switch from net6 to net9 and update SDKs

adamralph · Dec 27, 2024 · de0791a · de0791a
1 parent 516a7b3
commit de0791a
Show file tree

Hide file tree

Showing 15 changed files with 54 additions and 34 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -18,65 +18,78 @@ jobs:
               os: macos-13
             tests:
               framework: net8.0
-              sdk: "8.0.401"
+              sdk: "8.0.404"
               sdk-major-minor: "8.0"
           # current macOS, latest LTS and latest
           - job:
               os: macos-14
             tests:
               framework: net8.0
-              sdk: "8.0.401"
+              sdk: "8.0.404"
               sdk-major-minor: "8.0"
+          - job:
+              os: macos-14
+            tests:
+              framework: net9.0
+              sdk: "9.0.101"
+              sdk-major-minor: "9.0"
           # old Linux, latest LTS
           - job:
               os: ubuntu-20.04
             tests:
               framework: net8.0
-              sdk: "8.0.401"
+              sdk: "8.0.404"
               sdk-major-minor: "8.0"
           # old Linux, latest LTS
           - job:
               os: ubuntu-22.04
             tests:
               framework: net8.0
-              sdk: "8.0.401"
+              sdk: "8.0.404"
               sdk-major-minor: "8.0"
           # current Linux, all
           - job:
               os: ubuntu-24.04
+              upload: true
             tests:
-              framework: net6.0
-              sdk: "6.0.425"
-              sdk-major-minor: "6.0"
+              framework: net8.0
+              sdk: "8.0.404"
+              sdk-major-minor: "8.0"
           - job:
               os: ubuntu-24.04
               upload: true
             tests:
-              framework: net8.0
-              sdk: "8.0.401"
-              sdk-major-minor: "8.0"
+              framework: net9.0
+              sdk: "9.0.101"
+              sdk-major-minor: "9.0"
           # old Windows, latest LTS
           - job:
               os: windows-2019
             tests:
               framework: net8.0
-              sdk: "8.0.401"
+              sdk: "8.0.404"
               sdk-major-minor: "8.0"
             # current Windows, latest LTS and latest
           - job:
               os: windows-2022
             tests:
               framework: net8.0
-              sdk: "8.0.401"
+              sdk: "8.0.404"
               sdk-major-minor: "8.0"
+          - job:
+              os: windows-2022
+            tests:
+              framework: net9.0
+              sdk: "9.0.101"
+              sdk-major-minor: "9.0"
     name: ${{ matrix.job.os }}-sdk-${{ matrix.tests.sdk-major-minor }}
     runs-on: ${{ matrix.job.os }}
     steps:
       - uses: actions/[email protected]
         with:
           dotnet-version: |
             ${{ matrix.tests.sdk }}
-            8.0.401
+            9.0.101
       - run: dotnet --info
       - run: git --version
       - uses: actions/[email protected]

diff --git a/.github/workflows/infer-sharp.yml b/.github/workflows/infer-sharp.yml
@@ -10,7 +10,7 @@ jobs:
     steps:
       - uses: actions/[email protected]
         with:
-          dotnet-version: '8.0.401'
+          dotnet-version: '9.0.101'
       - uses: actions/[email protected]
       - run: dotnet build
       - run: ls -al

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -12,7 +12,7 @@ jobs:
     steps:
       - uses: actions/[email protected]
         with:
-          dotnet-version: 8.0.401
+          dotnet-version: 9.0.101
       - uses: actions/[email protected]
       - env:
           MINVER_VERSION: ${{ vars.MINVER_VERSION }}

diff --git a/MSBuild.Caching/MSBuild.Caching.csproj b/MSBuild.Caching/MSBuild.Caching.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <IsPackable>false</IsPackable>
-    <TargetFrameworks>net472;net6.0</TargetFrameworks>
+    <TargetFrameworks>net472;net8.0</TargetFrameworks>
     <LangVersion>12.0</LangVersion>
   </PropertyGroup>
 

diff --git a/MinVer.Lib/MinVer.Lib.csproj b/MinVer.Lib/MinVer.Lib.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <IsPackable>false</IsPackable>
-    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/MinVer/MinVer.csproj b/MinVer/MinVer.csproj
@@ -18,7 +18,7 @@
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <RollForward>major</RollForward>
     <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
-    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
@@ -43,7 +43,7 @@
     <Content Include="build\**\*" PackagePath="build" />
     <Content Include="buildMultiTargeting\**\*" PackagePath="buildMultiTargeting" />
     <None Include="..\MSBuild.Caching\bin\$(Configuration)\net472\MSBuild.Caching.dll" Pack="true" PackagePath="build\bin\net472" Visible="false" />
-    <None Include="..\MSBuild.Caching\bin\$(Configuration)\net6.0\MSBuild.Caching.dll" Pack="true" PackagePath="build\bin\net6.0" Visible="false" />
+    <None Include="..\MSBuild.Caching\bin\$(Configuration)\net8.0\MSBuild.Caching.dll" Pack="true" PackagePath="build\bin\net8.0" Visible="false" />
   </ItemGroup>
 
   <Target Name="AddMinVerOutput" BeforeTargets="_GetPackageFiles">

