Update the MbaHost test project to use an external exe to load the BA, which allows loading a different .NET than the one running the tests. This also allows writing the tests in C# instead of C++/CLI.

33 files changed, 756 insertions, 372 deletions

diff --git a/Bal.wixext.sln b/Bal.wixext.sln
index 867beef5..e74e99c3 100644
--- a/Bal.wixext.sln
+++ b/Bal.wixext.sln
@@ -13,78 +13,149 @@ Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "bal", "src\wixlib\bal.wixpr
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Bal.wixext", "src\wixext\WixToolset.Bal.wixext.csproj", "{BF720A63-9D7B-456E-B60C-8122852D9FED}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WixToolsetTest.MbaHost", "src\test\WixToolsetTest.MbaHost\WixToolsetTest.MbaHost.vcxproj", "{8C131CB9-7B1C-4B06-A328-E69CE9EDC763}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolset.Mba.Host", "src\WixToolset.Mba.Host\WixToolset.Mba.Host.csproj", "{F2BA1935-70FA-4156-B161-FD03850B4FAA}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{C70E3534-A018-4D0A-A340-916C9777EEF7}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Example.FullFramework2MBA", "src\test\examples\FullFramework2MBA\Example.FullFramework2MBA.csproj", "{CC4236FC-226E-4232-AB50-24CBEC4D314D}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Example.TestEngine", "src\test\examples\TestEngine\Example.TestEngine.vcxproj", "{3D44B67D-A475-49BA-8310-E39F6C117CC9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.ManagedHost", "src\test\WixToolsetTest.ManagedHost\WixToolsetTest.ManagedHost.csproj", "{FED9D707-E5C3-4867-87B0-FABDB5EB0823}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Example.FullFramework4MBA", "src\test\examples\FullFramework4MBA\Example.FullFramework4MBA.csproj", "{44297646-706D-4508-8E96-1B35B109694C}"
+EndProject
 Global
         GlobalSection(SolutionConfigurationPlatforms) = preSolution
                 Debug|Any CPU = Debug|Any CPU
+                Debug|x64 = Debug|x64
                 Debug|x86 = Debug|x86
                 Release|Any CPU = Release|Any CPU
+                Release|x64 = Release|x64
                 Release|x86 = Release|x86
         EndGlobalSection
         GlobalSection(ProjectConfigurationPlatforms) = postSolution
                 {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Debug|Any CPU.ActiveCfg = Debug|Win32
                 {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Debug|Any CPU.Build.0 = Debug|Win32
+                {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Debug|x64.ActiveCfg = Debug|Win32
                 {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Debug|x86.ActiveCfg = Debug|Win32
                 {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Debug|x86.Build.0 = Debug|Win32
                 {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Release|Any CPU.ActiveCfg = Release|Win32
                 {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Release|Any CPU.Build.0 = Release|Win32
+                {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Release|x64.ActiveCfg = Release|Win32
                 {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Release|x86.ActiveCfg = Release|Win32
                 {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Release|x86.Build.0 = Release|Win32
                 {12C87C77-3547-44F8-8134-29BC915CB19D}.Debug|Any CPU.ActiveCfg = Debug|Win32
                 {12C87C77-3547-44F8-8134-29BC915CB19D}.Debug|Any CPU.Build.0 = Debug|Win32
+                {12C87C77-3547-44F8-8134-29BC915CB19D}.Debug|x64.ActiveCfg = Debug|Win32
                 {12C87C77-3547-44F8-8134-29BC915CB19D}.Debug|x86.ActiveCfg = Debug|Win32
                 {12C87C77-3547-44F8-8134-29BC915CB19D}.Debug|x86.Build.0 = Debug|Win32
                 {12C87C77-3547-44F8-8134-29BC915CB19D}.Release|Any CPU.ActiveCfg = Release|Win32
                 {12C87C77-3547-44F8-8134-29BC915CB19D}.Release|Any CPU.Build.0 = Release|Win32
+                {12C87C77-3547-44F8-8134-29BC915CB19D}.Release|x64.ActiveCfg = Release|Win32
                 {12C87C77-3547-44F8-8134-29BC915CB19D}.Release|x86.ActiveCfg = Release|Win32
                 {12C87C77-3547-44F8-8134-29BC915CB19D}.Release|x86.Build.0 = Release|Win32
                 {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Debug|Any CPU.ActiveCfg = Debug|Win32
                 {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Debug|Any CPU.Build.0 = Debug|Win32
+                {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Debug|x64.ActiveCfg = Debug|Win32
                 {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Debug|x86.ActiveCfg = Debug|Win32
                 {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Debug|x86.Build.0 = Debug|Win32
                 {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Release|Any CPU.ActiveCfg = Release|Win32
                 {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Release|Any CPU.Build.0 = Release|Win32
+                {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Release|x64.ActiveCfg = Release|Win32
                 {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Release|x86.ActiveCfg = Release|Win32
                 {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Release|x86.Build.0 = Release|Win32
                 {3444D952-F21C-496F-AB6B-56435BFD0787}.Debug|Any CPU.ActiveCfg = Debug|x86
                 {3444D952-F21C-496F-AB6B-56435BFD0787}.Debug|Any CPU.Build.0 = Debug|x86
+                {3444D952-F21C-496F-AB6B-56435BFD0787}.Debug|x64.ActiveCfg = Debug|x86
                 {3444D952-F21C-496F-AB6B-56435BFD0787}.Debug|x86.ActiveCfg = Debug|x86
                 {3444D952-F21C-496F-AB6B-56435BFD0787}.Debug|x86.Build.0 = Debug|x86
                 {3444D952-F21C-496F-AB6B-56435BFD0787}.Release|Any CPU.ActiveCfg = Release|x86
                 {3444D952-F21C-496F-AB6B-56435BFD0787}.Release|Any CPU.Build.0 = Release|x86
+                {3444D952-F21C-496F-AB6B-56435BFD0787}.Release|x64.ActiveCfg = Release|x86
                 {3444D952-F21C-496F-AB6B-56435BFD0787}.Release|x86.ActiveCfg = Release|x86
                 {3444D952-F21C-496F-AB6B-56435BFD0787}.Release|x86.Build.0 = Release|x86
                 {BF720A63-9D7B-456E-B60C-8122852D9FED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                 {BF720A63-9D7B-456E-B60C-8122852D9FED}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {BF720A63-9D7B-456E-B60C-8122852D9FED}.Debug|x64.ActiveCfg = Debug|Any CPU
+                {BF720A63-9D7B-456E-B60C-8122852D9FED}.Debug|x64.Build.0 = Debug|Any CPU
                 {BF720A63-9D7B-456E-B60C-8122852D9FED}.Debug|x86.ActiveCfg = Debug|Any CPU
                 {BF720A63-9D7B-456E-B60C-8122852D9FED}.Debug|x86.Build.0 = Debug|Any CPU
                 {BF720A63-9D7B-456E-B60C-8122852D9FED}.Release|Any CPU.ActiveCfg = Release|Any CPU
                 {BF720A63-9D7B-456E-B60C-8122852D9FED}.Release|Any CPU.Build.0 = Release|Any CPU
+                {BF720A63-9D7B-456E-B60C-8122852D9FED}.Release|x64.ActiveCfg = Release|Any CPU
+                {BF720A63-9D7B-456E-B60C-8122852D9FED}.Release|x64.Build.0 = Release|Any CPU
                 {BF720A63-9D7B-456E-B60C-8122852D9FED}.Release|x86.ActiveCfg = Release|Any CPU
                 {BF720A63-9D7B-456E-B60C-8122852D9FED}.Release|x86.Build.0 = Release|Any CPU
-                {8C131CB9-7B1C-4B06-A328-E69CE9EDC763}.Debug|Any CPU.ActiveCfg = Debug|Win32
-                {8C131CB9-7B1C-4B06-A328-E69CE9EDC763}.Debug|Any CPU.Build.0 = Debug|Win32
-                {8C131CB9-7B1C-4B06-A328-E69CE9EDC763}.Debug|x86.ActiveCfg = Debug|Win32
-                {8C131CB9-7B1C-4B06-A328-E69CE9EDC763}.Debug|x86.Build.0 = Debug|Win32
-                {8C131CB9-7B1C-4B06-A328-E69CE9EDC763}.Release|Any CPU.ActiveCfg = Release|Win32
-                {8C131CB9-7B1C-4B06-A328-E69CE9EDC763}.Release|Any CPU.Build.0 = Release|Win32
-                {8C131CB9-7B1C-4B06-A328-E69CE9EDC763}.Release|x86.ActiveCfg = Release|Win32
-                {8C131CB9-7B1C-4B06-A328-E69CE9EDC763}.Release|x86.Build.0 = Release|Win32
                 {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                 {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Debug|x64.ActiveCfg = Debug|Any CPU
+                {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Debug|x64.Build.0 = Debug|Any CPU
                 {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Debug|x86.ActiveCfg = Debug|Any CPU
                 {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Debug|x86.Build.0 = Debug|Any CPU
                 {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Release|Any CPU.ActiveCfg = Release|Any CPU
                 {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Release|Any CPU.Build.0 = Release|Any CPU
+                {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Release|x64.ActiveCfg = Release|Any CPU
+                {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Release|x64.Build.0 = Release|Any CPU
                 {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Release|x86.ActiveCfg = Release|Any CPU
                 {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Release|x86.Build.0 = Release|Any CPU
+                {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Debug|x64.ActiveCfg = Debug|Any CPU
+                {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Debug|x64.Build.0 = Debug|Any CPU
+                {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Debug|x86.ActiveCfg = Debug|Any CPU
+                {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Debug|x86.Build.0 = Debug|Any CPU
+                {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Release|Any CPU.Build.0 = Release|Any CPU
+                {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Release|x64.ActiveCfg = Release|Any CPU
+                {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Release|x64.Build.0 = Release|Any CPU
+                {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Release|x86.ActiveCfg = Release|Any CPU
+                {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Release|x86.Build.0 = Release|Any CPU
+                {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Debug|Any CPU.ActiveCfg = Debug|Win32
+                {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Debug|Any CPU.Build.0 = Debug|Win32
+                {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Debug|x64.ActiveCfg = Debug|x64
+                {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Debug|x64.Build.0 = Debug|x64
+                {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Debug|x86.ActiveCfg = Debug|Win32
+                {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Debug|x86.Build.0 = Debug|Win32
+                {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Release|Any CPU.ActiveCfg = Release|Win32
+                {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Release|Any CPU.Build.0 = Release|Win32
+                {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Release|x64.ActiveCfg = Release|x64
+                {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Release|x64.Build.0 = Release|x64
+                {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Release|x86.ActiveCfg = Release|Win32
+                {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Release|x86.Build.0 = Release|Win32
+                {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Debug|x64.ActiveCfg = Debug|Any CPU
+                {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Debug|x64.Build.0 = Debug|Any CPU
+                {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Debug|x86.ActiveCfg = Debug|Any CPU
+                {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Debug|x86.Build.0 = Debug|Any CPU
+                {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Release|Any CPU.Build.0 = Release|Any CPU
+                {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Release|x64.ActiveCfg = Release|Any CPU
+                {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Release|x64.Build.0 = Release|Any CPU
+                {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Release|x86.ActiveCfg = Release|Any CPU
+                {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Release|x86.Build.0 = Release|Any CPU
+                {44297646-706D-4508-8E96-1B35B109694C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {44297646-706D-4508-8E96-1B35B109694C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {44297646-706D-4508-8E96-1B35B109694C}.Debug|x64.ActiveCfg = Debug|Any CPU
+                {44297646-706D-4508-8E96-1B35B109694C}.Debug|x64.Build.0 = Debug|Any CPU
+                {44297646-706D-4508-8E96-1B35B109694C}.Debug|x86.ActiveCfg = Debug|Any CPU
+                {44297646-706D-4508-8E96-1B35B109694C}.Debug|x86.Build.0 = Debug|Any CPU
+                {44297646-706D-4508-8E96-1B35B109694C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {44297646-706D-4508-8E96-1B35B109694C}.Release|Any CPU.Build.0 = Release|Any CPU
+                {44297646-706D-4508-8E96-1B35B109694C}.Release|x64.ActiveCfg = Release|Any CPU
+                {44297646-706D-4508-8E96-1B35B109694C}.Release|x64.Build.0 = Release|Any CPU
+                {44297646-706D-4508-8E96-1B35B109694C}.Release|x86.ActiveCfg = Release|Any CPU
+                {44297646-706D-4508-8E96-1B35B109694C}.Release|x86.Build.0 = Release|Any CPU
         EndGlobalSection
         GlobalSection(SolutionProperties) = preSolution
                 HideSolutionNode = FALSE
         EndGlobalSection
+        GlobalSection(NestedProjects) = preSolution
+                {CC4236FC-226E-4232-AB50-24CBEC4D314D} = {C70E3534-A018-4D0A-A340-916C9777EEF7}
+                {3D44B67D-A475-49BA-8310-E39F6C117CC9} = {C70E3534-A018-4D0A-A340-916C9777EEF7}
+                {44297646-706D-4508-8E96-1B35B109694C} = {C70E3534-A018-4D0A-A340-916C9777EEF7}
+        EndGlobalSection
         GlobalSection(ExtensibilityGlobals) = postSolution
                 SolutionGuid = {74046961-48BF-467A-A6C2-F886C75CE0BE}
         EndGlobalSection
diff --git a/src/Custom.Build.props b/src/Custom.Build.props
new file mode 100644
index 00000000..f4352014
--- /dev/null
+++ b/src/Custom.Build.props
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <OutputPath Condition="$(ProjectName.StartsWith('Example.')) And '$(MSBuildProjectExtension)'=='.csproj' ">$(OutputPath)examples\$(ProjectName)\</OutputPath>
+    <OutDir Condition="$(ProjectName.StartsWith('Example.')) And '$(MSBuildProjectExtension)'=='.vcxproj' ">$(OutDir)examples\$(ProjectName)\</OutDir>
+  </PropertyGroup>
+</Project>
diff --git a/src/test/WixToolsetTest.ManagedHost/MbaHostFixture.cs b/src/test/WixToolsetTest.ManagedHost/MbaHostFixture.cs
new file mode 100644
index 00000000..8da42e77
--- /dev/null
+++ b/src/test/WixToolsetTest.ManagedHost/MbaHostFixture.cs
@@ -0,0 +1,40 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolsetTest.ManagedHost
+{
+    using WixBuildTools.TestSupport;
+    using Xunit;
+
+    public class MbaHostFixture
+    {
+        [Fact]
+        public void CanLoadFullFramework2MBA()
+        {
+            var testEngine = new TestEngine();
+            var baFile = TestData.Get(@"..\examples\Example.FullFramework2MBA\mbahost.dll");
+
+            var result = testEngine.RunShutdownEngine(baFile);
+            Assert.Equal(0, result.ExitCode);
+
+            var logMessages = result.Output;
+            Assert.Equal(2, logMessages.Count);
+            Assert.Equal("Loading managed bootstrapper application.", logMessages[0]);
+            Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[1]);
+        }
+
+        [Fact]
+        public void CanLoadFullFramework4MBA()
+        {
+            var testEngine = new TestEngine();
+            var baFile = TestData.Get(@"..\examples\Example.FullFramework4MBA\net48\mbahost.dll");
+
+            var result = testEngine.RunShutdownEngine(baFile);
+            Assert.Equal(0, result.ExitCode);
+
+            var logMessages = result.Output;
+            Assert.Equal(2, logMessages.Count);
+            Assert.Equal("Loading managed bootstrapper application.", logMessages[0]);
+            Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[1]);
+        }
+    }
+}
diff --git a/src/test/WixToolsetTest.ManagedHost/TestEngine.cs b/src/test/WixToolsetTest.ManagedHost/TestEngine.cs
new file mode 100644
index 00000000..4dd531ad
--- /dev/null
+++ b/src/test/WixToolsetTest.ManagedHost/TestEngine.cs
@@ -0,0 +1,53 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolsetTest.ManagedHost
+{
+    using System.Collections.Generic;
+    using System.Diagnostics;
+    using WixBuildTools.TestSupport;
+
+    public class TestEngine
+    {
+        private static readonly string TestEngineFile = TestData.Get(@"..\Win32\examples\Example.TestEngine\Example.TestEngine.exe");
+
+        public TestEngineResult RunShutdownEngine(string baFile)
+        {
+            var args = new string[] { '"' + baFile + '"' };
+            return RunProcessCaptureOutput(TestEngineFile, args);
+        }
+
+        private static TestEngineResult RunProcessCaptureOutput(string executablePath, string[] arguments = null, string workingFolder = null)
+        {
+            var startInfo = new ProcessStartInfo(executablePath)
+            {
+                Arguments = string.Join(' ', arguments),
+                CreateNoWindow = true,
+                RedirectStandardError = true,
+                RedirectStandardOutput = true,
+                UseShellExecute = false,
+                WorkingDirectory = workingFolder,
+            };
+
+            var exitCode = 0;
+            var output = new List<string>();
+
+            using (var process = Process.Start(startInfo))
+            {
+                process.OutputDataReceived += (s, e) => { if (e.Data != null) { output.Add(e.Data); } };
+                process.ErrorDataReceived += (s, e) => { if (e.Data != null) { output.Add(e.Data); } };
+
+                process.BeginErrorReadLine();
+                process.BeginOutputReadLine();
+
+                process.WaitForExit();
+                exitCode = process.ExitCode;
+            }
+
+            return new TestEngineResult
+            {
+                ExitCode = exitCode,
+                Output = output,
+            };
+        }
+    }
+}
diff --git a/src/test/WixToolsetTest.ManagedHost/TestEngineResult.cs b/src/test/WixToolsetTest.ManagedHost/TestEngineResult.cs
new file mode 100644
index 00000000..63f6f7f5
--- /dev/null
+++ b/src/test/WixToolsetTest.ManagedHost/TestEngineResult.cs
@@ -0,0 +1,12 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolsetTest.ManagedHost
+{
+    using System.Collections.Generic;
+
+    public class TestEngineResult
+    {
+        public int ExitCode { get; set; }
+        public List<string> Output { get; set; }
+    }
+}
diff --git a/src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj b/src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj
new file mode 100644
index 00000000..cb1d1c78
--- /dev/null
+++ b/src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <NoWarn>NU1701</NoWarn>
+  </PropertyGroup>
+
+  <ItemGroup>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\examples\FullFramework2MBA\Example.FullFramework2MBA.csproj" />
+    <ProjectReference Include="..\examples\TestEngine\Example.TestEngine.vcxproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="WixBuildTools.TestSupport" Version="4.0.*" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" />
+  </ItemGroup>
+</Project>
diff --git a/src/test/WixToolsetTest.MbaHost/EngineForTest.cpp b/src/test/WixToolsetTest.MbaHost/EngineForTest.cpp
deleted file mode 100644
index b2567a7b..00000000
--- a/src/test/WixToolsetTest.MbaHost/EngineForTest.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-#include "precomp.h"
-
-static HRESULT BAEngineLog(
-    __in BOOTSTRAPPER_ENGINE_CONTEXT* pContext,
-    __in BAENGINE_LOG_ARGS* pArgs,
-    __in BAENGINE_LOG_RESULTS* /*pResults*/
-)
-{
-    HRESULT hr = S_OK;
-
-    pContext->pfnLog(pArgs->wzMessage);
-
-    return hr;
-}
-
-HRESULT WINAPI EngineForTestProc(
-    __in BOOTSTRAPPER_ENGINE_MESSAGE message,
-    __in const LPVOID pvArgs,
-    __inout LPVOID pvResults,
-    __in_opt LPVOID pvContext
-)
-{
-    HRESULT hr = S_OK;
-    BOOTSTRAPPER_ENGINE_CONTEXT* pContext = reinterpret_cast<BOOTSTRAPPER_ENGINE_CONTEXT*>(pvContext);
-
-    if (!pContext || !pvArgs || !pvResults)
-    {
-        ExitFunction1(hr = E_INVALIDARG);
-    }
-
-    switch (message)
-    {
-    case BOOTSTRAPPER_ENGINE_MESSAGE_LOG:
-        hr = BAEngineLog(pContext, reinterpret_cast<BAENGINE_LOG_ARGS*>(pvArgs), reinterpret_cast<BAENGINE_LOG_RESULTS*>(pvResults));
-        break;
-    default:
-        hr = E_NOTIMPL;
-        break;
-    }
-
-LExit:
-    return hr;
-}
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.MbaHost/EngineForTest.h b/src/test/WixToolsetTest.MbaHost/EngineForTest.h
deleted file mode 100644
index 6058e67c..00000000
--- a/src/test/WixToolsetTest.MbaHost/EngineForTest.h
+++ /dev/null
@@ -1,63 +0,0 @@
-#pragma once
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-HRESULT WINAPI EngineForTestProc(
-    __in BOOTSTRAPPER_ENGINE_MESSAGE message,
-    __in const LPVOID pvArgs,
-    __inout LPVOID pvResults,
-    __in_opt LPVOID pvContext
-);
-
-typedef void(WINAPI *PFN_TEST_LOG_PROC)(
-    __in LPCWSTR sczMessage
-    );
-
-struct BOOTSTRAPPER_ENGINE_CONTEXT
-{
-    PFN_TEST_LOG_PROC pfnLog;
-};
-
-namespace WixToolsetTest
-{
-namespace MbaHost
-{
-namespace Native
-{
-    using namespace System;
-    using namespace System::Collections::Generic;
-    using namespace System::Runtime::InteropServices;
-
-    public ref class EngineForTest
-    {
-    private:
-        delegate void LogDelegate(LPCWSTR);
-        LogDelegate^ _logDelegate;
-        List<String^>^ _messages;
-
-        void Log(LPCWSTR sczMessage)
-        {
-            String^ message = gcnew String(sczMessage);
-            System::Diagnostics::Debug::WriteLine(message);
-            _messages->Add(message);
-        }
-    public:
-        EngineForTest()
-        {
-            _logDelegate = gcnew LogDelegate(this, &EngineForTest::Log);
-            _messages = gcnew List<String^>();
-        }
-
-        List<String^>^ GetLogMessages()
-        {
-            return _messages;
-        }
-
-        PFN_TEST_LOG_PROC GetTestLogProc()
-        {
-            IntPtr functionPointer = Marshal::GetFunctionPointerForDelegate(_logDelegate);
-            return static_cast<PFN_TEST_LOG_PROC>(functionPointer.ToPointer());
-        }
-    };
-}
-}
-}
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.MbaHost/MbaHostFixture.cpp b/src/test/WixToolsetTest.MbaHost/MbaHostFixture.cpp
deleted file mode 100644
index 9328aacf..00000000
--- a/src/test/WixToolsetTest.MbaHost/MbaHostFixture.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-#include "precomp.h"
-
-namespace WixToolsetTest
-{
-namespace MbaHost
-{
-namespace Native
-{
-    using namespace System;
-    using namespace Xunit;
-
-    public ref class MbaHostFixture
-    {
-    public:
-        [Fact]
-        void CanLoadManagedBootstrapperApplication()
-        {
-            HMODULE hBAModule = NULL;
-            PFN_BOOTSTRAPPER_APPLICATION_CREATE pfnCreate = NULL;
-            HRESULT hr = S_OK;
-
-            EngineForTest^ engine = gcnew EngineForTest();
-            BOOTSTRAPPER_ENGINE_CONTEXT engineContext = { };
-            engineContext.pfnLog = engine->GetTestLogProc();
-
-            LogInitialize(::GetModuleHandleW(NULL));
-
-            hr = LogOpen(NULL, L"MbaHostUnitTest", NULL, L"txt", FALSE, FALSE, NULL);
-            Assert::Equal(S_OK, hr);
-
-            BOOTSTRAPPER_COMMAND command = { };
-            BOOTSTRAPPER_CREATE_ARGS args = { };
-            BOOTSTRAPPER_CREATE_RESULTS results = { };
-
-            args.cbSize = sizeof(BOOTSTRAPPER_CREATE_ARGS);
-            args.pCommand = &command;
-            args.pfnBootstrapperEngineProc = EngineForTestProc;
-            args.pvBootstrapperEngineProcContext = &engineContext;
-            args.qwEngineAPIVersion = MAKEQWORDVERSION(0, 0, 0, 1);
-
-            results.cbSize = sizeof(BOOTSTRAPPER_CREATE_RESULTS);
-
-            hBAModule = ::LoadLibraryExW(L"mbahost.dll", NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
-            Assert::NotEqual(NULL, (int)hBAModule);
-
-            pfnCreate = (PFN_BOOTSTRAPPER_APPLICATION_CREATE)::GetProcAddress(hBAModule, "BootstrapperApplicationCreate");
-            Assert::NotEqual(NULL, (int)pfnCreate);
-
-            hr = pfnCreate(&args, &results);
-            Assert::Equal(S_OK, hr);
-
-            BA_ONSHUTDOWN_ARGS shutdownArgs = { };
-            BA_ONSHUTDOWN_RESULTS shutdownResults = { };
-            shutdownArgs.cbSize = sizeof(BA_ONSHUTDOWN_ARGS);
-            shutdownResults.action = BOOTSTRAPPER_SHUTDOWN_ACTION_RELOAD_BOOTSTRAPPER;
-            shutdownResults.cbSize = sizeof(BA_ONSHUTDOWN_RESULTS);
-            hr = results.pfnBootstrapperApplicationProc(BOOTSTRAPPER_APPLICATION_MESSAGE_ONSHUTDOWN, &shutdownArgs, &shutdownResults, results.pvBootstrapperApplicationProcContext);
-            Assert::Equal(S_OK, hr);
-
-            List<String^>^ logMessages = engine->GetLogMessages();
-            Assert::Equal(2, logMessages->Count);
-            Assert::Equal("Loading managed bootstrapper application.", logMessages[0]);
-            Assert::Equal("Shutdown,ReloadBootstrapper,0", logMessages[1]);
-        }
-    };
-}
-}
-}
diff --git a/src/test/WixToolsetTest.MbaHost/TestManagedBootstrapperApplication.h b/src/test/WixToolsetTest.MbaHost/TestManagedBootstrapperApplication.h
deleted file mode 100644
index d2b53718..00000000
--- a/src/test/WixToolsetTest.MbaHost/TestManagedBootstrapperApplication.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#pragma once
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-namespace WixToolsetTest
-{
-namespace MbaHost
-{
-namespace Native
-{
-    using namespace System;
-    using namespace WixToolset::Mba::Core;
-
-    public ref class TestManagedBootstrapperApplication : BootstrapperApplication
-    {
-    public:
-        TestManagedBootstrapperApplication(WixToolset::Mba::Core::IEngine^ engine)
-            : BootstrapperApplication(engine)
-        {
-
-        }
-
-        virtual void Run() override
-        {
-        }
-
-        virtual void OnShutdown(ShutdownEventArgs^ e) override
-        {
-            String^ message = "Shutdown," + e->Action.ToString() + "," + e->HResult.ToString();
-            this->engine->Log(LogLevel::Standard, message);
-        }
-    };
-}
-}
-}
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.MbaHost/TestManagedBootstrapperApplicationFactory.h b/src/test/WixToolsetTest.MbaHost/TestManagedBootstrapperApplicationFactory.h
deleted file mode 100644
index 86f6e3cb..00000000
--- a/src/test/WixToolsetTest.MbaHost/TestManagedBootstrapperApplicationFactory.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#pragma once
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-namespace WixToolsetTest
-{
-namespace MbaHost
-{
-namespace Native
-{
-    using namespace System;
-    using namespace WixToolset::Mba::Core;
-
-    public ref class TestManagedBootstrapperApplicationFactory : public BaseBootstrapperApplicationFactory
-    {
-    protected:
-        virtual IBootstrapperApplication^ Create(IEngine^ engine, IBootstrapperCommand^ /*command*/) override
-        {
-            return gcnew TestManagedBootstrapperApplication(engine);
-        }
-    };
-
-    [assembly:BootstrapperApplicationFactory(TestManagedBootstrapperApplicationFactory::typeid)];
-}
-}
-}
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.MbaHost/WixToolsetTest.MbaHost.vcxproj b/src/test/WixToolsetTest.MbaHost/WixToolsetTest.MbaHost.vcxproj
deleted file mode 100644
index d8143880..00000000
--- a/src/test/WixToolsetTest.MbaHost/WixToolsetTest.MbaHost.vcxproj
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\packages\WixToolset.BalUtil.4.0.12\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\packages\WixToolset.BalUtil.4.0.12\build\WixToolset.BalUtil.props')" />
-  <Import Project="..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.10\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.10\build\WixToolset.BootstrapperCore.Native.props')" />
-  <Import Project="..\..\..\packages\xunit.core.2.4.0\build\xunit.core.props" Condition="Exists('..\..\..\packages\xunit.core.2.4.0\build\xunit.core.props')" />
-  <Import Project="..\..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props')" />
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectTypes>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}</ProjectTypes>
-    <ProjectGuid>{8C131CB9-7B1C-4B06-A328-E69CE9EDC763}</ProjectGuid>
-    <RootNamespace>WixToolsetTest.MbaHost</RootNamespace>
-    <Keyword>ManagedCProj</Keyword>
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-    <CLRSupport>true</CLRSupport>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <PropertyGroup>
-    <ProjectAdditionalLinkLibraries></ProjectAdditionalLinkLibraries>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClCompile Include="EngineForTest.cpp" />
-    <ClCompile Include="MbaHostFixture.cpp" />
-    <ClCompile Include="precomp.cpp">
-      <PrecompiledHeader>Create</PrecompiledHeader>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="EngineForTest.h" />
-    <ClInclude Include="precomp.h" />
-    <ClInclude Include="TestManagedBootstrapperApplication.h" />
-    <ClInclude Include="TestManagedBootstrapperApplicationFactory.h" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Include="packages.config" />
-    <Content Include="BootstrapperApplicationData.xml" CopyToOutputDirectory="PreserveNewest" />
-    <Content Include="WixToolset.Mba.Host.config" CopyToOutputDirectory="PreserveNewest" />
-    <Content Include="..\..\..\packages\WixToolset.Mba.Core.4.0.12\build\native\x86\mbanative.dll" Condition="Exists('..\..\..\packages\WixToolset.Mba.Core.4.0.12\build\native\x86\mbanative.dll')" CopyToOutputDirectory="PreserveNewest">
-      <Visible>False</Visible>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="xunit.abstractions">
-      <HintPath>..\..\..\packages\xunit.abstractions.2.0.2\lib\net35\xunit.abstractions.dll</HintPath>
-    </Reference>
-    <Reference Include="xunit.assert">
-      <HintPath>..\..\..\packages\xunit.assert.2.4.0\lib\netstandard2.0\xunit.assert.dll</HintPath>
-    </Reference>
-    <Reference Include="xunit.core">
-      <HintPath>..\..\..\packages\xunit.extensibility.core.2.4.0\lib\net452\xunit.core.dll</HintPath>
-    </Reference>
-    <Reference Include="xunit.execution.desktop">
-      <HintPath>..\..\..\packages\xunit.extensibility.execution.2.4.0\lib\net452\xunit.execution.desktop.dll</HintPath>
-    </Reference>
-    <Reference Include="WixToolset.Mba.Core">
-      <HintPath>..\..\..\packages\WixToolset.Mba.Core.4.0.12\lib\net20\WixToolset.Mba.Core.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\mbahost\mbahost.vcxproj">
-      <Project>{12c87c77-3547-44f8-8134-29bc915cb19d}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Analyzer Include="..\packages\xunit.analyzers.0.10.0\analyzers\dotnet\cs\xunit.analyzers.dll" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\packages\WixToolset.BalUtil.4.0.12\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BalUtil.4.0.12\build\WixToolset.BalUtil.props'))" />
-    <Error Condition="!Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.10\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.10\build\WixToolset.BootstrapperCore.Native.props'))" />
-    <Error Condition="!Exists('..\..\..\packages\xunit.core.2.4.0\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\xunit.core.2.4.0\build\xunit.core.props'))" />
-    <Error Condition="!Exists('..\..\..\packages\xunit.core.2.4.0\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\xunit.core.2.4.0\build\xunit.core.targets'))" />
-    <Error Condition="!Exists('..\..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props'))" />
-  </Target>
-  <Import Project="..\..\..\packages\xunit.core.2.4.0\build\xunit.core.targets" Condition="Exists('..\..\..\packages\xunit.core.2.4.0\build\xunit.core.targets')" />
-</Project>
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.MbaHost/packages.config b/src/test/WixToolsetTest.MbaHost/packages.config
deleted file mode 100644
index 4e9838f6..00000000
--- a/src/test/WixToolsetTest.MbaHost/packages.config
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="xunit" version="2.4.0" targetFramework="net461" />
-  <package id="xunit.abstractions" version="2.0.2" targetFramework="net461" />
-  <package id="xunit.analyzers" version="0.10.0" targetFramework="net461" />
-  <package id="xunit.assert" version="2.4.0" targetFramework="net461" />
-  <package id="xunit.core" version="2.4.0" targetFramework="net461" />
-  <package id="xunit.extensibility.core" version="2.4.0" targetFramework="net461" />
-  <package id="xunit.extensibility.execution" version="2.4.0" targetFramework="net461" />
-  <package id="xunit.runner.visualstudio" version="2.4.0" targetFramework="net461" />
-  <package id="WixToolset.BalUtil" version="4.0.12" targetFramework="native" />
-  <package id="WixToolset.BootstrapperCore.Native" version="4.0.10" targetFramework="native" />
-  <package id="WixToolset.DUtil" version="4.0.18" targetFramework="native" />
-  <package id="WixToolset.Mba.Core" version="4.0.12" targetFramework="net461" />
-</packages>
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.MbaHost/BootstrapperApplicationData.xml b/src/test/examples/FullFramework2MBA/BootstrapperApplicationData.xml
index 7c4169b1..7c4169b1 100644
--- a/src/test/WixToolsetTest.MbaHost/BootstrapperApplicationData.xml
+++ b/src/test/examples/FullFramework2MBA/BootstrapperApplicationData.xml
diff --git a/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj b/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj
new file mode 100644
index 00000000..dec1ff1e
--- /dev/null
+++ b/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\..\packages\WixToolset.Mba.Core.4.0.12\build\net20\WixToolset.Mba.Core.props" Condition="Exists('..\..\..\..\packages\WixToolset.Mba.Core.4.0.12\build\net20\WixToolset.Mba.Core.props')" />
+  <PropertyGroup>
+    <ProjectGuid>{CC4236FC-226E-4232-AB50-24CBEC4D314D}</ProjectGuid>
+    <AssemblyName>Example.FullFramework2MBA</AssemblyName>
+    <OutputType>Library</OutputType>
+    <RootNamespace>Example.FullFramework2MBA</RootNamespace>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <CreateDocumentation>false</CreateDocumentation>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <DebugSymbols>true</DebugSymbols>
+    <Optimize>false</Optimize>
+    <DefineConstants>$(DefineConstants);DEBUG;TRACE</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <DebugSymbols>true</DebugSymbols>
+    <Optimize>true</Optimize>
+    <DefineConstants>$(DefineConstants);TRACE</DefineConstants>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="FullFramework2BA.cs" />
+    <Compile Include="FullFramework2BAFactory.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="BootstrapperApplicationData.xml" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="WixToolset.Mba.Host.config" CopyToOutputDirectory="PreserveNewest" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+    <Reference Include="WixToolset.Mba.Core">
+      <HintPath>..\..\..\..\packages\WixToolset.Mba.Core.4.0.12\lib\net20\WixToolset.Mba.Core.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\mbahost\mbahost.vcxproj">
+      <Project>{12c87c77-3547-44f8-8134-29bc915cb19d}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\WixToolset.Mba.Host\WixToolset.Mba.Host.csproj">
+      <Project>{F2BA1935-70FA-4156-B161-FD03850B4FAA}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+      <OutputItemType>Content</OutputItemType>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </ProjectReference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <MbaHostDependency Include="$(BaseOutputPath)$(Configuration)\Win32\mbahost.dll" />
+  </ItemGroup>
+
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+
+  <Import Project="..\..\..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\..\..\packages\WixToolset.Mba.Core.4.0.12\build\net20\WixToolset.Mba.Core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.Mba.Core.4.0.12\build\net20\WixToolset.Mba.Core.props'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" />
+  </Target>
+
+  <Target Name="CopyMbaHostDependencies" AfterTargets="Build">
+    <Copy DestinationFolder="$(OutputPath)" SourceFiles="@(MbaHostDependency)" SkipUnchangedFiles="true" />
+  </Target>
+</Project>
\ No newline at end of file
diff --git a/src/test/examples/FullFramework2MBA/FullFramework2BA.cs b/src/test/examples/FullFramework2MBA/FullFramework2BA.cs
new file mode 100644
index 00000000..13d4673a
--- /dev/null
+++ b/src/test/examples/FullFramework2MBA/FullFramework2BA.cs
@@ -0,0 +1,27 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace Example.FullFramework2MBA
+{
+    using WixToolset.Mba.Core;
+
+    public class FullFramework2BA : BootstrapperApplication
+    {
+        public FullFramework2BA(IEngine engine)
+            : base(engine)
+        {
+
+        }
+
+        protected override void Run()
+        {
+        }
+
+        protected override void OnShutdown(ShutdownEventArgs args)
+        {
+            base.OnShutdown(args);
+
+            var message = "Shutdown," + args.Action.ToString() + "," + args.HResult.ToString();
+            this.engine.Log(LogLevel.Standard, message);
+        }
+    }
+}
diff --git a/src/test/examples/FullFramework2MBA/FullFramework2BAFactory.cs b/src/test/examples/FullFramework2MBA/FullFramework2BAFactory.cs
new file mode 100644
index 00000000..d3cafc70
--- /dev/null
+++ b/src/test/examples/FullFramework2MBA/FullFramework2BAFactory.cs
@@ -0,0 +1,14 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace Example.FullFramework2MBA
+{
+    using WixToolset.Mba.Core;
+
+    public class FullFramework2BAFactory : BaseBootstrapperApplicationFactory
+    {
+        protected override IBootstrapperApplication Create(IEngine engine, IBootstrapperCommand bootstrapperCommand)
+        {
+            return new FullFramework2BA(engine);
+        }
+    }
+}
diff --git a/src/test/examples/FullFramework2MBA/Properties/AssemblyInfo.cs b/src/test/examples/FullFramework2MBA/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000..640c17ad
--- /dev/null
+++ b/src/test/examples/FullFramework2MBA/Properties/AssemblyInfo.cs
@@ -0,0 +1,18 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+using System;
+using System.Reflection;
+using System.Runtime.InteropServices;
+using WixToolset.Mba.Core;
+
+[assembly: AssemblyTitle("Example.FullFramework2MBA")]
+[assembly: AssemblyDescription("Example.FullFramework2MBA")]
+[assembly: AssemblyProduct("WiX Toolset")]
+[assembly: AssemblyCompany("WiX Toolset Team")]
+[assembly: AssemblyCopyright("Copyright (c) .NET Foundation and contributors. All rights reserved.")]
+
+// Types should not be visible to COM by default.
+[assembly: ComVisible(false)]
+[assembly: Guid("7A671EAF-FAE5-41A2-83DD-C35AB3779651")]
+
+[assembly: BootstrapperApplicationFactory(typeof(Example.FullFramework2MBA.FullFramework2BAFactory))]
diff --git a/src/test/WixToolsetTest.MbaHost/WixToolset.Mba.Host.config b/src/test/examples/FullFramework2MBA/WixToolset.Mba.Host.config
index 53a3d29e..be450a4f 100644
--- a/src/test/WixToolsetTest.MbaHost/WixToolset.Mba.Host.config
+++ b/src/test/examples/FullFramework2MBA/WixToolset.Mba.Host.config
@@ -8,19 +8,13 @@
             <section name="host" type="WixToolset.Mba.Host.HostSection, WixToolset.Mba.Host" />
         </sectionGroup>
     </configSections>
-    <startup useLegacyV2RuntimeActivationPolicy="true">
-        <supportedRuntime version="v4.0" />
+    <startup>
         <supportedRuntime version="v2.0.50727" />
     </startup>
     <wix.bootstrapper>
-        <!-- Example only. Use only if the startup/supportedRuntime above cannot discern supported frameworks. -->
-        <!--
-        <supportedFramework version="v4\Client" />
-        <supportedFramework version="v3.5" />
-        <supportedFramework version="v3.0" />
-        -->
 
-        <!-- Example only. Replace the host/@assemblyName attribute with assembly that implements IBootstrapperApplicationFactory. -->
-        <host assemblyName="WixToolsetTest.MbaHost" />
+        <host assemblyName="Example.FullFramework2MBA">
+            <supportedFramework version="v3.5" />
+        </host>
     </wix.bootstrapper>
 </configuration>
diff --git a/src/test/examples/FullFramework2MBA/packages.config b/src/test/examples/FullFramework2MBA/packages.config
new file mode 100644
index 00000000..77b7e398
--- /dev/null
+++ b/src/test/examples/FullFramework2MBA/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="WixToolset.Mba.Core" version="4.0.12" targetFramework="net461" />
+</packages>
\ No newline at end of file
diff --git a/src/test/examples/FullFramework4MBA/BootstrapperApplicationData.xml b/src/test/examples/FullFramework4MBA/BootstrapperApplicationData.xml
new file mode 100644
index 00000000..7c4169b1
--- /dev/null
+++ b/src/test/examples/FullFramework4MBA/BootstrapperApplicationData.xml
diff --git a/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj b/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj
new file mode 100644
index 00000000..e044c6b1
--- /dev/null
+++ b/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj
@@ -0,0 +1,38 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net48</TargetFramework>
+    <Description>Full Framework v4 MBA</Description>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="all" />
+    <PackageReference Include="WixToolset.Mba.Core" Version="4.0.*" PrivateAssets="All" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Include="BootstrapperApplicationData.xml" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="WixToolset.Mba.Host.config" CopyToOutputDirectory="PreserveNewest" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\mbahost\mbahost.vcxproj">
+      <Project>{12c87c77-3547-44f8-8134-29bc915cb19d}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\WixToolset.Mba.Host\WixToolset.Mba.Host.csproj">
+      <Project>{F2BA1935-70FA-4156-B161-FD03850B4FAA}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+      <OutputItemType>Content</OutputItemType>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </ProjectReference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <MbaHostDependency Include="$(BaseOutputPath)$(Configuration)\Win32\mbahost.dll" />
+  </ItemGroup>
+
+  <Target Name="CopyMbaHostDependencies" AfterTargets="Build">
+    <Copy DestinationFolder="$(OutputPath)" SourceFiles="@(MbaHostDependency)" SkipUnchangedFiles="true" />
+  </Target>
+</Project>
\ No newline at end of file
diff --git a/src/test/examples/FullFramework4MBA/FullFramework4BA.cs b/src/test/examples/FullFramework4MBA/FullFramework4BA.cs
new file mode 100644
index 00000000..556a61a7
--- /dev/null
+++ b/src/test/examples/FullFramework4MBA/FullFramework4BA.cs
@@ -0,0 +1,27 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace Example.FullFramework4MBA
+{
+    using WixToolset.Mba.Core;
+
+    public class FullFramework4BA : BootstrapperApplication
+    {
+        public FullFramework4BA(IEngine engine)
+            : base(engine)
+        {
+
+        }
+
+        protected override void Run()
+        {
+        }
+
+        protected override void OnShutdown(ShutdownEventArgs args)
+        {
+            base.OnShutdown(args);
+
+            var message = "Shutdown," + args.Action.ToString() + "," + args.HResult.ToString();
+            this.engine.Log(LogLevel.Standard, message);
+        }
+    }
+}
diff --git a/src/test/examples/FullFramework4MBA/FullFramework4BAFactory.cs b/src/test/examples/FullFramework4MBA/FullFramework4BAFactory.cs
new file mode 100644
index 00000000..b7c8750d
--- /dev/null
+++ b/src/test/examples/FullFramework4MBA/FullFramework4BAFactory.cs
@@ -0,0 +1,15 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+[assembly: WixToolset.Mba.Core.BootstrapperApplicationFactory(typeof(Example.FullFramework4MBA.FullFramework4BAFactory))]
+namespace Example.FullFramework4MBA
+{
+    using WixToolset.Mba.Core;
+
+    public class FullFramework4BAFactory : BaseBootstrapperApplicationFactory
+    {
+        protected override IBootstrapperApplication Create(IEngine engine, IBootstrapperCommand bootstrapperCommand)
+        {
+            return new FullFramework4BA(engine);
+        }
+    }
+}
diff --git a/src/test/examples/FullFramework4MBA/WixToolset.Mba.Host.config b/src/test/examples/FullFramework4MBA/WixToolset.Mba.Host.config
new file mode 100644
index 00000000..96678cda
--- /dev/null
+++ b/src/test/examples/FullFramework4MBA/WixToolset.Mba.Host.config
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+
+<configuration>
+    <configSections>
+        <sectionGroup name="wix.bootstrapper" type="WixToolset.Mba.Host.BootstrapperSectionGroup, WixToolset.Mba.Host">
+            <section name="host" type="WixToolset.Mba.Host.HostSection, WixToolset.Mba.Host" />
+        </sectionGroup>
+    </configSections>
+    <startup>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
+    </startup>
+    <wix.bootstrapper>
+        <host assemblyName="Example.FullFramework4MBA" />
+    </wix.bootstrapper>
+</configuration>
diff --git a/src/test/examples/TestEngine/Example.TestEngine.vcxproj b/src/test/examples/TestEngine/Example.TestEngine.vcxproj
new file mode 100644
index 00000000..ab79dacc
--- /dev/null
+++ b/src/test/examples/TestEngine/Example.TestEngine.vcxproj
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\..\packages\WixToolset.BalUtil.4.0.12\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\..\packages\WixToolset.BalUtil.4.0.12\build\WixToolset.BalUtil.props')" />
+  <Import Project="..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.10\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.10\build\WixToolset.BootstrapperCore.Native.props')" />
+  <Import Project="..\..\..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props')" />
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{3D44B67D-A475-49BA-8310-E39F6C117CC9}</ProjectGuid>
+    <ConfigurationType>Application</ConfigurationType>
+    <ProjectSubSystem>Console</ProjectSubSystem>
+    <TargetName>Example.TestEngine</TargetName>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+    <WindowsTargetPlatformVersion>$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+    <Import Project="..\..\..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" />
+  </ImportGroup>
+  <PropertyGroup>
+    <ProjectAdditionalLinkLibraries>
+    </ProjectAdditionalLinkLibraries>
+  </PropertyGroup>
+  <ItemGroup>
+    <ClCompile Include="precomp.cpp">
+      <PrecompiledHeader>Create</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="ShutdownEngine.cpp" />
+    <ClCompile Include="ExampleTestEngine.cpp" />
+    <ClCompile Include="TestEngine.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="precomp.h" />
+    <ClInclude Include="TestEngine.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\WixToolset.BalUtil.4.0.12\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.BalUtil.4.0.12\build\WixToolset.BalUtil.props'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.10\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.10\build\WixToolset.BootstrapperCore.Native.props'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props'))" />
+  </Target>
+</Project>
\ No newline at end of file
diff --git a/src/test/examples/TestEngine/ExampleTestEngine.cpp b/src/test/examples/TestEngine/ExampleTestEngine.cpp
new file mode 100644
index 00000000..9f051875
--- /dev/null
+++ b/src/test/examples/TestEngine/ExampleTestEngine.cpp
@@ -0,0 +1,22 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+#include "precomp.h"
+
+int __cdecl wmain(int argc, LPWSTR argv[])
+{
+    HRESULT hr = E_INVALIDARG;
+
+    ConsoleInitialize();
+
+    if (argc != 2)
+    {
+        ConsoleWriteError(hr, CONSOLE_COLOR_RED, "Usage: Example.TestEngine.exe BA.dll");
+    }
+    else
+    {
+        hr = RunShutdownEngine(argv[1]);
+    }
+
+    ConsoleUninitialize();
+    return HRESULT_CODE(hr);
+}
diff --git a/src/test/examples/TestEngine/ShutdownEngine.cpp b/src/test/examples/TestEngine/ShutdownEngine.cpp
new file mode 100644
index 00000000..69321d91
--- /dev/null
+++ b/src/test/examples/TestEngine/ShutdownEngine.cpp
@@ -0,0 +1,23 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+#include "precomp.h"
+
+HRESULT RunShutdownEngine(
+    __in LPCWSTR wzBAFilePath
+    )
+{
+    HRESULT hr = S_OK;
+    TestEngine* pTestEngine = NULL;
+
+    pTestEngine = new TestEngine();
+    ConsoleExitOnNull(pTestEngine, hr, E_OUTOFMEMORY, CONSOLE_COLOR_RED, "Failed to create new test engine.");
+
+    hr = pTestEngine->LoadBA(wzBAFilePath);
+    ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to load BA.");
+
+    hr = pTestEngine->SendShutdownEvent(BOOTSTRAPPER_SHUTDOWN_ACTION_RELOAD_BOOTSTRAPPER);
+    ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "BA returned failure for OnShutdown.");
+
+LExit:
+    return hr;
+}
diff --git a/src/test/examples/TestEngine/TestEngine.cpp b/src/test/examples/TestEngine/TestEngine.cpp
new file mode 100644
index 00000000..c0a62eda
--- /dev/null
+++ b/src/test/examples/TestEngine/TestEngine.cpp
@@ -0,0 +1,117 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+#include "precomp.h"
+
+HRESULT TestEngine::LoadBA(
+    __in LPCWSTR wzBAFilePath
+    )
+{
+    HRESULT hr = S_OK;
+    BOOTSTRAPPER_COMMAND command = { };
+    BOOTSTRAPPER_CREATE_ARGS args = { };
+    HMODULE hBAModule = NULL;
+    PFN_BOOTSTRAPPER_APPLICATION_CREATE pfnCreate = NULL;
+
+    if (m_pCreateResults)
+    {
+        ExitFunction1(hr = E_INVALIDSTATE);
+    }
+
+    LogInitialize(::GetModuleHandleW(NULL));
+
+    hr = LogOpen(NULL, L"ExampleTestEngine", NULL, L"txt", FALSE, FALSE, NULL);
+    ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to open log.");
+
+    m_pCreateResults = static_cast<BOOTSTRAPPER_CREATE_RESULTS*>(MemAlloc(sizeof(BOOTSTRAPPER_CREATE_RESULTS), TRUE));
+
+    command.cbSize = sizeof(BOOTSTRAPPER_COMMAND);
+
+    args.cbSize = sizeof(BOOTSTRAPPER_CREATE_ARGS);
+    args.pCommand = &command;
+    args.pfnBootstrapperEngineProc = TestEngine::EngineProc;
+    args.pvBootstrapperEngineProcContext = this;
+    args.qwEngineAPIVersion = MAKEQWORDVERSION(0, 0, 0, 1);
+
+    m_pCreateResults->cbSize = sizeof(BOOTSTRAPPER_CREATE_RESULTS);
+
+    hBAModule = ::LoadLibraryExW(wzBAFilePath, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);    
+    ExitOnNullWithLastError(hBAModule, hr, "Failed to load BA dll.");
+
+    pfnCreate = (PFN_BOOTSTRAPPER_APPLICATION_CREATE)::GetProcAddress(hBAModule, "BootstrapperApplicationCreate");
+    ConsoleExitOnNull(pfnCreate, hr, E_OUTOFMEMORY, CONSOLE_COLOR_RED, "Failed to get address for BootstrapperApplicationCreate.");
+
+    hr = pfnCreate(&args, m_pCreateResults);
+    ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "BA returned failure on BootstrapperApplicationCreate.");
+
+LExit:
+    return hr;
+}
+
+HRESULT TestEngine::Log(
+    __in LPCWSTR wzMessage
+    )
+{
+    return ConsoleWriteLine(CONSOLE_COLOR_NORMAL, "%ls", wzMessage);
+}
+
+HRESULT TestEngine::SendShutdownEvent(
+    __in BOOTSTRAPPER_SHUTDOWN_ACTION defaultAction
+    )
+{
+    HRESULT hr = S_OK;
+    BA_ONSHUTDOWN_ARGS shutdownArgs = { };
+    BA_ONSHUTDOWN_RESULTS shutdownResults = { };
+    shutdownArgs.cbSize = sizeof(BA_ONSHUTDOWN_ARGS);
+    shutdownResults.action = defaultAction;
+    shutdownResults.cbSize = sizeof(BA_ONSHUTDOWN_RESULTS);
+    hr = m_pCreateResults->pfnBootstrapperApplicationProc(BOOTSTRAPPER_APPLICATION_MESSAGE_ONSHUTDOWN, &shutdownArgs, &shutdownResults, m_pCreateResults->pvBootstrapperApplicationProcContext);
+    return hr;
+}
+
+HRESULT TestEngine::BAEngineLog(
+    __in TestEngine* pContext,
+    __in BAENGINE_LOG_ARGS* pArgs,
+    __in BAENGINE_LOG_RESULTS* /*pResults*/
+    )
+{
+    return pContext->Log(pArgs->wzMessage);
+}
+
+HRESULT WINAPI TestEngine::EngineProc(
+    __in BOOTSTRAPPER_ENGINE_MESSAGE message,
+    __in const LPVOID pvArgs,
+    __inout LPVOID pvResults,
+    __in_opt LPVOID pvContext
+    )
+{
+    HRESULT hr = S_OK;
+    TestEngine* pContext = (TestEngine*)pvContext;
+
+    if (!pContext || !pvArgs || !pvResults)
+    {
+        ExitFunction1(hr = E_INVALIDARG);
+    }
+
+    switch (message)
+    {
+    case BOOTSTRAPPER_ENGINE_MESSAGE_LOG:
+        hr = BAEngineLog(pContext, reinterpret_cast<BAENGINE_LOG_ARGS*>(pvArgs), reinterpret_cast<BAENGINE_LOG_RESULTS*>(pvResults));
+        break;
+    default:
+        hr = E_NOTIMPL;
+        break;
+    }
+
+LExit:
+    return hr;
+}
+
+TestEngine::TestEngine()
+{
+    m_pCreateResults = NULL;
+}
+
+TestEngine::~TestEngine()
+{
+    ReleaseMem(m_pCreateResults);
+}
\ No newline at end of file
diff --git a/src/test/examples/TestEngine/TestEngine.h b/src/test/examples/TestEngine/TestEngine.h
new file mode 100644
index 00000000..52872100
--- /dev/null
+++ b/src/test/examples/TestEngine/TestEngine.h
@@ -0,0 +1,42 @@
+#pragma once
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+#include "precomp.h"
+
+class TestEngine
+{
+public:
+    HRESULT LoadBA(
+        __in LPCWSTR wzBAFilePath
+        );
+
+    HRESULT Log(
+        __in LPCWSTR wzMessage
+        );
+
+    HRESULT SendShutdownEvent(
+        __in BOOTSTRAPPER_SHUTDOWN_ACTION defaultAction
+        );
+
+private:
+    static HRESULT BAEngineLog(
+        __in TestEngine* pContext,
+        __in BAENGINE_LOG_ARGS* pArgs,
+        __in BAENGINE_LOG_RESULTS* /*pResults*/
+        );
+
+    static HRESULT WINAPI EngineProc(
+        __in BOOTSTRAPPER_ENGINE_MESSAGE message,
+        __in const LPVOID pvArgs,
+        __inout LPVOID pvResults,
+        __in_opt LPVOID pvContext
+        );
+
+public:
+    TestEngine();
+
+    ~TestEngine();
+
+private:
+    BOOTSTRAPPER_CREATE_RESULTS* m_pCreateResults;
+};
\ No newline at end of file
diff --git a/src/test/examples/TestEngine/packages.config b/src/test/examples/TestEngine/packages.config
new file mode 100644
index 00000000..f209d5fb
--- /dev/null
+++ b/src/test/examples/TestEngine/packages.config
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" />
+  <package id="WixToolset.BootstrapperCore.Native" version="4.0.10" targetFramework="native" />
+  <package id="WixToolset.BalUtil" version="4.0.12" targetFramework="native" />
+  <package id="WixToolset.DUtil" version="4.0.18" targetFramework="native" />
+</packages>
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.MbaHost/precomp.cpp b/src/test/examples/TestEngine/precomp.cpp
index 37664a1c..37664a1c 100644
--- a/src/test/WixToolsetTest.MbaHost/precomp.cpp
+++ b/src/test/examples/TestEngine/precomp.cpp
diff --git a/src/test/WixToolsetTest.MbaHost/precomp.h b/src/test/examples/TestEngine/precomp.h
index 7c451c03..6e867e89 100644
--- a/src/test/WixToolsetTest.MbaHost/precomp.h
+++ b/src/test/examples/TestEngine/precomp.h
@@ -1,16 +1,19 @@
 #pragma once
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-
 #include <windows.h>
-#include <msiquery.h>
+#include <MsiQuery.h>
 
 #include "dutil.h"
+#include "conutil.h"
 #include "logutil.h"
+#include "memutil.h"
 
 #include "BootstrapperEngine.h"
 #include "BootstrapperApplication.h"
 
-#include "EngineForTest.h"
-#include "TestManagedBootstrapperApplication.h"
-#include "TestManagedBootstrapperApplicationFactory.h"
+#include "TestEngine.h"
+
+HRESULT RunShutdownEngine(
+    __in LPCWSTR wzBAFilePath
+    );