From 1e926f8fce3f834428d7d352176d6a7aa52e8754 Mon Sep 17 00:00:00 2001
From: Jason Zhai <v-wuzhai@microsoft.com>
Date: Mon, 10 Mar 2025 23:41:59 -0700
Subject: [PATCH 01/63] Revert changes to NativeAot test due to runtime update

---
 .../GivenThatWeWantToPublishAnAotApp.cs       | 22 ++-----------------
 1 file changed, 2 insertions(+), 20 deletions(-)

diff --git a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs
index 9417f7eb2cd5..d136a7f9e3d4 100644
--- a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs
+++ b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs
@@ -39,25 +39,7 @@ public void NativeAot_hw_runs_with_no_warnings_when_PublishAot_is_enabled(string
             {
                 testProject.AdditionalProperties["StripSymbols"] = "true";
             }
-            var testAsset = _testAssetsManager.CreateTestProject(testProject, identifier: targetFramework);
-
-            string[] ignoredPatterns = null;
-
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
-            {
-                ignoredPatterns = new string[]
-                {
-                    // Both these exclusions can be removed once the min tested version is .NET 10 and the min supported
-                    // XCode version is XCode 16.
-
-                    // -ld_classic option is required to workaround bugs in XCode 15 and .NET 9 and older runtimes.
-                    // See https://github.com/dotnet/runtime/issues/97745 for details.
-                    "ld: warning: -ld_classic is deprecated and will be removed in a future release",
-                    // These warnings show up when dotnet/runtime compiled using Apple clang 15+ is used
-                    // with classic linker (either Apple clang 14 or clang 15+ with -ld_classic).
-                    "ld: warning: __LD,__compact_unwind entries for",
-                };
-            }
+            var testAsset = _testAssetsManager.CreateTestProject(testProject);
 
             var publishCommand = new PublishCommand(Log, Path.Combine(testAsset.TestRoot, testProject.Name));
             publishCommand
@@ -66,7 +48,7 @@ public void NativeAot_hw_runs_with_no_warnings_when_PublishAot_is_enabled(string
                 .And.NotHaveStdOutContaining("IL2026")
                 .And.NotHaveStdErrContaining("NETSDK1179")
                 .And.NotHaveStdErrContaining("warning")
-                .And.NotHaveStdOutContaining("warning", ignoredPatterns);
+                .And.NotHaveStdOutContaining("warning");
 
             var buildProperties = testProject.GetPropertyValues(testAsset.TestRoot, targetFramework);
             var rid = buildProperties["NETCoreSdkPortableRuntimeIdentifier"];

From d12c226fabddeba48e5d967485ead81de22d4768 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 12 Mar 2025 22:24:44 +0000
Subject: [PATCH 02/63] Update dependencies from
 https://github.com/dotnet/arcade build 20250220.1

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.25114.5 -> To Version 8.0.0-beta.25120.1
---
 NuGet.config                     | 16 ++++++++++++++--
 eng/Version.Details.xml          | 16 ++++++++--------
 eng/Versions.props               |  4 ++--
 eng/common/cross/toolchain.cmake |  4 ++++
 global.json                      |  4 ++--
 5 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 3d39cef95a36..881e8276de3a 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -4,6 +4,8 @@
     <!--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-ec84e77" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ec84e775/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-emsdk-ec84e77-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ec84e775-2/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-emsdk-ec84e77-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ec84e775-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-emsdk -->
     <!--  Begin: Package sources from dotnet-format -->
     <add key="darc-pub-dotnet-format-27f1865" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-27f18656/nuget/v3/index.json" />
@@ -19,6 +21,8 @@
     <!--  End: Package sources from dotnet-format -->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
     <add key="darc-int-dotnet-aspnetcore-25ef4aa" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-25ef4aa3/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-25ef4aa-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-25ef4aa3-2/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-25ef4aa-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-25ef4aa3-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from DotNet-msbuild-Trusted -->
     <add key="darc-pub-DotNet-msbuild-Trusted-bfbb056" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-bfbb0566/nuget/v3/index.json" />
@@ -27,14 +31,16 @@
     <!--  End: Package sources from dotnet-roslyn-analyzers -->
     <!--  Begin: Package sources from dotnet-runtime -->
     <add key="darc-int-dotnet-runtime-1584e49" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-1584e493/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-runtime-1584e49-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-1584e493-2/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-runtime-1584e49-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-1584e493-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
-    <add key="darc-pub-dotnet-templating-a977119" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-a977119e/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-a977119-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-a977119e-1/nuget/v3/index.json" />
     <add key="darc-pub-dotnet-templating-0da2c6e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-0da2c6ec/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-8506c0d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-8506c0d8/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-8506c0d-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-8506c0d8-2/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-8506c0d-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-8506c0d8-1/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="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
@@ -59,6 +65,8 @@
     <!--  Begin: Package sources from dotnet-templating -->
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
+    <add key="darc-int-dotnet-aspnetcore-25ef4aa-1" value="true" />
+    <add key="darc-int-dotnet-aspnetcore-25ef4aa-2" value="true" />
     <add key="darc-int-dotnet-aspnetcore-25ef4aa" value="true" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-format -->
@@ -74,9 +82,13 @@
     <!--  End: Package sources from dotnet-format -->
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-runtime -->
+    <add key="darc-int-dotnet-runtime-1584e49-1" value="true" />
+    <add key="darc-int-dotnet-runtime-1584e49-2" value="true" />
     <add key="darc-int-dotnet-runtime-1584e49" value="true" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
+    <add key="darc-int-dotnet-windowsdesktop-8506c0d-1" value="true" />
+    <add key="darc-int-dotnet-windowsdesktop-8506c0d-2" value="true" />
     <add key="darc-int-dotnet-windowsdesktop-8506c0d" value="true" />
     <!--  End: Package sources from dotnet-windowsdesktop -->
     <!--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 4fb092505667..a517b16943ef 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -491,22 +491,22 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25114.5">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25120.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>221fba21fbd6a29f17af7a7004f8ef18a51519bd</Sha>
+      <Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25114.5">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25120.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>221fba21fbd6a29f17af7a7004f8ef18a51519bd</Sha>
+      <Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25114.5">
+    <Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25120.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>221fba21fbd6a29f17af7a7004f8ef18a51519bd</Sha>
+      <Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25114.5">
+    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25120.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>221fba21fbd6a29f17af7a7004f8ef18a51519bd</Sha>
+      <Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
     </Dependency>
     <Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.1">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 499146b39dcb..e8f52430cc2c 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -34,7 +34,7 @@
     <SystemCollectionsImmutablePackageVersion>7.0.0</SystemCollectionsImmutablePackageVersion>
     <SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
     <SystemReflectionMetadataVersion>7.0.0</SystemReflectionMetadataVersion>
-    <MicrosoftDotNetSignToolVersion>8.0.0-beta.25114.5</MicrosoftDotNetSignToolVersion>
+    <MicrosoftDotNetSignToolVersion>8.0.0-beta.25120.1</MicrosoftDotNetSignToolVersion>
     <MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
     <SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
     <SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
@@ -209,7 +209,7 @@
   <PropertyGroup>
     <FluentAssertionsVersion>6.12.0</FluentAssertionsVersion>
     <FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
-    <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25114.5</MicrosoftDotNetXUnitExtensionsVersion>
+    <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25120.1</MicrosoftDotNetXUnitExtensionsVersion>
     <MoqPackageVersion>4.18.4</MoqPackageVersion>
     <XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
     <MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>
diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake
index dafabdcaef00..f93dc440df0e 100644
--- a/eng/common/cross/toolchain.cmake
+++ b/eng/common/cross/toolchain.cmake
@@ -280,6 +280,8 @@ elseif(TARGET_ARCH_NAME MATCHES "^(arm64|x64)$")
     add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64")
     add_toolchain_linker_flag("-Wl,--rpath-link=${TIZEN_TOOLCHAIN_PATH}")
   endif()
+elseif(TARGET_ARCH_NAME STREQUAL "s390x")
+  add_toolchain_linker_flag("--target=${TOOLCHAIN}")
 elseif(TARGET_ARCH_NAME STREQUAL "x86")
   if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/i586-alpine-linux-musl)
     add_toolchain_linker_flag("--target=${TOOLCHAIN}")
@@ -327,6 +329,8 @@ if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$")
   if(TARGET_ARCH_NAME STREQUAL "armel")
     add_compile_options(-mfloat-abi=softfp)
   endif()
+elseif(TARGET_ARCH_NAME STREQUAL "s390x")
+  add_compile_options("--target=${TOOLCHAIN}")
 elseif(TARGET_ARCH_NAME STREQUAL "x86")
   if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/i586-alpine-linux-musl)
     add_compile_options(--target=${TOOLCHAIN})
diff --git a/global.json b/global.json
index 29e4c494df4e..d6b08a6813f8 100644
--- a/global.json
+++ b/global.json
@@ -14,7 +14,7 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25114.5",
-    "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25114.5"
+    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25120.1",
+    "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25120.1"
   }
 }

From 27f44d6312792c01018242288abc9456a2f22fb0 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 13 Mar 2025 04:00:58 +0000
Subject: [PATCH 03/63] Update dependencies from
 https://github.com/dotnet/templating build 20250312.2

Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks
 From Version 8.0.115-servicing.25156.8 -> To Version 8.0.115-servicing.25162.2
---
 NuGet.config            | 18 +++++++++++++++---
 eng/Version.Details.xml | 10 +++++-----
 eng/Versions.props      |  2 +-
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 3d39cef95a36..cd0b2e883244 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -4,6 +4,8 @@
     <!--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-ec84e77" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ec84e775/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-emsdk-ec84e77-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ec84e775-2/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-emsdk-ec84e77-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ec84e775-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-emsdk -->
     <!--  Begin: Package sources from dotnet-format -->
     <add key="darc-pub-dotnet-format-27f1865" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-27f18656/nuget/v3/index.json" />
@@ -19,6 +21,8 @@
     <!--  End: Package sources from dotnet-format -->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
     <add key="darc-int-dotnet-aspnetcore-25ef4aa" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-25ef4aa3/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-25ef4aa-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-25ef4aa3-2/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-25ef4aa-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-25ef4aa3-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from DotNet-msbuild-Trusted -->
     <add key="darc-pub-DotNet-msbuild-Trusted-bfbb056" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-bfbb0566/nuget/v3/index.json" />
@@ -27,14 +31,16 @@
     <!--  End: Package sources from dotnet-roslyn-analyzers -->
     <!--  Begin: Package sources from dotnet-runtime -->
     <add key="darc-int-dotnet-runtime-1584e49" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-1584e493/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-runtime-1584e49-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-1584e493-2/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-runtime-1584e49-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-1584e493-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
-    <add key="darc-pub-dotnet-templating-a977119" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-a977119e/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-a977119-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-a977119e-1/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-0da2c6e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-0da2c6ec/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-e779fed" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-e779fed3/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-8506c0d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-8506c0d8/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-8506c0d-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-8506c0d8-2/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-windowsdesktop-8506c0d-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-8506c0d8-1/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="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
@@ -59,6 +65,8 @@
     <!--  Begin: Package sources from dotnet-templating -->
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
+    <add key="darc-int-dotnet-aspnetcore-25ef4aa-1" value="true" />
+    <add key="darc-int-dotnet-aspnetcore-25ef4aa-2" value="true" />
     <add key="darc-int-dotnet-aspnetcore-25ef4aa" value="true" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-format -->
@@ -74,9 +82,13 @@
     <!--  End: Package sources from dotnet-format -->
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-runtime -->
+    <add key="darc-int-dotnet-runtime-1584e49-1" value="true" />
+    <add key="darc-int-dotnet-runtime-1584e49-2" value="true" />
     <add key="darc-int-dotnet-runtime-1584e49" value="true" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
+    <add key="darc-int-dotnet-windowsdesktop-8506c0d-1" value="true" />
+    <add key="darc-int-dotnet-windowsdesktop-8506c0d-2" value="true" />
     <add key="darc-int-dotnet-windowsdesktop-8506c0d" value="true" />
     <!--  End: Package sources from dotnet-windowsdesktop -->
     <!--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 4fb092505667..8e8bfba866fd 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,15 +3,15 @@
   <ProductDependencies>
     <Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.115">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>0da2c6ec19a265dd1478a9fb736c02117c907179</Sha>
+      <Sha>e779fed31bb4e3f62b17133cac1cf9de44a3288d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.115-servicing.25156.8">
+    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.115-servicing.25162.2">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>0da2c6ec19a265dd1478a9fb736c02117c907179</Sha>
+      <Sha>e779fed31bb4e3f62b17133cac1cf9de44a3288d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.115-servicing.25156.8">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.115-servicing.25162.2">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>0da2c6ec19a265dd1478a9fb736c02117c907179</Sha>
+      <Sha>e779fed31bb4e3f62b17133cac1cf9de44a3288d</Sha>
       <SourceBuild RepoName="templating" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.14">
diff --git a/eng/Versions.props b/eng/Versions.props
index 499146b39dcb..68ea66d80289 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -143,7 +143,7 @@
     <MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
     <MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
     <!-- test dependencies -->
-    <MicrosoftTemplateEngineMocksPackageVersion>8.0.115-servicing.25156.8</MicrosoftTemplateEngineMocksPackageVersion>
+    <MicrosoftTemplateEngineMocksPackageVersion>8.0.115-servicing.25162.2</MicrosoftTemplateEngineMocksPackageVersion>
     <MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
     <MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
     <MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>

