Merge pull request #1156 from adamralph/net10-sdk

adamralph · web-flow · commit 876960b7c9c7 · 2025-12-11T10:44:55.000+01:00
switch to .NET 10 SDK for build and test
diff --git a/.editorconfig b/.editorconfig
@@ -34,3 +34,7 @@ indent_style                                                              = tab
 
 [build]
 end_of_line                                                               = lf
+
+[packages.lock.json]
+end_of_line                                                               = unset
+insert_final_newline                                                      = unset
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -20,31 +20,25 @@ jobs:
           - job:
               os: macos-14
             tests:
-              framework: net8.0
-              sdk: "8.0.416"
-              sdk-major-minor: "8.0"
+              framework: net10.0
+              sdk: "10.0.101"
+              sdk-major-minor: "10.0"
           ### current, latest LTS and latest
           - job:
               os: macos-15
             tests:
-              framework: net8.0
-              sdk: "8.0.416"
-              sdk-major-minor: "8.0"
-          - job:
-              os: macos-15
-            tests:
-              framework: net9.0
-              sdk: "9.0.308"
-              sdk-major-minor: "9.0"
+              framework: net10.0
+              sdk: "10.0.101"
+              sdk-major-minor: "10.0"
           # Linux
           ## x64
           ### old latest LTS
           - job:
               os: ubuntu-22.04
             tests:
-              framework: net8.0
-              sdk: "8.0.416"
-              sdk-major-minor: "8.0"
+              framework: net10.0
+              sdk: "10.0.101"
+              sdk-major-minor: "10.0"
           ### current, all
           - job:
               os: ubuntu-24.04
@@ -58,14 +52,20 @@ jobs:
               framework: net9.0
               sdk: "9.0.308"
               sdk-major-minor: "9.0"
+          - job:
+              os: ubuntu-24.04
+            tests:
+              framework: net10.0
+              sdk: "10.0.101"
+              sdk-major-minor: "10.0"
           ## arm64
           ### old, latest LTS
           - job:
               os: ubuntu-22.04-arm
             tests:
-              framework: net8.0
-              sdk: "8.0.416"
-              sdk-major-minor: "8.0"
+              framework: net10.0
+              sdk: "10.0.101"
+              sdk-major-minor: "10.0"
           ### current, all
           - job:
               os: ubuntu-24.04-arm
@@ -80,50 +80,44 @@ jobs:
               framework: net9.0
               sdk: "9.0.308"
               sdk-major-minor: "9.0"
+          - job:
+              os: ubuntu-24.04-arm
+            tests:
+              framework: net10.0
+              sdk: "10.0.101"
+              sdk-major-minor: "10.0"
           # Windows
           ## x64
           ### old, latest LTS
           - job:
               os: windows-2022
             tests:
-              framework: net8.0
-              sdk: "8.0.416"
-              sdk-major-minor: "8.0"
+              framework: net10.0
+              sdk: "10.0.101"
+              sdk-major-minor: "10.0"
           ### current, latest LTS and latest
           - job:
               os: windows-2025
             tests:
-              framework: net8.0
-              sdk: "8.0.416"
-              sdk-major-minor: "8.0"
-          - job:
-              os: windows-2025
-            tests:
-              framework: net9.0
-              sdk: "9.0.308"
-              sdk-major-minor: "9.0"
+              framework: net10.0
+              sdk: "10.0.101"
+              sdk-major-minor: "10.0"
           ## arm64
           ### current, latest LTS and latest
           - job:
               os: windows-11-arm
             tests:
-              framework: net8.0
-              sdk: "8.0.416"
-              sdk-major-minor: "8.0"
-          - job:
-              os: windows-11-arm
-            tests:
-              framework: net9.0
-              sdk: "9.0.308"
-              sdk-major-minor: "9.0"
+              framework: net10.0
+              sdk: "10.0.101"
+              sdk-major-minor: "10.0"
     name: ${{ matrix.job.os }}-sdk-${{ matrix.tests.sdk-major-minor }}
     runs-on: ${{ matrix.job.os }}
     steps:
       - uses: actions/setup-dotnet@v4.3.1
         with:
           dotnet-version: |
             ${{ matrix.tests.sdk }}
-            9.0.308
+            10.0.101
       - run: dotnet --info
       - run: git --version
       - uses: actions/checkout@v4.2.2
