[automated] Merge branch 'vs17.4' => 'vs17.5'

[dotnet-maestro-bot]

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

This PR merges commits made on vs17.4 by the following committers:

• @Forgind
• @AR-May
• @rainersigwald
• @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 vs17.4
git pull --ff-only
git checkout vs17.5
git pull --ff-only
git merge --no-ff vs17.4

# 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/msbuild HEAD:merge/vs17.4-to-vs17.5

or if you are using SSH

git push git@github.com:dotnet-maestro-bot/msbuild HEAD:merge/vs17.4-to-vs17.5

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

git checkout -b merge/vs17.4-to-vs17.5 vs17.5
git pull https://github.com/dotnet-maestro-bot/msbuild merge/vs17.4-to-vs17.5
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/msbuild HEAD:merge/vs17.4-to-vs17.5

or if you are using SSH

git checkout -b merge/vs17.4-to-vs17.5 vs17.5
git pull git@github.com:dotnet-maestro-bot/msbuild merge/vs17.4-to-vs17.5
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet-maestro-bot/msbuild HEAD:merge/vs17.4-to-vs17.5

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.

[Forgind]

🥳 (Thanks @rainersigwald!)

@AR-May, I take it your optprof changes hadn't gone into 17.5? If they should, can you resolve the conflict? Not sure what it should be.

[rainersigwald]

@AR-May, I take it your optprof changes hadn't gone into 17.5? If they should, can you resolve the conflict? Not sure what it should be.

They went into 17.5/main but via unrelated commits (they were there first), so the content was identical. I took the 17.5 version of everything (with the allow-keep-machines-around edit you ported).