From 5d7b9b0cf16dbccdb61543bcab334d194dfbeb7d Mon Sep 17 00:00:00 2001
From: DotNet Bot <dn-bot@microsoft.com>
Date: Tue, 24 Jan 2023 18:20:24 +0000
Subject: [PATCH] Merged PR 29155: [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.AspNetCore.App.Ref**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.14-servicing.23070.15 to 6.0.14-servicing.23074.3 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.14-servicing.23070.15 to 6.0.14-servicing.23074.3 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.14-servicing.23070.15 to 6.0.14-servicing.23074.3 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.14-servicing.23070.15 to 6.0.14-servicing.23074.3 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.114 to 6.0.114 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.114-servicing.23070.9 to 6.0.114-servicing.23074.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.114 to 6.0.114 (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**: 20230124.15
- **Date Produced**: January 24, 2023 5:53:22 PM UTC
- **Commit**: 70e268dcc55cdc08f9b2f46db120e1780b062f26
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.114-servicing.23074.6 to 6.0.114-servicing.23074.15][1]
  - **Microsoft.NET.Sdk**: [from 6.0.114-servicing.23074.6 to 6.0.114-servicing.23074.15][1]
  - **Microsoft.AspNetCore.App.Ref**: [from 6.0.14 to 6.0.14][2]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.14-servicing.23070.15 to 6.0.14-servicing.23074.3][2]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.14 to 6.0.14][2]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.14-servicing.23070.15 to 6.0.14-servicing.23074.3][2]
  - **dotnet-dev-certs**: [from 6.0.14-servicing.23070.15 to 6.0.14-servicing.23074.3][2]
  - **dotnet-user-secrets**: [from 6.0.14-servicing.23070.15 to 6.0.14-servicing.23074.3][2]
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.114 to 6.0.114][3]
  - **Microsoft.TemplateEngine.Cli**: [from 6.0.114-servicing.23070.9 to 6.0.114-servicing.23074.4][3]
  - **...
---
 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 90404cfbffde..ecce922883d7 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-a1bfef7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-a1bfef7b/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-54e8b61" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-54e8b617/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-emsdk -->
     <add key="darc-pub-dotnet-emsdk-9f2e9f6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-9f2e9f6e/nuget/v3/index.json" />
@@ -18,7 +18,7 @@
     <add key="darc-int-dotnet-runtime-2a90daa" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2a90daa2/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
-    <add key="darc-int-dotnet-templating-b62a43a" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-b62a43a5/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-templating-629fc1a" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-629fc1a8/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-1312fab" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-1312fabe/nuget/v3/index.json" />
@@ -42,14 +42,14 @@
   <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-a1bfef7" value="true" />
+    <add key="darc-int-dotnet-aspnetcore-54e8b61" 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-2a90daa" value="true" />
     <!--  Begin: Package sources from dotnet-templating -->
-    <add key="darc-int-dotnet-templating-b62a43a" value="true" />
+    <add key="darc-int-dotnet-templating-629fc1a" value="true" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-1312fab" value="true" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 5ed463c2e3f2..cefe0184a90f 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.14" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>a1bfef7bb9b42d541075d352ba22e039d2e700eb</Sha>
+      <Sha>54e8b61777d42d2b10744d1987438ee5b8c0b24d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.14-servicing.23070.15" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.14-servicing.23074.3" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>a1bfef7bb9b42d541075d352ba22e039d2e700eb</Sha>
+      <Sha>54e8b61777d42d2b10744d1987438ee5b8c0b24d</Sha>
     </Dependency>
     <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="6.0.14" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>a1bfef7bb9b42d541075d352ba22e039d2e700eb</Sha>
+      <Sha>54e8b61777d42d2b10744d1987438ee5b8c0b24d</Sha>
       <SourceBuildTarball RepoName="aspnetcore" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.14-servicing.23070.15" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.14-servicing.23074.3" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>a1bfef7bb9b42d541075d352ba22e039d2e700eb</Sha>
+      <Sha>54e8b61777d42d2b10744d1987438ee5b8c0b24d</Sha>
     </Dependency>
