Migrate to xunit.v3

Author: Youssef1313

.github/workflows/dotnet-build-and-test.yml

@@ -133,7 +133,7 @@ jobs:
             
             # Check if the project supports the target framework
             if [[ "$target_frameworks" == *"${{ matrix.targetFramework }}"* ]]; then
-              dotnet test -f ${{ matrix.targetFramework }} -c ${{ matrix.configuration }} $project --no-build -v Normal --logger trx --collect:"XPlat Code Coverage" --results-directory:"TestResults/Coverage/" -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.ExcludeByAttribute=GeneratedCodeAttribute,CompilerGeneratedAttribute,ExcludeFromCodeCoverageAttribute
+              dotnet test -f ${{ matrix.targetFramework }} -c ${{ matrix.configuration }} --project $project --no-build -v Normal --report-trx --coverage --results-directory "TestResults/Coverage/" -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.ExcludeByAttribute=GeneratedCodeAttribute,CompilerGeneratedAttribute,ExcludeFromCodeCoverageAttribute
             else
               echo "Skipping $project - does not support target framework ${{ matrix.targetFramework }} (supports: $target_frameworks)"
             fi
@@ -170,7 +170,7 @@ jobs:
             
             # Check if the project supports the target framework
             if [[ "$target_frameworks" == *"${{ matrix.targetFramework }}"* ]]; then
-              dotnet test -f ${{ matrix.targetFramework }} -c ${{ matrix.configuration }} $project --no-build -v Normal --logger trx
+              dotnet test -f ${{ matrix.targetFramework }} -c ${{ matrix.configuration }} --project $project --no-build -v Normal --report-trx
             else
               echo "Skipping $project - does not support target framework ${{ matrix.targetFramework }} (supports: $target_frameworks)"
             fi

dotnet/.editorconfig

@@ -220,6 +220,7 @@ dotnet_diagnostic.VSTHRD111.severity = none # Use .ConfigureAwait(bool) is hidde
 
 dotnet_diagnostic.xUnit1004.severity = none # Test methods should not be skipped. Remove the Skip property to start running the test again.
 dotnet_diagnostic.xUnit1042.severity = none # Untyped data rows
+dotnet_diagnostic.xUnit1051.severity = none
 
 dotnet_diagnostic.RCS1032.severity = none # Remove redundant parentheses.
 dotnet_diagnostic.RCS1074.severity = none # Remove redundant constructor.

dotnet/Directory.Packages.props

@@ -118,13 +118,13 @@
     <!-- Test -->
     <PackageVersion Include="FluentAssertions" Version="8.8.0" />
     <PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="9.0.11" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
     <PackageVersion Include="Moq" Version="[4.18.4]" />
-    <PackageVersion Include="xunit" Version="2.9.3" />
-    <PackageVersion Include="xunit.abstractions" Version="2.0.3" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.3" />
-    <PackageVersion Include="xretry" Version="1.9.0" />
-    <PackageVersion Include="coverlet.collector" Version="6.0.4" />
+    <PackageVersion Include="xunit.v3.mtp-v2" Version="3.2.0" />
+    <PackageVersion Include="xunit.v3.extensibility.core" Version="3.2.0" />
+    <PackageVersion Include="xunit.v3.assert" Version="3.2.0" />
+    <PackageVersion Include="xretry.v3" Version="1.0.0-rc2" />
+    <PackageVersion Include="Microsoft.Testing.Extensions.TrxReport" Version="2.0.2" />
+    <PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.1.0" />
     <!-- Symbols -->
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
     <!-- Toolset -->
@@ -139,7 +139,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageVersion Include="xunit.analyzers" Version="1.23.0" />
+    <PackageVersion Include="xunit.analyzers" Version="1.25.0" />
     <PackageReference Include="xunit.analyzers">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

dotnet/global.json

@@ -1,7 +1,10 @@
 {
     "sdk": {
-        "version": "9.0.300",
+        "version": "10.0.100",
         "rollForward": "latestMajor",
         "allowPrerelease": false
+    },
+    "test": {
+        "runner": "Microsoft.Testing.Platform"
     }
 }

