[release/2.2] Fixes to align with 2.2.0-preview3 Microsoft build (#821)

* Fix prerelease label for Core-Setup, SDK

Put UseStableVersions, VersionStamp properties where they will be auto-updated eventually.

SDK picks up on PB_VersionStamp, so set it similarly to PB_IsStable.

* Update templating repo version props

* Update nuget-client submodule for CLI dependency

dependencies.props

@@ -27,6 +27,12 @@
     <MicrosoftNETSdkRazorPackageVersion>2.2.0-preview3-35497</MicrosoftNETSdkRazorPackageVersion>
   </PropertyGroup>
 
+  <!-- Build stabilization properties as passed in by ProdCon. -->
+  <PropertyGroup>
+    <UseStableVersions Condition="'$(UseStableVersions)' == ''">false</UseStableVersions>
+    <VersionStamp Condition="'$(VersionStamp)' == ''">preview3</VersionStamp>
+  </PropertyGroup>
+
   <ItemGroup>
     <!-- Get ILAsm tool version from CoreCLR. -->
     <RemoteDependencyBuildInfo Include="CoreClr">

repos/core-setup.proj

@@ -16,7 +16,7 @@
     <BuildArguments>$(BuildArguments) /p:BuildDebPackage=false</BuildArguments>
     <BuildArguments>$(BuildArguments) /p:BuildAllPackages=true</BuildArguments>
     <BuildArguments>$(BuildArguments) /p:OutputRid=$(OverrideTargetRid)</BuildArguments>
-    <BuildArguments>$(BuildArguments) /p:PreReleaseLabel="preview"</BuildArguments>
+    <BuildArguments>$(BuildArguments) /p:PreReleaseLabel="$(VersionStamp)"</BuildArguments>
     <BuildArguments>$(BuildArguments) /bl</BuildArguments>
 
     <BuildCommand>$(ProjectDirectory)/build$(ShellExtension) $(BuildArguments)</BuildCommand>

repos/dir.props

@@ -35,12 +35,6 @@
     <OrchestratedManifestBuildName Condition="'$(OrchestratedManifestBuildName)' == ''">$(RepositoryName)</OrchestratedManifestBuildName>
   </PropertyGroup>
 
-  <!-- for RTM only, default to stabilized builds because that's what matches the official builds -->
-  <!-- once https://github.com/dotnet/source-build/issues/550 is fixed we will be able to determine this automatically -->
-  <PropertyGroup>
-    <UseStableVersions Condition="'$(UseStableVersions)' == ''">false</UseStableVersions>
-  </PropertyGroup>
-
   <ItemGroup>
     <EnvironmentVariables Include="DOTNET_TOOL_DIR=$(DotNetCliToolDir)" />
     <EnvironmentVariables Include="BUILD_TOOLS_TOOL_DIR=$(ProjectDir)Tools/" />
@@ -51,9 +45,12 @@
     <EnvironmentVariables Include="DotNetBuildOffline=true" Condition="'$(OfflineBuild)' == 'true'" />
     <EnvironmentVariables Include="DotNetCoreSdkDir=$(DotNetCliToolDir)" />
     <EnvironmentVariables Include="DotNetBuildToolsDir=$(ProjectDir)Tools/" />
+
     <EnvironmentVariables Include="StabilizePackageVersion=$(UseStableVersions)" Condition="'$(UseStableVersions)' != ''" />
     <EnvironmentVariables Include="PB_IsStable=$(UseStableVersions)" Condition="'$(UseStableVersions)' != ''" />
+
     <EnvironmentVariables Include="PackageVersionStamp=$(VersionStamp)" Condition="'$(VersionStamp)' != ''" />
+    <EnvironmentVariables Include="PB_VersionStamp=$(VersionStamp)" Condition="'$(VersionStamp)' != ''" />
 
     <!-- If MSBuild exits early, make sure debug output like 'MSBuild_*.failure.txt' ends up in a place we can see it. -->
     <EnvironmentVariables Include="MSBUILDDEBUGPATH=$(MSBuildDebugPathTargetDir)" />

repos/nuget-client.proj

@@ -6,7 +6,7 @@
     <NuGetCoreSourceDirectory>$(ProjectDirectory)src/NuGet.Core/</NuGetCoreSourceDirectory>
     <ToolsDirectory>$(ProjectDirectory)cli/</ToolsDirectory>
     <NuGetKeyFilePath>$(KeysDir)NuGet.Client.snk</NuGetKeyFilePath>
-    <NuGetClientBuildNumber>5362</NuGetClientBuildNumber>
+    <NuGetClientBuildNumber>5473</NuGetClientBuildNumber>
     <RepoApiImplemented>false</RepoApiImplemented>
     <!--
       This repo is not currently built in ProdCon

repos/templating.proj

@@ -3,9 +3,9 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))/dir.props" />
   <PropertyGroup>
     <PackagesOutput>$(ProjectDirectory)artifacts/packages</PackagesOutput>
-    <BuildNumber>301</BuildNumber>
-    <PackageDateTime>20170727</PackageDateTime>
-    <PackageBuildQuality>beta2</PackageBuildQuality>
+    <BuildNumber>2115911</BuildNumber>
+    <PackageDateTime>20181014</PackageDateTime>
+    <PackageBuildQuality>beta4</PackageBuildQuality>
     <RepoApiImplemented>false</RepoApiImplemented>
   </PropertyGroup>