Merged PR 757: Update for 2.1.10 runtime/2.1.506 SDK April release.

dotnet · Mar 30, 2019 · 13e19e5 · 13e19e5
2 parents 3da9418 + a385d6f
commit 13e19e5
Show file tree

Hide file tree

Showing 12 changed files with 40 additions and 35 deletions.
diff --git a/ProdConFeed.txt b/ProdConFeed.txt
@@ -1 +1 @@
-https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/20190214-01/final/index.json
+https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/20190314-05/final/index.json
diff --git a/dependencies.props b/dependencies.props
@@ -22,8 +22,8 @@
     the product as version strings to be used by the SDK to fetch extra content.
   -->
   <PropertyGroup>
-    <MicrosoftAspNetCoreAllPackageVersion>2.1.9</MicrosoftAspNetCoreAllPackageVersion>
-    <MicrosoftAspNetCoreAppPackageVersion>2.1.9</MicrosoftAspNetCoreAppPackageVersion>
+    <MicrosoftAspNetCoreAllPackageVersion>2.1.10</MicrosoftAspNetCoreAllPackageVersion>
+    <MicrosoftAspNetCoreAppPackageVersion>2.1.10</MicrosoftAspNetCoreAppPackageVersion>
     <MicrosoftNETSdkRazorPackageVersion>2.2.0</MicrosoftNETSdkRazorPackageVersion>
   </PropertyGroup>
 

diff --git a/patches/cli/0001-Persist-ASP.NET-runtime-patch-targeting-default.patch b/patches/cli/0001-Persist-ASP.NET-runtime-patch-targeting-default.patch
@@ -1,4 +1,4 @@
-From d2609347aa91d0ef25388562ce4805748b4796cd Mon Sep 17 00:00:00 2001
+From 3f9e2fc33d74da5d0b72137879e6e7fefe08a9db Mon Sep 17 00:00:00 2001
 From: Davis Goodin <[email protected]>
 Date: Wed, 13 Jun 2018 09:46:43 -0500
 Subject: [PATCH] Persist ASP.NET runtime patch targeting default
@@ -7,17 +7,23 @@ Let the CLI build take a default value for TargetLatestAspNetCoreRuntimePatch in
 
 https://github.com/dotnet/cli/issues/9469 is required to remove this patch.
 ---
- build/MSBuildExtensions.targets | 8 ++++++++
- 1 file changed, 8 insertions(+)
+ build/MSBuildExtensions.targets | 14 +++++++++++---
+ 1 file changed, 11 insertions(+), 3 deletions(-)
 
 diff --git a/build/MSBuildExtensions.targets b/build/MSBuildExtensions.targets
-index 5ea081651..1ea4735ee 100644
+index 73b6f88a2..6fc609c30 100644
 --- a/build/MSBuildExtensions.targets
 +++ b/build/MSBuildExtensions.targets
