diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2022-04-20 15:30:08 -0500 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2022-04-20 16:34:16 -0500 |
commit | b82c6a2b7d451212fb0b2e32ca4d5d86c953d81a (patch) | |
tree | 6405c7522555b8ba404b84a6d187c0f8f95d42d8 /src/test | |
parent | 96ce05107d0e01014a3264e91ecb5731a9f28cc5 (diff) | |
download | wix-b82c6a2b7d451212fb0b2e32ca4d5d86c953d81a.tar.gz wix-b82c6a2b7d451212fb0b2e32ca4d5d86c953d81a.tar.bz2 wix-b82c6a2b7d451212fb0b2e32ca4d5d86c953d81a.zip |
Upgrade dnchost's nethost dependency to .NET 6.0.4.
Diffstat (limited to 'src/test')
-rw-r--r-- | src/test/burn/README.md | 4 | ||||
-rw-r--r-- | src/test/burn/WixToolsetTest.BurnE2E/BurnE2ETests.cs | 6 |
2 files changed, 7 insertions, 3 deletions
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: | |||
20 | > dotnet test --filter WixToolsetTest.BurnE2E.BasicFunctionalityTests.CanInstallAndUninstallSimpleBundle_x86_wixstdba WixToolsetTest.BurnE2E.dll | 20 | > dotnet test --filter WixToolsetTest.BurnE2E.BasicFunctionalityTests.CanInstallAndUninstallSimpleBundle_x86_wixstdba WixToolsetTest.BurnE2E.dll |
21 | 21 | ||
22 | The VM must have: | 22 | The VM must have: |
23 | 1. x64 .NET Core SDK of 5.0 or later (for the test runner) | 23 | 1. x64 .NET Core SDK of 6.0 or later (for the test runner and .NET Core TestBA) |
24 | 1. Any version of .NET Framework (for the .NET Framework TestBA) | 24 | 1. Any version of .NET Framework (for the .NET Framework TestBA) |
25 | 1. x86 .NET Core Desktop Runtime of 5.0 or later (for the .NET Core TestBA) | 25 | 1. x86 .NET Core Desktop Runtime of 6.0 or later (for the .NET Core TestBA) |
26 | 26 | ||
27 | ## Building with local changes | 27 | ## Building with local changes |
28 | 28 | ||
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 | |||
11 | [Collection("BurnE2E")] | 11 | [Collection("BurnE2E")] |
12 | public abstract class BurnE2ETests : WixTestBase, IDisposable | 12 | public abstract class BurnE2ETests : WixTestBase, IDisposable |
13 | { | 13 | { |
14 | protected BurnE2ETests(ITestOutputHelper testOutputHelper) : base(testOutputHelper) { } | 14 | protected BurnE2ETests(ITestOutputHelper testOutputHelper) : base(testOutputHelper) |
15 | { | ||
16 | // https://github.com/microsoft/vstest/issues/3586 | ||
17 | Environment.SetEnvironmentVariable("DOTNET_ROOT", null); | ||
18 | } | ||
15 | 19 | ||
16 | private Stack<IDisposable> Installers { get; } = new Stack<IDisposable>(); | 20 | private Stack<IDisposable> Installers { get; } = new Stack<IDisposable>(); |
17 | 21 | ||