From 6f2c3204ac12da6ecec49d2fdf532cf83acc5bcd Mon Sep 17 00:00:00 2001
From: DotNet Bot <dn-bot@microsoft.com>
Date: Mon, 22 May 2023 15:28:14 +0000
Subject: [PATCH] Merged PR 31446: [internal/release/6.0.3xx] 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**:
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.18-servicing.23268.10 to 6.0.18-servicing.23269.7 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Ref**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.18-servicing.23268.10 to 6.0.18-servicing.23269.7 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.Platforms**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.18-servicing.23268.16 to 6.0.18-servicing.23269.9 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.18-servicing.23268.16 to 6.0.18-servicing.23269.9 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.18-servicing.23268.16 to 6.0.18-servicing.23269.9 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.18-servicing.23268.16 to 6.0.18-servicing.23269.9 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9
- **Build**: 20230522.7
- **Date Produced**: May 22, 2023 2:54:27 PM UTC
- **Commit**: fb967c6347d470d72897e1bd1e0fe1bc9d3e997a
- **Branch**: refs/heads/internal/release/6.0.3xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.313-servicing.23269.19 to 6.0.313-servicing.23272.7][1]
  - **Microsoft.NET.Sdk**: [from 6.0.313-servicing.23269.19 to 6.0.313-servicing.23272.7][1]
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.18-servicing.23268.10 to 6.0.18-servicing.23269.7][2]
  - **Microsoft.NETCore.App.Ref**: [from 6.0.18 to 6.0.18][2]
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.18-servicing.23268.10 to 6.0.18-servicing.23269.7][2]
  - **Microsoft.NETCore.App.Runt...
---
 NuGet.config            |  8 +++----
 eng/Version.Details.xml | 46 ++++++++++++++++++++---------------------
 eng/Versions.props      | 16 +++++++-------
 3 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 68b334424..4ae07eb47 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -7,14 +7,14 @@
     <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-119232c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-119232c9/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-be51b1a" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-be51b1aa/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-emsdk -->
     <!--  End: Package sources from dotnet-emsdk -->
     <!--  Begin: Package sources from DotNet-msbuild-Trusted -->
     <!--  End: Package sources from DotNet-msbuild-Trusted -->
     <!--  Begin: Package sources from dotnet-runtime -->
-    <add key="darc-int-dotnet-runtime-320aeb7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-320aeb73/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-runtime-c76ac56" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-c76ac565/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
     <add key="darc-int-dotnet-templating-5d160bc" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-5d160bc1/nuget/v3/index.json" />
@@ -41,10 +41,10 @@
     <!--  Begin: Package sources from DotNet-msbuild-Trusted -->
     <!--  End: Package sources from DotNet-msbuild-Trusted -->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
-    <add key="darc-int-dotnet-aspnetcore-119232c" value="true" />
+    <add key="darc-int-dotnet-aspnetcore-be51b1a" value="true" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-runtime -->
-    <add key="darc-int-dotnet-runtime-320aeb7" value="true" />
+    <add key="darc-int-dotnet-runtime-c76ac56" value="true" />
     <!--  Begin: Package sources from dotnet-templating -->
     <add key="darc-int-dotnet-templating-5d160bc" value="true" />
     <!--  End: Package sources from dotnet-templating -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index d566c0058..2a4767c38 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -17,30 +17,30 @@
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
       <Sha>6cc1fd96eb2b8be53291236de88a007ac81f99bf</Sha>
     </Dependency>
-    <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.18-servicing.23268.10" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.18-servicing.23269.7" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>320aeb73d891e262d000327191c61a0f74e2e918</Sha>
+      <Sha>c76ac565499f3e7c657126d46c00b67a0d74832c</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.18" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>320aeb73d891e262d000327191c61a0f74e2e918</Sha>
+      <Sha>c76ac565499f3e7c657126d46c00b67a0d74832c</Sha>
     </Dependency>
-    <Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.6.0" Version="6.0.18-servicing.23268.10" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.6.0" Version="6.0.18-servicing.23269.7" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>320aeb73d891e262d000327191c61a0f74e2e918</Sha>
+      <Sha>c76ac565499f3e7c657126d46c00b67a0d74832c</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.18" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>320aeb73d891e262d000327191c61a0f74e2e918</Sha>
+      <Sha>c76ac565499f3e7c657126d46c00b67a0d74832c</Sha>
       <SourceBuildTarball RepoName="runtime" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="6.0.18" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>320aeb73d891e262d000327191c61a0f74e2e918</Sha>
+      <Sha>c76ac565499f3e7c657126d46c00b67a0d74832c</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="6.0.18" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>320aeb73d891e262d000327191c61a0f74e2e918</Sha>
+      <Sha>c76ac565499f3e7c657126d46c00b67a0d74832c</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. -->
@@ -50,32 +50,32 @@
     </Dependency>
     <Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.10" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>320aeb73d891e262d000327191c61a0f74e2e918</Sha>
+      <Sha>c76ac565499f3e7c657126d46c00b67a0d74832c</Sha>
     </Dependency>
     <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="6.0.18" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>119232c91c39668e983be4558d944dc81115b434</Sha>
