Skip to content

Commit dc09158

Browse files
rojiroji
authored
Bump dependencies to EF 10.0.0 (#3659)
1 parent e56c11f commit dc09158

File tree

5 files changed

+33
-65
lines changed

5 files changed

+33
-65
lines changed

‎Directory.Packages.props‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22
<PropertyGroup>
3-
<EFCoreVersion>10.0.0-rc.2.25502.107</EFCoreVersion>
4-
<MicrosoftExtensionsVersion>10.0.0-rc.2.25502.107</MicrosoftExtensionsVersion>
3+
<EFCoreVersion>10.0.0</EFCoreVersion>
4+
<MicrosoftExtensionsVersion>10.0.0</MicrosoftExtensionsVersion>
55
<NpgsqlVersion>10.0.0-rc.2-ci.20251107T191940</NpgsqlVersion>
66
</PropertyGroup>
77

@@ -10,11 +10,11 @@
1010
Dependencies on EF preview versions should be locked to a specific version (as provider-facing breaking changes are frequent).
1111
For released versions, depend on anything in the current major version to allow users to update to higher patch versions.
1212
-->
13-
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="[$(EFCoreVersion)]" />
14-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="[$(EFCoreVersion)]" />
15-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Abstractions" Version="[$(EFCoreVersion)]" />
16-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="[$(EFCoreVersion)]" />
17-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="[$(EFCoreVersion)]" />
13+
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="[10.0.0,11.0.0)" />
14+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="[10.0.0,11.0.0)" />
15+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Abstractions" Version="[10.0.0,11.0.0)" />
16+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="[10.0.0,11.0.0)" />
17+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="[10.0.0,11.0.0)" />
1818

1919
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="$(MicrosoftExtensionsVersion)" />
2020
<PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MicrosoftExtensionsVersion)" />
@@ -26,15 +26,11 @@
2626
<PackageVersion Include="Npgsql.DependencyInjection" Version="$(NpgsqlVersion)" />
2727

2828
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
29-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
29+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
3030
<PackageVersion Include="xunit" Version="2.9.3" />
3131
<PackageVersion Include="xunit.assert" Version="2.9.3" />
3232
<PackageVersion Include="xunit.core" Version="2.9.3" />
33-
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.3" />
33+
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
3434
<PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" />
35-
36-
<!-- Temporary workaround for https://github.com/advisories/GHSA-w3q9-fxm7-j8fq, remote for 10.0.0 GA -->
37-
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="17.14.28" />
38-
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.14.28" />
3935
</ItemGroup>
4036
</Project>

‎test/EFCore.PG.FunctionalTests/EFCore.PG.FunctionalTests.csproj‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,6 @@
1818
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" />
1919
<PackageReference Include="Microsoft.Extensions.Configuration.Json" />
2020
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" />
21-
22-
<!-- Temporary workaround for https://github.com/advisories/GHSA-w3q9-fxm7-j8fq, remote for 10.0.0 GA -->
23-
<PackageReference Include="Microsoft.Build.Tasks.Core" />
24-
<PackageReference Include="Microsoft.Build.Utilities.Core" />
25-
26-
<!-- Needed to override xunit dependencies from EFCore projects on versions which aren't available on nuget.org -->
27-
<PackageReference Include="xunit.assert" />
28-
<PackageReference Include="xunit.core" />
2921
</ItemGroup>
3022

3123
<ItemGroup>

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@ namespace Microsoft.EntityFrameworkCore.Query;
22

