Sync to EF 11.0.0-preview.5.26275.101

Shay Rojansky · Copilot · Shay Rojansky · commit e19a51629428 · 2026-05-25T22:44:28.000+02:00
Co-authored-by: Copilot &lt;223556219+Copilot@users.noreply.github.com&gt;
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -1,8 +1,8 @@
   <Project>
   <PropertyGroup>
-    <EFCoreVersion>11.0.0-preview.5.26267.102</EFCoreVersion>
-    <MicrosoftExtensionsVersion>11.0.0-preview.5.26267.102</MicrosoftExtensionsVersion>
-    <MicrosoftExtensionsConfigurationVersion>11.0.0-preview.5.26267.102</MicrosoftExtensionsConfigurationVersion>
+    <EFCoreVersion>11.0.0-preview.5.26275.101</EFCoreVersion>
+    <MicrosoftExtensionsVersion>11.0.0-preview.5.26275.101</MicrosoftExtensionsVersion>
+    <MicrosoftExtensionsConfigurationVersion>11.0.0-preview.5.26275.101</MicrosoftExtensionsConfigurationVersion>
     <NpgsqlVersion>10.0.0</NpgsqlVersion>
   </PropertyGroup>
 
@@ -28,6 +28,7 @@
 
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
+    <PackageVersion Include="xunit.v3" Version="4.0.0-pre.108" />
     <PackageVersion Include="xunit" Version="2.9.3" />
     <PackageVersion Include="xunit.assert" Version="2.9.3" />
     <PackageVersion Include="xunit.core" Version="2.9.3" />
diff --git a/NuGet.config b/NuGet.config
@@ -21,6 +21,9 @@
         <packageSource key="dotnet11">
             <package pattern="*" />
         </packageSource>
+        <packageSource key="dotnet-eng">
+            <package pattern="Microsoft.DotNet.*" />
+        </packageSource>
     </packageSourceMapping>
 
 </configuration>
diff --git a/global.json b/global.json
@@ -3,5 +3,8 @@
     "version": "11.0.100-preview.4.26210.111",
     "rollForward": "latestMinor",
     "allowPrerelease": true
+  },
+  "test": {
+    "runner": "Microsoft.Testing.Platform"
   }
 }
diff --git a/test/Directory.Build.props b/test/Directory.Build.props
@@ -5,14 +5,21 @@
   <PropertyGroup>
     <IsPackable>false</IsPackable>
     <GenerateDocumentationFile>false</GenerateDocumentationFile>
+    <UseMicrosoftTestingPlatformRunner>true</UseMicrosoftTestingPlatformRunner>
 
     <!-- There's lots of use of internal EF Core APIs from the tests, suppress the analyzer warnings for those -->
-    <NoWarn>$(NoWarn);xUnit1003;xUnit1004;xUnit1013;xUnit1024;EF1001</NoWarn>
+    <NoWarn>$(NoWarn);CS0618;xUnit1003;xUnit1004;xUnit1013;xUnit1024;xUnit1051;EF1001</NoWarn>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TestRunnerName>XUnitV3</TestRunnerName>
+    <TestingPlatformCommandLineArguments>$(TestingPlatformCommandLineArguments) --filter-not-trait category=failing --ignore-exit-code 8</TestingPlatformCommandLineArguments>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.v3" />
     <PackageReference Include="xunit.runner.visualstudio" />
     <PackageReference Include="GitHubActionsTestLogger" />
     <PackageReference Include="Npgsql" />
@@ -24,7 +31,6 @@
 
   <ItemGroup>
     <Using Include="Xunit" />
-    <Using Include="Xunit.Abstractions" />
     <Using Include="Microsoft.EntityFrameworkCore.TestUtilities" />
     <Using Include="Microsoft.EntityFrameworkCore.TestUtilities.Xunit" />
   </ItemGroup>
