Skip to content

Commit 7aacb4f

Browse files
rojiroji
authored
Sync to EF preview.4 (#3548)
1 parent 837c2f2 commit 7aacb4f

File tree

43 files changed

+186
-164
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+186
-164
lines changed

‎Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<VersionPrefix>10.0.0-preview.3</VersionPrefix>
3+
<VersionPrefix>10.0.0-preview.4</VersionPrefix>
44
<TargetFramework>net10.0</TargetFramework>
55
<LangVersion>latest</LangVersion>
66
<Nullable>enable</Nullable>

‎Directory.Packages.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22
<PropertyGroup>
3-
<EFCoreVersion>10.0.0-preview.3.25171.6</EFCoreVersion>
4-
<MicrosoftExtensionsVersion>10.0.0-preview.3.25171.5</MicrosoftExtensionsVersion>
3+
<EFCoreVersion>10.0.0-preview.4.25258.110</EFCoreVersion>
4+
<MicrosoftExtensionsVersion>10.0.0-preview.4.25258.110</MicrosoftExtensionsVersion>
55
<NpgsqlVersion>9.0.3</NpgsqlVersion>
66
</PropertyGroup>
77

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "10.0.100-preview.2.25081.1",
3+
"version": "10.0.100-preview.4.25258.110",
44
"rollForward": "latestMajor",
55
"allowPrerelease": true
66
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
namespace Microsoft.EntityFrameworkCore.BulkUpdates;
22

3-
public class NonSharedModelBulkUpdatesNpgsqlTest : NonSharedModelBulkUpdatesRelationalTestBase
3+
public class NonSharedModelBulkUpdatesNpgsqlTest(NonSharedFixture fixture) : NonSharedModelBulkUpdatesRelationalTestBase(fixture)
44
{
55
protected override ITestStoreFactory TestStoreFactory
66
=> NpgsqlTestStoreFactory.Instance;

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,11 @@
2424
<PackageReference Include="xunit.core" />
2525
</ItemGroup>
2626

27+
<!-- Temporary, remove after sync to latest EF preview -->
28+
<ItemGroup>
29+
<NuGetAuditSuppress Include="https://github.com/advisories/GHSA-h4j7-5rxr-p4wc" />
30+
</ItemGroup>
31+
2732
<ItemGroup>
2833
<None Update="Northwind.sql" CopyToOutputDirectory="PreserveNewest" />
2934
<None Update="config.json" CopyToOutputDirectory="PreserveNewest" />

‎test/EFCore.PG.FunctionalTests/EntitySplittingNpgsqlTest.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
namespace Microsoft.EntityFrameworkCore;
22

3-
public class EntitySplittingNpgsqlTest(ITestOutputHelper testOutputHelper) : EntitySplittingTestBase(testOutputHelper)
3+
public class EntitySplittingNpgsqlTest(NonSharedFixture fixture, ITestOutputHelper testOutputHelper)
4+
: EntitySplittingTestBase(fixture, testOutputHelper)
45
{
56
protected override ITestStoreFactory TestStoreFactory
67
=> NpgsqlTestStoreFactory.Instance;

‎test/EFCore.PG.FunctionalTests/JsonTypesNpgsqlTest.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
namespace Microsoft.EntityFrameworkCore;
1010

11-
public class JsonTypesNpgsqlTest : JsonTypesRelationalTestBase
11+
public class JsonTypesNpgsqlTest(NonSharedFixture fixture) : JsonTypesRelationalTestBase(fixture)
1212
{
1313
#region Nested collections (unsupported)
1414

‎test/EFCore.PG.FunctionalTests/MaterializationInterceptionNpgsqlTest.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
namespace Microsoft.EntityFrameworkCore;
22

3-
public class MaterializationInterceptionNpgsqlTest :
4-
MaterializationInterceptionTestBase<MaterializationInterceptionNpgsqlTest.NpgsqlLibraryContext>
3+
public class MaterializationInterceptionNpgsqlTest(NonSharedFixture fixture) :
4+
MaterializationInterceptionTestBase<MaterializationInterceptionNpgsqlTest.NpgsqlLibraryContext>(fixture)
55
{
66
public class NpgsqlLibraryContext(DbContextOptions options) : LibraryContext(options)
77
{

‎test/EFCore.PG.FunctionalTests/ModelBuilding/NpgsqlModelBuilderGenericTest.cs‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,13 @@ protected override TestModelBuilder CreateModelBuilder(
2222
=> new GenericTestModelBuilder(Fixture, configure);
2323
}
2424

25+
public class NpgsqlGenericComplexCollection(NpgsqlModelBuilderFixture fixture) : NpgsqlComplexCollection(fixture)
26+
{
27+
protected override TestModelBuilder CreateModelBuilder(
28+
Action<ModelConfigurationBuilder>? configure)
29+
=> new GenericTestModelBuilder(Fixture, configure);
30+
}
31+
2532
public class NpgsqlGenericInheritance(NpgsqlModelBuilderFixture fixture) : NpgsqlInheritance(fixture)
2633
{
2734
protected override TestModelBuilder CreateModelBuilder(

‎test/EFCore.PG.FunctionalTests/ModelBuilding/NpgsqlModelBuilderTestBase.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ public abstract class NpgsqlNonRelationship(NpgsqlModelBuilderFixture fixture)
88
public abstract class NpgsqlComplexType(NpgsqlModelBuilderFixture fixture)
99
: RelationalComplexTypeTestBase(fixture), IClassFixture<NpgsqlModelBuilderFixture>;
1010

11+
public abstract class NpgsqlComplexCollection(NpgsqlModelBuilderFixture fixture)
12+
: RelationalComplexCollectionTestBase(fixture), IClassFixture<NpgsqlModelBuilderFixture>;
13+
1114
public abstract class NpgsqlInheritance(NpgsqlModelBuilderFixture fixture)
1215
: RelationalInheritanceTestBase(fixture), IClassFixture<NpgsqlModelBuilderFixture>;
1316

0 commit comments

Comments
 (0)