[release/2.1] Update to ProdCon 2.1.3 (#644)

* Update from product/cli/release/2.1.3

* Update CoreClr, ProdCon to servicing-26708-02, 20180711-01-1855006, respectively

* Manually update aspnet packages to ProdCon 2.1.3

* Fix cli and websdk patches

cli patch needed to be refreshed.

websdk patch has been incorporated into repo.

* Add sdk patch ensuring PackAsTool not set

* Add CLI binlogging

* Update NuGet to 4.8.0.5278 sources

Fix NuGet.Client patch

* Add CLI patch to fix NuGet SDK resolver PVP prop

* Add reference to nuget-client patch fix

* Add binlog as patch, not replacement

The replacement causes "\" to be replaced with "/", breaking the build script by surrounding the Rid with "/"s.

* Update RepoToolset for ImportNetSdkFromRepoToolset

This RepoToolset commit matches the RepoToolset package that the SDK repo uses. The SDK repo is failing on error MSB4011 '...Sdk.targets" cannot be imported again. It was already imported ...', which seems related.

* Update SDK submodule and remove patch

* Update roslyn-tools to an update commit

Try to find a "fresh" commit capable of building itself.

* Add roslyn dependency to msbuild

* Update roslyn-tools to minimal change sdk needs

* Workaround get prebuilt roslyn-tools props/targets

* Link workaround tracking issue

Author: dagood

ProdConFeed.txt

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

build-source-tarball.sh

@@ -108,6 +108,27 @@ if [ -z "${SOURCE_BUILD_SKIP_PREBUILT_REPORT:-}" ]; then
     )
 fi
 
