From 71365b4d424b0860ceb9ad8ee47f7cd08c55c362 Mon Sep 17 00:00:00 2001
From: DotNet Bot <dn-bot@microsoft.com>
Date: Mon, 14 Dec 2020 19:42:58 +0000
Subject: [PATCH] [internal/release/5.0.1xx] Update dependencies from
 dnceng/internal/dotnet-sdk - Coherency Updates:   -
 Microsoft.WindowsDesktop.App: from 5.0.1-servicing.20580.3 to
 5.0.2-servicing.20613.4 (parent: Microsoft.NET.Sdk)   -
 Microsoft.NETCore.App.Internal: from 5.0.1-servicing.20575.16 to
 5.0.2-servicing.20611.20 (parent: Microsoft.NET.Sdk)   -
 Microsoft.NETCore.App.Runtime.win-x64: from 5.0.1 to 5.0.2 (parent:
 Microsoft.NET.Sdk)   - Microsoft.NETCore.App.Host.win-x64: from 5.0.1 to
 5.0.2 (parent: Microsoft.NET.Sdk)   - Microsoft.NETCore.DotNetHostResolver:
 from 5.0.1 to 5.0.2 (parent: Microsoft.NET.Sdk)   -
 VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0: from
 5.0.1-servicing.20601.7 to 5.0.2-servicing.20613.2 (parent:
 Microsoft.NET.Sdk)   - Microsoft.EntityFrameworkCore: from 5.0.1 to 5.0.2
 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)   -
 Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.1 to 5.0.2 (parent:
 Microsoft.NET.Sdk)   - dotnet-dev-certs: from 5.0.1-servicing.20601.7 to
 5.0.2-servicing.20613.2 (parent: Microsoft.NET.Sdk)   - dotnet-user-secrets:
 from 5.0.1-servicing.20601.7 to 5.0.2-servicing.20613.2 (parent:
 Microsoft.NET.Sdk)   - dotnet-watch: from 5.0.1-servicing.20601.7 to
 5.0.2-servicing.20613.2 (parent: Microsoft.NET.Sdk)   -
 Microsoft.DotNet.Common.ItemTemplates: from 5.0.1 to 5.0.2 (parent:
 Microsoft.NET.Sdk)   - Microsoft.Dotnet.WinForms.ProjectTemplates: from
 5.0.1-servicing.20575.6 to 5.0.2-servicing.20613.1 (parent:
 Microsoft.WindowsDesktop.App.Runtime.win-x64)   -
 Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.1 to 5.0.2 (parent:
 Microsoft.NET.Sdk)   - Microsoft.DotNet.Wpf.ProjectTemplates: from
 5.0.1-servicing.20580.1 to 5.0.2-servicing.20613.2 (parent:
 Microsoft.WindowsDesktop.App.Runtime.win-x64)   - Microsoft.NET.ILLink.Tasks:
 from 5.0.0-rtm.20604.1 to 5.0.0-rtm.20612.1 (parent: Microsoft.NET.Sdk)   -
 Microsoft.Build: from 16.8.0 to 16.8.3 (parent: Microsoft.NET.Sdk)

 - Try simpler fix

 - Revert attempts to fix base64 problem

 - Pass base64 token

 - Emptyness check

 - DOTNETCLIMSRC_READ_SAS_TOKEN_BASE64 agan

 - Another attempt to decode base64 token

 - DOTNETCLIMSRC_READ_SAS_TOKEN_BASE64/DOTNETCLIMSRC_READ_SAS_TOKEN confusion

 - Remove redundant DOTNETCLIMSRC_READ_SAS_TOKEN assignment

 - Attempt using base64 string

 - Fixup disabled package sources

 - Internal runtime download arguments
---
 NuGet.config                              |  28 +++++-
 eng/Version.Details.xml                   | 108 +++++++++++-----------
 eng/Versions.props                        |  32 +++----
 eng/build.yml                             |   7 ++
 src/redist/targets/GenerateLayout.targets |   2 +-
 5 files changed, 104 insertions(+), 73 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 9e48ae7d9f3c..40744f85e8f0 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -5,6 +5,26 @@
   </solution>
   <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-2670c12" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-2670c128/nuget/v3/index.json" />
