[main] Source code updates from dotnet/efcore by dotnet-maestro[bot] · Pull Request #3993 · dotnet/dotnet

dotnet-maestro · 2025-12-20T02:14:13Z

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: 20260107.5 (296342)
Date Produced: January 8, 2026 12:56:04 AM UTC
Commit: 08538477d4f237a4cff28ec7d0808cb3c8715840
Commit Diff: 5a68c09...0853847
Branch: main

Diff the source with this PR branch

darc vmr diff --name-only https://github.com/dotnet/efcore:08538477d4f237a4cff28ec7d0808cb3c8715840..https://github.com/dotnet/dotnet:darc-main-feab3a7b-abf8-48e4-8ecc-7aed24d76694

Diff: https://github.com/dotnet/efcore/compare/5a68c09c2c67b7f410f0972b193b42d5502367a7..fdb46adb42c970f40d6ee839b62957ba58c0ef90 From: dotnet/efcore@5a68c09 To: dotnet/efcore@fdb46ad [[ commit created by automation ]]

dotnet-maestro · 2025-12-20T02:14:14Z

Note

PRs from original repository included in this codeflow update:

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

Diff: https://github.com/dotnet/efcore/compare/fdb46adb42c970f40d6ee839b62957ba58c0ef90..0b1afb47d21c4f82eb6aa14e0bdc38e1b091d5cd From: dotnet/efcore@fdb46ad To: dotnet/efcore@0b1afb4 [[ commit created by automation ]]

dotnet-maestro · 2025-12-23T02:05:36Z

Note

PRs from original repository included in this codeflow update:

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

Diff: https://github.com/dotnet/efcore/compare/0b1afb47d21c4f82eb6aa14e0bdc38e1b091d5cd..767ce8eb275014dd1117f8eb47510fb3a9896f7d From: dotnet/efcore@0b1afb4 To: dotnet/efcore@767ce8e [[ commit created by automation ]]

dotnet-maestro · 2025-12-28T02:03:50Z

Note

PRs from original repository included in this codeflow update:

Fix uncorrelated parameterized collections in compiled queries efcore#37372

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

Diff: https://github.com/dotnet/efcore/compare/767ce8eb275014dd1117f8eb47510fb3a9896f7d..97bd46aabfecf98c9b22a1903a53467a2f1a8201 From: dotnet/efcore@767ce8e To: dotnet/efcore@97bd46a [[ commit created by automation ]]

dotnet-maestro · 2025-12-29T02:04:27Z

Note

PRs from original repository included in this codeflow update:

Obsolete owned JSON entities in relational efcore#37363

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

Diff: https://github.com/dotnet/efcore/compare/97bd46aabfecf98c9b22a1903a53467a2f1a8201..fdc668657fc37fa6b5d9b96e864beec86f5f9278 From: dotnet/efcore@97bd46a To: dotnet/efcore@fdc6686 [[ commit created by automation ]]

dotnet-maestro · 2025-12-30T02:04:47Z

Note

PRs from original repository included in this codeflow update:

Redo query complex type support for TPC and other hierarchy scenarios efcore#37410

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

Diff: https://github.com/dotnet/efcore/compare/fdc668657fc37fa6b5d9b96e864beec86f5f9278..ccb034441457f668c361de45bd9960e75a200c79 From: dotnet/efcore@fdc6686 To: dotnet/efcore@ccb0344 [[ commit created by automation ]]

dotnet-maestro · 2025-12-31T02:50:21Z

Note

PRs from original repository included in this codeflow update:

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

Diff: https://github.com/dotnet/efcore/compare/ccb034441457f668c361de45bd9960e75a200c79..8540b89b33fcc6f60e429724790ce8ec89bca215 From: dotnet/efcore@ccb0344 To: dotnet/efcore@8540b89 [[ commit created by automation ]]

dotnet-maestro · 2026-01-04T02:04:15Z

Note

PRs from original repository included in this codeflow update:

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

dotnet-maestro · 2026-01-06T02:08:06Z

Caution

🛑 Conflict detected

A conflict was detected when trying to update this PR with changes from https://github.com/dotnet/efcore/tree/2cc3da841692bb6348c7a589b9af2ec9e36d67d9.

The conflicts in the following files need to be manually resolved so that automated codeflow can resume for this PR:

eng/Versions.props
🔍 View file in dotnet/efcore vs VMR

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

Clone the current repository

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

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

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

Run from repo's git clone and follow the instructions provided by the command to resolve the conflict locally
```
darc vmr resolve-conflict --subscription 5062ef9d-0a23-4aa5-9835-b62951d567a8
```
This should apply the build 296054 with sources from 2cc3da8
Commit & push the changes
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 · 2026-01-06T02:08:07Z

Note

PRs from original repository included in this codeflow update:

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

premun · 2026-01-06T10:50:34Z

@AndriySvyryd can you take a look at this PR? It needs some conflict resolution it seems

dotnet-maestro · 2026-01-07T02:09:18Z

Caution

🛑 Conflict detected

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

The conflicts in the following files need to be manually resolved so that automated codeflow can resume for this PR:

