test: Upgrade to xUnit v3 and mtp v2

.github/workflows/ci.yml

@@ -48,7 +48,7 @@ jobs:
         run: dotnet build -c Release --no-restore
 
       - name: Test
-        run: dotnet test -c Release --no-build --logger GitHubActions
+        run: dotnet test -c Release --no-build --report-github --ignore-exit-code 8
 
       - name: aot-publish test
         run: |

.github/workflows/code-coverage.yml

@@ -40,15 +40,15 @@ jobs:
             ${{ runner.os }}-nuget-
 
       - name: Run Test
-        run: dotnet test --verbosity normal --collect:"XPlat Code Coverage" -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Format=opencover
+        run: dotnet test --coverlet --coverlet-output-format opencover --coverlet-exclude "[GitHubActionsTestLogger*]*" --ignore-exit-code 8
 
       # Keep globbing on non-Windows runners (works today)
       - name: Upload coverage to Codecov (non-Windows)
         if: runner.os != 'Windows'
         uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v6.0.0
         with:
           name: Code Coverage for ${{ matrix.os }}
-          files: "**/TestResults/**/coverage.opencover.xml"
+          files: "**/TestResults/**/coverage.opencover.*.xml"
           disable_search: true
           fail_ci_if_error: true
           verbose: true
@@ -59,9 +59,9 @@ jobs:
         if: runner.os == 'Windows'
         shell: pwsh
         run: |
-          $files = Get-ChildItem -Path "$PWD" -Recurse -Filter "coverage.opencover.xml" | ForEach-Object { $_.FullName }
+          $files = Get-ChildItem -Path "$PWD" -Recurse -Filter "coverage.opencover.*.xml" | ForEach-Object { $_.FullName }
           if (-not $files -or $files.Count -eq 0) {
-            throw "No coverage.opencover.xml files were found under the repository."
+            throw "No coverage.opencover.*.xml files were found under the repository."
           }
 
           # Codecov accepts comma-separated file paths

.github/workflows/e2e.yml

