From 6ebd52b98d09a830c37f5c93dd68bb9f9c280c78 Mon Sep 17 00:00:00 2001
From: DotNet Bot <dn-bot@microsoft.com>
Date: Tue, 18 Apr 2023 16:36:41 +0000
Subject: [PATCH] Merged PR 30757: [internal/release/6.0.1xx] 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.NETCore.App.Ref**: from 6.0.17 to 6.0.17 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.17-servicing.23212.18 to 6.0.17-servicing.23217.9 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.17 to 6.0.17 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.17 to 6.0.17 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.17 to 6.0.17 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 6.0.17 to 6.0.17 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.17-servicing.23214.11 to 6.0.17-servicing.23217.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.17 to 6.0.17 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.17-servicing.23214.11 to 6.0.17-servicing.23217.10 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.17-servicing.23214.11 to 6.0.17-servicing.23217.10 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.17-servicing.23214.11 to 6.0.17-servicing.23217.10 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.17-servicing.23212.18 to 6.0.17-servicing.23217.9 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698
- **Build**: 20230418.4
- **Date Produced**: April 18, 2023 3:27:49 PM UTC
- **Commit**: d340d427e8ae0cc2039eb8f5801b9a5fd7b9345b
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.117-servicing.23216.6 to 6.0.117-servicing.23218.4][1]
  - **Microsoft.NET.Sdk**: [from 6.0.117-servicing.23216.6 to 6.0.117-servicing.23218.4][1]
  - **Microsoft.NETCore.App.Ref**: [from 6.0.17 to 6.0.17][2]
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.17-servicing.23212.18 to 6.0.17-servicing.23217.9][2]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.17 to 6.0.17][2]
  - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.17 to 6.0.17][2]
  - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.17 to 6.0.17][2]
  - **Microsoft.As...
---
 NuGet.config            | 15 ++++++++------
 eng/Version.Details.xml | 44 ++++++++++++++++++++---------------------
 eng/Versions.props      | 16 +++++++--------
 3 files changed, 39 insertions(+), 36 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 89ae0fb4e..82c9e4a45 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -7,22 +7,24 @@
     <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-876c25f" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-876c25fd/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-c5dca37" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-c5dca375/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-emsdk -->
     <add key="darc-pub-dotnet-emsdk-275d1fa" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-275d1fa1/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-emsdk-275d1fa-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-275d1fa1-1/nuget/v3/index.json" />
     <!--  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-ea0418c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-ea0418c9/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-runtime-ea0418c-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-ea0418c9-1/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-runtime-6e89d2b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-6e89d2b6/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
     <add key="darc-int-dotnet-templating-b8c3336" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-b8c3336a/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-templating-b8c3336-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-b8c3336a-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-cf2cbab" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-cf2cbab3/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-cf2cbab-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-cf2cbab3-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.-->
     <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
@@ -43,17 +45,18 @@
   <disabledPackageSources>
     <!--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-876c25f" value="true" />
+    <add key="darc-int-dotnet-aspnetcore-c5dca37" value="true" />
     <!--  Begin: Package sources from DotNet-msbuild-Trusted -->
     <!--  End: Package sources from DotNet-msbuild-Trusted -->
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-runtime -->
-    <add key="darc-int-dotnet-runtime-ea0418c-1" value="true" />
-    <add key="darc-int-dotnet-runtime-ea0418c" value="true" />
+    <add key="darc-int-dotnet-runtime-6e89d2b" value="true" />
     <!--  Begin: Package sources from dotnet-templating -->
+    <add key="darc-int-dotnet-templating-b8c3336-1" value="true" />
     <add key="darc-int-dotnet-templating-b8c3336" value="true" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
+    <add key="darc-int-dotnet-windowsdesktop-cf2cbab-1" value="true" />
     <add key="darc-int-dotnet-windowsdesktop-cf2cbab" value="true" />
     <!--  End: Package sources from dotnet-windowsdesktop -->
     <!--  End: Package sources from dotnet-runtime -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 147ff1972..240288f03 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>cf2cbab34d18c578eaced5a9429c6b2df3c471d0</Sha>
     </Dependency>
-    <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.17-servicing.23212.18" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.17-servicing.23217.9" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>ea0418c9be5fd59911882a59916c64fed035fb76</Sha>
+      <Sha>6e89d2b65b0f8fc739d861077a2665e94d03d875</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.17" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>ea0418c9be5fd59911882a59916c64fed035fb76</Sha>
+      <Sha>6e89d2b65b0f8fc739d861077a2665e94d03d875</Sha>
     </Dependency>
-    <Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.6.0" Version="6.0.17-servicing.23212.18" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.6.0" Version="6.0.17-servicing.23217.9" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>ea0418c9be5fd59911882a59916c64fed035fb76</Sha>
+      <Sha>6e89d2b65b0f8fc739d861077a2665e94d03d875</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.17" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>ea0418c9be5fd59911882a59916c64fed035fb76</Sha>
+      <Sha>6e89d2b65b0f8fc739d861077a2665e94d03d875</Sha>
       <SourceBuildTarball RepoName="runtime" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="6.0.17" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>ea0418c9be5fd59911882a59916c64fed035fb76</Sha>
+      <Sha>6e89d2b65b0f8fc739d861077a2665e94d03d875</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="6.0.17" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>ea0418c9be5fd59911882a59916c64fed035fb76</Sha>
+      <Sha>6e89d2b65b0f8fc739d861077a2665e94d03d875</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. -->
@@ -54,28 +54,28 @@
     </Dependency>
     <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="6.0.17" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>876c25fd1e9dcdc5a8514c891f7fe8dfdb1ed0c9</Sha>
