From 3bfdd9b80bdb27f3e4a7dec5fffe16a49db54a3a Mon Sep 17 00:00:00 2001
From: DotNet Bot <dn-bot@microsoft.com>
Date: Tue, 22 Aug 2023 22:03:34 +0000
Subject: [PATCH] Merged PR 33335: [internal/release/8.0.1xx-rc1] 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.AspNetCore.App.Ref**: from 8.0.0-rc.1.23421.17 to 8.0.0-rc.1.23421.29 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 8.0.0-rc.1.23421.17 to 8.0.0-rc.1.23421.29 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 8.0.0-rc.1.23421.17 to 8.0.0-rc.1.23421.29 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: from 8.0.0-rc.1.23421.17 to 8.0.0-rc.1.23421.29 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 8.0.0-rc.1.23421.17 to 8.0.0-rc.1.23421.29 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-jwts**: from 8.0.0-rc.1.23421.17 to 8.0.0-rc.1.23421.29 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 8.0.0-rc.1.23421.17 to 8.0.0-rc.1.23421.29 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

[marker]: <> (End:Coherency Updates)

[marker]: <> (Begin:87a23e77-90d2-4087-288b-08db9cf9af34)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: 87a23e77-90d2-4087-288b-08db9cf9af34
- **Build**: 20230822.10
- **Date Produced**: August 22, 2023 6:03:03 PM UTC
- **Commit**: 9e4cce057115cfe94da2c2c9143ae04226050046
- **Branch**: refs/heads/internal/release/8.0.1xx-rc1

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 8.0.100-rc.1.23421.12 to 8.0.100-rc.1.23422.10][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 8.0.100-rc.1.23421.12 to 8.0.100-rc.1.23422.10][1]
  - **Microsoft.NET.Sdk**: [from 8.0.100-rc.1.23421.12 to 8.0.100-rc.1.23422.10][1]
  - **Microsoft.TemplateEngine.Cli**: [from 8.0.100-rc.1.23421.12 to 8.0.100-rc.1.23422.10][1]
  - **Microsoft.AspNetCore.App.Ref**: [from 8.0.0-rc.1.23421.17 to 8.0.0-rc.1.23421.29][2]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 8.0.0-rc.1.23421.17 to 8.0.0-rc.1.23421.29][2]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 8.0.0-rc.1.23421.17 to 8.0.0-rc.1.23421.29][2]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: [from 8.0.0-rc.1.23421.17 to 8.0.0-rc.1.23421.29][2]
  - **dotnet-dev-certs**: [from 8.0.0-rc.1.23421.17 to 8.0.0-rc.1.23421.29][2]
  - **dotnet-user-jwts**: [from 8.0.0-rc.1.23421.17 to 8.0.0-rc.1.23421.29][2]
  - **dotnet-user-secrets**: [from 8.0.0-rc.1.23421.17 to 8.0.0-rc.1.23421.29][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCad2dbeae65&targetVersion=GC9e4cce0571&_a=files
[2]:...
---
 eng/Version.Details.xml                   | 48 +++++++++++------------
 eng/Versions.props                        | 22 +++++------
 src/redist/targets/GenerateLayout.targets |  5 ---
 3 files changed, 35 insertions(+), 40 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index f6eddec25..a4ad748bc 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -56,51 +56,51 @@
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
       <Sha>92959931a32a37a19d8e1b1684edc6db0857d7de</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.0-rc.1.23421.17" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.0-rc.1.23421.29" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>3ddcd4d95491d68d398291a93605a1daf8b80efc</Sha>
+      <Sha>8ad057426fa6a27cd648b05684afddab9d97d3d9</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="8.0.0-rc.1.23421.17" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="8.0.0-rc.1.23421.29" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>3ddcd4d95491d68d398291a93605a1daf8b80efc</Sha>
+      <Sha>8ad057426fa6a27cd648b05684afddab9d97d3d9</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="8.0.0-rc.1.23421.17" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="8.0.0-rc.1.23421.29" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>3ddcd4d95491d68d398291a93605a1daf8b80efc</Sha>
+      <Sha>8ad057426fa6a27cd648b05684afddab9d97d3d9</Sha>
       <SourceBuild RepoName="aspnetcore" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0" Version="8.0.0-rc.1.23421.17" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0" Version="8.0.0-rc.1.23421.29" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>3ddcd4d95491d68d398291a93605a1daf8b80efc</Sha>
+      <Sha>8ad057426fa6a27cd648b05684afddab9d97d3d9</Sha>
     </Dependency>
-    <Dependency Name="dotnet-dev-certs" Version="8.0.0-rc.1.23421.17" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="dotnet-dev-certs" Version="8.0.0-rc.1.23421.29" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>3ddcd4d95491d68d398291a93605a1daf8b80efc</Sha>
+      <Sha>8ad057426fa6a27cd648b05684afddab9d97d3d9</Sha>
     </Dependency>
-    <Dependency Name="dotnet-user-jwts" Version="8.0.0-rc.1.23421.17" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="dotnet-user-jwts" Version="8.0.0-rc.1.23421.29" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>3ddcd4d95491d68d398291a93605a1daf8b80efc</Sha>
+      <Sha>8ad057426fa6a27cd648b05684afddab9d97d3d9</Sha>
     </Dependency>
-    <Dependency Name="dotnet-user-secrets" Version="8.0.0-rc.1.23421.17" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="dotnet-user-secrets" Version="8.0.0-rc.1.23421.29" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>3ddcd4d95491d68d398291a93605a1daf8b80efc</Sha>
+      <Sha>8ad057426fa6a27cd648b05684afddab9d97d3d9</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="8.0.100-rc.1.23421.12">
+    <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="8.0.100-rc.1.23422.13">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>ad2dbeae65a1a7b33443bd05386fccf5c7928336</Sha>
+      <Sha>a8ab70ff0f36fa9702f7d25ac7392d12017ce9e1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.Cli" Version="8.0.100-rc.1.23421.12">
+    <Dependency Name="Microsoft.TemplateEngine.Cli" Version="8.0.100-rc.1.23422.13">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>ad2dbeae65a1a7b33443bd05386fccf5c7928336</Sha>
+      <Sha>a8ab70ff0f36fa9702f7d25ac7392d12017ce9e1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk" Version="8.0.100-rc.1.23421.12">
+    <Dependency Name="Microsoft.NET.Sdk" Version="8.0.100-rc.1.23422.13">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>ad2dbeae65a1a7b33443bd05386fccf5c7928336</Sha>
+      <Sha>a8ab70ff0f36fa9702f7d25ac7392d12017ce9e1</Sha>
       <SourceBuild RepoName="sdk" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="8.0.100-rc.1.23421.12">
+    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="8.0.100-rc.1.23422.13">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>ad2dbeae65a1a7b33443bd05386fccf5c7928336</Sha>
+      <Sha>a8ab70ff0f36fa9702f7d25ac7392d12017ce9e1</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22406.1">
       <Uri>https://github.com/dotnet/test-templates</Uri>
@@ -141,9 +141,9 @@
       <Sha>711de175bf0c7ddfda4005c3334606b90bb11146</Sha>
       <SourceBuild RepoName="fsharp" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.NET.Test.Sdk" Version="17.8.0-preview-23414-01" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.NET.Test.Sdk" Version="17.8.0-preview-23421-06" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/microsoft/vstest</Uri>
-      <Sha>5e505c8698fc4707a15fadb1190e9cc080d7aac0</Sha>
+      <Sha>5672d0f0d9433a9e2d97b9b7575fb2cc48579519</Sha>
       <SourceBuild RepoName="vstest" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-rc.1.23419.4" CoherentParentDependency="Microsoft.NET.Sdk">
diff --git a/eng/Versions.props b/eng/Versions.props
index 777387790..5fd5af4c3 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -71,22 +71,22 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/aspnet/AspNetCore -->
-    <MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>8.0.0-rc.1.23421.17</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
-    <MicrosoftAspNetCoreAppRefPackageVersion>8.0.0-rc.1.23421.17</MicrosoftAspNetCoreAppRefPackageVersion>
-    <MicrosoftAspNetCoreAppRefInternalPackageVersion>8.0.0-rc.1.23421.17</MicrosoftAspNetCoreAppRefInternalPackageVersion>
-    <VSRedistCommonAspNetCoreSharedFrameworkx6480PackageVersion>8.0.0-rc.1.23421.17</VSRedistCommonAspNetCoreSharedFrameworkx6480PackageVersion>
-    <dotnetdevcertsPackageVersion>8.0.0-rc.1.23421.17</dotnetdevcertsPackageVersion>
-    <dotnetuserjwtsPackageVersion>8.0.0-rc.1.23421.17</dotnetuserjwtsPackageVersion>
-    <dotnetusersecretsPackageVersion>8.0.0-rc.1.23421.17</dotnetusersecretsPackageVersion>
+    <MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>8.0.0-rc.1.23421.29</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
+    <MicrosoftAspNetCoreAppRefPackageVersion>8.0.0-rc.1.23421.29</MicrosoftAspNetCoreAppRefPackageVersion>
+    <MicrosoftAspNetCoreAppRefInternalPackageVersion>8.0.0-rc.1.23421.29</MicrosoftAspNetCoreAppRefInternalPackageVersion>
+    <VSRedistCommonAspNetCoreSharedFrameworkx6480PackageVersion>8.0.0-rc.1.23421.29</VSRedistCommonAspNetCoreSharedFrameworkx6480PackageVersion>
+    <dotnetdevcertsPackageVersion>8.0.0-rc.1.23421.29</dotnetdevcertsPackageVersion>
+    <dotnetuserjwtsPackageVersion>8.0.0-rc.1.23421.29</dotnetuserjwtsPackageVersion>
+    <dotnetusersecretsPackageVersion>8.0.0-rc.1.23421.29</dotnetusersecretsPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/sdk -->
-    <MicrosoftDotNetCommonItemTemplatesPackageVersion>8.0.100-rc.1.23421.12</MicrosoftDotNetCommonItemTemplatesPackageVersion>
-    <MicrosoftNETSdkPackageVersion>8.0.100-rc.1.23421.12</MicrosoftNETSdkPackageVersion>
-    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>8.0.100-rc.1.23421.12</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+    <MicrosoftDotNetCommonItemTemplatesPackageVersion>8.0.100-rc.1.23422.13</MicrosoftDotNetCommonItemTemplatesPackageVersion>
+    <MicrosoftNETSdkPackageVersion>8.0.100-rc.1.23422.13</MicrosoftNETSdkPackageVersion>
+    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>8.0.100-rc.1.23422.13</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
     <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
     <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
     <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
@@ -231,7 +231,7 @@
   <PropertyGroup>
     <VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion>
     <DotnetDebToolVersion>2.0.0</DotnetDebToolVersion>
-    <MicrosoftNETTestSdkVersion>17.8.0-preview-23414-01</MicrosoftNETTestSdkVersion>
+    <MicrosoftNETTestSdkVersion>17.8.0-preview-23421-06</MicrosoftNETTestSdkVersion>
     <MicrosoftExtensionsLoggingConsoleVersion>8.0.0-alpha.1.22557.12</MicrosoftExtensionsLoggingConsoleVersion>
   </PropertyGroup>
   <!-- Workload manifest package versions -->
diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets
index f12dd495f..bfb2078f5 100644
--- a/src/redist/targets/GenerateLayout.targets
+++ b/src/redist/targets/GenerateLayout.targets
@@ -382,11 +382,6 @@
         <DownloadDestination>%(ComponentToDownload.DownloadDestination)</DownloadDestination>
         <token>$(DotNetRuntimeSourceFeedKey)</token>
       </UrisToDownload>
-      <UrisToDownload Include="$([System.String]::Copy('%(ComponentToDownload.PrivateBaseUrl)').Replace($(InternalBaseURL), 'https://dotnetbuilds.blob.core.windows.net/internal/'))/%(ComponentToDownload.DownloadFileName)" Condition="'%(ComponentToDownload.ShouldDownload)' == 'true' and '$(DotNetRuntimeSourceFeedKey)' != ''">
-        <ShouldDownload>%(ComponentToDownload.ShouldDownload)</ShouldDownload>
-        <DownloadDestination>%(ComponentToDownload.DownloadDestination)</DownloadDestination>
-        <token>$(dotnetbuilds-internal-container-read-token-base64)</token>
-      </UrisToDownload>
     </ItemGroup>
     
     <DownloadFile Condition=" '@(UrisToDownload)' != '' and %(ShouldDownload)"