Upgrade to XUnit v3

Author: AndriySvyryd

.agents/skills/cosmos-provider/SKILL.md

@@ -19,4 +19,4 @@ Non-relational provider with its own parallel query pipeline. Uses JSON for docu
 ## Azure Cosmos DB Emulator for Tests
 
 - `TestEnvironment.InitializeAsync()` auto-starts a `Testcontainers.CosmosDb` container when `Test__Cosmos__DefaultConnection` is not set. Set the env var to use an existing emulator instead.
-- Skip tests requiring unsupported features on the Linux emulator with `[CosmosCondition(CosmosCondition.IsNotLinuxEmulator)]`.
+- Skip tests requiring unsupported features on the Linux emulator with ` [ConditionalFact(typeof(CosmosTestEnvironment), nameof(CosmosTestEnvironment.IsNotLinuxEmulator))]`.

EFCore.slnx

@@ -59,24 +59,17 @@
     <Project Path="test/EFCore.AspNet.InMemory.FunctionalTests/EFCore.AspNet.InMemory.FunctionalTests.csproj" />
     <Project Path="test/EFCore.AspNet.Specification.Tests/EFCore.AspNet.Specification.Tests.csproj" />
     <Project Path="test/EFCore.AspNet.Sqlite.FunctionalTests/EFCore.AspNet.Sqlite.FunctionalTests.csproj" />
-    <Project Path="test/EFCore.AspNet.SqlServer.FunctionalTests/EFCore.AspNet.SqlServer.FunctionalTests.csproj" />
     <Project Path="test/EFCore.Cosmos.FunctionalTests/EFCore.Cosmos.FunctionalTests.csproj" />
     <Project Path="test/EFCore.Cosmos.Tests/EFCore.Cosmos.Tests.csproj" />
-    <Project Path="test/EFCore.CrossStore.FunctionalTests/EFCore.CrossStore.FunctionalTests.csproj" />
-    <Project Path="test/EFCore.Design.Tests/EFCore.Design.Tests.csproj" />
     <Project Path="test/EFCore.FSharp.FunctionalTests/EFCore.FSharp.FunctionalTests.fsproj" />
     <Project Path="test/EFCore.InMemory.FunctionalTests/EFCore.InMemory.FunctionalTests.csproj" />
     <Project Path="test/EFCore.InMemory.Tests/EFCore.InMemory.Tests.csproj" />
-    <Project Path="test/EFCore.OData.FunctionalTests/EFCore.OData.FunctionalTests.csproj" />
     <Project Path="test/EFCore.Proxies.Tests/EFCore.Proxies.Tests.csproj" />
     <Project Path="test/EFCore.Relational.Specification.Tests/EFCore.Relational.Specification.Tests.csproj" />
     <Project Path="test/EFCore.Relational.Tests/EFCore.Relational.Tests.csproj" />
     <Project Path="test/EFCore.Specification.Tests/EFCore.Specification.Tests.csproj" />
     <Project Path="test/EFCore.Sqlite.FunctionalTests/EFCore.Sqlite.FunctionalTests.csproj" />
     <Project Path="test/EFCore.Sqlite.Tests/EFCore.Sqlite.Tests.csproj" />
-    <Project Path="test/EFCore.SqlServer.FunctionalTests/EFCore.SqlServer.FunctionalTests.csproj" />
-    <Project Path="test/EFCore.SqlServer.HierarchyId.Tests/EFCore.SqlServer.HierarchyId.Tests.csproj" />
-    <Project Path="test/EFCore.SqlServer.Tests/EFCore.SqlServer.Tests.csproj" />
     <Project Path="test/EFCore.Tests/EFCore.Tests.csproj" />
     <Project Path="test/EFCore.VisualBasic.FunctionalTests/EFCore.VisualBasic.FunctionalTests.vbproj" />
     <Project Path="test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.sqlite3.Tests.csproj" />

azure-pipelines-internal-tests.yml

