Merge in 'release/3.1' changes

dotnet · Nov 16, 2022 · f94bb2c · f94bb2c
2 parents fd23be0 + 2e0ae6d
commit f94bb2c
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/test/HostActivation.Tests/FrameworkResolution/MultipleHives.cs b/src/test/HostActivation.Tests/FrameworkResolution/MultipleHives.cs
@@ -79,7 +79,10 @@ private CommandResult RunTest(Func<RuntimeConfig, RuntimeConfig> runtimeConfig)
  SharedState.FrameworkReferenceApp,
  new TestSettings()
  .WithRuntimeConfigCustomizer(runtimeConfig)
- .WithEnvironment(Constants.TestOnlyEnvironmentVariables.GloballyRegisteredPath, SharedState.DotNetGlobalHive.BinPath),
+ .WithEnvironment(Constants.TestOnlyEnvironmentVariables.GloballyRegisteredPath, SharedState.DotNetGlobalHive.BinPath)
+ .WithEnvironment( // Redirect the default install location to an invalid location so that a machine-wide install is not used
+ Constants.TestOnlyEnvironmentVariables.DefaultInstallPath,
+ System.IO.Path.Combine(SharedState.DotNetMainHive.BinPath, "invalid")),
  // Must enable multi-level lookup otherwise multiple hives are not enabled
  multiLevelLookup: true);
  }