-@@ -202,6 +202,14 @@ Copyright (c) .NET Foundation. All rights reserved.
-     <LatestPatchVersionForNetCore1_0 Condition="'%24(LatestPatchVersionForNetCore1_0)' == ''">$(LatestPatchVersionForNetCore1_0)</LatestPatchVersionForNetCore1_0>
-     <LatestPatchVersionForNetCore1_1 Condition="'%24(LatestPatchVersionForNetCore1_1)' == ''">$(LatestPatchVersionForNetCore1_1)</LatestPatchVersionForNetCore1_1>
-     <LatestPatchVersionForNetCore2_0 Condition="'%24(LatestPatchVersionForNetCore2_0)' == ''">$(LatestPatchVersionForNetCore2_0)</LatestPatchVersionForNetCore2_0>
+@@ -199,9 +199,17 @@ Copyright (c) .NET Foundation. All rights reserved.
+     <DefaultPatchVersionForAspNetCoreApp2_1>$(_DefaultPatchVersionForAspNetCoreApp2_1)</DefaultPatchVersionForAspNetCoreApp2_1>
+
+     <!-- Latest patch versions for each minor version of .NET Core -->
+-    <LatestPatchVersionForNetCore1_0 Condition="'%24(LatestPatchVersionForNetCore1_0)' == ''">$(MicrosoftNETCoreAppLatestVersion1_0)</LatestPatchVersionForNetCore1_0>
+-    <LatestPatchVersionForNetCore1_1 Condition="'%24(LatestPatchVersionForNetCore1_1)' == ''">$(MicrosoftNETCoreAppLatestVersion1_1)</LatestPatchVersionForNetCore1_1>
+-    <LatestPatchVersionForNetCore2_0 Condition="'%24(LatestPatchVersionForNetCore2_0)' == ''">$(MicrosoftNETCoreAppLatestVersion2_0)</LatestPatchVersionForNetCore2_0>
++    <LatestPatchVersionForNetCore1_0 Condition="'%24(LatestPatchVersionForNetCore1_0)' == ''">$(LatestPatchVersionForNetCore1_0)</LatestPatchVersionForNetCore1_0>
++    <LatestPatchVersionForNetCore1_1 Condition="'%24(LatestPatchVersionForNetCore1_1)' == ''">$(LatestPatchVersionForNetCore1_1)</LatestPatchVersionForNetCore1_1>
++    <LatestPatchVersionForNetCore2_0 Condition="'%24(LatestPatchVersionForNetCore2_0)' == ''">$(LatestPatchVersionForNetCore2_0)</LatestPatchVersionForNetCore2_0>
 +
 +    <!-- In source-build, override the default behavior to always target the latest ASP.NET Core runtime.
 +         Normally, a published application will use the latest patch version of the shared ASP.NET framework.

diff --git a/repos/core-setup.proj b/repos/core-setup.proj
@@ -21,7 +21,7 @@
     <BuildCommand>$(ProjectDirectory)/build$(ShellExtension) $(BuildArguments)</BuildCommand>
     <BuildCommand Condition="$(Platform.Contains('arm'))">$(ArmEnvironmentVariables) $(BuildCommand)</BuildCommand>
 
-    <OfficialBuildId>20190215-01</OfficialBuildId>
+    <OfficialBuildId>20190314-01</OfficialBuildId>
 
     <!-- Need to set $(PackagesOutput) so WriteVersions writes the versions file for cli, until cli respects auto-dependency flow -->
     <PackagesOutput>$(SourceBuiltPackagesPath)</PackagesOutput>

diff --git a/repos/coreclr.proj b/repos/coreclr.proj
@@ -18,7 +18,7 @@
     <BuildCommand Condition="$(Platform.Contains('arm'))">$(ArmEnvironmentVariables) $(BuildCommand)</BuildCommand>
 
     <CleanCommand>$(ProjectDirectory)/clean$(ShellExtension)</CleanCommand>
-    <OfficialBuildId>20190214-06</OfficialBuildId>
+    <OfficialBuildId>20190314-02</OfficialBuildId>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/repos/corefx.proj b/repos/corefx.proj
@@ -24,7 +24,7 @@
 
     <PackagesOutput>$(ProjectDirectory)/bin/packages/$(Configuration)</PackagesOutput>
     <CleanCommand>$(ProjectDirectory)/clean$(ShellExtension)</CleanCommand>
-    <OfficialBuildId>20190215-01</OfficialBuildId>
+    <OfficialBuildId>20190314-02</OfficialBuildId>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/cli b/src/cli
diff --git a/src/core-setup b/src/core-setup
diff --git a/src/coreclr b/src/coreclr
diff --git a/src/corefx b/src/corefx
diff --git a/tools-local/prebuilt-baseline-offline.xml b/tools-local/prebuilt-baseline-offline.xml
@@ -217,12 +217,12 @@
     <Usage Id="runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.2" Rid="fedora.24-x64" />
     <Usage Id="runtime.linux-x64.Microsoft.NETCore.App" Version="2.0.0" Rid="linux-x64" />
     <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="2.0.0" Rid="linux-x64" />
-    <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="2.1.8" Rid="linux-x64" />
-    <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHost" Version="2.1.8" Rid="linux-x64" />
+    <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="2.1.9" Rid="linux-x64" />
+    <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHost" Version="2.1.9" Rid="linux-x64" />
     <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.0.0" Rid="linux-x64" />