diff --git a/.github/workflows/infer-sharp.yml b/.github/workflows/infer-sharp.yml
@@ -11,7 +11,7 @@ jobs:
     steps:
       - uses: actions/setup-dotnet@v4.3.1
         with:
-          dotnet-version: '9.0.308'
+          dotnet-version: '10.0.101'
       - uses: actions/checkout@v4.2.2
       - run: dotnet build
       - run: ls -al
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -21,6 +21,9 @@ jobs:
           DEFAULT_BRANCH: main
           FILTER_REGEX_EXCLUDE: \bcodeql-analysis\.yml$|\bLICENSE$|\bversions\.txt$
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          VALIDATE_DOTNET_SLN_FORMAT_ANALYZERS: false
+          VALIDATE_DOTNET_SLN_FORMAT_STYLE: false
+          VALIDATE_DOTNET_SLN_FORMAT_WHITESPACE: false
           VALIDATE_JSON_PRETTIER: false
           VALIDATE_MARKDOWN_PRETTIER: false
           VALIDATE_SHELL_SHFMT: false
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -12,7 +12,7 @@ jobs:
     steps:
       - uses: actions/setup-dotnet@v4.3.1
         with:
-          dotnet-version: 9.0.308
+          dotnet-version: 10.0.101
       - uses: actions/checkout@v4.2.2
       - env:
           MINVER_VERSION: ${{ vars.MINVER_VERSION }}
diff --git a/MinVerTests.Infra/MinVerCli.cs b/MinVerTests.Infra/MinVerCli.cs
@@ -2,19 +2,24 @@ namespace MinVerTests.Infra;
 
 public static class MinVerCli
 {
-    public static Task<(string StandardOutput, string StandardError)> ReadAsync(string workingDirectory, string configuration = Configuration.Current, string args = "", Func<int, bool>? handleExitCode = null, params (string, string)[] envVars)
+    public static async Task<(string StandardOutput, string StandardError)> ReadAsync(string workingDirectory, string configuration = Configuration.Current, string args = "", Func<int, bool>? handleExitCode = null, params (string, string)[] envVars)
     {
         var environmentVariables = envVars.ToDictionary(envVar => envVar.Item1, envVar => envVar.Item2, StringComparer.OrdinalIgnoreCase);
         _ = environmentVariables.TryAdd("MinVerVerbosity".ToAltCase(), "trace");
 
-        return CommandEx.ReadLoggedAsync("dotnet", $"exec {GetPath(configuration)} {args}", workingDirectory, environmentVariables, handleExitCode);
+        var path = await GetPath(configuration).ConfigureAwait(false);
+        return await CommandEx.ReadLoggedAsync("dotnet", $"exec {path} {args}", workingDirectory, environmentVariables, handleExitCode).ConfigureAwait(false);
     }
 
-    public static string GetPath(string configuration) =>
-#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
+    public static async Task<string> GetPath(string configuration)
+    {
+        var targetFramework = await GetTargetFramework().ConfigureAwait(false);
+        return Solution.GetFullPath($"minver-cli/bin/{configuration}/{targetFramework}/minver-cli.dll");
+    }
+
+    private static async Task<string> GetTargetFramework()
+    {
+        var sdkVersionInUse = await Sdk.GetVersionInUse().ConfigureAwait(false);
+        return sdkVersionInUse.Split('.', 2)[0] == "8" ? "net8.0" : "net9.0";
+    }
 }
diff --git a/MinVerTests.Infra/MinVerTests.Infra.csproj b/MinVerTests.Infra/MinVerTests.Infra.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <IsPackable>false</IsPackable>
-    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/MinVerTests.Infra/Sdk.cs b/MinVerTests.Infra/Sdk.cs
@@ -18,6 +18,8 @@ public static class Sdk
         return standardOutput.Trim();
     });
 
