[CORELIB-342] Switch to XUnit v3 and MTP

Author: marcin-dardzinski

.config/dotnet-tools.json

@@ -8,6 +8,13 @@
         "csharpier"
       ],
       "rollForward": false
+    },
+    "dotnet-coverage": {
+      "version": "18.1.0",
+      "commands": [
+        "dotnet-coverage"
+      ],
+      "rollForward": false
     }
   }
 }

.github/workflows/ci.yml

@@ -12,13 +12,17 @@ jobs:
     env:
       DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
       DOTNET_CLI_TELEMETRY_OPTOUT: 1
+    permissions:
+      contents: read
+      checks: write
+      pull-requests: write
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           lfs: true
       - name: Setup .NET SDK
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
             8.0.x
@@ -31,44 +35,39 @@ jobs:
       - name: Check formatting
         run: dotnet tool run csharpier -- check .
       - name: Build
-        run: dotnet build --framework net${{ matrix.dotnet }}
+        run: dotnet build --framework net${{ matrix.dotnet }} --no-restore
       - name: Test
-        run: dotnet test --no-build --collect "XPlat Code Coverage" --settings coverlet.runsettings --logger trx --framework net${{ matrix.dotnet }}
+        run: >
+          dotnet test
+          --project src/LeanCode.ContractsGenerator.Tests/LeanCode.ContractsGenerator.Tests.csproj
+          --no-build
+          --framework net${{ matrix.dotnet }}
+      - name: Process test results
+        if: always()
+        run: |
+          # Strip BOM from JSON files
+          find TestResults -name '*.json' | xargs -n 1 sed -i "$(printf '1s/^\357\273\277//')"
+          # Merge coverage XML files
+          dotnet tool run dotnet-coverage merge TestResults/*.xml -o TestResults/cobertura.xml -f cobertura
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v5
         with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          files: TestResults/cobertura.xml
           flags: net${{ matrix.dotnet }}
+          fail_ci_if_error: false
         if: always()
-      - name: Upload Test Results
+      - name: Publish test report
+        uses: ctrf-io/github-test-reporter@v1
         if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: test_results_${{ matrix.dotnet }}.zip
-          path: TestResults/*.trx
-
-  publish-test-results:
-    name: "Publish Tests Results"
-    needs: ci
-    runs-on: ubuntu-latest
-    permissions:
-      checks: write
-      pull-requests: write
-    if: always()
-    steps:
-      - name: Download Artifacts
-        uses: actions/download-artifact@v4
-        with:
-          path: artifacts
-      - name: Extract Artifacts
-        run: |
-          for file in artifacts/*.zip; do
-            if [[ -f "$file" ]]; then
-              dir="${file%.zip}"
-              mkdir -p "$dir"
-              unzip -d "$dir" "$file"
-            fi
-          done
-      - name: Publish Test Results
-        uses: EnricoMi/publish-unit-test-result-action@v2
         with:
-          trx_files: "artifacts/*/**/*.trx"
+          report-path: 'TestResults/*.json'
+          summary-report: true
+          failed-folded-report: true
+          skipped-report: true
+          annotate: true
+          pull-request: true
+          overwrite-comment: true
+          comment-tag: 'net${{ matrix.dotnet }}'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

@@ -14,13 +14,13 @@ jobs:
     steps:
       - name: Get the version
         id: get_version
-        run: echo ::set-output name=version::$(echo $GITHUB_REF | cut -d / -f 3 | cut -c2-)
+        run: echo "version=$(echo $GITHUB_REF | cut -d / -f 3 | cut -c2-)" >> $GITHUB_OUTPUT
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           lfs: true
       - name: Setup .NET SDK
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
             8.0.x
@@ -35,7 +35,11 @@ jobs:
       - name: Test
         env:
           BUILD_VERSION: ${{ steps.get_version.outputs.version }}
-        run: dotnet test --no-build --configuration Release
+        run: >
+          dotnet test
+          --project src/LeanCode.ContractsGenerator.Tests/LeanCode.ContractsGenerator.Tests.csproj
+          --no-build
+          --configuration Release
       - name: Publish
         env:
           BUILD_VERSION: ${{ steps.get_version.outputs.version }}

Directory.Build.targets

@@ -37,12 +37,10 @@
     <PackageReference Include="LeanCode.CodeAnalysis" Version="$(LncdCaVer)" PrivateAssets="all" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Update="Microsoft.NET.Test.Sdk" Version="18.0.1" />
-    <PackageReference Update="xunit" Version="2.9.3" />
-    <PackageReference Update="xunit.analyzers" Version="1.21.0" />
-    <PackageReference Update="xunit.runner.visualstudio" Version="3.1.0" />
+    <PackageReference Update="Microsoft.Testing.Extensions.CodeCoverage" Version="18.1.0" />
+    <PackageReference Update="xunit.v3.mtp-v2" Version="3.2.0" />
+    <PackageReference Update="xunit.analyzers" Version="1.25.0" />
     <PackageReference Update="FluentAssertions" Version="7.2.0" />
-    <PackageReference Update="coverlet.collector" Version="6.0.4" />
     <!-- Use latest NuGet.Frameworks available at build time for tests
          to make sure we don't reference anything older than what current MSBuild uses -->
     <PackageReference Update="NuGet.Frameworks" Version="*" />

coverlet.runsettings

@@ -3,5 +3,8 @@
     "version": "10.0.100",
     "allowPrerelease": true,
     "rollForward": "latestMajor"
+  },
+  "test": {
+    "runner": "Microsoft.Testing.Platform"
   }
 }

global.json

@@ -3,6 +3,12 @@
     <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <IsPackable>false</IsPackable>
+    <OutputType>Exe</OutputType>
+  </PropertyGroup>
+  <PropertyGroup>
+    <TestingPlatformDotnetTestSupport>true</TestingPlatformDotnetTestSupport>
+    <UseMicrosoftTestingPlatformRunner>true</UseMicrosoftTestingPlatformRunner>
+    <TestingPlatformCommandLineArguments>$(TestingPlatformCommandLineArguments) --report-ctrf --coverage --ignore-exit-code 8 --results-directory $(MSBuildThisFileDirectory)/../../TestResults --coverage-output-format cobertura --report-ctrf-filename $(MSBuildProjectName)-$([System.DateTime]::Now.ToString("HH-mm-ss")).json --coverage-output $(MSBuildProjectName)-$([System.DateTime]::Now.ToString("HH-mm-ss")).xml</TestingPlatformCommandLineArguments>
   </PropertyGroup>
   <Target Name="PackDependenciesForTests" BeforeTargets="AfterBuild">
     <Message Text="Packing the LeanCode.Contracts" Importance="high" />
@@ -28,18 +34,10 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="xunit" />
+    <PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" />
+    <PackageReference Include="xunit.v3.mtp-v2" />
     <PackageReference Include="xunit.analyzers" />
-    <PackageReference Include="xunit.runner.visualstudio">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
     <PackageReference Include="FluentAssertions" />
-    <PackageReference Include="coverlet.collector">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
     <!-- workaround for MSBuild trying to load multiple versions of this package into the process -->
     <PackageReference Include="NuGet.Frameworks" PrivateAssets="all" />
   </ItemGroup>