Merged PR 53411: [internal/release/8.0.4xx] update msbuild

update msbuild

----
#### AI description  (iteration 4)
#### PR Classification
This PR performs a dependency update by upgrading msbuild and aligning related package configurations.

#### PR Summary
The PR upgrades msbuild from version 17.11.45 to 17.11.48, ensuring version consistency across the build by updating package sources and overlaying newer SDK assemblies.
- **`NuGet.config`**: Updates package source keys for msbuild and removes deprecated entries.
- **`src/Layout/redist/targets/GenerateLayout.targets`**: Adds steps to copy newer Microsoft.Build assemblies from the SDK for consistency.
- **`eng/Version.Details.xml`**: Updates the msbuild dependency details and source URIs.
- **`eng/Versions.props`**: Aligns msbuild version properties to the new version.
<!-- GitOpsUserAgent=GitOps.Apps.Server.pullrequestcopilot -->

Author: JanProvaznik

NuGet.config

@@ -17,7 +17,7 @@
     <add key="darc-int-dotnet-aspnetcore-22b4865" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-22b4865a/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from DotNet-msbuild-Trusted -->
-    <add key="darc-pub-DotNet-msbuild-Trusted-70f0ec6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-70f0ec66/nuget/v3/index.json" />
+    <add key="darc-int-DotNet-msbuild-Trusted-02bf662" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-DotNet-msbuild-Trusted-02bf6629/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 -->
@@ -57,6 +57,7 @@
     <add key="darc-int-dotnet-aspnetcore-22b4865" value="true" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from DotNet-msbuild-Trusted -->
+    <add key="darc-int-DotNet-msbuild-Trusted-02bf662" value="true" />
     <!--  End: Package sources from DotNet-msbuild-Trusted -->
     <!--  Begin: Package sources from dotnet-format -->
     <!--  End: Package sources from dotnet-format -->

eng/Version.Details.xml

@@ -55,17 +55,17 @@
       <Uri>https://github.com/dotnet/emsdk</Uri>
       <Sha>ea366a7a40bc588c70ef59376040130baf864c85</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Build" Version="17.11.45">
-      <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>70f0ec66d526ee9e8c658bc6c6c2cf6498286fb6</Sha>
+    <Dependency Name="Microsoft.Build" Version="17.11.48">
+      <Uri>https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted</Uri>
+      <Sha>02bf66295b64ab368d12933041f7281aad186a2d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Build.Localization" Version="17.11.45-servicing-25452-07">
-      <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>70f0ec66d526ee9e8c658bc6c6c2cf6498286fb6</Sha>
+    <Dependency Name="Microsoft.Build.Localization" Version="17.11.48-servicing-25466-05">
+      <Uri>https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted</Uri>
+      <Sha>02bf66295b64ab368d12933041f7281aad186a2d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.11.45-servicing-25452-07">
-      <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>70f0ec66d526ee9e8c658bc6c6c2cf6498286fb6</Sha>
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.11.48-servicing-25466-05">
+      <Uri>https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted</Uri>
+      <Sha>02bf66295b64ab368d12933041f7281aad186a2d</Sha>
       <SourceBuild RepoName="msbuild" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.FSharp.Compiler" Version="12.8.403-beta.24526.2">

eng/Versions.props

@@ -126,7 +126,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/Microsoft/msbuild -->
-    <MicrosoftBuildPackageVersion>17.11.45</MicrosoftBuildPackageVersion>
+    <MicrosoftBuildPackageVersion>17.11.48</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.
@@ -135,7 +135,7 @@
     <MicrosoftBuildMinimumVersion Condition="'$(DotNetBuildFromSource)' != 'true'">17.8.27</MicrosoftBuildMinimumVersion>
     <MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildMinimumVersion)</MicrosoftBuildFrameworkPackageVersion>
     <MicrosoftBuildRuntimePackageVersion>$(MicrosoftBuildMinimumVersion)</MicrosoftBuildRuntimePackageVersion>
-    <MicrosoftBuildLocalizationPackageVersion>17.11.45-servicing-25452-07</MicrosoftBuildLocalizationPackageVersion>
+    <MicrosoftBuildLocalizationPackageVersion>17.11.48-servicing-25466-05</MicrosoftBuildLocalizationPackageVersion>
     <MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildMinimumVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
     <MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildMinimumVersion)</MicrosoftBuildTasksCorePackageVersion>
     <MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildTasksCorePackageVersion)</MicrosoftBuildTasksCoreVersion>

src/Layout/redist/targets/GenerateLayout.targets

@@ -117,10 +117,27 @@
       <DotnetFormatConfigFiles Include="$(Pkgdotnet-format)/tools/net8.0/any/**/*.config" />
     </ItemGroup>
 
+    <!-- SDK Microsoft.Build assemblies to overlay for version consistency -->
+    <ItemGroup>
+      <SdkMicrosoftBuildFiles Include="$(OutputPath)/Microsoft.Build.dll" />
+      <SdkMicrosoftBuildFiles Include="$(OutputPath)/Microsoft.Build.Framework.dll" />
+      <SdkMicrosoftBuildFiles Include="$(OutputPath)/Microsoft.Build.Tasks.Core.dll" />
+      <SdkMicrosoftBuildFiles Include="$(OutputPath)/Microsoft.Build.Utilities.Core.dll" />
+    </ItemGroup>
+
     <Error Condition="'@(DotnetFormatDllFiles)' == ''" Text="Something moved around in dotnet-format package, adjust code here accordingly. TFM change?" />
     <Error Condition="'@(DotnetFormatConfigFiles)' == ''" Text="Something moved around in dotnet-format package, adjust code here accordingly. TFM change?" />
+
+    <!-- Copy dotnet-format files first -->
     <Copy SourceFiles="@(DotnetFormatDllFiles)" DestinationFiles="@(DotnetFormatDllFiles->'$(DotnetFormatDestinationDirectory)/%(RecursiveDir)%(Filename)%(Extension)')" />
     <Copy SourceFiles="@(DotnetFormatConfigFiles)" DestinationFiles="@(DotnetFormatConfigFiles->'$(DotnetFormatDestinationDirectory)/%(RecursiveDir)%(Filename)%(Extension)')" />
+
+    <!-- Overlay newer Microsoft.Build.* assemblies from SDK for version consistency
+         this does not fix deps.json inconsistencies but ensures we don't ship vulnerable packages -->
+    <Copy SourceFiles="@(SdkMicrosoftBuildFiles)"
+          DestinationFolder="$(DotnetFormatDestinationDirectory)"
+          Condition="Exists('%(FullPath)')"
+          OverwriteReadOnlyFiles="true" />
   </Target>
 
   <Target Name="PublishMSBuildExtensions"