Skip to content

Commit db5feff

Browse files
committed
Reconcile patches
1 parent e92e2f9 commit db5feff

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@ This file is actually a very long minified JS file with a version number at the
77
end. The file is treated as binary, making this patch less clear, but it's easy
88
to update/reapply it with a text editor.
99
---
10-
.../Web.JS/dist/Release/blazor.server.js | Bin 242561 -> 242562 bytes
10+
.../Web.JS/dist/Release/blazor.server.js | Bin 242561 -> 242561 bytes
1111
1 file changed, 0 insertions(+), 0 deletions(-)
1212

1313
diff --git a/src/Components/Web.JS/dist/Release/blazor.server.js b/src/Components/Web.JS/dist/Release/blazor.server.js
14-
index 1c602124e2c7a54b062e3b1d52c32580a70927bd..8a9b6408fae1502713f054bfe01cc281c130417d 100644
14+
index 1c602124e2c7a54b062e3b1d52c32580a70927bd..af706d7529f40614d5ec3a568060b0459ad4ca23 100644
1515
GIT binary patch
16-
delta 23
17-
ecmZpC&e!yuuc3vpg=q_O^=5VxrP^3cYc2qA5(onT
16+
delta 22
17+
dcmZpC&e!;yuc3vpg=q_O^=39xrP^3cYXE2a2lxO0
1818

1919
delta 22
20-
dcmZpA&e!;yuc3vpg=q_O^=39BrP^3cYXE2e2lfB}
20+
dcmZpC&e!;yuc3vpg=q_O^=39BrP^3cYXE2I2lW5|
2121

2222
--
2323
2.18.0

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.21158.9",
39-
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.21158.9"
38+
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.21161.1",
39+
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.21161.1"
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.113",
27+
"dotnet": "3.1.114",
2828
"runtimes": {
2929
- "dotnet/x64": [
3030
- "$(MicrosoftNETCoreAppInternalPackageVersion)"

0 commit comments

Comments
 (0)