From 1f60d4013d34c371d6710f7a866ee2e1d1565a15 Mon Sep 17 00:00:00 2001
From: Davis Goodin <dagood@microsoft.com>
Date: Wed, 13 Jun 2018 09:41:16 -0500
Subject: [PATCH 1/4] Update ProdCon feed, AspNetCore, CLI toolset

---
 DotnetCLIVersion.txt | 2 +-
 ProdConFeed.txt      | 2 +-
 dependencies.props   | 2 +-
 repos/cli.proj       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/DotnetCLIVersion.txt b/DotnetCLIVersion.txt
index 9d572733d2..4aeb28150e 100644
--- a/DotnetCLIVersion.txt
+++ b/DotnetCLIVersion.txt
@@ -1 +1 @@
-2.1.300-rc1-008673
+2.1.300
diff --git a/ProdConFeed.txt b/ProdConFeed.txt
index 592e4c4603..e862e3f39d 100644
--- a/ProdConFeed.txt
+++ b/ProdConFeed.txt
@@ -1 +1 @@
-https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/20180515-07/final/index.json
+https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/20180605-09/final/index.json
diff --git a/dependencies.props b/dependencies.props
index d6a51337da..9807498e05 100644
--- a/dependencies.props
+++ b/dependencies.props
@@ -5,7 +5,7 @@
     for which dotnet/versions commit was last used to update the dependency.
   -->
   <PropertyGroup>
-    <ProdConCurrentRef>79731c509a9d31b921f531ee63c48daa8e0c30d5</ProdConCurrentRef>
+    <ProdConCurrentRef>9beae4222a58a355e2107e99bdbcb8902c232c18</ProdConCurrentRef>
     <CoreClrCurrentRef>79731c509a9d31b921f531ee63c48daa8e0c30d5</CoreClrCurrentRef>
     <BuildToolsCurrentRef>ba7a90f8cbc824737d0fae5ff230635a9764a1d7</BuildToolsCurrentRef>
   </PropertyGroup>
diff --git a/repos/cli.proj b/repos/cli.proj
index abda36040a..08a18fcbb8 100644
--- a/repos/cli.proj
+++ b/repos/cli.proj
@@ -49,7 +49,7 @@
         Microsoft.AspNetCore.All;
         Microsoft.AspNetCore.App;
         Microsoft.NET.Sdk.Razor"
-      Version="2.1.0" />
+      Version="2.1.1" />
   </ItemGroup>
 
   <ItemGroup>

From dabf6ed800944aecaab58636041247826f863abc Mon Sep 17 00:00:00 2001
From: Davis Goodin <dagood@microsoft.com>
Date: Wed, 13 Jun 2018 09:55:30 -0500
Subject: [PATCH 2/4] Use latest patch version of AspNetCore packages

---
 ....NET-runtime-patch-targeting-default.patch | 29 ++++++++++++
 ...AspNetCore-patch-override-properties.patch | 47 +++++++++++++++++++
 repos/cli.proj                                |  1 +
 3 files changed, 77 insertions(+)
 create mode 100644 patches/cli/0001-Persist-ASP.NET-runtime-patch-targeting-default.patch
 create mode 100644 patches/websdk/0001-Add-versioned-AspNetCore-patch-override-properties.patch