diff --git a/MinVer/build/MinVer.targets b/MinVer/build/MinVer.targets
@@ -4,7 +4,7 @@
     <MSBuildAllProjects Condition="'$(MSBuildAssemblyVersion)' == '' Or '$(MSBuildAssemblyVersion)' &lt; '16.0'">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
     <GenerateNuspecDependsOn>$(GenerateNuspecDependsOn);MinVer</GenerateNuspecDependsOn>
     <GetPackageVersionDependsOn>$(GetPackageVersionDependsOn);MinVer</GetPackageVersionDependsOn>
-    <MinVerMSBuildCachingPath Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)bin\net6.0\MSBuild.Caching.dll</MinVerMSBuildCachingPath>
+    <MinVerMSBuildCachingPath Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)bin\net8.0\MSBuild.Caching.dll</MinVerMSBuildCachingPath>
     <MinVerMSBuildCachingPath Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)bin\net472\MSBuild.Caching.dll</MinVerMSBuildCachingPath>
   </PropertyGroup>
 
@@ -14,8 +14,9 @@
   <PropertyGroup>
     <MinVerDetailed>low</MinVerDetailed>
     <MinVerDetailed Condition="'$(MinVerVerbosity)' == 'detailed' Or '$(MinVerVerbosity)' == 'd' Or '$(MinVerVerbosity)' == 'diagnostic' Or '$(MinVerVerbosity)' == 'diag'">high</MinVerDetailed>
-    <MinVerTargetFramework>net6.0</MinVerTargetFramework>
-    <MinVerTargetFramework Condition="'$(MSBuildAssemblyVersion)' &gt;= '17.8'">net8.0</MinVerTargetFramework>
+    <MinVerTargetFramework>net8.0</MinVerTargetFramework>
+    <!-- https://learn.microsoft.com/en-us/dotnet/core/porting/versioning-sdk-msbuild-vs#supported-net-versions -->
+    <MinVerTargetFramework Condition="'$(MSBuildAssemblyVersion)' &gt;= '17.12'">net9.0</MinVerTargetFramework>
     <NoWarn>$(NoWarn);NU5105</NoWarn>
   </PropertyGroup>
 

diff --git a/MinVerTests.Infra/MinVerCli.cs b/MinVerTests.Infra/MinVerCli.cs
@@ -11,10 +11,10 @@ public static class MinVerCli
     }
 
     public static string GetPath(string configuration) =>
-#if NET6_0
-        Solution.GetFullPath($"minver-cli/bin/{configuration}/net6.0/minver-cli.dll");
-#endif
 #if NET8_0
         Solution.GetFullPath($"minver-cli/bin/{configuration}/net8.0/minver-cli.dll");
 #endif
+#if NET9_0
+        Solution.GetFullPath($"minver-cli/bin/{configuration}/net9.0/minver-cli.dll");
+#endif
 }
diff --git a/MinVerTests.Infra/MinVerTests.Infra.csproj b/MinVerTests.Infra/MinVerTests.Infra.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <IsPackable>false</IsPackable>
-    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/MinVerTests.Infra/Sdk.cs b/MinVerTests.Infra/Sdk.cs
@@ -199,10 +199,12 @@ private static (Version Version, string InformationalVersion) GetAssemblyVersion
 
         try
         {
-            return (
-                assembly.GetName().Version ?? throw new InvalidOperationException("The assembly version is null."),
+            var version = assembly.GetName().Version ?? throw new InvalidOperationException("The assembly version is null.");
+            var informationalVersion =
                 assembly.GetCustomAttributes().OfType<AssemblyInformationalVersionAttribute>().FirstOrDefault()?.InformationalVersion ??
-                throw new InvalidOperationException("The assembly has no informational version."));
+                throw new InvalidOperationException("The assembly has no informational version.");
+
+            return (version, informationalVersion);
         }
         finally
         {

diff --git a/MinVerTests.Lib/MinVerTests.Lib.csproj b/MinVerTests.Lib/MinVerTests.Lib.csproj
@@ -1,8 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
+    <!-- https://github.com/dotnet/roslyn-analyzers/issues/7192 -->
+    <NoWarn>$(NoWarn);CA1515</NoWarn>
     <RollForward>major</RollForward>
-    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/MinVerTests.Packages/MinVerTests.Packages.csproj b/MinVerTests.Packages/MinVerTests.Packages.csproj
@@ -1,8 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
+    <!-- https://github.com/dotnet/roslyn-analyzers/issues/7192 -->
+    <NoWarn>$(NoWarn);CA1515</NoWarn>
     <RollForward>major</RollForward>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.100",
+    "version": "9.0.100",
     "rollForward": "latestMajor"
   }
 }
diff --git a/minver-cli/minver-cli.csproj b/minver-cli/minver-cli.csproj
@@ -14,7 +14,7 @@
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <RollForward>major</RollForward>
     <RootNamespace>MinVer</RootNamespace>
-    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <ToolCommandName>minver</ToolCommandName>
   </PropertyGroup>
 

diff --git a/targets/Targets.csproj b/targets/Targets.csproj
@@ -4,7 +4,7 @@
     <IsPackable>false</IsPackable>
     <OutputType>Exe</OutputType>
     <RollForward>major</RollForward>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>