Merged PR 435: Update to ProdCon 20190117-05 (internal/release/2.2)

dotnet-bot · dseefeld · commit f063068ec3df · 2019-01-29T20:46:51.000Z
diff --git a/DotnetCLIVersion.txt b/DotnetCLIVersion.txt
@@ -1 +1 @@
-2.1.500
+2.1.503
diff --git a/ProdConFeed.txt b/ProdConFeed.txt
@@ -1 +1 @@
-https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-2/20181207-03/final/index.json
+https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-2/20190117-05/final/index.json
diff --git a/dependencies.props b/dependencies.props
@@ -22,8 +22,8 @@
     the product as version strings to be used by the SDK to fetch extra content.
   -->
   <PropertyGroup>
-    <MicrosoftAspNetCoreAllPackageVersion>2.2.1</MicrosoftAspNetCoreAllPackageVersion>
-    <MicrosoftAspNetCoreAppPackageVersion>2.2.1</MicrosoftAspNetCoreAppPackageVersion>
+    <MicrosoftAspNetCoreAllPackageVersion>2.2.2</MicrosoftAspNetCoreAllPackageVersion>
+    <MicrosoftAspNetCoreAppPackageVersion>2.2.2</MicrosoftAspNetCoreAppPackageVersion>
     <MicrosoftNETSdkRazorPackageVersion>2.2.0</MicrosoftNETSdkRazorPackageVersion>
   </PropertyGroup>
 
diff --git a/patches/sdk/0001-Exclude-unit-test-projects-from-source-build.patch b/patches/sdk/0001-Exclude-unit-test-projects-from-source-build.patch
diff --git a/repos/core-setup.proj b/repos/core-setup.proj
@@ -22,7 +22,7 @@
     <BuildCommand>$(ProjectDirectory)/build$(ShellExtension) $(BuildArguments)</BuildCommand>
     <BuildCommand Condition="$(Platform.Contains('arm'))">$(ArmEnvironmentVariables) $(BuildCommand)</BuildCommand>
 
-    <OfficialBuildId>20181207-03</OfficialBuildId>
+    <OfficialBuildId>20190118-01</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
@@ -18,7 +18,7 @@
     <BuildCommand Condition="$(Platform.Contains('arm'))">$(ArmEnvironmentVariables) $(BuildCommand)</BuildCommand>
 
     <CleanCommand>$(ProjectDirectory)/clean$(ShellExtension)</CleanCommand>
-    <OfficialBuildId>20181207-03</OfficialBuildId>
+    <OfficialBuildId>20190117-07</OfficialBuildId>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/repos/corefx.proj b/repos/corefx.proj
@@ -24,7 +24,7 @@
 
     <PackagesOutput>$(ProjectDirectory)/bin/packages/$(Configuration)</PackagesOutput>
     <CleanCommand>$(ProjectDirectory)/clean$(ShellExtension)</CleanCommand>
-    <OfficialBuildId>20181207-03</OfficialBuildId>
+    <OfficialBuildId>20190118-02</OfficialBuildId>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/cli b/src/cli
@@ -1 +1 @@
-Subproject commit 8edbc2570aaac6c92d69cd9943217c4c225a10b8
+Subproject commit 73f036d4ac69e0c4421ca67727e900df90066d9c
diff --git a/src/core-setup b/src/core-setup
@@ -1 +1 @@
-Subproject commit 878dd11e62232865aec731fc91604c52c4ecafcf
+Subproject commit a4fd7b2c84454bfb3d2992eb04821972f911834b
diff --git a/src/coreclr b/src/coreclr
@@ -1 +1 @@
-Subproject commit b24eee89da14b63be629b5bab80d24990316e1ba
+Subproject commit 24ac8c378b4e96c70c9129098950413945be427d
diff --git a/src/corefx b/src/corefx
@@ -1 +1 @@
-Subproject commit de33b6edaa9b9167b16323a9104af4003aad6235
+Subproject commit 67aa312f4461a767cbe61d6fe0b7e1f9aca36717
diff --git a/src/nuget-client b/src/nuget-client
@@ -1 +1 @@
-Subproject commit 849063018d8ee08625774a2dcd07ab84224dabb9
+Subproject commit e5150f1e119e456e01c4f1e413213d392eda1c3a
diff --git a/src/sdk b/src/sdk
@@ -1 +1 @@
-Subproject commit bc08c7f1b78bfa7f96e26a7f5326a410d984baf2
+Subproject commit e432232d6196da21a0f0bd30a180b2431523038b
diff --git a/tools-local/prebuilt-baseline-offline.xml b/tools-local/prebuilt-baseline-offline.xml
@@ -1,5 +1,5 @@
 <UsageData>
