18 files changed, 384 insertions, 12 deletions

diff --git a/src/test/WixToolsetTest.ManagedHost/DncHostFixture.cs b/src/test/WixToolsetTest.ManagedHost/DncHostFixture.cs
index 7f40ee26..f33709ab 100644
--- a/src/test/WixToolsetTest.ManagedHost/DncHostFixture.cs
+++ b/src/test/WixToolsetTest.ManagedHost/DncHostFixture.cs
@@ -335,5 +335,39 @@ namespace WixToolsetTest.ManagedHost
                 Assert.Equal("Shutdown,Restart,0", logMessages[8]);
             }
         }
+
+        [Fact]
+        public void CanLoadFDDWPFCoreMBA()
+        {
+            using (var fs = new DisposableFileSystem())
+            {
+                var baseFolder = fs.GetFolder();
+                var binFolder = Path.Combine(baseFolder, "bin");
+                var bundleFile = Path.Combine(binFolder, "FDDWPFCoreMBA.exe");
+                var baSourceFolder = TestData.Get(@"..\examples");
+                var bundleSourceFolder = TestData.Get(@"TestData\WPFCoreMBA");
+                var intermediateFolder = Path.Combine(baseFolder, "obj");
+
+                var compileResult = WixRunner.Execute(new[]
+                {
+                    "build",
+                    Path.Combine(bundleSourceFolder, "FrameworkDependentBundle.wxs"),
+                    "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
+                    "-intermediateFolder", intermediateFolder,
+                    "-bindpath", baSourceFolder,
+                    "-burnStub", TestEngine.BurnStubFile,
+                    "-o", bundleFile,
+                });
+                compileResult.AssertSuccess();
+                var testEngine = new TestEngine();
+
+                var result = testEngine.RunShutdownEngine(bundleFile, baseFolder);
+                var logMessages = result.Output;
+                Assert.Equal("Loading .NET Core FDD bootstrapper application.", logMessages[0]);
+                Assert.Equal("Creating BA thread to run asynchronously.", logMessages[1]);
+                Assert.Equal("WPFCoreBA", logMessages[2]);
+                Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[3]);
+            }
+        }
     }
 }
diff --git a/src/test/WixToolsetTest.ManagedHost/TestData/WPFCoreMBA/FrameworkDependentBundle.wxs b/src/test/WixToolsetTest.ManagedHost/TestData/WPFCoreMBA/FrameworkDependentBundle.wxs
new file mode 100644
index 00000000..ecc5e8c1
--- /dev/null
+++ b/src/test/WixToolsetTest.ManagedHost/TestData/WPFCoreMBA/FrameworkDependentBundle.wxs
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
+     xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
+    <Bundle Name="FDDWPFCoreMBA" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="5CE5B5C7-4B6B-4B95-B297-731F1F956533">
+        <BootstrapperApplicationRef Id="DotNetCoreBootstrapperApplicationHost">
+            <Payload SourceFile='publish\Example.WPFCoreMBA\fdd\Example.WPFCoreMBA.deps.json' Name='Example.WPFCoreMBA.deps.json' />
+            <Payload SourceFile='publish\Example.WPFCoreMBA\fdd\Example.WPFCoreMBA.dll' Name='Example.WPFCoreMBA.dll' bal:BAFactoryAssembly='yes' />
+            <Payload SourceFile='publish\Example.WPFCoreMBA\fdd\Example.WPFCoreMBA.pdb' Name='Example.WPFCoreMBA.pdb' />
+            <Payload SourceFile='publish\Example.WPFCoreMBA\fdd\Example.WPFCoreMBA.runtimeconfig.json' Name='Example.WPFCoreMBA.runtimeconfig.json' />
+            <Payload SourceFile='publish\Example.WPFCoreMBA\fdd\mbanative.dll' Name='mbanative.dll' />
+            <Payload SourceFile='publish\Example.WPFCoreMBA\fdd\WixToolset.Mba.Core.dll' Name='WixToolset.Mba.Core.dll' />
+        </BootstrapperApplicationRef>
+        <Chain>
+            <ExePackage SourceFile="c:\windows\system32\kernel32.dll" bal:PrereqPackage="yes" />
+        </Chain>
+    </Bundle>
+</Wix>
diff --git a/src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj b/src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj
index 958c63fc..ff472322 100644
--- a/src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj
+++ b/src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj
@@ -14,6 +14,7 @@
   <PropertyGroup>
     <EarliestCoreMBAProjectPath>..\examples\EarliestCoreMBA\Example.EarliestCoreMBA.csproj</EarliestCoreMBAProjectPath>
     <LatestCoreMBAProjectPath>..\examples\LatestCoreMBA\Example.LatestCoreMBA.csproj</LatestCoreMBAProjectPath>