@@ -40,4 +40,4 @@ jobs:
           cp spec/specification/assets/gherkin/*.feature test/OpenFeature.E2ETests/Features/
 
       - name: Run Tests
-        run: dotnet test test/OpenFeature.E2ETests/ --configuration Release --logger GitHubActions
+        run: dotnet test test/OpenFeature.E2ETests/ --configuration Release --report-github

CONTRIBUTING.md

@@ -84,7 +84,7 @@ dotnet test test/OpenFeature.Tests/
 To run unit tests with code coverage execute:
 
 ```bash
-dotnet test test/OpenFeature.Tests/ --collect:"XPlat Code Coverage"
+dotnet test test/OpenFeature.Tests/ --coverlet --coverlet-output-format opencover
 ```
 
 #### E2E tests

Directory.Packages.props

@@ -7,8 +7,7 @@
   <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible($(TargetFramework), 'net9.0'))">
     <MicrosoftExtensionsVersion>9.0.0</MicrosoftExtensionsVersion>
   </PropertyGroup>
-  <PropertyGroup
-    Condition="$([MSBuild]::IsTargetFrameworkCompatible($(TargetFramework), 'net10.0'))">
+  <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible($(TargetFramework), 'net10.0'))">
     <MicrosoftExtensionsVersion>10.0.0</MicrosoftExtensionsVersion>
   </PropertyGroup>
 
@@ -35,17 +34,17 @@
   <ItemGroup Label="test">
     <PackageVersion Include="AutoFixture" Version="5.0.0-preview0012" />
     <PackageVersion Include="BenchmarkDotNet" Version="0.15.8" />
-    <PackageVersion Include="coverlet.collector" Version="10.0.0" />
+    <PackageVersion Include="coverlet.MTP" Version="10.0.1" />
     <PackageVersion Include="GitHubActionsTestLogger" Version="3.0.4" />
     <PackageVersion Include="Microsoft.Extensions.Diagnostics.Testing" Version="10.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Hosting" Version="$(MicrosoftExtensionsVersion)" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.5.1" />
     <PackageVersion Include="NSubstitute" Version="5.3.0" />
     <PackageVersion Include="OpenTelemetry" Version="1.15.3" />
     <PackageVersion Include="OpenTelemetry.Exporter.InMemory" Version="1.15.3" />
-    <PackageVersion Include="Reqnroll.xUnit" Version="3.3.4" />
-    <PackageVersion Include="xunit" Version="2.9.3" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
+    <PackageVersion Include="Reqnroll.xunit.v3" Version="3.3.4" />
+    <PackageVersion Include="xunit.v3.mtp-v2" Version="3.2.2" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
@@ -64,4 +63,4 @@
     <PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" />
   </ItemGroup>
 
-</Project>
+</Project>

global.json

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

test/Directory.Build.props

@@ -2,6 +2,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'OpenFeature.slnx'))\build\Common.tests.props" />
   <PropertyGroup>
     <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
-    <TargetFrameworks Condition="$(OS) == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
+    <TargetFrameworks Condition="$(OS) == 'Windows_NT'">$(TargetFrameworks);net472</TargetFrameworks>
   </PropertyGroup>
 </Project>

test/OpenFeature.E2ETests/OpenFeature.E2ETests.csproj

@@ -2,24 +2,20 @@
 
   <PropertyGroup>
     <RootNamespace>OpenFeature.E2ETests</RootNamespace>
+    <OutputType>Exe</OutputType>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="AutoFixture" />
-    <PackageReference Include="coverlet.collector">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Reqnroll.xUnit" />
+    <PackageReference Include="coverlet.MTP" />
+    <PackageReference Include="Reqnroll.xUnit.v3" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="NSubstitute" />
-    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.v3.mtp-v2" />
     <PackageReference Include="xunit.runner.visualstudio">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <!-- Reqnroll 3.2.0 requires System.Threading.Channels >= 9.0.6 -->
-    <PackageVersion Update="System.Threading.Channels" Version="9.0.6" />
   </ItemGroup>
 
   <ItemGroup>

test/OpenFeature.E2ETests/Steps/ExcludedTagsStep.cs

@@ -11,6 +11,6 @@ public class ExcludedTagsStep
     [BeforeScenario]
     public static void BeforeScenario()
     {
-        Skip.If(true, "Tag is not supported");
+        Assert.SkipWhen(true, "Tag is not supported");
     }
 }

test/OpenFeature.Hosting.Tests/Internal/FeatureLifecycleManagerTests.cs

@@ -26,7 +26,7 @@ public async Task EnsureInitializedAsync_SetsProvider()
         // Act
         using var serviceProvider = services.BuildServiceProvider();
         var lifecycleManager = new FeatureLifecycleManager(api, serviceProvider, NullLogger<FeatureLifecycleManager>.Instance);
-        await lifecycleManager.EnsureInitializedAsync();
+        await lifecycleManager.EnsureInitializedAsync(TestContext.Current.CancellationToken);
 
         // Assert
         var actualProvider = api.GetProvider();
@@ -53,7 +53,7 @@ public async Task EnsureInitializedAsync_SetsMultipleProvider()
         // Act
         using var serviceProvider = services.BuildServiceProvider();
         var lifecycleManager = new FeatureLifecycleManager(api, serviceProvider, NullLogger<FeatureLifecycleManager>.Instance);
-        await lifecycleManager.EnsureInitializedAsync();
+        await lifecycleManager.EnsureInitializedAsync(TestContext.Current.CancellationToken);
 
         // Assert
         Assert.Equal(provider1, api.GetProvider("provider1"));
@@ -80,7 +80,7 @@ public async Task EnsureInitializedAsync_AddsHooks()
         // Act
         using var serviceProvider = services.BuildServiceProvider();
         var lifecycleManager = new FeatureLifecycleManager(api, serviceProvider, NullLogger<FeatureLifecycleManager>.Instance);
-        await lifecycleManager.EnsureInitializedAsync();
+        await lifecycleManager.EnsureInitializedAsync(TestContext.Current.CancellationToken);
 
         // Assert
         var actualHooks = api.GetHooks();
@@ -108,7 +108,7 @@ public async Task EnsureInitializedAsync_AddHandlers()
         // Act
         using var serviceProvider = services.BuildServiceProvider();
         var lifecycleManager = new FeatureLifecycleManager(api, serviceProvider, NullLogger<FeatureLifecycleManager>.Instance);
-        await lifecycleManager.EnsureInitializedAsync();
+        await lifecycleManager.EnsureInitializedAsync(TestContext.Current.CancellationToken);
 
         // Assert
         Assert.True(hookExecuted);
@@ -122,13 +122,13 @@ public async Task ShutdownAsync_ResetsApi()
         var provider = new NoOpFeatureProvider();
 
         var api = Api.Instance;
-        await api.SetProviderAsync(provider);
+        await api.SetProviderAsync(provider, TestContext.Current.CancellationToken);
         api.AddHooks(new NoOpHook());
 
         // Act
         using var serviceProvider = services.BuildServiceProvider();
         var lifecycleManager = new FeatureLifecycleManager(api, serviceProvider, NullLogger<FeatureLifecycleManager>.Instance);
-        await lifecycleManager.ShutdownAsync();
+        await lifecycleManager.ShutdownAsync(TestContext.Current.CancellationToken);
 
         // Assert
         var actualProvider = api.GetProvider();
@@ -154,7 +154,7 @@ public async Task EnsureInitializedAsync_LogStartingInitialization()
         // Act
         using var serviceProvider = services.BuildServiceProvider();
         var lifecycleManager = new FeatureLifecycleManager(api, serviceProvider, logger);
-        await lifecycleManager.EnsureInitializedAsync();
+        await lifecycleManager.EnsureInitializedAsync(TestContext.Current.CancellationToken);
 
         // Assert
         var log = logger.LatestRecord;
@@ -181,7 +181,7 @@ public async Task ShutdownAsync_LogShuttingDown()
         // Act
         using var serviceProvider = services.BuildServiceProvider();
         var lifecycleManager = new FeatureLifecycleManager(api, serviceProvider, logger);
-        await lifecycleManager.ShutdownAsync();
+        await lifecycleManager.ShutdownAsync(TestContext.Current.CancellationToken);
 
         // Assert
         var log = logger.LatestRecord;
@@ -190,13 +190,13 @@ public async Task ShutdownAsync_LogShuttingDown()
         Assert.Equal(LogLevel.Information, log.Level);
     }
 
-    public async Task InitializeAsync()
+    public async ValueTask InitializeAsync()
     {
         await Api.Instance.ShutdownAsync();
     }
 
     // Make sure the singleton is cleared between tests
-    public async Task DisposeAsync()
+    public async ValueTask DisposeAsync()
     {
         await Api.Instance.ShutdownAsync().ConfigureAwait(false);
     }

test/OpenFeature.Hosting.Tests/OpenFeature.Hosting.Tests.csproj

@@ -2,18 +2,16 @@
 
   <PropertyGroup>
     <RootNamespace>OpenFeature.Hosting.Tests</RootNamespace>
+    <OutputType>Exe</OutputType>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="AutoFixture" />
-    <PackageReference Include="coverlet.collector">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
+    <PackageReference Include="coverlet.MTP" />
     <PackageReference Include="Microsoft.Extensions.Diagnostics.Testing" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="NSubstitute" />
-    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.v3.mtp-v2" />
     <PackageReference Include="xunit.runner.visualstudio">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>

test/OpenFeature.Hosting.Tests/Providers/Memory/FeatureBuilderExtensionsTests.cs

@@ -48,7 +48,7 @@ public async Task AddInMemoryProvider_WithFlags_AddsProvider()
         Assert.NotNull(featureProvider);
         Assert.IsType<InMemoryProvider>(featureProvider);
 
-        var result = await featureProvider.ResolveBooleanValueAsync("feature1", false);
+        var result = await featureProvider.ResolveBooleanValueAsync("feature1", false, cancellationToken: TestContext.Current.CancellationToken);
         Assert.True(result.Value);
     }
 
@@ -130,7 +130,7 @@ public async Task AddInMemoryProvider_WithDomainAndFlags_AddsProvider()
         Assert.IsType<InMemoryProvider>(featureProvider);
 
         var context = EvaluationContext.Builder().Set("group", "alpha").Build();
-        var result = await featureProvider.ResolveBooleanValueAsync("feature2", false, context);
+        var result = await featureProvider.ResolveBooleanValueAsync("feature2", false, context, TestContext.Current.CancellationToken);
         Assert.True(result.Value);
     }
 
@@ -178,7 +178,7 @@ public async Task AddInMemoryProvider_WithOptions_AddsProvider()
         Assert.NotNull(featureProvider);
         Assert.IsType<InMemoryProvider>(featureProvider);
 
-        var result = await featureProvider.ResolveBooleanValueAsync("new-feature", true);
+        var result = await featureProvider.ResolveBooleanValueAsync("new-feature", true, cancellationToken: TestContext.Current.CancellationToken);
         Assert.False(result.Value);
     }
 
@@ -208,7 +208,7 @@ public async Task AddInMemoryProvider_WithDomainAndOptions_AddsProvider()
         Assert.NotNull(featureProvider);
         Assert.IsType<InMemoryProvider>(featureProvider);
 
-        var result = await featureProvider.ResolveBooleanValueAsync("new-feature", true);
+        var result = await featureProvider.ResolveBooleanValueAsync("new-feature", true, cancellationToken: TestContext.Current.CancellationToken);
         Assert.False(result.Value);
     }
 

test/OpenFeature.IntegrationTests/FeatureFlagIntegrationTest.cs

@@ -54,8 +54,8 @@ public async Task VerifyFeatureFlagBehaviorAcrossServiceLifetimesAsync(string us
         var requestUri = $"/features/{userId}/flags/{FeatureA}";
 
         // Act
-        var response = await client.GetAsync(requestUri).ConfigureAwait(true);
-        var responseContent = await response.Content.ReadFromJsonAsync<FeatureFlagResponse<bool>>().ConfigureAwait(true);
+        var response = await client.GetAsync(requestUri, TestContext.Current.CancellationToken).ConfigureAwait(true);
+        var responseContent = await response.Content.ReadFromJsonAsync<FeatureFlagResponse<bool>>(cancellationToken: TestContext.Current.CancellationToken).ConfigureAwait(true);
 
         // Assert
         Assert.True(response.IsSuccessStatusCode, "Expected HTTP status code 200 OK.");
@@ -85,7 +85,7 @@ public async Task VerifyLoggingHookIsRegisteredAsync()
         var requestUri = $"/features/{TestUserId}/flags/{FeatureA}";
 
         // Act
-        var response = await client.GetAsync(requestUri).ConfigureAwait(true);
+        var response = await client.GetAsync(requestUri, TestContext.Current.CancellationToken).ConfigureAwait(true);
         var logs = logger.Collector.GetSnapshot();
 
         // Assert
@@ -120,7 +120,7 @@ public async Task VerifyHandlerIsRegisteredAsync()
         var requestUri = $"/features/{TestUserId}/flags/{FeatureA}";
 
         // Act
-        var response = await client.GetAsync(requestUri).ConfigureAwait(true);
+        var response = await client.GetAsync(requestUri, TestContext.Current.CancellationToken).ConfigureAwait(true);
 
         // Assert
         Assert.True(response.IsSuccessStatusCode, "Expected HTTP status code 200 OK.");
@@ -152,7 +152,7 @@ public async Task VerifyMultipleHandlersAreRegisteredAsync()
         var requestUri = $"/features/{TestUserId}/flags/{FeatureA}";
 
         // Act
-        var response = await client.GetAsync(requestUri).ConfigureAwait(true);
+        var response = await client.GetAsync(requestUri, TestContext.Current.CancellationToken).ConfigureAwait(true);
 
         // Assert
         Assert.True(response.IsSuccessStatusCode, "Expected HTTP status code 200 OK.");
@@ -191,7 +191,7 @@ public async Task VerifyHandlersAreRegisteredWithServiceProviderAsync()
         var requestUri = $"/features/{TestUserId}/flags/{FeatureA}";
 
         // Act
-        var response = await client.GetAsync(requestUri).ConfigureAwait(true);
+        var response = await client.GetAsync(requestUri, TestContext.Current.CancellationToken).ConfigureAwait(true);
 
         // Assert
         Assert.True(response.IsSuccessStatusCode, "Expected HTTP status code 200 OK.");

test/OpenFeature.IntegrationTests/OpenFeature.IntegrationTests.csproj

@@ -2,17 +2,15 @@
 
   <PropertyGroup>
     <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
+    <OutputType>Exe</OutputType>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.collector">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
+    <PackageReference Include="coverlet.MTP" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="Microsoft.AspNetCore.TestHost" />
     <PackageReference Include="Microsoft.Extensions.Diagnostics.Testing" />
-    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.v3.mtp-v2" />
     <PackageReference Include="xunit.runner.visualstudio">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>