[release/2.1] Update ProdCon to 20181019-02-2156680 (#840)

* Update ProdCon to 20181019-02-2156680

Update to a 2.1.6 build.

* Update CLI patches

Remove uptaken NuGet warning CLI patch, update runtime version targeting patch to fix conflict.

* Update SDK toolset to 2.1.403

* Update submodules based on investigation

* Use test template packages as ref prebuilt

* Update version numbers

* Update baselines for 2.1.6, test template ref prebuilt

Author: dagood

DotnetCLIVersion.txt

@@ -1 +1 @@
-2.1.402
+2.1.403

ProdConFeed.txt

@@ -1 +1 @@
-https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/20180919-01/final/index.json
+https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/20181019-02/final/index.json

dependencies.props

@@ -5,7 +5,7 @@
     for which dotnet/versions commit was last used to update the dependency.
   -->
   <PropertyGroup>
-    <ProdConCurrentRef>7863ead82cb2424e8b6f2ac8625ec5f29eb88b84</ProdConCurrentRef>
+    <ProdConCurrentRef>db136a92478f1489903ef97beb905e235f5cd1da</ProdConCurrentRef>
     <CoreClrCurrentRef>1dbfe089b5c3537799927f6541185a8c1fd0adef</CoreClrCurrentRef>
     <BuildToolsCurrentRef>1dbfe089b5c3537799927f6541185a8c1fd0adef</BuildToolsCurrentRef>
   </PropertyGroup>
@@ -22,8 +22,8 @@
     the product as version strings to be used by the SDK to fetch extra content.
   -->
   <PropertyGroup>
-    <MicrosoftAspNetCoreAllPackageVersion>2.1.5</MicrosoftAspNetCoreAllPackageVersion>
-    <MicrosoftAspNetCoreAppPackageVersion>2.1.5</MicrosoftAspNetCoreAppPackageVersion>
+    <MicrosoftAspNetCoreAllPackageVersion>2.1.6</MicrosoftAspNetCoreAllPackageVersion>
+    <MicrosoftAspNetCoreAppPackageVersion>2.1.6</MicrosoftAspNetCoreAppPackageVersion>
     <MicrosoftNETSdkRazorPackageVersion>2.1.2</MicrosoftNETSdkRazorPackageVersion>
   </PropertyGroup>
 
@@ -50,7 +50,7 @@
 
     <DependencyInfo Include="ProdCon" Condition="'$(UpdateFromManifestFile)' == ''">
       <DependencyType>Orchestrated build</DependencyType>
-      <BasePath>build-info/dotnet/product/cli/release/2.1.5</BasePath>
+      <BasePath>build-info/dotnet/product/cli/release/2.1.6</BasePath>
       <CurrentRef>$(ProdConCurrentRef)</CurrentRef>
       <VersionsRepoOwner>dotnet</VersionsRepoOwner>
       <VersionsRepo>versions</VersionsRepo>

patches/cli/0001-Persist-ASP.NET-runtime-patch-targeting-default.patch

@@ -11,12 +11,12 @@ https://github.com/dotnet/cli/issues/9469 is required to remove this patch.
  1 file changed, 8 insertions(+)
 
 diff --git a/build/MSBuildExtensions.targets b/build/MSBuildExtensions.targets
-index f5365724a..fd2fa3719 100644
+index a85966295..448c3a27e 100644
 --- a/build/MSBuildExtensions.targets
 +++ b/build/MSBuildExtensions.targets
 @@ -196,6 +196,14 @@ Copyright (c) .NET Foundation. All rights reserved.
-     <LatestPatchVersionForNetCore1_0 Condition="'%24(LatestPatchVersionForNetCore1_0)' == ''">1.0.12</LatestPatchVersionForNetCore1_0>
-     <LatestPatchVersionForNetCore1_1 Condition="'%24(LatestPatchVersionForNetCore1_1)' == ''">1.1.9</LatestPatchVersionForNetCore1_1>
+     <LatestPatchVersionForNetCore1_0 Condition="'%24(LatestPatchVersionForNetCore1_0)' == ''">1.0.13</LatestPatchVersionForNetCore1_0>
+     <LatestPatchVersionForNetCore1_1 Condition="'%24(LatestPatchVersionForNetCore1_1)' == ''">1.1.10</LatestPatchVersionForNetCore1_1>
      <LatestPatchVersionForNetCore2_0 Condition="'%24(LatestPatchVersionForNetCore2_0)' == ''">2.0.9</LatestPatchVersionForNetCore2_0>
 +
 +    <!-- In source-build, override the default behavior to always target the latest ASP.NET Core runtime.

patches/cli/0002-Ignore-NU5123-build-failure-with-SDK-2.1.402.patch

@@ -21,7 +21,7 @@
     <BuildCommand>$(ProjectDirectory)/build$(ShellExtension) $(BuildArguments)</BuildCommand>
     <BuildCommand Condition="$(Platform.Contains('arm'))">$(ArmEnvironmentVariables) $(BuildCommand)</BuildCommand>
 
-    <OfficialBuildId>20180919-01</OfficialBuildId>
+    <OfficialBuildId>20181019-06</OfficialBuildId>
 
     <!-- Need to set $(PackagesOutput) so WriteVersions writes the versions file for cli, until cli respects auto-dependency flow -->
     <PackagesOutput>$(SourceBuiltPackagesPath)</PackagesOutput>

patches/nuget-client/0001-Add-TargetingPack-and-enable-net46-builds-for-source.patch

@@ -19,7 +19,7 @@
     <BuildCommand Condition="$(Platform.Contains('arm'))">$(ArmEnvironmentVariables) $(BuildCommand)</BuildCommand>
 
     <CleanCommand>$(ProjectDirectory)/clean$(ShellExtension)</CleanCommand>
-    <OfficialBuildId>20180919-02</OfficialBuildId>
+    <OfficialBuildId>20181019-06</OfficialBuildId>
   </PropertyGroup>
 
   <ItemGroup>

repos/core-setup.proj

@@ -22,7 +22,7 @@
 
     <PackagesOutput>$(ProjectDirectory)/bin/packages/$(Configuration)</PackagesOutput>
     <CleanCommand>$(ProjectDirectory)/clean$(ShellExtension)</CleanCommand>
-    <OfficialBuildId>20180919-02</OfficialBuildId>
+    <OfficialBuildId>20181019-05</OfficialBuildId>
   </PropertyGroup>
 
   <ItemGroup>

repos/coreclr.proj

@@ -3,7 +3,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))/dir.props" />
   <PropertyGroup>
     <PackagesOutput>$(ProjectDirectory)/BuildFromSource/Release/bin</PackagesOutput>
-    <BuildRevision>171107</BuildRevision>
+    <BuildRevision>181017</BuildRevision>
     <BuildCommand>$(ProjectDirectory)/src/buildfromsource$(ShellExtension)</BuildCommand>
     <RepoApiImplemented>false</RepoApiImplemented>
     <!-- This repo is not currently built in ProdCon -->