[main] Source code updates from dotnet/efcore

[dotnet-maestro]

Note

This is a codeflow update. It may contain both source code changes from
the source repo
as well as dependency updates. Learn more here.

This pull request brings the following source code changes

From https://github.com/dotnet/efcore

• Subscription: 5062ef9d-0a23-4aa5-9835-b62951d567a8
• Build: 20260421.2 (311333)
• Date Produced: April 22, 2026 12:25:56 AM UTC
• Commit: c945994acc1a87b3aaba854ef5c46890ad5044d6
• Commit Diff: 3a6e825...c945994
• Branch: main

Diff the source with this PR branch

darc vmr diff --name-only https://github.com/dotnet/efcore:c945994acc1a87b3aaba854ef5c46890ad5044d6..https://github.com/dotnet/dotnet:darc-main-8dc9fd96-aaca-41c5-a068-9314f5a6b7b9

[dotnet-maestro]

Caution

🚨 Action Required — Conflict detected

A conflict was detected when trying to update this PR with changes from build 311119 of https://github.com/dotnet/efcore/tree/a37976ccf1c3d1832931c9c8a6af95f024543346.

The conflicts in the following files need to be manually resolved:

ℹ️ To resolve the conflicts, please follow these steps:

1. Clone the current repository

   git clone https://github.com/dotnet/dotnet
   cd dotnet

2. Make sure your darc is up-to-date
   (version 1.1.0-beta.26214.2 or higher)

   # Linux / MacOS
   ./eng/common/darc-init.sh
   # or on Windows
   .\eng\common\darc-init.ps1

3. Run from repo's git clone and follow the instructions provided by the command to stage the conflict locally

   darc vmr resolve-conflict --subscription 5062ef9d-0a23-4aa5-9835-b62951d567a8

   This should apply the build 311119 with sources from a37976c
4. Resolve the conflicts, commit & push the changes
5. Once pushed, the Codeflow verification check will turn green.
   If not, a new build might have flown into the PR and you might need to run the command above again.

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

[dotnet-maestro]

Note

PRs from original repository included in this codeflow update:

• Fix flaky ServicePropertyDiscoveryConventionTest.Finds_service_properties_in_hierarchy efcore#38128
• Revert "Use PRAGMA defer_foreign_keys instead of PRAGMA foreign_keys when migrating" efcore#38120
• FIX Insert order bug when using TPC - Issue #35978  efcore#38070
• Refactor CommandBatchPreparer efcore#38133
• Update skills efcore#38126
• Add dotnet-ef JSON config defaults and validation features efcore#37966
• [main] Source code updates from dotnet/dotnet efcore#38142

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

[dotnet-maestro]

Note

PRs from original repository included in this codeflow update:

• [release/10.0] Source code updates from dotnet/dotnet efcore#38125
• [release/10.0] Source code updates from dotnet/dotnet efcore#38127
• [release/10.0] Source code updates from dotnet/dotnet efcore#38143
• [release/10.0] Fix query filter parameter names with primary constructor parameters efcore#38136
• [release/10.0] Fix nullable complex property discriminator changes not persisted efcore#38134
• CI: Consolidate GitHub Actions test workflows efcore#38147
• [automated] Merge branch 'release/10.0' => 'main' efcore#38149

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.