+    <!--  End: Package sources from dotnet-aspnetcore -->
+    <!--  Begin: Package sources from dotnet-efcore -->
+    <add key="darc-int-dotnet-efcore-1ee6b62" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-efcore-1ee6b629/nuget/v3/index.json" />
+    <!--  End: Package sources from dotnet-efcore -->
+    <!--  Begin: Package sources from dotnet-msbuild -->
+    <add key="darc-pub-dotnet-msbuild-39993bd" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-msbuild-39993bd9/nuget/v3/index.json" />
+    <!--  End: Package sources from dotnet-msbuild -->
+    <!--  Begin: Package sources from dotnet-runtime -->
+    <add key="darc-int-dotnet-runtime-cb5f173" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-cb5f173b/nuget/v3/index.json" />
+    <!--  End: Package sources from dotnet-runtime -->
+    <!--  Begin: Package sources from dotnet-templating -->
+    <add key="darc-pub-dotnet-templating-568c09b" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-568c09b9/nuget/v3/index.json" />
+    <!--  End: Package sources from dotnet-templating -->
+    <!--  Begin: Package sources from dotnet-windowsdesktop -->
+    <add key="darc-int-dotnet-windowsdesktop-c0f7184" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-windowsdesktop-c0f71846/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" />
@@ -20,9 +40,13 @@
     <add key="darc-pub-dotnet-templating-247f60e9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-247f60e9/nuget/v3/index.json" />
   </packageSources>
   <disabledPackageSources>
-    <clear />
+    <!--  Begin: Package sources from dotnet-aspnetcore -->
+    <add key="darc-int-dotnet-aspnetcore-2670c12" value="true" />
+    <!--  End: Package sources from dotnet-aspnetcore -->
+    <add key="darc-int-dotnet-efcore-1ee6b62" value="true" />
+    <add key="darc-int-dotnet-runtime-cb5f173" value="true" />
+    <add key="darc-int-dotnet-windowsdesktop-c0f7184" value="true" />
     <!-- 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" />
   </disabledPackageSources>
 </configuration>
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 646cc9a2daa9..b231d516924d 100644
--- 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.1-servicing.20580.3" CoherentParentDependency="Microsoft.NET.Sdk">
-      <Uri>https://github.com/dotnet/windowsdesktop</Uri>
-      <Sha>cc1f119dc6ed7ca15c5d395cf7bdaa5c472f00e9</Sha>
+    <Dependency Name="Microsoft.WindowsDesktop.App" Version="5.0.2-servicing.20613.4" CoherentParentDependency="Microsoft.NET.Sdk">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
+      <Sha>c0f71846fb6ea631ffd2b4f6d3a9974c0897b901</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="5.0.1" CoherentParentDependency="Microsoft.NET.Sdk">
-      <Uri>https://github.com/dotnet/windowsdesktop</Uri>
-      <Sha>cc1f119dc6ed7ca15c5d395cf7bdaa5c472f00e9</Sha>
+    <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="5.0.2" CoherentParentDependency="Microsoft.NET.Sdk">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
+      <Sha>c0f71846fb6ea631ffd2b4f6d3a9974c0897b901</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,21 @@
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>cf258a14b70ad9069470a108f13765e0e5988f51</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Internal" Version="5.0.1-servicing.20575.16" CoherentParentDependency="Microsoft.NET.Sdk">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>b02e13abab3d6f499751af2ad1ae6333fb4e633d</Sha>
+    <Dependency Name="Microsoft.NETCore.App.Internal" Version="5.0.2-servicing.20611.20" CoherentParentDependency="Microsoft.NET.Sdk">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
+      <Sha>cb5f173b9696d9d00a544b953d95190ab3b56df2</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.1" CoherentParentDependency="Microsoft.NET.Sdk">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>b02e13abab3d6f499751af2ad1ae6333fb4e633d</Sha>
+    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.2" CoherentParentDependency="Microsoft.NET.Sdk">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
+      <Sha>cb5f173b9696d9d00a544b953d95190ab3b56df2</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="5.0.1" CoherentParentDependency="Microsoft.NET.Sdk">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>b02e13abab3d6f499751af2ad1ae6333fb4e633d</Sha>
+    <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="5.0.2" CoherentParentDependency="Microsoft.NET.Sdk">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
+      <Sha>cb5f173b9696d9d00a544b953d95190ab3b56df2</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="5.0.1" CoherentParentDependency="Microsoft.NET.Sdk">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>b02e13abab3d6f499751af2ad1ae6333fb4e633d</Sha>
+    <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="5.0.2" CoherentParentDependency="Microsoft.NET.Sdk">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
+      <Sha>cb5f173b9696d9d00a544b953d95190ab3b56df2</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,29 +55,29 @@
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
       <Sha>371a26f07b23ad77c636332c2dfc0cbd1d8137ba</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="5.0.1" CoherentParentDependency="Microsoft.NET.Sdk">
