diff --git a/src/BinSkim.Driver/BinSkim.Driver.csproj b/src/BinSkim.Driver/BinSkim.Driver.csproj index 80e725f0..3a2c911a 100644 --- a/src/BinSkim.Driver/BinSkim.Driver.csproj +++ b/src/BinSkim.Driver/BinSkim.Driver.csproj @@ -1,16 +1,14 @@  - BinSkim - $(NetCoreVersion) + net9.0 True Exe x64 - app.manifest true @@ -19,35 +17,30 @@ git https://github.com/Microsoft/binskim - PreserveNewest - - - - - - + + + + + - ..\..\refs\Dia2Lib.dll False - - True @@ -55,7 +48,6 @@ DriverResources.resx - ResXFileCodeGenerator @@ -63,17 +55,14 @@ Microsoft.CodeAnalysis.IL - - + - + - - @@ -82,4 +71,4 @@ - + \ No newline at end of file diff --git a/src/BinSkim.Rules/BinSkim.Rules.csproj b/src/BinSkim.Rules/BinSkim.Rules.csproj index 4bb6e4a8..f2148ea3 100644 --- a/src/BinSkim.Rules/BinSkim.Rules.csproj +++ b/src/BinSkim.Rules/BinSkim.Rules.csproj @@ -1,32 +1,28 @@ - Microsoft.CodeAnalysis.IL.Rules - $(NetStandardVersion) + net9.0 x64 - ..\..\refs\Dia2Lib.dll False - - - - + + + + - - True @@ -34,7 +30,6 @@ RuleResources.resx - ResXFileCodeGenerator @@ -42,5 +37,4 @@ Microsoft.CodeAnalysis.IL.Rules - - + \ No newline at end of file diff --git a/src/BinSkim.Sdk/BinSkim.Sdk.csproj b/src/BinSkim.Sdk/BinSkim.Sdk.csproj index e6e7f07f..ee18558a 100644 --- a/src/BinSkim.Sdk/BinSkim.Sdk.csproj +++ b/src/BinSkim.Sdk/BinSkim.Sdk.csproj @@ -1,24 +1,20 @@ - - + Microsoft.CodeAnalysis.IL.Sdk - $(NetStandardVersion) + net9.0 x64 - - - - + + + - - True @@ -31,7 +27,6 @@ SdkResources.resx - ResXFileCodeGenerator @@ -43,5 +38,4 @@ Microsoft.CodeAnalysis.IL.Sdk - - + \ No newline at end of file diff --git a/src/BinSkim.sln b/src/BinSkim.sln index 9aec0944..aef0cd53 100644 --- a/src/BinSkim.sln +++ b/src/BinSkim.sln @@ -58,8 +58,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sarif.Converters", "sarif-s EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Test.UnitTests.Sarif.Converters", "sarif-sdk\src\Test.UnitTests.Sarif.Converters\Test.UnitTests.Sarif.Converters.csproj", "{E29D948B-BF8D-41D3-9924-01E994602D8A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test.ConcurrencyTests", "Test.ConcurrencyTests\Test.ConcurrencyTests.csproj", "{27A04162-2037-41FB-AD76-E179451BB627}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -196,14 +194,6 @@ Global {E29D948B-BF8D-41D3-9924-01E994602D8A}.Release|Any CPU.Build.0 = Release|Any CPU {E29D948B-BF8D-41D3-9924-01E994602D8A}.Release|x64.ActiveCfg = Release|Any CPU {E29D948B-BF8D-41D3-9924-01E994602D8A}.Release|x64.Build.0 = Release|Any CPU - {27A04162-2037-41FB-AD76-E179451BB627}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {27A04162-2037-41FB-AD76-E179451BB627}.Debug|Any CPU.Build.0 = Debug|Any CPU - {27A04162-2037-41FB-AD76-E179451BB627}.Debug|x64.ActiveCfg = Debug|Any CPU - {27A04162-2037-41FB-AD76-E179451BB627}.Debug|x64.Build.0 = Debug|Any CPU - {27A04162-2037-41FB-AD76-E179451BB627}.Release|Any CPU.ActiveCfg = Release|Any CPU - {27A04162-2037-41FB-AD76-E179451BB627}.Release|Any CPU.Build.0 = Release|Any CPU - {27A04162-2037-41FB-AD76-E179451BB627}.Release|x64.ActiveCfg = Release|Any CPU - {27A04162-2037-41FB-AD76-E179451BB627}.Release|x64.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/BinaryParsers/BinaryParsers.csproj b/src/BinaryParsers/BinaryParsers.csproj index 9b49224a..faabff25 100644 --- a/src/BinaryParsers/BinaryParsers.csproj +++ b/src/BinaryParsers/BinaryParsers.csproj @@ -3,30 +3,25 @@ Microsoft.CodeAnalysis.BinaryParsers - $(NetStandardVersion) + net9.0 true x64 - - - - - - + + + + - - ..\..\refs\Dia2Lib.dll False - True @@ -34,7 +29,6 @@ BinaryParsersResources.resx - ResXFileCodeGenerator @@ -42,7 +36,6 @@ Microsoft.CodeAnalysis.BinaryParsers - echo Copying file from "$(MSBuildProjectDirectory)\..\..\refs\Dia2Lib.dll" to "$(MSBuildProjectDirectory)\..\..\src\packages\microsoft.diagnostics.tracing.traceevent\3.1.3\lib\netstandard2.0\" diff --git a/src/BinaryParsers/VersionConstants.cs b/src/BinaryParsers/VersionConstants.cs index 66ecca41..37f51269 100644 --- a/src/BinaryParsers/VersionConstants.cs +++ b/src/BinaryParsers/VersionConstants.cs @@ -1,12 +1,12 @@ // Copyright (c) Microsoft. All rights reserved. Licensed under the MIT // license. See LICENSE file in the project root for full license information. -namespace Microsoft.CodeAnalysis.IL -{ - public static class VersionConstants - { - public const string Prerelease = ""; - public const string AssemblyVersion = "4.3.1" + ".0"; - public const string FileVersion = "4.3.1" + ".0"; - public const string Version = AssemblyVersion + Prerelease; - } -} +namespace Microsoft.CodeAnalysis.IL +{ + public static class VersionConstants + { + public const string Prerelease = ""; + public const string AssemblyVersion = "4.3.1" + ".0"; + public const string FileVersion = "4.3.1" + ".0"; + public const string Version = AssemblyVersion + Prerelease; + } + } diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props new file mode 100644 index 00000000..253ca4d2 --- /dev/null +++ b/src/Directory.Packages.props @@ -0,0 +1,42 @@ + + + true + true + $(NoWarn);NU1507 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Test.ConcurrencyTests/Test.ConcurrencyTests.csproj b/src/Test.ConcurrencyTests/Test.ConcurrencyTests.csproj index 87e05ac3..9c2bee25 100644 --- a/src/Test.ConcurrencyTests/Test.ConcurrencyTests.csproj +++ b/src/Test.ConcurrencyTests/Test.ConcurrencyTests.csproj @@ -1,40 +1,35 @@ netcoreapp3.1 - 1.7.9 - powershell - pwsh - \ - / + 1.7.9 + powershell + pwsh + \ + / - - - $(PowershellExecutable) -executionpolicy bypass -command ".$(PathSeparator)rewriteUnitTests.ps1 -Configuration $(Configuration) -CoyoteVersion $(CoyoteVersion) -TargetFramework $(TargetFramework)" - - - - - - - - - - - - - - Never - - - Never - - - Never - - - - - - - - + + $(PowershellExecutable) -executionpolicy bypass -command ".$(PathSeparator)rewriteUnitTests.ps1 -Configuration $(Configuration) -CoyoteVersion $(CoyoteVersion) -TargetFramework $(TargetFramework)" + + + + + + + + + + + + Never + + + Never + + + Never + + + + + + \ No newline at end of file diff --git a/src/Test.FunctionalTests.BinSkim.Driver/Test.FunctionalTests.BinSkim.Driver.csproj b/src/Test.FunctionalTests.BinSkim.Driver/Test.FunctionalTests.BinSkim.Driver.csproj index 19463eb9..fa7db041 100644 --- a/src/Test.FunctionalTests.BinSkim.Driver/Test.FunctionalTests.BinSkim.Driver.csproj +++ b/src/Test.FunctionalTests.BinSkim.Driver/Test.FunctionalTests.BinSkim.Driver.csproj @@ -2,7 +2,7 @@ - $(NetCoreVersion) + net9.0 Library True x64 @@ -10,28 +10,25 @@ $(MSBuildProjectDirectory)\BaselineTests.runsettings - - + - - - - - - - - + + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive - @@ -41,17 +38,14 @@ - PreserveNewest - PreserveNewest - - + \ No newline at end of file diff --git a/src/Test.FunctionalTests.BinSkim.Rules/Test.FunctionalTests.BinSkim.Rules.csproj b/src/Test.FunctionalTests.BinSkim.Rules/Test.FunctionalTests.BinSkim.Rules.csproj index b403080e..3540b409 100644 --- a/src/Test.FunctionalTests.BinSkim.Rules/Test.FunctionalTests.BinSkim.Rules.csproj +++ b/src/Test.FunctionalTests.BinSkim.Rules/Test.FunctionalTests.BinSkim.Rules.csproj @@ -1,43 +1,37 @@  - - - $(NetCoreVersion) + net9.0 Library True x64 - - - - - - - + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - PreserveNewest - - + \ No newline at end of file diff --git a/src/Test.UnitTests.BinSkim.Driver/Test.UnitTests.BinSkim.Driver.csproj b/src/Test.UnitTests.BinSkim.Driver/Test.UnitTests.BinSkim.Driver.csproj index 021dcd79..c3f7da48 100644 --- a/src/Test.UnitTests.BinSkim.Driver/Test.UnitTests.BinSkim.Driver.csproj +++ b/src/Test.UnitTests.BinSkim.Driver/Test.UnitTests.BinSkim.Driver.csproj @@ -4,22 +4,22 @@ Microsoft.CodeAnalysis.BinSkim.Rules - $(NetCoreVersion) + net9.0 Library True x64 - - - - - - + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + @@ -30,4 +30,4 @@ - + \ No newline at end of file diff --git a/src/Test.UnitTests.BinSkim.Rules/Test.UnitTests.BinSkim.Rules.csproj b/src/Test.UnitTests.BinSkim.Rules/Test.UnitTests.BinSkim.Rules.csproj index b0c0a6d4..b8966130 100644 --- a/src/Test.UnitTests.BinSkim.Rules/Test.UnitTests.BinSkim.Rules.csproj +++ b/src/Test.UnitTests.BinSkim.Rules/Test.UnitTests.BinSkim.Rules.csproj @@ -4,25 +4,25 @@ Microsoft.CodeAnalysis.BinSkim.Rules - $(NetCoreVersion) + net9.0 Library True x64 - - - - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + - + \ No newline at end of file diff --git a/src/Test.UnitTests.BinaryParsers/Test.UnitTests.BinaryParsers.csproj b/src/Test.UnitTests.BinaryParsers/Test.UnitTests.BinaryParsers.csproj index 7bf3be0c..36a74321 100644 --- a/src/Test.UnitTests.BinaryParsers/Test.UnitTests.BinaryParsers.csproj +++ b/src/Test.UnitTests.BinaryParsers/Test.UnitTests.BinaryParsers.csproj @@ -2,34 +2,29 @@ - Microsoft.CodeAnalysis.BinaryParsers - $(NetCoreVersion) + net9.0 Library True x64 - - - - - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - ..\..\refs\Dia2Lib.dll - - + \ No newline at end of file diff --git a/src/sarif-sdk b/src/sarif-sdk index 9e95888f..f9e0a4d5 160000 --- a/src/sarif-sdk +++ b/src/sarif-sdk @@ -1 +1 @@ -Subproject commit 9e95888f74d0e23a782d864674a044ddc1604ee1 +Subproject commit f9e0a4d54bbdbecbf89c0a980986d7cfc21f2a17