Skip to content

Commit 6686cd7

Browse files
crummelcrummel
authored
Update to June 2020 3.1.105 release. (#1616)
* Update to June 2020 3.1.105 release. * Address code review feedback
1 parent 8437ea1 commit 6686cd7

16 files changed

+68
-316
lines changed

‎eng/Version.Details.xml

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -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.20202.1" CoherentParentDependency="Microsoft.Private.CoreFx.NETCoreApp">
30+
<Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.1.4-servicing.20269.1" CoherentParentDependency="Microsoft.Private.CoreFx.NETCoreApp">
3131
<Uri>https://github.com/dotnet/coreclr</Uri>
32-
<Sha>05e3582c126663120b82a2eec8fd12dcb6929064</Sha>
32+
<Sha>018cfd06dceb19b6eb1e9217a500fb1071946fcd</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.20221.1" CoherentParentDependency="Microsoft.NETCore.App.Runtime.linux-x64">
40+
<Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.7.0-servicing.20270.1" CoherentParentDependency="Microsoft.NETCore.App.Runtime.linux-x64">
4141
<Uri>https://github.com/dotnet/corefx</Uri>
42-
<Sha>059a4a19e602494bfbed473dbbb18f2dbfbd0878</Sha>
42+
<Sha>620cea9ccf0359993e803c900059932966399584</Sha>
4343
<RepoName>corefx</RepoName>
4444
<RepoName>corefx-portable</RepoName>
4545
</Dependency>
46-
<Dependency Name="Microsoft.NETCore.App.Runtime.linux-x64" Version="3.1.4-servicing.20221.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
46+
<Dependency Name="Microsoft.NETCore.App.Runtime.linux-x64" Version="3.1.5-servicing.20270.5" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
4747
<Uri>https://github.com/dotnet/core-setup</Uri>
48-
<Sha>0c2e69caa609d5164e16df91d6d646eb9ed74640</Sha>
48+
<Sha>65cd7897774a464b5991c1962f7a0d476bb63101</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.4" CoherentParentDependency="Microsoft.AspNetCore.App.Ref">
52+
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="3.1.5" CoherentParentDependency="Microsoft.AspNetCore.App.Ref">
5353
<Uri>https://github.com/dotnet/aspnetcore-tooling</Uri>
54-
<Sha>a8242d79df31dbff528c185dd62c290b7cc262de</Sha>
54+
<Sha>0e01666509ce785750e66cb5e2d2da219867c4fb</Sha>
5555
<RepoName>aspnetcore-tooling</RepoName>
5656
</Dependency>
57-
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="3.1.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
57+
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="3.1.5" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
5858
<Uri>https://github.com/dotnet/templating</Uri>
59-
<Sha>d503e3a0aeafd9cd580d44495aafc116b5f71588</Sha>
59+
<Sha>fefccd4c1edee4f9e3cfe4377e00592fb5fe172b</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.4" CoherentParentDependency="Microsoft.AspNetCore.Mvc.Razor.Extensions">
75+
<Dependency Name="Microsoft.Extensions.Logging" Version="3.1.5" CoherentParentDependency="Microsoft.AspNetCore.Mvc.Razor.Extensions">
7676
<Uri>https://github.com/dotnet/extensions</Uri>
77-
<Sha>3b1f2b7cd3f3a3de66e94c73435e7c6deac775bb</Sha>
77+
<Sha>877455ff72cbb5834c52c12ce962f1417f5477c8</Sha>
7878
<RepoName>aspnet-extensions</RepoName>
7979
</Dependency>
80-
<Dependency Name="Microsoft.NET.Sdk" Version="3.1.104-servicing.20223.11" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
80+
<Dependency Name="Microsoft.NET.Sdk" Version="3.1.105-servicing.20270.18" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
8181
<Uri>https://github.com/dotnet/sdk</Uri>
82-
<Sha>99d7f3290a766fe288678650bd1f2af760b44212</Sha>
82+
<Sha>46e19481c7a7c4ebff15828344d30f3568a23bb1</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.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
99+
<Dependency Name="Microsoft.AspNetCore.App.Runtime.linux-x64" Version="3.1.5" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
100100
<Uri>https://github.com/dotnet/aspnetcore</Uri>
101-
<Sha>35628a67800a3e269eb375989d2fffa9d67b8dbf</Sha>
101+
<Sha>844a82e37cae48af2ab2ee4f39b41283e6bb4f0e</Sha>
102102
<RepoName>aspnetcore</RepoName>
103103
</Dependency>
104-
<Dependency Name="Microsoft.DotNet.Cli.Runtime" Version="3.1.104-servicing.20223.4" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
104+
<Dependency Name="Microsoft.DotNet.Cli.Runtime" Version="3.1.105-servicing.20271.8" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
105105
<Uri>https://github.com/dotnet/cli</Uri>
106-
<Sha>1afb98ab831b1a5c52675a2391365f999aeb9859</Sha>
106+
<Sha>a5c7ba66c6d060e46af1e0b01612eda8b9556411</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.104-servicing.20222.9" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
113+
<Dependency Name="Microsoft.NET.Sdk.Web" Version="3.1.105-servicing.20271.9" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
114114
<Uri>https://github.com/dotnet/websdk</Uri>
115-
<Sha>8d1ef114fbf7afc33420ae2121984c04dbb04e56</Sha>
115+
<Sha>32a1fb862cfb9966f1cc982234046d11d9be62fa</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.104-servicing.20223.10" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
122+
<Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.105-servicing.20271.18" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
123123
<Uri>https://github.com/dotnet/toolset</Uri>
124-
<Sha>91f740fe926973a5ffefbddbfb9db61a737022dd</Sha>
124+
<Sha>cc5157e04db69f06bcbbf50bc0093d92ee6eceaf</Sha>
125125
<RepoName>toolset</RepoName>
126126
</Dependency>
127-
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="1.0.0-preview.20224.3">
127+
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="1.0.0-preview.20276.7">
128128
<Uri>https://github.com/dotnet/installer</Uri>
129-
<Sha>0cf4df563ae73624abaa57158d99fb522d4536a1</Sha>
129+
<Sha>99c9707ea83d05c20b31be39cfd373fd0929ed3e</Sha>
130130
<RepoName>core-sdk</RepoName>
131131
</Dependency>
132132
<!-- external dependencies, not handled by Maestro/Arcade -->

‎patches/aspnet-extensions/0004-remove-unneeded-feeds.patch

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

‎patches/aspnetcore-tooling/0005-remove-unneeded-feeds.patch

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

‎patches/aspnetcore/0002-Use-non-portable-NETCoreAppRuntime-for-crossgen.patch

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 9a7a6d1a47367d7aef96cf7cc2f8a29b81b22ae4 Mon Sep 17 00:00:00 2001
1+
From 423375a1b0bcbb45312e0fd26cf1e69650a75ce5 Mon Sep 17 00:00:00 2001
22
From: dseefeld <dseefeld@microsoft.com>
33
Date: Tue, 29 Oct 2019 18:19:03 +0000
44
Subject: [PATCH 02/16] Use non-portable NETCoreAppRuntime for crossgen
@@ -9,10 +9,10 @@ Subject: [PATCH 02/16] Use non-portable NETCoreAppRuntime for crossgen
99
2 files changed, 5 insertions(+), 2 deletions(-)
1010

1111
diff --git a/eng/Dependencies.props b/eng/Dependencies.props
12-
index 8e7bb0ecd5..fca75d926c 100644
12+
index 73ffdde39f..9d0ba32204 100644
1313
--- a/eng/Dependencies.props
1414
+++ b/eng/Dependencies.props
15-
@@ -113,6 +113,7 @@ and are generated based on the last package release.
15+
@@ -114,6 +114,7 @@ and are generated based on the last package release.
1616
<LatestPackageReference Include="microsoft.netcore.app.runtime.linux-arm64" Version="$(MicrosoftNETCoreAppRuntimeVersion)" />
1717
<LatestPackageReference Include="microsoft.netcore.app.runtime.linux-musl-x64" Version="$(MicrosoftNETCoreAppRuntimeVersion)" />
1818
<LatestPackageReference Include="microsoft.netcore.app.runtime.linux-musl-arm64" Version="$(MicrosoftNETCoreAppRuntimeVersion)" />
@@ -21,11 +21,11 @@ index 8e7bb0ecd5..fca75d926c 100644
2121

2222
<ItemGroup Label=".NET team dependencies (Non-source-build)" Condition="'$(DotNetBuildFromSource)' != 'true'">
2323
diff --git a/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj b/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj
24-
index d6a90fc286..2f4d5d7886 100644
24+
index 3451584734..75b8e5515e 100644
2525
--- a/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj
2626
+++ b/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj
27-
@@ -107,7 +107,9 @@ This package is an internal implementation of the .NET Core SDK and is not meant
28-
<CrossgenToolPackagePath Condition=" '$(TargetRuntimeIdentifier)' == 'linux-arm64' OR '$(TargetRuntimeIdentifier)' == 'linux-musl-arm64' ">x64_arm64\$(CrossgenToolPackagePath)</CrossgenToolPackagePath>
27+
@@ -108,7 +108,9 @@ This package is an internal implementation of the .NET Core SDK and is not meant
28+
<CrossgenToolPackagePath Condition=" '$(TargetRuntimeIdentifier)' == 'win-arm64' OR '$(TargetRuntimeIdentifier)' == 'linux-arm64' OR '$(TargetRuntimeIdentifier)' == 'linux-musl-arm64' ">x64_arm64\$(CrossgenToolPackagePath)</CrossgenToolPackagePath>
2929
<CrossgenToolPackagePath Condition=" '$(TargetRuntimeIdentifier)' == 'win-arm' ">x86_arm\$(CrossgenToolPackagePath)</CrossgenToolPackagePath>
3030

3131
- <RuntimePackageRoot>$([System.IO.Path]::Combine('$(NuGetPackageRoot)', 'microsoft.netcore.app.runtime.$(RuntimeIdentifier)', '$(MicrosoftNETCoreAppRuntimeVersion)'))</RuntimePackageRoot>
@@ -35,7 +35,7 @@ index d6a90fc286..2f4d5d7886 100644
3535
<RuntimePackageRoot>$([MSBuild]::EnsureTrailingSlash('$(RuntimePackageRoot)'))</RuntimePackageRoot>
3636
<CrossgenToolPath>$([System.IO.Path]::Combine('$(RuntimePackageRoot)', 'tools', '$(CrossgenToolPackagePath)'))</CrossgenToolPath>
3737
<AssetTargetFallback>$(AssetTargetFallback);native,Version=0.0</AssetTargetFallback>
38-
@@ -122,7 +124,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant
38+
@@ -123,7 +125,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant
3939
<IncludeAssets>Runtime;Native</IncludeAssets>
4040
</Reference>
4141

@@ -45,5 +45,5 @@ index d6a90fc286..2f4d5d7886 100644
4545
<ProjectReference Condition="'$(BuildIisNativeProjects)' == 'true' AND '$(BuildNative)' != 'false' AND '$(VCTargetsPath)' != ''" Include="$(RepoRoot)src\Servers\IIS\AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj">
4646
<SetPlatform>Platform=$(TargetArchitecture)</SetPlatform>
4747
--
48-
2.18.0
48+
2.21.0
4949

‎patches/aspnetcore/0011-Add-FreeBSD.patch

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 6697f0df246ce3d126a8a4cd505d23db7c0d008c Mon Sep 17 00:00:00 2001
1+
From ddd04cae937e4f8595cf0f93b691a49c896037d6 Mon Sep 17 00:00:00 2001
22
From: Tomas Weinfurt <tweinfurt@yahoo.com>
33
Date: Wed, 13 Nov 2019 22:32:02 -0800
44
Subject: [PATCH 11/16] Add FreeBSD
@@ -8,7 +8,7 @@ Subject: [PATCH 11/16] Add FreeBSD
88
1 file changed, 2 insertions(+)
99

1010
diff --git a/Directory.Build.props b/Directory.Build.props
11-
index 493ea07e99..c02d9fd5cd 100644
11+
index d7691d9b8d..4000049e52 100644
1212
--- a/Directory.Build.props
1313
+++ b/Directory.Build.props
1414
@@ -108,6 +108,7 @@
@@ -19,14 +19,14 @@ index 493ea07e99..c02d9fd5cd 100644
1919
<TargetOsName Condition=" '$(TargetOsName)' == '' AND $([MSBuild]::IsOSPlatform('Linux'))">linux</TargetOsName>
2020
<TargetArchitecture Condition="'$(TargetArchitecture)' == ''">x64</TargetArchitecture>
2121
<TargetRuntimeIdentifier>$(TargetOsName)-$(TargetArchitecture)</TargetRuntimeIdentifier>
22-
@@ -118,6 +119,7 @@
23-
win-x86;
22+
@@ -119,6 +120,7 @@
2423
win-arm;
24+
win-arm64;
2525
osx-x64;
2626
+ freebsd-x64;
2727
linux-musl-x64;
2828
linux-musl-arm64;
2929
linux-x64;
3030
--
31-
2.18.0
31+
2.21.0
3232

‎patches/aspnetcore/0013-Support-building-for-arm64-on-arm64-nix.patch

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 0397d5feee81bd680d08031b5b78d368b6974532 Mon Sep 17 00:00:00 2001
1+
From b5e4f7ee1af325f8cabb3bbba6cf442e793d5108 Mon Sep 17 00:00:00 2001
22
From: Omair Majid <omajid@redhat.com>
33
Date: Mon, 11 Nov 2019 13:37:40 -0500
44
Subject: [PATCH 13/16] Support building for arm64 on arm64 (*nix)
@@ -36,7 +36,7 @@ work on arm64.
3636
2 files changed, 9 insertions(+), 4 deletions(-)
3737

3838
diff --git a/Directory.Build.props b/Directory.Build.props
39-
index c02d9fd5cd..3596f3e768 100644
39+
index 4000049e52..1f94f9c854 100644
4040
--- a/Directory.Build.props
4141
+++ b/Directory.Build.props
4242
@@ -110,6 +110,7 @@
@@ -48,10 +48,10 @@ index c02d9fd5cd..3596f3e768 100644
4848
<TargetRuntimeIdentifier>$(TargetOsName)-$(TargetArchitecture)</TargetRuntimeIdentifier>
4949

5050
diff --git a/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj b/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj
51-
index 2f4d5d7886..d17536b86d 100644
51+
index 75b8e5515e..b0a999453d 100644
5252
--- a/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj
5353
+++ b/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj
54-
@@ -97,15 +97,17 @@ This package is an internal implementation of the .NET Core SDK and is not meant
54+
@@ -98,15 +98,17 @@ This package is an internal implementation of the .NET Core SDK and is not meant
5555
<PathSeparator Condition="'$(PathSeparator)' == ''">:</PathSeparator>
5656
<PathSeparator Condition=" '$(TargetOsName)' == 'win' ">%3B</PathSeparator>
5757

@@ -66,13 +66,13 @@ index 2f4d5d7886..d17536b86d 100644
6666
<CrossgenToolPackagePath>$(CrossgenToolFileName)</CrossgenToolPackagePath>
6767
<!-- Disambiguated RID-specific crossgen executable relative path -->
6868
- <CrossgenToolPackagePath Condition=" '$(TargetRuntimeIdentifier)' == 'linux-arm' ">x64_arm\$(CrossgenToolPackagePath)</CrossgenToolPackagePath>
69-
- <CrossgenToolPackagePath Condition=" '$(TargetRuntimeIdentifier)' == 'linux-arm64' OR '$(TargetRuntimeIdentifier)' == 'linux-musl-arm64' ">x64_arm64\$(CrossgenToolPackagePath)</CrossgenToolPackagePath>
69+
- <CrossgenToolPackagePath Condition=" '$(TargetRuntimeIdentifier)' == 'win-arm64' OR '$(TargetRuntimeIdentifier)' == 'linux-arm64' OR '$(TargetRuntimeIdentifier)' == 'linux-musl-arm64' ">x64_arm64\$(CrossgenToolPackagePath)</CrossgenToolPackagePath>
7070
- <CrossgenToolPackagePath Condition=" '$(TargetRuntimeIdentifier)' == 'win-arm' ">x86_arm\$(CrossgenToolPackagePath)</CrossgenToolPackagePath>
7171
+ <CrossgenToolPackagePath Condition=" '$(CrossCompileDirectory)' != '' ">$(CrossCompileDirectory)\$(CrossgenToolPackagePath)</CrossgenToolPackagePath>
7272

7373
<MicrosoftNETCoreAppRuntimeIdentifier>$(RuntimeIdentifier)</MicrosoftNETCoreAppRuntimeIdentifier>
7474
<MicrosoftNETCoreAppRuntimeIdentifier Condition="'$(TargetOsName)' != 'osx'">$(SourceBuildRuntimeIdentifier)</MicrosoftNETCoreAppRuntimeIdentifier>
75-
@@ -303,7 +305,9 @@ This package is an internal implementation of the .NET Core SDK and is not meant
75+
@@ -309,7 +311,9 @@ This package is an internal implementation of the .NET Core SDK and is not meant
7676
<PropertyGroup>
7777
<CrossgenToolDir>$(IntermediateOutputPath)crossgen\</CrossgenToolDir>
7878
<CrossgenPlatformAssembliesDir>$(IntermediateOutputPath)platformAssemblies\</CrossgenPlatformAssembliesDir>
@@ -84,5 +84,5 @@ index 2f4d5d7886..d17536b86d 100644
8484

8585
<ItemGroup>
8686
--
87-
2.18.0
87+
2.21.0
8888

0 commit comments

Comments
 (0)