Merge pull request #6 from EricZimmerman/master

upd8
EricZimmerman · Mar 21, 2021 · f8ca8b9 · f8ca8b9
2 parents b05a1d8 + f99c5e4
commit f8ca8b9
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/SQLECmd/FodyWeavers.xsd b/SQLECmd/FodyWeavers.xsd
@@ -19,12 +19,12 @@
               </xs:element>
               <xs:element minOccurs="0" maxOccurs="1" name="ExcludeRuntimeAssemblies" type="xs:string">
                 <xs:annotation>
-                  <xs:documentation>A list of (.NET Core) runtime assembly names to exclude from the default action of "embed all Copy Local references", delimited with line breaks</xs:documentation>
+                  <xs:documentation>A list of runtime assembly names to exclude from the default action of "embed all Copy Local references", delimited with line breaks</xs:documentation>
                 </xs:annotation>
               </xs:element>
               <xs:element minOccurs="0" maxOccurs="1" name="IncludeRuntimeAssemblies" type="xs:string">
                 <xs:annotation>
-                  <xs:documentation>A list of (.NET Core) runtime assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks.</xs:documentation>
+                  <xs:documentation>A list of runtime assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks.</xs:documentation>
                 </xs:annotation>
               </xs:element>
               <xs:element minOccurs="0" maxOccurs="1" name="Unmanaged32Assemblies" type="xs:string">
@@ -55,7 +55,12 @@
             </xs:attribute>
             <xs:attribute name="IncludeRuntimeReferences" type="xs:boolean">
               <xs:annotation>
-                <xs:documentation>Controls if (.NET Core) runtime assemblies are also embedded.</xs:documentation>
+                <xs:documentation>Controls if runtime assemblies are also embedded.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="UseRuntimeReferencePaths" type="xs:boolean">
+              <xs:annotation>
+                <xs:documentation>Controls whether the runtime assemblies are embedded with their full path or only with their assembly name.</xs:documentation>
               </xs:annotation>
             </xs:attribute>
             <xs:attribute name="DisableCompression" type="xs:boolean">
@@ -90,12 +95,12 @@
             </xs:attribute>
             <xs:attribute name="ExcludeRuntimeAssemblies" type="xs:string">
               <xs:annotation>
-                <xs:documentation>A list of (.NET Core) runtime assembly names to exclude from the default action of "embed all Copy Local references", delimited with |</xs:documentation>
+                <xs:documentation>A list of runtime assembly names to exclude from the default action of "embed all Copy Local references", delimited with |</xs:documentation>
               </xs:annotation>
             </xs:attribute>
             <xs:attribute name="IncludeRuntimeAssemblies" type="xs:string">
               <xs:annotation>
-                <xs:documentation>A list of (.NET Core) runtime assembly names to include from the default action of "embed all Copy Local references", delimited with |.</xs:documentation>
+                <xs:documentation>A list of runtime assembly names to include from the default action of "embed all Copy Local references", delimited with |.</xs:documentation>
               </xs:annotation>
             </xs:attribute>
             <xs:attribute name="Unmanaged32Assemblies" type="xs:string">

diff --git a/SQLECmd/SQLECmd.csproj b/SQLECmd/SQLECmd.csproj
@@ -14,6 +14,8 @@
 
   <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net462|AnyCPU'">
     <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>embedded</DebugType>
+    <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
 
   <ItemGroup>
@@ -22,7 +24,7 @@
 
   <ItemGroup>
     <PackageReference Include="AlphaFS" Version="2.2.6" />
-    <PackageReference Include="Costura.Fody" Version="5.0.2">
+    <PackageReference Include="Costura.Fody" Version="5.1.0">
       <PrivateAssets>all</PrivateAssets>
 
     </PackageReference>

diff --git a/SQLMap/Maps/Windows_Firefox_Bookmarks.smap b/SQLMap/Maps/Windows_Firefox_Bookmarks.smap
@@ -11,7 +11,7 @@ Queries:
     -
         Name: Bookmarks
         Query: |
-                WHEN moz_historyvisiSELECT
+                SELECT
                 Bookmarks.id AS ID,
                 Bookmarks.parent AS ParentID,
                 CASE

diff --git a/SQLMap/Maps/Windows_Firefox_Cookies.smap b/SQLMap/Maps/Windows_Firefox_Cookies.smap
@@ -13,7 +13,6 @@ Queries:
         Query: |
                SELECT
                moz_cookies.id AS ID,
-               moz_cookies.baseDomain AS BaseDomain,
                moz_cookies.host AS Host,
                moz_cookies.name AS Name,
                moz_cookies.value AS Value,