-    <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.1.8" Rid="linux-x64" />
+    <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.1.9" Rid="linux-x64" />
     <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.0.0" Rid="linux-x64" />
-    <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.1.8" Rid="linux-x64" />
+    <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.1.9" Rid="linux-x64" />
     <Usage Id="runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.1" />
     <Usage Id="runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.0" Rid="opensuse.13.2-x64" />
     <Usage Id="runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.1" Rid="opensuse.13.2-x64" />

diff --git a/tools-local/prebuilt-baseline-online.xml b/tools-local/prebuilt-baseline-online.xml
@@ -95,9 +95,9 @@
     <Usage Id="Microsoft.DotNet.PlatformAbstractions" Version="2.1.0-preview2-26306-03" />
     <Usage Id="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4-20181009-2100240" />
     <Usage Id="Microsoft.DotNet.VersionTools" Version="2.1.0-rc1-03130-05" IsDirectDependency="true" />
-    <Usage Id="Microsoft.DotNet.Web.ItemTemplates" Version="2.1.9" />
-    <Usage Id="Microsoft.DotNet.Web.ProjectTemplates.2.1" Version="2.1.9" />
-    <Usage Id="Microsoft.DotNet.Web.Spa.ProjectTemplates" Version="2.1.9" />
+    <Usage Id="Microsoft.DotNet.Web.ItemTemplates" Version="2.1.10" />
+    <Usage Id="Microsoft.DotNet.Web.ProjectTemplates.2.1" Version="2.1.10" />
+    <Usage Id="Microsoft.DotNet.Web.Spa.ProjectTemplates" Version="2.1.10" />
     <Usage Id="Microsoft.Extensions.CommandLineUtils" Version="1.1.0" IsDirectDependency="true" />
     <Usage Id="Microsoft.Extensions.CommandLineUtils.Sources" Version="2.2.0-rtm-35542" IsDirectDependency="true" />
     <Usage Id="Microsoft.Extensions.DependencyModel" Version="1.0.3" />
@@ -122,24 +122,24 @@
     <Usage Id="Microsoft.NETCore.DotNetAppHost" Version="2.0.0" />
     <Usage Id="Microsoft.NETCore.DotNetAppHost" Version="2.1.0-preview1-26116-04" />
     <Usage Id="Microsoft.NETCore.DotNetAppHost" Version="2.1.0" />
-    <Usage Id="Microsoft.NETCore.DotNetAppHost" Version="2.1.8" />
+    <Usage Id="Microsoft.NETCore.DotNetAppHost" Version="2.1.9" />
     <Usage Id="Microsoft.NETCore.DotNetHost" Version="1.0.1" />
     <Usage Id="Microsoft.NETCore.DotNetHost" Version="1.1.0" />
-    <Usage Id="Microsoft.NETCore.DotNetHost" Version="2.1.8" IsDirectDependency="true" />
+    <Usage Id="Microsoft.NETCore.DotNetHost" Version="2.1.9" IsDirectDependency="true" />
     <Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="1.0.3" />
     <Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="1.0.5" />
     <Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="1.1.0" />
     <Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="1.1.2" />
     <Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="2.0.0" />
     <Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="2.1.0-preview1-26116-04" />
     <Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="2.1.0" />
-    <Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="2.1.8" IsDirectDependency="true" />
+    <Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="2.1.9" IsDirectDependency="true" />
     <Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="1.0.1" />
     <Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="1.1.0" />
     <Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="2.0.0" />
     <Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="2.1.0-preview1-26116-04" />
     <Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="2.1.0" />
-    <Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="2.1.8" />
+    <Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="2.1.9" />
     <Usage Id="Microsoft.NETCore.ILAsm" Version="2.2.2-servicing-27317-07" IsDirectDependency="true" />
     <Usage Id="Microsoft.NETCore.ILDAsm" Version="2.2.2-servicing-27317-07" IsDirectDependency="true" />
     <Usage Id="Microsoft.NETCore.Jit" Version="1.0.5" />
