Update to xunit.v3

Youssef1313 · Youssef1313 · commit 3aac6214c42a · 2025-08-14T22:30:05.000+02:00
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -11,7 +11,7 @@
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>d27184f7cb92b4abb4b20e91ecb5c43bc43de65b</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25408.3">
+    <Dependency Name="Microsoft.DotNet.XUnitV3Extensions" Version="10.0.0-beta.25408.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>d27184f7cb92b4abb4b20e91ecb5c43bc43de65b</Sha>
     </Dependency>
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -15,7 +15,7 @@
     <SystemIOHashingVersion>8.0.0</SystemIOHashingVersion>
     <MicrosoftAspNetCoreTestHostVersion>6.0.36</MicrosoftAspNetCoreTestHostVersion>
     <MicrosoftCrankEventSourcesVersion>0.2.0-alpha.24576.2</MicrosoftCrankEventSourcesVersion>
-    <MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.25408.3</MicrosoftDotNetXUnitExtensionsPackageVersion>
+    <MicrosoftDotNetXUnitV3ExtensionsPackageVersion>10.0.0-beta.25408.3</MicrosoftDotNetXUnitV3ExtensionsPackageVersion>
     <CoverletCollectorVersion>6.0.0</CoverletCollectorVersion>
     <MoqVersion>4.18.4</MoqVersion>
     <AutofacVersion>4.9.4</AutofacVersion>
diff --git a/test/Directory.Build.props b/test/Directory.Build.props
@@ -5,5 +5,8 @@
 
   <PropertyGroup>
     <IsTestProject>true</IsTestProject>
+    <TestRunnerName>XUnitV3</TestRunnerName>
+
+    <TestingPlatformDotnetTestSupport>true</TestingPlatformDotnetTestSupport>
   </PropertyGroup>
 </Project>
diff --git a/test/Kubernetes.Tests/IngressCacheTests.cs b/test/Kubernetes.Tests/IngressCacheTests.cs
@@ -10,7 +10,6 @@
 using Microsoft.Extensions.Options;
 using Moq;
 using Xunit;
-using Xunit.Abstractions;
 using Yarp.Kubernetes.Controller;
 using Yarp.Kubernetes.Controller.Caching;
 using Yarp.Kubernetes.Controller.Certificates;
diff --git a/test/Kubernetes.Tests/IngressControllerTests.cs b/test/Kubernetes.Tests/IngressControllerTests.cs
@@ -10,7 +10,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Xunit;
-using Xunit.Abstractions;
 using Yarp.Kubernetes.Controller;
 using Yarp.Kubernetes.Controller.Caching;
 using Yarp.Kubernetes.Controller.Client.Tests;
diff --git a/test/Kubernetes.Tests/ReconcilerTests.cs b/test/Kubernetes.Tests/ReconcilerTests.cs
@@ -7,7 +7,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Xunit;
-using Xunit.Abstractions;
 using Yarp.Kubernetes.Controller;
 using Yarp.Kubernetes.Controller.Client;
 using Yarp.Kubernetes.Controller.Caching;
diff --git a/test/Kubernetes.Tests/Utils/TestLogger.cs b/test/Kubernetes.Tests/Utils/TestLogger.cs
@@ -3,7 +3,6 @@
 
 using System;
 using Microsoft.Extensions.Logging;
-using Xunit.Abstractions;
 
 namespace Yarp.Kubernetes.Tests.Utils;
 
diff --git a/test/Kubernetes.Tests/Yarp.Kubernetes.Tests.csproj b/test/Kubernetes.Tests/Yarp.Kubernetes.Tests.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>$(TestTFMs)</TargetFrameworks>
-    <OutputType>Library</OutputType>
+    <OutputType>Exe</OutputType>
     <NoWarn>$(NoWarn);CS8002</NoWarn>
     <RootNamespace>Yarp.Kubernetes</RootNamespace>
   </PropertyGroup>
diff --git a/test/ReverseProxy.FunctionalTests/Common/TestEnvironment.cs b/test/ReverseProxy.FunctionalTests/Common/TestEnvironment.cs
@@ -18,7 +18,6 @@
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Xunit;
-using Xunit.Abstractions;
 using Yarp.ReverseProxy.Configuration;
 using Yarp.Tests.Common;
 
diff --git a/test/ReverseProxy.FunctionalTests/WebSocketTests.cs b/test/ReverseProxy.FunctionalTests/WebSocketTests.cs
@@ -19,7 +19,6 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Net.Http.Headers;
 using Xunit;
-using Xunit.Abstractions;
 using Yarp.ReverseProxy.Common;
 using Yarp.ReverseProxy.Forwarder;
 using Yarp.ReverseProxy.Transforms;
