Merge pull request #2229 from MichaelSimons/release/3.1.116-June2021

Update to the 3.1.16 / 3.1.116 release
dotnet · Jun 10, 2021 · 50888aa · 50888aa
2 parents 965c78c + 45a5172
commit 50888aa
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 75 deletions.
diff --git a/build.sh b/build.sh
@@ -118,11 +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-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/_packaging/darc-int-dotnet-aspnetcore-7e8bbb70/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
+    {"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-tooling-198cc5ec/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
+    {"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-4c6b4aa2/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
+    {"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-extensions-60938620/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
+    {"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-templating-241b4771-1/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'"}

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.15-servicing.21212.2" CoherentParentDependency="Microsoft.Private.CoreFx.NETCoreApp">
+    <Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.1.16-servicing.21262.5" CoherentParentDependency="Microsoft.Private.CoreFx.NETCoreApp">
       <Uri>https://github.com/dotnet/coreclr</Uri>
-      <Sha>803ce08ee96925f9d08021c9c6b96af8f27d16c4</Sha>
+      <Sha>b820e148c5ded6a37cb3ddb38b88b54210189562</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.21214.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.linux-x64">
+    <Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.7.0-servicing.21262.5" CoherentParentDependency="Microsoft.NETCore.App.Runtime.linux-x64">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>585ae475d8aebdecf310d7509585003721509c5a</Sha>
+      <Sha>658544bf73653f734bca9675602fa57440f8b718</Sha>
       <RepoName>corefx</RepoName>
       <RepoName>corefx-portable</RepoName>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Runtime.linux-x64" Version="3.1.15" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+    <Dependency Name="Microsoft.NETCore.App.Runtime.linux-x64" Version="3.1.16" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>dc339bd0fb2ec082e3afdc0a5ade2066a86d1681</Sha>
+      <Sha>4c6b4aa257241c4d419b8c271e37afac4445b1c0</Sha>
       <RepoName>core-setup</RepoName>
       <RepoName>core-setup-portable</RepoName>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="3.1.15" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.linux-x64">
+    <Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="3.1.16" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.linux-x64">
       <Uri>https://github.com/dotnet/aspnetcore-tooling</Uri>
-      <Sha>b4f2d7437db4b5f36375cfcf1de316e3e42fcee6</Sha>
+      <Sha>198cc5ec1c2fa512a34273fdfcc659e54c539002</Sha>
       <RepoName>aspnetcore-tooling</RepoName>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="3.1.15" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+    <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="3.1.16" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>7116c61c686c40fa0cb33f6f96a3631f8764846e</Sha>
+      <Sha>241b4771f5caa832464e16ee6739c291d12b0ff5</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.15" CoherentParentDependency="Microsoft.AspNetCore.Mvc.Razor.Extensions">
+    <Dependency Name="Microsoft.Extensions.Logging" Version="3.1.16" CoherentParentDependency="Microsoft.AspNetCore.Mvc.Razor.Extensions">
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>194782ed2ccc8f5103e741c8421a60c3618c8fed</Sha>
+      <Sha>60938620996db86debee5cf1652e70a6ec5cb3e7</Sha>
       <RepoName>aspnet-extensions</RepoName>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk" Version="3.1.115-servicing.21213.19" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
+    <Dependency Name="Microsoft.NET.Sdk" Version="3.1.116-servicing.21262.33" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
       <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>e78e47c7ee386dfe0c1c30d8db2bb15d517cb825</Sha>
+      <Sha>ef142b8d894e6f4b4f5f2d086e1802ec56351dd6</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.15" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+    <Dependency Name="Microsoft.AspNetCore.App.Runtime.linux-x64" Version="3.1.16" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>8ca3954ca335343ce6dd1d14d8d1c6c3369710b7</Sha>
+      <Sha>7e8bbb70b266b2fdaf0b11ec47fb3077761fb6bf</Sha>
       <RepoName>aspnetcore</RepoName>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Cli.Runtime" Version="3.1.115-servicing.21216.5" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
+    <Dependency Name="Microsoft.DotNet.Cli.Runtime" Version="3.1.116-servicing.21263.11" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
       <Uri>https://github.com/dotnet/cli</Uri>
-      <Sha>6a07d0e5d0f8a660113e5d6007d5b107ef8a6b8b</Sha>
+      <Sha>49e1881e820b9958b6292276afc5afb8a7b2b9d8</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.115-servicing.21215.14" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
+    <Dependency Name="Microsoft.NET.Sdk.Web" Version="3.1.116-servicing.21263.9" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
       <Uri>https://github.com/dotnet/websdk</Uri>
-      <Sha>165b36ca8a73efee5660465ec1281d24fddf67e5</Sha>
+      <Sha>7f8358e605a2a61afbba8b5e61be6a9f6c474955</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.115-servicing.21216.7" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.116-servicing.21263.16" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://github.com/dotnet/toolset</Uri>
-      <Sha>af8eb8e1d2dc75ee3152b57aea2d49ec6a7d3f48</Sha>
+      <Sha>7e6521f300e2a942d94c3be4eefbde921d3bbe74</Sha>
       <RepoName>toolset</RepoName>
     </Dependency>
-    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="1.0.0-preview.21216.13">
+    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="1.0.0-preview.21263.54">
       <Uri>https://github.com/dotnet/installer</Uri>
-      <Sha>612a6634c59d6c946d232929055665bc64b18f49</Sha>
+      <Sha>975b5bfc36d279a27ee35637f6503b5b9ddb7b1c</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.114</PrivateSourceBuiltArtifactsPackageVersion>
+    <PrivateSourceBuiltArtifactsPackageVersion>0.1.0-3.1.115</PrivateSourceBuiltArtifactsPackageVersion>
   </PropertyGroup>
 </Project>
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "tools": {
-    "dotnet": "3.1.114"
+    "dotnet": "3.1.115"
   },
   "msbuild-sdks": {
     "Microsoft.Build.CentralPackageVersions": "2.0.1",

diff --git a/patches/aspnetcore/0011-Support-global.json-on-arm64-as-well.patch b/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.114",
+     "dotnet": "3.1.115",
      "runtimes": {
 -      "dotnet/x64": [
 -        "$(MicrosoftNETCoreAppInternalPackageVersion)"

diff --git a/tools-local/prebuilt-baseline-offline.xml b/tools-local/prebuilt-baseline-offline.xml
@@ -1,44 +1,3 @@
 <UsageData>
   <CreatedByRid>centos.7-x64</CreatedByRid>
-  <ProjectDirectories>
-    <Dir>src/ApplicationInsights-dotnet.53b80940842204f78708a538628288ff5d741a1d/</Dir>
-    <Dir>src/arcade.15f00efd583eab4372b2e9ca25bd80ace5b119ad/</Dir>
-    <Dir>src/dotnet-extensions.be18161fbed286d6fb7a7b1c7999ce70a50cf3eb/</Dir>
-    <Dir>src/xdt.c01a538851a8ab1a1fbeb2e6243f391fff7587b4/</Dir>
-    <Dir>src/dotnet-aspnetcore-tooling.d63ec4a166a5c4f40fcbb823873cfa68cfd39eae/</Dir>
-    <Dir>src/dotnet-aspnetcore.62c098bc170f50feca15916e81cb7f321ffc52ff/</Dir>
-    <Dir>src/dotnet-cli.01244375eb89e6e3ea48123f7b6ec8193403a7ba/</Dir>
-    <Dir>src/cliCommandLineParser.0e89c2116ad28e404ba56c14d1c3f938caa25a01/</Dir>
-    <Dir>src/common.6e37cdfe96ac8b06a923242120169fafacd720e6/</Dir>
-    <Dir>src/dotnet-installer.0f94483edc7cae71ffc34a2c8e8f0a54534e331f/</Dir>
-    <Dir>src/dotnet-core-setup.3acd9b0cd16596bad450c82be08780875a73c05c/</Dir>
-    <Dir>src/dotnet-core-setup.3acd9b0cd16596bad450c82be08780875a73c05c/</Dir>
-    <Dir>src/coreclr.20ee1c47c2bcec0101e3cf04c98549aeffe85989/</Dir>
-    <Dir>src/coreclr.20ee1c47c2bcec0101e3cf04c98549aeffe85989/</Dir>
-    <Dir>src/dotnet-corefx.73aa947bfae18d576fc2fe69fb9c3f7839decd93/</Dir>
-    <Dir>src/dotnet-corefx.73aa947bfae18d576fc2fe69fb9c3f7839decd93/</Dir>
-    <Dir>src/fsharp.dc86ab5d2c46e9a7c49290e7e2270ab1eeb0c61e/</Dir>
-    <Dir>src/known-good-tests./</Dir>
-    <Dir>src/known-good./</Dir>
-    <Dir>src/linker.1127689f262d52ea8ff68ef03d706fa62b3b40a1/</Dir>
-    <Dir>src/msbuild.e901037fe1815eae17424f860412d0b967d09461/</Dir>
-    <Dir>src/netcorecli-fsc/</Dir>
-    <Dir>src/Newtonsoft.Json.cac0690ad133c5e166ce5642dc71175791404fad/</Dir>
-    <Dir>src/Newtonsoft.Json.e43dae94c26f0c30e9095327a3a9eac87193923d/</Dir>
-    <Dir>src/NuGet.Client.6f8eb3a2e1db6b458451b9cfd2a4f5557769b041/</Dir>
-    <Dir>src/package-source-build/</Dir>
-    <Dir>src/roslyn.d8180a5ecafb92adcfbfe8cf9199eb23be1a1ccf/</Dir>
-    <Dir>src/dotnet-sdk.ff65e086ba67984e42a64123bcc6c310d0183fd4/</Dir>
-    <Dir>src/sourcelink.f175b06862f889474b689a57527e489101c774cc/</Dir>
-    <Dir>src/standard.a5b5f2e1e369972c8ff1e2183979fab6099f52ef/</Dir>
-    <Dir>src/templating.3a2d6426513c7add0c1c140165d528c33e62bc21/</Dir>
-    <Dir>src/dotnet-toolset.a7844b9e4a0db833265766e2af14dc7391371038/</Dir>
-    <Dir>src/vstest.55e7e45431c9c05656c999b902686e7402664573/</Dir>
-    <Dir>src/dotnet-websdk.9d9bfc40e20005ff3504d86a9b86bdcc447d94b2/</Dir>
-    <Dir>src/xliff-tasks.173ee3bd61c9549557eefa3cfb718bdef157cb87/</Dir>
-    <Dir>Tools/</Dir>
-    <Dir>tools-local/tasks/</Dir>
-    <Dir>artifacts/obj/</Dir>
-    <Dir></Dir>
-  </ProjectDirectories>
 </UsageData>
diff --git a/tools-local/prebuilt-baseline-online.xml b/tools-local/prebuilt-baseline-online.xml
@@ -1,5 +1,5 @@
 <UsageData>
-  <CreatedByRid>fedora.31-x64</CreatedByRid>
+  <CreatedByRid>centos.7-x64</CreatedByRid>
   <IgnorePatterns>
     <UsagePattern IdentityGlob="Microsoft.AspNetCore.App.Ref/3.*" />
     <UsagePattern IdentityGlob="Microsoft.DotNet.Web.ItemTemplates/2.1.*" />
@@ -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>