+    <WPFCoreMBAProjectPath>..\examples\WPFCoreMBA\Example.WPFCoreMBA.csproj</WPFCoreMBAProjectPath>
     <MBAPublishPath>$(OutputPath)examples\publish\</MBAPublishPath>
   </PropertyGroup>
 
@@ -30,6 +31,7 @@
     <Content Include="TestData\LatestCoreMBA\HarvestedTrimmedSCD.wxs" CopyToOutputDirectory="PreserveNewest"/>
     <Content Include="TestData\LatestCoreMBA\SelfContainedBundle.wxs" CopyToOutputDirectory="PreserveNewest"/>
     <Content Include="TestData\LatestCoreMBA\TrimmedSelfContainedBundle.wxs" CopyToOutputDirectory="PreserveNewest"/>
+    <Content Include="TestData\WPFCoreMBA\FrameworkDependentBundle.wxs" CopyToOutputDirectory="PreserveNewest"/>
   </ItemGroup>
 
   <Target Name="CopyExtensions" AfterTargets="Build">
@@ -43,11 +45,17 @@
     <CoreMBAProject Include="$(LatestCoreMBAProjectPath)">
       <PublishPath>$(MBAPublishPath)Example.LatestCoreMBA</PublishPath>
     </CoreMBAProject>
+    <CoreMBAProject Include="$(WPFCoreMBAProjectPath)">
+      <PublishPath>$(MBAPublishPath)Example.WPFCoreMBA</PublishPath>
+      <SkipSCD>true</SkipSCD>
+      <SkipTrimmedSCD>true</SkipTrimmedSCD>
+    </CoreMBAProject>
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="$(EarliestCoreMBAProjectPath)" />
     <ProjectReference Include="$(LatestCoreMBAProjectPath)" />
+    <ProjectReference Include="$(WPFCoreMBAProjectPath)" />
     <ProjectReference Include="..\examples\FullFramework2MBA\Example.FullFramework2MBA.csproj" />
     <ProjectReference Include="..\examples\FullFramework4MBA\Example.FullFramework4MBA.csproj" />
     <ProjectReference Include="..\examples\TestEngine\Example.TestEngine.vcxproj" />
@@ -69,8 +77,11 @@
   </ItemGroup>
 
   <Target Name="PublishExamples" AfterTargets="Build">
-    <Exec Command='dotnet publish -o "%(CoreMBAProject.PublishPath)\fdd" -r win-x86 -c $(Configuration) --self-contained false "%(CoreMBAProject.Identity)"' />
-    <Exec Command='dotnet publish -o "%(CoreMBAProject.PublishPath)\scd" -r win-x86 -c $(Configuration) --self-contained true "%(CoreMBAProject.Identity)"' />
-    <Exec Command='dotnet publish -o "%(CoreMBAProject.PublishPath)\trimmedscd" -r win-x86 -c $(Configuration) --self-contained true -p:PublishTrimmed=true "%(CoreMBAProject.Identity)"' />
+    <Exec Command='dotnet publish -o "%(CoreMBAProject.PublishPath)\fdd" -r win-x86 -c $(Configuration) --self-contained false "%(CoreMBAProject.Identity)"'
+          Condition="'%(CoreMBAProject.SkipFDD)'==''" />
+    <Exec Command='dotnet publish -o "%(CoreMBAProject.PublishPath)\scd" -r win-x86 -c $(Configuration) --self-contained true "%(CoreMBAProject.Identity)"'
+          Condition="'%(CoreMBAProject.SkipSCD)'==''" />
+    <Exec Command='dotnet publish -o "%(CoreMBAProject.PublishPath)\trimmedscd" -r win-x86 -c $(Configuration) --self-contained true -p:PublishTrimmed=true "%(CoreMBAProject.Identity)"'
+          Condition="'%(CoreMBAProject.SkipTrimmedSCD)'==''" />
   </Target>
 </Project>
