Migrated to .Net10.

Author: azchohfi

.github/workflows/build-package.yml

@@ -22,7 +22,7 @@ jobs:
     - name: Install .NET Core
       uses: actions/setup-dotnet@v5
       with:
-        dotnet-version: 9.0.x
+        dotnet-version: 10.0.x
 
     - name: Setup Node.js
       uses: actions/setup-node@v5

.pipelines/ci.yml

@@ -32,9 +32,9 @@ extends:
         steps:
           - checkout: self
           - task: UseDotNet@2
-            displayName: Setup .NET 9
+            displayName: Setup .NET 10
             inputs:
-              version: 9.0.x
+              version: 10.0.x
           - task: UseNode@1
             displayName: Setup Node.js 24
             inputs:

.pipelines/release.yml

@@ -46,9 +46,9 @@ extends:
         steps:
           - checkout: self
           - task: UseDotNet@2
-            displayName: Setup .NET 9
+            displayName: Setup .NET 10
             inputs:
-              version: 9.0.x
+              version: 10.0.x
           - ${{ if eq(parameters.DoEsrp, 'true') }}:
             - task: UseDotNet@2
               displayName: Setup .NET 6.0 (For ESRP Task)

global.json

@@ -0,0 +1,5 @@
+{
+    "test": {
+        "runner": "Microsoft.Testing.Platform"
+    }
+}

scripts/build-cli.ps1

