npgsql · roji · Aug 17, 2025 · Aug 17, 2025
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -1,16 +1,20 @@
   <Project>
   <PropertyGroup>
-    <EFCoreVersion>10.0.0-preview.7.25352.2</EFCoreVersion>
-    <MicrosoftExtensionsVersion>10.0.0-preview.7.25351.105</MicrosoftExtensionsVersion>
+    <EFCoreVersion>10.0.0-preview.7.25380.108</EFCoreVersion>
+    <MicrosoftExtensionsVersion>10.0.0-preview.7.25380.108</MicrosoftExtensionsVersion>
     <NpgsqlVersion>9.0.3</NpgsqlVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageVersion Include="Microsoft.EntityFrameworkCore" Version="$(EFCoreVersion)" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="$(EFCoreVersion)" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Abstractions" Version="$(EFCoreVersion)" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="$(EFCoreVersion)" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="$(EFCoreVersion)" />
+    <!--
+      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.
+    -->
+    <PackageVersion Include="Microsoft.EntityFrameworkCore" Version="[$(EFCoreVersion)]" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="[$(EFCoreVersion)]" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Abstractions" Version="[$(EFCoreVersion)]" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="[$(EFCoreVersion)]" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="[$(EFCoreVersion)]" />
 
     <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="$(MicrosoftExtensionsVersion)" />
     <PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MicrosoftExtensionsVersion)" />
@@ -22,11 +26,11 @@
     <PackageVersion Include="Npgsql.DependencyInjection" Version="$(NpgsqlVersion)" />
 
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageVersion Include="xunit" Version="2.9.2" />
-    <PackageVersion Include="xunit.assert" Version="2.9.2" />
-    <PackageVersion Include="xunit.core" Version="2.9.2" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="3.0.2" />
-    <PackageVersion Include="GitHubActionsTestLogger" Version="2.3.3" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
+    <PackageVersion Include="xunit" Version="2.9.3" />
+    <PackageVersion Include="xunit.assert" Version="2.9.3" />
+    <PackageVersion Include="xunit.core" Version="2.9.3" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.3" />
+    <PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" />
   </ItemGroup>
 </Project>