-  <CreatedByRid>rhel.7-x64</CreatedByRid>
+  <CreatedByRid>centos.7-x64</CreatedByRid>
   <ProjectDirectories>
     <Dir>src/application-insights/</Dir>
     <Dir>src/aspnet-razor/</Dir>
@@ -219,12 +219,12 @@
     <Usage Id="runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.2" Rid="fedora.24-x64" />
     <Usage Id="runtime.linux-x64.Microsoft.NETCore.App" Version="2.0.0" Rid="linux-x64" />
     <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="2.0.0" Rid="linux-x64" />
-    <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="2.2.0" Rid="linux-x64" />
-    <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHost" Version="2.2.0" Rid="linux-x64" />
+    <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="2.2.1" Rid="linux-x64" />
+    <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHost" Version="2.2.1" Rid="linux-x64" />
     <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.0.0" Rid="linux-x64" />
-    <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.2.0" Rid="linux-x64" />
+    <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.2.1" Rid="linux-x64" />
     <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.0.0" Rid="linux-x64" />
-    <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.2.0" Rid="linux-x64" />
+    <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.2.1" Rid="linux-x64" />
     <Usage Id="runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.0" Rid="opensuse.13.2-x64" />
     <Usage Id="runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.2" Rid="opensuse.13.2-x64" />
     <Usage Id="runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.0" Rid="opensuse.42.1-x64" />
diff --git a/tools-local/prebuilt-baseline-online.xml b/tools-local/prebuilt-baseline-online.xml
@@ -1,5 +1,5 @@
 <UsageData>
-  <CreatedByRid>rhel.7-x64</CreatedByRid>
+  <CreatedByRid>centos.7-x64</CreatedByRid>
   <ProjectDirectories>
     <Dir>src/application-insights/</Dir>
     <Dir>src/aspnet-razor/</Dir>
@@ -96,9 +96,9 @@
     <Usage Id="Microsoft.DotNet.PlatformAbstractions" Version="2.1.0-preview2-26306-03" />
     <Usage Id="Microsoft.DotNet.Test.ProjectTemplates.2.2" Version="1.0.2-beta4-20181021-2140732" />
     <Usage Id="Microsoft.DotNet.VersionTools" Version="2.1.0-rc1-03130-05" IsDirectDependency="true" />
-    <Usage Id="Microsoft.DotNet.Web.ItemTemplates" Version="2.2.1" />
-    <Usage Id="Microsoft.DotNet.Web.ProjectTemplates.2.2" Version="2.2.1" />
-    <Usage Id="Microsoft.DotNet.Web.Spa.ProjectTemplates" Version="2.2.1" />
+    <Usage Id="Microsoft.DotNet.Web.ItemTemplates" Version="2.2.2" />
+    <Usage Id="Microsoft.DotNet.Web.ProjectTemplates.2.2" Version="2.2.2" />
+    <Usage Id="Microsoft.DotNet.Web.Spa.ProjectTemplates" Version="2.2.2" />
     <Usage Id="Microsoft.Extensions.CommandLineUtils" Version="1.1.0" />
     <Usage Id="Microsoft.Extensions.CommandLineUtils" Version="1.1.1" />
     <Usage Id="Microsoft.Extensions.CommandLineUtils.Sources" Version="2.2.0-rtm-35542" IsDirectDependency="true" />
@@ -118,29 +118,29 @@
     <Usage Id="Microsoft.NETCore.App" Version="2.0.0" IsDirectDependency="true" IsAutoReferenced="true" />
     <Usage Id="Microsoft.NETCore.App" Version="2.1.0-preview1-26116-04" IsDirectDependency="true" />
     <Usage Id="Microsoft.NETCore.App" Version="2.1.0" IsDirectDependency="true" IsAutoReferenced="true" />