diff --git a/src/test/examples/TestEngine/Example.TestEngine.vcxproj b/src/test/examples/TestEngine/Example.TestEngine.vcxproj
index be52105b..b9425295 100644
--- a/src/test/examples/TestEngine/Example.TestEngine.vcxproj
+++ b/src/test/examples/TestEngine/Example.TestEngine.vcxproj
@@ -50,12 +50,14 @@
     <ClCompile Include="ShutdownEngine.cpp" />
     <ClCompile Include="ExampleTestEngine.cpp" />
     <ClCompile Include="TestEngine.cpp" />
+    <ClCompile Include="WaitForQuitEngine.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="precomp.h" />
     <ClInclude Include="ReloadEngine.h" />
     <ClInclude Include="ShutdownEngine.h" />
     <ClInclude Include="TestEngine.h" />
+    <ClInclude Include="WaitForQuitEngine.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
diff --git a/src/test/examples/TestEngine/ExampleTestEngine.cpp b/src/test/examples/TestEngine/ExampleTestEngine.cpp
index a378c9a3..fc1938fe 100644
--- a/src/test/examples/TestEngine/ExampleTestEngine.cpp
+++ b/src/test/examples/TestEngine/ExampleTestEngine.cpp
@@ -4,9 +4,15 @@
 
 int __cdecl wmain(int argc, LPWSTR argv[])
 {
-    HRESULT hr = E_INVALIDARG;
+    HRESULT hr = S_OK;
+    BOOL fComInitialized = FALSE;
     BOOL fShowUsage = FALSE;
 
+    // initialize COM
+    hr = ::CoInitializeEx(NULL, COINIT_MULTITHREADED);
+    ExitOnFailure(hr, "Failed to initialize COM.");
+    fComInitialized = TRUE;
+
     ConsoleInitialize();
 
     if (argc != 4)
@@ -21,6 +27,10 @@ int __cdecl wmain(int argc, LPWSTR argv[])
     {
         hr = RunShutdownEngine(argv[2], argv[3]);
     }
+    else if (CSTR_EQUAL == ::CompareString(LOCALE_INVARIANT, NORM_IGNORECASE, argv[1], -1, L"waitforquit", -1))
+    {
+        hr = RunWaitForQuitEngine(argv[2], argv[3]);
+    }
     else
     {
         fShowUsage = TRUE;
@@ -28,9 +38,16 @@ int __cdecl wmain(int argc, LPWSTR argv[])
 
     if (fShowUsage)
     {
-        ConsoleWriteError(hr, CONSOLE_COLOR_RED, "Usage: {reload|shutdown} Example.TestEngine.exe Bundle.exe BA.dll");
+        ConsoleWriteError(hr = E_INVALIDARG, CONSOLE_COLOR_RED, "Usage: Example.TestEngine.exe {reload|shutdown|waitforquit} Bundle.exe BA.dll");
     }
 
     ConsoleUninitialize();
+
+LExit:
+    if (fComInitialized)
+    {
+        ::CoUninitialize();
+    }
+
     return hr;
 }
diff --git a/src/test/examples/TestEngine/ReloadEngine.cpp b/src/test/examples/TestEngine/ReloadEngine.cpp
index 83541672..46fd9afa 100644
--- a/src/test/examples/TestEngine/ReloadEngine.cpp
+++ b/src/test/examples/TestEngine/ReloadEngine.cpp
@@ -22,6 +22,12 @@ HRESULT RunReloadEngine(
     hr = pTestEngine->SendStartupEvent();
     ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "BA returned failure for OnStartup.");
 
+    hr = pTestEngine->SimulateQuit(0);
+    ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to simulate quit.");
+
+    hr = pTestEngine->RunApplication();
+    ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to run engine.");
+
     hr = pTestEngine->SendShutdownEvent(BOOTSTRAPPER_SHUTDOWN_ACTION_RELOAD_BOOTSTRAPPER);
     ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "BA returned failure for OnShutdown.");
 
