From 198e1c4771fc6a8a19625159c5730c26ef00f3cf Mon Sep 17 00:00:00 2001
From: DotNet Bot <dn-bot@microsoft.com>
Date: Wed, 21 Jun 2023 20:50:04 +0000
Subject: [PATCH] Merged PR 32121: [internal/release/6.0] Update dependencies
 from dnceng/internal/dotnet-wpf

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.Private.Winforms**: from 6.0.20-servicing.23320.10 to 6.0.20-servicing.23321.4 (parent: Microsoft.DotNet.Wpf.GitHub)
  - **Microsoft.Private.Winforms**: from 6.0.20-servicing.23320.10 to 6.0.20-servicing.23321.4 (parent: Microsoft.DotNet.Wpf.GitHub)
  - **Microsoft.Private.Winforms**: from 6.0.20-servicing.23320.10 to 6.0.20-servicing.23321.4 (parent: Microsoft.DotNet.Wpf.GitHub)
  - **Microsoft.Private.Winforms**: from 6.0.20-servicing.23320.10 to 6.0.20-servicing.23321.4 (parent: Microsoft.DotNet.Wpf.GitHub)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.20-servicing.23320.10 to 6.0.20-servicing.23321.4 (parent: Microsoft.DotNet.Wpf.GitHub)

[DependencyUpdate]: <> (End)

[marker]: <> (End:Coherency Updates)

[marker]: <> (Begin:5b48321b-d791-47a4-da08-08d961c27f17)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-wpf
- **Subscription**: 5b48321b-d791-47a4-da08-08d961c27f17
- **Build**: 20230621.8
- **Date Produced**: June 21, 2023 7:42:54 PM UTC
- **Commit**: 0a2507dd214349c40c4f1e9aba2ce6a91e8675a8
- **Branch**: refs/heads/internal/release/6.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Wpf.GitHub**: [from 6.0.20-servicing.23321.5 to 6.0.20-servicing.23321.8][1]
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.20-servicing.23321.5 to 6.0.20-servicing.23321.8][1]
  - **Microsoft.NET.Sdk.WindowsDesktop**: [from 6.0.20-servicing.23321.5 to 6.0.20-servicing.23321.8][1]
  - **Microsoft.Private.Winforms**: [from 6.0.20-servicing.23320.10 to 6.0.20-servicing.23321.4][2]
  - **Microsoft.Private.Winforms**: [from 6.0.20-servicing.23320.10 to 6.0.20-servicing.23321.4][2]
  - **Microsoft.Private.Winforms**: [from 6.0.20-servicing.23320.10 to 6.0.20-servicing.23321.4][2]
  - **Microsoft.Private.Winforms**: [from 6.0.20-servicing.23320.10 to 6.0.20-servicing.23321.4][2]
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.20-servicing.23320.10 to 6.0.20-servicing.23321.4][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GC6298294127&targetVersion=GC0a2507dd21&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC2536781675&targetVersion=GC7f67c1539d&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:5b48321b-d791-47a4-da08-08d961c27f17)
---
 eng/Version.Details.xml | 20 ++++++++++----------
 eng/Versions.props      |  8 ++++----
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 82ff49cc9..cd2061898 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -5,17 +5,17 @@
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
       <Sha>a08d9ce2caf02455c0b825bcdc32974bdf769a80</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Private.Winforms" Version="6.0.20-servicing.23320.10" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
+    <Dependency Name="Microsoft.Private.Winforms" Version="6.0.20-servicing.23321.4" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
-      <Sha>2536781675df3fe4848e96605b0ee852fe3ee91b</Sha>
+      <Sha>7f67c1539dcfa02ef740306820b44a713bdcb525</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Wpf.GitHub" Version="6.0.20-servicing.23321.5">
+    <Dependency Name="Microsoft.DotNet.Wpf.GitHub" Version="6.0.20-servicing.23321.8">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
-      <Sha>6298294127ccd64bc544dae38d09a4cd6be1d7a0</Sha>
+      <Sha>0a2507dd214349c40c4f1e9aba2ce6a91e8675a8</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="6.0.20-servicing.23321.5">
+    <Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="6.0.20-servicing.23321.8">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
-      <Sha>6298294127ccd64bc544dae38d09a4cd6be1d7a0</Sha>
+      <Sha>0a2507dd214349c40c4f1e9aba2ce6a91e8675a8</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.20" CoherentParentDependency="Microsoft.Private.Winforms">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -29,13 +29,13 @@
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
       <Sha>a08d9ce2caf02455c0b825bcdc32974bdf769a80</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.20-servicing.23320.10" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
+    <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.20-servicing.23321.4" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
-      <Sha>2536781675df3fe4848e96605b0ee852fe3ee91b</Sha>
+      <Sha>7f67c1539dcfa02ef740306820b44a713bdcb525</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="6.0.20-servicing.23321.5">
+    <Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="6.0.20-servicing.23321.8">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
-      <Sha>6298294127ccd64bc544dae38d09a4cd6be1d7a0</Sha>
+      <Sha>0a2507dd214349c40c4f1e9aba2ce6a91e8675a8</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index 22f4662d2..95d17d534 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -19,8 +19,8 @@
     <NETCoreAppMaximumVersion>6.0</NETCoreAppMaximumVersion>
     <NETCoreAppFrameworkVersion>6.0</NETCoreAppFrameworkVersion>
     <NETCoreAppFramework>net$(NETCoreAppFrameworkVersion)</NETCoreAppFramework>
-    <MicrosoftDotnetWinFormsProjectTemplatesVersion>6.0.20-servicing.23320.10</MicrosoftDotnetWinFormsProjectTemplatesVersion>
-    <MicrosoftDotNetWpfProjectTemplatesVersion>6.0.20-servicing.23321.5</MicrosoftDotNetWpfProjectTemplatesVersion>
+    <MicrosoftDotnetWinFormsProjectTemplatesVersion>6.0.20-servicing.23321.4</MicrosoftDotnetWinFormsProjectTemplatesVersion>
+    <MicrosoftDotNetWpfProjectTemplatesVersion>6.0.20-servicing.23321.8</MicrosoftDotNetWpfProjectTemplatesVersion>
   </PropertyGroup>
   <!--
 
@@ -60,9 +60,9 @@
     <MicrosoftInternalRuntimeWindowsDesktopTransportVersion>6.0.20-servicing.23320.17</MicrosoftInternalRuntimeWindowsDesktopTransportVersion>
     <VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.20-servicing.23320.17</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
     <!-- winforms -->
-    <MicrosoftPrivateWinformsVersion>6.0.20-servicing.23320.10</MicrosoftPrivateWinformsVersion>
+    <MicrosoftPrivateWinformsVersion>6.0.20-servicing.23321.4</MicrosoftPrivateWinformsVersion>
     <!-- wpf -->
-    <MicrosoftDotNetWpfGitHubVersion>6.0.20-servicing.23321.5</MicrosoftDotNetWpfGitHubVersion>
+    <MicrosoftDotNetWpfGitHubVersion>6.0.20-servicing.23321.8</MicrosoftDotNetWpfGitHubVersion>
     <!-- Not auto-updated. -->
     <MicrosoftBuildVersion>15.7.179</MicrosoftBuildVersion>
     <MicrosoftBuildFrameworkVersion>$(MicrosoftBuildVersion)</MicrosoftBuildFrameworkVersion>