Skip to content

Commit

Permalink
Dotnet update to 9
Browse files Browse the repository at this point in the history
  • Loading branch information
AllDwarf committed Nov 26, 2024
1 parent 66597e4 commit 3d1696b
Show file tree
Hide file tree
Showing 14 changed files with 154 additions and 174 deletions.
29 changes: 9 additions & 20 deletions src/BinSkim.Driver/BinSkim.Driver.csproj
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.netcore.props))\build.netcore.props" />

<PropertyGroup>
<AssemblyName>BinSkim</AssemblyName>
<!-- Condition="'$(OS)'=='Windows_NT'" -->
<TargetFrameworks>$(NetCoreVersion)</TargetFrameworks>
<TargetFrameworks>net9.0</TargetFrameworks>
<TargetLatestRuntimePatch>True</TargetLatestRuntimePatch>
<OutputType>Exe</OutputType>
<Platforms>x64</Platforms>
</PropertyGroup>

<PropertyGroup>
<ApplicationManifest>app.manifest</ApplicationManifest>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
Expand All @@ -19,61 +17,52 @@
<RepositoryType>git</RepositoryType>
<RepositoryUrl>https://github.com/Microsoft/binskim</RepositoryUrl>
</PropertyGroup>

<ItemGroup>
<Content Include="README.txt">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>

<ItemGroup>
<PackageReference Include="CommandLineParser" Version="2.9.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="System.Collections.Immutable" Version="7.0.0" />
<PackageReference Include="System.Private.Uri" Version="4.3.2" />
<PackageReference Include="System.Reflection.Metadata" Version="7.0.2" />
<PackageReference Include="CommandLineParser" />
<PackageReference Include="Newtonsoft.Json" />
<PackageReference Include="System.Collections.Immutable" />
<PackageReference Include="System.Private.Uri" />
<PackageReference Include="System.Reflection.Metadata" />
</ItemGroup>

<ItemGroup>
<Reference Include="Dia2Lib">
<HintPath>..\..\refs\Dia2Lib.dll</HintPath>
<EmbedInteropTypes>False</EmbedInteropTypes>
</Reference>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\sarif-sdk\src\Sarif.Driver\Sarif.Driver.csproj" />
<ProjectReference Include="..\BinaryParsers\BinaryParsers.csproj" />
<ProjectReference Include="..\BinSkim.Rules\BinSkim.Rules.csproj" />
<ProjectReference Include="..\BinSkim.Sdk\BinSkim.Sdk.csproj" />
</ItemGroup>

<ItemGroup>
<Compile Update="DriverResources.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>DriverResources.resx</DependentUpon>
</Compile>
</ItemGroup>

<ItemGroup>
<EmbeddedResource Update="DriverResources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>DriverResources.Designer.cs</LastGenOutput>
<CustomToolNamespace>Microsoft.CodeAnalysis.IL</CustomToolNamespace>
</EmbeddedResource>
</ItemGroup>

<ItemGroup>
<ItemGroup>
<MsDiaLibs Include="..\..\refs\x64\*" Condition="'$(RuntimeIdentifier)'==''" />
<!-- Note: Official Release builds on Windows should specify a RID. Build using the BuildAndTest.cmd script. -->
<!-- Note: Official Release builds on Windows should specify a RID. Build using the BuildAndTest.cmd script. -->
<MsDiaLibs Include="..\..\refs\x64\*" Condition="'$(RuntimeIdentifier)'=='win-x64'" />
<MsDiaLibs Include="..\..\refs\msdia140.dll.manifest" />

<!-- Required DLLs for Microsoft Visual C++ runtime. -->
<MsRuntime Include="..\..\refs\runtime\*" />
</ItemGroup>

<Target Name="CopyMsDiaLibs" AfterTargets="build">
<Copy SourceFiles="@(MsDiaLibs)" DestinationFolder="$(OutputPath)\" />
<Copy SourceFiles="@(MsRuntime)" DestinationFolder="$(OutputPath)\" />
Expand All @@ -82,4 +71,4 @@
<Copy SourceFiles="@(MsDiaLibs)" DestinationFolder="$(PublishDir)\" />
<Copy SourceFiles="@(MsRuntime)" DestinationFolder="$(PublishDir)\" />
</Target>
</Project>
</Project>
18 changes: 6 additions & 12 deletions src/BinSkim.Rules/BinSkim.Rules.csproj
Original file line number Diff line number Diff line change
@@ -1,46 +1,40 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">