@@ -154,7 +154,7 @@
     <Usage Id="Microsoft.NETCore.Platforms" Version="2.0.0" />
     <Usage Id="Microsoft.NETCore.Platforms" Version="2.1.0-preview1-26116-01" />
     <Usage Id="Microsoft.NETCore.Platforms" Version="2.1.0" />
-    <Usage Id="Microsoft.NETCore.Platforms" Version="2.1.2" IsDirectDependency="true" />
+    <Usage Id="Microsoft.NETCore.Platforms" Version="2.1.3" IsDirectDependency="true" />
     <Usage Id="Microsoft.NETCore.Runtime.CoreCLR" Version="1.0.5" />
     <Usage Id="Microsoft.NETCore.Runtime.CoreCLR" Version="1.0.7" />
     <Usage Id="Microsoft.NETCore.Runtime.CoreCLR" Version="1.1.1" />
@@ -191,7 +191,6 @@
     <Usage Id="NETStandard.Library" Version="1.6.1" IsDirectDependency="true" IsAutoReferenced="true" />
     <Usage Id="NETStandard.Library" Version="2.0.0" />
     <Usage Id="NETStandard.Library" Version="2.0.1" />
-    <Usage Id="NETStandard.Library" Version="2.0.3" IsDirectDependency="true" IsAutoReferenced="true" />
     <Usage Id="NETStandard.Library.NETFramework" Version="2.0.1-servicing-26011-01" IsDirectDependency="true" />
     <Usage Id="Newtonsoft.Json" Version="6.0.4" />
     <Usage Id="Newtonsoft.Json" Version="8.0.3" IsDirectDependency="true" />
@@ -274,12 +273,12 @@
     <Usage Id="runtime.linux-x64.Microsoft.NETCore.App" Version="2.0.0" Rid="linux-x64" />
     <Usage Id="runtime.linux-x64.Microsoft.NETCore.App" Version="2.1.8" Rid="linux-x64" />
     <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="2.0.0" Rid="linux-x64" />
-    <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="2.1.8" Rid="linux-x64" />
-    <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHost" Version="2.1.8" Rid="linux-x64" />
+    <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="2.1.9" Rid="linux-x64" />
+    <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHost" Version="2.1.9" Rid="linux-x64" />
     <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.0.0" Rid="linux-x64" />
-    <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.1.8" Rid="linux-x64" />
+    <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.1.9" Rid="linux-x64" />
     <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.0.0" Rid="linux-x64" />
-    <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.1.8" Rid="linux-x64" />
+    <Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.1.9" Rid="linux-x64" />
     <Usage Id="runtime.linux-x64.Microsoft.NETCore.ILAsm" Version="2.2.2-servicing-27317-07" Rid="linux-x64" />
     <Usage Id="runtime.linux-x64.Microsoft.NETCore.ILDAsm" Version="2.2.2-servicing-27317-07" Rid="linux-x64" />
     <Usage Id="runtime.linux-x64.Microsoft.NETCore.Jit" Version="2.2.2-servicing-27317-07" Rid="linux-x64" />
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/20190214-01/final/index.json
		https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/20190314-05/final/index.json
