diff --git a/src/libraries/sendtohelixhelp.proj b/src/libraries/sendtohelixhelp.proj index 8bf53d4d5fc152..6c04a4365065f1 100644 --- a/src/libraries/sendtohelixhelp.proj +++ b/src/libraries/sendtohelixhelp.proj @@ -139,7 +139,7 @@ - + diff --git a/src/mono/wasm/Wasm.Build.Tests/Common/BuildEnvironment.cs b/src/mono/wasm/Wasm.Build.Tests/Common/BuildEnvironment.cs index 4dddc0c2ed2d40..257502ba61802a 100644 --- a/src/mono/wasm/Wasm.Build.Tests/Common/BuildEnvironment.cs +++ b/src/mono/wasm/Wasm.Build.Tests/Common/BuildEnvironment.cs @@ -106,6 +106,7 @@ public BuildEnvironment() // `runtime` repo's build environment sets these, and they // mess up the build for the test project, which is using a different // dotnet + EnvVars["DOTNET_ROOT"] = sdkForWorkloadPath; EnvVars["DOTNET_INSTALL_DIR"] = sdkForWorkloadPath; EnvVars["DOTNET_MULTILEVEL_LOOKUP"] = "0"; EnvVars["DOTNET_SKIP_FIRST_TIME_EXPERIENCE"] = "1"; diff --git a/src/mono/wasm/Wasm.Build.Tests/Common/RunCommand.cs b/src/mono/wasm/Wasm.Build.Tests/Common/RunCommand.cs index b13b6011de2656..5ab27489622aed 100644 --- a/src/mono/wasm/Wasm.Build.Tests/Common/RunCommand.cs +++ b/src/mono/wasm/Wasm.Build.Tests/Common/RunCommand.cs @@ -11,7 +11,7 @@ public class RunCommand : DotNetCommand public RunCommand(BuildEnvironment buildEnv, ITestOutputHelper _testOutput, string label="") : base(buildEnv, _testOutput, false, label) { WithEnvironmentVariables(buildEnv.EnvVars); - WithEnvironmentVariable("DOTNET_ROOT", buildEnv.DotNet); + WithEnvironmentVariable("DOTNET_ROOT", Path.GetDirectoryName(buildEnv.DotNet)!); WithEnvironmentVariable("DOTNET_INSTALL_DIR", Path.GetDirectoryName(buildEnv.DotNet)!); WithEnvironmentVariable("DOTNET_MULTILEVEL_LOOKUP", "0"); WithEnvironmentVariable("DOTNET_SKIP_FIRST_TIME_EXPERIENCE", "1");