-    <Dependency Name="dotnet-dev-certs" Version="6.0.14-servicing.23070.15" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="dotnet-dev-certs" Version="6.0.14-servicing.23074.3" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>a1bfef7bb9b42d541075d352ba22e039d2e700eb</Sha>
+      <Sha>54e8b61777d42d2b10744d1987438ee5b8c0b24d</Sha>
     </Dependency>
-    <Dependency Name="dotnet-user-secrets" Version="6.0.14-servicing.23070.15" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="dotnet-user-secrets" Version="6.0.14-servicing.23074.3" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>a1bfef7bb9b42d541075d352ba22e039d2e700eb</Sha>
+      <Sha>54e8b61777d42d2b10744d1987438ee5b8c0b24d</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>
@@ -92,25 +92,25 @@
     </Dependency>
     <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="6.0.114" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
-      <Sha>b62a43a54b753d428d7243f4ec1058a991e369bc</Sha>
+      <Sha>629fc1a8b3d53b551ea512c4f0294062dcd30afe</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.114-servicing.23070.9" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.114-servicing.23074.4" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
-      <Sha>b62a43a54b753d428d7243f4ec1058a991e369bc</Sha>
+      <Sha>629fc1a8b3d53b551ea512c4f0294062dcd30afe</Sha>
       <SourceBuild RepoName="templating" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.DotNet.Common.ProjectTemplates.6.0" Version="6.0.114" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
-      <Sha>b62a43a54b753d428d7243f4ec1058a991e369bc</Sha>
+      <Sha>629fc1a8b3d53b551ea512c4f0294062dcd30afe</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk" Version="6.0.114-servicing.23074.6">
+    <Dependency Name="Microsoft.NET.Sdk" Version="6.0.114-servicing.23074.15">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>5005a736e2825036e50a04be9930769c03f93572</Sha>
+      <Sha>70e268dcc55cdc08f9b2f46db120e1780b062f26</Sha>
       <SourceBuild RepoName="sdk" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.114-servicing.23074.6">
+    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.114-servicing.23074.15">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>5005a736e2825036e50a04be9930769c03f93572</Sha>
+      <Sha>70e268dcc55cdc08f9b2f46db120e1780b062f26</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.14-servicing.23070.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
diff --git a/eng/Versions.props b/eng/Versions.props
index b0b926e4fd86..db44d6a3dd71 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -46,18 +46,18 @@
     <!-- Dependencies from https://github.com/aspnet/AspNetCore -->
     <MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>6.0.14</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
     <MicrosoftAspNetCoreAppRefPackageVersion>6.0.14</MicrosoftAspNetCoreAppRefPackageVersion>
-    <MicrosoftAspNetCoreAppRefInternalPackageVersion>6.0.14-servicing.23070.15</MicrosoftAspNetCoreAppRefInternalPackageVersion>
-    <VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>6.0.14-servicing.23070.15</VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>
-    <dotnetdevcertsPackageVersion>6.0.14-servicing.23070.15</dotnetdevcertsPackageVersion>
-    <dotnetusersecretsPackageVersion>6.0.14-servicing.23070.15</dotnetusersecretsPackageVersion>
+    <MicrosoftAspNetCoreAppRefInternalPackageVersion>6.0.14-servicing.23074.3</MicrosoftAspNetCoreAppRefInternalPackageVersion>
+    <VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>6.0.14-servicing.23074.3</VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>
+    <dotnetdevcertsPackageVersion>6.0.14-servicing.23074.3</dotnetdevcertsPackageVersion>
+    <dotnetusersecretsPackageVersion>6.0.14-servicing.23074.3</dotnetusersecretsPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/sdk -->
-    <MicrosoftNETSdkPackageVersion>6.0.114-servicing.23074.6</MicrosoftNETSdkPackageVersion>
-    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.114-servicing.23074.6</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+    <MicrosoftNETSdkPackageVersion>6.0.114-servicing.23074.15</MicrosoftNETSdkPackageVersion>
+    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.114-servicing.23074.15</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
     <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
     <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
     <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>