Update ProdCon to 20180905-01, BuildTools to 2.2 (#715)

dotnet-maestro-bot · dagood · commit 257d100355e6 · 2018-09-10T14:29:29.000-05:00
* Update BuildTools, CoreClr, ProdCon to rc1-03131-06, servicing-26902-03, 20180905-01-2004589, respectively

* Remove websdk patch: implemented

* Update BuildTools from 2.2 branch

* Update BuildTools, CoreClr to preview1-03131-04, preview2-26905-03, respectively
diff --git a/BuildToolsVersion.txt b/BuildToolsVersion.txt
@@ -1 +1 @@
-2.1.0-rc1-03006-01
+2.2.0-preview1-03131-04
diff --git a/ProdConFeed.txt b/ProdConFeed.txt
@@ -1 +1 @@
-https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-2/20180820-01/final/index.json
+https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-2/20180905-01/final/index.json
diff --git a/dependencies.props b/dependencies.props
@@ -5,15 +5,15 @@
     for which dotnet/versions commit was last used to update the dependency.
   -->
   <PropertyGroup>
-    <ProdConCurrentRef>8cb4f31e7894e4363ff1941a679f01ebe0f07297</ProdConCurrentRef>
-    <CoreClrCurrentRef>293e58e87c0575e7e425a1bab57d5eb0e25d743e</CoreClrCurrentRef>
-    <BuildToolsCurrentRef>91c9a3b3374ff71e72c06d5773bd26598539aa1d</BuildToolsCurrentRef>
+    <ProdConCurrentRef>37bc522eb90b9f80e2346829b8aefb25b792cdfc</ProdConCurrentRef>
+    <CoreClrCurrentRef>c45fef92df48cbec1b73a48eb7b06e31b220986b</CoreClrCurrentRef>
+    <BuildToolsCurrentRef>c45fef92df48cbec1b73a48eb7b06e31b220986b</BuildToolsCurrentRef>
   </PropertyGroup>
 
   <!-- Package dependency verification/auto-upgrade configuration. -->
   <PropertyGroup>
     <BaseDotNetBuildInfo>build-info/dotnet/</BaseDotNetBuildInfo>
-    <DependencyBranch>release/2.1</DependencyBranch>
+    <DependencyBranch>release/2.2</DependencyBranch>
     <CurrentRefXmlPath>$(MSBuildThisFileFullPath)</CurrentRefXmlPath>
   </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-35029</MicrosoftAspNetCoreAllPackageVersion>
-    <MicrosoftAspNetCoreAppPackageVersion>2.2.0-preview1-35029</MicrosoftAspNetCoreAppPackageVersion>
-    <MicrosoftNETSdkRazorPackageVersion>2.2.0-preview1-35029</MicrosoftNETSdkRazorPackageVersion>
+    <MicrosoftAspNetCoreAllPackageVersion>2.2.0-preview2-35157</MicrosoftAspNetCoreAllPackageVersion>
+    <MicrosoftAspNetCoreAppPackageVersion>2.2.0-preview2-35157</MicrosoftAspNetCoreAppPackageVersion>
+    <MicrosoftNETSdkRazorPackageVersion>2.2.0-preview2-35157</MicrosoftNETSdkRazorPackageVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/patches/websdk/0001-Fix-DotNetBuildFromSource-framework-override.patch b/patches/websdk/0001-Fix-DotNetBuildFromSource-framework-override.patch
diff --git a/repos/core-setup.proj b/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>20180820-02</OfficialBuildId>
+    <OfficialBuildId>20180905-02</OfficialBuildId>
 
     <!-- Need to set $(PackagesOutput) so WriteVersions writes the versions file for cli, until cli respects auto-dependency flow -->
     <PackagesOutput>$(SourceBuiltPackagesPath)</PackagesOutput>
diff --git a/repos/coreclr.proj b/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>20180820-03</OfficialBuildId>
+    <OfficialBuildId>20180905-03</OfficialBuildId>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/repos/corefx.proj b/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>20180820-02</OfficialBuildId>
+    <OfficialBuildId>20180905-02</OfficialBuildId>
   </PropertyGroup>
 
   <ItemGroup>
diff --git 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>20180820.1</OfficialBuildId>
+    <OfficialBuildId>20180905.2</OfficialBuildId>
     <OutputVersionArgs>/p:BUILD_BUILDNUMBER=$(OfficialBuildId)</OutputVersionArgs>
     <BuildCommandArgs>--pack --configuration $(Configuration) $(OutputVersionArgs)</BuildCommandArgs>
 
diff --git a/src/cli b/src/cli
@@ -1 +1 @@
-Subproject commit 3f454575488cadf3a7ba69cb8d1b051fd1595bf6
+Subproject commit f4707d384d35155bf3106add8da21ec6db5cc5b8
diff --git a/src/core-setup b/src/core-setup
@@ -1 +1 @@
-Subproject commit b4726350b3a3280041eac66953fb7d40aad813ac
+Subproject commit ad4d306fe07cc2fa21a5461e749966a857dd7794
diff --git a/src/coreclr b/src/coreclr
@@ -1 +1 @@
-Subproject commit 6b3fd2f09c1b5c8f0306e3d72ea1c96de946cf1a
+Subproject commit 667bf06a7b39c93cf1dc49c44e1d31dbad48cd40
diff --git a/src/corefx b/src/corefx
@@ -1 +1 @@
-Subproject commit 1ae377ff8a19eb83338e99b53b5cb3aca7d5683f
+Subproject commit cdaab0a8f64aaf6289582c4aa8cbeca18df991c1
diff --git a/src/websdk b/src/websdk
@@ -1 +1 @@
-Subproject commit a696108fa62d2468b7fa4f715f286a5aebc526df
+Subproject commit 8912c438e20704df53784cb3fce3d4aa2fc045c7
diff --git a/tools-local/ILAsmVersion.txt b/tools-local/ILAsmVersion.txt
@@ -1 +1 @@
-2.1.3-servicing-26724-06
+2.2.0-preview2-26905-03

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-2.1.0-rc1-03006-01`
	`1`	`+2.2.0-preview1-03131-04`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-2/20180820-01/final/index.json`
	`1`	`+https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-2/20180905-01/final/index.json`