[release/2.1] 2.1.1 fixes, combined

[dagood]

Rolls up #598 (PR) plus(merged) fixes for #608, #609, #586.

[dagood]

This patch isn't fully working yet (see #586 (comment)) so I'm going to go ahead and merge #598 since its CI finished and rebase this PR with the fix.

[dagood]

There was a new 2.1.1 build (published to the 2.1 channel) that I've added a commit to uptake. I hear it's branding fixes for sdk and websdk.

[crummel]

I'm not sure yet why we weren't seeing the branding issue; from the changes I think we should have been and I'm continuing to look at it. I think we also need to add <EnvironmentVariables Include="PB_IsStable=$(UseStableVersions)" Condition="'$(UseStableVersions)' != ''" /> here to be completely correct because roslyn-tools-based repos use this variable directly.

[crummel]

Ah, it appears the packages that are produced with the incorrect versions are unpacked and the contents included, so we never see the incorrect version. For the roslyn-tools issue, I think the only place we would actually produce bad packages would be MSBuild, where we're manually setting the version anyway - so this change shouldn't be necessary for 2.1.1, although I think it would be good long-term.

[dagood]

If CI infra ends up too flaky and we want to go ahead with 2.1.1 without the last two commits, dabf6ed passed CI except an infra snag with CentOS7.1 Release. I kicked off a build to run the leg on that commit (edit: which has now succeeded). (It didn't update the CI status indicators because it's a manual build, unfortunately.)

[crummel]

@dotnet-bot test OSX10.12 Release please (java.nio.channels.ClosedChannelException)

[crummel]

This did get the versioning updates (that we didn't really need):

Successfully created package '/mnt/resource/j/workspace/dotnet_source-build/release_2.1/CentOS7.1_Release_prtest/src/websdk/bin/Release/Microsoft.NET.Sdk.Web.2.1.301.nupkg'.
Successfully created package '/mnt/resource/j/workspace/dotnet_source-build/release_2.1/CentOS7.1_Release_prtest/src/sdk/artifacts/Release/packages/Microsoft.NET.Sdk.2.1.301.nupkg'.

[dagood]

@dotnet-bot test OSX10.12 Release (java.nio.channels.ClosedChannelException)

[crummel]

@dotnet-bot test OSX10.12 Release please (looks like a timeout, but didn't take long enough for one. no other error message. machine lost without Jenkins realizing it?)