@@ -81,7 +81,7 @@ try
     # Step 2: Run tests (unless skipped)
     if (-not $SkipTests) {
         Write-Host "[TEST] Running tests..." -ForegroundColor Blue
-        dotnet test $CliSolutionPath -c Release --no-build --results-directory .\TestResults -- --report-trx
+        dotnet test --solution $CliSolutionPath -c Release --no-build --results-directory .\TestResults --report-trx
         $TestExitCode = $LASTEXITCODE
 
         # Copy test results to artifacts BEFORE checking for failure - find all TRX files

src/winapp-CLI/.editorconfig

@@ -38,6 +38,9 @@ dotnet_analyzer_diagnostic.category-reliability.severity = warning
 dotnet_analyzer_diagnostic.category-security.severity = warning
 dotnet_analyzer_diagnostic.category-usage.severity = warning
 
+# CA1068: CancellationToken parameters must come last
+dotnet_diagnostic.CA1068.severity = warning
+
 # CancellationToken rules (Built-in .NET analyzers) - MOST IMPORTANT
 # CA2016: Forward the CancellationToken parameter to methods that take one
 dotnet_diagnostic.CA2016.severity = warning
@@ -58,9 +61,6 @@ dotnet_diagnostic.CA1031.severity = none
 # CA2201: Exception type System.Exception is not sufficiently specific
 dotnet_diagnostic.CA2201.severity = suggestion
 
-# CA1822: Mark members as static (can be noisy)
-dotnet_diagnostic.CA1822.severity = none
-
 # CA1852: Type can be sealed (not critical)
 dotnet_diagnostic.CA1852.severity = none
 
@@ -76,6 +76,9 @@ dotnet_diagnostic.CA1031.severity = suggestion
 # CA1848: Use the LoggerMessage delegates
 dotnet_diagnostic.CA1848.severity = none
 
+# CA1873: 
+dotnet_diagnostic.CA1873.severity = none
+
 # CA2249: Consider using String.Contains instead of String.IndexOf
 dotnet_diagnostic.CA2249.severity = suggestion
 

src/winapp-CLI/Directory.Packages.props

@@ -1,9 +1,9 @@
 <Project>
   <ItemGroup>
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.10" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="9.0.10" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0-rc.2.25502.107" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="10.0.0-rc.2.25502.107" />
     <PackageVersion Include="System.CommandLine" Version="2.0.0-rc.2.25502.107" />
-    <PackageVersion Include="System.Diagnostics.EventLog" Version="9.0.10" />
+    <PackageVersion Include="System.Diagnostics.EventLog" Version="10.0.0-rc.2.25502.107" />
     <PackageVersion Include="Microsoft.Telemetry.Inbox.Managed" Version="10.0.25148.1001-220626-1600.rs-fun-deploy-dev5" />
   </ItemGroup>
-</Project>
+</Project>

src/winapp-CLI/WinApp.Cli.Tests/BaseCommandTests.cs

@@ -19,6 +19,8 @@ public abstract class BaseCommandTests(bool configPaths = true)
     protected StringWriter ConsoleStdOut { private set; get; } = null!;
     protected StringWriter ConsoleStdErr { private set; get; } = null!;
 
+    public TestContext TestContext { get; set; } = null!;
+
     [TestInitialize]
     public void SetupBase()
     {

src/winapp-CLI/WinApp.Cli.Tests/BuildToolsServiceTests.cs

@@ -157,7 +157,7 @@ public async Task RunBuildToolAsync_WithValidTool_ReturnsOutput()
         File.WriteAllText(fakeToolPath, "@echo Hello from fake tool");
 
         // Act
-        var (stdout, stderr) = await _buildToolsService.RunBuildToolAsync("echo.cmd", "");
+        var (stdout, stderr) = await _buildToolsService.RunBuildToolAsync("echo.cmd", "", TestContext.CancellationToken);
 
         // Assert
         Assert.Contains("Hello from fake tool", stdout);
@@ -173,7 +173,7 @@ public async Task RunBuildToolAsync_WithNonExistentTool_ThrowsFileNotFoundExcept
         // Act & Assert
         await Assert.ThrowsExactlyAsync<FileNotFoundException>(async () =>
         {
-            await _buildToolsService.RunBuildToolAsync("nonexistent.exe", "");
+            await _buildToolsService.RunBuildToolAsync("nonexistent.exe", "", TestContext.CancellationToken);
         });
     }
 
@@ -184,7 +184,7 @@ public async Task EnsureBuildToolsAsync_WithNoExistingPackage_ShouldAttemptInsta
         // since we can't easily mock the package installation service in this test setup
 
         // Act
-        var result = await _buildToolsService.EnsureBuildToolsAsync();
+        var result = await _buildToolsService.EnsureBuildToolsAsync(cancellationToken: TestContext.CancellationToken);
 
         // Assert - Result can be either null (if installation fails) or a path (if successful)
         // The important part is that the method completes without throwing
@@ -202,7 +202,7 @@ public async Task EnsureBuildToolsAsync_WithExistingPackage_ReturnsExistingPath(
         Directory.CreateDirectory(binDir);
 
         // Act
-        var result = await _buildToolsService.EnsureBuildToolsAsync();
+        var result = await _buildToolsService.EnsureBuildToolsAsync(cancellationToken: TestContext.CancellationToken);
 
         // Assert - Should find and return the existing bin path
         Assert.AreEqual(binDir, result!.FullName);
@@ -218,7 +218,7 @@ public async Task EnsureBuildToolsAsync_WithForceLatest_ShouldAttemptReinstallat
         Directory.CreateDirectory(binDir);
 
         // Act - Force latest should attempt reinstallation even with existing package
-        var result = await _buildToolsService.EnsureBuildToolsAsync(forceLatest: true);
+        var result = await _buildToolsService.EnsureBuildToolsAsync(forceLatest: true, TestContext.CancellationToken);
 
         // Assert - Result can be either null (if installation fails) or a path (if successful)
         // The important part is that the method completes and attempts reinstallation
@@ -238,7 +238,7 @@ public async Task EnsureBuildToolAvailableAsync_WithExistingTool_ReturnsToolPath
         File.WriteAllText(toolPath, "fake mt.exe");
 
         // Act
-        var result = await _buildToolsService.EnsureBuildToolAvailableAsync("mt.exe");
+        var result = await _buildToolsService.EnsureBuildToolAvailableAsync("mt.exe", TestContext.CancellationToken);
 
         // Assert
         Assert.AreEqual(toolPath, result!.FullName);
@@ -257,7 +257,7 @@ public async Task EnsureBuildToolAvailableAsync_WithToolNameWithoutExtension_Add
         File.WriteAllText(toolPath, "fake mt.exe");
 
         // Act - Request tool without .exe extension
-        var result = await _buildToolsService.EnsureBuildToolAvailableAsync("mt");
+        var result = await _buildToolsService.EnsureBuildToolAvailableAsync("mt", TestContext.CancellationToken);
 
         // Assert
         Assert.AreEqual(toolPath, result.FullName);
@@ -272,7 +272,7 @@ public async Task EnsureBuildToolAvailableAsync_WithNoExistingPackageAndInstallS
         // Act
         try 
         {
-            var result = await _buildToolsService.EnsureBuildToolAvailableAsync("mt.exe");
+            var result = await _buildToolsService.EnsureBuildToolAvailableAsync("mt.exe", TestContext.CancellationToken);
 
             // Assert - If we get here, installation was successful and we got a path
             Assert.IsNotNull(result);
@@ -306,7 +306,7 @@ public async Task EnsureBuildToolAvailableAsync_WithNonExistentTool_ThrowsFileNo
         // Act & Assert
         await Assert.ThrowsExactlyAsync<FileNotFoundException>(async () =>
         {
-            await _buildToolsService.EnsureBuildToolAvailableAsync("nonexistent.exe");
+            await _buildToolsService.EnsureBuildToolAvailableAsync("nonexistent.exe", TestContext.CancellationToken);
         });
     }
 
@@ -320,7 +320,7 @@ public async Task RunBuildToolAsync_WithNoExistingPackage_AutoInstallsAndRuns()
         {
             // Create a simple batch command that outputs something
             // This will either succeed (if BuildTools installs successfully) or throw an exception
-            await _buildToolsService.RunBuildToolAsync("echo.cmd", "test");
+            await _buildToolsService.RunBuildToolAsync("echo.cmd", "test", TestContext.CancellationToken);
 
             // If we reach here, the auto-installation worked - test passes
         }
@@ -347,7 +347,7 @@ public async Task RunBuildToolAsync_WithExistingTool_RunsDirectly()
         File.WriteAllText(batchFile, "@echo Hello from test tool");
 
         // Act
-        var (stdout, stderr) = await _buildToolsService.RunBuildToolAsync("test.cmd", "");
+        var (stdout, stderr) = await _buildToolsService.RunBuildToolAsync("test.cmd", "", TestContext.CancellationToken);
 
         // Assert
         Assert.Contains("Hello from test tool", stdout);

src/winapp-CLI/WinApp.Cli.Tests/EndToEndTests.cs

@@ -68,7 +68,7 @@ public async Task E2E_WinFormsApp_CreateBuildManifestAndPackage_ShouldSucceed()
         };
 
         var manifestParseResult = manifestGenerateCommand.Parse(manifestArgs);
-        var manifestExitCode = await manifestParseResult.InvokeAsync();
+        var manifestExitCode = await manifestParseResult.InvokeAsync(cancellationToken: TestContext.CancellationToken);
         Assert.AreEqual(0, manifestExitCode, "Manifest generate command should complete successfully");
 
         // Verify manifest generated the necessary files
@@ -90,7 +90,7 @@ public async Task E2E_WinFormsApp_CreateBuildManifestAndPackage_ShouldSucceed()
         };
 
         var packageParseResult = packageCommand.Parse(packageArgs);
