Merge branch 'release/9.0.1xx' of https://github.com/dotnet/sdk into darc-release/9.0.1xx-22b7913c-0028-4167-b1a4-86cdac5fa544

Author: Jason Zhai

build/RunTestsOnHelix.cmd

@@ -9,6 +9,7 @@ set DOTNET_ROOT=%HELIX_CORRELATION_PAYLOAD%\d
 set PATH=%DOTNET_ROOT%;%PATH%
 set DOTNET_MULTILEVEL_LOOKUP=0
 set TestFullMSBuild=%1
+set BuildWithNetFrameworkHostedCompiler=false
 
 set TestExecutionDirectory=%CD%\testExecutionDirectory
 mkdir %TestExecutionDirectory%
@@ -48,4 +49,4 @@ dotnet nuget remove source dotnet-libraries-transport --configfile %TestExecutio
 dotnet nuget remove source dotnet-tools-transport --configfile %TestExecutionDirectory%\nuget.config
 dotnet nuget remove source dotnet-libraries --configfile %TestExecutionDirectory%\nuget.config
 dotnet nuget remove source dotnet-eng --configfile %TestExecutionDirectory%\nuget.config
-dotnet nuget list source --configfile %TestExecutionDirectory%\nuget.config
+dotnet nuget list source --configfile %TestExecutionDirectory%\nuget.config

global.json

@@ -1,6 +1,6 @@
 {
   "tools": {
-    "dotnet": "9.0.100-preview.5.24307.3",
+    "dotnet": "9.0.100-preview.7.24407.12",
     "runtimes": {
       "dotnet": [
         "$(VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion)"

test/Microsoft.NET.Build.Tests/GivenFrameworkReferences.cs

@@ -887,7 +887,7 @@ public void WindowsFormsFrameworkReference(bool selfContained)
             TestFrameworkReferenceProfiles(
                 frameworkReferences: new[] { "Microsoft.WindowsDesktop.App.WindowsForms" },
                 expectedReferenceNames: new[] { "Microsoft.Win32.Registry", "System.Windows.Forms" },
-                notExpectedReferenceNames: new[] { "WindowsFormsIntegration" },
+                notExpectedReferenceNames: Enumerable.Empty<string>(),
                 selfContained);
         }
 
@@ -899,7 +899,7 @@ public void WPFFrameworkReference(bool selfContained)
             TestFrameworkReferenceProfiles(
                 frameworkReferences: new[] { "Microsoft.WindowsDesktop.App.WPF" },
                 expectedReferenceNames: new[] { "Microsoft.Win32.Registry", "System.Windows.Presentation" },
-                notExpectedReferenceNames: new[] { "WindowsFormsIntegration" },
+                notExpectedReferenceNames: Enumerable.Empty<string>(),
                 selfContained);
         }
 
@@ -911,7 +911,7 @@ public void WindowsFormAndWPFFrameworkReference(bool selfContained)
             TestFrameworkReferenceProfiles(
                 frameworkReferences: new[] { "Microsoft.WindowsDesktop.App.WindowsForms", "Microsoft.WindowsDesktop.App.WPF" },
                 expectedReferenceNames: new[] { "Microsoft.Win32.Registry", "System.Windows.Forms", "System.Windows.Presentation" },
-                notExpectedReferenceNames: new[] { "WindowsFormsIntegration" },
+                notExpectedReferenceNames: Enumerable.Empty<string>(),
                 selfContained);
         }
 

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

@@ -44,7 +44,7 @@ public void It_downloads_Microsoft_Net_Compilers_Toolset_Framework_when_requeste
                 .HaveStdOutContaining(Path.Combine(toolsetPackageDir, toolsetPackageVersion, "csc.exe") + " /noconfig");
         }
 
-        [FullMSBuildOnlyFact]
+        [FullMSBuildOnlyFact(Skip = "Skip until we can figure out how to fix the test with the package off globally")]
         public void It_downloads_Microsoft_Net_Compilers_Toolset_Framework_when_MSBuild_is_torn()
         {
             const string testProjectName = "NetCoreApp";
@@ -66,6 +66,7 @@ public void It_downloads_Microsoft_Net_Compilers_Toolset_Framework_when_MSBuild_
 
             testAsset.GetRestoreCommand(Log, relativePath: testProjectName)
                 .WithEnvironmentVariable("NUGET_PACKAGES", customPackagesDir)
+                .WithEnvironmentVariable("BuildWithNetFrameworkHostedCompiler", "")
                 .Execute().Should().Pass();
 
             var toolsetPackageDir = Path.Combine(customPackagesDir, "microsoft.net.sdk.compilers.toolset");
@@ -76,6 +77,7 @@ public void It_downloads_Microsoft_Net_Compilers_Toolset_Framework_when_MSBuild_
 
             new BuildCommand(testAsset)
                 .WithEnvironmentVariable("NUGET_PACKAGES", customPackagesDir)
+                .WithEnvironmentVariable("BuildWithNetFrameworkHostedCompiler", "")
                 .Execute().Should().Pass().And
                 .HaveStdOutContaining(Path.Combine(toolsetPackageDir, toolsetPackageVersion, "csc.exe") + " /noconfig");
         }