From fb958f0c784ead4d72dc645dbe4dedeb7a01385a Mon Sep 17 00:00:00 2001
From: DotNet Bot <dn-bot@microsoft.com>
Date: Mon, 24 Oct 2022 03:58:27 +0000
Subject: [PATCH] Merged PR 27002: [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.11 to 6.0.11 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.11 to 6.0.11 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.306 to 6.0.306 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.306-servicing.22519.11 to 6.0.306-servicing.22523.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.306 to 6.0.306 (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**: 20221023.15
- **Date Produced**: October 24, 2022 3:27:24 AM UTC
- **Commit**: eeb998091f4302f58f636f1c75ee5150d5b940c1
- **Branch**: refs/heads/internal/release/6.0.3xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.306-servicing.22523.5 to 6.0.306-servicing.22523.15][1]
  - **Microsoft.NET.Sdk**: [from 6.0.306-servicing.22523.5 to 6.0.306-servicing.22523.15][1]
  - **Microsoft.AspNetCore.App.Ref**: [from 6.0.11 to 6.0.11][2]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4][2]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.11 to 6.0.11][2]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4][2]
  - **dotnet-dev-certs**: [from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4][2]
  - **dotnet-user-secrets**: [from 6.0.11-servicing.22518.17 to 6.0.11-servicing.22523.4][2]
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.306 to 6.0.306][3]
  - **Microsoft.TemplateEngine.Cli**: [from 6.0.306-servicing.22519.11 to 6.0.306-servicing.22523.5][3]
  - ...
---
 NuGet.config            | 14 ++++----------
 eng/Version.Details.xml | 36 ++++++++++++++++++------------------
 eng/Versions.props      | 12 ++++++------
 3 files changed, 28 insertions(+), 34 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index e5703141e..a302dd99f 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -7,9 +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-1f92829" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-1f928299/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-aspnetcore-1f92829-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-1f928299-2/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-aspnetcore-1f92829-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-1f928299-1/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-617d594" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-617d594f/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-emsdk -->
     <!--  End: Package sources from dotnet-emsdk -->
@@ -19,8 +17,7 @@
     <add key="darc-int-dotnet-runtime-943474c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-943474ca/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
-    <add key="darc-int-dotnet-templating-2198eb3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-2198eb3a/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-templating-2198eb3-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-2198eb3a-1/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-templating-84fa040" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-84fa0403/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-ab5b39e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-ab5b39ee/nuget/v3/index.json" />
@@ -45,15 +42,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-1f92829-1" value="true" />
-    <add key="darc-int-dotnet-aspnetcore-1f92829-2" value="true" />
-    <add key="darc-int-dotnet-aspnetcore-1f92829" value="true" />
+    <add key="darc-int-dotnet-aspnetcore-617d594" value="true" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-runtime -->
     <add key="darc-int-dotnet-runtime-943474c" value="true" />
     <!--  Begin: Package sources from dotnet-templating -->
-    <add key="darc-int-dotnet-templating-2198eb3-1" value="true" />
-    <add key="darc-int-dotnet-templating-2198eb3" value="true" />
+    <add key="darc-int-dotnet-templating-84fa040" value="true" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-ab5b39e-1" value="true" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index a364ec461..31dd91950 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.11" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>1f928299b4f7543976248e5a96abf8aa45ea5605</Sha>
+      <Sha>617d594f2bf75a8904d3d0e7d68a0bacf8e6763a</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.11-servicing.22518.17" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.11-servicing.22523.4" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>1f928299b4f7543976248e5a96abf8aa45ea5605</Sha>
+      <Sha>617d594f2bf75a8904d3d0e7d68a0bacf8e6763a</Sha>
     </Dependency>
     <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="6.0.11" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>1f928299b4f7543976248e5a96abf8aa45ea5605</Sha>
+      <Sha>617d594f2bf75a8904d3d0e7d68a0bacf8e6763a</Sha>
       <SourceBuildTarball RepoName="aspnetcore" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.11-servicing.22518.17" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.11-servicing.22523.4" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>1f928299b4f7543976248e5a96abf8aa45ea5605</Sha>