eng/Versions.props
🔍 View file in dotnet/efcore vs VMR

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

Clone the current repository

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

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

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

Run from repo's git clone and follow the instructions provided by the command to resolve the conflict locally
```
darc vmr resolve-conflict --subscription 5062ef9d-0a23-4aa5-9835-b62951d567a8
```
This should apply the build 296236 with sources from d9e2402
Commit & push the changes
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 · 2026-01-07T02:09:18Z

Note

PRs from original repository included in this codeflow update:

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

dotnet-maestro · 2026-01-08T02:07:53Z

Caution

🛑 Conflict detected

A conflict was detected when trying to update this PR with changes from https://github.com/dotnet/efcore/tree/08538477d4f237a4cff28ec7d0808cb3c8715840.

The conflicts in the following files need to be manually resolved so that automated codeflow can resume for this PR:

eng/Versions.props
🔍 View file in dotnet/efcore vs VMR

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

Clone the current repository

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

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

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

Run from repo's git clone and follow the instructions provided by the command to resolve the conflict locally
```
darc vmr resolve-conflict --subscription 5062ef9d-0a23-4aa5-9835-b62951d567a8
```
This should apply the build 296342 with sources from 0853847
Commit & push the changes
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 · 2026-01-08T02:07:53Z

Note

PRs from original repository included in this codeflow update:

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

SamMonoRT · 2026-01-08T17:38:02Z

@dotnet/prodconsvcs - there are conflicts in src/source-manifest.json and src/source-manifest.json

Recommendation is avoid manually updating these files - please can you take a look?

premun · 2026-01-08T17:42:50Z

@SamMonoRT interesting, thanks for pinging us. I will have a look at it tomorrow morning.

premun · 2026-01-08T18:12:39Z

@SamMonoRT you saw conflicts after running the command? I only saw staged files and a conflict in Versions.props

SamMonoRT · 2026-01-08T20:36:45Z

@premun - Saw that from https://github.com/dotnet/dotnet/pull/3993/checks?check_run_id=59596519776 (under Checks->DotNet Maestro

DotNet Maestro / Maestro auto-merge - Codeflow verification
failed 18 hours ago in 1d 9h 10m 37s
Missing or mismatched values found in src/source-manifest.json
❌ Check Failed
The following error(s) were encountered:

BAR ID Mismatch in src/source-manifest.json
Source Repository: https://github.com/dotnet/efcore
Error: BAR ID 295911 found in the source manifest does not match the build ID of the current update (296342).
Commit SHA Mismatch in src/source-manifest.json
Source Repository: https://github.com/dotnet/efcore
Error: Commit SHA 8540b89b33fcc6f60e429724790ce8ec89bca215 found in the source manifest does not match the commit SHA of the current update (08538477d4f237a4cff28ec7d0808cb3c8715840).
❗ IMPORTANT
The src/source-manifest.json and eng/Version.Details.xml files are managed by Maestro/darc. Outside of exceptional circumstances, these files should not be modified manually.
Unless you are sure that you know what you are doing, we recommend reaching out for help. You can receive assistance by:

tagging the @dotnet/prodconsvcs team in a PR comment
using the First Responder channel,
opening an issue in the dotnet/arcade-services repo
contacting the .NET Product Construction Services team via e-mail.

Diff: https://github.com/dotnet/efcore/compare/08538477d4f237a4cff28ec7d0808cb3c8715840..08538477d4f237a4cff28ec7d0808cb3c8715840 From: dotnet/efcore@0853847 To: dotnet/efcore@0853847 The following files had conflicts that were resolved by a user: - src/efcore/eng/Versions.props

premun · 2026-01-08T21:34:48Z

@SamMonoRT ah yeah, starting tomorrow this check will have more guidance that this is expected when conflict is about to be resolved.

@AndriySvyryd you can try darc authenticate --clear and then again. You can also not put any GH token if you have GH CLI. But I can see you made it work?

AndriySvyryd · 2026-01-08T21:58:28Z

@premun Yes. darc authenticate --clear helped

[main] Source code updates from dotnet/efcore - Suppress EF8001 warning for owned JSON entities - Merge branch 'main' into darc-main-feab3a7b-abf8-48e4-8ecc-7aed24d76694 - [efcore] Source update 0853847 → 0853847 Diff: https://github.com/dotnet/efcore/compare/08538477d4f237a4cff28ec7d0808cb3c8715840..08538477d4f237a4cff28ec7d0808cb3c8715840 From: dotnet/efcore@0853847 To: dotnet/efcore@0853847 The following files had conflicts that were resolved by a user: - src/efcore/eng/Versions.props - Merge branch 'main' into darc-main-feab3a7b-abf8-48e4-8ecc-7aed24d76694

[efcore] Source update 5a68c09 → fdb46ad

721fa96

Diff: https://github.com/dotnet/efcore/compare/5a68c09c2c67b7f410f0972b193b42d5502367a7..fdb46adb42c970f40d6ee839b62957ba58c0ef90 From: dotnet/efcore@5a68c09 To: dotnet/efcore@fdb46ad [[ commit created by automation ]]

