[automated] Merge branch 'release/5.0.2xx' => 'master'

[dotnet-maestro-bot]

I detected changes in the release/5.0.2xx 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.2xx by the following committers:

• wli3
• 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.2xx
git pull --ff-only
git checkout master
git pull --ff-only
git merge --no-ff release/5.0.2xx

# 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/sdk HEAD:merge/release/5.0.2xx-to-master

or if you are using SSH

git push git@github.com:dotnet-maestro-bot/sdk HEAD:merge/release/5.0.2xx-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.2xx-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.2xx-to-master master
git pull https://github.com/dotnet-maestro-bot/sdk merge/release/5.0.2xx-to-master
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/sdk HEAD:merge/release/5.0.2xx-to-master

or if you are using SSH

git checkout -b merge/release/5.0.2xx-to-master master
git pull git@github.com:dotnet-maestro-bot/sdk merge/release/5.0.2xx-to-master
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet-maestro-bot/sdk HEAD:merge/release/5.0.2xx-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.

[dotnet-issue-labeler]

I couldn't figure out the best area label to add to this PR. If you have write-permissions please help me learn by adding exactly one area label.

[v-wuzhai]

@sfoslund I resolved the conflicts. Could you help to review it at your convenience?

[sfoslund]

@marcpopMSFT @dsplaisted do we want the revert in #15695 to flow to master and prev 1?

[marcpopMSFT]

@sfoslund Master, yes. For preview 1, we don't want any autoflow of changes at this point. I created a PR in case we want to revert directly in preview 1: #15790

thanks!

[wli3]

@marcpopMSFT @sfoslund so this merge will have #15695