Reconcile patches

Author: dseefeld

patches/aspnetcore/0007-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 216950 -> 216952 bytes
+ .../Web.JS/dist/Release/blazor.server.js      | Bin 216950 -> 216951 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 3042cc0c0242767d8389582c9243eb48195a3954..442ee8cd1ef0f870162ebab0ccedde56f8ec4a5d 100644
+index 3042cc0c0242767d8389582c9243eb48195a3954..ec2211a04cb1f7d02cd5477a95cdd2b175df4d98 100644
 GIT binary patch
-delta 24
-fcmex1kN3ws-i8*&7N#xC1^yg{hDx=un$}zZd&~$L
+delta 23
+ecmex1kN5jL-i8*&7N#xC1^(=YMoP7@n$`ewoCps9
 
 delta 22
-dcmew{kN4X=-i8*&7N#xC1^#T7O0}_?)&OiZ2ju_&
+dcmex9kN4X=-i8*&7N#xC1^#T7O0}_?)&OiD2jl<%
 
 --
 2.18.0

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

@@ -35,8 +35,8 @@ index 6880ef82ed..854ab2f3a5 100644
    },
    "msbuild-sdks": {
 -    "Yarn.MSBuild": "1.15.2",
-     "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20569.8",
-     "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.20569.8"
+     "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.21063.4",
+     "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.21063.4"
    }
 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 36eec6b93a..19c5906526 100644

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

@@ -24,7 +24,7 @@ index 854ab2f3a5..bc379b038e 100644
 +++ b/global.json
 @@ -5,10 +5,7 @@
    "tools": {
-     "dotnet": "3.1.110",
+     "dotnet": "3.1.111",
      "runtimes": {
 -      "dotnet/x64": [
 -        "$(MicrosoftNETCoreAppInternalPackageVersion)"

patches/corefx/0001-Enable-sourcelink-in-source-build.patch

@@ -8,7 +8,7 @@ Subject: [PATCH 1/7] Enable sourcelink in source-build
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/eng/Tools.props b/eng/Tools.props
-index cfe49be3c6..025f8ab9af 100644
+index 33edddae16..fdbb3b9c4a 100644
 --- a/eng/Tools.props
 +++ b/eng/Tools.props
 @@ -20,6 +20,10 @@
@@ -18,7 +18,7 @@ index cfe49be3c6..025f8ab9af 100644
 +
 +    <!-- SourceLink -->
 +    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="$(MicrosoftSourceLinkVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />
-+    <PackageReference Include="Microsoft.SourceLink.Vsts.Git" Version="$(MicrosoftSourceLinkVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />
++    <PackageReference Include="Microsoft.SourceLink.Vsts.Git" Version="$(MicrosoftSourceLinkVSTSVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />
    </ItemGroup>
 
    <!-- excluded from offline portion of source build -->
@@ -28,7 +28,7 @@ index cfe49be3c6..025f8ab9af 100644
 
 -    <!-- SourceLink -->
 -    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="$(MicrosoftSourceLinkVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />
--    <PackageReference Include="Microsoft.SourceLink.Vsts.Git" Version="$(MicrosoftSourceLinkVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />
+-    <PackageReference Include="Microsoft.SourceLink.Vsts.Git" Version="$(MicrosoftSourceLinkVSTSVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />
 -
      <!-- UWP test tools -->
      <PackageReference Include="Microsoft.DotNet.UAP.TestTools" Version="$(MicrosoftDotNetUapTestToolsPackageVersion)" Condition="$(TargetGroup.StartsWith('uap'))" PrivateAssets="all" IsImplicitlyDefined="true" />