diff --git a/test/EFCore.PG.FunctionalTests/ComputedColumnTest.cs b/test/EFCore.PG.FunctionalTests/ComputedColumnTest.cs
@@ -134,9 +134,9 @@ public void Can_use_computed_columns_with_nullable_enum()
 
     protected NpgsqlTestStore TestStore { get; private set; } = null!;
 
-    public async Task InitializeAsync()
+    public async ValueTask InitializeAsync()
         => TestStore = await NpgsqlTestStore.CreateInitializedAsync("ComputedColumnTest");
 
-    public async Task DisposeAsync()
+    public async ValueTask DisposeAsync()
         => await TestStore.DisposeAsync();
 }
diff --git a/test/EFCore.PG.FunctionalTests/Query/CompatibilityQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/CompatibilityQueryNpgsqlTest.cs
@@ -74,7 +74,7 @@ public virtual CompatibilityContext CreateRedshiftContext()
             return new CompatibilityContext(builder.Options);
         }
 
-        public virtual async Task InitializeAsync()
+        public virtual async ValueTask InitializeAsync()
         {
             _testStore = NpgsqlTestStoreFactory.Instance.GetOrCreate(StoreName);
             await _testStore.InitializeAsync(null, CreateContext, c => CompatibilityContext.SeedAsync((CompatibilityContext)c));
@@ -85,7 +85,7 @@ public virtual void Dispose()
         {
         }
 
-        public virtual async Task DisposeAsync()
+        public virtual async ValueTask DisposeAsync()
             => await _testStore.DisposeAsync();
     }
 
diff --git a/test/EFCore.PG.FunctionalTests/Query/LegacyTimestampQueryTest.cs b/test/EFCore.PG.FunctionalTests/Query/LegacyTimestampQueryTest.cs
@@ -110,10 +110,10 @@ public LegacyTimestampQueryFixture()
                 NpgsqlTypeMappingSource.LegacyTimestampBehavior = true;
             }
 
-            public override Task DisposeAsync()
+            public override ValueTask DisposeAsync()
             {
                 NpgsqlTypeMappingSource.LegacyTimestampBehavior = false;
-                return Task.CompletedTask;
+                return ValueTask.CompletedTask;
             }
 
             protected override async Task SeedAsync(TimestampQueryContext context)
diff --git a/test/EFCore.PG.FunctionalTests/Query/NorthwindDbFunctionsQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/NorthwindDbFunctionsQueryNpgsqlTest.cs
@@ -127,7 +127,7 @@ WHERE c."ContactName" NOT ILIKE '%M%' OR c."ContactName" IS NULL
     #region Collation
 
     [MinimumPostgresVersion(12, 0)]