-    <Usage Id="Microsoft.NETCore.App" Version="2.1.6" IsDirectDependency="true" />
+    <Usage Id="Microsoft.NETCore.App" Version="2.1.7" IsDirectDependency="true" />
     <Usage Id="Microsoft.NETCore.Compilers" Version="2.8.0-beta2-62719-08" IsDirectDependency="true" />
     <Usage Id="Microsoft.NETCore.Compilers" Version="2.8.0-beta4-62824-10" />
     <Usage Id="Microsoft.NETCore.DotNetAppHost" Version="2.0.0" />
     <Usage Id="Microsoft.NETCore.DotNetAppHost" Version="2.1.0-preview1-26116-04" />
     <Usage Id="Microsoft.NETCore.DotNetAppHost" Version="2.1.0" />
-    <Usage Id="Microsoft.NETCore.DotNetAppHost" Version="2.2.0" />
+    <Usage Id="Microsoft.NETCore.DotNetAppHost" Version="2.2.1" />
     <Usage Id="Microsoft.NETCore.DotNetHost" Version="1.0.1" />
     <Usage Id="Microsoft.NETCore.DotNetHost" Version="1.1.0" />
-    <Usage Id="Microsoft.NETCore.DotNetHost" Version="2.2.0" IsDirectDependency="true" />
+    <Usage Id="Microsoft.NETCore.DotNetHost" Version="2.2.1" IsDirectDependency="true" />
     <Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="1.0.3" />
     <Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="1.0.5" />
     <Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="1.1.0" />
     <Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="2.0.0" />
     <Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="2.1.0-preview1-26116-04" />
     <Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="2.1.0" />
-    <Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="2.2.0" IsDirectDependency="true" />
+    <Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="2.2.1" IsDirectDependency="true" />
     <Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="1.0.1" />
     <Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="1.1.0" />
     <Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="2.0.0" />
     <Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="2.1.0-preview1-26116-04" />
     <Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="2.1.0" />
-    <Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="2.2.0" />
+    <Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="2.2.1" />
     <Usage Id="Microsoft.NETCore.ILAsm" Version="2.2.0-preview3-27008-03" IsDirectDependency="true" />
     <Usage Id="Microsoft.NETCore.ILDAsm" Version="2.2.0-preview3-27008-03" IsDirectDependency="true" />
     <Usage Id="Microsoft.NETCore.Jit" Version="1.0.5" />
@@ -274,14 +274,14 @@
     <Usage Id="runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.0" Rid="fedora.24-x64" />
     <Usage Id="runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.2" Rid="fedora.24-x64" />
     <Usage Id="runtime.linux-x64.Microsoft.NETCore.App" Version="2.0.0" Rid="linux-x64" />
-    <Usage Id="runtime.linux-x64.Microsoft.NETCore.App" Version="2.1.6" Rid="linux-x64" />
+    <Usage Id="runtime.linux-x64.Microsoft.NETCore.App" Version="2.1.7" Rid="linux-x64" />
     <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="2.0.0" Rid="linux-x64" />
-    <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="2.2.0" Rid="linux-x64" />
-    <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHost" Version="2.2.0" Rid="linux-x64" />
+    <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="2.2.1" Rid="linux-x64" />
+    <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHost" Version="2.2.1" Rid="linux-x64" />
     <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.0.0" Rid="linux-x64" />
-    <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.2.0" Rid="linux-x64" />
+    <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.2.1" Rid="linux-x64" />
     <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.0.0" Rid="linux-x64" />
-    <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.2.0" Rid="linux-x64" />
+    <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.2.1" Rid="linux-x64" />
     <Usage Id="runtime.linux-x64.Microsoft.NETCore.ILAsm" Version="2.2.0-preview3-27008-03" Rid="linux-x64" />
     <Usage Id="runtime.linux-x64.Microsoft.NETCore.ILDAsm" Version="2.2.0-preview3-27008-03" Rid="linux-x64" />
     <Usage Id="runtime.linux-x64.Microsoft.NETCore.Jit" Version="2.2.0-preview3-27008-03" Rid="linux-x64" />

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-2/20181207-03/final/index.json`
	`1`	`+https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-2/20190117-05/final/index.json`