Merge branch 'main' of https://github.com/dotnet/sdk into darc-main-3179108c-c6b8-45ea-ab29-d26b162530ec

Author: Simon Zhao (BEYONDSOFT CONSULTING INC)

eng/Version.Details.props

@@ -142,8 +142,8 @@ This file should be imported by eng/Versions.props
     <!-- nuget/nuget.client dependencies -->
     <NuGetLocalizationPackageVersion>7.0.0-preview.1.100</NuGetLocalizationPackageVersion>
     <!-- microsoft/testfx dependencies -->
-    <MicrosoftTestingPlatformPackageVersion>1.9.0-preview.25404.3</MicrosoftTestingPlatformPackageVersion>
-    <MSTestPackageVersion>3.11.0-preview.25404.3</MSTestPackageVersion>
+    <MicrosoftTestingPlatformPackageVersion>1.9.0-preview.25405.2</MicrosoftTestingPlatformPackageVersion>
+    <MSTestPackageVersion>3.11.0-preview.25405.2</MSTestPackageVersion>
   </PropertyGroup>
   <!--Property group for alternate package version names-->
   <PropertyGroup>

eng/Version.Details.xml

@@ -553,13 +553,13 @@
       <Uri>https://github.com/dotnet/dotnet</Uri>
       <Sha>8cb85e042157ddb8122121a13b7b05329636214c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Testing.Platform" Version="1.9.0-preview.25404.3">
+    <Dependency Name="Microsoft.Testing.Platform" Version="1.9.0-preview.25405.2">
       <Uri>https://github.com/microsoft/testfx</Uri>
-      <Sha>f3ec4dde6ee95396a53012dad96885827b7f932b</Sha>
+      <Sha>07d36fd9a7959c757a9f0dade43667bdec159944</Sha>
     </Dependency>
-    <Dependency Name="MSTest" Version="3.11.0-preview.25404.3">
+    <Dependency Name="MSTest" Version="3.11.0-preview.25405.2">
       <Uri>https://github.com/microsoft/testfx</Uri>
-      <Sha>f3ec4dde6ee95396a53012dad96885827b7f932b</Sha>
+      <Sha>07d36fd9a7959c757a9f0dade43667bdec159944</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.Configuration.Ini" Version="10.0.0-rc.1.25405.103">
       <Uri>https://github.com/dotnet/dotnet</Uri>

src/Layout/redist/tools/tool_fsc.csproj

@@ -17,9 +17,10 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.FSharp.Compiler" ExcludeAssets="contentFiles" GeneratePathProperty="true" />
-    <PackageReference Include="Microsoft.Build.Framework" />
-    <PackageReference Include="Microsoft.Build.Tasks.Core" />
-    <PackageReference Include="Microsoft.Build.Utilities.Core" />
+    <PackageReference Include="Microsoft.Build.Framework" VersionOverride="$(MicrosoftBuildCurrentPackageVersion)" />
+    <PackageReference Include="Microsoft.Build.Tasks.Core" VersionOverride="$(MicrosoftBuildCurrentPackageVersion)" />
+    <PackageReference Include="Microsoft.Build.Utilities.Core" VersionOverride="$(MicrosoftBuildCurrentPackageVersion)" />
+    <PackageReference Include="Microsoft.NET.StringTools" VersionOverride="$(MicrosoftBuildCurrentPackageVersion)" />
   </ItemGroup>
 
   <!-- MIBC don't work for SB yet: https://github.com/dotnet/source-build/issues/247 -->

test/Microsoft.NET.Restore.Tests/GivenThatWeWantToUseFrameworkRoslyn.cs

@@ -11,7 +11,7 @@ public GivenThatWeWantToUseFrameworkRoslyn(ITestOutputHelper log) : base(log)
         {
         }
 
-        [FullMSBuildOnlyFact]
+        [FullMSBuildOnlyFact(Skip = "https://github.com/dotnet/sdk/pull/49654/")]
         public void It_downloads_Microsoft_Net_Compilers_Toolset_Framework_when_requested()
         {
             const string testProjectName = "NetCoreApp";
@@ -46,7 +46,7 @@ public void It_downloads_Microsoft_Net_Compilers_Toolset_Framework_when_requeste
                 .HaveStdOutContaining(Path.Combine(toolsetPackageDir, toolsetPackageVersion, "csc.exe") + " /noconfig");
         }
 
-        [FullMSBuildOnlyFact]
+        [FullMSBuildOnlyFact(Skip = "https://github.com/dotnet/sdk/pull/49654/")]
         public void It_downloads_Microsoft_Net_Compilers_Toolset_Framework_when_MSBuild_is_torn()
         {
             const string testProjectName = "NetCoreApp";