From d1715f6a19763558384092cc34c85c0cd38bd576 Mon Sep 17 00:00:00 2001
From: Jan Jones <janjones@microsoft.com>
Date: Tue, 20 Aug 2024 14:31:57 +0200
Subject: [PATCH 1/4] Revert disabling the toolset package in Helix

---
 build/RunTestsOnHelix.cmd                                       | 1 -
 .../GivenThatWeWantToUseFrameworkRoslyn.cs                      | 2 --
 2 files changed, 3 deletions(-)

diff --git a/build/RunTestsOnHelix.cmd b/build/RunTestsOnHelix.cmd
index 8d822621b206..fcd82743f016 100644
--- a/build/RunTestsOnHelix.cmd
+++ b/build/RunTestsOnHelix.cmd
@@ -9,7 +9,6 @@ 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%
diff --git a/test/Microsoft.NET.Restore.Tests/GivenThatWeWantToUseFrameworkRoslyn.cs b/test/Microsoft.NET.Restore.Tests/GivenThatWeWantToUseFrameworkRoslyn.cs
index daaee1b23a72..f352d289f639 100644
--- a/test/Microsoft.NET.Restore.Tests/GivenThatWeWantToUseFrameworkRoslyn.cs
+++ b/test/Microsoft.NET.Restore.Tests/GivenThatWeWantToUseFrameworkRoslyn.cs
@@ -66,7 +66,6 @@ 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");
@@ -77,7 +76,6 @@ 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");
         }

From c5e8a24cd99ed264f4c853919d54f158f9a7df0d Mon Sep 17 00:00:00 2001
From: Jan Jones <janjones@microsoft.com>
Date: Tue, 20 Aug 2024 16:33:08 +0200
Subject: [PATCH 2/4] Include Testpackages in Helix

---
 build/RunTestsOnHelix.cmd | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build/RunTestsOnHelix.cmd b/build/RunTestsOnHelix.cmd
index fcd82743f016..49cd4081a934 100644
--- a/build/RunTestsOnHelix.cmd
+++ b/build/RunTestsOnHelix.cmd
@@ -37,6 +37,7 @@ REM We downloaded a special zip of files to the .nuget folder so add that as a s
 dotnet nuget list source --configfile %TestExecutionDirectory%\nuget.config
 PowerShell -ExecutionPolicy ByPass "dotnet nuget locals all -l | ForEach-Object { $_.Split(' ')[1]} | Where-Object{$_ -like '*cache'} | Get-ChildItem -Recurse -File -Filter '*.dat' | Measure"
 dotnet nuget add source %DOTNET_ROOT%\.nuget --configfile %TestExecutionDirectory%\nuget.config
+if exist %TestExecutionDirectory%\Testpackages dotnet nuget add source %TestExecutionDirectory%\Testpackages --name testpackages --configfile %TestExecutionDirectory%\nuget.config
 
 dotnet nuget remove source dotnet6-transport --configfile %TestExecutionDirectory%\nuget.config
 dotnet nuget remove source dotnet6-internal-transport --configfile %TestExecutionDirectory%\nuget.config

From b0acfed73852166c4015338557b8ad9b0532e0e4 Mon Sep 17 00:00:00 2001
From: Jan Jones <janjones@microsoft.com>
Date: Wed, 21 Aug 2024 14:10:07 +0200
Subject: [PATCH 3/4] Avoid using unset `NuGetPackageRoot`

---
 .../targets/Microsoft.NET.Sdk.targets                          | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets
index e21d8dec9c68..eb331474ad94 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets
@@ -232,6 +232,7 @@ Copyright (c) .NET Foundation. All rights reserved.
   <PropertyGroup Condition="'$(BuildWithNetFrameworkHostedCompiler)' == 'true' and '$(OS)' == 'Windows_NT'">
     <RoslynTargetsPath>$(NuGetPackageRoot)\microsoft.net.sdk.compilers.toolset\$(NETCoreSdkVersion)</RoslynTargetsPath>
     <_NeedToDownloadMicrosoftNetSdkCompilersToolsetPackage>true</_NeedToDownloadMicrosoftNetSdkCompilersToolsetPackage>
+    <_SkipCheckMicrosoftNetSdkCompilersToolsetPackageExists Condition="'$(NuGetPackageRoot)' == ''">true</_SkipCheckMicrosoftNetSdkCompilersToolsetPackageExists>
   </PropertyGroup>
 
   <!-- NOTE: Keep in sync with https://github.com/dotnet/msbuild/blob/main/src/Tasks/Microsoft.Common.tasks -->
@@ -254,7 +255,7 @@ Copyright (c) .NET Foundation. All rights reserved.
   </Target>
 
   <Target Name="_CheckMicrosoftNetSdkCompilersToolsetPackageExists"
-          Condition="'$(_NeedToDownloadMicrosoftNetSdkCompilersToolsetPackage)' == 'true' and '$(DesignTimeBuild)' != 'true'"
+          Condition="'$(_NeedToDownloadMicrosoftNetSdkCompilersToolsetPackage)' == 'true' and '$(DesignTimeBuild)' != 'true' and '$(_SkipCheckMicrosoftNetSdkCompilersToolsetPackageExists)' != 'true'"
           BeforeTargets="CoreCompile">
     <!-- If users did not run restore or it failed to download the Microsoft.Net.Sdk.Compilers.Toolset package
          (but they proceeded to build, e.g., in Visual Studio), display an error with suggestions how to fix the problem. -->

From e8bb7f8344006c4ddf5492c538fa8b6c149c9d8d Mon Sep 17 00:00:00 2001
From: Jan Jones <janjones@microsoft.com>
Date: Tue, 27 Aug 2024 09:29:18 +0200
Subject: [PATCH 4/4] Link tracking issue

---
 .../Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets
index eb331474ad94..21fde51c351c 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets
@@ -232,6 +232,7 @@ Copyright (c) .NET Foundation. All rights reserved.
   <PropertyGroup Condition="'$(BuildWithNetFrameworkHostedCompiler)' == 'true' and '$(OS)' == 'Windows_NT'">
     <RoslynTargetsPath>$(NuGetPackageRoot)\microsoft.net.sdk.compilers.toolset\$(NETCoreSdkVersion)</RoslynTargetsPath>
     <_NeedToDownloadMicrosoftNetSdkCompilersToolsetPackage>true</_NeedToDownloadMicrosoftNetSdkCompilersToolsetPackage>
+    <!-- Workaround for https://github.com/dotnet/sdk/issues/43016. -->
     <_SkipCheckMicrosoftNetSdkCompilersToolsetPackageExists Condition="'$(NuGetPackageRoot)' == ''">true</_SkipCheckMicrosoftNetSdkCompilersToolsetPackageExists>
   </PropertyGroup>