From 7892f91f7191adb473a9e97a79e1c4ca8a2c9247 Mon Sep 17 00:00:00 2001
From: Rainer Sigwald <raines@microsoft.com>
Date: Wed, 16 Apr 2025 15:56:41 +0000
Subject: [PATCH 1/7] [internal/release/8.0.4xx] MSBuild 17.11.31

MSBuild 17.11.31

via `darc update-dependencies --id 263904`
---
 NuGet.config            |  9 ++++++++-
 eng/Version.Details.xml | 16 ++++++++--------
 eng/Versions.props      |  4 ++--
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index b02836bc40ef..f50d1ad8a55d 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -11,7 +11,8 @@
     <!--  Begin: Package sources from dotnet-aspnetcore -->
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from DotNet-msbuild-Trusted -->
-    <add key="darc-pub-DotNet-msbuild-Trusted-bc60720" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-bc607202/nuget/v3/index.json" />
+    <add key="darc-int-DotNet-msbuild-Trusted-3ab07f0" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-DotNet-msbuild-Trusted-3ab07f0c/nuget/v3/index.json" />
+    <add key="darc-int-DotNet-msbuild-Trusted-933b72e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-DotNet-msbuild-Trusted-933b72e3/nuget/v3/index.json" />
     <!--  End: Package sources from DotNet-msbuild-Trusted -->
     <!--  Begin: Package sources from dotnet-roslyn-analyzers -->
     <!--  End: Package sources from dotnet-roslyn-analyzers -->
@@ -19,6 +20,8 @@
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
     <add key="darc-pub-dotnet-templating-731d469" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-731d4697/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-21231eb-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-21231eb0-2/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-21231eb-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-21231eb0-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <!--  End: Package sources from dotnet-windowsdesktop -->
@@ -47,6 +50,10 @@
     <!--  Begin: Package sources from dotnet-templating -->
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
+    <!--  Begin: Package sources from DotNet-msbuild-Trusted -->
+    <add key="darc-int-DotNet-msbuild-Trusted-3ab07f0" value="true" />
+    <add key="darc-int-DotNet-msbuild-Trusted-933b72e" value="true" />
+    <!--  End: Package sources from DotNet-msbuild-Trusted -->
     <!--  Begin: Package sources from dotnet-format -->
     <!--  End: Package sources from dotnet-format -->
     <!--  End: Package sources from dotnet-aspnetcore -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 673c2fb15f12..f48a7097ee48 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -56,16 +56,16 @@
       <Sha>6afd7b9f34943078f2e3b747f33350e5fe114269</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Build" Version="17.11.31">
-      <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>bc6072029ab59942e3ba6b3db63147f6aab9dabc</Sha>
+      <Uri>https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted</Uri>
+      <Sha>933b72e36e86c22ba73e8b8148488f8298bb73c7</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Build.Localization" Version="17.11.31-servicing-25215-01">
-      <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>bc6072029ab59942e3ba6b3db63147f6aab9dabc</Sha>
+    <Dependency Name="Microsoft.Build.Localization" Version="17.11.31-servicing-25210-17">
+      <Uri>https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted</Uri>
+      <Sha>933b72e36e86c22ba73e8b8148488f8298bb73c7</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.11.31-servicing-25215-01">
-      <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>bc6072029ab59942e3ba6b3db63147f6aab9dabc</Sha>
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.11.31-servicing-25210-17">
+      <Uri>https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted</Uri>
+      <Sha>933b72e36e86c22ba73e8b8148488f8298bb73c7</Sha>
       <SourceBuild RepoName="msbuild" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.FSharp.Compiler" Version="12.8.403-beta.24526.2">
diff --git a/eng/Versions.props b/eng/Versions.props
index c217eab2fcd9..d5a8dc90a25d 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -130,10 +130,10 @@
           so target one that matches the version in minimumMSBuildVersion.
 
           This avoids the need to juggle references to packages that have been updated in newer MSBuild. -->
-    <MicrosoftBuildMinimumVersion Condition="exists('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion') and '$(DotNetBuildFromSource)' != 'true'">$([System.IO.File]::ReadAllText('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion').Trim())</MicrosoftBuildMinimumVersion>
+    <MicrosoftBuildMinimumVersion Condition="'$(DotNetBuildFromSource)' != 'true'">17.8.27</MicrosoftBuildMinimumVersion>
     <MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildMinimumVersion)</MicrosoftBuildFrameworkPackageVersion>
     <MicrosoftBuildRuntimePackageVersion>$(MicrosoftBuildMinimumVersion)</MicrosoftBuildRuntimePackageVersion>