-      <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>fc93e595ceffbb1e3e85532bf454e92a6a80dd6b</Sha>
+    <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="5.0.2" CoherentParentDependency="Microsoft.NET.Sdk">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
+      <Sha>2670c128d522473e146ff9f8159bfffdfe694cd9</Sha>
     </Dependency>
-    <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0" Version="5.0.1-servicing.20601.7" CoherentParentDependency="Microsoft.NET.Sdk">
-      <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>fc93e595ceffbb1e3e85532bf454e92a6a80dd6b</Sha>
+    <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0" Version="5.0.2-servicing.20613.2" CoherentParentDependency="Microsoft.NET.Sdk">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
+      <Sha>2670c128d522473e146ff9f8159bfffdfe694cd9</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore" Version="5.0.1" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
-      <Uri>https://github.com/dotnet/efcore</Uri>
-      <Sha>494e218127bfb7afee3c9b10a30bcd32d6cd80db</Sha>
+    <Dependency Name="Microsoft.EntityFrameworkCore" Version="5.0.2" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
+      <Sha>1ee6b629b3437c0d45bfe3aa5703abdcc449231f</Sha>
     </Dependency>
-    <Dependency Name="dotnet-dev-certs" Version="5.0.1-servicing.20601.7" CoherentParentDependency="Microsoft.NET.Sdk">
-      <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>fc93e595ceffbb1e3e85532bf454e92a6a80dd6b</Sha>
+    <Dependency Name="dotnet-dev-certs" Version="5.0.2-servicing.20613.2" CoherentParentDependency="Microsoft.NET.Sdk">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
+      <Sha>2670c128d522473e146ff9f8159bfffdfe694cd9</Sha>
     </Dependency>
-    <Dependency Name="dotnet-user-secrets" Version="5.0.1-servicing.20601.7" CoherentParentDependency="Microsoft.NET.Sdk">
-      <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>fc93e595ceffbb1e3e85532bf454e92a6a80dd6b</Sha>
+    <Dependency Name="dotnet-user-secrets" Version="5.0.2-servicing.20613.2" CoherentParentDependency="Microsoft.NET.Sdk">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
+      <Sha>2670c128d522473e146ff9f8159bfffdfe694cd9</Sha>
     </Dependency>
-    <Dependency Name="dotnet-watch" Version="5.0.1-servicing.20601.7" CoherentParentDependency="Microsoft.NET.Sdk">
-      <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>fc93e595ceffbb1e3e85532bf454e92a6a80dd6b</Sha>
+    <Dependency Name="dotnet-watch" Version="5.0.2-servicing.20613.2" CoherentParentDependency="Microsoft.NET.Sdk">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
+      <Sha>2670c128d522473e146ff9f8159bfffdfe694cd9</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,26 +87,26 @@
       <Uri>https://github.com/dotnet/test-templates</Uri>
       <Sha>a2b05d8171915c69ad97ab5d49bbb07d2c780a67</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="5.0.1" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="5.0.2" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>9d3065efbe93ec1daaa4d59115b2887f6b36766a</Sha>
