From 06fdcb17cf8251e8824bda41d1afd159e0bc431b Mon Sep 17 00:00:00 2001
From: DotNet Bot <dn-bot@microsoft.com>
Date: Sat, 25 Mar 2023 19:20:35 +0000
Subject: [PATCH] Merged PR 30244: [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**:
  - **Microsoft.AspNetCore.App.Ref**: from 6.0.16 to 6.0.16 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.16-servicing.23170.21 to 6.0.16-servicing.23174.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.16 to 6.0.16 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.16-servicing.23170.21 to 6.0.16-servicing.23174.6 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.16-servicing.23170.21 to 6.0.16-servicing.23174.6 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.16-servicing.23170.21 to 6.0.16-servicing.23174.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.311 to 6.0.311 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.311-servicing.23171.10 to 6.0.311-servicing.23174.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.311 to 6.0.311 (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**: 20230325.2
- **Date Produced**: March 25, 2023 4:40:55 PM UTC
- **Commit**: 502b4c216dd56bb1ebb5c93e8e356fde7f826de0
- **Branch**: refs/heads/internal/release/6.0.3xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.311-servicing.23174.12 to 6.0.311-servicing.23175.2][1]
  - **Microsoft.NET.Sdk**: [from 6.0.311-servicing.23174.12 to 6.0.311-servicing.23175.2][1]
  - **Microsoft.AspNetCore.App.Ref**: [from 6.0.16 to 6.0.16][2]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.16-servicing.23170.21 to 6.0.16-servicing.23174.6][2]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.16 to 6.0.16][2]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.16-servicing.23170.21 to 6.0.16-servicing.23174.6][2]
  - **dotnet-dev-certs**: [from 6.0.16-servicing.23170.21 to 6.0.16-servicing.23174.6][2]
  - **dotnet-user-secrets**: [from 6.0.16-servicing.23170.21 to 6.0.16-servicing.23174.6][2]
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.311 to 6.0.311][3]
  - **Microsoft.TemplateEngine.Cli**: [from 6.0.311-servicing.23171.10 to 6.0.311-servicing.23174.6][3]
  - **M...
---
 NuGet.config            |  8 ++++----
 eng/Version.Details.xml | 36 ++++++++++++++++++------------------
 eng/Versions.props      | 12 ++++++------
 3 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 4098d41cc..2c39ca7b0 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -7,7 +7,7 @@
     <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-41a6490" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-41a64905/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-d6f154c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-d6f154cc/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-emsdk -->
     <!--  End: Package sources from dotnet-emsdk -->
@@ -17,7 +17,7 @@
     <add key="darc-int-dotnet-runtime-1e620a4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-1e620a42/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
-    <add key="darc-int-dotnet-templating-76f9cf4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-76f9cf41/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-templating-3dcf189" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-3dcf1890/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <!--  End: Package sources from dotnet-windowsdesktop -->
@@ -40,12 +40,12 @@
     <!--  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-41a6490" value="true" />
+    <add key="darc-int-dotnet-aspnetcore-d6f154c" value="true" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-runtime -->
     <add key="darc-int-dotnet-runtime-1e620a4" value="true" />
     <!--  Begin: Package sources from dotnet-templating -->
-    <add key="darc-int-dotnet-templating-76f9cf4" value="true" />
+    <add key="darc-int-dotnet-templating-3dcf189" value="true" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <!--  End: Package sources from dotnet-windowsdesktop -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index fb4fbe85c..dba43af5e 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -54,28 +54,28 @@
     </Dependency>
     <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="6.0.16" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>41a64905967d6579041b042c2295820c2cf38578</Sha>
+      <Sha>d6f154cca3863703cf87c8b840eea9cbe20229b2</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.16-servicing.23170.21" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.16-servicing.23174.6" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>41a64905967d6579041b042c2295820c2cf38578</Sha>
+      <Sha>d6f154cca3863703cf87c8b840eea9cbe20229b2</Sha>
     </Dependency>
     <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="6.0.16" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>41a64905967d6579041b042c2295820c2cf38578</Sha>
+      <Sha>d6f154cca3863703cf87c8b840eea9cbe20229b2</Sha>
       <SourceBuildTarball RepoName="aspnetcore" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.16-servicing.23170.21" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.16-servicing.23174.6" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>41a64905967d6579041b042c2295820c2cf38578</Sha>
