[automated] Merge branch 'release/2.2' => 'release/3.0'

[dotnet-maestro-bot]

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

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

• @anurse

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/2.2
git pull --ff-only
git checkout release/3.0
git pull --ff-only
git merge --no-ff release/2.2

# 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/AspNetCore HEAD:merge/release/2.2-to-release/3.0

or if you are using SSH

git push [email protected]:dotnet-maestro-bot/AspNetCore HEAD:merge/release/2.2-to-release/3.0

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

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

or if you are using SSH

git checkout -b merge/release/2.2-to-release/3.0 release/3.0
git pull [email protected]:dotnet-maestro-bot/AspNetCore merge/release/2.2-to-release/3.0
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet-maestro-bot/AspNetCore HEAD:merge/release/2.2-to-release/3.0

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.

[Tratcher]

DO NOT MERGE.

There is a seperate PR for 3.0 (#13870) and it needs to wait until the branch opens for November.

[dotnet-maestro-bot]

This pull request has been updated.

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

• @dougbu
• @anurse

[analogrelay]

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

• @anurse

On a side-note, it seems that the bot that generates this is only looking at the Git "Committer" field. Perhaps it should consider the "Author" field. In this case, I just pressed the merge button on @Tratcher 's commits. @Tratcher is more likely to have the context here for conflict resolution.

[dougbu]

On the same side note, this isn't our bot but we can bring the author preference up with dnceng. Wanna file a bug in dotnet/core-eng?

[analogrelay]

https://github.com/dotnet/core-eng/issues/8070

[Tratcher]

Unblocked, but we need to be careful about resolving the merge conflicts.

[dougbu]

Unblocked, but we need to be careful about resolving the merge conflicts.

Why is this unblocked while we're still trying to get 3.0.1 done? Are the changes coming in mandatory for 3.01?

Separately, will the "we" in your statement about conflict resolution be "@Tratcher"? We need an owner and if it's not you, the assignee for this PR is incorrect.

[Tratcher]

I've resolved the conflicts.