1 files changed, 58 insertions, 16 deletions

diff --git a/src/test/WixToolsetTest.ManagedHost/MbaHostFixture.cs b/src/test/WixToolsetTest.ManagedHost/MbaHostFixture.cs
index 8da42e77..8ef0320e 100644
--- a/src/test/WixToolsetTest.ManagedHost/MbaHostFixture.cs
+++ b/src/test/WixToolsetTest.ManagedHost/MbaHostFixture.cs
@@ -2,7 +2,9 @@
 
 namespace WixToolsetTest.ManagedHost
 {
+    using System.IO;
     using WixBuildTools.TestSupport;
+    using WixToolset.Core.TestPackage;
     using Xunit;
 
     public class MbaHostFixture
@@ -10,31 +12,71 @@ namespace WixToolsetTest.ManagedHost
         [Fact]
         public void CanLoadFullFramework2MBA()
         {
-            var testEngine = new TestEngine();
-            var baFile = TestData.Get(@"..\examples\Example.FullFramework2MBA\mbahost.dll");
+            using (var fs = new DisposableFileSystem())
+            {
+                var baseFolder = fs.GetFolder();
+                var binFolder = Path.Combine(baseFolder, "bin");
+                var bundleFile = Path.Combine(binFolder, "FullFramework2MBA.exe");
+                var baSourceFolder = TestData.Get(@"..\examples");
+                var bundleSourceFolder = TestData.Get(@"TestData\FullFramework2MBA");
+                var intermediateFolder = Path.Combine(baseFolder, "obj");
 
-            var result = testEngine.RunShutdownEngine(baFile);
-            Assert.Equal(0, result.ExitCode);
+                var compileResult = WixRunner.Execute(new[]
+                {
+                    "build",
+                    Path.Combine(bundleSourceFolder, "Bundle.wxs"),
+                    "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
+                    "-ext", TestData.Get(@"WixToolset.NetFx.wixext.dll"),
+                    "-intermediateFolder", intermediateFolder,
+                    "-bindpath", baSourceFolder,
+                    "-burnStub", TestEngine.BurnStubFile,
+                    "-o", bundleFile,
+                });
+                compileResult.AssertSuccess();
+                var testEngine = new TestEngine();
 
-            var logMessages = result.Output;
-            Assert.Equal(2, logMessages.Count);
-            Assert.Equal("Loading managed bootstrapper application.", logMessages[0]);
-            Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[1]);
+                var result = testEngine.RunShutdownEngine(bundleFile, baseFolder);
+                var logMessages = result.Output;
+                Assert.Equal("Loading managed bootstrapper application.", logMessages[0]);
+                Assert.Equal("Creating BA thread to run asynchronously.", logMessages[1]);
+                Assert.Equal("FullFramework2BA", logMessages[2]);
+                Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[3]);
+            }
         }
 
         [Fact]
         public void CanLoadFullFramework4MBA()
         {
-            var testEngine = new TestEngine();
-            var baFile = TestData.Get(@"..\examples\Example.FullFramework4MBA\net48\mbahost.dll");
+            using (var fs = new DisposableFileSystem())
+            {
+                var baseFolder = fs.GetFolder();
+                var binFolder = Path.Combine(baseFolder, "bin");
+                var bundleFile = Path.Combine(binFolder, "FullFramework4MBA.exe");
+                var baSourceFolder = TestData.Get(@"..\examples");
+                var bundleSourceFolder = TestData.Get(@"TestData\FullFramework4MBA");
+                var intermediateFolder = Path.Combine(baseFolder, "obj");
 
-            var result = testEngine.RunShutdownEngine(baFile);
-            Assert.Equal(0, result.ExitCode);
+                var compileResult = WixRunner.Execute(new[]
+                {
+                    "build",
+                    Path.Combine(bundleSourceFolder, "Bundle.wxs"),
+                    "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
+                    "-ext", TestData.Get(@"WixToolset.NetFx.wixext.dll"),
+                    "-intermediateFolder", intermediateFolder,
+                    "-bindpath", baSourceFolder,
+                    "-burnStub", TestEngine.BurnStubFile,
+                    "-o", bundleFile,
+                });
+                compileResult.AssertSuccess();
+                var testEngine = new TestEngine();
 
-            var logMessages = result.Output;
-            Assert.Equal(2, logMessages.Count);
-            Assert.Equal("Loading managed bootstrapper application.", logMessages[0]);
-            Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[1]);
+                var result = testEngine.RunShutdownEngine(bundleFile, baseFolder);
+                var logMessages = result.Output;
+                Assert.Equal("Loading managed bootstrapper application.", logMessages[0]);
+                Assert.Equal("Creating BA thread to run asynchronously.", logMessages[1]);
+                Assert.Equal("FullFramework4BA", logMessages[2]);
+                Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[3]);
+            }
         }
     }
 }