Merge pull request #2162 from dseefeld/3.1.15-may2021

Update to the May 3.1.15 release

NuGet.config

@@ -2,9 +2,7 @@
 <configuration>
   <packageSources>
     <clear />
-    <!--  Begin: Package sources from dotnet-templating -->
     <add key="darc-pub-dotnet-templating-f8760d0" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f8760d03/nuget/v3/index.json" />
-    <!--  End: Package sources from dotnet-templating -->
     <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>

build.sh

@@ -118,10 +118,11 @@ 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-aspnetcore-440dadc0/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
-    {"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-tooling-aec2954c/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
-    {"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-826c2c2f/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
-    {"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-extensions-1c79cde9/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
+    {"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-8ca3954c/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
+    {"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-tooling-b4f2d743/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
+    {"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-dc339bd0/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
+    {"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-extensions-194782ed/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
+    {"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-templating-7116c61c/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
     {"endpoint":"https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f8760d03/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'"},
     {"endpoint":"https://pkgs.dev.azure.com/dnceng/internal/_packaging/3-1-13-2-18-21/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"}

eng/Version.Details.xml

@@ -27,36 +27,36 @@
       <Sha>1127689f262d52ea8ff68ef03d706fa62b3b40a1</Sha>
       <RepoName>linker</RepoName>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.1.13-servicing.21162.1" CoherentParentDependency="Microsoft.Private.CoreFx.NETCoreApp">
+    <Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.1.15-servicing.21212.2" CoherentParentDependency="Microsoft.Private.CoreFx.NETCoreApp">
       <Uri>https://github.com/dotnet/coreclr</Uri>
-      <Sha>0897c45fb56b1ddd9fa69cb5329fac1ce700b8eb</Sha>
+      <Sha>803ce08ee96925f9d08021c9c6b96af8f27d16c4</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.21162.8" CoherentParentDependency="Microsoft.NETCore.App.Runtime.linux-x64">
+    <Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.7.0-servicing.21214.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.linux-x64">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>6e37696a5420057596d61119614574db9037c652</Sha>
+      <Sha>585ae475d8aebdecf310d7509585003721509c5a</Sha>
       <RepoName>corefx</RepoName>
       <RepoName>corefx-portable</RepoName>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Runtime.linux-x64" Version="3.1.14" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+    <Dependency Name="Microsoft.NETCore.App.Runtime.linux-x64" Version="3.1.15" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>826c2c2f8f0506c4fdb57ddc71b1dc4af9cb781c</Sha>
+      <Sha>dc339bd0fb2ec082e3afdc0a5ade2066a86d1681</Sha>
       <RepoName>core-setup</RepoName>
       <RepoName>core-setup-portable</RepoName>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="3.1.14" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.linux-x64">
+    <Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="3.1.15" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.linux-x64">
       <Uri>https://github.com/dotnet/aspnetcore-tooling</Uri>
-      <Sha>aec2954c62f9ca32403ef572f8e64b417c6b67e8</Sha>
+      <Sha>b4f2d7437db4b5f36375cfcf1de316e3e42fcee6</Sha>
       <RepoName>aspnetcore-tooling</RepoName>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="3.1.14" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+    <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="3.1.15" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>f8760d033ff55c8e24944bf18f8e007bea4deb50</Sha>
+      <Sha>7116c61c686c40fa0cb33f6f96a3631f8764846e</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.14" CoherentParentDependency="Microsoft.AspNetCore.Mvc.Razor.Extensions">
+    <Dependency Name="Microsoft.Extensions.Logging" Version="3.1.15" CoherentParentDependency="Microsoft.AspNetCore.Mvc.Razor.Extensions">
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>1c79cde92ca66a991b25a5ed9cbd570e289df47e</Sha>
+      <Sha>194782ed2ccc8f5103e741c8421a60c3618c8fed</Sha>
       <RepoName>aspnet-extensions</RepoName>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk" Version="3.1.114-servicing.21161.11" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
+    <Dependency Name="Microsoft.NET.Sdk" Version="3.1.115-servicing.21213.19" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
       <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>5565e6b21b7a11560fb88e73dce4c097fac6260d</Sha>
+      <Sha>e78e47c7ee386dfe0c1c30d8db2bb15d517cb825</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.14" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+    <Dependency Name="Microsoft.AspNetCore.App.Runtime.linux-x64" Version="3.1.15" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>440dadc05b2bed38e6a726c2492db90e77d43c62</Sha>
+      <Sha>8ca3954ca335343ce6dd1d14d8d1c6c3369710b7</Sha>
       <RepoName>aspnetcore</RepoName>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Cli.Runtime" Version="3.1.114-servicing.21166.6" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
+    <Dependency Name="Microsoft.DotNet.Cli.Runtime" Version="3.1.115-servicing.21216.5" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
       <Uri>https://github.com/dotnet/cli</Uri>
-      <Sha>b637fb8974fdc0ddc880dfd16cf681c7eb7febb6</Sha>
+      <Sha>6a07d0e5d0f8a660113e5d6007d5b107ef8a6b8b</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.113-servicing.21166.4" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
+    <Dependency Name="Microsoft.NET.Sdk.Web" Version="3.1.115-servicing.21215.14" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
       <Uri>https://github.com/dotnet/websdk</Uri>
-      <Sha>f55130b54ae93962c362692267601941f693291b</Sha>
+      <Sha>165b36ca8a73efee5660465ec1281d24fddf67e5</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.114-servicing.21166.14" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.115-servicing.21216.7" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://github.com/dotnet/toolset</Uri>
-      <Sha>3c0bb6e7e1a5526407ab9ba284bed18f9b841251</Sha>
+      <Sha>af8eb8e1d2dc75ee3152b57aea2d49ec6a7d3f48</Sha>
       <RepoName>toolset</RepoName>
     </Dependency>
-    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="1.0.0-preview.21166.31">
+    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="1.0.0-preview.21216.13">
       <Uri>https://github.com/dotnet/installer</Uri>
-      <Sha>07ddd844dccc1dadbec69b4c9628ec7689b5468d</Sha>
+      <Sha>612a6634c59d6c946d232929055665bc64b18f49</Sha>
       <RepoName>core-sdk</RepoName>
     </Dependency>
     <!-- external dependencies, not handled by Maestro/Arcade -->

eng/Versions.props

@@ -8,6 +8,6 @@
   <!-- Production Dependencies -->
   <PropertyGroup>
     <PrivateSourceBuildReferencePackagesPackageVersion>1.0.0-beta.20374.1</PrivateSourceBuildReferencePackagesPackageVersion>
-    <PrivateSourceBuiltArtifactsPackageVersion>0.1.0-3.1.113.3</PrivateSourceBuiltArtifactsPackageVersion>
+    <PrivateSourceBuiltArtifactsPackageVersion>0.1.0-3.1.114</PrivateSourceBuiltArtifactsPackageVersion>
   </PropertyGroup>
 </Project>

global.json

@@ -1,6 +1,6 @@
 {
   "tools": {
-    "dotnet": "3.1.113"
+    "dotnet": "3.1.114"
   },
   "msbuild-sdks": {
     "Microsoft.Build.CentralPackageVersions": "2.0.1",

patches/aspnetcore/0006-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 242561 -> 242562 bytes
+ .../Web.JS/dist/Release/blazor.server.js      | Bin 242561 -> 242561 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 1c602124e2c7a54b062e3b1d52c32580a70927bd..8a9b6408fae1502713f054bfe01cc281c130417d 100644
+index 1c602124e2c7a54b062e3b1d52c32580a70927bd..af706d7529f40614d5ec3a568060b0459ad4ca23 100644
 GIT binary patch
-delta 23
-ecmZpC&e!yuuc3vpg=q_O^=5VxrP^3cYc2qA5(onT
+delta 22
+dcmZpC&e!;yuc3vpg=q_O^=39xrP^3cYXE2a2lxO0
 
 delta 22
-dcmZpA&e!;yuc3vpg=q_O^=39BrP^3cYXE2e2lfB}
+dcmZpC&e!;yuc3vpg=q_O^=39BrP^3cYXE2I2lW5|
 
 -- 
 2.18.0

patches/aspnetcore/0007-Remove-Yarn-dependency-not-used-in-source-build.patch

@@ -35,8 +35,8 @@ index 97783de603..de628eca3c 100644
    },
    "msbuild-sdks": {
 -    "Yarn.MSBuild": "1.15.2",
-     "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.21158.9",
-     "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.21158.9"
+     "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.21161.1",
+     "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.21161.1"
    }
 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

patches/aspnetcore/0011-Support-global.json-on-arm64-as-well.patch

@@ -24,7 +24,7 @@ index de628eca3c..3fb6244e52 100644
 +++ b/global.json
 @@ -5,10 +5,7 @@
    "tools": {
-     "dotnet": "3.1.113",
+     "dotnet": "3.1.114",
      "runtimes": {
 -      "dotnet/x64": [
 -        "$(MicrosoftNETCoreAppInternalPackageVersion)"

smoke-testNuGet.Config

@@ -3,9 +3,7 @@
   <packageSources>
     <!--To inherit the global NuGet package sources remove the <clear/> line below -->
     <clear />
-    <!--  Begin: Package sources from dotnet-templating -->
     <add key="darc-pub-dotnet-templating-f8760d0" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f8760d03/nuget/v3/index.json" />
-    <!--  End: Package sources from dotnet-templating -->
     <add key="source-built-packages" value="SOURCE_BUILT_PACKAGES" />
     <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public%40Local/nuget/v3/index.json" />
     <add key="smoke-test feed" value="SMOKE_TEST_PACKAGE_FEED" />

tools-local/prebuilt-baseline-online.xml

@@ -48,7 +48,7 @@
     <Usage Id="Microsoft.DotNet.Common.ItemTemplates" Version="1.0.2-beta3" />
     <Usage Id="Microsoft.DotNet.Common.ItemTemplates" Version="1.0.2-beta4" />
     <Usage Id="Microsoft.DotNet.Common.ItemTemplates" Version="2.0.0-preview8.19373.1" />
-    <Usage Id="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.21158.9" IsDirectDependency="true" />
+    <Usage Id="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.21161.1" IsDirectDependency="true" />
     <Usage Id="Microsoft.DotNet.PlatformAbstractions" Version="2.0.0" IsDirectDependency="true" />
     <Usage Id="Microsoft.DotNet.PlatformAbstractions" Version="2.1.0" IsDirectDependency="true" />
     <Usage Id="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4-20181009-2100240" />
@@ -363,4 +363,4 @@
     <Usage Id="System.Xml.XPath.XDocument" Version="4.3.0" />
     <Usage Id="vswhere" Version="2.6.7" IsDirectDependency="true" IsAutoReferenced="true" />
   </Usages>
-</UsageData>
+</UsageData>