From 9fc16b3685bb747a9a7f784d4f58d3ade4b6e0b6 Mon Sep 17 00:00:00 2001
From: DotNet Bot <dn-bot@microsoft.com>
Date: Mon, 22 May 2023 21:28:02 +0000
Subject: [PATCH] Merged PR 31455: [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.DotNet.Common.ItemTemplates**: from 6.0.313 to 6.0.313 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.313-servicing.23268.21 to 6.0.313-servicing.23272.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.313 to 6.0.313 (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.16
- **Date Produced**: May 22, 2023 4:19:43 PM UTC
- **Commit**: 2d505333fdcbcff7e5344aa046c39452643ecc09
- **Branch**: refs/heads/internal/release/6.0.3xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.313-servicing.23272.7 to 6.0.313-servicing.23272.16][1]
  - **Microsoft.NET.Sdk**: [from 6.0.313-servicing.23272.7 to 6.0.313-servicing.23272.16][1]
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.313 to 6.0.313][2]
  - **Microsoft.TemplateEngine.Cli**: [from 6.0.313-servicing.23268.21 to 6.0.313-servicing.23272.6][2]
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.313 to 6.0.313][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCfb967c6347&targetVersion=GC2d505333fd&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC5d160bc149&targetVersion=GC61b9e8db59&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9)
---
 NuGet.config            |  4 ++--
 eng/Version.Details.xml | 16 ++++++++--------
 eng/Versions.props      |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 4ae07eb47..a663dd331 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -17,7 +17,7 @@
     <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" />
+    <add key="darc-int-dotnet-templating-61b9e8d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-61b9e8db/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-6cc1fd9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-6cc1fd96/nuget/v3/index.json" />
@@ -46,7 +46,7 @@
     <!--  Begin: Package sources from dotnet-runtime -->
     <add key="darc-int-dotnet-runtime-c76ac56" value="true" />
     <!--  Begin: Package sources from dotnet-templating -->
-    <add key="darc-int-dotnet-templating-5d160bc" value="true" />
+    <add key="darc-int-dotnet-templating-61b9e8d" value="true" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-6cc1fd9" value="true" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 2a4767c38..8b50d592a 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -92,25 +92,25 @@
     </Dependency>
     <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="6.0.313" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
-      <Sha>5d160bc14947eb77de730179ef7bb3146a1d37e2</Sha>
+      <Sha>61b9e8db59eccd3a3a20b247a54896dd977e134d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.313-servicing.23268.21" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.313-servicing.23272.6" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
-      <Sha>5d160bc14947eb77de730179ef7bb3146a1d37e2</Sha>
+      <Sha>61b9e8db59eccd3a3a20b247a54896dd977e134d</Sha>
       <SourceBuild RepoName="templating" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.DotNet.Common.ProjectTemplates.6.0" Version="6.0.313" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
-      <Sha>5d160bc14947eb77de730179ef7bb3146a1d37e2</Sha>
+      <Sha>61b9e8db59eccd3a3a20b247a54896dd977e134d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk" Version="6.0.313-servicing.23272.7">
+    <Dependency Name="Microsoft.NET.Sdk" Version="6.0.313-servicing.23272.16">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>fb967c6347d470d72897e1bd1e0fe1bc9d3e997a</Sha>
+      <Sha>2d505333fdcbcff7e5344aa046c39452643ecc09</Sha>
       <SourceBuild RepoName="sdk" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.313-servicing.23272.7">
+    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.313-servicing.23272.16">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>fb967c6347d470d72897e1bd1e0fe1bc9d3e997a</Sha>
+      <Sha>2d505333fdcbcff7e5344aa046c39452643ecc09</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 0d027ccd4..56d20d0f0 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -56,8 +56,8 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/sdk -->
-    <MicrosoftNETSdkPackageVersion>6.0.313-servicing.23272.7</MicrosoftNETSdkPackageVersion>
-    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.313-servicing.23272.7</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+    <MicrosoftNETSdkPackageVersion>6.0.313-servicing.23272.16</MicrosoftNETSdkPackageVersion>
+    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.313-servicing.23272.16</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
     <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
     <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
     <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>