+      <Sha>568c09b99075179607c572f7b9f3ad3d706f1fc3</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk" Version="5.0.101-servicing.20604.7">
-      <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>c3a779b104eabb4bd859283919c96889d00d7f9c</Sha>
+    <Dependency Name="Microsoft.NET.Sdk" Version="5.0.102-servicing.20613.7">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
+      <Sha>ef14c79a16171496e2d972edd9a7874d596f624d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="5.0.101-servicing.20604.7">
-      <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>c3a779b104eabb4bd859283919c96889d00d7f9c</Sha>
+    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="5.0.102-servicing.20613.7">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
+      <Sha>ef14c79a16171496e2d972edd9a7874d596f624d</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.1-servicing.20575.6" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
-      <Uri>https://github.com/dotnet/winforms</Uri>
-      <Sha>200d7409fd9078764eb840e431bc3649caf3ad56</Sha>
+    <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="5.0.2-servicing.20613.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
+      <Sha>1a7d925a270d4eaca6e801de8b88b34b535091de</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="5.0.1-servicing.20580.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
-      <Uri>https://github.com/dotnet/wpf</Uri>
-      <Sha>f336060dde15d0aecaf37f3493f699134451fa8c</Sha>
+    <Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="5.0.2-servicing.20613.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
+      <Sha>89936f5f8d7ac99e04123f8f48754f252dfd9973</Sha>
     </Dependency>
     <Dependency Name="Microsoft.FSharp.Compiler" Version="11.0.0-beta.20507.4" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/dotnet/fsharp</Uri>
@@ -116,18 +116,18 @@
       <Uri>https://github.com/microsoft/vstest</Uri>
       <Sha>212656d7b384a506aa714999f678b3ace82d114e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="5.0.0-rtm.20604.1" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="5.0.0-rtm.20612.1" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/mono/linker</Uri>
-      <Sha>0497f2ad6a13fe9c240a1a79bb07bd1fcbc73b9d</Sha>
+      <Sha>25604250cf2663aed6630e305cc0538aeebda80a</Sha>
       <RepoName>linker</RepoName>
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.8.0-5.20604.10" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>9ed4b774d20940880de8df1ca8b07508aa01c8cd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Build" Version="16.8.0" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.Build" Version="16.8.3" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>126527ff107ae93fed10af675506c56d046aa5a3</Sha>
+      <Sha>39993bd9d02917993b6147a9973dc3aa6e9b00c7</Sha>
     </Dependency>
     <Dependency Name="NuGet.Build.Tasks" Version="5.8.0-rc.6930" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/NuGet/NuGet.Client</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index a9acc755a294..cfdbe2e7f7ae 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -23,15 +23,15 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/winforms -->
-    <MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>5.0.1-servicing.20575.6</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
+    <MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>5.0.2-servicing.20613.1</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/wpf -->
-    <MicrosoftDotNetWpfProjectTemplatesPackageVersion>5.0.1-servicing.20580.1</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
+    <MicrosoftDotNetWpfProjectTemplatesPackageVersion>5.0.2-servicing.20613.2</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/templating -->
-    <MicrosoftDotNetCommonItemTemplatesPackageVersion>5.0.1</MicrosoftDotNetCommonItemTemplatesPackageVersion>
+    <MicrosoftDotNetCommonItemTemplatesPackageVersion>5.0.2</MicrosoftDotNetCommonItemTemplatesPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/test-templates -->
@@ -43,21 +43,21 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/aspnet/AspNetCore -->
-    <MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>5.0.1</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
+    <MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>5.0.2</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
     <MicrosoftAspNetCoreAppRefPackageVersion>5.0.0</MicrosoftAspNetCoreAppRefPackageVersion>
     <MicrosoftAspNetCoreAppRefInternalPackageVersion>5.0.0-rtm.20526.5</MicrosoftAspNetCoreAppRefInternalPackageVersion>