-    <MicrosoftBuildLocalizationPackageVersion>17.11.31-servicing-25215-01</MicrosoftBuildLocalizationPackageVersion>
+    <MicrosoftBuildLocalizationPackageVersion>17.11.31-servicing-25210-17</MicrosoftBuildLocalizationPackageVersion>
     <MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildMinimumVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
     <MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildMinimumVersion)</MicrosoftBuildTasksCorePackageVersion>
     <MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildTasksCorePackageVersion)</MicrosoftBuildTasksCoreVersion>

From b3f255126390fe8af55385736619443d6c7d4a22 Mon Sep 17 00:00:00 2001
From: DotNet-Bot <dn-bot@microsoft.com>
Date: Thu, 17 Apr 2025 00:12:06 +0000
Subject: [PATCH 2/7] Update dependencies from
 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20250415.6

Microsoft.NET.HostModel , Microsoft.NET.ILLink.Tasks , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.Platforms , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 , VS.Redist.Common.NetCore.TargetingPack.x64.8.0
 From Version 8.0.15-servicing.25164.13 -> To Version 8.0.16-servicing.25215.6

Dependency coherency updates

Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100
 From Version 8.0.15 -> To Version 8.0.16 (parent: Microsoft.NETCore.App.Runtime.win-x64
---
 NuGet.config            |  7 +++----
 eng/Version.Details.xml | 40 ++++++++++++++++++++--------------------
 eng/Versions.props      | 14 +++++++-------
 3 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index f50d1ad8a55d..a722a27f4a96 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -4,6 +4,7 @@
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from dotnet-emsdk -->
+    <add key="darc-pub-dotnet-emsdk-adc0d6e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-adc0d6e7/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-emsdk -->
     <!--  Begin: Package sources from dotnet-format -->
     <add key="darc-pub-dotnet-format-59e6d3d" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-59e6d3d2/nuget/v3/index.json" />
@@ -11,17 +12,15 @@
     <!--  Begin: Package sources from dotnet-aspnetcore -->
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from DotNet-msbuild-Trusted -->
-    <add key="darc-int-DotNet-msbuild-Trusted-3ab07f0" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-DotNet-msbuild-Trusted-3ab07f0c/nuget/v3/index.json" />
     <add key="darc-int-DotNet-msbuild-Trusted-933b72e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-DotNet-msbuild-Trusted-933b72e3/nuget/v3/index.json" />
     <!--  End: Package sources from DotNet-msbuild-Trusted -->
     <!--  Begin: Package sources from dotnet-roslyn-analyzers -->
     <!--  End: Package sources from dotnet-roslyn-analyzers -->
     <!--  Begin: Package sources from dotnet-runtime -->
+    <add key="darc-int-dotnet-runtime-efd5742" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-efd5742b/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
     <add key="darc-pub-dotnet-templating-731d469" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-731d4697/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-21231eb-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-21231eb0-2/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-21231eb-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-21231eb0-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <!--  End: Package sources from dotnet-windowsdesktop -->
@@ -51,13 +50,13 @@
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from DotNet-msbuild-Trusted -->
-    <add key="darc-int-DotNet-msbuild-Trusted-3ab07f0" value="true" />
     <add key="darc-int-DotNet-msbuild-Trusted-933b72e" value="true" />
     <!--  End: Package sources from DotNet-msbuild-Trusted -->
     <!--  Begin: Package sources from dotnet-format -->
     <!--  End: Package sources from dotnet-format -->
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-runtime -->
+    <add key="darc-int-dotnet-runtime-efd5742" value="true" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <!--  Begin: Package sources from dotnet-winforms -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index f48a7097ee48..eddf0da50362 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -14,46 +14,46 @@
       <Sha>731d4697ceb43ca5ab88a4994b5a226e0cbf16c4</Sha>
       <SourceBuild RepoName="templating" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.15">
+    <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.16">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>50c4cb9fc31c47f03eac865d7bc518af173b74b7</Sha>
+      <Sha>efd5742bb5dd1677fbbbeb277bcfb5c9025548e5</Sha>
     </Dependency>
-    <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.15-servicing.25164.13">
+    <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.16-servicing.25215.6">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>50c4cb9fc31c47f03eac865d7bc518af173b74b7</Sha>
+      <Sha>efd5742bb5dd1677fbbbeb277bcfb5c9025548e5</Sha>
       <SourceBuild RepoName="runtime" ManagedOnly="false" />
     </Dependency>
-    <Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.8.0" Version="8.0.15-servicing.25164.13">
+    <Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.8.0" Version="8.0.16-servicing.25215.6">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>50c4cb9fc31c47f03eac865d7bc518af173b74b7</Sha>
+      <Sha>efd5742bb5dd1677fbbbeb277bcfb5c9025548e5</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.15">
+    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.16">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>50c4cb9fc31c47f03eac865d7bc518af173b74b7</Sha>
+      <Sha>efd5742bb5dd1677fbbbeb277bcfb5c9025548e5</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="8.0.15">
+    <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="8.0.16">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>50c4cb9fc31c47f03eac865d7bc518af173b74b7</Sha>
+      <Sha>efd5742bb5dd1677fbbbeb277bcfb5c9025548e5</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.15-servicing.25164.13">
+    <Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.16-servicing.25215.6">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>50c4cb9fc31c47f03eac865d7bc518af173b74b7</Sha>
+      <Sha>efd5742bb5dd1677fbbbeb277bcfb5c9025548e5</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.HostModel" Version="8.0.15-servicing.25164.13">
+    <Dependency Name="Microsoft.NET.HostModel" Version="8.0.16-servicing.25215.6">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>50c4cb9fc31c47f03eac865d7bc518af173b74b7</Sha>
+      <Sha>efd5742bb5dd1677fbbbeb277bcfb5c9025548e5</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.DependencyModel" Version="8.0.2">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
       <Sha>81cabf2857a01351e5ab578947c7403a5b128ad1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="8.0.15">
+    <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="8.0.16">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>50c4cb9fc31c47f03eac865d7bc518af173b74b7</Sha>
+      <Sha>efd5742bb5dd1677fbbbeb277bcfb5c9025548e5</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100" Version="8.0.15" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100" Version="8.0.16" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/emsdk</Uri>
-      <Sha>6afd7b9f34943078f2e3b747f33350e5fe114269</Sha>
+      <Sha>adc0d6e7d3abb9c4ecee2420c51ae99c57dc9755</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Build" Version="17.11.31">
       <Uri>https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted</Uri>
@@ -200,9 +200,9 @@
       <Uri>https://github.com/microsoft/vstest</Uri>
       <Sha>7855c9b221686104532ebf3380f2d45b3613b369</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.15">
+    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.16">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
-      <Sha>50c4cb9fc31c47f03eac865d7bc518af173b74b7</Sha>
+      <Sha>efd5742bb5dd1677fbbbeb277bcfb5c9025548e5</Sha>
     </Dependency>
     <Dependency Name="System.Formats.Asn1" Version="8.0.2">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index d5a8dc90a25d..38be099211b7 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -51,19 +51,19 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/runtime -->
-    <MicrosoftNETCoreAppRefPackageVersion>8.0.15</MicrosoftNETCoreAppRefPackageVersion>
-    <VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.15-servicing.25164.13</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
-    <MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.15</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
+    <MicrosoftNETCoreAppRefPackageVersion>8.0.16</MicrosoftNETCoreAppRefPackageVersion>
+    <VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.16-servicing.25215.6</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
+    <MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.16</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
     <MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion>
     <MicrosoftExtensionsDependencyModelPackageVersion>8.0.2</MicrosoftExtensionsDependencyModelPackageVersion>
-    <MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.15</MicrosoftNETCoreDotNetHostResolverPackageVersion>
-    <MicrosoftNETHostModelVersion>8.0.15-servicing.25164.13</MicrosoftNETHostModelVersion>
+    <MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.16</MicrosoftNETCoreDotNetHostResolverPackageVersion>
+    <MicrosoftNETHostModelVersion>8.0.16-servicing.25215.6</MicrosoftNETHostModelVersion>
     <MicrosoftExtensionsFileSystemGlobbingPackageVersion>8.0.0</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
     <MicrosoftExtensionsDependencyModelVersion>$(MicrosoftExtensionsDependencyModelPackageVersion)</MicrosoftExtensionsDependencyModelVersion>
     <MicrosoftExtensionsLoggingVersion>8.0.1</MicrosoftExtensionsLoggingVersion>
     <MicrosoftExtensionsLoggingAbstractionsVersion>8.0.3</MicrosoftExtensionsLoggingAbstractionsVersion>
     <MicrosoftExtensionsLoggingConsoleVersion>8.0.1</MicrosoftExtensionsLoggingConsoleVersion>
-    <MicrosoftNETILLinkTasksPackageVersion>8.0.15</MicrosoftNETILLinkTasksPackageVersion>
+    <MicrosoftNETILLinkTasksPackageVersion>8.0.16</MicrosoftNETILLinkTasksPackageVersion>
     <MicrosoftBclAsyncInterfacesPackageVersion>8.0.0</MicrosoftBclAsyncInterfacesPackageVersion>
     <MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>8.0.0</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
     <MicrosoftExtensionsObjectPoolPackageVersion>8.0.15</MicrosoftExtensionsObjectPoolPackageVersion>
@@ -229,7 +229,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Workloads from dotnet/emsdk -->
-    <MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion>8.0.15</MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion>
+    <MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion>8.0.16</MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion>
     <EmscriptenWorkloadManifestVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion)</EmscriptenWorkloadManifestVersion>
     <!-- emsdk workload prerelease version band must match the emsdk feature band -->
     <EmscriptenWorkloadFeatureBand>8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`))</EmscriptenWorkloadFeatureBand>

From 288386918c7febd3648ff52f858805b34c588c32 Mon Sep 17 00:00:00 2001
From: DotNet-Bot <dn-bot@microsoft.com>
Date: Thu, 17 Apr 2025 06:18:24 +0000
Subject: [PATCH 3/7] Update dependencies from
 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build
 20250416.11

dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.ObjectPool , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0
 From Version 8.0.15-servicing.25165.5 -> To Version 8.0.16-servicing.25216.11
---
 NuGet.config            |  2 ++
 eng/Version.Details.xml | 72 ++++++++++++++++++++---------------------
 eng/Versions.props      | 16 ++++-----
 3 files changed, 46 insertions(+), 44 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index a722a27f4a96..f68b6495fe59 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -10,6 +10,7 @@
     <add key="darc-pub-dotnet-format-59e6d3d" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-59e6d3d2/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-format -->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
+    <add key="darc-int-dotnet-aspnetcore-4ae1269" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-4ae1269b/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from DotNet-msbuild-Trusted -->
     <add key="darc-int-DotNet-msbuild-Trusted-933b72e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-DotNet-msbuild-Trusted-933b72e3/nuget/v3/index.json" />
@@ -49,6 +50,7 @@
     <!--  Begin: Package sources from dotnet-templating -->
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
+    <add key="darc-int-dotnet-aspnetcore-4ae1269" value="true" />
     <!--  Begin: Package sources from DotNet-msbuild-Trusted -->
     <add key="darc-int-DotNet-msbuild-Trusted-933b72e" value="true" />
     <!--  End: Package sources from DotNet-msbuild-Trusted -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index eddf0da50362..3dd4e288671e 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -111,13 +111,13 @@
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>bc1c3011064a493b0ca527df6fb7215e2e5cfa96</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="8.0.15-servicing.25165.5">
+    <Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="8.0.16-servicing.25216.11">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>8899cb30120d41413065f1b1465cdabefe0a1f9c</Sha>
+      <Sha>4ae1269bff83362236d0f3bd4c9302e6a1e9341c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.TestHost" Version="8.0.15">
+    <Dependency Name="Microsoft.AspNetCore.TestHost" Version="8.0.16">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>8899cb30120d41413065f1b1465cdabefe0a1f9c</Sha>
+      <Sha>4ae1269bff83362236d0f3bd4c9302e6a1e9341c</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Build.NuGetSdkResolver" Version="6.11.1-rc.2">
       <Uri>https://github.com/nuget/nuget.client</Uri>
@@ -248,50 +248,50 @@
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
       <Sha>4d5e32859f7dfaca9102a95d111a49d2aa2dbd8c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.15">
+    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.16">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>8899cb30120d41413065f1b1465cdabefe0a1f9c</Sha>
+      <Sha>4ae1269bff83362236d0f3bd4c9302e6a1e9341c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="8.0.15-servicing.25165.5">
+    <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="8.0.16-servicing.25216.11">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>8899cb30120d41413065f1b1465cdabefe0a1f9c</Sha>
+      <Sha>4ae1269bff83362236d0f3bd4c9302e6a1e9341c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="8.0.15">
+    <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="8.0.16">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>8899cb30120d41413065f1b1465cdabefe0a1f9c</Sha>
+      <Sha>4ae1269bff83362236d0f3bd4c9302e6a1e9341c</Sha>
     </Dependency>
-    <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0" Version="8.0.15-servicing.25165.5">
+    <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0" Version="8.0.16-servicing.25216.11">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>8899cb30120d41413065f1b1465cdabefe0a1f9c</Sha>
+      <Sha>4ae1269bff83362236d0f3bd4c9302e6a1e9341c</Sha>
       <SourceBuild RepoName="aspnetcore" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="dotnet-dev-certs" Version="8.0.15-servicing.25165.5">
+    <Dependency Name="dotnet-dev-certs" Version="8.0.16-servicing.25216.11">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>8899cb30120d41413065f1b1465cdabefe0a1f9c</Sha>
+      <Sha>4ae1269bff83362236d0f3bd4c9302e6a1e9341c</Sha>
     </Dependency>
-    <Dependency Name="dotnet-user-jwts" Version="8.0.15-servicing.25165.5">
+    <Dependency Name="dotnet-user-jwts" Version="8.0.16-servicing.25216.11">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>8899cb30120d41413065f1b1465cdabefe0a1f9c</Sha>
+      <Sha>4ae1269bff83362236d0f3bd4c9302e6a1e9341c</Sha>
     </Dependency>
-    <Dependency Name="dotnet-user-secrets" Version="8.0.15-servicing.25165.5">
+    <Dependency Name="dotnet-user-secrets" Version="8.0.16-servicing.25216.11">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>8899cb30120d41413065f1b1465cdabefe0a1f9c</Sha>
+      <Sha>4ae1269bff83362236d0f3bd4c9302e6a1e9341c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Analyzers" Version="8.0.15-servicing.25165.5">
+    <Dependency Name="Microsoft.AspNetCore.Analyzers" Version="8.0.16-servicing.25216.11">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>8899cb30120d41413065f1b1465cdabefe0a1f9c</Sha>
+      <Sha>4ae1269bff83362236d0f3bd4c9302e6a1e9341c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Components.SdkAnalyzers" Version="8.0.15-servicing.25165.5">
+    <Dependency Name="Microsoft.AspNetCore.Components.SdkAnalyzers" Version="8.0.16-servicing.25216.11">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>8899cb30120d41413065f1b1465cdabefe0a1f9c</Sha>
+      <Sha>4ae1269bff83362236d0f3bd4c9302e6a1e9341c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Mvc.Analyzers" Version="8.0.15-servicing.25165.5">
+    <Dependency Name="Microsoft.AspNetCore.Mvc.Analyzers" Version="8.0.16-servicing.25216.11">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>8899cb30120d41413065f1b1465cdabefe0a1f9c</Sha>
+      <Sha>4ae1269bff83362236d0f3bd4c9302e6a1e9341c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Mvc.Api.Analyzers" Version="8.0.15-servicing.25165.5">
+    <Dependency Name="Microsoft.AspNetCore.Mvc.Api.Analyzers" Version="8.0.16-servicing.25216.11">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>8899cb30120d41413065f1b1465cdabefe0a1f9c</Sha>
+      <Sha>4ae1269bff83362236d0f3bd4c9302e6a1e9341c</Sha>
     </Dependency>
     <Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="9.0.0-preview.24577.3">
       <Uri>https://github.com/dotnet/razor</Uri>
@@ -306,21 +306,21 @@
       <Uri>https://github.com/dotnet/razor</Uri>
       <Sha>c937db618f8c8739c6fa66ab4ca541344a468fdc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.15">
+    <Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.16">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>8899cb30120d41413065f1b1465cdabefe0a1f9c</Sha>
+      <Sha>4ae1269bff83362236d0f3bd4c9302e6a1e9341c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Authorization" Version="8.0.15">
+    <Dependency Name="Microsoft.AspNetCore.Authorization" Version="8.0.16">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>8899cb30120d41413065f1b1465cdabefe0a1f9c</Sha>
+      <Sha>4ae1269bff83362236d0f3bd4c9302e6a1e9341c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Components.Web" Version="8.0.15">
+    <Dependency Name="Microsoft.AspNetCore.Components.Web" Version="8.0.16">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>8899cb30120d41413065f1b1465cdabefe0a1f9c</Sha>
+      <Sha>4ae1269bff83362236d0f3bd4c9302e6a1e9341c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.JSInterop" Version="8.0.15">
+    <Dependency Name="Microsoft.JSInterop" Version="8.0.16">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>8899cb30120d41413065f1b1465cdabefe0a1f9c</Sha>
+      <Sha>4ae1269bff83362236d0f3bd4c9302e6a1e9341c</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Web.Xdt" Version="7.0.0-preview.22423.2" Pinned="true">
       <Uri>https://github.com/dotnet/xdt</Uri>
@@ -437,9 +437,9 @@
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
       <Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.ObjectPool" Version="8.0.15">
+    <Dependency Name="Microsoft.Extensions.ObjectPool" Version="8.0.16">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>8899cb30120d41413065f1b1465cdabefe0a1f9c</Sha>
+      <Sha>4ae1269bff83362236d0f3bd4c9302e6a1e9341c</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Win32.SystemEvents" Version="8.0.0">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 38be099211b7..9e90400fd8ed 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -66,7 +66,7 @@
     <MicrosoftNETILLinkTasksPackageVersion>8.0.16</MicrosoftNETILLinkTasksPackageVersion>
     <MicrosoftBclAsyncInterfacesPackageVersion>8.0.0</MicrosoftBclAsyncInterfacesPackageVersion>
     <MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>8.0.0</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
-    <MicrosoftExtensionsObjectPoolPackageVersion>8.0.15</MicrosoftExtensionsObjectPoolPackageVersion>
+    <MicrosoftExtensionsObjectPoolPackageVersion>8.0.16</MicrosoftExtensionsObjectPoolPackageVersion>
     <MicrosoftWin32SystemEventsPackageVersion>8.0.0</MicrosoftWin32SystemEventsPackageVersion>
     <SystemCompositionAttributedModelPackageVersion>8.0.0</SystemCompositionAttributedModelPackageVersion>
     <SystemCompositionConventionPackageVersion>8.0.0</SystemCompositionConventionPackageVersion>
@@ -169,13 +169,13 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/aspnet/AspNetCore -->
-    <MicrosoftAspNetCoreAppRefPackageVersion>8.0.15</MicrosoftAspNetCoreAppRefPackageVersion>
-    <MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>8.0.15-servicing.25165.5</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
-    <MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>8.0.15-servicing.25165.5</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
-    <MicrosoftAspNetCoreMvcAnalyzersPackageVersion>8.0.15-servicing.25165.5</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
-    <MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>8.0.15-servicing.25165.5</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
-    <MicrosoftAspNetCoreAnalyzersPackageVersion>8.0.15-servicing.25165.5</MicrosoftAspNetCoreAnalyzersPackageVersion>
-    <MicrosoftAspNetCoreTestHostPackageVersion>8.0.15</MicrosoftAspNetCoreTestHostPackageVersion>
+    <MicrosoftAspNetCoreAppRefPackageVersion>8.0.16</MicrosoftAspNetCoreAppRefPackageVersion>
+    <MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>8.0.16-servicing.25216.11</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
+    <MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>8.0.16-servicing.25216.11</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
+    <MicrosoftAspNetCoreMvcAnalyzersPackageVersion>8.0.16-servicing.25216.11</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
+    <MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>8.0.16-servicing.25216.11</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
+    <MicrosoftAspNetCoreAnalyzersPackageVersion>8.0.16-servicing.25216.11</MicrosoftAspNetCoreAnalyzersPackageVersion>
+    <MicrosoftAspNetCoreTestHostPackageVersion>8.0.16</MicrosoftAspNetCoreTestHostPackageVersion>
   </PropertyGroup>
   <!-- Dependencies from https://github.com/dotnet/razor -->
   <PropertyGroup>

From c77b8334466b3c2e6b76714fa720f825763b2648 Mon Sep 17 00:00:00 2001
From: DotNet-Bot <dn-bot@microsoft.com>
Date: Thu, 17 Apr 2025 06:50:14 +0000
Subject: [PATCH 4/7] Update dependencies from
 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build
 20250416.4

Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0
 From Version 8.0.15 -> To Version 8.0.16

Dependency coherency updates

Microsoft.NET.Sdk.WindowsDesktop
 From Version 8.0.15-servicing.25167.9 -> To Version 8.0.16-servicing.25216.4 (parent: Microsoft.WindowsDesktop.App.Ref
---
 NuGet.config            |  2 ++
 eng/Version.Details.xml | 20 ++++++++++----------
 eng/Versions.props      |  2 +-
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index f68b6495fe59..6ff426fb97c3 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -24,6 +24,7 @@
     <add key="darc-pub-dotnet-templating-731d469" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-731d4697/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
+    <add key="darc-int-dotnet-windowsdesktop-3696ba6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-3696ba6d/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-windowsdesktop -->
     <!--  Begin: Package sources from dotnet-winforms -->
     <!--  End: Package sources from dotnet-winforms -->
@@ -61,6 +62,7 @@
     <add key="darc-int-dotnet-runtime-efd5742" value="true" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
+    <add key="darc-int-dotnet-windowsdesktop-3696ba6" value="true" />
     <!--  Begin: Package sources from dotnet-winforms -->
     <!--  End: Package sources from dotnet-winforms -->
     <!--  End: Package sources from dotnet-windowsdesktop -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 3dd4e288671e..c59d7939c3c0 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -228,25 +228,25 @@
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
       <Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="8.0.15">
+    <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="8.0.16">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
-      <Sha>83fc500260851a71b62ed3e92e672021624c28da</Sha>
+      <Sha>3696ba6dd113a089bec2da8b9150f5181ec465ad</Sha>
     </Dependency>
-    <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0" Version="8.0.15-servicing.25168.3">
+    <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0" Version="8.0.16-servicing.25216.4">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
-      <Sha>83fc500260851a71b62ed3e92e672021624c28da</Sha>
+      <Sha>3696ba6dd113a089bec2da8b9150f5181ec465ad</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="8.0.15">
+    <Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="8.0.16">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
-      <Sha>83fc500260851a71b62ed3e92e672021624c28da</Sha>
+      <Sha>3696ba6dd113a089bec2da8b9150f5181ec465ad</Sha>
     </Dependency>
-    <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0" Version="8.0.15-servicing.25168.3">
+    <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0" Version="8.0.16-servicing.25216.4">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
-      <Sha>83fc500260851a71b62ed3e92e672021624c28da</Sha>
+      <Sha>3696ba6dd113a089bec2da8b9150f5181ec465ad</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="8.0.15-servicing.25167.9" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
+    <Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="8.0.16-servicing.25216.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
-      <Sha>4d5e32859f7dfaca9102a95d111a49d2aa2dbd8c</Sha>
+      <Sha>1a7a066fb7594c1083fb07e8ce5d1a8c81bc3b5d</Sha>
     </Dependency>
     <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.16">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 9e90400fd8ed..a9a964f9ba40 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -185,7 +185,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/wpf -->
-    <MicrosoftNETSdkWindowsDesktopPackageVersion>8.0.15-servicing.25167.9</MicrosoftNETSdkWindowsDesktopPackageVersion>
+    <MicrosoftNETSdkWindowsDesktopPackageVersion>8.0.16-servicing.25216.4</MicrosoftNETSdkWindowsDesktopPackageVersion>
   </PropertyGroup>
   <PropertyGroup Label="Manually updated">
     <!-- Dependencies from https://github.com/microsoft/MSBuildLocator -->

From e07102a79a0cd37376eb6d79ee6c4544e0234e7b Mon Sep 17 00:00:00 2001
From: Rainer Sigwald <raines@microsoft.com>
Date: Thu, 17 Apr 2025 17:26:43 -0500
Subject: [PATCH 5/7] Fix droppped MSBuild internal feed for the 17.8 fix

---
 NuGet.config | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/NuGet.config b/NuGet.config
index 6ff426fb97c3..5b22b98614d3 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -13,6 +13,7 @@
     <add key="darc-int-dotnet-aspnetcore-4ae1269" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-4ae1269b/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from DotNet-msbuild-Trusted -->
+    <add key="darc-int-DotNet-msbuild-Trusted-3ab07f0" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-DotNet-msbuild-Trusted-3ab07f0c/nuget/v3/index.json" />
     <add key="darc-int-DotNet-msbuild-Trusted-933b72e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-DotNet-msbuild-Trusted-933b72e3/nuget/v3/index.json" />
     <!--  End: Package sources from DotNet-msbuild-Trusted -->
     <!--  Begin: Package sources from dotnet-roslyn-analyzers -->
@@ -53,6 +54,7 @@
     <!--  Begin: Package sources from dotnet-aspnetcore -->
     <add key="darc-int-dotnet-aspnetcore-4ae1269" value="true" />
     <!--  Begin: Package sources from DotNet-msbuild-Trusted -->
+    <add key="darc-int-DotNet-msbuild-Trusted-3ab07f0" value="true" />
     <add key="darc-int-DotNet-msbuild-Trusted-933b72e" value="true" />
     <!--  End: Package sources from DotNet-msbuild-Trusted -->
     <!--  Begin: Package sources from dotnet-format -->

From e47ad747d9c3fa60dd0b4ec41d5ccfffb574337c Mon Sep 17 00:00:00 2001
From: DotNet-Bot <dn-bot@microsoft.com>
Date: Fri, 18 Apr 2025 05:27:56 +0000
Subject: [PATCH 6/7] Update dependencies from
 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build
 20250417.2

Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0
 From Version 8.0.16 -> To Version 8.0.16

Dependency coherency updates

Microsoft.NET.Sdk.WindowsDesktop
 From Version 8.0.16-servicing.25216.4 -> To Version 8.0.16-servicing.25217.3 (parent: Microsoft.WindowsDesktop.App.Ref
---
 NuGet.config            |  6 ++----
 eng/Version.Details.xml | 16 ++++++++--------
 eng/Versions.props      |  2 +-
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 5b22b98614d3..4ab9cde95be2 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -13,7 +13,6 @@
     <add key="darc-int-dotnet-aspnetcore-4ae1269" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-4ae1269b/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from DotNet-msbuild-Trusted -->
-    <add key="darc-int-DotNet-msbuild-Trusted-3ab07f0" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-DotNet-msbuild-Trusted-3ab07f0c/nuget/v3/index.json" />
     <add key="darc-int-DotNet-msbuild-Trusted-933b72e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-DotNet-msbuild-Trusted-933b72e3/nuget/v3/index.json" />
     <!--  End: Package sources from DotNet-msbuild-Trusted -->
     <!--  Begin: Package sources from dotnet-roslyn-analyzers -->
@@ -25,7 +24,7 @@
     <add key="darc-pub-dotnet-templating-731d469" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-731d4697/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
-    <add key="darc-int-dotnet-windowsdesktop-3696ba6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-3696ba6d/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-cda1f82" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-cda1f825/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-windowsdesktop -->
     <!--  Begin: Package sources from dotnet-winforms -->
     <!--  End: Package sources from dotnet-winforms -->
@@ -54,7 +53,6 @@
     <!--  Begin: Package sources from dotnet-aspnetcore -->
     <add key="darc-int-dotnet-aspnetcore-4ae1269" value="true" />
     <!--  Begin: Package sources from DotNet-msbuild-Trusted -->
-    <add key="darc-int-DotNet-msbuild-Trusted-3ab07f0" value="true" />
     <add key="darc-int-DotNet-msbuild-Trusted-933b72e" value="true" />
     <!--  End: Package sources from DotNet-msbuild-Trusted -->
     <!--  Begin: Package sources from dotnet-format -->
@@ -64,7 +62,7 @@
     <add key="darc-int-dotnet-runtime-efd5742" value="true" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
-    <add key="darc-int-dotnet-windowsdesktop-3696ba6" value="true" />
+    <add key="darc-int-dotnet-windowsdesktop-cda1f82" value="true" />
     <!--  Begin: Package sources from dotnet-winforms -->
     <!--  End: Package sources from dotnet-winforms -->
     <!--  End: Package sources from dotnet-windowsdesktop -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index c59d7939c3c0..08f645ce1075 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -230,23 +230,23 @@
     </Dependency>
     <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="8.0.16">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
-      <Sha>3696ba6dd113a089bec2da8b9150f5181ec465ad</Sha>
+      <Sha>cda1f825e91100518205f3d354bd8ea07c5ceac2</Sha>
     </Dependency>
-    <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0" Version="8.0.16-servicing.25216.4">
+    <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0" Version="8.0.16-servicing.25217.2">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
-      <Sha>3696ba6dd113a089bec2da8b9150f5181ec465ad</Sha>
+      <Sha>cda1f825e91100518205f3d354bd8ea07c5ceac2</Sha>
     </Dependency>
     <Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="8.0.16">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
-      <Sha>3696ba6dd113a089bec2da8b9150f5181ec465ad</Sha>
+      <Sha>cda1f825e91100518205f3d354bd8ea07c5ceac2</Sha>
     </Dependency>
-    <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0" Version="8.0.16-servicing.25216.4">
+    <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0" Version="8.0.16-servicing.25217.2">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
-      <Sha>3696ba6dd113a089bec2da8b9150f5181ec465ad</Sha>
+      <Sha>cda1f825e91100518205f3d354bd8ea07c5ceac2</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="8.0.16-servicing.25216.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
+    <Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="8.0.16-servicing.25217.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
-      <Sha>1a7a066fb7594c1083fb07e8ce5d1a8c81bc3b5d</Sha>
+      <Sha>5bf5c017e225debf2b431cf33d0e4fad03039032</Sha>
     </Dependency>
     <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.16">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index a9a964f9ba40..34a62722f736 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -185,7 +185,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/wpf -->
-    <MicrosoftNETSdkWindowsDesktopPackageVersion>8.0.16-servicing.25216.4</MicrosoftNETSdkWindowsDesktopPackageVersion>
+    <MicrosoftNETSdkWindowsDesktopPackageVersion>8.0.16-servicing.25217.3</MicrosoftNETSdkWindowsDesktopPackageVersion>
   </PropertyGroup>
   <PropertyGroup Label="Manually updated">
     <!-- Dependencies from https://github.com/microsoft/MSBuildLocator -->

From cf4be5430e0194ba8a10a7493f4e46da9b7515f8 Mon Sep 17 00:00:00 2001
From: "Sean Reeser (CSI Interfusion Inc)" <v-seanreeser@microsoft.com>
Date: Fri, 18 Apr 2025 11:43:35 +0000
Subject: [PATCH 7/7] Updated NuGet.config - add msbuild feed

Updated NuGet.config - replace msbuild feed
---
 NuGet.config | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/NuGet.config b/NuGet.config
index 4ab9cde95be2..fed210fd3b97 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -13,6 +13,7 @@
     <add key="darc-int-dotnet-aspnetcore-4ae1269" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-4ae1269b/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from DotNet-msbuild-Trusted -->
+    <add key="darc-int-DotNet-msbuild-Trusted-3ab07f0" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-DotNet-msbuild-Trusted-3ab07f0c/nuget/v3/index.json" />
     <add key="darc-int-DotNet-msbuild-Trusted-933b72e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-DotNet-msbuild-Trusted-933b72e3/nuget/v3/index.json" />
     <!--  End: Package sources from DotNet-msbuild-Trusted -->
     <!--  Begin: Package sources from dotnet-roslyn-analyzers -->
@@ -53,6 +54,7 @@
     <!--  Begin: Package sources from dotnet-aspnetcore -->
     <add key="darc-int-dotnet-aspnetcore-4ae1269" value="true" />
     <!--  Begin: Package sources from DotNet-msbuild-Trusted -->
+    <add key="darc-int-DotNet-msbuild-Trusted-3ab07f0" value="true" />    
     <add key="darc-int-DotNet-msbuild-Trusted-933b72e" value="true" />
     <!--  End: Package sources from DotNet-msbuild-Trusted -->
     <!--  Begin: Package sources from dotnet-format -->