-    [PlatformSkipCondition(TestUtilities.Xunit.TestPlatform.Windows, SkipReason = "ICU non-deterministic doesn't seem to work on Windows?")]
+    [SkipOnPlatform(TestPlatforms.Windows, "ICU non-deterministic doesn't seem to work on Windows?")]
     public override async Task Collate_case_insensitive(bool async)
     {
         await base.Collate_case_insensitive(async);
diff --git a/test/EFCore.PG.FunctionalTests/Scaffolding/NpgsqlDatabaseModelFactoryTest.cs b/test/EFCore.PG.FunctionalTests/Scaffolding/NpgsqlDatabaseModelFactoryTest.cs
@@ -2214,7 +2214,7 @@ protected override ITestStoreFactory TestStoreFactory
         public new NpgsqlTestStore TestStore
             => (NpgsqlTestStore)base.TestStore;
 
-        public override async Task InitializeAsync()
+        public override async ValueTask InitializeAsync()
         {
             await base.InitializeAsync();
             await TestStore.ExecuteNonQueryAsync("CREATE SCHEMA IF NOT EXISTS db2");
diff --git a/test/EFCore.PG.FunctionalTests/SequenceEndToEndTest.cs b/test/EFCore.PG.FunctionalTests/SequenceEndToEndTest.cs
@@ -391,9 +391,9 @@ private class Unicon
 
     protected NpgsqlTestStore TestStore { get; private set; } = null!;
 
-    public async Task InitializeAsync()
+    public async ValueTask InitializeAsync()
         => TestStore = await NpgsqlTestStore.CreateInitializedAsync("SequenceEndToEndTest");
 
-    public async Task DisposeAsync()
+    public async ValueTask DisposeAsync()
         => await TestStore.DisposeAsync();
 }
diff --git a/test/EFCore.PG.FunctionalTests/TestUtilities/MinimumPostgresVersionAttribute.cs b/test/EFCore.PG.FunctionalTests/TestUtilities/MinimumPostgresVersionAttribute.cs
@@ -1,13 +1,16 @@
 namespace Microsoft.EntityFrameworkCore.TestUtilities;
 
 [AttributeUsage(AttributeTargets.Method | AttributeTargets.Class)]
-public sealed class MinimumPostgresVersionAttribute(int major, int minor) : Attribute, ITestCondition
+public sealed class MinimumPostgresVersionAttribute(int major, int minor) : Attribute, global::Xunit.v3.ITraitAttribute
 {
     private readonly Version _version = new(major, minor);
 
-    public ValueTask<bool> IsMetAsync()
-        => new(TestEnvironment.PostgresVersion >= _version);
+    private bool IsMet
+        => TestEnvironment.PostgresVersion >= _version;
 
     public string SkipReason
         => $"Requires PostgreSQL version {_version} or later.";
+
+    public IReadOnlyCollection<KeyValuePair<string, string>> GetTraits()
+        => IsMet ? [] : [new("category", "failing")];
 }
diff --git a/test/EFCore.PG.FunctionalTests/TestUtilities/RequiresPostgisAttribute.cs b/test/EFCore.PG.FunctionalTests/TestUtilities/RequiresPostgisAttribute.cs
@@ -3,11 +3,15 @@
 namespace Microsoft.EntityFrameworkCore.TestUtilities;
 
 [AttributeUsage(AttributeTargets.Method | AttributeTargets.Class)]
-public sealed class RequiresPostgisAttribute : Attribute, ITestCondition
+public sealed class RequiresPostgisAttribute : Attribute, global::Xunit.v3.ITraitAttribute
 {
-    public ValueTask<bool> IsMetAsync()
-        => new(TestEnvironment.IsPostgisAvailable || Environment.GetEnvironmentVariable("NPGSQL_TEST_POSTGIS")?.ToLower(CultureInfo.InvariantCulture) is "1" or "true");
+    private static bool IsMet
+        => TestEnvironment.IsPostgisAvailable
+            || Environment.GetEnvironmentVariable("NPGSQL_TEST_POSTGIS")?.ToLower(CultureInfo.InvariantCulture) is "1" or "true";
 
     public string SkipReason
         => "PostGIS isn't installed, skipping";
+
+    public IReadOnlyCollection<KeyValuePair<string, string>> GetTraits()
+        => IsMet ? [] : [new("category", "failing")];
 }

Original file line number	Diff line number	Diff line change
`@@ -3,5 +3,8 @@`
`3`	`3`	`"version": "11.0.100-preview.4.26210.111",`
`4`	`4`	`"rollForward": "latestMinor",`
`5`	`5`	`"allowPrerelease": true`
	`6`	`+ },`
	`7`	`+ "test": {`
	`8`	`+ "runner": "Microsoft.Testing.Platform"`
`6`	`9`	`}`
`7`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -134,9 +134,9 @@ public void Can_use_computed_columns_with_nullable_enum()`
`134`	`134`
`135`	`135`	`protected NpgsqlTestStore TestStore { get; private set; } = null!;`
`136`	`136`
`137`		`- public async Task InitializeAsync()`
	`137`	`+ public async ValueTask InitializeAsync()`
`138`	`138`	`=> TestStore = await NpgsqlTestStore.CreateInitializedAsync("ComputedColumnTest");`
`139`	`139`
`140`		`- public async Task DisposeAsync()`
	`140`	`+ public async ValueTask DisposeAsync()`
`141`	`141`	`=> await TestStore.DisposeAsync();`
`142`	`142`	`}`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public virtual CompatibilityContext CreateRedshiftContext()`
`74`	`74`	`return new CompatibilityContext(builder.Options);`
`75`	`75`	`}`
`76`	`76`
`77`		`- public virtual async Task InitializeAsync()`
	`77`	`+ public virtual async ValueTask InitializeAsync()`
