Skip to content

Commit 23b4ab0

Browse files
committed
Update remaining patches
1 parent 2c4e283 commit 23b4ab0

File tree

3 files changed

+9
-74
lines changed

3 files changed

+9
-74
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From ada8d6847f94cdbab444dab899d746a86c5bdc1d Mon Sep 17 00:00:00 2001
1+
From 0c65bf213286fc84e2b9a2f2768cca8ec5449407 Mon Sep 17 00:00:00 2001
22
From: adaggarwal <aditya.aggarwal@microsoft.com>
33
Date: Thu, 14 Nov 2019 17:34:41 +0000
44
Subject: [PATCH] Remove Yarn dependency - not used in source-build
@@ -27,16 +27,16 @@ index 062a9d3a8f..3f91b02d42 100644
2727
<NormalizedPackageId>$(PackageId.Replace('@','').Replace('/','-'))</NormalizedPackageId>
2828
<PackageFileName>$(NormalizedPackageId)-$(PackageVersion).tgz</PackageFileName>
2929
diff --git a/global.json b/global.json
30-
index 974708a611..f0ea6add96 100644
30+
index 6880ef82ed..854ab2f3a5 100644
3131
--- a/global.json
3232
+++ b/global.json
3333
@@ -24,7 +24,6 @@
3434
}
3535
},
3636
"msbuild-sdks": {
3737
- "Yarn.MSBuild": "1.15.2",
38-
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20213.4",
39-
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.20213.4"
38+
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20509.7",
39+
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.20509.7"
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/0012-Support-global.json-on-arm64-as-well.patch

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From d4f88b027d6250591506f541c3763db30502fd01 Mon Sep 17 00:00:00 2001
1+
From 4f70aa3d91e824fce0a138c105760eabccda2797 Mon Sep 17 00:00:00 2001
22
From: Omair Majid <omajid@redhat.com>
33
Date: Wed, 23 Oct 2019 15:43:57 -0400
4-
Subject: [PATCH 12/15] Support global.json on arm64 as well
4+
Subject: [PATCH] Support global.json on arm64 as well
55

66
arcade uses the runtime section of global.json to decide which
77
architecture + runtime combination needs to be installed.
@@ -19,12 +19,12 @@ This gets us a working SDK/Runtime combo on arm64.
1919
1 file changed, 1 insertion(+), 4 deletions(-)
2020

2121
diff --git a/global.json b/global.json
22-
index 1a5c06a73b..7ebd66e5c9 100644
22+
index 854ab2f3a5..bc379b038e 100644
2323
--- a/global.json
2424
+++ b/global.json
2525
@@ -5,10 +5,7 @@
2626
"tools": {
27-
"dotnet": "3.1.107",
27+
"dotnet": "3.1.109",
2828
"runtimes": {
2929
- "dotnet/x64": [
3030
- "$(MicrosoftNETCoreAppInternalPackageVersion)"
@@ -35,5 +35,5 @@ index 1a5c06a73b..7ebd66e5c9 100644
3535
]
3636
},
3737
--
38-
2.18.0
38+
2.25.2
3939

patches/coreclr/0005-Fix-bad-configure-tests.patch

Lines changed: 0 additions & 65 deletions
This file was deleted.

0 commit comments

Comments
 (0)