23 files changed, 132 insertions, 119 deletions
diff --git a/src/test/burn/TestData/BAFunctionsTests/BafRelatedBundleVariableTesting/BafRelatedBundleVariableTesting.cpp b/src/test/burn/TestData/BAFunctionsTests/BafRelatedBundleVariableTesting/BafRelatedBundleVariableTesting.cpp
index 01750b4b..ba559b05 100644
--- a/src/test/burn/TestData/BAFunctionsTests/BafRelatedBundleVariableTesting/BafRelatedBundleVariableTesting.cpp
+++ b/src/test/burn/TestData/BAFunctionsTests/BafRelatedBundleVariableTesting/BafRelatedBundleVariableTesting.cpp
@@ -29,37 +29,28 @@ public: //IBootstrapperApplication
        hr = BalGetRelatedBundleVariable(wzBundleId, STRING_VARIABLE, &wzValue);
-        ExitOnFailure(hr, "Failed to get related bundle string variable.");
+        BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Retrieved related bundle variable with BAFunctions: AString = %ws, Error: 0x%x", wzValue, hr);
-        if (wzValue)
-        {
-            BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Retrieved related bundle variable with BAFunctions: AString = %ws", wzValue);
-        }
        hr = BalGetRelatedBundleVariable(wzBundleId, NUMBER_VARIABLE, &wzValue);
-        if (wzValue)
+        BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Retrieved related bundle variable with BAFunctions: ANumber = %ws, Error: 0x%x", wzValue, hr);
-        {
-            BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Retrieved related bundle variable with BAFunctions: ANumber = %ws", wzValue);
-        }
        hr = __super::OnDetectRelatedBundle(wzBundleId, relationType, wzBundleTag, fPerMachine, wzVersion, fMissingFromCache, pfCancel);
-    LExit:
        ReleaseStr(wzValue);
-        return hr;        
+        return hr;
    }
 private:
- 
 public:
    //
    // Constructor - initialize member variables.
    //
    CBafRelatedBundleVariableTesting(
-        __in HMODULE hModule,
+        __in HMODULE hModule
-        __in IBootstrapperEngine* pEngine,
+        ) : CBalBaseBAFunctions(hModule)
-        __in const BA_FUNCTIONS_CREATE_ARGS* pArgs
-        ) : CBalBaseBAFunctions(hModule, pEngine, pArgs)
    {
    }
@@ -82,21 +73,21 @@ HRESULT WINAPI CreateBAFunctions(
 {
    HRESULT hr = S_OK;
    CBafRelatedBundleVariableTesting* pBAFunctions = NULL;
-    IBootstrapperEngine* pEngine = NULL;
-    hr = BalInitializeFromCreateArgs(pArgs->pBootstrapperCreateArgs, &pEngine);
+    BalInitialize(pArgs->pEngine);
-    ExitOnFailure(hr, "Failed to initialize Bal.");
-    pBAFunctions = new CBafRelatedBundleVariableTesting(hModule, pEngine, pArgs);
+    pBAFunctions = new CBafRelatedBundleVariableTesting(hModule);
    ExitOnNull(pBAFunctions, hr, E_OUTOFMEMORY, "Failed to create new CBafRelatedBundleVariableTesting object.");
+    hr = pBAFunctions->OnCreate(pArgs->pEngine, pArgs->pCommand);
+    ExitOnFailure(hr, "Failed to create BA function");
    pResults->pfnBAFunctionsProc = BalBaseBAFunctionsProc;
    pResults->pvBAFunctionsProcContext = pBAFunctions;
    pBAFunctions = NULL;
 LExit:
    ReleaseObject(pBAFunctions);
-    ReleaseObject(pEngine);
    return hr;
 }
diff --git a/src/test/burn/TestData/BAFunctionsTests/BundleAv1/BundleAv1.wxs b/src/test/burn/TestData/BAFunctionsTests/BundleAv1/BundleAv1.wxs
index 4aba7a2f..431ef3d1 100644
--- a/src/test/burn/TestData/BAFunctionsTests/BundleAv1/BundleAv1.wxs
+++ b/src/test/burn/TestData/BAFunctionsTests/BundleAv1/BundleAv1.wxs
@@ -1,15 +1,16 @@
 <!-- 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. -->
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
  <Fragment>
-    <BootstrapperApplication>
+    <PayloadGroup Id="override ExtraPayloads">
      <Payload SourceFile="$(var.BafRelatedBundleVariableTesting.TargetPath)" bal:BAFunctions="yes" />
-    </BootstrapperApplication>
+    </PayloadGroup>
    <PackageGroup Id="BundlePackages">
      <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" />
    </PackageGroup>
    <Variable Name="ANumber" bal:Overridable="yes" Value="42" Persisted="yes" />
-    <Variable Name="AString" bal:Overridable="yes" Value="This is a test" Persisted="yes" /> 
+    <Variable Name="AString" bal:Overridable="yes" Value="This is a test" Persisted="yes" />
  </Fragment>
 </Wix>
diff --git a/src/test/burn/TestData/BAFunctionsTests/BundleAv2/BundleAv2.wxs b/src/test/burn/TestData/BAFunctionsTests/BundleAv2/BundleAv2.wxs
index 8608512c..9c512899 100644
--- a/src/test/burn/TestData/BAFunctionsTests/BundleAv2/BundleAv2.wxs
+++ b/src/test/burn/TestData/BAFunctionsTests/BundleAv2/BundleAv2.wxs
@@ -1,15 +1,16 @@
 <!-- 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. -->
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
  <Fragment>
-    <BootstrapperApplication>
+    <PayloadGroup Id="override ExtraPayloads">
      <Payload SourceFile="$(var.BafRelatedBundleVariableTesting.TargetPath)" bal:BAFunctions="yes" />
-    </BootstrapperApplication>
+    </PayloadGroup>
    <PackageGroup Id="BundlePackages">
      <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv2.TargetPath)" />
    </PackageGroup>
    <Variable Name="ANumber" bal:Overridable="yes" Value="4242" Persisted="yes" />