diff --git a/patches/cli/0001-Persist-ASP.NET-runtime-patch-targeting-default.patch b/patches/cli/0001-Persist-ASP.NET-runtime-patch-targeting-default.patch
new file mode 100644
index 0000000000..30e7baea8b
--- /dev/null
+++ b/patches/cli/0001-Persist-ASP.NET-runtime-patch-targeting-default.patch
@@ -0,0 +1,29 @@
+From 9609106bcab766e1e44e464c38cc4148ea639a23 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
+
+Let the CLI build take a default value for TargetLatestAspNetCoreRuntimePatch in the output SDK.
+
+https://github.com/dotnet/cli/issues/9469 is required to remove this patch.
+---
+ build/MSBuildExtensions.targets | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/build/MSBuildExtensions.targets b/build/MSBuildExtensions.targets
+index 042cd2e93..7df11b659 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>
++
++    <!-- If true, always target the latest ASP.NET Core runtime by default -->
++    <TargetLatestAspNetCoreRuntimePatch Condition="'$(TargetLatestAspNetCoreRuntimePatch)' == ''">$(DefaultTargetLatestAspNetCoreRuntimePatch)</TargetLatestAspNetCoreRuntimePatch>
+   </PropertyGroup>
+ </Project>
+ ]]>
+-- 
+2.17.1.windows.2
+
diff --git a/patches/websdk/0001-Add-versioned-AspNetCore-patch-override-properties.patch b/patches/websdk/0001-Add-versioned-AspNetCore-patch-override-properties.patch
new file mode 100644
index 0000000000..19c52901d4
--- /dev/null
+++ b/patches/websdk/0001-Add-versioned-AspNetCore-patch-override-properties.patch
@@ -0,0 +1,47 @@
+From d5f8588d6a97ba9972e572219c2a1a714fd587b1 Mon Sep 17 00:00:00 2001
+From: Davis Goodin <dagood@microsoft.com>
+Date: Wed, 13 Jun 2018 12:35:52 -0500
+Subject: [PATCH] Add versioned AspNetCore patch override properties
+
+https://github.com/aspnet/websdk/issues/355 will include changes that make this patch unnecessary.
+---
+ .../Sdk.DefaultItems.targets                           | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/src/Web/Microsoft.NET.Sdk.Web.Targets/Sdk.DefaultItems.targets b/src/Web/Microsoft.NET.Sdk.Web.Targets/Sdk.DefaultItems.targets
+index 9fc331e..15ebdc5 100644
+--- a/src/Web/Microsoft.NET.Sdk.Web.Targets/Sdk.DefaultItems.targets
++++ b/src/Web/Microsoft.NET.Sdk.Web.Targets/Sdk.DefaultItems.targets
+@@ -67,11 +67,12 @@ Copyright (c) .NET Foundation. All rights reserved.
+       <!-- Latest patch version of .All Framework -->
+       <PropertyGroup Condition="'$(LatestAspNetCoreAllPatchVersion)' == ''">
+         <!-- Placeholder for setting latest patch version using the bundled version from CLI for previous TFMs, this will not apply until 2.2 -->
+-        <!-- <LatestAspNetCoreAllPatchVersion Condition="'$(_TargetFrameworkVersionWithoutV)' == '2.1'">$(LatestPatchVersionForAspNetCoreAll2_1)</LatestAspNetCoreAllPatchVersion> -->
++        <LatestAspNetCoreAllPatchVersion Condition="'$(_TargetFrameworkVersionWithoutV)' == '2.1'">$(LatestPatchVersionForAspNetCoreAll2_1)</LatestAspNetCoreAllPatchVersion>
++        <LatestAspNetCoreAllPatchVersion Condition="'$(_TargetFrameworkVersionWithoutV)' == '2.2'">$(LatestPatchVersionForAspNetCoreAll2_2)</LatestAspNetCoreAllPatchVersion>
+ 
+         <!-- If targeting the same release that is bundled with the .NET Core SDK, use the bundled package version
+             provided by Microsoft.NETCoreSdk.BundledVersions.props -->
+-        <LatestAspNetCoreAllPatchVersion Condition="'$(_TargetFrameworkVersionWithoutV)' == '$(BundledAspNetCoreAllTargetFrameworkVersion)'">$(BundledAspNetCoreAllPackageVersion)</LatestAspNetCoreAllPatchVersion>
++        <LatestAspNetCoreAllPatchVersion Condition="'$(_TargetFrameworkVersionWithoutV)' == '$(BundledAspNetCoreAllTargetFrameworkVersion)' AND '$(LatestAspNetCoreAllPatchVersion)' == ''">$(BundledAspNetCoreAllPackageVersion)</LatestAspNetCoreAllPatchVersion>
+         <!-- If not covered by the previous cases use the target framework version for the latest patch version -->
+         <LatestAspNetCoreAllPatchVersion Condition="'$(LatestAspNetCoreAllPatchVersion)' == ''">$(_TargetFrameworkVersionWithoutV)</LatestAspNetCoreAllPatchVersion>
+       </PropertyGroup>
+@@ -79,11 +80,12 @@ Copyright (c) .NET Foundation. All rights reserved.
+       <!-- Latest patch version of .App Framework -->
+       <PropertyGroup Condition="'$(LatestAspNetCoreAppPatchVersion)' == ''">
+         <!-- Placeholder for setting latest patch version using the bundled version from CLI for previous TFMs, this will not apply until 2.2 -->
+-        <!-- <LatestAspNetCoreAppPatchVersion Condition="'$(_TargetFrameworkVersionWithoutV)' == '2.1'">$(LatestPatchVersionForAspNetCoreApp2_1)</LatestAspNetCoreAppPatchVersion> -->
++        <LatestAspNetCoreAppPatchVersion Condition="'$(_TargetFrameworkVersionWithoutV)' == '2.1'">$(LatestPatchVersionForAspNetCoreApp2_1)</LatestAspNetCoreAppPatchVersion>
++        <LatestAspNetCoreAppPatchVersion Condition="'$(_TargetFrameworkVersionWithoutV)' == '2.2'">$(LatestPatchVersionForAspNetCoreApp2_2)</LatestAspNetCoreAppPatchVersion>
+ 
+         <!-- If targeting the same release that is bundled with the .NET Core SDK, use the bundled package version
+             provided by Microsoft.NETCoreSdk.BundledVersions.props -->
+-        <LatestAspNetCoreAppPatchVersion Condition="'$(_TargetFrameworkVersionWithoutV)' == '$(BundledAspNetCoreAppTargetFrameworkVersion)'">$(BundledAspNetCoreAppPackageVersion)</LatestAspNetCoreAppPatchVersion>
++        <LatestAspNetCoreAppPatchVersion Condition="'$(_TargetFrameworkVersionWithoutV)' == '$(BundledAspNetCoreAppTargetFrameworkVersion)' AND '$(LatestAspNetCoreAppPatchVersion)' == ''">$(BundledAspNetCoreAppPackageVersion)</LatestAspNetCoreAppPatchVersion>
+         <!-- If not covered by the previous cases use the target framework version for the latest patch version -->
+         <LatestAspNetCoreAppPatchVersion Condition="'$(LatestAspNetCoreAppPatchVersion)' == ''">$(_TargetFrameworkVersionWithoutV)</LatestAspNetCoreAppPatchVersion>
+       </PropertyGroup>
+-- 
+2.17.1.windows.2
+
diff --git a/repos/cli.proj b/repos/cli.proj
index 08a18fcbb8..eed25e3c1a 100644
--- a/repos/cli.proj
+++ b/repos/cli.proj
@@ -23,6 +23,7 @@
     <BuildCommandArgs>$(BuildCommandArgs) /p:UsePortableLinuxSharedFramework=false</BuildCommandArgs>
     <BuildCommandArgs>$(BuildCommandArgs) /p:IncludeSharedFrameworksForBackwardsCompatibilityTests=false</BuildCommandArgs>
     <BuildCommandArgs>$(BuildCommandArgs) /p:IncludeMSBuildSdkResolver=false</BuildCommandArgs>
