From a00bfca5d74a3af5d56634625a03288dd029b6fd Mon Sep 17 00:00:00 2001 From: Eric Zimmerman Date: Wed, 8 Jan 2025 11:14:54 -0500 Subject: [PATCH] nuget --- SQLECmd/FodyWeavers.xsd | 43 ++++++++++++++++++++++++++++++---- SQLECmd/SQLECmd.csproj | 21 +++++++++-------- SQLMap.Test/SQLMap.Test.csproj | 14 +++++------ SQLMap/SQLMap.cs | 2 +- SQLMap/SQLMaps.csproj | 16 ++++++------- 5 files changed, 66 insertions(+), 30 deletions(-) diff --git a/SQLECmd/FodyWeavers.xsd b/SQLECmd/FodyWeavers.xsd index 05e92c1..f2dbece 100644 --- a/SQLECmd/FodyWeavers.xsd +++ b/SQLECmd/FodyWeavers.xsd @@ -29,12 +29,27 @@ - A list of unmanaged 32 bit assembly names to include, delimited with line breaks. + Obsolete, use UnmanagedWinX86Assemblies instead + + + + + A list of unmanaged X86 (32 bit) assembly names to include, delimited with line breaks. - A list of unmanaged 64 bit assembly names to include, delimited with line breaks. + Obsolete, use UnmanagedWinX64Assemblies instead. + + + + + A list of unmanaged X64 (64 bit) assembly names to include, delimited with line breaks. + + + + + A list of unmanaged Arm64 (64 bit) assembly names to include, delimited with line breaks. @@ -73,6 +88,11 @@ As part of Costura, embedded assemblies are no longer included as part of the build. This cleanup can be turned off. + + + The attach method no longer subscribes to the `AppDomain.AssemblyResolve` (.NET 4.x) and `AssemblyLoadContext.Resolving` (.NET 6.0+) events. + + 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. @@ -105,12 +125,27 @@ - A list of unmanaged 32 bit assembly names to include, delimited with |. + Obsolete, use UnmanagedWinX86Assemblies instead + + + + + A list of unmanaged X86 (32 bit) assembly names to include, delimited with |. - A list of unmanaged 64 bit assembly names to include, delimited with |. + Obsolete, use UnmanagedWinX64Assemblies instead + + + + + A list of unmanaged X64 (64 bit) assembly names to include, delimited with |. + + + + + A list of unmanaged Arm64 (64 bit) assembly names to include, delimited with |. diff --git a/SQLECmd/SQLECmd.csproj b/SQLECmd/SQLECmd.csproj index dc793aa..35729b0 100644 --- a/SQLECmd/SQLECmd.csproj +++ b/SQLECmd/SQLECmd.csproj @@ -1,27 +1,28 @@  Exe - net6.0;net462 + net6.0;net462;net9.0 MIT - 1.0.0 + 1.1.0 DatabaseSearch.ico 10 false - + all - - - - - - - + + + + + + + + diff --git a/SQLMap.Test/SQLMap.Test.csproj b/SQLMap.Test/SQLMap.Test.csproj index b49467f..3d602bf 100644 --- a/SQLMap.Test/SQLMap.Test.csproj +++ b/SQLMap.Test/SQLMap.Test.csproj @@ -1,17 +1,17 @@  - net462;net6.0 - 0.6.0.0 + net8.0 + 0.6.0 10 false - - - - - + + + + + diff --git a/SQLMap/SQLMap.cs b/SQLMap/SQLMap.cs index b96ae5b..b3c81b4 100644 --- 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 index 40b76bd..02798cf 100644 --- a/SQLMap/SQLMaps.csproj +++ b/SQLMap/SQLMaps.csproj @@ -1,13 +1,13 @@  - net6.0;netstandard2.0 + netstandard2.0 10 0.6.0 Eric R. Zimmerman SQLite maps manager https://github.com/EricZimmerman/SQLECmd MIT - 1.0.0 + 1.1.0 SRUM README.md @@ -18,19 +18,19 @@ - - - + + + - + - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive