From de9a4b2f4b9f62cdf5b4a94cb66f9125e37b2a5c Mon Sep 17 00:00:00 2001
From: DotNet Bot <dn-bot@microsoft.com>
Date: Tue, 27 Sep 2022 04:17:31 +0000
Subject: [PATCH] Merged PR 26244: [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.WindowsDesktop.App.Ref**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.10-servicing.22470.9 to 6.0.10-servicing.22476.6 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.10-servicing.22470.9 to 6.0.10-servicing.22476.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.10-servicing.22476.12 to 6.0.10-servicing.22476.17 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.10-servicing.22470.3 to 6.0.10-servicing.22476.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.10 to 6.0.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.10-servicing.22470.7 to 6.0.10-servicing.22476.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[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**: 20220926.47
- **Date Produced**: September 27, 2022 3:41:49 AM UTC
- **Commit**: 0c33071e5eddb592a4b2122ec86afb2163873b6e
- **Branch**: refs/heads/internal/release/6.0.3xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.305-servicing.22476.32 to 6.0.305-servicing.22476.47][1]
  - **Microsoft.NET.Sdk**: [from 6.0.305-servicing.22476.32 to 6.0.305-servicing.22476.47][1]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.10 to 6.0.10][2]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.10-...
---
 NuGet.config            | 12 ++++-------
 eng/Version.Details.xml | 48 ++++++++++++++++++++---------------------
 eng/Versions.props      | 20 ++++++++---------
 3 files changed, 38 insertions(+), 42 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 6ad4589ff..02c6d9de0 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-9efc206" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-9efc206d/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-32e8c8c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-32e8c8ca/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-emsdk -->
     <!--  End: Package sources from dotnet-emsdk -->
@@ -26,9 +26,7 @@
     <add key="darc-int-dotnet-templating-4c6436d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-4c6436d0/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
-    <add key="darc-int-dotnet-windowsdesktop-6281f2d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-6281f2d8/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-windowsdesktop-6281f2d-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-6281f2d8-2/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-windowsdesktop-6281f2d-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-6281f2d8-1/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-74607da" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-74607da1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-windowsdesktop -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
     <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
@@ -55,7 +53,7 @@
     <add key="darc-int-DotNet-msbuild-Trusted-038f9ba" value="true" />
     <!--  End: Package sources from DotNet-msbuild-Trusted -->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
-    <add key="darc-int-dotnet-aspnetcore-9efc206" value="true" />
+    <add key="darc-int-dotnet-aspnetcore-32e8c8c" value="true" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-runtime -->
     <add key="darc-int-dotnet-runtime-5a400c2" value="true" />
@@ -63,9 +61,7 @@
     <add key="darc-int-dotnet-templating-4c6436d" value="true" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
-    <add key="darc-int-dotnet-windowsdesktop-6281f2d-1" value="true" />
-    <add key="darc-int-dotnet-windowsdesktop-6281f2d-2" value="true" />
-    <add key="darc-int-dotnet-windowsdesktop-6281f2d" value="true" />
+    <add key="darc-int-dotnet-windowsdesktop-74607da" value="true" />
     <!--  End: Package sources from dotnet-windowsdesktop -->
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 313ce9492..75778c857 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,19 +3,19 @@
   <ProductDependencies>
     <Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="6.0.10" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
-      <Sha>6281f2d8b6fdec03cffc91e31a134f6f6cc855df</Sha>
+      <Sha>74607da18cfa95417e1bddf02c80fb97e48c7f46</Sha>
     </Dependency>
-    <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0" Version="6.0.10-servicing.22470.9" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0" Version="6.0.10-servicing.22476.6" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
-      <Sha>6281f2d8b6fdec03cffc91e31a134f6f6cc855df</Sha>
+      <Sha>74607da18cfa95417e1bddf02c80fb97e48c7f46</Sha>
     </Dependency>
-    <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0" Version="6.0.10-servicing.22470.9" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0" Version="6.0.10-servicing.22476.6" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
-      <Sha>6281f2d8b6fdec03cffc91e31a134f6f6cc855df</Sha>
+      <Sha>74607da18cfa95417e1bddf02c80fb97e48c7f46</Sha>
     </Dependency>
     <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="6.0.10" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
-      <Sha>6281f2d8b6fdec03cffc91e31a134f6f6cc855df</Sha>
+      <Sha>74607da18cfa95417e1bddf02c80fb97e48c7f46</Sha>
     </Dependency>
     <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.10-servicing.22476.5" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -54,28 +54,28 @@
     </Dependency>
     <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="6.0.10" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>9efc206d0eec75172819678bbc4899d55ba01e9c</Sha>
+      <Sha>32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.10-servicing.22476.12" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.10-servicing.22476.17" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>9efc206d0eec75172819678bbc4899d55ba01e9c</Sha>
+      <Sha>32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173</Sha>
     </Dependency>
     <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="6.0.10" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>9efc206d0eec75172819678bbc4899d55ba01e9c</Sha>
+      <Sha>32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173</Sha>
       <SourceBuildTarball RepoName="aspnetcore" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.10-servicing.22476.12" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.10-servicing.22476.17" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>9efc206d0eec75172819678bbc4899d55ba01e9c</Sha>
