From 14e7d3c0b176d7936d4a3510b60e5ff4f5bc83f1 Mon Sep 17 00:00:00 2001
From: DotNet Bot <dn-bot@microsoft.com>
Date: Thu, 22 Jun 2023 18:34:47 +0000
Subject: [PATCH] Merged PR 32179: [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.315 to 6.0.315 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.315-servicing.23320.9 to 6.0.315-servicing.23322.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.315 to 6.0.315 (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**: 20230622.9
- **Date Produced**: June 22, 2023 5:52:42 PM UTC
- **Commit**: 326d33693c0fc67483ad0da850d5f36ea5a078e8
- **Branch**: refs/heads/internal/release/6.0.3xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.315-servicing.23321.37 to 6.0.315-servicing.23322.9][1]
  - **Microsoft.NET.Sdk**: [from 6.0.315-servicing.23321.37 to 6.0.315-servicing.23322.9][1]
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.315 to 6.0.315][2]
  - **Microsoft.TemplateEngine.Cli**: [from 6.0.315-servicing.23320.9 to 6.0.315-servicing.23322.5][2]
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.315 to 6.0.315][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC942c2e51b7&targetVersion=GC326d33693c&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GCe058a95e92&targetVersion=GC3a75313bb4&_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 3fa4c7668..3453596a3 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -17,7 +17,7 @@
     <add key="darc-int-dotnet-runtime-a08d9ce" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-a08d9ce2/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
-    <add key="darc-int-dotnet-templating-e058a95" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-e058a95e/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-templating-3a75313" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-3a75313b/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-198e1c4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-198e1c47/nuget/v3/index.json" />
@@ -46,7 +46,7 @@
     <!--  Begin: Package sources from dotnet-runtime -->
     <add key="darc-int-dotnet-runtime-a08d9ce" value="true" />
     <!--  Begin: Package sources from dotnet-templating -->
-    <add key="darc-int-dotnet-templating-e058a95" value="true" />
+    <add key="darc-int-dotnet-templating-3a75313" value="true" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-198e1c4" value="true" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 6d72dc294..de3d76128 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.315" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
-      <Sha>e058a95e92f41e53e56790d1b2f7a4ba6e104034</Sha>
+      <Sha>3a75313bb4f23e7fb72e1d382e944351dd4fa473</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.315-servicing.23320.9" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.315-servicing.23322.5" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
-      <Sha>e058a95e92f41e53e56790d1b2f7a4ba6e104034</Sha>
+      <Sha>3a75313bb4f23e7fb72e1d382e944351dd4fa473</Sha>
       <SourceBuild RepoName="templating" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.DotNet.Common.ProjectTemplates.6.0" Version="6.0.315" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
-      <Sha>e058a95e92f41e53e56790d1b2f7a4ba6e104034</Sha>
+      <Sha>3a75313bb4f23e7fb72e1d382e944351dd4fa473</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk" Version="6.0.315-servicing.23321.37">
+    <Dependency Name="Microsoft.NET.Sdk" Version="6.0.315-servicing.23322.9">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>942c2e51b71ef5aaa289f5f2edd62db728e25201</Sha>
+      <Sha>326d33693c0fc67483ad0da850d5f36ea5a078e8</Sha>
       <SourceBuild RepoName="sdk" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.315-servicing.23321.37">
+    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.315-servicing.23322.9">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>942c2e51b71ef5aaa289f5f2edd62db728e25201</Sha>
+      <Sha>326d33693c0fc67483ad0da850d5f36ea5a078e8</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.20-servicing.23321.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
diff --git a/eng/Versions.props b/eng/Versions.props
index 2cfe4db3a..59c6bea8b 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.315-servicing.23321.37</MicrosoftNETSdkPackageVersion>
-    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.315-servicing.23321.37</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+    <MicrosoftNETSdkPackageVersion>6.0.315-servicing.23322.9</MicrosoftNETSdkPackageVersion>
+    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.315-servicing.23322.9</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
     <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
     <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
     <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>