nuget

AndrewRathbun · Jan 8, 2025 · a00bfca · a00bfca
1 parent 5e7c696
commit a00bfca
Show file tree

Hide file tree

Showing 5 changed files with 66 additions and 30 deletions.
diff --git a/SQLECmd/FodyWeavers.xsd b/SQLECmd/FodyWeavers.xsd
@@ -29,12 +29,27 @@
               </xs:element>
               <xs:element minOccurs="0" maxOccurs="1" name="Unmanaged32Assemblies" type="xs:string">
                 <xs:annotation>
-                  <xs:documentation>A list of unmanaged 32 bit assembly names to include, delimited with line breaks.</xs:documentation>
+                  <xs:documentation>Obsolete, use UnmanagedWinX86Assemblies instead</xs:documentation>
+                </xs:annotation>
+              </xs:element>
+              <xs:element minOccurs="0" maxOccurs="1" name="UnmanagedWinX86Assemblies" type="xs:string">
+                <xs:annotation>
+                  <xs:documentation>A list of unmanaged X86 (32 bit) assembly names to include, delimited with line breaks.</xs:documentation>
                 </xs:annotation>
               </xs:element>
               <xs:element minOccurs="0" maxOccurs="1" name="Unmanaged64Assemblies" type="xs:string">
                 <xs:annotation>
-                  <xs:documentation>A list of unmanaged 64 bit assembly names to include, delimited with line breaks.</xs:documentation>
+                  <xs:documentation>Obsolete, use UnmanagedWinX64Assemblies instead.</xs:documentation>
+                </xs:annotation>
+              </xs:element>
+              <xs:element minOccurs="0" maxOccurs="1" name="UnmanagedWinX64Assemblies" type="xs:string">
+                <xs:annotation>
+                  <xs:documentation>A list of unmanaged X64 (64 bit) assembly names to include, delimited with line breaks.</xs:documentation>
+                </xs:annotation>
+              </xs:element>
+              <xs:element minOccurs="0" maxOccurs="1" name="UnmanagedWinArm64Assemblies" type="xs:string">
+                <xs:annotation>
+                  <xs:documentation>A list of unmanaged Arm64 (64 bit) assembly names to include, delimited with line breaks.</xs:documentation>
                 </xs:annotation>
               </xs:element>
               <xs:element minOccurs="0" maxOccurs="1" name="PreloadOrder" type="xs:string">
@@ -73,6 +88,11 @@
                 <xs:documentation>As part of Costura, embedded assemblies are no longer included as part of the build. This cleanup can be turned off.</xs:documentation>
               </xs:annotation>
             </xs:attribute>
+            <xs:attribute name="DisableEventSubscription" type="xs:boolean">
+              <xs:annotation>
+                <xs:documentation>The attach method no longer subscribes to the `AppDomain.AssemblyResolve` (.NET 4.x) and `AssemblyLoadContext.Resolving` (.NET 6.0+) events.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
             <xs:attribute name="LoadAtModuleInit" type="xs:boolean">
               <xs:annotation>
                 <xs:documentation>Costura by default will load as part of the module initialization. This flag disables that behavior. Make sure you call CosturaUtility.Initialize() somewhere in your code.</xs:documentation>
@@ -105,12 +125,27 @@
             </xs:attribute>
             <xs:attribute name="Unmanaged32Assemblies" type="xs:string">
               <xs:annotation>
-                <xs:documentation>A list of unmanaged 32 bit assembly names to include, delimited with |.</xs:documentation>
+                <xs:documentation>Obsolete, use UnmanagedWinX86Assemblies instead</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="UnmanagedWinX86Assemblies" type="xs:string">
+              <xs:annotation>
+                <xs:documentation>A list of unmanaged X86 (32 bit) assembly names to include, delimited with |.</xs:documentation>
               </xs:annotation>
             </xs:attribute>
             <xs:attribute name="Unmanaged64Assemblies" type="xs:string">
               <xs:annotation>
-                <xs:documentation>A list of unmanaged 64 bit assembly names to include, delimited with |.</xs:documentation>
+                <xs:documentation>Obsolete, use UnmanagedWinX64Assemblies instead</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="UnmanagedWinX64Assemblies" type="xs:string">
+              <xs:annotation>
+                <xs:documentation>A list of unmanaged X64 (64 bit) assembly names to include, delimited with |.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="UnmanagedWinArm64Assemblies" type="xs:string">
+              <xs:annotation>
+                <xs:documentation>A list of unmanaged Arm64 (64 bit) assembly names to include, delimited with |.</xs:documentation>
               </xs:annotation>
             </xs:attribute>
             <xs:attribute name="PreloadOrder" type="xs:string">

