Merged PR 13164: [internal/release/5.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk

This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App**: from 5.0.3-servicing.21073.2 to 5.0.4-servicing.21117.6 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Internal**: from 5.0.3-servicing.21072.12 to 5.0.4-servicing.21116.14 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 5.0.3 to 5.0.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 5.0.3 to 5.0.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 5.0.3 to 5.0.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0**: from 5.0.3-servicing.21073.3 to 5.0.4-servicing.21118.15 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 5.0.3 to 5.0.4 (parent: Microsoft.NET.Sdk) - **Microsoft.EntityFrameworkCore**: from 5.0.3 to 5.0.4 (parent: Microsoft.AspNetCore.App.Runtime.win-x64) - **dotnet-dev-certs**: from 5.0.3-servicing.21073.3 to 5.0.4-servicing.21118.15 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 5.0.3-servicing.21073.3 to 5.0.4-servicing.21118.15 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 5.0.3 to 5.0.4 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 5.0.3-servicing.21073.2 to 5.0.4-servicing.21117.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 5.0.3 to 5.0.4 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 5.0.3-servicing.21073.2 to 5.0.4-servicing.21117.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:fec1f9ef-909e-4396-5b7d-08d8d784082a) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: fec1f9ef-909e-4396-5b7d-08d8d784082a - **Build**: 20210223.16 - **Date Produced**: 2/23/2021 10:47 PM - **Commit**: eb87e99879e0d4f697c33b6d991af832d4345a06 - **Branch**: refs/heads/internal/release/5.0.2xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 5.0.200-servicing.21123.3 to 5.0.201-servicing.21123.16][1] - **Microsoft.NET.Sdk**: [from 5.0.200-servicing.21123.3 to 5.0.201-servicing.21123.16][1] - **Microsoft.WindowsDesktop.App**: [from 5.0.3-servicing.21073.2 to 5.0.4-servicing.21117.6][2] - **Microsoft.NETCore.App.Internal**: [from 5.0.3-servici...
2021-02-24 02:33:30 +00:00 · 2021-02-24 02:33:30 +00:00 · 2c17870a09
commit 2c17870a09
parent b5c628e773 d26f0db082
7 changed files with 134 additions and 61 deletions
--- a/NuGet.config
+++ b/NuGet.config
@ -6,12 +6,22 @@
  <packageSources>
    <clear />
    <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
+    <!--  Begin: Package sources from dotnet-aspnetcore -->
+    <add key="darc-int-dotnet-aspnetcore-e882394" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-e882394a/nuget/v3/index.json" />
+    <!--  End: Package sources from dotnet-aspnetcore -->
+    <!--  Begin: Package sources from dotnet-efcore -->
+    <add key="darc-int-dotnet-efcore-cfd206a" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-efcore-cfd206aa/nuget/v3/index.json" />
+    <!--  End: Package sources from dotnet-efcore -->
    <!--  Begin: Package sources from dotnet-msbuild -->
    <add key="darc-pub-dotnet-msbuild-57a23d2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-msbuild-57a23d24/nuget/v3/index.json" />
    <!--  End: Package sources from dotnet-msbuild -->
+    <!--  Begin: Package sources from dotnet-runtime -->
+    <add key="darc-int-dotnet-runtime-f27d337" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-f27d3372/nuget/v3/index.json" />
+    <!--  End: Package sources from dotnet-runtime -->
+    <!--  Begin: Package sources from dotnet-windowsdesktop -->
+    <add key="darc-int-dotnet-windowsdesktop-e708867-1" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-windowsdesktop-e7088670-1/nuget/v3/index.json" />
+    <!--  End: Package sources from dotnet-windowsdesktop -->
    <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
-    <!-- For custom version of arcade -->
-    <add key="general-testing" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing/nuget/v3/index.json" />
    <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
    <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
    <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
@ -22,8 +32,19 @@
  </packageSources>
  <disabledPackageSources>
    <clear />
-    <!-- Added by darc above. due to dependencies on 3.0.0 and 2.1.0 packs, but we can get those from nuget.org -->
-    <!-- Darc will just put it back if we attempt to remove it above. -->
-    <add key="darc-pub-dotnet-core-setup-7d57652" value="true" />
+    <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
+    <!--  Begin: Package sources from dotnet-aspnetcore -->
+    <add key="darc-int-dotnet-aspnetcore-e882394" value="true" />
+    <!--  End: Package sources from dotnet-aspnetcore -->
+    <!--  Begin: Package sources from dotnet-efcore -->
+    <add key="darc-int-dotnet-efcore-cfd206a" value="true" />
+    <!--  End: Package sources from dotnet-efcore -->
+    <!--  Begin: Package sources from dotnet-runtime -->
+    <add key="darc-int-dotnet-runtime-f27d337" value="true" />
+    <!--  End: Package sources from dotnet-runtime -->
+    <!--  Begin: Package sources from dotnet-windowsdesktop -->
+    <add key="darc-int-dotnet-windowsdesktop-e708867-1" value="true" />
+    <!--  End: Package sources from dotnet-windowsdesktop -->
+    <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
  </disabledPackageSources>
 </configuration>
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@ -5,13 +5,13 @@
      <Uri>https://github.com/dotnet/windowsdesktop</Uri>
      <Sha>ec2af60c1eb8b2665745750f6445b3ff133178fb</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.WindowsDesktop.App" Version="5.0.3-servicing.21073.2" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.WindowsDesktop.App" Version="5.0.4-servicing.21117.6" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
-      <Sha>f8d26ae79a212ae4e64f2fac177a013f4e82307e</Sha>
+      <Sha>e708867037ec6edbe7965b8f0f1193999785037e</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="5.0.3" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="5.0.4" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
-      <Sha>f8d26ae79a212ae4e64f2fac177a013f4e82307e</Sha>
+      <Sha>e708867037ec6edbe7965b8f0f1193999785037e</Sha>
    </Dependency>
    <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.5.0" Version="5.0.0-rtm.20520.1" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://github.com/dotnet/windowsdesktop</Uri>
@ -21,21 +21,25 @@
      <Uri>https://github.com/dotnet/runtime</Uri>
      <Sha>cf258a14b70ad9069470a108f13765e0e5988f51</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Internal" Version="5.0.3-servicing.21072.12" CoherentParentDependency="Microsoft.NET.Sdk">
-      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>c636bbdc8a2d393d07c0e9407a4f8923ba1a21cb</Sha>
+    <Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.5.0" Version="5.0.0-rtm.20519.4" CoherentParentDependency="Microsoft.NET.Sdk">
+      <Uri>https://github.com/dotnet/runtime</Uri>
+      <Sha>cf258a14b70ad9069470a108f13765e0e5988f51</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.3" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.NETCore.App.Internal" Version="5.0.4-servicing.21116.14" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>c636bbdc8a2d393d07c0e9407a4f8923ba1a21cb</Sha>
+      <Sha>f27d33729518f5aa478aa818b7b4f54a4d50bef1</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="5.0.3" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.4" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>c636bbdc8a2d393d07c0e9407a4f8923ba1a21cb</Sha>
+      <Sha>f27d33729518f5aa478aa818b7b4f54a4d50bef1</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="5.0.3" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="5.0.4" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>c636bbdc8a2d393d07c0e9407a4f8923ba1a21cb</Sha>
+      <Sha>f27d33729518f5aa478aa818b7b4f54a4d50bef1</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="5.0.4" CoherentParentDependency="Microsoft.NET.Sdk">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
+      <Sha>f27d33729518f5aa478aa818b7b4f54a4d50bef1</Sha>
    </Dependency>
    <!-- Change blob version in GenerateLayout.targets if this is unpinned to service targeting pack -->
    <!-- No new netstandard.library planned for 3.1 timeframe at this time. -->
@ -55,25 +59,25 @@
      <Uri>https://github.com/dotnet/aspnetcore</Uri>
      <Sha>371a26f07b23ad77c636332c2dfc0cbd1d8137ba</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="5.0.3" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="5.0.4" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>d827c653b787c07de908240b7746ce34d3e6271e</Sha>
+      <Sha>e882394a7bb38930da748291fe2c2ceaa6a80588</Sha>
    </Dependency>
-    <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0" Version="5.0.3-servicing.21073.3" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0" Version="5.0.4-servicing.21118.15" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>d827c653b787c07de908240b7746ce34d3e6271e</Sha>
+      <Sha>e882394a7bb38930da748291fe2c2ceaa6a80588</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore" Version="5.0.3" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
-      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
-      <Sha>efc2924e6e36db17611c7da480d5bc97a4514cb8</Sha>
+    <Dependency Name="Microsoft.EntityFrameworkCore" Version="5.0.4" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+      <Uri>https://github.com/dotnet/efcore</Uri>
+      <Sha>cfd206aa4bc7c878dbbd91959f1c9edada70da93</Sha>
    </Dependency>
-    <Dependency Name="dotnet-dev-certs" Version="5.0.3-servicing.21073.3" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="dotnet-dev-certs" Version="5.0.4-servicing.21118.15" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>d827c653b787c07de908240b7746ce34d3e6271e</Sha>
+      <Sha>e882394a7bb38930da748291fe2c2ceaa6a80588</Sha>
    </Dependency>
-    <Dependency Name="dotnet-user-secrets" Version="5.0.3-servicing.21073.3" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="dotnet-user-secrets" Version="5.0.4-servicing.21118.15" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>d827c653b787c07de908240b7746ce34d3e6271e</Sha>
+      <Sha>e882394a7bb38930da748291fe2c2ceaa6a80588</Sha>
    </Dependency>
    <Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.20420.1">
      <Uri>https://github.com/dotnet/test-templates</Uri>
@ -87,22 +91,22 @@
      <Uri>https://github.com/dotnet/templating</Uri>
      <Sha>ce1a4cd3340d93e1a3d56d16600bd30f7ee32bda</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk" Version="5.0.200-servicing.21123.3">
-      <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>1679bd5a2093db54f04f6a3c900ea3c511f1d8cf</Sha>
+    <Dependency Name="Microsoft.NET.Sdk" Version="5.0.201-servicing.21123.16">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
+      <Sha>eb87e99879e0d4f697c33b6d991af832d4345a06</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="5.0.200-servicing.21123.3">
-      <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>1679bd5a2093db54f04f6a3c900ea3c511f1d8cf</Sha>
+    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="5.0.201-servicing.21123.16">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
+      <Sha>eb87e99879e0d4f697c33b6d991af832d4345a06</Sha>
    </Dependency>
    <!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
-    <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="5.0.3-servicing.21073.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="5.0.4-servicing.21117.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
-      <Sha>ea25334307fb11be0b03c56ce767f25faf5259c1</Sha>
+      <Sha>3991c2606be14a6faf29eeafe824bd4444e85ea1</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="5.0.3-servicing.21073.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="5.0.4-servicing.21117.5" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
-      <Sha>3a3d1e582344146190e9815e79cd5c8a29361b3d</Sha>
+      <Sha>5d6364723197e917e11c0d442545287c27754aa5</Sha>
    </Dependency>
    <Dependency Name="Microsoft.FSharp.Compiler" Version="11.3.2-beta.21102.9" CoherentParentDependency="Microsoft.NET.Sdk">
      <Uri>https://github.com/dotnet/fsharp</Uri>
--- a/eng/Versions.props
+++ b/eng/Versions.props
@ -23,11 +23,11 @@
  </PropertyGroup>
  <PropertyGroup>
    <!-- Dependency from https://github.com/dotnet/winforms -->
-    <MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>5.0.3-servicing.21073.2</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
+    <MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>5.0.4-servicing.21117.2</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
  </PropertyGroup>
  <PropertyGroup>
    <!-- Dependency from https://github.com/dotnet/wpf -->
-    <MicrosoftDotNetWpfProjectTemplatesPackageVersion>5.0.3-servicing.21073.2</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
+    <MicrosoftDotNetWpfProjectTemplatesPackageVersion>5.0.4-servicing.21117.5</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
  </PropertyGroup>
  <PropertyGroup>
    <!-- Dependency from https://github.com/dotnet/templating -->
@ -43,41 +43,39 @@
  </PropertyGroup>
  <PropertyGroup>
    <!-- Dependencies from https://github.com/aspnet/AspNetCore -->
-    <MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>5.0.3</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
+    <MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>5.0.4</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
    <MicrosoftAspNetCoreAppRefPackageVersion>5.0.0</MicrosoftAspNetCoreAppRefPackageVersion>
    <MicrosoftAspNetCoreAppRefInternalPackageVersion>5.0.0-rtm.20526.5</MicrosoftAspNetCoreAppRefInternalPackageVersion>
-    <VSRedistCommonAspNetCoreSharedFrameworkx6450PackageVersion>5.0.3-servicing.21073.3</VSRedistCommonAspNetCoreSharedFrameworkx6450PackageVersion>
-    <dotnetdevcertsPackageVersion>5.0.3-servicing.21073.3</dotnetdevcertsPackageVersion>
-    <dotnetusersecretsPackageVersion>5.0.3-servicing.21073.3</dotnetusersecretsPackageVersion>
+    <VSRedistCommonAspNetCoreSharedFrameworkx6450PackageVersion>5.0.4-servicing.21118.15</VSRedistCommonAspNetCoreSharedFrameworkx6450PackageVersion>
+    <dotnetdevcertsPackageVersion>5.0.4-servicing.21118.15</dotnetdevcertsPackageVersion>
+    <dotnetusersecretsPackageVersion>5.0.4-servicing.21118.15</dotnetusersecretsPackageVersion>
  </PropertyGroup>
  <PropertyGroup>
    <MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
  </PropertyGroup>
  <PropertyGroup>
    <!-- Dependencies from https://github.com/dotnet/sdk -->
-    <MicrosoftNETSdkPackageVersion>5.0.200-servicing.21123.3</MicrosoftNETSdkPackageVersion>
-    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>5.0.200-servicing.21123.3</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+    <MicrosoftNETSdkPackageVersion>5.0.201-servicing.21123.16</MicrosoftNETSdkPackageVersion>
+    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>5.0.201-servicing.21123.16</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
    <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
    <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
    <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
  </PropertyGroup>
  <PropertyGroup>
-    <!-- Dependencies from https://github.com/dotnet/corefx -->
-    <MicrosoftNETCorePlatformsPackageVersion>5.0.1</MicrosoftNETCorePlatformsPackageVersion>
-  </PropertyGroup>
-  <PropertyGroup>
-    <!-- Dependencies from https://github.com/dotnet/core-setup -->
-    <MicrosoftNETCoreAppInternalPackageVersion>5.0.3-servicing.21072.12</MicrosoftNETCoreAppInternalPackageVersion>
-    <MicrosoftNETCoreAppRuntimewinx64PackageVersion>5.0.3</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
-    <MicrosoftNETCoreAppHostwinx64PackageVersion>5.0.3</MicrosoftNETCoreAppHostwinx64PackageVersion>
+    <!-- Dependencies from https://github.com/dotnet/runtime -->
+    <MicrosoftNETCoreAppInternalPackageVersion>5.0.4-servicing.21116.14</MicrosoftNETCoreAppInternalPackageVersion>
+    <MicrosoftNETCoreAppRuntimewinx64PackageVersion>5.0.4</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
+    <MicrosoftNETCoreAppHostwinx64PackageVersion>5.0.4</MicrosoftNETCoreAppHostwinx64PackageVersion>
    <MicrosoftNETCoreAppRefPackageVersion>5.0.0</MicrosoftNETCoreAppRefPackageVersion>
-    <MicrosoftNETCoreDotNetHostResolverPackageVersion>5.0.3</MicrosoftNETCoreDotNetHostResolverPackageVersion>
+    <MicrosoftNETCoreDotNetHostResolverPackageVersion>5.0.4</MicrosoftNETCoreDotNetHostResolverPackageVersion>
+    <MicrosoftNETCorePlatformsPackageVersion>5.0.1</MicrosoftNETCorePlatformsPackageVersion>
    <NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
+    <VSRedistCommonNetCoreTargetingPackx6450PackageVersion>5.0.0-rtm.20519.4</VSRedistCommonNetCoreTargetingPackx6450PackageVersion>
  </PropertyGroup>
  <PropertyGroup>
    <!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
-    <MicrosoftWindowsDesktopAppPackageVersion>5.0.3-servicing.21073.2</MicrosoftWindowsDesktopAppPackageVersion>
-    <MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>5.0.3</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
+    <MicrosoftWindowsDesktopAppPackageVersion>5.0.4-servicing.21117.6</MicrosoftWindowsDesktopAppPackageVersion>
+    <MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>5.0.4</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
    <MicrosoftWindowsDesktopAppRefPackageVersion>5.0.0</MicrosoftWindowsDesktopAppRefPackageVersion>
    <VSRedistCommonWindowsDesktopTargetingPackx6450PackageVersion>5.0.0-rtm.20520.1</VSRedistCommonWindowsDesktopTargetingPackx6450PackageVersion>
  </PropertyGroup>
--- a/eng/build.yml
+++ b/eng/build.yml
@ -43,10 +43,14 @@ phases:
      - _SignType: test
      - _BuildArgs: '/p:DotNetSignType=$(_SignType)'
      - _DOTNETCLIMSRC_READ_SAS_TOKEN: ''
+      - _InternalRuntimeDownloadArgs: ''

      - ${{ if eq(variables['System.TeamProject'], 'internal') }}:
        - group: DotNet-MSRC-Storage
        - _DOTNETCLIMSRC_READ_SAS_TOKEN: $(dotnetclimsrc-read-sas-token)
+        - name: _InternalRuntimeDownloadArgs
+          value: /p:DotNetRuntimeSourceFeed=https://dotnetclimsrc.blob.core.windows.net/dotnet
+            /p:DotNetRuntimeSourceFeedKey=$(dotnetclimsrc-read-sas-token-base64)

      - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
        - group: DotNet-Symbol-Server-PATs
@ -81,6 +85,7 @@ phases:
                  -Architecture $(_BuildArchitecture)
                  $(_BuildArgs)
                  $(_AdditionalBuildParameters)
+                  $(_InternalRuntimeDownloadArgs)
        displayName: Build
        env:
          DOTNET_CLI_UI_LANGUAGE: $(_DOTNET_CLI_UI_LANGUAGE)
@ -107,6 +112,7 @@ phases:
                  $(_RuntimeIdentifier)
                  $(_BuildArgs)
                  $(_AdditionalBuildParameters)
+                  $(_InternalRuntimeDownloadArgs)
        displayName: Build
        env:
          DOTNETCLIMSRC_READ_SAS_TOKEN: $(_DOTNETCLIMSRC_READ_SAS_TOKEN)
@ -119,6 +125,7 @@ phases:
                  --configuration $(_BuildConfig)
                  $(_BuildArgs)
                  $(_AdditionalBuildParameters)
+                  $(_InternalRuntimeDownloadArgs)
        displayName: Build
        env:
          DOTNETCLIMSRC_READ_SAS_TOKEN: $(_DOTNETCLIMSRC_READ_SAS_TOKEN)
--- a/src/redist/targets/GenerateLayout.targets
+++ b/src/redist/targets/GenerateLayout.targets
@ -16,7 +16,7 @@
    <WindowsDesktopBlobVersion>$(MicrosoftWindowsDesktopAppPackageVersion)</WindowsDesktopBlobVersion>

    <!-- Change these individually to or $(CoreSetupBlobVersion), $(AspNetCoreBlobVersion), or appropriate fixed version depending if corresponding .Ref packages are unpinned. -->
-    <NETCoreAppTargetingPackBlobVersion>5.0.0-rtm.20563.12</NETCoreAppTargetingPackBlobVersion>
+    <NETCoreAppTargetingPackBlobVersion>$(VSRedistCommonNetCoreTargetingPackx6450PackageVersion)</NETCoreAppTargetingPackBlobVersion>
    <AspNetCoreTargetingPackBlobVersion>$(MicrosoftAspNetCoreAppRefInternalPackageVersion)</AspNetCoreTargetingPackBlobVersion>
    <WindowsDesktopTargetingPackBlobVersion>$(VSRedistCommonWindowsDesktopTargetingPackx6450PackageVersion)</WindowsDesktopTargetingPackBlobVersion>
    <NETStandardTargetingPackBlobVersion>3.0.0</NETStandardTargetingPackBlobVersion>
@ -334,7 +334,7 @@

    <DownloadFile Condition=" '@(ComponentToDownload)' != '' And '%(ComponentToDownload.ShouldDownload)' == 'true'"
                  Uri="%(ComponentToDownload.BaseUrl)/%(ComponentToDownload.DownloadFileName)"
-                  PrivateUri="%(ComponentToDownload.PrivateBaseUrl)/%(ComponentToDownload.DownloadFileName)$(DOTNETCLIMSRC_READ_SAS_TOKEN)"
+                  PrivateUri="%(ComponentToDownload.PrivateBaseUrl)/%(ComponentToDownload.DownloadFileName)$([System.Environment]::GetEnvironmentVariable('DOTNETCLIMSRC_READ_SAS_TOKEN'))"
                  DestinationPath="%(ComponentToDownload.DownloadDestination)" />

    <ItemGroup>
--- a/test/EndToEnd/GivenWeWantToRequireWindowsForDesktopApps.cs
+++ b/test/EndToEnd/GivenWeWantToRequireWindowsForDesktopApps.cs
@ -3,6 +3,7 @@

 using System;
 using System.IO;
+using System.Xml.Linq;
 using EndToEnd;
 using FluentAssertions;
 using Microsoft.DotNet.Tools.Test.Utilities;
@ -48,7 +49,24 @@ namespace Microsoft.DotNet.Tests.EndToEnd
            testProjectCreator.AdditionalProperties["OutputType"] = "exe";
            testProjectCreator.AdditionalProperties["RuntimeIdentifier"] = Rid;

-            var testInstance = testProjectCreator.Create();
+            // At certain point of the release cycle LatestRuntimeFrameworkVersion in eng folder may not exist on the nuget feed
+            static void overrideLastRuntimeFrameworkVersionToExistingOlderVersion(XDocument project)
+            {
+                XNamespace ns = project.Root.Name.Namespace;
+                var target = XElement.Parse(@"  <ItemGroup>
+    <KnownFrameworkReference Update=""@(KnownFrameworkReference)"">
+      <LatestRuntimeFrameworkVersion Condition=""'%(TargetFramework)' == 'netcoreapp3.1'"">3.1.10</LatestRuntimeFrameworkVersion>
+    </KnownFrameworkReference>
+
+    <KnownAppHostPack Update=""@(KnownAppHostPack)"">
+      <AppHostPackVersion Condition=""'%(TargetFramework)' == 'netcoreapp3.1'"">3.1.10</AppHostPackVersion>
+    </KnownAppHostPack>
+  </ItemGroup>");
+                target.Name = ns + target.Name.LocalName;
+                project.Root.Add(target);
+            }
+            TestFramework.TestAssetInstance testInstance 
+                = testProjectCreator.Create().WithProjectChanges(overrideLastRuntimeFrameworkVersionToExistingOlderVersion);

            new PublishCommand()
                    .WithWorkingDirectory(testInstance.Root.FullName)
--- a/test/SdkTests/TestConfig.xml
+++ b/test/SdkTests/TestConfig.xml
@ -141,5 +141,30 @@
            Skip="true"
            Issue=""
            Reason="Need all .NET core runtime"/>
+
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishAFrameworkDependentApp.It_publishes_with_or_without_apphost"
+            Skip="true"
+            Issue=""
+            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishASingleFileApp.It_generates_a_single_file_including_pdbs"
+            Skip="true"
+            Issue=""
+            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishASelfContainedApp.It_can_make_a_Windows_GUI_exe"
+            Skip="true"
+            Issue=""
+            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishASingleFileApp.It_can_include_ni_pdbs_in_single_file"
+            Skip="true"
+            Issue=""
+            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
+    <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildANetCoreApp.It_runs_a_rid_specific_app_from_the_output_folder"
+            Skip="true"
+            Issue=""
+            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
+    <Method Name="Microsoft.NET.Build.Tests.GivenWeWantToRequireWindowsForDesktopApps.It_infers_WinExe_output_type"
+            Skip="true"
+            Issue=""
+            Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/>
  </SkippedTests>
 </Tests>