Bump to 7.0-preview.2 and sync dependencies

EF Core -> 7.0.0-preview.2.22107.3

Directory.Build.props

@@ -11,9 +11,9 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <ImplicitUsings>true</ImplicitUsings>
 
-    <Copyright>Copyright 2021 © The Npgsql Development Team</Copyright>
+    <Copyright>Copyright 2022 © The Npgsql Development Team</Copyright>
     <Company>Npgsql</Company>
-    <VersionPrefix>7.0.0-preview.1</VersionPrefix>
+    <VersionPrefix>7.0.0-preview.2</VersionPrefix>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <PackageLicenseExpression>PostgreSQL</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/npgsql/efcore.pg</PackageProjectUrl>

Directory.Packages.props

 <Project>
   <PropertyGroup>
-    <EFCoreVersion>7.0.0-preview.1.22071.1</EFCoreVersion>
-    <MicrosoftExtensionsVersion>7.0.0-alpha.1.22066.4</MicrosoftExtensionsVersion>
+    <EFCoreVersion>7.0.0-preview.2.22107.3</EFCoreVersion>
+    <MicrosoftExtensionsVersion>7.0.0-preview.2.22103.2</MicrosoftExtensionsVersion>
     <NpgsqlVersion>7.0.0-preview.1-ci.20220123T182030</NpgsqlVersion>
   </PropertyGroup>
 

test/EFCore.PG.FunctionalTests/Migrations/MigrationsNpgsqlTest.cs

@@ -1817,6 +1817,14 @@ public override async Task Create_index_unique()
             @"CREATE UNIQUE INDEX ""IX_People_FirstName_LastName"" ON ""People"" (""FirstName"", ""LastName"");");
     }
 
+    [ConditionalFact(Skip = "https://github.com/npgsql/efcore.pg/issues/2267")]
+    public override Task Create_index_descending()
+        => Task.CompletedTask;
+
+    [ConditionalFact(Skip = "https://github.com/npgsql/efcore.pg/issues/2267")]
+    public override Task Create_index_descending_mixed()
+        => Task.CompletedTask;
+
     public override async Task Create_index_with_filter()
     {
         await base.Create_index_with_filter();
@@ -2175,6 +2183,10 @@ public virtual async Task Create_index_tsvector_using_gin()
             @"CREATE INDEX ""IX_Blogs_Title_Description"" ON ""Blogs"" USING GIN (to_tsvector('simple', ""Title"" || ' ' || coalesce(""Description"", '')));");
     }
 
+    [ConditionalFact(Skip = "https://github.com/npgsql/efcore.pg/issues/2267")]
+    public override Task Alter_index_change_sort_order()
+        => Task.CompletedTask;
+
     public override async Task Drop_index()
     {
         await base.Drop_index();

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

@@ -8,10 +8,20 @@ public NorthwindKeylessEntitiesQueryNpgsqlTest(NorthwindQueryNpgsqlFixture<NoopM
         : base(fixture)
     {
         Fixture.TestSqlLoggerFactory.Clear();
-        //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper);
+        // Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper);
     }
 
-    [ConditionalFact(Skip = "https://github.com/dotnet/efcore/issues/21627")]
-    public override void KeylessEntity_with_nav_defining_query()
-        => base.KeylessEntity_with_nav_defining_query();
-}
\ No newline at end of file
+    public override async Task KeylessEntity_with_nav_defining_query(bool async)
+    {
+        // FromSql mapping. Issue #21627.
+        await Assert.ThrowsAsync<PostgresException>(() => base.KeylessEntity_with_nav_defining_query(async));
+
+        AssertSql(
+            @"SELECT c.""CompanyName"", c.""OrderCount"", c.""SearchTerm""
+FROM ""CustomerQueryWithQueryFilter"" AS c
+WHERE c.""OrderCount"" > 0");
+    }
+
+    private void AssertSql(params string[] expected)
+        => Fixture.TestSqlLoggerFactory.AssertBaseline(expected);
+}

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

@@ -152,11 +152,25 @@ SELECT MAX(o.""OrderID"")
 FROM ""Customers"" AS c");
     }
 
-    public override void Select_DTO_constructor_distinct_with_collection_projection_translated_to_server()
+    public override async Task Entity_equality_through_subquery_composite_key(bool async)
+    {
+        var message = (await Assert.ThrowsAsync<InvalidOperationException>(
+            () => base.Entity_equality_through_subquery_composite_key(async))).Message;
+
+        Assert.Equal(
+            CoreStrings.EntityEqualityOnCompositeKeyEntitySubqueryNotSupported("==", nameof(OrderDetail)),
+            message);
+
+        AssertSql();
+    }
+
+    public override async Task
+        Select_DTO_constructor_distinct_with_collection_projection_translated_to_server_with_binding_after_client_eval(bool async)
     {
         // Allow binding of expressions after projection has turned to client eval. Issue #24478.
-        Assert.Throws<TrueException>(
-            () => base.Select_DTO_constructor_distinct_with_collection_projection_translated_to_server());
+        await Assert.ThrowsAsync<TrueException>(
+            () => base
+                .Select_DTO_constructor_distinct_with_collection_projection_translated_to_server_with_binding_after_client_eval(async));
 
         AssertSql(
             @"SELECT t.""CustomerID"", o0.""OrderID"", o0.""CustomerID"", o0.""EmployeeID"", o0.""OrderDate""

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

@@ -43,10 +43,6 @@ public override async Task
         AssertSql();
     }
 
-    [ConditionalTheory(Skip = "https://github.com/dotnet/efcore/issues/27152")]
-    public override Task Reverse_in_subquery_via_pushdown(bool async)
-        => base.Reverse_in_subquery_via_pushdown(async);
-
     public override Task Member_binding_after_ctor_arguments_fails_with_client_eval(bool async)
         => AssertTranslationFailed(() => base.Member_binding_after_ctor_arguments_fails_with_client_eval(async));
 

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

@@ -6,7 +6,11 @@ public class SimpleQueryNpgsqlTest : SimpleQueryRelationalTestBase
 {
     protected override ITestStoreFactory TestStoreFactory => NpgsqlTestStoreFactory.Instance;
 
-    [ConditionalTheory(Skip = "https://github.com/dotnet/efcore/issues/27278")]
-    public override Task Aggregate_over_subquery_in_group_by_projection(bool async)
-        => base.Aggregate_over_subquery_in_group_by_projection(async);
+    // Writes DateTime with Kind=Unspecified to timestamptz
+    public override Task SelectMany_where_Select(bool async)
+        => Task.CompletedTask;
+
+    // Writes DateTime with Kind=Unspecified to timestamptz
+    public override Task Subquery_first_member_compared_to_null(bool async)
+        => Task.CompletedTask;
 }