diff --git a/SQLECmd/SQLECmd.csproj b/SQLECmd/SQLECmd.csproj
@@ -1,27 +1,28 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFrameworks>net6.0;net462</TargetFrameworks>
+        <TargetFrameworks>net6.0;net462;net9.0</TargetFrameworks>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
-        <Version>1.0.0</Version>
+        <Version>1.1.0</Version>
         <ApplicationIcon>DatabaseSearch.ico</ApplicationIcon>
         <LangVersion>10</LangVersion>
         <IsPackable>false</IsPackable>
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="AlphaFS.New" Version="2.3.0"/>
-        <PackageReference Include="Costura.Fody" Version="5.7.0">
+        <PackageReference Include="Costura.Fody" Version="6.0.0">
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="ERZHelpers" Version="1.3.0.0"/>
-        <PackageReference Include="Exceptionless" Version="4.6.2"/>
-        <PackageReference Include="Serilog" Version="2.10.0"/>
-        <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1"/>
-        <PackageReference Include="ServiceStack.OrmLite.Sqlite" Version="5.13.2"/>
-        <PackageReference Include="ServiceStack.Text" Version="5.13.2"/>
-        <PackageReference Include="SharpZipLib" Version="1.3.3"/>
+        <PackageReference Include="ERZHelpers" Version="1.5.0" />
+        <PackageReference Include="Exceptionless" Version="6.0.4" />
+        <PackageReference Include="Serilog" Version="4.2.0" />
+        <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
+        <PackageReference Include="ServiceStack.OrmLite.Sqlite" Version="8.5.2" />
+        <PackageReference Include="ServiceStack.Text" Version="8.5.2" />
+        <PackageReference Include="SharpZipLib" Version="1.4.2" />
         <PackageReference Include="System.CommandLine" Version="2.0.0-beta2.21617.1"/>
         <PackageReference Include="System.CommandLine.NamingConventionBinder" Version="2.0.0-beta2.21617.1"/>
+        <PackageReference Include="System.Private.Uri" Version="4.3.2" />
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\SQLMap\SQLMaps.csproj"/>

diff --git a/SQLMap.Test/SQLMap.Test.csproj b/SQLMap.Test/SQLMap.Test.csproj
@@ -1,17 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>net462;net6.0</TargetFrameworks>
-        <Version>0.6.0.0</Version>
+        <TargetFramework>net8.0</TargetFramework>
+        <Version>0.6.0</Version>
         <LangVersion>10</LangVersion>
         <IsPackable>false</IsPackable>
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="AlphaFS.New" Version="2.3.0"/>
-        <PackageReference Include="FluentAssertions" Version="6.2.0"/>
-        <PackageReference Include="Serilog" Version="2.10.0"/>
-        <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1"/>
-        <PackageReference Include="NUnit" Version="3.13.2"/>
-        <PackageReference Include="ServiceStack.OrmLite.Sqlite" Version="5.13.2"/>
+        <PackageReference Include="FluentAssertions" Version="7.0.0" />
+        <PackageReference Include="Serilog" Version="4.2.0" />
+        <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
+        <PackageReference Include="NUnit" Version="4.3.2" />
+        <PackageReference Include="ServiceStack.OrmLite.Sqlite" Version="8.5.2" />
     </ItemGroup>
     <ItemGroup>
         <Folder Include="TestFiles\"/>

diff --git a/SQLMap/SQLMap.cs b/SQLMap/SQLMap.cs
@@ -132,7 +132,7 @@ public static bool LoadMaps(string mapPath)
                 var lines = File.ReadLines(mapFile).ToList();
                 var fileContents = mapFile.ReadAllText();
 
-                var badLine = lines[se.Start.Line - 1];
+                var badLine = lines[(int)(se.Start.Line - 1)];
                 Console.WriteLine();
                 Log.Fatal("Bad line (or close to it) {BadLine} has invalid data at column {Column}", badLine, se.Start.Column);
 

diff --git a/SQLMap/SQLMaps.csproj b/SQLMap/SQLMaps.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
+        <TargetFramework>netstandard2.0</TargetFramework>
         <LangVersion>10</LangVersion>
         <Version>0.6.0</Version>
         <Authors>Eric R. Zimmerman</Authors>
         <Description>SQLite maps manager</Description>
         <PackageProjectUrl>https://github.com/EricZimmerman/SQLECmd</PackageProjectUrl>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
-        <Version>1.0.0</Version>
+        <Version>1.1.0</Version>
 
         <PackageTags>SRUM</PackageTags>
         <PackageReadmeFile>README.md</PackageReadmeFile>
@@ -18,19 +18,19 @@
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="AlphaFS.New" Version="2.3.0"/>
-        <PackageReference Include="CsvHelper" Version="27.2.1"/>
-        <PackageReference Include="FluentValidation" Version="10.3.6"/>
-        <PackageReference Include="Serilog" Version="2.10.0"/>
+        <PackageReference Include="CsvHelper" Version="33.0.1" />
+        <PackageReference Include="FluentValidation" Version="11.11.0" />
+        <PackageReference Include="Serilog" Version="4.2.0" />
         <PackageReference Include="ServiceStack.Text" Version="5.13.2"/>
-        <PackageReference Include="YamlDotNet" Version="11.2.1"/>
+        <PackageReference Include="YamlDotNet" Version="16.3.0" />
 
         <None Include="../README.md" Pack="true" PackagePath=""/>
         <None Include="../icon.png" Pack="true" PackagePath=""/>
-        <PackageReference Include="DotNet.ReproducibleBuilds" Version="1.1.1">
+        <PackageReference Include="DotNet.ReproducibleBuilds" Version="1.2.25">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="MinVer" Version="4.3.0">
+        <PackageReference Include="MinVer" Version="6.0.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>