dotnet/tests/AgentConformance.IntegrationTests/AgentConformance.IntegrationTests.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>$(ProjectsTargetFrameworks)</TargetFrameworks>
-    <IsTestProject>false</IsTestProject>
+    <IsTestUtilityProject>true</IsTestUtilityProject>
   </PropertyGroup>
 
   <ItemGroup>

dotnet/tests/AgentConformance.IntegrationTests/AgentTests.cs

@@ -15,11 +15,17 @@ public abstract class AgentTests<TAgentFixture>(Func<TAgentFixture> createAgentF
 {
     protected TAgentFixture Fixture { get; private set; } = default!;
 
-    public Task InitializeAsync()
+    public ValueTask InitializeAsync()
     {
         this.Fixture = createAgentFixture();
         return this.Fixture.InitializeAsync();
     }
 
-    public Task DisposeAsync() => this.Fixture.DisposeAsync();
+    public async ValueTask DisposeAsync()
+    {
+        await this.Fixture.DisposeAsync();
+
+        // https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1816
+        GC.SuppressFinalize(this);
+    }
 }

dotnet/tests/AzureAI.IntegrationTests/AIProjectClientFixture.cs

@@ -144,17 +144,18 @@ private async Task DeleteResponseChainAsync(string lastResponseId)
         }
     }
 
-    public Task DisposeAsync()
+    public async ValueTask DisposeAsync()
     {
         if (this._client is not null && this._agent is not null)
         {
-            return this._client.Agents.DeleteAgentAsync(this._agent.Name);
+            await this._client.Agents.DeleteAgentAsync(this._agent.Name);
         }
 
-        return Task.CompletedTask;
+        // https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1816
+        GC.SuppressFinalize(this);
     }
 
-    public async Task InitializeAsync()
+    public async ValueTask InitializeAsync()
     {
         this._client = new(new Uri(s_config.Endpoint), new AzureCliCredential());
         this._agent = await this.CreateChatClientAgentAsync();

dotnet/tests/AzureAI.IntegrationTests/AzureAI.IntegrationTests.csproj

@@ -4,6 +4,7 @@
     <TargetFrameworks>$(ProjectsTargetFrameworks)</TargetFrameworks>
     <TargetFrameworks Condition="'$(Configuration)' == 'Debug'">$(ProjectsDebugTargetFrameworks)</TargetFrameworks>
     <InjectSharedIntegrationTestCode>True</InjectSharedIntegrationTestCode>
+    <OutputType>Exe</OutputType>
   </PropertyGroup>
 
   <ItemGroup>

dotnet/tests/AzureAIAgentsPersistent.IntegrationTests/AzureAIAgentsPersistent.IntegrationTests.csproj

@@ -4,6 +4,7 @@
     <TargetFrameworks>$(ProjectsTargetFrameworks)</TargetFrameworks>
     <TargetFrameworks Condition="'$(Configuration)' == 'Debug'">$(ProjectsDebugTargetFrameworks)</TargetFrameworks>
     <InjectSharedIntegrationTestCode>True</InjectSharedIntegrationTestCode>
+    <OutputType>Exe</OutputType>
   </PropertyGroup>
 
   <ItemGroup>

dotnet/tests/AzureAIAgentsPersistent.IntegrationTests/AzureAIAgentsPersistentFixture.cs

@@ -1,5 +1,6 @@
 // Copyright (c) Microsoft. All rights reserved.
 
+using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using AgentConformance.IntegrationTests;
@@ -86,17 +87,18 @@ public Task DeleteThreadAsync(AgentThread thread)
         return Task.CompletedTask;
     }
 
-    public Task DisposeAsync()
+    public async ValueTask DisposeAsync()
     {
         if (this._persistentAgentsClient is not null && this._agent is not null)
         {
-            return this._persistentAgentsClient.Administration.DeleteAgentAsync(this._agent.Id);
+            await this._persistentAgentsClient.Administration.DeleteAgentAsync(this._agent.Id);
         }
 
-        return Task.CompletedTask;
+        // https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1816
+        GC.SuppressFinalize(this);
     }
 
-    public async Task InitializeAsync()
+    public async ValueTask InitializeAsync()
     {
         this._persistentAgentsClient = new(s_config.Endpoint, new AzureCliCredential());
         this._agent = await this.CreateChatClientAgentAsync();