Update ProdCon to 20180820-01-1963377 (release/2.2) (#694)

* Update ProdCon to 20180820-01-1963377

* Add patch to fix websdk TargetFrameworks override

ProdConFeed.txt

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

dependencies.props

@@ -5,7 +5,7 @@
     for which dotnet/versions commit was last used to update the dependency.
   -->
   <PropertyGroup>
-    <ProdConCurrentRef>222f28f0e1d1ccc987c574efb500e804d42add74</ProdConCurrentRef>
+    <ProdConCurrentRef>8cb4f31e7894e4363ff1941a679f01ebe0f07297</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-34992</MicrosoftAspNetCoreAllPackageVersion>
-    <MicrosoftAspNetCoreAppPackageVersion>2.2.0-preview1-34992</MicrosoftAspNetCoreAppPackageVersion>
-    <MicrosoftNETSdkRazorPackageVersion>2.2.0-preview1-34992</MicrosoftNETSdkRazorPackageVersion>
+    <MicrosoftAspNetCoreAllPackageVersion>2.2.0-preview1-35029</MicrosoftAspNetCoreAllPackageVersion>
+    <MicrosoftAspNetCoreAppPackageVersion>2.2.0-preview1-35029</MicrosoftAspNetCoreAppPackageVersion>
+    <MicrosoftNETSdkRazorPackageVersion>2.2.0-preview1-35029</MicrosoftNETSdkRazorPackageVersion>
   </PropertyGroup>
 
   <ItemGroup>

patches/websdk/0001-Fix-DotNetBuildFromSource-framework-override.patch

@@ -0,0 +1,44 @@
+From 646cb1bace928c3392116f6687127b25562e99b6 Mon Sep 17 00:00:00 2001
+From: Davis Goodin <[email protected]>
+Date: Tue, 21 Aug 2018 14:19:23 -0500
+Subject: [PATCH] Fix DotNetBuildFromSource framework override
+
+Makes the override single framework match the usual one. netstandard1.3 was
+changed to netcoreapp2.0 for TargetFrameworks, but not the override. This also
+required including the override in test project, probably because the change
+was from netstandard to netcoreapp which isn't compatible with net46.
+
+https://github.com/aspnet/websdk/issues/398 is required to remove this patch.
+---
+ .../Microsoft.NET.Sdk.Publish.Tasks.csproj                      | 2 +-
+ .../Microsoft.NET.Sdk.Publish.Tasks.Tests.csproj                | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/Publish/Microsoft.NET.Sdk.Publish.Tasks/Microsoft.NET.Sdk.Publish.Tasks.csproj b/src/Publish/Microsoft.NET.Sdk.Publish.Tasks/Microsoft.NET.Sdk.Publish.Tasks.csproj
+index 72a50d6..2d257e4 100644
+--- a/src/Publish/Microsoft.NET.Sdk.Publish.Tasks/Microsoft.NET.Sdk.Publish.Tasks.csproj
++++ b/src/Publish/Microsoft.NET.Sdk.Publish.Tasks/Microsoft.NET.Sdk.Publish.Tasks.csproj
+@@ -8,7 +8,7 @@
+
+   <PropertyGroup>
+     <TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
+-    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netstandard1.3</TargetFrameworks>
++    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp2.0</TargetFrameworks>
+     <PlatformTarget>AnyCPU</PlatformTarget>
+     <OutputPath>$(WebSdkRoot)\bin\$(Configuration)\</OutputPath>
+     <IntermediateOutputPath>$(WebSdkRoot)\obj\$(Configuration)\</IntermediateOutputPath>
+diff --git a/test/Publish/Microsoft.NET.Sdk.Publish.Tasks.Tests/Microsoft.NET.Sdk.Publish.Tasks.Tests.csproj b/test/Publish/Microsoft.NET.Sdk.Publish.Tasks.Tests/Microsoft.NET.Sdk.Publish.Tasks.Tests.csproj
+index a12de84..a90257c 100644
+--- a/test/Publish/Microsoft.NET.Sdk.Publish.Tasks.Tests/Microsoft.NET.Sdk.Publish.Tasks.Tests.csproj
++++ b/test/Publish/Microsoft.NET.Sdk.Publish.Tasks.Tests/Microsoft.NET.Sdk.Publish.Tasks.Tests.csproj
+@@ -1,6 +1,7 @@
+ <Project Sdk="Microsoft.NET.Sdk">
+   <PropertyGroup>
+     <TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
++    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp2.0</TargetFrameworks>
+     <AssemblyName>Microsoft.NET.Sdk.Publish.Tasks.Tests</AssemblyName>
+   </PropertyGroup>
+
+-- 
+2.17.1.windows.2
+

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>20180815-03</OfficialBuildId>
+    <OfficialBuildId>20180820-02</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>20180815-03</OfficialBuildId>
+    <OfficialBuildId>20180820-03</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>20180815-03</OfficialBuildId>
+    <OfficialBuildId>20180820-02</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>20180815.2</OfficialBuildId>
+    <OfficialBuildId>20180820.1</OfficialBuildId>
     <OutputVersionArgs>/p:BUILD_BUILDNUMBER=$(OfficialBuildId)</OutputVersionArgs>
     <BuildCommandArgs>--pack --configuration $(Configuration) $(OutputVersionArgs)</BuildCommandArgs>