+      <Sha>617d594f2bf75a8904d3d0e7d68a0bacf8e6763a</Sha>
     </Dependency>
-    <Dependency Name="dotnet-dev-certs" Version="6.0.11-servicing.22518.17" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="dotnet-dev-certs" Version="6.0.11-servicing.22523.4" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>1f928299b4f7543976248e5a96abf8aa45ea5605</Sha>
+      <Sha>617d594f2bf75a8904d3d0e7d68a0bacf8e6763a</Sha>
     </Dependency>
-    <Dependency Name="dotnet-user-secrets" Version="6.0.11-servicing.22518.17" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="dotnet-user-secrets" Version="6.0.11-servicing.22523.4" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>1f928299b4f7543976248e5a96abf8aa45ea5605</Sha>
+      <Sha>617d594f2bf75a8904d3d0e7d68a0bacf8e6763a</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.306" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
-      <Sha>2198eb3a0ffe5e89b98096058f414f9a81dbe7a1</Sha>
+      <Sha>84fa0403a62bd95b9e1f29c00f4b4f8e605bfc7c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.306-servicing.22519.11" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.306-servicing.22523.5" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
-      <Sha>2198eb3a0ffe5e89b98096058f414f9a81dbe7a1</Sha>
+      <Sha>84fa0403a62bd95b9e1f29c00f4b4f8e605bfc7c</Sha>
       <SourceBuild RepoName="templating" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.DotNet.Common.ProjectTemplates.6.0" Version="6.0.306" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
-      <Sha>2198eb3a0ffe5e89b98096058f414f9a81dbe7a1</Sha>
+      <Sha>84fa0403a62bd95b9e1f29c00f4b4f8e605bfc7c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk" Version="6.0.306-servicing.22523.5">
+    <Dependency Name="Microsoft.NET.Sdk" Version="6.0.306-servicing.22523.15">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>bcf774aca16d2d8493f05a521ce03819bd195448</Sha>
+      <Sha>eeb998091f4302f58f636f1c75ee5150d5b940c1</Sha>
       <SourceBuild RepoName="sdk" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.306-servicing.22523.5">
+    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.306-servicing.22523.15">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>bcf774aca16d2d8493f05a521ce03819bd195448</Sha>
+      <Sha>eeb998091f4302f58f636f1c75ee5150d5b940c1</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.11-servicing.22519.5" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
diff --git a/eng/Versions.props b/eng/Versions.props
index c95db2a49..5c887fb39 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -46,18 +46,18 @@
     <!-- Dependencies from https://github.com/aspnet/AspNetCore -->
     <MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>6.0.11</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
     <MicrosoftAspNetCoreAppRefPackageVersion>6.0.11</MicrosoftAspNetCoreAppRefPackageVersion>
-    <MicrosoftAspNetCoreAppRefInternalPackageVersion>6.0.11-servicing.22518.17</MicrosoftAspNetCoreAppRefInternalPackageVersion>
-    <VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>6.0.11-servicing.22518.17</VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>
-    <dotnetdevcertsPackageVersion>6.0.11-servicing.22518.17</dotnetdevcertsPackageVersion>
-    <dotnetusersecretsPackageVersion>6.0.11-servicing.22518.17</dotnetusersecretsPackageVersion>
+    <MicrosoftAspNetCoreAppRefInternalPackageVersion>6.0.11-servicing.22523.4</MicrosoftAspNetCoreAppRefInternalPackageVersion>
+    <VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>6.0.11-servicing.22523.4</VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>
+    <dotnetdevcertsPackageVersion>6.0.11-servicing.22523.4</dotnetdevcertsPackageVersion>
+    <dotnetusersecretsPackageVersion>6.0.11-servicing.22523.4</dotnetusersecretsPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/sdk -->
-    <MicrosoftNETSdkPackageVersion>6.0.306-servicing.22523.5</MicrosoftNETSdkPackageVersion>
-    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.306-servicing.22523.5</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+    <MicrosoftNETSdkPackageVersion>6.0.306-servicing.22523.15</MicrosoftNETSdkPackageVersion>
+    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.306-servicing.22523.15</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
     <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
     <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
     <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>