-        var packageExitCode = await packageParseResult.InvokeAsync();
+        var packageExitCode = await packageParseResult.InvokeAsync(cancellationToken: TestContext.CancellationToken);
         Assert.AreEqual(0, packageExitCode, "Package command should complete successfully");
 
         // Step 6: Verify the MSIX package was created
@@ -100,7 +100,7 @@ public async Task E2E_WinFormsApp_CreateBuildManifestAndPackage_ShouldSucceed()
         Assert.IsGreaterThan(0, fileInfo.Length, "MSIX package should not be empty");
 
         // Verify the MSIX contains expected files
-        using var archive = ZipFile.OpenRead(packageOutputPath);
+        using var archive = await ZipFile.OpenReadAsync(packageOutputPath, TestContext.CancellationToken);
         var entries = archive.Entries.Select(e => e.FullName).ToList();
 
         Assert.IsTrue(entries.Any(e => e.EndsWith("AppxManifest.xml", StringComparison.OrdinalIgnoreCase)), 
@@ -149,14 +149,14 @@ public async Task E2E_WinFormsApp_WithCustomManifestOptions_ShouldPackageSuccess
         };
 
         var manifestParseResult = manifestGenerateCommand.Parse(manifestArgs);
-        var manifestExitCode = await manifestParseResult.InvokeAsync();
+        var manifestExitCode = await manifestParseResult.InvokeAsync(cancellationToken: TestContext.CancellationToken);
         Assert.AreEqual(0, manifestExitCode, "Manifest generate command should complete successfully");
 
         // Verify custom options were applied
         var manifestPath = Path.Combine(projectDir.FullName, "appxmanifest.xml");
         Assert.IsTrue(File.Exists(manifestPath), "Manifest should be created");
 