@@ -197,7 +197,7 @@ extends:
           - job: Linux_Cosmos
             displayName: 'Linux Cosmos'
             condition: notin(variables['Build.Reason'], 'PullRequest', 'Schedule')
-            timeoutInMinutes: 210
+            timeoutInMinutes: 300
             pool:
               name: $(DncEngInternalBuildPool)
               demands: ImageOverride -equals 1es-ubuntu-2204

benchmark/Directory.Build.props

@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" />
-    <PackageReference Include="xunit.assert" VersionOverride="$(XUnitVersion)" />
+    <PackageReference Include="xunit.v3.assert" VersionOverride="$(XUnitV3Version)" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" />
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" />
   </ItemGroup>

eng/Versions.props

@@ -52,6 +52,9 @@
     <OpenTelemetryExporterInMemoryVersion>1.15.1</OpenTelemetryExporterInMemoryVersion>
     <SQLitePCLRawVersion>3.0.3</SQLitePCLRawVersion>
     <SQLite3MCPCLRawBundleVersion>2.3.2</SQLite3MCPCLRawBundleVersion>
+    <XUnitV3Version>4.0.0-pre.108</XUnitV3Version>
+    <MicrosoftDotNetXUnitV3ExtensionsVersion>11.0.0-beta.26263.112</MicrosoftDotNetXUnitV3ExtensionsVersion>
+    <MicrosoftTestingPlatformVersion>2.2.2</MicrosoftTestingPlatformVersion>
   </PropertyGroup>
 
   <PropertyGroup Label="Analyzers">

eng/helix.proj

@@ -41,89 +41,99 @@
   </ItemGroup>
 
   <ItemGroup>
-    <XUnitProject Include="$(RepoRoot)/test/**/*.csproj"/>
-    <XUnitProject Include="$(RepoRoot)/test/**/*.fsproj"/>
-    <XUnitProject Remove="$(RepoRoot)/test/EFCore.Specification.Tests/*.csproj"/>
-    <XUnitProject Remove="$(RepoRoot)/test/EFCore.AspNet.Specification.Tests/*.csproj"/>
-    <XUnitProject Remove="$(RepoRoot)/test/EFCore.Relational.Specification.Tests/*.csproj"/>
+    <XUnitV3Project Include="$(RepoRoot)/test/**/*.csproj"/>
+    <XUnitV3Project Include="$(RepoRoot)/test/**/*.fsproj"/>
+    <XUnitV3Project Remove="$(RepoRoot)/test/EFCore.Specification.Tests/*.csproj"/>
+    <XUnitV3Project Remove="$(RepoRoot)/test/EFCore.AspNet.Specification.Tests/*.csproj"/>
+    <XUnitV3Project Remove="$(RepoRoot)/test/EFCore.Relational.Specification.Tests/*.csproj"/>
     <!-- The trimming and NativeAOT test projects are console programs -->
-    <XUnitProject Remove="$(RepoRoot)/test/EFCore.TrimmingTests/*.csproj"/>
-    <XUnitProject Remove="$(RepoRoot)/test/EFCore.NativeAotTests/*.csproj"/>
+    <XUnitV3Project Remove="$(RepoRoot)/test/EFCore.TrimmingTests/*.csproj"/>
+    <XUnitV3Project Remove="$(RepoRoot)/test/EFCore.NativeAotTests/*.csproj"/>
     <!-- API baseline tests require source files and cannot run in Helix -->
-    <XUnitProject Remove="$(RepoRoot)/test/EFCore.ApiBaseline.Tests/*.csproj"/>
+    <XUnitV3Project Remove="$(RepoRoot)/test/EFCore.ApiBaseline.Tests/*.csproj"/>
   </ItemGroup>
 
   <!-- Work-around for https://github.com/dotnet/runtime/issues/70758 -->
   <ItemGroup Condition = "'$(HelixTargetQueue.StartsWith(`OSX`))'">
