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

[dotnet-maestro-bot]

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

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

• @danmosemsft

Instructions for merging

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

You can also do this on command line:

git checkout release/2.2
git pull
git fetch --force https://github.com/dotnet-maestro-bot/corefx merge/release/2.1-to-release/2.2:merge/release/2.1-to-release/2.2
git merge merge/release/2.1-to-release/2.2
git push

⚠️ If there are merge conflicts, you will need to resolve them manually before merging.

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

[danmoseley]

@weshaggard CoreCLR has its own release/2.2 branch. Shouldn't maestro be pointing our release/2.2 at their release/2.2 instead of letting this tool point it at their release/2.1?

[weshaggard]

@danmosemsft as far as I'm aware we have yet to produce an official release/2.2 build, @mmitche can confirm. Until that happens we will continue to consume the release/2.1 bits. Once we start publishing release/2.2 builds we need to have auto-updates into the release/2.2 branches but these auto merges from release/2.1 will still continue and we may have to handle any merge conflicts that occur manually. @wtgodbe will be on the lookout for those.

[danmoseley]

@weshaggard @wtgodbe so meantime it is OK for me to merge these 2.2 mirror PR's including the Maestro edits?

[weshaggard]

Yes and if there are merge conflicts ping @wtgodbe and myself.

[dotnet-maestro-bot]

This pull request has been updated.

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

• @joshfree
• @danmosemsft

[danmoseley]

Aw nuts. @weshaggard @wtgodbe apologies, I did squash not rebase.

[weshaggard]

Aw nuts. @weshaggard @wtgodbe apologies, I did squash not rebase.

You should do neither you should do a merge (see the pretty picture in bot provided in the description). Doing a squash eliminates the individual commits which kind of sucks for these PR's, as we loose the context of each commit we are porting.