@@ -33,6 +39,12 @@ HRESULT RunReloadEngine(
     hr = pTestEngine->SendStartupEvent();
     ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "BA returned failure for OnStartup.");
 
+    hr = pTestEngine->SimulateQuit(0);
+    ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to simulate quit.");
+
+    hr = pTestEngine->RunApplication();
+    ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to run engine.");
+
     hr = pTestEngine->SendShutdownEvent(BOOTSTRAPPER_SHUTDOWN_ACTION_RESTART);
     ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "BA returned failure for OnShutdown.");
 
diff --git a/src/test/examples/TestEngine/ShutdownEngine.cpp b/src/test/examples/TestEngine/ShutdownEngine.cpp
index 0dfbb429..3b876e4e 100644
--- a/src/test/examples/TestEngine/ShutdownEngine.cpp
+++ b/src/test/examples/TestEngine/ShutdownEngine.cpp
@@ -22,6 +22,12 @@ HRESULT RunShutdownEngine(
     hr = pTestEngine->SendStartupEvent();
     ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "BA returned failure for OnStartup.");
 
+    hr = pTestEngine->SimulateQuit(0);
+    ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to simulate quit.");
+
+    hr = pTestEngine->RunApplication();
+    ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to run engine.");
+
     hr = pTestEngine->SendShutdownEvent(BOOTSTRAPPER_SHUTDOWN_ACTION_RELOAD_BOOTSTRAPPER);
     ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "BA returned failure for OnShutdown.");
 
diff --git a/src/test/examples/TestEngine/TestEngine.cpp b/src/test/examples/TestEngine/TestEngine.cpp
index f0811e0a..7b7dafce 100644
--- a/src/test/examples/TestEngine/TestEngine.cpp
+++ b/src/test/examples/TestEngine/TestEngine.cpp
@@ -7,12 +7,15 @@ HRESULT TestEngine::Initialize(
     )
 {
     HRESULT hr = S_OK;
+    MSG msg = { };
 
     LogInitialize(::GetModuleHandleW(NULL));
 
     hr = LogOpen(NULL, PathFile(wzBundleFilePath), NULL, L"txt", FALSE, FALSE, NULL);
     ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to open log.");
 
+    ::PeekMessageW(&msg, NULL, WM_USER, WM_USER, PM_NOREMOVE);
+
 LExit:
     return hr;
 }
@@ -73,6 +76,29 @@ HRESULT TestEngine::Log(
     return ConsoleWriteLine(CONSOLE_COLOR_NORMAL, "%ls", wzMessage);
 }
 
+HRESULT TestEngine::RunApplication()
+{
+    HRESULT hr = S_OK;
+    MSG msg = { };
+    BOOL fRet = FALSE;
+
+    // Enter the message pump.
+    while (0 != (fRet = ::GetMessageW(&msg, NULL, 0, 0)))
+    {
+        if (-1 == fRet)
+        {
+            ConsoleExitOnFailure(hr = E_UNEXPECTED, CONSOLE_COLOR_RED, "Unexpected return value from message pump.");
+        }
+        else
+        {
+            ProcessBAMessage(&msg);
+        }
+    }
+
+LExit:
+    return hr;
+}
+
 HRESULT TestEngine::SendShutdownEvent(
     __in BOOTSTRAPPER_SHUTDOWN_ACTION defaultAction
     )
@@ -98,6 +124,21 @@ HRESULT TestEngine::SendStartupEvent()
     return hr;
 }
 