-    <XUnitProject Update="$(RepoRoot)/test/EFCore.InMemory.FunctionalTests/*.csproj;$(RepoRoot)/test/EFCore.Sqlite.FunctionalTests/*.csproj;$(RepoRoot)/test/ef.Tests/*.csproj">
+    <XUnitV3Project Update="$(RepoRoot)/test/EFCore.InMemory.FunctionalTests/*.csproj;$(RepoRoot)/test/EFCore.Sqlite.FunctionalTests/*.csproj;$(RepoRoot)/test/ef.Tests/*.csproj">
       <PreCommands>$(PreCommands); export COMPlus_EnableWriteXorExecute=0</PreCommands>
-    </XUnitProject>
+    </XUnitV3Project>
   </ItemGroup>
 
   <ItemGroup Condition = "'$(HelixTargetQueue.StartsWith(`Windows.10.Amd64`))'">
-    <XUnitProject Remove="$(CosmosTests)"/>
-    <XUnitProject Remove="$(SqlServerTests)"/>
-    <XUnitProject Update="@(XUnitProject)">
+    <XUnitV3Project Remove="$(CosmosTests)"/>
+    <XUnitV3Project Remove="$(SqlServerTests)"/>
+    <XUnitV3Project Update="@(XUnitV3Project)">
       <PreCommands>$(PreCommands); set "Test__SqlServer__DefaultConnection=Data Source="</PreCommands>
-    </XUnitProject>
+    </XUnitV3Project>
   </ItemGroup>
 
   <ItemGroup Condition = "'$(HelixTargetQueue.StartsWith(`Windows.11.Arm64`))'">
-    <XUnitProject Remove="$(SqlServerTests)"/>
-    <XUnitProject Remove="$(CosmosTests)"/>
-    <XUnitProject Update="@(XUnitProject)">
+    <XUnitV3Project Remove="$(SqlServerTests)"/>
+    <XUnitV3Project Remove="$(CosmosTests)"/>
+    <XUnitV3Project Update="@(XUnitV3Project)">
       <PreCommands>$(PreCommands); set "Test__SqlServer__DefaultConnection=Data Source="</PreCommands>
-    </XUnitProject>
+    </XUnitV3Project>
   </ItemGroup>
 
   <ItemGroup Condition = "'$(HelixTargetQueue.StartsWith(`Windows.11.Amd64.Client`))'">
-    <XUnitProject Remove="$(RepoRoot)/test/**/*.csproj"/>
-    <XUnitProject Remove="$(RepoRoot)/test/**/*.fsproj"/>
-    <XUnitProject Include="$(SqlServerTests)">
+    <XUnitV3Project Remove="$(RepoRoot)/test/**/*.csproj"/>
+    <XUnitV3Project Remove="$(RepoRoot)/test/**/*.fsproj"/>
+    <XUnitV3Project Include="$(SqlServerTests)">
       <PreCommands>$(PreCommands); SqlLocalDB start</PreCommands>
-    </XUnitProject>
+    </XUnitV3Project>
   </ItemGroup>
 
   <ItemGroup Condition = "'$(HelixTargetQueue.StartsWith(`Windows.Server2025.Amd64`))'">
-    <XUnitProject Remove="$(RepoRoot)/test/**/*.csproj"/>
-    <XUnitProject Remove="$(RepoRoot)/test/**/*.fsproj"/>
-    <XUnitProject Include="$(CosmosTests)">
+    <XUnitV3Project Remove="$(RepoRoot)/test/**/*.csproj"/>
+    <XUnitV3Project Remove="$(RepoRoot)/test/**/*.fsproj"/>
+    <XUnitV3Project Include="$(CosmosTests)">
       <PreCommands>$(PreCommands); call %HELIX_CORRELATION_PAYLOAD%\testing\WaitCosmosEmulator.cmd; set Test__Cosmos__DefaultConnection=https://localhost:8081; set Test__Cosmos__SkipConnectionCheck=true</PreCommands>
