Merge pull request #2121 from dseefeld/3.1.14-apr2021

Update to the April 3.1.14 release
dotnet · Apr 16, 2021 · 3d8766b · 3d8766b
2 parents f6cacdd + 4169b22
commit 3d8766b
Show file tree

Hide file tree

Showing 12 changed files with 48 additions and 40 deletions.
diff --git a/NuGet.config b/NuGet.config
@@ -2,6 +2,9 @@
 <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>

diff --git a/build.sh b/build.sh
@@ -118,12 +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-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/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/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.13-servicing.21111.2" CoherentParentDependency="Microsoft.Private.CoreFx.NETCoreApp">
+    <Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.1.13-servicing.21162.1" CoherentParentDependency="Microsoft.Private.CoreFx.NETCoreApp">
       <Uri>https://github.com/dotnet/coreclr</Uri>
-      <Sha>c531bbb17fd887eaf7073f7159db43477d557ae3</Sha>
+      <Sha>0897c45fb56b1ddd9fa69cb5329fac1ce700b8eb</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.21116.2" CoherentParentDependency="Microsoft.NETCore.App.Runtime.linux-x64">
+    <Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.7.0-servicing.21162.8" CoherentParentDependency="Microsoft.NETCore.App.Runtime.linux-x64">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>9299d909ff6c03c664a3f9a3ef995a9fa2eeec3e</Sha>
+      <Sha>6e37696a5420057596d61119614574db9037c652</Sha>
       <RepoName>corefx</RepoName>
       <RepoName>corefx-portable</RepoName>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Runtime.linux-x64" Version="3.1.13" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+    <Dependency Name="Microsoft.NETCore.App.Runtime.linux-x64" Version="3.1.14" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>64df28ec4a52d6cc23efffbb918eab87ee42600f</Sha>
+      <Sha>826c2c2f8f0506c4fdb57ddc71b1dc4af9cb781c</Sha>
       <RepoName>core-setup</RepoName>
       <RepoName>core-setup-portable</RepoName>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="3.1.13" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.linux-x64">
+    <Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="3.1.14" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.linux-x64">
       <Uri>https://github.com/dotnet/aspnetcore-tooling</Uri>
-      <Sha>1756aa62b0ee24952b064aabf88f240da51179b1</Sha>
+      <Sha>aec2954c62f9ca32403ef572f8e64b417c6b67e8</Sha>
       <RepoName>aspnetcore-tooling</RepoName>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="3.1.13" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+    <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="3.1.14" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>01919484d0079b505f1befc05109f4f8405c2ec4</Sha>
+      <Sha>f8760d033ff55c8e24944bf18f8e007bea4deb50</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.13" CoherentParentDependency="Microsoft.AspNetCore.Mvc.Razor.Extensions">
+    <Dependency Name="Microsoft.Extensions.Logging" Version="3.1.14" CoherentParentDependency="Microsoft.AspNetCore.Mvc.Razor.Extensions">
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>945dd07ff3fabf64fe67e7dd2197bbeedbe6ca0f</Sha>
+      <Sha>1c79cde92ca66a991b25a5ed9cbd570e289df47e</Sha>
       <RepoName>aspnet-extensions</RepoName>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk" Version="3.1.113-servicing.21112.20" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
+    <Dependency Name="Microsoft.NET.Sdk" Version="3.1.114-servicing.21161.11" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
       <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>567532b5ebc207581830835b65bbd75feca7044c</Sha>
+      <Sha>5565e6b21b7a11560fb88e73dce4c097fac6260d</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.13" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+    <Dependency Name="Microsoft.AspNetCore.App.Runtime.linux-x64" Version="3.1.14" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>cf2c5c9c6dca430b97aa96429b84d0da07eb77f1</Sha>
+      <Sha>440dadc05b2bed38e6a726c2492db90e77d43c62</Sha>
       <RepoName>aspnetcore</RepoName>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Cli.Runtime" Version="3.1.113-servicing.21117.4" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
+    <Dependency Name="Microsoft.DotNet.Cli.Runtime" Version="3.1.114-servicing.21166.6" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
       <Uri>https://github.com/dotnet/cli</Uri>
-      <Sha>bf72556791de4b18f1517271c858707d3eb2613a</Sha>
+      <Sha>b637fb8974fdc0ddc880dfd16cf681c7eb7febb6</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.13-servicing.21117.4" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
+    <Dependency Name="Microsoft.NET.Sdk.Web" Version="3.1.113-servicing.21166.4" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
       <Uri>https://github.com/dotnet/websdk</Uri>
-      <Sha>55d967978dda970e58d997a73bcb9dd86de1f9e4</Sha>
+      <Sha>f55130b54ae93962c362692267601941f693291b</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.113-servicing.21117.35" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.114-servicing.21166.14" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://github.com/dotnet/toolset</Uri>
-      <Sha>6dfa1a00637e5a59cf077919d7d536b56900b102</Sha>
+      <Sha>3c0bb6e7e1a5526407ab9ba284bed18f9b841251</Sha>
       <RepoName>toolset</RepoName>
     </Dependency>
-    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="3.1.113-servicing-015239">
+    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="1.0.0-preview.21166.31">
       <Uri>https://github.com/dotnet/installer</Uri>