-    <Variable Name="AString" bal:Overridable="yes" Value="This is a test v2" Persisted="yes" /> 
+    <Variable Name="AString" bal:Overridable="yes" Value="This is a test v2" Persisted="yes" />
  </Fragment>
 </Wix>
diff --git a/src/test/burn/TestData/Manual/BafThmutilTesting/BafThmUtilTesting.cpp b/src/test/burn/TestData/Manual/BafThmutilTesting/BafThmUtilTesting.cpp
index a2b8e041..29a5d7d5 100644
--- a/src/test/burn/TestData/Manual/BafThmutilTesting/BafThmUtilTesting.cpp
+++ b/src/test/burn/TestData/Manual/BafThmutilTesting/BafThmUtilTesting.cpp
@@ -44,6 +44,16 @@ static void CALLBACK BafThmUtilTestingTraceError(
 class CBafThmUtilTesting : public CBalBaseBAFunctions
 {
 public: // IBAFunctions
+    virtual STDMETHODIMP OnCreate(
+        __in IBootstrapperEngine* pEngine,
+        __in BOOTSTRAPPER_COMMAND* pCommand
+        )
+    {
+        m_commandDisplay = pCommand->display;
+        return __super::OnCreate(pEngine, pCommand);
+    }
    virtual STDMETHODIMP OnThemeControlLoading(
        __in LPCWSTR wzName,
        __inout BOOL* pfProcessed,
@@ -95,7 +105,7 @@ public: //IBootstrapperApplication
        __inout BOOL* pfCancel
        )
    {
-        if (BOOTSTRAPPER_DISPLAY_FULL <= m_command.display)
+        if (BOOTSTRAPPER_DISPLAY_FULL <= m_commandDisplay)
        {
            if (IDCANCEL == ::MessageBoxW(m_hwndParent, L"Shutdown requests should be denied right now.", L"OnExecuteBegin", MB_OKCANCEL))
            {
@@ -184,7 +194,7 @@ private:
        }
        hr = ThemeCreateParentWindow(m_pBafTheme, 0, wc.lpszClassName, m_pBafTheme->sczCaption, m_pBafTheme->dwStyle, x, y, m_hwndParent, m_hModule, this, THEME_WINDOW_INITIAL_POSITION_CENTER_MONITOR_FROM_COORDINATES, &m_hWndBaf);
-        ExitOnFailure(hr, "Failed to create window.");
+        ExitOnFailure(hr, "Failed to create baf testing window.");
        hr = S_OK;
@@ -330,7 +340,7 @@ private:
    {
        HRESULT hr = S_OK;
        BOOL fProcessed = FALSE;
-        
        for (DWORD iAssignControl = 0; iAssignControl < countof(vrgInitControls); ++iAssignControl)
        {
            if (CSTR_EQUAL == ::CompareStringW(LOCALE_NEUTRAL, 0, pArgs->pThemeControl->sczName, -1, vrgInitControls[iAssignControl].wzName, -1))
@@ -371,7 +381,7 @@ private:
            }
            break;
-            
        case BAFTHMUTILTESTING_CONTROL_PROGRESSBAR_STANDARD:
            fProcessed = TRUE;
@@ -410,11 +420,10 @@ public:
    // Constructor - initialize member variables.
    //
    CBafThmUtilTesting(
-        __in HMODULE hModule,
+        __in HMODULE hModule
-        __in IBootstrapperEngine* pEngine,
+        ) : CBalBaseBAFunctions(hModule)
-        __in const BA_FUNCTIONS_CREATE_ARGS* pArgs
-        ) : CBalBaseBAFunctions(hModule, pEngine, pArgs)
    {
+        m_commandDisplay = BOOTSTRAPPER_DISPLAY_UNKNOWN;
        m_pBafTheme = NULL;
        m_fRegistered = FALSE;
        m_hWndBaf = NULL;
@@ -434,12 +443,12 @@ public:
    }
 private:
+    BOOTSTRAPPER_DISPLAY m_commandDisplay;
    THEME* m_pBafTheme;
    BOOL m_fRegistered;
    HWND m_hWndBaf;
 };
 HRESULT WINAPI CreateBAFunctions(
    __in HMODULE hModule,
    __in const BA_FUNCTIONS_CREATE_ARGS* pArgs,
@@ -448,16 +457,20 @@ HRESULT WINAPI CreateBAFunctions(
 {
    HRESULT hr = S_OK;
    CBafThmUtilTesting* pBAFunctions = NULL;
-    IBootstrapperEngine* pEngine = NULL;
    DutilInitialize(&BafThmUtilTestingTraceError);
+#if TODO_REWRITE
    hr = BalInitializeFromCreateArgs(pArgs->pBootstrapperCreateArgs, &pEngine);
    ExitOnFailure(hr, "Failed to initialize Bal.");
+#endif
-    pBAFunctions = new CBafThmUtilTesting(hModule, pEngine, pArgs);
+    pBAFunctions = new CBafThmUtilTesting(hModule);
    ExitOnNull(pBAFunctions, hr, E_OUTOFMEMORY, "Failed to create new CBafThmUtilTesting object.");
+    hr = pBAFunctions->OnCreate(pArgs->pEngine, pArgs->pCommand);
+    ExitOnFailure(hr, "Failed to call OnCreate CPrereqBaf.");
    pResults->pfnBAFunctionsProc = BalBaseBAFunctionsProc;
    pResults->pvBAFunctionsProcContext = pBAFunctions;
    pBAFunctions = NULL;
@@ -466,7 +479,6 @@ HRESULT WINAPI CreateBAFunctions(
 LExit:
    ReleaseObject(pBAFunctions);
-    ReleaseObject(pEngine);
    return hr;
 }
diff --git a/src/test/burn/TestData/Manual/BundleB/Bundle.wxs b/src/test/burn/TestData/Manual/BundleB/Bundle.wxs
index 615d4b1d..eea96895 100644
--- a/src/test/burn/TestData/Manual/BundleB/Bundle.wxs
+++ b/src/test/burn/TestData/Manual/BundleB/Bundle.wxs
@@ -30,9 +30,12 @@
    <?elseif $(var.BA) = "hyperlinkLicense"?>
      <BootstrapperApplication>
        <bal:WixStandardBootstrapperApplication LicenseUrl="" Theme="hyperlinkLicense" />
+        <PayloadGroupRef Id="BAPayloads" />
      </BootstrapperApplication>
    <?else?>
-      <BootstrapperApplicationRef Id="$(var.BA)" />
+      <BootstrapperApplicationRef Id="$(var.BA)">
+        <PayloadGroupRef Id="BAPayloads" />
+      </BootstrapperApplicationRef>
    <?endif?>
    <Chain>
diff --git a/src/test/burn/TestData/Manual/BundleB/BundleB.wixproj b/src/test/burn/TestData/Manual/BundleB/BundleB.wixproj
index c092f1fd..e7d029a3 100644
--- a/src/test/burn/TestData/Manual/BundleB/BundleB.wixproj
+++ b/src/test/burn/TestData/Manual/BundleB/BundleB.wixproj
@@ -6,6 +6,7 @@
    <UpgradeCode>{5DE2F206-3C37-4265-81F7-095284E16B08}</UpgradeCode>
    <HarvestDirectoryAdditionalOptions>-generate payloadgroup</HarvestDirectoryAdditionalOptions>
  </PropertyGroup>
  <ItemGroup>
    <HarvestDirectory Include="BAPayloads">
      <ComponentGroupName>BAPayloads</ComponentGroupName>
@@ -18,20 +19,24 @@
      <Transforms>package.xslt</Transforms>
    </HarvestDirectory>
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\PackageA\PackageA.wixproj" />
  </ItemGroup>
  <ItemGroup>
    <PackageReference Include="WixToolset.Heat" />
    <PackageReference Include="WixToolset.Bal.wixext" />
  </ItemGroup>
  <!-- We do this dynamically to avoid committing so many files to source control. -->
  <Target Name="CreateThousandsOfFiles" AfterTargets="BeforeBuild">
    <Exec Command='"$(BaseOutputPath)$(Configuration)\net6.0\win-x86\testexe.exe" /gf "BAPayloads|10000' WorkingDirectory="$(MSBuildProjectDirectory)" />
    <Exec Command='"$(BaseOutputPath)$(Configuration)\net6.0\win-x86\testexe.exe" /gf "PackagePayloads|10000' WorkingDirectory="$(MSBuildProjectDirectory)" />
  </Target>
  <Target Name="DeleteThousandsOfFiles" AfterTargets="AfterBuild">
    <RemoveDir Directories="$(MSBuildProjectDirectory)\BAPayloads" />
    <RemoveDir Directories="$(MSBuildProjectDirectory)\PackagePayloads" />
  </Target>
-</Project>
-\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/Manual/BundleB/BundleB.wxs b/src/test/burn/TestData/Manual/BundleB/BundleB.wxs
index 3b189b15..54082131 100644
--- a/src/test/burn/TestData/Manual/BundleB/BundleB.wxs
+++ b/src/test/burn/TestData/Manual/BundleB/BundleB.wxs
@@ -1,11 +1,7 @@
 <!-- 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. -->
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
  <Fragment>
-    <BootstrapperApplication>
-      <PayloadGroupRef Id="BAPayloads" />
-    </BootstrapperApplication>
    <PackageGroup Id="BundlePackages">
      <MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)">
        <PayloadGroupRef Id="PackagePayloads" />
diff --git a/src/test/burn/TestData/Manual/PackageA/PackageA.wixproj b/src/test/burn/TestData/Manual/PackageA/PackageA.wixproj
index 61dc27ab..f16c2038 100644
--- a/src/test/burn/TestData/Manual/PackageA/PackageA.wixproj
+++ b/src/test/burn/TestData/Manual/PackageA/PackageA.wixproj
@@ -10,4 +10,4 @@
  <ItemGroup>
    <PackageReference Include="WixToolset.Util.wixext" />
  </ItemGroup>
-</Project>
-\ No newline at end of file
+</Project>
diff --git a/src/test/burn/TestData/PrereqBaTests/BundleA/BundleA.wxs b/src/test/burn/TestData/PrereqBaTests/BundleA/BundleA.wxs
index 6073e09f..f56a7f8a 100644
--- a/src/test/burn/TestData/PrereqBaTests/BundleA/BundleA.wxs
+++ b/src/test/burn/TestData/PrereqBaTests/BundleA/BundleA.wxs
@@ -3,15 +3,16 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
  <Fragment>
-    <BootstrapperApplication Id="BrokenDnc">
+    <BootstrapperApplication Id="BrokenDnc" SourceFile="!(bindpath.dncx86)\TestBA.exe" Secondary="yes">
      <Payload SourceFile="!(bindpath.dncx86)\TestBA.deps.json" />
-      <Payload SourceFile="!(bindpath.dncx86)\TestBA.dll" bal:BAFactoryAssembly="yes" />
+      <Payload SourceFile="!(bindpath.dncx86)\TestBA.dll" />
      <Payload Name="good.runtimeconfig.json" SourceFile="!(bindpath.dncx86)\TestBA.runtimeconfig.json" />
      <Payload Name="TestBA.runtimeconfig.json" SourceFile="bad.runtimeconfig.json" />
      <Payload SourceFile="!(bindpath.dncx86)\mbanative.dll" />
      <Payload SourceFile="!(bindpath.dncx86)\WixToolset.Mba.Core.dll" />
      <Payload SourceFile="$(var.PrereqBaf.TargetPath)" bal:BAFunctions="yes" />
-      <bal:WixDotNetCoreBootstrapperApplicationHost />
+      <bal:WixPrerequisiteBootstrapperApplication />
    </BootstrapperApplication>
  </Fragment>
diff --git a/src/test/burn/TestData/PrereqBaTests/BundleB/BundleB.wxs b/src/test/burn/TestData/PrereqBaTests/BundleB/BundleB.wxs
index b7742582..87b8be36 100644
--- a/src/test/burn/TestData/PrereqBaTests/BundleB/BundleB.wxs
+++ b/src/test/burn/TestData/PrereqBaTests/BundleB/BundleB.wxs
@@ -3,14 +3,15 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
  <Fragment>
-    <BootstrapperApplication Id="BrokenMba">
+    <BootstrapperApplication Id="BrokenMba" SourceFile="!(bindpath.net2x86)\TestBA.exe"
-      <Payload Name="good.config" SourceFile="!(bindpath.net2x86)\TestBA.BootstrapperCore.config" />
+                             Secondary="yes">
-      <Payload Name="WixToolset.Mba.Host.config" SourceFile="bad.config" />
+      <Payload Name="good.config" SourceFile="!(bindpath.net2x86)\TestBA.exe.config" />
-      <Payload SourceFile="!(bindpath.net2x86)\TestBA.dll" />
+      <Payload Name="TestBA.exe.config" SourceFile="bad.config" />
      <Payload SourceFile="!(bindpath.net2x86)\mbanative.dll" />
      <Payload SourceFile="!(bindpath.net2x86)\WixToolset.Mba.Core.dll" />
      <Payload SourceFile="$(var.PrereqBaf.TargetPath)" bal:BAFunctions="yes" />
-      <bal:WixManagedBootstrapperApplicationHost />
+      <bal:WixPrerequisiteBootstrapperApplication />
    </BootstrapperApplication>
  </Fragment>
@@ -21,7 +22,7 @@
    <PackageGroup Id="BundlePackages">
      <ExePackage SourceFile="$(var.ReplaceConfig.TargetPath)" bal:PrereqPackage="yes"
                  Permanent="yes" DetectCondition="NOT GoodConfigPresent OR CAUSEINFINITELOOP = 1"
-                  InstallArguments="&quot;[BARuntimeDirectory]WixToolset.Mba.Host.config&quot; &quot;[BARuntimeDirectory]good.config&quot; &quot;[BARuntimeDirectory]bad.config&quot;" />
+                  InstallArguments="&quot;[BARuntimeDirectory]TestBA.exe.config&quot; &quot;[BARuntimeDirectory]good.config&quot; &quot;[BARuntimeDirectory]bad.config&quot;" />
      <MsiPackage Id="PackageB" SourceFile="$(var.PackageB.TargetPath)" bal:PrereqPackage="yes" Permanent="yes" />
      <MsiPackage Id="PackageC" SourceFile="$(var.PackageC.TargetPath)" />
    </PackageGroup>
diff --git a/src/test/burn/TestData/PrereqBaTests/BundleB/bad.config b/src/test/burn/TestData/PrereqBaTests/BundleB/bad.config
index 1512e59a..ff3530f6 100644
--- a/src/test/burn/TestData/PrereqBaTests/BundleB/bad.config
+++ b/src/test/burn/TestData/PrereqBaTests/BundleB/bad.config
@@ -1,17 +1,8 @@
 <?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=v5.8" />
    </startup>
-    <wix.bootstrapper>
-        <host assemblyName="TestBA" />
-    </wix.bootstrapper>
 </configuration>
diff --git a/src/test/burn/TestData/PrereqBaTests/BundleC/BundleC.wxs b/src/test/burn/TestData/PrereqBaTests/BundleC/BundleC.wxs
index fe9425f7..9bf7932b 100644
--- a/src/test/burn/TestData/PrereqBaTests/BundleC/BundleC.wxs
+++ b/src/test/burn/TestData/PrereqBaTests/BundleC/BundleC.wxs
@@ -1,17 +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. -->
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
  <Fragment>
-    <BootstrapperApplication Id="BrokenDncAlwaysPrereq">
+    <BootstrapperApplication Id="BrokenDncAlwaysPrereq" SourceFile="!(bindpath.dncx86)\TestBA.exe" Secondary="true">
      <Payload SourceFile="!(bindpath.dncx86)\TestBA.deps.json" />
-      <Payload SourceFile="!(bindpath.dncx86)\TestBA.dll" bal:BAFactoryAssembly="yes" />
+      <Payload SourceFile="!(bindpath.dncx86)\TestBA.dll" />
      <Payload Name="good.runtimeconfig.json" SourceFile="!(bindpath.dncx86)\TestBA.runtimeconfig.json" />
      <Payload Name="TestBA.runtimeconfig.json" SourceFile="bad.runtimeconfig.json" />
      <Payload SourceFile="!(bindpath.dncx86)\mbanative.dll" />
      <Payload SourceFile="!(bindpath.dncx86)\WixToolset.Mba.Core.dll" />
      <Payload SourceFile="$(var.PrereqBaf.TargetPath)" bal:BAFunctions="yes" />
-      <bal:WixDotNetCoreBootstrapperApplicationHost AlwaysInstallPrereqs="yes" />
+      <bal:WixPrerequisiteBootstrapperApplication />
    </BootstrapperApplication>
  </Fragment>
diff --git a/src/test/burn/TestData/PrereqBaTests/BundleD/BundleD.wxs b/src/test/burn/TestData/PrereqBaTests/BundleD/BundleD.wxs
index 0e866295..68baba22 100644
--- a/src/test/burn/TestData/PrereqBaTests/BundleD/BundleD.wxs
+++ b/src/test/burn/TestData/PrereqBaTests/BundleD/BundleD.wxs
@@ -3,14 +3,14 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
  <Fragment>
-    <BootstrapperApplication Id="BrokenMbaAlwaysPrereq">
+    <BootstrapperApplication Id="BrokenMbaAlwaysPrereq" SourceFile="!(bindpath.net2x86)\TestBA.exe" Secondary="true">
-      <Payload Name="good.config" SourceFile="!(bindpath.net2x86)\TestBA.BootstrapperCore.config" />
+      <Payload Name="good.config" SourceFile="!(bindpath.net2x86)\TestBA.exe.config" />
-      <Payload Name="WixToolset.Mba.Host.config" SourceFile="bad.config" />
+      <Payload Name="TestBA.exe.config" SourceFile="bad.config" />
-      <Payload SourceFile="!(bindpath.net2x86)\TestBA.dll" />
      <Payload SourceFile="!(bindpath.net2x86)\mbanative.dll" />
      <Payload SourceFile="!(bindpath.net2x86)\WixToolset.Mba.Core.dll" />
      <Payload SourceFile="$(var.PrereqBaf.TargetPath)" bal:BAFunctions="yes" />
-      <bal:WixManagedBootstrapperApplicationHost AlwaysInstallPrereqs="yes" />
+      <bal:WixPrerequisiteBootstrapperApplication />
    </BootstrapperApplication>
  </Fragment>
@@ -21,7 +21,7 @@
    <PackageGroup Id="BundlePackages">
      <ExePackage SourceFile="$(var.ReplaceConfig.TargetPath)" bal:PrereqPackage="yes"
                  Permanent="yes" DetectCondition="NOT GoodConfigPresent OR CAUSEINFINITELOOP = 1"
-                  InstallArguments="&quot;[BARuntimeDirectory]WixToolset.Mba.Host.config&quot; &quot;[BARuntimeDirectory]good.config&quot; &quot;[BARuntimeDirectory]bad.config&quot;" />
+                  InstallArguments="&quot;[BARuntimeDirectory]TestBA.exe.config&quot; &quot;[BARuntimeDirectory]good.config&quot; &quot;[BARuntimeDirectory]bad.config&quot;" />
      <MsiPackage Id="PackageB" SourceFile="$(var.PackageB.TargetPath)" bal:PrereqPackage="yes" Permanent="yes" />
      <MsiPackage Id="PackageC" SourceFile="$(var.PackageC.TargetPath)" />
    </PackageGroup>
diff --git a/src/test/burn/TestData/PrereqBaTests/BundleE/BundleE.wxs b/src/test/burn/TestData/PrereqBaTests/BundleE/BundleE.wxs
index 5f2e6a75..4855c66e 100644
--- a/src/test/burn/TestData/PrereqBaTests/BundleE/BundleE.wxs
+++ b/src/test/burn/TestData/PrereqBaTests/BundleE/BundleE.wxs
@@ -3,14 +3,13 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
  <Fragment>
-    <BootstrapperApplication Id="DncAlwaysPrereq">
+    <BootstrapperApplication Id="DncAlwaysPrereq" SourceFile="!(bindpath.dncx86)\TestBA.exe">
      <Payload SourceFile="!(bindpath.dncx86)\TestBA.deps.json" />
-      <Payload SourceFile="!(bindpath.dncx86)\TestBA.dll" bal:BAFactoryAssembly="yes" />
+      <Payload SourceFile="!(bindpath.dncx86)\TestBA.dll" />
      <Payload SourceFile="!(bindpath.dncx86)\TestBA.runtimeconfig.json" />
      <Payload SourceFile="!(bindpath.dncx86)\mbanative.dll" />
      <Payload SourceFile="!(bindpath.dncx86)\WixToolset.Mba.Core.dll" />
      <Payload SourceFile="$(var.PrereqBaf.TargetPath)" bal:BAFunctions="yes" />
-      <bal:WixDotNetCoreBootstrapperApplicationHost AlwaysInstallPrereqs="yes" />
    </BootstrapperApplication>
  </Fragment>
diff --git a/src/test/burn/TestData/PrereqBaTests/PrereqBaf/PrereqBaf.cpp b/src/test/burn/TestData/PrereqBaTests/PrereqBaf/PrereqBaf.cpp
index 35949eb9..c93f9d3f 100644
--- a/src/test/burn/TestData/PrereqBaTests/PrereqBaf/PrereqBaf.cpp
+++ b/src/test/burn/TestData/PrereqBaTests/PrereqBaf/PrereqBaf.cpp
@@ -9,6 +9,22 @@ class CPrereqBaf : public CBalBaseBAFunctions
 public: // IBAFunctions
 public: //IBootstrapperApplication
+    STDMETHODIMP OnCreate(
+        __in IBootstrapperEngine* pEngine,
+        __in BOOTSTRAPPER_COMMAND* pCommand
+    )
+    {
+        HRESULT hr = S_OK;
+        hr = __super::OnCreate(pEngine, pCommand);
+        ExitOnFailure(hr, "CBalBaseBootstrapperApplication initialization failed.");
+        hr = StrAllocString(&m_sczBARuntimeDirectory, pCommand->wzBootstrapperWorkingFolder, 0);
+        ExitOnFailure(hr, "Failed to copy working folder");
+    LExit:
+        return hr;
+    }
    virtual STDMETHODIMP OnDetectBegin(
        __in BOOL /*fCached*/,
@@ -19,7 +35,7 @@ public: //IBootstrapperApplication
    {
        HRESULT hr = S_OK;
-        hr = m_pEngine->SetVariableString(L"BARuntimeDirectory", m_command.wzBootstrapperWorkingFolder, FALSE);
+        hr = m_pEngine->SetVariableString(L"BARuntimeDirectory", m_sczBARuntimeDirectory, FALSE);
        ExitOnFailure(hr, "Failed to set BARuntimeDirectory");
    LExit:
@@ -33,11 +49,10 @@ public:
    // Constructor - initialize member variables.
    //
    CPrereqBaf(
-        __in HMODULE hModule,
+        __in HMODULE hModule
-        __in IBootstrapperEngine* pEngine,
+        ) : CBalBaseBAFunctions(hModule)
-        __in const BA_FUNCTIONS_CREATE_ARGS* pArgs
-        ) : CBalBaseBAFunctions(hModule, pEngine, pArgs)
    {
+        m_sczBARuntimeDirectory = NULL;
    }
    //
@@ -45,9 +60,11 @@ public:
    //
    ~CPrereqBaf()
    {
+        ReleaseNullStr(m_sczBARuntimeDirectory);
    }
 private:
+    LPWSTR m_sczBARuntimeDirectory;
 };
@@ -59,21 +76,21 @@ HRESULT WINAPI CreateBAFunctions(
 {
    HRESULT hr = S_OK;
    CPrereqBaf* pBAFunctions = NULL;
-    IBootstrapperEngine* pEngine = NULL;
-    hr = BalInitializeFromCreateArgs(pArgs->pBootstrapperCreateArgs, &pEngine);
+    BalInitialize(pArgs->pEngine);
-    ExitOnFailure(hr, "Failed to initialize Bal.");
-    pBAFunctions = new CPrereqBaf(hModule, pEngine, pArgs);
+    pBAFunctions = new CPrereqBaf(hModule);
    ExitOnNull(pBAFunctions, hr, E_OUTOFMEMORY, "Failed to create new CPrereqBaf object.");
+    hr = pBAFunctions->OnCreate(pArgs->pEngine, pArgs->pCommand);
+    ExitOnFailure(hr, "Failed to call OnCreate CPrereqBaf.");
    pResults->pfnBAFunctionsProc = BalBaseBAFunctionsProc;
    pResults->pvBAFunctionsProcContext = pBAFunctions;
    pBAFunctions = NULL;
 LExit:
    ReleaseObject(pBAFunctions);
-    ReleaseObject(pEngine);
    return hr;
 }
diff --git a/src/test/burn/TestData/Templates/Bundle.wxs b/src/test/burn/TestData/Templates/Bundle.wxs
index 43974524..ee3b5f4e 100644
--- a/src/test/burn/TestData/Templates/Bundle.wxs
+++ b/src/test/burn/TestData/Templates/Bundle.wxs
@@ -32,6 +32,7 @@
    <?elseif $(var.BA) = "hyperlinkLicense"?>
      <BootstrapperApplication>
        <bal:WixStandardBootstrapperApplication LicenseUrl="" Theme="hyperlinkLicense" />
+        <PayloadGroupRef Id="ExtraPayloads" />
      </BootstrapperApplication>
    <?elseif $(var.BA) = "iui"?>
      <BootstrapperApplication>
@@ -59,4 +60,9 @@
      <PackageGroupRef Id="BundlePackages" />
    </Chain>
  </Bundle>
+  <Fragment>
+    <PayloadGroup Id="virtual ExtraPayloads" />
+  </Fragment>
 </Wix>
diff --git a/src/test/burn/TestData/TestBA/TestBAWixlib/NetCore6_Platform.wxi b/src/test/burn/TestData/TestBA/TestBAWixlib/NetCore6_Platform.wxi
index c09c3624..e3458815 100644
--- a/src/test/burn/TestData/TestBA/TestBAWixlib/NetCore6_Platform.wxi
+++ b/src/test/burn/TestData/TestBA/TestBAWixlib/NetCore6_Platform.wxi
@@ -35,7 +35,7 @@
      <PackageGroupRef Id="$(var.AspNetCoreRedistId)" />
    </PackageGroup>
-    <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.AspNetCoreRedistId)" LicenseUrl="$(var.NetCoreEulaLink)" />
+    <bal:BootstrapperApplicationPrerequisiteInformation PackageId="$(var.AspNetCoreRedistId)" LicenseUrl="$(var.NetCoreEulaLink)" />
  </Fragment>
  <Fragment>
@@ -43,7 +43,7 @@
      <PackageGroupRef Id="$(var.DesktopNetCoreRedistId)" />
    </PackageGroup>
-    <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.DesktopNetCoreRedistId)" LicenseUrl="$(var.NetCoreEulaLink)" />
+    <bal:BootstrapperApplicationPrerequisiteInformation PackageId="$(var.DesktopNetCoreRedistId)" LicenseUrl="$(var.NetCoreEulaLink)" />
  </Fragment>
  <Fragment>
@@ -51,7 +51,7 @@
      <PackageGroupRef Id="$(var.DotNetCoreRedistId)" />
    </PackageGroup>
-    <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.DotNetCoreRedistId)" LicenseUrl="$(var.NetCoreEulaLink)" />
+    <bal:BootstrapperApplicationPrerequisiteInformation PackageId="$(var.DotNetCoreRedistId)" LicenseUrl="$(var.NetCoreEulaLink)" />
  </Fragment>
  <Fragment>
@@ -59,6 +59,6 @@
      <PackageGroupRef Id="$(var.DotNetCoreSdkRedistId)" />
    </PackageGroup>
-    <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.DotNetCoreSdkRedistId)" LicenseUrl="$(var.NetCoreEulaLink)" />
+    <bal:BootstrapperApplicationPrerequisiteInformation PackageId="$(var.DotNetCoreSdkRedistId)" LicenseUrl="$(var.NetCoreEulaLink)" />
  </Fragment>
 </Include>
diff --git a/src/test/burn/TestData/TestBA/TestBAWixlib/TestBA.wxs b/src/test/burn/TestData/TestBA/TestBAWixlib/TestBA.wxs
index 2db22e4b..98c3acb2 100644
--- a/src/test/burn/TestData/TestBA/TestBAWixlib/TestBA.wxs
+++ b/src/test/burn/TestData/TestBA/TestBAWixlib/TestBA.wxs
@@ -1,13 +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. -->
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
  <Fragment>
-    <BootstrapperApplication>
+    <BootstrapperApplication SourceFile="!(bindpath.dncx86)\TestBA.exe">
      <Payload SourceFile="!(bindpath.dncx86)\TestBA.deps.json" />
-      <Payload SourceFile="!(bindpath.dncx86)\TestBA.dll" bal:BAFactoryAssembly="yes" />
+      <Payload SourceFile="!(bindpath.dncx86)\TestBA.dll" />
      <Payload SourceFile="!(bindpath.dncx86)\TestBA.runtimeconfig.json" />
      <Payload SourceFile="!(bindpath.dncx86)\mbanative.dll" />
      <Payload SourceFile="!(bindpath.dncx86)\WixToolset.Mba.Core.dll" />
-      <bal:WixDotNetCoreBootstrapperApplicationHost />
    </BootstrapperApplication>
    <PackageGroup Id="TestBAdnc">
@@ -15,12 +14,10 @@
    </PackageGroup>
  </Fragment>
  <Fragment>
-    <BootstrapperApplication>
+    <BootstrapperApplication SourceFile="!(bindpath.net2x86)\TestBA.exe">
-      <Payload Name="WixToolset.Mba.Host.config" SourceFile="!(bindpath.net2x86)\TestBA.BootstrapperCore.config" />
+      <Payload SourceFile="!(bindpath.net2x86)\TestBA.exe.config" />
-      <Payload SourceFile="!(bindpath.net2x86)\TestBA.dll" />
      <Payload SourceFile="!(bindpath.net2x86)\mbanative.dll" />
      <Payload SourceFile="!(bindpath.net2x86)\WixToolset.Mba.Core.dll" />
-      <bal:WixManagedBootstrapperApplicationHost />
    </BootstrapperApplication>
    <PackageGroup Id="TestBA">
diff --git a/src/test/burn/TestData/TestBA/TestBAWixlib/WixBA.wxs b/src/test/burn/TestData/TestBA/TestBAWixlib/WixBA.wxs
index c6da2a17..3d4eb274 100644
--- a/src/test/burn/TestData/TestBA/TestBAWixlib/WixBA.wxs
+++ b/src/test/burn/TestData/TestBA/TestBAWixlib/WixBA.wxs
@@ -1,13 +1,11 @@
 <!-- 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. -->
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
  <Fragment>
-    <BootstrapperApplication>
+    <BootstrapperApplication SourceFile="!(bindpath.net4x86)\WixToolset.WixBA.exe">
-      <Payload Name="WixToolset.Mba.Host.config" SourceFile="!(bindpath.net4x86)\WixBA.BootstrapperCore.config" />
+      <Payload SourceFile="!(bindpath.net4x86)\WixToolset.WixBA.exe.config" />
-      <Payload SourceFile="!(bindpath.net4x86)\WixToolset.WixBA.dll" />
      <Payload SourceFile="!(bindpath.net4x86)\mbanative.dll" />
      <Payload SourceFile="!(bindpath.net4x86)\WixToolset.Mba.Core.dll" />
      <Payload SourceFile='..\..\..\..\..\..\License.txt' />
-      <bal:WixManagedBootstrapperApplicationHost />
    </BootstrapperApplication>
    <PackageGroup Id="WixBA">
diff --git a/src/test/burn/TestData/TestBA/TestBAWixlib_x64/TestBA_x64.wxs b/src/test/burn/TestData/TestBA/TestBAWixlib_x64/TestBA_x64.wxs
index f6a6382b..08d428a1 100644
--- a/src/test/burn/TestData/TestBA/TestBAWixlib_x64/TestBA_x64.wxs
+++ b/src/test/burn/TestData/TestBA/TestBAWixlib_x64/TestBA_x64.wxs
@@ -1,13 +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. -->
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
  <Fragment>
-    <BootstrapperApplication>
+    <BootstrapperApplication SourceFile="!(bindpath.dncx64)\TestBA.exe">
      <Payload SourceFile="!(bindpath.dncx64)\TestBA.deps.json" />
-      <Payload SourceFile="!(bindpath.dncx64)\TestBA.dll" bal:BAFactoryAssembly="yes" />
+      <Payload SourceFile="!(bindpath.dncx64)\TestBA.dll" />
      <Payload SourceFile="!(bindpath.dncx64)\TestBA.runtimeconfig.json" />
      <Payload SourceFile="!(bindpath.dncx64)\mbanative.dll" />
      <Payload SourceFile="!(bindpath.dncx64)\WixToolset.Mba.Core.dll" />
-      <bal:WixDotNetCoreBootstrapperApplicationHost />
    </BootstrapperApplication>
    <PackageGroup Id="TestBAdnc_x64">
@@ -15,12 +14,10 @@
    </PackageGroup>
  </Fragment>
  <Fragment>
-    <BootstrapperApplication>
+    <BootstrapperApplication SourceFile="!(bindpath.net2x64)\TestBA.exe">
-      <Payload Name="WixToolset.Mba.Host.config" SourceFile="!(bindpath.net2x64)\TestBA.BootstrapperCore.config" />
+      <Payload SourceFile="!(bindpath.net2x64)\TestBA.exe.config" />
-      <Payload SourceFile="!(bindpath.net2x64)\TestBA.dll" />
      <Payload SourceFile="!(bindpath.net2x64)\mbanative.dll" />
      <Payload SourceFile="!(bindpath.net2x64)\WixToolset.Mba.Core.dll" />
-      <bal:WixManagedBootstrapperApplicationHost />
    </BootstrapperApplication>
    <PackageGroup Id="TestBA_x64">
diff --git a/src/test/burn/TestData/TestBA/TestBAWixlib_x64/WixBA_x64.wxs b/src/test/burn/TestData/TestBA/TestBAWixlib_x64/WixBA_x64.wxs
index e9cd9827..ef465e23 100644
--- a/src/test/burn/TestData/TestBA/TestBAWixlib_x64/WixBA_x64.wxs
+++ b/src/test/burn/TestData/TestBA/TestBAWixlib_x64/WixBA_x64.wxs
@@ -1,14 +1,13 @@
 <!-- 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. -->
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal" xmlns:netfx="http://wixtoolset.org/schemas/v4/wxs/netfx">
  <Fragment>
-    <BootstrapperApplication>
+    <BootstrapperApplication SourceFile="!(bindpath.dncx64)\WixToolset.WixBA.exe">
      <Payload SourceFile="!(bindpath.dncx64)\WixToolset.WixBA.deps.json" />
-      <Payload SourceFile="!(bindpath.dncx64)\WixToolset.WixBA.dll" bal:BAFactoryAssembly="yes" />
+      <Payload SourceFile="!(bindpath.dncx64)\WixToolset.WixBA.dll" />
      <Payload SourceFile="!(bindpath.dncx64)\WixToolset.WixBA.runtimeconfig.json" />
      <Payload SourceFile="!(bindpath.dncx64)\mbanative.dll" />
      <Payload SourceFile="!(bindpath.dncx64)\WixToolset.Mba.Core.dll" />
      <Payload SourceFile='..\..\..\..\..\..\License.txt' />
-      <bal:WixDotNetCoreBootstrapperApplicationHost />
    </BootstrapperApplication>
    <PackageGroup Id="WixBAdnc_x64">
diff --git a/src/test/burn/TestData/UpdateBundleTests/BundleBv1/Bundle.wxs b/src/test/burn/TestData/UpdateBundleTests/BundleBv1/Bundle.wxs
index 906121f4..63f3043b 100644
--- a/src/test/burn/TestData/UpdateBundleTests/BundleBv1/Bundle.wxs
+++ b/src/test/burn/TestData/UpdateBundleTests/BundleBv1/Bundle.wxs
@@ -22,9 +22,7 @@
    <?elseif $(var.BA) = "TestBAdnc"?>
      <!-- pulled in through the PackageGroupRef below -->
    <?elseif $(var.BA) = "hyperlinkLicense"?>
-      <BootstrapperApplication>
+      <bal:WixStandardBootstrapperApplication LicenseUrl="" Theme="hyperlinkLicense" />
-        <bal:WixStandardBootstrapperApplication LicenseUrl="" Theme="hyperlinkLicense" />
-      </BootstrapperApplication>
    <?else?>
      <BootstrapperApplicationRef Id="$(var.BA)" />
    <?endif?>
diff --git a/src/test/burn/TestData/WixStdBaTests/BundleA/Bundle.wxs b/src/test/burn/TestData/WixStdBaTests/BundleA/Bundle.wxs
index 70b8ed1f..44f52817 100644
--- a/src/test/burn/TestData/WixStdBaTests/BundleA/Bundle.wxs
+++ b/src/test/burn/TestData/WixStdBaTests/BundleA/Bundle.wxs
@@ -9,7 +9,7 @@
    <?endif?>
    <Update Location='$(UpdateFeed)' />
-    
    <Variable Name="TestGroupName" Value="$(var.TestGroupName)" />
    <BootstrapperApplication>