-
Notifications
You must be signed in to change notification settings - Fork 132
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1732 from dagood/3.1.108
- Loading branch information
Showing
5 changed files
with
77 additions
and
77 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
12 changes: 6 additions & 6 deletions
12
patches/aspnet-extensions/0003-Build-MS.Internal.Ext.Refs-for-AspNetCore.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,31 +1,31 @@ | ||
| From ab847aa914da4ce93ade3dbe7bbc0ba7d262fec3 Mon Sep 17 00:00:00 2001 | ||
| From f62d5a7191b77650a464fcce8fd21d74ae98f18c Mon Sep 17 00:00:00 2001 | ||
| From: adaggarwal <[email protected]> | ||
| Date: Fri, 7 Feb 2020 20:55:51 +0000 | ||
| Subject: [PATCH 3/4] Build-MS.Internal.Ext.Refs-for-AspNetCore | ||
| Subject: [PATCH 3/3] Build-MS.Internal.Ext.Refs-for-AspNetCore | ||
|
|
||
| --- | ||
| .../ref/Microsoft.Internal.Extensions.Refs.csproj | 6 +++--- | ||
| 1 file changed, 3 insertions(+), 3 deletions(-) | ||
|
|
||
| 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 | ||
| index c89ec063a..952d69edc 100644 | ||
| index c12cb4f4d..795121fa0 100644 | ||
| --- 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 | ||
| @@ -4,11 +4,11 @@ | ||
| <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework> | ||
|
|
||
| <!-- Do not pack in servicing builds. --> | ||
| <!-- Do not pack in servicing builds except in special circumstances e.g. 3.1.8. --> | ||
| - <IsPackable>false</IsPackable> | ||
| + <IsPackable>true</IsPackable> | ||
| <IsPackable Condition=" '$(PatchVersion)' == '0' ">true</IsPackable> | ||
| <IsPackable Condition=" '$(PatchVersion)' == '0' OR '$(PatchVersion)' == '8' ">true</IsPackable> | ||
| <IsShipping>false</IsShipping> | ||
| <!-- This project is not included in the shared framework --> | ||
| - <ExcludeFromSourceBuild>true</ExcludeFromSourceBuild> | ||
| + <ExcludeFromSourceBuild>false</ExcludeFromSourceBuild> | ||
| <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking> | ||
|
|
||
| <!-- Subject to change: see https://github.com/dotnet/designs/pull/50 --> | ||
| @@ -49,7 +49,7 @@ | ||
| @@ -55,7 +55,7 @@ | ||
| </BuildDependsOn> | ||
|
|
||
| <!-- Suppresses building this project completely during servicing builds. --> | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,24 +1,24 @@ | ||
| From b9a4b93b1f387486891e2fbd65f7789ac0844376 Mon Sep 17 00:00:00 2001 | ||
| From 084646ce6506bc7b68b0962aa6b29042f6895f71 Mon Sep 17 00:00:00 2001 | ||
| From: dseefeld <[email protected]> | ||
| Date: Mon, 27 Jul 2020 19:29:54 +0000 | ||
| Subject: [PATCH] Fix version number | ||
| Subject: [PATCH 07/15] Fix version number | ||
|
|
||
| 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 216732 -> 216733 bytes | ||
| .../Web.JS/dist/Release/blazor.server.js | Bin 222661 -> 222658 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 5a7cfd0de00e1c2694bf333a972ec50943bb2c06..da374eea71824751541d58313f8a6e1b7af7bde7 100644 | ||
| index 93953a2749b38d198df7d85b370d232789f6a592..3d2b39c93eecec27f94896db784a90f160d3acf2 100644 | ||
| GIT binary patch | ||
| delta 23 | ||
| ecmbO;mv`=5-i8*&7N#xC)BM=Ym1<)(t+@bZFb7-! | ||
| delta 27 | ||
| icmX?ln)lFY-i8*&7N#xC+f%uX^$hhalxkx&t+@c03kd@N | ||
|
|
||
| delta 22 | ||
| dcmbO`mv_!w-i8*&7N#xC)BM;>m1<)(tpQ%d2TuS1 | ||
| delta 30 | ||
| lcmX?fn)m2w-i8*&7N#xC+f(^W^$he3bW>8xlxkx&tpT@;3Sj^M | ||
|
|
||
| -- | ||
| 1.8.3.1 | ||
| 2.18.0 | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| From be7380c4e0e6fd8924bfa1ea7a44443e36ad867f Mon Sep 17 00:00:00 2001 | ||
| From d4f88b027d6250591506f541c3763db30502fd01 Mon Sep 17 00:00:00 2001 | ||
| From: Omair Majid <[email protected]> | ||
| Date: Wed, 23 Oct 2019 15:43:57 -0400 | ||
| Subject: [PATCH 12/16] Support global.json on arm64 as well | ||
| Subject: [PATCH 12/15] Support global.json on arm64 as well | ||
|
|
||
| arcade uses the runtime section of global.json to decide which | ||
| architecture + runtime combination needs to be installed. | ||
|
|
@@ -19,12 +19,12 @@ This gets us a working SDK/Runtime combo on arm64. | |
| 1 file changed, 1 insertion(+), 4 deletions(-) | ||
|
|
||
| diff --git a/global.json b/global.json | ||
| index f0ea6add96..a1c7d128ef 100644 | ||
| index 1a5c06a73b..7ebd66e5c9 100644 | ||
| --- a/global.json | ||
| +++ b/global.json | ||
| @@ -5,10 +5,7 @@ | ||
| "tools": { | ||
| "dotnet": "3.1.103", | ||
| "dotnet": "3.1.107", | ||
| "runtimes": { | ||
| - "dotnet/x64": [ | ||
| - "$(MicrosoftNETCoreAppInternalPackageVersion)" | ||
|
|
||
Oops, something went wrong.