From 94730f874db2b109b4c5866d175e8a15a4e94d07 Mon Sep 17 00:00:00 2001
From: DotNet Bot <dn-bot@microsoft.com>
Date: Mon, 22 May 2023 14:32:22 +0000
Subject: [PATCH] Merged PR 31405: [internal/release/7.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 7.0.6 to 7.0.7 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.6-servicing.23213.14 to 7.0.7-servicing.23269.4 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.6-servicing.23213.14 to 7.0.7-servicing.23269.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.6 to 7.0.7 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.6-servicing.23213.5 to 7.0.7-servicing.23268.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.6 to 7.0.7 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.6-servicing.23213.10 to 7.0.7-servicing.23269.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651
- **Build**: 20230519.13
- **Date Produced**: May 19, 2023 8:25:09 PM UTC
- **Commit**: aebead6511cc0eaa9fbb84ecc7e8100f72c56532
- **Branch**: refs/heads/internal/release/7.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.107 to 7.0.107][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.107-servicing.23269.6 to 7.0.107-servicing.23269.13][1]
  - **Microsoft.NET.Sdk**: [from 7.0.107-servicing.23269.6 to 7.0.107-servicing.23269.13][1]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.107-servicing.23269.6 to 7.0.107-servicing.23269.13][1]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 7.0.6 to 7.0.7][2]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: [from 7.0.6-servicing.23213.14 to 7.0.7-servicing.23269.4][2]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: [from 7.0.6-servicing.23213.14 to 7.0.7-servicing.23269.4][2]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.6 to 7.0.7][2]
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 7.0.6-servicing.23213.5 to 7.0.7-servicing.23268.2][3]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.6 to 7.0.7][2]
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 7.0.6-servicing.23213.10 to 7.0.7-servicing.2...
---
 NuGet.config            | 12 ++++--------
 eng/Version.Details.xml | 38 +++++++++++++++++++-------------------
 eng/Versions.props      | 16 ++++++++--------
 3 files changed, 31 insertions(+), 35 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index a9fe44769..8b7bd22e2 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -19,12 +19,10 @@
     <add key="darc-int-dotnet-runtime-4906b56" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-4906b56c/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-sdk -->
-    <add key="darc-int-dotnet-sdk-9911a9f" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-9911a9f5/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-sdk-aebead6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-aebead65/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-sdk -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
-    <add key="darc-int-dotnet-windowsdesktop-0af2ffd" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0af2ffd3/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-windowsdesktop-0af2ffd-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0af2ffd3-3/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-windowsdesktop-0af2ffd-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0af2ffd3-1/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-2c4afc9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-2c4afc9f/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" />
@@ -51,12 +49,10 @@
     <!--  Begin: Package sources from dotnet-runtime -->
     <add key="darc-int-dotnet-runtime-4906b56" value="true" />
     <!--  Begin: Package sources from dotnet-sdk -->
-    <add key="darc-int-dotnet-sdk-9911a9f" value="true" />
+    <add key="darc-int-dotnet-sdk-aebead6" value="true" />
     <!--  End: Package sources from dotnet-sdk -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
-    <add key="darc-int-dotnet-windowsdesktop-0af2ffd-1" value="true" />
-    <add key="darc-int-dotnet-windowsdesktop-0af2ffd-3" value="true" />
-    <add key="darc-int-dotnet-windowsdesktop-0af2ffd" value="true" />
+    <add key="darc-int-dotnet-windowsdesktop-2c4afc9" value="true" />
     <!--  End: Package sources from dotnet-windowsdesktop -->
     <!--  End: Package sources from dotnet-runtime -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 644b674c2..eace9bc39 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="7.0.6" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="7.0.7" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
-      <Sha>0af2ffd343917ef04085946fb40e75474b391ccf</Sha>
+      <Sha>2c4afc9f20969377bcf289b20c039cab44deddbd</Sha>
     </Dependency>
-    <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0" Version="7.0.6-servicing.23213.14" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0" Version="7.0.7-servicing.23269.4" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
-      <Sha>0af2ffd343917ef04085946fb40e75474b391ccf</Sha>
+      <Sha>2c4afc9f20969377bcf289b20c039cab44deddbd</Sha>
     </Dependency>