+echo 'WORKAROUND: Overwriting the source-built roslyn-tools MSBuild files with prebuilt so that roslyn-tools can successfully build in the tarball... (https://github.com/dotnet/source-build/issues/654)'
+
+ROSLYN_TOOLS_PACKAGE='RoslynTools.RepoToolset'
+JSON_LINE=$(grep "$ROSLYN_TOOLS_PACKAGE" "$SCRIPT_ROOT/src/roslyn-tools/global.json")
+# Remove spaces.
+JSON_LINE=${JSON_LINE// }
+
+# Isolate version from something like: "RoslynTools.RepoToolset":"1.0.0-beta2-62805-03"
+PREFIX="\"$ROSLYN_TOOLS_PACKAGE\":\""
+ROSLYN_TOOLS_REPO_TOOLSET_VERSION=${JSON_LINE:${#PREFIX}:$((${#JSON_LINE} - ${#PREFIX} - 1))}
+REPO_TOOLSET_PACKAGE_DIR="$SCRIPT_ROOT/packages/${ROSLYN_TOOLS_PACKAGE,,}/$ROSLYN_TOOLS_REPO_TOOLSET_VERSION"
+
+if [ ! -d "$REPO_TOOLSET_PACKAGE_DIR" ]; then
+    echo "Failed to find repo toolset at: $REPO_TOOLSET_PACKAGE_DIR"
+    exit 1
+fi
+
+SOURCE_BUILT_SDK_TOOLS_DIR="$TARBALL_ROOT/Tools/source-built/$ROSLYN_TOOLS_PACKAGE/tools"
+cp "$REPO_TOOLSET_PACKAGE_DIR/tools/"*.props "$SOURCE_BUILT_SDK_TOOLS_DIR"
+cp "$REPO_TOOLSET_PACKAGE_DIR/tools/"*.targets "$SOURCE_BUILT_SDK_TOOLS_DIR"
+
 echo 'Recording commits for the source-build repo and all submodules, to aid in reproducibility...'
 
 cat >$TARBALL_ROOT/source-build-info.txt << EOF

dependencies.props

@@ -5,8 +5,8 @@
     for which dotnet/versions commit was last used to update the dependency.
   -->
   <PropertyGroup>
-    <ProdConCurrentRef>d1e2bedf58a4a66aadda4f5751ecdaf3ad4f62fe</ProdConCurrentRef>
-    <CoreClrCurrentRef>79731c509a9d31b921f531ee63c48daa8e0c30d5</CoreClrCurrentRef>
+    <ProdConCurrentRef>908dee01ee91f36bf97c69a33dcc2e54e4d837ac</ProdConCurrentRef>
+    <CoreClrCurrentRef>908dee01ee91f36bf97c69a33dcc2e54e4d837ac</CoreClrCurrentRef>
     <BuildToolsCurrentRef>91c9a3b3374ff71e72c06d5773bd26598539aa1d</BuildToolsCurrentRef>
   </PropertyGroup>
 
@@ -40,7 +40,7 @@
 
     <DependencyInfo Include="ProdCon" Condition="'$(UpdateFromManifestFile)' == ''">
       <DependencyType>Orchestrated build</DependencyType>
-      <BasePath>build-info/dotnet/product/cli/release/2.1</BasePath>
+      <BasePath>build-info/dotnet/product/cli/release/2.1.3</BasePath>
       <CurrentRef>$(ProdConCurrentRef)</CurrentRef>
       <VersionsRepoOwner>dotnet</VersionsRepoOwner>
       <VersionsRepo>versions</VersionsRepo>

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

@@ -1,4 +1,4 @@
-From 9609106bcab766e1e44e464c38cc4148ea639a23 Mon Sep 17 00:00:00 2001
+From d6f6922c24e205a53bc5f2420695a4a177648808 Mon Sep 17 00:00:00 2001
 From: Davis Goodin <dagood@microsoft.com>
 Date: Wed, 13 Jun 2018 09:46:43 -0500
 Subject: [PATCH] Persist ASP.NET runtime patch targeting default
@@ -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 042cd2e93..7df11b659 100644
+index f5365724a..f192226b8 100644
 --- a/build/MSBuildExtensions.targets
 +++ b/build/MSBuildExtensions.targets
-@@ -185,6 +185,9 @@ Copyright (c) .NET Foundation. All rights reserved.
-     <LatestPatchVersionForNetCore1_0 Condition="'$(LatestPatchVersionForNetCore1_0)' == ''">1.0.11</LatestPatchVersionForNetCore1_0>
-     <LatestPatchVersionForNetCore1_1 Condition="'$(LatestPatchVersionForNetCore1_1)' == ''">1.1.8</LatestPatchVersionForNetCore1_1>
-     <LatestPatchVersionForNetCore2_0 Condition="'$(LatestPatchVersionForNetCore2_0)' == ''">2.0.7</LatestPatchVersionForNetCore2_0>
+@@ -196,6 +196,9 @@ 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>
+     <LatestPatchVersionForNetCore2_0 Condition="'%24(LatestPatchVersionForNetCore2_0)' == ''">2.0.9</LatestPatchVersionForNetCore2_0>
 +
 +    <!-- 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

@@ -0,0 +1,40 @@
+From 7c3f8f470aa6fd832ca0dfd6d7a94b2d9adeb6fb 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
+
+https://github.com/dotnet/cli/issues/9669 is required to remove this patch.
+---
+ build/DependencyVersions.props | 2 +-
+ src/redist/redist.csproj       | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
+index 099c68052..618d48771 100644
+--- a/build/DependencyVersions.props
++++ b/build/DependencyVersions.props
+@@ -52,7 +52,7 @@
+     <NuGetPackagingPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetPackagingPackageVersion>
+     <NuGetProjectModelPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetProjectModelPackageVersion>
+     <NuGetVersioningPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetVersioningPackageVersion>
+-    <NuGetSdkResolverPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetSdkResolverPackageVersion>
++    <MicrosoftBuildNuGetSdkResolverPackageVersion>$(NuGetBuildTasksPackageVersion)</MicrosoftBuildNuGetSdkResolverPackageVersion>
+     <MicrosoftNETTestSdkPackageVersion>15.8.0-preview-20180605-02</MicrosoftNETTestSdkPackageVersion>
+     <MicrosoftTestPlatformCLIPackageVersion>$(MicrosoftNETTestSdkPackageVersion)</MicrosoftTestPlatformCLIPackageVersion>
+     <MicrosoftTestPlatformBuildPackageVersion>$(MicrosoftNETTestSdkPackageVersion)</MicrosoftTestPlatformBuildPackageVersion>
+diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj
+index 05a2b52c0..8b069b3ad 100644
+--- a/src/redist/redist.csproj
++++ b/src/redist/redist.csproj
+@@ -17,7 +17,7 @@
+   <ItemGroup>
+     <PackageReference Include="Microsoft.NETCore.App" Version="$(MicrosoftNETCoreAppPackageVersion)" />
+     <PackageReference Include="NuGet.Build.Tasks" Version="$(NuGetBuildTasksPackageVersion)" />
+-    <PackageReference Include="Microsoft.Build.NuGetSdkResolver" Version="$(NuGetSdkResolverPackageVersion)" />
++    <PackageReference Include="Microsoft.Build.NuGetSdkResolver" Version="$(MicrosoftBuildNuGetSdkResolverPackageVersion)" />
+     <PackageReference Include="Microsoft.TestPlatform.CLI" Version="$(MicrosoftTestPlatformCLIPackageVersion)" />
+     <PackageReference Include="Microsoft.TestPlatform.Build" Version="$(MicrosoftTestPlatformBuildPackageVersion)" />
+     <PackageReference Condition=" '$(DotNetBuildFromSource)' != 'true' " Include="NuGet.Localization" Version="$(NuGetProjectModelPackageVersion)" />
+-- 
+2.17.1.windows.2
+

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

@@ -0,0 +1,28 @@
+From 0287e8c92360de0474295864496c13c5c1eae190 Mon Sep 17 00:00:00 2001
+From: Davis Goodin <dagood@microsoft.com>
+Date: Mon, 16 Jul 2018 14:13:54 -0500
+Subject: [PATCH] Add binlog build args
+
+https://github.com/dotnet/cli/issues/9671 is required to remove this patch.
+---
+ run-build.sh | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/run-build.sh b/run-build.sh
+index 1f2ed25a9..426604aee 100755
+--- a/run-build.sh
++++ b/run-build.sh
+@@ -189,8 +189,8 @@ fi
+ export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
+ 
+ if [ $BUILD -eq 1 ]; then
+-    dotnet msbuild build.proj /p:Architecture=$ARCHITECTURE $CUSTOM_BUILD_ARGS /p:GeneratePropsFile=true /t:WriteDynamicPropsToStaticPropsFiles ${argsnotargets[@]}
+-    dotnet msbuild build.proj /m /v:normal /fl /flp:v=diag /p:Architecture=$ARCHITECTURE $CUSTOM_BUILD_ARGS $args
++    dotnet msbuild build.proj /bl:msbuild.generatepropsfile.binlog /p:Architecture=$ARCHITECTURE $CUSTOM_BUILD_ARGS /p:GeneratePropsFile=true /t:WriteDynamicPropsToStaticPropsFiles ${argsnotargets[@]}
++    dotnet msbuild build.proj /bl:msbuild.mainbuild.binlog /m /v:normal /fl /flp:v=diag /p:Architecture=$ARCHITECTURE $CUSTOM_BUILD_ARGS $args
+ else
+     echo "Not building due to --nobuild"
+     echo "Command that would be run is: 'dotnet msbuild build.proj /m /p:Architecture=$ARCHITECTURE $CUSTOM_BUILD_ARGS $args'"
+-- 
+2.17.1.windows.2
+