From 09c97f0d3fbdfc0aaee3e481479ff756606abdfa Mon Sep 17 00:00:00 2001
From: Eduardo Villalpando Mello <eduardov@microsoft.com>
Date: Thu, 13 Mar 2025 17:49:35 -0700
Subject: [PATCH 04/63] [Github Actions] Labels: Add extra labels to check
 (#47564)

---
 .github/workflows/pr-analysis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/pr-analysis.yml b/.github/workflows/pr-analysis.yml
index b74a99c9799b..653869ada03b 100644
--- a/.github/workflows/pr-analysis.yml
+++ b/.github/workflows/pr-analysis.yml
@@ -1,7 +1,7 @@
 name: PR Analysis
 on:
   pull_request:
-    types: [opened, synchronize, labeled, unlabeled]
+    types: [opened, labeled, unlabeled]
 permissions:
   contents: read
   pull-requests: read
@@ -9,6 +9,6 @@ jobs:
   allowed-labels:
     runs-on: ubuntu-latest
     steps:
-      - name: Return error if branch is in lockdown or 'do not merge' label is present
+      - name: Return error if blocking labels are present in PR
         run: echo "Labels on this PR prevent it from being merged. Please contact the repo owners for more information." && exit 1
-        if: ${{ contains(github.event.pull_request.labels.*.name, 'Branch Lockdown') || contains(github.event.pull_request.labels.*.name, 'DO NOT MERGE') }}
+        if: ${{ contains(github.event.pull_request.labels.*.name, 'Branch Lockdown') || contains(github.event.pull_request.labels.*.name, 'DO NOT MERGE') || contains(github.event.pull_request.labels.*.name, 'Servicing-consider') || contains(github.event.pull_request.labels.*.name, 'Servicing-more-info') || contains(github.event.pull_request.labels.*.name, 'Servicing-rejected') }}

From ca430eb3c1613b41cd2a5e2aa76497370ca36bab Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 14 Mar 2025 05:01:46 +0000
Subject: [PATCH 05/63] Update dependencies from
 https://github.com/dotnet/source-build-reference-packages build 20250313.2

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 8.0.0-alpha.1.25081.5 -> To Version 8.0.0-alpha.1.25163.2
---
 NuGet.config            | 1 -
 eng/Version.Details.xml | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 4cde543704c7..021c2a9f4b95 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -30,7 +30,6 @@
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
     <add key="darc-pub-dotnet-templating-643e034" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-643e034b/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-488c525" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-488c525e/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-8506c0d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-8506c0d8/nuget/v3/index.json" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index ad16e06b5393..0faf81c9fdb1 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -354,9 +354,9 @@
       <Sha>dc30cd1ec22f198d658e011c14525d4d65873991</Sha>
       <SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25081.5">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25163.2">
       <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
-      <Sha>d73fc552386797322e84fa9b2ef5eaa5369de83c</Sha>
+      <Sha>b09e26d761555d806f31af68d6fe5dfdeebf6e38</Sha>
       <SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Deployment.DotNet.Releases" Version="2.0.0-rtm.1.25064.1">

From f19eed1dcba31ce1e20300551b3ad99ceb4b4819 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 14 Mar 2025 07:06:22 +0000
Subject: [PATCH 06/63] Update dependencies from
 https://github.com/dotnet/templating build 20250313.8

Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks
 From Version 8.0.115-servicing.25162.2 -> To Version 8.0.115-servicing.25163.8
---
 NuGet.config            |  3 +--
 eng/Version.Details.xml | 10 +++++-----
 eng/Versions.props      |  2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 7b5916a52142..a2a22ec2ccd7 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -35,8 +35,7 @@
     <add key="darc-int-dotnet-runtime-1584e49-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-1584e493-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
-    <add key="darc-pub-dotnet-templating-e779fed" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-e779fed3/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-0da2c6e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-0da2c6ec/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-7cdf1f0" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-7cdf1f0e/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-8506c0d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-8506c0d8/nuget/v3/index.json" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 89024ffdf808..e80f8119385d 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,15 +3,15 @@
   <ProductDependencies>
     <Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.115">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>e779fed31bb4e3f62b17133cac1cf9de44a3288d</Sha>
+      <Sha>7cdf1f0e90717817671c87331db6bc44dc1d7eea</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.115-servicing.25162.2">
+    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.115-servicing.25163.8">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>e779fed31bb4e3f62b17133cac1cf9de44a3288d</Sha>
+      <Sha>7cdf1f0e90717817671c87331db6bc44dc1d7eea</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.115-servicing.25162.2">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.115-servicing.25163.8">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>e779fed31bb4e3f62b17133cac1cf9de44a3288d</Sha>
+      <Sha>7cdf1f0e90717817671c87331db6bc44dc1d7eea</Sha>
       <SourceBuild RepoName="templating" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.14">
diff --git a/eng/Versions.props b/eng/Versions.props
index ed810ee22224..89b86e8c8bc0 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -143,7 +143,7 @@
     <MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
     <MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
     <!-- test dependencies -->
-    <MicrosoftTemplateEngineMocksPackageVersion>8.0.115-servicing.25162.2</MicrosoftTemplateEngineMocksPackageVersion>
+    <MicrosoftTemplateEngineMocksPackageVersion>8.0.115-servicing.25163.8</MicrosoftTemplateEngineMocksPackageVersion>
     <MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
     <MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
     <MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>

From 4c44281c293d0491c2159ab5646fe610612b7d85 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 14 Mar 2025 16:25:12 +0000
Subject: [PATCH 07/63] [release/8.0.1xx] Update dependencies from
 dotnet/source-build-reference-packages (#47579)

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: v-wuzhai <v-wuzhai@microsoft.com>
---
 NuGet.config            | 1 +
 eng/Version.Details.xml | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index a2a22ec2ccd7..d9c1ddfe3dd1 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -35,6 +35,7 @@
     <add key="darc-int-dotnet-runtime-1584e49-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-1584e493-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
+    <add key="darc-pub-dotnet-templating-e779fed" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-e779fed3/nuget/v3/index.json" />
     <add key="darc-pub-dotnet-templating-7cdf1f0" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-7cdf1f0e/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index e80f8119385d..f56c092c0f2e 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -354,9 +354,9 @@
       <Sha>dc30cd1ec22f198d658e011c14525d4d65873991</Sha>
       <SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25081.5">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25163.2">
       <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
-      <Sha>d73fc552386797322e84fa9b2ef5eaa5369de83c</Sha>
+      <Sha>b09e26d761555d806f31af68d6fe5dfdeebf6e38</Sha>
       <SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Deployment.DotNet.Releases" Version="2.0.0-rtm.1.25064.1">

From 5b8484f1b26db09a2b2e0c2aa3e50bef58042b24 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 14 Mar 2025 09:54:14 -0700
Subject: [PATCH 08/63] [release/8.0.3xx] Update dependencies from
 dotnet/templating (#47583)

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Jason Zhai <v-wuzhai@microsoft.com>
---
 NuGet.config            |  1 +
 eng/Version.Details.xml | 10 +++++-----
 eng/Versions.props      |  2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 021c2a9f4b95..7856fccc7cf9 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -29,6 +29,7 @@
     <add key="darc-int-dotnet-runtime-1584e49-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-1584e493-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
+    <add key="darc-pub-dotnet-templating-9a10417" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-9a104178/nuget/v3/index.json" />
     <add key="darc-pub-dotnet-templating-643e034" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-643e034b/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 0faf81c9fdb1..efada1a7e849 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,15 +3,15 @@
   <ProductDependencies>
     <Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.311">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>643e034bcd7691f83537da605da511458de60b89</Sha>
+      <Sha>9a104178ab2f26e0a4e5ead165f7b272090b2114</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.311-servicing.25162.1">
+    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.311-servicing.25163.1">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>643e034bcd7691f83537da605da511458de60b89</Sha>
+      <Sha>9a104178ab2f26e0a4e5ead165f7b272090b2114</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.311-servicing.25162.1">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.311-servicing.25163.1">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>643e034bcd7691f83537da605da511458de60b89</Sha>
+      <Sha>9a104178ab2f26e0a4e5ead165f7b272090b2114</Sha>
       <SourceBuild RepoName="templating" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.14">
diff --git a/eng/Versions.props b/eng/Versions.props
index 64a36985e709..9873611c3d07 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -147,7 +147,7 @@
     <MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
     <MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
     <!-- test dependencies -->
-    <MicrosoftTemplateEngineMocksPackageVersion>8.0.311-servicing.25162.1</MicrosoftTemplateEngineMocksPackageVersion>
+    <MicrosoftTemplateEngineMocksPackageVersion>8.0.311-servicing.25163.1</MicrosoftTemplateEngineMocksPackageVersion>
     <MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
     <MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
     <MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>

From f7ec9feafd0939073964e2d7a60673048dbd4cb4 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Sat, 15 Mar 2025 05:02:47 +0000
Subject: [PATCH 09/63] Update dependencies from
 https://github.com/dotnet/templating build 20250314.2

Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks
 From Version 8.0.311-servicing.25163.1 -> To Version 8.0.311-servicing.25164.2
---
 NuGet.config            |  3 +--
 eng/Version.Details.xml | 10 +++++-----
 eng/Versions.props      |  2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 7856fccc7cf9..5a5af4701808 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -29,8 +29,7 @@
     <add key="darc-int-dotnet-runtime-1584e49-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-1584e493-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
-    <add key="darc-pub-dotnet-templating-9a10417" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-9a104178/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-643e034" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-643e034b/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-f9ebd7d" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f9ebd7d2/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-8506c0d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-8506c0d8/nuget/v3/index.json" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index efada1a7e849..be9bd908b8d7 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,15 +3,15 @@
   <ProductDependencies>
     <Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.311">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>9a104178ab2f26e0a4e5ead165f7b272090b2114</Sha>
+      <Sha>f9ebd7d27891161e756c3812c94b2d2e4a7e7d87</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.311-servicing.25163.1">
+    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.311-servicing.25164.2">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>9a104178ab2f26e0a4e5ead165f7b272090b2114</Sha>
+      <Sha>f9ebd7d27891161e756c3812c94b2d2e4a7e7d87</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.311-servicing.25163.1">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.311-servicing.25164.2">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>9a104178ab2f26e0a4e5ead165f7b272090b2114</Sha>
+      <Sha>f9ebd7d27891161e756c3812c94b2d2e4a7e7d87</Sha>
       <SourceBuild RepoName="templating" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.14">
diff --git a/eng/Versions.props b/eng/Versions.props
index 9873611c3d07..aa1d317404bc 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -147,7 +147,7 @@
     <MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
     <MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
     <!-- test dependencies -->
-    <MicrosoftTemplateEngineMocksPackageVersion>8.0.311-servicing.25163.1</MicrosoftTemplateEngineMocksPackageVersion>
+    <MicrosoftTemplateEngineMocksPackageVersion>8.0.311-servicing.25164.2</MicrosoftTemplateEngineMocksPackageVersion>
     <MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
     <MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
     <MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>

From 702118b30c8e308b7e0cce1802857e95229b0c43 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Sat, 15 Mar 2025 05:02:48 +0000
Subject: [PATCH 10/63] Update dependencies from
 https://github.com/dotnet/arcade build 20250314.5

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.25120.1 -> To Version 8.0.0-beta.25164.5
---
 NuGet.config                                  |  1 -
 eng/Version.Details.xml                       | 16 +++++++--------
 eng/Versions.props                            |  4 ++--
 eng/common/generate-sbom-prep.ps1             | 20 +++++++++++++------
 eng/common/generate-sbom-prep.sh              | 17 ++++++++++------
 eng/common/templates-official/job/job.yml     |  3 ++-
 .../steps/generate-sbom.yml                   |  2 +-
 eng/common/tools.ps1                          |  4 ++--
 eng/common/tools.sh                           |  4 ++--
 global.json                                   |  6 +++---
 10 files changed, 45 insertions(+), 32 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index d9c1ddfe3dd1..a2a22ec2ccd7 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -35,7 +35,6 @@
     <add key="darc-int-dotnet-runtime-1584e49-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-1584e493-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
-    <add key="darc-pub-dotnet-templating-e779fed" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-e779fed3/nuget/v3/index.json" />
     <add key="darc-pub-dotnet-templating-7cdf1f0" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-7cdf1f0e/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index f56c092c0f2e..b9584cc072ff 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -491,22 +491,22 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25120.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25164.5">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
+      <Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25120.1">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25164.5">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
+      <Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25120.1">
+    <Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25164.5">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
+      <Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25120.1">
+    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25164.5">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
+      <Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
     </Dependency>
     <Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.1">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 89b86e8c8bc0..2dfb3a8a16f5 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -34,7 +34,7 @@
     <SystemCollectionsImmutablePackageVersion>7.0.0</SystemCollectionsImmutablePackageVersion>
     <SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
     <SystemReflectionMetadataVersion>7.0.0</SystemReflectionMetadataVersion>
-    <MicrosoftDotNetSignToolVersion>8.0.0-beta.25120.1</MicrosoftDotNetSignToolVersion>
+    <MicrosoftDotNetSignToolVersion>8.0.0-beta.25164.5</MicrosoftDotNetSignToolVersion>
     <MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
     <SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
     <SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
@@ -209,7 +209,7 @@
   <PropertyGroup>
     <FluentAssertionsVersion>6.12.0</FluentAssertionsVersion>
     <FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
-    <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25120.1</MicrosoftDotNetXUnitExtensionsVersion>
+    <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25164.5</MicrosoftDotNetXUnitExtensionsVersion>
     <MoqPackageVersion>4.18.4</MoqPackageVersion>
     <XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
     <MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>
diff --git a/eng/common/generate-sbom-prep.ps1 b/eng/common/generate-sbom-prep.ps1
index 3e5c1c74a1c5..a0c7d792a76f 100644
--- a/eng/common/generate-sbom-prep.ps1
+++ b/eng/common/generate-sbom-prep.ps1
@@ -4,18 +4,26 @@ Param(
 
 . $PSScriptRoot\pipeline-logging-functions.ps1
 
+# Normally - we'd listen to the manifest path given, but 1ES templates will overwrite if this level gets uploaded directly
+# with their own overwriting ours. So we create it as a sub directory of the requested manifest path.
+$ArtifactName = "${env:SYSTEM_STAGENAME}_${env:AGENT_JOBNAME}_SBOM"
+$SafeArtifactName = $ArtifactName -replace '["/:<>\\|?@*"() ]', '_'
+$SbomGenerationDir = Join-Path $ManifestDirPath $SafeArtifactName
+
+Write-Host "Artifact name before : $ArtifactName"
+Write-Host "Artifact name after : $SafeArtifactName"
+
 Write-Host "Creating dir $ManifestDirPath"
+
 # create directory for sbom manifest to be placed
-if (!(Test-Path -path $ManifestDirPath))
+if (!(Test-Path -path $SbomGenerationDir))
 {
-  New-Item -ItemType Directory -path $ManifestDirPath
-  Write-Host "Successfully created directory $ManifestDirPath"
+  New-Item -ItemType Directory -path $SbomGenerationDir
+  Write-Host "Successfully created directory $SbomGenerationDir"
 }
 else{
   Write-PipelineTelemetryError -category 'Build'  "Unable to create sbom folder."
 }
 
 Write-Host "Updating artifact name"
-$artifact_name = "${env:SYSTEM_STAGENAME}_${env:AGENT_JOBNAME}_SBOM" -replace '["/:<>\\|?@*"() ]', '_'
-Write-Host "Artifact name $artifact_name"
-Write-Host "##vso[task.setvariable variable=ARTIFACT_NAME]$artifact_name"
+Write-Host "##vso[task.setvariable variable=ARTIFACT_NAME]$SafeArtifactName"
diff --git a/eng/common/generate-sbom-prep.sh b/eng/common/generate-sbom-prep.sh
index d5c76dc827b4..bbb4922151e6 100644
--- a/eng/common/generate-sbom-prep.sh
+++ b/eng/common/generate-sbom-prep.sh
@@ -14,19 +14,24 @@ done
 scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
 . $scriptroot/pipeline-logging-functions.sh
 
+# replace all special characters with _, some builds use special characters like : in Agent.Jobname, that is not a permissible name while uploading artifacts.
+artifact_name=$SYSTEM_STAGENAME"_"$AGENT_JOBNAME"_SBOM"
+safe_artifact_name="${artifact_name//["/:<>\\|?@*$" ]/_}"
+
 manifest_dir=$1
 
-if [ ! -d "$manifest_dir" ] ; then
-  mkdir -p "$manifest_dir"
-  echo "Sbom directory created." $manifest_dir
+# Normally - we'd listen to the manifest path given, but 1ES templates will overwrite if this level gets uploaded directly
+# with their own overwriting ours. So we create it as a sub directory of the requested manifest path.
+sbom_generation_dir="$manifest_dir/$safe_artifact_name"
+
+if [ ! -d "$sbom_generation_dir" ] ; then
+  mkdir -p "$sbom_generation_dir"
+  echo "Sbom directory created." $sbom_generation_dir
 else
   Write-PipelineTelemetryError -category 'Build'  "Unable to create sbom folder."
 fi
 
-artifact_name=$SYSTEM_STAGENAME"_"$AGENT_JOBNAME"_SBOM"
 echo "Artifact name before : "$artifact_name
-# replace all special characters with _, some builds use special characters like : in Agent.Jobname, that is not a permissible name while uploading artifacts.
-safe_artifact_name="${artifact_name//["/:<>\\|?@*$" ]/_}"
 echo "Artifact name after : "$safe_artifact_name
 export ARTIFACT_NAME=$safe_artifact_name
 echo "##vso[task.setvariable variable=ARTIFACT_NAME]$safe_artifact_name"
diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml
index 1f035fee73f4..98ccbd7a9c16 100644
--- a/eng/common/templates-official/job/job.yml
+++ b/eng/common/templates-official/job/job.yml
@@ -38,6 +38,7 @@ parameters:
   enableSbom: true
   PackageVersion: 7.0.0
   BuildDropPath: '$(Build.SourcesDirectory)/artifacts'
+  ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom
 
 jobs:
 - job: ${{ parameters.name }}
@@ -261,4 +262,4 @@ jobs:
         targetPath: '$(Build.SourcesDirectory)\eng\common\BuildConfiguration'
         artifactName: 'BuildConfiguration'
       displayName: 'Publish build retry configuration'
-      continueOnError: true
\ No newline at end of file
+      continueOnError: true
diff --git a/eng/common/templates-official/steps/generate-sbom.yml b/eng/common/templates-official/steps/generate-sbom.yml
index 1bf43bf807af..daf0957b68d7 100644
--- a/eng/common/templates-official/steps/generate-sbom.yml
+++ b/eng/common/templates-official/steps/generate-sbom.yml
@@ -35,7 +35,7 @@ steps:
       PackageName: ${{ parameters.packageName }}
       BuildDropPath: ${{ parameters.buildDropPath }}
       PackageVersion: ${{ parameters.packageVersion }}
-      ManifestDirPath: ${{ parameters.manifestDirPath }}
+      ManifestDirPath: ${{ parameters.manifestDirPath }}/$(ARTIFACT_NAME)
       ${{ if ne(parameters.IgnoreDirectories, '') }}:
         AdditionalComponentDetectorArgs: '--IgnoreDirectories ${{ parameters.IgnoreDirectories }}'
 
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index a00577ed17aa..82b2798ba307 100644
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -42,7 +42,7 @@
 [bool]$useInstalledDotNetCli = if (Test-Path variable:useInstalledDotNetCli) { $useInstalledDotNetCli } else { $true }
 
 # Enable repos to use a particular version of the on-line dotnet-install scripts.
-#    default URL: https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.ps1
+#    default URL: https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.ps1
 [string]$dotnetInstallScriptVersion = if (Test-Path variable:dotnetInstallScriptVersion) { $dotnetInstallScriptVersion } else { 'v1' }
 
 # True to use global NuGet cache instead of restoring packages to repository-local directory.
@@ -263,7 +263,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) {
   if (!(Test-Path $installScript)) {
     Create-Directory $dotnetRoot
     $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit
-    $uri = "https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1"
+    $uri = "https://builds.dotnet.microsoft.com/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1"
 
     Retry({
       Write-Host "GET $uri"
diff --git a/eng/common/tools.sh b/eng/common/tools.sh
index b9b329ce37ff..68db15430230 100755
--- a/eng/common/tools.sh
+++ b/eng/common/tools.sh
@@ -54,7 +54,7 @@ warn_as_error=${warn_as_error:-true}
 use_installed_dotnet_cli=${use_installed_dotnet_cli:-true}
 
 # Enable repos to use a particular version of the on-line dotnet-install scripts.
-#    default URL: https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.sh
+#    default URL: https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.sh
 dotnetInstallScriptVersion=${dotnetInstallScriptVersion:-'v1'}
 
 # True to use global NuGet cache instead of restoring packages to repository-local directory.
@@ -297,7 +297,7 @@ function with_retries {
 function GetDotNetInstallScript {
   local root=$1
   local install_script="$root/dotnet-install.sh"
-  local install_script_url="https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh"
+  local install_script_url="https://builds.dotnet.microsoft.com/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh"
 
   if [[ ! -a "$install_script" ]]; then
     mkdir -p "$root"
diff --git a/global.json b/global.json
index d6b08a6813f8..9982ec1ef3b5 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "tools": {
-    "dotnet": "8.0.113",
+    "dotnet": "8.0.114",
     "runtimes": {
       "dotnet": [
         "$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)"
@@ -14,7 +14,7 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25120.1",
-    "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25120.1"
+    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25164.5",
+    "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25164.5"
   }
 }

From 4b85f19796a8b9fdfba934c36d4780869e65f8b8 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Sat, 15 Mar 2025 05:02:53 +0000
Subject: [PATCH 11/63] Update dependencies from
 https://github.com/dotnet/arcade build 20250314.5

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.25120.1 -> To Version 8.0.0-beta.25164.5
---
 NuGet.config                                  |  1 -
 eng/Version.Details.xml                       | 16 +++++++--------
 eng/Versions.props                            |  4 ++--
 eng/common/generate-sbom-prep.ps1             | 20 +++++++++++++------
 eng/common/generate-sbom-prep.sh              | 17 ++++++++++------
 eng/common/templates-official/job/job.yml     |  3 ++-
 .../steps/generate-sbom.yml                   |  2 +-
 eng/common/tools.ps1                          |  4 ++--
 eng/common/tools.sh                           |  4 ++--
 global.json                                   |  6 +++---
 10 files changed, 45 insertions(+), 32 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 7856fccc7cf9..e30c314a895e 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -30,7 +30,6 @@
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
     <add key="darc-pub-dotnet-templating-9a10417" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-9a104178/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-templating-643e034" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-643e034b/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-8506c0d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-8506c0d8/nuget/v3/index.json" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index efada1a7e849..609a63983751 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -491,22 +491,22 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25120.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25164.5">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
+      <Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25120.1">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25164.5">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
+      <Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25120.1">
+    <Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25164.5">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
+      <Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25120.1">
+    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25164.5">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
+      <Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
     </Dependency>
     <Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.1">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 9873611c3d07..846faccfcf2a 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -36,7 +36,7 @@
     <SystemCollectionsImmutablePackageVersion>7.0.0</SystemCollectionsImmutablePackageVersion>
     <SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
     <SystemReflectionMetadataVersion>7.0.0</SystemReflectionMetadataVersion>
-    <MicrosoftDotNetSignToolVersion>8.0.0-beta.25120.1</MicrosoftDotNetSignToolVersion>
+    <MicrosoftDotNetSignToolVersion>8.0.0-beta.25164.5</MicrosoftDotNetSignToolVersion>
     <MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
     <SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
     <SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
@@ -213,7 +213,7 @@
   <PropertyGroup>
     <FluentAssertionsVersion>6.12.0</FluentAssertionsVersion>
     <FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
-    <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25120.1</MicrosoftDotNetXUnitExtensionsVersion>
+    <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25164.5</MicrosoftDotNetXUnitExtensionsVersion>
     <MoqPackageVersion>4.18.4</MoqPackageVersion>
     <XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
     <MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>
diff --git a/eng/common/generate-sbom-prep.ps1 b/eng/common/generate-sbom-prep.ps1
index 3e5c1c74a1c5..a0c7d792a76f 100644
--- a/eng/common/generate-sbom-prep.ps1
+++ b/eng/common/generate-sbom-prep.ps1
@@ -4,18 +4,26 @@ Param(
 
 . $PSScriptRoot\pipeline-logging-functions.ps1
 
+# Normally - we'd listen to the manifest path given, but 1ES templates will overwrite if this level gets uploaded directly
+# with their own overwriting ours. So we create it as a sub directory of the requested manifest path.
+$ArtifactName = "${env:SYSTEM_STAGENAME}_${env:AGENT_JOBNAME}_SBOM"
+$SafeArtifactName = $ArtifactName -replace '["/:<>\\|?@*"() ]', '_'
+$SbomGenerationDir = Join-Path $ManifestDirPath $SafeArtifactName
+
+Write-Host "Artifact name before : $ArtifactName"
+Write-Host "Artifact name after : $SafeArtifactName"
+
 Write-Host "Creating dir $ManifestDirPath"
+
 # create directory for sbom manifest to be placed
-if (!(Test-Path -path $ManifestDirPath))
+if (!(Test-Path -path $SbomGenerationDir))
 {
-  New-Item -ItemType Directory -path $ManifestDirPath
-  Write-Host "Successfully created directory $ManifestDirPath"
+  New-Item -ItemType Directory -path $SbomGenerationDir
+  Write-Host "Successfully created directory $SbomGenerationDir"
 }
 else{
   Write-PipelineTelemetryError -category 'Build'  "Unable to create sbom folder."
 }
 
 Write-Host "Updating artifact name"
-$artifact_name = "${env:SYSTEM_STAGENAME}_${env:AGENT_JOBNAME}_SBOM" -replace '["/:<>\\|?@*"() ]', '_'
-Write-Host "Artifact name $artifact_name"
-Write-Host "##vso[task.setvariable variable=ARTIFACT_NAME]$artifact_name"
+Write-Host "##vso[task.setvariable variable=ARTIFACT_NAME]$SafeArtifactName"
diff --git a/eng/common/generate-sbom-prep.sh b/eng/common/generate-sbom-prep.sh
index d5c76dc827b4..bbb4922151e6 100644
--- a/eng/common/generate-sbom-prep.sh
+++ b/eng/common/generate-sbom-prep.sh
@@ -14,19 +14,24 @@ done
 scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
 . $scriptroot/pipeline-logging-functions.sh
 
+# replace all special characters with _, some builds use special characters like : in Agent.Jobname, that is not a permissible name while uploading artifacts.
+artifact_name=$SYSTEM_STAGENAME"_"$AGENT_JOBNAME"_SBOM"
+safe_artifact_name="${artifact_name//["/:<>\\|?@*$" ]/_}"
+
 manifest_dir=$1
 
-if [ ! -d "$manifest_dir" ] ; then
-  mkdir -p "$manifest_dir"
-  echo "Sbom directory created." $manifest_dir
+# Normally - we'd listen to the manifest path given, but 1ES templates will overwrite if this level gets uploaded directly
+# with their own overwriting ours. So we create it as a sub directory of the requested manifest path.
+sbom_generation_dir="$manifest_dir/$safe_artifact_name"
+
+if [ ! -d "$sbom_generation_dir" ] ; then
+  mkdir -p "$sbom_generation_dir"
+  echo "Sbom directory created." $sbom_generation_dir
 else
   Write-PipelineTelemetryError -category 'Build'  "Unable to create sbom folder."
 fi
 
-artifact_name=$SYSTEM_STAGENAME"_"$AGENT_JOBNAME"_SBOM"
 echo "Artifact name before : "$artifact_name
-# replace all special characters with _, some builds use special characters like : in Agent.Jobname, that is not a permissible name while uploading artifacts.
-safe_artifact_name="${artifact_name//["/:<>\\|?@*$" ]/_}"
 echo "Artifact name after : "$safe_artifact_name
 export ARTIFACT_NAME=$safe_artifact_name
 echo "##vso[task.setvariable variable=ARTIFACT_NAME]$safe_artifact_name"
diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml
index 1f035fee73f4..98ccbd7a9c16 100644
--- a/eng/common/templates-official/job/job.yml
+++ b/eng/common/templates-official/job/job.yml
@@ -38,6 +38,7 @@ parameters:
   enableSbom: true
   PackageVersion: 7.0.0
   BuildDropPath: '$(Build.SourcesDirectory)/artifacts'
+  ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom
 
 jobs:
 - job: ${{ parameters.name }}
@@ -261,4 +262,4 @@ jobs:
         targetPath: '$(Build.SourcesDirectory)\eng\common\BuildConfiguration'
         artifactName: 'BuildConfiguration'
       displayName: 'Publish build retry configuration'
-      continueOnError: true
\ No newline at end of file
+      continueOnError: true
diff --git a/eng/common/templates-official/steps/generate-sbom.yml b/eng/common/templates-official/steps/generate-sbom.yml
index 1bf43bf807af..daf0957b68d7 100644
--- a/eng/common/templates-official/steps/generate-sbom.yml
+++ b/eng/common/templates-official/steps/generate-sbom.yml
@@ -35,7 +35,7 @@ steps:
       PackageName: ${{ parameters.packageName }}
       BuildDropPath: ${{ parameters.buildDropPath }}
       PackageVersion: ${{ parameters.packageVersion }}
-      ManifestDirPath: ${{ parameters.manifestDirPath }}
+      ManifestDirPath: ${{ parameters.manifestDirPath }}/$(ARTIFACT_NAME)
       ${{ if ne(parameters.IgnoreDirectories, '') }}:
         AdditionalComponentDetectorArgs: '--IgnoreDirectories ${{ parameters.IgnoreDirectories }}'
 
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index a00577ed17aa..82b2798ba307 100644
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -42,7 +42,7 @@
 [bool]$useInstalledDotNetCli = if (Test-Path variable:useInstalledDotNetCli) { $useInstalledDotNetCli } else { $true }
 
 # Enable repos to use a particular version of the on-line dotnet-install scripts.
-#    default URL: https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.ps1
+#    default URL: https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.ps1
 [string]$dotnetInstallScriptVersion = if (Test-Path variable:dotnetInstallScriptVersion) { $dotnetInstallScriptVersion } else { 'v1' }
 
 # True to use global NuGet cache instead of restoring packages to repository-local directory.
@@ -263,7 +263,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) {
   if (!(Test-Path $installScript)) {
     Create-Directory $dotnetRoot
     $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit
-    $uri = "https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1"
+    $uri = "https://builds.dotnet.microsoft.com/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1"
 
     Retry({
       Write-Host "GET $uri"
diff --git a/eng/common/tools.sh b/eng/common/tools.sh
index b9b329ce37ff..68db15430230 100755
--- a/eng/common/tools.sh
+++ b/eng/common/tools.sh
@@ -54,7 +54,7 @@ warn_as_error=${warn_as_error:-true}
 use_installed_dotnet_cli=${use_installed_dotnet_cli:-true}
 
 # Enable repos to use a particular version of the on-line dotnet-install scripts.
-#    default URL: https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.sh
+#    default URL: https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.sh
 dotnetInstallScriptVersion=${dotnetInstallScriptVersion:-'v1'}
 
 # True to use global NuGet cache instead of restoring packages to repository-local directory.
@@ -297,7 +297,7 @@ function with_retries {
 function GetDotNetInstallScript {
   local root=$1
   local install_script="$root/dotnet-install.sh"
-  local install_script_url="https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh"
+  local install_script_url="https://builds.dotnet.microsoft.com/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh"
 
   if [[ ! -a "$install_script" ]]; then
     mkdir -p "$root"
diff --git a/global.json b/global.json
index d6b08a6813f8..9982ec1ef3b5 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "tools": {
-    "dotnet": "8.0.113",
+    "dotnet": "8.0.114",
     "runtimes": {
       "dotnet": [
         "$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)"
@@ -14,7 +14,7 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25120.1",
-    "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25120.1"
+    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25164.5",
+    "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25164.5"
   }
 }

From 5213445380973bc425704fb06b4c6ef61b8bedca Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Mon, 17 Mar 2025 03:13:19 +0000
Subject: [PATCH 12/63] Update dependencies from
 https://github.com/dotnet/templating build 20250316.1

Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks
 From Version 8.0.115-servicing.25163.8 -> To Version 8.0.115-servicing.25166.1
---
 NuGet.config            | 23 +----------------------
 eng/Version.Details.xml | 10 +++++-----
 eng/Versions.props      |  2 +-
 3 files changed, 7 insertions(+), 28 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index a2a22ec2ccd7..12dfce6e239f 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -3,9 +3,6 @@
     <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-ec84e77" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ec84e775/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-emsdk-ec84e77-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ec84e775-2/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-emsdk-ec84e77-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ec84e775-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-emsdk -->
     <!--  Begin: Package sources from dotnet-format -->
     <add key="darc-pub-dotnet-format-27f1865" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-27f18656/nuget/v3/index.json" />
@@ -20,9 +17,6 @@
     <add key="darc-int-dotnet-format-27f1865-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-27f18656-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-format -->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
-    <add key="darc-int-dotnet-aspnetcore-25ef4aa" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-25ef4aa3/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-aspnetcore-25ef4aa-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-25ef4aa3-2/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-aspnetcore-25ef4aa-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-25ef4aa3-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from DotNet-msbuild-Trusted -->
     <add key="darc-pub-DotNet-msbuild-Trusted-bfbb056" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-bfbb0566/nuget/v3/index.json" />
@@ -30,17 +24,11 @@
     <!--  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-1584e49" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-1584e493/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-runtime-1584e49-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-1584e493-2/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-runtime-1584e49-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-1584e493-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
-    <add key="darc-pub-dotnet-templating-7cdf1f0" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-7cdf1f0e/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-342a0e1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-342a0e1e/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
-    <add key="darc-int-dotnet-windowsdesktop-8506c0d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-8506c0d8/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-windowsdesktop-8506c0d-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-8506c0d8-2/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-windowsdesktop-8506c0d-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-8506c0d8-1/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="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
@@ -65,9 +53,6 @@
     <!--  Begin: Package sources from dotnet-templating -->
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
-    <add key="darc-int-dotnet-aspnetcore-25ef4aa-1" value="true" />
-    <add key="darc-int-dotnet-aspnetcore-25ef4aa-2" value="true" />
-    <add key="darc-int-dotnet-aspnetcore-25ef4aa" value="true" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-format -->
     <add key="darc-int-dotnet-format-27f1865-1" value="true" />
@@ -82,14 +67,8 @@
     <!--  End: Package sources from dotnet-format -->
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-runtime -->
-    <add key="darc-int-dotnet-runtime-1584e49-1" value="true" />
-    <add key="darc-int-dotnet-runtime-1584e49-2" value="true" />
-    <add key="darc-int-dotnet-runtime-1584e49" value="true" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
-    <add key="darc-int-dotnet-windowsdesktop-8506c0d-1" value="true" />
-    <add key="darc-int-dotnet-windowsdesktop-8506c0d-2" value="true" />
-    <add key="darc-int-dotnet-windowsdesktop-8506c0d" value="true" />
     <!--  End: Package sources from dotnet-windowsdesktop -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
   </disabledPackageSources>
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index b9584cc072ff..72a523b4ff5a 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,15 +3,15 @@
   <ProductDependencies>
     <Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.115">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>7cdf1f0e90717817671c87331db6bc44dc1d7eea</Sha>
+      <Sha>342a0e1e7d00f65e4c5b31228fb2148b64f81603</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.115-servicing.25163.8">
+    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.115-servicing.25166.1">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>7cdf1f0e90717817671c87331db6bc44dc1d7eea</Sha>
+      <Sha>342a0e1e7d00f65e4c5b31228fb2148b64f81603</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.115-servicing.25163.8">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.115-servicing.25166.1">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>7cdf1f0e90717817671c87331db6bc44dc1d7eea</Sha>
+      <Sha>342a0e1e7d00f65e4c5b31228fb2148b64f81603</Sha>
       <SourceBuild RepoName="templating" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.14">
diff --git a/eng/Versions.props b/eng/Versions.props
index 2dfb3a8a16f5..6975e1a6ae51 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -143,7 +143,7 @@
     <MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
     <MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
     <!-- test dependencies -->
-    <MicrosoftTemplateEngineMocksPackageVersion>8.0.115-servicing.25163.8</MicrosoftTemplateEngineMocksPackageVersion>
+    <MicrosoftTemplateEngineMocksPackageVersion>8.0.115-servicing.25166.1</MicrosoftTemplateEngineMocksPackageVersion>
     <MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
     <MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
     <MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>

From 7df0cd2899bc567f731655d4f43fc8e199dd258a Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Mon, 17 Mar 2025 05:03:45 +0000
Subject: [PATCH 13/63] Update dependencies from
 https://github.com/dotnet/templating build 20250316.5

Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks
 From Version 8.0.408-servicing.25163.2 -> To Version 8.0.408-servicing.25166.5
---
 NuGet.config            | 23 +----------------------
 eng/Version.Details.xml | 10 +++++-----
 eng/Versions.props      |  2 +-
 3 files changed, 7 insertions(+), 28 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 2c9bf7892b79..f11122618150 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -4,9 +4,6 @@
     <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-ec84e77" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ec84e775/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-emsdk-ec84e77-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ec84e775-2/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-emsdk-ec84e77-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ec84e775-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-emsdk -->
     <!--  Begin: Package sources from dotnet-format -->
     <add key="darc-pub-dotnet-format-42ef1d0" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-42ef1d04/nuget/v3/index.json" />
@@ -14,9 +11,6 @@
     <add key="darc-pub-dotnet-format-42ef1d0-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-42ef1d04-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-format -->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
-    <add key="darc-int-dotnet-aspnetcore-25ef4aa" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-25ef4aa3/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-aspnetcore-25ef4aa-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-25ef4aa3-2/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-aspnetcore-25ef4aa-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-25ef4aa3-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from DotNet-msbuild-Trusted -->
     <add key="darc-pub-DotNet-msbuild-Trusted-2b19be4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-2b19be47/nuget/v3/index.json" />
@@ -24,17 +18,11 @@
     <!--  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-1584e49" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-1584e493/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-runtime-1584e49-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-1584e493-2/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-runtime-1584e49-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-1584e493-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
-    <add key="darc-pub-dotnet-templating-21231eb" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-21231eb0/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-4a84424" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-4a844244/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
-    <add key="darc-int-dotnet-windowsdesktop-8506c0d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-8506c0d8/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-windowsdesktop-8506c0d-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-8506c0d8-2/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-windowsdesktop-8506c0d-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-8506c0d8-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-windowsdesktop -->
     <!--  Begin: Package sources from dotnet-winforms -->
     <!--  End: Package sources from dotnet-winforms -->
@@ -61,21 +49,12 @@
     <!--  Begin: Package sources from dotnet-templating -->
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
-    <add key="darc-int-dotnet-aspnetcore-25ef4aa-1" value="true" />
-    <add key="darc-int-dotnet-aspnetcore-25ef4aa-2" value="true" />
-    <add key="darc-int-dotnet-aspnetcore-25ef4aa" value="true" />
     <!--  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-1584e49-1" value="true" />
-    <add key="darc-int-dotnet-runtime-1584e49-2" value="true" />
-    <add key="darc-int-dotnet-runtime-1584e49" value="true" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
-    <add key="darc-int-dotnet-windowsdesktop-8506c0d-1" value="true" />
-    <add key="darc-int-dotnet-windowsdesktop-8506c0d-2" value="true" />
-    <add key="darc-int-dotnet-windowsdesktop-8506c0d" 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 501f6ed83127..439dc7bf1d26 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,15 +3,15 @@
   <ProductDependencies>
     <Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.408">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>21231eb04bbada374ed06160e7889c161d4e1453</Sha>
+      <Sha>4a8442440cc7c977ec7d5d65c92e00e432162d4e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.408-servicing.25163.2">
+    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.408-servicing.25166.5">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>21231eb04bbada374ed06160e7889c161d4e1453</Sha>
+      <Sha>4a8442440cc7c977ec7d5d65c92e00e432162d4e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.408-servicing.25163.2">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.408-servicing.25166.5">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>21231eb04bbada374ed06160e7889c161d4e1453</Sha>
+      <Sha>4a8442440cc7c977ec7d5d65c92e00e432162d4e</Sha>
       <SourceBuild RepoName="templating" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.14">
diff --git a/eng/Versions.props b/eng/Versions.props
index 6bb852027bfe..265d37080595 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -147,7 +147,7 @@
     <MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
     <MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
     <!-- test dependencies -->
-    <MicrosoftTemplateEngineMocksPackageVersion>8.0.408-servicing.25163.2</MicrosoftTemplateEngineMocksPackageVersion>
+    <MicrosoftTemplateEngineMocksPackageVersion>8.0.408-servicing.25166.5</MicrosoftTemplateEngineMocksPackageVersion>
     <MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
     <MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
     <MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>

From 2dc99eaf6b87ebe318ad5dc2eef4b91356ac78f7 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 25 Mar 2025 22:54:21 +0000
Subject: [PATCH 14/63] Update dependencies from
 https://github.com/dotnet/format build 20250325.6

dotnet-format
 From Version 8.1.546807 -> To Version 8.1.617506
---
 NuGet.config            | 20 +-------------------
 eng/Version.Details.xml |  6 +++---
 eng/Versions.props      |  2 +-
 3 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 12dfce6e239f..ae5ecfa375c0 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -5,16 +5,7 @@
     <!--  Begin: Package sources from dotnet-emsdk -->
     <!--  End: Package sources from dotnet-emsdk -->
     <!--  Begin: Package sources from dotnet-format -->
-    <add key="darc-pub-dotnet-format-27f1865" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-27f18656/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-format-27f1865" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-27f18656/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-format-27f1865-9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-27f18656-9/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-format-27f1865-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-27f18656-6/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-format-27f1865-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-27f18656-5/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-format-27f1865-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-27f18656-4/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-format-27f1865-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-27f18656-3/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-format-27f1865-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-27f18656-2/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-format-27f1865-10" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-27f18656-10/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-format-27f1865-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-format-27f18656-1/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-format-664013f" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-664013fb/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-format -->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
     <!--  End: Package sources from dotnet-aspnetcore -->
@@ -55,15 +46,6 @@
     <!--  Begin: Package sources from dotnet-aspnetcore -->
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-format -->
-    <add key="darc-int-dotnet-format-27f1865-1" value="true" />
-    <add key="darc-int-dotnet-format-27f1865-10" value="true" />
-    <add key="darc-int-dotnet-format-27f1865-2" value="true" />
-    <add key="darc-int-dotnet-format-27f1865-3" value="true" />
-    <add key="darc-int-dotnet-format-27f1865-4" value="true" />
-    <add key="darc-int-dotnet-format-27f1865-5" value="true" />
-    <add key="darc-int-dotnet-format-27f1865-6" value="true" />
-    <add key="darc-int-dotnet-format-27f1865-9" value="true" />
-    <add key="darc-int-dotnet-format-27f1865" value="true" />
     <!--  End: Package sources from dotnet-format -->
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-runtime -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 72a523b4ff5a..c0cce5d1d6d5 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -77,9 +77,9 @@
       <Sha>fc5e9eda234e2b69aa479f4f83faddc31fdd4da7</Sha>
       <SourceBuild RepoName="fsharp" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="dotnet-format" Version="8.1.546807">
-      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-format</Uri>
-      <Sha>27f18656aab37d71839f562c0653afce07a2d2fd</Sha>
+    <Dependency Name="dotnet-format" Version="8.1.617506">
+      <Uri>https://github.com/dotnet/format</Uri>
+      <Sha>664013fbe5e68941be81f9a710058db028da788f</Sha>
       <SourceBuild RepoName="format" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.8.0-7.25056.18">
diff --git a/eng/Versions.props b/eng/Versions.props
index 6975e1a6ae51..c39219623548 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -112,7 +112,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/format -->
-    <dotnetformatVersion>8.1.546807</dotnetformatVersion>
+    <dotnetformatVersion>8.1.617506</dotnetformatVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/roslyn-analyzers -->

From cd7cd77824f0194c18c2b57ceea4cb99d28d173e Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 2 Apr 2025 21:46:55 +0000
Subject: [PATCH 15/63] Update dependencies from
 https://github.com/dotnet/templating build 20250402.2

Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks
 From Version 8.0.115-servicing.25166.1 -> To Version 8.0.116-servicing.25202.2
---
 NuGet.config            |  2 +-
 eng/Version.Details.xml | 12 ++++++------
 eng/Versions.props      |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 12dfce6e239f..45f20822ac07 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -26,7 +26,7 @@
     <!--  Begin: Package sources from dotnet-runtime -->
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
-    <add key="darc-pub-dotnet-templating-342a0e1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-342a0e1e/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-a6bfd46" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-a6bfd46f/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <!--  End: Package sources from dotnet-windowsdesktop -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 72a523b4ff5a..68e4cb9d30e3 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.115">
+    <Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.116">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>342a0e1e7d00f65e4c5b31228fb2148b64f81603</Sha>
+      <Sha>a6bfd46fc8b8c127a05603dd12ce715cd303a697</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.115-servicing.25166.1">
+    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.116-servicing.25202.2">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>342a0e1e7d00f65e4c5b31228fb2148b64f81603</Sha>
+      <Sha>a6bfd46fc8b8c127a05603dd12ce715cd303a697</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.115-servicing.25166.1">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.116-servicing.25202.2">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>342a0e1e7d00f65e4c5b31228fb2148b64f81603</Sha>
+      <Sha>a6bfd46fc8b8c127a05603dd12ce715cd303a697</Sha>
       <SourceBuild RepoName="templating" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.14">
diff --git a/eng/Versions.props b/eng/Versions.props
index 6975e1a6ae51..a4065cd93622 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -137,13 +137,13 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/templating -->
-    <MicrosoftTemplateEngineAbstractionsPackageVersion>8.0.115</MicrosoftTemplateEngineAbstractionsPackageVersion>
+    <MicrosoftTemplateEngineAbstractionsPackageVersion>8.0.116</MicrosoftTemplateEngineAbstractionsPackageVersion>
     <MicrosoftTemplateEngineEdgePackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineEdgePackageVersion>
     <MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
     <MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
     <MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
     <!-- test dependencies -->
-    <MicrosoftTemplateEngineMocksPackageVersion>8.0.115-servicing.25166.1</MicrosoftTemplateEngineMocksPackageVersion>
+    <MicrosoftTemplateEngineMocksPackageVersion>8.0.116-servicing.25202.2</MicrosoftTemplateEngineMocksPackageVersion>
     <MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
     <MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
     <MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>

From f00237a541027a2f81ca124f0981b4f04cf506d3 Mon Sep 17 00:00:00 2001
From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com>
Date: Wed, 2 Apr 2025 15:06:53 -0700
Subject: [PATCH 16/63] Update branding to 8.0.116 (#48107)

---
 eng/Versions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 6975e1a6ae51..d6538a2ac985 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -11,7 +11,7 @@
   </PropertyGroup>
   <!-- Repo Version Information -->
   <PropertyGroup>
-    <VersionPrefix>8.0.115</VersionPrefix>
+    <VersionPrefix>8.0.116</VersionPrefix>
     <!-- Enable to remove prerelease label. -->
     <StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">true</StabilizePackageVersion>
     <DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>

From b79fa4922364b9d562a82fae87da05bfc4ad2715 Mon Sep 17 00:00:00 2001
From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com>
Date: Wed, 2 Apr 2025 15:07:08 -0700
Subject: [PATCH 17/63] Update branding to 8.0.312 (#48108)

---
 eng/Versions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 12032215da49..f1933a29e83e 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -11,7 +11,7 @@
   </PropertyGroup>
   <!-- Repo Version Information -->
   <PropertyGroup>
-    <VersionPrefix>8.0.311</VersionPrefix>
+    <VersionPrefix>8.0.312</VersionPrefix>
     <WorkloadsFeatureBand>8.0.300</WorkloadsFeatureBand>
     <!-- Enable to remove prerelease label. -->
     <StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">true</StabilizePackageVersion>

From 8e7af5ab0e2986fe9950f88db74684548f4cd6ff Mon Sep 17 00:00:00 2001
From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com>
Date: Wed, 2 Apr 2025 15:07:21 -0700
Subject: [PATCH 18/63] Update branding to 8.0.409 (#48109)

---
 eng/Versions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 56d6fe90b7a4..309c7d4f650c 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -11,7 +11,7 @@
   </PropertyGroup>
   <!-- Repo Version Information -->
   <PropertyGroup>
-    <VersionPrefix>8.0.408</VersionPrefix>
+    <VersionPrefix>8.0.409</VersionPrefix>
     <WorkloadsFeatureBand>8.0.400</WorkloadsFeatureBand>
     <!-- Enable to remove prerelease label. -->
     <StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">true</StabilizePackageVersion>

From cdf48dd6c3dbbb84822580f4d6eb9ff78dd01408 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 2 Apr 2025 15:26:58 -0700
Subject: [PATCH 19/63] [release/8.0.1xx] Update dependencies from
 dotnet/source-build-externals (#48103)

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
---
 eng/Version.Details.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 72a523b4ff5a..d8c28c3449e9 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -349,9 +349,9 @@
       <Sha>02fe27cd6a9b001c8feb7938e6ef4b3799745759</Sha>
       <SourceBuild RepoName="command-line-api" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.25104.1">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.25202.2">
       <Uri>https://github.com/dotnet/source-build-externals</Uri>
-      <Sha>dc30cd1ec22f198d658e011c14525d4d65873991</Sha>
+      <Sha>16bcad1c13be082bd52ce178896d1119a73081a9</Sha>
       <SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25163.2">

From 99c81e1969b3dfd9d33821eecce6270a44244002 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 2 Apr 2025 15:27:32 -0700
Subject: [PATCH 20/63] [release/8.0.4xx] Update dependencies from
 dotnet/format (#47890)

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
---
 NuGet.config            | 4 +---
 eng/Version.Details.xml | 4 ++--
 eng/Versions.props      | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index f11122618150..61d96218c546 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -6,9 +6,7 @@
     <!--  Begin: Package sources from dotnet-emsdk -->
     <!--  End: Package sources from dotnet-emsdk -->
     <!--  Begin: Package sources from dotnet-format -->
-    <add key="darc-pub-dotnet-format-42ef1d0" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-42ef1d04/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-format-42ef1d0-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-42ef1d04-2/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-format-42ef1d0-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-42ef1d04-1/nuget/v3/index.json" />
+    <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 -->
     <!--  End: Package sources from dotnet-aspnetcore -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 7ba0921c16e3..59873ea7e580 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -77,9 +77,9 @@
       <Sha>e11d7079bebc6f101c5313fe0d1de9e3d38a7c02</Sha>
       <SourceBuild RepoName="fsharp" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="dotnet-format" Version="8.3.607401">
+    <Dependency Name="dotnet-format" Version="8.3.617508">
       <Uri>https://github.com/dotnet/format</Uri>
-      <Sha>42ef1d04e544c2a0dca064f9fc982639ca516a84</Sha>
+      <Sha>59e6d3d25002f5d630274b7ceb0cb164fdf0a996</Sha>
       <SourceBuild RepoName="format" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.11.0-3.24554.2">
diff --git a/eng/Versions.props b/eng/Versions.props
index 309c7d4f650c..66451cc56b41 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -115,7 +115,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/format -->
-    <dotnetformatVersion>8.3.607401</dotnetformatVersion>
+    <dotnetformatVersion>8.3.617508</dotnetformatVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/roslyn-analyzers -->

From b68b698fe2ad186426207ba2fa7b804f6f22d22d Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 2 Apr 2025 15:27:39 -0700
Subject: [PATCH 21/63] [release/8.0.3xx] Update dependencies from
 dotnet/format (#47889)

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
---
 NuGet.config            | 26 +-------------------------
 eng/Version.Details.xml |  4 ++--
 eng/Versions.props      |  2 +-
 3 files changed, 4 insertions(+), 28 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 00ac762da740..28cef02644fc 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -4,19 +4,11 @@
     <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-ec84e77" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ec84e775/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-emsdk-ec84e77-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ec84e775-2/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-emsdk-ec84e77-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ec84e775-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-emsdk -->
     <!--  Begin: Package sources from dotnet-format -->
-    <add key="darc-pub-dotnet-format-42ef1d0" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-42ef1d04/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-format-42ef1d0-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-42ef1d04-2/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-format-42ef1d0-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-42ef1d04-1/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-format-c61d046" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-c61d046a/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-format -->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
-    <add key="darc-int-dotnet-aspnetcore-25ef4aa" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-25ef4aa3/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-aspnetcore-25ef4aa-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-25ef4aa3-2/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-aspnetcore-25ef4aa-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-25ef4aa3-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from DotNet-msbuild-Trusted -->
     <add key="darc-pub-DotNet-msbuild-Trusted-f305233" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-f3052339/nuget/v3/index.json" />
@@ -24,18 +16,11 @@
     <!--  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-1584e49" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-1584e493/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-runtime-1584e49-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-1584e493-2/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-runtime-1584e49-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-1584e493-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
-    <add key="darc-pub-dotnet-templating-9a10417" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-9a104178/nuget/v3/index.json" />
     <add key="darc-pub-dotnet-templating-f9ebd7d" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f9ebd7d2/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
-    <add key="darc-int-dotnet-windowsdesktop-8506c0d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-8506c0d8/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-windowsdesktop-8506c0d-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-8506c0d8-2/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-windowsdesktop-8506c0d-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-8506c0d8-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-windowsdesktop -->
     <!--  Begin: Package sources from dotnet-winforms -->
     <!--  End: Package sources from dotnet-winforms -->
@@ -62,23 +47,14 @@
     <!--  Begin: Package sources from dotnet-templating -->
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
-    <add key="darc-int-dotnet-aspnetcore-25ef4aa-1" value="true" />
-    <add key="darc-int-dotnet-aspnetcore-25ef4aa-2" value="true" />
-    <add key="darc-int-dotnet-aspnetcore-25ef4aa" value="true" />
     <!--  Begin: Package sources from dotnet-emsdk -->
     <!--  End: Package sources from dotnet-emsdk -->
     <!--  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-1584e49-1" value="true" />
-    <add key="darc-int-dotnet-runtime-1584e49-2" value="true" />
-    <add key="darc-int-dotnet-runtime-1584e49" value="true" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
-    <add key="darc-int-dotnet-windowsdesktop-8506c0d-1" value="true" />
-    <add key="darc-int-dotnet-windowsdesktop-8506c0d-2" value="true" />
-    <add key="darc-int-dotnet-windowsdesktop-8506c0d" 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 af33ac8d36cc..b33b9de2cf6b 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -77,9 +77,9 @@
       <Sha>80c165644db640d0f309affe0daa281c7e17b939</Sha>
       <SourceBuild RepoName="fsharp" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="dotnet-format" Version="8.3.607401">
+    <Dependency Name="dotnet-format" Version="8.3.617507">
       <Uri>https://github.com/dotnet/format</Uri>
-      <Sha>42ef1d04e544c2a0dca064f9fc982639ca516a84</Sha>
+      <Sha>c61d046a6d6dfb63e5cfcee2c3218a13b83e3bff</Sha>
       <SourceBuild RepoName="format" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.10.0-3.25064.8">
diff --git a/eng/Versions.props b/eng/Versions.props
index f1933a29e83e..bb00f0dc204d 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -115,7 +115,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/format -->
-    <dotnetformatVersion>8.3.607401</dotnetformatVersion>
+    <dotnetformatVersion>8.3.617507</dotnetformatVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/roslyn-analyzers -->

From e5949fad6dc554da04c5dac41103d1dffa66501c Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 2 Apr 2025 15:41:59 -0700
Subject: [PATCH 22/63] [release/8.0.1xx] Update dependencies from dotnet/razor
 (#47815)

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
---
 eng/Version.Details.xml | 12 ++++++------
 eng/Versions.props      |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index d8c28c3449e9..0a0a14a5aa33 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -293,18 +293,18 @@
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
       <Sha>25ef4aa38b77974263cb10f6e9cbd10135f17b59</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="7.0.0-preview.25123.5">
+    <Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="7.0.0-preview.25175.8">
       <Uri>https://github.com/dotnet/razor</Uri>
-      <Sha>738705b78cec78396b98e793dcb3466a03a7a269</Sha>
+      <Sha>4c8bb4ff79523da1aa8ffbf2834ede5118f73d60</Sha>
       <SourceBuild RepoName="razor" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="7.0.0-preview.25123.5">
+    <Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="7.0.0-preview.25175.8">
       <Uri>https://github.com/dotnet/razor</Uri>
-      <Sha>738705b78cec78396b98e793dcb3466a03a7a269</Sha>
+      <Sha>4c8bb4ff79523da1aa8ffbf2834ede5118f73d60</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="7.0.0-preview.25123.5">
+    <Dependency Name="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="7.0.0-preview.25175.8">
       <Uri>https://github.com/dotnet/razor</Uri>
-      <Sha>738705b78cec78396b98e793dcb3466a03a7a269</Sha>
+      <Sha>4c8bb4ff79523da1aa8ffbf2834ede5118f73d60</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.14">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index d6538a2ac985..9e45240df7fa 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -175,9 +175,9 @@
   </PropertyGroup>
   <!-- Dependencies from https://github.com/dotnet/razor -->
   <PropertyGroup>
-    <MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>7.0.0-preview.25123.5</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
-    <MicrosoftCodeAnalysisRazorToolingInternalVersion>7.0.0-preview.25123.5</MicrosoftCodeAnalysisRazorToolingInternalVersion>
-    <MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>7.0.0-preview.25123.5</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
+    <MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>7.0.0-preview.25175.8</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
+    <MicrosoftCodeAnalysisRazorToolingInternalVersion>7.0.0-preview.25175.8</MicrosoftCodeAnalysisRazorToolingInternalVersion>
+    <MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>7.0.0-preview.25175.8</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/wpf -->

From 2b284419b031cb7f3f215e7e1dcf666d82a7a012 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 2 Apr 2025 15:46:57 -0700
Subject: [PATCH 23/63] [release/8.0.4xx] Update dependencies from
 dotnet/templating (#47682)

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
---
 NuGet.config            |  2 +-
 eng/Version.Details.xml | 10 +++++-----
 eng/Versions.props      |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 61d96218c546..b49e68ee97ba 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -18,7 +18,7 @@
     <!--  Begin: Package sources from dotnet-runtime -->
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
-    <add key="darc-pub-dotnet-templating-4a84424" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-4a844244/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-11015ec" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-11015ec6/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <!--  End: Package sources from dotnet-windowsdesktop -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 59873ea7e580..43ae81e1d1ed 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,15 +3,15 @@
   <ProductDependencies>
     <Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.408">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>4a8442440cc7c977ec7d5d65c92e00e432162d4e</Sha>
+      <Sha>11015ec62c33cfbb43585fd8fcc5dd97817d9496</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.408-servicing.25166.5">
+    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.408-servicing.25166.9">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>4a8442440cc7c977ec7d5d65c92e00e432162d4e</Sha>
+      <Sha>11015ec62c33cfbb43585fd8fcc5dd97817d9496</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.408-servicing.25166.5">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.408-servicing.25166.9">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>4a8442440cc7c977ec7d5d65c92e00e432162d4e</Sha>
+      <Sha>11015ec62c33cfbb43585fd8fcc5dd97817d9496</Sha>
       <SourceBuild RepoName="templating" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.14">
diff --git a/eng/Versions.props b/eng/Versions.props
index 66451cc56b41..b7b515ca7ae1 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -147,7 +147,7 @@
     <MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
     <MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
     <!-- test dependencies -->
-    <MicrosoftTemplateEngineMocksPackageVersion>8.0.408-servicing.25166.5</MicrosoftTemplateEngineMocksPackageVersion>
+    <MicrosoftTemplateEngineMocksPackageVersion>8.0.408-servicing.25166.9</MicrosoftTemplateEngineMocksPackageVersion>
     <MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
     <MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
     <MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>

From a60a1a0f96bd496289b43ce5d5202c33964eff6c Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 3 Apr 2025 00:20:30 +0000
Subject: [PATCH 24/63] [release/8.0.3xx] Update dependencies from dotnet/razor
 (#47826)

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
---
 eng/Version.Details.xml | 12 ++++++------
 eng/Versions.props      |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index b33b9de2cf6b..a435dd223d64 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -293,18 +293,18 @@
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
       <Sha>25ef4aa38b77974263cb10f6e9cbd10135f17b59</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="7.0.0-preview.25123.3">
+    <Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="7.0.0-preview.25175.5">
       <Uri>https://github.com/dotnet/razor</Uri>
-      <Sha>291218a1671cc18216b6fc93204619d761515011</Sha>
+      <Sha>09ca88197916e545aefea53f16ed1b266644cde9</Sha>
       <SourceBuild RepoName="razor" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="7.0.0-preview.25123.3">
+    <Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="7.0.0-preview.25175.5">
       <Uri>https://github.com/dotnet/razor</Uri>
-      <Sha>291218a1671cc18216b6fc93204619d761515011</Sha>
+      <Sha>09ca88197916e545aefea53f16ed1b266644cde9</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="7.0.0-preview.25123.3">
+    <Dependency Name="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="7.0.0-preview.25175.5">
       <Uri>https://github.com/dotnet/razor</Uri>
-      <Sha>291218a1671cc18216b6fc93204619d761515011</Sha>
+      <Sha>09ca88197916e545aefea53f16ed1b266644cde9</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.14">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index bb00f0dc204d..4bbd49480b9b 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -179,9 +179,9 @@
   </PropertyGroup>
   <!-- Dependencies from https://github.com/dotnet/razor -->
   <PropertyGroup>
-    <MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>7.0.0-preview.25123.3</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
-    <MicrosoftCodeAnalysisRazorToolingInternalVersion>7.0.0-preview.25123.3</MicrosoftCodeAnalysisRazorToolingInternalVersion>
-    <MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>7.0.0-preview.25123.3</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
+    <MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>7.0.0-preview.25175.5</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
+    <MicrosoftCodeAnalysisRazorToolingInternalVersion>7.0.0-preview.25175.5</MicrosoftCodeAnalysisRazorToolingInternalVersion>
+    <MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>7.0.0-preview.25175.5</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/wpf -->

From 75e459ec2adb6a79f02d49999f12acf4352ab3cc Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 3 Apr 2025 05:02:22 +0000
Subject: [PATCH 25/63] Update dependencies from
 https://github.com/dotnet/source-build-externals build 20250402.2

Microsoft.SourceBuild.Intermediate.source-build-externals
 From Version 8.0.0-alpha.1.25104.1 -> To Version 8.0.0-alpha.1.25202.2
---
 eng/Version.Details.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index a435dd223d64..604d6163fd89 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -349,9 +349,9 @@
       <Sha>02fe27cd6a9b001c8feb7938e6ef4b3799745759</Sha>
       <SourceBuild RepoName="command-line-api" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.25104.1">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.25202.2">
       <Uri>https://github.com/dotnet/source-build-externals</Uri>
-      <Sha>dc30cd1ec22f198d658e011c14525d4d65873991</Sha>
+      <Sha>16bcad1c13be082bd52ce178896d1119a73081a9</Sha>
       <SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25163.2">

From 304012978deb01c3d89a8a62e19228652406694d Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 3 Apr 2025 05:02:28 +0000
Subject: [PATCH 26/63] Update dependencies from
 https://github.com/dotnet/source-build-externals build 20250402.2

Microsoft.SourceBuild.Intermediate.source-build-externals
 From Version 8.0.0-alpha.1.25104.1 -> To Version 8.0.0-alpha.1.25202.2
---
 eng/Version.Details.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 43ae81e1d1ed..526eb79bf5aa 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -349,9 +349,9 @@
       <Sha>02fe27cd6a9b001c8feb7938e6ef4b3799745759</Sha>
       <SourceBuild RepoName="command-line-api" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.25104.1">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.25202.2">
       <Uri>https://github.com/dotnet/source-build-externals</Uri>
-      <Sha>dc30cd1ec22f198d658e011c14525d4d65873991</Sha>
+      <Sha>16bcad1c13be082bd52ce178896d1119a73081a9</Sha>
       <SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25163.2">

From 9451c234772223cdab7b0b814f9aeaed007be506 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 3 Apr 2025 05:02:28 +0000
Subject: [PATCH 27/63] Update dependencies from
 https://github.com/dotnet/templating build 20250402.5

Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks
 From Version 8.0.408-servicing.25166.9 -> To Version 8.0.409-servicing.25202.5
---
 NuGet.config            |  2 +-
 eng/Version.Details.xml | 12 ++++++------
 eng/Versions.props      |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index b49e68ee97ba..4da8b1b42cb3 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -18,7 +18,7 @@
     <!--  Begin: Package sources from dotnet-runtime -->
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
-    <add key="darc-pub-dotnet-templating-11015ec" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-11015ec6/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-4a61383" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-4a613832/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <!--  End: Package sources from dotnet-windowsdesktop -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 43ae81e1d1ed..0449882f8342 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.408">
+    <Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.409">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>11015ec62c33cfbb43585fd8fcc5dd97817d9496</Sha>
+      <Sha>4a61383202e8c30b61d746c86b94bd5cbf3d9c39</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.408-servicing.25166.9">
+    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.409-servicing.25202.5">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>11015ec62c33cfbb43585fd8fcc5dd97817d9496</Sha>
+      <Sha>4a61383202e8c30b61d746c86b94bd5cbf3d9c39</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.408-servicing.25166.9">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.409-servicing.25202.5">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>11015ec62c33cfbb43585fd8fcc5dd97817d9496</Sha>
+      <Sha>4a61383202e8c30b61d746c86b94bd5cbf3d9c39</Sha>
       <SourceBuild RepoName="templating" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.14">
diff --git a/eng/Versions.props b/eng/Versions.props
index b7b515ca7ae1..68f21fd263d7 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -141,13 +141,13 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/templating -->
-    <MicrosoftTemplateEngineAbstractionsPackageVersion>8.0.408</MicrosoftTemplateEngineAbstractionsPackageVersion>
+    <MicrosoftTemplateEngineAbstractionsPackageVersion>8.0.409</MicrosoftTemplateEngineAbstractionsPackageVersion>
     <MicrosoftTemplateEngineEdgePackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineEdgePackageVersion>
     <MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
     <MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
     <MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
     <!-- test dependencies -->
-    <MicrosoftTemplateEngineMocksPackageVersion>8.0.408-servicing.25166.9</MicrosoftTemplateEngineMocksPackageVersion>
+    <MicrosoftTemplateEngineMocksPackageVersion>8.0.409-servicing.25202.5</MicrosoftTemplateEngineMocksPackageVersion>
     <MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
     <MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
     <MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>

From 1365c9241d5250d1d27f8e23c15f738ed764cdbd Mon Sep 17 00:00:00 2001
From: Jason Zhai <v-wuzhai@microsoft.com>
Date: Thu, 3 Apr 2025 00:11:26 -0700
Subject: [PATCH 28/63] Revert changes to eng/Version.Details.xml

---
 eng/Version.Details.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 604d6163fd89..a435dd223d64 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -349,9 +349,9 @@
       <Sha>02fe27cd6a9b001c8feb7938e6ef4b3799745759</Sha>
       <SourceBuild RepoName="command-line-api" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.25202.2">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.25104.1">
       <Uri>https://github.com/dotnet/source-build-externals</Uri>
-      <Sha>16bcad1c13be082bd52ce178896d1119a73081a9</Sha>
+      <Sha>dc30cd1ec22f198d658e011c14525d4d65873991</Sha>
       <SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25163.2">

From e3e0f6bf59a55467a4880cc28f4cd214e5eb7e31 Mon Sep 17 00:00:00 2001
From: Chet Husk <baronfel@users.noreply.github.com>
Date: Thu, 3 Apr 2025 11:18:08 -0500
Subject: [PATCH 29/63] Allow container targets to be loaded in more scenarios,
 even if the targets will be skipped (#47693)

---
 .../Microsoft.NET.Build.Tasks/sdk/Sdk.targets |  2 +-
 .../EndToEndTests.cs                          | 82 ++++++++++++++++++-
 2 files changed, 80 insertions(+), 4 deletions(-)

diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/sdk/Sdk.targets b/src/Tasks/Microsoft.NET.Build.Tasks/sdk/Sdk.targets
index 3d68d1de7830..15e9ca429aea 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/sdk/Sdk.targets
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/sdk/Sdk.targets
@@ -64,5 +64,5 @@ Copyright (c) .NET Foundation. All rights reserved.
           Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\Containers\build\Microsoft.NET.Build.Containers.props')" />
 
   <Import Project="$(_ContainersTargetsDir)Microsoft.NET.Build.Containers.targets"
-    Condition="$(_IsNotSetContainersTargetsDir) AND Exists('$(_ContainersTargetsDir)Microsoft.NET.Build.Containers.targets') AND '$(TargetFramework)' != ''" />
+    Condition="$(_IsNotSetContainersTargetsDir) AND Exists('$(_ContainersTargetsDir)Microsoft.NET.Build.Containers.targets')" />
 </Project>
diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs
index 836022f30f3b..2144a47973cb 100644
--- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs
+++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs
@@ -353,7 +353,7 @@ private string BuildLocalApp([CallerMemberName] string testName = "TestName", st
     public async Task EndToEnd_MultiProjectSolution()
     {
         ILogger logger = _loggerFactory.CreateLogger(nameof(EndToEnd_MultiProjectSolution));
-        DirectoryInfo newSolutionDir = new(Path.Combine(TestSettings.TestArtifactsDirectory, $"CreateNewImageTest_EndToEnd_MultiProjectSolution"));
+        DirectoryInfo newSolutionDir = new(Path.Combine(TestSettings.TestArtifactsDirectory, nameof(EndToEnd_MultiProjectSolution)));
 
         if (newSolutionDir.Exists)
         {
@@ -431,6 +431,82 @@ public async Task EndToEnd_MultiProjectSolution()
         commandResult.Should().HaveStdOutContaining("Pushed image 'consoleapp:latest'");
     }
 
+    /// <summary>
+    /// Tests that a multi-project solution with a library that targets multiple frameworks can be published.
+    /// This is interesting because before https://github.com/dotnet/sdk/pull/47693 the container targets
+    /// wouldn't be loaded for multi-TFM project evaluations, so any calls to the PublishContainer target
+    /// for libraries (which may be multi-targeted even when referenced from a single-target published app project) would fail.
+    /// It's safe to load the target for libraries in a multi-targeted context because libraries don't have EnableSdkContainerSupport
+    /// enabled by default, so the target will be skipped.
+    /// </summary>
+    [DockerAvailableFact]
+    public async Task EndToEnd_MultiProjectSolution_with_multitargeted_library()
+    {
+        ILogger logger = _loggerFactory.CreateLogger(nameof(EndToEnd_MultiProjectSolution_with_multitargeted_library));
+        DirectoryInfo newSolutionDir = new(Path.Combine(TestSettings.TestArtifactsDirectory, nameof(EndToEnd_MultiProjectSolution_with_multitargeted_library)));
+
+        if (newSolutionDir.Exists)
+        {
+            newSolutionDir.Delete(recursive: true);
+        }
+
+        newSolutionDir.Create();
+
+        // Create solution with projects
+        new DotnetNewCommand(_testOutput, "sln", "-n", nameof(EndToEnd_MultiProjectSolution_with_multitargeted_library))
+            .WithVirtualHive()
+            .WithWorkingDirectory(newSolutionDir.FullName)
+            .Execute()
+            .Should().Pass();
+
+        new DotnetNewCommand(_testOutput, "web", "-n", "WebApp")
+            .WithVirtualHive()
+            .WithWorkingDirectory(newSolutionDir.FullName)
+            .Execute()
+            .Should().Pass();
+
+        new DotnetCommand(_testOutput, "sln", "add", Path.Combine("WebApp", "WebApp.csproj"))
+            .WithWorkingDirectory(newSolutionDir.FullName)
+            .Execute()
+            .Should().Pass();
+
+        new DotnetNewCommand(_testOutput, "classlib", "-n", "Library")
+            .WithVirtualHive()
+            .WithWorkingDirectory(newSolutionDir.FullName)
+            .Execute()
+            .Should().Pass();
+
+        new DotnetCommand(_testOutput, "sln", "add", Path.Combine("Library", "Library.csproj"))
+            .WithWorkingDirectory(newSolutionDir.FullName)
+            .Execute()
+            .Should().Pass();
+
+        // Set TFMs for Library - use current toolset + NS2.0 for compatibility
+        // also set IsPublishable to false
+        using (FileStream stream = File.Open(Path.Join(newSolutionDir.FullName, "Library", "Library.csproj"), FileMode.Open, FileAccess.ReadWrite))
+        {
+            XDocument document = await XDocument.LoadAsync(stream, LoadOptions.None, CancellationToken.None);
+            var tfmNode =
+                document
+                .Descendants()
+                .First(e => e.Name.LocalName == "TargetFramework");
+            var propertyGroupNode = tfmNode.Parent!;
+            tfmNode.Remove();
+            propertyGroupNode.Add(new XElement("TargetFrameworks", $"{ToolsetInfo.CurrentTargetFramework};netstandard2.0"));
+            propertyGroupNode.Add(new XElement("IsPublishable", "false"));
+            stream.SetLength(0);
+            await document.SaveAsync(stream, SaveOptions.None, CancellationToken.None);
+        }
+
+        // Publish
+        CommandResult commandResult = new DotnetCommand(_testOutput, "publish", "/t:PublishContainer")
+            .WithWorkingDirectory(newSolutionDir.FullName)
+            .Execute();
+
+        commandResult.Should().Pass();
+        commandResult.Should().HaveStdOutContaining("Pushed image 'webapp:latest'");
+    }
+
     [DockerAvailableTheory()]
     [InlineData("webapi", false)]
     [InlineData("webapi", true)]
@@ -1012,7 +1088,7 @@ public void EndToEndMultiArch_RemoteRegistry()
             .And.HaveStdOutContaining($"Pushed image '{imageX64}' to registry '{registry}'.")
             .And.HaveStdOutContaining($"Pushed image '{imageArm64}' to registry '{registry}'.")
             .And.HaveStdOutContaining($"Pushed image index '{imageIndex}' to registry '{registry}'.");
-        
+
         // Check that the containers can be run
         // First pull the image from the registry for each platform
         ContainerCli.PullCommand(
@@ -1029,7 +1105,7 @@ public void EndToEndMultiArch_RemoteRegistry()
             imageFromRegistry)
             .Execute()
             .Should().Pass();
-        
+
         // Run the containers
         ContainerCli.RunCommand(
             _testOutput,

From 36cf06921146bace99bc286d98edd8fe0d2a624e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 3 Apr 2025 11:18:20 -0500
Subject: [PATCH 30/63] [release/8.0.4xx] add a flag to let users opt into
 serial builds of inner-RID containers (#47475)

Co-authored-by: Chet Husk <baronfel@users.noreply.github.com>
---
 .../packaging/build/Microsoft.NET.Build.Containers.targets      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets b/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets
index ff22ed811e83..687c561d1554 100644
--- a/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets
+++ b/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets
@@ -345,7 +345,7 @@
     <MSBuild
         Projects="@(_InnerBuild)"
         Targets="Publish;_ParseItemsForPublishingSingleContainer;_PublishSingleContainer"
-        BuildInParallel="true">
+        BuildInParallel="$([MSBuild]::ValueOrDefault('$(ContainerPublishInParallel)', 'true'))">
         <Output TaskParameter="TargetOutputs" ItemName="GeneratedContainers" />
     </MSBuild>
 

From 56ef042ec92460d94e319ce11cf2f9e9c01362ee Mon Sep 17 00:00:00 2001
From: Chet Husk <baronfel@users.noreply.github.com>
Date: Thu, 3 Apr 2025 11:18:29 -0500
Subject: [PATCH 31/63] Force OCI format for inner images when publishing
 tarballs or to local docker instances (#47398)

---
 .../Microsoft.NET.Build.Containers.targets    | 11 ++++-
 .../EndToEndTests.cs                          | 41 +++++++++++++++++++
 2 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets b/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets
index 687c561d1554..3a65dbd64d7e 100644
--- a/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets
+++ b/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets
@@ -304,10 +304,16 @@
       <!--We don't want to skip publishing individual images in case of local daemon podman because podman loads multi-arch tarball differently - only individual image for the current platform.-->
       <_SkipContainerPublishing>false</_SkipContainerPublishing>
       <_SkipContainerPublishing Condition="$(ContainerArchiveOutputPath) != '' or ( $(ContainerRegistry) == '' and ( $(LocalRegistry) == '' or $(LocalRegistry) == 'Docker' ) )">true</_SkipContainerPublishing>
-    
+
       <!--We want to skip CreateImageIndex task in case of local daemon podman because it is not supported.-->
       <_SkipCreateImageIndex>false</_SkipCreateImageIndex>
       <_SkipCreateImageIndex Condition="$(ContainerArchiveOutputPath) == '' and $(ContainerRegistry) == '' and $(LocalRegistry) == 'Podman'">true</_SkipCreateImageIndex>
+
+      <!-- Figure out what format the inner images should be coerced to -->
+      <!-- If a user had an opinion, use that -->
+      <_SingleImageContainerFormat Condition="'$(ContainerImageFormat)' != ''">$(ContainerImageFormat)</_SingleImageContainerFormat>
+      <!-- If we are publishing to local tarball or to local Docker, force OCI to prevent mismatches between inner images and the outer manifest -->
+      <_SingleImageContainerFormat Condition="$(_SkipContainerPublishing) == 'true' ">OCI</_SingleImageContainerFormat>
     </PropertyGroup>
 
     <ItemGroup>
@@ -337,7 +343,8 @@
           ContainerUser=$(ContainerUser);
           ContainerGenerateLabels=$(ContainerGenerateLabels);
           ContainerGenerateLabelsImageBaseDigest=$(ContainerGenerateLabelsImageBaseDigest);
-          _SkipContainerPublishing=$(_SkipContainerPublishing)
+          _SkipContainerPublishing=$(_SkipContainerPublishing);
+          ContainerImageFormat=$(_SingleImageContainerFormat)
         "/>
       <_rids Remove ="$(_rids)" />
     </ItemGroup>
diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs
index 2144a47973cb..c630ef45e541 100644
--- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs
+++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs
@@ -1427,4 +1427,45 @@ static string[] DecideEntrypoint(string rid, string appName, string workingDir)
             return new[] { $"{workingDir}/{binary}" };
         }
     }
+
+    [DockerAvailableFact(checkContainerdStoreAvailability: true)]
+    public void EnforcesOciSchemaForMultiRIDTarballOutput()
+    {
+        string imageName = NewImageName();
+        string tag = "1.0";
+
+        // Create new console app
+        DirectoryInfo newProjectDir = CreateNewProject("webapp");
+
+        // Run PublishContainer for multi-arch with ContainerGenerateLabels
+        var publishResult = new DotnetCommand(
+            _testOutput,
+            "publish",
+            "/t:PublishContainer",
+            "/p:RuntimeIdentifiers=\"linux-x64;linux-arm64\"",
+            $"/p:ContainerBaseImage={DockerRegistryManager.FullyQualifiedBaseImageAspNet}",
+            $"/p:ContainerRepository={imageName}",
+            $"/p:ContainerImageTag={tag}",
+            "/p:EnableSdkContainerSupport=true",
+            "/p:ContainerArchiveOutputPath=archive.tar.gz",
+            "-getProperty:GeneratedImageIndex",
+            "-getItem:GeneratedContainers",
+            "/bl")
+            .WithWorkingDirectory(newProjectDir.FullName)
+            .Execute();
+
+        publishResult.Should().Pass();
+        var jsonDump = JsonDocument.Parse(publishResult.StdOut);
+        var index = JsonDocument.Parse(jsonDump.RootElement.GetProperty("Properties").GetProperty("GeneratedImageIndex").ToString());
+        var containers = jsonDump.RootElement.GetProperty("Items").GetProperty("GeneratedContainers").EnumerateArray().ToArray();
+
+        index.RootElement.GetProperty("mediaType").GetString().Should().Be("application/vnd.oci.image.index.v1+json");
+        containers.Should().HaveCount(2);
+        foreach (var container in containers)
+        {
+            container.GetProperty("ManifestMediaType").GetString().Should().Be("application/vnd.oci.image.manifest.v1+json");
+        }
+        // Cleanup
+        newProjectDir.Delete(true);
+    }
 }

From a9f45389b6db9d90e0a834dd5c13652472542e7e Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 3 Apr 2025 09:27:25 -0700
Subject: [PATCH 32/63] [release/8.0.3xx] Update dependencies from
 dotnet/templating (#47645)

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Jason Zhai <v-wuzhai@microsoft.com>
Co-authored-by: Forgind <12969783+Forgind@users.noreply.github.com>
---
 NuGet.config            |  2 +-
 eng/Version.Details.xml | 12 ++++++------
 eng/Versions.props      |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 28cef02644fc..02e598067bab 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -18,7 +18,7 @@
     <!--  Begin: Package sources from dotnet-runtime -->
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
-    <add key="darc-pub-dotnet-templating-f9ebd7d" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f9ebd7d2/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-72950e7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-72950e7c/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <!--  End: Package sources from dotnet-windowsdesktop -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 604d6163fd89..3a745c9080b3 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.311">
+    <Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.312">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>f9ebd7d27891161e756c3812c94b2d2e4a7e7d87</Sha>
+      <Sha>72950e7ca3f79f6642bead94221b2b8d0616a3d8</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.311-servicing.25164.2">
+    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.312-servicing.25202.3">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>f9ebd7d27891161e756c3812c94b2d2e4a7e7d87</Sha>
+      <Sha>72950e7ca3f79f6642bead94221b2b8d0616a3d8</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.311-servicing.25164.2">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.312-servicing.25202.3">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>f9ebd7d27891161e756c3812c94b2d2e4a7e7d87</Sha>
+      <Sha>72950e7ca3f79f6642bead94221b2b8d0616a3d8</Sha>
       <SourceBuild RepoName="templating" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.14">
diff --git a/eng/Versions.props b/eng/Versions.props
index 4bbd49480b9b..55671bd91834 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -141,13 +141,13 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/templating -->
-    <MicrosoftTemplateEngineAbstractionsPackageVersion>8.0.311</MicrosoftTemplateEngineAbstractionsPackageVersion>
+    <MicrosoftTemplateEngineAbstractionsPackageVersion>8.0.312</MicrosoftTemplateEngineAbstractionsPackageVersion>
     <MicrosoftTemplateEngineEdgePackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineEdgePackageVersion>
     <MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
     <MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
     <MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
     <!-- test dependencies -->
-    <MicrosoftTemplateEngineMocksPackageVersion>8.0.311-servicing.25164.2</MicrosoftTemplateEngineMocksPackageVersion>
+    <MicrosoftTemplateEngineMocksPackageVersion>8.0.312-servicing.25202.3</MicrosoftTemplateEngineMocksPackageVersion>
     <MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
     <MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
     <MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>

From 8fbe152df0b04f84603fb1286dbcfce8c86f11ea Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 4 Apr 2025 15:23:39 -0700
Subject: [PATCH 33/63] [release/8.0.4xx] Update dependencies from
 dotnet/templating (#48164)

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
---
 NuGet.config            |  2 +-
 eng/Version.Details.xml | 10 +++++-----
 eng/Versions.props      |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 4da8b1b42cb3..52f282f9690b 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -18,7 +18,7 @@
     <!--  Begin: Package sources from dotnet-runtime -->
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
-    <add key="darc-pub-dotnet-templating-4a61383" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-4a613832/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-4501fdd" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-4501fdd4/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <!--  End: Package sources from dotnet-windowsdesktop -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index d8eb9929f9c6..7652b8585bd7 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,15 +3,15 @@
   <ProductDependencies>
     <Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.409">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>4a61383202e8c30b61d746c86b94bd5cbf3d9c39</Sha>
+      <Sha>4501fdd4fb107f05fca15ea0fa6db9c82a6eb271</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.409-servicing.25202.5">
+    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.409-servicing.25203.2">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>4a61383202e8c30b61d746c86b94bd5cbf3d9c39</Sha>
+      <Sha>4501fdd4fb107f05fca15ea0fa6db9c82a6eb271</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.409-servicing.25202.5">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.409-servicing.25203.2">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>4a61383202e8c30b61d746c86b94bd5cbf3d9c39</Sha>
+      <Sha>4501fdd4fb107f05fca15ea0fa6db9c82a6eb271</Sha>
       <SourceBuild RepoName="templating" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.14">
diff --git a/eng/Versions.props b/eng/Versions.props
index 68f21fd263d7..57fdfe8009b5 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -147,7 +147,7 @@
     <MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
     <MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
     <!-- test dependencies -->
-    <MicrosoftTemplateEngineMocksPackageVersion>8.0.409-servicing.25202.5</MicrosoftTemplateEngineMocksPackageVersion>
+    <MicrosoftTemplateEngineMocksPackageVersion>8.0.409-servicing.25203.2</MicrosoftTemplateEngineMocksPackageVersion>
     <MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
     <MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
     <MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>

From a7ea0cd54f238358918c01c837bc51b6582e82b5 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 4 Apr 2025 15:23:57 -0700
Subject: [PATCH 34/63] [release/8.0.3xx] Update dependencies from
 dotnet/templating (#48162)

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
---
 NuGet.config            |  2 +-
 eng/Version.Details.xml | 10 +++++-----
 eng/Versions.props      |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 02e598067bab..d69cecbc702d 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -18,7 +18,7 @@
     <!--  Begin: Package sources from dotnet-runtime -->
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
-    <add key="darc-pub-dotnet-templating-72950e7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-72950e7c/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-c339ffb" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-c339ffb1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <!--  End: Package sources from dotnet-windowsdesktop -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 3a745c9080b3..62360ce1b597 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,15 +3,15 @@
   <ProductDependencies>
     <Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.312">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>72950e7ca3f79f6642bead94221b2b8d0616a3d8</Sha>
+      <Sha>c339ffb1e20866b2e8089a8cd1c3ae76b106af14</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.312-servicing.25202.3">
+    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.312-servicing.25203.1">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>72950e7ca3f79f6642bead94221b2b8d0616a3d8</Sha>
+      <Sha>c339ffb1e20866b2e8089a8cd1c3ae76b106af14</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.312-servicing.25202.3">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.312-servicing.25203.1">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>72950e7ca3f79f6642bead94221b2b8d0616a3d8</Sha>
+      <Sha>c339ffb1e20866b2e8089a8cd1c3ae76b106af14</Sha>
       <SourceBuild RepoName="templating" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.14">
diff --git a/eng/Versions.props b/eng/Versions.props
index 55671bd91834..33b3f9a0239e 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -147,7 +147,7 @@
     <MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
     <MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
     <!-- test dependencies -->
-    <MicrosoftTemplateEngineMocksPackageVersion>8.0.312-servicing.25202.3</MicrosoftTemplateEngineMocksPackageVersion>
+    <MicrosoftTemplateEngineMocksPackageVersion>8.0.312-servicing.25203.1</MicrosoftTemplateEngineMocksPackageVersion>
     <MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
     <MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
     <MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>

From 89c2b04bbee92b54f4d9f840ee1f3602cf1d9c78 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Sat, 5 Apr 2025 05:02:23 +0000
Subject: [PATCH 35/63] Update dependencies from
 https://github.com/dotnet/arcade build 20250404.7

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.25164.5 -> To Version 8.0.0-beta.25204.7
---
 eng/Version.Details.xml | 16 ++++++++--------
 eng/Versions.props      |  4 ++--
 global.json             |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 8515baf54e56..579a7439d1d7 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -491,22 +491,22 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25164.5">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25204.7">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
+      <Sha>faa1471063676aca349da6b48c56dd0fc95aa869</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25164.5">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25204.7">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
+      <Sha>faa1471063676aca349da6b48c56dd0fc95aa869</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25164.5">
+    <Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25204.7">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
+      <Sha>faa1471063676aca349da6b48c56dd0fc95aa869</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25164.5">
+    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25204.7">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
+      <Sha>faa1471063676aca349da6b48c56dd0fc95aa869</Sha>
     </Dependency>
     <Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.1">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index d6a12101862b..7c13f515cea6 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -34,7 +34,7 @@
     <SystemCollectionsImmutablePackageVersion>7.0.0</SystemCollectionsImmutablePackageVersion>
     <SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
     <SystemReflectionMetadataVersion>7.0.0</SystemReflectionMetadataVersion>
-    <MicrosoftDotNetSignToolVersion>8.0.0-beta.25164.5</MicrosoftDotNetSignToolVersion>
+    <MicrosoftDotNetSignToolVersion>8.0.0-beta.25204.7</MicrosoftDotNetSignToolVersion>
     <MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
     <SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
     <SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
@@ -209,7 +209,7 @@
   <PropertyGroup>
     <FluentAssertionsVersion>6.12.0</FluentAssertionsVersion>
     <FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
-    <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25164.5</MicrosoftDotNetXUnitExtensionsVersion>
+    <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25204.7</MicrosoftDotNetXUnitExtensionsVersion>
     <MoqPackageVersion>4.18.4</MoqPackageVersion>
     <XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
     <MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>
diff --git a/global.json b/global.json
index 9982ec1ef3b5..570ed21c0599 100644
--- a/global.json
+++ b/global.json
@@ -14,7 +14,7 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25164.5",
-    "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25164.5"
+    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25204.7",
+    "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25204.7"
   }
 }

From 7c65c0d1e0f4ad089545dfe234971fb20430f4fb Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Sat, 5 Apr 2025 05:02:29 +0000
Subject: [PATCH 36/63] Update dependencies from
 https://github.com/dotnet/arcade build 20250404.7

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.25164.5 -> To Version 8.0.0-beta.25204.7
---
 eng/Version.Details.xml | 16 ++++++++--------
 eng/Versions.props      |  4 ++--
 global.json             |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 62360ce1b597..0f66a6bec0f0 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -491,22 +491,22 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25164.5">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25204.7">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
+      <Sha>faa1471063676aca349da6b48c56dd0fc95aa869</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25164.5">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25204.7">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
+      <Sha>faa1471063676aca349da6b48c56dd0fc95aa869</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25164.5">
+    <Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25204.7">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
+      <Sha>faa1471063676aca349da6b48c56dd0fc95aa869</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25164.5">
+    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25204.7">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
+      <Sha>faa1471063676aca349da6b48c56dd0fc95aa869</Sha>
     </Dependency>
     <Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.1">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 33b3f9a0239e..5cb24fa0293c 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -36,7 +36,7 @@
     <SystemCollectionsImmutablePackageVersion>7.0.0</SystemCollectionsImmutablePackageVersion>
     <SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
     <SystemReflectionMetadataVersion>7.0.0</SystemReflectionMetadataVersion>
-    <MicrosoftDotNetSignToolVersion>8.0.0-beta.25164.5</MicrosoftDotNetSignToolVersion>
+    <MicrosoftDotNetSignToolVersion>8.0.0-beta.25204.7</MicrosoftDotNetSignToolVersion>
     <MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
     <SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
     <SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
@@ -213,7 +213,7 @@
   <PropertyGroup>
     <FluentAssertionsVersion>6.12.0</FluentAssertionsVersion>
     <FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
-    <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25164.5</MicrosoftDotNetXUnitExtensionsVersion>
+    <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25204.7</MicrosoftDotNetXUnitExtensionsVersion>
     <MoqPackageVersion>4.18.4</MoqPackageVersion>
     <XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
     <MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>
diff --git a/global.json b/global.json
index 9982ec1ef3b5..570ed21c0599 100644
--- a/global.json
+++ b/global.json
@@ -14,7 +14,7 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25164.5",
-    "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25164.5"
+    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25204.7",
+    "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25204.7"
   }
 }

From 052b3286d19661c88929bc5ddd63056524d133f6 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Sat, 5 Apr 2025 05:02:38 +0000
Subject: [PATCH 37/63] Update dependencies from
 https://github.com/dotnet/arcade build 20250404.7

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.25164.5 -> To Version 8.0.0-beta.25204.7
---
 eng/Version.Details.xml | 16 ++++++++--------
 eng/Versions.props      |  4 ++--
 global.json             |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 7652b8585bd7..be31e2458c16 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -491,22 +491,22 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25164.5">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25204.7">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
+      <Sha>faa1471063676aca349da6b48c56dd0fc95aa869</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25164.5">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25204.7">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
+      <Sha>faa1471063676aca349da6b48c56dd0fc95aa869</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25164.5">
+    <Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25204.7">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
+      <Sha>faa1471063676aca349da6b48c56dd0fc95aa869</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25164.5">
+    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25204.7">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
+      <Sha>faa1471063676aca349da6b48c56dd0fc95aa869</Sha>
     </Dependency>
     <Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.1">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 57fdfe8009b5..4c8de3ef1960 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -36,7 +36,7 @@
     <SystemCollectionsImmutablePackageVersion>8.0.0</SystemCollectionsImmutablePackageVersion>
     <SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
     <SystemReflectionMetadataVersion>8.0.0</SystemReflectionMetadataVersion>
-    <MicrosoftDotNetSignToolVersion>8.0.0-beta.25164.5</MicrosoftDotNetSignToolVersion>
+    <MicrosoftDotNetSignToolVersion>8.0.0-beta.25204.7</MicrosoftDotNetSignToolVersion>
     <MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
     <SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
     <SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
@@ -213,7 +213,7 @@
   <PropertyGroup>
     <FluentAssertionsVersion>6.12.0</FluentAssertionsVersion>
     <FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
-    <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25164.5</MicrosoftDotNetXUnitExtensionsVersion>
+    <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25204.7</MicrosoftDotNetXUnitExtensionsVersion>
     <MoqPackageVersion>4.18.4</MoqPackageVersion>
     <XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
     <MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>
diff --git a/global.json b/global.json
index 9982ec1ef3b5..570ed21c0599 100644
--- a/global.json
+++ b/global.json
@@ -14,7 +14,7 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25164.5",
-    "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25164.5"
+    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25204.7",
+    "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25204.7"
   }
 }

From 27e83096e2179ef326658ab618cb483b06ab8783 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Mon, 7 Apr 2025 03:12:19 +0000
Subject: [PATCH 38/63] Update dependencies from
 https://github.com/dotnet/msbuild build 20250407.2

Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization
 From Version 17.8.22-preview-25121-01 -> To Version 17.8.24-preview-25207-02
---
 NuGet.config            |  2 +-
 eng/Version.Details.xml | 12 ++++++------
 eng/Versions.props      |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index ab75cad13b06..93f6f3e73467 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -10,7 +10,7 @@
     <!--  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-bfbb056" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-bfbb0566/nuget/v3/index.json" />
+    <add key="darc-pub-DotNet-msbuild-Trusted-b46a62a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-b46a62a9/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 -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 579a7439d1d7..e7b5cc0cc510 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -55,17 +55,17 @@
       <Uri>https://github.com/dotnet/emsdk</Uri>
       <Sha>ec84e775d21d3b7a6698ec30f7b2a5a9e3acd314</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Build" Version="17.8.22">
+    <Dependency Name="Microsoft.Build" Version="17.8.24">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>bfbb05667061fc94ba2d135e28e3827161947b95</Sha>
+      <Sha>b46a62a9a9861ce314f4119f968caafedd85741e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Build.Localization" Version="17.8.22-preview-25121-01">
+    <Dependency Name="Microsoft.Build.Localization" Version="17.8.24-preview-25207-02">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>bfbb05667061fc94ba2d135e28e3827161947b95</Sha>
+      <Sha>b46a62a9a9861ce314f4119f968caafedd85741e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.8.22-preview-25121-01">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.8.24-preview-25207-02">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>bfbb05667061fc94ba2d135e28e3827161947b95</Sha>
+      <Sha>b46a62a9a9861ce314f4119f968caafedd85741e</Sha>
       <SourceBuild RepoName="msbuild" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.FSharp.Compiler" Version="12.8.102-beta.24081.2">
diff --git a/eng/Versions.props b/eng/Versions.props
index 7c13f515cea6..2ab3c3164180 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -121,7 +121,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/Microsoft/msbuild -->
-    <MicrosoftBuildPackageVersion>17.8.22</MicrosoftBuildPackageVersion>
+    <MicrosoftBuildPackageVersion>17.8.24</MicrosoftBuildPackageVersion>
     <MicrosoftBuildCurrentPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildCurrentPackageVersion>
     <!-- Some tasks and the resolver will need to run in an MSBuild that is older than the very latest,
           so target one that matches the version in minimumMSBuildVersion.
@@ -130,7 +130,7 @@
     <MicrosoftBuildPackageVersion Condition="exists('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion') and '$(DotNetBuildFromSource)' != 'true'">$([System.IO.File]::ReadAllText('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion').Trim())</MicrosoftBuildPackageVersion>
     <MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
     <MicrosoftBuildRuntimePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildRuntimePackageVersion>
-    <MicrosoftBuildLocalizationPackageVersion>17.8.22-preview-25121-01</MicrosoftBuildLocalizationPackageVersion>
+    <MicrosoftBuildLocalizationPackageVersion>17.8.24-preview-25207-02</MicrosoftBuildLocalizationPackageVersion>
     <MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
     <MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildTasksCorePackageVersion>
     <MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildTasksCorePackageVersion)</MicrosoftBuildTasksCoreVersion>

From 130a083cc9cca213832334ad15b17e5ac61d220e Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Mon, 7 Apr 2025 03:12:23 +0000
Subject: [PATCH 39/63] Update dependencies from
 https://github.com/dotnet/templating build 20250406.3

Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks
 From Version 8.0.116-servicing.25202.2 -> To Version 8.0.116-servicing.25206.3
---
 NuGet.config            |  2 +-
 eng/Version.Details.xml | 10 +++++-----
 eng/Versions.props      |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index ab75cad13b06..42d622410d32 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -17,7 +17,7 @@
     <!--  Begin: Package sources from dotnet-runtime -->
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
-    <add key="darc-pub-dotnet-templating-a6bfd46" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-a6bfd46f/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-2ce7363" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-2ce7363f/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <!--  End: Package sources from dotnet-windowsdesktop -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 579a7439d1d7..279f0c6080cc 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,15 +3,15 @@
   <ProductDependencies>
     <Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.116">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>a6bfd46fc8b8c127a05603dd12ce715cd303a697</Sha>
+      <Sha>2ce7363f41ab414c2754b4883a50743df3d2b388</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.116-servicing.25202.2">
+    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.116-servicing.25206.3">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>a6bfd46fc8b8c127a05603dd12ce715cd303a697</Sha>
+      <Sha>2ce7363f41ab414c2754b4883a50743df3d2b388</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.116-servicing.25202.2">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.116-servicing.25206.3">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>a6bfd46fc8b8c127a05603dd12ce715cd303a697</Sha>
+      <Sha>2ce7363f41ab414c2754b4883a50743df3d2b388</Sha>
       <SourceBuild RepoName="templating" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.14">
diff --git a/eng/Versions.props b/eng/Versions.props
index 7c13f515cea6..c67c6877e261 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -143,7 +143,7 @@
     <MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
     <MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
     <!-- test dependencies -->
-    <MicrosoftTemplateEngineMocksPackageVersion>8.0.116-servicing.25202.2</MicrosoftTemplateEngineMocksPackageVersion>
+    <MicrosoftTemplateEngineMocksPackageVersion>8.0.116-servicing.25206.3</MicrosoftTemplateEngineMocksPackageVersion>
     <MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
     <MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
     <MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>

From af54c4eae5f271fd48226f939437901294ed8651 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Mon, 7 Apr 2025 05:03:12 +0000
Subject: [PATCH 40/63] Update dependencies from
 https://github.com/dotnet/templating build 20250406.4

Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks
 From Version 8.0.312-servicing.25203.1 -> To Version 8.0.312-servicing.25206.4
---
 NuGet.config            |  2 +-
 eng/Version.Details.xml | 10 +++++-----
 eng/Versions.props      |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index d69cecbc702d..ef67c5726cb3 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -18,7 +18,7 @@
     <!--  Begin: Package sources from dotnet-runtime -->
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
-    <add key="darc-pub-dotnet-templating-c339ffb" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-c339ffb1/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-c2bed41" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-c2bed41c/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <!--  End: Package sources from dotnet-windowsdesktop -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 0f66a6bec0f0..afce62ce8ec8 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,15 +3,15 @@
   <ProductDependencies>
     <Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.312">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>c339ffb1e20866b2e8089a8cd1c3ae76b106af14</Sha>
+      <Sha>c2bed41c09564b0abe6392c689f5e75a2c8c2b2a</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.312-servicing.25203.1">
+    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.312-servicing.25206.4">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>c339ffb1e20866b2e8089a8cd1c3ae76b106af14</Sha>
+      <Sha>c2bed41c09564b0abe6392c689f5e75a2c8c2b2a</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.312-servicing.25203.1">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.312-servicing.25206.4">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>c339ffb1e20866b2e8089a8cd1c3ae76b106af14</Sha>
+      <Sha>c2bed41c09564b0abe6392c689f5e75a2c8c2b2a</Sha>
       <SourceBuild RepoName="templating" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.14">
diff --git a/eng/Versions.props b/eng/Versions.props
index 5cb24fa0293c..0676564efc2b 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -147,7 +147,7 @@
     <MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
     <MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
     <!-- test dependencies -->
-    <MicrosoftTemplateEngineMocksPackageVersion>8.0.312-servicing.25203.1</MicrosoftTemplateEngineMocksPackageVersion>
+    <MicrosoftTemplateEngineMocksPackageVersion>8.0.312-servicing.25206.4</MicrosoftTemplateEngineMocksPackageVersion>
     <MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
     <MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
     <MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>

From 4027983af08937baacc7a0ff27f6daa7ba67314d Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Mon, 7 Apr 2025 05:03:12 +0000
Subject: [PATCH 41/63] Update dependencies from
 https://github.com/dotnet/msbuild build 20250407.5

Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization
 From Version 17.10.23-preview-25121-03 -> To Version 17.10.25-preview-25207-05
---
 NuGet.config            |  2 +-
 eng/Version.Details.xml | 12 ++++++------
 eng/Versions.props      |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index d69cecbc702d..a1085fe35fb8 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -11,7 +11,7 @@
     <!--  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-f305233" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-f3052339/nuget/v3/index.json" />
+    <add key="darc-pub-DotNet-msbuild-Trusted-54a3d0c" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-54a3d0c0/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 -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 0f66a6bec0f0..1e2260458f0b 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -55,17 +55,17 @@
       <Uri>https://github.com/dotnet/emsdk</Uri>
       <Sha>ec84e775d21d3b7a6698ec30f7b2a5a9e3acd314</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Build" Version="17.10.23">
+    <Dependency Name="Microsoft.Build" Version="17.10.25">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>f3052339bec221fe67339242439d2b960674265d</Sha>
+      <Sha>54a3d0c079460f83122c75c8349bed1ed0258135</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Build.Localization" Version="17.10.23-preview-25121-03">
+    <Dependency Name="Microsoft.Build.Localization" Version="17.10.25-preview-25207-05">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>f3052339bec221fe67339242439d2b960674265d</Sha>
+      <Sha>54a3d0c079460f83122c75c8349bed1ed0258135</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.10.23-preview-25121-03">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.10.25-preview-25207-05">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>f3052339bec221fe67339242439d2b960674265d</Sha>
+      <Sha>54a3d0c079460f83122c75c8349bed1ed0258135</Sha>
       <SourceBuild RepoName="msbuild" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.FSharp.Compiler" Version="12.8.301-beta.24271.6">
diff --git a/eng/Versions.props b/eng/Versions.props
index 5cb24fa0293c..595b25d65bf9 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -124,7 +124,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/Microsoft/msbuild -->
-    <MicrosoftBuildPackageVersion>17.10.23</MicrosoftBuildPackageVersion>
+    <MicrosoftBuildPackageVersion>17.10.25</MicrosoftBuildPackageVersion>
     <MicrosoftBuildCurrentPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildCurrentPackageVersion>
     <!-- Some tasks and the resolver will need to run in an MSBuild that is older than the very latest,
           so target one that matches the version in minimumMSBuildVersion.
@@ -133,7 +133,7 @@
     <MicrosoftBuildPackageVersion Condition="exists('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion') and '$(DotNetBuildFromSource)' != 'true'">$([System.IO.File]::ReadAllText('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion').Trim())</MicrosoftBuildPackageVersion>
     <MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
     <MicrosoftBuildRuntimePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildRuntimePackageVersion>
-    <MicrosoftBuildLocalizationPackageVersion>17.10.23-preview-25121-03</MicrosoftBuildLocalizationPackageVersion>
+    <MicrosoftBuildLocalizationPackageVersion>17.10.25-preview-25207-05</MicrosoftBuildLocalizationPackageVersion>
     <MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
     <MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildTasksCorePackageVersion>
     <MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildTasksCorePackageVersion)</MicrosoftBuildTasksCoreVersion>

From 0748c208c780c86174825307b1c5cf9baff493a3 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Mon, 7 Apr 2025 05:03:17 +0000
Subject: [PATCH 42/63] Update dependencies from
 https://github.com/dotnet/templating build 20250406.5

Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks
 From Version 8.0.409-servicing.25203.2 -> To Version 8.0.409-servicing.25206.5
---
 NuGet.config            |  2 +-
 eng/Version.Details.xml | 10 +++++-----
 eng/Versions.props      |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 52f282f9690b..a20fb4ed89e0 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -18,7 +18,7 @@
     <!--  Begin: Package sources from dotnet-runtime -->
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
-    <add key="darc-pub-dotnet-templating-4501fdd" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-4501fdd4/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-76ac94d" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-76ac94d3/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <!--  End: Package sources from dotnet-windowsdesktop -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index be31e2458c16..e37f02812e62 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,15 +3,15 @@
   <ProductDependencies>
     <Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.409">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>4501fdd4fb107f05fca15ea0fa6db9c82a6eb271</Sha>
+      <Sha>76ac94d300d991040db03f15ccb250105c32be6f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.409-servicing.25203.2">
+    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.409-servicing.25206.5">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>4501fdd4fb107f05fca15ea0fa6db9c82a6eb271</Sha>
+      <Sha>76ac94d300d991040db03f15ccb250105c32be6f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.409-servicing.25203.2">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.409-servicing.25206.5">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>4501fdd4fb107f05fca15ea0fa6db9c82a6eb271</Sha>
+      <Sha>76ac94d300d991040db03f15ccb250105c32be6f</Sha>
       <SourceBuild RepoName="templating" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.14">
diff --git a/eng/Versions.props b/eng/Versions.props
index 4c8de3ef1960..9066b0d525d9 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -147,7 +147,7 @@
     <MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
     <MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
     <!-- test dependencies -->
-    <MicrosoftTemplateEngineMocksPackageVersion>8.0.409-servicing.25203.2</MicrosoftTemplateEngineMocksPackageVersion>
+    <MicrosoftTemplateEngineMocksPackageVersion>8.0.409-servicing.25206.5</MicrosoftTemplateEngineMocksPackageVersion>
     <MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
     <MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
     <MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>

From f60392d6a68ed530ac87dc554035486a5eda4fe4 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 8 Apr 2025 05:02:25 +0000
Subject: [PATCH 43/63] Update dependencies from
 https://github.com/dotnet/templating build 20250407.2

Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks
 From Version 8.0.409-servicing.25206.5 -> To Version 8.0.409-servicing.25207.2
---
 NuGet.config            |  2 +-
 eng/Version.Details.xml | 10 +++++-----
 eng/Versions.props      |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index a20fb4ed89e0..e3f763004357 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -18,7 +18,7 @@
     <!--  Begin: Package sources from dotnet-runtime -->
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
-    <add key="darc-pub-dotnet-templating-76ac94d" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-76ac94d3/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-a8f24d5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-a8f24d55/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <!--  End: Package sources from dotnet-windowsdesktop -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index e37f02812e62..0a3a5ce05222 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,15 +3,15 @@
   <ProductDependencies>
     <Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.409">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>76ac94d300d991040db03f15ccb250105c32be6f</Sha>
+      <Sha>a8f24d5519fcff94cd145f3c19c745d53fba8290</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.409-servicing.25206.5">
+    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.409-servicing.25207.2">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>76ac94d300d991040db03f15ccb250105c32be6f</Sha>
+      <Sha>a8f24d5519fcff94cd145f3c19c745d53fba8290</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.409-servicing.25206.5">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.409-servicing.25207.2">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>76ac94d300d991040db03f15ccb250105c32be6f</Sha>
+      <Sha>a8f24d5519fcff94cd145f3c19c745d53fba8290</Sha>
       <SourceBuild RepoName="templating" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.14">
diff --git a/eng/Versions.props b/eng/Versions.props
index 9066b0d525d9..d94724ec0c05 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -147,7 +147,7 @@
     <MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
     <MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
     <!-- test dependencies -->
-    <MicrosoftTemplateEngineMocksPackageVersion>8.0.409-servicing.25206.5</MicrosoftTemplateEngineMocksPackageVersion>
+    <MicrosoftTemplateEngineMocksPackageVersion>8.0.409-servicing.25207.2</MicrosoftTemplateEngineMocksPackageVersion>
     <MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
     <MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
     <MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>

From 002cdd8e0f54f46147759022cf16a043384f2bf2 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 8 Apr 2025 05:02:26 +0000
Subject: [PATCH 44/63] Update dependencies from
 https://github.com/dotnet/templating build 20250407.1

Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks
 From Version 8.0.312-servicing.25206.4 -> To Version 8.0.312-servicing.25207.1
---
 NuGet.config            |  2 +-
 eng/Version.Details.xml | 10 +++++-----
 eng/Versions.props      |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index dde87fa22714..36a4c9f42d8f 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -18,7 +18,7 @@
     <!--  Begin: Package sources from dotnet-runtime -->
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
-    <add key="darc-pub-dotnet-templating-c2bed41" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-c2bed41c/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-a406d80" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-a406d80e/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <!--  End: Package sources from dotnet-windowsdesktop -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 2ae4462391fa..0e91e7926d9e 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,15 +3,15 @@
   <ProductDependencies>
     <Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.312">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>c2bed41c09564b0abe6392c689f5e75a2c8c2b2a</Sha>
+      <Sha>a406d80ea09a87752f369987d0746ca42c5ee3c5</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.312-servicing.25206.4">
+    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.312-servicing.25207.1">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>c2bed41c09564b0abe6392c689f5e75a2c8c2b2a</Sha>
+      <Sha>a406d80ea09a87752f369987d0746ca42c5ee3c5</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.312-servicing.25206.4">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.312-servicing.25207.1">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>c2bed41c09564b0abe6392c689f5e75a2c8c2b2a</Sha>
+      <Sha>a406d80ea09a87752f369987d0746ca42c5ee3c5</Sha>
       <SourceBuild RepoName="templating" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.14">
diff --git a/eng/Versions.props b/eng/Versions.props
index a886f5ef5fed..3d17438d5546 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -147,7 +147,7 @@
     <MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
     <MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
     <!-- test dependencies -->
-    <MicrosoftTemplateEngineMocksPackageVersion>8.0.312-servicing.25206.4</MicrosoftTemplateEngineMocksPackageVersion>
+    <MicrosoftTemplateEngineMocksPackageVersion>8.0.312-servicing.25207.1</MicrosoftTemplateEngineMocksPackageVersion>
     <MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
     <MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
     <MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>

From c1036441267458d4f19a0b63823bd2a7d65d64a0 Mon Sep 17 00:00:00 2001
From: v-wuzhai <v-wuzhai@microsoft.com>
Date: Tue, 8 Apr 2025 12:12:37 +0000
Subject: [PATCH 45/63] [GitHub Actions] Add synchronize Event (#48245)

---
 .github/workflows/pr-analysis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/pr-analysis.yml b/.github/workflows/pr-analysis.yml
index 653869ada03b..3e8487f7c234 100644
--- a/.github/workflows/pr-analysis.yml
+++ b/.github/workflows/pr-analysis.yml
@@ -1,7 +1,7 @@
 name: PR Analysis
 on:
   pull_request:
-    types: [opened, labeled, unlabeled]
+    types: [opened, synchronize, labeled, unlabeled]
 permissions:
   contents: read
   pull-requests: read

From 28d560cd9be7268202dbf01d100aeea0c64f82f3 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 9 Apr 2025 05:02:09 +0000
Subject: [PATCH 46/63] Update dependencies from
 https://github.com/dotnet/arcade build 20250408.7

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.25204.7 -> To Version 8.0.0-beta.25208.7
---
 eng/Version.Details.xml | 16 ++++++++--------
 eng/Versions.props      |  4 ++--
 global.json             |  6 +++---
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 0e91e7926d9e..7835b4715019 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -491,22 +491,22 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25204.7">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25208.7">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>faa1471063676aca349da6b48c56dd0fc95aa869</Sha>
+      <Sha>c7a36e53f91e41943746f97a8c183549364c5092</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25204.7">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25208.7">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>faa1471063676aca349da6b48c56dd0fc95aa869</Sha>
+      <Sha>c7a36e53f91e41943746f97a8c183549364c5092</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25204.7">
+    <Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25208.7">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>faa1471063676aca349da6b48c56dd0fc95aa869</Sha>
+      <Sha>c7a36e53f91e41943746f97a8c183549364c5092</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25204.7">
+    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25208.7">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>faa1471063676aca349da6b48c56dd0fc95aa869</Sha>
+      <Sha>c7a36e53f91e41943746f97a8c183549364c5092</Sha>
     </Dependency>
     <Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.1">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 3d17438d5546..2d466fe6d0bf 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -36,7 +36,7 @@
     <SystemCollectionsImmutablePackageVersion>7.0.0</SystemCollectionsImmutablePackageVersion>
     <SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
     <SystemReflectionMetadataVersion>7.0.0</SystemReflectionMetadataVersion>
-    <MicrosoftDotNetSignToolVersion>8.0.0-beta.25204.7</MicrosoftDotNetSignToolVersion>
+    <MicrosoftDotNetSignToolVersion>8.0.0-beta.25208.7</MicrosoftDotNetSignToolVersion>
     <MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
     <SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
     <SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
@@ -213,7 +213,7 @@
   <PropertyGroup>
     <FluentAssertionsVersion>6.12.0</FluentAssertionsVersion>
     <FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
-    <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25204.7</MicrosoftDotNetXUnitExtensionsVersion>
+    <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25208.7</MicrosoftDotNetXUnitExtensionsVersion>
     <MoqPackageVersion>4.18.4</MoqPackageVersion>
     <XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
     <MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>
diff --git a/global.json b/global.json
index 570ed21c0599..1918bc6863ac 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "tools": {
-    "dotnet": "8.0.114",
+    "dotnet": "8.0.115",
     "runtimes": {
       "dotnet": [
         "$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)"
@@ -14,7 +14,7 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25204.7",
-    "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25204.7"
+    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25208.7",
+    "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25208.7"
   }
 }

From 6be82afde3166545e013da8ec230a53a57796fab Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 9 Apr 2025 05:02:19 +0000
Subject: [PATCH 47/63] Update dependencies from
 https://github.com/dotnet/arcade build 20250408.7

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.25204.7 -> To Version 8.0.0-beta.25208.7
---
 eng/Version.Details.xml | 16 ++++++++--------
 eng/Versions.props      |  4 ++--
 global.json             |  6 +++---
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 0a3a5ce05222..d9f235ea17d0 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -491,22 +491,22 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25204.7">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25208.7">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>faa1471063676aca349da6b48c56dd0fc95aa869</Sha>
+      <Sha>c7a36e53f91e41943746f97a8c183549364c5092</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25204.7">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25208.7">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>faa1471063676aca349da6b48c56dd0fc95aa869</Sha>
+      <Sha>c7a36e53f91e41943746f97a8c183549364c5092</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25204.7">
+    <Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25208.7">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>faa1471063676aca349da6b48c56dd0fc95aa869</Sha>
+      <Sha>c7a36e53f91e41943746f97a8c183549364c5092</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25204.7">
+    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25208.7">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>faa1471063676aca349da6b48c56dd0fc95aa869</Sha>
+      <Sha>c7a36e53f91e41943746f97a8c183549364c5092</Sha>
     </Dependency>
     <Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.1">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index d94724ec0c05..ad08ca939dc0 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -36,7 +36,7 @@
     <SystemCollectionsImmutablePackageVersion>8.0.0</SystemCollectionsImmutablePackageVersion>
     <SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
     <SystemReflectionMetadataVersion>8.0.0</SystemReflectionMetadataVersion>
-    <MicrosoftDotNetSignToolVersion>8.0.0-beta.25204.7</MicrosoftDotNetSignToolVersion>
+    <MicrosoftDotNetSignToolVersion>8.0.0-beta.25208.7</MicrosoftDotNetSignToolVersion>
     <MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
     <SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
     <SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
@@ -213,7 +213,7 @@
   <PropertyGroup>
     <FluentAssertionsVersion>6.12.0</FluentAssertionsVersion>
     <FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
-    <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25204.7</MicrosoftDotNetXUnitExtensionsVersion>
+    <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25208.7</MicrosoftDotNetXUnitExtensionsVersion>
     <MoqPackageVersion>4.18.4</MoqPackageVersion>
     <XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
     <MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>
diff --git a/global.json b/global.json
index 570ed21c0599..1918bc6863ac 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "tools": {
-    "dotnet": "8.0.114",
+    "dotnet": "8.0.115",
     "runtimes": {
       "dotnet": [
         "$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)"
@@ -14,7 +14,7 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25204.7",
-    "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25204.7"
+    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25208.7",
+    "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25208.7"
   }
 }

From 4ff970545f6ed6472f107f102e1135e3af077fc9 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 10 Apr 2025 05:02:15 +0000
Subject: [PATCH 48/63] Update dependencies from
 https://github.com/dotnet/templating build 20250409.1

Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks
 From Version 8.0.312-servicing.25207.1 -> To Version 8.0.312-servicing.25209.1
---
 NuGet.config            |  2 +-
 eng/Version.Details.xml | 10 +++++-----
 eng/Versions.props      |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 36a4c9f42d8f..87bf0ce05c19 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -18,7 +18,7 @@
     <!--  Begin: Package sources from dotnet-runtime -->
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
-    <add key="darc-pub-dotnet-templating-a406d80" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-a406d80e/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-9b1c885" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-9b1c8852/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <!--  End: Package sources from dotnet-windowsdesktop -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 0e91e7926d9e..c47b4567ef0d 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,15 +3,15 @@
   <ProductDependencies>
     <Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.312">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>a406d80ea09a87752f369987d0746ca42c5ee3c5</Sha>
+      <Sha>9b1c885219a83187df9fd8778cbc78f05bb6e6d4</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.312-servicing.25207.1">
+    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.312-servicing.25209.1">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>a406d80ea09a87752f369987d0746ca42c5ee3c5</Sha>
+      <Sha>9b1c885219a83187df9fd8778cbc78f05bb6e6d4</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.312-servicing.25207.1">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.312-servicing.25209.1">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>a406d80ea09a87752f369987d0746ca42c5ee3c5</Sha>
+      <Sha>9b1c885219a83187df9fd8778cbc78f05bb6e6d4</Sha>
       <SourceBuild RepoName="templating" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.14">
diff --git a/eng/Versions.props b/eng/Versions.props
index 3d17438d5546..e04220c9713f 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -147,7 +147,7 @@
     <MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
     <MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
     <!-- test dependencies -->
-    <MicrosoftTemplateEngineMocksPackageVersion>8.0.312-servicing.25207.1</MicrosoftTemplateEngineMocksPackageVersion>
+    <MicrosoftTemplateEngineMocksPackageVersion>8.0.312-servicing.25209.1</MicrosoftTemplateEngineMocksPackageVersion>
     <MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
     <MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
     <MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>

From d2881a6427af42ab8dbb7498380be4150609b6e8 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 10 Apr 2025 05:02:15 +0000
Subject: [PATCH 49/63] Update dependencies from
 https://github.com/dotnet/msbuild build 20250410.2

Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization
 From Version 17.10.25-preview-25207-05 -> To Version 17.10.26-servicing-25210-02
---
 NuGet.config            |  2 +-
 eng/Version.Details.xml | 12 ++++++------
 eng/Versions.props      |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 36a4c9f42d8f..b412f6da2db4 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -11,7 +11,7 @@
     <!--  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-54a3d0c" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-54a3d0c0/nuget/v3/index.json" />
+    <add key="darc-pub-DotNet-msbuild-Trusted-12f3204" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-12f32044/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 -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 0e91e7926d9e..f234e1ed0f90 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -55,17 +55,17 @@
       <Uri>https://github.com/dotnet/emsdk</Uri>
       <Sha>ec84e775d21d3b7a6698ec30f7b2a5a9e3acd314</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Build" Version="17.10.25">
+    <Dependency Name="Microsoft.Build" Version="17.10.26">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>54a3d0c079460f83122c75c8349bed1ed0258135</Sha>
+      <Sha>12f3204401afd9eb4311789cdc9a74b496fcf895</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Build.Localization" Version="17.10.25-preview-25207-05">
+    <Dependency Name="Microsoft.Build.Localization" Version="17.10.26-servicing-25210-02">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>54a3d0c079460f83122c75c8349bed1ed0258135</Sha>
+      <Sha>12f3204401afd9eb4311789cdc9a74b496fcf895</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.10.25-preview-25207-05">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.10.26-servicing-25210-02">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>54a3d0c079460f83122c75c8349bed1ed0258135</Sha>
+      <Sha>12f3204401afd9eb4311789cdc9a74b496fcf895</Sha>
       <SourceBuild RepoName="msbuild" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.FSharp.Compiler" Version="12.8.301-beta.24271.6">
diff --git a/eng/Versions.props b/eng/Versions.props
index 3d17438d5546..eae34cd96781 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -124,7 +124,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/Microsoft/msbuild -->
-    <MicrosoftBuildPackageVersion>17.10.25</MicrosoftBuildPackageVersion>
+    <MicrosoftBuildPackageVersion>17.10.26</MicrosoftBuildPackageVersion>
     <MicrosoftBuildCurrentPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildCurrentPackageVersion>
     <!-- Some tasks and the resolver will need to run in an MSBuild that is older than the very latest,
           so target one that matches the version in minimumMSBuildVersion.
@@ -133,7 +133,7 @@
     <MicrosoftBuildPackageVersion Condition="exists('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion') and '$(DotNetBuildFromSource)' != 'true'">$([System.IO.File]::ReadAllText('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion').Trim())</MicrosoftBuildPackageVersion>
     <MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
     <MicrosoftBuildRuntimePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildRuntimePackageVersion>
-    <MicrosoftBuildLocalizationPackageVersion>17.10.25-preview-25207-05</MicrosoftBuildLocalizationPackageVersion>
+    <MicrosoftBuildLocalizationPackageVersion>17.10.26-servicing-25210-02</MicrosoftBuildLocalizationPackageVersion>
     <MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
     <MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildTasksCorePackageVersion>
     <MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildTasksCorePackageVersion)</MicrosoftBuildTasksCoreVersion>

From 9d590119da60ef15c7ad7bf9af592a1c0c0704fe Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 10 Apr 2025 05:02:23 +0000
Subject: [PATCH 50/63] Update dependencies from
 https://github.com/dotnet/msbuild build 20250410.3

Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization
 From Version 17.11.26-servicing-25111-04 -> To Version 17.11.30-servicing-25210-03
---
 NuGet.config            |  2 +-
 eng/Version.Details.xml | 12 ++++++------
 eng/Versions.props      |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index e3f763004357..bc4189edd688 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -11,7 +11,7 @@
     <!--  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-2b19be4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-2b19be47/nuget/v3/index.json" />
+    <add key="darc-pub-DotNet-msbuild-Trusted-e8f3d27" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-e8f3d272/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 -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 0a3a5ce05222..e3d6c4fb9065 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -55,17 +55,17 @@
       <Uri>https://github.com/dotnet/emsdk</Uri>
       <Sha>ec84e775d21d3b7a6698ec30f7b2a5a9e3acd314</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Build" Version="17.11.26">
+    <Dependency Name="Microsoft.Build" Version="17.11.30">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>2b19be476c8b86077deb82788563d7f7cc53468b</Sha>
+      <Sha>e8f3d27217ec7f7b9296955b74077e0c4f6328c3</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Build.Localization" Version="17.11.26-servicing-25111-04">
+    <Dependency Name="Microsoft.Build.Localization" Version="17.11.30-servicing-25210-03">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>2b19be476c8b86077deb82788563d7f7cc53468b</Sha>
+      <Sha>e8f3d27217ec7f7b9296955b74077e0c4f6328c3</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.11.26-servicing-25111-04">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.11.30-servicing-25210-03">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>2b19be476c8b86077deb82788563d7f7cc53468b</Sha>
+      <Sha>e8f3d27217ec7f7b9296955b74077e0c4f6328c3</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 d94724ec0c05..32b8ab444d79 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -124,7 +124,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/Microsoft/msbuild -->
-    <MicrosoftBuildPackageVersion>17.11.26</MicrosoftBuildPackageVersion>
+    <MicrosoftBuildPackageVersion>17.11.30</MicrosoftBuildPackageVersion>
     <MicrosoftBuildCurrentPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildCurrentPackageVersion>
     <!-- Some tasks and the resolver will need to run in an MSBuild that is older than the very latest,
           so target one that matches the version in minimumMSBuildVersion.
@@ -133,7 +133,7 @@
     <MicrosoftBuildMinimumVersion Condition="exists('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion') and '$(DotNetBuildFromSource)' != 'true'">$([System.IO.File]::ReadAllText('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion').Trim())</MicrosoftBuildMinimumVersion>
     <MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildMinimumVersion)</MicrosoftBuildFrameworkPackageVersion>
     <MicrosoftBuildRuntimePackageVersion>$(MicrosoftBuildMinimumVersion)</MicrosoftBuildRuntimePackageVersion>
-    <MicrosoftBuildLocalizationPackageVersion>17.11.26-servicing-25111-04</MicrosoftBuildLocalizationPackageVersion>
+    <MicrosoftBuildLocalizationPackageVersion>17.11.30-servicing-25210-03</MicrosoftBuildLocalizationPackageVersion>
     <MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildMinimumVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
     <MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildMinimumVersion)</MicrosoftBuildTasksCorePackageVersion>
     <MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildTasksCorePackageVersion)</MicrosoftBuildTasksCoreVersion>

From c4db488b4eb089724613e8f3f486f4ddbe3d161b Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 10 Apr 2025 05:02:23 +0000
Subject: [PATCH 51/63] Update dependencies from
 https://github.com/dotnet/templating build 20250409.2

Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks
 From Version 8.0.409-servicing.25207.2 -> To Version 8.0.409-servicing.25209.2
---
 NuGet.config            |  2 +-
 eng/Version.Details.xml | 10 +++++-----
 eng/Versions.props      |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index e3f763004357..a02d2059835a 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -18,7 +18,7 @@
     <!--  Begin: Package sources from dotnet-runtime -->
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
-    <add key="darc-pub-dotnet-templating-a8f24d5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-a8f24d55/nuget/v3/index.json" />
+    <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 -->
     <!--  End: Package sources from dotnet-windowsdesktop -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 0a3a5ce05222..b83995bdfeba 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,15 +3,15 @@
   <ProductDependencies>
     <Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.409">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>a8f24d5519fcff94cd145f3c19c745d53fba8290</Sha>
+      <Sha>731d4697ceb43ca5ab88a4994b5a226e0cbf16c4</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.409-servicing.25207.2">
+    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.409-servicing.25209.2">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>a8f24d5519fcff94cd145f3c19c745d53fba8290</Sha>
+      <Sha>731d4697ceb43ca5ab88a4994b5a226e0cbf16c4</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.409-servicing.25207.2">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.409-servicing.25209.2">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>a8f24d5519fcff94cd145f3c19c745d53fba8290</Sha>
+      <Sha>731d4697ceb43ca5ab88a4994b5a226e0cbf16c4</Sha>
       <SourceBuild RepoName="templating" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.14">
diff --git a/eng/Versions.props b/eng/Versions.props
index d94724ec0c05..b3f7387abd11 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -147,7 +147,7 @@
     <MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
     <MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
     <!-- test dependencies -->
-    <MicrosoftTemplateEngineMocksPackageVersion>8.0.409-servicing.25207.2</MicrosoftTemplateEngineMocksPackageVersion>
+    <MicrosoftTemplateEngineMocksPackageVersion>8.0.409-servicing.25209.2</MicrosoftTemplateEngineMocksPackageVersion>
     <MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
     <MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
     <MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>

From 8c6ee8e01632a321227c48baf5cc37399b097402 Mon Sep 17 00:00:00 2001
From: Jason Zhai <v-wuzhai@microsoft.com>
Date: Thu, 10 Apr 2025 01:57:47 -0700
Subject: [PATCH 52/63] Disable
 Publish_HostedApp_WithRidSpecifiedAsArgument_NoSelfContained_Works

---
 .../WasmPublishIntegrationTest.cs                               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmPublishIntegrationTest.cs b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmPublishIntegrationTest.cs
index 20caa31b5962..7075611f8963 100644
--- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmPublishIntegrationTest.cs
+++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmPublishIntegrationTest.cs
@@ -1081,7 +1081,7 @@ public void Publish_HostedApp_WithRidSpecifiedInCLI_Works()
             AssertRIDPublishOuput(publishCommand, testInstance, hosted: true);
         }
 
-        [ConditionalFact()]
+        [Fact(Skip = "https://github.com/dotnet/sdk/issues/44179")]
         public void Publish_HostedApp_WithRidSpecifiedAsArgument_NoSelfContained_Works()
         {
             // Arrange

From c354bd5cd1800087874140f334f37bbdee9edd07 Mon Sep 17 00:00:00 2001
From: Jason Zhai <v-wuzhai@microsoft.com>
Date: Thu, 10 Apr 2025 01:59:58 -0700
Subject: [PATCH 53/63] Disable
 Publish_HostedApp_WithRidSpecifiedAsArgument_NoSelfContained_Works

---
 .../WasmPublishIntegrationTest.cs                               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmPublishIntegrationTest.cs b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmPublishIntegrationTest.cs
index 20caa31b5962..7075611f8963 100644
--- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmPublishIntegrationTest.cs
+++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmPublishIntegrationTest.cs
@@ -1081,7 +1081,7 @@ public void Publish_HostedApp_WithRidSpecifiedInCLI_Works()
             AssertRIDPublishOuput(publishCommand, testInstance, hosted: true);
         }
 
-        [ConditionalFact()]
+        [Fact(Skip = "https://github.com/dotnet/sdk/issues/44179")]
         public void Publish_HostedApp_WithRidSpecifiedAsArgument_NoSelfContained_Works()
         {
             // Arrange

From c17a6f188558fffb27f5247db144a6bf8f3a2471 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 11 Apr 2025 05:02:30 +0000
Subject: [PATCH 54/63] Update dependencies from
 https://github.com/dotnet/source-build-reference-packages build 20250410.2

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 8.0.0-alpha.1.25163.2 -> To Version 8.0.0-alpha.1.25210.2
---
 eng/Version.Details.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 6e933536bcc8..310a9de598aa 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -354,9 +354,9 @@
       <Sha>16bcad1c13be082bd52ce178896d1119a73081a9</Sha>
       <SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25163.2">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25210.2">
       <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
-      <Sha>b09e26d761555d806f31af68d6fe5dfdeebf6e38</Sha>
+      <Sha>6ae07097c0f03eb59c8a581faaedcc3f2e4cc42c</Sha>
       <SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.Deployment.DotNet.Releases" Version="2.0.0-rtm.1.25064.1">

From 0de985dc8ab127439eae09952e73f732ca53fc44 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 15 Apr 2025 05:01:52 +0000
Subject: [PATCH 55/63] Update dependencies from
 https://github.com/dotnet/msbuild build 20250415.1

Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization
 From Version 17.11.30-servicing-25210-03 -> To Version 17.11.31-servicing-25215-01
---
 NuGet.config            |  9 +--------
 eng/Version.Details.xml | 12 ++++++------
 eng/Versions.props      |  4 ++--
 3 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 141c70d2c35c..b02836bc40ef 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -4,27 +4,23 @@
     <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-6afd7b9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-6afd7b9f/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" />
     <!--  End: Package sources from dotnet-format -->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
-    <add key="darc-int-dotnet-aspnetcore-8899cb3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-8899cb30/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from DotNet-msbuild-Trusted -->
-    <add key="darc-pub-DotNet-msbuild-Trusted-e8f3d27" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-e8f3d272/nuget/v3/index.json" />
+    <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" />
     <!--  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-50c4cb9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-50c4cb9f/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" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
-    <add key="darc-int-dotnet-windowsdesktop-83fc500" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-83fc5002/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-windowsdesktop -->
     <!--  Begin: Package sources from dotnet-winforms -->
     <!--  End: Package sources from dotnet-winforms -->
@@ -51,15 +47,12 @@
     <!--  Begin: Package sources from dotnet-templating -->
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
-    <add key="darc-int-dotnet-aspnetcore-8899cb3" value="true" />
     <!--  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-50c4cb9" value="true" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
-    <add key="darc-int-dotnet-windowsdesktop-83fc500" 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 562708fab39b..0b8c792e79a5 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -55,17 +55,17 @@
       <Uri>https://github.com/dotnet/emsdk</Uri>
       <Sha>6afd7b9f34943078f2e3b747f33350e5fe114269</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Build" Version="17.11.30">
+    <Dependency Name="Microsoft.Build" Version="17.11.31">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>e8f3d27217ec7f7b9296955b74077e0c4f6328c3</Sha>
+      <Sha>bc6072029ab59942e3ba6b3db63147f6aab9dabc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Build.Localization" Version="17.11.30-servicing-25210-03">
+    <Dependency Name="Microsoft.Build.Localization" Version="17.11.31-servicing-25215-01">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>e8f3d27217ec7f7b9296955b74077e0c4f6328c3</Sha>
+      <Sha>bc6072029ab59942e3ba6b3db63147f6aab9dabc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.11.30-servicing-25210-03">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.11.31-servicing-25215-01">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>e8f3d27217ec7f7b9296955b74077e0c4f6328c3</Sha>
+      <Sha>bc6072029ab59942e3ba6b3db63147f6aab9dabc</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 bca3bc9c9f28..2f8a2eca5ee1 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -124,7 +124,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/Microsoft/msbuild -->
-    <MicrosoftBuildPackageVersion>17.11.30</MicrosoftBuildPackageVersion>
+    <MicrosoftBuildPackageVersion>17.11.31</MicrosoftBuildPackageVersion>
     <MicrosoftBuildCurrentPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildCurrentPackageVersion>
     <!-- Some tasks and the resolver will need to run in an MSBuild that is older than the very latest,
           so target one that matches the version in minimumMSBuildVersion.
@@ -133,7 +133,7 @@
     <MicrosoftBuildMinimumVersion Condition="exists('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion') and '$(DotNetBuildFromSource)' != 'true'">$([System.IO.File]::ReadAllText('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion').Trim())</MicrosoftBuildMinimumVersion>
     <MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildMinimumVersion)</MicrosoftBuildFrameworkPackageVersion>
     <MicrosoftBuildRuntimePackageVersion>$(MicrosoftBuildMinimumVersion)</MicrosoftBuildRuntimePackageVersion>
-    <MicrosoftBuildLocalizationPackageVersion>17.11.30-servicing-25210-03</MicrosoftBuildLocalizationPackageVersion>
+    <MicrosoftBuildLocalizationPackageVersion>17.11.31-servicing-25215-01</MicrosoftBuildLocalizationPackageVersion>
     <MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildMinimumVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
     <MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildMinimumVersion)</MicrosoftBuildTasksCorePackageVersion>
     <MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildTasksCorePackageVersion)</MicrosoftBuildTasksCoreVersion>

From 285ed0af349b87af296bfa130fb80d4f41183893 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 15 Apr 2025 05:01:58 +0000
Subject: [PATCH 56/63] Update dependencies from
 https://github.com/dotnet/arcade build 20250414.7

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.25208.7 -> To Version 8.0.0-beta.25214.7
---
 NuGet.config                   |  7 -------
 eng/Version.Details.xml        | 16 ++++++++--------
 eng/Versions.props             |  4 ++--
 eng/common/sdl/packages.config |  2 +-
 global.json                    |  4 ++--
 5 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 141c70d2c35c..98bde053f429 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -4,13 +4,11 @@
     <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-6afd7b9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-6afd7b9f/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" />
     <!--  End: Package sources from dotnet-format -->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
-    <add key="darc-int-dotnet-aspnetcore-8899cb3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-8899cb30/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from DotNet-msbuild-Trusted -->
     <add key="darc-pub-DotNet-msbuild-Trusted-e8f3d27" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-e8f3d272/nuget/v3/index.json" />
@@ -18,13 +16,11 @@
     <!--  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-50c4cb9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-50c4cb9f/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" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
-    <add key="darc-int-dotnet-windowsdesktop-83fc500" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-83fc5002/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-windowsdesktop -->
     <!--  Begin: Package sources from dotnet-winforms -->
     <!--  End: Package sources from dotnet-winforms -->
@@ -51,15 +47,12 @@
     <!--  Begin: Package sources from dotnet-templating -->
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
-    <add key="darc-int-dotnet-aspnetcore-8899cb3" value="true" />
     <!--  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-50c4cb9" value="true" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
-    <add key="darc-int-dotnet-windowsdesktop-83fc500" 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 562708fab39b..2373771360ce 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -491,22 +491,22 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25208.7">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25214.7">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>c7a36e53f91e41943746f97a8c183549364c5092</Sha>
+      <Sha>c487e860d456cda2580600ad81fd425d3bba21f7</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25208.7">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25214.7">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>c7a36e53f91e41943746f97a8c183549364c5092</Sha>
+      <Sha>c487e860d456cda2580600ad81fd425d3bba21f7</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25208.7">
+    <Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25214.7">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>c7a36e53f91e41943746f97a8c183549364c5092</Sha>
+      <Sha>c487e860d456cda2580600ad81fd425d3bba21f7</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25208.7">
+    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25214.7">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>c7a36e53f91e41943746f97a8c183549364c5092</Sha>
+      <Sha>c487e860d456cda2580600ad81fd425d3bba21f7</Sha>
     </Dependency>
     <Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.1">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index bca3bc9c9f28..22197a51213b 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -36,7 +36,7 @@
     <SystemCollectionsImmutablePackageVersion>8.0.0</SystemCollectionsImmutablePackageVersion>
     <SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
     <SystemReflectionMetadataVersion>8.0.0</SystemReflectionMetadataVersion>
-    <MicrosoftDotNetSignToolVersion>8.0.0-beta.25208.7</MicrosoftDotNetSignToolVersion>
+    <MicrosoftDotNetSignToolVersion>8.0.0-beta.25214.7</MicrosoftDotNetSignToolVersion>
     <MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
     <SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
     <SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
@@ -213,7 +213,7 @@
   <PropertyGroup>
     <FluentAssertionsVersion>6.12.0</FluentAssertionsVersion>
     <FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
-    <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25208.7</MicrosoftDotNetXUnitExtensionsVersion>
+    <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25214.7</MicrosoftDotNetXUnitExtensionsVersion>
     <MoqPackageVersion>4.18.4</MoqPackageVersion>
     <XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
     <MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>
diff --git a/eng/common/sdl/packages.config b/eng/common/sdl/packages.config
index 4585cfd6bba1..e5f543ea68c2 100644
--- a/eng/common/sdl/packages.config
+++ b/eng/common/sdl/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Guardian.Cli" version="0.109.0"/>
+  <package id="Microsoft.Guardian.Cli" version="0.199.0"/>
 </packages>
diff --git a/global.json b/global.json
index 1918bc6863ac..5208b63f114e 100644
--- a/global.json
+++ b/global.json
@@ -14,7 +14,7 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25208.7",
-    "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25208.7"
+    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25214.7",
+    "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25214.7"
   }
 }

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 57/63] [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 58/63] 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 59/63] 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 60/63] 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 61/63] 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 62/63] 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 63/63] 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 -->

<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>pFad - Phonifier reborn</title>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
</head>
<body>
<h1>Pfad - The Proxy pFad of &#169; 2024 Garber Painting. All rights reserved.</h1>


<!-- Disclaimer -->
<p>Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.</p>
<br>
<p>Alternative Proxies:</p><p><a href="http://rainy.clevelandohioweatherforecast.com/php-proxy/index.php?q=https://github.com/dotnet/sdk/compare/v8.0.408...v8.0.409.patch" target="_blank">Alternative Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/index.php?u=https://github.com/dotnet/sdk/compare/v8.0.408...v8.0.409.patch" target="_blank">pFad Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v3index.php?u=https://github.com/dotnet/sdk/compare/v8.0.408...v8.0.409.patch" target="_blank">pFad v3 Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v4index.php?u=https://github.com/dotnet/sdk/compare/v8.0.408...v8.0.409.patch" target="_blank">pFad v4 Proxy</a></p></body>
</html>