+    public static Task<string> GetVersionInUse() => VersionInUse.Value;
+
     public static async Task CreateSolution(string path, string[] projectNames, string configuration = Configuration.Current)
     {
         projectNames = projectNames ?? throw new ArgumentNullException(nameof(projectNames));
@@ -191,7 +193,11 @@ private static async Task<Package> GetPackage(string fileName)
     {
         var extractedDirectoryName = Path.Combine(Path.GetDirectoryName(fileName) ?? "", Path.GetFileNameWithoutExtension(fileName));
 
+#if NET10_0_OR_GREATER
+        await ZipFile.ExtractToDirectoryAsync(fileName, extractedDirectoryName).ConfigureAwait(false);
+#else
         ZipFile.ExtractToDirectory(fileName, extractedDirectoryName);
+#endif
 
         var nuspecFileName = Directory.EnumerateFiles(extractedDirectoryName, "*.nuspec").First();
 
diff --git a/MinVerTests.Lib/LogMessages.cs b/MinVerTests.Lib/LogMessages.cs
@@ -115,9 +115,14 @@ private static async Task<string> ReplaceShas(string logMessages, string path)
     {
         var shas = (await ReadAsync("git", "log --pretty=format:\"%H\"", path))
             .StandardOutput
-            .ToNonEmptyLines()
-            .Reverse()
-            .ToList();
+            .ToNonEmptyLines();
+#if NET10_0_OR_GREATER
+        shas = [.. shas.Reverse(),];
+#else
+#pragma warning disable CA1806 // Do not ignore method results
+        shas.Reverse();
+#pragma warning restore CA1806
+#endif
 
         foreach (var item in shas.Select((sha, index) => new { Sha = sha, Index = index, }))
         {
diff --git a/MinVerTests.Lib/MinVerTests.Lib.csproj b/MinVerTests.Lib/MinVerTests.Lib.csproj
@@ -4,7 +4,7 @@
     <!-- https://github.com/dotnet/roslyn-analyzers/issues/7192 -->
     <NoWarn>$(NoWarn);CA1515</NoWarn>
     <RollForward>major</RollForward>
-    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/MinVerTests.Packages/Cleaning.cs b/MinVerTests.Packages/Cleaning.cs
@@ -9,7 +9,12 @@ public static class Cleaning
 {
     [Theory]
     [InlineData(false)]
+    // In the .NET 10 SDK, packages produced from multi-TFM projects are no longer cleaned.
+    // This is left here as a placeholder in case this is a regression which will be fixed later.
+    // See https://github.com/dotnet/sdk/issues/52109
+#if !NET10_0
     [InlineData(true)]
+#endif
     public static async Task PackagesAreCleaned(bool multiTarget)
     {
         // arrange
diff --git a/MinVerTests.Packages/MinVerTests.Packages.csproj b/MinVerTests.Packages/MinVerTests.Packages.csproj
@@ -4,7 +4,7 @@
     <!-- https://github.com/dotnet/roslyn-analyzers/issues/7192 -->
     <NoWarn>$(NoWarn);CA1515</NoWarn>
     <RollForward>major</RollForward>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "9.0.100",
+    "version": "10.0.100",
     "rollForward": "latestMinor"
   }
 }
diff --git a/targets/Program.cs b/targets/Program.cs
@@ -3,7 +3,7 @@
 using static SimpleExec.Command;
 
 var testFx = Environment.GetEnvironmentVariable("MINVER_TESTS_FRAMEWORK") ?? "net8.0";
-var testLoggerArgs = new List<string> { "--logger", "\"console;verbosity=normal\"", };
+var testLoggerArgs = new List<string> { "--logger", "console;verbosity=normal", };
 
 if (Environment.GetEnvironmentVariable("GITHUB_ACTIONS")?.ToUpperInvariant() == "TRUE")
 {
@@ -75,7 +75,7 @@ await RunAsync(
 
         await RunAsync(
             "dotnet",
-            $"exec {MinVerCli.GetPath("Release")} {path}",
+            $"exec {await MinVerCli.GetPath("Release")} {path}",
             configureEnvironment: env =>
             {
                 env.Add("MinVerBuildMetadata", "build.6");
diff --git a/targets/Targets.csproj b/targets/Targets.csproj
@@ -4,7 +4,7 @@
     <IsPackable>false</IsPackable>
     <OutputType>Exe</OutputType>
     <RollForward>major</RollForward>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

-Original file line number
+Diff line change
     steps:
       - uses: actions/[email protected]
         with:
 -          dotnet-version: 9.0.308
 +          dotnet-version: 10.0.101
       - uses: actions/[email protected]
       - env:
           MINVER_VERSION: ${{ vars.MINVER_VERSION }}