+      <Sha>c5dca375ba37a494ac5b8a1e228a7ca8484613c1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.17-servicing.23214.11" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.17-servicing.23217.10" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>876c25fd1e9dcdc5a8514c891f7fe8dfdb1ed0c9</Sha>
+      <Sha>c5dca375ba37a494ac5b8a1e228a7ca8484613c1</Sha>
     </Dependency>
     <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="6.0.17" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>876c25fd1e9dcdc5a8514c891f7fe8dfdb1ed0c9</Sha>
+      <Sha>c5dca375ba37a494ac5b8a1e228a7ca8484613c1</Sha>
       <SourceBuildTarball RepoName="aspnetcore" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.17-servicing.23214.11" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.17-servicing.23217.10" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>876c25fd1e9dcdc5a8514c891f7fe8dfdb1ed0c9</Sha>
+      <Sha>c5dca375ba37a494ac5b8a1e228a7ca8484613c1</Sha>
     </Dependency>
-    <Dependency Name="dotnet-dev-certs" Version="6.0.17-servicing.23214.11" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="dotnet-dev-certs" Version="6.0.17-servicing.23217.10" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>876c25fd1e9dcdc5a8514c891f7fe8dfdb1ed0c9</Sha>
+      <Sha>c5dca375ba37a494ac5b8a1e228a7ca8484613c1</Sha>
     </Dependency>
-    <Dependency Name="dotnet-user-secrets" Version="6.0.17-servicing.23214.11" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="dotnet-user-secrets" Version="6.0.17-servicing.23217.10" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>876c25fd1e9dcdc5a8514c891f7fe8dfdb1ed0c9</Sha>
+      <Sha>c5dca375ba37a494ac5b8a1e228a7ca8484613c1</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22064.3">
       <Uri>https://github.com/dotnet/test-templates</Uri>
@@ -103,14 +103,14 @@
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
       <Sha>b8c3336aaeb266735521b3f71476df551bd06916</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk" Version="6.0.117-servicing.23216.6">
+    <Dependency Name="Microsoft.NET.Sdk" Version="6.0.117-servicing.23218.4">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>4bcf845ee20643a295f8a36e603a82698e0c22ff</Sha>
+      <Sha>d340d427e8ae0cc2039eb8f5801b9a5fd7b9345b</Sha>
       <SourceBuild RepoName="sdk" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.117-servicing.23216.6">
+    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.117-servicing.23218.4">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>4bcf845ee20643a295f8a36e603a82698e0c22ff</Sha>
+      <Sha>d340d427e8ae0cc2039eb8f5801b9a5fd7b9345b</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.17-servicing.23213.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
diff --git a/eng/Versions.props b/eng/Versions.props
index 535927639..320b5b824 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -46,18 +46,18 @@
     <!-- Dependencies from https://github.com/aspnet/AspNetCore -->
     <MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>6.0.17</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
     <MicrosoftAspNetCoreAppRefPackageVersion>6.0.17</MicrosoftAspNetCoreAppRefPackageVersion>
-    <MicrosoftAspNetCoreAppRefInternalPackageVersion>6.0.17-servicing.23214.11</MicrosoftAspNetCoreAppRefInternalPackageVersion>
-    <VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>6.0.17-servicing.23214.11</VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>
-    <dotnetdevcertsPackageVersion>6.0.17-servicing.23214.11</dotnetdevcertsPackageVersion>
-    <dotnetusersecretsPackageVersion>6.0.17-servicing.23214.11</dotnetusersecretsPackageVersion>
+    <MicrosoftAspNetCoreAppRefInternalPackageVersion>6.0.17-servicing.23217.10</MicrosoftAspNetCoreAppRefInternalPackageVersion>
+    <VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>6.0.17-servicing.23217.10</VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>
+    <dotnetdevcertsPackageVersion>6.0.17-servicing.23217.10</dotnetdevcertsPackageVersion>
+    <dotnetusersecretsPackageVersion>6.0.17-servicing.23217.10</dotnetusersecretsPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/sdk -->
-    <MicrosoftNETSdkPackageVersion>6.0.117-servicing.23216.6</MicrosoftNETSdkPackageVersion>
-    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.117-servicing.23216.6</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+    <MicrosoftNETSdkPackageVersion>6.0.117-servicing.23218.4</MicrosoftNETSdkPackageVersion>
+    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.117-servicing.23218.4</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.17-servicing.23212.18</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
-    <VSRedistCommonNetCoreTargetingPackx6460PackageVersion>6.0.17-servicing.23212.18</VSRedistCommonNetCoreTargetingPackx6460PackageVersion>
+    <VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.17-servicing.23217.9</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
+    <VSRedistCommonNetCoreTargetingPackx6460PackageVersion>6.0.17-servicing.23217.9</VSRedistCommonNetCoreTargetingPackx6460PackageVersion>
     <MicrosoftNETCoreAppRuntimewinx64PackageVersion>6.0.17</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
     <MicrosoftNETCoreAppHostwinx64PackageVersion>6.0.17</MicrosoftNETCoreAppHostwinx64PackageVersion>
     <MicrosoftNETCoreAppRefPackageVersion>6.0.17</MicrosoftNETCoreAppRefPackageVersion>