Reconcile patches

Author: dseefeld

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

@@ -33,8 +33,8 @@ index 501ba161bf..ee9dcaf4fa 100644
    },
    "msbuild-sdks": {
 -    "Yarn.MSBuild": "1.15.2",
-     "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20580.4",
-     "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20580.4"
+     "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21063.3",
+     "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.21063.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

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

@@ -24,18 +24,18 @@ index ee9dcaf4fa..053e92ebee 100644
 +++ b/global.json
 @@ -5,13 +5,10 @@
    "tools": {
-     "dotnet": "5.0.101",
+     "dotnet": "5.0.102",
      "runtimes": {
 -      "dotnet/x64": [
 +      "dotnet": [
-         "2.1.23",
+         "2.1.24",
          "$(MicrosoftNETCoreAppInternalPackageVersion)"
        ],
 -      "dotnet/x86": [
 -        "$(MicrosoftNETCoreAppInternalPackageVersion)"
 -      ],
        "aspnetcore/x64": [
-         "3.1.10"
+         "3.1.11"
        ]
 -- 
 2.18.0

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

@@ -7,17 +7,17 @@ This file is actually a very long minified JS file with a version number at the
 end. The file is treated as binary, making this patch less clear, but it's easy
 to update/reapply it with a text editor.
 ---
- .../Web.JS/dist/Release/blazor.server.js           | Bin 249682 -> 249683 bytes
+ .../Web.JS/dist/Release/blazor.server.js      | Bin 249682 -> 249682 bytes
  1 file changed, 0 insertions(+), 0 deletions(-)
 
 diff --git a/src/Components/Web.JS/dist/Release/blazor.server.js b/src/Components/Web.JS/dist/Release/blazor.server.js
-index 6fc91cb4c3d8816f2b4eed7a576e058bdfe57542..6d20cf7d4106bdfae5825ebb73075c321c0a36d0 100644
+index 6fc91cb4c3d8816f2b4eed7a576e058bdfe57542..6ebe5b8226b821c16bb6c6f230922d7dc76c5e39 100644
 GIT binary patch
-delta 23
-ecmcaKkN@&K{)QID7N#xCKIhqulxkx&t+@bkI|u*(
+delta 22
+dcmcaKkN?s<{)QID7N#xCKIhqtm1<)(tpRB#2lW5|
 
 delta 22
-dcmcaSkN?s<{)QID7N#xCKIhpCm1<)(tpRB<2lM~{
+dcmcaKkN?s<{)QID7N#xCKIhpCm1<)(tpRBp2lD^`
 
 -- 
 1.8.3.1