-     </XUnitProject>
+     </XUnitV3Project>
   </ItemGroup>
 
   <!-- Start SqlServer instance for test projects which uses SqlServer on docker. Only run SqlServer tests. -->
   <ItemGroup Condition = "'$(HelixTargetQueue.Contains(`helix-sqlserver`))'">
-    <XUnitProject Remove="$(RepoRoot)/test/**/*.csproj"/>
-    <XUnitProject Remove="$(RepoRoot)/test/**/*.fsproj"/>
-    <XUnitProject Include="$(SqlServerTests)">
+    <XUnitV3Project Remove="$(RepoRoot)/test/**/*.csproj"/>
+    <XUnitV3Project Remove="$(RepoRoot)/test/**/*.fsproj"/>
+    <XUnitV3Project Include="$(SqlServerTests)">
       <PreCommands>$(PreCommands); export MSSQL_SA_PASSWORD=$(MSSQL_SA_PASSWORD); export Test__SqlServer__DefaultConnection="Server=localhost;;Database=master;;User=sa;;Password=$(MSSQL_SA_PASSWORD);;Connect Timeout=60;;ConnectRetryCount=0;;TrustServerCertificate=True"; /opt/mssql/bin/sqlservr --accept-eula &amp;; sleep 120; </PreCommands>
-    </XUnitProject>
+    </XUnitV3Project>
   </ItemGroup>
 
   <!-- Run Cosmos tests on Ubuntu with Docker support (testcontainer auto-starts the emulator) -->
   <ItemGroup Condition = "'$(HelixTargetQueue)' == 'Ubuntu.2204.Amd64.XL.Open' OR '$(HelixTargetQueue)' == 'Ubuntu.2204.Amd64.XL'">
-    <XUnitProject Remove="$(RepoRoot)/test/**/*.csproj"/>
-    <XUnitProject Remove="$(RepoRoot)/test/**/*.fsproj"/>
-    <XUnitProject Include="$(CosmosTests)"/>
+    <XUnitV3Project Remove="$(RepoRoot)/test/**/*.csproj"/>
+    <XUnitV3Project Remove="$(RepoRoot)/test/**/*.fsproj"/>
+    <XUnitV3Project Include="$(CosmosTests)"/>
   </ItemGroup>
 
   <!-- Run tests that don't need SqlServer or Cosmos on bare Ubuntu -->
   <ItemGroup Condition = "'$(HelixTargetQueue)' == 'Ubuntu.2204.Amd64.Open' OR '$(HelixTargetQueue)' == 'Ubuntu.2204.Amd64'">
-    <XUnitProject Remove="$(SqlServerTests)"/>
-    <XUnitProject Remove="$(CosmosTests)"/>
+    <XUnitV3Project Remove="$(SqlServerTests)"/>
+    <XUnitV3Project Remove="$(CosmosTests)"/>
   </ItemGroup>
 
   <!-- Remove test projects which require SqlServer or Cosmos from OSX -->
   <ItemGroup Condition = "'$(HelixTargetQueue.StartsWith(`OSX`))'">
-    <XUnitProject Remove="$(SqlServerTests)"/>
-    <XUnitProject Remove="$(CosmosTests)"/>
+    <XUnitV3Project Remove="$(SqlServerTests)"/>
+    <XUnitV3Project Remove="$(CosmosTests)"/>
+  </ItemGroup>
+
+  <!--
+    Skip tests tagged with the "failing" category. Microsoft.DotNet.XUnitV3Extensions attributes
+    such as [ConditionalClass]/[ConditionalAssembly] add `category=failing` to tests whose
+    condition evaluates to false; this filter is what actually skips them at the runner.
+
+    This must run AFTER any per-queue ItemGroup that re-Includes XUnitV3Project items.
+  -->
+  <ItemGroup>
+    <XUnitV3Project Update="@(XUnitV3Project)">
+      <Arguments>$(XUnitV3Arguments) --filter-not-trait category=failing --ignore-exit-code 8</Arguments>
+    </XUnitV3Project>
   </ItemGroup>
 
   <PropertyGroup>