`78`	`78`	`{`
`79`	`79`	`_testStore = NpgsqlTestStoreFactory.Instance.GetOrCreate(StoreName);`
`80`	`80`	`await _testStore.InitializeAsync(null, CreateContext, c => CompatibilityContext.SeedAsync((CompatibilityContext)c));`
`@@ -85,7 +85,7 @@ public virtual void Dispose()`
`85`	`85`	`{`
`86`	`86`	`}`
`87`	`87`
`88`		`- public virtual async Task DisposeAsync()`
	`88`	`+ public virtual async ValueTask DisposeAsync()`
`89`	`89`	`=> await _testStore.DisposeAsync();`
`90`	`90`	`}`
`91`	`91`
Original file line number	Diff line number	Diff line change
`@@ -110,10 +110,10 @@ public LegacyTimestampQueryFixture()`
`110`	`110`	`NpgsqlTypeMappingSource.LegacyTimestampBehavior = true;`
`111`	`111`	`}`
`112`	`112`
`113`		`- public override Task DisposeAsync()`
	`113`	`+ public override ValueTask DisposeAsync()`
`114`	`114`	`{`
`115`	`115`	`NpgsqlTypeMappingSource.LegacyTimestampBehavior = false;`
`116`		`- return Task.CompletedTask;`
	`116`	`+ return ValueTask.CompletedTask;`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`protected override async Task SeedAsync(TimestampQueryContext context)`
Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ WHERE c."ContactName" NOT ILIKE '%M%' OR c."ContactName" IS NULL`
`127`	`127`	`#region Collation`
`128`	`128`
`129`	`129`	`[MinimumPostgresVersion(12, 0)]`
`130`		`- [PlatformSkipCondition(TestUtilities.Xunit.TestPlatform.Windows, SkipReason = "ICU non-deterministic doesn't seem to work on Windows?")]`
	`130`	`+ [SkipOnPlatform(TestPlatforms.Windows, "ICU non-deterministic doesn't seem to work on Windows?")]`
`131`	`131`	`public override async Task Collate_case_insensitive(bool async)`
`132`	`132`	`{`
`133`	`133`	`await base.Collate_case_insensitive(async);`
Original file line number	Diff line number	Diff line change
`@@ -2214,7 +2214,7 @@ protected override ITestStoreFactory TestStoreFactory`
`2214`	`2214`	`public new NpgsqlTestStore TestStore`
`2215`	`2215`	`=> (NpgsqlTestStore)base.TestStore;`
`2216`	`2216`
`2217`		`- public override async Task InitializeAsync()`
	`2217`	`+ public override async ValueTask InitializeAsync()`
`2218`	`2218`	`{`
`2219`	`2219`	`await base.InitializeAsync();`
`2220`	`2220`	`await TestStore.ExecuteNonQueryAsync("CREATE SCHEMA IF NOT EXISTS db2");`
Original file line number	Diff line number	Diff line change
`@@ -391,9 +391,9 @@ private class Unicon`
`391`	`391`
`392`	`392`	`protected NpgsqlTestStore TestStore { get; private set; } = null!;`
`393`	`393`
`394`		`- public async Task InitializeAsync()`
	`394`	`+ public async ValueTask InitializeAsync()`
`395`	`395`	`=> TestStore = await NpgsqlTestStore.CreateInitializedAsync("SequenceEndToEndTest");`
`396`	`396`
`397`		`- public async Task DisposeAsync()`
	`397`	`+ public async ValueTask DisposeAsync()`
`398`	`398`	`=> await TestStore.DisposeAsync();`
`399`	`399`	`}`