Merge release/2.1 to master

[dotnet-bot]

This is an automatically generated pull request from release/2.1 into master.

git fetch --all
git checkout merges/release/2.1-to-master
git reset --hard upstream/master
git merge upstream/release/2.1
# Fix merge conflicts
git commit
git push merges/release/2.1-to-master --force

Once all conflicts are resolved and all the tests pass, you are free to merge the pull request.

[nguerrera]

https://ci.dot.net/job/dotnet_sdk/job/master/job/debug_osx10.12_prtest/566/testReport/

Perf tests are failing.

[nguerrera]

Just a note one more time because you can see commits getting duplicated in the history here: do not squash or rebase merge this or any merge between official branches.

[ghost]

@dotnet/dotnet-cli
Can we get a final code review on this please.

[nguerrera]

One line in build.ps1 seems to have been accepted on the wrong side:

It should match this from 2.1:

sdk/build/build.ps1

Line 92 in 6c29759

$env:MicrosoftNETBuildExtensionsTargets = Join-Path $env:MSBuildSDKsPath "Microsoft.NET.Build.Extensions\msbuildExtensions\Microsoft\Microoft.NET.Build.Extensions\Microsoft.NET.Build.Extensions.targets"

Not this from master:

sdk/build/build.ps1

Line 87 in 0b4c14f

$env:MicrosoftNETBuildExtensionsTargets = Join-Path $env:MSBuildSDKsPath "Microsoft.NET.Build.Extensions\msbuildExtensions\Microsoft.Common.Targets\ImportAfter\Microsoft.NET.Build.Extensions.targets"

[nguerrera]

See comment about incorrect merge in build.ps1

[ghost]

@nguerrera
The 'MicrosoftNETBuildExtensionsTargets' line has been addressed.

[nguerrera]

Something is strange. e00bcbd is showing lots more than fixing the extensions targets. I will dig a bit.

[nguerrera]

Oh I see, it's a merge commit. I thought it was a fix on top of the last commit, but you redid the merge. That is fine. I still want to check one more thing, but probably good to go in a few minutes.

[nguerrera]

Good to go: remember, do not squash or rebase.

[nguerrera]

Another nit for the future: don't describe your merge commits as "[Merging conflicting file1] and [conflicting file2]' but rather which branches you're merging to/from. Git will set the description for you, leave it that way. You can add notes about the conflicts below the summary. This is why I was so confused to see such a big diff in e00bcbd.