Migrate to MTP and latest xunit.v3

.github/workflows/Steeltoe.All.yml

@@ -21,8 +21,8 @@ env:
   DOTNET_NOLOGO: true
   SOLUTION_FILE: 'src/Steeltoe.All.sln'
   COMMON_TEST_ARGS: >-
-    --no-build --configuration Release --collect "XPlat Code Coverage" --logger trx --results-directory ${{ github.workspace }}/dumps
-    --settings coverlet.runsettings --blame-crash --blame-hang-timeout 3m
+    --no-build --configuration Release --coverage --report-trx --results-directory ${{ github.workspace }}/dumps
+    --coverage-settings coverage.config --crashdump --hangdump --hangdump-timeout 3m
 
 jobs:
   analyze:
@@ -36,9 +36,9 @@ jobs:
         - os: ubuntu-latest
           runDockerContainers: true
         - os: windows-latest
-          skipFilter: Category!=Integration
+          skipFilter: '--filter-not-trait "Category=Integration"'
         - os: macos-latest
-          skipFilter: Category!=Integration&Category!=SkipOnMacOS
+          skipFilter: '--filter-not-trait "Category=Integration" --filter-not-trait "Category=SkipOnMacOS"'
     runs-on: ${{ matrix.os }}
     continue-on-error: true
 
@@ -82,6 +82,10 @@ jobs:
       with:
         persist-credentials: false
 
+    - uses: actions/setup-dotnet@v5
+      with:
+        global-json-file: global.json
+
     - name: Restore packages
       run: dotnet restore ${{ env.SOLUTION_FILE }} /p:Configuration=Release --verbosity minimal
 
@@ -91,20 +95,20 @@ jobs:
     - name: Set skip filters for tests
       shell: bash
       run: |
-        echo SKIP_FILTER_NO_MEMORY_DUMPS="${{ matrix.skipFilter && format('{0}&Category!=MemoryDumps', matrix.skipFilter) || 'Category!=MemoryDumps' }}" >> $GITHUB_ENV
-        echo SKIP_FILTER_WITH_MEMORY_DUMPS="${{ matrix.skipFilter && format('{0}&Category=MemoryDumps', matrix.skipFilter) || 'Category=MemoryDumps' }}" >> $GITHUB_ENV
+        echo SKIP_FILTER_NO_MEMORY_DUMPS="${{ matrix.skipFilter && format('{0} --filter-not-trait Category=MemoryDumps', matrix.skipFilter) || '--filter-not-trait Category=MemoryDumps' }}" >> $GITHUB_ENV
+        echo SKIP_FILTER_WITH_MEMORY_DUMPS="${{ matrix.skipFilter && format('{0} --filter-trait Category=MemoryDumps', matrix.skipFilter) || '--filter-trait Category=MemoryDumps' }}" >> $GITHUB_ENV
 
     - name: Test (net8.0)
-      run: dotnet test ${{ env.SOLUTION_FILE }} --framework net8.0 --filter "${{ env.SKIP_FILTER_NO_MEMORY_DUMPS }}" ${{ env.COMMON_TEST_ARGS }}
+      run: dotnet test ${{ env.SOLUTION_FILE }} --framework net8.0 ${{ env.SKIP_FILTER_NO_MEMORY_DUMPS }} ${{ env.COMMON_TEST_ARGS }}
 
     - name: Test (net8.0) (memory dumps)
-      run: dotnet test ${{ env.SOLUTION_FILE }} --framework net8.0 --filter "${{ env.SKIP_FILTER_WITH_MEMORY_DUMPS }}" ${{ env.COMMON_TEST_ARGS }}
+      run: dotnet test ${{ env.SOLUTION_FILE }} --framework net8.0 ${{ env.SKIP_FILTER_WITH_MEMORY_DUMPS }} ${{ env.COMMON_TEST_ARGS }}
 
     - name: Test (net9.0)
-      run: dotnet test ${{ env.SOLUTION_FILE }} --framework net9.0 --filter "${{ env.SKIP_FILTER_NO_MEMORY_DUMPS }}" ${{ env.COMMON_TEST_ARGS }}
+      run: dotnet test ${{ env.SOLUTION_FILE }} --framework net9.0 ${{ env.SKIP_FILTER_NO_MEMORY_DUMPS }} ${{ env.COMMON_TEST_ARGS }}
 
     - name: Test (net9.0) (memory dumps)
