Merge pull request #2045 from dseefeld/3.1.112

Update to 3.1.112
dotnet · Feb 12, 2021 · 899abf9 · 899abf9
2 parents a5805a9 + f12f834
commit 899abf9
Show file tree

Hide file tree

Showing 12 changed files with 112 additions and 60 deletions.
diff --git a/NuGet.config b/NuGet.config
@@ -5,5 +5,5 @@
     <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public%40Local/nuget/v3/index.json" />
     <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
   </packageSources>
-  <disabledPackageSources />
+  <disabledPackageSources/>
 </configuration>
diff --git a/build.sh b/build.sh
@@ -118,12 +118,12 @@ if [ "${internalPackageFeedPat:-}" ]; then
   # TODO: Read these from nuget.config
   # The internal transport isn't added by Darc, though, so it will still need special-casing.
   export VSS_NUGET_EXTERNAL_FEED_ENDPOINTS='{"endpointCredentials": [
-    {"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-templating-7ab67ec7/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
-    {"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-corefx-59d2f36e/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
-    {"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-f5eceb81/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
-    {"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-tooling-cd25a65e/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
-    {"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-extensions-77d62c57/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
-    {"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-9699b939/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
+    {"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-331b52b3/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
+    {"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-tooling-7f783df7/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
+    {"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-0267ad09/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
+    {"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-extensions-4210e7d1/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
+    {"endpoint":"https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-corefx-43e382ec/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
+    {"endpoint":"https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-9b154f56/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
     {"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"}
   ]}'
 fi

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -27,36 +27,36 @@
       <Sha>1127689f262d52ea8ff68ef03d706fa62b3b40a1</Sha>
       <RepoName>linker</RepoName>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.1.11-servicing.20566.2" CoherentParentDependency="Microsoft.Private.CoreFx.NETCoreApp">
+    <Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.1.12-servicing.21065.4" CoherentParentDependency="Microsoft.Private.CoreFx.NETCoreApp">
       <Uri>https://github.com/dotnet/coreclr</Uri>
-      <Sha>9fb9458bed5f812b88a69a02f795b738a5a8f167</Sha>
+      <Sha>fa682a7bd0a7a1eb5f80904c10b88301eb33150c</Sha>
       <RepoName>coreclr</RepoName>
       <RepoName>coreclr-portable</RepoName>
     </Dependency>
     <Dependency Name="NETStandard.Library" Version="2.1.0" CoherentParentDependency="Microsoft.NETCore.App.Runtime.linux-x64">
       <Uri>https://github.com/dotnet/standard</Uri>
       <Sha>a5b5f2e1e369972c8ff1e2183979fab6099f52ef</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.7.0-servicing.20566.4" CoherentParentDependency="Microsoft.NETCore.App.Runtime.linux-x64">
+    <Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.7.0-servicing.21069.5" CoherentParentDependency="Microsoft.NETCore.App.Runtime.linux-x64">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>59d2f36ec02c494eec50940c7993257a807f9531</Sha>
+      <Sha>50a99d5d3c6e68aecf70627897c0d862a92fc283</Sha>
       <RepoName>corefx</RepoName>
       <RepoName>corefx-portable</RepoName>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Runtime.linux-x64" Version="3.1.11" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+    <Dependency Name="Microsoft.NETCore.App.Runtime.linux-x64" Version="3.1.12" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>f5eceb810586ea6138aadcef9e2bba115015ab99</Sha>
+      <Sha>0267ad09c6f2e2a37b23b7d230ffbf9e787dd388</Sha>
       <RepoName>core-setup</RepoName>
       <RepoName>core-setup-portable</RepoName>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="3.1.11" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.linux-x64">
+    <Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="3.1.12" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.linux-x64">
       <Uri>https://github.com/dotnet/aspnetcore-tooling</Uri>
-      <Sha>cd25a65e47d2740ebe460fb4c465a66298e42145</Sha>
+      <Sha>7f783df7bb2513f30f7d86f2ff1a80e9d5a5a9c5</Sha>
       <RepoName>aspnetcore-tooling</RepoName>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="3.1.11" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+    <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="3.1.12" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>7ab67ec7d56e991d19540fdda6b62d07b519b08a</Sha>
+      <Sha>9b154f56a0d634c7257b3e5286af6a8d7b0c1f35</Sha>
       <RepoName>templating</RepoName>
     </Dependency>
     <Dependency Name="Microsoft.NETCore.Compilers" Version="3.4.1-beta4-20127-10" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
@@ -72,14 +72,14 @@
       <Sha>6f8eb3a2e1db6b458451b9cfd2a4f5557769b041</Sha>
       <RepoName>nuget-client</RepoName>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging" Version="3.1.11-servicing.20567.16" CoherentParentDependency="Microsoft.AspNetCore.Mvc.Razor.Extensions">
+    <Dependency Name="Microsoft.Extensions.Logging" Version="3.1.12" CoherentParentDependency="Microsoft.AspNetCore.Mvc.Razor.Extensions">
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>77d62c5738da86985cf69ba0479539b6fdbc904e</Sha>
+      <Sha>4210e7d19b3e18ecadbd1c4c8589e39eea035d5f</Sha>
       <RepoName>aspnet-extensions</RepoName>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk" Version="3.1.111-servicing.20561.13" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
+    <Dependency Name="Microsoft.NET.Sdk" Version="3.1.112-servicing.21071.11" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
       <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>14820d6789a0f0590b858c7c47ffd35c244f935a</Sha>
+      <Sha>bcb77a6887a5600d050bba4be39c0512f4d5a036</Sha>
       <RepoName>sdk</RepoName>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.Cli.CommandLine" Version="1.0.0-preview.19208.1" CoherentParentDependency="Microsoft.DotNet.Cli.Runtime">
@@ -96,37 +96,37 @@
       <Uri>https://github.com/dotnet/xliff-tasks</Uri>
       <Sha>173ee3bd61c9549557eefa3cfb718bdef157cb87</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Runtime.linux-x64" Version="3.1.11" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+    <Dependency Name="Microsoft.AspNetCore.App.Runtime.linux-x64" Version="3.1.12" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>9699b939f94b7524a178821d78addefa5af5d750</Sha>
+      <Sha>331b52b370cd4e7fe2919d4d4cda27412e2ab1cc</Sha>
       <RepoName>aspnetcore</RepoName>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Cli.Runtime" Version="3.1.111-servicing.20570.11" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
+    <Dependency Name="Microsoft.DotNet.Cli.Runtime" Version="3.1.112-servicing.21071.9" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
       <Uri>https://github.com/dotnet/cli</Uri>
-      <Sha>ae61eac41692ef81b6cce06d56d758a4e348191e</Sha>
+      <Sha>d4aa2a9233c3fcfab38e9539b44c8143a2bbccd3</Sha>
       <RepoName>cli</RepoName>
     </Dependency>
     <Dependency Name="Microsoft.FSharp.Compiler" Version="10.7.0-beta.19610.6" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
       <Uri>https://github.com/dotnet/fsharp</Uri>
       <Sha>dc86ab5d2c46e9a7c49290e7e2270ab1eeb0c61e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk.Web" Version="3.1.11-servicing.20570.12" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
+    <Dependency Name="Microsoft.NET.Sdk.Web" Version="3.1.12-servicing.21070.14" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
       <Uri>https://github.com/dotnet/websdk</Uri>
-      <Sha>8c7152d287be3a2e594555d75c750cf773a4dbe2</Sha>
+      <Sha>7373166c63518d71a6f9fb7fe83b4ff47700b9fe</Sha>
       <RepoName>websdk</RepoName>
     </Dependency>
     <Dependency Name="Microsoft.NET.Test.Sdk" Version="16.3.0" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
       <Uri>https://github.com/microsoft/vstest</Uri>
       <Sha>55e7e45431c9c05656c999b902686e7402664573</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.111-servicing.20570.21" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.112-servicing.21071.25" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://github.com/dotnet/toolset</Uri>
-      <Sha>1b928f45826015068a84e30a61868433ea74697c</Sha>
+      <Sha>1ca4fe1cdbf170c999d22e2c5e1cb586f54a8bf7</Sha>
       <RepoName>toolset</RepoName>
     </Dependency>
-    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="3.1.111-servicing-015181">
+    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="1.0.0-preview.21072.16">
       <Uri>https://github.com/dotnet/installer</Uri>
-      <Sha>a9538e031d92052e74583261eb736b7ffd79f93c</Sha>
+      <Sha>cd75074bf4176d61f2c043cfaab67ed78762d329</Sha>
       <RepoName>core-sdk</RepoName>
     </Dependency>
     <!-- external dependencies, not handled by Maestro/Arcade -->

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -8,6 +8,6 @@
   <!-- Production Dependencies -->
   <PropertyGroup>
     <PrivateSourceBuildReferencePackagesPackageVersion>1.0.0-beta.20374.1</PrivateSourceBuildReferencePackagesPackageVersion>
-    <PrivateSourceBuiltArtifactsPackageVersion>0.1.0-3.1.110</PrivateSourceBuiltArtifactsPackageVersion>
+    <PrivateSourceBuiltArtifactsPackageVersion>0.1.0-3.1.111</PrivateSourceBuiltArtifactsPackageVersion>
   </PropertyGroup>
 </Project>
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "tools": {
-    "dotnet": "3.1.110"
+    "dotnet": "3.1.111"
   },
   "msbuild-sdks": {
     "Microsoft.Build.CentralPackageVersions": "2.0.1",

diff --git a/patches/aspnetcore/0007-Fix-version-number.patch b/patches/aspnetcore/0007-Fix-version-number.patch
@@ -7,17 +7,17 @@ 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 216950 -> 216952 bytes
+ .../Web.JS/dist/Release/blazor.server.js      | Bin 216950 -> 216951 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 3042cc0c0242767d8389582c9243eb48195a3954..442ee8cd1ef0f870162ebab0ccedde56f8ec4a5d 100644
+index 3042cc0c0242767d8389582c9243eb48195a3954..ec2211a04cb1f7d02cd5477a95cdd2b175df4d98 100644
 GIT binary patch
-delta 24
-fcmex1kN3ws-i8*&7N#xC1^yg{hDx=un$}zZd&~$L
+delta 23
+ecmex1kN5jL-i8*&7N#xC1^(=YMoP7@n$`ewoCps9
 
 delta 22
-dcmew{kN4X=-i8*&7N#xC1^#T7O0}_?)&OiZ2ju_&
+dcmex9kN4X=-i8*&7N#xC1^#T7O0}_?)&OiD2jl<%
 
 --
 2.18.0

diff --git a/patches/aspnetcore/0008-Remove-Yarn-dependency-not-used-in-source-build.patch b/patches/aspnetcore/0008-Remove-Yarn-dependency-not-used-in-source-build.patch
@@ -35,8 +35,8 @@ index 6880ef82ed..854ab2f3a5 100644
    },
    "msbuild-sdks": {
 -    "Yarn.MSBuild": "1.15.2",
-     "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20569.8",
-     "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.20569.8"
+     "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.21063.4",
+     "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.21063.4"
    }
 diff --git a/src/Components/WebAssembly/Authentication.Msal/src/Microsoft.Authentication.WebAssembly.Msal.csproj b/src/Components/WebAssembly/Authentication.Msal/src/Microsoft.Authentication.WebAssembly.Msal.csproj
 index 36eec6b93a..19c5906526 100644

diff --git a/patches/aspnetcore/0012-Support-global.json-on-arm64-as-well.patch b/patches/aspnetcore/0012-Support-global.json-on-arm64-as-well.patch
@@ -24,7 +24,7 @@ index 854ab2f3a5..bc379b038e 100644
 +++ b/global.json
 @@ -5,10 +5,7 @@
    "tools": {
-     "dotnet": "3.1.110",
+     "dotnet": "3.1.111",
      "runtimes": {
 -      "dotnet/x64": [
 -        "$(MicrosoftNETCoreAppInternalPackageVersion)"

diff --git a/patches/corefx/0001-Enable-sourcelink-in-source-build.patch b/patches/corefx/0001-Enable-sourcelink-in-source-build.patch
@@ -8,7 +8,7 @@ Subject: [PATCH 1/7] Enable sourcelink in source-build
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/eng/Tools.props b/eng/Tools.props
-index cfe49be3c6..025f8ab9af 100644
+index 33edddae16..fdbb3b9c4a 100644
 --- a/eng/Tools.props
 +++ b/eng/Tools.props
 @@ -20,6 +20,10 @@
@@ -18,7 +18,7 @@ index cfe49be3c6..025f8ab9af 100644
 +
 +    <!-- SourceLink -->
 +    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="$(MicrosoftSourceLinkVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />
-+    <PackageReference Include="Microsoft.SourceLink.Vsts.Git" Version="$(MicrosoftSourceLinkVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />
++    <PackageReference Include="Microsoft.SourceLink.Vsts.Git" Version="$(MicrosoftSourceLinkVSTSVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />
    </ItemGroup>
 
    <!-- excluded from offline portion of source build -->
@@ -28,7 +28,7 @@ index cfe49be3c6..025f8ab9af 100644
 
 -    <!-- SourceLink -->
 -    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="$(MicrosoftSourceLinkVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />
--    <PackageReference Include="Microsoft.SourceLink.Vsts.Git" Version="$(MicrosoftSourceLinkVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />
+-    <PackageReference Include="Microsoft.SourceLink.Vsts.Git" Version="$(MicrosoftSourceLinkVSTSVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />
 -
      <!-- UWP test tools -->
      <PackageReference Include="Microsoft.DotNet.UAP.TestTools" Version="$(MicrosoftDotNetUapTestToolsPackageVersion)" Condition="$(TargetGroup.StartsWith('uap'))" PrivateAssets="all" IsImplicitlyDefined="true" />

diff --git a/patches/corefx/0009-correct-system.numerics.tensors-package-versions.patch b/patches/corefx/0009-correct-system.numerics.tensors-package-versions.patch
@@ -0,0 +1,50 @@
+From b0e30ebc5df0b078599fc94e9b23b1be1de82f87 Mon Sep 17 00:00:00 2001
+From: Anipik <anirudhagnihotry098@gmail.com>
+Date: Wed, 27 Jan 2021 10:44:33 -0800
+Subject: [PATCH] correct system.numerics.tensors package versions
+
+See https://github.com/dotnet/corefx/pull/43022
+
+---
+ pkg/Microsoft.Private.PackageBaseline/packageIndex.json | 8 +++-----
+ src/System.Numerics.Tensors/Directory.Build.props       | 2 +-
+ 2 files changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/pkg/Microsoft.Private.PackageBaseline/packageIndex.json b/pkg/Microsoft.Private.PackageBaseline/packageIndex.json
+index 4f289d50cb..1733197f67 100644
+--- a/pkg/Microsoft.Private.PackageBaseline/packageIndex.json
++++ b/pkg/Microsoft.Private.PackageBaseline/packageIndex.json
+@@ -3534,14 +3534,12 @@
+     },
+     "System.Numerics.Tensors": {
+       "StableVersions": [
+-        "0.1.0",
+-        "0.3.0"
++        "0.1.0"
+       ],
+-      "BaselineVersion": "0.3.0",
++      "BaselineVersion": "0.1.0",
+       "InboxOn": {},
+       "AssemblyVersionInPackageVersion": {
+-        "0.1.0.0": "0.1.0",
+-        "0.2.0.0": "0.2.0"
++        "0.1.0.0": "0.1.0"
+       }
+     },
+     "System.Numerics.Vectors": {
+diff --git a/src/System.Numerics.Tensors/Directory.Build.props b/src/System.Numerics.Tensors/Directory.Build.props
+index 54cc918845..f1c26cee38 100644
+--- a/src/System.Numerics.Tensors/Directory.Build.props
++++ b/src/System.Numerics.Tensors/Directory.Build.props
+@@ -2,7 +2,7 @@
+   <Import Project="..\Directory.Build.props" />
+   <PropertyGroup>
+     <AssemblyVersion>0.2.1.0</AssemblyVersion>
+-    <PackageVersion>0.3.0</PackageVersion>
++    <PackageVersion>0.2.0</PackageVersion>
+     <StrongNameKeyId>Open</StrongNameKeyId>
+     <!-- This is a preview package. Do not mark as stable. -->
+     <BlockStable>true</BlockStable>
+--
+2.21.3
+