From fd20a8cec8ebf029f35ac9bd8d5ae855c3e3e2dc Mon Sep 17 00:00:00 2001
From: DotNet Bot <dn-bot@microsoft.com>
Date: Tue, 23 Apr 2024 22:15:15 +0000
Subject: [PATCH] Merged PR 39140: [internal/release/7.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 7.0.19 to 7.0.19 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.19-servicing.24216.12 to 7.0.19-servicing.24223.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.19 to 7.0.19 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.19-servicing.24216.12 to 7.0.19-servicing.24223.6 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 7.0.19-servicing.24216.12 to 7.0.19-servicing.24223.6 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-jwts**: from 7.0.19-servicing.24216.12 to 7.0.19-servicing.24223.6 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 7.0.19-servicing.24216.12 to 7.0.19-servicing.24223.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Build**: from 17.6.10 to 17.6.11 (parent: Microsoft.NET.Sdk)
  - **Microsoft.SourceBuild.Intermediate.msbuild**: from 17.6.10-preview-23329-03 to 17.6.11-preview-24222-15 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:ca5481e4-f667-4dcd-b176-08db3b93de76)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: ca5481e4-f667-4dcd-b176-08db3b93de76
- **Build**: 20240423.9
- **Date Produced**: April 23, 2024 9:32:12 PM UTC
- **Commit**: 98554e0c58a2221a77a6469abbb4525d677447f6
- **Branch**: refs/heads/internal/release/7.0.3xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.316 to 7.0.316][3]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.316-servicing.24217.4 to 7.0.316-servicing.24223.9][3]
  - **Microsoft.NET.Sdk**: [from 7.0.316-servicing.24217.4 to 7.0.316-servicing.24223.9][3]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.316-servicing.24217.4 to 7.0.316-servicing.24223.9][3]
  - **Microsoft.AspNetCore.App.Ref**: [from 7.0.19 to 7.0.19][4]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 7.0.19-servicing.24216.12 to 7.0.19-servicing.24223.6][4]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 7.0.19 to 7.0.19][4]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: [from 7.0.19-servicing.24216.12 to 7.0.19-servicing.24223.6][4]
  - **dotnet-dev-certs**: [from 7.0.19-servicing.24216.12 to 7.0.19-servicing.24223.6][4]
  - **dotnet-user-jwts**: [from 7.0.19-servicing.24216.12 to 7.0.19-servicing.24223.6][4]
  - **dotnet-us...
---
 NuGet.config            | 10 ++++-----
 eng/Version.Details.xml | 46 ++++++++++++++++++++---------------------
 eng/Versions.props      | 16 +++++++-------
 3 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 5c3a0a86d..358aca0d2 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -7,10 +7,10 @@
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from DotNet-msbuild-Trusted -->
-    <add key="darc-pub-DotNet-msbuild-Trusted-2679cf5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-2679cf5a/nuget/v3/index.json" />
+    <add key="darc-pub-DotNet-msbuild-Trusted-5eb99e6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-5eb99e6e/nuget/v3/index.json" />
     <!--  End: Package sources from DotNet-msbuild-Trusted -->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
-    <add key="darc-int-dotnet-aspnetcore-8edf68f" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-8edf68fb/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-06b2bc1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-06b2bc11/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-emsdk -->
     <add key="darc-pub-dotnet-emsdk-4f16685" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-4f16685f/nuget/v3/index.json" />
@@ -19,7 +19,7 @@
     <add key="darc-int-dotnet-runtime-19f489b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-19f489b8/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-sdk -->
-    <add key="darc-int-dotnet-sdk-551556f" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-551556f8/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-sdk-98554e0" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-98554e0c/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-sdk -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-d96741e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-d96741e3/nuget/v3/index.json" />
@@ -45,12 +45,12 @@
   <disabledPackageSources>
     <!--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-8edf68f" value="true" />
+    <add key="darc-int-dotnet-aspnetcore-06b2bc1" value="true" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-runtime -->
     <add key="darc-int-dotnet-runtime-19f489b" value="true" />
     <!--  Begin: Package sources from dotnet-sdk -->
-    <add key="darc-int-dotnet-sdk-551556f" value="true" />
+    <add key="darc-int-dotnet-sdk-98554e0" value="true" />
     <!--  End: Package sources from dotnet-sdk -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-d96741e" value="true" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 8fc7a421b..2748cfa6f 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -54,32 +54,32 @@
     </Dependency>
     <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="7.0.19" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>8edf68fbb682d821ced5523038eb69302834bf51</Sha>
+      <Sha>06b2bc111203f9b9ff0914a7715675a9a66bdac9</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="7.0.19-servicing.24216.12" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="7.0.19-servicing.24223.6" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>8edf68fbb682d821ced5523038eb69302834bf51</Sha>
+      <Sha>06b2bc111203f9b9ff0914a7715675a9a66bdac9</Sha>
       <SourceBuild RepoName="aspnetcore" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="7.0.19" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>8edf68fbb682d821ced5523038eb69302834bf51</Sha>
+      <Sha>06b2bc111203f9b9ff0914a7715675a9a66bdac9</Sha>
     </Dependency>
-    <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0" Version="7.0.19-servicing.24216.12" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0" Version="7.0.19-servicing.24223.6" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>8edf68fbb682d821ced5523038eb69302834bf51</Sha>
+      <Sha>06b2bc111203f9b9ff0914a7715675a9a66bdac9</Sha>
     </Dependency>
