Update to the March 5.0.4 release. (#2089)

* Update to the March 5.0.4 release.

* Update repo URLs.

* Add patch to restore ability to skip bundled dotnet tools to fix bootstrapping.

Author: crummel

eng/Version.Details.xml

@@ -22,20 +22,20 @@
       <Sha>c01a538851a8ab1a1fbeb2e6243f391fff7587b4</Sha>
       <RepoName>aspnet-xdt</RepoName>
     </Dependency>
-    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="5.0.0-rtm.20612.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="5.0.0-rtm.21113.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://github.com/mono/linker</Uri>
-      <Sha>25604250cf2663aed6630e305cc0538aeebda80a</Sha>
+      <Sha>e0b9157b540f5fc020b2e7967f4bbd23ba826e4e</Sha>
       <RepoName>linker</RepoName>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>c636bbdc8a2d393d07c0e9407a4f8923ba1a21cb</Sha>
+      <Sha>f27d33729518f5aa478aa818b7b4f54a4d50bef1</Sha>
       <RepoName>runtime</RepoName>
       <RepoName>runtime-portable</RepoName>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="5.0.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+    <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="5.0.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>5a9a6d5fd42c19379e3e65f41e1223a59ecc9930</Sha>
+      <Sha>8dc4f8a9283d45103e132026797af30ead2aad6d</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.5.0" Version="1.0.2-beta4.20407.5">
       <Uri>https://github.com/dotnet/test-templates</Uri>
@@ -63,9 +63,9 @@
       <Sha>830c8be45dbbccd411ecf6080abff0c2c98079cf</Sha>
       <RepoName>nuget-client</RepoName>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk" Version="5.0.103-servicing.21073.8" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+    <Dependency Name="Microsoft.NET.Sdk" Version="5.0.104-servicing.21118.26" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>0c81a4876c3f22f6753ae6fec6e74d1c20bc55f7</Sha>
+      <Sha>2932b586ae1ebf28415df80e0bf96d8015f2c192</Sha>
       <RepoName>sdk</RepoName>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.Cli.CommandLine" Version="1.0.0-preview.19208.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
@@ -83,9 +83,9 @@
       <Uri>https://github.com/dotnet/xliff-tasks</Uri>
       <Sha>a52f3d7fb58470749ee4035fbbcb7e63c78b0459</Sha>
     </Dependency>
-    <Dependency Name="dotnet-watch" Version="5.0.3-servicing.21073.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+    <Dependency Name="dotnet-watch" Version="5.0.4-servicing.21118.15" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>d827c653b787c07de908240b7746ce34d3e6271e</Sha>
+      <Sha>e882394a7bb38930da748291fe2c2ceaa6a80588</Sha>
       <RepoName>aspnetcore</RepoName>
     </Dependency>
     <Dependency Name="Microsoft.FSharp.Compiler" Version="11.0.0-beta.20507.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
@@ -96,9 +96,9 @@
       <Uri>https://github.com/microsoft/vstest</Uri>
       <Sha>212656d7b384a506aa714999f678b3ace82d114e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="5.0.103-servicing.21073.8">
+    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="5.0.104-servicing.21118.22">
       <Uri>https://github.com/dotnet/installer</Uri>
-      <Sha>72dec52dbda7611ff3b2a39c96ef40942bedc4f0</Sha>
+      <Sha>ca6b6acadbd30de2160ab6a003fba072b2c7b568</Sha>
       <RepoName>installer</RepoName>
     </Dependency>
     <Dependency Name="Microsoft.Diagnostics.NETCore.Client" Version="0.2.0-preview.20419.2">

eng/Versions.props

@@ -4,8 +4,8 @@
   <PropertyGroup>
     <MajorVersion>5</MajorVersion>
     <MinorVersion>0</MinorVersion>
-    <RuntimePatchVersion>2</RuntimePatchVersion>
-    <SdkPatchVersion>102</SdkPatchVersion>
+    <RuntimePatchVersion>4</RuntimePatchVersion>
+    <SdkPatchVersion>104</SdkPatchVersion>
     <RuntimeProductVersion>$(MajorVersion).$(MinorVersion).$(RuntimePatchVersion)</RuntimeProductVersion>
     <AspNetCoreProductVersion>$(MajorVersion).$(MinorVersion).$(RuntimePatchVersion)</AspNetCoreProductVersion>
     <SdkProductVersion>$(MajorVersion).$(MinorVersion).$(SdkPatchVersion)</SdkProductVersion>
@@ -25,6 +25,6 @@
     <PrivateSourceBuildReferencePackagesPackageVersion>1.0.0-beta.20623.1</PrivateSourceBuildReferencePackagesPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
-    <PrivateSourceBuiltArtifactsPackageVersion>0.1.0-5.0.102-952729-20210115.1</PrivateSourceBuiltArtifactsPackageVersion>
+    <PrivateSourceBuiltArtifactsPackageVersion>0.1.0-5.0.103-992795-20210212.2</PrivateSourceBuiltArtifactsPackageVersion>
   </PropertyGroup>
 </Project>

patches/aspnetcore/0004-Remove-Yarn-dependency-not-used-in-source-build.patch

@@ -1,40 +1,39 @@
-From 83c0f95c563fa6eb9b446f09166cac2c62ab6390 Mon Sep 17 00:00:00 2001
+From 0e0702ac47c27e80b8365ecb2a10e51b87e5cc77 Mon Sep 17 00:00:00 2001
 From: dseefeld <dseefeld@microsoft.com>
 Date: Thu, 14 May 2020 16:29:28 +0000
-Subject: [PATCH 04/14] Remove Yarn dependency - not used in source-build
+Subject: [PATCH 04/18] Remove Yarn dependency - not used in source-build
 
 ---
- eng/targets/Npm.Common.targets                                 | 3 ---
- global.json                                                    | 1 -
- .../src/Microsoft.Authentication.WebAssembly.Msal.csproj       | 2 --
- ...oft.AspNetCore.Components.WebAssembly.Authentication.csproj | 2 --
- src/Shared/E2ETesting/E2ETesting.targets                       | 3 ---
- 5 files changed, 11 deletions(-)
+ eng/targets/Npm.Common.targets                                  | 2 --
+ global.json                                                     | 1 -
+ .../src/Microsoft.Authentication.WebAssembly.Msal.csproj        | 2 --
+ ...soft.AspNetCore.Components.WebAssembly.Authentication.csproj | 2 --
+ src/Shared/E2ETesting/E2ETesting.targets                        | 2 --
+ 5 files changed, 9 deletions(-)
 
 diff --git a/eng/targets/Npm.Common.targets b/eng/targets/Npm.Common.targets
-index 696d23402b..6086dd0843 100644
+index 696d23402b..6dd3ea7dd3 100644
 --- a/eng/targets/Npm.Common.targets
 +++ b/eng/targets/Npm.Common.targets
-@@ -1,8 +1,5 @@
+@@ -1,7 +1,5 @@
  <Project DefaultTargets="Build" InitialTargets="_CheckForInvalidConfiguration">
 
 -  <!-- Version of this SDK is set in global.json -->
 -  <Sdk Name="Yarn.MSBuild" />
--
+ 
    <PropertyGroup>
      <NormalizedPackageId>$(PackageId.Replace('@','').Replace('/','-'))</NormalizedPackageId>
-     <PackageFileName>$(NormalizedPackageId)-$(PackageVersion).tgz</PackageFileName>
 diff --git a/global.json b/global.json
-index 501ba161bf..ee9dcaf4fa 100644
+index 5e4856113a..101f6c4fac 100644
 --- a/global.json
 +++ b/global.json
 @@ -29,7 +29,6 @@
      "xcopy-msbuild": "16.5.0-alpha"
    },
    "msbuild-sdks": {
 -    "Yarn.MSBuild": "1.15.2",
-     "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21063.3",
-     "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.21063.3"
+     "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21112.3",
+     "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.21112.3"
    }
 diff --git a/src/Components/WebAssembly/Authentication.Msal/src/Microsoft.Authentication.WebAssembly.Msal.csproj b/src/Components/WebAssembly/Authentication.Msal/src/Microsoft.Authentication.WebAssembly.Msal.csproj
 index 939ba16f88..ea2c849ea3 100644