+HRESULT TestEngine::SimulateQuit(
+    __in DWORD dwExitCode
+    )
+{
+    BAENGINE_QUIT_ARGS args = { };
+    BAENGINE_QUIT_RESULTS results = { };
+
+    args.cbSize = sizeof(BAENGINE_QUIT_ARGS);
+    args.dwExitCode = dwExitCode;
+
+    results.cbSize = sizeof(BAENGINE_QUIT_RESULTS);
+
+    return BAEngineQuit(&args, &results);
+}
+
 void TestEngine::UnloadBA()
 {
     PFN_BOOTSTRAPPER_APPLICATION_DESTROY pfnDestroy = NULL;
@@ -124,12 +165,27 @@ void TestEngine::UnloadBA()
 }
 
 HRESULT TestEngine::BAEngineLog(
-    __in TestEngine* pContext,
     __in BAENGINE_LOG_ARGS* pArgs,
     __in BAENGINE_LOG_RESULTS* /*pResults*/
     )
 {
-    return pContext->Log(pArgs->wzMessage);
+    return Log(pArgs->wzMessage);
+}
+
+HRESULT TestEngine::BAEngineQuit(
+    __in BAENGINE_QUIT_ARGS* pArgs,
+    __in BAENGINE_QUIT_RESULTS* /*pResults*/
+    )
+{
+    HRESULT hr = S_OK;
+
+    if (!::PostThreadMessageW(m_dwThreadId, WM_TESTENG_QUIT, static_cast<WPARAM>(pArgs->dwExitCode), 0))
+    {
+        ExitWithLastError(hr, "Failed to post shutdown message.");
+    }
+
+LExit:
+    return hr;
 }
 
 HRESULT WINAPI TestEngine::EngineProc(
@@ -150,8 +206,10 @@ HRESULT WINAPI TestEngine::EngineProc(
     switch (message)
     {
     case BOOTSTRAPPER_ENGINE_MESSAGE_LOG:
-        hr = BAEngineLog(pContext, reinterpret_cast<BAENGINE_LOG_ARGS*>(pvArgs), reinterpret_cast<BAENGINE_LOG_RESULTS*>(pvResults));
+        hr = pContext->BAEngineLog(reinterpret_cast<BAENGINE_LOG_ARGS*>(pvArgs), reinterpret_cast<BAENGINE_LOG_RESULTS*>(pvResults));
         break;
+    case BOOTSTRAPPER_ENGINE_MESSAGE_QUIT:
+        hr = pContext->BAEngineQuit(reinterpret_cast<BAENGINE_QUIT_ARGS*>(pvArgs), reinterpret_cast<BAENGINE_QUIT_RESULTS*>(pvResults));
     default:
         hr = E_NOTIMPL;
         break;
@@ -161,13 +219,30 @@ LExit:
     return hr;
 }
 
+HRESULT TestEngine::ProcessBAMessage(
+    __in const MSG* pmsg
+    )
+{
+    HRESULT hr = S_OK;
+
+    switch (pmsg->message)
+    {
+    case WM_TESTENG_QUIT:
+        ::PostQuitMessage(static_cast<int>(pmsg->wParam)); // go bye-bye.
+        break;
+    }
+
+    return hr;
+}
+
 TestEngine::TestEngine()
 {
     m_hBAModule = NULL;
     m_pCreateResults = NULL;
+    m_dwThreadId = ::GetCurrentThreadId();
 }
 
 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
index cf1c8aac..14b69999 100644
--- a/src/test/examples/TestEngine/TestEngine.h
+++ b/src/test/examples/TestEngine/TestEngine.h
@@ -2,6 +2,20 @@
 // 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.
 
 
+enum WM_TESTENG
+{
+    WM_TESTENG_FIRST = WM_APP + 0xFFF, // this enum value must always be first.
+
+    WM_TESTENG_DETECT,
+    WM_TESTENG_PLAN,
+    WM_TESTENG_ELEVATE,
+    WM_TESTENG_APPLY,
+    WM_TESTENG_LAUNCH_APPROVED_EXE,
+    WM_TESTENG_QUIT,
+
+    WM_TESTENG_LAST, // this enum value must always be last.
+};
+
 class TestEngine
 {
 public:
@@ -17,19 +31,29 @@ public:
         __in LPCWSTR wzMessage
         );
 
+    HRESULT RunApplication();
+
     HRESULT SendShutdownEvent(
         __in BOOTSTRAPPER_SHUTDOWN_ACTION defaultAction
         );
 
     HRESULT SendStartupEvent();
 
+    HRESULT SimulateQuit(
+        __in DWORD dwExitCode
+        );
+
     void UnloadBA();
 
 private:
-    static HRESULT BAEngineLog(
-        __in TestEngine* pContext,
+    HRESULT BAEngineLog(
         __in BAENGINE_LOG_ARGS* pArgs,
-        __in BAENGINE_LOG_RESULTS* /*pResults*/
+        __in BAENGINE_LOG_RESULTS* pResults
+        );
+
+    HRESULT BAEngineQuit(
+        __in BAENGINE_QUIT_ARGS* pArgs,
+        __in BAENGINE_QUIT_RESULTS* pResults
         );
 
     static HRESULT WINAPI EngineProc(
@@ -39,6 +63,10 @@ private:
         __in_opt LPVOID pvContext
         );
 
+    HRESULT ProcessBAMessage(
+        __in const MSG* pmsg
+        );
+
 public:
     TestEngine();
 
@@ -47,4 +75,5 @@ public:
 private:
     HMODULE m_hBAModule;
     BOOTSTRAPPER_CREATE_RESULTS* m_pCreateResults;
+    DWORD m_dwThreadId;
 };
\ No newline at end of file
diff --git a/src/test/examples/TestEngine/WaitForQuitEngine.cpp b/src/test/examples/TestEngine/WaitForQuitEngine.cpp
new file mode 100644
index 00000000..2f80ba75
--- /dev/null
+++ b/src/test/examples/TestEngine/WaitForQuitEngine.cpp
@@ -0,0 +1,35 @@
+// 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 RunWaitForQuitEngine(
+    __in LPCWSTR wzBundleFilePath,
+    __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->Initialize(wzBundleFilePath);
+    ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to initialize engine.");
+
+    hr = pTestEngine->LoadBA(wzBAFilePath);
+    ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to load BA.");
+
+    hr = pTestEngine->SendStartupEvent();
+    ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "BA returned failure for OnStartup.");
+
+    hr = pTestEngine->RunApplication();
+    ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to run engine.");
+
+    hr = pTestEngine->SendShutdownEvent(BOOTSTRAPPER_SHUTDOWN_ACTION_RELOAD_BOOTSTRAPPER);
+    ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "BA returned failure for OnShutdown.");
+
+    pTestEngine->UnloadBA();
+
+LExit:
+    return hr;
+}
diff --git a/src/test/examples/TestEngine/WaitForQuitEngine.h b/src/test/examples/TestEngine/WaitForQuitEngine.h
new file mode 100644
index 00000000..99e3f63c
--- /dev/null
+++ b/src/test/examples/TestEngine/WaitForQuitEngine.h
@@ -0,0 +1,8 @@
+#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 RunWaitForQuitEngine(
+    __in LPCWSTR wzBundleFilePath,
+    __in LPCWSTR wzBAFilePath
+    );
diff --git a/src/test/examples/TestEngine/precomp.h b/src/test/examples/TestEngine/precomp.h
index 3fbc7e90..f943f420 100644
--- a/src/test/examples/TestEngine/precomp.h
+++ b/src/test/examples/TestEngine/precomp.h
@@ -17,3 +17,4 @@
 #include "TestEngine.h"
 #include "ReloadEngine.h"
 #include "ShutdownEngine.h"