+      <Sha>d6f154cca3863703cf87c8b840eea9cbe20229b2</Sha>
     </Dependency>
-    <Dependency Name="dotnet-dev-certs" Version="6.0.16-servicing.23170.21" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="dotnet-dev-certs" Version="6.0.16-servicing.23174.6" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>41a64905967d6579041b042c2295820c2cf38578</Sha>
+      <Sha>d6f154cca3863703cf87c8b840eea9cbe20229b2</Sha>
     </Dependency>
-    <Dependency Name="dotnet-user-secrets" Version="6.0.16-servicing.23170.21" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="dotnet-user-secrets" Version="6.0.16-servicing.23174.6" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>41a64905967d6579041b042c2295820c2cf38578</Sha>
+      <Sha>d6f154cca3863703cf87c8b840eea9cbe20229b2</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>
@@ -92,25 +92,25 @@
     </Dependency>
     <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="6.0.311" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
-      <Sha>76f9cf41a0925eee8c85b78a0cb8aaaedab162cf</Sha>
+      <Sha>3dcf1890238ad2d1685b4d45f361634f69d1ddc1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.311-servicing.23171.10" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.311-servicing.23174.6" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
-      <Sha>76f9cf41a0925eee8c85b78a0cb8aaaedab162cf</Sha>
+      <Sha>3dcf1890238ad2d1685b4d45f361634f69d1ddc1</Sha>
       <SourceBuild RepoName="templating" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.DotNet.Common.ProjectTemplates.6.0" Version="6.0.311" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
-      <Sha>76f9cf41a0925eee8c85b78a0cb8aaaedab162cf</Sha>
+      <Sha>3dcf1890238ad2d1685b4d45f361634f69d1ddc1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk" Version="6.0.311-servicing.23174.12">
+    <Dependency Name="Microsoft.NET.Sdk" Version="6.0.311-servicing.23175.2">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>1aa97e5123b778879c2329bfd15bcbfa187da318</Sha>
+      <Sha>502b4c216dd56bb1ebb5c93e8e356fde7f826de0</Sha>
       <SourceBuild RepoName="sdk" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.311-servicing.23174.12">
+    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.311-servicing.23175.2">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>1aa97e5123b778879c2329bfd15bcbfa187da318</Sha>
+      <Sha>502b4c216dd56bb1ebb5c93e8e356fde7f826de0</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.16-servicing.23171.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
diff --git a/eng/Versions.props b/eng/Versions.props
index 57fb53149..afc1ffcf2 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -46,18 +46,18 @@
     <!-- Dependencies from https://github.com/aspnet/AspNetCore -->
     <MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>6.0.16</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
     <MicrosoftAspNetCoreAppRefPackageVersion>6.0.16</MicrosoftAspNetCoreAppRefPackageVersion>
-    <MicrosoftAspNetCoreAppRefInternalPackageVersion>6.0.16-servicing.23170.21</MicrosoftAspNetCoreAppRefInternalPackageVersion>
-    <VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>6.0.16-servicing.23170.21</VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>
-    <dotnetdevcertsPackageVersion>6.0.16-servicing.23170.21</dotnetdevcertsPackageVersion>
-    <dotnetusersecretsPackageVersion>6.0.16-servicing.23170.21</dotnetusersecretsPackageVersion>
+    <MicrosoftAspNetCoreAppRefInternalPackageVersion>6.0.16-servicing.23174.6</MicrosoftAspNetCoreAppRefInternalPackageVersion>
+    <VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>6.0.16-servicing.23174.6</VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>
+    <dotnetdevcertsPackageVersion>6.0.16-servicing.23174.6</dotnetdevcertsPackageVersion>
+    <dotnetusersecretsPackageVersion>6.0.16-servicing.23174.6</dotnetusersecretsPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/sdk -->
-    <MicrosoftNETSdkPackageVersion>6.0.311-servicing.23174.12</MicrosoftNETSdkPackageVersion>
-    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.311-servicing.23174.12</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+    <MicrosoftNETSdkPackageVersion>6.0.311-servicing.23175.2</MicrosoftNETSdkPackageVersion>
+    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.311-servicing.23175.2</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
     <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
     <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
     <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>