Bump Dependencies, Add Net 9 target, Remove Net 6 and 7 Targets (#727)

* Update Dependencies and Build Targets * Update Pipelines for Net 9 * Switch to MSTest SDK per #719 * One more bump * Revert change to MSTest.SDK Does not seem to work properly and makes managing dependencies more difficult.
microsoft · Jan 22, 2025 · 6a44438 · 6a44438
1 parent 7915e00
commit 6a44438
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 30 deletions.
diff --git a/.gitignore b/.gitignore
@@ -264,6 +264,9 @@ paket-files/
 __pycache__/
 *.pyc
 
+# Mac OS Metadata
+**/.DS_Store
+
 Application Insights/
 *.sqlite-journal
 Tools/

diff --git a/Benchmarks/Benchmarks.csproj b/Benchmarks/Benchmarks.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ReleaseVersion>0.0.0-placeholder</ReleaseVersion>
     <LangVersion>10.0</LangVersion>
     <Nullable>enable</Nullable>

diff --git a/Cli/Cli.csproj b/Cli/Cli.csproj
@@ -24,7 +24,7 @@
     <PackageIcon>icon-128.png</PackageIcon>
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
@@ -37,11 +37,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.11.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" />
-    <PackageReference Include="Microsoft.CST.OAT.Blazor.Components" Version="1.2.68" />
-    <PackageReference Include="Microsoft.CST.OAT.Scripting" Version="1.2.68" />
+    <PackageReference Include="Microsoft.CST.OAT.Blazor.Components" Version="1.2.73" />
+    <PackageReference Include="Microsoft.CST.OAT.Scripting" Version="1.2.73" />
     <PackageReference Include="Sarif.Sdk" Version="4.5.4" />
-    <PackageReference Include="Tewr.Blazor.FileReader" Version="3.3.2.23201" />
+    <PackageReference Include="Tewr.Blazor.FileReader" Version="3.4.0.24340" />
   </ItemGroup>
 </Project>
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -2,7 +2,7 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <PackageReference Include="Nerdbank.GitVersioning">
-      <Version>3.6.146</Version>
+      <Version>3.7.115</Version>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>

diff --git a/Lib/Lib.csproj b/Lib/Lib.csproj
@@ -21,7 +21,7 @@
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <ReleaseVersion>2.1-alpha</ReleaseVersion>
-    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
   </PropertyGroup>
 
   <Target Name="CopyLicenseNotice" AfterTargets="AfterBuild">
@@ -35,32 +35,32 @@
 
   <ItemGroup>
     <PackageReference Include="MedallionShell" Version="1.6.2" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.11.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" />
-    <PackageReference Include="Microsoft.CST.OAT" Version="1.2.68" />
-    <PackageReference Include="Microsoft.CST.RecursiveExtractor" Version="1.2.32" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.12.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.12.0" />
+    <PackageReference Include="Microsoft.CST.OAT" Version="1.2.73" />
+    <PackageReference Include="Microsoft.CST.RecursiveExtractor" Version="1.2.34" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.Data.Sqlite" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Data.Sqlite" Version="9.0.1" />
     <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
-    <PackageReference Include="Microsoft.Windows.Compatibility" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="9.0.1" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="Serilog" Version="4.1.0" />
+    <PackageReference Include="Serilog" Version="4.2.0" />
     <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
     <PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
     <PackageReference Include="System.Diagnostics.Process" Version="4.3.0" />
-    <PackageReference Include="System.Management" Version="9.0.0" />
+    <PackageReference Include="System.Management" Version="9.0.1" />
     <PackageReference Include="System.Net.NetworkInformation" Version="4.3.0" />
     <PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0" />
-    <PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="9.0.1" />
     <PackageReference Include="System.Runtime" Version="4.3.1" />
     <PackageReference Include="System.Security.AccessControl" Version="6.0.1" />
-    <PackageReference Include="System.Threading.AccessControl" Version="9.0.0" />
+    <PackageReference Include="System.Threading.AccessControl" Version="9.0.1" />
     <PackageReference Include="System.Net.Security" Version="4.3.2" />
     <PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
     <PackageReference Include="WindowsFirewallHelper" Version="2.2.0.86" />
     <PackageReference Include="CommandLineParser" Version="2.9.1" />
     <PackageReference Include="Microsoft.TSS" Version="2.1.1" />
-    <PackageReference Include="PeNet" Version="4.1.0" />
+    <PackageReference Include="PeNet" Version="4.1.1" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="..\analyses.json" Link="analyses.json" />

diff --git a/Pipelines/asa-pr.yml b/Pipelines/asa-pr.yml
@@ -30,8 +30,8 @@ resources:
 
 variables:
   BuildConfiguration: 'Release'
-  DotnetVersion: '8.0.x'
-  DotnetTargetFramework: 'net8.0'
+  DotnetVersion: '9.0.x'
+  DotnetTargetFramework: 'net9.0'
 
 extends:
   template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
@@ -47,7 +47,7 @@ extends:
       - template: dotnet-test-job.yml@templates
         parameters:
           jobName: 'dotnet_test_windows'
-          dotnetVersions: ['6.0.x','7.0.x','8.0.x']
+          dotnetVersions: ['8.0.x','9.0.x']
           poolName: MSSecurity-1ES-Build-Agents-Pool
           poolImage: MSSecurity-1ES-Windows-2022
           poolOs: windows

diff --git a/Pipelines/asa-release.yml b/Pipelines/asa-release.yml
@@ -15,8 +15,8 @@ resources:
 
 variables:
   BuildConfiguration: 'Release'
-  DotnetVersion: '8.0.x'
-  DotnetTargetFramework: 'net8.0'
+  DotnetVersion: '9.0.x'
+  DotnetTargetFramework: 'net9.0'
 
 extends:
   template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
@@ -37,7 +37,7 @@ extends:
       - template: dotnet-test-job.yml@templates
         parameters:
           jobName: 'dotnet_test_windows'
-          dotnetVersions: ['6.0.x','7.0.x','8.0.x']
+          dotnetVersions: ['8.0.x','9.0.x']
           poolName: MSSecurity-1ES-Build-Agents-Pool
           poolImage: MSSecurity-1ES-Windows-2022
           poolOs: windows

diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
@@ -4,7 +4,7 @@
     <IsPackable>false</IsPackable>
     <AssemblyName>AsaTests</AssemblyName>
     <ReleaseVersion>0.0.0-placeholder</ReleaseVersion>
-    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
@@ -13,9 +13,15 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.6.3" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.6.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.7.1" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.7.1" />
+    <PackageReference Update="MSTest.Analyzers" Version="3.7.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Update="Microsoft.Testing.Extensions.TrxReport" Version="1.5.1" />
+    <PackageReference Update="Microsoft.Testing.Extensions.CodeCoverage" Version="17.13.1" />
   </ItemGroup>
 
   <ItemGroup>