dotnet-policy-service Bot requested a review from a team December 20, 2025 02:14

AndriySvyryd approved these changes Dec 22, 2025

View reviewed changes

[efcore] Source update fdb46ad → 0b1afb4

70c8e89

Diff: https://github.com/dotnet/efcore/compare/fdb46adb42c970f40d6ee839b62957ba58c0ef90..0b1afb47d21c4f82eb6aa14e0bdc38e1b091d5cd From: dotnet/efcore@fdb46ad To: dotnet/efcore@0b1afb4 [[ commit created by automation ]]

dotnet-policy-service Bot requested a review from a team December 23, 2025 02:05

AndriySvyryd approved these changes Dec 26, 2025

View reviewed changes

[efcore] Source update 0b1afb4 → 767ce8e

6d505bb

Diff: https://github.com/dotnet/efcore/compare/0b1afb47d21c4f82eb6aa14e0bdc38e1b091d5cd..767ce8eb275014dd1117f8eb47510fb3a9896f7d From: dotnet/efcore@0b1afb4 To: dotnet/efcore@767ce8e [[ commit created by automation ]]

dotnet-policy-service Bot requested a review from a team December 28, 2025 02:04

[efcore] Source update 767ce8e → 97bd46a

107b88c

Diff: https://github.com/dotnet/efcore/compare/767ce8eb275014dd1117f8eb47510fb3a9896f7d..97bd46aabfecf98c9b22a1903a53467a2f1a8201 From: dotnet/efcore@767ce8e To: dotnet/efcore@97bd46a [[ commit created by automation ]]

[efcore] Source update 97bd46a → fdc6686

00c60a9

Diff: https://github.com/dotnet/efcore/compare/97bd46aabfecf98c9b22a1903a53467a2f1a8201..fdc668657fc37fa6b5d9b96e864beec86f5f9278 From: dotnet/efcore@97bd46a To: dotnet/efcore@fdc6686 [[ commit created by automation ]]

Suppress EF8001 warning for owned JSON entities

e2d6abe

dotnet-policy-service Bot requested a review from a team December 30, 2025 20:18

dotnet-maestro Bot added 2 commits December 31, 2025 02:50

[efcore] Source update fdc6686 → ccb0344

9ce7d51

Diff: https://github.com/dotnet/efcore/compare/fdc668657fc37fa6b5d9b96e864beec86f5f9278..ccb034441457f668c361de45bd9960e75a200c79 From: dotnet/efcore@fdc6686 To: dotnet/efcore@ccb0344 [[ commit created by automation ]]

Update dependencies

ef48400

[efcore] Source update ccb0344 → 8540b89

f873cf4

Diff: https://github.com/dotnet/efcore/compare/ccb034441457f668c361de45bd9960e75a200c79..8540b89b33fcc6f60e429724790ce8ec89bca215 From: dotnet/efcore@ccb0344 To: dotnet/efcore@8540b89 [[ commit created by automation ]]

Merge branch 'main' into darc-main-feab3a7b-abf8-48e4-8ecc-7aed24d76694

58701cb

Merge branch 'main' into darc-main-feab3a7b-abf8-48e4-8ecc-7aed24d76694

07fb6af

dotnet-maestro Bot merged commit 6b0fceb into main Jan 9, 2026
17 checks passed

dotnet-maestro Bot deleted the darc-main-feab3a7b-abf8-48e4-8ecc-7aed24d76694 branch January 9, 2026 02:05

Uh oh!

Conversation

dotnet-maestro Bot commented Dec 20, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

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

Uh oh!

dotnet-maestro Bot commented Dec 20, 2025

Uh oh!

dotnet-maestro Bot commented Dec 23, 2025

Uh oh!

dotnet-maestro Bot commented Dec 28, 2025

Uh oh!

dotnet-maestro Bot commented Dec 29, 2025

Uh oh!

dotnet-maestro Bot commented Dec 30, 2025

Uh oh!

dotnet-maestro Bot commented Dec 31, 2025

Uh oh!

dotnet-maestro Bot commented Jan 4, 2026

Uh oh!

dotnet-maestro Bot commented Jan 6, 2026

🛑 Conflict detected

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

Uh oh!

dotnet-maestro Bot commented Jan 6, 2026

Uh oh!

premun commented Jan 6, 2026

Uh oh!

dotnet-maestro Bot commented Jan 7, 2026

🛑 Conflict detected

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

Uh oh!

dotnet-maestro Bot commented Jan 7, 2026

Uh oh!

dotnet-maestro Bot commented Jan 8, 2026

🛑 Conflict detected

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

Uh oh!

dotnet-maestro Bot commented Jan 8, 2026

Uh oh!

SamMonoRT commented Jan 8, 2026

Uh oh!

premun commented Jan 8, 2026

Uh oh!

premun commented Jan 8, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

SamMonoRT commented Jan 8, 2026

Uh oh!

premun commented Jan 8, 2026

Uh oh!

AndriySvyryd commented Jan 8, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

dotnet-maestro Bot commented Dec 20, 2025 •

edited

Loading

premun commented Jan 8, 2026 •

edited

Loading