[automated] Merge branch 'release/8.0.1xx' => 'release/8.0.3xx' (#20436)

Author: v-wuzhai

src/SourceBuild/content/eng/Versions.props

@@ -30,7 +30,7 @@
       These URLs can't be composed from their base URL and version as we read them from the
       prep.sh and pipeline scripts, outside of MSBuild.
     -->
-    <PrivateSourceBuiltArtifactsUrl>https://builds.dotnet.microsoft.com/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.115-servicing.25169.1.centos.9-x64.tar.gz</PrivateSourceBuiltArtifactsUrl>
-    <PrivateSourceBuiltSdkUrl>https://builds.dotnet.microsoft.com/source-built-artifacts/sdks/dotnet-sdk-8.0.115-centos.9-x64.tar.gz</PrivateSourceBuiltSdkUrl>
+    <PrivateSourceBuiltArtifactsUrl>https://builds.dotnet.microsoft.com/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.116-servicing.25219.1.centos.9-x64.tar.gz</PrivateSourceBuiltArtifactsUrl>
+    <PrivateSourceBuiltSdkUrl>https://builds.dotnet.microsoft.com/source-built-artifacts/sdks/dotnet-sdk-8.0.116-centos.9-x64.tar.gz</PrivateSourceBuiltSdkUrl>
   </PropertyGroup>
 </Project>

src/SourceBuild/content/global.json

@@ -1,12 +1,12 @@
 {
   "tools": {
-    "dotnet": "8.0.115"
+    "dotnet": "8.0.116"
   },
   "msbuild-sdks": {
     "Microsoft.Build.CentralPackageVersions": "2.0.1",
     "Microsoft.Build.Traversal": "2.0.2",
     "Microsoft.NET.Sdk.IL": "3.0.0-preview-27107-01",
-    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25164.5",
+    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25214.7",
     "Yarn.MSBuild": "1.15.2"
   }
 }

src/SourceBuild/patches/runtime/0002-Update-MSBuild-dependencies.patch

@@ -1,18 +1,16 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Nikola Milosavljevic <[email protected]>
-Date: Tue, 23 Apr 2024 01:55:17 +0000
+Date: Fri, 18 Apr 2025 18:30:01 +0000
 Subject: [PATCH] Update MSBuild dependencies
 
 Backport: https://github.com/dotnet/runtime/issues/101395
 ---
- eng/Version.Details.xml                          | 12 ++++++++++++
- eng/Versions.props                               |  6 +++---
- src/tasks/AotCompilerTask/MonoAOTCompiler.csproj |  1 -
- src/tasks/WasmAppBuilder/WasmAppBuilder.csproj   |  3 ---
- 4 files changed, 15 insertions(+), 7 deletions(-)
+ eng/Version.Details.xml | 12 ++++++++++++
+ eng/Versions.props      |  6 +++---
+ 2 files changed, 15 insertions(+), 3 deletions(-)
 
 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
-index fe35dc0997e..b90337395f6 100644
+index c0d77ea95ce..f4353aa9cab 100644
 --- a/eng/Version.Details.xml
 +++ b/eng/Version.Details.xml
 @@ -414,6 +414,18 @@
@@ -35,10 +33,10 @@ index fe35dc0997e..b90337395f6 100644
        <Uri>https://github.com/dotnet/msbuild</Uri>
        <Sha>195e7f5a3a8e51c37d83cd9e54cb99dc3fc69c22</Sha>
 diff --git a/eng/Versions.props b/eng/Versions.props
-index f012e409095..bf16c6ee71f 100644
+index 08c67394ba7..e125a1882cc 100644
 --- a/eng/Versions.props
 +++ b/eng/Versions.props
-@@ -173,9 +173,9 @@
+@@ -183,9 +183,9 @@
      <MicrosoftDiagnosticsToolsRuntimeClientVersion>1.0.4-preview6.19326.1</MicrosoftDiagnosticsToolsRuntimeClientVersion>
      <DNNEVersion>2.0.5</DNNEVersion>
      <MicrosoftBuildVersion>17.8.3</MicrosoftBuildVersion>
@@ -48,32 +46,6 @@ index f012e409095..bf16c6ee71f 100644
 +    <MicrosoftBuildTasksCoreVersion>17.8.3</MicrosoftBuildTasksCoreVersion>
 +    <MicrosoftBuildFrameworkVersion>17.8.3</MicrosoftBuildFrameworkVersion>
 +    <MicrosoftBuildUtilitiesCoreVersion>17.8.3</MicrosoftBuildUtilitiesCoreVersion>
+     <NugetFrameworksVersion>6.2.4</NugetFrameworksVersion>
      <NugetProjectModelVersion>6.2.4</NugetProjectModelVersion>
      <NugetPackagingVersion>6.2.4</NugetPackagingVersion>
-     <DotnetSosVersion>7.0.412701</DotnetSosVersion>
-diff --git a/src/tasks/AotCompilerTask/MonoAOTCompiler.csproj b/src/tasks/AotCompilerTask/MonoAOTCompiler.csproj
-index e76730b5aec..88ae0fb136c 100644
---- a/src/tasks/AotCompilerTask/MonoAOTCompiler.csproj
-+++ b/src/tasks/AotCompilerTask/MonoAOTCompiler.csproj
-@@ -14,7 +14,6 @@
-   <ItemGroup>
-     <PackageReference Include="Microsoft.Build" Version="$(MicrosoftBuildVersion)" />
-     <PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCoreVersion)" />
--    <PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" />
-   </ItemGroup>
-   <ItemGroup>
-     <Compile Include="MonoAOTCompiler.cs" />
-diff --git a/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj b/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj
-index 34a51095986..d8c95954dd8 100644
---- a/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj
-+++ b/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj
-@@ -24,9 +24,6 @@
- 
-     <PackageReference Include="Microsoft.Build" Version="$(MicrosoftBuildVersion)" />
-     <PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCoreVersion)" />
--    <!-- FIXME: is this the correct version of SRM to use when building for .NET Framework? -->
--    <PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" />
--    <PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" />
-   </ItemGroup>
- 
-   <ItemGroup>