Update ProdCon to 20180802-01-1915331 (release/2.2) (#679)

* Update ProdCon to 20180802-01-1915331

* Fix CLI patches (2 removed, 1 remains)

Author: dotnet-maestro-bot

ProdConFeed.txt

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

dependencies.props

@@ -5,7 +5,7 @@
     for which dotnet/versions commit was last used to update the dependency.
   -->
   <PropertyGroup>
-    <ProdConCurrentRef>370e36164ef030daf1086ac5ef8a7de8956d5724</ProdConCurrentRef>
+    <ProdConCurrentRef>07b337ef72ae40c52fbfb85047c06c8936c47462</ProdConCurrentRef>
     <CoreClrCurrentRef>293e58e87c0575e7e425a1bab57d5eb0e25d743e</CoreClrCurrentRef>
     <BuildToolsCurrentRef>91c9a3b3374ff71e72c06d5773bd26598539aa1d</BuildToolsCurrentRef>
   </PropertyGroup>
@@ -28,9 +28,9 @@
     the product as version strings to be used by the SDK to fetch extra content.
   -->
   <PropertyGroup>
-    <MicrosoftAspNetCoreAllPackageVersion>2.2.0-preview1-34785</MicrosoftAspNetCoreAllPackageVersion>
-    <MicrosoftAspNetCoreAppPackageVersion>2.2.0-preview1-34785</MicrosoftAspNetCoreAppPackageVersion>
-    <MicrosoftNETSdkRazorPackageVersion>2.2.0-preview1-34785</MicrosoftNETSdkRazorPackageVersion>
+    <MicrosoftAspNetCoreAllPackageVersion>2.2.0-preview1-34866</MicrosoftAspNetCoreAllPackageVersion>
+    <MicrosoftAspNetCoreAppPackageVersion>2.2.0-preview1-34866</MicrosoftAspNetCoreAppPackageVersion>
+    <MicrosoftNETSdkRazorPackageVersion>2.2.0-preview1-34866</MicrosoftNETSdkRazorPackageVersion>
   </PropertyGroup>
 
   <ItemGroup>

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

@@ -11,13 +11,13 @@ https://github.com/dotnet/cli/issues/9469 is required to remove this patch.
  1 file changed, 3 insertions(+)
 
 diff --git a/build/MSBuildExtensions.targets b/build/MSBuildExtensions.targets
-index f5365724a..f192226b8 100644
+index 9e0aa5db4..89c8503e1 100644
 --- a/build/MSBuildExtensions.targets
 +++ b/build/MSBuildExtensions.targets
-@@ -196,6 +196,9 @@ Copyright (c) .NET Foundation. All rights reserved.
-     <LatestPatchVersionForNetCore1_0 Condition="'%24(LatestPatchVersionForNetCore1_0)' == ''">1.0.12</LatestPatchVersionForNetCore1_0>
+@@ -197,6 +197,9 @@ Copyright (c) .NET Foundation. All rights reserved.
      <LatestPatchVersionForNetCore1_1 Condition="'%24(LatestPatchVersionForNetCore1_1)' == ''">1.1.9</LatestPatchVersionForNetCore1_1>
      <LatestPatchVersionForNetCore2_0 Condition="'%24(LatestPatchVersionForNetCore2_0)' == ''">2.0.9</LatestPatchVersionForNetCore2_0>
+     <LatestPatchVersionForNetCore2_1 Condition="'%24(LatestPatchVersionForNetCore2_1)' == ''">2.1.2</LatestPatchVersionForNetCore2_1>
 +
 +    <!-- If true, always target the latest ASP.NET Core runtime by default -->
 +    <TargetLatestAspNetCoreRuntimePatch Condition="'$(TargetLatestAspNetCoreRuntimePatch)' == ''">$(DefaultTargetLatestAspNetCoreRuntimePatch)</TargetLatestAspNetCoreRuntimePatch>

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

@@ -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>20180725-02</OfficialBuildId>
+    <OfficialBuildId>20180802-03</OfficialBuildId>
 
     <!-- Need to set $(PackagesOutput) so WriteVersions writes the versions file for cli, until cli respects auto-dependency flow -->
     <PackagesOutput>$(SourceBuiltPackagesPath)</PackagesOutput>

patches/cli/0003-Add-binlog-build-args.patch

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

repos/core-setup.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>20180725-02</OfficialBuildId>
+    <OfficialBuildId>20180802-03</OfficialBuildId>
   </PropertyGroup>
 
   <ItemGroup>

repos/coreclr.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>20180725.2</OfficialBuildId>
+    <OfficialBuildId>20180802.1</OfficialBuildId>
     <OutputVersionArgs>/p:BUILD_BUILDNUMBER=$(OfficialBuildId)</OutputVersionArgs>
     <BuildCommandArgs>--pack --configuration $(Configuration) $(OutputVersionArgs)</BuildCommandArgs>