Sync to EF 11.0.0-preview.5.26279.113#3853
Open
roji wants to merge 1 commit into
Open
Conversation
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>
There was a problem hiding this comment.
Pull request overview
Syncs EFCore.PG to EF Core 11.0.0-preview.5.26279.113, with the primary impact being the EF test infrastructure downgrade from xUnit v3 back to xUnit v2, and the corresponding adjustments across the test suite and CI.
Changes:
- Bumps EF Core / Microsoft.Extensions daily-build versions in
Directory.Packages.props. - Reverts test infrastructure from xUnit v3/Microsoft.Testing.Platform back to xUnit v2 (packages, global.json runner config, CI invocation, and test attributes/fixtures).
- Updates/realigns several functional-test baselines and behaviors to match the new EF build (e.g. Math
Sign*baseline, TPC insert/update/delete behavior).
Show a summary per file
| File | Description |
|---|---|
| test/EFCore.PG.FunctionalTests/ValueConvertersEndToEndNpgsqlTest.cs | Replaces xUnit v3 ActiveIssue usage with xUnit v2 conditional skip attribute. |
| test/EFCore.PG.FunctionalTests/Update/JsonUpdateNpgsqlTest.cs | Adds ConditionalFact annotations for xUnit v2 conditional execution. |
| test/EFCore.PG.FunctionalTests/TestUtilities/RequiresPostgisAttribute.cs | Reworks PostGIS requirement attribute to xUnit v2 ITestCondition model. |
| test/EFCore.PG.FunctionalTests/TestUtilities/MinimumPostgresVersionAttribute.cs | Reworks min-Postgres-version attribute to xUnit v2 ITestCondition model. |
| test/EFCore.PG.FunctionalTests/SequenceEndToEndTest.cs | Converts fixture lifetime methods from ValueTask to Task for xUnit v2. |
| test/EFCore.PG.FunctionalTests/Scaffolding/NpgsqlDatabaseModelFactoryTest.cs | Converts fixture initialization override to Task for xUnit v2. |
| test/EFCore.PG.FunctionalTests/Query/UdfDbFunctionNpgsqlTests.cs | Replaces ActiveIssue with xUnit v2 conditional skip attribute. |
| test/EFCore.PG.FunctionalTests/Query/Translations/MathTranslationsNpgsqlTest.cs | Updates expected SQL baselines (removes extra query assertions). |
| test/EFCore.PG.FunctionalTests/Query/Translations/ByteArrayTranslationsNpgsqlTest.cs | Adds ConditionalFact to align with xUnit v2 conditional execution. |
| test/EFCore.PG.FunctionalTests/Query/SqlQueryNpgsqlTest.cs | Replaces ActiveIssue with xUnit v2 conditional skip attributes. |
| test/EFCore.PG.FunctionalTests/Query/PrimitiveCollectionsQueryNpgsqlTest.cs | Adds ConditionalFact for conditional execution under xUnit v2. |
| test/EFCore.PG.FunctionalTests/Query/NorthwindGroupByQueryNpgsqlTest.cs | Replaces ActiveIssue with xUnit v2 conditional skip attribute. |
| test/EFCore.PG.FunctionalTests/Query/NorthwindDbFunctionsQueryNpgsqlTest.cs | Replaces platform skip attribute with xUnit v2 platform skip condition. |
| test/EFCore.PG.FunctionalTests/Query/LegacyTimestampQueryTest.cs | Converts async dispose from ValueTask to Task for xUnit v2. |
| test/EFCore.PG.FunctionalTests/Query/Inheritance/TPCInheritanceQueryNpgsqlTest.cs | Updates insert/update/delete test behavior to expect a conflict again (per EF baseline). |
| test/EFCore.PG.FunctionalTests/Query/FromSqlQueryNpgsqlTest.cs | Replaces ActiveIssue and adds xUnit v2 conditional theory annotation. |
| test/EFCore.PG.FunctionalTests/Query/EntitySplittingQueryNpgsqlTest.cs | Replaces ActiveIssue with xUnit v2 conditional skip attributes. |
| test/EFCore.PG.FunctionalTests/Query/ComplexNavigationsSharedTypeQueryNpgsqlTest.cs | Replaces ActiveIssue with xUnit v2 conditional skip attributes. |
| test/EFCore.PG.FunctionalTests/Query/CompatibilityQueryNpgsqlTest.cs | Converts fixture lifetime methods from ValueTask to Task for xUnit v2. |
| test/EFCore.PG.FunctionalTests/Query/Associations/OwnedNavigations/OwnedNavigationsCollectionNpgsqlTest.cs | Adds ConditionalFact for xUnit v2 conditional execution. |
| test/EFCore.PG.FunctionalTests/Query/Associations/OwnedJson/OwnedJsonCollectionNpgsqlTest.cs | Adds ConditionalFact for xUnit v2 conditional execution. |
| test/EFCore.PG.FunctionalTests/Query/Associations/Navigations/NavigationsCollectionNpgsqlTest.cs | Adds ConditionalFact for xUnit v2 conditional execution. |
| test/EFCore.PG.FunctionalTests/Query/Associations/ComplexJson/ComplexJsonCollectionNpgsqlTest.cs | Adds ConditionalFact for xUnit v2 conditional execution. |
| test/EFCore.PG.FunctionalTests/Query/AdHocMiscellaneousQueryNpgsqlTest.cs | Replaces ActiveIssue with xUnit v2 conditional skip attribute. |
| test/EFCore.PG.FunctionalTests/Migrations/MigrationsNpgsqlTest.cs | Replaces ActiveIssue with xUnit v2 conditional skip attribute. |
| test/EFCore.PG.FunctionalTests/Migrations/MigrationsInfrastructureNpgsqlTest.cs | Replaces ActiveIssue with xUnit v2 conditional skip attributes. |
| test/EFCore.PG.FunctionalTests/LazyLoadProxyNpgsqlTest.cs | Adjusts conditional execution/skip annotations for xUnit v2. |
| test/EFCore.PG.FunctionalTests/JsonTypesNpgsqlTest.cs | Adds ConditionalFact annotations for xUnit v2 conditional execution. |
| test/EFCore.PG.FunctionalTests/CustomConvertersNpgsqlTest.cs | Replaces ActiveIssue with xUnit v2 conditional skip attribute. |
| test/EFCore.PG.FunctionalTests/ConvertToProviderTypesNpgsqlTest.cs | Replaces ActiveIssue with xUnit v2 conditional skip attribute. |
| test/EFCore.PG.FunctionalTests/ConnectionInterceptionNpgsqlTest.cs | Replaces ActiveIssue with xUnit v2 conditional skip attributes. |
| test/EFCore.PG.FunctionalTests/ComputedColumnTest.cs | Converts fixture lifetime methods from ValueTask to Task for xUnit v2. |
| test/EFCore.PG.FunctionalTests/BulkUpdates/NorthwindBulkUpdatesNpgsqlTest.cs | Adds ConditionalTheory annotations for xUnit v2 conditional execution. |
| test/Directory.Build.props | Switches test dependencies/usings back to xUnit v2 and removes MTP runner properties. |
| NuGet.config | Removes dotnet-eng package source mapping used for the prior MTP/xUnit v3 setup. |
| global.json | Removes Microsoft.Testing.Platform runner configuration. |
| Directory.Packages.props | Updates EF Core / Extensions package versions; removes xUnit v3 package version entry. |
| .github/workflows/build.yml | Restores classic dotnet test usage with GitHubActionsTestLogger. |
Copilot's findings
- Files reviewed: 39/39 changed files
- Comments generated: 2
Comment on lines
+81
to
+83
| // Seed data for the fixture manually inserts entities with IDs 1, 2; then this test attempts to insert another one with an auto-generated ID, | ||
| // but the PG sequence wasn't updated so produces 1, resulting in a conflict. The test should be consistent in either using either | ||
| // auto-generated IDs or not across the board. |
Comment on lines
84
to
+85
| public override Task Can_insert_update_delete() | ||
| => base.Can_insert_update_delete(); | ||
| => Assert.ThrowsAsync<DbUpdateException>(base.Can_insert_update_delete); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Syncs EFCore.PG to the latest EF Core daily build on the preview.5 line: 11.0.0-preview.5.26275.101 → 11.0.0-preview.5.26279.113.
What changed
The main fallout is that EF Core's test infrastructure was reverted from xunit v3 back to xunit v2 on the preview.5 line. The
Microsoft.EntityFrameworkCore.Specification.Testspackage dependencies changed accordingly:xunit.v3.assert/xunit.v3.extensibility.core4.0.0-pre.108xunit.assert/xunit.core2.9.3Microsoft.DotNet.XUnitV3Extensionsxunit.runner.visualstudio4.0.0-pre.4This required reverting the xunit-v3 / Microsoft.Testing.Platform migration that was introduced in the previous sync (commit 3ddc83c, "Sync to EF 11.0.0-preview.5.26275.101"), while preserving the genuine EF API/test fallout from that commit. Concretely:
xunit.v3package, the MTP runner wiring intest/Directory.Build.props(UseMicrosoftTestingPlatformRunner,OutputType=Exe,TestRunnerName=XUnitV3,TestingPlatformCommandLineArguments), theMicrosoft.Testing.Platformrunner inglobal.json, thedotnet-engpackage-source mapping inNuGet.config, and restored the classicdotnet testinvocation inbuild.yml.[ActiveIssue(...)]→[ConditionalFact/Theory(Skip = ...)],[SkipOnPlatform(TestPlatforms.X, ...)]→[PlatformSkipCondition(...)],IAsyncLifetimeoverridesValueTask→Task, and theRequiresPostgis/MinimumPostgresVersionattributes back toITestCondition.MathTranslationsNpgsqlTest.Sign/Sign_floatnow assert a single query, andTPCInheritanceQueryNpgsqlTest.Can_insert_update_deleteagain asserts the PG seed/sequence conflict.EF-side changes
EF Core's product source is essentially unchanged between these two daily builds — the relevant change is the test-infrastructure downgrade from xunit v3 to xunit v2 on the
release/11.0-preview5line (mainremains on xunit v3 via dotnet/efcore#38277). The change flows through the dotnet/dotnet VMR, so there is no single dotnet/efcore product PR to attribute it to.Validation