Merge pull request #2164 from MichaelSimons/2.1.524-may2021

MichaelSimons · web-flow · commit 524592e30364 · 2021-05-12T07:52:51.000-05:00
Update to the 2.1.28 / 2.1.524 release
diff --git a/DotnetCLIVersion.txt b/DotnetCLIVersion.txt
@@ -1 +1 @@
-2.1.522
+2.1.523
diff --git a/ProdConFeed.txt b/ProdConFeed.txt
@@ -1 +1 @@
-https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/20210316-03/final/index.json
+https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/20210415-01/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.1.27</MicrosoftAspNetCoreAllPackageVersion>
-    <MicrosoftAspNetCoreAppPackageVersion>2.1.27</MicrosoftAspNetCoreAppPackageVersion>
+    <MicrosoftAspNetCoreAllPackageVersion>2.1.28</MicrosoftAspNetCoreAllPackageVersion>
+    <MicrosoftAspNetCoreAppPackageVersion>2.1.28</MicrosoftAspNetCoreAppPackageVersion>
     <MicrosoftNETSdkRazorPackageVersion>2.2.0</MicrosoftNETSdkRazorPackageVersion>
   </PropertyGroup>
 
diff --git a/repos/core-setup.proj b/repos/core-setup.proj
@@ -21,7 +21,7 @@
     <BuildCommand>$(ProjectDirectory)/build$(ShellExtension) $(BuildArguments)</BuildCommand>
     <BuildCommand Condition="$(Platform.Contains('arm'))">$(ArmEnvironmentVariables) $(BuildCommand)</BuildCommand>
 
-    <OfficialBuildId>20210316-01</OfficialBuildId>
+    <OfficialBuildId>20210415-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>20210316-01</OfficialBuildId>
+    <OfficialBuildId>20210415-01</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>20210316-03</OfficialBuildId>
+    <OfficialBuildId>20210415-01</OfficialBuildId>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/cli b/src/cli
@@ -1 +1 @@
-Subproject commit c294f2cbe4bac713c31bf640dc854703b95f3e29
+Subproject commit ab112507703c8c400014635bd88e4bcd1013a17b
diff --git a/src/core-setup b/src/core-setup
@@ -1 +1 @@
-Subproject commit 37d16c2b4d50a6affc6886dd1d066b8e8aba2309
+Subproject commit 612cb8b183c52dff0a7f2e57cbfb58e2f18938cc
diff --git a/src/coreclr b/src/coreclr
@@ -1 +1 @@
-Subproject commit c814243d7d94b640bc11972e0c588b97bc935e4d
+Subproject commit 936df21f6cf26c2fc5a5f02775626f83841c19c6
diff --git a/src/corefx b/src/corefx
@@ -1 +1 @@
-Subproject commit 627093c87fea3d92b28d0deb53d1259e79b45088
+Subproject commit 96d2fdd8610e6eead9b357789266be9d149dd0b8
diff --git a/tools-local/prebuilt-baseline-offline.xml b/tools-local/prebuilt-baseline-offline.xml
@@ -33,7 +33,7 @@
   <NeverRestoredTarballPrebuilts>
     <PackageIdentity Id="Microsoft.DotNet.BuildTools" Version="2.1.0-rc1-06014-01" />
     <PackageIdentity Id="RoslynTools.RepoToolset" Version="1.0.0-custom-62805-03" />
-    <PackageIdentity Id="runtime.linux-x64.Microsoft.NETCore.App" Version="2.1.24" />
+    <PackageIdentity Id="runtime.linux-x64.Microsoft.NETCore.App" Version="2.1.27" />
     <PackageIdentity Id="runtime.linux-x64.Microsoft.NETCore.ILAsm" Version="2.1.8-servicing-27317-03" />
     <PackageIdentity Id="runtime.linux-x64.Microsoft.NETCore.ILDAsm" Version="2.1.8-servicing-27317-03" />
     <PackageIdentity Id="runtime.linux-x64.Microsoft.NETCore.Jit" Version="2.1.8-servicing-27317-03" />
@@ -207,12 +207,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.1.25" Rid="linux-x64" />
-    <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHost" Version="2.1.25" Rid="linux-x64" />
+    <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="2.1.27" Rid="linux-x64" />
+    <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHost" Version="2.1.27" 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.1.25" Rid="linux-x64" />
+    <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.1.27" 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.1.25" Rid="linux-x64" />
+    <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.1.27" Rid="linux-x64" />
     <Usage Id="runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.1" />
     <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.1" Rid="opensuse.13.2-x64" />
@@ -501,4 +501,4 @@
     <Usage Id="XliffTasks" Version="0.2.0-beta-62730-03" IsDirectDependency="true" />
     <Usage Id="XliffTasks" Version="0.2.0-beta-63004-01" IsDirectDependency="true" />
   </Usages>
-</UsageData>
+</UsageData>
diff --git a/tools-local/prebuilt-baseline-online.xml b/tools-local/prebuilt-baseline-online.xml
@@ -95,9 +95,9 @@
     <Usage Id="Microsoft.DotNet.PlatformAbstractions" Version="2.1.0-preview2-26306-03" />
     <Usage Id="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4-20181009-2100240" />
     <Usage Id="Microsoft.DotNet.VersionTools" Version="2.1.0-rc1-05113-01" IsDirectDependency="true" />
-    <Usage Id="Microsoft.DotNet.Web.ItemTemplates" Version="2.1.27" />
-    <Usage Id="Microsoft.DotNet.Web.ProjectTemplates.2.1" Version="2.1.27" />
-    <Usage Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.2.1" Version="2.1.27" />
+    <Usage Id="Microsoft.DotNet.Web.ItemTemplates" Version="2.1.28" />
+    <Usage Id="Microsoft.DotNet.Web.ProjectTemplates.2.1" Version="2.1.28" />
+    <Usage Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.2.1" Version="2.1.28" />
     <Usage Id="Microsoft.Extensions.CommandLineUtils" Version="1.1.0" IsDirectDependency="true" />
     <Usage Id="Microsoft.Extensions.CommandLineUtils.Sources" Version="2.2.0-rtm-35542" IsDirectDependency="true" />
     <Usage Id="Microsoft.Extensions.DependencyModel" Version="1.0.3" />
@@ -116,30 +116,30 @@
     <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.26" IsDirectDependency="true" />
+    <Usage Id="Microsoft.NETCore.App" Version="2.1.27" 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.1.25" />
+    <Usage Id="Microsoft.NETCore.DotNetAppHost" Version="2.1.27" />
     <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.1.25" IsDirectDependency="true" />
+    <Usage Id="Microsoft.NETCore.DotNetHost" Version="2.1.27" 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="1.1.2" />
     <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.1.25" IsDirectDependency="true" />
+    <Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="2.1.27" 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.1.25" />
+    <Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="2.1.27" />
     <Usage Id="Microsoft.NETCore.ILAsm" Version="2.1.8-servicing-27317-03" IsDirectDependency="true" />
     <Usage Id="Microsoft.NETCore.ILDAsm" Version="2.1.8-servicing-27317-03" IsDirectDependency="true" />
     <Usage Id="Microsoft.NETCore.Jit" Version="1.0.5" />
@@ -154,7 +154,7 @@
     <Usage Id="Microsoft.NETCore.Platforms" Version="2.0.0" />
     <Usage Id="Microsoft.NETCore.Platforms" Version="2.1.0-preview1-26116-01" />
     <Usage Id="Microsoft.NETCore.Platforms" Version="2.1.0" />
-    <Usage Id="Microsoft.NETCore.Platforms" Version="2.1.12" IsDirectDependency="true" />
+    <Usage Id="Microsoft.NETCore.Platforms" Version="2.1.13" IsDirectDependency="true" />
     <Usage Id="Microsoft.NETCore.Runtime.CoreCLR" Version="1.0.5" />
     <Usage Id="Microsoft.NETCore.Runtime.CoreCLR" Version="1.0.7" />
     <Usage Id="Microsoft.NETCore.Runtime.CoreCLR" Version="1.1.1" />
@@ -261,14 +261,14 @@
     <Usage Id="runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.1" 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.26" Rid="linux-x64" />
+    <Usage Id="runtime.linux-x64.Microsoft.NETCore.App" Version="2.1.27" 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.1.25" Rid="linux-x64" />
-    <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHost" Version="2.1.25" Rid="linux-x64" />
+    <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="2.1.27" Rid="linux-x64" />
+    <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHost" Version="2.1.27" 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.1.25" Rid="linux-x64" />
+    <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.1.27" 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.1.25" Rid="linux-x64" />
+    <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.1.27" Rid="linux-x64" />
     <Usage Id="runtime.linux-x64.Microsoft.NETCore.ILAsm" Version="2.1.8-servicing-27317-03" Rid="linux-x64" />
     <Usage Id="runtime.linux-x64.Microsoft.NETCore.ILDAsm" Version="2.1.8-servicing-27317-03" Rid="linux-x64" />
     <Usage Id="runtime.linux-x64.Microsoft.NETCore.Jit" Version="2.1.8-servicing-27317-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-1/20210316-03/final/index.json`
	`1`	`+https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/20210415-01/final/index.json`