Merge pull request #610 from dagood/2.1.1-fixes

[release/2.1] 2.1.1 fixes, combined

Author: dagood

DotnetCLIVersion.txt

@@ -1 +1 @@
-2.1.300-rc1-008673
+2.1.300

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

dependencies.props

@@ -5,7 +5,7 @@
     for which dotnet/versions commit was last used to update the dependency.
   -->
   <PropertyGroup>
-    <ProdConCurrentRef>79731c509a9d31b921f531ee63c48daa8e0c30d5</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>

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
+

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
+

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>
@@ -49,7 +50,7 @@
         Microsoft.AspNetCore.All;
         Microsoft.AspNetCore.App;
         Microsoft.NET.Sdk.Razor"
-      Version="2.1.0" />
+      Version="2.1.1" />
   </ItemGroup>
 
   <ItemGroup>

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 

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>