Skip to content

[automated] Merge branch 'release/10.0' => 'main'#38031

Merged
AndriySvyryd merged 3 commits into
mainfrom
merge/release/10.0-to-main
Mar 30, 2026
Merged

[automated] Merge branch 'release/10.0' => 'main'#38031
AndriySvyryd merged 3 commits into
mainfrom
merge/release/10.0-to-main

Conversation

@github-actions
Copy link
Copy Markdown
Contributor

I detected changes in the release/10.0 branch which have not been merged yet to main. I'm a robot and am configured to help you automatically keep main up to date, so I've opened this PR.

This PR merges commits made on release/10.0 by the following committers:

  • roji
  • dotnet-maestro[bot]

Instructions for merging from UI

This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, not a squash or rebase commit.

merge button instructions

If this repo does not allow creating merge commits from the GitHub UI, use command line instructions.

Instructions for merging via command line

Run these commands to merge this pull request from the command line.

git fetch
git checkout release/10.0
git pull --ff-only
git checkout main
git pull --ff-only
git merge --no-ff release/10.0

# If there are merge conflicts, resolve them and then run git merge --continue to complete the merge
# Pushing the changes to the PR branch will re-trigger PR validation.
git push https://github.com/dotnet/efcore HEAD:merge/release/10.0-to-main
or if you are using SSH
git push git@github.com:dotnet/efcore HEAD:merge/release/10.0-to-main

After PR checks are complete push the branch

git push

Instructions for resolving conflicts

⚠️ If there are merge conflicts, you will need to resolve them manually before merging. You can do this using GitHub or using the command line.

Instructions for updating this pull request

Contributors to this repo have permission update this pull request by pushing to the branch 'merge/release/10.0-to-main'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.
The provided examples assume that the remote is named 'origin'. If you have a different remote name, please replace 'origin' with the name of your remote.

git fetch
git checkout -b merge/release/10.0-to-main origin/main
git pull https://github.com/dotnet/efcore merge/release/10.0-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/efcore HEAD:merge/release/10.0-to-main
or if you are using SSH
git fetch
git checkout -b merge/release/10.0-to-main origin/main
git pull git@github.com:dotnet/efcore merge/release/10.0-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet/efcore HEAD:merge/release/10.0-to-main

Contact .NET Core Engineering (dotnet/dnceng) if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/main/.github/workflows/scripts/inter-branch-merge.ps1.

dotnet-maestro Bot and others added 2 commits March 27, 2026 07:29
[release/10.0] Source code updates from dotnet/dotnet
…ties in ExecuteUpdate (#38007)

Backport of #37975 to release/10.0.

In ExpressionTreeFuncletizer.ProcessEvaluatableRoot, ConvertIfNeeded calls Visit
which corrupts _state back to EvaluatableWithoutCapturedVariable when wrapping a
constant int to int?. This causes the parent VisitLambda to treat the lambda as
evaluatable, compiling it to a Func and breaking TranslateSetterValueSelector.

Fix: reset state to NoEvaluatability after ConvertIfNeeded returns.
Added quirk Microsoft.EntityFrameworkCore.Issue37974 to opt out.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@github-actions github-actions Bot requested review from a team and AndriySvyryd as code owners March 30, 2026 18:06
@AndriySvyryd AndriySvyryd merged commit b845cf4 into main Mar 30, 2026
7 of 17 checks passed
@AndriySvyryd AndriySvyryd deleted the merge/release/10.0-to-main branch March 30, 2026 18:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants