mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge release/3.0.1xx into branch

Browse source
This commit is contained in:
wtgodbe 2019-11-08 14:07:20 -08:00
commit 7bb582ed3d
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/TestCommand.cs
View file

@ -145,6 +145,17 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
psi.Environment["DOTNET_MULTILEVEL_LOOKUP"] = "0";
psi.Environment["DOTNET_SKIP_FIRST_TIME_EXPERIENCE"] = "1";
// Set DOTNET_ROOT to ensure sub process find the same host fxr
string dotnetDirectoryPath = Path.GetDirectoryName(RepoDirectoriesProvider.DotnetUnderTest);
if (System.Environment.Is64BitProcess)
{
psi.Environment.Add("DOTNET_ROOT", dotnetDirectoryPath);
}
else
{
psi.Environment.Add("DOTNET_ROOT(x86)", dotnetDirectoryPath);
}
AddEnvironmentVariablesTo(psi);
AddWorkingDirectoryTo(psi);