Sync to EF 11.0.0-preview.3.26155.101 (#3769)

Author: roji

Directory.Packages.props

@@ -1,8 +1,8 @@
   <Project>
   <PropertyGroup>
-    <EFCoreVersion>11.0.0-preview.2.26154.117</EFCoreVersion>
-    <MicrosoftExtensionsVersion>11.0.0-preview.2.26154.117</MicrosoftExtensionsVersion>
-    <MicrosoftExtensionsConfigurationVersion>11.0.0-preview.2.26154.117</MicrosoftExtensionsConfigurationVersion>
+    <EFCoreVersion>11.0.0-preview.3.26155.101</EFCoreVersion>
+    <MicrosoftExtensionsVersion>11.0.0-preview.3.26155.101</MicrosoftExtensionsVersion>
+    <MicrosoftExtensionsConfigurationVersion>11.0.0-preview.3.26155.101</MicrosoftExtensionsConfigurationVersion>
     <NpgsqlVersion>10.0.0</NpgsqlVersion>
   </PropertyGroup>
 

test/EFCore.PG.FunctionalTests/BulkUpdates/NonSharedModelBulkUpdatesNpgsqlTest.cs

@@ -2,7 +2,7 @@ namespace Microsoft.EntityFrameworkCore.BulkUpdates;
 
 public class NonSharedModelBulkUpdatesNpgsqlTest(NonSharedFixture fixture) : NonSharedModelBulkUpdatesRelationalTestBase(fixture)
 {
-    protected override ITestStoreFactory TestStoreFactory
+    protected override ITestStoreFactory NonSharedTestStoreFactory
         => NpgsqlTestStoreFactory.Instance;
 
 
@@ -149,7 +149,7 @@ public override async Task Update_owned_and_non_owned_properties_with_table_shar
     public override async Task Update_main_table_in_entity_with_entity_splitting(bool async)
     {
         // Overridden/duplicated because we update DateTime, which Npgsql requires to be a UTC timestamp
-        var contextFactory = await InitializeAsync<DbContext>(
+        var contextFactory = await InitializeNonSharedTest<DbContext>(
             onModelCreating: mb => mb.Entity<Blog>()
                 .ToTable("Blogs")
                 .SplitToTable(
@@ -166,7 +166,7 @@ public override async Task Update_main_table_in_entity_with_entity_splitting(boo
 
         await AssertUpdate(
             async,
-            contextFactory.CreateContext,
+            contextFactory.CreateDbContext,
             ss => ss.Set<Blog>(),
             s => s.SetProperty(b => b.CreationTimestamp, b => new DateTime(2020, 1, 1, 0, 0, 0, DateTimeKind.Utc)),
             rowsAffectedCount: 1);
@@ -226,7 +226,7 @@ SELECT COALESCE(sum(o0."Amount"), 0)::int
     [MemberData(nameof(IsAsyncData))]
     public virtual async Task Update_with_primitive_collection_in_value_selector(bool async)
     {
-        var contextFactory = await InitializeAsync<Context3001>(
+        var contextFactory = await InitializeNonSharedTest<Context3001>(
             seed: async ctx =>
             {
                 ctx.AddRange(new EntityWithPrimitiveCollection { Tags = ["tag1", "tag2"] });
@@ -235,7 +235,7 @@ public virtual async Task Update_with_primitive_collection_in_value_selector(boo
 
         await Assert.ThrowsAsync<InvalidOperationException>(() => AssertUpdate(
             async,
-            contextFactory.CreateContext,
+            contextFactory.CreateDbContext,
             ss => ss.EntitiesWithPrimitiveCollection,
             s => s.SetProperty(x => x.Tags, x => x.Tags.Append("another_tag")),
             rowsAffectedCount: 1));

test/EFCore.PG.FunctionalTests/BulkUpdates/NorthwindBulkUpdatesNpgsqlTest.cs

@@ -1697,6 +1697,33 @@ ORDER BY o1."OrderID" NULLS FIRST
 """);
     }
 
+    public override async Task Update_with_select_mixed_entity_scalar_anonymous_projection(bool async)
+    {
+        await base.Update_with_select_mixed_entity_scalar_anonymous_projection(async);
+
+        AssertSql(
+            """
+@p='Updated'
+
+UPDATE "Customers" AS c
+SET "ContactName" = @p
+""");
+    }
+
+    public override async Task Update_with_select_scalar_anonymous_projection(bool async)
+    {
+        await base.Update_with_select_scalar_anonymous_projection(async);
+
+        AssertSql(
+            """
+@p='Updated'
+
+UPDATE "Customers" AS c
+SET "ContactName" = @p
+""");
+    }
+
+
     [ConditionalFact]
     public virtual void Check_all_tests_overridden()
         => TestHelpers.AssertAllMethodsOverridden(GetType());

test/EFCore.PG.FunctionalTests/EntitySplittingNpgsqlTest.cs

@@ -3,6 +3,6 @@ namespace Microsoft.EntityFrameworkCore;
 public class EntitySplittingNpgsqlTest(NonSharedFixture fixture, ITestOutputHelper testOutputHelper)
     : EntitySplittingTestBase(fixture, testOutputHelper)
 {
-    protected override ITestStoreFactory TestStoreFactory
+    protected override ITestStoreFactory NonSharedTestStoreFactory
         => NpgsqlTestStoreFactory.Instance;
 }

test/EFCore.PG.FunctionalTests/JsonTypesNpgsqlTest.cs

@@ -563,12 +563,12 @@ protected class LogSequenceNumberType
         public NpgsqlLogSequenceNumber LogSequenceNumber { get; set; }
     }
 
-    protected override ITestStoreFactory TestStoreFactory => NpgsqlTestStoreFactory.Instance;
+    protected override ITestStoreFactory NonSharedTestStoreFactory => NpgsqlTestStoreFactory.Instance;
 
     protected override IServiceCollection AddServices(IServiceCollection serviceCollection)
         => serviceCollection.AddEntityFrameworkNpgsqlNetTopologySuite();
 
-    protected override DbContextOptionsBuilder AddOptions(DbContextOptionsBuilder builder)
+    protected override DbContextOptionsBuilder AddNonSharedOptions(DbContextOptionsBuilder builder)
     {
         // Note that the enum doesn't actually need to be created in the database, since Can_read_and_write_JSON_value doesn't access
         // the database. We just need the mapping to be picked up by EFCore.PG from the ADO.NET layer.

test/EFCore.PG.FunctionalTests/MaterializationInterceptionNpgsqlTest.cs

@@ -16,6 +16,6 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
         }
     }
 
-    protected override ITestStoreFactory TestStoreFactory
+    protected override ITestStoreFactory NonSharedTestStoreFactory
         => NpgsqlTestStoreFactory.Instance;
 }

test/EFCore.PG.FunctionalTests/Query/AdHocAdvancedMappingsQueryNpgsqlTest.cs

@@ -3,7 +3,7 @@ namespace Microsoft.EntityFrameworkCore.Query;
 public class AdHocAdvancedMappingsQueryNpgsqlTest(NonSharedFixture fixture)
     : AdHocAdvancedMappingsQueryRelationalTestBase(fixture)
 {
-    protected override ITestStoreFactory TestStoreFactory
+    protected override ITestStoreFactory NonSharedTestStoreFactory
         => NpgsqlTestStoreFactory.Instance;
 
     // Cannot write DateTime with Kind=Unspecified to PostgreSQL type 'timestamp with time zone', only UTC is supported.

test/EFCore.PG.FunctionalTests/Query/AdHocComplexTypeQueryNpgsqlTest.cs

@@ -19,6 +19,6 @@ LIMIT 2
 """);
     }
 
-    protected override ITestStoreFactory TestStoreFactory
+    protected override ITestStoreFactory NonSharedTestStoreFactory
         => NpgsqlTestStoreFactory.Instance;
 }

test/EFCore.PG.FunctionalTests/Query/AdHocJsonQueryNpgsqlTest.cs

@@ -8,7 +8,7 @@ namespace Microsoft.EntityFrameworkCore.Query;
 
 public class AdHocJsonQueryNpgsqlTest(NonSharedFixture fixture) : AdHocJsonQueryRelationalTestBase(fixture)
 {
-    protected override ITestStoreFactory TestStoreFactory
+    protected override ITestStoreFactory NonSharedTestStoreFactory
         => NpgsqlTestStoreFactory.Instance;
 
     protected override async Task Seed29219(DbContext ctx)
@@ -179,7 +179,7 @@ protected override Task SeedBadJsonProperties(ContextBadJsonProperties ctx)
     [ConditionalTheory, MemberData(nameof(IsAsyncData))]
     public virtual async Task Json_predicate_on_bytea(bool async)
     {
-        var contextFactory = await InitializeAsync<TypesDbContext>(
+        var contextFactory = await InitializeNonSharedTest<TypesDbContext>(
             seed: async context =>
             {
                 context.Entities.AddRange(
@@ -188,7 +188,7 @@ public virtual async Task Json_predicate_on_bytea(bool async)
                 await context.SaveChangesAsync();
             });
 
-        using (var context = contextFactory.CreateContext())
+        using (var context = contextFactory.CreateDbContext())
         {
             var query = context.Entities.Where(x => x.JsonEntity.Bytea == new byte[] { 1, 2, 4 });
 
@@ -211,7 +211,7 @@ LIMIT 2
     [ConditionalTheory, MemberData(nameof(IsAsyncData))]
     public virtual async Task Json_predicate_on_interval(bool async)
     {
-        var contextFactory = await InitializeAsync<TypesDbContext>(
+        var contextFactory = await InitializeNonSharedTest<TypesDbContext>(
             seed: async context =>
             {
                 context.Entities.AddRange(
@@ -220,7 +220,7 @@ public virtual async Task Json_predicate_on_interval(bool async)
                 await context.SaveChangesAsync();
             });
 
-        using (var context = contextFactory.CreateContext())
+        using (var context = contextFactory.CreateDbContext())
         {
             var query = context.Entities.Where(x => x.JsonEntity.Interval == new TimeSpan(2, 2, 3, 4, 123, 456));
 

test/EFCore.PG.FunctionalTests/Query/AdHocManyToManyQueryNpgsqlTest.cs

@@ -2,6 +2,6 @@ namespace Microsoft.EntityFrameworkCore.Query;
 
 public class AdHocManyToManyQueryNpgsqlTest(NonSharedFixture fixture) : AdHocManyToManyQueryRelationalTestBase(fixture)
 {
-    protected override ITestStoreFactory TestStoreFactory
+    protected override ITestStoreFactory NonSharedTestStoreFactory
         => NpgsqlTestStoreFactory.Instance;
 }