Skip to content

Commit 05a0c8f

Browse files
dagooddagood
authored
Merge pull request #1732 from dagood/3.1.108
2 parents cf4ce12 + 27b48f5 commit 05a0c8f

File tree

5 files changed

+77
-77
lines changed

5 files changed

+77
-77
lines changed

‎eng/Version.Details.xml‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
<Uri>https://github.com/dotnet/arcade</Uri>
66
<Sha>15f00efd583eab4372b2e9ca25bd80ace5b119ad</Sha>
77
</Dependency>
8-
<Dependency Name="Private.SourceBuild.ReferencePackages" Version="1.0.0-beta.20374.1">
8+
<Dependency Name="Private.SourceBuild.ReferencePackages" Version="5.0.0-preview.7.20420.1">
99
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
10-
<Sha>a5e56cf0c92548d81ee8e3a680e6229807c93580</Sha>
10+
<Sha>e25d677d8963a6fb3156adf21d4c3a80738aecf4</Sha>
1111
</Dependency>
1212
</ToolsetDependencies>
1313
<ProductDependencies>
@@ -27,36 +27,36 @@
2727
<Sha>1127689f262d52ea8ff68ef03d706fa62b3b40a1</Sha>
2828
<RepoName>linker</RepoName>
2929
</Dependency>
30-
<Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.1.4-servicing.20366.2" CoherentParentDependency="Microsoft.Private.CoreFx.NETCoreApp">
30+
<Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.1.8-servicing.20411.5" CoherentParentDependency="Microsoft.Private.CoreFx.NETCoreApp">
3131
<Uri>https://github.com/dotnet/coreclr</Uri>
32-
<Sha>e8b17841cb5ce923aec48a1b0c12042d445d508f</Sha>
32+
<Sha>f897710bc4efe6a046068fde0acf641667a8fff5</Sha>
3333
<RepoName>coreclr</RepoName>
3434
<RepoName>coreclr-portable</RepoName>
3535
</Dependency>
3636
<Dependency Name="NETStandard.Library" Version="2.1.0" CoherentParentDependency="Microsoft.NETCore.App.Runtime.linux-x64">
3737
<Uri>https://github.com/dotnet/standard</Uri>
3838
<Sha>a5b5f2e1e369972c8ff1e2183979fab6099f52ef</Sha>
3939
</Dependency>
40-
<Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.7.0-servicing.20370.1" CoherentParentDependency="Microsoft.NETCore.App.Runtime.linux-x64">
40+
<Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.7.0-servicing.20419.3" CoherentParentDependency="Microsoft.NETCore.App.Runtime.linux-x64">
4141
<Uri>https://github.com/dotnet/corefx</Uri>
42-
<Sha>36b8b8e26a8e2e06e000f59e19910d117bf0025b</Sha>
42+
<Sha>d6302a72f8eafa326d7572a02acf8f3021ebb9e8</Sha>
4343
<RepoName>corefx</RepoName>
4444
<RepoName>corefx-portable</RepoName>
4545
</Dependency>
46-
<Dependency Name="Microsoft.NETCore.App.Runtime.linux-x64" Version="3.1.7" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
46+
<Dependency Name="Microsoft.NETCore.App.Runtime.linux-x64" Version="3.1.8" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
4747
<Uri>https://github.com/dotnet/core-setup</Uri>
48-
<Sha>fcfdef8d6ba770e4d7ba9efefe2591d8c33a1fc6</Sha>
48+
<Sha>9c1330deddc14e8c564e30402d6a644c43110778</Sha>
4949
<RepoName>core-setup</RepoName>
5050
<RepoName>core-setup-portable</RepoName>
5151
</Dependency>
52-
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="3.1.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.linux-x64">
52+
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="3.1.8" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.linux-x64">
5353
<Uri>https://github.com/dotnet/aspnetcore-tooling</Uri>
54-
<Sha>1c22292bc7fca352074d8862cf39fbdb8647f208</Sha>
54+
<Sha>02423c0c6c445b12abea9fee03ebdb2e18b4a2dd</Sha>
5555
<RepoName>aspnetcore-tooling</RepoName>
5656
</Dependency>
57-
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="3.1.7" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
57+
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="3.1.8" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
5858
<Uri>https://github.com/dotnet/templating</Uri>
59-
<Sha>2cb6ddf076dd8bcfb4e480f357b770889e5fd55e</Sha>
59+
<Sha>10dad0fa67c3cd3db542c29d591de026ed45147b</Sha>
6060
<RepoName>templating</RepoName>
6161
</Dependency>
6262
<Dependency Name="Microsoft.NETCore.Compilers" Version="3.4.1-beta4-20127-10" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
@@ -72,14 +72,14 @@
7272
<Sha>6f8eb3a2e1db6b458451b9cfd2a4f5557769b041</Sha>
7373
<RepoName>nuget-client</RepoName>
7474
</Dependency>
75-
<Dependency Name="Microsoft.Extensions.Logging" Version="3.1.7" CoherentParentDependency="Microsoft.AspNetCore.Mvc.Razor.Extensions">
75+
<Dependency Name="Microsoft.Extensions.Logging" Version="3.1.8" CoherentParentDependency="Microsoft.AspNetCore.Mvc.Razor.Extensions">
7676
<Uri>https://github.com/dotnet/extensions</Uri>
77-
<Sha>784b0ffaa40779255758ebbb146334da489a4bde</Sha>
77+
<Sha>1774c15ac24c65513fa9fc1f4fbb69be9a2a4e25</Sha>
7878
<RepoName>aspnet-extensions</RepoName>
7979
</Dependency>
80-
<Dependency Name="Microsoft.NET.Sdk" Version="3.1.107-servicing.20372.6" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
80+
<Dependency Name="Microsoft.NET.Sdk" Version="3.1.108-servicing.20413.3" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
8181
<Uri>https://github.com/dotnet/sdk</Uri>
82-
<Sha>8eec7c319054da5800541f77fa6d1acb2a74c395</Sha>
82+
<Sha>82e2b68c9ef7f28307114c4ab4d43c11e6f7cd52</Sha>
8383
<RepoName>sdk</RepoName>
8484
</Dependency>
8585
<Dependency Name="Microsoft.DotNet.Cli.CommandLine" Version="1.0.0-preview.19208.1" CoherentParentDependency="Microsoft.DotNet.Cli.Runtime">
@@ -96,37 +96,37 @@
9696
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
9797
<Sha>173ee3bd61c9549557eefa3cfb718bdef157cb87</Sha>
9898
</Dependency>
99-
<Dependency Name="Microsoft.AspNetCore.App.Runtime.linux-x64" Version="3.1.7" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
99+
<Dependency Name="Microsoft.AspNetCore.App.Runtime.linux-x64" Version="3.1.8" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
100100
<Uri>https://github.com/dotnet/aspnetcore</Uri>
101-
<Sha>1bf292d47ac2a0ebda07d8a3f00355dd01915ad5</Sha>
101+
<Sha>c75b3f7a2fb9fe21fd96c93c070fdfa88a2fbe97</Sha>
102102
<RepoName>aspnetcore</RepoName>
103103
</Dependency>
104-
<Dependency Name="Microsoft.DotNet.Cli.Runtime" Version="3.1.107-servicing.20372.17" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
104+
<Dependency Name="Microsoft.DotNet.Cli.Runtime" Version="3.1.108-servicing.20422.1" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
105105
<Uri>https://github.com/dotnet/cli</Uri>
106-
<Sha>bc693790b4064409950fe3306547063ec8107c26</Sha>
106+
<Sha>781686b7534a8203e3944c2b111df5a279d9c43e</Sha>
107107
<RepoName>cli</RepoName>
108108
</Dependency>
109109
<Dependency Name="Microsoft.FSharp.Compiler" Version="10.7.0-beta.19610.6" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
110110
<Uri>https://github.com/dotnet/fsharp</Uri>
111111
<Sha>dc86ab5d2c46e9a7c49290e7e2270ab1eeb0c61e</Sha>
112112
</Dependency>
113-
<Dependency Name="Microsoft.NET.Sdk.Web" Version="3.1.107-servicing.20372.9" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
113+
<Dependency Name="Microsoft.NET.Sdk.Web" Version="3.1.108-servicing.20421.3" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
114114
<Uri>https://github.com/dotnet/websdk</Uri>
115-
<Sha>c08ab58519b7a51658011e550868f4b028600918</Sha>
115+
<Sha>3478a1379fe3765b28eb3f7cb889fb45233fb09c</Sha>
116116
<RepoName>websdk</RepoName>
117117
</Dependency>
118118
<Dependency Name="Microsoft.NET.Test.Sdk" Version="16.3.0" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
119119
<Uri>https://github.com/microsoft/vstest</Uri>
120120
<Sha>55e7e45431c9c05656c999b902686e7402664573</Sha>
121121
</Dependency>
122-
<Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.107-servicing.20373.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
122+
<Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.108-servicing.20422.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
123123
<Uri>https://github.com/dotnet/toolset</Uri>
124-
<Sha>7430c1266dce6ec378d3939ede2b925a1c509686</Sha>
124+
<Sha>d04a69c978e9099d743ce68c667fafe9a1a7d59e</Sha>
125125
<RepoName>toolset</RepoName>
126126
</Dependency>
127-
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="1.0.0-preview.20373.14">
127+
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="1.0.0-preview.20422.8">
128128
<Uri>https://github.com/dotnet/installer</Uri>
129-
<Sha>617a3e03f4f24184a7ce83e08805ac84d0103127</Sha>
129+
<Sha>c423b556b530ff8a168386d63821acb6dfc6ee5d</Sha>
130130
<RepoName>core-sdk</RepoName>
131131
</Dependency>
132132
<!-- external dependencies, not handled by Maestro/Arcade -->

‎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. -->

‎patches/aspnetcore/0007-Fix-version-number.patch‎

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)