From 486395280b2e20dbfab401523b9baf8bdf86bd2e Mon Sep 17 00:00:00 2001
From: DotNet Bot <dn-bot@microsoft.com>
Date: Mon, 18 Jul 2022 22:22:57 +0000
Subject: [PATCH] Merged PR 24232: [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.WindowsDesktop.App.Ref**: from 6.0.8 to 6.0.8 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.8-servicing.22363.10 to 6.0.8-servicing.22368.4 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.8-servicing.22363.10 to 6.0.8-servicing.22368.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.8 to 6.0.8 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.8-servicing.22363.7 to 6.0.8-servicing.22368.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.8 to 6.0.8 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.8-servicing.22363.8 to 6.0.8-servicing.22368.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[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**: 20220718.19
- **Date Produced**: July 18, 2022 9:38:19 PM UTC
- **Commit**: 17ea4a71a1adac805a17c272977139ddc6200bf9
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.108-servicing.22368.7 to 6.0.108-servicing.22368.19][1]
  - **Microsoft.NET.Sdk**: [from 6.0.108-servicing.22368.7 to 6.0.108-servicing.22368.19][1]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.8 to 6.0.8][2]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.8-servicing.22363.10 to 6.0.8-servicing.22368.4][2]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.8-servicing.22363.10 to 6.0.8-servicing.22368.4][2]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.8 to 6.0.8][2]
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.8-servicing.22363.7 to 6.0.8-servicing.22368.4][3]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.8 to 6.0.8][2]
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.8-servicing.22363.8 to 6.0.8-servicing.22368.7][4]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC5a42b2d&targetVersion=GC17ea4a7&_a=files
[2]: https://dev.azure.com/dnceng/internal/_g...
---
 NuGet.config            |  4 ++--
 eng/Version.Details.xml | 28 ++++++++++++++--------------
 eng/Versions.props      | 12 ++++++------
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index bb5fc954d..8cac51c22 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -20,7 +20,7 @@
     <add key="darc-int-dotnet-templating-7334406" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-73344066/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
-    <add key="darc-int-dotnet-windowsdesktop-5905806" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-59058062/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-9195621" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-91956213/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" />
@@ -49,7 +49,7 @@
     <add key="darc-int-dotnet-templating-7334406" value="true" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
-    <add key="darc-int-dotnet-windowsdesktop-5905806" value="true" />
+    <add key="darc-int-dotnet-windowsdesktop-9195621" 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 6eb58ebd6..ebd08459f 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.8" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
-      <Sha>590580628cf9b02219cca72a73f218e468c5892b</Sha>
+      <Sha>919562130283931bdcd05a684af1421d1e962aa3</Sha>
     </Dependency>
-    <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0" Version="6.0.8-servicing.22363.10" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0" Version="6.0.8-servicing.22368.4" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
-      <Sha>590580628cf9b02219cca72a73f218e468c5892b</Sha>
+      <Sha>919562130283931bdcd05a684af1421d1e962aa3</Sha>
     </Dependency>
-    <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0" Version="6.0.8-servicing.22363.10" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0" Version="6.0.8-servicing.22368.4" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
-      <Sha>590580628cf9b02219cca72a73f218e468c5892b</Sha>
+      <Sha>919562130283931bdcd05a684af1421d1e962aa3</Sha>
     </Dependency>
     <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="6.0.8" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
-      <Sha>590580628cf9b02219cca72a73f218e468c5892b</Sha>
+      <Sha>919562130283931bdcd05a684af1421d1e962aa3</Sha>
     </Dependency>
     <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.8-servicing.22363.6" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -103,23 +103,23 @@
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
       <Sha>733440663a189f4c4de64f53bab82fd9382b9a3a</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk" Version="6.0.108-servicing.22368.7">
+    <Dependency Name="Microsoft.NET.Sdk" Version="6.0.108-servicing.22368.19">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>5a42b2d13276bc8f012a09589ad13842cb2e14d7</Sha>
+      <Sha>17ea4a71a1adac805a17c272977139ddc6200bf9</Sha>
       <SourceBuild RepoName="sdk" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.108-servicing.22368.7">
+    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.108-servicing.22368.19">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>5a42b2d13276bc8f012a09589ad13842cb2e14d7</Sha>
+      <Sha>17ea4a71a1adac805a17c272977139ddc6200bf9</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.8-servicing.22363.7" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.8-servicing.22368.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
-      <Sha>876ba0c47b9b4fd4b7d729b8a0fe1bea8c9f765f</Sha>
+      <Sha>bcdb000de284571bf5267aa3d052dee7918c1e6e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="6.0.8-servicing.22363.8" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="6.0.8-servicing.22368.7" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
-      <Sha>629fa4b5d72642eeb9a3931ad4d107594663c0f5</Sha>
+      <Sha>7a75fd34f53bc300206bd8cfc636527934dd17af</Sha>
     </Dependency>
     <Dependency Name="Microsoft.FSharp.Compiler" Version="12.0.0-beta.21522.2" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/dotnet/fsharp</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index bbe8f7ed1..b115ad60d 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.8-servicing.22363.7</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
+    <MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>6.0.8-servicing.22368.4</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/wpf -->
-    <MicrosoftDotNetWpfProjectTemplatesPackageVersion>6.0.8-servicing.22363.8</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
+    <MicrosoftDotNetWpfProjectTemplatesPackageVersion>6.0.8-servicing.22368.7</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/templating -->
@@ -56,8 +56,8 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/sdk -->
-    <MicrosoftNETSdkPackageVersion>6.0.108-servicing.22368.7</MicrosoftNETSdkPackageVersion>
-    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.108-servicing.22368.7</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+    <MicrosoftNETSdkPackageVersion>6.0.108-servicing.22368.19</MicrosoftNETSdkPackageVersion>
+    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.108-servicing.22368.19</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.8-servicing.22363.10</VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>
-    <VSRedistCommonWindowsDesktopTargetingPackx6460PackageVersion>6.0.8-servicing.22363.10</VSRedistCommonWindowsDesktopTargetingPackx6460PackageVersion>
+    <VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>6.0.8-servicing.22368.4</VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>
+    <VSRedistCommonWindowsDesktopTargetingPackx6460PackageVersion>6.0.8-servicing.22368.4</VSRedistCommonWindowsDesktopTargetingPackx6460PackageVersion>
     <MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>6.0.8</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
     <MicrosoftWindowsDesktopAppRefPackageVersion>6.0.8</MicrosoftWindowsDesktopAppRefPackageVersion>
   </PropertyGroup>