33
public class AdHocComplexTypeQueryNpgsqlTest(NonSharedFixture fixture) : AdHocComplexTypeQueryTestBase(fixture)
44
{
5+
// Test is SQL Server-specific and being removed, https://github.com/dotnet/efcore/pull/37177
6+
public override Task Complex_type_equality_with_non_default_type_mapping()
7+
=> Task.CompletedTask;
8+
59
public override async Task Complex_type_equals_parameter_with_nested_types_with_property_of_same_name()
610
{
711
await base.Complex_type_equals_parameter_with_nested_types_with_property_of_same_name();

‎test/EFCore.PG.FunctionalTests/Query/Associations/ComplexJson/ComplexJsonStructuralEqualityNpgsqlTest.cs‎

Lines changed: 20 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -150,16 +150,13 @@ public override async Task Nested_collection_with_parameter()
150150

151151
public override async Task Contains_with_inline()
152152
{
153-
// https://github.com/dotnet/efcore/issues/36837
154-
await Assert.ThrowsAsync<PostgresException>(async () =>
155-
{
156-
await base.Contains_with_inline();
157-
158-
// TODO: The following translation is sub-optimal: we should be using OPENSJON to extract elements of the collection as JSON elements (OPENJSON WITH JSON),
159-
// and comparison those elements to a single entire JSON fragment on the other side (just like non-collection JSON comparison), rather than breaking the
160-
// elements down to their columns and doing column-by-column comparison. See #32576.
161-
AssertSql(
162-
"""
153+
await base.Contains_with_inline();
154+
155+
// TODO: The following translation is sub-optimal: we should be using OPENSJON to extract elements of the collection as JSON elements (OPENJSON WITH JSON),
156+
// and comparison those elements to a single entire JSON fragment on the other side (just like non-collection JSON comparison), rather than breaking the
157+
// elements down to their columns and doing column-by-column comparison. See #32576.
158+
AssertSql(
159+
"""
163160
SELECT r."Id", r."Name", r."AssociateCollection", r."OptionalAssociate", r."RequiredAssociate"
164161
FROM "RootEntity" AS r
165162
WHERE EXISTS (
@@ -173,21 +170,17 @@ FROM ROWS FROM (jsonb_to_recordset(r."RequiredAssociate" -> 'NestedCollection')
173170
)) WITH ORDINALITY AS n
174171
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')
175172
""");
176-
});
177173
}
178174

179175
public override async Task Contains_with_parameter()
180176
{
181-
// https://github.com/dotnet/efcore/issues/36837
182-
await Assert.ThrowsAsync<PostgresException>(async () =>
183-
{
184-
await base.Contains_with_parameter();
185-
186-
// TODO: The following translation is sub-optimal: we should be using OPENSJON to extract elements of the collection as JSON elements (OPENJSON WITH JSON),
187-
// and comparison those elements to a single entire JSON fragment on the other side (just like non-collection JSON comparison), rather than breaking the
188-
// elements down to their columns and doing column-by-column comparison. See #32576.
189-
AssertSql(
190-
"""
177+
await base.Contains_with_parameter();
178+
179+
// TODO: The following translation is sub-optimal: we should be using OPENSJON to extract elements of the collection as JSON elements (OPENJSON WITH JSON),
180+
// and comparison those elements to a single entire JSON fragment on the other side (just like non-collection JSON comparison), rather than breaking the
181+
// elements down to their columns and doing column-by-column comparison. See #32576.
182+
AssertSql(
183+
"""
191184
@entity_equality_nested_Id='?' (DbType = Int32)
192185
@entity_equality_nested_Int='?' (DbType = Int32)
193186
@entity_equality_nested_Ints='?' (DbType = Object)
@@ -207,18 +200,14 @@ FROM ROWS FROM (jsonb_to_recordset(r."RequiredAssociate" -> 'NestedCollection')
207200
)) WITH ORDINALITY AS n
208201
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)
209202
""");
210-
});
211203
}
212204

213205
public override async Task Contains_with_operators_composed_on_the_collection()
214206
{
215-
// https://github.com/dotnet/efcore/issues/36837
216-
await Assert.ThrowsAsync<PostgresException>(async () =>
217-
{
218-
await base.Contains_with_operators_composed_on_the_collection();
207+
await base.Contains_with_operators_composed_on_the_collection();
219208

220-
AssertSql(
221-
"""
209+
AssertSql(
210+
"""
222211
@get_Item_Int='?' (DbType = Int32)
223212
@entity_equality_get_Item_Id='?' (DbType = Int32)
224213
@entity_equality_get_Item_Int='?' (DbType = Int32)
@@ -239,18 +228,14 @@ FROM ROWS FROM (jsonb_to_recordset(r."RequiredAssociate" -> 'NestedCollection')
239228
)) WITH ORDINALITY AS n
240229
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)
241230
""");
242-
});
243231
}
244232

245233
public override async Task Contains_with_nested_and_composed_operators()
246234
{
247-
// https://github.com/dotnet/efcore/issues/36837
248-
await Assert.ThrowsAsync<PostgresException>(async () =>
249-
{
250-
await base.Contains_with_nested_and_composed_operators();
235+
await base.Contains_with_nested_and_composed_operators();
251236

252-
AssertSql(
253-
"""
237+
AssertSql(
238+
"""
254239
@get_Item_Id='?' (DbType = Int32)
255240
@entity_equality_get_Item_Id='?' (DbType = Int32)
256241
@entity_equality_get_Item_Int='?' (DbType = Int32)
@@ -277,7 +262,6 @@ FROM ROWS FROM (jsonb_to_recordset(r."AssociateCollection") AS (
277262
)) WITH ORDINALITY AS a
278263
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)
279264
""");
280-
});
281265
}
282266

283267
#endregion Contains

‎test/EFCore.PG.Tests/EFCore.PG.Tests.csproj‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,6 @@
1919
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" />
2020
<PackageReference Include="Microsoft.Extensions.Logging" />
2121
<PackageReference Include="Npgsql.DependencyInjection" />
22-
23-
<!-- Temporary workaround for https://github.com/advisories/GHSA-w3q9-fxm7-j8fq, remote for 10.0.0 GA -->
24-
<PackageReference Include="Microsoft.Build.Tasks.Core" />
25-
<PackageReference Include="Microsoft.Build.Utilities.Core" />
26-
27-
<!-- Needed to override xunit dependencies from EFCore projects on versions which aren't available on nuget.org -->
28-
<PackageReference Include="xunit.assert" />
29-
<PackageReference Include="xunit.core" />
3022
</ItemGroup>
3123

3224
</Project>

0 commit comments

Comments
 (0)