-      run: dotnet test ${{ env.SOLUTION_FILE }} --framework net9.0 --filter "${{ env.SKIP_FILTER_WITH_MEMORY_DUMPS }}" ${{ env.COMMON_TEST_ARGS }}
+      run: dotnet test ${{ env.SOLUTION_FILE }} --framework net9.0 ${{ env.SKIP_FILTER_WITH_MEMORY_DUMPS }} ${{ env.COMMON_TEST_ARGS }}
 
     - name: Upload crash/hang dumps (on failure)
       if: ${{ failure() }}

.github/workflows/component-management.yml

@@ -31,7 +31,7 @@ jobs:
     with:
       component: Management
       OS: macos
-      skipFilter: Category!=SkipOnMacOS
+      skipFilter: '--filter-not-trait Category=SkipOnMacOS'
 
   windows:
     uses: ./.github/workflows/component-shared-workflow.yml

.github/workflows/component-shared-workflow.yml

@@ -26,12 +26,12 @@ env:
   DOTNET_NOLOGO: true
   SOLUTION_FILE: src/Steeltoe.${{ inputs.component }}.slnf
   COMMON_TEST_ARGS: >-
-    --no-build --configuration Release --collect "XPlat Code Coverage" --logger trx --results-directory ${{ github.workspace }}/dumps
-    --settings coverlet.runsettings --blame-crash --blame-hang-timeout 3m
+    --no-build --configuration Release --coverage --report-trx --results-directory ${{ github.workspace }}/dumps
+    --coverage-settings coverage.config --crashdump --hangdump --hangdump-timeout 3m
   SKIP_FILTER_NO_MEMORY_DUMPS: >-
-    ${{ inputs.skipFilter && format('--filter "{0}&Category!=MemoryDumps"', inputs.skipFilter) || '--filter "Category!=MemoryDumps"' }}
+    ${{ inputs.skipFilter && format('{0} --filter-not-trait "Category=MemoryDumps"', inputs.skipFilter) || '--filter-not-trait "Category=MemoryDumps"' }}
   SKIP_FILTER_WITH_MEMORY_DUMPS: >-
-    ${{ inputs.skipFilter && format('--filter "{0}&Category=MemoryDumps"', inputs.skipFilter) || '--filter "Category=MemoryDumps"' }}
+    ${{ inputs.skipFilter && format('{0} --filter-trait "Category=MemoryDumps"', inputs.skipFilter) || '--filter-trait "Category=MemoryDumps"' }}
 
 jobs:
   build:
@@ -79,6 +79,10 @@ jobs:
       with:
         persist-credentials: false
 
+    - uses: actions/setup-dotnet@v5
+      with:
+        global-json-file: global.json
+
     - name: Restore packages
       run: dotnet restore ${{ env.SOLUTION_FILE }} /p:Configuration=Release --verbosity minimal
 

.github/workflows/package.yml

@@ -43,6 +43,10 @@ jobs:
       with:
         persist-credentials: false
 
+    - uses: actions/setup-dotnet@v5
+      with:
+        global-json-file: global.json
+
     - name: Restore packages
       run: dotnet restore ${{ env.SOLUTION_FILE }} /p:Configuration=Release --verbosity minimal
 

.github/workflows/scan-vulnerable-dependencies.yml

@@ -28,11 +28,9 @@ jobs:
 
     steps:
     - name: Setup .NET
-      uses: actions/setup-dotnet@v4
+      uses: actions/setup-dotnet@v5
       with:
-        dotnet-version: |
-          8.0.*
-          9.0.*
+        global-json-file: global.json
 
     - name: Git checkout
       uses: actions/checkout@v4

.github/workflows/sonarcube.yml

@@ -22,8 +22,8 @@ env:
   DOTNET_NOLOGO: true
   SOLUTION_FILE: 'src/Steeltoe.All.sln'
   SONAR_TEST_ARGS: >-
-    --no-build --configuration Release --collect "XPlat Code Coverage" --logger trx --results-directory ${{ github.workspace }}
-    --settings coverlet.runsettings -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.UseSourceLink=false
+    --no-build --configuration Release --coverage --report-trx --results-directory ${{ github.workspace }}
+    --coverage-settings coverage.config
 
 jobs:
   analyze:
@@ -64,6 +64,10 @@ jobs:
         # Sonar: Shallow clones should be disabled for a better relevancy of analysis.
         fetch-depth: 0
 
+    - uses: actions/setup-dotnet@v5
+      with:
+        global-json-file: global.json
+
     - name: Restore packages
       run: dotnet restore ${{ env.SOLUTION_FILE }} /p:Configuration=Release --verbosity minimal
 
@@ -79,16 +83,16 @@ jobs:
       run: dotnet build ${{ env.SOLUTION_FILE }} --no-restore --configuration Release --verbosity minimal
 
     - name: Test (net8.0)
-      run: dotnet test ${{ env.SOLUTION_FILE }} --filter "Category!=MemoryDumps" --framework net8.0 ${{ env.SONAR_TEST_ARGS }}
+      run: dotnet test ${{ env.SOLUTION_FILE }} --filter-not-trait "Category=MemoryDumps" --framework net8.0 ${{ env.SONAR_TEST_ARGS }}
 
     - name: Test (net8.0) (memory dumps)
-      run: dotnet test ${{ env.SOLUTION_FILE }} --filter "Category=MemoryDumps" --framework net8.0 ${{ env.SONAR_TEST_ARGS }}
+      run: dotnet test ${{ env.SOLUTION_FILE }} --filter-trait "Category=MemoryDumps" --framework net8.0 ${{ env.SONAR_TEST_ARGS }}
 
     - name: Test (net9.0)
-      run: dotnet test ${{ env.SOLUTION_FILE }} --filter "Category!=MemoryDumps" --framework net9.0  ${{ env.SONAR_TEST_ARGS }}
+      run: dotnet test ${{ env.SOLUTION_FILE }} --filter-not-trait "Category=MemoryDumps" --framework net9.0  ${{ env.SONAR_TEST_ARGS }}
 
     - name: Test (net9.0) (memory dumps)
-      run: dotnet test ${{ env.SOLUTION_FILE }} --filter "Category=MemoryDumps" --framework net9.0  ${{ env.SONAR_TEST_ARGS }}
+      run: dotnet test ${{ env.SOLUTION_FILE }} --filter-trait "Category=MemoryDumps" --framework net9.0  ${{ env.SONAR_TEST_ARGS }}
 
     - name: End Sonar .NET scanner
       if: ${{ !cancelled() && steps.sonar_begin.outcome == 'success' }}

.github/workflows/verify-code-style.yml

@@ -39,6 +39,10 @@ jobs:
         persist-credentials: false
         fetch-depth: 2
 
+    - uses: actions/setup-dotnet@v5
+      with:
+        global-json-file: global.json
+
     - name: Restore tools
       run: dotnet tool restore --verbosity minimal
 

coverage.config

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Configuration>
+  <Format>coverage</Format>
+  <CodeCoverage>
+    <EnableDynamicNativeInstrumentation>False</EnableDynamicNativeInstrumentation>
+    <EnableStaticNativeInstrumentation>True</EnableStaticNativeInstrumentation>
+    <ModulePaths>
+      <Exclude>
+        <ModulePath>.*ConfigurationSchemaGenerator.*</ModulePath>
+      </Exclude>
+    </ModulePaths>
+    <Attributes>
+      <Exclude>
+        <Attribute>^System\.ObsoleteAttribute$</Attribute>
+        <Attribute>^System\.CodeDom\.Compiler\.GeneratedCodeAttribute$</Attribute>
+        <Attribute>^System\.Runtime\.CompilerServices\.CompilerGeneratedAttribute$</Attribute>
+        <Attribute>^System\.Diagnostics\.CodeAnalysis\.ExcludeFromCodeCoverageAttribute$</Attribute>
+      </Exclude>
+    </Attributes>
+    <Sources>
+      <Exclude>
+        <Source>.*\\test\\.*</Source>
+      </Exclude>
+    </Sources>
+  </CodeCoverage>
+</Configuration>

global.json

@@ -0,0 +1,8 @@
+{
+    "sdk": {
+        "version": "10.0.100"
+    },
+    "test": {
+        "runner": "Microsoft.Testing.Platform"
+    }
+}

shared-test.props

@@ -7,21 +7,24 @@
   <PropertyGroup>
     <!-- https://github.com/xunit/xunit/issues/3238#issuecomment-2770720936 -->
     <TestTfmsInParallel>false</TestTfmsInParallel>
