[release/2.1] Update to new 2.1.3 build 20180720-01-1881271 (#661)

* Update CoreClr, ProdCon to servicing-26719-02, 20180720-01-1881271, respectively

* Fix CLI patches

Author: dagood

ProdConFeed.txt

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

dependencies.props

@@ -5,8 +5,8 @@
     for which dotnet/versions commit was last used to update the dependency.
   -->
   <PropertyGroup>
-    <ProdConCurrentRef>908dee01ee91f36bf97c69a33dcc2e54e4d837ac</ProdConCurrentRef>
-    <CoreClrCurrentRef>908dee01ee91f36bf97c69a33dcc2e54e4d837ac</CoreClrCurrentRef>
+    <ProdConCurrentRef>249d209ddf374b9fd057e23e1ddd8941aec117ee</ProdConCurrentRef>
+    <CoreClrCurrentRef>249d209ddf374b9fd057e23e1ddd8941aec117ee</CoreClrCurrentRef>
     <BuildToolsCurrentRef>91c9a3b3374ff71e72c06d5773bd26598539aa1d</BuildToolsCurrentRef>
   </PropertyGroup>
 

patches/cli/0002-Fix-NuGet-SDK-resolver-PackageVersion-property.patch

@@ -1,4 +1,4 @@
-From 7c3f8f470aa6fd832ca0dfd6d7a94b2d9adeb6fb Mon Sep 17 00:00:00 2001
+From 2ada435dd1c0fa29d85ed0885eb5531eba6b5d31 Mon Sep 17 00:00:00 2001
 From: Davis Goodin <dagood@microsoft.com>
 Date: Mon, 16 Jul 2018 12:33:29 -0500
 Subject: [PATCH] Fix NuGet SDK resolver PackageVersion property
@@ -10,7 +10,7 @@ https://github.com/dotnet/cli/issues/9669 is required to remove this patch.
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
-index 099c68052..618d48771 100644
+index 2b82b358d..31cf70e72 100644
 --- a/build/DependencyVersions.props
 +++ b/build/DependencyVersions.props
 @@ -52,7 +52,7 @@
@@ -19,7 +19,7 @@ index 099c68052..618d48771 100644
      <NuGetVersioningPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetVersioningPackageVersion>
 -    <NuGetSdkResolverPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetSdkResolverPackageVersion>
 +    <MicrosoftBuildNuGetSdkResolverPackageVersion>$(NuGetBuildTasksPackageVersion)</MicrosoftBuildNuGetSdkResolverPackageVersion>
-     <MicrosoftNETTestSdkPackageVersion>15.8.0-preview-20180605-02</MicrosoftNETTestSdkPackageVersion>
+     <MicrosoftNETTestSdkPackageVersion>15.8.0</MicrosoftNETTestSdkPackageVersion>
      <MicrosoftTestPlatformCLIPackageVersion>$(MicrosoftNETTestSdkPackageVersion)</MicrosoftTestPlatformCLIPackageVersion>
      <MicrosoftTestPlatformBuildPackageVersion>$(MicrosoftNETTestSdkPackageVersion)</MicrosoftTestPlatformBuildPackageVersion>
 diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj

repos/core-setup.proj

@@ -6,7 +6,7 @@
     <BuildArguments Condition="$(Platform.Contains('arm'))">$(BuildArguments) -TargetArchitecture=$(Platform) -DisableCrossgen=true -CrossBuild=true</BuildArguments>
     <BuildCommand>$(ProjectDirectory)/build$(ShellExtension) $(BuildArguments) -- /p:BuildDebPackage=false /p:BuildAllPackages=true</BuildCommand>
     <BuildCommand Condition="$(Platform.Contains('arm'))">$(ArmEnvironmentVariables) $(BuildCommand)</BuildCommand>
-    <OfficialBuildId>20180711-05</OfficialBuildId>
+    <OfficialBuildId>20180720-04</OfficialBuildId>
 
     <!-- Need to set $(PackagesOutput) so WriteVersions writes the versions file for cli, until cli respects auto-dependency flow -->
     <PackagesOutput>$(SourceBuiltPackagesPath)</PackagesOutput>

repos/coreclr.proj

@@ -10,7 +10,7 @@
     <BuildCommand>$(ProjectDirectory)/build$(ShellExtension) $(BuildArguments) --</BuildCommand>
     <BuildCommand Condition="$(Platform.Contains('arm'))">$(ArmEnvironmentVariables) $(BuildCommand)</BuildCommand>
     <CleanCommand>$(ProjectDirectory)/clean$(ShellExtension)</CleanCommand>
-    <OfficialBuildId>20180711-02</OfficialBuildId>
+    <OfficialBuildId>20180720-02</OfficialBuildId>
   </PropertyGroup>
 
   <ItemGroup>

repos/corefx.proj

@@ -7,7 +7,7 @@
     <BuildCommand Condition="$(Platform.Contains('arm'))">$(ArmEnvironmentVariables) $(BuildCommand)</BuildCommand>
     <PackagesOutput>$(ProjectDirectory)/bin/packages/$(Configuration)</PackagesOutput>
     <CleanCommand>$(ProjectDirectory)/clean$(ShellExtension)</CleanCommand>
-    <OfficialBuildId>20180711-08</OfficialBuildId>
+    <OfficialBuildId>20180720-08</OfficialBuildId>
   </PropertyGroup>
 
   <ItemGroup>

repos/sdk.proj

@@ -2,7 +2,7 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))/dir.props" />
   <PropertyGroup>
-    <OfficialBuildId>20180711.1</OfficialBuildId>
+    <OfficialBuildId>20180720.2</OfficialBuildId>
     <OutputVersionArgs>/p:BUILD_BUILDNUMBER=$(OfficialBuildId)</OutputVersionArgs>
     <BuildCommandArgs>--pack --configuration $(Configuration) $(OutputVersionArgs)</BuildCommandArgs>