Merge pull request #767 from dagood/2.1.4

Merge v2.1.4-ga, v2.1.402-SDK-ga into release/2.1

Author: dagood

ProdConFeed.txt

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

dependencies.props

@@ -28,8 +28,8 @@
     the product as version strings to be used by the SDK to fetch extra content.
   -->
   <PropertyGroup>
-    <MicrosoftAspNetCoreAllPackageVersion>2.1.3</MicrosoftAspNetCoreAllPackageVersion>
-    <MicrosoftAspNetCoreAppPackageVersion>2.1.3</MicrosoftAspNetCoreAppPackageVersion>
+    <MicrosoftAspNetCoreAllPackageVersion>2.1.4</MicrosoftAspNetCoreAllPackageVersion>
+    <MicrosoftAspNetCoreAppPackageVersion>2.1.4</MicrosoftAspNetCoreAppPackageVersion>
     <MicrosoftNETSdkRazorPackageVersion>2.1.2</MicrosoftNETSdkRazorPackageVersion>
   </PropertyGroup>
 

dir.props

@@ -46,7 +46,7 @@
     <ToolPackageExtractDir>$(ToolsDir)source-built/</ToolPackageExtractDir>
     <ToolsLocalDir>$(ProjectDir)tools-local/</ToolsLocalDir>
     <TaskDirectory>$(ToolsLocalDir)tasks/</TaskDirectory>
-    <TasksBinDir>$(TaskDirectory)Microsoft.DotNet.SourceBuild.Tasks/bin/Debug/netstandard2.0/</TasksBinDir>
+    <TasksBinDir>$(TaskDirectory)Microsoft.DotNet.SourceBuild.Tasks/bin/Debug/netstandard1.5/</TasksBinDir>
     <BaseIntermediatePath>$(BaseOutputPath)obj/</BaseIntermediatePath>
     <OutputPath>$(BaseOutputPath)$(Platform)/$(Configuration)/</OutputPath>
     <IntermediatePath>$(BaseIntermediatePath)$(Platform)/$(Configuration)/</IntermediatePath>

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>20180725-05</OfficialBuildId>
+    <OfficialBuildId>20180814-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>20180725-06</OfficialBuildId>
+    <OfficialBuildId>20180814-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>20180725-05</OfficialBuildId>
+    <OfficialBuildId>20180814-02</OfficialBuildId>
   </PropertyGroup>
 
   <ItemGroup>