+    <BuildCommandArgs>$(BuildCommandArgs) /p:DefaultTargetLatestAspNetCoreRuntimePatch=true</BuildCommandArgs>
 
     <BuildCommandArgs Condition="'$(OS)' == 'Windows_NT'">$(BuildCommandArgs) '/p:CLITargets=\&quot;\&quot;\&quot;Prepare;Compile;Package\&quot;\&quot;\&quot;'</BuildCommandArgs>
     <BuildCommandArgs Condition="'$(OS)' != 'Windows_NT'">$(BuildCommandArgs) '/p:CLITargets=&quot;Prepare;Compile;Package&quot;'</BuildCommandArgs>

From 8c411796d24e2bbae77b339a7f3a4bcda22cf26c Mon Sep 17 00:00:00 2001
From: Davis Goodin <dagood@microsoft.com>
Date: Wed, 13 Jun 2018 15:26:12 -0500
Subject: [PATCH 3/4] Update to new 2.1.1 build: branding changes

---
 dependencies.props | 4 ++--
 repos/sdk.proj     | 2 +-
 src/sdk            | 2 +-
 src/websdk         | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dependencies.props b/dependencies.props
index 9807498e05..2fffddd714 100644
--- a/dependencies.props
+++ b/dependencies.props
@@ -5,7 +5,7 @@
     for which dotnet/versions commit was last used to update the dependency.
   -->
   <PropertyGroup>