-    <DisableTestingPlatformServerCapability>true</DisableTestingPlatformServerCapability>
+    <UseMicrosoftTestingPlatformRunner>true</UseMicrosoftTestingPlatformRunner>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="$(MSBuildThisFileDirectory)\src\Common\test\TestResources\Steeltoe.Common.TestResources.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="$(CoverletVersion)" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" Version="$(MicrosoftTestingExtensionsCodeCoverageVersion)" />
+    <PackageReference Include="Microsoft.Testing.Extensions.TrxReport" Version="$(MicrosoftTestingPlatformVersion)" />
+    <PackageReference Include="Microsoft.Testing.Extensions.HangDump" Version="$(MicrosoftTestingPlatformVersion)" />
+    <PackageReference Include="Microsoft.Testing.Extensions.CrashDump" Version="$(MicrosoftTestingPlatformVersion)" />
     <PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="$(MatchTargetFrameworkVersion)" />
     <PackageReference Include="Microsoft.Extensions.TimeProvider.Testing" Version="$(FoundationalVersion)" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
     <PackageReference Include="Moq" Version="$(MoqVersion)" />
-    <PackageReference Include="xunit.v3" Version="$(XunitVersion)" />
+    <PackageReference Include="xunit.v3.mtp-v2" Version="$(XunitVersion)" />
     <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitVisualStudioVersion)" />
   </ItemGroup>
 

src/Configuration/src/Abstractions/CompositeConfigurationProvider.cs

@@ -97,10 +97,7 @@
 
         LogSet(GetType().Name, key, value);
 
-        if (ConfigurationRoot != null)
-        {
-            ConfigurationRoot[key] = value;
-        }
+        ConfigurationRoot?[key] = value;
     }
 
     public void Dispose()

src/Steeltoe.All.sln

@@ -29,7 +29,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_shared", "_shared", "{DC1B
 		..\.gitattributes = ..\.gitattributes
 		..\.gitignore = ..\.gitignore
 		..\cleanupcode.ps1 = ..\cleanupcode.ps1
-		..\coverlet.runsettings = ..\coverlet.runsettings
+		..\coverage.config = ..\coverage.config
 		..\Directory.Build.targets = ..\Directory.Build.targets
 		..\nuget.config = ..\nuget.config
 		..\PackageReadme.md = ..\PackageReadme.md

src/Tools/test/ConfigurationSchemaGenerator.Tests/ConfigurationSchemaGenerator.Tests.csproj

@@ -23,11 +23,14 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="$(CoverletVersion)" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" Version="$(MicrosoftTestingExtensionsCodeCoverageVersion)" />
+    <PackageReference Include="Microsoft.Testing.Extensions.TrxReport" Version="$(MicrosoftTestingPlatformVersion)" />
+    <PackageReference Include="Microsoft.Testing.Extensions.HangDump" Version="$(MicrosoftTestingPlatformVersion)" />
+    <PackageReference Include="Microsoft.Testing.Extensions.CrashDump" Version="$(MicrosoftTestingPlatformVersion)" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="$(FoundationalVersion)" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
     <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
-    <PackageReference Include="xunit.v3" Version="$(XunitVersion)" />
+    <PackageReference Include="xunit.v3.mtp-v2" Version="$(XunitVersion)" />
     <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitVisualStudioVersion)" />
   </ItemGroup>
 

versions.props

@@ -6,7 +6,8 @@
     -->
 
     <AspNetCoreHealthChecksVersion>9.0.*</AspNetCoreHealthChecksVersion>
-    <CoverletVersion>6.0.*</CoverletVersion>
+    <MicrosoftTestingExtensionsCodeCoverageVersion>18.1.*</MicrosoftTestingExtensionsCodeCoverageVersion>
+    <MicrosoftTestingPlatformVersion>2.0.*</MicrosoftTestingPlatformVersion>
     <FluentAssertionsVersion>7.2.*</FluentAssertionsVersion>
     <MicrosoftAzureCosmosVersion>3.51.*</MicrosoftAzureCosmosVersion>
     <MicrosoftCodeAnalysisVersion>4.14.*</MicrosoftCodeAnalysisVersion>
@@ -27,7 +28,7 @@
     <SystemIdentityModelVersion>8.12.*</SystemIdentityModelVersion>
     <SystemSqlClientVersion>4.9.*</SystemSqlClientVersion>
     <TestSdkVersion>18.0.*</TestSdkVersion>
-    <XunitVersion>2.0.*</XunitVersion>
+    <XunitVersion>3.2.*</XunitVersion>
     <XunitVisualStudioVersion>3.1.*</XunitVisualStudioVersion>
   </PropertyGroup>