ci(unit-tests): Align build target, structure results, and upload coverage

Author: arturcic

.github/workflows/_unit_tests.yml

@@ -11,8 +11,8 @@ env:
 jobs:
   unit_test:
     name: ${{ matrix.os }} - net${{ matrix.dotnet_version }}
-    env:
-      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+    permissions:
+      id-token: write
     strategy:
       fail-fast: false
       matrix:
@@ -30,18 +30,27 @@ jobs:
       name: Restore State
       uses: ./.github/actions/cache-restore
 
-    - name: '[Unit Test]'
+    -
+      name: '[Unit Test]'
       uses: nick-fields/retry@v3
       with:
         shell: pwsh
         timeout_minutes: 30
         max_attempts: 3
         retry_on: error
-        command: 'dotnet run/build.dll --target=Test --dotnet_version=${{ matrix.dotnet_version }}'
+        command: 'dotnet run/build.dll --target=UnitTest --dotnet_version=${{ matrix.dotnet_version }}'
 
     -
       name: Test Summary
       uses: test-summary/action@v2.4
       if: always() && matrix.dotnet_version == '10.0'
       with:
-        paths: artifacts/test-results/*.results.xml
+        paths: artifacts/test-results/**/results.xml
+
+    -
+      name: Upload Coverage
+      uses: codecov/codecov-action@v5
+      if: success() && github.event_name != 'pull_request' && github.repository_owner == 'GitTools' && github.ref_name == 'main' && matrix.dotnet_version == '10.0'
+      with:
+        directory: artifacts/test-results
+        use_oidc: true

build/build/Tasks/Test/UnitTest.cs

@@ -1,6 +1,4 @@
-using Cake.Common.Build.AzurePipelines.Data;
 using Cake.Common.Tools.DotNet.Test;
-using Cake.Coverlet;
 using Cake.Incubator.LoggingExtensions;
 using Common.Utilities;
 
@@ -49,24 +47,10 @@ public override void OnError(Exception exception, BuildContext context)
         throw exception;
     }
 
-    public override void Finally(BuildContext context)
-    {
-        var testResultsFiles = context.GetFiles($"{Paths.TestOutput}/*.results.xml");
-        if (!context.IsAzurePipelineBuild || testResultsFiles.Count == 0) return;
-
-        var data = new AzurePipelinesPublishTestResultsData
-        {
-            TestResultsFiles = testResultsFiles.ToArray(),
-            Platform = context.Platform.ToString(),
-            TestRunner = AzurePipelinesTestRunnerType.JUnit
-        };
-        context.BuildSystem().AzurePipelines.Commands.PublishTestResults(data);
-    }
-
     private static void TestProjectForTarget(BuildContext context, FilePath project, string framework)
     {
         var testResultsPath = Paths.TestOutput;
-        var projectName = $"{project.GetFilenameWithoutExtension()}.net{framework}";
+        var projectName = $"{project.GetFilenameWithoutExtension()}";
         var settings = new DotNetTestSettings
         {
             PathType = DotNetTestPathType.Project,
@@ -78,14 +62,16 @@ private static void TestProjectForTarget(BuildContext context, FilePath project,
         };
         settings.MSBuildSettings.SetContinuousIntegrationBuild(false);
 
-        var resultsPath = context.MakeAbsolute(testResultsPath.CombineWithFilePath($"{projectName}.results.xml"));
+        var resultsDirectory = context.MakeAbsolute(testResultsPath.Combine(projectName));
+
         settings.WithArgumentCustomization(args => args
             .Append("--report-spekt-junit")
-            .Append("--report-spekt-junit-filename").AppendQuoted(resultsPath.FullPath)
+            .Append("--report-spekt-junit-filename").AppendQuoted(resultsDirectory.CombineWithFilePath("results.xml").FullPath)
+            .Append("--results-directory").AppendQuoted(resultsDirectory.FullPath)
             .Append("--coverlet")
             .Append("--coverlet-output-format").AppendQuoted("cobertura")
-            .Append("--coverlet-exclude ").AppendQuoted("[GitVersion*.Tests]*")
-            .Append("--coverlet-exclude ").AppendQuoted("[GitTools.Testing]*")
+            .Append("--coverlet-exclude").AppendQuoted("[GitVersion*.Tests]*")
+            .Append("--coverlet-exclude").AppendQuoted("[GitTools.Testing]*")
         );
 
         context.DotNetTest(project.FullPath, settings);