-    <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0" Version="7.0.6-servicing.23213.14" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0" Version="7.0.7-servicing.23269.4" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
-      <Sha>0af2ffd343917ef04085946fb40e75474b391ccf</Sha>
+      <Sha>2c4afc9f20969377bcf289b20c039cab44deddbd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="7.0.6" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="7.0.7" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
-      <Sha>0af2ffd343917ef04085946fb40e75474b391ccf</Sha>
+      <Sha>2c4afc9f20969377bcf289b20c039cab44deddbd</Sha>
     </Dependency>
     <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.7-servicing.23268.2" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -100,29 +100,29 @@
     </Dependency>
     <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.107">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>9911a9f5d7c62b8213e2b33323c7714f2261135b</Sha>
+      <Sha>aebead6511cc0eaa9fbb84ecc7e8100f72c56532</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.107-servicing.23269.6">
+    <Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.107-servicing.23269.13">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>9911a9f5d7c62b8213e2b33323c7714f2261135b</Sha>
+      <Sha>aebead6511cc0eaa9fbb84ecc7e8100f72c56532</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk" Version="7.0.107-servicing.23269.6">
+    <Dependency Name="Microsoft.NET.Sdk" Version="7.0.107-servicing.23269.13">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>9911a9f5d7c62b8213e2b33323c7714f2261135b</Sha>
+      <Sha>aebead6511cc0eaa9fbb84ecc7e8100f72c56532</Sha>
       <SourceBuild RepoName="sdk" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.107-servicing.23269.6">
+    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.107-servicing.23269.13">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>9911a9f5d7c62b8213e2b33323c7714f2261135b</Sha>
+      <Sha>aebead6511cc0eaa9fbb84ecc7e8100f72c56532</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="7.0.6-servicing.23213.5" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.7-servicing.23268.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
-      <Sha>b3dce1f781e8f035f43da3d5eb11d4916d1be36f</Sha>
+      <Sha>fafc9aa56432f1e5728f082b222c3ef519b3dd59</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="7.0.6-servicing.23213.10" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="7.0.7-servicing.23269.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
-      <Sha>2c5505b6cdfe7e0be6283d8b2f9968139cc54087</Sha>
+      <Sha>bd4d958ccb657d11bbcd0d94f6f8a8c54e1c8c08</Sha>
     </Dependency>
     <Dependency Name="Microsoft.FSharp.Compiler" Version="12.4.0-beta.22571.5" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/dotnet/fsharp</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 1ffacd6cf..0f872a0d4 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -37,11 +37,11 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/winforms -->
-    <MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>7.0.6-servicing.23213.5</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
+    <MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>7.0.7-servicing.23268.2</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/wpf -->
-    <MicrosoftDotNetWpfProjectTemplatesPackageVersion>7.0.6-servicing.23213.10</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
+    <MicrosoftDotNetWpfProjectTemplatesPackageVersion>7.0.7-servicing.23269.2</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/test-templates -->
@@ -70,8 +70,8 @@
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/sdk -->
     <MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.107</MicrosoftDotNetCommonItemTemplatesPackageVersion>
-    <MicrosoftNETSdkPackageVersion>7.0.107-servicing.23269.6</MicrosoftNETSdkPackageVersion>
-    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.107-servicing.23269.6</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+    <MicrosoftNETSdkPackageVersion>7.0.107-servicing.23269.13</MicrosoftNETSdkPackageVersion>
+    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.107-servicing.23269.13</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
     <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
     <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
     <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
@@ -92,10 +92,10 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
-    <VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion>7.0.6-servicing.23213.14</VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion>
-    <VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion>7.0.6-servicing.23213.14</VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion>
-    <MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>7.0.6</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
-    <MicrosoftWindowsDesktopAppRefPackageVersion>7.0.6</MicrosoftWindowsDesktopAppRefPackageVersion>
+    <VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion>7.0.7-servicing.23269.4</VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion>
+    <VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion>7.0.7-servicing.23269.4</VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion>
+    <MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>7.0.7</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
+    <MicrosoftWindowsDesktopAppRefPackageVersion>7.0.7</MicrosoftWindowsDesktopAppRefPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64    -->