-    <Dependency Name="dotnet-dev-certs" Version="7.0.19-servicing.24216.12" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="dotnet-dev-certs" Version="7.0.19-servicing.24223.6" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>8edf68fbb682d821ced5523038eb69302834bf51</Sha>
+      <Sha>06b2bc111203f9b9ff0914a7715675a9a66bdac9</Sha>
     </Dependency>
-    <Dependency Name="dotnet-user-jwts" Version="7.0.19-servicing.24216.12" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="dotnet-user-jwts" Version="7.0.19-servicing.24223.6" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>8edf68fbb682d821ced5523038eb69302834bf51</Sha>
+      <Sha>06b2bc111203f9b9ff0914a7715675a9a66bdac9</Sha>
     </Dependency>
-    <Dependency Name="dotnet-user-secrets" Version="7.0.19-servicing.24216.12" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="dotnet-user-secrets" Version="7.0.19-servicing.24223.6" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>8edf68fbb682d821ced5523038eb69302834bf51</Sha>
+      <Sha>06b2bc111203f9b9ff0914a7715675a9a66bdac9</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22406.1">
       <Uri>https://github.com/dotnet/test-templates</Uri>
@@ -100,20 +100,20 @@
     </Dependency>
     <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.316">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>551556f876a217f37dd76563f12d34aac673c360</Sha>
+      <Sha>98554e0c58a2221a77a6469abbb4525d677447f6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.316-servicing.24217.4">
+    <Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.316-servicing.24223.9">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>551556f876a217f37dd76563f12d34aac673c360</Sha>
+      <Sha>98554e0c58a2221a77a6469abbb4525d677447f6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk" Version="7.0.316-servicing.24217.4">
+    <Dependency Name="Microsoft.NET.Sdk" Version="7.0.316-servicing.24223.9">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>551556f876a217f37dd76563f12d34aac673c360</Sha>
+      <Sha>98554e0c58a2221a77a6469abbb4525d677447f6</Sha>
       <SourceBuild RepoName="sdk" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.316-servicing.24217.4">
+    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.316-servicing.24223.9">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
-      <Sha>551556f876a217f37dd76563f12d34aac673c360</Sha>
+      <Sha>98554e0c58a2221a77a6469abbb4525d677447f6</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.19-servicing.24216.14" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
@@ -149,13 +149,13 @@
       <Sha>5db000294db8cc634e7d8fc004844338c9747dbc</Sha>
       <SourceBuild RepoName="roslyn" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.Build" Version="17.6.10" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.Build" Version="17.6.11" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>2679cf5a9cbd13e6833ca8a59553716f3f2f2afa</Sha>
+      <Sha>5eb99e6e9fc36042fa9de92f124981e23a250a66</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.6.10-preview-23329-03" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.6.11-preview-24222-15" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>2679cf5a9cbd13e6833ca8a59553716f3f2f2afa</Sha>
+      <Sha>5eb99e6e9fc36042fa9de92f124981e23a250a66</Sha>
       <SourceBuild RepoName="msbuild" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="NuGet.Build.Tasks" Version="6.6.2-rc.1" CoherentParentDependency="Microsoft.NET.Sdk">
diff --git a/eng/Versions.props b/eng/Versions.props
index b476b33e2..0a3edb93e 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -56,11 +56,11 @@
     <!-- Dependencies from https://github.com/aspnet/AspNetCore -->
     <MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>7.0.19</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
     <MicrosoftAspNetCoreAppRefPackageVersion>7.0.19</MicrosoftAspNetCoreAppRefPackageVersion>
-    <MicrosoftAspNetCoreAppRefInternalPackageVersion>7.0.19-servicing.24216.12</MicrosoftAspNetCoreAppRefInternalPackageVersion>
-    <VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>7.0.19-servicing.24216.12</VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>
-    <dotnetdevcertsPackageVersion>7.0.19-servicing.24216.12</dotnetdevcertsPackageVersion>
-    <dotnetuserjwtsPackageVersion>7.0.19-servicing.24216.12</dotnetuserjwtsPackageVersion>
-    <dotnetusersecretsPackageVersion>7.0.19-servicing.24216.12</dotnetusersecretsPackageVersion>
+    <MicrosoftAspNetCoreAppRefInternalPackageVersion>7.0.19-servicing.24223.6</MicrosoftAspNetCoreAppRefInternalPackageVersion>
+    <VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>7.0.19-servicing.24223.6</VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>
+    <dotnetdevcertsPackageVersion>7.0.19-servicing.24223.6</dotnetdevcertsPackageVersion>
+    <dotnetuserjwtsPackageVersion>7.0.19-servicing.24223.6</dotnetuserjwtsPackageVersion>
+    <dotnetusersecretsPackageVersion>7.0.19-servicing.24223.6</dotnetusersecretsPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
@@ -68,8 +68,8 @@
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/sdk -->
     <MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.316</MicrosoftDotNetCommonItemTemplatesPackageVersion>
-    <MicrosoftNETSdkPackageVersion>7.0.316-servicing.24217.4</MicrosoftNETSdkPackageVersion>
-    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.316-servicing.24217.4</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+    <MicrosoftNETSdkPackageVersion>7.0.316-servicing.24223.9</MicrosoftNETSdkPackageVersion>
+    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.316-servicing.24223.9</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
     <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
     <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
     <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
@@ -114,7 +114,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/msbuild -->
-    <MicrosoftBuildPackageVersion>17.6.10</MicrosoftBuildPackageVersion>
+    <MicrosoftBuildPackageVersion>17.6.11</MicrosoftBuildPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Automated versions for asp.net templates -->