-        var manifestContent = await File.ReadAllTextAsync(manifestPath);
+        var manifestContent = await File.ReadAllTextAsync(manifestPath, TestContext.CancellationToken);
         Assert.IsTrue(manifestContent.Contains("CustomPackageName", StringComparison.OrdinalIgnoreCase), 
             "Manifest should contain custom package name");
         Assert.IsTrue(manifestContent.Contains("CN=TestPublisher", StringComparison.Ordinal), 
@@ -176,7 +176,7 @@ public async Task E2E_WinFormsApp_WithCustomManifestOptions_ShouldPackageSuccess
         };
 
         var packageParseResult = packageCommand.Parse(packageArgs);
-        var packageExitCode = await packageParseResult.InvokeAsync();
+        var packageExitCode = await packageParseResult.InvokeAsync(cancellationToken: TestContext.CancellationToken);
         Assert.AreEqual(0, packageExitCode, "Package command should complete successfully");
 
         Assert.IsTrue(File.Exists(packageOutputPath), "MSIX package should be created");
@@ -208,7 +208,7 @@ def main():
 if __name__ == ""__main__"":
     sys.exit(main())
 ";
-        await File.WriteAllTextAsync(scriptPath, pythonScript);
+        await File.WriteAllTextAsync(scriptPath, pythonScript, TestContext.CancellationToken);
         Assert.IsTrue(File.Exists(scriptPath), "Python script should be created");
 
         // Step 2: Run 'winapp manifest generate --template hostedapp --entrypoint main.py'
@@ -222,14 +222,14 @@ def main():
         };
 
         var manifestParseResult = manifestGenerateCommand.Parse(manifestArgs);
-        var manifestExitCode = await manifestParseResult.InvokeAsync();
+        var manifestExitCode = await manifestParseResult.InvokeAsync(cancellationToken: TestContext.CancellationToken);
         Assert.AreEqual(0, manifestExitCode, "Manifest generate command should complete successfully");
 
         // Verify manifest was created with hosted app configuration
         var manifestPath = Path.Combine(projectDir.FullName, "appxmanifest.xml");
         Assert.IsTrue(File.Exists(manifestPath), "Manifest should be created");
 
-        var manifestContent = await File.ReadAllTextAsync(manifestPath);
+        var manifestContent = await File.ReadAllTextAsync(manifestPath, TestContext.CancellationToken);
         Assert.IsTrue(manifestContent.Contains("Python314", StringComparison.OrdinalIgnoreCase) || 
                       manifestContent.Contains("Python", StringComparison.OrdinalIgnoreCase),
             "Manifest should contain Python runtime dependency");
@@ -247,7 +247,7 @@ def main():
         };
 
         var debugIdentityParseResult = createDebugIdentityCommand.Parse(debugIdentityArgs);
-        var debugIdentityExitCode = await debugIdentityParseResult.InvokeAsync();
+        var debugIdentityExitCode = await debugIdentityParseResult.InvokeAsync(cancellationToken: TestContext.CancellationToken);
         Assert.AreEqual(0, debugIdentityExitCode, "Create debug identity command should complete successfully");
 
         // Verify the debug identity package was created (sparse package registration)
@@ -258,7 +258,7 @@ def main():
     /// <summary>
     /// Helper method to run dotnet commands
     /// </summary>
-    private async Task<(int ExitCode, string Output, string Error)> RunDotnetCommandAsync(
+    private static async Task<(int ExitCode, string Output, string Error)> RunDotnetCommandAsync(
         DirectoryInfo workingDirectory, 
         string arguments)
     {