Skip to content

Commit 5ac98b6

Browse files
rojiCopilot
roji
and
Copilot
committed
Sync to EF 11.0.0-preview.5.26279.113
EF Core reverted its test infrastructure from xunit v3 back to xunit v2 on the preview.5 line, so this reverts the xunit-v3/MTP migration that was introduced in the previous sync (3ddc83c), while keeping the genuine EF API/test-baseline fallout for the new build. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent acd7a14 commit 5ac98b6

39 files changed

Lines changed: 96 additions & 105 deletions

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ jobs:
112112
shell: bash
113113

114114
- name: Test
115-
run: dotnet test -c ${{ matrix.config }} -- --no-progress
115+
run: dotnet test -c ${{ matrix.config }} --logger "GitHubActions;report-warnings=false"
116116
shell: bash
117117
env:
118118
# Disable SSL to avoid unnecessary handshake pressure in the Windows functional tests.

‎Directory.Packages.props‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project>
22
<PropertyGroup>
3-
<EFCoreVersion>11.0.0-preview.5.26275.101</EFCoreVersion>
4-
<MicrosoftExtensionsVersion>11.0.0-preview.5.26275.101</MicrosoftExtensionsVersion>
5-
<MicrosoftExtensionsConfigurationVersion>11.0.0-preview.5.26275.101</MicrosoftExtensionsConfigurationVersion>
3+
<EFCoreVersion>11.0.0-preview.5.26279.113</EFCoreVersion>
4+
<MicrosoftExtensionsVersion>11.0.0-preview.5.26279.113</MicrosoftExtensionsVersion>
5+
<MicrosoftExtensionsConfigurationVersion>11.0.0-preview.5.26279.113</MicrosoftExtensionsConfigurationVersion>
66
<NpgsqlVersion>10.0.3</NpgsqlVersion>
77
</PropertyGroup>
88

@@ -28,7 +28,6 @@
2828

2929
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="10.0.300" />
3030
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
31-
<PackageVersion Include="xunit.v3" Version="4.0.0-pre.108" />
3231
<PackageVersion Include="xunit" Version="2.9.3" />
3332
<PackageVersion Include="xunit.assert" Version="2.9.3" />
3433
<PackageVersion Include="xunit.core" Version="2.9.3" />

‎NuGet.config‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@
2121
<packageSource key="dotnet11">
2222
<package pattern="*" />
2323
</packageSource>
24-
<packageSource key="dotnet-eng">
25-
<package pattern="Microsoft.DotNet.*" />
26-
</packageSource>
2724
</packageSourceMapping>
2825

2926
</configuration>

‎global.json‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,5 @@
33
"version": "11.0.100-preview.4.26210.111",
44
"rollForward": "latestMinor",
55
"allowPrerelease": true
6-
},
7-
"test": {
8-
"runner": "Microsoft.Testing.Platform"
96
}
107
}

‎test/Directory.Build.props‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,14 @@
55
<PropertyGroup>
66
<IsPackable>false</IsPackable>
77
<GenerateDocumentationFile>false</GenerateDocumentationFile>
8-
<UseMicrosoftTestingPlatformRunner>true</UseMicrosoftTestingPlatformRunner>
98

109
<!-- There's lots of use of internal EF Core APIs from the tests, suppress the analyzer warnings for those -->
11-
<NoWarn>$(NoWarn);CS0618;xUnit1003;xUnit1004;xUnit1008;xUnit1013;xUnit1024;xUnit1051;EF1001</NoWarn>
12-
</PropertyGroup>
13-
14-
<PropertyGroup>
15-
<OutputType>Exe</OutputType>
16-
<TestRunnerName>XUnitV3</TestRunnerName>
17-
<TestingPlatformCommandLineArguments>$(TestingPlatformCommandLineArguments) --filter-not-trait category=failing --ignore-exit-code 8</TestingPlatformCommandLineArguments>
10+
<NoWarn>$(NoWarn);xUnit1003;xUnit1004;xUnit1013;xUnit1024;EF1001</NoWarn>
1811
</PropertyGroup>
1912

2013
<ItemGroup>
2114
<PackageReference Include="Microsoft.NET.Test.Sdk" />
22-
<PackageReference Include="xunit.v3" />
15+
<PackageReference Include="xunit" />
2316
<PackageReference Include="xunit.runner.visualstudio" />
2417
<PackageReference Include="GitHubActionsTestLogger" />
2518
<PackageReference Include="Npgsql" />
@@ -31,6 +24,7 @@
3124