+#include "WaitForQuitEngine.h"
diff --git a/src/test/examples/WPFCoreMBA/AssemblyInfo.cs b/src/test/examples/WPFCoreMBA/AssemblyInfo.cs
new file mode 100644
index 00000000..03a5c7fa
--- /dev/null
+++ b/src/test/examples/WPFCoreMBA/AssemblyInfo.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.
+
+using System.Windows;
+
+[assembly:ThemeInfo(
+    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
+                                     //(used if a resource is not found in the page,
+                                     // or application resource dictionaries)
+    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+                                              //(used if a resource is not found in the page,
+                                              // app, or any theme specific resource dictionaries)
+)]
diff --git a/src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj b/src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj
new file mode 100644
index 00000000..3b559f9b
--- /dev/null
+++ b/src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj
@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
+    <EnableDynamicLoading>true</EnableDynamicLoading>
+    <Description>WPF .NET Core MBA</Description>
+    <UseWPF>true</UseWPF>
+  </PropertyGroup>
+
+
+  <ItemGroup>
+    <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="all" />
+    <PackageReference Include="WixToolset.Mba.Core" Version="4.0.19" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/test/examples/WPFCoreMBA/MainWindow.xaml b/src/test/examples/WPFCoreMBA/MainWindow.xaml
new file mode 100644
index 00000000..40a27a06
--- /dev/null
+++ b/src/test/examples/WPFCoreMBA/MainWindow.xaml
@@ -0,0 +1,16 @@
+<?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. -->
+
+
+<Window x:Class="Example.WPFCoreMBA.MainWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:Example.WPFCoreMBA"
+        mc:Ignorable="d"
+        Title="MainWindow" Height="450" Width="800">
+    <Grid>
+
+    </Grid>
+</Window>
diff --git a/src/test/examples/WPFCoreMBA/MainWindow.xaml.cs b/src/test/examples/WPFCoreMBA/MainWindow.xaml.cs
new file mode 100644
index 00000000..4f61b807
--- /dev/null
+++ b/src/test/examples/WPFCoreMBA/MainWindow.xaml.cs
@@ -0,0 +1,17 @@
+// 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.WPFCoreMBA
+{
+    using System.Windows;
+
+    /// <summary>
+    /// Interaction logic for MainWindow.xaml
+    /// </summary>
+    public partial class MainWindow : Window
+    {
+        public MainWindow()
+        {
+            this.InitializeComponent();
+        }
+    }
+}
diff --git a/src/test/examples/WPFCoreMBA/WPFCoreBA.cs b/src/test/examples/WPFCoreMBA/WPFCoreBA.cs
new file mode 100644
index 00000000..d50be813
--- /dev/null
+++ b/src/test/examples/WPFCoreMBA/WPFCoreBA.cs
@@ -0,0 +1,42 @@
+// 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.WPFCoreMBA
+{
+    using System.Windows.Threading;
+    using WixToolset.Mba.Core;
+
+    public class WPFCoreBA : BootstrapperApplication
+    {
+        public WPFCoreBA(IEngine engine)
+            : base(engine)
+        {
+        }
+        
+        public Dispatcher BADispatcher { get; private set; }
+
+        protected override void Run()
+        {
+            this.BADispatcher = Dispatcher.CurrentDispatcher;
+            var window = new MainWindow();
+            window.Closed += (s, e) => this.BADispatcher.InvokeShutdown();
+            //window.Show();
+            //Dispatcher.Run();
+            //this.engine.Quit(0);
+        }
+
+        protected override void OnStartup(StartupEventArgs args)
+        {
+            base.OnStartup(args);
+
+            this.engine.Log(LogLevel.Standard, nameof(WPFCoreBA));
+        }
+
+        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/WPFCoreMBA/WPFCoreBAFactory.cs b/src/test/examples/WPFCoreMBA/WPFCoreBAFactory.cs
new file mode 100644
index 00000000..a3ccdf9f
--- /dev/null
+++ b/src/test/examples/WPFCoreMBA/WPFCoreBAFactory.cs
@@ -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.
+
+[assembly: WixToolset.Mba.Core.BootstrapperApplicationFactory(typeof(Example.WPFCoreMBA.WPFCoreBAFactory))]
+namespace Example.WPFCoreMBA
+{
+    using WixToolset.Mba.Core;
+
+    public class WPFCoreBAFactory : BaseBootstrapperApplicationFactory
+    {
+        private static int loadCount = 0;
+
+        protected override IBootstrapperApplication Create(IEngine engine, IBootstrapperCommand bootstrapperCommand)
+        {
+            if (loadCount > 0)
+            {
+                engine.Log(LogLevel.Standard, $"Reloaded {loadCount} time(s)");
+            }
+            ++loadCount;
+            return new WPFCoreBA(engine);
+        }
+    }
+}