xUnit migration to v3

.github/workflows/sdk_build.yml

@@ -233,6 +233,7 @@ jobs:
           --logger "trx;LogFilePrefix=${{ matrix.prefix }}" \
           --logger "GitHubActions;report-warnings=false" \
           --results-directory "${{ github.workspace }}/TestResults" \
+          /p:RuntimeIdentifier=linux-x64 \
           /p:CollectCoverage=true \
           /p:CoverletOutputFormat=opencover \
           /p:GITHUB_ACTIONS=false
@@ -298,6 +299,7 @@ jobs:
         --logger "trx;LogFilePrefix=${{ matrix.prefix }}" \
         --logger "GitHubActions;report-warnings=false" \
         --results-directory "${{ github.workspace }}/TestResults" \
+        /p:RuntimeIdentifier=linux-x64 \
         /p:CollectCoverage=true \
         /p:CoverletOutputFormat=opencover \
         /p:GITHUB_ACTIONS=false

Directory.Packages.props

@@ -43,6 +43,7 @@
     <PackageVersion Include="Microsoft.Extensions.Options" Version="10.0.3" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="10.0.103" />
+    <PackageVersion Include="Microsoft.Testing.Platform" Version="2.1.0" />
     <PackageVersion Include="MinVer" Version="7.0.0" />
     <PackageVersion Include="Moq" Version="4.20.72" />
     <PackageVersion Include="protobuf-net.Grpc.AspNetCore" Version="1.2.2" />
@@ -53,8 +54,8 @@
     <PackageVersion Include="System.Net.ServerSentEvents" Version="10.0.3" />
     <PackageVersion Include="System.Text.Json" Version="10.0.3" />
     <PackageVersion Include="Testcontainers" Version="4.9.0" />
-    <PackageVersion Include="xunit" Version="2.9.3" />
-    <PackageVersion Include="xunit.extensibility.core" Version="2.9.3" />
+    <PackageVersion Include="xunit.v3" Version="3.2.2" />
+    <PackageVersion Include="xunit.v3.extensibility.core" Version="3.2.2" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
   </ItemGroup>
 </Project>

examples/Workflow/WorkflowUnitTest/WorkflowUnitTest.csproj

@@ -8,7 +8,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="Moq" />
-    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.v3" />
     <PackageReference Include="xunit.runner.visualstudio">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>

src/Dapr.Testcontainers.Xunit/Dapr.Testcontainers.Xunit.csproj

@@ -8,7 +8,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="xunit.extensibility.core" />
+      <PackageReference Include="xunit.v3.extensibility.core" />
     </ItemGroup>
 
 </Project>

test/Dapr.AI.Test/Dapr.AI.Test.csproj

@@ -9,7 +9,7 @@
         </PackageReference>
         <PackageReference Include="Microsoft.Extensions.Configuration" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" />
-        <PackageReference Include="xunit" />
+        <PackageReference Include="xunit.v3" />
         <PackageReference Include="xunit.runner.visualstudio">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

test/Dapr.Actors.Analyzers.Test/Dapr.Actors.Analyzers.Test.csproj

@@ -13,9 +13,9 @@
         <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" PrivateAssets="all" />
         <PackageReference Include="Microsoft.Extensions.Hosting"/>
         <PackageReference Include="Microsoft.Extensions.DependencyInjection"/>
-        <PackageReference Include="xunit.extensibility.core"/>
+        <PackageReference Include="xunit.v3.extensibility.core"/>
         <PackageReference Include="Microsoft.NET.Test.Sdk"/>
-        <PackageReference Include="xunit"/>
+        <PackageReference Include="xunit.v3"/>
         <PackageReference Include="coverlet.collector">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>

test/Dapr.Actors.Analyzers.Test/TimerCallbackMethodPresentAnalyzerTests.cs

