[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:

• @dougbu

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.

[dotnet-maestro-bot]

❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/2.2, but I could not automatically push those to merge/release/2.2-to-release/3.0 to update this PR.
You may need to fix this problem by merging branches with this PR. Contact .NET Core Engineering if you are not sure what to do about this.

[wtgodbe]

This is the flaky failure:

An operation is not legal in the current state.

Should hopefully be fixed after Doug's PR

[pranavkm]

@aspnet/build can we get this merged?

[dougbu]

@pranavkm the branding in our 'release/3.0' branch is fine. My only concern is conflicts between this and the 'release/2.1' merges into 'release/3.0' (soon).

@wtgodbe I thought we fixed up the dotnet/versions repo to take 'release/2.2' out of the automated merge sequence? https://github.com/dotnet/versions/blob/master/Maestro/subscriptions.json#L1144-L1184 still includes an indirection through that branch instead of going direct from 'release/2.1' into 'release/3.0'. We need an issue here or just send a PR to dotnet/versions and CC a few of us.