diff --git a/test/ReverseProxy.FunctionalTests/WebSocketsTelemetryTests.cs b/test/ReverseProxy.FunctionalTests/WebSocketsTelemetryTests.cs
@@ -15,7 +15,6 @@
 using Microsoft.AspNetCore.Server.Kestrel.Core;
 using Microsoft.Extensions.DependencyInjection;
 using Xunit;
-using Xunit.Abstractions;
 using Yarp.ReverseProxy.Common;
 using Yarp.Telemetry.Consumption;
 using Yarp.Tests.Common;
diff --git a/test/ReverseProxy.FunctionalTests/Yarp.ReverseProxy.FunctionalTests.csproj b/test/ReverseProxy.FunctionalTests/Yarp.ReverseProxy.FunctionalTests.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFrameworks>$(TestTFMs)</TargetFrameworks>
     <NoWarn>$(NoWarn);SYSLIB0057</NoWarn>
-    <OutputType>Library</OutputType>
+    <OutputType>Exe</OutputType>
     <RootNamespace>Yarp.ReverseProxy</RootNamespace>
 
     <!--
@@ -28,7 +28,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.DotNet.XUnitExtensions" Version="$(MicrosoftDotNetXUnitExtensionsPackageVersion)" />
+    <PackageReference Include="Microsoft.DotNet.XUnitV3Extensions" Version="$(MicrosoftDotNetXUnitV3ExtensionsPackageVersion)" />
   </ItemGroup>
 
 </Project>
diff --git a/test/ReverseProxy.Tests/Forwarder/HttpForwarderTests.cs b/test/ReverseProxy.Tests/Forwarder/HttpForwarderTests.cs
@@ -22,7 +22,6 @@
 using Microsoft.Net.Http.Headers;
 using Moq;
 using Xunit;
-using Xunit.Abstractions;
 using Yarp.ReverseProxy.Common;
 using Yarp.ReverseProxy.Transforms;
 using Yarp.ReverseProxy.Transforms.Builder.Tests;
diff --git a/test/ReverseProxy.Tests/Yarp.ReverseProxy.Tests.csproj b/test/ReverseProxy.Tests/Yarp.ReverseProxy.Tests.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>$(TestTFMs)</TargetFrameworks>
-    <OutputType>Library</OutputType>
+    <OutputType>Exe</OutputType>
     <RootNamespace>Yarp.ReverseProxy</RootNamespace>
     <NoWarn>$(NoWarn);SYSLIB0039;SYSLIB0057</NoWarn>
   </PropertyGroup>
diff --git a/test/Tests.Common/TestLoggerProvider.cs b/test/Tests.Common/TestLoggerProvider.cs
@@ -3,7 +3,6 @@
 
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Testing;
-using Xunit.Abstractions;
 
 namespace Yarp.ReverseProxy.Common;
 
diff --git a/test/Tests.Common/TestTimeProvider.cs b/test/Tests.Common/TestTimeProvider.cs
@@ -5,7 +5,6 @@
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
-using Xunit;
 
 namespace Yarp.Tests.Common;
 
diff --git a/test/Tests.Common/XunitLoggerFactoryExtensions.cs b/test/Tests.Common/XunitLoggerFactoryExtensions.cs
@@ -4,7 +4,6 @@
 using System;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging.Testing;
-using Xunit.Abstractions;
 
 namespace Microsoft.Extensions.Logging;
 
diff --git a/test/Tests.Common/XunitLoggerProvider.cs b/test/Tests.Common/XunitLoggerProvider.cs
@@ -6,7 +6,6 @@
 using System.Linq;
 using System.Text;
 using System.Threading;
-using Xunit.Abstractions;
 
 namespace Microsoft.Extensions.Logging.Testing;
 
diff --git a/test/Tests.Common/Yarp.Tests.Common.csproj b/test/Tests.Common/Yarp.Tests.Common.csproj
@@ -4,17 +4,25 @@
     <TargetFrameworks>$(TestTFMs)</TargetFrameworks>
     <OutputType>Library</OutputType>
     <RootNamespace>Yarp.Common.Tests</RootNamespace>
+    <!-- This is a test utility project. -->
+    <IsTestProject>false</IsTestProject>
+    <IsTestUtilityProject>true</IsTestUtilityProject>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Autofac" Version="$(AutofacVersion)" />
     <PackageReference Include="Autofac.Extras.Moq" Version="$(AutofacExtrasMoqVersion)" />
     <PackageReference Include="coverlet.collector" Version="$(CoverletCollectorVersion)" />
     <PackageReference Include="Moq" Version="$(MoqVersion)" />
+    <PackageReference Include="xunit.v3.extensibility.core" Version="$(XUnitV3Version)" />
+    <PackageReference Include="xunit.v3.assert" Version="$(XUnitV3Version)" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\ReverseProxy\Yarp.ReverseProxy.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Using Include="Xunit" />
+  </ItemGroup>
 </Project>
