From 495d73a7e3116cb51e990a517a4921d4905d121e Mon Sep 17 00:00:00 2001
From: Youssef1313 <youssefvictor00@gmail.com>
Date: Thu, 2 Oct 2025 14:32:41 +0200
Subject: [PATCH] Update to xunit.v3

---
 Directory.Build.props                                     | 1 +
 global.json                                               | 8 ++++++++
 .../Tests.AzureAppConfiguration.AspNetCore.csproj         | 6 +++---
 .../Tests.AzureAppConfiguration.Functions.Worker.csproj   | 6 +++---
 .../Integration/IntegrationTests.cs                       | 6 ++----
 .../Tests.AzureAppConfiguration.csproj                    | 6 +++---
 .../Unit/SnapshotReferenceTests.cs                        | 1 -
 7 files changed, 20 insertions(+), 14 deletions(-)
 create mode 100644 global.json

diff --git a/Directory.Build.props b/Directory.Build.props
index e1220a8d1..5002aa13a 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -2,6 +2,7 @@
 
    <PropertyGroup>
       <EnforceCodeStyleInBuild>True</EnforceCodeStyleInBuild>
+      <UseMicrosoftTestingPlatformRunner>true</UseMicrosoftTestingPlatformRunner>
    </PropertyGroup>
 
 </Project>
\ No newline at end of file
diff --git a/global.json b/global.json
new file mode 100644
index 000000000..912509211
--- /dev/null
+++ b/global.json
@@ -0,0 +1,8 @@
+{
+  "sdk": {
+    "version": "10.0.100-rc.2.25468.104"
+  },
+  "test": {
+    "runner": "Microsoft.Testing.Platform"
+  }
+}
\ No newline at end of file
diff --git a/tests/Tests.AzureAppConfiguration.AspNetCore/Tests.AzureAppConfiguration.AspNetCore.csproj b/tests/Tests.AzureAppConfiguration.AspNetCore/Tests.AzureAppConfiguration.AspNetCore.csproj
index 4a3c672cd..6c821ce68 100644
--- a/tests/Tests.AzureAppConfiguration.AspNetCore/Tests.AzureAppConfiguration.AspNetCore.csproj
+++ b/tests/Tests.AzureAppConfiguration.AspNetCore/Tests.AzureAppConfiguration.AspNetCore.csproj
@@ -7,18 +7,18 @@
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\build\AzureAppConfiguration.snk</AssemblyOriginatorKeyFile>
     <IsPackable>false</IsPackable>
+    <OutputType>Exe</OutputType>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageReference Include="Moq" Version="4.20.70" />
-    <PackageReference Include="xunit" Version="2.7.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
+    <PackageReference Include="xunit.v3" Version="3.1.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/tests/Tests.AzureAppConfiguration.Functions.Worker/Tests.AzureAppConfiguration.Functions.Worker.csproj b/tests/Tests.AzureAppConfiguration.Functions.Worker/Tests.AzureAppConfiguration.Functions.Worker.csproj
index 935b38306..d0c3736ce 100644
--- a/tests/Tests.AzureAppConfiguration.Functions.Worker/Tests.AzureAppConfiguration.Functions.Worker.csproj
+++ b/tests/Tests.AzureAppConfiguration.Functions.Worker/Tests.AzureAppConfiguration.Functions.Worker.csproj
@@ -7,18 +7,18 @@
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\build\AzureAppConfiguration.snk</AssemblyOriginatorKeyFile>
     <IsPackable>false</IsPackable>
+    <OutputType>Exe</OutputType>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageReference Include="Moq" Version="4.20.70" />
-    <PackageReference Include="xunit" Version="2.7.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
+    <PackageReference Include="xunit.v3" Version="3.1.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/tests/Tests.AzureAppConfiguration/Integration/IntegrationTests.cs b/tests/Tests.AzureAppConfiguration/Integration/IntegrationTests.cs
index b7be4f9b9..daa45f5b3 100644
--- a/tests/Tests.AzureAppConfiguration/Integration/IntegrationTests.cs
+++ b/tests/Tests.AzureAppConfiguration/Integration/IntegrationTests.cs
@@ -29,8 +29,6 @@
 
 namespace Tests.AzureAppConfiguration
 {
-    using Xunit.Abstractions;
-
     /// <summary>
     /// Integration tests for Azure App Configuration that connect to a real service.
     /// Uses an existing App Configuration store and Key Vault for testing.
@@ -135,7 +133,7 @@ private async Task<string> CreateSnapshot(string snapshotName, IEnumerable<Confi
             return operation.Value.Name;
         }
 
-        public async Task InitializeAsync()
+        public async ValueTask InitializeAsync()
         {
             DefaultAzureCredential credential = _defaultAzureCredential;
             string subscriptionId = GetCurrentSubscriptionId();
@@ -268,7 +266,7 @@ private async Task CleanupStaleResources()
             }
         }
 
-        public async Task DisposeAsync()
+        public async ValueTask DisposeAsync()
         {
             await CleanupStaleResources();
         }
diff --git a/tests/Tests.AzureAppConfiguration/Tests.AzureAppConfiguration.csproj b/tests/Tests.AzureAppConfiguration/Tests.AzureAppConfiguration.csproj
index 1e5aaae18..47dc67027 100644
--- a/tests/Tests.AzureAppConfiguration/Tests.AzureAppConfiguration.csproj
+++ b/tests/Tests.AzureAppConfiguration/Tests.AzureAppConfiguration.csproj
@@ -8,6 +8,7 @@
     <AssemblyOriginatorKeyFile>..\..\build\AzureAppConfiguration.snk</AssemblyOriginatorKeyFile>
     <IsPackable>false</IsPackable>
     <JsonSerializerIsReflectionEnabledByDefault>true</JsonSerializerIsReflectionEnabledByDefault>
+    <OutputType>Exe</OutputType>
   </PropertyGroup>
 
   <ItemGroup>
@@ -21,12 +22,11 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageReference Include="System.Linq.Async" Version="6.0.3" />
     <PackageReference Include="Moq" Version="4.20.70" />
-    <PackageReference Include="xunit" Version="2.7.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
+    <PackageReference Include="xunit.v3" Version="3.1.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/tests/Tests.AzureAppConfiguration/Unit/SnapshotReferenceTests.cs b/tests/Tests.AzureAppConfiguration/Unit/SnapshotReferenceTests.cs
index 830a92f28..2802afcf5 100644
--- a/tests/Tests.AzureAppConfiguration/Unit/SnapshotReferenceTests.cs
+++ b/tests/Tests.AzureAppConfiguration/Unit/SnapshotReferenceTests.cs
@@ -13,7 +13,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace Tests.AzureAppConfiguration
 {