@@ -49,7 +49,7 @@ public async Task DoSomethingAsync()
                            """;
 
         context.ExpectedDiagnostics.Clear();
-        await context.RunAsync();
+        await context.RunAsync(TestContext.Current.CancellationToken);
     }
 
     [Fact]
@@ -80,7 +80,7 @@ private static async Task TimerCallback(byte[] data)
                            """;
 
         context.ExpectedDiagnostics.Clear();
-        await context.RunAsync();
+        await context.RunAsync(TestContext.Current.CancellationToken);
     }
 
     [Fact]
@@ -111,7 +111,7 @@ private static async Task TimerCallback(byte[] data)
                            """;
 
         context.ExpectedDiagnostics.Clear();
-        await context.RunAsync();
+        await context.RunAsync(TestContext.Current.CancellationToken);
     }
 
     [Fact]
@@ -138,7 +138,7 @@ public async Task DoSomethingAsync()
         context.ExpectedDiagnostics.Add(new DiagnosticResult(TimerCallbackMethodPresentAnalyzer.DaprTimerCallbackMethodRule)
             .WithSpan(8, 45, 8, 60)
             .WithArguments("TimerCallback", "TestActorTimerRegistrationTimerCallbackNotPresent"));
-        await context.RunAsync();
+        await context.RunAsync(TestContext.Current.CancellationToken);
     }
 }
 

test/Dapr.Actors.AspNetCore.IntegrationTest/ActivationTests.cs

@@ -32,7 +32,7 @@ public class ActivationTests
     [Fact]
     public async Task CanActivateActorWithDependencyInjection()
     {
-        using var factory = new AppWebApplicationFactory();
+        await using var factory = new AppWebApplicationFactory();
         var httpClient = factory.CreateClient(new Microsoft.AspNetCore.Mvc.Testing.WebApplicationFactoryClientOptions { HandleCookies = false });
 
         // Doing this twice verifies that the Actor stays active and retains state using DI.
@@ -47,8 +47,8 @@ public async Task CanActivateActorWithDependencyInjection()
 
     private async Task<string> IncrementCounterAsync(HttpClient httpClient, string actorId)
     {
-        var actorTypeName = nameof(DependencyInjectionActor);
-        var methodName = nameof(DependencyInjectionActor.IncrementAsync);
+        const string actorTypeName = nameof(DependencyInjectionActor);
+        const string methodName = nameof(DependencyInjectionActor.IncrementAsync);
 
         var request = new HttpRequestMessage(HttpMethod.Put, $"http://localhost/actors/{actorTypeName}/{actorId}/method/{methodName}");
         var response = await httpClient.SendAsync(request);
@@ -59,7 +59,7 @@ private async Task<string> IncrementCounterAsync(HttpClient httpClient, string a
 
     private async Task DeactivateActor(HttpClient httpClient, string actorId)
     {
-        var actorTypeName = nameof(DependencyInjectionActor);
+        const string actorTypeName = nameof(DependencyInjectionActor);
 
         var request = new HttpRequestMessage(HttpMethod.Delete, $"http://localhost/actors/{actorTypeName}/{actorId}");
         var response = await httpClient.SendAsync(request);
@@ -82,4 +82,4 @@ private async Task Assert2XXStatusAsync(HttpResponseMessage response)
         var text = await response.Content.ReadAsStringAsync();
         throw new XunitException($"The response failed with a {response.StatusCode} and body:" + Environment.NewLine + text);
     }
-}
+}

test/Dapr.Actors.AspNetCore.IntegrationTest/AppWebApplicationFactory.cs

@@ -13,7 +13,7 @@
 
 namespace Dapr.Actors.AspNetCore.IntegrationTest;
 
-using Dapr.Actors.AspNetCore.IntegrationTest.App;
+using App;
 using Microsoft.AspNetCore.Mvc.Testing;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
@@ -36,4 +36,4 @@ protected override IHostBuilder CreateHostBuilder()
         });
         return builder;
     }
-}
+}

test/Dapr.Actors.AspNetCore.IntegrationTest/Dapr.Actors.AspNetCore.IntegrationTest.csproj

@@ -6,7 +6,7 @@
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing"  />
-    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.v3" />
     <PackageReference Include="xunit.runner.visualstudio">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

test/Dapr.Actors.AspNetCore.IntegrationTest/HostingTests.cs

@@ -54,10 +54,10 @@ public void MapActorsHandlers_WithoutAddActors_Throws()
     [Fact]
     public async Task MapActorsHandlers_IncludesHealthChecks()
     {
-        using var factory = new AppWebApplicationFactory();
+        await using var factory = new AppWebApplicationFactory();
 
         var httpClient = factory.CreateClient(new Microsoft.AspNetCore.Mvc.Testing.WebApplicationFactoryClientOptions { HandleCookies = false });
-        var response = await httpClient.GetAsync("/healthz");
+        var response = await httpClient.GetAsync("/healthz", TestContext.Current.CancellationToken);
         await Assert2XXStatusAsync(response);
     }
 
@@ -68,7 +68,7 @@ public async Task ActorsHealthz_ShouldNotRequireAuthorization()
         var server = host.GetTestServer();
 
         var httpClient = server.CreateClient();
-        var response = await httpClient.GetAsync("/healthz");
+        var response = await httpClient.GetAsync("/healthz", TestContext.Current.CancellationToken);
         await Assert2XXStatusAsync(response);
     }
 
@@ -82,10 +82,10 @@ public async Task MapActorsHandlers_ActorHealthCheckDoesNotConflict()
         var server = host.GetTestServer();
 
         var httpClient = server.CreateClient();
-        var response = await httpClient.GetAsync("/healthz");
+        var response = await httpClient.GetAsync("/healthz", TestContext.Current.CancellationToken);
         await Assert2XXStatusAsync(response);
 
-        var text = await response.Content.ReadAsStringAsync();
+        var text = await response.Content.ReadAsStringAsync(TestContext.Current.CancellationToken);
         Assert.Equal("Ice Cold, Solid Gold!", text);
     }
 
@@ -97,7 +97,7 @@ public async Task MapActorsHandlers_WorksWithFallbackRoute()
         var server = host.GetTestServer();
 
         var httpClient = server.CreateClient();
-        var response = await httpClient.GetAsync("/dapr/config");
+        var response = await httpClient.GetAsync("/dapr/config", TestContext.Current.CancellationToken);
         await Assert2XXStatusAsync(response);
     }
 
@@ -237,4 +237,4 @@ private async Task Assert2XXStatusAsync(HttpResponseMessage response)
         var text = await response.Content.ReadAsStringAsync();
         throw new XunitException($"The response failed with a {response.StatusCode} and body:" + Environment.NewLine + text);
     }
-}
+}

test/Dapr.Actors.AspNetCore.Test/Dapr.Actors.AspNetCore.Test.csproj

@@ -12,7 +12,7 @@
     <PackageReference Include="Microsoft.AspNetCore.TestHost"  />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="Moq" />
-    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.v3" />
     <PackageReference Include="xunit.runner.visualstudio">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

test/Dapr.Actors.AspNetCore.Test/Runtime/ActorsEndpointRouteBuilderExtensionsTests.cs

@@ -35,9 +35,9 @@ public async Task MapActorsHandlers_MapDaprConfigEndpoint()
         var server = host.GetTestServer();
 
         var httpClient = server.CreateClient();
-        var response = await httpClient.GetAsync("/dapr/config");
+        var response = await httpClient.GetAsync("/dapr/config", TestContext.Current.CancellationToken);
 
-        var text = await response.Content.ReadAsStringAsync();
+        var text = await response.Content.ReadAsStringAsync(TestContext.Current.CancellationToken);
         Assert.Equal(@"{""entities"":[""TestActor""],""reentrancy"":{""enabled"":false}}", text);
     }
 
@@ -98,4 +98,4 @@ private class TestActor : Actor, ITestActor
     {
         public TestActor(ActorHost host) : base(host) { }
     }
-}
+}