<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.netcore.props))\build.netcore.props" />
<PropertyGroup>
<RootNamespace>Microsoft.CodeAnalysis.IL.Rules</RootNamespace>
<TargetFramework>$(NetStandardVersion)</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<Platforms>x64</Platforms>
</PropertyGroup>

<ItemGroup>
<Reference Include="Dia2Lib">
<HintPath>..\..\refs\Dia2Lib.dll</HintPath>
<EmbedInteropTypes>False</EmbedInteropTypes>
</Reference>
</ItemGroup>

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="System.Collections.Immutable" Version="7.0.0" />
<PackageReference Include="System.Composition" Version="7.0.0" />
<PackageReference Include="Microsoft.ApplicationInsights" />
<PackageReference Include="Newtonsoft.Json" />
<PackageReference Include="System.Collections.Immutable" />
<PackageReference Include="System.Composition" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\sarif-sdk\src\Sarif.Driver\Sarif.Driver.csproj" />
<ProjectReference Include="..\BinaryParsers\BinaryParsers.csproj" />
<ProjectReference Include="..\BinSkim.Sdk\BinSkim.Sdk.csproj" />
</ItemGroup>

<ItemGroup>
<Compile Update="RuleResources.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>RuleResources.resx</DependentUpon>
</Compile>
</ItemGroup>

<ItemGroup>
<EmbeddedResource Update="RuleResources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>RuleResources.Designer.cs</LastGenOutput>
<CustomToolNamespace>Microsoft.CodeAnalysis.IL.Rules</CustomToolNamespace>
</EmbeddedResource>
</ItemGroup>

</Project>
</Project>
18 changes: 6 additions & 12 deletions src/BinSkim.Sdk/BinSkim.Sdk.csproj
Original file line number Diff line number Diff line change
@@ -1,24 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">

<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.netcore.props))\build.netcore.props" />
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.netcore.props))\build.netcore.props" />
<PropertyGroup>
<RootNamespace>Microsoft.CodeAnalysis.IL.Sdk</RootNamespace>
<TargetFramework>$(NetStandardVersion)</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<Platforms>x64</Platforms>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.21.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="System.Collections.Immutable" Version="7.0.0" />
<PackageReference Include="Microsoft.ApplicationInsights" />
<PackageReference Include="Newtonsoft.Json" />
<PackageReference Include="System.Collections.Immutable" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\BinaryParsers\BinaryParsers.csproj" />
<ProjectReference Include="..\sarif-sdk\src\Sarif.Driver\Sarif.Driver.csproj" />
</ItemGroup>

<ItemGroup>
<Compile Update="EnvironmentResources.Designer.cs">
<DesignTime>True</DesignTime>
Expand All @@ -31,7 +27,6 @@
<DependentUpon>SdkResources.resx</DependentUpon>
</Compile>
</ItemGroup>

<ItemGroup>
<EmbeddedResource Update="EnvironmentResources.resx">
<Generator>ResXFileCodeGenerator</Generator>
Expand All @@ -43,5 +38,4 @@
<CustomToolNamespace>Microsoft.CodeAnalysis.IL.Sdk</CustomToolNamespace>
</EmbeddedResource>
</ItemGroup>

</Project>
</Project>
10 changes: 0 additions & 10 deletions src/BinSkim.sln
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
17 changes: 5 additions & 12 deletions src/BinaryParsers/BinaryParsers.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,46 +3,39 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.netcore.props))\build.netcore.props" />
<PropertyGroup>
<RootNamespace>Microsoft.CodeAnalysis.BinaryParsers</RootNamespace>
<TargetFramework>$(NetStandardVersion)</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Platforms>x64</Platforms>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="ELFSharp" Version="2.17.2" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="System.Collections.Immutable" Version="7.0.0" />
<PackageReference Include="System.Reflection.Metadata" Version="7.0.2" />
<PackageReference Include="System.Security.Cryptography.Algorithms" Version="4.3.1" />
<PackageReference Include="ELFSharp" />
<PackageReference Include="Newtonsoft.Json" />
<PackageReference Include="System.Collections.Immutable" />
<PackageReference Include="System.Reflection.Metadata" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\sarif-sdk\src\Sarif.Driver\Sarif.Driver.csproj" />
</ItemGroup>

