Skip to content

Commit 42c140f

Browse files
committed
Reconcile patches
1 parent 2feb35a commit 42c140f

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ index 97783de603..de628eca3c 100644
3535
},
3636
"msbuild-sdks": {
3737
- "Yarn.MSBuild": "1.15.2",
38-
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.21110.10",
39-
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.21110.10"
38+
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.21158.9",
39+
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.21158.9"
4040
}
4141
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
4242
index 36eec6b93a..19c5906526 100644

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ index de628eca3c..3fb6244e52 100644
2424
+++ b/global.json
2525
@@ -5,10 +5,7 @@
2626
"tools": {
27-
"dotnet": "3.1.112",
27+
"dotnet": "3.1.113",
2828
"runtimes": {
2929
- "dotnet/x64": [
3030
- "$(MicrosoftNETCoreAppInternalPackageVersion)"

patches/core-sdk/0002-Patch-property-used-for-core-setup-version.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ index 43ea706d4..b1f5d5772 100644
1919
+ <CoreSetupBlobVersion>$(MicrosoftNETCoreAppRuntimePackageVersion)</CoreSetupBlobVersion>
2020

2121
<!-- Change these individually to or $(CoreSetupBlobVersion), $(AspNetCoreBlobVersion), or appropriate fixed version depending if corresponding .Ref packages are unpinned. -->
22-
<NETCoreAppTargetingPackBlobVersion>3.1.0-rtm.19565.2</NETCoreAppTargetingPackBlobVersion>
22+
<NETCoreAppTargetingPackBlobVersion Condition="'$(Rid)' != 'win-arm64'">3.1.0-rtm.19565.2</NETCoreAppTargetingPackBlobVersion>
2323
--
2424
2.21.0
2525

0 commit comments

Comments
 (0)