[automated] Merge branch 'release/5.0-preview6' => 'master'

[dotnet-maestro-bot]

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

This PR merges commits made on release/5.0-preview6 by the following committers:

• @smitpatel
• @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.

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/5.0-preview6
git pull --ff-only
git checkout master
git pull --ff-only
git merge --no-ff release/5.0-preview6

# 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-maestro-bot/EntityFrameworkCore HEAD:merge/release/5.0-preview6-to-master

or if you are using SSH

git push git@github.com:dotnet-maestro-bot/EntityFrameworkCore HEAD:merge/release/5.0-preview6-to-master

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/5.0-preview6-to-master'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.

git checkout -b merge/release/5.0-preview6-to-master master
git pull https://github.com/dotnet-maestro-bot/EntityFrameworkCore merge/release/5.0-preview6-to-master
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/EntityFrameworkCore HEAD:merge/release/5.0-preview6-to-master

or if you are using SSH

git checkout -b merge/release/5.0-preview6-to-master master
git pull git@github.com:dotnet-maestro-bot/EntityFrameworkCore merge/release/5.0-preview6-to-master
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet-maestro-bot/EntityFrameworkCore HEAD:merge/release/5.0-preview6-to-master

Contact .NET Core Engineering if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/master/scripts/GitHubMergeBranches.ps1.

[smitpatel]

@roji - Please remember to merge release to master whenever you merge something to release branches.

[roji]

@smitpatel can you explain what I missed? For both commits, I first merged to master and then cherry-picked to release/5.0-preview6:

• Return ValueTask in loggers and interceptors: 9f316e5 in master, 869b4af in release/5.0-preview6
• Add ConfigureAwait(false): e1c9a3a in master, 81f9ddb in release/5.0-preview6

The bot then generated a PR from the release branch to master with some conflicts, which I resolved by taking master's versions (following the instructions above).

[smitpatel]

The commits were not marked as merged into master. That is the reason it shows up in the diff above. I had to go through to resolve conflicts manually because all my commits had to flow to master.
Whatever happened in #21193 was not a correct merge.

[roji]

I have no idea what happened - I did follow the instructions above. FWIW I find this whole complexity to be meaningless extra work.

[smitpatel]

cc: @ajcvickers

[ajcvickers]

@roji Did you do a merge commit?

[roji]

I followed the instructions above under "Instructions for updating this pull request", but I guess I must have gotten it wrong.

I guess the annoying part is that I started work on master, then cherry-picked to the release branch - resolving conflicts at that point - and then again had to deal with conflicts as the bot merged release back into master. Had I worked on release first this wouldn't have happened - but this flow just makes things difficult when starting from master.

It doesn't really matter, I guess we don't backport to release/patch branches often enough for it to be an issue.