@@ -61,17 +60,16 @@ index 21a2efba4e..b4a6a75446 100644
      <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
      <Description>Build client-side authentication for single-page applications (SPAs).</Description>
 diff --git a/src/Shared/E2ETesting/E2ETesting.targets b/src/Shared/E2ETesting/E2ETesting.targets
-index 76ced2cce9..eaecb913a9 100644
+index 76ced2cce9..0eb94aaf2e 100644
 --- a/src/Shared/E2ETesting/E2ETesting.targets
 +++ b/src/Shared/E2ETesting/E2ETesting.targets
-@@ -1,7 +1,4 @@
+@@ -1,6 +1,4 @@
  <Project>
 -  <!-- Version of this SDK is set in global.json -->
 -  <Sdk Name="Yarn.MSBuild" />
--
+ 
    <!-- Make sure the settings files get copied to the test output folder. -->
    <ItemGroup>
-     <None Update="e2eTestSettings*.json">
 -- 
 2.18.0
 

patches/aspnetcore/0007-Support-global.json-on-arm64-as-well.patch

@@ -1,7 +1,7 @@
-From ca706cd8670d14fae05b36ee83de716fa19d95ba Mon Sep 17 00:00:00 2001
+From 7de9a361f7c687f697d9309110d83c9ddd8cc1a7 Mon Sep 17 00:00:00 2001
 From: Omair Majid <omajid@redhat.com>
 Date: Wed, 23 Oct 2019 15:43:57 -0400