<ItemGroup>
<Reference Include="Dia2Lib">
<HintPath>..\..\refs\Dia2Lib.dll</HintPath>
<EmbedInteropTypes>False</EmbedInteropTypes>
</Reference>
</ItemGroup>

<ItemGroup>
<Compile Update="BinaryParsersResources.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>BinaryParsersResources.resx</DependentUpon>
</Compile>
</ItemGroup>

<ItemGroup>
<EmbeddedResource Update="BinaryParsersResources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>BinaryParsersResources.Designer.cs</LastGenOutput>
<CustomToolNamespace>Microsoft.CodeAnalysis.BinaryParsers</CustomToolNamespace>
</EmbeddedResource>
</ItemGroup>

<PropertyGroup>
<PreBuildEvent Condition="$(OS) == 'Windows_NT'">
echo Copying file from "$(MSBuildProjectDirectory)\..\..\refs\Dia2Lib.dll" to "$(MSBuildProjectDirectory)\..\..\src\packages\microsoft.diagnostics.tracing.traceevent\3.1.3\lib\netstandard2.0\"
Expand Down
20 changes: 10 additions & 10 deletions src/BinaryParsers/VersionConstants.cs
Original file line number Diff line number Diff line change
@@ -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;
}
}
42 changes: 42 additions & 0 deletions src/Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<Project>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
<NoWarn>$(NoWarn);NU1507</NoWarn>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="CommandLineParser" Version="2.9.1" />
<PackageVersion Include="CsvHelper" Version="15.0.5" />
<PackageVersion Include="ELFSharp" Version="2.17.2" />
<PackageVersion Include="FluentAssertions" Version="6.12.0" />
<PackageVersion Include="Microsoft.ApplicationInsights" Version="2.22.0" />
<PackageVersion Include="Microsoft.Coyote" Version="1.7.9" />
<PackageVersion Include="Microsoft.Coyote.Test" Version="1.7.9" />
<PackageVersion Include="Microsoft.Coyote.Tool" Version="1.7.9" />
<PackageVersion Include="Microsoft.Diagnostics.Tracing.EventRegister" Version="1.1.28" />
<PackageVersion Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="3.1.3" />
<PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="3.1.9" />
<PackageVersion Include="Microsoft.Json.Schema" Version="2.1.0" />
<PackageVersion Include="Microsoft.Json.Schema.Validation" Version="2.1.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
<PackageVersion Include="Moq" Version="4.18.4" />
<PackageVersion Include="MSTest.TestAdapter" Version="3.0.4" />
<PackageVersion Include="MSTest.TestFramework" Version="3.0.4" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
<PackageVersion Include="System.Collections.Immutable" Version="9.0.0" />
<PackageVersion Include="System.Composition" Version="9.0.0" />
<PackageVersion Include="System.Diagnostics.Debug" Version="4.3.0" />
<PackageVersion Include="System.IO.Compression" Version="4.3.0" />
<PackageVersion Include="System.IO.FileSystem.Primitives" Version="4.3.0" />
<PackageVersion Include="System.Private.Uri" Version="4.3.2" />
<PackageVersion Include="System.Reflection.Metadata" Version="9.0.0" />
<PackageVersion Include="System.Text.Encoding.CodePages" Version="4.3.0" />
<PackageVersion Include="System.Text.Encoding.Extensions" Version="4.3.0" />
<PackageVersion Include="System.Threading.Channels" Version="5.0.0" />
<PackageVersion Include="xunit" Version="2.5.1" />
<PackageVersion Include="xunit.runner.console" Version="2.5.1" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.1" />
<PackageVersion Include="YamlDotNet" Version="11.2.0" />
</ItemGroup>
</Project>
Loading

0 comments on commit 3d1696b

Please sign in to comment.