Skip to content

Commit c6c8138

Browse files
committed
Update patches.
1 parent 3ed1dbd commit c6c8138

File tree

3 files changed

+19
-19
lines changed

3 files changed

+19
-19
lines changed

patches/aspnet-extensions/0003-Build-MS.Internal.Ext.Refs-for-AspNetCore.patch

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
1-
From ab847aa914da4ce93ade3dbe7bbc0ba7d262fec3 Mon Sep 17 00:00:00 2001
1+
From f62d5a7191b77650a464fcce8fd21d74ae98f18c Mon Sep 17 00:00:00 2001
22
From: adaggarwal <[email protected]>
33
Date: Fri, 7 Feb 2020 20:55:51 +0000
4-
Subject: [PATCH 3/4] Build-MS.Internal.Ext.Refs-for-AspNetCore
4+
Subject: [PATCH 3/3] Build-MS.Internal.Ext.Refs-for-AspNetCore
55

66
---
77
.../ref/Microsoft.Internal.Extensions.Refs.csproj | 6 +++---
88
1 file changed, 3 insertions(+), 3 deletions(-)
99

1010
diff --git a/src/TargetingPack/Microsoft.Internal.Extensions.Refs/ref/Microsoft.Internal.Extensions.Refs.csproj b/src/TargetingPack/Microsoft.Internal.Extensions.Refs/ref/Microsoft.Internal.Extensions.Refs.csproj
11-
index c89ec063a..952d69edc 100644
11+
index c12cb4f4d..795121fa0 100644
1212
--- a/src/TargetingPack/Microsoft.Internal.Extensions.Refs/ref/Microsoft.Internal.Extensions.Refs.csproj
1313
+++ b/src/TargetingPack/Microsoft.Internal.Extensions.Refs/ref/Microsoft.Internal.Extensions.Refs.csproj
1414
@@ -4,11 +4,11 @@
1515
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
1616

17-
<!-- Do not pack in servicing builds. -->
17+
<!-- Do not pack in servicing builds except in special circumstances e.g. 3.1.8. -->
1818
- <IsPackable>false</IsPackable>
1919
+ <IsPackable>true</IsPackable>
20-
<IsPackable Condition=" '$(PatchVersion)' == '0' ">true</IsPackable>
20+
<IsPackable Condition=" '$(PatchVersion)' == '0' OR '$(PatchVersion)' == '8' ">true</IsPackable>
2121
<IsShipping>false</IsShipping>
2222
<!-- This project is not included in the shared framework -->
2323
- <ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
2424
+ <ExcludeFromSourceBuild>false</ExcludeFromSourceBuild>
2525
<SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
2626

2727
<!-- Subject to change: see https://github.com/dotnet/designs/pull/50 -->
28-
@@ -49,7 +49,7 @@
28+
@@ -55,7 +55,7 @@
2929
</BuildDependsOn>
3030

3131
<!-- Suppresses building this project completely during servicing builds. -->
Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
1-
From b9a4b93b1f387486891e2fbd65f7789ac0844376 Mon Sep 17 00:00:00 2001
1+
From 084646ce6506bc7b68b0962aa6b29042f6895f71 Mon Sep 17 00:00:00 2001
22
From: dseefeld <[email protected]>
33
Date: Mon, 27 Jul 2020 19:29:54 +0000
4-
Subject: [PATCH] Fix version number
4+
Subject: [PATCH 07/15] Fix version number
55

66
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 216732 -> 216733 bytes
10+
.../Web.JS/dist/Release/blazor.server.js | Bin 222661 -> 222658 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 5a7cfd0de00e1c2694bf333a972ec50943bb2c06..da374eea71824751541d58313f8a6e1b7af7bde7 100644
14+
index 93953a2749b38d198df7d85b370d232789f6a592..3d2b39c93eecec27f94896db784a90f160d3acf2 100644
1515
GIT binary patch
16-
delta 23
17-
ecmbO;mv`=5-i8*&7N#xC)BM=Ym1<)(t+@bZFb7-!
16+
delta 27
17+
icmX?ln)lFY-i8*&7N#xC+f%uX^$hhalxkx&t+@c03kd@N
1818

19-
delta 22
20-
dcmbO`mv_!w-i8*&7N#xC)BM;>m1<)(tpQ%d2TuS1
19+
delta 30
20+
lcmX?fn)m2w-i8*&7N#xC+f(^W^$he3bW>8xlxkx&tpT@;3Sj^M
2121

2222
--
23-
1.8.3.1
23+
2.18.0
2424

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From be7380c4e0e6fd8924bfa1ea7a44443e36ad867f Mon Sep 17 00:00:00 2001
1+
From d4f88b027d6250591506f541c3763db30502fd01 Mon Sep 17 00:00:00 2001
22
From: Omair Majid <[email protected]>
33
Date: Wed, 23 Oct 2019 15:43:57 -0400
4-
Subject: [PATCH 12/16] Support global.json on arm64 as well
4+
Subject: [PATCH 12/15] 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 f0ea6add96..a1c7d128ef 100644
22+
index 1a5c06a73b..7ebd66e5c9 100644
2323
--- a/global.json
2424
+++ b/global.json
2525
@@ -5,10 +5,7 @@
2626
"tools": {
27-
"dotnet": "3.1.103",
27+
"dotnet": "3.1.107",
2828
"runtimes": {
2929
- "dotnet/x64": [
3030
- "$(MicrosoftNETCoreAppInternalPackageVersion)"

0 commit comments

Comments
 (0)