-    <ProdConCurrentRef>9beae4222a58a355e2107e99bdbcb8902c232c18</ProdConCurrentRef>
+    <ProdConCurrentRef>d1e2bedf58a4a66aadda4f5751ecdaf3ad4f62fe</ProdConCurrentRef>
     <CoreClrCurrentRef>79731c509a9d31b921f531ee63c48daa8e0c30d5</CoreClrCurrentRef>
     <BuildToolsCurrentRef>ba7a90f8cbc824737d0fae5ff230635a9764a1d7</BuildToolsCurrentRef>
   </PropertyGroup>
@@ -40,7 +40,7 @@
 
     <DependencyInfo Include="ProdCon">
       <DependencyType>Orchestrated build</DependencyType>
-      <BasePath>build-info/dotnet/product/cli/release/2.1.1</BasePath>
+      <BasePath>build-info/dotnet/product/cli/release/2.1</BasePath>
       <CurrentRef>$(ProdConCurrentRef)</CurrentRef>
       <VersionsRepoOwner>dotnet</VersionsRepoOwner>
       <VersionsRepo>versions</VersionsRepo>
diff --git a/repos/sdk.proj b/repos/sdk.proj
index 3a4986ca1d..a9c4f9fd59 100644
--- a/repos/sdk.proj
+++ b/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>20180606.1</OfficialBuildId>
+    <OfficialBuildId>20180613.3</OfficialBuildId>
     <OutputVersionArgs>/p:BUILD_BUILDNUMBER=$(OfficialBuildId)</OutputVersionArgs>
     <BuildCommandArgs>--pack --configuration $(Configuration) $(OutputVersionArgs)</BuildCommandArgs>
 
diff --git a/src/sdk b/src/sdk
index 507ef61c57..a4d22faa4f 160000
--- a/src/sdk
+++ b/src/sdk
@@ -1 +1 @@
-Subproject commit 507ef61c57ef7e15383c07a31689ed8f30b0d386
+Subproject commit a4d22faa4f4f3d4ed6453b287396ede8a7044270
diff --git a/src/websdk b/src/websdk
index 8a00160a3c..8803ffa7a7 160000
--- a/src/websdk
+++ b/src/websdk
@@ -1 +1 @@
-Subproject commit 8a00160a3c6466ff9926548125088da2af44c7fe
+Subproject commit 8803ffa7a7a3d5760da9ad7379a02e789963cdc4

From cdf7249ccb14bf1b1da499f0c283b78129556036 Mon Sep 17 00:00:00 2001
From: Davis Goodin <dagood@microsoft.com>
Date: Wed, 13 Jun 2018 15:55:10 -0500
Subject: [PATCH 4/4] Add PB_IsStable (StabilizePackageVersion alias)

RoslynTools-using repos look for PB_IsStable.
---
 repos/dir.props | 1 +
 1 file changed, 1 insertion(+)

diff --git a/repos/dir.props b/repos/dir.props
index 9fb37ad4ae..bea8d507cd 100644
--- a/repos/dir.props
+++ b/repos/dir.props
@@ -53,6 +53,7 @@
     <EnvironmentVariables Include="DotNetCoreSdkDir=$(DotNetCliToolDir)" />
     <EnvironmentVariables Include="DotNetBuildToolsDir=$(ProjectDir)Tools/" />
     <EnvironmentVariables Include="StabilizePackageVersion=$(UseStableVersions)" Condition="'$(UseStableVersions)' != ''" />
+    <EnvironmentVariables Include="PB_IsStable=$(UseStableVersions)" Condition="'$(UseStableVersions)' != ''" />
     <EnvironmentVariables Include="PackageVersionStamp=$(VersionStamp)" Condition="'$(VersionStamp)' != ''" />
 
     <!-- Turn off node reuse for source build because repos use conflicting versions