diff --git a/src/EFCore.PG/Infrastructure/Internal/NpgsqlOptionsExtension.cs b/src/EFCore.PG/Infrastructure/Internal/NpgsqlOptionsExtension.cs
@@ -11,7 +11,7 @@ namespace Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure.Internal;
 public class NpgsqlOptionsExtension : RelationalOptionsExtension
 {
     private DbContextOptionsExtensionInfo? _info;
-    private ParameterizedCollectionMode? _parameterizedCollectionMode;
+    private ParameterTranslationMode? _parameterizedCollectionMode;
 
     private readonly List<UserRangeDefinition> _userRangeDefinitions;
     private readonly List<EnumDefinition> _enumDefinitions;
@@ -27,8 +27,8 @@ public class NpgsqlOptionsExtension : RelationalOptionsExtension
     ///     any release. You should only use it directly in your code with extreme caution and knowing that
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
-    public override ParameterizedCollectionMode ParameterizedCollectionMode
-        => _parameterizedCollectionMode ?? ParameterizedCollectionMode.Parameter;
+    public override ParameterTranslationMode ParameterizedCollectionMode
+        => _parameterizedCollectionMode ?? ParameterTranslationMode.Parameter;
 
     /// <summary>
     ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
@@ -148,7 +148,7 @@ public override int? MinBatchSize
 
     // We need to override WithUseParameterizedCollectionMode since we override ParameterizedCollectionMode above
     /// <inheritdoc />
-    public override RelationalOptionsExtension WithUseParameterizedCollectionMode(ParameterizedCollectionMode parameterizedCollectionMode)
+    public override RelationalOptionsExtension WithUseParameterizedCollectionMode(ParameterTranslationMode parameterizedCollectionMode)
     {
         var clone = (NpgsqlOptionsExtension)Clone();
 

diff --git a/test/EFCore.PG.FunctionalTests/NpgsqlComplianceTest.cs b/test/EFCore.PG.FunctionalTests/NpgsqlComplianceTest.cs
@@ -4,6 +4,9 @@ public class NpgsqlComplianceTest : RelationalComplianceTestBase
 {
     protected override ICollection<Type> IgnoredTestBases { get; } = new HashSet<Type>
     {
+        // TODO: Enable for rc.1 (query support for complex collections mapped to JSON)
+        typeof(ComplexCollectionJsonUpdateTestBase<>),
+
         // Not implemented
         typeof(CompiledModelTestBase), typeof(CompiledModelRelationalTestBase), // #3087
         typeof(FromSqlSprocQueryTestBase<>),

diff --git a/test/EFCore.PG.FunctionalTests/Query/AdHocMiscellaneousQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/AdHocMiscellaneousQueryNpgsqlTest.cs
@@ -7,7 +7,7 @@ public class AdHocMiscellaneousQueryNpgsqlTest(NonSharedFixture fixture) : AdHoc
     protected override ITestStoreFactory TestStoreFactory
         => NpgsqlTestStoreFactory.Instance;
 
-    protected override DbContextOptionsBuilder SetParameterizedCollectionMode(DbContextOptionsBuilder optionsBuilder, ParameterizedCollectionMode parameterizedCollectionMode)
+    protected override DbContextOptionsBuilder SetParameterizedCollectionMode(DbContextOptionsBuilder optionsBuilder, ParameterTranslationMode parameterizedCollectionMode)
     {
         new NpgsqlDbContextOptionsBuilder(optionsBuilder).UseParameterizedCollectionMode(parameterizedCollectionMode);
 

diff --git a/test/EFCore.PG.FunctionalTests/Query/CompatibilityQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/CompatibilityQueryNpgsqlTest.cs
@@ -17,21 +17,20 @@ public async Task Array_contains_is_not_parameterized_with_array_on_redshift()
     {
         var ctx = CreateRedshiftContext();
 
-        // https://github.com/dotnet/efcore/issues/36311
-        await Assert.ThrowsAsync<UnreachableException>(async () =>
-        {
-            var numbers = new[] { 8, 9 };
-            var result = await ctx.TestEntities.Where(e => numbers.Contains(e.SomeInt)).SingleAsync();
-            Assert.Equal(1, result.Id);
-
-            AssertSql(
-                """
-    SELECT t."Id", t."SomeInt"
-    FROM "TestEntities" AS t
-    WHERE t."SomeInt" IN (?, ?)
-    LIMIT 2
-    """);
-        });
+        var numbers = new[] { 8, 9 };
+        var result = await ctx.TestEntities.Where(e => numbers.Contains(e.SomeInt)).SingleAsync();
+        Assert.Equal(1, result.Id);
+
+        AssertSql(
+            """
+@numbers1='?' (DbType = Int32)
+@numbers2='?' (DbType = Int32)
+
+SELECT t."Id", t."SomeInt"
+FROM "TestEntities" AS t
+WHERE t."SomeInt" IN (@numbers1, @numbers2)
+LIMIT 2
+""");
     }
 
     #region Support

diff --git a/test/EFCore.PG.FunctionalTests/Query/NonSharedPrimitiveCollectionsQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/NonSharedPrimitiveCollectionsQueryNpgsqlTest.cs
@@ -5,7 +5,7 @@ namespace Microsoft.EntityFrameworkCore.Query;
 public class NonSharedPrimitiveCollectionsQueryNpgsqlTest(NonSharedFixture fixture)
     : NonSharedPrimitiveCollectionsQueryRelationalTestBase(fixture)
 {
-    protected override DbContextOptionsBuilder SetParameterizedCollectionMode(DbContextOptionsBuilder optionsBuilder, ParameterizedCollectionMode parameterizedCollectionMode)
+    protected override DbContextOptionsBuilder SetParameterizedCollectionMode(DbContextOptionsBuilder optionsBuilder, ParameterTranslationMode parameterizedCollectionMode)
     {
         new NpgsqlDbContextOptionsBuilder(optionsBuilder).UseParameterizedCollectionMode(parameterizedCollectionMode);
 

diff --git a/test/EFCore.PG.FunctionalTests/Query/NorthwindAggregateOperatorsQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/NorthwindAggregateOperatorsQueryNpgsqlTest.cs
@@ -15,22 +15,6 @@ public NorthwindAggregateOperatorsQueryNpgsqlTest(
         Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper);
     }
 
-    // https://github.com/dotnet/efcore/issues/36311
-    public override Task Contains_with_parameter_list_value_type_id(bool async)
-        => Assert.ThrowsAsync<UnreachableException>(() => base.Contains_with_parameter_list_value_type_id(async));
-
-    // https://github.com/dotnet/efcore/issues/36311
-    public override Task IReadOnlySet_Contains_with_parameter(bool async)
-        => Assert.ThrowsAsync<UnreachableException>(() => base.IReadOnlySet_Contains_with_parameter(async));
-
-    // https://github.com/dotnet/efcore/issues/36311
-    public override Task List_Contains_with_parameter_list(bool async)
-        => Assert.ThrowsAsync<UnreachableException>(() => base.List_Contains_with_parameter_list(async));
-
-    // https://github.com/dotnet/efcore/issues/36311
-    public override Task IImmutableSet_Contains_with_parameter(bool async)
-        => Assert.ThrowsAsync<UnreachableException>(() => base.IImmutableSet_Contains_with_parameter(async));
-
     // Overriding to add equality tolerance because of floating point precision
     public override async Task Average_over_max_subquery(bool async)
     {

diff --git a/test/EFCore.PG.FunctionalTests/Query/NorthwindMiscellaneousQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/NorthwindMiscellaneousQueryNpgsqlTest.cs
@@ -18,10 +18,6 @@ public NorthwindMiscellaneousQueryNpgsqlTest(
         Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper);
     }
 
-    // https://github.com/dotnet/efcore/issues/36311
-    public override Task Entity_equality_contains_with_list_of_null(bool async)
-        => Assert.ThrowsAsync<UnreachableException>(() => base.Entity_equality_contains_with_list_of_null(async));
-
     public override async Task Query_expression_with_to_string_and_contains(bool async)
     {
         await base.Query_expression_with_to_string_and_contains(async);

diff --git a/test/EFCore.PG.FunctionalTests/Query/NorthwindWhereQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/NorthwindWhereQueryNpgsqlTest.cs
@@ -13,10 +13,6 @@ public NorthwindWhereQueryNpgsqlTest(NorthwindQueryNpgsqlFixture<NoopModelCustom
         Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper);
     }
 
-    // https://github.com/dotnet/efcore/issues/36311
-    public override Task Where_navigation_contains(bool async)
-        => Assert.ThrowsAsync<UnreachableException>(() => base.Where_navigation_contains(async));
-
     public override async Task Where_compare_constructed_equal(bool async)
     {
         // Anonymous type to constant comparison. Issue #14672.

diff --git a/test/EFCore.PG.FunctionalTests/Query/Relationships/ComplexRelationshipsNpgsqlFixture.cs b/test/EFCore.PG.FunctionalTests/Query/Relationships/ComplexRelationshipsNpgsqlFixture.cs
diff --git a/...onalTests/Query/Relationships/ComplexTableSplitting/ComplexTableSplittingNpgsqlFixture.cs b/...onalTests/Query/Relationships/ComplexTableSplitting/ComplexTableSplittingNpgsqlFixture.cs
@@ -0,0 +1,10 @@
+namespace Microsoft.EntityFrameworkCore.Query.Relationships.ComplexTableSplitting;
+
+public class ComplexTableSplittingNpgsqlFixture : ComplexTableSplittingRelationalFixtureBase, ITestSqlLoggerFactory
+{
+    protected override ITestStoreFactory TestStoreFactory
+        => NpgsqlTestStoreFactory.Instance;
+
+    public TestSqlLoggerFactory TestSqlLoggerFactory
+        => (TestSqlLoggerFactory)ListLoggerFactory;
+}