-    <VSRedistCommonAspNetCoreSharedFrameworkx6450PackageVersion>5.0.1-servicing.20601.7</VSRedistCommonAspNetCoreSharedFrameworkx6450PackageVersion>
-    <dotnetdevcertsPackageVersion>5.0.1-servicing.20601.7</dotnetdevcertsPackageVersion>
-    <dotnetusersecretsPackageVersion>5.0.1-servicing.20601.7</dotnetusersecretsPackageVersion>
-    <dotnetwatchPackageVersion>5.0.1-servicing.20601.7</dotnetwatchPackageVersion>
+    <VSRedistCommonAspNetCoreSharedFrameworkx6450PackageVersion>5.0.2-servicing.20613.2</VSRedistCommonAspNetCoreSharedFrameworkx6450PackageVersion>
+    <dotnetdevcertsPackageVersion>5.0.2-servicing.20613.2</dotnetdevcertsPackageVersion>
+    <dotnetusersecretsPackageVersion>5.0.2-servicing.20613.2</dotnetusersecretsPackageVersion>
+    <dotnetwatchPackageVersion>5.0.2-servicing.20613.2</dotnetwatchPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/sdk -->
-    <MicrosoftNETSdkPackageVersion>5.0.101-servicing.20604.7</MicrosoftNETSdkPackageVersion>
-    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>5.0.101-servicing.20604.7</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+    <MicrosoftNETSdkPackageVersion>5.0.102-servicing.20613.7</MicrosoftNETSdkPackageVersion>
+    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>5.0.102-servicing.20613.7</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
     <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
     <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
     <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
@@ -68,17 +68,17 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/core-setup -->
-    <MicrosoftNETCoreAppInternalPackageVersion>5.0.1-servicing.20575.16</MicrosoftNETCoreAppInternalPackageVersion>
-    <MicrosoftNETCoreAppRuntimewinx64PackageVersion>5.0.1</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
-    <MicrosoftNETCoreAppHostwinx64PackageVersion>5.0.1</MicrosoftNETCoreAppHostwinx64PackageVersion>
+    <MicrosoftNETCoreAppInternalPackageVersion>5.0.2-servicing.20611.20</MicrosoftNETCoreAppInternalPackageVersion>
+    <MicrosoftNETCoreAppRuntimewinx64PackageVersion>5.0.2</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
+    <MicrosoftNETCoreAppHostwinx64PackageVersion>5.0.2</MicrosoftNETCoreAppHostwinx64PackageVersion>
     <MicrosoftNETCoreAppRefPackageVersion>5.0.0</MicrosoftNETCoreAppRefPackageVersion>
-    <MicrosoftNETCoreDotNetHostResolverPackageVersion>5.0.1</MicrosoftNETCoreDotNetHostResolverPackageVersion>
+    <MicrosoftNETCoreDotNetHostResolverPackageVersion>5.0.2</MicrosoftNETCoreDotNetHostResolverPackageVersion>
     <NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
-    <MicrosoftWindowsDesktopAppPackageVersion>5.0.1-servicing.20580.3</MicrosoftWindowsDesktopAppPackageVersion>
-    <MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>5.0.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
+    <MicrosoftWindowsDesktopAppPackageVersion>5.0.2-servicing.20613.4</MicrosoftWindowsDesktopAppPackageVersion>
+    <MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>5.0.2</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
     <MicrosoftWindowsDesktopAppRefPackageVersion>5.0.0</MicrosoftWindowsDesktopAppRefPackageVersion>
     <VSRedistCommonWindowsDesktopTargetingPackx6450PackageVersion>5.0.0-rtm.20520.1</VSRedistCommonWindowsDesktopTargetingPackx6450PackageVersion>
   </PropertyGroup>
diff --git a/eng/build.yml b/eng/build.yml
index 1293e3764d04..6190e078b710 100644
--- 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)
diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets
index d2a3ea0e155c..0523597ebaaa 100644
--- a/src/redist/targets/GenerateLayout.targets
+++ b/src/redist/targets/GenerateLayout.targets
@@ -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>