Set DOTNET_ROOT in tests

dotnet · Nov 8, 2019 · d6ec8d5 · d6ec8d5
1 parent 3df3c6d
commit d6ec8d5
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/TestCommand.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/TestCommand.cs
@@ -235,7 +235,19 @@ private void AddEnvironmentVariablesTo(ProcessStartInfo psi)
             }
 
             //  Flow the TEST_PACKAGES environment variable to the child process
-            psi.Environment["TEST_PACKAGES"] = new RepoDirectoriesProvider().TestPackages;
+            RepoDirectoriesProvider repoDirectoriesProvider = new RepoDirectoriesProvider();
+            psi.Environment["TEST_PACKAGES"] = repoDirectoriesProvider.TestPackages;
+
+            // Set DOTNET_ROOT to ensure sub process find the same host fxr
+            string dotnetDirectoryPath = repoDirectoriesProvider.DotnetRoot;
+            if (System.Environment.Is64BitProcess)
+            {
+                psi.Environment.Add("DOTNET_ROOT", dotnetDirectoryPath);
+            }
+            else
+            {
+                psi.Environment.Add("DOTNET_ROOT(x86)", dotnetDirectoryPath);
+            }
         }
 
         private void AddDotnetToolPathToAvoidSettingPermanentEnvInBuildMachineOnWindows()