3225
<ItemGroup>
3326
<Using Include="Xunit" />
27+
<Using Include="Xunit.Abstractions" />
3428
<Using Include="Microsoft.EntityFrameworkCore.TestUtilities" />
3529
<Using Include="Microsoft.EntityFrameworkCore.TestUtilities.Xunit" />
3630
</ItemGroup>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -719,7 +719,7 @@ private static void AssertNullMappedNullableDataTypes(MappedNullableDataTypes en
719719
Assert.Null(entity.Mood);
720720
}
721721

722-
[ActiveIssue("DateTimeOffset with non-zero offset, https://github.com/dotnet/efcore/issues/26068")]
722+
[ConditionalFact(Skip = "DateTimeOffset with non-zero offset, https://github.com/dotnet/efcore/issues/26068")]
723723
public override Task Can_insert_and_read_back_object_backed_data_types()
724724
=> Task.CompletedTask;
725725

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1407,6 +1407,7 @@ WHERE c."CustomerID" LIKE 'F%'
14071407
""");
14081408
}
14091409

1410+
[ConditionalTheory]
14101411
public override async Task Update_with_cross_join_left_join_set_constant(bool async)
14111412
{
14121413
await base.Update_with_cross_join_left_join_set_constant(async);
@@ -1436,6 +1437,7 @@ WHERE c."CustomerID" LIKE 'F%'
14361437
""");
14371438
}
14381439

1440+
[ConditionalTheory]
14391441
public override async Task Update_with_cross_join_cross_apply_set_constant(bool async)
14401442
{
14411443
await base.Update_with_cross_join_cross_apply_set_constant(async);
@@ -1465,6 +1467,7 @@ WHERE c."CustomerID" LIKE 'F%'
14651467
""");
14661468
}
14671469

1470+
[ConditionalTheory]
14681471
public override async Task Update_with_cross_join_outer_apply_set_constant(bool async)
14691472
{
14701473
await base.Update_with_cross_join_outer_apply_set_constant(async);
@@ -1574,6 +1577,7 @@ WHERE c."CustomerID" LIKE 'F%'
15741577
""");
15751578
}
15761579

1580+
[ConditionalTheory]
15771581
[MemberData(nameof(IsAsyncData))]
15781582
public override async Task Update_with_two_inner_joins(bool async)
15791583
{

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,9 @@ public void Can_use_computed_columns_with_nullable_enum()
134134

135135
protected NpgsqlTestStore TestStore { get; private set; } = null!;
136136

137-
public async ValueTask InitializeAsync()
137+
public async Task InitializeAsync()
138138
=> TestStore = await NpgsqlTestStore.CreateInitializedAsync("ComputedColumnTest");
139139

140-
public async ValueTask DisposeAsync()
140+
public async Task DisposeAsync()
141141
=> await TestStore.DisposeAsync();
142142
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@ namespace Microsoft.EntityFrameworkCore;
77
public abstract class ConnectionInterceptionNpgsqlTestBase(ConnectionInterceptionNpgsqlTestBase.InterceptionNpgsqlFixtureBase fixture)
88
: ConnectionInterceptionTestBase(fixture)
99
{
10-
[ActiveIssue("#2368")]
10+
[ConditionalTheory(Skip = "#2368")]
1111
public override Task Intercept_connection_creation_passively(bool async)
1212
=> base.Intercept_connection_creation_passively(async);
1313

14-
[ActiveIssue("#2368")]
14+
[ConditionalTheory(Skip = "#2368")]
1515
public override Task Intercept_connection_creation_with_multiple_interceptors(bool async)
1616
=> base.Intercept_connection_creation_with_multiple_interceptors(async);
1717

18-
[ActiveIssue("#2368")]
18+
[ConditionalTheory(Skip = "#2368")]
1919
public override Task Intercept_connection_to_override_connection_after_creation(bool async)
2020
=> base.Intercept_connection_to_override_connection_after_creation(async);
2121

22-
[ActiveIssue("#2368")]
22+
[ConditionalTheory(Skip = "#2368")]
2323
public override Task Intercept_connection_to_override_creation(bool async)
2424
=> base.Intercept_connection_to_override_creation(async);
2525

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public ConvertToProviderTypesNpgsqlTest(ConvertToProviderTypesNpgsqlFixture fixt
4949
// }
5050
// }
5151

52-
[ActiveIssue("DateTimeOffset with non-zero offset, https://github.com/dotnet/efcore/issues/26068")]
52+
[ConditionalFact(Skip = "DateTimeOffset with non-zero offset, https://github.com/dotnet/efcore/issues/26068")]
5353
public override Task Can_insert_and_read_back_object_backed_data_types()
5454
=> Task.CompletedTask;
5555

0 commit comments

Comments
 (0)