+      <Sha>32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173</Sha>
     </Dependency>
-    <Dependency Name="dotnet-dev-certs" Version="6.0.10-servicing.22476.12" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="dotnet-dev-certs" Version="6.0.10-servicing.22476.17" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>9efc206d0eec75172819678bbc4899d55ba01e9c</Sha>
+      <Sha>32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173</Sha>
     </Dependency>
-    <Dependency Name="dotnet-user-secrets" Version="6.0.10-servicing.22476.12" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="dotnet-user-secrets" Version="6.0.10-servicing.22476.17" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>9efc206d0eec75172819678bbc4899d55ba01e9c</Sha>
+      <Sha>32e8c8cae5b1a4dd752d0a42a6f8a2813f75f173</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>
@@ -103,23 +103,23 @@
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
       <Sha>4c6436d0fb4378537a091f06432b306ea8ef383e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk" Version="6.0.305-servicing.22476.32">
+    <Dependency Name="Microsoft.NET.Sdk" Version="6.0.305-servicing.22476.47">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>5fd3362390628630252507a10e451f4877afe1c2</Sha>
+      <Sha>0c33071e5eddb592a4b2122ec86afb2163873b6e</Sha>
       <SourceBuild RepoName="sdk" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.305-servicing.22476.32">
+    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.305-servicing.22476.47">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>5fd3362390628630252507a10e451f4877afe1c2</Sha>
+      <Sha>0c33071e5eddb592a4b2122ec86afb2163873b6e</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.10-servicing.22470.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.10-servicing.22476.6" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
-      <Sha>24d64ba63551a0f0457d62b834d043292d090815</Sha>
+      <Sha>729cc7ccdec38bb23e6216a371293bb5ce738b5a</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="6.0.10-servicing.22470.7" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="6.0.10-servicing.22476.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
-      <Sha>bbe6a9e6d0da0f80a57f80914177691fd1f1b97e</Sha>
+      <Sha>3bbc77257e3d51a2e19195523eafd262da1f5459</Sha>
     </Dependency>
     <Dependency Name="Microsoft.FSharp.Compiler" Version="12.0.4-beta.22329.1" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/dotnet/fsharp</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 0b89a0a15..822921a85 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -23,11 +23,11 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/winforms -->
-    <MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>6.0.10-servicing.22470.3</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
+    <MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>6.0.10-servicing.22476.6</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/wpf -->
-    <MicrosoftDotNetWpfProjectTemplatesPackageVersion>6.0.10-servicing.22470.7</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
+    <MicrosoftDotNetWpfProjectTemplatesPackageVersion>6.0.10-servicing.22476.4</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/templating -->
@@ -46,18 +46,18 @@
     <!-- Dependencies from https://github.com/aspnet/AspNetCore -->
     <MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>6.0.10</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
     <MicrosoftAspNetCoreAppRefPackageVersion>6.0.10</MicrosoftAspNetCoreAppRefPackageVersion>
-    <MicrosoftAspNetCoreAppRefInternalPackageVersion>6.0.10-servicing.22476.12</MicrosoftAspNetCoreAppRefInternalPackageVersion>
-    <VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>6.0.10-servicing.22476.12</VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>
-    <dotnetdevcertsPackageVersion>6.0.10-servicing.22476.12</dotnetdevcertsPackageVersion>
-    <dotnetusersecretsPackageVersion>6.0.10-servicing.22476.12</dotnetusersecretsPackageVersion>
+    <MicrosoftAspNetCoreAppRefInternalPackageVersion>6.0.10-servicing.22476.17</MicrosoftAspNetCoreAppRefInternalPackageVersion>
+    <VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>6.0.10-servicing.22476.17</VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>
+    <dotnetdevcertsPackageVersion>6.0.10-servicing.22476.17</dotnetdevcertsPackageVersion>
+    <dotnetusersecretsPackageVersion>6.0.10-servicing.22476.17</dotnetusersecretsPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/sdk -->
-    <MicrosoftNETSdkPackageVersion>6.0.305-servicing.22476.32</MicrosoftNETSdkPackageVersion>
-    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.305-servicing.22476.32</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+    <MicrosoftNETSdkPackageVersion>6.0.305-servicing.22476.47</MicrosoftNETSdkPackageVersion>
+    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.305-servicing.22476.47</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
     <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
     <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
     <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
@@ -78,8 +78,8 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
-    <VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>6.0.10-servicing.22470.9</VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>
-    <VSRedistCommonWindowsDesktopTargetingPackx6460PackageVersion>6.0.10-servicing.22470.9</VSRedistCommonWindowsDesktopTargetingPackx6460PackageVersion>
+    <VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>6.0.10-servicing.22476.6</VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>
+    <VSRedistCommonWindowsDesktopTargetingPackx6460PackageVersion>6.0.10-servicing.22476.6</VSRedistCommonWindowsDesktopTargetingPackx6460PackageVersion>
     <MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>6.0.10</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
     <MicrosoftWindowsDesktopAppRefPackageVersion>6.0.10</MicrosoftWindowsDesktopAppRefPackageVersion>
   </PropertyGroup>