Revert "[wasm] fix weird build failures"

This reverts commit 1a731fb.

src/mono/wasm/Wasm.Build.Tests/BuildEnvironment.cs

@@ -107,6 +107,7 @@ public BuildEnvironment()
             EnvVars["DOTNET_INSTALL_DIR"] = sdkForWorkloadPath;
             EnvVars["DOTNET_MULTILEVEL_LOOKUP"] = "0";
             EnvVars["DOTNET_SKIP_FIRST_TIME_EXPERIENCE"] = "1";
+            EnvVars["MSBuildSDKsPath"] = string.Empty;
             EnvVars["PATH"] = $"{sdkForWorkloadPath}{Path.PathSeparator}{Environment.GetEnvironmentVariable("PATH")}";
             EnvVars["EM_WORKAROUND_PYTHON_BUG_34780"] = "1";
 

src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs

@@ -840,9 +840,6 @@ public static (int exitCode, string buildOutput) RunProcess(string path,
                     processStartInfo.EnvironmentVariables[envVar.Key] = envVar.Value;
                     _testOutput.WriteLine($"\t{envVar.Key} = {envVar.Value}");
                 }
-
-                // runtime repo sets this, which interferes with the tests
-                processStartInfo.RemoveEnvironmentVariables("MSBuildSDKsPath");
             }
 
             Process process = new ();

src/mono/wasm/Wasm.Build.Tests/HelperExtensions.cs

@@ -120,18 +120,5 @@ public static void UpdateTo(this IDictionary<string, (string fullPath, bool unch
                 dict[filename] = (oldValue.fullPath, unchanged);
             }
         }
-
-        public static ProcessStartInfo RemoveEnvironmentVariables(this ProcessStartInfo psi, params string[] names)
-        {
-            var env = psi.Environment;
-            foreach (string name in names)
-            {
-                string? key = env.Keys.FirstOrDefault(k => string.Compare(k, name, StringComparison.OrdinalIgnoreCase) == 0);
-                if (key is not null)
-                    env.Remove("MSBuildSDKsPath");
-            }
-
-            return psi;
-        }
     }
 }

src/mono/wasm/Wasm.Build.Tests/ToolCommand.cs

@@ -161,8 +161,6 @@ private Process CreateProcess(string executable, string args)
             psi.Environment["DOTNET_MULTILEVEL_LOOKUP"] = "0";
             psi.Environment["DOTNET_SKIP_FIRST_TIME_EXPERIENCE"] = "1";
 
-            // runtime repo sets this, which interferes with the tests
-            psi.RemoveEnvironmentVariables("MSBuildSDKsPath");
             AddEnvironmentVariablesTo(psi);
             AddWorkingDirectoryTo(psi);
             var process = new Process
@@ -203,7 +201,6 @@ private void AddEnvironmentVariablesTo(ProcessStartInfo psi)
         {
             foreach (var item in Environment)
             {
-                _testOutput.WriteLine($"\t[{item.Key}] = {item.Value}");
                 psi.Environment[item.Key] = item.Value;
             }
         }