diff --git a/Directory.Packages.props b/Directory.Packages.props
index b49d16aee..8048e89af 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -1,7 +1,7 @@
- 10.0.0-rc.2.25502.107
- 10.0.0-rc.2.25502.107
+ 10.0.0
+ 10.0.0
10.0.0-rc.2-ci.20251107T191940
@@ -10,11 +10,11 @@
Dependencies on EF preview versions should be locked to a specific version (as provider-facing breaking changes are frequent).
For released versions, depend on anything in the current major version to allow users to update to higher patch versions.
-->
-
-
-
-
-
+
+
+
+
+
@@ -26,15 +26,11 @@
-
+
-
+
-
-
-
-
diff --git a/test/EFCore.PG.FunctionalTests/EFCore.PG.FunctionalTests.csproj b/test/EFCore.PG.FunctionalTests/EFCore.PG.FunctionalTests.csproj
index 278a40050..ae0c6c54d 100644
--- a/test/EFCore.PG.FunctionalTests/EFCore.PG.FunctionalTests.csproj
+++ b/test/EFCore.PG.FunctionalTests/EFCore.PG.FunctionalTests.csproj
@@ -18,14 +18,6 @@
-
-
-
-
-
-
-
-
diff --git a/test/EFCore.PG.FunctionalTests/Query/AdHocComplexTypeQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/AdHocComplexTypeQueryNpgsqlTest.cs
index b83a30a83..83cc8d30e 100644
--- a/test/EFCore.PG.FunctionalTests/Query/AdHocComplexTypeQueryNpgsqlTest.cs
+++ b/test/EFCore.PG.FunctionalTests/Query/AdHocComplexTypeQueryNpgsqlTest.cs
@@ -2,6 +2,10 @@ namespace Microsoft.EntityFrameworkCore.Query;
public class AdHocComplexTypeQueryNpgsqlTest(NonSharedFixture fixture) : AdHocComplexTypeQueryTestBase(fixture)
{
+ // Test is SQL Server-specific and being removed, https://github.com/dotnet/efcore/pull/37177
+ public override Task Complex_type_equality_with_non_default_type_mapping()
+ => Task.CompletedTask;
+
public override async Task Complex_type_equals_parameter_with_nested_types_with_property_of_same_name()
{
await base.Complex_type_equals_parameter_with_nested_types_with_property_of_same_name();
diff --git a/test/EFCore.PG.FunctionalTests/Query/Associations/ComplexJson/ComplexJsonStructuralEqualityNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/Associations/ComplexJson/ComplexJsonStructuralEqualityNpgsqlTest.cs
index ea0f4ad95..90ad538a0 100644
--- a/test/EFCore.PG.FunctionalTests/Query/Associations/ComplexJson/ComplexJsonStructuralEqualityNpgsqlTest.cs
+++ b/test/EFCore.PG.FunctionalTests/Query/Associations/ComplexJson/ComplexJsonStructuralEqualityNpgsqlTest.cs
@@ -150,16 +150,13 @@ public override async Task Nested_collection_with_parameter()
public override async Task Contains_with_inline()
{
- // https://github.com/dotnet/efcore/issues/36837
- await Assert.ThrowsAsync(async () =>
- {
- await base.Contains_with_inline();
-
- // TODO: The following translation is sub-optimal: we should be using OPENSJON to extract elements of the collection as JSON elements (OPENJSON WITH JSON),
- // and comparison those elements to a single entire JSON fragment on the other side (just like non-collection JSON comparison), rather than breaking the
- // elements down to their columns and doing column-by-column comparison. See #32576.
- AssertSql(
- """
+ await base.Contains_with_inline();
+
+ // TODO: The following translation is sub-optimal: we should be using OPENSJON to extract elements of the collection as JSON elements (OPENJSON WITH JSON),
+ // and comparison those elements to a single entire JSON fragment on the other side (just like non-collection JSON comparison), rather than breaking the
+ // elements down to their columns and doing column-by-column comparison. See #32576.
+ AssertSql(
+ """
SELECT r."Id", r."Name", r."AssociateCollection", r."OptionalAssociate", r."RequiredAssociate"
FROM "RootEntity" AS r
WHERE EXISTS (
@@ -173,21 +170,17 @@ FROM ROWS FROM (jsonb_to_recordset(r."RequiredAssociate" -> 'NestedCollection')
)) WITH ORDINALITY AS n
WHERE n."Id" = 1002 AND n."Int" = 8 AND n."Ints" = '[1,2,3]' AND n."Name" = 'Root1_RequiredAssociate_NestedCollection_1' AND n."String" = 'foo')
""");
- });
}
public override async Task Contains_with_parameter()
{
- // https://github.com/dotnet/efcore/issues/36837
- await Assert.ThrowsAsync(async () =>
- {
- await base.Contains_with_parameter();
-
- // TODO: The following translation is sub-optimal: we should be using OPENSJON to extract elements of the collection as JSON elements (OPENJSON WITH JSON),
- // and comparison those elements to a single entire JSON fragment on the other side (just like non-collection JSON comparison), rather than breaking the
- // elements down to their columns and doing column-by-column comparison. See #32576.
- AssertSql(
- """
+ await base.Contains_with_parameter();
+
+ // TODO: The following translation is sub-optimal: we should be using OPENSJON to extract elements of the collection as JSON elements (OPENJSON WITH JSON),
+ // and comparison those elements to a single entire JSON fragment on the other side (just like non-collection JSON comparison), rather than breaking the
+ // elements down to their columns and doing column-by-column comparison. See #32576.
+ AssertSql(
+ """
@entity_equality_nested_Id='?' (DbType = Int32)
@entity_equality_nested_Int='?' (DbType = Int32)
@entity_equality_nested_Ints='?' (DbType = Object)
@@ -207,18 +200,14 @@ FROM ROWS FROM (jsonb_to_recordset(r."RequiredAssociate" -> 'NestedCollection')
)) WITH ORDINALITY AS n
WHERE n."Id" = @entity_equality_nested_Id AND n."Int" = @entity_equality_nested_Int AND n."Ints" = @entity_equality_nested_Ints AND n."Name" = @entity_equality_nested_Name AND n."String" = @entity_equality_nested_String)
""");
- });
}
public override async Task Contains_with_operators_composed_on_the_collection()
{
- // https://github.com/dotnet/efcore/issues/36837
- await Assert.ThrowsAsync(async () =>
- {
- await base.Contains_with_operators_composed_on_the_collection();
+ await base.Contains_with_operators_composed_on_the_collection();
- AssertSql(
- """
+ AssertSql(
+ """
@get_Item_Int='?' (DbType = Int32)
@entity_equality_get_Item_Id='?' (DbType = Int32)
@entity_equality_get_Item_Int='?' (DbType = Int32)
@@ -239,18 +228,14 @@ FROM ROWS FROM (jsonb_to_recordset(r."RequiredAssociate" -> 'NestedCollection')
)) WITH ORDINALITY AS n
WHERE n."Int" > @get_Item_Int AND n."Id" = @entity_equality_get_Item_Id AND n."Int" = @entity_equality_get_Item_Int AND n."Ints" = @entity_equality_get_Item_Ints AND n."Name" = @entity_equality_get_Item_Name AND n."String" = @entity_equality_get_Item_String)
""");
- });
}
public override async Task Contains_with_nested_and_composed_operators()
{
- // https://github.com/dotnet/efcore/issues/36837
- await Assert.ThrowsAsync(async () =>
- {
- await base.Contains_with_nested_and_composed_operators();
+ await base.Contains_with_nested_and_composed_operators();
- AssertSql(
- """
+ AssertSql(
+ """
@get_Item_Id='?' (DbType = Int32)
@entity_equality_get_Item_Id='?' (DbType = Int32)
@entity_equality_get_Item_Int='?' (DbType = Int32)
@@ -277,7 +262,6 @@ FROM ROWS FROM (jsonb_to_recordset(r."AssociateCollection") AS (
)) WITH ORDINALITY AS a
WHERE a."Id" > @get_Item_Id AND a."Id" = @entity_equality_get_Item_Id AND a."Int" = @entity_equality_get_Item_Int AND a."Ints" = @entity_equality_get_Item_Ints AND a."Name" = @entity_equality_get_Item_Name AND a."String" = @entity_equality_get_Item_String AND (a."NestedCollection") = @entity_equality_get_Item_NestedCollection AND (a."OptionalNestedAssociate") = @entity_equality_get_Item_OptionalNestedAssociate AND (a."RequiredNestedAssociate") = @entity_equality_get_Item_RequiredNestedAssociate)
""");
- });
}
#endregion Contains
diff --git a/test/EFCore.PG.Tests/EFCore.PG.Tests.csproj b/test/EFCore.PG.Tests/EFCore.PG.Tests.csproj
index 15489c031..8facd65ab 100644
--- a/test/EFCore.PG.Tests/EFCore.PG.Tests.csproj
+++ b/test/EFCore.PG.Tests/EFCore.PG.Tests.csproj
@@ -19,14 +19,6 @@
-
-
-
-
-
-
-
-