-    <XUnitPublishTargetFramework>$(NetCurrent)</XUnitPublishTargetFramework>
-    <XUnitRuntimeTargetFramework>netcoreapp2.0</XUnitRuntimeTargetFramework>
-    <XUnitArguments>-verbose</XUnitArguments>
-    <XUnitWorkItemTimeout Condition = "'$(XUnitWorkItemTimeout)' == ''">02:00:00</XUnitWorkItemTimeout>
+    <XUnitWorkItemTimeout Condition = "'$(XUnitWorkItemTimeout)' == ''">03:00:00</XUnitWorkItemTimeout>
   </PropertyGroup>
 </Project>

global.json

@@ -9,6 +9,9 @@
     ],
     "errorMessage": "The required .NET SDK wasn't found. Please run ./restore.sh or .\\restore.cmd to install it."
   },
+  "test": {
+    "runner": "Microsoft.Testing.Platform"
+  },
   "tools": {
     "dotnet": "11.0.100-preview.5.26227.104",
     "runtimes": {

src/EFCore.Cosmos/Storage/Internal/CosmosExecutionStrategy.cs

@@ -3,6 +3,7 @@
 
 using System.Globalization;
 using System.Net;
+using Azure;
 
 namespace Microsoft.EntityFrameworkCore.Cosmos.Storage.Internal;
 
@@ -99,6 +100,7 @@ protected override bool ShouldRetryOn(Exception exception)
             CosmosException cosmosException => IsTransient(cosmosException.StatusCode),
             HttpException httpException => IsTransient(httpException.Response.StatusCode),
             WebException webException => IsTransient((webException.Response as HttpWebResponse)?.StatusCode),
+            RequestFailedException requestFailed => IsTransient((HttpStatusCode)requestFailed.Status),
             _ => false
         };
 

src/EFCore/Metadata/Internal/ForeignKey.cs

@@ -951,6 +951,8 @@ public virtual IDependentKeyValueFactory DependentKeyValueFactory
             if (field == null)
             {
                 EnsureReadOnly();
+                // The principal key value factory creates the dependent key value factory
+                _ = ((IKey)PrincipalKey).GetPrincipalKeyValueFactory();
             }
 
             return field!;

src/EFCore/Metadata/RuntimeForeignKey.cs

@@ -259,18 +259,26 @@ IEnumerable<IReadOnlySkipNavigation> IReadOnlyForeignKey.GetReferencingSkipNavig
     /// <inheritdoc />
     [DebuggerStepThrough]
     IDependentKeyValueFactory<TKey> IForeignKey.GetDependentKeyValueFactory<TKey>()
-        => (IDependentKeyValueFactory<TKey>)_dependentKeyValueFactory!;
+        => (IDependentKeyValueFactory<TKey>)((IRuntimeForeignKey)this).DependentKeyValueFactory;
 
     /// <inheritdoc />
     [DebuggerStepThrough]
     IDependentKeyValueFactory IForeignKey.GetDependentKeyValueFactory()
-        => _dependentKeyValueFactory!;
+        => ((IRuntimeForeignKey)this).DependentKeyValueFactory;
 
     /// <inheritdoc />
     IDependentKeyValueFactory IRuntimeForeignKey.DependentKeyValueFactory
     {
         [DebuggerStepThrough]
-        get => _dependentKeyValueFactory!;
+        get
+        {
+            if (_dependentKeyValueFactory == null)
+            {
+                // The principal key value factory creates the dependent key value factory
+                _ = ((IKey)PrincipalKey).GetPrincipalKeyValueFactory();
+            }
+            return _dependentKeyValueFactory!;
+        }
 
         [DebuggerStepThrough]
         set => _dependentKeyValueFactory = value;