+2 −2		build/DependencyVersions.props
+6 −6		build/MSBuildExtensions.targets
+1 −1		build/Version.props
+1 −1		BranchInfo.props
+5 −5		dependencies.props
+2 −5		src/pkg/packaging/rpm/dotnet-sharedhost-rpm_config.json
+19 −7		src/pkg/packaging/rpm/package.targets
+0 −7		src/pkg/packaging/rpm/scripts/after_install_host.sh
+0 −10		src/pkg/packaging/rpm/scripts/after_remove_host.sh
+1 −1		ILAsmVersion.txt
+6 −6		dependencies.props
+3 −2		src/corefx/System.Globalization.Native/calendarData.cpp
+108 −5		src/jit/liveness.cpp
+60 −0		tests/src/JIT/Regression/JitBlue/GitHub_22820/GitHub_22820.cs
+33 −0		tests/src/JIT/Regression/JitBlue/GitHub_22820/GitHub_22820.csproj
+9 −9		dependencies.props
+1 −1		external/harvestPackages/harvestPackages.props
+2 −2		pkg/Microsoft.NETCore.Platforms/Microsoft.NETCore.Platforms.pkgproj
+117 −0		pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
+50 −0		pkg/Microsoft.NETCore.Platforms/runtime.json
+6 −0		pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
+7 −4		pkg/Microsoft.Private.PackageBaseline/packageIndex.json
+1 −0		src/Common/src/Interop/Unix/System.Net.Http.Native/Interop.Easy.cs
+20 −0		src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.OpenSsl.cs
+5 −1		src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.Ssl.cs
+23 −0		src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.X509StoreCtx.cs
+6 −2		src/Common/src/Interop/Windows/SChannel/Interop.SchProtocols.cs
+6 −1		src/Common/src/System/Net/SecurityProtocol.cs
+16 −4		src/Common/tests/System/Net/SslProtocolSupport.cs
+2 −0		src/CoreFx.Private.TestUtilities/ref/CoreFx.Private.TestUtilities.cs
+7 −4		src/CoreFx.Private.TestUtilities/src/System/PlatformDetection.Unix.cs
+23 −0		src/CoreFx.Private.TestUtilities/src/System/PlatformDetection.Windows.cs
+8 −1		src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_ssl.cpp
+1 −0		src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_ssl.h
+2 −1		src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_x509chain.cpp
+1 −0		src/Native/Unix/System.Security.Cryptography.Native/CMakeLists.txt
+10 −0		src/Native/Unix/System.Security.Cryptography.Native/apibridge.cpp
+2 −0		src/Native/Unix/System.Security.Cryptography.Native/apibridge.h
+22 −1		src/Native/Unix/System.Security.Cryptography.Native/openssl_1_0_structs.h
+33 −3		src/Native/Unix/System.Security.Cryptography.Native/opensslshim.h
+1 −1		src/Native/Unix/System.Security.Cryptography.Native/pal_asn1_print.cpp
+4 −1		src/Native/Unix/System.Security.Cryptography.Native/pal_ssl.cpp
+2 −1		src/Native/Unix/System.Security.Cryptography.Native/pal_ssl.h
+120 −0		src/Native/Unix/System.Security.Cryptography.Native/pal_x509.cpp
+9 −0		src/Native/Unix/System.Security.Cryptography.Native/pal_x509.h
+3 −3		src/System.Net.Http.WinHttpHandler/dir.props
+11 −0		src/System.Net.Http.WinHttpHandler/src/System/Net/Http/WinHttpHandler.cs
+7 −0		src/System.Net.Http/src/System/Net/Http/CurlHandler/CurlHandler.SslProvider.Linux.cs
+7 −0		src/System.Net.Http/src/System/Net/Http/CurlHandler/CurlHandler.SslProvider.OSX.cs
+2 −0		src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.AcceptAllCerts.cs
+19 −7		src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.SslProtocols.cs
+4 −0		src/System.Net.Http/tests/FunctionalTests/HttpClientTestBase.cs
+2 −0		src/System.Net.Security/src/System/Net/Security/SslConnectionInfo.Unix.cs
+8 −0		src/System.Net.Security/src/System/Net/Security/SslState.cs
+4 −1		src/System.Net.ServicePoint/src/System/Net/ServicePointManager.cs
+1 −0		src/System.Private.Uri/tests/FunctionalTests/IriTest.cs
+43 −0		...stem.Security.Cryptography.X509Certificates/src/Internal/Cryptography/Pal.Unix/OpenSslX509ChainProcessor.cs
+73 −0		src/System.Security.Cryptography.X509Certificates/tests/ChainTests.cs
+210 −0		src/System.Security.Cryptography.X509Certificates/tests/DynamicChainTests.cs
+3 −1		...tem.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.csproj
+137 −0		src/System.Security.Cryptography.X509Certificates/tests/TestDataGenerator.cs
+1 −1		src/packages.builds
+1 −1		tools-local/ILAsmVersion.txt