From b82c6a2b7d451212fb0b2e32ca4d5d86c953d81a Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Wed, 20 Apr 2022 15:30:08 -0500 Subject: Upgrade dnchost's nethost dependency to .NET 6.0.4. --- src/test/burn/README.md | 4 ++-- src/test/burn/WixToolsetTest.BurnE2E/BurnE2ETests.cs | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'src/test') diff --git a/src/test/burn/README.md b/src/test/burn/README.md index 1f2168cf..6c9edb3c 100644 --- a/src/test/burn/README.md +++ b/src/test/burn/README.md @@ -20,9 +20,9 @@ For example, the following line runs only the specified test: > dotnet test --filter WixToolsetTest.BurnE2E.BasicFunctionalityTests.CanInstallAndUninstallSimpleBundle_x86_wixstdba WixToolsetTest.BurnE2E.dll The VM must have: -1. x64 .NET Core SDK of 5.0 or later (for the test runner) +1. x64 .NET Core SDK of 6.0 or later (for the test runner and .NET Core TestBA) 1. Any version of .NET Framework (for the .NET Framework TestBA) -1. x86 .NET Core Desktop Runtime of 5.0 or later (for the .NET Core TestBA) +1. x86 .NET Core Desktop Runtime of 6.0 or later (for the .NET Core TestBA) ## Building with local changes diff --git a/src/test/burn/WixToolsetTest.BurnE2E/BurnE2ETests.cs b/src/test/burn/WixToolsetTest.BurnE2E/BurnE2ETests.cs index 4f5b40e0..975bd238 100644 --- a/src/test/burn/WixToolsetTest.BurnE2E/BurnE2ETests.cs +++ b/src/test/burn/WixToolsetTest.BurnE2E/BurnE2ETests.cs @@ -11,7 +11,11 @@ namespace WixToolsetTest.BurnE2E [Collection("BurnE2E")] public abstract class BurnE2ETests : WixTestBase, IDisposable { - protected BurnE2ETests(ITestOutputHelper testOutputHelper) : base(testOutputHelper) { } + protected BurnE2ETests(ITestOutputHelper testOutputHelper) : base(testOutputHelper) + { + // https://github.com/microsoft/vstest/issues/3586 + Environment.SetEnvironmentVariable("DOTNET_ROOT", null); + } private Stack Installers { get; } = new Stack(); -- cgit v1.2.3-55-g6feb