aboutsummaryrefslogtreecommitdiff
path: root/src/ext/Bal
diff options
context:
space:
mode:
Diffstat (limited to 'src/ext/Bal')
-rw-r--r--src/ext/Bal/test/WixToolsetTest.ManagedHost/DncHostFixture.cs12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/ext/Bal/test/WixToolsetTest.ManagedHost/DncHostFixture.cs b/src/ext/Bal/test/WixToolsetTest.ManagedHost/DncHostFixture.cs
index 25856f4d..3aa2bec7 100644
--- a/src/ext/Bal/test/WixToolsetTest.ManagedHost/DncHostFixture.cs
+++ b/src/ext/Bal/test/WixToolsetTest.ManagedHost/DncHostFixture.cs
@@ -4,6 +4,7 @@ namespace WixToolsetTest.ManagedHost
4{ 4{
5 using System; 5 using System;
6 using WixBuildTools.TestSupport; 6 using WixBuildTools.TestSupport;
7 using WixBuildTools.TestSupport.XunitExtensions;
7 using Xunit; 8 using Xunit;
8 9
9 public class DncHostFixture 10 public class DncHostFixture
@@ -30,7 +31,7 @@ namespace WixToolsetTest.ManagedHost
30 } 31 }
31 } 32 }
32 33
33 [Fact(Skip = "Requires .NET Core 3.1 x86 runtime which might be missing")] 34 [SkippableFact]
34 public void CanLoadFDDx86EarliestCoreMBA() 35 public void CanLoadFDDx86EarliestCoreMBA()
35 { 36 {
36 // https://github.com/microsoft/vstest/issues/3586 37 // https://github.com/microsoft/vstest/issues/3586
@@ -43,13 +44,20 @@ namespace WixToolsetTest.ManagedHost
43 var testEngine = new TestEngine(); 44 var testEngine = new TestEngine();
44 45
45 var result = testEngine.RunShutdownEngine(bundleFile, baseFolder, x86: true); 46 var result = testEngine.RunShutdownEngine(bundleFile, baseFolder, x86: true);
47 var resultOutput = result.Output.ToArray();
48
49 if (resultOutput.Length > 0 && resultOutput[0] == "error from hostfxr: It was not possible to find any compatible framework version")
50 {
51 WixAssert.Skip(String.Join(Environment.NewLine, resultOutput));
52 }
53
46 WixAssert.CompareLineByLine(new[] 54 WixAssert.CompareLineByLine(new[]
47 { 55 {
48 "Loading .NET Core FDD bootstrapper application.", 56 "Loading .NET Core FDD bootstrapper application.",
49 "Creating BA thread to run asynchronously.", 57 "Creating BA thread to run asynchronously.",
50 "EarliestCoreBA", 58 "EarliestCoreBA",
51 "Shutdown,ReloadBootstrapper,0", 59 "Shutdown,ReloadBootstrapper,0",
52 }, result.Output.ToArray()); 60 }, resultOutput);
53 } 61 }
54 } 62 }
55 63