Fixed coverage

Kralizek · Kralizek · commit 99c581a4d949 · 2025-10-30T14:02:05.000+01:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -42,7 +42,9 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v4
         with:
-          global-json-file: global.json
+          dotnet-version: |
+            8.0.x
+            9.0.x
       
       - name: Install tools
         run: |
@@ -73,13 +75,7 @@ jobs:
         run: dotnet build --no-restore --configuration Release -warnaserror
       
       - name: Test
-        run: |
-          dotnet test --no-build --configuration Release --verbosity normal \
-            --filter "TestCategory!=External" \
-            --logger "junit;LogFilePath=$GITHUB_WORKSPACE/outputs/tests/{assembly}/TestResults.xml;MethodFormat=Full" \
-            --logger "GitHubActions" \
-            --collect:"XPlat Code Coverage" \
-            --results-directory "$GITHUB_WORKSPACE/outputs/coverage"
+        run: dotnet test --no-build --verbosity normal --logger "junit;LogFilePath=$GITHUB_WORKSPACE/outputs/test-results/{assembly}.xml;MethodFormat=Full" --logger "GitHubActions" --no-build --no-restore --collect:"XPlat Code Coverage" --results-directory "$GITHUB_WORKSPACE/outputs/coverage"
 
       - name: Merge coverage reports
         run: |
@@ -103,7 +99,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: test-results
-          path: outputs/tests/**/TestResults.xml
+          path: outputs/test-results/**/*.xml
         continue-on-error: true
         
       - name: Upload coverage report
@@ -120,6 +116,8 @@ jobs:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           file: outputs/coverage/cobertura.xml
           format: cobertura
+          base-path: ${{ github.workspace }}
+          flag-name: ubuntu-latest
         continue-on-error: true
 
   publish:
@@ -135,7 +133,9 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:
-        global-json-file: global.json
+        dotnet-version: |
+          8.0.x
+          9.0.x
     
     - name: Install tools
       run: |
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.100",
+    "version": "9.0.300",
     "rollForward": "latestMinor"
   }
 }
diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
@@ -12,7 +12,7 @@
     <PackageReference Include="NUnit.Analyzers" Version="3.10.0" />
     
     <!-- Test loggers for GitHub Actions integration -->
-    <PackageReference Include="JUnitTestLogger" Version="1.1.0" />
+    <PackageReference Include="JunitXml.TestLogger" Version="7.0.2" />
     <PackageReference Include="GitHubActionsTestLogger" Version="2.4.1" />
   </ItemGroup>
 
diff --git a/tests/Tests.AspNetCore.RazorPages/Tests.AspNetCore.RazorPages.csproj b/tests/Tests.AspNetCore.RazorPages/Tests.AspNetCore.RazorPages.csproj
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="6.0.0" />
+    <PackageReference Include="coverlet.collector" Version="6.0.2" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageReference Include="NUnit" Version="3.14.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
diff --git a/tests/Tests.AspNetCore.WebApplicationFactory/Tests.AspNetCore.WebApplicationFactory.csproj b/tests/Tests.AspNetCore.WebApplicationFactory/Tests.AspNetCore.WebApplicationFactory.csproj
@@ -10,6 +10,7 @@
     <PackageReference Include="NUnit" Version="3.14.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="coverlet.collector" Version="6.0.2" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/tests/Tests.Grpc.Integration.Client/Tests.Grpc.Integration.Client.csproj b/tests/Tests.Grpc.Integration.Client/Tests.Grpc.Integration.Client.csproj
@@ -10,6 +10,7 @@
     <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
     <PackageReference Include="System.Linq.Async" Version="6.0.1" />
+    <PackageReference Include="coverlet.collector" Version="6.0.2" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/tests/Tests.Grpc.Integration.Service/Tests.Grpc.Integration.Service.csproj b/tests/Tests.Grpc.Integration.Service/Tests.Grpc.Integration.Service.csproj
@@ -9,6 +9,7 @@
     <PackageReference Include="NUnit" Version="3.14.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="coverlet.collector" Version="6.0.2" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/tests/Tests.Grpc/Tests.Grpc.csproj b/tests/Tests.Grpc/Tests.Grpc.csproj
@@ -10,6 +10,7 @@
     <PackageReference Include="NUnit" Version="3.14.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="coverlet.collector" Version="6.0.2" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/tests/Tests.MockHttp/Tests.MockHttp.csproj b/tests/Tests.MockHttp/Tests.MockHttp.csproj
@@ -9,6 +9,7 @@
     <PackageReference Include="NUnit" Version="3.14.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="coverlet.collector" Version="6.0.2" />
   </ItemGroup>
 
   <ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"sdk": {`
`3`		`- "version": "8.0.100",`
	`3`	`+ "version": "9.0.300",`
`4`	`4`	`"rollForward": "latestMinor"`
`5`	`5`	`}`
`6`	`6`	`}`