+      <Sha>be51b1aa73343e45a1d00afd436abad794f471fb</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.18-servicing.23268.16" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.18-servicing.23269.9" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>119232c91c39668e983be4558d944dc81115b434</Sha>
+      <Sha>be51b1aa73343e45a1d00afd436abad794f471fb</Sha>
     </Dependency>
     <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="6.0.18" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>119232c91c39668e983be4558d944dc81115b434</Sha>
+      <Sha>be51b1aa73343e45a1d00afd436abad794f471fb</Sha>
       <SourceBuildTarball RepoName="aspnetcore" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.18-servicing.23268.16" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.18-servicing.23269.9" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>119232c91c39668e983be4558d944dc81115b434</Sha>
+      <Sha>be51b1aa73343e45a1d00afd436abad794f471fb</Sha>
     </Dependency>
-    <Dependency Name="dotnet-dev-certs" Version="6.0.18-servicing.23268.16" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="dotnet-dev-certs" Version="6.0.18-servicing.23269.9" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>119232c91c39668e983be4558d944dc81115b434</Sha>
+      <Sha>be51b1aa73343e45a1d00afd436abad794f471fb</Sha>
     </Dependency>
-    <Dependency Name="dotnet-user-secrets" Version="6.0.18-servicing.23268.16" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="dotnet-user-secrets" Version="6.0.18-servicing.23269.9" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>119232c91c39668e983be4558d944dc81115b434</Sha>
+      <Sha>be51b1aa73343e45a1d00afd436abad794f471fb</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22207.1">
       <Uri>https://github.com/dotnet/test-templates</Uri>
@@ -103,14 +103,14 @@
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
       <Sha>5d160bc14947eb77de730179ef7bb3146a1d37e2</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk" Version="6.0.313-servicing.23269.19">
+    <Dependency Name="Microsoft.NET.Sdk" Version="6.0.313-servicing.23272.7">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>27e299c7e96eb96f798581d96cf0cf9d5917a340</Sha>
+      <Sha>fb967c6347d470d72897e1bd1e0fe1bc9d3e997a</Sha>
       <SourceBuild RepoName="sdk" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.313-servicing.23269.19">
+    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.313-servicing.23272.7">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>27e299c7e96eb96f798581d96cf0cf9d5917a340</Sha>
+      <Sha>fb967c6347d470d72897e1bd1e0fe1bc9d3e997a</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="6.0.18-servicing.23268.8" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
diff --git a/eng/Versions.props b/eng/Versions.props
index e76aa8468..0d027ccd4 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -46,18 +46,18 @@
     <!-- Dependencies from https://github.com/aspnet/AspNetCore -->
     <MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>6.0.18</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
     <MicrosoftAspNetCoreAppRefPackageVersion>6.0.18</MicrosoftAspNetCoreAppRefPackageVersion>
-    <MicrosoftAspNetCoreAppRefInternalPackageVersion>6.0.18-servicing.23268.16</MicrosoftAspNetCoreAppRefInternalPackageVersion>
-    <VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>6.0.18-servicing.23268.16</VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>
-    <dotnetdevcertsPackageVersion>6.0.18-servicing.23268.16</dotnetdevcertsPackageVersion>
-    <dotnetusersecretsPackageVersion>6.0.18-servicing.23268.16</dotnetusersecretsPackageVersion>
+    <MicrosoftAspNetCoreAppRefInternalPackageVersion>6.0.18-servicing.23269.9</MicrosoftAspNetCoreAppRefInternalPackageVersion>
+    <VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>6.0.18-servicing.23269.9</VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>
+    <dotnetdevcertsPackageVersion>6.0.18-servicing.23269.9</dotnetdevcertsPackageVersion>
+    <dotnetusersecretsPackageVersion>6.0.18-servicing.23269.9</dotnetusersecretsPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/sdk -->
-    <MicrosoftNETSdkPackageVersion>6.0.313-servicing.23269.19</MicrosoftNETSdkPackageVersion>
-    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.313-servicing.23269.19</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+    <MicrosoftNETSdkPackageVersion>6.0.313-servicing.23272.7</MicrosoftNETSdkPackageVersion>
+    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.313-servicing.23272.7</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
     <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
     <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
     <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
@@ -68,8 +68,8 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/core-setup -->
-    <VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.18-servicing.23268.10</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
-    <VSRedistCommonNetCoreTargetingPackx6460PackageVersion>6.0.18-servicing.23268.10</VSRedistCommonNetCoreTargetingPackx6460PackageVersion>
+    <VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.18-servicing.23269.7</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
+    <VSRedistCommonNetCoreTargetingPackx6460PackageVersion>6.0.18-servicing.23269.7</VSRedistCommonNetCoreTargetingPackx6460PackageVersion>
     <MicrosoftNETCoreAppRuntimewinx64PackageVersion>6.0.18</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
     <MicrosoftNETCoreAppHostwinx64PackageVersion>6.0.18</MicrosoftNETCoreAppHostwinx64PackageVersion>
     <MicrosoftNETCoreAppRefPackageVersion>6.0.18</MicrosoftNETCoreAppRefPackageVersion>