-      <Sha>2703068f9520050e59ba9c2e44aabe8fe533c65e</Sha>
+      <Sha>07ddd844dccc1dadbec69b4c9628ec7689b5468d</Sha>
       <RepoName>core-sdk</RepoName>
     </Dependency>
     <!-- external dependencies, not handled by Maestro/Arcade -->

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "tools": {
-    "dotnet": "3.1.112"
+    "dotnet": "3.1.113"
   },
   "msbuild-sdks": {
     "Microsoft.Build.CentralPackageVersions": "2.0.1",

diff --git a/patches/aspnetcore/0006-Fix-version-number.patch b/patches/aspnetcore/0006-Fix-version-number.patch
@@ -11,10 +11,10 @@ to update/reapply it with a text editor.
  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..f4a07dde84be054ae6020981d431562c706fa577 100644
+index 1c602124e2c7a54b062e3b1d52c32580a70927bd..8a9b6408fae1502713f054bfe01cc281c130417d 100644
 GIT binary patch
 delta 23
-ecmZpC&e!yuuc3vpg=q_O^=5WsrP^3cYc2qA3kU)L
+ecmZpC&e!yuuc3vpg=q_O^=5VxrP^3cYc2qA5(onT
 
 delta 22
 dcmZpA&e!;yuc3vpg=q_O^=39BrP^3cYXE2e2lfB}

diff --git a/patches/aspnetcore/0007-Remove-Yarn-dependency-not-used-in-source-build.patch b/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.21110.10",
-     "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.21110.10"
+     "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.21158.9",
+     "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.21158.9"
    }
 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/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.112",
+     "dotnet": "3.1.113",
      "runtimes": {
 -      "dotnet/x64": [
 -        "$(MicrosoftNETCoreAppInternalPackageVersion)"

diff --git a/patches/core-sdk/0002-Patch-property-used-for-core-setup-version.patch b/patches/core-sdk/0002-Patch-property-used-for-core-setup-version.patch
@@ -19,7 +19,7 @@ index 43ea706d4..b1f5d5772 100644
 +    <CoreSetupBlobVersion>$(MicrosoftNETCoreAppRuntimePackageVersion)</CoreSetupBlobVersion>
 
      <!-- Change these individually to or $(CoreSetupBlobVersion), $(AspNetCoreBlobVersion), or appropriate fixed version depending if corresponding .Ref packages are unpinned. -->
-     <NETCoreAppTargetingPackBlobVersion>3.1.0-rtm.19565.2</NETCoreAppTargetingPackBlobVersion>
+     <NETCoreAppTargetingPackBlobVersion Condition="'$(Rid)' != 'win-arm64'">3.1.0-rtm.19565.2</NETCoreAppTargetingPackBlobVersion>
 -- 
 2.21.0
 
diff --git a/repos/aspnetcore.proj b/repos/aspnetcore.proj
@@ -66,7 +66,7 @@
 
   <UsingTask AssemblyFile="$(XPlatSourceBuildTasksAssembly)" TaskName="PublishToolsetBinaries" />
 
-  <Target Name="PublishBinaries" 
+  <Target Name="PublishBinaries"
           AfterTargets="Build"
           Inputs="$(MSBuildProjectFullPath)"
           Outputs="$(RepoCompletedSemaphorePath)PublishBinaries.complete">

diff --git a/repos/package-source-build.proj b/repos/package-source-build.proj
@@ -24,7 +24,9 @@
     <ItemGroup>
       <CoreClrToolsFiles Include="$(ToolPackageExtractDir)coreclr-tools/*" />
     </ItemGroup>
+    <!-- Also copy to the legacy path without the architecture for SBRP for now -->
     <Copy SourceFiles="@(CoreClrToolsFiles)" DestinationFolder="$(SourceBuiltPackagesPath)coreclr-tools" />
+    <Copy SourceFiles="@(CoreClrToolsFiles)" DestinationFolder="$(SourceBuiltPackagesPath)coreclr-tools/$(BuildArchitecture)" />
 
     <PropertyGroup>
       <SourceBuiltTarballName>$(OutputPath)$(SourceBuiltArtifactsTarballName).$(VersionPrefix)-$(VersionSuffix).tar.gz</SourceBuiltTarballName>

diff --git a/smoke-testNuGet.Config b/smoke-testNuGet.Config
@@ -3,7 +3,11 @@
   <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" />
   </packageSources>
 </configuration>
diff --git a/tools-local/prebuilt-baseline-online.xml b/tools-local/prebuilt-baseline-online.xml
@@ -1,5 +1,5 @@
 <UsageData>
-  <CreatedByRid>fedora.30-x64</CreatedByRid>
+  <CreatedByRid>fedora.31-x64</CreatedByRid>
   <IgnorePatterns>
     <UsagePattern IdentityGlob="Microsoft.AspNetCore.App.Ref/3.*" />
     <UsagePattern IdentityGlob="Microsoft.DotNet.Web.ItemTemplates/2.1.*" />
@@ -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.21110.10" IsDirectDependency="true" />
+    <Usage Id="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.21158.9" 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" />