-Subject: [PATCH 07/14] Support global.json on arm64 as well
+Subject: [PATCH 07/18] Support global.json on arm64 as well
 
 arcade uses the runtime section of global.json to decide which
 architecture + runtime combination needs to be installed.
@@ -19,23 +19,23 @@ This gets us a working SDK/Runtime combo on arm64.
  1 file changed, 1 insertion(+), 4 deletions(-)
 
 diff --git a/global.json b/global.json
-index ee9dcaf4fa..053e92ebee 100644
+index 101f6c4fac..70047a815a 100644
 --- a/global.json
 +++ b/global.json
 @@ -5,13 +5,10 @@
    "tools": {
-     "dotnet": "5.0.102",
+     "dotnet": "5.0.103",
      "runtimes": {
 -      "dotnet/x64": [
 +      "dotnet": [
-         "2.1.24",
+         "2.1.25",
          "$(MicrosoftNETCoreAppInternalPackageVersion)"
        ],
 -      "dotnet/x86": [
 -        "$(MicrosoftNETCoreAppInternalPackageVersion)"
 -      ],
        "aspnetcore/x64": [
-         "3.1.11"
+         "3.1.12"
        ]
 -- 
 2.18.0

patches/aspnetcore/0015-Don-t-canonicalize-all-ref-packages-to-RTM-versions-.patch

@@ -1,11 +1,11 @@
-From db28c21cbe16efe4c6f0de3ef6541c1487d00348 Mon Sep 17 00:00:00 2001
+From 93b584d3905b1abe7b7e3bb09fd853fe372c9da5 Mon Sep 17 00:00:00 2001
 From: Chris Rummel <crummel@microsoft.com>
 Date: Wed, 16 Dec 2020 19:36:48 -0600
-Subject: [PATCH 15/15] Don't canonicalize all ref packages to RTM versions for
+Subject: [PATCH 15/18] Don't canonicalize all ref packages to RTM versions for
  source-build. This is because we turn on BuildAllPackages in runtime since we
- don't use the previous version's prebuilt bits.  This target makes the
- version numbers mismatch, resulting in errors like error MSB3106: Assembly
- strong name
+ don't use the previous version's prebuilt bits. This target makes the version
+ numbers mismatch, resulting in errors like error MSB3106: Assembly strong
+ name
  "/home/chris/dotnet_source-build/packages/restored/system.io.pipelines/5.0.0/ref/net5.0/System.I
  O.Pipelines.dll" is either a path which could not be found or it is a full
  assembly name which is badly formed.

patches/aspnetcore/0016-Fix-version-number.patch

@@ -1,12 +1,12 @@
-From 340b200c6f0efe8dbe38186a5c94ba28cd9bfd5f Mon Sep 17 00:00:00 2001
+From f9ca4bdfbf9ac7802310e86428c8fca2c1f2f6c1 Mon Sep 17 00:00:00 2001
 From: Davis Goodin <dagood@microsoft.com>
 Date: Mon, 21 Dec 2020 15:17:22 -0600
-Subject: [PATCH] Don't use RTMVersion in source-build
+Subject: [PATCH 17/18] Don't use RTMVersion in source-build
 
 This seems like it would bring in prebuilts, and more directly, causes:
 
-  Detected package downgrade: System.Security.Cryptography.Pkcs from 5.0.1 to 5.0.0. Reference the package directly from the project to select a different version. 
-   RepoTasks -> NuGet.Packaging 5.8.0-rc.6930 -> System.Security.Cryptography.Pkcs (>= 5.0.1) 
+  Detected package downgrade: System.Security.Cryptography.Pkcs from 5.0.1 to 5.0.0. Reference the package directly from the project to select a different version.
+   RepoTasks -> NuGet.Packaging 5.8.0-rc.6930 -> System.Security.Cryptography.Pkcs (>= 5.0.1)
    RepoTasks -> System.Security.Cryptography.Pkcs (>= 5.0.0)
 ---
  eng/Dependencies.props | 6 +++++-
@@ -30,5 +30,5 @@ index d573a7bde9..79436b5a16 100644
        <!-- Remove excess metadata. -->
        <RTMVersion Condition=" '%(Version)' == '%(RTMVersion)' " />
 -- 
-2.25.4
+2.18.0
 

patches/aspnetcore/0018-Don-t-use-RTMVersion-in-source-build.patch renamed to patches/aspnetcore/0017-Don-t-use-RTMVersion-in-source-build.patch

@@ -0,0 +1,23 @@
+From 4463ac79852a962c1b41188ead601cf2052c6dfd Mon Sep 17 00:00:00 2001
+From: Chris Rummel <crummel@microsoft.com>
+Date: Sat, 13 Mar 2021 14:21:20 -0600
+Subject: [PATCH 9/9] Restore CLIBUILD_SKIP_BUNDLEDDOTNETTOOLS property.
+
+---
+ src/redist/targets/BundledDotnetTools.targets | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/redist/targets/BundledDotnetTools.targets b/src/redist/targets/BundledDotnetTools.targets
+index 0b5b202e0..0d3cc2e8c 100644
+--- a/src/redist/targets/BundledDotnetTools.targets
++++ b/src/redist/targets/BundledDotnetTools.targets
+@@ -1,5 +1,5 @@
+ <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+-  <ItemGroup Condition=" '$(IncludeAspNetCoreRuntime)' != 'false' ">
++  <ItemGroup Condition=" '$(IncludeAspNetCoreRuntime)' != 'false' and '$(CLIBUILD_SKIP_BUNDLEDDOTNETTOOLS)' != 'true' ">
+     <BundledDotnetTool Include="dotnet-dev-certs" Version="$(DotnetDevCertsPackageVersion)" />
+     <BundledDotnetTool Include="dotnet-user-secrets" Version="$(DotnetUserSecretsPackageVersion)" ObsoletesCliTool="Microsoft.Extensions.SecretManager.Tools" />
+     <BundledDotnetTool Include="dotnet-watch" Version="$(DotnetWatchPackageVersion)" ObsoletesCliTool="Microsoft.DotNet.Watcher.Tools" />
+-- 
+2.18.0
+