191 files changed, 1486 insertions, 4815 deletions
diff --git a/src/ext/Bal/Bal.wixext.sln b/src/ext/Bal/Bal.wixext.sln
index be7149f4..f341a7be 100644
--- a/src/ext/Bal/Bal.wixext.sln
+++ b/src/ext/Bal/Bal.wixext.sln
@@ -1,45 +1,21 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
+# Visual Studio Version 17
-VisualStudioVersion = 16.0.29503.13
+VisualStudioVersion = 17.8.34408.163
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{C70E3534-A018-4D0A-A340-916C9777EEF7}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bafunctions", "Samples\bafunctions\bafunctions.vcxproj", "{EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mbahost", "mbahost\mbahost.vcxproj", "{12C87C77-3547-44F8-8134-29BC915CB19D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wixiuiba", "wixiuiba\wixiuiba.vcxproj", "{0F73E566-925C-448D-99CB-3A7F5DF399C8}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wixstdba", "wixstdba\wixstdba.vcxproj", "{41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}"
 EndProject
 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "bal", "wixlib\bal.wixproj", "{3444D952-F21C-496F-AB6B-56435BFD0787}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Bal.wixext", "wixext\WixToolset.Bal.wixext.csproj", "{BF720A63-9D7B-456E-B60C-8122852D9FED}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Dnc.HostGenerator", "WixToolset.Dnc.HostGenerator\WixToolset.Dnc.HostGenerator.csproj", "{D6A58B36-D47E-4020-A130-58B0CEAF01A2}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Mba.Host", "WixToolset.Mba.Host\WixToolset.Mba.Host.csproj", "{F2BA1935-70FA-4156-B161-FD03850B4FAA}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Example.FullFramework2MBA", "test\examples\FullFramework2MBA\Example.FullFramework2MBA.csproj", "{CC4236FC-226E-4232-AB50-24CBEC4D314D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Example.TestEngine", "test\examples\TestEngine\Example.TestEngine.vcxproj", "{3D44B67D-A475-49BA-8310-E39F6C117CC9}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Dnc.HostGenerator", "test\WixToolsetTest.Dnc.HostGenerator\WixToolsetTest.Dnc.HostGenerator.csproj", "{38D80FC7-EBD4-4902-A114-C93AA75CFCA0}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.ManagedHost", "test\WixToolsetTest.ManagedHost\WixToolsetTest.ManagedHost.csproj", "{FED9D707-E5C3-4867-87B0-FABDB5EB0823}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Example.FullFramework4MBA", "test\examples\FullFramework4MBA\Example.FullFramework4MBA.csproj", "{44297646-706D-4508-8E96-1B35B109694C}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Bal", "test\WixToolsetTest.Bal\WixToolsetTest.Bal.csproj", "{89D479FC-20DA-44D8-AE38-48F063223498}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Example.EarliestCoreMBA", "test\examples\EarliestCoreMBA\Example.EarliestCoreMBA.csproj", "{1E86D8DF-DABD-4B6E-A812-64CD2040C73A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wixiuiba", "wixiuiba\wixiuiba.vcxproj", "{0F73E566-925C-448D-99CB-3A7F5DF399C8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dnchost", "dnchost\dnchost.vcxproj", "{B6F70281-6583-4138-BB7F-AABFEBBB3CA2}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Example.LatestCoreMBA", "test\examples\LatestCoreMBA\Example.LatestCoreMBA.csproj", "{A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Example.WPFCoreMBA", "test\examples\WPFCoreMBA\Example.WPFCoreMBA.csproj", "{8E707BF2-FD72-4649-8727-BA5955D48D40}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stdbas", "stdbas\stdbas.vcxproj", "{DBBF5F32-BAEA-46A8-99A0-17277A906456}"
 EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -69,38 +45,6 @@ Global
                {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Release|x64.Build.0 = Release|x64
                {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|ARM64.ActiveCfg = Debug|ARM64
-                {12C87C77-3547-44F8-8134-29BC915CB19D}.Debug|ARM64.Build.0 = Debug|ARM64
-                {12C87C77-3547-44F8-8134-29BC915CB19D}.Debug|x64.ActiveCfg = Debug|x64
-                {12C87C77-3547-44F8-8134-29BC915CB19D}.Debug|x64.Build.0 = Debug|x64
-                {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|ARM64.ActiveCfg = Release|ARM64
-                {12C87C77-3547-44F8-8134-29BC915CB19D}.Release|ARM64.Build.0 = Release|ARM64
-                {12C87C77-3547-44F8-8134-29BC915CB19D}.Release|x64.ActiveCfg = Release|x64
-                {12C87C77-3547-44F8-8134-29BC915CB19D}.Release|x64.Build.0 = Release|x64
-                {12C87C77-3547-44F8-8134-29BC915CB19D}.Release|x86.ActiveCfg = Release|Win32
-                {12C87C77-3547-44F8-8134-29BC915CB19D}.Release|x86.Build.0 = Release|Win32
-                {0F73E566-925C-448D-99CB-3A7F5DF399C8}.Debug|Any CPU.ActiveCfg = Debug|Win32
-                {0F73E566-925C-448D-99CB-3A7F5DF399C8}.Debug|Any CPU.Build.0 = Debug|Win32
-                {0F73E566-925C-448D-99CB-3A7F5DF399C8}.Debug|ARM64.ActiveCfg = Debug|ARM64
-                {0F73E566-925C-448D-99CB-3A7F5DF399C8}.Debug|ARM64.Build.0 = Debug|ARM64
-                {0F73E566-925C-448D-99CB-3A7F5DF399C8}.Debug|x64.ActiveCfg = Debug|x64
-                {0F73E566-925C-448D-99CB-3A7F5DF399C8}.Debug|x64.Build.0 = Debug|x64
-                {0F73E566-925C-448D-99CB-3A7F5DF399C8}.Debug|x86.ActiveCfg = Debug|Win32
-                {0F73E566-925C-448D-99CB-3A7F5DF399C8}.Debug|x86.Build.0 = Debug|Win32
-                {0F73E566-925C-448D-99CB-3A7F5DF399C8}.Release|Any CPU.ActiveCfg = Release|Win32
-                {0F73E566-925C-448D-99CB-3A7F5DF399C8}.Release|Any CPU.Build.0 = Release|Win32
-                {0F73E566-925C-448D-99CB-3A7F5DF399C8}.Release|ARM64.ActiveCfg = Release|ARM64
-                {0F73E566-925C-448D-99CB-3A7F5DF399C8}.Release|ARM64.Build.0 = Release|ARM64
-                {0F73E566-925C-448D-99CB-3A7F5DF399C8}.Release|x64.ActiveCfg = Release|x64
-                {0F73E566-925C-448D-99CB-3A7F5DF399C8}.Release|x64.Build.0 = Release|x64
-                {0F73E566-925C-448D-99CB-3A7F5DF399C8}.Release|x86.ActiveCfg = Release|Win32
-                {0F73E566-925C-448D-99CB-3A7F5DF399C8}.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|ARM64.ActiveCfg = Debug|ARM64
@@ -145,118 +89,6 @@ Global
                {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
-                {D6A58B36-D47E-4020-A130-58B0CEAF01A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {D6A58B36-D47E-4020-A130-58B0CEAF01A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {D6A58B36-D47E-4020-A130-58B0CEAF01A2}.Debug|ARM64.ActiveCfg = Debug|AnyCPU
-                {D6A58B36-D47E-4020-A130-58B0CEAF01A2}.Debug|ARM64.Build.0 = Debug|AnyCPU
-                {D6A58B36-D47E-4020-A130-58B0CEAF01A2}.Debug|x64.ActiveCfg = Debug|AnyCPU
-                {D6A58B36-D47E-4020-A130-58B0CEAF01A2}.Debug|x64.Build.0 = Debug|AnyCPU
-                {D6A58B36-D47E-4020-A130-58B0CEAF01A2}.Debug|x86.ActiveCfg = Debug|AnyCPU
-                {D6A58B36-D47E-4020-A130-58B0CEAF01A2}.Debug|x86.Build.0 = Debug|AnyCPU
-                {D6A58B36-D47E-4020-A130-58B0CEAF01A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {D6A58B36-D47E-4020-A130-58B0CEAF01A2}.Release|Any CPU.Build.0 = Release|Any CPU
-                {D6A58B36-D47E-4020-A130-58B0CEAF01A2}.Release|ARM64.ActiveCfg = Release|AnyCPU
-                {D6A58B36-D47E-4020-A130-58B0CEAF01A2}.Release|ARM64.Build.0 = Release|AnyCPU
-                {D6A58B36-D47E-4020-A130-58B0CEAF01A2}.Release|x64.ActiveCfg = Release|AnyCPU
-                {D6A58B36-D47E-4020-A130-58B0CEAF01A2}.Release|x64.Build.0 = Release|AnyCPU
-                {D6A58B36-D47E-4020-A130-58B0CEAF01A2}.Release|x86.ActiveCfg = Release|AnyCPU
-                {D6A58B36-D47E-4020-A130-58B0CEAF01A2}.Release|x86.Build.0 = Release|AnyCPU
-                {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|ARM64.ActiveCfg = Debug|Any CPU
-                {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Debug|ARM64.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|ARM64.ActiveCfg = Release|Any CPU
-                {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Release|ARM64.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|ARM64.ActiveCfg = Debug|Any CPU
-                {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Debug|ARM64.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|ARM64.ActiveCfg = Release|Any CPU
-                {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Release|ARM64.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|x64
-                {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Debug|Any CPU.Build.0 = Debug|x64
-                {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Debug|ARM64.ActiveCfg = Debug|ARM64
-                {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Debug|ARM64.Build.0 = Debug|ARM64
-                {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|x64
-                {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Release|Any CPU.Build.0 = Release|x64
-                {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Release|ARM64.ActiveCfg = Release|ARM64
-                {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Release|ARM64.Build.0 = Release|ARM64
-                {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
-                {38D80FC7-EBD4-4902-A114-C93AA75CFCA0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {38D80FC7-EBD4-4902-A114-C93AA75CFCA0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {38D80FC7-EBD4-4902-A114-C93AA75CFCA0}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-                {38D80FC7-EBD4-4902-A114-C93AA75CFCA0}.Debug|ARM64.Build.0 = Debug|Any CPU
-                {38D80FC7-EBD4-4902-A114-C93AA75CFCA0}.Debug|x64.ActiveCfg = Debug|Any CPU
-                {38D80FC7-EBD4-4902-A114-C93AA75CFCA0}.Debug|x64.Build.0 = Debug|Any CPU
-                {38D80FC7-EBD4-4902-A114-C93AA75CFCA0}.Debug|x86.ActiveCfg = Debug|Any CPU
-                {38D80FC7-EBD4-4902-A114-C93AA75CFCA0}.Debug|x86.Build.0 = Debug|Any CPU
-                {38D80FC7-EBD4-4902-A114-C93AA75CFCA0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {38D80FC7-EBD4-4902-A114-C93AA75CFCA0}.Release|Any CPU.Build.0 = Release|Any CPU
-                {38D80FC7-EBD4-4902-A114-C93AA75CFCA0}.Release|ARM64.ActiveCfg = Release|Any CPU
-                {38D80FC7-EBD4-4902-A114-C93AA75CFCA0}.Release|ARM64.Build.0 = Release|Any CPU
-                {38D80FC7-EBD4-4902-A114-C93AA75CFCA0}.Release|x64.ActiveCfg = Release|Any CPU
-                {38D80FC7-EBD4-4902-A114-C93AA75CFCA0}.Release|x64.Build.0 = Release|Any CPU
-                {38D80FC7-EBD4-4902-A114-C93AA75CFCA0}.Release|x86.ActiveCfg = Release|Any CPU
-                {38D80FC7-EBD4-4902-A114-C93AA75CFCA0}.Release|x86.Build.0 = Release|Any CPU
-                {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|ARM64.ActiveCfg = Debug|Any CPU
-                {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Debug|ARM64.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|ARM64.ActiveCfg = Release|Any CPU
-                {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Release|ARM64.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|ARM64.ActiveCfg = Debug|Any CPU
-                {44297646-706D-4508-8E96-1B35B109694C}.Debug|ARM64.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|ARM64.ActiveCfg = Release|Any CPU
-                {44297646-706D-4508-8E96-1B35B109694C}.Release|ARM64.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
                {89D479FC-20DA-44D8-AE38-48F063223498}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                {89D479FC-20DA-44D8-AE38-48F063223498}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {89D479FC-20DA-44D8-AE38-48F063223498}.Debug|ARM64.ActiveCfg = Debug|Any CPU
@@ -273,82 +105,42 @@ Global
                {89D479FC-20DA-44D8-AE38-48F063223498}.Release|x64.Build.0 = Release|Any CPU
                {89D479FC-20DA-44D8-AE38-48F063223498}.Release|x86.ActiveCfg = Release|Any CPU
                {89D479FC-20DA-44D8-AE38-48F063223498}.Release|x86.Build.0 = Release|Any CPU
-                {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {0F73E566-925C-448D-99CB-3A7F5DF399C8}.Debug|Any CPU.ActiveCfg = Debug|x64
-                {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {0F73E566-925C-448D-99CB-3A7F5DF399C8}.Debug|Any CPU.Build.0 = Debug|x64
-                {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+                {0F73E566-925C-448D-99CB-3A7F5DF399C8}.Debug|ARM64.ActiveCfg = Debug|ARM64
-                {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Debug|ARM64.Build.0 = Debug|Any CPU
+                {0F73E566-925C-448D-99CB-3A7F5DF399C8}.Debug|ARM64.Build.0 = Debug|ARM64
-                {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Debug|x64.ActiveCfg = Debug|Any CPU
+                {0F73E566-925C-448D-99CB-3A7F5DF399C8}.Debug|x64.ActiveCfg = Debug|x64
-                {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Debug|x64.Build.0 = Debug|Any CPU
+                {0F73E566-925C-448D-99CB-3A7F5DF399C8}.Debug|x64.Build.0 = Debug|x64
-                {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Debug|x86.ActiveCfg = Debug|Any CPU
+                {0F73E566-925C-448D-99CB-3A7F5DF399C8}.Debug|x86.ActiveCfg = Debug|Win32
-                {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Debug|x86.Build.0 = Debug|Any CPU
+                {0F73E566-925C-448D-99CB-3A7F5DF399C8}.Debug|x86.Build.0 = Debug|Win32
-                {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {0F73E566-925C-448D-99CB-3A7F5DF399C8}.Release|Any CPU.ActiveCfg = Release|x64
-                {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Release|Any CPU.Build.0 = Release|Any CPU
+                {0F73E566-925C-448D-99CB-3A7F5DF399C8}.Release|Any CPU.Build.0 = Release|x64
-                {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Release|ARM64.ActiveCfg = Release|Any CPU
+                {0F73E566-925C-448D-99CB-3A7F5DF399C8}.Release|ARM64.ActiveCfg = Release|ARM64
-                {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Release|ARM64.Build.0 = Release|Any CPU
+                {0F73E566-925C-448D-99CB-3A7F5DF399C8}.Release|ARM64.Build.0 = Release|ARM64
-                {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Release|x64.ActiveCfg = Release|Any CPU
+                {0F73E566-925C-448D-99CB-3A7F5DF399C8}.Release|x64.ActiveCfg = Release|x64
-                {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Release|x64.Build.0 = Release|Any CPU
+                {0F73E566-925C-448D-99CB-3A7F5DF399C8}.Release|x64.Build.0 = Release|x64
-                {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Release|x86.ActiveCfg = Release|Any CPU
+                {0F73E566-925C-448D-99CB-3A7F5DF399C8}.Release|x86.ActiveCfg = Release|Win32
-                {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Release|x86.Build.0 = Release|Any CPU
+                {0F73E566-925C-448D-99CB-3A7F5DF399C8}.Release|x86.Build.0 = Release|Win32
-                {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Debug|Any CPU.ActiveCfg = Debug|Win32
+                {DBBF5F32-BAEA-46A8-99A0-17277A906456}.Debug|Any CPU.ActiveCfg = Debug|x64
-                {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Debug|Any CPU.Build.0 = Debug|Win32
+                {DBBF5F32-BAEA-46A8-99A0-17277A906456}.Debug|Any CPU.Build.0 = Debug|x64
-                {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Debug|ARM64.ActiveCfg = Debug|ARM64
+                {DBBF5F32-BAEA-46A8-99A0-17277A906456}.Debug|ARM64.ActiveCfg = Debug|ARM64
-                {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Debug|ARM64.Build.0 = Debug|ARM64
+                {DBBF5F32-BAEA-46A8-99A0-17277A906456}.Debug|ARM64.Build.0 = Debug|ARM64
-                {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Debug|x64.ActiveCfg = Debug|x64
+                {DBBF5F32-BAEA-46A8-99A0-17277A906456}.Debug|x64.ActiveCfg = Debug|x64
-                {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Debug|x64.Build.0 = Debug|x64
+                {DBBF5F32-BAEA-46A8-99A0-17277A906456}.Debug|x64.Build.0 = Debug|x64
-                {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Debug|x86.ActiveCfg = Debug|Win32
+                {DBBF5F32-BAEA-46A8-99A0-17277A906456}.Debug|x86.ActiveCfg = Debug|Win32
-                {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Debug|x86.Build.0 = Debug|Win32
+                {DBBF5F32-BAEA-46A8-99A0-17277A906456}.Debug|x86.Build.0 = Debug|Win32
-                {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Release|Any CPU.ActiveCfg = Release|Win32
+                {DBBF5F32-BAEA-46A8-99A0-17277A906456}.Release|Any CPU.ActiveCfg = Release|x64
-                {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Release|Any CPU.Build.0 = Release|Win32
+                {DBBF5F32-BAEA-46A8-99A0-17277A906456}.Release|Any CPU.Build.0 = Release|x64
-                {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Release|ARM64.ActiveCfg = Release|ARM64
+                {DBBF5F32-BAEA-46A8-99A0-17277A906456}.Release|ARM64.ActiveCfg = Release|ARM64
-                {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Release|ARM64.Build.0 = Release|ARM64
+                {DBBF5F32-BAEA-46A8-99A0-17277A906456}.Release|ARM64.Build.0 = Release|ARM64
-                {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Release|x64.ActiveCfg = Release|x64
+                {DBBF5F32-BAEA-46A8-99A0-17277A906456}.Release|x64.ActiveCfg = Release|x64
-                {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Release|x64.Build.0 = Release|x64
+                {DBBF5F32-BAEA-46A8-99A0-17277A906456}.Release|x64.Build.0 = Release|x64
-                {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Release|x86.ActiveCfg = Release|Win32
+                {DBBF5F32-BAEA-46A8-99A0-17277A906456}.Release|x86.ActiveCfg = Release|Win32
-                {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Release|x86.Build.0 = Release|Win32
+                {DBBF5F32-BAEA-46A8-99A0-17277A906456}.Release|x86.Build.0 = Release|Win32
-                {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-                {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Debug|ARM64.Build.0 = Debug|Any CPU
-                {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Debug|x64.ActiveCfg = Debug|Any CPU
-                {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Debug|x64.Build.0 = Debug|Any CPU
-                {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Debug|x86.ActiveCfg = Debug|Any CPU
-                {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Debug|x86.Build.0 = Debug|Any CPU
-                {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Release|Any CPU.Build.0 = Release|Any CPU
-                {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Release|ARM64.ActiveCfg = Release|Any CPU
-                {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Release|ARM64.Build.0 = Release|Any CPU
-                {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Release|x64.ActiveCfg = Release|Any CPU
-                {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Release|x64.Build.0 = Release|Any CPU
-                {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Release|x86.ActiveCfg = Release|Any CPU
-                {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Release|x86.Build.0 = Release|Any CPU
-                {8E707BF2-FD72-4649-8727-BA5955D48D40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {8E707BF2-FD72-4649-8727-BA5955D48D40}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {8E707BF2-FD72-4649-8727-BA5955D48D40}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-                {8E707BF2-FD72-4649-8727-BA5955D48D40}.Debug|ARM64.Build.0 = Debug|Any CPU
-                {8E707BF2-FD72-4649-8727-BA5955D48D40}.Debug|x64.ActiveCfg = Debug|Any CPU
-                {8E707BF2-FD72-4649-8727-BA5955D48D40}.Debug|x64.Build.0 = Debug|Any CPU
-                {8E707BF2-FD72-4649-8727-BA5955D48D40}.Debug|x86.ActiveCfg = Debug|Any CPU
-                {8E707BF2-FD72-4649-8727-BA5955D48D40}.Debug|x86.Build.0 = Debug|Any CPU
-                {8E707BF2-FD72-4649-8727-BA5955D48D40}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {8E707BF2-FD72-4649-8727-BA5955D48D40}.Release|Any CPU.Build.0 = Release|Any CPU
-                {8E707BF2-FD72-4649-8727-BA5955D48D40}.Release|ARM64.ActiveCfg = Release|Any CPU
-                {8E707BF2-FD72-4649-8727-BA5955D48D40}.Release|ARM64.Build.0 = Release|Any CPU
-                {8E707BF2-FD72-4649-8727-BA5955D48D40}.Release|x64.ActiveCfg = Release|Any CPU
-                {8E707BF2-FD72-4649-8727-BA5955D48D40}.Release|x64.Build.0 = Release|Any CPU
-                {8E707BF2-FD72-4649-8727-BA5955D48D40}.Release|x86.ActiveCfg = Release|Any CPU
-                {8E707BF2-FD72-4649-8727-BA5955D48D40}.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}
-                {1E86D8DF-DABD-4B6E-A812-64CD2040C73A} = {C70E3534-A018-4D0A-A340-916C9777EEF7}
-                {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618} = {C70E3534-A018-4D0A-A340-916C9777EEF7}
-                {8E707BF2-FD72-4649-8727-BA5955D48D40} = {C70E3534-A018-4D0A-A340-916C9777EEF7}
-        EndGlobalSection
        GlobalSection(ExtensibilityGlobals) = postSolution
                SolutionGuid = {74046961-48BF-467A-A6C2-F886C75CE0BE}
        EndGlobalSection
diff --git a/src/ext/Bal/Samples/bafunctions/WixSampleBAFunctions.cpp b/src/ext/Bal/Samples/bafunctions/WixSampleBAFunctions.cpp
index 5383efbf..14a898e8 100644
--- a/src/ext/Bal/Samples/bafunctions/WixSampleBAFunctions.cpp
+++ b/src/ext/Bal/Samples/bafunctions/WixSampleBAFunctions.cpp
@@ -51,10 +51,8 @@ public:
    // Constructor - initialize member variables.
    //
    CWixSampleBAFunctions(
-        __in HMODULE hModule,
+        __in HMODULE hModule
-        __in IBootstrapperEngine* pEngine,
+        ) : CBalBaseBAFunctions(hModule)
-        __in const BA_FUNCTIONS_CREATE_ARGS* pArgs
-        ) : CBalBaseBAFunctions(hModule, pEngine, pArgs)
    {
    }
@@ -75,22 +73,22 @@ HRESULT WINAPI CreateBAFunctions(
 {
    HRESULT hr = S_OK;
    CWixSampleBAFunctions* pBAFunctions = NULL;
-    IBootstrapperEngine* pEngine = NULL;
    // This is required to enable logging functions.
-    hr = BalInitializeFromCreateArgs(pArgs->pBootstrapperCreateArgs, &pEngine);
+    BalInitialize(pArgs->pEngine);
-    ExitOnFailure(hr, "Failed to initialize Bal.");
-    pBAFunctions = new CWixSampleBAFunctions(hModule, pEngine, pArgs);
+    pBAFunctions = new CWixSampleBAFunctions(hModule);
    ExitOnNull(pBAFunctions, hr, E_OUTOFMEMORY, "Failed to create new CWixSampleBAFunctions 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/ext/Bal/Samples/bafunctions/bafunctions.cpp b/src/ext/Bal/Samples/bafunctions/bafunctions.cpp
index fc9d1177..d26e7cce 100644
--- a/src/ext/Bal/Samples/bafunctions/bafunctions.cpp
+++ b/src/ext/Bal/Samples/bafunctions/bafunctions.cpp
@@ -26,13 +26,13 @@ extern "C" BOOL WINAPI DllMain(
 }
 extern "C" HRESULT WINAPI BAFunctionsCreate(
-    __in const BA_FUNCTIONS_CREATE_ARGS* pArgs,
+    __in const BA_FUNCTIONS_CREATE_ARGS* /*pArgs*/,
-    __inout BA_FUNCTIONS_CREATE_RESULTS* pResults
+    __inout BA_FUNCTIONS_CREATE_RESULTS* /*pResults*/
    )
 {
    HRESULT hr = S_OK;
    
-    hr = CreateBAFunctions(vhInstance, pArgs, pResults);
+    //hr = CreateBAFunctions(vhInstance, pArgs, pResults);
    BalExitOnFailure(hr, "Failed to create BAFunctions interface.");
 LExit:
diff --git a/src/ext/Bal/WixToolset.Dnc.HostGenerator/DncHostGenerator.cs b/src/ext/Bal/WixToolset.Dnc.HostGenerator/DncHostGenerator.cs
deleted file mode 100644
index 088b2b49..00000000
--- a/src/ext/Bal/WixToolset.Dnc.HostGenerator/DncHostGenerator.cs
+++ /dev/null
@@ -1,127 +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.
-namespace WixToolset.Dnc.HostGenerator
-{
-    using System;
-    using System.Diagnostics.CodeAnalysis;
-    using System.Text;
-    using Microsoft.CodeAnalysis;
-    using Microsoft.CodeAnalysis.Text;
-    [Generator]
-    public sealed class DncHostGenerator : ISourceGenerator
-    {
-        public static readonly string Version = String.Format($"{ThisAssembly.Git.SemVer.Major}.{ThisAssembly.Git.SemVer.Minor}.{ThisAssembly.Git.SemVer.Patch}{ThisAssembly.Git.SemVer.DashLabel}+{ThisAssembly.Git.Sha}");
-        public static readonly string TargetAttributeFullName = "WixToolset.Mba.Core.BootstrapperApplicationFactoryAttribute";
-        [SuppressMessage("MicrosoftCodeAnalysisReleaseTracking", "RS2008:Enable analyzer release tracking", Justification = "Tracking not needed")]
-        public static readonly DiagnosticDescriptor MissingFactoryAttributeDescriptor = new DiagnosticDescriptor(
-            "WIXBAL001",
-            $"Missing assembly level attribute {TargetAttributeFullName}.",
-            $"Add [assembly: {TargetAttributeFullName}(typeof(<your IBootstrapperApplicationFactory>)].",
-            "WixToolset.Bal.wixext",
-            DiagnosticSeverity.Error,
-            true
-        );
-        public void Initialize(GeneratorInitializationContext context)
-        {
-        }
-        public void Execute(GeneratorExecutionContext context)
-        {
-            var symbolDisplayFormat = new SymbolDisplayFormat(typeQualificationStyle: SymbolDisplayTypeQualificationStyle.NameAndContainingTypesAndNamespaces);
-            string baFactoryClassName = null;
-            foreach (var assemblyAttribute in context.Compilation.Assembly.GetAttributes())
-            {
-                var fullAssemblyTypeName = assemblyAttribute.AttributeClass.ToDisplayString(symbolDisplayFormat);
-                if (fullAssemblyTypeName == TargetAttributeFullName &&
-                    assemblyAttribute.ConstructorArguments.Length == 1)
-                {
-                    var arg = assemblyAttribute.ConstructorArguments[0];
-                    if (arg.Value is INamedTypeSymbol argValue)
-                    {
-                        baFactoryClassName = argValue.ToDisplayString(symbolDisplayFormat);
-                        break;
-                    }
-                }
-            }
-            if (baFactoryClassName == null)
-            {
-                context.ReportDiagnostic(Diagnostic.Create(MissingFactoryAttributeDescriptor, null));
-            }
-            else
-            {
-                var source = String.Format(Template, Version, baFactoryClassName);
-                context.AddSource("WixToolset.Dnc.Host.g.cs", SourceText.From(source, Encoding.UTF8, SourceHashAlgorithm.Sha256));
-            }
-        }
-        public const string Template = @"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-namespace WixToolset.Dnc.Host
-{{
-    using System;
-    using System.CodeDom.Compiler;
-    using System.Diagnostics.CodeAnalysis;
-    using System.Linq;
-    using System.Reflection;
-    using System.Runtime.CompilerServices;
-    using System.Runtime.InteropServices;
-    using WixToolset.Mba.Core;
-    [GeneratedCode(""WixToolset.Dnc.HostGenerator.DncHostGenerator"", ""{0}"")]
-    [CompilerGenerated]
-    delegate IBootstrapperApplicationFactory StaticEntryDelegate();
-    /// <summary>
-    /// Entry point for the .NET Core host to create and return the BA to the engine.
-    /// </summary>
-    [GeneratedCode(""WixToolset.Dnc.HostGenerator.DncHostGenerator"", ""{0}"")]
-    [CompilerGenerated]
-    public sealed class BootstrapperApplicationFactory : IBootstrapperApplicationFactory
-    {{
-        /// <summary>
-        /// Creates the bootstrapper application factory and calls its IBootstrapperApplicationFactory.Create method.
-        /// </summary>
-        /// <param name=""pArgs"">Pointer to BOOTSTRAPPER_CREATE_ARGS struct.</param>
-        /// <param name=""pResults"">Pointer to BOOTSTRAPPER_CREATE_RESULTS struct.</param>
-        public void Create(IntPtr pArgs, IntPtr pResults)
-        {{
-            var baFactory = new {1}();
-            baFactory.Create(pArgs, pResults);
-        }}
-        // Entry point for the DNC host.
-        public static IBootstrapperApplicationFactory CreateBAFactory()
-        {{
-            return new BootstrapperApplicationFactory();
-        }}
-#if NET5_0_OR_GREATER
-        [ModuleInitializer]
-        [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(BootstrapperApplicationFactory))]
-#if NET5_0
-        [DynamicDependency(""GetFunctionPointer(System.IntPtr,System.IntPtr,System.IntPtr,System.IntPtr,System.IntPtr,System.IntPtr)"", ""Internal.Runtime.InteropServices.ComponentActivator"", ""System.Private.CoreLib"")]
-#endif
-        /// <summary>
-        /// Empty method to attach above attributes to support linker trimming.
-        /// </summary>
-        public static void ModuleInitialize() {{ }}
-#endif
-    }}
-}}
-";
-    }
-}
diff --git a/src/ext/Bal/WixToolset.Dnc.HostGenerator/WixToolset.Dnc.HostGenerator.csproj b/src/ext/Bal/WixToolset.Dnc.HostGenerator/WixToolset.Dnc.HostGenerator.csproj
deleted file mode 100644
index 750db40e..00000000
--- a/src/ext/Bal/WixToolset.Dnc.HostGenerator/WixToolset.Dnc.HostGenerator.csproj
+++ /dev/null
@@ -1,27 +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 Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <RootNamespace>WixToolset.Dnc.HostGenerator</RootNamespace>
-    <Description>WiX Toolset .NET Core BA Host Generator</Description>
-    <Title>WiX Toolset .NET Core BA Host Generator</Title>
-    <DebugType>embedded</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <IncludeThisAssembly>true</IncludeThisAssembly>
-  </PropertyGroup>
-  <ItemGroup>
-    <Content Include="build\$(AssemblyName).props" CopyToOutputDirectory="PreserveNewest" />
-    <Content Include="build\$(AssemblyName).targets" CopyToOutputDirectory="PreserveNewest" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
-</Project>
diff --git a/src/ext/Bal/WixToolset.Dnc.HostGenerator/WixToolset.Dnc.HostGenerator.nuspec b/src/ext/Bal/WixToolset.Dnc.HostGenerator/WixToolset.Dnc.HostGenerator.nuspec
deleted file mode 100644
index 8f4de5e8..00000000
--- a/src/ext/Bal/WixToolset.Dnc.HostGenerator/WixToolset.Dnc.HostGenerator.nuspec
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-  <metadata>
-    <id>$id$</id>
-    <version>$version$</version>
-    <title>$title$</title>
-    <description>$description$</description>
-    <authors>$authors$</authors>
-    <icon>wix.png</icon>
-    <license type="expression">MS-RL</license>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <copyright>$copyright$</copyright>
-    <projectUrl>$projectUrl$</projectUrl>
-    <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
-    <dependencies>
-      <dependency id="WixToolset.Mba.Core" version="[$version$,5)" />
-    </dependencies>
-  </metadata>
-  <files>
-    <file src="$projectFolder$\..\..\..\internal\images\wix.png" />
-    <file src="$id$.dll" target="analyzers/dotnet/cs" />
-    <file src="build\**\*" target="build" />
-  </files>
-</package>
diff --git a/src/ext/Bal/WixToolset.Dnc.HostGenerator/build/WixToolset.Dnc.HostGenerator.props b/src/ext/Bal/WixToolset.Dnc.HostGenerator/build/WixToolset.Dnc.HostGenerator.props
deleted file mode 100644
index f9306af7..00000000
--- a/src/ext/Bal/WixToolset.Dnc.HostGenerator/build/WixToolset.Dnc.HostGenerator.props
+++ /dev/null
@@ -1,10 +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 xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="Current">
-  <PropertyGroup>
-    <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
-    <EnableDynamicLoading>true</EnableDynamicLoading>
-    <_EnableConsumingManagedCodeFromNativeHosting>true</_EnableConsumingManagedCodeFromNativeHosting>
-  </PropertyGroup>
-</Project>
diff --git a/src/ext/Bal/WixToolset.Dnc.HostGenerator/build/WixToolset.Dnc.HostGenerator.targets b/src/ext/Bal/WixToolset.Dnc.HostGenerator/build/WixToolset.Dnc.HostGenerator.targets
deleted file mode 100644
index d536ef5f..00000000
--- a/src/ext/Bal/WixToolset.Dnc.HostGenerator/build/WixToolset.Dnc.HostGenerator.targets
+++ /dev/null
@@ -1,11 +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 xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="Current">
-  <ItemGroup Condition=" '$(TrimMode)'=='CopyUsed' ">
-    <TrimmerRootAssembly Include="System.Diagnostics.Tools" />
-    <TrimmerRootAssembly Include="System.Runtime" />
-    <TrimmerRootAssembly Include="System.Runtime.InteropServices" />
-    <TrimmerRootAssembly Include="System.Runtime.Loader" />
-  </ItemGroup>
-</Project>
diff --git a/src/ext/Bal/WixToolset.Mba.Host/BootstrapperApplicationFactory.cs b/src/ext/Bal/WixToolset.Mba.Host/BootstrapperApplicationFactory.cs
deleted file mode 100644
index 78e68bd9..00000000
--- a/src/ext/Bal/WixToolset.Mba.Host/BootstrapperApplicationFactory.cs
+++ /dev/null
@@ -1,86 +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.
-namespace WixToolset.Mba.Host
-{
-    using System;
-    using System.Configuration;
-    using System.Reflection;
-    using System.Runtime.InteropServices;
-    using WixToolset.Mba.Core;
-    /// <summary>
-    /// Entry point for the managed host to create and return the BA to the engine.
-    /// </summary>
-    [ClassInterface(ClassInterfaceType.None)]
-    public sealed class BootstrapperApplicationFactory : MarshalByRefObject, IBootstrapperApplicationFactory
-    {
-        /// <summary>
-        /// Creates a new instance of the <see cref="BootstrapperApplicationFactory"/> class.
-        /// Entry point for the MBA host.
-        /// </summary>
-        public BootstrapperApplicationFactory()
-        {
-        }
-        /// <summary>
-        /// Loads the bootstrapper application assembly and calls its IBootstrapperApplicationFactory.Create method.
-        /// </summary>
-        /// <param name="pArgs">Pointer to BOOTSTRAPPER_CREATE_ARGS struct.</param>
-        /// <param name="pResults">Pointer to BOOTSTRAPPER_CREATE_RESULTS struct.</param>
-        /// <exception cref="MissingAttributeException">The bootstrapper application assembly
-        /// does not define the <see cref="BootstrapperApplicationFactoryAttribute"/>.</exception>
-        public void Create(IntPtr pArgs, IntPtr pResults)
-        {
-            // Get the wix.boostrapper section group to get the name of the bootstrapper application assembly to host.
-            var section = ConfigurationManager.GetSection("wix.bootstrapper/host") as HostSection;
-            if (null == section)
-            {
-                throw new MissingAttributeException(); // TODO: throw a more specific exception than this.
-            }
-            // Load the BA's IBootstrapperApplicationFactory.
-            var baFactoryType = BootstrapperApplicationFactory.GetBAFactoryTypeFromAssembly(section.AssemblyName);
-            var baFactory = (IBootstrapperApplicationFactory)Activator.CreateInstance(baFactoryType);
-            if (null == baFactory)
-            {
-                throw new InvalidBootstrapperApplicationFactoryException();
-            }
-            baFactory.Create(pArgs, pResults);
-        }
-        /// <summary>
-        /// Locates the <see cref="BootstrapperApplicationFactoryAttribute"/> and returns the specified type.
-        /// </summary>
-        /// <param name="assemblyName">The assembly that defines the IBootstrapperApplicationFactory implementation.</param>
-        /// <returns>The bootstrapper application factory <see cref="Type"/>.</returns>
-        private static Type GetBAFactoryTypeFromAssembly(string assemblyName)
-        {
-            Type baFactoryType = null;
-            // Load the requested assembly.
-            Assembly asm = AppDomain.CurrentDomain.Load(assemblyName);
-            // If an assembly was loaded and is not the current assembly, check for the required attribute.
-            // This is done to avoid using the BootstrapperApplicationFactoryAttribute which we use at build time
-            // to specify the BootstrapperApplicationFactory assembly in the manifest.
-            if (!Assembly.GetExecutingAssembly().Equals(asm))
-            {
-                // There must be one and only one BootstrapperApplicationFactoryAttribute.
-                // The attribute prevents multiple declarations already.
-                var attrs = (BootstrapperApplicationFactoryAttribute[])asm.GetCustomAttributes(typeof(BootstrapperApplicationFactoryAttribute), false);
-                if (null != attrs)
-                {
-                    baFactoryType = attrs[0].BootstrapperApplicationFactoryType;
-                }
-            }
-            if (null == baFactoryType)
-            {
-                throw new MissingAttributeException();
-            }
-            return baFactoryType;
-        }
-    }
-}
diff --git a/src/ext/Bal/WixToolset.Mba.Host/BootstrapperSectionGroup.cs b/src/ext/Bal/WixToolset.Mba.Host/BootstrapperSectionGroup.cs
deleted file mode 100644
index 5cf1bc9c..00000000
--- a/src/ext/Bal/WixToolset.Mba.Host/BootstrapperSectionGroup.cs
+++ /dev/null
@@ -1,29 +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.
-namespace WixToolset.Mba.Host
-{
-    using System;
-    using System.Configuration;
-    /// <summary>
-    /// Handler for the wix.bootstrapper configuration section group.
-    /// </summary>
-    public class BootstrapperSectionGroup : ConfigurationSectionGroup
-    {
-        /// <summary>
-        /// Creates a new instance of the <see cref="BootstrapperSectionGroup"/> class.
-        /// </summary>
-        public BootstrapperSectionGroup()
-        {
-        }
-        /// <summary>
-        /// Gets the <see cref="HostSection"/> handler for the mba configuration section.
-        /// </summary>
-        [ConfigurationProperty("host")]
-        public HostSection Host
-        {
-            get { return (HostSection)base.Sections["host"]; }
-        }
-    }
-}
diff --git a/src/ext/Bal/WixToolset.Mba.Host/Exceptions.cs b/src/ext/Bal/WixToolset.Mba.Host/Exceptions.cs
deleted file mode 100644
index c68951f0..00000000
--- a/src/ext/Bal/WixToolset.Mba.Host/Exceptions.cs
+++ /dev/null
@@ -1,145 +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.
-namespace WixToolset.Mba.Host
-{
-    using System;
-    using System.Runtime.Serialization;
-    /// <summary>
-    /// Base class for exception returned to the bootstrapper application host.
-    /// </summary>
-    [Serializable]
-    public abstract class BootstrapperException : Exception
-    {
-        /// <summary>
-        /// Creates an instance of the <see cref="BootstrapperException"/> base class with the given HRESULT.
-        /// </summary>
-        /// <param name="hr">The HRESULT for the exception that is used by the bootstrapper application host.</param>
-        public BootstrapperException(int hr)
-        {
-            this.HResult = hr;
-        }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="BootstrapperException"/> class.
-        /// </summary>
-        /// <param name="message">Exception message.</param>
-        public BootstrapperException(string message)
-            : base(message)
-        {
-        }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="BootstrapperException"/> class.
-        /// </summary>
-        /// <param name="message">Exception message</param>
-        /// <param name="innerException">Inner exception associated with this one</param>
-        public BootstrapperException(string message, Exception innerException)
-            : base(message, innerException)
-        {
-        }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="BootstrapperException"/> class.
-        /// </summary>
-        /// <param name="info">Serialization information for this exception</param>
-        /// <param name="context">Streaming context to serialize to</param>
-        protected BootstrapperException(SerializationInfo info, StreamingContext context)
-            : base(info, context)
-        {
-        }
-    }
-    /// <summary>
-    /// The bootstrapper application assembly loaded by the host does not contain exactly one instance of the
-    /// <see cref="Core.BootstrapperApplicationFactoryAttribute"/> class.
-    /// </summary>
-    /// <seealso cref="Core.BootstrapperApplicationFactoryAttribute"/>
-    [Serializable]
-    public class MissingAttributeException : BootstrapperException
-    {
-        /// <summary>
-        /// Creates a new instance of the <see cref="MissingAttributeException"/> class.
-        /// </summary>
-        public MissingAttributeException()
-            : base(NativeMethods.E_NOTFOUND)
-        {
-        }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MissingAttributeException"/> class.
-        /// </summary>
-        /// <param name="message">Exception message.</param>
-        public MissingAttributeException(string message)
-            : base(message)
-        {
-        }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MissingAttributeException"/> class.
-        /// </summary>
-        /// <param name="message">Exception message</param>
-        /// <param name="innerException">Inner exception associated with this one</param>
-        public MissingAttributeException(string message, Exception innerException)
-            : base(message, innerException)
-        {
-        }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MissingAttributeException"/> class.
-        /// </summary>
-        /// <param name="info">Serialization information for this exception</param>
-        /// <param name="context">Streaming context to serialize to</param>
-        protected MissingAttributeException(SerializationInfo info, StreamingContext context)
-            : base(info, context)
-        {
-        }
-    }
-    /// <summary>
-    /// The bootstrapper application factory specified by the <see cref="Core.BootstrapperApplicationFactoryAttribute"/>
-    ///  does not extend the <see cref="Core.IBootstrapperApplicationFactory"/> base class.
-    /// </summary>
-    /// <seealso cref="Core.BaseBootstrapperApplicationFactory"/>
-    /// <seealso cref="Core.BootstrapperApplicationFactoryAttribute"/>
-    [Serializable]
-    public class InvalidBootstrapperApplicationFactoryException : BootstrapperException
-    {
-        /// <summary>
-        /// Creates a new instance of the <see cref="InvalidBootstrapperApplicationFactoryException"/> class.
-        /// </summary>
-        public InvalidBootstrapperApplicationFactoryException()
-            : base(NativeMethods.E_UNEXPECTED)
-        {
-        }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="InvalidBootstrapperApplicationFactoryException"/> class.
-        /// </summary>
-        /// <param name="message">Exception message.</param>
-        public InvalidBootstrapperApplicationFactoryException(string message)
-            : base(message)
-        {
-        }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="InvalidBootstrapperApplicationFactoryException"/> class.
-        /// </summary>
-        /// <param name="message">Exception message</param>
-        /// <param name="innerException">Inner exception associated with this one</param>
-        public InvalidBootstrapperApplicationFactoryException(string message, Exception innerException)
-            : base(message, innerException)
-        {
-        }
-        /// <summary>
-        /// Initializes a new instance of the <see cref="InvalidBootstrapperApplicationFactoryException"/> class.
-        /// </summary>
-        /// <param name="info">Serialization information for this exception</param>
-        /// <param name="context">Streaming context to serialize to</param>
-        protected InvalidBootstrapperApplicationFactoryException(SerializationInfo info, StreamingContext context)
-            : base(info, context)
-        {
-        }
-    }
-}
diff --git a/src/ext/Bal/WixToolset.Mba.Host/HostSection.cs b/src/ext/Bal/WixToolset.Mba.Host/HostSection.cs
deleted file mode 100644
index 632025c7..00000000
--- a/src/ext/Bal/WixToolset.Mba.Host/HostSection.cs
+++ /dev/null
@@ -1,47 +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.
-namespace WixToolset.Mba.Host
-{
-    using System;
-    using System.Configuration;
-    /// <summary>
-    /// Handler for the Host configuration section.
-    /// </summary>
-    public sealed class HostSection : ConfigurationSection
-    {
-        private static readonly ConfigurationProperty assemblyNameProperty = new ConfigurationProperty("assemblyName", typeof(string), null, ConfigurationPropertyOptions.IsRequired);
-        private static readonly ConfigurationProperty supportedFrameworksProperty = new ConfigurationProperty("", typeof(SupportedFrameworkElementCollection), null, ConfigurationPropertyOptions.IsDefaultCollection);
-        /// <summary>
-        /// Creates a new instance of the <see cref="HostSection"/> class.
-        /// </summary>
-        public HostSection()
-        {
-        }
-        /// <summary>
-        /// Gets the name of the assembly that contians the <see cref="Core.IBootstrapperApplicationFactory"/> child class.
-        /// </summary>
-        /// <remarks>
-        /// The assembly specified by this name must contain the <see cref="Core.BootstrapperApplicationFactoryAttribute"/> to identify
-        /// the type of the <see cref="Core.IBootstrapperApplicationFactory"/> child class.
-        /// </remarks>
-        [ConfigurationProperty("assemblyName", IsRequired = true)]
-        public string AssemblyName
-        {
-            get { return (string)base[assemblyNameProperty]; }
-            set { base[assemblyNameProperty] = value; }
-        }
-        /// <summary>
-        /// Gets the <see cref="SupportedFrameworkElementCollection"/> of supported frameworks for the host configuration.
-        /// </summary>
-        [ConfigurationProperty("", IsDefaultCollection = true)]
-        [ConfigurationCollection(typeof(SupportedFrameworkElement))]
-        public SupportedFrameworkElementCollection SupportedFrameworks
-        {
-            get { return (SupportedFrameworkElementCollection)base[supportedFrameworksProperty]; }
-        }
-    }
-}
diff --git a/src/ext/Bal/WixToolset.Mba.Host/NativeMethods.cs b/src/ext/Bal/WixToolset.Mba.Host/NativeMethods.cs
deleted file mode 100644
index b9fc85a0..00000000
--- a/src/ext/Bal/WixToolset.Mba.Host/NativeMethods.cs
+++ /dev/null
@@ -1,18 +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.
-namespace WixToolset.Mba.Host
-{
-    using System;
-    using System.Runtime.InteropServices;
-    /// <summary>
-    /// Contains native constants, functions, and structures for this assembly.
-    /// </summary>
-    internal static class NativeMethods
-    {
-        #region Error Constants
-        internal const int E_NOTFOUND = unchecked((int)0x80070490);
-        internal const int E_UNEXPECTED = unchecked((int)0x8000ffff);
-        #endregion
-    }
-}
diff --git a/src/ext/Bal/WixToolset.Mba.Host/SupportedFrameworkElement.cs b/src/ext/Bal/WixToolset.Mba.Host/SupportedFrameworkElement.cs
deleted file mode 100644
index fe7fd2eb..00000000
--- a/src/ext/Bal/WixToolset.Mba.Host/SupportedFrameworkElement.cs
+++ /dev/null
@@ -1,47 +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.
-namespace WixToolset.Mba.Host
-{
-    using System;
-    using System.Configuration;
-    /// <summary>
-    /// Handler for the supportedFramework configuration section.
-    /// </summary>
-    public sealed class SupportedFrameworkElement : ConfigurationElement
-    {
-        private static readonly ConfigurationProperty versionProperty = new ConfigurationProperty("version", typeof(string), null, ConfigurationPropertyOptions.IsRequired);
-        private static readonly ConfigurationProperty runtimeVersionProperty = new ConfigurationProperty("runtimeVersion", typeof(string));
-        /// <summary>
-        /// Creates a new instance of the <see cref="SupportedFrameworkElement"/> class.
-        /// </summary>
-        public SupportedFrameworkElement()
-        {
-        }
-        /// <summary>
-        /// Gets the version of the supported framework.
-        /// </summary>
-        /// <remarks>
-        /// The assembly specified by this name must contain a value matching the NETFX version registry key under
-        /// "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\NET Framework Setup\NDP".
-        /// </remarks>
-        [ConfigurationProperty("version", IsRequired = true)]
-        public string Version
-        {
-            get { return (string)base[versionProperty]; }
-            set { base[versionProperty] = value; }
-        }
-        /// <summary>
-        /// Gets the runtime version required by this supported framework.
-        /// </summary>
-        [ConfigurationProperty("runtimeVersion", IsRequired = false)]
-        public string RuntimeVersion
-        {
-            get { return (string)base[runtimeVersionProperty]; }
-            set { base[runtimeVersionProperty] = value; }
-        }
-    }
-}
diff --git a/src/ext/Bal/WixToolset.Mba.Host/SupportedFrameworkElementCollection.cs b/src/ext/Bal/WixToolset.Mba.Host/SupportedFrameworkElementCollection.cs
deleted file mode 100644
index 12c7cf3e..00000000
--- a/src/ext/Bal/WixToolset.Mba.Host/SupportedFrameworkElementCollection.cs
+++ /dev/null
@@ -1,36 +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.
-namespace WixToolset.Mba.Host
-{
-    using System;
-    using System.Configuration;
-    using System.Diagnostics.CodeAnalysis;
-    /// <summary>
-    /// Handler for the supportedFramework collection.
-    /// </summary>
-    [SuppressMessage("Microsoft.Design", "CA1010:CollectionsShouldImplementGenericInterface")]
-    [ConfigurationCollection(typeof(SupportedFrameworkElement), AddItemName = "supportedFramework", CollectionType = ConfigurationElementCollectionType.BasicMap)]
-    public sealed class SupportedFrameworkElementCollection : ConfigurationElementCollection
-    {
-        public override ConfigurationElementCollectionType CollectionType
-        {
-            get { return ConfigurationElementCollectionType.BasicMap; }
-        }
-        protected override string ElementName
-        {
-            get { return "supportedFramework"; }
-        }
-        protected override ConfigurationElement CreateNewElement()
-        {
-            return new SupportedFrameworkElement();
-        }
-        protected override object GetElementKey(ConfigurationElement element)
-        {
-            return (element as SupportedFrameworkElement).Version;
-        }
-    }
-}
diff --git a/src/ext/Bal/WixToolset.Mba.Host/WixToolset.Mba.Host.config b/src/ext/Bal/WixToolset.Mba.Host/WixToolset.Mba.Host.config
deleted file mode 100644
index 91280739..00000000
--- a/src/ext/Bal/WixToolset.Mba.Host/WixToolset.Mba.Host.config
+++ /dev/null
@@ -1,25 +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. -->
-<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 useLegacyV2RuntimeActivationPolicy="true">
-        <supportedRuntime version="v4.0" />
-    </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="AssemblyWithClassThatInheritsFromBootstrapperApplicationFactory" />
-    </wix.bootstrapper>
-</configuration>
diff --git a/src/ext/Bal/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj b/src/ext/Bal/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj
deleted file mode 100644
index 242c4d14..00000000
--- a/src/ext/Bal/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj
+++ /dev/null
@@ -1,48 +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 Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <AssemblyName>WixToolset.Mba.Host</AssemblyName>
-    <RootNamespace>WixToolset.Mba.Host</RootNamespace>
-    <TargetFrameworks>net462</TargetFrameworks>
-    <Description>Managed Bootstrapper Application entry point</Description>
-    <DebugType>embedded</DebugType>
-    <NuspecFile>$(MSBuildThisFileName).nuspec</NuspecFile>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-  </PropertyGroup>
-  <ItemGroup>
-    <None Include="WixToolset.Mba.Host.config" CopyToOutputDirectory="PreserveNewest" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System.Configuration" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="WixToolset.Mba.Core" />
-  </ItemGroup>
-  <ItemGroup>
-    <HeaderPath Include="$(BaseOutputPath)obj\$(AssemblyName).h">
-      <Visible>False</Visible>
-    </HeaderPath>
-  </ItemGroup>
-  <Target Name="GenerateIdentityHeader" AfterTargets="Build" Inputs="$(TargetPath)" Outputs="@(HeaderPath)">
-    <GetAssemblyIdentity AssemblyFiles="$(TargetPath)">
-      <Output TaskParameter="Assemblies" ItemName="AssemblyIdentity" />
-    </GetAssemblyIdentity>
-    <ItemGroup>
-      <Line Include='#define MBA_ASSEMBLY_FULL_NAME L"%(AssemblyIdentity.Identity)"' />
-      <Line Include='#define MBA_CONFIG_FILE_NAME L"$(AssemblyName).config"' />
-      <Line Include='#define MBA_ENTRY_TYPE L"$(RootNamespace).BootstrapperApplicationFactory"' />
-    </ItemGroup>
-    <Message Importance="normal" Text="Generating identity definitions into @(HeaderPath->'%(FullPath)')" />
-    <WriteLinesToFile File="@(HeaderPath)" Lines="@(Line)" Overwrite="True" />
-    <ItemGroup>
-      <FileWrites Include="@(HeaderPath)" />
-    </ItemGroup>
-  </Target>
-</Project>
diff --git a/src/ext/Bal/WixToolset.Mba.Host/WixToolset.Mba.Host.nuspec b/src/ext/Bal/WixToolset.Mba.Host/WixToolset.Mba.Host.nuspec
deleted file mode 100644
index b1f00ebd..00000000
--- a/src/ext/Bal/WixToolset.Mba.Host/WixToolset.Mba.Host.nuspec
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-  <metadata>
-    <id>$id$</id>
-    <version>$version$</version>
-    <title>$title$</title>
-    <description>$description$</description>
-    <authors>$authors$</authors>
-    <icon>wix.png</icon>
-    <license type="expression">MS-RL</license>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <copyright>$copyright$</copyright>
-    <projectUrl>$projectUrl$</projectUrl>
-    <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
-    <dependencies>
-      <group targetFramework=".NETFramework4.6.2" />
-    </dependencies>
-  </metadata>
-  <files>
-    <file src="$projectFolder$\..\..\..\internal\images\wix.png" />
-    <file src="net462\$id$.config" target="samples" />
-    <file src="net462\$id$.dll" target="lib\net462" />
-  </files>
-</package>
diff --git a/src/ext/Bal/bal.cmd b/src/ext/Bal/bal.cmd
index 2759d499..23a53a91 100644
--- a/src/ext/Bal/bal.cmd
+++ b/src/ext/Bal/bal.cmd
@@ -20,37 +20,28 @@
 @echo Building ext\Bal %_C% using %_N%
 :: Restore
-nuget restore dnchost\packages.config || exit /b
 :: Build
-msbuild -Restore -p:Configuration=%_C% -tl -nologo -warnaserror -bl:%_L%\ext_bal_build.binlog || exit /b
+msbuild -Restore -p:Configuration=%_C% -tl -nologo -m -warnaserror test\WixToolsetTest.Bal\WixToolsetTest.Bal.csproj -bl:%_L%\ext_bal_build.binlog || exit /b
-msbuild -Restore -p:Configuration=%_C% -tl -nologo -m -warnaserror test\examples\examples.proj -m -bl:%_L%\bal_examples_build.binlog  || exit /b
+msbuild -Restore -p:Configuration=%_C% -tl -nologo -m -warnaserror test\examples\examples.proj -bl:%_L%\bal_examples_build.binlog  || exit /b
 :: Test
 dotnet test ^
- %_B%\net6.0\WixToolsetTest.Dnc.HostGenerator.dll ^
+  %_B%\net6.0\WixToolsetTest.Bal.dll ^
- %_B%\net6.0\WixToolsetTest.Bal.dll ^
+  --nologo -l "trx;LogFileName=%_L%\TestResults\bal.wixext.trx" || exit /b
- %_B%\net6.0\WixToolsetTest.ManagedHost.dll ^
- --nologo -l "trx;LogFileName=%_L%\TestResults\bal.wixext.trx" || exit /b
 :: Pack
 msbuild -t:Pack -p:Configuration=%_C% -tl -nologo -warnaserror -p:NoBuild=true wixext\WixToolset.Bal.wixext.csproj || exit /b
-msbuild -t:Pack -p:Configuration=%_C% -tl -nologo -warnaserror -p:NoBuild=true WixToolset.Dnc.HostGenerator\WixToolset.Dnc.HostGenerator.csproj || exit /b
-msbuild -t:Pack -p:Configuration=%_C% -tl -nologo -warnaserror -p:NoBuild=true WixToolset.Mba.Host\WixToolset.Mba.Host.csproj || exit /b
 @goto :end
 :clean
 @rd /s/q "..\..\..\build\Bal.wixext" 2> nul
 @del "..\..\..\build\artifacts\WixToolset.Bal.wixext.*.nupkg" 2> nul
-@del "..\..\..\build\artifacts\WixToolset.Dnc.HostGenerator.*.nupkg" 2> nul
-@del "..\..\..\build\artifacts\WixToolset.Mba.Host.*.nupkg" 2> nul
 @del "%_L%\ext_bal_build.binlog" 2> nul
 @del "%_L%\TestResults\bal.wixext.trx" 2> nul
 @rd /s/q "%USERPROFILE%\.nuget\packages\wixtoolset.bal.wixext" 2> nul
-@rd /s/q "%USERPROFILE%\.nuget\packages\wixtoolset.dnc.hostgenerator" 2> nul
-@rd /s/q "%USERPROFILE%\.nuget\packages\wixtoolset.mba.host" 2> nul
 @exit /b
 :end
diff --git a/src/ext/Bal/dnchost/dnchost.cpp b/src/ext/Bal/dnchost/dnchost.cpp
deleted file mode 100644
index 1868e3f8..00000000
--- a/src/ext/Bal/dnchost/dnchost.cpp
+++ /dev/null
@@ -1,328 +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 DNCSTATE vstate = { };
-// internal function declarations
-static HRESULT LoadModulePaths(
-    __in DNCSTATE* pState
-    );
-static HRESULT LoadDncConfiguration(
-    __in DNCSTATE* pState,
-    __in const BOOTSTRAPPER_CREATE_ARGS* pArgs
-    );
-static HRESULT LoadRuntime(
-    __in DNCSTATE* pState
-    );
-static HRESULT LoadManagedBootstrapperApplicationFactory(
-    __in DNCSTATE* pState
-    );
-static HRESULT CreatePrerequisiteBA(
-    __in DNCSTATE* pState,
-    __in IBootstrapperEngine* pEngine,
-    __in const BOOTSTRAPPER_CREATE_ARGS* pArgs,
-    __inout BOOTSTRAPPER_CREATE_RESULTS* pResults
-    );
-// function definitions
-extern "C" BOOL WINAPI DllMain(
-    IN HINSTANCE hInstance,
-    IN DWORD dwReason,
-    IN LPVOID /* pvReserved */
-    )
-{
-    switch (dwReason)
-    {
-    case DLL_PROCESS_ATTACH:
-        ::DisableThreadLibraryCalls(hInstance);
-        vstate.hInstance = hInstance;
-        break;
-    case DLL_PROCESS_DETACH:
-        vstate.hInstance = NULL;
-        break;
-    }
-    return TRUE;
-}
-extern "C" HRESULT WINAPI BootstrapperApplicationCreate(
-    __in const BOOTSTRAPPER_CREATE_ARGS* pArgs,
-    __inout BOOTSTRAPPER_CREATE_RESULTS* pResults
-    )
-{
-    HRESULT hr = S_OK;
-    IBootstrapperEngine* pEngine = NULL;
-    hr = BalInitializeFromCreateArgs(pArgs, &pEngine);
-    ExitOnFailure(hr, "Failed to initialize Bal.");
-    if (!vstate.fInitialized)
-    {
-        hr = XmlInitialize();
-        BalExitOnFailure(hr, "Failed to initialize XML.");
-        hr = LoadModulePaths(&vstate);
-        BalExitOnFailure(hr, "Failed to get the host base path.");
-        hr = LoadDncConfiguration(&vstate, pArgs);
-        BalExitOnFailure(hr, "Failed to get the dnc configuration.");
-        vstate.fInitialized = TRUE;
-    }
-    if (vstate.prereqData.fAlwaysInstallPrereqs && !vstate.prereqData.fCompleted)
-    {
-        BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Loading prerequisite bootstrapper application since it's configured to always run before loading the runtime.");
-        hr = CreatePrerequisiteBA(&vstate, pEngine, pArgs, pResults);
-        BalExitOnFailure(hr, "Failed to create the pre-requisite bootstrapper application.");
-        ExitFunction();
-    }
-    if (!vstate.fInitializedRuntime)
-    {
-        hr = LoadRuntime(&vstate);
-        vstate.fInitializedRuntime = SUCCEEDED(hr);
-    }
-    if (vstate.fInitializedRuntime)
-    {
-        if (!vstate.pAppFactory)
-        {
-            hr = LoadManagedBootstrapperApplicationFactory(&vstate);
-            BalExitOnFailure(hr, "Failed to create the .NET Core bootstrapper application factory.");
-        }
-        BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Loading .NET Core %ls bootstrapper application.", DNCHOSTTYPE_FDD == vstate.type ? L"FDD" : L"SCD");
-        hr = vstate.pAppFactory->Create(pArgs, pResults);
-        BalExitOnFailure(hr, "Failed to create the .NET Core bootstrapper application.");
-    }
-    else // fallback to the prerequisite BA.
-    {
-        if (DNCHOSTTYPE_SCD == vstate.type)
-        {
-            vstate.prereqData.hrFatalError = E_DNCHOST_SCD_RUNTIME_FAILURE;
-            BalLogError(hr, "The self-contained .NET Core runtime failed to load. This is an unrecoverable error.");
-        }
-        else if (vstate.prereqData.fCompleted)
-        {
-            hr = E_PREREQBA_INFINITE_LOOP;
-            BalLogError(hr, "The prerequisites were already installed. The bootstrapper application will not be reloaded to prevent an infinite loop.");
-            vstate.prereqData.hrFatalError = hr;
-        }
-        else
-        {
-            vstate.prereqData.hrFatalError = S_OK;
-        }
-        BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Loading prerequisite bootstrapper application because .NET Core host could not be loaded, error: 0x%08x.", hr);
-        hr = CreatePrerequisiteBA(&vstate, pEngine, pArgs, pResults);
-        BalExitOnFailure(hr, "Failed to create the pre-requisite bootstrapper application.");
-    }
-LExit:
-    ReleaseNullObject(pEngine);
-    return hr;
-}
-extern "C" void WINAPI BootstrapperApplicationDestroy(
-    __in const BOOTSTRAPPER_DESTROY_ARGS* pArgs,
-    __in BOOTSTRAPPER_DESTROY_RESULTS* pResults
-    )
-{
-    BOOTSTRAPPER_DESTROY_RESULTS childResults = { };
-    childResults.cbSize = sizeof(BOOTSTRAPPER_DESTROY_RESULTS);
-    if (vstate.hMbapreqModule)
-    {
-        PFN_BOOTSTRAPPER_APPLICATION_DESTROY pfnDestroy = reinterpret_cast<PFN_BOOTSTRAPPER_APPLICATION_DESTROY>(::GetProcAddress(vstate.hMbapreqModule, "PrereqBootstrapperApplicationDestroy"));
-        if (pfnDestroy)
-        {
-            (*pfnDestroy)(pArgs, &childResults);
-        }
-        ::FreeLibrary(vstate.hMbapreqModule);
-        vstate.hMbapreqModule = NULL;
-    }
-    BalUninitialize();
-    // Need to keep track of state between reloads.
-    pResults->fDisableUnloading = TRUE;
-}
-static HRESULT LoadModulePaths(
-    __in DNCSTATE* pState
-    )
-{
-    HRESULT hr = S_OK;
-    hr = PathForCurrentProcess(&pState->sczModuleFullPath, pState->hInstance);
-    BalExitOnFailure(hr, "Failed to get the full host path.");
-    hr = PathGetDirectory(pState->sczModuleFullPath, &pState->sczAppBase);
-    BalExitOnFailure(hr, "Failed to get the directory of the full process path.");
-LExit:
-    return hr;
-}
-static HRESULT LoadDncConfiguration(
-    __in DNCSTATE* pState,
-    __in const BOOTSTRAPPER_CREATE_ARGS* pArgs
-    )
-{
-    HRESULT hr = S_OK;
-    IXMLDOMDocument* pixdManifest = NULL;
-    IXMLDOMNode* pixnHost = NULL;
-    LPWSTR sczPayloadName = NULL;
-    DWORD dwBool = 0;
-    BOOL fXmlFound = FALSE;
-    hr = XmlLoadDocumentFromFile(pArgs->pCommand->wzBootstrapperApplicationDataPath, &pixdManifest);
-    BalExitOnFailure(hr, "Failed to load BalManifest '%ls'", pArgs->pCommand->wzBootstrapperApplicationDataPath);
-    hr = XmlSelectSingleNode(pixdManifest, L"/BootstrapperApplicationData/WixBalBAFactoryAssembly", &pixnHost);
-    BalExitOnRequiredXmlQueryFailure(hr, "Failed to get WixBalBAFactoryAssembly element.");
-    hr = XmlGetAttributeEx(pixnHost, L"FilePath", &sczPayloadName);
-    BalExitOnRequiredXmlQueryFailure(hr, "Failed to get WixBalBAFactoryAssembly/@FilePath.");
-    hr = PathConcatRelativeToBase(pArgs->pCommand->wzBootstrapperWorkingFolder, sczPayloadName, &pState->sczBaFactoryAssemblyPath);
-    BalExitOnFailure(hr, "Failed to create BaFactoryAssemblyPath.");
-    LPCWSTR wzFileName = PathFile(pState->sczBaFactoryAssemblyPath);
-    LPCWSTR wzExtension = PathExtension(pState->sczBaFactoryAssemblyPath);
-    if (!wzExtension)
-    {
-        BalExitOnFailure(hr = E_FAIL, "BaFactoryAssemblyPath has no extension.");
-    }
-    hr = StrAllocString(&pState->sczBaFactoryAssemblyName, wzFileName, wzExtension - wzFileName);
-    BalExitOnFailure(hr, "Failed to copy BAFactoryAssembly payload Name.");
-    hr = StrAllocString(&pState->sczBaFactoryDepsJsonPath, pState->sczBaFactoryAssemblyPath, wzExtension - pState->sczBaFactoryAssemblyPath);
-    BalExitOnFailure(hr, "Failed to initialize deps json path.");
-    hr = StrAllocString(&pState->sczBaFactoryRuntimeConfigPath, pState->sczBaFactoryDepsJsonPath, 0);
-    BalExitOnFailure(hr, "Failed to initialize runtime config path.");
-    hr = StrAllocConcat(&pState->sczBaFactoryDepsJsonPath, L".deps.json", 0);
-    BalExitOnFailure(hr, "Failed to concat extension to deps json path.");
-    hr = StrAllocConcat(&pState->sczBaFactoryRuntimeConfigPath, L".runtimeconfig.json", 0);
-    BalExitOnFailure(hr, "Failed to concat extension to runtime config path.");
-    hr = XmlSelectSingleNode(pixdManifest, L"/BootstrapperApplicationData/WixMbaPrereqOptions", &pixnHost);
-    BalExitOnOptionalXmlQueryFailure(hr, fXmlFound, "Failed to find WixMbaPrereqOptions element in bootstrapper application config.");
-    if (fXmlFound)
-    {
-        hr = XmlGetAttributeNumber(pixnHost, L"AlwaysInstallPrereqs", reinterpret_cast<DWORD*>(&pState->prereqData.fAlwaysInstallPrereqs));
-        BalExitOnOptionalXmlQueryFailure(hr, fXmlFound, "Failed to get AlwaysInstallPrereqs value.");
-    }
-    pState->prereqData.fPerformHelp = !pState->prereqData.fAlwaysInstallPrereqs;
-    pState->type = DNCHOSTTYPE_FDD;
-    hr = XmlSelectSingleNode(pixdManifest, L"/BootstrapperApplicationData/WixDncOptions", &pixnHost);
-    BalExitOnOptionalXmlQueryFailure(hr, fXmlFound, "Failed to find WixDncOptions element in bootstrapper application config.");
-    if (!fXmlFound)
-    {
-        ExitFunction();
-    }
-    hr = XmlGetAttributeNumber(pixnHost, L"SelfContainedDeployment", &dwBool);
-    BalExitOnOptionalXmlQueryFailure(hr, fXmlFound, "Failed to get SelfContainedDeployment value.");
-    if (fXmlFound && dwBool)
-    {
-        pState->type = DNCHOSTTYPE_SCD;
-    }
-LExit:
-    ReleaseStr(sczPayloadName);
-    ReleaseObject(pixnHost);
-    ReleaseObject(pixdManifest);
-    return hr;
-}
-static HRESULT LoadRuntime(
-    __in DNCSTATE* pState
-    )
-{
-    HRESULT hr = S_OK;
-    hr = DnchostLoadRuntime(
-        &pState->hostfxrState,
-        pState->sczModuleFullPath,
-        pState->sczBaFactoryAssemblyPath,
-        pState->sczBaFactoryDepsJsonPath,
-        pState->sczBaFactoryRuntimeConfigPath);
-    return hr;
-}
-static HRESULT LoadManagedBootstrapperApplicationFactory(
-    __in DNCSTATE* pState
-    )
-{
-    HRESULT hr = S_OK;
-    hr = DnchostCreateFactory(
-        &pState->hostfxrState,
-        pState->sczBaFactoryAssemblyName,
-        &pState->pAppFactory);
-    return hr;
-}
-static HRESULT CreatePrerequisiteBA(
-    __in DNCSTATE* pState,
-    __in IBootstrapperEngine* pEngine,
-    __in const BOOTSTRAPPER_CREATE_ARGS* pArgs,
-    __inout BOOTSTRAPPER_CREATE_RESULTS* pResults
-    )
-{
-    HRESULT hr = S_OK;
-    LPWSTR sczDncpreqPath = NULL;
-    HMODULE hModule = NULL;
-    hr = PathConcat(pState->sczAppBase, L"dncpreq.dll", &sczDncpreqPath);
-    BalExitOnFailure(hr, "Failed to get path to pre-requisite BA.");
-    hModule = ::LoadLibraryExW(sczDncpreqPath, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
-    BalExitOnNullWithLastError(hModule, hr, "Failed to load pre-requisite BA DLL.");
-    PFN_PREQ_BOOTSTRAPPER_APPLICATION_CREATE pfnCreate = reinterpret_cast<PFN_PREQ_BOOTSTRAPPER_APPLICATION_CREATE>(::GetProcAddress(hModule, "PrereqBootstrapperApplicationCreate"));
-    BalExitOnNullWithLastError(pfnCreate, hr, "Failed to get PrereqBootstrapperApplicationCreate entry-point from: %ls", sczDncpreqPath);
-    hr = pfnCreate(&pState->prereqData, pEngine, pArgs, pResults);
-    BalExitOnFailure(hr, "Failed to create prequisite bootstrapper app.");
-    pState->hMbapreqModule = hModule;
-    hModule = NULL;
-LExit:
-    if (hModule)
-    {
-        ::FreeLibrary(hModule);
-    }
-    ReleaseStr(sczDncpreqPath);
-    return hr;
-}
diff --git a/src/ext/Bal/dnchost/dnchost.def b/src/ext/Bal/dnchost/dnchost.def
deleted file mode 100644
index 4488df94..00000000
--- a/src/ext/Bal/dnchost/dnchost.def
+++ /dev/null
@@ -1,6 +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.
-EXPORTS
-    BootstrapperApplicationCreate
-    BootstrapperApplicationDestroy
diff --git a/src/ext/Bal/dnchost/dnchost.h b/src/ext/Bal/dnchost/dnchost.h
deleted file mode 100644
index 000cf43d..00000000
--- a/src/ext/Bal/dnchost/dnchost.h
+++ /dev/null
@@ -1,28 +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.
-enum DNCHOSTTYPE
-{
-    DNCHOSTTYPE_UNKNOWN,
-    DNCHOSTTYPE_FDD,
-    DNCHOSTTYPE_SCD,
-};
-struct DNCSTATE
-{
-    BOOL fInitialized;
-    BOOL fInitializedRuntime;
-    HINSTANCE hInstance;
-    LPWSTR sczModuleFullPath;
-    LPWSTR sczAppBase;
-    LPWSTR sczBaFactoryAssemblyName;
-    LPWSTR sczBaFactoryAssemblyPath;
-    LPWSTR sczBaFactoryDepsJsonPath;
-    LPWSTR sczBaFactoryRuntimeConfigPath;
-    DNCHOSTTYPE type;
-    HOSTFXR_STATE hostfxrState;
-    IBootstrapperApplicationFactory* pAppFactory;
-    HMODULE hMbapreqModule;
-    PREQBA_DATA prereqData;
-};
diff --git a/src/ext/Bal/dnchost/dncutil.cpp b/src/ext/Bal/dnchost/dncutil.cpp
deleted file mode 100644
index d00b0ce6..00000000
--- a/src/ext/Bal/dnchost/dncutil.cpp
+++ /dev/null
@@ -1,216 +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"
-#define DNC_ENTRY_TYPEW L"WixToolset.Dnc.Host.BootstrapperApplicationFactory"
-#define DNC_STATIC_ENTRY_METHODW L"CreateBAFactory"
-#define DNC_STATIC_ENTRY_DELEGATEW L"WixToolset.Dnc.Host.StaticEntryDelegate"
-// https://github.com/dotnet/runtime/blob/master/src/installer/corehost/error_codes.h
-#define InvalidArgFailure 0x80008081
-#define HostApiBufferTooSmall 0x80008098
-#define HostApiUnsupportedVersion 0x800080a2
-// internal function declarations
-static HRESULT GetHostfxrPath(
-    __in HOSTFXR_STATE* pState,
-    __in LPCWSTR wzNativeHostPath
-    );
-static HRESULT LoadHostfxr(
-    __in HOSTFXR_STATE* pState
-    );
-static HRESULT InitializeHostfxr(
-    __in HOSTFXR_STATE* pState,
-    __in LPCWSTR wzManagedHostPath,
-    __in LPCWSTR wzDepsJsonPath,
-    __in LPCWSTR wzRuntimeConfigPath
-    );
-static HRESULT InitializeCoreClr(
-    __in HOSTFXR_STATE* pState
-    );
-// function definitions
-HRESULT DnchostLoadRuntime(
-    __in HOSTFXR_STATE* pState,
-    __in LPCWSTR wzNativeHostPath,
-    __in LPCWSTR wzManagedHostPath,
-    __in LPCWSTR wzDepsJsonPath,
-    __in LPCWSTR wzRuntimeConfigPath
-    )
-{
-    HRESULT hr = S_OK;
-    hr = GetHostfxrPath(pState, wzNativeHostPath);
-    BalExitOnFailure(hr, "Failed to find hostfxr.");
-    hr = LoadHostfxr(pState);
-    BalExitOnFailure(hr, "Failed to load hostfxr.");
-    hr = InitializeHostfxr(pState, wzManagedHostPath, wzDepsJsonPath, wzRuntimeConfigPath);
-    BalExitOnFailure(hr, "Failed to initialize hostfxr.");
-    hr = InitializeCoreClr(pState);
-    BalExitOnFailure(hr, "Failed to initialize coreclr.");
-LExit:
-    return hr;
-}
-HRESULT DnchostCreateFactory(
-    __in HOSTFXR_STATE* pState,
-    __in LPCWSTR wzBaFactoryAssemblyName,
-    __out IBootstrapperApplicationFactory** ppAppFactory
-    )
-{
-    HRESULT hr = S_OK;
-    PFNCREATEBAFACTORY pfnCreateBAFactory = NULL;
-    LPWSTR sczEntryType = NULL;
-    LPWSTR sczEntryDelegate = NULL;
-    LPSTR sczBaFactoryAssemblyName = NULL;
-    hr = StrAllocFormatted(&sczEntryType, L"%ls,%ls", DNC_ENTRY_TYPEW, wzBaFactoryAssemblyName);
-    BalExitOnFailure(hr, "Failed to format entry type.");
-    hr = StrAllocFormatted(&sczEntryDelegate, L"%ls,%ls", DNC_STATIC_ENTRY_DELEGATEW, wzBaFactoryAssemblyName);
-    BalExitOnFailure(hr, "Failed to format entry delegate.");
-    hr = pState->pfnGetFunctionPointer(
-        sczEntryType,
-        DNC_STATIC_ENTRY_METHODW,
-        sczEntryDelegate,
-        NULL,
-        NULL,
-        reinterpret_cast<void**>(&pfnCreateBAFactory));
-    BalExitOnFailure(hr, "Failed to create delegate through GetFunctionPointer.");
-    *ppAppFactory = pfnCreateBAFactory();
-LExit:
-    ReleaseStr(sczEntryType);
-    ReleaseStr(sczEntryDelegate);
-    ReleaseStr(sczBaFactoryAssemblyName);
-    return hr;
-}
-static HRESULT GetHostfxrPath(
-    __in HOSTFXR_STATE* pState,
-    __in LPCWSTR wzNativeHostPath
-    )
-{
-    HRESULT hr = S_OK;
-    get_hostfxr_parameters getHostfxrParameters = { };
-    int nrc = 0;
-    size_t cchHostFxrPath = MAX_PATH;
-    getHostfxrParameters.size = sizeof(get_hostfxr_parameters);
-    getHostfxrParameters.assembly_path = wzNativeHostPath;
-    // get_hostfxr_path does a full search on every call, so
-    //    minimize the number of calls
-    //    need to loop
-    for (;;)
-    {
-        cchHostFxrPath *= 2;
-        hr = StrAlloc(&pState->sczHostfxrPath, cchHostFxrPath);
-        BalExitOnFailure(hr, "Failed to allocate hostFxrPath.");
-        nrc = get_hostfxr_path(pState->sczHostfxrPath, &cchHostFxrPath, &getHostfxrParameters);
-        if (HostApiBufferTooSmall != nrc)
-        {
-            break;
-        }
-    }
-    if (0 != nrc)
-    {
-        BalExitOnFailure(hr = nrc, "GetHostfxrPath failed");
-    }
-LExit:
-    return hr;
-}
-static HRESULT LoadHostfxr(
-    __in HOSTFXR_STATE* pState
-    )
-{
-    HRESULT hr = S_OK;
-    HMODULE hHostfxr;
-    hHostfxr = ::LoadLibraryExW(pState->sczHostfxrPath, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
-    BalExitOnNullWithLastError(hHostfxr, hr, "Failed to load hostfxr from '%ls'.", pState->sczHostfxrPath);
-    pState->pfnHostfxrInitializeForApp = reinterpret_cast<hostfxr_initialize_for_dotnet_command_line_fn>(::GetProcAddress(hHostfxr, "hostfxr_initialize_for_dotnet_command_line"));
-    BalExitOnNullWithLastError(pState->pfnHostfxrInitializeForApp, hr, "Failed to get procedure address for hostfxr_initialize_for_dotnet_command_line.");
-    pState->pfnHostfxrSetErrorWriter = reinterpret_cast<hostfxr_set_error_writer_fn>(::GetProcAddress(hHostfxr, "hostfxr_set_error_writer"));
-    BalExitOnNullWithLastError(pState->pfnHostfxrSetErrorWriter, hr, "Failed to get procedure address for hostfxr_set_error_writer.");
-    pState->pfnHostfxrClose = reinterpret_cast<hostfxr_close_fn>(::GetProcAddress(hHostfxr, "hostfxr_close"));
-    BalExitOnNullWithLastError(pState->pfnHostfxrClose, hr, "Failed to get procedure address for hostfxr_close.");
-    pState->pfnHostfxrGetRuntimeDelegate = reinterpret_cast<hostfxr_get_runtime_delegate_fn>(::GetProcAddress(hHostfxr, "hostfxr_get_runtime_delegate"));
-    BalExitOnNullWithLastError(pState->pfnHostfxrGetRuntimeDelegate, hr, "Failed to get procedure address for hostfxr_get_runtime_delegate.");
-LExit:
-    // Never unload the module since it isn't meant to be unloaded.
-    return hr;
-}
-static void HOSTFXR_CALLTYPE DnchostErrorWriter(
-    __in LPCWSTR wzMessage
-    )
-{
-    BalLog(BOOTSTRAPPER_LOG_LEVEL_ERROR, "error from hostfxr: %ls", wzMessage);
-}
-static HRESULT InitializeHostfxr(
-    __in HOSTFXR_STATE* pState,
-    __in LPCWSTR wzManagedHostPath,
-    __in LPCWSTR wzDepsJsonPath,
-    __in LPCWSTR wzRuntimeConfigPath
-    )
-{
-    HRESULT hr = S_OK;
-    pState->pfnHostfxrSetErrorWriter(static_cast<hostfxr_error_writer_fn>(&DnchostErrorWriter));
-    LPCWSTR argv[] = {
-        L"exec",
-        L"--depsfile",
-        wzDepsJsonPath,
-        L"--runtimeconfig",
-        wzRuntimeConfigPath,
-        wzManagedHostPath,
-    };
-    hr = pState->pfnHostfxrInitializeForApp(sizeof(argv)/sizeof(LPWSTR), argv, NULL, &pState->hostContextHandle);
-    BalExitOnFailure(hr, "HostfxrInitializeForApp failed");
-LExit:
-    return hr;
-}
-static HRESULT InitializeCoreClr(
-    __in HOSTFXR_STATE* pState
-    )
-{
-    HRESULT hr = S_OK;
-    hr = pState->pfnHostfxrGetRuntimeDelegate(pState->hostContextHandle, hdt_get_function_pointer, reinterpret_cast<void**>(&pState->pfnGetFunctionPointer));
-    if (InvalidArgFailure == hr || // old versions of hostfxr don't allow calling GetRuntimeDelegate from InitializeForApp.
-        HostApiUnsupportedVersion == hr) // hdt_get_function_pointer was added in .NET 5.
-    {
-        BalExitOnFailure(hr, "HostfxrGetRuntimeDelegate failed, most likely because the target framework is older than .NET 5.");
-    }
-    else
-    {
-        BalExitOnFailure(hr, "HostfxrGetRuntimeDelegate failed");
-    }
-LExit:
-    return hr;
-}
diff --git a/src/ext/Bal/dnchost/dncutil.h b/src/ext/Bal/dnchost/dncutil.h
deleted file mode 100644
index 3fa81364..00000000
--- a/src/ext/Bal/dnchost/dncutil.h
+++ /dev/null
@@ -1,29 +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.
-typedef IBootstrapperApplicationFactory* (STDMETHODCALLTYPE* PFNCREATEBAFACTORY)();
-struct HOSTFXR_STATE
-{
-    LPWSTR sczHostfxrPath;
-    hostfxr_handle hostContextHandle;
-    hostfxr_initialize_for_dotnet_command_line_fn pfnHostfxrInitializeForApp;
-    hostfxr_set_error_writer_fn pfnHostfxrSetErrorWriter;
-    hostfxr_close_fn pfnHostfxrClose;
-    hostfxr_get_runtime_delegate_fn pfnHostfxrGetRuntimeDelegate;
-    get_function_pointer_fn pfnGetFunctionPointer;
-};
-HRESULT DnchostLoadRuntime(
-    __in HOSTFXR_STATE* pState,
-    __in LPCWSTR wzNativeHostPath,
-    __in LPCWSTR wzManagedHostPath,
-    __in LPCWSTR wzDepsJsonPath,
-    __in LPCWSTR wzRuntimeConfigPath
-    );
-HRESULT DnchostCreateFactory(
-    __in HOSTFXR_STATE* pState,
-    __in LPCWSTR wzBaFactoryAssemblyName,
-    __out IBootstrapperApplicationFactory** ppAppFactory
-    );
diff --git a/src/ext/Bal/dnchost/packages.config b/src/ext/Bal/dnchost/packages.config
deleted file mode 100644
index 1c7505e7..00000000
--- a/src/ext/Bal/dnchost/packages.config
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="runtime.win-arm64.Microsoft.NETCore.DotNetAppHost" version="6.0.4" targetFramework="native" />
-  <package id="runtime.win-x64.Microsoft.NETCore.DotNetAppHost" version="6.0.4" targetFramework="native" />
-  <package id="runtime.win-x86.Microsoft.NETCore.DotNetAppHost" version="6.0.4" targetFramework="native" />
-</packages>
-\ No newline at end of file
diff --git a/src/ext/Bal/dnchost/precomp.h b/src/ext/Bal/dnchost/precomp.h
deleted file mode 100644
index 2166a23d..00000000
--- a/src/ext/Bal/dnchost/precomp.h
+++ /dev/null
@@ -1,31 +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.
-#include <windows.h>
-#include <msiquery.h>
-#include <corerror.h>
-#include <Shlwapi.h>
-#include <dutil.h>
-#include <memutil.h>
-#include <pathutil.h>
-#include <strutil.h>
-#include <xmlutil.h>
-#include <BootstrapperEngine.h>
-#include <BootstrapperApplication.h>
-#include <IBootstrapperEngine.h>
-#include <IBootstrapperApplication.h>
-#include <IBootstrapperApplicationFactory.h>
-#include <balutil.h>
-#define NETHOST_USE_AS_STATIC
-#include <nethost.h>
-#include <hostfxr.h>
-#include <coreclr_delegates.h>
-#include <preqba.h>
-#include "dncutil.h"
-#include "dnchost.h"
diff --git a/src/ext/Bal/mbahost/mbahost.cpp b/src/ext/Bal/mbahost/mbahost.cpp
deleted file mode 100644
index 9d8acc8a..00000000
--- a/src/ext/Bal/mbahost/mbahost.cpp
+++ /dev/null
@@ -1,693 +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 const DWORD NET452_RELEASE = 379893;
-using namespace mscorlib;
-extern "C" typedef HRESULT (WINAPI *PFN_CORBINDTOCURRENTRUNTIME)(
-    __in LPCWSTR pwszFileName,
-    __in REFCLSID rclsid,
-    __in REFIID riid,
-    __out LPVOID *ppv
-    );
-static MBASTATE vstate = { };
-// internal function declarations
-static HRESULT GetAppDomain(
-    __in MBASTATE* pState
-    );
-static HRESULT LoadModulePaths(
-    __in MBASTATE* pState
-    );
-static HRESULT LoadMbaConfiguration(
-    __in MBASTATE* pState,
-    __in const BOOTSTRAPPER_CREATE_ARGS* pArgs
-    );
-static HRESULT CheckSupportedFrameworks(
-    __in LPCWSTR wzConfigPath
-    );
-static HRESULT UpdateSupportedRuntime(
-    __in IXMLDOMDocument* pixdManifest,
-    __in IXMLDOMNode* pixnSupportedFramework,
-    __out BOOL* pfUpdatedManifest
-    );
-static HRESULT LoadRuntime(
-    __in MBASTATE* pState
-    );
-static HRESULT CreateManagedBootstrapperApplication(
-    __in _AppDomain* pAppDomain,
-    __in const BOOTSTRAPPER_CREATE_ARGS* pArgs,
-    __inout BOOTSTRAPPER_CREATE_RESULTS* pResults
-    );
-static HRESULT CreateManagedBootstrapperApplicationFactory(
-    __in _AppDomain* pAppDomain,
-    __out IBootstrapperApplicationFactory** ppAppFactory
-    );
-static HRESULT CreatePrerequisiteBA(
-    __in MBASTATE* pState,
-    __in IBootstrapperEngine* pEngine,
-    __in const BOOTSTRAPPER_CREATE_ARGS* pArgs,
-    __inout BOOTSTRAPPER_CREATE_RESULTS* pResults
-    );
-static HRESULT VerifyNET4RuntimeIsSupported(
-    );
-// function definitions
-extern "C" BOOL WINAPI DllMain(
-    IN HINSTANCE hInstance,
-    IN DWORD dwReason,
-    IN LPVOID /* pvReserved */
-    )
-{
-    switch (dwReason)
-    {
-    case DLL_PROCESS_ATTACH:
-        ::DisableThreadLibraryCalls(hInstance);
-        vstate.hInstance = hInstance;
-        break;
-    case DLL_PROCESS_DETACH:
-        vstate.hInstance = NULL;
-        break;
-    }
-    return TRUE;
-}
-// Note: This function assumes that COM was already initialized on the thread.
-extern "C" HRESULT WINAPI BootstrapperApplicationCreate(
-    __in const BOOTSTRAPPER_CREATE_ARGS* pArgs,
-    __inout BOOTSTRAPPER_CREATE_RESULTS* pResults
-    )
-{
-    HRESULT hr = S_OK; 
-    IBootstrapperEngine* pEngine = NULL;
-    if (vstate.fStoppedRuntime)
-    {
-        BalExitWithRootFailure(hr, E_INVALIDSTATE, "Reloaded mbahost after stopping .NET runtime.");
-    }
-    hr = BalInitializeFromCreateArgs(pArgs, &pEngine);
-    ExitOnFailure(hr, "Failed to initialize Bal.");
-    if (!vstate.fInitialized)
-    {
-        hr = XmlInitialize();
-        BalExitOnFailure(hr, "Failed to initialize XML.");
-        hr = LoadModulePaths(&vstate);
-        BalExitOnFailure(hr, "Failed to load the module paths.");
-        hr = LoadMbaConfiguration(&vstate, pArgs);
-        BalExitOnFailure(hr, "Failed to get the mba configuration.");
-        vstate.fInitialized = TRUE;
-    }
-    if (vstate.prereqData.fAlwaysInstallPrereqs && !vstate.prereqData.fCompleted)
-    {
-        BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Loading prerequisite bootstrapper application since it's configured to always run before loading the runtime.");
-        hr = CreatePrerequisiteBA(&vstate, pEngine, pArgs, pResults);
-        BalExitOnFailure(hr, "Failed to create the pre-requisite bootstrapper application.");
-        ExitFunction();
-    }
-    if (!vstate.fInitializedRuntime)
-    {
-        hr = LoadRuntime(&vstate);
-        vstate.fInitializedRuntime = SUCCEEDED(hr);
-    }
-    if (vstate.fInitializedRuntime)
-    {
-        hr = GetAppDomain(&vstate);
-        BalExitOnFailure(hr, "Failed to create the AppDomain for the managed bootstrapper application.");
-        BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Loading managed bootstrapper application.");
-        hr = CreateManagedBootstrapperApplication(vstate.pAppDomain, pArgs, pResults);
-        BalExitOnFailure(hr, "Failed to create the managed bootstrapper application.");
-    }
-    else // fallback to the prerequisite BA.
-    {
-        if (E_MBAHOST_NET452_ON_WIN7RTM == hr)
-        {
-            BalLogError(hr, "The Burn engine cannot run with an MBA under the .NET 4 CLR on Windows 7 RTM with .NET 4.5.2 (or greater) installed.");
-            vstate.prereqData.hrFatalError = hr;
-        }
-        else if (vstate.prereqData.fCompleted)
-        {
-            hr = E_PREREQBA_INFINITE_LOOP;
-            BalLogError(hr, "The prerequisites were already installed. The bootstrapper application will not be reloaded to prevent an infinite loop.");
-            vstate.prereqData.hrFatalError = hr;
-        }
-        else
-        {
-            vstate.prereqData.hrFatalError = S_OK;
-        }
-        BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Loading prerequisite bootstrapper application because managed host could not be loaded, error: 0x%08x.", hr);
-        hr = CreatePrerequisiteBA(&vstate, pEngine, pArgs, pResults);
-        BalExitOnFailure(hr, "Failed to create the pre-requisite bootstrapper application.");
-    }
-LExit:
-    ReleaseNullObject(pEngine);
-    return hr;
-}
-extern "C" void WINAPI BootstrapperApplicationDestroy(
-    __in const BOOTSTRAPPER_DESTROY_ARGS* pArgs,
-    __in BOOTSTRAPPER_DESTROY_RESULTS* pResults
-    )
-{
-    BOOTSTRAPPER_DESTROY_RESULTS childResults = { };
-    if (vstate.pAppDomain)
-    {
-        HRESULT hr = vstate.pCLRHost->UnloadDomain(vstate.pAppDomain);
-        if (FAILED(hr))
-        {
-            BalLogError(hr, "Failed to unload app domain.");
-        }
-        vstate.pAppDomain->Release();
-        vstate.pAppDomain = NULL;
-    }
-    // pCLRHost can only be stopped once per process.
-    if (vstate.pCLRHost && !pArgs->fReload)
-    {
-        vstate.pCLRHost->Stop();
-        vstate.pCLRHost->Release();
-        vstate.pCLRHost = NULL;
-        vstate.fStoppedRuntime = TRUE;
-    }
-    if (vstate.hMbapreqModule)
-    {
-        PFN_BOOTSTRAPPER_APPLICATION_DESTROY pfnDestroy = reinterpret_cast<PFN_BOOTSTRAPPER_APPLICATION_DESTROY>(::GetProcAddress(vstate.hMbapreqModule, "PrereqBootstrapperApplicationDestroy"));
-        if (pfnDestroy)
-        {
-            (*pfnDestroy)(pArgs, &childResults);
-        }
-        ::FreeLibrary(vstate.hMbapreqModule);
-        vstate.hMbapreqModule = NULL;
-    }
-    BalUninitialize();
-    // Need to keep track of state between reloads.
-    pResults->fDisableUnloading = TRUE;
-}
-// Gets the custom AppDomain for loading managed BA.
-static HRESULT GetAppDomain(
-    __in MBASTATE* pState
-    )
-{
-    HRESULT hr = S_OK;
-    IUnknown *pUnk = NULL;
-    IAppDomainSetup* pAppDomainSetup = NULL;
-    BSTR bstrAppBase = NULL;
-    BSTR bstrConfigPath = NULL;
-    // Create the setup information for a new AppDomain to set the app base and config.
-    hr = pState->pCLRHost->CreateDomainSetup(&pUnk);
-    BalExitOnRootFailure(hr, "Failed to create the AppDomainSetup object.");
-    hr = pUnk->QueryInterface(__uuidof(IAppDomainSetup), reinterpret_cast<LPVOID*>(&pAppDomainSetup));
-    BalExitOnRootFailure(hr, "Failed to query for the IAppDomainSetup interface.");
-    ReleaseNullObject(pUnk);
-    // Set properties on the AppDomainSetup object.
-    bstrAppBase = ::SysAllocString(pState->sczAppBase);
-    BalExitOnNull(bstrAppBase, hr, E_OUTOFMEMORY, "Failed to allocate the application base path for the AppDomainSetup.");
-    hr = pAppDomainSetup->put_ApplicationBase(bstrAppBase);
-    BalExitOnRootFailure(hr, "Failed to set the application base path for the AppDomainSetup.");
-    bstrConfigPath = ::SysAllocString(pState->sczConfigPath);
-    BalExitOnNull(bstrConfigPath, hr, E_OUTOFMEMORY, "Failed to allocate the application configuration file for the AppDomainSetup.");
-    hr = pAppDomainSetup->put_ConfigurationFile(bstrConfigPath);
-    BalExitOnRootFailure(hr, "Failed to set the configuration file path for the AppDomainSetup.");
-    // Create the AppDomain to load the factory type.
-    hr = pState->pCLRHost->CreateDomainEx(L"MBA", pAppDomainSetup, NULL, &pUnk);
-    BalExitOnRootFailure(hr, "Failed to create the MBA AppDomain.");
-    hr = pUnk->QueryInterface(__uuidof(_AppDomain), reinterpret_cast<LPVOID*>(&pState->pAppDomain));
-    BalExitOnRootFailure(hr, "Failed to query for the _AppDomain interface.");
-LExit:
-    ReleaseBSTR(bstrConfigPath);
-    ReleaseBSTR(bstrAppBase);
-    ReleaseNullObject(pUnk);
-    return hr;
-}
-static HRESULT LoadModulePaths(
-    __in MBASTATE* pState
-    )
-{
-    HRESULT hr = S_OK;
-    LPWSTR sczFullPath = NULL;
-    hr = PathForCurrentProcess(&sczFullPath, pState->hInstance);
-    BalExitOnFailure(hr, "Failed to get the full host path.");
-    hr = PathGetDirectory(sczFullPath, &pState->sczAppBase);
-    BalExitOnFailure(hr, "Failed to get the directory of the full process path.");
-    hr = PathConcat(pState->sczAppBase, MBA_CONFIG_FILE_NAME, &pState->sczConfigPath);
-    BalExitOnFailure(hr, "Failed to get the full path to the application configuration file.");
-LExit:
-    ReleaseStr(sczFullPath);
-    return hr;
-}
-static HRESULT LoadMbaConfiguration(
-    __in MBASTATE* pState,
-    __in const BOOTSTRAPPER_CREATE_ARGS* pArgs
-    )
-{
-    HRESULT hr = S_OK;
-    IXMLDOMDocument* pixdManifest = NULL;
-    IXMLDOMNode* pixnHost = NULL;
-    BOOL fXmlFound = FALSE;
-    hr = XmlLoadDocumentFromFile(pArgs->pCommand->wzBootstrapperApplicationDataPath, &pixdManifest);
-    BalExitOnFailure(hr, "Failed to load BalManifest '%ls'", pArgs->pCommand->wzBootstrapperApplicationDataPath);
-    hr = XmlSelectSingleNode(pixdManifest, L"/BootstrapperApplicationData/WixMbaPrereqOptions", &pixnHost);
-    BalExitOnOptionalXmlQueryFailure(hr, fXmlFound, "Failed to find WixMbaPrereqOptions element in bootstrapper application config.");
-    if (fXmlFound)
-    {
-        hr = XmlGetAttributeNumber(pixnHost, L"AlwaysInstallPrereqs", reinterpret_cast<DWORD*>(&pState->prereqData.fAlwaysInstallPrereqs));
-        BalExitOnOptionalXmlQueryFailure(hr, fXmlFound, "Failed to get AlwaysInstallPrereqs value.");
-    }
-    pState->prereqData.fPerformHelp = !pState->prereqData.fAlwaysInstallPrereqs;
-LExit:
-    ReleaseObject(pixnHost);
-    ReleaseObject(pixdManifest);
-    return hr;
-}
-// Checks whether at least one of required supported frameworks is installed via the NETFX registry keys.
-static HRESULT CheckSupportedFrameworks(
-    __in LPCWSTR wzConfigPath
-    )
-{
-    HRESULT hr = S_OK;
-    IXMLDOMDocument* pixdManifest = NULL;
-    IXMLDOMNodeList* pNodeList = NULL;
-    IXMLDOMNode* pNode = NULL;
-    DWORD cSupportedFrameworks = 0;
-    LPWSTR sczSupportedFrameworkVersion = NULL;
-    LPWSTR sczFrameworkRegistryKey = NULL;
-    HKEY hkFramework = NULL;
-    DWORD dwFrameworkInstalled = 0;
-    BOOL fUpdatedManifest = FALSE;
-    hr = XmlLoadDocumentFromFile(wzConfigPath, &pixdManifest);
-    BalExitOnFailure(hr, "Failed to load bootstrapper config file from path: %ls", wzConfigPath);
-    hr = XmlSelectNodes(pixdManifest, L"/configuration/wix.bootstrapper/host/supportedFramework", &pNodeList);
-    BalExitOnFailure(hr, "Failed to select all supportedFramework elements.");
-    hr = pNodeList->get_length(reinterpret_cast<long*>(&cSupportedFrameworks));
-    BalExitOnFailure(hr, "Failed to get the supported framework count.");
-    if (cSupportedFrameworks)
-    {
-        while (S_OK == (hr = XmlNextElement(pNodeList, &pNode, NULL)))
-        {
-            hr = XmlGetAttributeEx(pNode, L"version", &sczSupportedFrameworkVersion);
-            BalExitOnRequiredXmlQueryFailure(hr, "Failed to get supportedFramework/@version.");
-            hr = StrAllocFormatted(&sczFrameworkRegistryKey, L"SOFTWARE\\Microsoft\\NET Framework Setup\\NDP\\%ls", sczSupportedFrameworkVersion);
-            BalExitOnFailure(hr, "Failed to allocate path to supported framework Install registry key.");
-            hr = RegOpen(HKEY_LOCAL_MACHINE, sczFrameworkRegistryKey, KEY_READ, &hkFramework);
-            if (SUCCEEDED(hr))
-            {
-                hr = RegReadNumber(hkFramework, L"Install", &dwFrameworkInstalled);
-                if (dwFrameworkInstalled)
-                {
-                    hr = S_OK;
-                    break;
-                }
-            }
-            ReleaseNullObject(pNode);
-        }
-        // If we looped through all the supported frameworks but didn't find anything, ensure we return a failure.
-        if (S_FALSE == hr)
-        {
-            BalExitWithRootFailure(hr, E_NOTFOUND, "Failed to find a supported framework.");
-        }
-        hr = UpdateSupportedRuntime(pixdManifest, pNode, &fUpdatedManifest);
-        BalExitOnFailure(hr, "Failed to update supportedRuntime.");
-    }
-    // else no supported frameworks specified, so the startup/supportedRuntime must be enough.
-    if (fUpdatedManifest)
-    {
-        hr = XmlSaveDocument(pixdManifest, wzConfigPath);
-        BalExitOnFailure(hr, "Failed to save updated manifest over config file: %ls", wzConfigPath);
-    }
-LExit:
-    ReleaseRegKey(hkFramework);
-    ReleaseStr(sczFrameworkRegistryKey);
-    ReleaseStr(sczSupportedFrameworkVersion);
-    ReleaseObject(pNode);
-    ReleaseObject(pNodeList);
-    ReleaseObject(pixdManifest);
-    return hr;
-}
-// Fixes the supportedRuntime element if necessary.
-static HRESULT UpdateSupportedRuntime(
-    __in IXMLDOMDocument* pixdManifest,
-    __in IXMLDOMNode* pixnSupportedFramework,
-    __out BOOL* pfUpdatedManifest
-    )
-{
-    HRESULT hr = S_OK;
-    LPWSTR sczSupportedRuntimeVersion = NULL;
-    IXMLDOMNode* pixnStartup = NULL;
-    IXMLDOMNode* pixnSupportedRuntime = NULL;
-    BOOL fXmlFound = FALSE;
-    *pfUpdatedManifest = FALSE;
-    // If the runtime version attribute is not specified, don't update the manifest.
-    hr = XmlGetAttributeEx(pixnSupportedFramework, L"runtimeVersion", &sczSupportedRuntimeVersion);
-    BalExitOnOptionalXmlQueryFailure(hr, fXmlFound, "Failed to get supportedFramework/@runtimeVersion.");
-    if (!fXmlFound)
-    {
-        ExitFunction();
-    }
-    // Get the startup element. Fail if we can't find it since it'll be necessary to load the
-    // correct runtime.
-    hr = XmlSelectSingleNode(pixdManifest, L"/configuration/startup", &pixnStartup);
-    BalExitOnRequiredXmlQueryFailure(hr, "Failed to get startup element.");
-    // Remove any pre-existing supported runtimes because they'll just get in the way and create our new one.
-    hr = XmlRemoveChildren(pixnStartup, L"supportedRuntime");
-    BalExitOnFailure(hr, "Failed to remove pre-existing supportedRuntime elements.");
-    hr = XmlCreateChild(pixnStartup, L"supportedRuntime", &pixnSupportedRuntime);
-    BalExitOnFailure(hr, "Failed to create supportedRuntime element.");
-    hr = XmlSetAttribute(pixnSupportedRuntime, L"version", sczSupportedRuntimeVersion);
-    BalExitOnFailure(hr, "Failed to set supportedRuntime/@version to '%ls'.", sczSupportedRuntimeVersion);
-    *pfUpdatedManifest = TRUE;
-LExit:
-    ReleaseObject(pixnSupportedRuntime);
-    ReleaseObject(pixnStartup);
-    ReleaseStr(sczSupportedRuntimeVersion);
-    return hr;
-}
-// Gets the CLR host and caches it.
-static HRESULT LoadRuntime(
-    __in MBASTATE* pState
-    )
-{
-    HRESULT hr = S_OK;
-    UINT uiMode = 0;
-    HMODULE hModule = NULL;
-    BOOL fFallbackToCorBindToCurrentRuntime = TRUE;
-    CLRCreateInstanceFnPtr pfnCLRCreateInstance = NULL;
-    ICLRMetaHostPolicy* pCLRMetaHostPolicy = NULL;
-    IStream* pCfgStream = NULL;
-    LPWSTR pwzVersion = NULL;
-    DWORD cchVersion = 0;
-    DWORD dwConfigFlags = 0;
-    ICLRRuntimeInfo* pCLRRuntimeInfo = NULL;
-    PFN_CORBINDTOCURRENTRUNTIME pfnCorBindToCurrentRuntime = NULL;
-    // Always set the error mode because we will always restore it below.
-    uiMode = ::SetErrorMode(0);
-    // Check that the supported framework is installed.
-    hr = CheckSupportedFrameworks(pState->sczConfigPath);
-    BalExitOnFailure(hr, "Failed to find supported framework.");
-    // Cache the CLR host to be shutdown later. This can occur on a different thread.
-    // Disable message boxes from being displayed on error and blocking execution.
-    ::SetErrorMode(uiMode | SEM_FAILCRITICALERRORS);
-    hr = LoadSystemLibrary(L"mscoree.dll", &hModule);
-    BalExitOnFailure(hr, "Failed to load mscoree.dll");
-    pfnCLRCreateInstance = reinterpret_cast<CLRCreateInstanceFnPtr>(::GetProcAddress(hModule, "CLRCreateInstance"));
-    if (pfnCLRCreateInstance)
-    {
-        hr = pfnCLRCreateInstance(CLSID_CLRMetaHostPolicy, IID_ICLRMetaHostPolicy, reinterpret_cast<LPVOID*>(&pCLRMetaHostPolicy));
-        if (E_NOTIMPL != hr)
-        {
-            BalExitOnRootFailure(hr, "Failed to create instance of ICLRMetaHostPolicy.");
-            fFallbackToCorBindToCurrentRuntime = FALSE;
-        }
-    }
-    if (fFallbackToCorBindToCurrentRuntime)
-    {
-        pfnCorBindToCurrentRuntime = reinterpret_cast<PFN_CORBINDTOCURRENTRUNTIME>(::GetProcAddress(hModule, "CorBindToCurrentRuntime"));
-        BalExitOnNullWithLastError(pfnCorBindToCurrentRuntime, hr, "Failed to get procedure address for CorBindToCurrentRuntime.");
-        hr = pfnCorBindToCurrentRuntime(pState->sczConfigPath, CLSID_CorRuntimeHost, IID_ICorRuntimeHost, reinterpret_cast<LPVOID*>(&pState->pCLRHost));
-        BalExitOnRootFailure(hr, "Failed to create the CLR host using the application configuration file path.");
-    }
-    else
-    {
-        hr = SHCreateStreamOnFileEx(pState->sczConfigPath, STGM_READ | STGM_SHARE_DENY_WRITE, 0, FALSE, NULL, &pCfgStream);
-        BalExitOnFailure(hr, "Failed to load bootstrapper config file from path: %ls", pState->sczConfigPath);
-        hr = pCLRMetaHostPolicy->GetRequestedRuntime(METAHOST_POLICY_HIGHCOMPAT, NULL, pCfgStream, NULL, &cchVersion, NULL, NULL, &dwConfigFlags, IID_ICLRRuntimeInfo, reinterpret_cast<LPVOID*>(&pCLRRuntimeInfo));
-        BalExitOnRootFailure(hr, "Failed to get the CLR runtime info using the application configuration file path.");
-        // .NET 4 RTM had a bug where it wouldn't set pcchVersion if pwzVersion was NULL.
-        if (!cchVersion)
-        {
-            hr = pCLRRuntimeInfo->GetVersionString(NULL, &cchVersion);
-            if (HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER) != hr)
-            {
-                BalExitOnFailure(hr, "Failed to get the length of the CLR version string.");
-            }
-        }
-        hr = StrAlloc(&pwzVersion, cchVersion);
-        ExitOnFailure(hr, "Failed to allocate the CLR version string.");
-        hr = pCLRRuntimeInfo->GetVersionString(pwzVersion, &cchVersion);
-        ExitOnFailure(hr, "Failed to get the CLR version string.");
-        if (CSTR_EQUAL == CompareString(LOCALE_NEUTRAL, 0, L"v4.0.30319", -1, pwzVersion, cchVersion))
-        {
-            hr = VerifyNET4RuntimeIsSupported();
-            BalExitOnFailure(hr, "Found unsupported .NET 4 Runtime.");
-        }
-        if (METAHOST_CONFIG_FLAGS_LEGACY_V2_ACTIVATION_POLICY_TRUE == (METAHOST_CONFIG_FLAGS_LEGACY_V2_ACTIVATION_POLICY_MASK & dwConfigFlags))
-        {
-            hr = pCLRRuntimeInfo->BindAsLegacyV2Runtime();
-            BalExitOnRootFailure(hr, "Failed to bind as legacy V2 runtime.");
-        }
-        hr = pCLRRuntimeInfo->GetInterface(CLSID_CorRuntimeHost, IID_ICorRuntimeHost, reinterpret_cast<LPVOID*>(&pState->pCLRHost));
-        BalExitOnRootFailure(hr, "Failed to get instance of ICorRuntimeHost.");
-    }
-    hr = pState->pCLRHost->Start();
-    BalExitOnRootFailure(hr, "Failed to start the CLR host.");
-LExit:
-    ReleaseStr(pwzVersion);
-    ReleaseNullObject(pCLRRuntimeInfo);
-    ReleaseNullObject(pCfgStream);
-    ReleaseNullObject(pCLRMetaHostPolicy);
-    // Unload the module so it's not in use when we install .NET.
-    if (FAILED(hr))
-    {
-        ::FreeLibrary(hModule);
-    }
-    ::SetErrorMode(uiMode); // restore the previous error mode.
-    return hr;
-}
-// Creates the bootstrapper app and returns it for the engine.
-static HRESULT CreateManagedBootstrapperApplication(
-    __in _AppDomain* pAppDomain,
-    __in const BOOTSTRAPPER_CREATE_ARGS* pArgs,
-    __inout BOOTSTRAPPER_CREATE_RESULTS* pResults
-    )
-{
-    HRESULT hr = S_OK;
-    IBootstrapperApplicationFactory* pAppFactory = NULL;
-    hr = CreateManagedBootstrapperApplicationFactory(pAppDomain, &pAppFactory);
-    BalExitOnFailure(hr, "Failed to create the factory to create the bootstrapper application.");
-    hr = pAppFactory->Create(pArgs, pResults);
-    BalExitOnFailure(hr, "Failed to create the bootstrapper application.");
-LExit:
-    ReleaseNullObject(pAppFactory);
-    return hr;
-}
-// Creates the app factory to create the managed app in the default AppDomain.
-static HRESULT CreateManagedBootstrapperApplicationFactory(
-    __in _AppDomain* pAppDomain,
-    __out IBootstrapperApplicationFactory** ppAppFactory
-    )
-{
-    HRESULT hr = S_OK;
-    BSTR bstrAssemblyName = NULL;
-    BSTR bstrTypeName = NULL;
-    _ObjectHandle* pObj = NULL;
-    VARIANT vtBAFactory;
-    ::VariantInit(&vtBAFactory);
-    bstrAssemblyName = ::SysAllocString(MBA_ASSEMBLY_FULL_NAME);
-    BalExitOnNull(bstrAssemblyName, hr, E_OUTOFMEMORY, "Failed to allocate the full assembly name for the bootstrapper application factory.");
-    bstrTypeName = ::SysAllocString(MBA_ENTRY_TYPE);
-    BalExitOnNull(bstrTypeName, hr, E_OUTOFMEMORY, "Failed to allocate the full type name for the BA factory.");
-    hr = pAppDomain->CreateInstance(bstrAssemblyName, bstrTypeName, &pObj);
-    BalExitOnRootFailure(hr, "Failed to create the BA factory object.");
-    hr = pObj->Unwrap(&vtBAFactory);
-    BalExitOnRootFailure(hr, "Failed to unwrap the BA factory object into the host domain.");
-    BalExitOnNull(vtBAFactory.punkVal, hr, E_UNEXPECTED, "The variant did not contain the expected IUnknown pointer.");
-    hr = vtBAFactory.punkVal->QueryInterface(__uuidof(IBootstrapperApplicationFactory), reinterpret_cast<LPVOID*>(ppAppFactory));
-    BalExitOnRootFailure(hr, "Failed to query for the bootstrapper app factory interface.");
-LExit:
-    ReleaseVariant(vtBAFactory);
-    ReleaseNullObject(pObj);
-    ReleaseBSTR(bstrTypeName);
-    ReleaseBSTR(bstrAssemblyName);
-    return hr;
-}
-static HRESULT CreatePrerequisiteBA(
-    __in MBASTATE* pState,
-    __in IBootstrapperEngine* pEngine,
-    __in const BOOTSTRAPPER_CREATE_ARGS* pArgs,
-    __inout BOOTSTRAPPER_CREATE_RESULTS* pResults
-    )
-{
-    HRESULT hr = S_OK;
-    LPWSTR sczMbapreqPath = NULL;
-    HMODULE hModule = NULL;
-    hr = PathConcat(pState->sczAppBase, L"mbapreq.dll", &sczMbapreqPath);
-    BalExitOnFailure(hr, "Failed to get path to pre-requisite BA.");
-    hModule = ::LoadLibraryExW(sczMbapreqPath, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
-    BalExitOnNullWithLastError(hModule, hr, "Failed to load pre-requisite BA DLL.");
-    PFN_PREQ_BOOTSTRAPPER_APPLICATION_CREATE pfnCreate = reinterpret_cast<PFN_PREQ_BOOTSTRAPPER_APPLICATION_CREATE>(::GetProcAddress(hModule, "PrereqBootstrapperApplicationCreate"));
-    BalExitOnNullWithLastError(pfnCreate, hr, "Failed to get PrereqBootstrapperApplicationCreate entry-point from: %ls", sczMbapreqPath);
-    hr = pfnCreate(&pState->prereqData, pEngine, pArgs, pResults);
-    BalExitOnFailure(hr, "Failed to create prequisite bootstrapper app.");
-    pState->hMbapreqModule = hModule;
-    hModule = NULL;
-LExit:
-    if (hModule)
-    {
-        ::FreeLibrary(hModule);
-    }
-    ReleaseStr(sczMbapreqPath);
-    return hr;
-}
-static HRESULT VerifyNET4RuntimeIsSupported(
-    )
-{
-    HRESULT hr = S_OK;
-    OS_VERSION osv = OS_VERSION_UNKNOWN;
-    DWORD dwServicePack = 0;
-    HKEY hKey = NULL;
-    DWORD er = ERROR_SUCCESS;
-    DWORD dwRelease = 0;
-    DWORD cchRelease = sizeof(dwRelease);
-    OsGetVersion(&osv, &dwServicePack);
-    if (OS_VERSION_WIN7 == osv && 0 == dwServicePack)
-    {
-        hr = RegOpen(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\NET Framework Setup\\NDP\\v4\\Full", KEY_QUERY_VALUE, &hKey);
-        if (E_FILENOTFOUND == hr)
-        {
-            ExitFunction1(hr = S_OK);
-        }
-        BalExitOnFailure(hr, "Failed to open registry key for .NET 4.");
-        er = ::RegQueryValueExW(hKey, L"Release", NULL, NULL, reinterpret_cast<LPBYTE>(&dwRelease), &cchRelease);
-        if (ERROR_FILE_NOT_FOUND == er)
-        {
-            ExitFunction1(hr = S_OK);
-        }
-        BalExitOnWin32Error(er, hr, "Failed to get Release value.");
-        if (NET452_RELEASE <= dwRelease)
-        {
-            hr = E_MBAHOST_NET452_ON_WIN7RTM;
-        }
-    }
-LExit:
-    ReleaseRegKey(hKey);
-    return hr;
-}
diff --git a/src/ext/Bal/mbahost/mbahost.def b/src/ext/Bal/mbahost/mbahost.def
deleted file mode 100644
index 4488df94..00000000
--- a/src/ext/Bal/mbahost/mbahost.def
+++ /dev/null
@@ -1,6 +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.
-EXPORTS
-    BootstrapperApplicationCreate
-    BootstrapperApplicationDestroy
diff --git a/src/ext/Bal/mbahost/mbahost.h b/src/ext/Bal/mbahost/mbahost.h
deleted file mode 100644
index 19cf8311..00000000
--- a/src/ext/Bal/mbahost/mbahost.h
+++ /dev/null
@@ -1,17 +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.
-struct MBASTATE
-{
-    BOOL fInitialized;
-    BOOL fInitializedRuntime;
-    BOOL fStoppedRuntime;
-    HINSTANCE hInstance;
-    LPWSTR sczAppBase;
-    LPWSTR sczConfigPath;
-    mscorlib::_AppDomain* pAppDomain;
-    ICorRuntimeHost* pCLRHost;
-    HMODULE hMbapreqModule;
-    PREQBA_DATA prereqData;
-};
diff --git a/src/ext/Bal/mbahost/precomp.h b/src/ext/Bal/mbahost/precomp.h
deleted file mode 100644
index a07f2fc0..00000000
--- a/src/ext/Bal/mbahost/precomp.h
+++ /dev/null
@@ -1,30 +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.
-#include <windows.h>
-#include <msiquery.h>
-#include <metahost.h>
-#include <shlwapi.h>
-#import <mscorlib.tlb> raw_interfaces_only rename("ReportEvent", "mscorlib_ReportEvent")
-#include <dutil.h>
-#include <osutil.h>
-#include <pathutil.h>
-#include <regutil.h>
-#include <strutil.h>
-#include <xmlutil.h>
-#include <BootstrapperEngine.h>
-#include <BootstrapperApplication.h>
-#include <IBootstrapperEngine.h>
-#include <IBootstrapperApplication.h>
-#include <IBootstrapperApplicationFactory.h>
-#include <balutil.h>
-#include <preqba.h>
-#include <WixToolset.Mba.Host.h> // includes the generated assembly name macros.
-#include "mbahost.h"
diff --git a/src/ext/Bal/wixstdba/Resources/1028/mbapreq.wxl b/src/ext/Bal/stdbas/Resources/1028/wixpreq.wxl
index 1ab287e4..1ab287e4 100644
--- a/src/ext/Bal/wixstdba/Resources/1028/mbapreq.wxl
+++ b/src/ext/Bal/stdbas/Resources/1028/wixpreq.wxl
diff --git a/src/ext/Bal/wixstdba/Resources/1029/mbapreq.wxl b/src/ext/Bal/stdbas/Resources/1029/wixpreq.wxl
index e60c92cb..e60c92cb 100644
--- a/src/ext/Bal/wixstdba/Resources/1029/mbapreq.wxl
+++ b/src/ext/Bal/stdbas/Resources/1029/wixpreq.wxl
diff --git a/src/ext/Bal/wixstdba/Resources/1030/mbapreq.wxl b/src/ext/Bal/stdbas/Resources/1030/wixpreq.wxl
index b895bb76..b895bb76 100644
--- a/src/ext/Bal/wixstdba/Resources/1030/mbapreq.wxl
+++ b/src/ext/Bal/stdbas/Resources/1030/wixpreq.wxl
diff --git a/src/ext/Bal/wixstdba/Resources/1031/mbapreq.wxl b/src/ext/Bal/stdbas/Resources/1031/wixpreq.wxl
index 760b1ceb..760b1ceb 100644
--- a/src/ext/Bal/wixstdba/Resources/1031/mbapreq.wxl
+++ b/src/ext/Bal/stdbas/Resources/1031/wixpreq.wxl
diff --git a/src/ext/Bal/wixstdba/Resources/1032/mbapreq.wxl b/src/ext/Bal/stdbas/Resources/1032/wixpreq.wxl
index a9cd7a5b..a9cd7a5b 100644
--- a/src/ext/Bal/wixstdba/Resources/1032/mbapreq.wxl
+++ b/src/ext/Bal/stdbas/Resources/1032/wixpreq.wxl
diff --git a/src/ext/Bal/wixstdba/Resources/1035/mbapreq.wxl b/src/ext/Bal/stdbas/Resources/1035/wixpreq.wxl
index b54476bd..b54476bd 100644
--- a/src/ext/Bal/wixstdba/Resources/1035/mbapreq.wxl
+++ b/src/ext/Bal/stdbas/Resources/1035/wixpreq.wxl
diff --git a/src/ext/Bal/wixstdba/Resources/1036/mbapreq.wxl b/src/ext/Bal/stdbas/Resources/1036/wixpreq.wxl
index cd17ae34..cd17ae34 100644
--- a/src/ext/Bal/wixstdba/Resources/1036/mbapreq.wxl
+++ b/src/ext/Bal/stdbas/Resources/1036/wixpreq.wxl
diff --git a/src/ext/Bal/wixstdba/Resources/1038/mbapreq.wxl b/src/ext/Bal/stdbas/Resources/1038/wixpreq.wxl
index 6cbb1d34..6cbb1d34 100644
--- a/src/ext/Bal/wixstdba/Resources/1038/mbapreq.wxl
+++ b/src/ext/Bal/stdbas/Resources/1038/wixpreq.wxl
diff --git a/src/ext/Bal/wixstdba/Resources/1040/mbapreq.wxl b/src/ext/Bal/stdbas/Resources/1040/wixpreq.wxl
index 66940e85..66940e85 100644
--- a/src/ext/Bal/wixstdba/Resources/1040/mbapreq.wxl
+++ b/src/ext/Bal/stdbas/Resources/1040/wixpreq.wxl
diff --git a/src/ext/Bal/wixstdba/Resources/1041/mbapreq.wxl b/src/ext/Bal/stdbas/Resources/1041/wixpreq.wxl
index c830072e..c830072e 100644
--- a/src/ext/Bal/wixstdba/Resources/1041/mbapreq.wxl
+++ b/src/ext/Bal/stdbas/Resources/1041/wixpreq.wxl
diff --git a/src/ext/Bal/wixstdba/Resources/1042/mbapreq.wxl b/src/ext/Bal/stdbas/Resources/1042/wixpreq.wxl
index df6e9b31..df6e9b31 100644
--- a/src/ext/Bal/wixstdba/Resources/1042/mbapreq.wxl
+++ b/src/ext/Bal/stdbas/Resources/1042/wixpreq.wxl
diff --git a/src/ext/Bal/wixstdba/Resources/1043/mbapreq.wxl b/src/ext/Bal/stdbas/Resources/1043/wixpreq.wxl
index c9d7b8e4..c9d7b8e4 100644
--- a/src/ext/Bal/wixstdba/Resources/1043/mbapreq.wxl
+++ b/src/ext/Bal/stdbas/Resources/1043/wixpreq.wxl
diff --git a/src/ext/Bal/wixstdba/Resources/1044/mbapreq.wxl b/src/ext/Bal/stdbas/Resources/1044/wixpreq.wxl
index 9a5f8ea1..9a5f8ea1 100644
--- a/src/ext/Bal/wixstdba/Resources/1044/mbapreq.wxl
+++ b/src/ext/Bal/stdbas/Resources/1044/wixpreq.wxl
diff --git a/src/ext/Bal/wixstdba/Resources/1045/mbapreq.wxl b/src/ext/Bal/stdbas/Resources/1045/wixpreq.wxl
index f7d0de6a..f7d0de6a 100644
--- a/src/ext/Bal/wixstdba/Resources/1045/mbapreq.wxl
+++ b/src/ext/Bal/stdbas/Resources/1045/wixpreq.wxl
diff --git a/src/ext/Bal/wixstdba/Resources/1046/mbapreq.wxl b/src/ext/Bal/stdbas/Resources/1046/wixpreq.wxl
index dc8d22d1..dc8d22d1 100644
--- a/src/ext/Bal/wixstdba/Resources/1046/mbapreq.wxl
+++ b/src/ext/Bal/stdbas/Resources/1046/wixpreq.wxl
diff --git a/src/ext/Bal/wixstdba/Resources/1049/mbapreq.wxl b/src/ext/Bal/stdbas/Resources/1049/wixpreq.wxl
index 0614da9e..0614da9e 100644
--- a/src/ext/Bal/wixstdba/Resources/1049/mbapreq.wxl
+++ b/src/ext/Bal/stdbas/Resources/1049/wixpreq.wxl
diff --git a/src/ext/Bal/wixstdba/Resources/1051/mbapreq.wxl b/src/ext/Bal/stdbas/Resources/1051/wixpreq.wxl
index 0dd75159..0dd75159 100644
--- a/src/ext/Bal/wixstdba/Resources/1051/mbapreq.wxl
+++ b/src/ext/Bal/stdbas/Resources/1051/wixpreq.wxl
diff --git a/src/ext/Bal/wixstdba/Resources/1053/mbapreq.wxl b/src/ext/Bal/stdbas/Resources/1053/wixpreq.wxl
index 068f5519..068f5519 100644
--- a/src/ext/Bal/wixstdba/Resources/1053/mbapreq.wxl
+++ b/src/ext/Bal/stdbas/Resources/1053/wixpreq.wxl
diff --git a/src/ext/Bal/wixstdba/Resources/1055/mbapreq.wxl b/src/ext/Bal/stdbas/Resources/1055/wixpreq.wxl
index f4d98354..f4d98354 100644
--- a/src/ext/Bal/wixstdba/Resources/1055/mbapreq.wxl
+++ b/src/ext/Bal/stdbas/Resources/1055/wixpreq.wxl
diff --git a/src/ext/Bal/wixstdba/Resources/1060/mbapreq.wxl b/src/ext/Bal/stdbas/Resources/1060/wixpreq.wxl
index d24231db..d24231db 100644
--- a/src/ext/Bal/wixstdba/Resources/1060/mbapreq.wxl
+++ b/src/ext/Bal/stdbas/Resources/1060/wixpreq.wxl
diff --git a/src/ext/Bal/wixstdba/Resources/2052/mbapreq.wxl b/src/ext/Bal/stdbas/Resources/2052/wixpreq.wxl
index 43ed19fe..43ed19fe 100644
--- a/src/ext/Bal/wixstdba/Resources/2052/mbapreq.wxl
+++ b/src/ext/Bal/stdbas/Resources/2052/wixpreq.wxl
diff --git a/src/ext/Bal/wixstdba/Resources/2070/mbapreq.wxl b/src/ext/Bal/stdbas/Resources/2070/wixpreq.wxl
index 1e57ec2f..1e57ec2f 100644
--- a/src/ext/Bal/wixstdba/Resources/2070/mbapreq.wxl
+++ b/src/ext/Bal/stdbas/Resources/2070/wixpreq.wxl
diff --git a/src/ext/Bal/wixstdba/Resources/3082/mbapreq.wxl b/src/ext/Bal/stdbas/Resources/3082/wixpreq.wxl
index cd835913..cd835913 100644
--- a/src/ext/Bal/wixstdba/Resources/3082/mbapreq.wxl
+++ b/src/ext/Bal/stdbas/Resources/3082/wixpreq.wxl
diff --git a/src/ext/Bal/wixstdba/Resources/HyperlinkLargeTheme.xml b/src/ext/Bal/stdbas/Resources/HyperlinkLargeTheme.xml
index 6e7b69ee..6e7b69ee 100644
--- a/src/ext/Bal/wixstdba/Resources/HyperlinkLargeTheme.xml
+++ b/src/ext/Bal/stdbas/Resources/HyperlinkLargeTheme.xml
diff --git a/src/ext/Bal/wixstdba/Resources/HyperlinkSidebarTheme.xml b/src/ext/Bal/stdbas/Resources/HyperlinkSidebarTheme.xml
index 59a03ad0..59a03ad0 100644
--- a/src/ext/Bal/wixstdba/Resources/HyperlinkSidebarTheme.xml
+++ b/src/ext/Bal/stdbas/Resources/HyperlinkSidebarTheme.xml
diff --git a/src/ext/Bal/wixstdba/Resources/HyperlinkTheme.wxl b/src/ext/Bal/stdbas/Resources/HyperlinkTheme.wxl
index 24e7b728..24e7b728 100644
--- a/src/ext/Bal/wixstdba/Resources/HyperlinkTheme.wxl
+++ b/src/ext/Bal/stdbas/Resources/HyperlinkTheme.wxl
diff --git a/src/ext/Bal/wixstdba/Resources/HyperlinkTheme.xml b/src/ext/Bal/stdbas/Resources/HyperlinkTheme.xml
index c82e1b9f..c82e1b9f 100644
--- a/src/ext/Bal/wixstdba/Resources/HyperlinkTheme.xml
+++ b/src/ext/Bal/stdbas/Resources/HyperlinkTheme.xml
diff --git a/src/ext/Bal/wixstdba/Resources/LoremIpsumLicense.rtf b/src/ext/Bal/stdbas/Resources/LoremIpsumLicense.rtf
index 1a183236..1a183236 100644
--- a/src/ext/Bal/wixstdba/Resources/LoremIpsumLicense.rtf
+++ b/src/ext/Bal/stdbas/Resources/LoremIpsumLicense.rtf
Binary files differ
diff --git a/src/ext/Bal/wixstdba/Resources/RtfLargeTheme.xml b/src/ext/Bal/stdbas/Resources/RtfLargeTheme.xml
index b30fe3cd..b30fe3cd 100644
--- a/src/ext/Bal/wixstdba/Resources/RtfLargeTheme.xml
+++ b/src/ext/Bal/stdbas/Resources/RtfLargeTheme.xml
diff --git a/src/ext/Bal/wixstdba/Resources/RtfTheme.wxl b/src/ext/Bal/stdbas/Resources/RtfTheme.wxl
index a827d1a9..a827d1a9 100644
--- a/src/ext/Bal/wixstdba/Resources/RtfTheme.wxl
+++ b/src/ext/Bal/stdbas/Resources/RtfTheme.wxl
diff --git a/src/ext/Bal/wixstdba/Resources/RtfTheme.xml b/src/ext/Bal/stdbas/Resources/RtfTheme.xml
index e1a486c8..e1a486c8 100644
--- a/src/ext/Bal/wixstdba/Resources/RtfTheme.xml
+++ b/src/ext/Bal/stdbas/Resources/RtfTheme.xml
diff --git a/src/ext/Bal/wixstdba/Resources/dncpreq.wxl b/src/ext/Bal/stdbas/Resources/dncpreq.wxl
index 42c8fa63..a1f63d43 100644
--- a/src/ext/Bal/wixstdba/Resources/dncpreq.wxl
+++ b/src/ext/Bal/stdbas/Resources/dncpreq.wxl
@@ -14,7 +14,7 @@
  <String Id="ProgressHeader" Value="Setup Progress" />
  <String Id="ProgressLabel" Value="Processing:" />
  <String Id="ProgressCancelButton" Value="&amp;Cancel" />
-  <String Id="SuccessHeader" Value="Microsoft .NET Framework Setup Successful" />
+  <String Id="SuccessHeader" Value="Microsoft .NET Core Setup Successful" />
  <String Id="SuccessRestartText" Value="You must restart your computer before [WixBundleName] setup can continue." />
  <String Id="SuccessRestartButton" Value="&amp;Restart" />
  <String Id="SuccessCloseButton" Value="&amp;Close" />
@@ -23,7 +23,6 @@
  <String Id="FailureRestartText" Value="You must restart your computer to complete the rollback of the software." />
  <String Id="FailureRestartButton" Value="&amp;Restart" />
  <String Id="FailureCloseButton" Value="&amp;Close" />
-  <String Id="SCDRUNTIMEFAILUREErrorMessage" Value="[WixBundleName] cannot run on this machine. Install the latest updates and/or the latest OS to run in a supported environment." />
  <String Id="PREREQBAINFINITELOOPErrorMessage" Value="[WixBundleName] failed to load the .NET Core runtime even though all of the prerequisites are installed." />
  <String Id="FilesInUseTitle" Value="Files In Use" />
  <String Id="FilesInUseLabel" Value="The following applications are using files that need to be updated:" />
diff --git a/src/ext/Bal/wixstdba/Resources/iuipreq.thm b/src/ext/Bal/stdbas/Resources/iuipreq.thm
index 5429b3d2..83425841 100644
--- a/src/ext/Bal/wixstdba/Resources/iuipreq.thm
+++ b/src/ext/Bal/stdbas/Resources/iuipreq.thm
@@ -6,7 +6,7 @@
    <Font Id="3" Height="-12" Weight="500" Foreground="windowtext" Background="window">Segoe UI</Font>
    <Window Width="485" Height="300" HexStyle="100a0000" FontId="0" Caption="#(loc.Caption)">
-        <ImageControl X="11" Y="11" Width="64" Height="64" ImageFile="mbapreq.png" Visible="yes"/>
+        <ImageControl X="11" Y="11" Width="64" Height="64" ImageFile="wixpreq.png" Visible="yes"/>
        <Label X="80" Y="11" Width="-11" Height="96" FontId="1" Visible="yes" DisablePrefix="yes">
            <Text>#(loc.Title)</Text>
            <Text Condition="WixBundleAction = 2 OR WixBundleCommandLineAction = 1">#(loc.NonPrereqTitle)</Text>
diff --git a/src/ext/Bal/wixstdba/Resources/logo.png b/src/ext/Bal/stdbas/Resources/logo.png
index 7adc6e11..7adc6e11 100644
--- a/src/ext/Bal/wixstdba/Resources/logo.png
+++ b/src/ext/Bal/stdbas/Resources/logo.png
Binary files differ
diff --git a/src/ext/Bal/wixstdba/Resources/logoSide.png b/src/ext/Bal/stdbas/Resources/logoSide.png
index 308841c5..308841c5 100644
--- a/src/ext/Bal/wixstdba/Resources/logoSide.png
+++ b/src/ext/Bal/stdbas/Resources/logoSide.png
Binary files differ
diff --git a/src/ext/Bal/wixstdba/Resources/mbapreq.png b/src/ext/Bal/stdbas/Resources/wixpreq.png
index c6e9527b..c6e9527b 100644
--- a/src/ext/Bal/wixstdba/Resources/mbapreq.png
+++ b/src/ext/Bal/stdbas/Resources/wixpreq.png
Binary files differ
diff --git a/src/ext/Bal/wixstdba/Resources/mbapreq.thm b/src/ext/Bal/stdbas/Resources/wixpreq.thm
index fda84004..a49c3ee7 100644
--- a/src/ext/Bal/wixstdba/Resources/mbapreq.thm
+++ b/src/ext/Bal/stdbas/Resources/wixpreq.thm
@@ -6,7 +6,7 @@
    <Font Id="3" Height="-12" Weight="500" Foreground="windowtext" Background="window">Segoe UI</Font>
    <Window Width="485" Height="300" HexStyle="100a0000" FontId="0" Caption="#(loc.Caption)">
-        <ImageControl X="11" Y="11" Width="64" Height="64" ImageFile="mbapreq.png" Visible="yes"/>
+        <ImageControl X="11" Y="11" Width="64" Height="64" ImageFile="wixpreq.png" Visible="yes"/>
        <Label X="80" Y="11" Width="-11" Height="96" FontId="1" Visible="yes" DisablePrefix="yes">#(loc.Title)</Label>
        <Page Name="Help">
diff --git a/src/ext/Bal/wixstdba/Resources/iuipreq.wxl b/src/ext/Bal/stdbas/Resources/wixpreq.wxl
index fb3d0cc2..f4725121 100644
--- a/src/ext/Bal/wixstdba/Resources/iuipreq.wxl
+++ b/src/ext/Bal/stdbas/Resources/wixpreq.wxl
@@ -7,7 +7,7 @@
  <String Id="NonPrereqTitle" Value="[WixBundleName] setup" />
  <String Id="ConfirmCancelMessage" Value="Are you sure you want to cancel?" />
  <String Id="HelpHeader" Value="Setup Help" />
-  <String Id="HelpText" Value="/passive | /quiet -  displays minimal UI with no prompts or displays no UI and&#xA;   no prompts. By default UI and all prompts are displayed.&#xA;&#xA;/log log.txt - logs to a specific file. By default a log file is created in %TEMP%." />
+  <String Id="HelpText" Value="/passive | /quiet -  displays minimal UI with no prompts or displays no UI and&#xA;   no prompts. By default UI and all prompts are displayed.&#xA;&#xA;/norestart   - suppress any attempts to restart. By default UI will prompt before restart.&#xA;/log log.txt - logs to a specific file. By default a log file is created in %TEMP%." />
  <String Id="HelpCloseButton" Value="&amp;Close" />
  <String Id="InstallLicenseTerms" Value="Click the &quot;Accept and Install&quot; button to accept the prerequisite &lt;a href=&quot;#&quot;&gt;license terms&lt;/a&gt;." />
  <String Id="InstallAcceptAndInstallButton" Value="&amp;Accept and Install" />
@@ -26,6 +26,7 @@
  <String Id="FailureRestartText" Value="You must restart your computer to complete the rollback of the software." />
  <String Id="FailureRestartButton" Value="&amp;Restart" />
  <String Id="FailureCloseButton" Value="&amp;Close" />
+  <String Id="PREREQBAINFINITELOOPErrorMessage" Value="[WixBundleName] failed to start even though all of the prerequisites are installed." />
  <String Id="FilesInUseTitle" Value="Files In Use" />
  <String Id="FilesInUseLabel" Value="The following applications are using files that need to be updated:" />
  <String Id="FilesInUseNetfxCloseRadioButton" Value="Close the &amp;applications." />
diff --git a/src/ext/Bal/wixiuiba/WixInternalUIBootstrapperApplication.cpp b/src/ext/Bal/stdbas/WixInternalUIBootstrapperApplication.cpp
index 6ff6559b..a8967a31 100644
--- a/src/ext/Bal/wixiuiba/WixInternalUIBootstrapperApplication.cpp
+++ b/src/ext/Bal/stdbas/WixInternalUIBootstrapperApplication.cpp
@@ -1,7 +1,6 @@
 // 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"
-#include "BalBaseBootstrapperApplicationProc.h"
 #include "BalBaseBootstrapperApplication.h"
 static const LPCWSTR WIXIUIBA_WINDOW_CLASS = L"WixInternalUIBA";
@@ -19,6 +18,26 @@ enum WM_WIXIUIBA
 class CWixInternalUIBootstrapperApplication : public CBalBaseBootstrapperApplication
 {
 public: // IBootstrapperApplication
+    STDMETHODIMP OnCreate(
+        __in IBootstrapperEngine* pEngine,
+        __in BOOTSTRAPPER_COMMAND* pCommand
+    )
+    {
+        HRESULT hr = S_OK;
+        hr = __super::OnCreate(pEngine, pCommand);
+        BalExitOnFailure(hr, "CBalBaseBootstrapperApplication initialization failed.");
+        m_commandAction = pCommand->action;
+        m_commandDisplay = pCommand->display;
+        hr = InitializeData();
+        BalExitOnFailure(hr, "Failed to initialize data in internal UI bootstrapper application.");
+    LExit:
+        return hr;
+    }
    virtual STDMETHODIMP OnStartup()
    {
        HRESULT hr = S_OK;
@@ -50,7 +69,8 @@ public: // IBootstrapperApplication
        if (m_fFailedToLoadPackage)
        {
            Assert(FAILED(m_hrFinal));
-            m_pPrereqData->hrFatalError = m_hrFinal;
+            // TODO: Should we really do what this error message says? Going back to the prereq BA
+            // to show the error dialog is pretty overkill vs. showing an error dialog in this BA.
            BalLog(BOOTSTRAPPER_LOG_LEVEL_ERROR, "Failed to load primary package as the BA. The bootstrapper application will be reloaded to show the error.");
            *pAction = BOOTSTRAPPER_SHUTDOWN_ACTION_RELOAD_BOOTSTRAPPER;
        }
@@ -74,13 +94,13 @@ public: // IBootstrapperApplication
            BOOL fInstalled = BOOTSTRAPPER_PACKAGE_STATE_ABSENT < state;
            // Maybe modify the action state if the primary package is or is not already installed.
-            if (fInstalled && BOOTSTRAPPER_ACTION_INSTALL == m_command.action)
+            if (fInstalled && BOOTSTRAPPER_ACTION_INSTALL == m_commandAction)
            {
-                m_command.action = BOOTSTRAPPER_ACTION_MODIFY;
+                m_commandAction = BOOTSTRAPPER_ACTION_MODIFY;
            }
-            else if (!fInstalled && (BOOTSTRAPPER_ACTION_MODIFY == m_command.action || BOOTSTRAPPER_ACTION_REPAIR == m_command.action))
+            else if (!fInstalled && (BOOTSTRAPPER_ACTION_MODIFY == m_commandAction || BOOTSTRAPPER_ACTION_REPAIR == m_commandAction))
            {
-                m_command.action = BOOTSTRAPPER_ACTION_INSTALL;
+                m_commandAction = BOOTSTRAPPER_ACTION_INSTALL;
            }
            if (m_fApplied && !fInstalled && fCached)
@@ -111,7 +131,7 @@ public: // IBootstrapperApplication
        // If we're performing an action that modifies machine state then evaluate conditions.
        BOOL fEvaluateConditions = SUCCEEDED(hrStatus) &&
-            (BOOTSTRAPPER_ACTION_LAYOUT < m_command.action && BOOTSTRAPPER_ACTION_UPDATE_REPLACE > m_command.action);
+            (BOOTSTRAPPER_ACTION_LAYOUT < m_commandAction && BOOTSTRAPPER_ACTION_UPDATE_REPLACE > m_commandAction);
        if (fEvaluateConditions)
        {
@@ -120,7 +140,7 @@ public: // IBootstrapperApplication
        if (SUCCEEDED(hrStatus))
        {
-            ::PostMessageW(m_hWnd, WM_WIXIUIBA_PLAN_PACKAGES, 0, m_command.action);
+            ::PostMessageW(m_hWnd, WM_WIXIUIBA_PLAN_PACKAGES, 0, m_commandAction);
        }
        else
        {
@@ -163,7 +183,7 @@ public: // IBootstrapperApplication
            *pRequestState = BOOTSTRAPPER_REQUEST_STATE_NONE;
        }
-        else if (BOOTSTRAPPER_DISPLAY_FULL == m_command.display && !m_fAutomaticRemoval)
+        else if (BOOTSTRAPPER_DISPLAY_FULL == m_commandDisplay && !m_fAutomaticRemoval)
        {
            // Make sure the MSI UI is shown regardless of the current state of the package.
            *pRequestState = BOOTSTRAPPER_REQUEST_STATE_FORCE_PRESENT;
@@ -192,7 +212,7 @@ public: // IBootstrapperApplication
            ExitFunction();
        }
-        switch (m_command.display)
+        switch (m_commandDisplay)
        {
        case BOOTSTRAPPER_DISPLAY_FULL:
            uiLevel = INSTALLUILEVEL_FULL;
@@ -304,32 +324,6 @@ public: // IBootstrapperApplication
    }
-public: //CBalBaseBootstrapperApplication
-    virtual STDMETHODIMP Initialize(
-        __in const BOOTSTRAPPER_CREATE_ARGS* pCreateArgs
-        )
-    {
-        HRESULT hr = S_OK;
-        hr = __super::Initialize(pCreateArgs);
-        BalExitOnFailure(hr, "CBalBaseBootstrapperApplication initialization failed.");
-        memcpy_s(&m_command, sizeof(m_command), pCreateArgs->pCommand, sizeof(BOOTSTRAPPER_COMMAND));
-        memcpy_s(&m_createArgs, sizeof(m_createArgs), pCreateArgs, sizeof(BOOTSTRAPPER_CREATE_ARGS));
-        m_createArgs.pCommand = &m_command;
-    LExit:
-        return hr;
-    }
-    void Uninitialize(
-        __in const BOOTSTRAPPER_DESTROY_ARGS* /*pArgs*/,
-        __in BOOTSTRAPPER_DESTROY_RESULTS* /*pResults*/
-        )
-    {
-    }
 private:
    //
    // UiThreadProc - entrypoint for UI thread.
@@ -345,17 +339,14 @@ private:
        MSG msg = { };
        DWORD dwQuit = 0;
-        // Initialize COM and theme.
+        // Initialize COM.
        hr = ::CoInitialize(NULL);
        BalExitOnFailure(hr, "Failed to initialize COM.");
        fComInitialized = TRUE;
-        hr = pThis->InitializeData();
-        BalExitOnFailure(hr, "Failed to initialize data in bootstrapper application.");
        // Create main window.
        hr = pThis->CreateMainWindow();
-        BalExitOnFailure(hr, "Failed to create main window.");
+        BalExitOnFailure(hr, "Failed to create internal UI bootstrapper application main window.");
        ::PostMessageW(pThis->m_hWnd, WM_WIXIUIBA_DETECT_PACKAGES, 0, 0);
@@ -428,6 +419,9 @@ private:
        HRESULT hr = S_OK;
        IXMLDOMDocument* pixdManifest = NULL;
+        hr = XmlInitialize();
+        BalExitOnFailure(hr, "Failed to initialize XML.");
        hr = BalManifestLoad(m_hModule, &pixdManifest);
        BalExitOnFailure(hr, "Failed to load bootstrapper application manifest.");
@@ -580,13 +574,13 @@ private:
        // If the UI should be visible, allow it to be visible and activated so we are the foreground window.
        // This allows the UAC prompt and MSI UI to automatically be activated.
-        if (BOOTSTRAPPER_DISPLAY_NONE < m_command.display)
+        if (BOOTSTRAPPER_DISPLAY_NONE < m_commandDisplay)
        {
            dwWindowStyle |= WS_VISIBLE;
        }
        m_hWnd = ::CreateWindowExW(WS_EX_TOOLWINDOW, wc.lpszClassName, NULL, dwWindowStyle, 0, 0, 0, 0, HWND_DESKTOP, NULL, m_hModule, this);
-        ExitOnNullWithLastError(m_hWnd, hr, "Failed to create window.");
+        ExitOnNullWithLastError(m_hWnd, hr, "Failed to create internal UI main window.");
    LExit:
        return hr;
@@ -799,14 +793,12 @@ public:
    // Constructor - initialize member variables.
    //
    CWixInternalUIBootstrapperApplication(
-        __in HMODULE hModule,
+        __in HMODULE hModule
-        __in_opt PREQBA_DATA* pPrereqData,
+        ) : CBalBaseBootstrapperApplication(3, 3000)
-        __in IBootstrapperEngine* pEngine
-        ) : CBalBaseBootstrapperApplication(pEngine, 3, 3000)
    {
        m_hModule = hModule;
-        m_command = { };
+        m_commandAction = BOOTSTRAPPER_ACTION_UNKNOWN;
-        m_createArgs = { };
+        m_commandDisplay = BOOTSTRAPPER_DISPLAY_UNKNOWN;
        m_plannedAction = BOOTSTRAPPER_ACTION_UNKNOWN;
@@ -827,10 +819,6 @@ public:
        m_fApplied = FALSE;
        m_fAutomaticRemoval = FALSE;
        m_fFailedToLoadPackage = FALSE;
-        m_pPrereqData = pPrereqData;
-        pEngine->AddRef();
-        m_pEngine = pEngine;
    }
@@ -849,9 +837,9 @@ public:
 private:
    HMODULE m_hModule;
-    BOOTSTRAPPER_CREATE_ARGS m_createArgs;
+    BOOTSTRAPPER_ACTION m_commandAction;
-    BOOTSTRAPPER_COMMAND m_command;
+    BOOTSTRAPPER_DISPLAY m_commandDisplay;
-    IBootstrapperEngine* m_pEngine;
    BOOTSTRAPPER_ACTION m_plannedAction;
    BAL_INFO_BUNDLE m_Bundle;
@@ -871,48 +859,27 @@ private:
    BOOL m_fApplied;
    BOOL m_fAutomaticRemoval;
    BOOL m_fFailedToLoadPackage;
-    PREQBA_DATA* m_pPrereqData;
 };
 //
 // CreateBootstrapperApplication - creates a new IBootstrapperApplication object.
 //
-HRESULT CreateBootstrapperApplication(
+EXTERN_C HRESULT CreateWixInternalUIBootstrapperApplication(
-    __in HMODULE hModule,
+    __in HMODULE hInstance,
-    __in_opt PREQBA_DATA* pPrereqData,
-    __in IBootstrapperEngine* pEngine,
-    __in const BOOTSTRAPPER_CREATE_ARGS* pArgs,
-    __inout BOOTSTRAPPER_CREATE_RESULTS* pResults,
    __out IBootstrapperApplication** ppApplication
-    )
+)
 {
    HRESULT hr = S_OK;
-    CWixInternalUIBootstrapperApplication* pApplication = NULL;
-    pApplication = new CWixInternalUIBootstrapperApplication(hModule, pPrereqData, pEngine);
+    CWixInternalUIBootstrapperApplication* pApplication = new CWixInternalUIBootstrapperApplication(hInstance);
-    BalExitOnNull(pApplication, hr, E_OUTOFMEMORY, "Failed to create new InternalUI bootstrapper application object.");
+    ExitOnNull(pApplication, hr, E_OUTOFMEMORY, "Failed to create new internal UI bootstrapper application.");
-    hr = pApplication->Initialize(pArgs);
+    hr = pApplication->QueryInterface(IID_PPV_ARGS(ppApplication));
-    ExitOnFailure(hr, "CWixInternalUIBootstrapperApplication initialization failed.");
+    ExitOnRootFailure(hr, "Failed to query for IBootstrapperApplication.");
-    pResults->pfnBootstrapperApplicationProc = BalBaseBootstrapperApplicationProc;
-    pResults->pvBootstrapperApplicationProcContext = pApplication;
-    *ppApplication = pApplication;
-    pApplication = NULL;
 LExit:
    ReleaseObject(pApplication);
-    return hr;
-}
-void DestroyBootstrapperApplication(
+    return hr;
-    __in IBootstrapperApplication* pApplication,
-    __in const BOOTSTRAPPER_DESTROY_ARGS* pArgs,
-    __inout BOOTSTRAPPER_DESTROY_RESULTS* pResults
-    )
-{
-    CWixInternalUIBootstrapperApplication* pBA = (CWixInternalUIBootstrapperApplication*)pApplication;
-    pBA->Uninitialize(pArgs, pResults);
 }
diff --git a/src/ext/Bal/wixstdba/WixStandardBootstrapperApplication.cpp b/src/ext/Bal/stdbas/WixStandardBootstrapperApplication.cpp
index e4eee002..233cabbc 100644
--- a/src/ext/Bal/wixstdba/WixStandardBootstrapperApplication.cpp
+++ b/src/ext/Bal/stdbas/WixStandardBootstrapperApplication.cpp
@@ -1,7 +1,6 @@
 // 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"
-#include "BalBaseBootstrapperApplicationProc.h"
 #include "BalBaseBootstrapperApplication.h"
 static const LPCWSTR WIXBUNDLE_VARIABLE_CANRESTART = L"WixCanRestart";
@@ -182,7 +181,66 @@ static LPCSTR LoggingMsiFeatureStateToString(
 class CWixStandardBootstrapperApplication : public CBalBaseBootstrapperApplication
 {
 public: // IBootstrapperApplication
-    virtual STDMETHODIMP OnStartup()
+    STDMETHODIMP OnCreate(
+        __in IBootstrapperEngine* pEngine,
+        __in BOOTSTRAPPER_COMMAND* pCommand
+    )
+    {
+        HRESULT hr = S_OK;
+        hr = __super::OnCreate(pEngine, pCommand);
+        BalExitOnFailure(hr, "CBalBaseBootstrapperApplication initialization failed.");
+        m_commandAction = pCommand->action;
+        m_commandDisplay = pCommand->display;
+        m_commandResumeType = pCommand->resumeType;
+        m_commandRelationType = pCommand->relationType;
+        m_hwndSplashScreen = pCommand->hwndSplashScreen;
+        hr = BalGetStringVariable(L"WixBundleVersion", &m_sczBundleVersion);
+        BalExitOnFailure(hr, "CWixStandardBootstrapperApplication initialization failed.");
+        hr = InitializeData(pCommand);
+        BalExitOnFailure(hr, "Failed to initialize data in bootstrapper application.");
+    LExit:
+        return hr;
+    }
+    STDMETHODIMP OnDestroy(
+        __in BOOL fReload
+    )
+    {
+        if (m_hBAFModule)
+        {
+            BA_FUNCTIONS_DESTROY_ARGS args = { };
+            BA_FUNCTIONS_DESTROY_RESULTS results = { };
+            args.cbSize = sizeof(BA_FUNCTIONS_DESTROY_ARGS);
+            args.fReload = fReload;
+            results.cbSize = sizeof(BA_FUNCTIONS_DESTROY_RESULTS);
+            PFN_BA_FUNCTIONS_DESTROY pfnBAFunctionsDestroy = reinterpret_cast<PFN_BA_FUNCTIONS_DESTROY>(::GetProcAddress(m_hBAFModule, "BAFunctionsDestroy"));
+            if (pfnBAFunctionsDestroy)
+            {
+                pfnBAFunctionsDestroy(&args, &results);
+            }
+            if (!results.fDisableUnloading)
+            {
+                m_pfnBAFunctionsProc = NULL;
+                m_pvBAFunctionsProcContext = NULL;
+                ::FreeLibrary(m_hBAFModule);
+                m_hBAFModule = NULL;
+            }
+        }
+        return __super::OnDestroy(fReload);
+    }
+    STDMETHODIMP OnStartup()
    {
        HRESULT hr = S_OK;
        DWORD dwUIThreadId = 0;
@@ -199,7 +257,7 @@ public: // IBootstrapperApplication
    }
-    virtual STDMETHODIMP OnShutdown(
+    STDMETHODIMP OnShutdown(
        __inout BOOTSTRAPPER_SHUTDOWN_ACTION* pAction
        )
    {
@@ -233,7 +291,6 @@ public: // IBootstrapperApplication
                ? "The prerequisites were successfully installed. The bootstrapper application will be reloaded."
                : "The prerequisites were already installed. The bootstrapper application will be reloaded.");
            *pAction = BOOTSTRAPPER_SHUTDOWN_ACTION_RELOAD_BOOTSTRAPPER;
-            m_pPrereqData->fCompleted = TRUE;
        }
        else if (m_fPrereq)
        {
@@ -255,38 +312,24 @@ public: // IBootstrapperApplication
        if (m_fPrereq)
        {
-            if (m_pPrereqData->fPerformLayout && BOOTSTRAPPER_ACTION_LAYOUT == m_command.action)
+            // Pre-requisite command action is set during initialization.
-            {
-                // The parent BA has requested that this BA be in charge of layout.
-                m_fPrereq = FALSE;
-            }
-            else
-            {
-                m_fPreplanPrereqs = m_pPrereqData->fAlwaysInstallPrereqs;
-                // Pre-req BA should only show help or do an install (to launch the parent BA which can then do the right action).
-                if (BOOTSTRAPPER_ACTION_HELP != m_command.action)
-                {
-                    m_command.action = BOOTSTRAPPER_ACTION_INSTALL;
-                }
-            }
        }
-        else if (BOOTSTRAPPER_DISPLAY_FULL <= m_command.display) // only modify the action state if showing full UI.
+        else if (BOOTSTRAPPER_DISPLAY_FULL <= m_commandDisplay) // only modify the action state if showing full UI.
        {
            // Maybe modify the action state if the bundle is or is not already installed.
-            if (fInstalled && BOOTSTRAPPER_RESUME_TYPE_REBOOT != m_command.resumeType && BOOTSTRAPPER_ACTION_INSTALL == m_command.action)
+            if (fInstalled && BOOTSTRAPPER_RESUME_TYPE_REBOOT != m_commandResumeType && BOOTSTRAPPER_ACTION_INSTALL == m_commandAction)
            {
-                m_command.action = BOOTSTRAPPER_ACTION_MODIFY;
+                m_commandAction = BOOTSTRAPPER_ACTION_MODIFY;
            }
-            else if (!fInstalled && (BOOTSTRAPPER_ACTION_MODIFY == m_command.action || BOOTSTRAPPER_ACTION_REPAIR == m_command.action))
+            else if (!fInstalled && (BOOTSTRAPPER_ACTION_MODIFY == m_commandAction || BOOTSTRAPPER_ACTION_REPAIR == m_commandAction))
            {
-                m_command.action = BOOTSTRAPPER_ACTION_INSTALL;
+                m_commandAction = BOOTSTRAPPER_ACTION_INSTALL;
            }
        }
        // When resuming from restart doing some install-like operation, try to find the package that forced the
        // restart. We'll use this information during planning.
-        if (BOOTSTRAPPER_RESUME_TYPE_REBOOT == m_command.resumeType && BOOTSTRAPPER_ACTION_UNINSTALL < m_command.action)
+        if (BOOTSTRAPPER_RESUME_TYPE_REBOOT == m_commandResumeType && BOOTSTRAPPER_ACTION_UNINSTALL < m_commandAction)
        {
            // Ensure the forced restart package variable is null when it is an empty string.
            hr = BalGetStringVariable(L"WixBundleForcedRestartPackage", &m_sczAfterForcedRestartPackage);
@@ -301,7 +344,7 @@ public: // IBootstrapperApplication
        if (!m_fPreplanPrereqs)
        {
            // If the UI should be visible, display it now and hide the splash screen
-            if (BOOTSTRAPPER_DISPLAY_NONE < m_command.display)
+            if (BOOTSTRAPPER_DISPLAY_NONE < m_commandDisplay)
            {
                ::ShowWindow(m_pTheme->hwndParent, SW_SHOW);
            }
@@ -330,7 +373,7 @@ public: // IBootstrapperApplication
            // Best effort
        }
-        if (BOOTSTRAPPER_ACTION_INSTALL == m_command.action && BOOTSTRAPPER_RELATION_UPGRADE != m_command.relationType && BOOTSTRAPPER_RELATION_UPGRADE == relationType)
+        if (BOOTSTRAPPER_ACTION_INSTALL == m_commandAction && BOOTSTRAPPER_RELATION_UPGRADE != m_commandRelationType && BOOTSTRAPPER_RELATION_UPGRADE == relationType)
        {
            int nResult = 0;
            HRESULT hr = VerCompareStringVersions(m_sczBundleVersion, wzVersion, TRUE/*fStrict*/, &nResult);
@@ -362,7 +405,7 @@ public: // IBootstrapperApplication
        // Try update detection only if we have a potential update source and are in full UI mode.
        *pfSkip = !wzUpdateLocation
            || !*wzUpdateLocation
-            || BOOTSTRAPPER_DISPLAY_FULL != m_command.display;
+            || BOOTSTRAPPER_DISPLAY_FULL != m_commandDisplay;
        ThemeShowControl(m_pControlCheckingForUpdatesLabel, *pfSkip ? SW_HIDE : SW_SHOW);
@@ -390,6 +433,9 @@ public: // IBootstrapperApplication
        HRESULT hr = S_OK;
        int nResult = 0;
+        UUID guid = { };
+        WCHAR wzUpdatePackageId[39];
+        RPC_STATUS rs = RPC_S_OK;
        hr = VerCompareStringVersions(m_sczBundleVersion, wzUpdateVersion, TRUE/*fStrict*/, &nResult);
        BalExitOnFailure(hr, "Failed to compare bundle version: %ls to update version: %ls.", m_sczBundleVersion, wzUpdateVersion);
@@ -405,11 +451,23 @@ public: // IBootstrapperApplication
        {
            BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "WIXSTDBA: Update v%ls for bundle v%ls available from: %ls.", wzUpdateVersion, m_sczBundleVersion, wzUpdateLocation);
+            rs = ::UuidCreate(&guid);
+            hr = HRESULT_FROM_RPC(rs);
+            ExitOnFailure(hr, "Failed to generate bundle update package id.");
+            if (!::StringFromGUID2(guid, wzUpdatePackageId, countof(wzUpdatePackageId)))
+            {
+                hr = E_OUTOFMEMORY;
+                ExitOnRootFailure(hr, "Failed to create string from bundle update package id.");
+            }
            hr = BalSetVersionVariable(WIXSTDBA_VARIABLE_UPDATE_AVAILABLE, wzUpdateVersion);
            BalExitOnFailure(hr, "Failed to set WixStdBAUpdateAvailable value: %ls.", wzUpdateVersion);
-            hr = m_pEngine->SetUpdate(NULL, wzUpdateLocation, dw64Size, hashAlgorithm, wzHash);
+            hr = m_pEngine->SetUpdate(NULL, wzUpdateLocation, dw64Size, hashAlgorithm, wzHash, wzUpdatePackageId);
            BalExitOnFailure(hr, "Failed to set update location: %ls.", wzUpdateLocation);
+            BalInfoAddUpdateBundleAsPackage(&m_Bundle.packages, wzUpdatePackageId, NULL);
        }
    LExit:
@@ -447,15 +505,15 @@ public: // IBootstrapperApplication
        // If we're not interacting with the user or we're doing a layout or we're resuming just after a force restart
        // then automatically start planning.
        BOOL fSkipToPlan = SUCCEEDED(hrStatus) &&
-                           (BOOTSTRAPPER_DISPLAY_FULL > m_command.display ||
+                           (BOOTSTRAPPER_DISPLAY_FULL > m_commandDisplay ||
-                            BOOTSTRAPPER_ACTION_LAYOUT == m_command.action ||
+                            BOOTSTRAPPER_ACTION_LAYOUT == m_commandAction ||
-                            BOOTSTRAPPER_RESUME_TYPE_REBOOT == m_command.resumeType);
+                            BOOTSTRAPPER_RESUME_TYPE_REBOOT == m_commandResumeType);
        // If we're requiring user input (which currently means Install, Repair, or Uninstall)
        // or if we're skipping to an action that modifies machine state
        // then evaluate conditions.
        BOOL fEvaluateConditions = SUCCEEDED(hrStatus) &&
-            (!fSkipToPlan || BOOTSTRAPPER_ACTION_LAYOUT < m_command.action && BOOTSTRAPPER_ACTION_UPDATE_REPLACE > m_command.action);
+            (!fSkipToPlan || BOOTSTRAPPER_ACTION_LAYOUT < m_commandAction && BOOTSTRAPPER_ACTION_UPDATE_REPLACE > m_commandAction);
        if (fEvaluateConditions)
        {
@@ -472,7 +530,7 @@ public: // IBootstrapperApplication
            }
            else if (fSkipToPlan)
            {
-                ::PostMessageW(m_hWnd, WM_WIXSTDBA_PLAN_PACKAGES, 0, m_command.action);
+                ::PostMessageW(m_hWnd, WM_WIXSTDBA_PLAN_PACKAGES, 0, m_commandAction);
            }
        }
@@ -596,7 +654,7 @@ public: // IBootstrapperApplication
        BOOL fShowInternalUI = FALSE;
        INSTALLUILEVEL uiLevel = INSTALLUILEVEL_NOCHANGE;
-        switch (m_command.display)
+        switch (m_commandDisplay)
        {
        case BOOTSTRAPPER_DISPLAY_FULL:
            uiLevel = INSTALLUILEVEL_FULL;
@@ -662,7 +720,7 @@ public: // IBootstrapperApplication
                SetState(WIXSTDBA_STATE_APPLIED, S_OK);
                ExitFunction();
            }
-            else if (BOOTSTRAPPER_ACTION_HELP == m_command.action)
+            else if (BOOTSTRAPPER_ACTION_HELP == m_commandAction)
            {
                // If prereq packages were planned then the managed BA probably can't be loaded, so show the help from this BA.
@@ -687,15 +745,15 @@ public: // IBootstrapperApplication
        if (fPreplannedPrereqs)
        {
            // If the UI should be visible, display it now and hide the splash screen
-            if (BOOTSTRAPPER_DISPLAY_NONE < m_command.display)
+            if (BOOTSTRAPPER_DISPLAY_NONE < m_commandDisplay)
            {
                ::ShowWindow(m_pTheme->hwndParent, SW_SHOW);
            }
            m_pEngine->CloseSplashScreen();
-            fApply = BOOTSTRAPPER_DISPLAY_FULL > m_command.display ||
+            fApply = BOOTSTRAPPER_DISPLAY_FULL > m_commandDisplay ||
-                     BOOTSTRAPPER_RESUME_TYPE_REBOOT == m_command.resumeType;
+                     BOOTSTRAPPER_RESUME_TYPE_REBOOT == m_commandResumeType;
        }
        if (fApply)
@@ -958,7 +1016,7 @@ public: // IBootstrapperApplication
        int nResult = *pResult;
        LPWSTR sczError = NULL;
-        if (BOOTSTRAPPER_DISPLAY_EMBEDDED == m_command.display)
+        if (BOOTSTRAPPER_DISPLAY_EMBEDDED == m_commandDisplay)
        {
            hr = m_pEngine->SendEmbeddedError(dwCode, wzError, dwUIHint, &nResult);
            if (FAILED(hr))
@@ -966,7 +1024,7 @@ public: // IBootstrapperApplication
                nResult = IDERROR;
            }
        }
-        else if (BOOTSTRAPPER_DISPLAY_FULL == m_command.display)
+        else if (BOOTSTRAPPER_DISPLAY_FULL == m_commandDisplay)
        {
            // If this is an authentication failure, let the engine try to handle it for us.
            if (BOOTSTRAPPER_ERROR_TYPE_HTTP_AUTH_SERVER == errorType || BOOTSTRAPPER_ERROR_TYPE_HTTP_AUTH_PROXY == errorType)
@@ -1029,7 +1087,7 @@ public: // IBootstrapperApplication
        BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "WIXSTDBA: OnExecuteMsiMessage() - package: %ls, message: %ls", wzPackageId, wzMessage);
 #endif
-        if (BOOTSTRAPPER_DISPLAY_FULL == m_command.display && (INSTALLMESSAGE_WARNING == messageType || INSTALLMESSAGE_USER == messageType))
+        if (BOOTSTRAPPER_DISPLAY_FULL == m_commandDisplay && (INSTALLMESSAGE_WARNING == messageType || INSTALLMESSAGE_USER == messageType))
        {
            if (!m_fShowingInternalUiThisPackage)
            {
@@ -1174,7 +1232,7 @@ public: // IBootstrapperApplication
        __inout int* pResult
        )
    {
-     
        if (!m_fShowingInternalUiThisPackage && wzPackageId && *wzPackageId)
        {
            BalLog(BOOTSTRAPPER_LOG_LEVEL_VERBOSE, "Package %ls has %d applications holding files in use.", wzPackageId, cFiles);
@@ -1273,7 +1331,7 @@ public: // IBootstrapperApplication
        HRESULT hr = S_OK;
        LPWSTR sczPath = NULL;
-        if (BOOTSTRAPPER_CACHE_RESOLVE_NONE == *pAction && BOOTSTRAPPER_DISPLAY_FULL == m_command.display) // prompt to change the source location.
+        if (BOOTSTRAPPER_CACHE_RESOLVE_NONE == *pAction && BOOTSTRAPPER_DISPLAY_FULL == m_commandDisplay) // prompt to change the source location.
        {
            static COMDLG_FILTERSPEC vrgFilters[] =
            {
@@ -1318,7 +1376,7 @@ public: // IBootstrapperApplication
        m_fShouldRestart = m_fRestartRequired && BAL_INFO_RESTART_NEVER < m_BalInfoCommand.restart;
        // Automatically restart if we're not displaying a UI or the command line said to always allow restarts.
-        m_fAllowRestart = m_fShouldRestart && (BOOTSTRAPPER_DISPLAY_FULL > m_command.display || BAL_INFO_RESTART_PROMPT < m_BalInfoCommand.restart);
+        m_fAllowRestart = m_fShouldRestart && (BOOTSTRAPPER_DISPLAY_FULL > m_commandDisplay || BAL_INFO_RESTART_PROMPT < m_BalInfoCommand.restart);
        if (m_fPrereq)
        {
@@ -1326,7 +1384,7 @@ public: // IBootstrapperApplication
        }
        // If we are showing UI, wait a beat before moving to the final screen.
-        if (BOOTSTRAPPER_DISPLAY_NONE < m_command.display)
+        if (BOOTSTRAPPER_DISPLAY_NONE < m_commandDisplay)
        {
            ::Sleep(250);
        }
@@ -1359,23 +1417,6 @@ public: // IBootstrapperApplication
        return hr;
    }
-    virtual STDMETHODIMP OnSetUpdateComplete(
-        __in HRESULT hrStatus,
-        __in_z_opt LPCWSTR wzPreviousPackageId,
-        __in_z_opt LPCWSTR wzNewPackageId
-        )
-    {
-        BAL_INFO_PACKAGE* pPackage = NULL;
-        if (SUCCEEDED(hrStatus) && wzNewPackageId)
-        {
-            BalInfoAddUpdateBundleAsPackage(&m_Bundle.packages, wzNewPackageId, wzPreviousPackageId, &pPackage);
-            // Best effort
-        }
-        return S_OK;
-    }
    virtual STDMETHODIMP OnElevateComplete(
        __in HRESULT hrStatus
@@ -1402,9 +1443,8 @@ public: // IBootstrapperApplication
        __in BOOTSTRAPPER_APPLICATION_MESSAGE message,
        __in const LPVOID pvArgs,
        __inout LPVOID pvResults,
-        __inout HRESULT* phr,
+        __inout HRESULT* phr
-        __in_opt LPVOID /*pvContext*/
+    )
-        )
    {
        if (!m_pfnBAFunctionsProc || FAILED(*phr))
        {
@@ -1414,6 +1454,18 @@ public: // IBootstrapperApplication
        // Always log before and after so we don't get blamed when BAFunctions changes something.
        switch (message)
        {
+        case BOOTSTRAPPER_APPLICATION_MESSAGE_ONCREATE:
+            // Functions do not get ONCREATE, they get these parameters when created directly.
+            break;
+        case BOOTSTRAPPER_APPLICATION_MESSAGE_ONDESTROY:
+            OnDestroyFallback(reinterpret_cast<BA_ONDESTROY_ARGS*>(pvArgs), reinterpret_cast<BA_ONDESTROY_RESULTS*>(pvResults));
+            break;
+        case BOOTSTRAPPER_APPLICATION_MESSAGE_ONSTARTUP:
+            OnStartupFallback(reinterpret_cast<BA_ONSTARTUP_ARGS*>(pvArgs), reinterpret_cast<BA_ONSTARTUP_RESULTS*>(pvResults));
+            break;
+        case BOOTSTRAPPER_APPLICATION_MESSAGE_ONSHUTDOWN:
+            OnShutdownFallback(reinterpret_cast<BA_ONSHUTDOWN_ARGS*>(pvArgs), reinterpret_cast<BA_ONSHUTDOWN_RESULTS*>(pvResults));
+            break;
        case BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTBEGIN:
            OnDetectBeginFallback(reinterpret_cast<BA_ONDETECTBEGIN_ARGS*>(pvArgs), reinterpret_cast<BA_ONDETECTBEGIN_RESULTS*>(pvResults));
            break;
@@ -1426,11 +1478,6 @@ public: // IBootstrapperApplication
        case BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANCOMPLETE:
            OnPlanCompleteFallback(reinterpret_cast<BA_ONPLANCOMPLETE_ARGS*>(pvArgs), reinterpret_cast<BA_ONPLANCOMPLETE_RESULTS*>(pvResults));
            break;
-        case BOOTSTRAPPER_APPLICATION_MESSAGE_ONSTARTUP: // BAFunctions is loaded during this event on a separate thread so it's not possible to forward it.
-            break;
-        case BOOTSTRAPPER_APPLICATION_MESSAGE_ONSHUTDOWN:
-            OnShutdownFallback(reinterpret_cast<BA_ONSHUTDOWN_ARGS*>(pvArgs), reinterpret_cast<BA_ONSHUTDOWN_RESULTS*>(pvResults));
-            break;
        case BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTFORWARDCOMPATIBLEBUNDLE:
            OnDetectForwardCompatibleBundleFallback(reinterpret_cast<BA_ONDETECTFORWARDCOMPATIBLEBUNDLE_ARGS*>(pvArgs), reinterpret_cast<BA_ONDETECTFORWARDCOMPATIBLEBUNDLE_RESULTS*>(pvResults));
            break;
@@ -1626,12 +1673,6 @@ public: // IBootstrapperApplication
        case BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANROLLBACKBOUNDARY:
            OnPlanRollbackBoundaryFallback(reinterpret_cast<BA_ONPLANROLLBACKBOUNDARY_ARGS*>(pvArgs), reinterpret_cast<BA_ONPLANROLLBACKBOUNDARY_RESULTS*>(pvResults));
            break;
-        case BOOTSTRAPPER_APPLICATION_MESSAGE_ONSETUPDATEBEGIN:
-            OnSetUpdateBeginFallback(reinterpret_cast<BA_ONSETUPDATEBEGIN_ARGS*>(pvArgs), reinterpret_cast<BA_ONSETUPDATEBEGIN_RESULTS*>(pvResults));
-            break;
-        case BOOTSTRAPPER_APPLICATION_MESSAGE_ONSETUPDATECOMPLETE:
-            OnSetUpdateCompleteFallback(reinterpret_cast<BA_ONSETUPDATECOMPLETE_ARGS*>(pvArgs), reinterpret_cast<BA_ONSETUPDATECOMPLETE_RESULTS*>(pvResults));
-            break;
        case BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTCOMPATIBLEMSIPACKAGE:
            OnDetectCompatibleMsiPackageFallback(reinterpret_cast<BA_ONDETECTCOMPATIBLEMSIPACKAGE_ARGS*>(pvArgs), reinterpret_cast<BA_ONDETECTCOMPATIBLEMSIPACKAGE_RESULTS*>(pvResults));
            break;
@@ -1670,6 +1711,30 @@ public: // IBootstrapperApplication
 private: // privates
+    void OnDestroyFallback(
+        __in BA_ONDESTROY_ARGS* pArgs,
+        __inout BA_ONDESTROY_RESULTS* pResults
+    )
+    {
+        m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONDESTROY, pArgs, pResults, m_pvBAFunctionsProcContext);
+    }
+    void OnStartupFallback(
+        __in BA_ONSTARTUP_ARGS* pArgs,
+        __inout BA_ONSTARTUP_RESULTS* pResults
+    )
+    {
+        m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONSTARTUP, pArgs, pResults, m_pvBAFunctionsProcContext);
+    }
+    void OnShutdownFallback(
+        __in BA_ONSHUTDOWN_ARGS* pArgs,
+        __inout BA_ONSHUTDOWN_RESULTS* pResults
+    )
+    {
+        m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONSHUTDOWN, pArgs, pResults, m_pvBAFunctionsProcContext);
+    }
    void OnDetectBeginFallback(
        __in BA_ONDETECTBEGIN_ARGS* pArgs,
        __inout BA_ONDETECTBEGIN_RESULTS* pResults
@@ -1702,14 +1767,6 @@ private: // privates
        m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONPLANCOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext);
    }
-    void OnShutdownFallback(
-        __in BA_ONSHUTDOWN_ARGS* pArgs,
-        __inout BA_ONSHUTDOWN_RESULTS* pResults
-        )
-    {
-        m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONSHUTDOWN, pArgs, pResults, m_pvBAFunctionsProcContext);
-    }
    void OnDetectForwardCompatibleBundleFallback(
        __in BA_ONDETECTFORWARDCOMPATIBLEBUNDLE_ARGS* pArgs,
        __inout BA_ONDETECTFORWARDCOMPATIBLEBUNDLE_RESULTS* pResults
@@ -2272,22 +2329,6 @@ private: // privates
        BalLogId(BOOTSTRAPPER_LOG_LEVEL_STANDARD, MSG_WIXSTDBA_PLANNED_ROLLBACK_BOUNDARY, m_hModule, pArgs->wzRollbackBoundaryId, LoggingBoolToString(fTransaction), LoggingBoolToString(pResults->fTransaction));
    }
-    void OnSetUpdateBeginFallback(
-        __in BA_ONSETUPDATEBEGIN_ARGS* pArgs,
-        __inout BA_ONSETUPDATEBEGIN_RESULTS* pResults
-        )
-    {
-        m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONSETUPDATEBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext);
-    }
-    void OnSetUpdateCompleteFallback(
-        __in BA_ONSETUPDATECOMPLETE_ARGS* pArgs,
-        __inout BA_ONSETUPDATECOMPLETE_RESULTS* pResults
-        )
-    {
-        m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONSETUPDATECOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext);
-    }
    void OnDetectCompatibleMsiPackageFallback(
        __in BA_ONDETECTCOMPATIBLEMSIPACKAGE_ARGS* pArgs,
        __inout BA_ONDETECTCOMPATIBLEMSIPACKAGE_RESULTS* pResults
@@ -2375,7 +2416,7 @@ private: // privates
        {
            nResult = m_nLastMsiFilesInUseResult;
        }
-        else if (BOOTSTRAPPER_DISPLAY_FULL == m_command.display) // Only show files in use when using full display mode.
+        else if (BOOTSTRAPPER_DISPLAY_FULL == m_commandDisplay) // Only show files in use when using full display mode.
        {
            // See https://docs.microsoft.com/en-us/windows/win32/msi/sending-messages-to-windows-installer-using-msiprocessmessage for details.
            for (DWORD i = 1; i < cFiles; i += 2)
@@ -2404,7 +2445,7 @@ private: // privates
        }
        else
        {
-            // Silent UI level installations always shut down applications and services, 
+            // Silent UI level installations always shut down applications and services,
            // and on Windows Vista and later, use Restart Manager unless disabled.
            nResult = IDOK;
        }
@@ -2562,7 +2603,7 @@ private: // privates
        {
            nResult = m_nLastNetfxFilesInUseResult;
        }
-        else if (BOOTSTRAPPER_DISPLAY_FULL != m_command.display) // Only show files in use when using full display mode.
+        else if (BOOTSTRAPPER_DISPLAY_FULL != m_commandDisplay) // Only show files in use when using full display mode.
        {
            nResult = IDYES;
        }
@@ -2658,58 +2699,6 @@ private: // privates
        return hr;
    }
-public: //CBalBaseBootstrapperApplication
-    virtual STDMETHODIMP Initialize(
-        __in const BOOTSTRAPPER_CREATE_ARGS* pCreateArgs
-        )
-    {
-        HRESULT hr = S_OK;
-        hr = __super::Initialize(pCreateArgs);
-        BalExitOnFailure(hr, "CBalBaseBootstrapperApplication initialization failed.");
-        memcpy_s(&m_command, sizeof(m_command), pCreateArgs->pCommand, sizeof(BOOTSTRAPPER_COMMAND));
-        memcpy_s(&m_createArgs, sizeof(m_createArgs), pCreateArgs, sizeof(BOOTSTRAPPER_CREATE_ARGS));
-        m_createArgs.pCommand = &m_command;
-        hr = BalGetStringVariable(L"WixBundleVersion", &m_sczBundleVersion);
-        BalExitOnFailure(hr, "CWixStandardBootstrapperApplication initialization failed.");
-    LExit:
-        return hr;
-    }
-    void Uninitialize(
-        __in const BOOTSTRAPPER_DESTROY_ARGS* pArgs,
-        __in BOOTSTRAPPER_DESTROY_RESULTS* /*pResults*/
-        )
-    {
-        if (m_hBAFModule)
-        {
-            BA_FUNCTIONS_DESTROY_ARGS args = { };
-            BA_FUNCTIONS_DESTROY_RESULTS results = { };
-            args.cbSize = sizeof(BA_FUNCTIONS_DESTROY_ARGS);
-            args.fReload = pArgs->fReload;
-            results.cbSize = sizeof(BA_FUNCTIONS_DESTROY_RESULTS);
-            PFN_BA_FUNCTIONS_DESTROY pfnBAFunctionsDestroy = reinterpret_cast<PFN_BA_FUNCTIONS_DESTROY>(::GetProcAddress(m_hBAFModule, "BAFunctionsDestroy"));
-            if (pfnBAFunctionsDestroy)
-            {
-                pfnBAFunctionsDestroy(&args, &results);
-            }
-            if (!results.fDisableUnloading)
-            {
-                ::FreeLibrary(m_hBAFModule);
-                m_hBAFModule = NULL;
-            }
-        }
-    }
 private:
    //
    // UiThreadProc - entrypoint for UI thread.
@@ -2731,16 +2720,13 @@ private:
        BalExitOnFailure(hr, "Failed to initialize COM.");
        fComInitialized = TRUE;
-        hr = ThemeInitialize(pThis->m_hModule);
+        hr = pThis->InitializeTheme();
-        BalExitOnFailure(hr, "Failed to initialize theme manager.");
+        BalExitOnFailure(hr, "Failed to initialize theme.");
-        hr = pThis->InitializeData();
-        BalExitOnFailure(hr, "Failed to initialize data in bootstrapper application.");
        // Create main window.
        pThis->InitializeTaskbarButton();
        hr = pThis->CreateMainWindow();
-        BalExitOnFailure(hr, "Failed to create main window.");
+        BalExitOnFailure(hr, "Failed to create wixstdba main window.");
        if (FAILED(pThis->m_hrFinal))
        {
@@ -2752,7 +2738,7 @@ private:
            // Okay, we're ready for packages now.
            pThis->SetState(WIXSTDBA_STATE_INITIALIZED, hr);
-            if (pThis->m_fPerformHelp && BOOTSTRAPPER_ACTION_HELP == pThis->m_command.action)
+            if (pThis->m_fHandleHelp && BOOTSTRAPPER_ACTION_HELP == pThis->m_commandAction)
            {
                firstAction = WM_WIXSTDBA_SHOW_HELP;
            }
@@ -2828,12 +2814,16 @@ private:
    //
    // InitializeData - initializes all the package and prerequisite information.
    //
-    HRESULT InitializeData()
+    HRESULT InitializeData(
+        __in BOOTSTRAPPER_COMMAND* pCommand
+    )
    {
        HRESULT hr = S_OK;
-        LPWSTR sczModulePath = NULL;
        IXMLDOMDocument* pixdManifest = NULL;
+        hr = XmlInitialize();
+        BalExitOnFailure(hr, "Failed to initialize XML.");
        hr = BalManifestLoad(m_hModule, &pixdManifest);
        BalExitOnFailure(hr, "Failed to load bootstrapper application manifest.");
@@ -2843,21 +2833,10 @@ private:
        hr = ProcessCommandLine(&m_sczLanguage);
        ExitOnFailure(hr, "Unknown commandline parameters.");
-        hr = PathRelativeToModule(&sczModulePath, NULL, m_hModule);
-        BalExitOnFailure(hr, "Failed to get module path.");
-        hr = LoadLocalization(sczModulePath, m_sczLanguage);
-        ExitOnFailure(hr, "Failed to load localization.");
-        LoadFilesInUse();
-        hr = LoadTheme(sczModulePath, m_sczLanguage);
-        ExitOnFailure(hr, "Failed to load theme.");
        hr = BalConditionsParseFromXml(&m_Conditions, pixdManifest, m_pWixLoc);
        BalExitOnFailure(hr, "Failed to load conditions from XML.");
-        hr = LoadBAFunctions(pixdManifest);
+        hr = LoadBAFunctions(pixdManifest, pCommand);
        BalExitOnFailure(hr, "Failed to load bootstrapper functions.");
        GetBundleFileVersion();
@@ -2865,7 +2844,7 @@ private:
        if (m_fPrereq)
        {
-            hr = InitializePrerequisiteInformation();
+            hr = InitializePrerequisiteInformation(pixdManifest);
            BalExitOnFailure(hr, "Failed to initialize prerequisite information.");
        }
        else
@@ -2879,12 +2858,12 @@ private:
            if (m_fSupportCacheOnly)
            {
                // Doesn't make sense to prompt the user if cache only is requested.
-                if (BOOTSTRAPPER_DISPLAY_PASSIVE < m_command.display)
+                if (BOOTSTRAPPER_DISPLAY_PASSIVE < m_commandDisplay)
                {
-                    m_command.display = BOOTSTRAPPER_DISPLAY_PASSIVE;
+                    m_commandDisplay = BOOTSTRAPPER_DISPLAY_PASSIVE;
                }
-                m_command.action = BOOTSTRAPPER_ACTION_CACHE;
+                m_commandAction = BOOTSTRAPPER_ACTION_CACHE;
            }
            else
            {
@@ -2894,13 +2873,40 @@ private:
    LExit:
        ReleaseObject(pixdManifest);
-        ReleaseStr(sczModulePath);
        return hr;
    }
    //
+    // InitializeTheme - initializes the theme information.
+    //
+    HRESULT InitializeTheme()
+    {
+        HRESULT hr = S_OK;
+        LPWSTR sczModulePath = NULL;
+        hr = ThemeInitialize(m_hModule);
+        BalExitOnFailure(hr, "Failed to initialize theme manager.");
+        hr = PathRelativeToModule(&sczModulePath, NULL, m_hModule);
+        BalExitOnFailure(hr, "Failed to get module path.");
+        hr = LoadLocalization(sczModulePath, m_sczLanguage);
+        ExitOnFailure(hr, "Failed to load localization.");
+        LoadFilesInUse();
+        hr = LoadTheme(sczModulePath, m_sczLanguage);
+        ExitOnFailure(hr, "Failed to load theme.");
+    LExit:
+        ReleaseStr(sczModulePath);
+        return hr;
+    }
+    //
    // ProcessCommandLine - process the provided command line arguments.
    //
    HRESULT ProcessCommandLine(
@@ -2972,7 +2978,7 @@ private:
        HRESULT hr = S_OK;
        LPWSTR sczLocPath = NULL;
        LPWSTR sczFormatted = NULL;
-        LPCWSTR wzLocFileName = m_fPrereq ? L"mbapreq.wxl" : L"thm.wxl";
+        LPCWSTR wzLocFileName = m_fPrereq ? L"wixpreq.wxl" : L"thm.wxl";
        // Find and load .wxl file.
        hr = LocProbeForFile(wzModulePath, wzLocFileName, wzLanguage, &sczLocPath);
@@ -3054,7 +3060,7 @@ private:
    {
        HRESULT hr = S_OK;
        LPWSTR sczThemePath = NULL;
-        LPCWSTR wzThemeFileName = m_fPrereq ? L"mbapreq.thm" : L"thm.xml";
+        LPCWSTR wzThemeFileName = m_fPrereq ? L"wixpreq.thm" : L"thm.xml";
        hr = LocProbeForFile(wzModulePath, wzThemeFileName, wzLanguage, &sczThemePath);
        BalExitOnFailure(hr, "Failed to probe for theme file: %ls in path: %ls", wzThemeFileName, wzModulePath);
@@ -3080,10 +3086,51 @@ private:
    }
-    HRESULT InitializePrerequisiteInformation()
+    HRESULT InitializePrerequisiteInformation(
+        __in IXMLDOMDocument* pixdManifest
+        )
    {
        HRESULT hr = S_OK;
        BAL_INFO_PACKAGE* pPackage = NULL;
+        IXMLDOMNode* pNode = NULL;
+        BOOL fXmlFound = FALSE;
+        DWORD dwBool = 0;
+        BOOL fHandleLayout = FALSE;
+        // Read any prereq BA data from the BA manifest.
+        hr = XmlSelectSingleNode(pixdManifest, L"/BootstrapperApplicationData/WixPrereqOptions", &pNode);
+        BalExitOnOptionalXmlQueryFailure(hr, fXmlFound, "Failed to read prereq options from BootstrapperApplication.xml manifest.");
+        if (fXmlFound)
+        {
+            hr = XmlGetAttributeNumber(pNode, L"Primary", &dwBool);
+            BalExitOnOptionalXmlQueryFailure(hr, fXmlFound, "Failed to get WixPrereqOptions/@Primary value.");
+            m_fPreplanPrereqs = fXmlFound && (0 != dwBool);
+            hr = XmlGetAttributeNumber(pNode, L"HandleHelp", &dwBool);
+            BalExitOnOptionalXmlQueryFailure(hr, fXmlFound, "Failed to get WixPrereqOptions/@HandleHelp value.");
+            m_fHandleHelp = fXmlFound && (0 != dwBool);
+            hr = XmlGetAttributeNumber(pNode, L"HandleLayout", &dwBool);
+            BalExitOnOptionalXmlQueryFailure(hr, fXmlFound, "Failed to get WixPrereqOptions/@HandleLayout value.");
+            fHandleLayout = fXmlFound && (0 != dwBool);
+        }
+        // If pre-req BA has requested that this BA be in charge of layout.
+        if (fHandleLayout && BOOTSTRAPPER_ACTION_LAYOUT == m_commandAction)
+        {
+            m_fPrereq = FALSE;
+            ExitFunction();
+        }
+        // Pre-req BA should only show help or do an install (to launch the parent BA which can then do the right action).
+        if (BOOTSTRAPPER_ACTION_HELP != m_commandAction)
+        {
+            m_commandAction = BOOTSTRAPPER_ACTION_INSTALL;
+        }
        for (DWORD i = 0; i < m_Bundle.packages.cPackages; ++i)
        {
@@ -3265,13 +3312,13 @@ private:
        // Calculate the window style based on the theme style and command display value.
        dwWindowStyle = m_pTheme->dwStyle;
-        if (BOOTSTRAPPER_DISPLAY_NONE >= m_command.display || m_fPreplanPrereqs)
+        if (BOOTSTRAPPER_DISPLAY_NONE >= m_commandDisplay || m_fPreplanPrereqs)
        {
            dwWindowStyle &= ~WS_VISIBLE;
        }
        // Don't show the window if there is a splash screen (it will be made visible when the splash screen is hidden)
-        if (::IsWindow(m_command.hwndSplashScreen))
+        if (::IsWindow(m_hwndSplashScreen))
        {
            dwWindowStyle &= ~WS_VISIBLE;
        }
@@ -3284,7 +3331,7 @@ private:
        }
        hr = ThemeCreateParentWindow(m_pTheme, 0, wc.lpszClassName, m_pTheme->sczCaption, dwWindowStyle, x, y, HWND_DESKTOP, m_hModule, this, THEME_WINDOW_INITIAL_POSITION_CENTER_MONITOR_FROM_COORDINATES, &m_hWnd);
-        ExitOnFailure(hr, "Failed to create window.");
+        ExitOnFailure(hr, "Failed to create wixstdba theme window.");
        OnThemeLoaded();
@@ -3691,7 +3738,7 @@ private:
        SetState(WIXSTDBA_STATE_FAILED, S_OK);
        // If the UI should be visible, display it now and hide the splash screen
-        if (BOOTSTRAPPER_DISPLAY_NONE < m_command.display)
+        if (BOOTSTRAPPER_DISPLAY_NONE < m_commandDisplay)
        {
            ::ShowWindow(m_pTheme->hwndParent, SW_SHOW);
        }
@@ -3708,7 +3755,7 @@ private:
        SetState(WIXSTDBA_STATE_HELP, S_OK);
        // If the UI should be visible, display it now and hide the splash screen
-        if (BOOTSTRAPPER_DISPLAY_NONE < m_command.display)
+        if (BOOTSTRAPPER_DISPLAY_NONE < m_commandDisplay)
        {
            ::ShowWindow(m_pTheme->hwndParent, SW_SHOW);
        }
@@ -3830,7 +3877,7 @@ private:
        // If our install is at the end (success or failure) and we're not showing full UI or not updating or
        // we successfully installed the prerequisite(s) and either no restart is required or can automatically restart
        // then exit.
-        if ((WIXSTDBA_STATE_APPLIED <= m_state && (BOOTSTRAPPER_DISPLAY_FULL > m_command.display || BOOTSTRAPPER_ACTION_UPDATE_REPLACE == m_plannedAction)) ||
+        if ((WIXSTDBA_STATE_APPLIED <= m_state && (BOOTSTRAPPER_DISPLAY_FULL > m_commandDisplay || BOOTSTRAPPER_ACTION_UPDATE_REPLACE == m_plannedAction)) ||
            (WIXSTDBA_STATE_APPLIED == m_state && m_fPrereq && (!m_fRestartRequired || m_fShouldRestart && m_fAllowRestart)))
        {
            // Quietly exit.
@@ -3910,40 +3957,6 @@ private:
                        {
                            StrAllocString(&sczUnformattedText, m_sczFailedMessage, 0);
                        }
-                        else if (E_MBAHOST_NET452_ON_WIN7RTM == m_hrFinal)
-                        {
-                            HRESULT hr = StrAllocString(&sczUnformattedText, L"#(loc.NET452WIN7RTMErrorMessage)", 0);
-                            if (FAILED(hr))
-                            {
-                                BalLogError(hr, "Failed to initialize NET452WIN7RTMErrorMessage loc identifier.");
-                            }
-                            else
-                            {
-                                hr = LocLocalizeString(m_pWixLoc, &sczUnformattedText);
-                                if (FAILED(hr))
-                                {
-                                    BalLogError(hr, "Failed to localize NET452WIN7RTMErrorMessage: %ls", sczUnformattedText);
-                                    ReleaseNullStr(sczUnformattedText);
-                                }
-                            }
-                        }
-                        else if (E_DNCHOST_SCD_RUNTIME_FAILURE == m_hrFinal)
-                        {
-                            HRESULT hr = StrAllocString(&sczUnformattedText, L"#(loc.SCDRUNTIMEFAILUREErrorMessage)", 0);
-                            if (FAILED(hr))
-                            {
-                                BalLogError(hr, "Failed to initialize SCDRUNTIMEFAILUREErrorMessage loc identifier.");
-                            }
-                            else
-                            {
-                                hr = LocLocalizeString(m_pWixLoc, &sczUnformattedText);
-                                if (FAILED(hr))
-                                {
-                                    BalLogError(hr, "Failed to localize SCDRUNTIMEFAILUREErrorMessage: %ls", sczUnformattedText);
-                                    ReleaseNullStr(sczUnformattedText);
-                                }
-                            }
-                        }
                        else if (E_PREREQBA_INFINITE_LOOP == m_hrFinal)
                        {
                            HRESULT hr = StrAllocString(&sczUnformattedText, L"#(loc.PREREQBAINFINITELOOPErrorMessage)", 0);
@@ -3977,9 +3990,7 @@ private:
                                StrAllocString(&sczText, sczUnformattedText, 0);
                            }
                        }
-                        else if (E_MBAHOST_NET452_ON_WIN7RTM == m_hrFinal ||
+                        else if (E_PREREQBA_INFINITE_LOOP == m_hrFinal)
-                                 E_DNCHOST_SCD_RUNTIME_FAILURE == m_hrFinal ||
-                                 E_PREREQBA_INFINITE_LOOP == m_hrFinal)
                        {
                            if (sczUnformattedText)
                            {
@@ -4053,7 +4064,7 @@ private:
            ::EnterCriticalSection(&m_csShowingInternalUiThisPackage);
            fClose = PromptCancel(
                m_hWnd,
-                BOOTSTRAPPER_DISPLAY_FULL != m_command.display || m_fShowingInternalUiThisPackage,
+                BOOTSTRAPPER_DISPLAY_FULL != m_commandDisplay || m_fShowingInternalUiThisPackage,
                m_sczConfirmCloseMessage ? m_sczConfirmCloseMessage : L"Are you sure you want to cancel?",
                m_pTheme->sczCaption);
            ::LeaveCriticalSection(&m_csShowingInternalUiThisPackage);
@@ -4509,12 +4520,12 @@ LExit:
        __out DWORD* pdwPageId
        )
    {
-        if (BOOTSTRAPPER_DISPLAY_PASSIVE == m_command.display)
+        if (BOOTSTRAPPER_DISPLAY_PASSIVE == m_commandDisplay)
        {
            switch (state)
            {
            case WIXSTDBA_STATE_INITIALIZED:
-                *pdwPageId = BOOTSTRAPPER_ACTION_HELP == m_command.action ? m_rgdwPageIds[WIXSTDBA_PAGE_HELP] : m_rgdwPageIds[WIXSTDBA_PAGE_LOADING];
+                *pdwPageId = BOOTSTRAPPER_ACTION_HELP == m_commandAction ? m_rgdwPageIds[WIXSTDBA_PAGE_HELP] : m_rgdwPageIds[WIXSTDBA_PAGE_LOADING];
                break;
            case WIXSTDBA_STATE_HELP:
@@ -4543,7 +4554,7 @@ LExit:
                break;
            }
        }
-        else if (BOOTSTRAPPER_DISPLAY_FULL == m_command.display)
+        else if (BOOTSTRAPPER_DISPLAY_FULL == m_commandDisplay)
        {
            switch (state)
            {
@@ -4552,7 +4563,7 @@ LExit:
                break;
            case WIXSTDBA_STATE_INITIALIZED:
-                *pdwPageId = BOOTSTRAPPER_ACTION_HELP == m_command.action ? m_rgdwPageIds[WIXSTDBA_PAGE_HELP] : m_rgdwPageIds[WIXSTDBA_PAGE_LOADING];
+                *pdwPageId = BOOTSTRAPPER_ACTION_HELP == m_commandAction ? m_rgdwPageIds[WIXSTDBA_PAGE_HELP] : m_rgdwPageIds[WIXSTDBA_PAGE_LOADING];
                break;
            case WIXSTDBA_STATE_HELP:
@@ -4566,7 +4577,7 @@ LExit:
            case WIXSTDBA_STATE_DETECTED:
            case WIXSTDBA_STATE_PLANNING_PREREQS: __fallthrough;
            case WIXSTDBA_STATE_PLANNED_PREREQS: __fallthrough;
-                switch (m_command.action)
+                switch (m_commandAction)
                {
                case BOOTSTRAPPER_ACTION_INSTALL:
                    *pdwPageId = m_rgdwPageIds[WIXSTDBA_PAGE_INSTALL];
@@ -4699,7 +4710,8 @@ LExit:
    HRESULT LoadBAFunctions(
-        __in IXMLDOMDocument* pixdManifest
+        __in IXMLDOMDocument* pixdManifest,
+        __in BOOTSTRAPPER_COMMAND* pCommand
        )
    {
        HRESULT hr = S_OK;
@@ -4733,8 +4745,9 @@ LExit:
        BalExitOnNullWithLastError(pfnBAFunctionsCreate, hr, "Failed to get BAFunctionsCreate entry-point from: %ls", sczBafPath);
        bafCreateArgs.cbSize = sizeof(bafCreateArgs);
-        bafCreateArgs.qwBAFunctionsAPIVersion = MAKEQWORDVERSION(2021, 11, 8, 0);
+        bafCreateArgs.qwBAFunctionsAPIVersion = MAKEQWORDVERSION(2024, 1, 1, 0);
-        bafCreateArgs.pBootstrapperCreateArgs = &m_createArgs;
+        bafCreateArgs.pEngine = m_pEngine;
+        bafCreateArgs.pCommand = pCommand;
        bafCreateResults.cbSize = sizeof(bafCreateResults);
@@ -4764,16 +4777,18 @@ public:
    //
    CWixStandardBootstrapperApplication(
        __in HMODULE hModule,
-        __in_opt PREQBA_DATA* pPrereqData,
+        __in BOOL fRunAsPrereqBA
-        __in IBootstrapperEngine* pEngine
+        ) : CBalBaseBootstrapperApplication(3, 3000)
-        ) : CBalBaseBootstrapperApplication(pEngine, 3, 3000)
    {
        THEME_ASSIGN_CONTROL_ID* pAssignControl = NULL;
        DWORD dwAutomaticBehaviorType = THEME_CONTROL_AUTOMATIC_BEHAVIOR_EXCLUDE_ENABLED | THEME_CONTROL_AUTOMATIC_BEHAVIOR_EXCLUDE_VISIBLE | THEME_CONTROL_AUTOMATIC_BEHAVIOR_EXCLUDE_ACTION | THEME_CONTROL_AUTOMATIC_BEHAVIOR_EXCLUDE_VALUE;
        m_hModule = hModule;
-        m_command = { };
+        m_commandAction = BOOTSTRAPPER_ACTION_UNKNOWN;
-        m_createArgs = { };
+        m_commandDisplay = BOOTSTRAPPER_DISPLAY_UNKNOWN;
+        m_commandResumeType = BOOTSTRAPPER_RESUME_TYPE_NONE;
+        m_commandRelationType = BOOTSTRAPPER_RELATION_NONE;
+        m_hwndSplashScreen = NULL;
        m_plannedAction = BOOTSTRAPPER_ACTION_UNKNOWN;
@@ -4794,7 +4809,7 @@ public:
        m_hWnd = NULL;
        m_state = WIXSTDBA_STATE_INITIALIZING;
-        m_hrFinal = pPrereqData ? pPrereqData->hrFatalError : S_OK;
+        m_hrFinal = S_OK;
        m_restartResult = BOOTSTRAPPER_APPLY_RESTART_NONE;
        m_fRestartRequired = FALSE;
@@ -4818,10 +4833,9 @@ public:
        m_fShowingInternalUiThisPackage = FALSE;
        m_fTriedToLaunchElevated = FALSE;
-        m_pPrereqData = pPrereqData;
+        m_fPrereq = fRunAsPrereqBA;
-        m_fPrereq = NULL != pPrereqData;
+        m_fHandleHelp = FALSE;
        m_fPreplanPrereqs = FALSE;
-        m_fPerformHelp = !m_fPrereq || m_pPrereqData->fPerformHelp;
        m_fPrereqPackagePlanned = FALSE;
        m_fPrereqInstalled = FALSE;
        m_fPrereqSkipped = FALSE;
@@ -4840,9 +4854,6 @@ public:
        m_pFilesInUseIgnoreButtonLoc = NULL;
        m_pFilesInUseExitButtonLoc = NULL;
-        pEngine->AddRef();
-        m_pEngine = pEngine;
        m_hBAFModule = NULL;
        m_pfnBAFunctionsProc = NULL;
        m_pvBAFunctionsProcContext = NULL;
@@ -5056,15 +5067,16 @@ public:
        ReleaseStr(m_sczLicenseUrl);
        ReleaseStr(m_sczBundleVersion);
        ReleaseStr(m_sczAfterForcedRestartPackage);
-        ReleaseNullObject(m_pEngine);
    }
 private:
    HMODULE m_hModule;
-    BOOTSTRAPPER_CREATE_ARGS m_createArgs;
+    BOOTSTRAPPER_ACTION m_commandAction;
-    BOOTSTRAPPER_COMMAND m_command;
+    BOOTSTRAPPER_DISPLAY m_commandDisplay;
-    IBootstrapperEngine* m_pEngine;
+    BOOTSTRAPPER_RESUME_TYPE m_commandResumeType;
+    BOOTSTRAPPER_RELATION_TYPE m_commandRelationType;
+    HWND m_hwndSplashScreen;
    BOOTSTRAPPER_ACTION m_plannedAction;
    LPWSTR m_sczAfterForcedRestartPackage;
@@ -5147,10 +5159,9 @@ private:
    BOOL m_fSupportCacheOnly;
    BOOL m_fRequestedCacheOnly;
-    PREQBA_DATA* m_pPrereqData;
    BOOL m_fPrereq;
    BOOL m_fPreplanPrereqs;
-    BOOL m_fPerformHelp;
+    BOOL m_fHandleHelp;
    BOOL m_fPrereqPackagePlanned;
    BOOL m_fPrereqInstalled;
    BOOL m_fPrereqSkipped;
@@ -5182,54 +5193,6 @@ private:
 };
-//
-// CreateBootstrapperApplication - creates a new IBootstrapperApplication object.
-//
-HRESULT CreateBootstrapperApplication(
-    __in HMODULE hModule,
-    __in_opt PREQBA_DATA* pPrereqData,
-    __in IBootstrapperEngine* pEngine,
-    __in const BOOTSTRAPPER_CREATE_ARGS* pArgs,
-    __inout BOOTSTRAPPER_CREATE_RESULTS* pResults,
-    __out IBootstrapperApplication** ppApplication
-    )
-{
-    HRESULT hr = S_OK;
-    CWixStandardBootstrapperApplication* pApplication = NULL;
-    if (BOOTSTRAPPER_DISPLAY_UNKNOWN == pArgs->pCommand->display)
-    {
-        BalExitOnFailure(hr = E_INVALIDARG, "Engine requested Unknown display type.");
-    }
-    pApplication = new CWixStandardBootstrapperApplication(hModule, pPrereqData, pEngine);
-    BalExitOnNull(pApplication, hr, E_OUTOFMEMORY, "Failed to create new standard bootstrapper application object.");
-    hr = pApplication->Initialize(pArgs);
-    ExitOnFailure(hr, "CWixStandardBootstrapperApplication initialization failed.");
-    pResults->pfnBootstrapperApplicationProc = BalBaseBootstrapperApplicationProc;
-    pResults->pvBootstrapperApplicationProcContext = pApplication;
-    *ppApplication = pApplication;
-    pApplication = NULL;
-LExit:
-    ReleaseObject(pApplication);
-    return hr;
-}
-void DestroyBootstrapperApplication(
-    __in IBootstrapperApplication* pApplication,
-    __in const BOOTSTRAPPER_DESTROY_ARGS* pArgs,
-    __inout BOOTSTRAPPER_DESTROY_RESULTS* pResults
-    )
-{
-    CWixStandardBootstrapperApplication* pBA = (CWixStandardBootstrapperApplication*)pApplication;
-    pBA->Uninitialize(pArgs, pResults);
-}
 static HRESULT DAPI EvaluateVariableConditionCallback(
    __in_z LPCWSTR wzCondition,
    __out BOOL* pf,
@@ -5370,3 +5333,41 @@ static LPCSTR LoggingMsiFeatureStateToString(
        return "Invalid";
    }
 }
+EXTERN_C HRESULT CreateWixPrerequisiteBootstrapperApplication(
+    __in HINSTANCE hInstance,
+    __out IBootstrapperApplication** ppApplication
+    )
+{
+    HRESULT hr = S_OK;
+    CWixStandardBootstrapperApplication* pApplication = new CWixStandardBootstrapperApplication(hInstance, TRUE);
+    ExitOnNull(pApplication, hr, E_OUTOFMEMORY, "Failed to create new bootstrapper application.");
+    hr = pApplication->QueryInterface(IID_PPV_ARGS(ppApplication));
+    ExitOnRootFailure(hr, "Failed to query for IBootstrapperApplication.");
+LExit:
+    ReleaseObject(pApplication);
+    return hr;
+}
+EXTERN_C HRESULT CreateWixStandardBootstrapperApplication(
+    __in HINSTANCE hInstance,
+    __out IBootstrapperApplication** ppApplication
+    )
+{
+    HRESULT hr = S_OK;
+    CWixStandardBootstrapperApplication* pApplication = new CWixStandardBootstrapperApplication(hInstance, FALSE);
+    ExitOnNull(pApplication, hr, E_OUTOFMEMORY, "Failed to create new bootstrapper application.");
+    hr = pApplication->QueryInterface(IID_PPV_ARGS(ppApplication));
+    ExitOnRootFailure(hr, "Failed to query for IBootstrapperApplication.");
+LExit:
+    ReleaseObject(pApplication);
+    return hr;
+}
diff --git a/src/ext/Bal/wixiuiba/wixiuiba.h b/src/ext/Bal/stdbas/inc/WixInternalUIBootstrapperApplication.h
index 76077f42..6dfef7d9 100644
--- a/src/ext/Bal/wixiuiba/wixiuiba.h
+++ b/src/ext/Bal/stdbas/inc/WixInternalUIBootstrapperApplication.h
@@ -1,13 +1,7 @@
 #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.
+EXTERN_C HRESULT CreateWixInternalUIBootstrapperApplication(
-struct INTERNAL_UI_BA_STATE
+    __in HINSTANCE hInstance,
-{
+    __out IBootstrapperApplication** ppApplication
-    BOOL fInitialized;
+    );
-    HINSTANCE hInstance;
-    LPWSTR sczAppBase;
-    HMODULE hPrereqModule;
-    PREQBA_DATA prereqData;
-    IBootstrapperApplication* pApplication;
-};
diff --git a/src/ext/Bal/stdbas/inc/WixStandardBootstrapperApplication.h b/src/ext/Bal/stdbas/inc/WixStandardBootstrapperApplication.h
new file mode 100644
index 00000000..c3742816
--- /dev/null
+++ b/src/ext/Bal/stdbas/inc/WixStandardBootstrapperApplication.h
@@ -0,0 +1,12 @@
+#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.
+EXTERN_C HRESULT CreateWixPrerequisiteBootstrapperApplication(
+    __in HINSTANCE hInstance,
+    __out IBootstrapperApplication** ppApplication
+    );
+EXTERN_C HRESULT CreateWixStandardBootstrapperApplication(
+    __in HINSTANCE hInstance,
+    __out IBootstrapperApplication** ppApplication
+    );
diff --git a/src/ext/Bal/dnchost/precomp.cpp b/src/ext/Bal/stdbas/precomp.cpp
index 37664a1c..37664a1c 100644
--- a/src/ext/Bal/dnchost/precomp.cpp
+++ b/src/ext/Bal/stdbas/precomp.cpp
diff --git a/src/ext/Bal/stdbas/precomp.h b/src/ext/Bal/stdbas/precomp.h
new file mode 100644
index 00000000..7f138035
--- /dev/null
+++ b/src/ext/Bal/stdbas/precomp.h
@@ -0,0 +1,49 @@
+#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>
+#pragma warning(push)
+#pragma warning(disable:4458) // declaration of 'xxx' hides class member
+#include <gdiplus.h>
+#pragma warning(pop)
+#include <msiquery.h>
+#include <objbase.h>
+#include <shlobj.h>
+#include <shlwapi.h>
+#include <stdlib.h>
+#include <strsafe.h>
+#include <stddef.h>
+#include <dutil.h>
+#include <apputil.h>
+#include <memutil.h>
+#include <dictutil.h>
+#include <dirutil.h>
+#include <fileutil.h>
+#include <locutil.h>
+#include <logutil.h>
+#include <pathutil.h>
+#include <procutil.h>
+#include <resrutil.h>
+#include <shelutil.h>
+#include <strutil.h>
+#include <wndutil.h>
+#include <thmutil.h>
+#include <verutil.h>
+#include <uriutil.h>
+#include <xmlutil.h>
+#include <IBootstrapperEngine.h>
+#include <IBootstrapperApplication.h>
+#include <balutil.h>
+#include <balinfo.h>
+#include <balcondition.h>
+#include <BAFunctions.h>
+#include "stdbas.messages.h"
+#include "WixStandardBootstrapperApplication.h"
diff --git a/src/ext/Bal/stdbas/stdbas.manifest b/src/ext/Bal/stdbas/stdbas.manifest
new file mode 100644
index 00000000..d978bb2b
--- /dev/null
+++ b/src/ext/Bal/stdbas/stdbas.manifest
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+ <assemblyIdentity name="wixstdba.exe" version="5.0.0.0" type="win32"/>
+ <description>WiX Toolset Bootstrapper Applications</description>
+ <dependency><dependentAssembly><assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*" /></dependentAssembly></dependency>
+ <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"><application>
+  <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+  <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+  <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+  <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+  <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+ </application></compatibility>
+ <application xmlns="urn:schemas-microsoft-com:asm.v3"><windowsSettings>
+  <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true/pm</dpiAware>
+  <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2, PerMonitor, System</dpiAwareness>
+  <longPathAware xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">true</longPathAware>
+ </windowsSettings></application>
+ <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"><security><requestedPrivileges><requestedExecutionLevel level="asInvoker" uiAccess="false"/></requestedPrivileges></security></trustInfo>
+</assembly>
diff --git a/src/ext/Bal/wixstdba/wixstdba.mc b/src/ext/Bal/stdbas/stdbas.mc
index 025315a5..025315a5 100644
--- a/src/ext/Bal/wixstdba/wixstdba.mc
+++ b/src/ext/Bal/stdbas/stdbas.mc
diff --git a/src/ext/Bal/dnchost/dnchost.vcxproj b/src/ext/Bal/stdbas/stdbas.vcxproj
index 5860e968..3722b40a 100644
--- a/src/ext/Bal/dnchost/dnchost.vcxproj
+++ b/src/ext/Bal/stdbas/stdbas.vcxproj
@@ -1,5 +1,6 @@
 <?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">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|ARM64">
@@ -29,59 +30,48 @@
  </ItemGroup>
  <PropertyGroup Label="Globals">
-    <ProjectGuid>{B6F70281-6583-4138-BB7F-AABFEBBB3CA2}</ProjectGuid>
+    <ProjectGuid>{DBBF5F32-BAEA-46A8-99A0-17277A906456}</ProjectGuid>
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <Keyword>Win32Proj</Keyword>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
    <CharacterSet>Unicode</CharacterSet>
-    <TargetName>dnchost</TargetName>
+    <Description>WiX Standard Bootstrapper Applications</Description>
-    <ProjectModuleDefinitionFile>dnchost.def</ProjectModuleDefinitionFile>
+    <CustomBuildBeforeTargets>ClCompile</CustomBuildBeforeTargets>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ItemDefinitionGroup Condition=" '$(Configuration)'=='Debug' ">
+  <ImportGroup Label="ExtensionSettings">
-    <ClCompile>
+  </ImportGroup>
-      <!-- libnethost.lib is currently only available in Release mode, so can't use debug runtime -->
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <PropertyGroup>
+  <ImportGroup Label="Shared">
-    <NetHostPlatform>$(Platform)</NetHostPlatform>
+  </ImportGroup>
-    <NetHostPlatform Condition=" '$(NetHostPlatform)'=='Win32' ">x86</NetHostPlatform>
-    <NetHostPath>..\..\..\..\packages\runtime.win-$(NetHostPlatform).Microsoft.NETCore.DotNetAppHost.6.0.4\runtimes\win-$(NetHostPlatform)\native\</NetHostPath>
-    <ProjectAdditionalIncludeDirectories>$(BaseOutputPath)obj;$(NetHostPath);..\wixstdba\inc</ProjectAdditionalIncludeDirectories>
-    <ProjectAdditionalLinkLibraries>shlwapi.lib;$(NetHostPath)libnethost.lib</ProjectAdditionalLinkLibraries>
-  </PropertyGroup>
  <ItemGroup>
-    <ClCompile Include="dnchost.cpp" />
+    <ClInclude Include="inc\WixInternalUIBootstrapperApplication.h" />
-    <ClCompile Include="dncutil.cpp" />
+    <ClInclude Include="inc\WixStandardBootstrapperApplication.h" />
-    <ClCompile Include="precomp.cpp">
-      <PrecompiledHeader>Create</PrecompiledHeader>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="dnchost.h" />
-    <ClInclude Include="dncutil.h" />
    <ClInclude Include="precomp.h" />
  </ItemGroup>
  <ItemGroup>
-    <None Include="dnchost.def" />
+    <ClCompile Include="precomp.cpp">
+      <PrecompiledHeader>Create</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="WixInternalUIBootstrapperApplication.cpp" />
+    <ClCompile Include="WixStandardBootstrapperApplication.cpp" />
  </ItemGroup>
  <ItemDefinitionGroup>
-    <Link>
+    <CustomBuildStep>
-      <!-- libnethost.lib is currently compiled with /GL, so must use linker option /LTCG -->
+      <Message>Compiling message file...</Message>
-      <AdditionalOptions>/LTCG %(AdditionalOptions)</AdditionalOptions>
+      <Command>mc.exe -h "$(IntDir)." -r "$(IntDir)." -A -c -z stdbas.messages "$(InputDir)stdbas.mc"
-    </Link>
+rc.exe -fo "$(OutDir)stdbas.res" "$(IntDir)stdbas.messages.rc"</Command>
+      <Inputs>$(InputDir)stdbas.mc</Inputs>
+      <Outputs>$(IntDir)stdbas.messages.h;$(IntDir)stdbas.messages.rc</Outputs>
+    </CustomBuildStep>
  </ItemDefinitionGroup>
  <ItemGroup>
    <PackageReference Include="WixToolset.BalUtil" />
    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
  </ItemGroup>
diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/BalExtensionFixture.cs b/src/ext/Bal/test/WixToolsetTest.Bal/BalExtensionFixture.cs
index 2e60e2c0..217fdfb1 100644
--- a/src/ext/Bal/test/WixToolsetTest.Bal/BalExtensionFixture.cs
+++ b/src/ext/Bal/test/WixToolsetTest.Bal/BalExtensionFixture.cs
@@ -116,47 +116,47 @@ namespace WixToolsetTest.Bal
            }
        }
-        [Fact]
+        //[Fact]
-        public void CanBuildUsingMBAWithAlwaysInstallPrereqs()
+        //public void CanBuildUsingMBAWithAlwaysInstallPrereqs()
-        {
+        //{
-            using (var fs = new DisposableFileSystem())
+        //    using (var fs = new DisposableFileSystem())
-            {
+        //    {
-                var baseFolder = fs.GetFolder();
+        //        var baseFolder = fs.GetFolder();
-                var bundleFile = Path.Combine(baseFolder, "bin", "test.exe");
+        //        var bundleFile = Path.Combine(baseFolder, "bin", "test.exe");
-                var bundleSourceFolder = TestData.Get(@"TestData\MBA");
+        //        var bundleSourceFolder = TestData.Get("TestData", "MBA");
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
+        //        var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var baFolderPath = Path.Combine(baseFolder, "ba");
+        //        var baFolderPath = Path.Combine(baseFolder, "ba");
-                var extractFolderPath = Path.Combine(baseFolder, "extract");
+        //        var extractFolderPath = Path.Combine(baseFolder, "extract");
-                var compileResult = WixRunner.Execute(new[]
+        //        var compileResult = WixRunner.Execute(new[]
-                {
+        //        {
-                    "build",
+        //            "build",
-                    Path.Combine(bundleSourceFolder, "AlwaysInstallPrereqsBundle.wxs"),
+        //            Path.Combine(bundleSourceFolder, "AlwaysInstallPrereqsBundle.wxs"),
-                    "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
+        //            "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
-                    "-intermediateFolder", intermediateFolder,
+        //            "-intermediateFolder", intermediateFolder,
-                    "-o", bundleFile,
+        //            "-o", bundleFile,
-                });
+        //        });
-                compileResult.AssertSuccess();
+        //        compileResult.AssertSuccess();
-                Assert.True(File.Exists(bundleFile));
+        //        Assert.True(File.Exists(bundleFile));
-                var extractResult = BundleExtractor.ExtractBAContainer(null, bundleFile, baFolderPath, extractFolderPath);
+        //        var extractResult = BundleExtractor.ExtractBAContainer(null, bundleFile, baFolderPath, extractFolderPath);
-                extractResult.AssertSuccess();
+        //        extractResult.AssertSuccess();
-                var wixMbaPrereqOptionsElements = extractResult.GetBADataTestXmlLines("/ba:BootstrapperApplicationData/ba:WixMbaPrereqOptions");
+        //        var wixPrereqOptionsElements = extractResult.GetBADataTestXmlLines("/ba:BootstrapperApplicationData/ba:WixPrereqOptions");
-                WixAssert.CompareLineByLine(new[]
+        //        WixAssert.CompareLineByLine(new[]
-                {
+        //        {
-                    "<WixMbaPrereqOptions AlwaysInstallPrereqs='1' />",
+        //            "<WixPrereqOptions AlwaysInstallPrereqs='1' />",
-                }, wixMbaPrereqOptionsElements);
+        //        }, wixPrereqOptionsElements);
-                var wixMbaPrereqInformationElements = extractResult.GetBADataTestXmlLines("/ba:BootstrapperApplicationData/ba:WixMbaPrereqInformation");
+        //        var wixPrereqInformationElements = extractResult.GetBADataTestXmlLines("/ba:BootstrapperApplicationData/ba:WixPrereqInformation");
-                WixAssert.CompareLineByLine(new[]
+        //        WixAssert.CompareLineByLine(new[]
-                {
+        //        {
-                    "<WixMbaPrereqInformation PackageId='wixnative.exe' />",
+        //            "<WixPrereqInformation PackageId='wixnative.exe' />",
-                }, wixMbaPrereqInformationElements);
+        //        }, wixPrereqInformationElements);
-            }
+        //    }
-        }
+        //}
        [Fact]
        public void CannotBuildUsingMBAWithNoPrereqs()
@@ -165,7 +165,8 @@ namespace WixToolsetTest.Bal
            {
                var baseFolder = fs.GetFolder();
                var bundleFile = Path.Combine(baseFolder, "bin", "test.exe");
-                var bundleSourceFolder = TestData.Get(@"TestData\MBA");
+                var bundleSourceFolder = TestData.Get(@"TestData", "MBA");
+                var dataFolder = TestData.Get(@"TestData", ".Data");
                var intermediateFolder = Path.Combine(baseFolder, "obj");
                var compileResult = WixRunner.Execute(new[]
@@ -174,10 +175,15 @@ namespace WixToolsetTest.Bal
                    Path.Combine(bundleSourceFolder, "Bundle.wxs"),
                    "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
                    "-intermediateFolder", intermediateFolder,
+                    "-bindpath", dataFolder,
                    "-o", bundleFile,
                });
-                Assert.Equal(6802, compileResult.ExitCode);
-                WixAssert.StringEqual("There must be at least one package with bal:PrereqPackage=\"yes\" when using the ManagedBootstrapperApplicationHost.\nThis is typically done by using the WixNetFxExtension and referencing one of the NetFxAsPrereq package groups.", compileResult.Messages[0].ToString());
+                WixAssert.CompareLineByLine(new[]
+                {
+                    "The WixManagedBootstrapperApplicationHost element has been deprecated.",
+                }, compileResult.Messages.Select(m => m.ToString()).ToArray());
+                Assert.Equal(1130, compileResult.ExitCode);
                Assert.False(File.Exists(bundleFile));
                Assert.False(File.Exists(Path.Combine(intermediateFolder, "test.exe")));
@@ -202,11 +208,13 @@ namespace WixToolsetTest.Bal
                    "-intermediateFolder", intermediateFolder,
                    "-o", bundleFile,
                });
                WixAssert.CompareLineByLine(new[]
                {
-                    "When using DotNetCoreBootstrapperApplicationHost, the Payload element for the BA's entry point DLL must have bal:BAFactoryAssembly=\"yes\".",
+                    "The WixDotNetCoreBootstrapperApplicationHost element has been deprecated.",
+                    "The BootstrapperApplication element's Name or SourceFile attribute was not found; one of these is required."
                }, compileResult.Messages.Select(x => x.ToString()).ToArray());
-                Assert.Equal(6818, compileResult.ExitCode);
+                Assert.Equal(44, compileResult.ExitCode);
                Assert.False(File.Exists(bundleFile));
                Assert.False(File.Exists(Path.Combine(intermediateFolder, "test.exe")));
diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/InternalUIBAFixture.cs b/src/ext/Bal/test/WixToolsetTest.Bal/InternalUIBAFixture.cs
index 314bcd35..22e2fec1 100644
--- a/src/ext/Bal/test/WixToolsetTest.Bal/InternalUIBAFixture.cs
+++ b/src/ext/Bal/test/WixToolsetTest.Bal/InternalUIBAFixture.cs
@@ -45,8 +45,8 @@ namespace WixToolsetTest.Bal
                    "<WixBalPackageInfo PackageId='test.msi' PrimaryPackageType='default' />",
                }, balPackageInfos);
-                Assert.True(File.Exists(Path.Combine(baFolderPath, "mbapreq.thm")));
+                Assert.True(File.Exists(Path.Combine(baFolderPath, "wixpreq.thm")));
-                Assert.True(File.Exists(Path.Combine(baFolderPath, "mbapreq.wxl")));
+                Assert.True(File.Exists(Path.Combine(baFolderPath, "wixpreq.wxl")));
            }
        }
@@ -84,14 +84,14 @@ namespace WixToolsetTest.Bal
                    "<WixBalPackageInfo PackageId='test.msi' PrimaryPackageType='default' />",
                }, balPackageInfos);
-                var mbaPrereqInfos = extractResult.GetBADataTestXmlLines("/ba:BootstrapperApplicationData/ba:WixMbaPrereqInformation");
+                var mbaPrereqInfos = extractResult.GetBADataTestXmlLines("/ba:BootstrapperApplicationData/ba:WixPrereqInformation");
                WixAssert.CompareLineByLine(new[]
                {
-                    "<WixMbaPrereqInformation PackageId='wixnative.exe' LicenseUrl='https://www.mysite.com/prereqterms' />",
+                    "<WixPrereqInformation PackageId='wixnative.exe' LicenseUrl='https://www.mysite.com/prereqterms' />",
                }, mbaPrereqInfos);
-                Assert.True(File.Exists(Path.Combine(baFolderPath, "mbapreq.thm")));
+                Assert.True(File.Exists(Path.Combine(baFolderPath, "wixpreq.thm")));
-                Assert.True(File.Exists(Path.Combine(baFolderPath, "mbapreq.wxl")));
+                Assert.True(File.Exists(Path.Combine(baFolderPath, "wixpreq.wxl")));
            }
        }
@@ -129,14 +129,14 @@ namespace WixToolsetTest.Bal
                    "<WixBalPackageInfo PackageId='test.msi' PrimaryPackageType='default' />",
                }, balPackageInfos);
-                var mbaPrereqInfos = extractResult.GetBADataTestXmlLines("/ba:BootstrapperApplicationData/ba:WixMbaPrereqInformation");
+                var mbaPrereqInfos = extractResult.GetBADataTestXmlLines("/ba:BootstrapperApplicationData/ba:WixPrereqInformation");
                WixAssert.CompareLineByLine(new[]
                {
-                    "<WixMbaPrereqInformation PackageId='wixnative.exe' />",
+                    "<WixPrereqInformation PackageId='wixnative.exe' />",
                }, mbaPrereqInfos);
-                Assert.True(File.Exists(Path.Combine(baFolderPath, "mbapreq.thm")));
+                Assert.True(File.Exists(Path.Combine(baFolderPath, "wixpreq.thm")));
-                Assert.True(File.Exists(Path.Combine(baFolderPath, "mbapreq.wxl")));
+                Assert.True(File.Exists(Path.Combine(baFolderPath, "wixpreq.wxl")));
            }
        }
@@ -183,14 +183,14 @@ namespace WixToolsetTest.Bal
                    "<WixBalPackageInfo PackageId='test.msi' DisplayInternalUICondition='DISPLAYTEST' PrimaryPackageType='default' />",
                }, balPackageInfos);
-                var mbaPrereqInfos = extractResult.GetBADataTestXmlLines("/ba:BootstrapperApplicationData/ba:WixMbaPrereqInformation");
+                var mbaPrereqInfos = extractResult.GetBADataTestXmlLines("/ba:BootstrapperApplicationData/ba:WixPrereqInformation");
                WixAssert.CompareLineByLine(new[]
                {
-                    "<WixMbaPrereqInformation PackageId='wixnative.exe' />",
+                    "<WixPrereqInformation PackageId='wixnative.exe' />",
                }, mbaPrereqInfos);
-                Assert.True(File.Exists(Path.Combine(baFolderPath, "mbapreq.thm")));
+                Assert.True(File.Exists(Path.Combine(baFolderPath, "wixpreq.thm")));
-                Assert.True(File.Exists(Path.Combine(baFolderPath, "mbapreq.wxl")));
+                Assert.True(File.Exists(Path.Combine(baFolderPath, "wixpreq.wxl")));
            }
        }
diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/.Data/fake.exe b/src/ext/Bal/test/WixToolsetTest.Bal/TestData/.Data/fake.exe
new file mode 100644
index 00000000..f27639e9
--- /dev/null
+++ b/src/ext/Bal/test/WixToolsetTest.Bal/TestData/.Data/fake.exe
@@ -0,0 +1 @@
+This is fake.exe
+\ No newline at end of file
diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/MBA/Bundle.wxs b/src/ext/Bal/test/WixToolsetTest.Bal/TestData/MBA/Bundle.wxs
index ba1aefba..59be4bd4 100644
--- a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/MBA/Bundle.wxs
+++ b/src/ext/Bal/test/WixToolsetTest.Bal/TestData/MBA/Bundle.wxs
@@ -2,7 +2,7 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
     xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
    <Bundle Name="WixStdBa" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="75D5D534-E177-4689-AAE9-CAC1C39002C2">
-        <BootstrapperApplication>
+        <BootstrapperApplication SourceFile="fake.exe">
            <bal:WixManagedBootstrapperApplicationHost />
        </BootstrapperApplication>
        <Chain>
diff --git a/src/ext/Bal/test/WixToolsetTest.Dnc.HostGenerator/CSharpSourceGeneratorVerifier.cs b/src/ext/Bal/test/WixToolsetTest.Dnc.HostGenerator/CSharpSourceGeneratorVerifier.cs
deleted file mode 100644
index 27729ac8..00000000
--- a/src/ext/Bal/test/WixToolsetTest.Dnc.HostGenerator/CSharpSourceGeneratorVerifier.cs
+++ /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.
-namespace WixToolsetTest.Dnc.HostGenerator
-{
-    using System;
-    using System.Collections.Immutable;
-    using Microsoft.CodeAnalysis;
-    using Microsoft.CodeAnalysis.CSharp;
-    using Microsoft.CodeAnalysis.CSharp.Testing;
-    using Microsoft.CodeAnalysis.Testing.Verifiers;
-    public static class CSharpSourceGeneratorVerifier<TSourceGenerator>
-        where TSourceGenerator : ISourceGenerator, new()
-    {
-        public class Test : CSharpSourceGeneratorTest<TSourceGenerator, XUnitVerifier>
-        {
-            public Test()
-            {
-            }
-            protected override CompilationOptions CreateCompilationOptions()
-            {
-                var compilationOptions = base.CreateCompilationOptions();
-                return compilationOptions.WithSpecificDiagnosticOptions(
-                     compilationOptions.SpecificDiagnosticOptions.SetItems(GetNullableWarningsFromCompiler()));
-            }
-            public LanguageVersion LanguageVersion { get; set; } = LanguageVersion.Default;
-            private static ImmutableDictionary<string, ReportDiagnostic> GetNullableWarningsFromCompiler()
-            {
-                string[] args = { "/warnaserror:nullable" };
-                var commandLineArguments = CSharpCommandLineParser.Default.Parse(args, baseDirectory: Environment.CurrentDirectory, sdkDirectory: Environment.CurrentDirectory);
-                var nullableWarnings = commandLineArguments.CompilationOptions.SpecificDiagnosticOptions;
-                return nullableWarnings;
-            }
-            protected override ParseOptions CreateParseOptions()
-            {
-                return ((CSharpParseOptions)base.CreateParseOptions()).WithLanguageVersion(this.LanguageVersion);
-            }
-        }
-    }
-}
diff --git a/src/ext/Bal/test/WixToolsetTest.Dnc.HostGenerator/DncHostGeneratorTests.cs b/src/ext/Bal/test/WixToolsetTest.Dnc.HostGenerator/DncHostGeneratorTests.cs
deleted file mode 100644
index ae55b2b5..00000000
--- a/src/ext/Bal/test/WixToolsetTest.Dnc.HostGenerator/DncHostGeneratorTests.cs
+++ /dev/null
@@ -1,91 +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.
-namespace WixToolsetTest.Dnc.HostGenerator
-{
-    using System;
-    using System.Text;
-    using System.Threading.Tasks;
-    using Microsoft.CodeAnalysis;
-    using Microsoft.CodeAnalysis.Testing;
-    using Microsoft.CodeAnalysis.Text;
-    using WixToolset.Dnc.HostGenerator;
-    using WixToolset.Mba.Core;
-    using Xunit;
-    using VerifyCS = CSharpSourceGeneratorVerifier<WixToolset.Dnc.HostGenerator.DncHostGenerator>;
-    public class DncHostGeneratorTests
-    {
-        static readonly MetadataReference MbaCoreAssembly = MetadataReference.CreateFromFile(typeof(BootstrapperApplicationFactoryAttribute).Assembly.Location);
-        // https://github.com/dotnet/roslyn/blob/main/docs/features/source-generators.cookbook.md#unit-testing-of-generators
-        [Fact]
-        public async Task FailsBuildWhenMissingAttribute()
-        {
-            var code = @"
-//[assembly: WixToolset.Mba.Core.BootstrapperApplicationFactory(typeof(Test.BAFactory))]
-namespace Test
-{
-    using WixToolset.Mba.Core;
-    public class BAFactory : BaseBootstrapperApplicationFactory
-    {
-        protected override IBootstrapperApplication Create(IEngine engine, IBootstrapperCommand bootstrapperCommand)
-        {
-            return null;
-        }
-    }
-}
-";
-            await new VerifyCS.Test
-            {
-                TestState = 
-                {
-                    Sources = { code },
-                    ReferenceAssemblies = ReferenceAssemblies.Net.Net60,
-                    AdditionalReferences = { MbaCoreAssembly },
-                    ExpectedDiagnostics =
-                    {
-                        new DiagnosticResult(DncHostGenerator.MissingFactoryAttributeDescriptor),
-                    },
-                },
-            }.RunAsync();
-        }
-        [Fact]
-        public async Task GeneratesEntryPoint()
-        {
-            var code = @"
-[assembly: WixToolset.Mba.Core.BootstrapperApplicationFactory(typeof(Test.BAFactory))]
-namespace Test
-{
-    using WixToolset.Mba.Core;
-    public class BAFactory : BaseBootstrapperApplicationFactory
-    {
-        protected override IBootstrapperApplication Create(IEngine engine, IBootstrapperCommand bootstrapperCommand)
-        {
-            return null;
-        }
-    }
-}
-";
-            var generated = String.Format(DncHostGenerator.Template, DncHostGenerator.Version, "Test.BAFactory");
-            await new VerifyCS.Test
-            {
-                TestState =
-                {
-                    Sources = { code },
-                    GeneratedSources =
-                    {
-                        (typeof(DncHostGenerator), "WixToolset.Dnc.Host.g.cs", SourceText.From(generated, Encoding.UTF8, SourceHashAlgorithm.Sha256)),
-                    },
-                    ReferenceAssemblies = ReferenceAssemblies.Net.Net60,
-                    AdditionalReferences = { MbaCoreAssembly },
-                },
-            }.RunAsync();
-        }
-    }
-}
diff --git a/src/ext/Bal/test/WixToolsetTest.Dnc.HostGenerator/WixToolsetTest.Dnc.HostGenerator.csproj b/src/ext/Bal/test/WixToolsetTest.Dnc.HostGenerator/WixToolsetTest.Dnc.HostGenerator.csproj
deleted file mode 100644
index 1cbf702d..00000000
--- a/src/ext/Bal/test/WixToolsetTest.Dnc.HostGenerator/WixToolsetTest.Dnc.HostGenerator.csproj
+++ /dev/null
@@ -1,23 +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 Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <IsWixTestProject>true</IsWixTestProject>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\WixToolset.Dnc.HostGenerator\WixToolset.Dnc.HostGenerator.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="WixInternal.TestSupport" />
-    <PackageReference Include="WixToolset.Mba.Core" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.XUnit" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" />
-  </ItemGroup>
-</Project>
diff --git a/src/ext/Bal/test/WixToolsetTest.ManagedHost/DncHostFixture.cs b/src/ext/Bal/test/WixToolsetTest.ManagedHost/DncHostFixture.cs
deleted file mode 100644
index fe644d2d..00000000
--- a/src/ext/Bal/test/WixToolsetTest.ManagedHost/DncHostFixture.cs
+++ /dev/null
@@ -1,285 +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.
-namespace WixToolsetTest.ManagedHost
-{
-    using System;
-    using WixInternal.TestSupport;
-    using WixInternal.TestSupport.XunitExtensions;
-    using Xunit;
-    public class DncHostFixture
-    {
-        static readonly string bundleBasePath = TestData.Get("..", "examples");
-        [Fact]
-        public void CanLoadFDDEarliestCoreMBA()
-        {
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var bundleFile = TestData.Get(bundleBasePath, "EarliestCoreBundleFDD.exe");
-                var testEngine = new TestEngine();
-                var result = testEngine.RunShutdownEngine(bundleFile, baseFolder);
-                WixAssert.CompareLineByLine(new[]
-                {
-                    "Loading .NET Core FDD bootstrapper application.",
-                    "Creating BA thread to run asynchronously.",
-                    "EarliestCoreBA",
-                    "Shutdown,ReloadBootstrapper,0",
-                }, result.Output.ToArray());
-            }
-        }
-        [SkippableFact]
-        public void CanLoadFDDx86EarliestCoreMBA()
-        {
-            // https://github.com/microsoft/vstest/issues/3586
-            Environment.SetEnvironmentVariable("DOTNET_ROOT", null);
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var bundleFile = TestData.Get(bundleBasePath, "EarliestCoreBundleFDDx86.exe");
-                var testEngine = new TestEngine();
-                var result = testEngine.RunShutdownEngine(bundleFile, baseFolder, x86: true);
-                var resultOutput = result.Output.ToArray();
-                if (resultOutput.Length > 0 && (resultOutput[0] == "error from hostfxr: It was not possible to find any compatible framework version" ||
-                    resultOutput[0] == "error from hostfxr: You must install or update .NET to run this application."))
-                {
-                    WixAssert.Skip(String.Join(Environment.NewLine, resultOutput));
-                }
-                WixAssert.CompareLineByLine(new[]
-                {
-                    "Loading .NET Core FDD bootstrapper application.",
-                    "Creating BA thread to run asynchronously.",
-                    "EarliestCoreBA",
-                    "Shutdown,ReloadBootstrapper,0",
-                }, resultOutput);
-            }
-        }
-        [Fact]
-        public void CanLoadSCDEarliestCoreMBA()
-        {
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var bundleFile = TestData.Get(bundleBasePath, "EarliestCoreBundleSCD.exe");
-                var testEngine = new TestEngine();
-                var result = testEngine.RunShutdownEngine(bundleFile, baseFolder);
-                WixAssert.CompareLineByLine(new[]
-                {
-                    "Loading .NET Core SCD bootstrapper application.",
-                    "Creating BA thread to run asynchronously.",
-                    "EarliestCoreBA",
-                    "Shutdown,ReloadBootstrapper,0",
-                }, result.Output.ToArray());
-            }
-        }
-        [Fact]
-        public void CanLoadTrimmedSCDEarliestCoreMBA()
-        {
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var bundleFile = TestData.Get(bundleBasePath, "EarliestCoreBundleTrimmedSCD.exe");
-                var testEngine = new TestEngine();
-                var result = testEngine.RunShutdownEngine(bundleFile, baseFolder);
-                WixAssert.CompareLineByLine(new[]
-                {
-                    "Loading .NET Core SCD bootstrapper application.",
-                    "Creating BA thread to run asynchronously.",
-                    "EarliestCoreBA",
-                    "Shutdown,ReloadBootstrapper,0",
-                }, result.Output.ToArray());
-            }
-        }
-        [Fact]
-        public void CanReloadSCDEarliestCoreMBA()
-        {
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var bundleFile = TestData.Get(bundleBasePath, "EarliestCoreBundleSCD.exe");
-                var testEngine = new TestEngine();
-                var result = testEngine.RunReloadEngine(bundleFile, baseFolder);
-                WixAssert.CompareLineByLine(new[]
-                {
-                    "Loading .NET Core SCD bootstrapper application.",
-                    "Creating BA thread to run asynchronously.",
-                    "EarliestCoreBA",
-                    "Shutdown,ReloadBootstrapper,0",
-                    "Loading .NET Core SCD bootstrapper application.",
-                    "Reloaded 1 time(s)", // dnchost doesn't currently support unloading
-                    "Creating BA thread to run asynchronously.",
-                    "EarliestCoreBA",
-                    "Shutdown,Restart,0",
-                }, result.Output.ToArray());
-            }
-        }
-        [Fact]
-        public void CanLoadFDDLatestCoreMBA()
-        {
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var bundleFile = TestData.Get(bundleBasePath, "LatestCoreBundleFDD.exe");
-                var testEngine = new TestEngine();
-                var result = testEngine.RunShutdownEngine(bundleFile, baseFolder);
-                WixAssert.CompareLineByLine(new[]
-                {
-                    "Loading .NET Core FDD bootstrapper application.",
-                    "Creating BA thread to run asynchronously.",
-                    "LatestCoreBA",
-                    "Shutdown,ReloadBootstrapper,0",
-                }, result.Output.ToArray());
-            }
-        }
-        [Fact]
-        public void CanLoadFDDx86LatestCoreMBA()
-        {
-            // https://github.com/microsoft/vstest/issues/3586
-            Environment.SetEnvironmentVariable("DOTNET_ROOT", null);
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var bundleFile = TestData.Get(bundleBasePath, "LatestCoreBundleFDDx86.exe");
-                var testEngine = new TestEngine();
-                var result = testEngine.RunShutdownEngine(bundleFile, baseFolder, x86: true);
-                WixAssert.CompareLineByLine(new[]
-                {
-                    "Loading .NET Core FDD bootstrapper application.",
-                    "Creating BA thread to run asynchronously.",
-                    "LatestCoreBA",
-                    "Shutdown,ReloadBootstrapper,0",
-                }, result.Output.ToArray());
-            }
-        }
-        [Fact]
-        public void CanReloadFDDLatestCoreMBA()
-        {
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var bundleFile = TestData.Get(bundleBasePath, "LatestCoreBundleFDD.exe");
-                var testEngine = new TestEngine();
-                var result = testEngine.RunReloadEngine(bundleFile, baseFolder);
-                WixAssert.CompareLineByLine(new[]
-                {
-                    "Loading .NET Core FDD bootstrapper application.",
-                    "Creating BA thread to run asynchronously.",
-                    "LatestCoreBA",
-                    "Shutdown,ReloadBootstrapper,0",
-                    "Loading .NET Core FDD bootstrapper application.",
-                    "Reloaded 1 time(s)", // dnchost doesn't currently support unloading
-                    "Creating BA thread to run asynchronously.",
-                    "LatestCoreBA",
-                    "Shutdown,Restart,0",
-                }, result.Output.ToArray());
-            }
-        }
-        [Fact]
-        public void CanLoadSCDLatestCoreMBA()
-        {
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var bundleFile = TestData.Get(bundleBasePath, "LatestCoreBundleSCD.exe");
-                var testEngine = new TestEngine();
-                var result = testEngine.RunShutdownEngine(bundleFile, baseFolder);
-                WixAssert.CompareLineByLine(new[]
-                {
-                    "Loading .NET Core SCD bootstrapper application.",
-                    "Creating BA thread to run asynchronously.",
-                    "LatestCoreBA",
-                    "Shutdown,ReloadBootstrapper,0",
-                }, result.Output.ToArray());
-                var logMessages = result.Output;
-            }
-        }
-        [Fact]
-        public void CanLoadTrimmedSCDLatestCoreMBA()
-        {
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var bundleFile = TestData.Get(bundleBasePath, "LatestCoreBundleTrimmedSCD.exe");
-                var testEngine = new TestEngine();
-                var result = testEngine.RunShutdownEngine(bundleFile, baseFolder);
-                WixAssert.CompareLineByLine(new[]
-                {
-                    "Loading .NET Core SCD bootstrapper application.",
-                    "Creating BA thread to run asynchronously.",
-                    "LatestCoreBA",
-                    "Shutdown,ReloadBootstrapper,0",
-                }, result.Output.ToArray());
-            }
-        }
-        [Fact]
-        public void CanReloadSCDLatestCoreMBA()
-        {
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var bundleFile = TestData.Get(bundleBasePath, "LatestCoreBundleSCD.exe");
-                var testEngine = new TestEngine();
-                var result = testEngine.RunReloadEngine(bundleFile, baseFolder);
-                WixAssert.CompareLineByLine(new[]
-                {
-                    "Loading .NET Core SCD bootstrapper application.",
-                    "Creating BA thread to run asynchronously.",
-                    "LatestCoreBA",
-                    "Shutdown,ReloadBootstrapper,0",
-                    "Loading .NET Core SCD bootstrapper application.",
-                    "Reloaded 1 time(s)", // dnchost doesn't currently support unloading
-                    "Creating BA thread to run asynchronously.",
-                    "LatestCoreBA",
-                    "Shutdown,Restart,0",
-                }, result.Output.ToArray());
-            }
-        }
-        [Fact]
-        public void CanLoadFDDWPFCoreMBA()
-        {
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var bundleFile = TestData.Get(bundleBasePath, "WPFCoreBundleFDD.exe");
-                var testEngine = new TestEngine();
-                var result = testEngine.RunShutdownEngine(bundleFile, baseFolder);
-                WixAssert.CompareLineByLine(new[]
-                {
-                    "Loading .NET Core FDD bootstrapper application.",
-                    "Creating BA thread to run asynchronously.",
-                    "WPFCoreBA",
-                    "Shutdown,ReloadBootstrapper,0",
-                }, result.Output.ToArray());
-            }
-        }
-    }
-}
diff --git a/src/ext/Bal/test/WixToolsetTest.ManagedHost/MbaHostFixture.cs b/src/ext/Bal/test/WixToolsetTest.ManagedHost/MbaHostFixture.cs
deleted file mode 100644
index 6f7709b5..00000000
--- a/src/ext/Bal/test/WixToolsetTest.ManagedHost/MbaHostFixture.cs
+++ /dev/null
@@ -1,100 +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.
-namespace WixToolsetTest.ManagedHost
-{
-    using WixInternal.TestSupport;
-    using Xunit;
-    public class MbaHostFixture
-    {
-        static readonly string bundleBasePath = TestData.Get("..", "examples");
-        [Fact]
-        public void CanLoadFullFramework2MBA()
-        {
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var bundleFile = TestData.Get(bundleBasePath, "FullFramework2Bundle.exe");
-                var testEngine = new TestEngine();
-                var result = testEngine.RunShutdownEngine(bundleFile, baseFolder);
-                WixAssert.CompareLineByLine(new[]
-                {
-                    "Loading managed bootstrapper application.",
-                    "Creating BA thread to run asynchronously.",
-                    "FullFramework2BA",
-                    "Shutdown,ReloadBootstrapper,0",
-                }, result.Output.ToArray());
-            }
-        }
-        [Fact]
-        public void CanLoadFullFramework4MBA()
-        {
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var bundleFile = TestData.Get(bundleBasePath, "FullFramework4Bundle.exe");
-                var testEngine = new TestEngine();
-                var result = testEngine.RunShutdownEngine(bundleFile, baseFolder);
-                WixAssert.CompareLineByLine(new[]
-                {
-                    "Loading managed bootstrapper application.",
-                    "Creating BA thread to run asynchronously.",
-                    "FullFramework4BA",
-                    "Shutdown,ReloadBootstrapper,0",
-                }, result.Output.ToArray());
-            }
-        }
-        [Fact]
-        public void CanReloadFullFramework2MBA()
-        {
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var bundleFile = TestData.Get(bundleBasePath, "FullFramework2Bundle.exe");
-                var testEngine = new TestEngine();
-                var result = testEngine.RunReloadEngine(bundleFile, baseFolder);
-                WixAssert.CompareLineByLine(new[]
-                {
-                    "Loading managed bootstrapper application.",
-                    "Creating BA thread to run asynchronously.",
-                    "FullFramework2BA",
-                    "Shutdown,ReloadBootstrapper,0",
-                    "Loading managed bootstrapper application.",
-                    "Creating BA thread to run asynchronously.",
-                    "FullFramework2BA",
-                    "Shutdown,Restart,0",
-                }, result.Output.ToArray());
-            }
-        }
-        [Fact]
-        public void CanReloadFullFramework4MBA()
-        {
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var bundleFile = TestData.Get(bundleBasePath, "FullFramework4Bundle.exe");
-                var testEngine = new TestEngine();
-                var result = testEngine.RunReloadEngine(bundleFile, baseFolder);
-                WixAssert.CompareLineByLine(new[]
-                {
-                    "Loading managed bootstrapper application.",
-                    "Creating BA thread to run asynchronously.",
-                    "FullFramework4BA",
-                    "Shutdown,ReloadBootstrapper,0",
-                    "Loading managed bootstrapper application.",
-                    "Creating BA thread to run asynchronously.",
-                    "FullFramework4BA",
-                    "Shutdown,Restart,0",
-                }, result.Output.ToArray());
-            }
-        }
-    }
-}
diff --git a/src/ext/Bal/test/WixToolsetTest.ManagedHost/README.md b/src/ext/Bal/test/WixToolsetTest.ManagedHost/README.md
deleted file mode 100644
index cbec1387..00000000
--- a/src/ext/Bal/test/WixToolsetTest.ManagedHost/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-In order to properly test dnchost and mbahost,
-the managed BAs need to be published and a bundle needs to be built for each scenario.
-Making this happen on every build for the solution takes too long,
-so this project relies on manually running devbuild.cmd to publish everything before the tests can be run.
-devbuild.cmd needs to be ran again every time changes are made in other projects.
-\ No newline at end of file
diff --git a/src/ext/Bal/test/WixToolsetTest.ManagedHost/TestEngine.cs b/src/ext/Bal/test/WixToolsetTest.ManagedHost/TestEngine.cs
deleted file mode 100644
index 8be62e92..00000000
--- a/src/ext/Bal/test/WixToolsetTest.ManagedHost/TestEngine.cs
+++ /dev/null
@@ -1,76 +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.
-namespace WixToolsetTest.ManagedHost
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Diagnostics;
-    using System.IO;
-    using WixInternal.TestSupport;
-    using WixInternal.Core.TestPackage;
-    public class TestEngine
-    {
-        private static readonly string TestEngineFile = TestData.Get(@"..\x64\examples\Example.TestEngine\Example.TestEngine.exe");
-        private static readonly string TestEngineFileX86 = TestData.Get(@"..\x86\examples\Example.TestEngine\Example.TestEngine.exe");
-        public TestEngineResult RunReloadEngine(string bundleFilePath, string tempFolderPath, bool x86 = false)
-        {
-            return this.RunTestEngine("reload", bundleFilePath, tempFolderPath, x86);
-        }
-        public TestEngineResult RunShutdownEngine(string bundleFilePath, string tempFolderPath, bool x86 = false)
-        {
-            return this.RunTestEngine("shutdown", bundleFilePath, tempFolderPath, x86);
-        }
-        private TestEngineResult RunTestEngine(string engineMode, string bundleFilePath, string tempFolderPath, bool x86 = false)
-        {
-            var baFolderPath = Path.Combine(tempFolderPath, "ba");
-            var extractFolderPath = Path.Combine(tempFolderPath, "extract");
-            var extractResult = BundleExtractor.ExtractBAContainer(null, bundleFilePath, baFolderPath, extractFolderPath);
-            extractResult.AssertSuccess();
-            var args = new string[] {
-                engineMode,
-                '"' + bundleFilePath + '"',
-                '"' + extractResult.GetBAFilePath(baFolderPath) + '"',
-            };
-            return RunProcessCaptureOutput(x86 ? TestEngineFileX86 : 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/ext/Bal/test/WixToolsetTest.ManagedHost/TestEngineResult.cs b/src/ext/Bal/test/WixToolsetTest.ManagedHost/TestEngineResult.cs
deleted file mode 100644
index 63f6f7f5..00000000
--- a/src/ext/Bal/test/WixToolsetTest.ManagedHost/TestEngineResult.cs
+++ /dev/null
@@ -1,12 +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.
-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/ext/Bal/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj b/src/ext/Bal/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj
deleted file mode 100644
index 9caf3aa6..00000000
--- a/src/ext/Bal/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj
+++ /dev/null
@@ -1,19 +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 Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <IsWixTestProject>true</IsWixTestProject>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\examples\TestEngine\Example.TestEngine.vcxproj" Properties="Platform=ARM64" ReferenceOutputAssembly="false" />
-    <ProjectReference Include="..\examples\TestEngine\Example.TestEngine.vcxproj" Properties="Platform=x86" ReferenceOutputAssembly="false" />
-    <ProjectReference Include="..\examples\TestEngine\Example.TestEngine.vcxproj" Properties="Platform=x64" ReferenceOutputAssembly="false" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="WixInternal.Core.TestPackage" />
-  </ItemGroup>
-</Project>
diff --git a/src/ext/Bal/test/examples/Directory.Build.props b/src/ext/Bal/test/examples/Directory.Build.props
index 7f38564a..e7d65cdd 100644
--- a/src/ext/Bal/test/examples/Directory.Build.props
+++ b/src/ext/Bal/test/examples/Directory.Build.props
@@ -2,6 +2,5 @@
 <!-- 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>
  <Import Project="$(MsbuildThisFileDirectory)..\..\Directory.Build.props" />
-  <Import Project="Directory.csproj.props" Condition=" '$(MSBuildProjectExtension)'=='.csproj' " />
  <Import Project="Directory.wixproj.props" Condition=" '$(MSBuildProjectExtension)'=='.wixproj' " />
 </Project>
diff --git a/src/ext/Bal/test/examples/Directory.Build.targets b/src/ext/Bal/test/examples/Directory.Build.targets
index b27a1a41..3e9115e0 100644
--- a/src/ext/Bal/test/examples/Directory.Build.targets
+++ b/src/ext/Bal/test/examples/Directory.Build.targets
@@ -3,5 +3,4 @@
 <Project>
  <Import Project="$(MsbuildThisFileDirectory)..\..\..\..\Directory.Build.targets" />
  <Import Project="Directory.wixproj.targets" Condition=" '$(MSBuildProjectExtension)'=='.wixproj' " />
-  <Import Project="DncBA.targets" Condition=" '$(IsDncBA)'=='true' " />
 </Project>
diff --git a/src/ext/Bal/test/examples/DncBA.targets b/src/ext/Bal/test/examples/DncBA.targets
deleted file mode 100644
index 2b8c1428..00000000
--- a/src/ext/Bal/test/examples/DncBA.targets
+++ /dev/null
@@ -1,19 +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>
-  <Import Project="$(MsbuildThisFileDirectory)..\..\WixToolset.Dnc.HostGenerator\build\WixToolset.Dnc.HostGenerator.targets" />
-  <PropertyGroup>
-    <ILLinkTreatWarningsAsErrors>false</ILLinkTreatWarningsAsErrors>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="$(MsbuildThisFileDirectory)..\..\WixToolset.Dnc.HostGenerator\WixToolset.Dnc.HostGenerator.csproj"
-                      OutputItemType="Analyzer"
-                      ReferenceOutputAssembly="false" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="WixToolset.Mba.Core" />
-  </ItemGroup>
-</Project>
diff --git a/src/ext/Bal/test/examples/EarliestCoreBundleFDD/FrameworkDependentBundle.wxs b/src/ext/Bal/test/examples/EarliestCoreBundleFDD/FrameworkDependentBundle.wxs
index 116d5223..bb83568f 100644
--- a/src/ext/Bal/test/examples/EarliestCoreBundleFDD/FrameworkDependentBundle.wxs
+++ b/src/ext/Bal/test/examples/EarliestCoreBundleFDD/FrameworkDependentBundle.wxs
@@ -1,12 +1,12 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
    <Bundle Name="FDDEarliestCoreMBA" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="5CE5B5C7-4B6B-4B95-B297-731F1F956533">
-        <BootstrapperApplication>
+        <BootstrapperApplication SourceFile="publish\Example.EarliestCoreMBA\fdd\Example.EarliestCoreMBA.exe">
            <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd\Example.EarliestCoreMBA.deps.json" Name="Example.EarliestCoreMBA.deps.json" />
-            <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd\Example.EarliestCoreMBA.dll" Name="Example.EarliestCoreMBA.dll" bal:BAFactoryAssembly="yes" />
+            <!-- <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd\Example.EarliestCoreMBA.dll" Name="Example.EarliestCoreMBA.dll" bal:BAFactoryAssembly="yes" /> -->
            <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd\Example.EarliestCoreMBA.runtimeconfig.json" Name="Example.EarliestCoreMBA.runtimeconfig.json" />
            <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd\mbanative.dll" Name="mbanative.dll" />
            <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd\WixToolset.Mba.Core.dll" Name="WixToolset.Mba.Core.dll" />
-            <bal:WixDotNetCoreBootstrapperApplicationHost />
+            <!-- <bal:WixDotNetCoreBootstrapperApplicationHost /> -->
        </BootstrapperApplication>
        <Chain>
            <ExePackage DetectCondition="none" UninstallArguments="-foo" SourceFile="..\.data\notanexe.exe"  bal:PrereqPackage="yes" />
diff --git a/src/ext/Bal/test/examples/EarliestCoreBundleFDDx86/FrameworkDependentBundle.wxs b/src/ext/Bal/test/examples/EarliestCoreBundleFDDx86/FrameworkDependentBundle.wxs
index 3672fc1d..ca3d4cf0 100644
--- a/src/ext/Bal/test/examples/EarliestCoreBundleFDDx86/FrameworkDependentBundle.wxs
+++ b/src/ext/Bal/test/examples/EarliestCoreBundleFDDx86/FrameworkDependentBundle.wxs
@@ -1,12 +1,12 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
    <Bundle Name="FDDx86EarliestCoreMBA" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="{3D4A29A0-8AAE-4831-A9CF-E34AC298097D}">
-        <BootstrapperApplication>
+        <BootstrapperApplication SourceFile="publish\Example.EarliestCoreMBA\fdd-x86\Example.EarliestCoreMBA.exe">
            <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd-x86\Example.EarliestCoreMBA.deps.json" Name="Example.EarliestCoreMBA.deps.json" />
-            <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd-x86\Example.EarliestCoreMBA.dll" Name="Example.EarliestCoreMBA.dll" bal:BAFactoryAssembly="yes" />
+            <!-- <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd-x86\Example.EarliestCoreMBA.dll" Name="Example.EarliestCoreMBA.dll" bal:BAFactoryAssembly="yes" /> -->
            <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd-x86\Example.EarliestCoreMBA.runtimeconfig.json" Name="Example.EarliestCoreMBA.runtimeconfig.json" />
            <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd-x86\mbanative.dll" Name="mbanative.dll" />
            <Payload SourceFile="publish\Example.EarliestCoreMBA\fdd-x86\WixToolset.Mba.Core.dll" Name="WixToolset.Mba.Core.dll" />
-            <bal:WixDotNetCoreBootstrapperApplicationHost />
+            <!-- <bal:WixDotNetCoreBootstrapperApplicationHost /> -->
        </BootstrapperApplication>
        <Chain>
            <ExePackage DetectCondition="none" UninstallArguments="-foo" SourceFile="..\.data\notanexe.exe"  bal:PrereqPackage="yes" />
diff --git a/src/ext/Bal/test/examples/EarliestCoreBundleSCD/SelfContainedBundle.wxs b/src/ext/Bal/test/examples/EarliestCoreBundleSCD/SelfContainedBundle.wxs
index d888d3d9..38a167f1 100644
--- a/src/ext/Bal/test/examples/EarliestCoreBundleSCD/SelfContainedBundle.wxs
+++ b/src/ext/Bal/test/examples/EarliestCoreBundleSCD/SelfContainedBundle.wxs
@@ -1,7 +1,7 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
    <Bundle Name="SCDEarliestCoreMBA" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="5CE5B5C7-4B6B-4B95-B297-731F1F956533">
-        <BootstrapperApplication>
+        <BootstrapperApplication SourceFile="Example.EarliestCoreMBA.exe">
-            <bal:WixDotNetCoreBootstrapperApplicationHost SelfContainedDeployment="yes" />
+            <!-- <bal:WixDotNetCoreBootstrapperApplicationHost SelfContainedDeployment="yes" /> -->
            <PayloadGroupRef Id="publish.Example.EarliestCoreMBA.scd" />
        </BootstrapperApplication>
        <Chain>
diff --git a/src/ext/Bal/test/examples/EarliestCoreBundleSCD/ba.xslt b/src/ext/Bal/test/examples/EarliestCoreBundleSCD/ba.xslt
index 06b84256..d30b2564 100644
--- a/src/ext/Bal/test/examples/EarliestCoreBundleSCD/ba.xslt
+++ b/src/ext/Bal/test/examples/EarliestCoreBundleSCD/ba.xslt
@@ -11,10 +11,5 @@
        </xsl:copy>
    </xsl:template>
-    <xsl:template match="wix:Payload[@SourceFile='SourceDir\Example.EarliestCoreMBA.dll']" >
+    <xsl:template match="wix:Payload[@SourceFile='SourceDir\Example.EarliestCoreMBA.exe']" />
-        <xsl:copy>
-            <xsl:attribute name="BAFactoryAssembly" namespace="http://wixtoolset.org/schemas/v4/wxs/bal">yes</xsl:attribute>
-            <xsl:apply-templates select="@* | node()"/>
-        </xsl:copy>
-    </xsl:template>
 </xsl:stylesheet>
diff --git a/src/ext/Bal/test/examples/EarliestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs b/src/ext/Bal/test/examples/EarliestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs
index 5f1aa557..bf4ad6e3 100644
--- a/src/ext/Bal/test/examples/EarliestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs
+++ b/src/ext/Bal/test/examples/EarliestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs
@@ -1,7 +1,7 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
    <Bundle Name="TrimmedSCDEarliestCoreMBA" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="5CE5B5C7-4B6B-4B95-B297-731F1F956533">
-        <BootstrapperApplication>
+        <BootstrapperApplication SourceFile="SourceDir\Example.EarliestCoreMBA.exe" >
-            <bal:WixDotNetCoreBootstrapperApplicationHost SelfContainedDeployment="yes" />
+            <!-- <bal:WixDotNetCoreBootstrapperApplicationHost SelfContainedDeployment="yes" /> -->
            <PayloadGroupRef Id="publish.Example.EarliestCoreMBA.trimmedscd" />
        </BootstrapperApplication>
        <Chain>
diff --git a/src/ext/Bal/test/examples/EarliestCoreBundleTrimmedSCD/ba.xslt b/src/ext/Bal/test/examples/EarliestCoreBundleTrimmedSCD/ba.xslt
index 06b84256..d30b2564 100644
--- a/src/ext/Bal/test/examples/EarliestCoreBundleTrimmedSCD/ba.xslt
+++ b/src/ext/Bal/test/examples/EarliestCoreBundleTrimmedSCD/ba.xslt
@@ -11,10 +11,5 @@
        </xsl:copy>
    </xsl:template>
-    <xsl:template match="wix:Payload[@SourceFile='SourceDir\Example.EarliestCoreMBA.dll']" >
+    <xsl:template match="wix:Payload[@SourceFile='SourceDir\Example.EarliestCoreMBA.exe']" />
-        <xsl:copy>
-            <xsl:attribute name="BAFactoryAssembly" namespace="http://wixtoolset.org/schemas/v4/wxs/bal">yes</xsl:attribute>
-            <xsl:apply-templates select="@* | node()"/>
-        </xsl:copy>
-    </xsl:template>
 </xsl:stylesheet>
diff --git a/src/ext/Bal/test/examples/EarliestCoreMBA/EarliestCoreBA.cs b/src/ext/Bal/test/examples/EarliestCoreMBA/EarliestCoreBA.cs
index c9291a7f..490f4051 100644
--- a/src/ext/Bal/test/examples/EarliestCoreMBA/EarliestCoreBA.cs
+++ b/src/ext/Bal/test/examples/EarliestCoreMBA/EarliestCoreBA.cs
@@ -6,14 +6,9 @@ namespace Example.EarliestCoreMBA
    public class EarliestCoreBA : BootstrapperApplication
    {
-        public EarliestCoreBA(IEngine engine)
-            : base(engine)
-        {
-        }
        protected override void Run()
        {
+            this.engine.Quit(0);
        }
        protected override void OnStartup(StartupEventArgs args)
diff --git a/src/ext/Bal/test/examples/EarliestCoreMBA/EarliestCoreBAFactory.cs b/src/ext/Bal/test/examples/EarliestCoreMBA/EarliestCoreBAFactory.cs
deleted file mode 100644
index 672e17ee..00000000
--- a/src/ext/Bal/test/examples/EarliestCoreMBA/EarliestCoreBAFactory.cs
+++ /dev/null
@@ -1,22 +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.
-[assembly: WixToolset.Mba.Core.BootstrapperApplicationFactory(typeof(Example.EarliestCoreMBA.EarliestCoreBAFactory))]
-namespace Example.EarliestCoreMBA
-{
-    using WixToolset.Mba.Core;
-    public class EarliestCoreBAFactory : 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 EarliestCoreBA(engine);
-        }
-    }
-}
diff --git a/src/ext/Bal/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj b/src/ext/Bal/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj
index 7b9d1670..958381c3 100644
--- a/src/ext/Bal/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj
+++ b/src/ext/Bal/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj
@@ -3,7 +3,12 @@
  <PropertyGroup>
    <TargetFramework>net6.0</TargetFramework>
    <RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
-    <IsDncBA>true</IsDncBA>
+    <OutputType>WinExe</OutputType>
+    <DebugType>embedded</DebugType>
    <Description>Earliest .NET Core MBA</Description>
  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Mba.Core" />
+  </ItemGroup>
 </Project>
diff --git a/src/ext/Bal/test/examples/EarliestCoreMBA/Program.cs b/src/ext/Bal/test/examples/EarliestCoreMBA/Program.cs
new file mode 100644
index 00000000..11cc46f0
--- /dev/null
+++ b/src/ext/Bal/test/examples/EarliestCoreMBA/Program.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.
+namespace Example.EarliestCoreMBA
+{
+    using WixToolset.Mba.Core;
+    internal class Program
+    {
+        private static int Main()
+        {
+            var application = new EarliestCoreBA();
+            ManagedBootstrapperApplication.Run(application);
+            return 0;
+        }
+    }
+}
diff --git a/src/ext/Bal/test/examples/FullFramework2Bundle/Bundle.wxs b/src/ext/Bal/test/examples/FullFramework2Bundle/Bundle.wxs
index ba4f02b6..9ca93c7f 100644
--- a/src/ext/Bal/test/examples/FullFramework2Bundle/Bundle.wxs
+++ b/src/ext/Bal/test/examples/FullFramework2Bundle/Bundle.wxs
@@ -1,11 +1,10 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
    <Bundle Name="FullFramework2MBA" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="5CE5B5C7-4B6B-4B95-B297-731F1F956533">
-        <BootstrapperApplication>
+        <BootstrapperApplication SourceFile="Example.FullFramework2MBA\net462\win-x64\Example.FullFramework2MBA.exe">
-            <Payload SourceFile="Example.FullFramework2MBA\net462\win-x64\Example.FullFramework2MBA.dll" />
+            <Payload SourceFile="Example.FullFramework2MBA\net462\win-x64\Example.FullFramework2MBA.exe.config" />
            <Payload SourceFile="Example.FullFramework2MBA\net462\win-x64\mbanative.dll" />
            <Payload SourceFile="Example.FullFramework2MBA\net462\win-x64\WixToolset.Mba.Core.dll" />
-            <Payload SourceFile="Example.FullFramework2MBA\net462\win-x64\WixToolset.Mba.Host.config" />
+            <!-- <bal:WixManagedBootstrapperApplicationHost /> -->
-            <bal:WixManagedBootstrapperApplicationHost />
        </BootstrapperApplication>
        <Chain>
            <ExePackage DetectCondition="none" UninstallArguments="-foo" SourceFile="..\.data\notanexe.exe"  bal:PrereqPackage="yes" />
diff --git a/src/ext/Bal/test/examples/FullFramework2Bundle/FullFramework2Bundle.wixproj b/src/ext/Bal/test/examples/FullFramework2Bundle/FullFramework2Bundle.wixproj
index ba75a9ff..7f9c222e 100644
--- a/src/ext/Bal/test/examples/FullFramework2Bundle/FullFramework2Bundle.wixproj
+++ b/src/ext/Bal/test/examples/FullFramework2Bundle/FullFramework2Bundle.wixproj
@@ -1,2 +1,6 @@
 <!-- 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="WixToolset.Sdk" />
+<Project Sdk="WixToolset.Sdk">
+  <ItemGroup>
+    <ProjectReference Include="..\FullFramework2MBA\Example.FullFramework2MBA.csproj" />
+  </ItemGroup>
+</Project>
diff --git a/src/ext/Bal/test/examples/Directory.csproj.props b/src/ext/Bal/test/examples/FullFramework2MBA/App.config
index e314ca20..cd68f257 100644
--- a/src/ext/Bal/test/examples/Directory.csproj.props
+++ b/src/ext/Bal/test/examples/FullFramework2MBA/App.config
@@ -1,5 +1,7 @@
-<?xml version="1.0" encoding="utf-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. -->
-<Project>
+<configuration>
-  <Import Project="$(MsbuildThisFileDirectory)..\..\WixToolset.Dnc.HostGenerator\build\WixToolset.Dnc.HostGenerator.props" />
+    <startup>
-</Project>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
+    </startup>
+</configuration>
diff --git a/src/ext/Bal/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj b/src/ext/Bal/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj
index f6280a9e..7c4db8c1 100644
--- a/src/ext/Bal/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj
+++ b/src/ext/Bal/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj
@@ -4,6 +4,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <TargetFramework>net462</TargetFramework>
+    <OutputType>WinExe</OutputType>
    <AssemblyName>Example.FullFramework2MBA</AssemblyName>
    <RootNamespace>Example.FullFramework2MBA</RootNamespace>
    <DebugType>embedded</DebugType>
@@ -11,10 +12,10 @@
  </PropertyGroup>
  <ItemGroup>
-    <Content Include="WixToolset.Mba.Host.config" CopyToOutputDirectory="PreserveNewest" />
+    <PackageReference Include="WixToolset.Mba.Core" />
  </ItemGroup>
  <ItemGroup>
-    <PackageReference Include="WixToolset.Mba.Core" />
+    <ProjectReference Include="..\..\..\..\..\api\burn\WixToolset.Mba.Core\WixToolset.Mba.Core.csproj" />
  </ItemGroup>
 </Project>
diff --git a/src/ext/Bal/test/examples/FullFramework2MBA/FullFramework2BA.cs b/src/ext/Bal/test/examples/FullFramework2MBA/FullFramework2BA.cs
index 32cd19c8..c6d478af 100644
--- a/src/ext/Bal/test/examples/FullFramework2MBA/FullFramework2BA.cs
+++ b/src/ext/Bal/test/examples/FullFramework2MBA/FullFramework2BA.cs
@@ -6,14 +6,9 @@ namespace Example.FullFramework2MBA
    public class FullFramework2BA : BootstrapperApplication
    {
-        public FullFramework2BA(IEngine engine)
-            : base(engine)
-        {
-        }
        protected override void Run()
        {
+            this.engine.Quit(42);
        }
        protected override void OnStartup(StartupEventArgs args)
diff --git a/src/ext/Bal/test/examples/FullFramework2MBA/FullFramework2BAFactory.cs b/src/ext/Bal/test/examples/FullFramework2MBA/FullFramework2BAFactory.cs
deleted file mode 100644
index 647c2040..00000000
--- a/src/ext/Bal/test/examples/FullFramework2MBA/FullFramework2BAFactory.cs
+++ /dev/null
@@ -1,22 +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.
-[assembly: WixToolset.Mba.Core.BootstrapperApplicationFactory(typeof(Example.FullFramework2MBA.FullFramework2BAFactory))]
-namespace Example.FullFramework2MBA
-{
-    using WixToolset.Mba.Core;
-    public class FullFramework2BAFactory : 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 FullFramework2BA(engine);
-        }
-    }
-}
diff --git a/src/ext/Bal/test/examples/FullFramework2MBA/Program.cs b/src/ext/Bal/test/examples/FullFramework2MBA/Program.cs
new file mode 100644
index 00000000..067fefe8
--- /dev/null
+++ b/src/ext/Bal/test/examples/FullFramework2MBA/Program.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.
+namespace Example.FullFramework2MBA
+{
+    using WixToolset.Mba.Core;
+    internal class Program
+    {
+        private static int Main()
+        {
+            var application = new FullFramework2BA();
+            ManagedBootstrapperApplication.Run(application);
+            return 0;
+        }
+    }
+}
diff --git a/src/ext/Bal/test/examples/FullFramework2MBA/WixToolset.Mba.Host.config b/src/ext/Bal/test/examples/FullFramework2MBA/WixToolset.Mba.Host.config
deleted file mode 100644
index 41cacce5..00000000
--- a/src/ext/Bal/test/examples/FullFramework2MBA/WixToolset.Mba.Host.config
+++ /dev/null
@@ -1,20 +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. -->
-<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.6.2"  />
-    </startup>
-    <wix.bootstrapper>
-        <host assemblyName="Example.FullFramework2MBA">
-            <supportedFramework version="v4\Client" />
-        </host>
-    </wix.bootstrapper>
-</configuration>
diff --git a/src/ext/Bal/test/examples/FullFramework4Bundle/Bundle.wxs b/src/ext/Bal/test/examples/FullFramework4Bundle/Bundle.wxs
index 802b8b1e..7cac54f2 100644
--- a/src/ext/Bal/test/examples/FullFramework4Bundle/Bundle.wxs
+++ b/src/ext/Bal/test/examples/FullFramework4Bundle/Bundle.wxs
@@ -1,11 +1,11 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
    <Bundle Name="FullFramework4MBA" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="E08068E0-4FBA-439D-A1C8-4CD1FE27093F">
-        <BootstrapperApplication>
+        <BootstrapperApplication SourceFile="Example.FullFramework4MBA\net472\win-x64\Example.FullFramework4MBA.exe">
-            <Payload SourceFile="Example.FullFramework4MBA\net472\win-x64\Example.FullFramework4MBA.dll" />
+            <!-- <Payload SourceFile="Example.FullFramework4MBA\net472\win-x64\Example.FullFramework4MBA.dll" /> -->
+            <Payload SourceFile="Example.FullFramework4MBA\net472\win-x64\Example.FullFramework4MBA.exe.config" />
            <Payload SourceFile="Example.FullFramework4MBA\net472\win-x64\mbanative.dll" />
            <Payload SourceFile="Example.FullFramework4MBA\net472\win-x64\WixToolset.Mba.Core.dll" />
-            <Payload SourceFile="Example.FullFramework4MBA\net472\win-x64\WixToolset.Mba.Host.config" />
+            <!-- <bal:WixManagedBootstrapperApplicationHost /> -->
-            <bal:WixManagedBootstrapperApplicationHost />
        </BootstrapperApplication>
        <Chain>
            <ExePackage DetectCondition="none" UninstallArguments="-foo" SourceFile="..\.data\notanexe.exe" bal:PrereqPackage="yes" />
diff --git a/src/ext/Bal/test/examples/FullFramework4Bundle/FullFramework4Bundle.wixproj b/src/ext/Bal/test/examples/FullFramework4Bundle/FullFramework4Bundle.wixproj
index ba75a9ff..f36d1910 100644
--- a/src/ext/Bal/test/examples/FullFramework4Bundle/FullFramework4Bundle.wixproj
+++ b/src/ext/Bal/test/examples/FullFramework4Bundle/FullFramework4Bundle.wixproj
@@ -1,2 +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. -->
-<Project Sdk="WixToolset.Sdk" />
+<Project Sdk="WixToolset.Sdk">
+  <ItemGroup>
+    <ProjectReference Include="..\FullFramework4MBA\Example.FullFramework4MBA.csproj" />
+  </ItemGroup>
+</Project>
diff --git a/src/ext/Bal/test/examples/FullFramework4MBA/App.config b/src/ext/Bal/test/examples/FullFramework4MBA/App.config
new file mode 100644
index 00000000..dfb3084c
--- /dev/null
+++ b/src/ext/Bal/test/examples/FullFramework4MBA/App.config
@@ -0,0 +1,7 @@
+<?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>
+    <startup>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
+    </startup>
+</configuration>
diff --git a/src/ext/Bal/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj b/src/ext/Bal/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj
index 247c8173..09665180 100644
--- a/src/ext/Bal/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj
+++ b/src/ext/Bal/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj
@@ -4,15 +4,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <TargetFramework>net472</TargetFramework>
+    <OutputType>WinExe</OutputType>
    <Description>Full Framework v4 MBA</Description>
+    <DebugType>embedded</DebugType>
    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
  </PropertyGroup>
  <ItemGroup>
-    <Content Include="WixToolset.Mba.Host.config" CopyToOutputDirectory="PreserveNewest" />
-  </ItemGroup>
-  <ItemGroup>
    <PackageReference Include="WixToolset.Mba.Core" />
  </ItemGroup>
 </Project>
diff --git a/src/ext/Bal/test/examples/FullFramework4MBA/FullFramework4BA.cs b/src/ext/Bal/test/examples/FullFramework4MBA/FullFramework4BA.cs
index 8ee3bd19..8a91195a 100644
--- a/src/ext/Bal/test/examples/FullFramework4MBA/FullFramework4BA.cs
+++ b/src/ext/Bal/test/examples/FullFramework4MBA/FullFramework4BA.cs
@@ -6,14 +6,9 @@ namespace Example.FullFramework4MBA
    public class FullFramework4BA : BootstrapperApplication
    {
-        public FullFramework4BA(IEngine engine)
-            : base(engine)
-        {
-        }
        protected override void Run()
        {
+            this.engine.Quit(0);
        }
        protected override void OnStartup(StartupEventArgs args)
diff --git a/src/ext/Bal/test/examples/FullFramework4MBA/FullFramework4BAFactory.cs b/src/ext/Bal/test/examples/FullFramework4MBA/FullFramework4BAFactory.cs
deleted file mode 100644
index 6a571a54..00000000
--- a/src/ext/Bal/test/examples/FullFramework4MBA/FullFramework4BAFactory.cs
+++ /dev/null
@@ -1,22 +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.
-[assembly: WixToolset.Mba.Core.BootstrapperApplicationFactory(typeof(Example.FullFramework4MBA.FullFramework4BAFactory))]
-namespace Example.FullFramework4MBA
-{
-    using WixToolset.Mba.Core;
-    public class FullFramework4BAFactory : 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 FullFramework4BA(engine);
-        }
-    }
-}
diff --git a/src/ext/Bal/test/examples/FullFramework4MBA/Program.cs b/src/ext/Bal/test/examples/FullFramework4MBA/Program.cs
new file mode 100644
index 00000000..23fb6851
--- /dev/null
+++ b/src/ext/Bal/test/examples/FullFramework4MBA/Program.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.
+namespace Example.FullFramework4MBA
+{
+    using WixToolset.Mba.Core;
+    internal class Program
+    {
+        private static int Main()
+        {
+            var application = new FullFramework4BA();
+            ManagedBootstrapperApplication.Run(application);
+            return 0;
+        }
+    }
+}
diff --git a/src/ext/Bal/test/examples/FullFramework4MBA/WixToolset.Mba.Host.config b/src/ext/Bal/test/examples/FullFramework4MBA/WixToolset.Mba.Host.config
deleted file mode 100644
index ac4770df..00000000
--- a/src/ext/Bal/test/examples/FullFramework4MBA/WixToolset.Mba.Host.config
+++ /dev/null
@@ -1,17 +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. -->
-<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.6.2" />
-    </startup>
-    <wix.bootstrapper>
-        <host assemblyName="Example.FullFramework4MBA" />
-    </wix.bootstrapper>
-</configuration>
diff --git a/src/ext/Bal/test/examples/LatestCoreBundleFDD/FrameworkDependentBundle.wxs b/src/ext/Bal/test/examples/LatestCoreBundleFDD/FrameworkDependentBundle.wxs
index b29363dd..74f82d99 100644
--- a/src/ext/Bal/test/examples/LatestCoreBundleFDD/FrameworkDependentBundle.wxs
+++ b/src/ext/Bal/test/examples/LatestCoreBundleFDD/FrameworkDependentBundle.wxs
@@ -1,12 +1,12 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
    <Bundle Name="FDDLatestCoreMBA" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="5CE5B5C7-4B6B-4B95-B297-731F1F956533">
-        <BootstrapperApplication>
+        <BootstrapperApplication SourceFile="publish\Example.LatestCoreMBA\fdd\Example.LatestCoreMBA.exe">
            <Payload SourceFile="publish\Example.LatestCoreMBA\fdd\Example.LatestCoreMBA.deps.json" Name="Example.LatestCoreMBA.deps.json" />
-            <Payload SourceFile="publish\Example.LatestCoreMBA\fdd\Example.LatestCoreMBA.dll" Name="Example.LatestCoreMBA.dll" bal:BAFactoryAssembly="yes" />
+            <!-- <Payload SourceFile="publish\Example.LatestCoreMBA\fdd\Example.LatestCoreMBA.dll" Name="Example.LatestCoreMBA.dll" bal:BAFactoryAssembly="yes" /> -->
            <Payload SourceFile="publish\Example.LatestCoreMBA\fdd\Example.LatestCoreMBA.runtimeconfig.json" Name="Example.LatestCoreMBA.runtimeconfig.json" />
            <Payload SourceFile="publish\Example.LatestCoreMBA\fdd\mbanative.dll" Name="mbanative.dll" />
            <Payload SourceFile="publish\Example.LatestCoreMBA\fdd\WixToolset.Mba.Core.dll" Name="WixToolset.Mba.Core.dll" />
-            <bal:WixDotNetCoreBootstrapperApplicationHost />
+            <!-- <bal:WixDotNetCoreBootstrapperApplicationHost /> -->
        </BootstrapperApplication>
        <Chain>
            <ExePackage DetectCondition="none" UninstallArguments="-foo" SourceFile="..\.data\notanexe.exe" bal:PrereqPackage="yes" />
diff --git a/src/ext/Bal/test/examples/LatestCoreBundleFDDx86/FrameworkDependentBundle.wxs b/src/ext/Bal/test/examples/LatestCoreBundleFDDx86/FrameworkDependentBundle.wxs
index 15dd290a..ab40a543 100644
--- a/src/ext/Bal/test/examples/LatestCoreBundleFDDx86/FrameworkDependentBundle.wxs
+++ b/src/ext/Bal/test/examples/LatestCoreBundleFDDx86/FrameworkDependentBundle.wxs
@@ -1,12 +1,12 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
    <Bundle Name="FDDx86LatestCoreMBA" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="{E547C546-5E0E-4BF9-A675-BBEF4C77FF0D}">
-        <BootstrapperApplication>
+        <BootstrapperApplication SourceFile="publish\Example.LatestCoreMBA\fdd-x86\Example.LatestCoreMBA.exe">
            <Payload SourceFile="publish\Example.LatestCoreMBA\fdd-x86\Example.LatestCoreMBA.deps.json" Name="Example.LatestCoreMBA.deps.json" />
-            <Payload SourceFile="publish\Example.LatestCoreMBA\fdd-x86\Example.LatestCoreMBA.dll" Name="Example.LatestCoreMBA.dll" bal:BAFactoryAssembly="yes" />
+            <!-- <Payload SourceFile="publish\Example.LatestCoreMBA\fdd-x86\Example.LatestCoreMBA.dll" Name="Example.LatestCoreMBA.dll" bal:BAFactoryAssembly="yes" /> -->
            <Payload SourceFile="publish\Example.LatestCoreMBA\fdd-x86\Example.LatestCoreMBA.runtimeconfig.json" Name="Example.LatestCoreMBA.runtimeconfig.json" />
            <Payload SourceFile="publish\Example.LatestCoreMBA\fdd-x86\mbanative.dll" Name="mbanative.dll" />
            <Payload SourceFile="publish\Example.LatestCoreMBA\fdd-x86\WixToolset.Mba.Core.dll" Name="WixToolset.Mba.Core.dll" />
-            <bal:WixDotNetCoreBootstrapperApplicationHost />
+            <!-- <bal:WixDotNetCoreBootstrapperApplicationHost /> -->
        </BootstrapperApplication>
        <Chain>
            <ExePackage DetectCondition="none" UninstallArguments="-foo" SourceFile="..\.data\notanexe.exe" bal:PrereqPackage="yes" />
diff --git a/src/ext/Bal/test/examples/LatestCoreBundleSCD/SelfContainedBundle.wxs b/src/ext/Bal/test/examples/LatestCoreBundleSCD/SelfContainedBundle.wxs
index 56edc986..0022b690 100644
--- a/src/ext/Bal/test/examples/LatestCoreBundleSCD/SelfContainedBundle.wxs
+++ b/src/ext/Bal/test/examples/LatestCoreBundleSCD/SelfContainedBundle.wxs
@@ -1,7 +1,7 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
    <Bundle Name="SCDLatestCoreMBA" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="5CE5B5C7-4B6B-4B95-B297-731F1F956533">
-        <BootstrapperApplication>
+        <BootstrapperApplication SourceFile="Example.LatestCoreMBA.exe">
-            <bal:WixDotNetCoreBootstrapperApplicationHost SelfContainedDeployment="yes" />
+            <!-- <bal:WixDotNetCoreBootstrapperApplicationHost SelfContainedDeployment="yes" /> -->
            <PayloadGroupRef Id="publish.Example.LatestCoreMBA.scd" />
        </BootstrapperApplication>
        <Chain>
diff --git a/src/ext/Bal/test/examples/LatestCoreBundleSCD/ba.xslt b/src/ext/Bal/test/examples/LatestCoreBundleSCD/ba.xslt
index acc7474c..f606296e 100644
--- a/src/ext/Bal/test/examples/LatestCoreBundleSCD/ba.xslt
+++ b/src/ext/Bal/test/examples/LatestCoreBundleSCD/ba.xslt
@@ -11,10 +11,5 @@
        </xsl:copy>
    </xsl:template>
-    <xsl:template match="wix:Payload[@SourceFile='SourceDir\Example.LatestCoreMBA.dll']" >
+    <xsl:template match="wix:Payload[@SourceFile='SourceDir\Example.LatestCoreMBA.exe']" />
-        <xsl:copy>
-            <xsl:attribute name="BAFactoryAssembly" namespace="http://wixtoolset.org/schemas/v4/wxs/bal">yes</xsl:attribute>
-            <xsl:apply-templates select="@* | node()"/>
-        </xsl:copy>
-    </xsl:template>
 </xsl:stylesheet>
diff --git a/src/ext/Bal/test/examples/LatestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs b/src/ext/Bal/test/examples/LatestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs
index 7ac9c34a..322a27a3 100644
--- a/src/ext/Bal/test/examples/LatestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs
+++ b/src/ext/Bal/test/examples/LatestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs
@@ -1,7 +1,7 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
    <Bundle Name="TrimmedSCDLatestCoreMBA" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="5CE5B5C7-4B6B-4B95-B297-731F1F956533">
-        <BootstrapperApplication>
+        <BootstrapperApplication SourceFile="Example.LatestCoreMBA.exe">
-            <bal:WixDotNetCoreBootstrapperApplicationHost SelfContainedDeployment="yes" />
+            <!-- <bal:WixDotNetCoreBootstrapperApplicationHost SelfContainedDeployment="yes" /> -->
            <PayloadGroupRef Id="publish.Example.LatestCoreMBA.trimmedscd" />
        </BootstrapperApplication>
        <Chain>
diff --git a/src/ext/Bal/test/examples/LatestCoreBundleTrimmedSCD/ba.xslt b/src/ext/Bal/test/examples/LatestCoreBundleTrimmedSCD/ba.xslt
index acc7474c..f606296e 100644
--- a/src/ext/Bal/test/examples/LatestCoreBundleTrimmedSCD/ba.xslt
+++ b/src/ext/Bal/test/examples/LatestCoreBundleTrimmedSCD/ba.xslt
@@ -11,10 +11,5 @@
        </xsl:copy>
    </xsl:template>
-    <xsl:template match="wix:Payload[@SourceFile='SourceDir\Example.LatestCoreMBA.dll']" >
+    <xsl:template match="wix:Payload[@SourceFile='SourceDir\Example.LatestCoreMBA.exe']" />
-        <xsl:copy>
-            <xsl:attribute name="BAFactoryAssembly" namespace="http://wixtoolset.org/schemas/v4/wxs/bal">yes</xsl:attribute>
-            <xsl:apply-templates select="@* | node()"/>
-        </xsl:copy>
-    </xsl:template>
 </xsl:stylesheet>
diff --git a/src/ext/Bal/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj b/src/ext/Bal/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj
index 236e715c..c4d31151 100644
--- a/src/ext/Bal/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj
+++ b/src/ext/Bal/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj
@@ -3,7 +3,12 @@
  <PropertyGroup>
    <TargetFramework>net6.0</TargetFramework>
    <RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
-    <IsDncBA>true</IsDncBA>
+    <OutputType>WinExe</OutputType>
+    <DebugType>embedded</DebugType>
    <Description>Latest .NET Core MBA</Description>
  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Mba.Core" />
+  </ItemGroup>
 </Project>
diff --git a/src/ext/Bal/test/examples/LatestCoreMBA/LatestCoreBA.cs b/src/ext/Bal/test/examples/LatestCoreMBA/LatestCoreBA.cs
index 50386a87..bd5378eb 100644
--- a/src/ext/Bal/test/examples/LatestCoreMBA/LatestCoreBA.cs
+++ b/src/ext/Bal/test/examples/LatestCoreMBA/LatestCoreBA.cs
@@ -6,13 +6,9 @@ namespace Example.LatestCoreMBA
    public class LatestCoreBA : BootstrapperApplication
    {
-        public LatestCoreBA(IEngine engine)
-            : base(engine)
-        {
-        }
        protected override void Run()
        {
+            this.engine.Quit(0);
        }
        protected override void OnStartup(StartupEventArgs args)
diff --git a/src/ext/Bal/test/examples/LatestCoreMBA/LatestCoreBAFactory.cs b/src/ext/Bal/test/examples/LatestCoreMBA/LatestCoreBAFactory.cs
deleted file mode 100644
index fff3b5c5..00000000
--- a/src/ext/Bal/test/examples/LatestCoreMBA/LatestCoreBAFactory.cs
+++ /dev/null
@@ -1,22 +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.
-[assembly: WixToolset.Mba.Core.BootstrapperApplicationFactory(typeof(Example.LatestCoreMBA.LatestCoreBAFactory))]
-namespace Example.LatestCoreMBA
-{
-    using WixToolset.Mba.Core;
-    public class LatestCoreBAFactory : 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 LatestCoreBA(engine);
-        }
-    }
-}
diff --git a/src/ext/Bal/test/examples/LatestCoreMBA/Program.cs b/src/ext/Bal/test/examples/LatestCoreMBA/Program.cs
new file mode 100644
index 00000000..94da360b
--- /dev/null
+++ b/src/ext/Bal/test/examples/LatestCoreMBA/Program.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.
+namespace Example.LatestCoreMBA
+{
+    using WixToolset.Mba.Core;
+    internal class Program
+    {
+        private static int Main()
+        {
+            var application = new LatestCoreBA();
+            ManagedBootstrapperApplication.Run(application);
+            return 0;
+        }
+    }
+}
diff --git a/src/ext/Bal/test/examples/TestEngine/TestEngine.cpp b/src/ext/Bal/test/examples/TestEngine/TestEngine.cpp
index 5c6ed398..197e3116 100644
--- a/src/ext/Bal/test/examples/TestEngine/TestEngine.cpp
+++ b/src/ext/Bal/test/examples/TestEngine/TestEngine.cpp
@@ -26,16 +26,12 @@ HRESULT TestEngine::LoadBA(
 {
    HRESULT hr = S_OK;
    BOOTSTRAPPER_COMMAND command = { };
-    BOOTSTRAPPER_CREATE_ARGS args = { };
-    PFN_BOOTSTRAPPER_APPLICATION_CREATE pfnCreate = NULL;
-    if (m_pCreateResults || m_hBAModule)
+    if (m_hBAModule)
    {
        ExitFunction1(hr = E_INVALIDSTATE);
    }
-    m_pCreateResults = static_cast<BOOTSTRAPPER_CREATE_RESULTS*>(MemAlloc(sizeof(BOOTSTRAPPER_CREATE_RESULTS), TRUE));
    command.cbSize = sizeof(BOOTSTRAPPER_COMMAND);
    hr = PathGetDirectory(wzBAFilePath, &command.wzBootstrapperWorkingFolder);
@@ -44,14 +40,7 @@ HRESULT TestEngine::LoadBA(
    hr = PathConcat(command.wzBootstrapperWorkingFolder, L"BootstrapperApplicationData.xml", &command.wzBootstrapperApplicationDataPath);
    ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to allocate wzBootstrapperApplicationDataPath");
-    args.cbSize = sizeof(BOOTSTRAPPER_CREATE_ARGS);
+#ifdef TODO_DELETE
-    args.pCommand = &command;
-    args.pfnBootstrapperEngineProc = TestEngine::EngineProc;
-    args.pvBootstrapperEngineProcContext = this;
-    args.qwEngineAPIVersion = MAKEQWORDVERSION(0, 0, 0, 1);
-    m_pCreateResults->cbSize = sizeof(BOOTSTRAPPER_CREATE_RESULTS);
    m_hBAModule = ::LoadLibraryExW(wzBAFilePath, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
    ConsoleExitOnNullWithLastError(m_hBAModule, hr, CONSOLE_COLOR_RED, "Failed to load BA dll.");
@@ -60,6 +49,7 @@ HRESULT TestEngine::LoadBA(
    hr = pfnCreate(&args, m_pCreateResults);
    ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "BA returned failure on BootstrapperApplicationCreate.");
+#endif
 LExit:
    ReleaseStr(command.wzBootstrapperApplicationDataPath);
@@ -117,7 +107,7 @@ HRESULT TestEngine::SendShutdownEvent(
    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);
+    // hr = m_pCreateResults->pfnBootstrapperApplicationProc(BOOTSTRAPPER_APPLICATION_MESSAGE_ONSHUTDOWN, &shutdownArgs, &shutdownResults, m_pCreateResults->pvBootstrapperApplicationProcContext);
    return hr;
 }
@@ -128,7 +118,7 @@ HRESULT TestEngine::SendStartupEvent()
    BA_ONSTARTUP_RESULTS startupResults = { };
    startupArgs.cbSize = sizeof(BA_ONSTARTUP_ARGS);
    startupResults.cbSize = sizeof(BA_ONSTARTUP_RESULTS);
-    hr = m_pCreateResults->pfnBootstrapperApplicationProc(BOOTSTRAPPER_APPLICATION_MESSAGE_ONSTARTUP, &startupArgs, &startupResults, m_pCreateResults->pvBootstrapperApplicationProcContext);
+    // hr = m_pCreateResults->pfnBootstrapperApplicationProc(BOOTSTRAPPER_APPLICATION_MESSAGE_ONSTARTUP, &startupArgs, &startupResults, m_pCreateResults->pvBootstrapperApplicationProcContext);
    return hr;
 }
@@ -151,6 +141,7 @@ void TestEngine::UnloadBA(
    __in BOOL fReload
    )
 {
+#ifdef TODO_DELETE
    PFN_BOOTSTRAPPER_APPLICATION_DESTROY pfnDestroy = NULL;
    BOOTSTRAPPER_DESTROY_ARGS args = { };
    BOOTSTRAPPER_DESTROY_RESULTS results = { };
@@ -178,6 +169,7 @@ void TestEngine::UnloadBA(
        m_hBAModule = NULL;
    }
+#endif
 }
 HRESULT TestEngine::BAEngineLog(
@@ -254,11 +246,9 @@ HRESULT TestEngine::ProcessBAMessage(
 TestEngine::TestEngine()
 {
    m_hBAModule = NULL;
-    m_pCreateResults = NULL;
    m_dwThreadId = ::GetCurrentThreadId();
 }
 TestEngine::~TestEngine()
 {
-    ReleaseMem(m_pCreateResults);
 }
diff --git a/src/ext/Bal/test/examples/TestEngine/TestEngine.h b/src/ext/Bal/test/examples/TestEngine/TestEngine.h
index 248e979a..6c4867b0 100644
--- a/src/ext/Bal/test/examples/TestEngine/TestEngine.h
+++ b/src/ext/Bal/test/examples/TestEngine/TestEngine.h
@@ -77,6 +77,5 @@ public:
 private:
    HMODULE m_hBAModule;
-    BOOTSTRAPPER_CREATE_RESULTS* m_pCreateResults;
    DWORD m_dwThreadId;
 };
diff --git a/src/ext/Bal/test/examples/TestEngine/precomp.h b/src/ext/Bal/test/examples/TestEngine/precomp.h
index f943f420..e9ba3f98 100644
--- a/src/ext/Bal/test/examples/TestEngine/precomp.h
+++ b/src/ext/Bal/test/examples/TestEngine/precomp.h
@@ -11,8 +11,8 @@
 #include "pathutil.h"
 #include "strutil.h"
-#include "BootstrapperEngine.h"
+#include <baenginetypes.h>
-#include "BootstrapperApplication.h"
+#include <batypes.h>
 #include "TestEngine.h"
 #include "ReloadEngine.h"
diff --git a/src/ext/Bal/test/examples/WPFCoreBundleFDD/FrameworkDependentBundle.wxs b/src/ext/Bal/test/examples/WPFCoreBundleFDD/FrameworkDependentBundle.wxs
index 5f054ca4..e95fbba0 100644
--- a/src/ext/Bal/test/examples/WPFCoreBundleFDD/FrameworkDependentBundle.wxs
+++ b/src/ext/Bal/test/examples/WPFCoreBundleFDD/FrameworkDependentBundle.wxs
@@ -1,12 +1,12 @@
 <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">
-        <BootstrapperApplication>
+        <BootstrapperApplication SourceFile="publish\Example.WPFCoreMBA\fdd\Example.WPFCoreMBA.exe">
            <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.dll" Name="Example.WPFCoreMBA.dll" bal:BAFactoryAssembly="yes" /> -->
            <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" />
-            <bal:WixDotNetCoreBootstrapperApplicationHost />
+            <!-- <bal:WixDotNetCoreBootstrapperApplicationHost /> -->
        </BootstrapperApplication>
        <Chain>
            <ExePackage DetectCondition="none" UninstallArguments="-foo" SourceFile="..\.data\notanexe.exe" bal:PrereqPackage="yes" />
diff --git a/src/ext/Bal/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj b/src/ext/Bal/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj
index 338da446..279b498f 100644
--- a/src/ext/Bal/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj
+++ b/src/ext/Bal/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj
@@ -1,10 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
    <TargetFramework>net6.0-windows</TargetFramework>
    <RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
-    <IsDncBA>true</IsDncBA>
    <Description>WPF .NET Core MBA</Description>
    <UseWPF>true</UseWPF>
  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Mba.Core" />
+  </ItemGroup>
 </Project>
diff --git a/src/ext/Bal/test/examples/WPFCoreMBA/Program.cs b/src/ext/Bal/test/examples/WPFCoreMBA/Program.cs
new file mode 100644
index 00000000..185e92cc
--- /dev/null
+++ b/src/ext/Bal/test/examples/WPFCoreMBA/Program.cs
@@ -0,0 +1,19 @@
+// 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 WixToolset.Mba.Core;
+    // using WixToolset.BootstrapperApplications.Managed;
+    public class Program
+    {
+        public static int Main(string[] args)
+        {
+            var app = new WPFCoreBA();
+            ManagedBootstrapperApplication.Run(app);
+            return 0;
+        }
+    }
+}
diff --git a/src/ext/Bal/test/examples/WPFCoreMBA/WPFCoreBA.cs b/src/ext/Bal/test/examples/WPFCoreMBA/WPFCoreBA.cs
index d50be813..7bc06094 100644
--- a/src/ext/Bal/test/examples/WPFCoreMBA/WPFCoreBA.cs
+++ b/src/ext/Bal/test/examples/WPFCoreMBA/WPFCoreBA.cs
@@ -7,11 +7,6 @@ namespace Example.WPFCoreMBA
    public class WPFCoreBA : BootstrapperApplication
    {
-        public WPFCoreBA(IEngine engine)
-            : base(engine)
-        {
-        }
-        
        public Dispatcher BADispatcher { get; private set; }
        protected override void Run()
@@ -21,7 +16,7 @@ namespace Example.WPFCoreMBA
            window.Closed += (s, e) => this.BADispatcher.InvokeShutdown();
            //window.Show();
            //Dispatcher.Run();
-            //this.engine.Quit(0);
+            this.engine.Quit(0);
        }
        protected override void OnStartup(StartupEventArgs args)
diff --git a/src/ext/Bal/test/examples/WPFCoreMBA/WPFCoreBAFactory.cs b/src/ext/Bal/test/examples/WPFCoreMBA/WPFCoreBAFactory.cs
deleted file mode 100644
index a3ccdf9f..00000000
--- a/src/ext/Bal/test/examples/WPFCoreMBA/WPFCoreBAFactory.cs
+++ /dev/null
@@ -1,22 +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.
-[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);
-        }
-    }
-}
diff --git a/src/ext/Bal/test/examples/examples.proj b/src/ext/Bal/test/examples/examples.proj
index 60388a93..c1544766 100644
--- a/src/ext/Bal/test/examples/examples.proj
+++ b/src/ext/Bal/test/examples/examples.proj
@@ -6,8 +6,6 @@
  <PropertyGroup>
    <EarliestCoreMBAProjectPath>EarliestCoreMBA\Example.EarliestCoreMBA.csproj</EarliestCoreMBAProjectPath>
-    <FullFramework2MBAProjectPath>FullFramework2MBA\Example.FullFramework2MBA.csproj</FullFramework2MBAProjectPath>
-    <FullFramework4MBAProjectPath>FullFramework4MBA\Example.FullFramework4MBA.csproj</FullFramework4MBAProjectPath>
    <LatestCoreMBAProjectPath>LatestCoreMBA\Example.LatestCoreMBA.csproj</LatestCoreMBAProjectPath>
    <WPFCoreMBAProjectPath>WPFCoreMBA\Example.WPFCoreMBA.csproj</WPFCoreMBAProjectPath>
    <MBAPublishPath>$(OutputPath)examples\publish\</MBAPublishPath>
@@ -27,9 +25,6 @@
      <SkipFDDx86>true</SkipFDDx86>
      <SkipSCD>true</SkipSCD>
    </CoreMBAProject>
-    <FullMBAProject Include="$(FullFramework2MBAProjectPath)" />
-    <FullMBAProject Include="$(FullFramework4MBAProjectPath)" />
  </ItemGroup>
  <Target Name="PublishCoreExamples" BeforeTargets="Build">
@@ -41,7 +36,7 @@
          Condition="'%(CoreMBAProject.SkipSCD)'==''" />
    <!--
    Publishing a library is "undefined" (per https://github.com/dotnet/runtime/issues/91535)
-    and is now a build error. This will go away when BAs go out of proc, so not spending a 
+    and is now a build error. This will go away when BAs go out of proc, so not spending a
    lot of time to keep building trimmed in VS 17.8.
    -->
    <Exec Command='dotnet publish -o "%(CoreMBAProject.PublishPath)\trimmedscd" -r win-x64 -c $(Configuration) --self-contained true -p:PublishTrimmed=false -p:TrimMode=%(CoreMBAProject.TrimMode) "%(CoreMBAProject.Identity)"'
diff --git a/src/ext/Bal/wixext/BalBurnBackendExtension.cs b/src/ext/Bal/wixext/BalBurnBackendExtension.cs
index 0293b236..84e4323e 100644
--- a/src/ext/Bal/wixext/BalBurnBackendExtension.cs
+++ b/src/ext/Bal/wixext/BalBurnBackendExtension.cs
@@ -18,16 +18,17 @@ namespace WixToolset.Bal
    {
        private static readonly IntermediateSymbolDefinition[] BurnSymbolDefinitions =
        {
+#pragma warning disable 0612 // obsolete
            BalSymbolDefinitions.WixBalBAFactoryAssembly,
+#pragma warning restore 0612
            BalSymbolDefinitions.WixBalBAFunctions,
            BalSymbolDefinitions.WixBalCondition,
            BalSymbolDefinitions.WixBalPackageInfo,
-            BalSymbolDefinitions.WixDncOptions,
+            BalSymbolDefinitions.WixPrereqInformation,
-            BalSymbolDefinitions.WixMbaPrereqInformation,
            BalSymbolDefinitions.WixStdbaCommandLine,
            BalSymbolDefinitions.WixStdbaOptions,
            BalSymbolDefinitions.WixStdbaOverridableVariable,
-            BalSymbolDefinitions.WixMbaPrereqOptions,
+            BalSymbolDefinitions.WixPrereqOptions,
        };
        protected override IReadOnlyCollection<IntermediateSymbolDefinition> SymbolDefinitions => BurnSymbolDefinitions;
@@ -112,59 +113,28 @@ namespace WixToolset.Bal
            }
            var isIuiBA = balBaSymbol.Type == WixBalBootstrapperApplicationType.InternalUi;
+            var isPreqBA = balBaSymbol.Type == WixBalBootstrapperApplicationType.Prerequisite;
            var isStdBA = balBaSymbol.Type == WixBalBootstrapperApplicationType.Standard;
-            var isMBA = balBaSymbol.Type == WixBalBootstrapperApplicationType.ManagedHost;
-            var isDNC = balBaSymbol.Type == WixBalBootstrapperApplicationType.DotNetCoreHost;
-            var isSCD = isDNC && this.VerifySCD(section);
+            if (!isIuiBA && !isPreqBA && !isStdBA)
-            if (!isIuiBA && !isStdBA && !isMBA && !isDNC)
            {
                throw new WixException($"Invalid WixBalBootstrapperApplicationType: '{balBaSymbol.Type}'");
            }
+            this.VerifyBAFunctions(section);
            if (isIuiBA)
            {
                // This needs to happen before VerifyPrereqPackages because it can add prereq packages.
                this.VerifyPrimaryPackages(section, balBaSymbol.SourceLineNumbers);
            }
-            if (isDNC)
+            if (isIuiBA || isPreqBA)
            {
-                this.FinalizeBAFactorySymbol(section, balBaSymbol.SourceLineNumbers);
+                this.VerifyPrereqPackages(section, balBaSymbol.SourceLineNumbers, isIuiBA);
-            }
-            if (isIuiBA || isStdBA || isMBA || isDNC)
-            {
-                this.VerifyBAFunctions(section);
-            }
-            if (isIuiBA || isMBA || (isDNC && !isSCD))
-            {
-                this.VerifyPrereqPackages(section, balBaSymbol.SourceLineNumbers, isDNC, isIuiBA);
            }
        }
-        private void FinalizeBAFactorySymbol(IntermediateSection section, SourceLineNumber baSourceLineNumbers)
-        {
-            var factorySymbol = section.Symbols.OfType<WixBalBAFactoryAssemblySymbol>().SingleOrDefault();
-            if (null == factorySymbol)
-            {
-                this.Messaging.Write(BalErrors.MissingDNCBAFactoryAssembly(baSourceLineNumbers));
-                return;
-            }
-            var factoryPayloadSymbol = section.Symbols.OfType<WixBundlePayloadSymbol>()
-                                                      .Where(p => p.Id.Id == factorySymbol.PayloadId)
-                                                      .SingleOrDefault();
-            if (null == factoryPayloadSymbol)
-            {
-                throw new WixException($"Missing payload symbol with id: 'factorySymbol.PayloadId'");
-            }
-            factorySymbol.FilePath = factoryPayloadSymbol.Name;
-        }
        private void VerifyBAFunctions(IntermediateSection section)
        {
            WixBalBAFunctionsSymbol baFunctionsSymbol = null;
@@ -234,7 +204,7 @@ namespace WixToolset.Bal
            var nonPermanentNonPrimaryPackages = new List<WixBundlePackageSymbol>();
            var balPackageInfoSymbolsByPackageId = section.Symbols.OfType<WixBalPackageInfoSymbol>().ToDictionary(x => x.PackageId);
-            var mbaPrereqInfoSymbolsByPackageId = section.Symbols.OfType<WixMbaPrereqInformationSymbol>().ToDictionary(x => x.PackageId);
+            var mbaPrereqInfoSymbolsByPackageId = section.Symbols.OfType<WixPrereqInformationSymbol>().ToDictionary(x => x.PackageId);
            var msiPackageSymbolsByPackageId = section.Symbols.OfType<WixBundleMsiPackageSymbol>().ToDictionary(x => x.Id.Id);
            var packageSymbols = section.Symbols.OfType<WixBundlePackageSymbol>().ToList();
            foreach (var packageSymbol in packageSymbols)
@@ -263,7 +233,7 @@ namespace WixToolset.Bal
                    {
                        if (!isPrereq)
                        {
-                            var prereqInfoSymbol = section.AddSymbol(new WixMbaPrereqInformationSymbol(packageSymbol.SourceLineNumbers, new Identifier(AccessModifier.Global, packageId))
+                            var prereqInfoSymbol = section.AddSymbol(new WixPrereqInformationSymbol(packageSymbol.SourceLineNumbers, new Identifier(AccessModifier.Global, packageId))
                            {
                                PackageId = packageId,
                            });
@@ -476,13 +446,12 @@ namespace WixToolset.Bal
            }
        }
-        private void VerifyPrereqPackages(IntermediateSection section, SourceLineNumber baSourceLineNumbers, bool isDNC, bool isIuiBA)
+        private void VerifyPrereqPackages(IntermediateSection section, SourceLineNumber baSourceLineNumbers, bool isIuiBA)
        {
-            var prereqInfoSymbols = section.Symbols.OfType<WixMbaPrereqInformationSymbol>().ToList();
+            var prereqInfoSymbols = section.Symbols.OfType<WixPrereqInformationSymbol>().ToList();
            if (!isIuiBA && prereqInfoSymbols.Count == 0)
            {
-                var message = isDNC ? BalErrors.MissingDNCPrereq(baSourceLineNumbers) : BalErrors.MissingMBAPrereq(baSourceLineNumbers);
+                this.Messaging.Write(BalErrors.MissingPrereq(baSourceLineNumbers));
-                this.Messaging.Write(message);
                return;
            }
@@ -514,18 +483,5 @@ namespace WixToolset.Bal
                }
            }
        }
-        private bool VerifySCD(IntermediateSection section)
-        {
-            var isSCD = false;
-            var dncOptions = section.Symbols.OfType<WixDncOptionsSymbol>().SingleOrDefault();
-            if (dncOptions != null)
-            {
-                isSCD = dncOptions.SelfContainedDeployment != 0;
-            }
-            return isSCD;
-        }
    }
 }
diff --git a/src/ext/Bal/wixext/BalCompiler.cs b/src/ext/Bal/wixext/BalCompiler.cs
index 72883bdf..829da0e6 100644
--- a/src/ext/Bal/wixext/BalCompiler.cs
+++ b/src/ext/Bal/wixext/BalCompiler.cs
@@ -7,6 +7,7 @@ namespace WixToolset.Bal
    using System.Xml.Linq;
    using WixToolset.Bal.Symbols;
    using WixToolset.Data;
+    using WixToolset.Data.Burn;
    using WixToolset.Data.Symbols;
    using WixToolset.Extensibility;
    using WixToolset.Extensibility.Data;
@@ -17,16 +18,9 @@ namespace WixToolset.Bal
    public sealed class BalCompiler : BaseCompilerExtension
    {
        private readonly Dictionary<string, WixBalPackageInfoSymbol> packageInfoSymbolsByPackageId = new Dictionary<string, WixBalPackageInfoSymbol>();
-        private readonly Dictionary<string, WixMbaPrereqInformationSymbol> prereqInfoSymbolsByPackageId = new Dictionary<string, WixMbaPrereqInformationSymbol>();
+        private readonly Dictionary<string, WixPrereqInformationSymbol> prereqInfoSymbolsByPackageId = new Dictionary<string, WixPrereqInformationSymbol>();
-        private enum WixDotNetCoreBootstrapperApplicationHostTheme
+        private enum WixPrerequisiteBootstrapperApplicationTheme
-        {
-            Unknown,
-            None,
-            Standard,
-        }
-        private enum WixManagedBootstrapperApplicationHostTheme
        {
            Unknown,
            None,
@@ -63,17 +57,35 @@ namespace WixToolset.Bal
        /// <param name="context">Extra information about the context in which this element is being parsed.</param>
        public override void ParseElement(Intermediate intermediate, IntermediateSection section, XElement parentElement, XElement element, IDictionary<string, string> context)
        {
+            this.ParsePossibleKeyPathElement(intermediate, section, parentElement, element, context);
+        }
+        /// <summary>
+        /// Processes an element for the Compiler.
+        /// </summary>
+        /// <param name="sourceLineNumbers">Source line number for the parent element.</param>
+        /// <param name="parentElement">Parent element of element to process.</param>
+        /// <param name="element">Element to process.</param>
+        /// <param name="contextValues">Extra information about the context in which this element is being parsed.</param>
+        public override IComponentKeyPath ParsePossibleKeyPathElement(Intermediate intermediate, IntermediateSection section, XElement parentElement, XElement element, IDictionary<string, string> context)
+        {
+            IComponentKeyPath exePayloadRef = null;
            switch (parentElement.Name.LocalName)
            {
                case "Bundle":
                case "Fragment":
                    switch (element.Name.LocalName)
                    {
+                        case "BootstrapperApplicationPrerequisiteInformation":
+                            this.ParseBootstrapperApplicationPrerequisiteInformationElement(intermediate, section, element);
+                            break;
                        case "Condition":
                            this.ParseConditionElement(intermediate, section, element);
                            break;
                        case "ManagedBootstrapperApplicationPrereqInformation":
-                            this.ParseMbaPrereqInfoElement(intermediate, section, element);
+                            this.Messaging.Write(WarningMessages.DeprecatedElement(this.ParseHelper.GetSourceLineNumbers(element), element.Name.LocalName, "BootstrapperApplicationPrerequisiteInformation"));
+                            this.ParseBootstrapperApplicationPrerequisiteInformationElement(intermediate, section, element);
                            break;
                        default:
                            this.ParseHelper.UnexpectedElement(parentElement, element);
@@ -84,16 +96,19 @@ namespace WixToolset.Bal
                    switch (element.Name.LocalName)
                    {
                        case "WixInternalUIBootstrapperApplication":
-                            this.ParseWixInternalUIBootstrapperApplicationElement(intermediate, section, element);
+                            exePayloadRef = this.ParseWixInternalUIBootstrapperApplicationElement(intermediate, section, element);
+                            break;
+                        case "WixPrerequisiteBootstrapperApplication":
+                            this.ParseWixPrerequisiteBootstrapperApplicationElement(intermediate, section, element, context);
                            break;
                        case "WixStandardBootstrapperApplication":
-                            this.ParseWixStandardBootstrapperApplicationElement(intermediate, section, element);
+                            exePayloadRef = this.ParseWixStandardBootstrapperApplicationElement(intermediate, section, element);
                            break;
                        case "WixManagedBootstrapperApplicationHost":
-                            this.ParseWixManagedBootstrapperApplicationHostElement(intermediate, section, element);
+                            this.Messaging.Write(WarningMessages.DeprecatedElement(this.ParseHelper.GetSourceLineNumbers(element), element.Name.LocalName));
                            break;
                        case "WixDotNetCoreBootstrapperApplicationHost":
-                            this.ParseWixDotNetCoreBootstrapperApplicationHostElement(intermediate, section, element);
+                            this.Messaging.Write(WarningMessages.DeprecatedElement(this.ParseHelper.GetSourceLineNumbers(element), element.Name.LocalName));
                            break;
                        default:
                            this.ParseHelper.UnexpectedElement(parentElement, element);
@@ -104,6 +119,8 @@ namespace WixToolset.Bal
                    this.ParseHelper.UnexpectedElement(parentElement, element);
                    break;
            }
+            return exePayloadRef;
        }
        /// <summary>
@@ -282,15 +299,7 @@ namespace WixToolset.Bal
                        switch (attribute.Name.LocalName)
                        {
                            case "BAFactoryAssembly":
-                                if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attribute))
+                                this.Messaging.Write(BalWarnings.DeprecatedBAFactoryAssemblyAttribute(this.ParseHelper.GetSourceLineNumbers(parentElement), parentElement.Name.LocalName, attribute.Name.LocalName));
-                                {
-                                    // There can only be one.
-                                    var id = new Identifier(AccessModifier.Global, "TheBAFactoryAssembly");
-                                    section.AddSymbol(new WixBalBAFactoryAssemblySymbol(sourceLineNumbers, id)
-                                    {
-                                        PayloadId = payloadId,
-                                    });
-                                }
                                break;
                            case "BAFunctions":
                                if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attribute))
@@ -352,15 +361,15 @@ namespace WixToolset.Bal
            return packageInfo;
        }
-        private WixMbaPrereqInformationSymbol GetMbaPrereqInformationSymbol(IntermediateSection section, SourceLineNumber sourceLineNumbers, XAttribute prereqAttribute, string packageId)
+        private WixPrereqInformationSymbol GetMbaPrereqInformationSymbol(IntermediateSection section, SourceLineNumber sourceLineNumbers, XAttribute prereqAttribute, string packageId)
        {
-            WixMbaPrereqInformationSymbol prereqInfo = null;
+            WixPrereqInformationSymbol prereqInfo = null;
            if (prereqAttribute != null && YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, prereqAttribute))
            {
                if (!this.prereqInfoSymbolsByPackageId.TryGetValue(packageId, out prereqInfo))
                {
-                    prereqInfo = section.AddSymbol(new WixMbaPrereqInformationSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, packageId))
+                    prereqInfo = section.AddSymbol(new WixPrereqInformationSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, packageId))
                    {
                        PackageId = packageId,
                    });
@@ -432,7 +441,7 @@ namespace WixToolset.Bal
        /// Parses a Condition element for Bundles.
        /// </summary>
        /// <param name="node">The element to parse.</param>
-        private void ParseMbaPrereqInfoElement(Intermediate intermediate, IntermediateSection section, XElement node)
+        private void ParseBootstrapperApplicationPrerequisiteInformationElement(Intermediate intermediate, IntermediateSection section, XElement node)
        {
            var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(node);
            string packageId = null;
@@ -480,7 +489,7 @@ namespace WixToolset.Bal
            if (!this.Messaging.EncounteredError)
            {
-                section.AddSymbol(new WixMbaPrereqInformationSymbol(sourceLineNumbers)
+                section.AddSymbol(new WixPrereqInformationSymbol(sourceLineNumbers)
                {
                    PackageId = packageId,
                    LicenseFile = licenseFile,
@@ -490,14 +499,16 @@ namespace WixToolset.Bal
            }
        }
-        private void ParseWixInternalUIBootstrapperApplicationElement(Intermediate intermediate, IntermediateSection section, XElement node)
+        private IComponentKeyPath ParseWixInternalUIBootstrapperApplicationElement(Intermediate intermediate, IntermediateSection section, XElement node)
        {
            var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(node);
-            WixInternalUIBootstrapperApplicationTheme? theme = null;
+            var theme = WixInternalUIBootstrapperApplicationTheme.Standard;
            string themeFile = null;
            string logoFile = null;
            string localizationFile = null;
+            IComponentKeyPath exePayloadRef = null;
            foreach (var attrib in node.Attributes())
            {
                if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace)
@@ -542,11 +553,6 @@ namespace WixToolset.Bal
            this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, node);
-            if (!theme.HasValue)
-            {
-                theme = WixInternalUIBootstrapperApplicationTheme.Standard;
-            }
            if (!this.Messaging.EncounteredError)
            {
                if (!String.IsNullOrEmpty(logoFile))
@@ -573,23 +579,41 @@ namespace WixToolset.Bal
                    });
                }
-                var baId = "WixInternalUIBootstrapperApplication";
                switch (theme)
                {
                    case WixInternalUIBootstrapperApplicationTheme.Standard:
-                        baId = "WixInternalUIBootstrapperApplication.Standard";
+                        this.CreatePayloadGroupRef(section, sourceLineNumbers, node, "WixIuibaStandardPayloads", platformSpecific: false);
                        break;
                }
-                this.CreateBARef(section, sourceLineNumbers, node, baId, WixBalBootstrapperApplicationType.InternalUi);
+                section.AddSymbol(new WixBalBootstrapperApplicationSymbol(sourceLineNumbers)
+                {
+                    Type = WixBalBootstrapperApplicationType.InternalUi,
+                });
+                section.AddSymbol(new WixPrereqOptionsSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "WixPrereqOptions"))
+                {
+                    Primary = 1,
+                    HandleHelp = 1,
+                    HandleLayout = 1,
+                });
+                var exePayloadId = this.CreatePayloadGroupRef(section, sourceLineNumbers, node, "WixInternalUIBootstrapperApplication", platformSpecific: true);
+                exePayloadRef = this.CreateComponentKeyPath();
+                exePayloadRef.Id = new Identifier(AccessModifier.Section, exePayloadId);
+                exePayloadRef.Explicit = true; // Internal UI BA is always secondary because the PrereqBA is always primary to handle the help and layout options.
+                exePayloadRef.Type = PossibleKeyPathType.File;
            }
+            return exePayloadRef;
        }
        /// <summary>
        /// Parses a WixStandardBootstrapperApplication element for Bundles.
        /// </summary>
        /// <param name="node">The element to parse.</param>
-        private void ParseWixStandardBootstrapperApplicationElement(Intermediate intermediate, IntermediateSection section, XElement node)
+        private IComponentKeyPath ParseWixStandardBootstrapperApplicationElement(Intermediate intermediate, IntermediateSection section, XElement node)
        {
            var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(node);
            string launchTarget = null;
@@ -610,6 +634,8 @@ namespace WixToolset.Bal
            var showVersion = YesNoType.NotSet;
            var supportCacheOnly = YesNoType.NotSet;
+            IComponentKeyPath exePayloadRef = null;
            foreach (var attrib in node.Attributes())
            {
                if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace)
@@ -840,35 +866,159 @@ namespace WixToolset.Bal
                    }
                }
-                var baId = "WixStandardBootstrapperApplication";
                switch (theme)
                {
                    case WixStandardBootstrapperApplicationTheme.HyperlinkLargeLicense:
-                        baId = "WixStandardBootstrapperApplication.HyperlinkLargeLicense";
+                        this.CreatePayloadGroupRef(section, sourceLineNumbers, node, "WixStdbaHyperlinkLargeLicensePayloads", platformSpecific: false);
                        break;
                    case WixStandardBootstrapperApplicationTheme.HyperlinkLicense:
-                        baId = "WixStandardBootstrapperApplication.HyperlinkLicense";
+                        this.CreatePayloadGroupRef(section, sourceLineNumbers, node, "WixStdbaHyperlinkLicensePayloads", platformSpecific: false);
                        break;
                    case WixStandardBootstrapperApplicationTheme.HyperlinkSidebarLicense:
-                        baId = "WixStandardBootstrapperApplication.HyperlinkSidebarLicense";
+                        this.CreatePayloadGroupRef(section, sourceLineNumbers, node, "WixStdbaHyperlinkSidebarLicensePayloads", platformSpecific: false);
                        break;
                    case WixStandardBootstrapperApplicationTheme.RtfLargeLicense:
-                        baId = "WixStandardBootstrapperApplication.RtfLargeLicense";
+                        this.CreatePayloadGroupRef(section, sourceLineNumbers, node, "WixStdbaRtfLargeLicensePayloads", platformSpecific: false);
                        break;
                    case WixStandardBootstrapperApplicationTheme.RtfLicense:
-                        baId = "WixStandardBootstrapperApplication.RtfLicense";
+                        this.CreatePayloadGroupRef(section, sourceLineNumbers, node, "WixStdbaRtfLicensePayloads", platformSpecific: false);
+                        break;
+                }
+                section.AddSymbol(new WixBalBootstrapperApplicationSymbol(sourceLineNumbers)
+                {
+                    Type = WixBalBootstrapperApplicationType.Standard,
+                });
+                var exePayloadId = this.CreatePayloadGroupRef(section, sourceLineNumbers, node, "WixStandardBootstrapperApplication", platformSpecific: true);
+                exePayloadRef = this.CreateComponentKeyPath();
+                exePayloadRef.Id = new Identifier(AccessModifier.Section, exePayloadId);
+                exePayloadRef.Type = PossibleKeyPathType.File;
+            }
+            return exePayloadRef;
+        }
+        /// <summary>
+        /// Parses a WixManagedBootstrapperApplicationHost element for Bundles.
+        /// </summary>
+        /// <param name="node">The element to parse.</param>
+        private void ParseWixPrerequisiteBootstrapperApplicationElement(Intermediate intermediate, IntermediateSection section, XElement node, IDictionary<string, string> context)
+        {
+            var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(node);
+            string logoFile = null;
+            string themeFile = null;
+            string localizationFile = null;
+            var theme = WixPrerequisiteBootstrapperApplicationTheme.Standard;
+            foreach (var attrib in node.Attributes())
+            {
+                if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace)
+                {
+                    switch (attrib.Name.LocalName)
+                    {
+                        case "LogoFile":
+                            logoFile = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        case "ThemeFile":
+                            themeFile = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        case "LocalizationFile":
+                            localizationFile = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        case "Theme":
+                            var themeValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            switch (themeValue)
+                            {
+                                case "none":
+                                    theme = WixPrerequisiteBootstrapperApplicationTheme.None;
+                                    break;
+                                case "standard":
+                                    theme = WixPrerequisiteBootstrapperApplicationTheme.Standard;
+                                    break;
+                                default:
+                                    this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, node.Name.LocalName, "Theme", themeValue, "none", "standard"));
+                                    theme = WixPrerequisiteBootstrapperApplicationTheme.Unknown;
+                                    break;
+                            }
+                            break;
+                        default:
+                            this.ParseHelper.UnexpectedAttribute(node, attrib);
+                            break;
+                    }
+                }
+                else
+                {
+                    this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, node, attrib);
+                }
+            }
+            this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, node);
+            if (!this.Messaging.EncounteredError)
+            {
+                if (!String.IsNullOrEmpty(logoFile))
+                {
+                    section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "WixPreqbaLogo"))
+                    {
+                        Value = logoFile,
+                    });
+                }
+                if (!String.IsNullOrEmpty(themeFile))
+                {
+                    section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "WixPreqbaThemeXml"))
+                    {
+                        Value = themeFile,
+                    });
+                }
+                if (!String.IsNullOrEmpty(localizationFile))
+                {
+                    section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "WixPreqbaThemeWxl"))
+                    {
+                        Value = localizationFile,
+                    });
+                }
+                switch (theme)
+                {
+                    case WixPrerequisiteBootstrapperApplicationTheme.Standard:
+                        this.CreatePayloadGroupRef(section, sourceLineNumbers, node, "WixPreqbaStandardPayloads", platformSpecific: false);
                        break;
                }
-                this.CreateBARef(section, sourceLineNumbers, node, baId, WixBalBootstrapperApplicationType.Standard);
+                section.AddSymbol(new WixBalBootstrapperApplicationSymbol(sourceLineNumbers)
+                {
+                    Type = WixBalBootstrapperApplicationType.Prerequisite,
+                });
+                var primary = context.TryGetValue("Secondary", out var parentSecondaryValue) && "True".Equals(parentSecondaryValue, StringComparison.OrdinalIgnoreCase) ? true : false;
+                var baId = this.CreateIdentifierFromPlatform(sourceLineNumbers, node, primary ? "WixPrereqBootstrapperApplication.Primary" : "WixPrereqBootstrapperApplication.Secondary");
+                if (!String.IsNullOrEmpty(baId))
+                {
+                    this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.WixBootstrapperApplication, baId);
+                }
+                if (primary)
+                {
+                    section.AddSymbol(new WixPrereqOptionsSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "WixPrereqOptions"))
+                    {
+                        Primary = 1
+                    });
+                }
            }
        }
+#if DELETE
        /// <summary>
        /// Parses a WixManagedBootstrapperApplicationHost element for Bundles.
        /// </summary>
        /// <param name="node">The element to parse.</param>
-        private void ParseWixManagedBootstrapperApplicationHostElement(Intermediate intermediate, IntermediateSection section, XElement node)
+        private IComponentKeyPath ParseWixManagedBootstrapperApplicationHostElement(Intermediate intermediate, IntermediateSection section, XElement node)
        {
            var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(node);
            bool alwaysInstallPrereqs = false;
@@ -877,6 +1027,8 @@ namespace WixToolset.Bal
            string localizationFile = null;
            WixManagedBootstrapperApplicationHostTheme? theme = null;
+            IComponentKeyPath exePayloadRef = null;
            foreach (var attrib in node.Attributes())
            {
                if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace)
@@ -963,23 +1115,25 @@ namespace WixToolset.Bal
                        break;
                }
-                this.CreateBARef(section, sourceLineNumbers, node, baId, WixBalBootstrapperApplicationType.ManagedHost);
+                exePayloadRef = this.CreatePayloadGroupRef(section, sourceLineNumbers, node, "WixManagedBootstrapperApplicationHost", baId, WixBalBootstrapperApplicationType.ManagedHost);
                if (alwaysInstallPrereqs)
                {
-                    section.AddSymbol(new WixMbaPrereqOptionsSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "WixMbaPrereqOptions"))
+                    section.AddSymbol(new WixPrereqOptionsSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "WixPrereqOptions"))
                    {
                        AlwaysInstallPrereqs = 1,
                    });
                }
            }
+            return exePayloadRef;
        }
        /// <summary>
        /// Parses a WixDotNetCoreBootstrapperApplication element for Bundles.
        /// </summary>
        /// <param name="node">The element to parse.</param>
-        private void ParseWixDotNetCoreBootstrapperApplicationHostElement(Intermediate intermediate, IntermediateSection section, XElement node)
+        private IComponentKeyPath ParseWixDotNetCoreBootstrapperApplicationHostElement(Intermediate intermediate, IntermediateSection section, XElement node)
        {
            var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(node);
            bool alwaysInstallPrereqs = false;
@@ -989,6 +1143,8 @@ namespace WixToolset.Bal
            var selfContainedDeployment = YesNoType.NotSet;
            WixDotNetCoreBootstrapperApplicationHostTheme? theme = null;
+            IComponentKeyPath exePayloadRef = null;
            foreach (var attrib in node.Attributes())
            {
                if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace)
@@ -1086,19 +1242,36 @@ namespace WixToolset.Bal
                        break;
                }
-                this.CreateBARef(section, sourceLineNumbers, node, baId, WixBalBootstrapperApplicationType.DotNetCoreHost);
+                exePayloadRef = this.CreatePayloadGroupRef(section, sourceLineNumbers, node, "WixDotNetCoreBootstrapperApplicationHost", baId, WixBalBootstrapperApplicationType.DotNetCoreHost);
                if (alwaysInstallPrereqs)
                {
-                    section.AddSymbol(new WixMbaPrereqOptionsSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "WixMbaPrereqOptions"))
+                    section.AddSymbol(new WixPrereqOptionsSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "WixPrereqOptions"))
                    {
                        AlwaysInstallPrereqs = 1,
                    });
                }
            }
+            return exePayloadRef;
+        }
+#endif
+        private string CreatePayloadGroupRef(IntermediateSection section, SourceLineNumber sourceLineNumbers, XElement node, string basePayloadGroupId, bool platformSpecific)
+        {
+            var id = platformSpecific ? this.CreateIdentifierFromPlatform(sourceLineNumbers, node, basePayloadGroupId) : basePayloadGroupId;
+            if (!String.IsNullOrEmpty(id))
+            {
+                this.ParseHelper.CreateWixGroupSymbol(section, sourceLineNumbers, ComplexReferenceParentType.Container, BurnConstants.BurnUXContainerName, ComplexReferenceChildType.PayloadGroup, id);
+                this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.WixBundlePayloadGroup, id);
+            }
+            return id;
        }
-        private void CreateBARef(IntermediateSection section, SourceLineNumber sourceLineNumbers, XElement node, string name, WixBalBootstrapperApplicationType baType)
+        private string CreateIdentifierFromPlatform(SourceLineNumber sourceLineNumbers, XElement node, string name)
        {
            var id = this.ParseHelper.CreateIdentifierValueFromPlatform(name, this.Context.Platform, BurnPlatforms.X86 | BurnPlatforms.X64 | BurnPlatforms.ARM64);
            if (id == null)
@@ -1106,15 +1279,7 @@ namespace WixToolset.Bal
                this.Messaging.Write(ErrorMessages.UnsupportedPlatformForElement(sourceLineNumbers, this.Context.Platform.ToString(), node.Name.LocalName));
            }
-            if (!this.Messaging.EncounteredError)
+            return id;
-            {
-                this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.WixBootstrapperApplication, id);
-                section.AddSymbol(new WixBalBootstrapperApplicationSymbol(sourceLineNumbers)
-                {
-                    Type = baType,
-                });
-            }
        }
    }
 }
diff --git a/src/ext/Bal/wixext/BalErrors.cs b/src/ext/Bal/wixext/BalErrors.cs
index 7fbccecb..10986f0e 100644
--- a/src/ext/Bal/wixext/BalErrors.cs
+++ b/src/ext/Bal/wixext/BalErrors.cs
@@ -48,9 +48,9 @@ namespace WixToolset.Bal
            return Message(sourceLineNumbers, Ids.MissingDNCBAFactoryAssembly, "When using DotNetCoreBootstrapperApplicationHost, the Payload element for the BA's entry point DLL must have bal:BAFactoryAssembly=\"yes\".");
        }
-        public static Message MissingDNCPrereq(SourceLineNumber sourceLineNumbers)
+        public static Message MissingPrereq(SourceLineNumber sourceLineNumbers)
        {
-            return Message(sourceLineNumbers, Ids.MissingDNCPrereq, "There must be at least one package with bal:PrereqPackage=\"yes\" when using the DotNetCoreBootstrapperApplicationHost with SelfContainedDeployment set to \"no\".");
+            return Message(sourceLineNumbers, Ids.MissingPrereq, "There must be at least one package with bal:PrereqPackage=\"yes\" when using the bal:WixPrerequisiteBootstrapperApplication.");
        }
        public static Message MissingIUIPrimaryPackage(SourceLineNumber sourceLineNumbers)
@@ -58,11 +58,6 @@ namespace WixToolset.Bal
            return Message(sourceLineNumbers, Ids.MissingIUIPrimaryPackage, "When using WixInternalUIBootstrapperApplication, there must be one package with bal:PrimaryPackageType=\"default\".");
        }
-        public static Message MissingMBAPrereq(SourceLineNumber sourceLineNumbers)
-        {
-            return Message(sourceLineNumbers, Ids.MissingMBAPrereq, "There must be at least one package with bal:PrereqPackage=\"yes\" when using the ManagedBootstrapperApplicationHost.\nThis is typically done by using the WixNetFxExtension and referencing one of the NetFxAsPrereq package groups.");
-        }
        public static Message MultipleBAFunctions(SourceLineNumber sourceLineNumbers)
        {
            return Message(sourceLineNumbers, Ids.MultipleBAFunctions, "WixStandardBootstrapperApplication doesn't support multiple BAFunctions DLLs.");
@@ -106,11 +101,10 @@ namespace WixToolset.Bal
        public enum Ids
        {
            AttributeRequiresPrereqPackage = 6801,
-            MissingMBAPrereq = 6802,
+            MissingPrereq = 6802,
            MultiplePrereqLicenses = 6803,
            MultipleBAFunctions = 6804,
            BAFunctionsPayloadRequiredInUXContainer = 6805,
-            MissingDNCPrereq = 6806,
            MissingIUIPrimaryPackage = 6808,
            MultiplePrimaryPackageType = 6809,
            MultiplePrimaryPackageType2 = 6810,
diff --git a/src/ext/Bal/wixext/BalWarnings.cs b/src/ext/Bal/wixext/BalWarnings.cs
index 96e7a523..73a19d07 100644
--- a/src/ext/Bal/wixext/BalWarnings.cs
+++ b/src/ext/Bal/wixext/BalWarnings.cs
@@ -33,6 +33,11 @@ namespace WixToolset.Bal
            return Message(sourceLineNumbers, Ids.UnmarkedBAFunctionsDLL, "WixStandardBootstrapperApplication doesn't automatically load BAFunctions.dll. Use the bal:BAFunctions attribute to indicate that it should be loaded.");
        }
+        public static Message DeprecatedBAFactoryAssemblyAttribute(SourceLineNumber sourceLineNumbers, string elementName, string attributeName)
+        {
+            return Message(sourceLineNumbers, Ids.DeprecatedBAFactoryAssemblyAttribute, "The {0}/@{1} attribute has been deprecated. Move the Payload/@SourceFile attribute to be the BootstrapperApplication/@SourceFile attribute and remove the Payload element.", elementName, attributeName);
+        }
        private static Message Message(SourceLineNumber sourceLineNumber, Ids id, string format, params object[] args)
        {
            return new Message(sourceLineNumber, MessageLevel.Warning, (int)id, format, args);
@@ -50,6 +55,7 @@ namespace WixToolset.Bal
            IuibaPrimaryPackageInstallCondition = 6503,
            IuibaPrimaryPackageDisplayInternalUICondition = 6504,
            IuibaPrereqPackageAfterPrimaryPackage = 6505,
+            DeprecatedBAFactoryAssemblyAttribute = 6506,
        }
    }
 }
diff --git a/src/ext/Bal/wixext/Symbols/BalSymbolDefinitions.cs b/src/ext/Bal/wixext/Symbols/BalSymbolDefinitions.cs
index 5229f278..5e9fb936 100644
--- a/src/ext/Bal/wixext/Symbols/BalSymbolDefinitions.cs
+++ b/src/ext/Bal/wixext/Symbols/BalSymbolDefinitions.cs
@@ -13,11 +13,11 @@ namespace WixToolset.Bal
        WixBalCondition,
        WixBalPackageInfo,
        WixDncOptions,
-        WixMbaPrereqInformation,
+        WixPrereqInformation,
        WixStdbaCommandLine,
        WixStdbaOptions,
        WixStdbaOverridableVariable,
-        WixMbaPrereqOptions,
+        WixPrereqOptions,
        WixBalBootstrapperApplication,
    }
@@ -37,8 +37,10 @@ namespace WixToolset.Bal
        {
            switch (type)
            {
+#pragma warning disable 0612 // obsolete
                case BalSymbolDefinitionType.WixBalBAFactoryAssembly:
                    return BalSymbolDefinitions.WixBalBAFactoryAssembly;
+#pragma warning restore 0612
                case BalSymbolDefinitionType.WixBalBAFunctions:
                    return BalSymbolDefinitions.WixBalBAFunctions;
@@ -49,11 +51,8 @@ namespace WixToolset.Bal
                case BalSymbolDefinitionType.WixBalPackageInfo:
                    return BalSymbolDefinitions.WixBalPackageInfo;
-                case BalSymbolDefinitionType.WixDncOptions:
+                case BalSymbolDefinitionType.WixPrereqInformation:
-                    return BalSymbolDefinitions.WixDncOptions;
+                    return BalSymbolDefinitions.WixPrereqInformation;
-                case BalSymbolDefinitionType.WixMbaPrereqInformation:
-                    return BalSymbolDefinitions.WixMbaPrereqInformation;
                case BalSymbolDefinitionType.WixStdbaCommandLine:
                    return BalSymbolDefinitions.WixStdbaCommandLine;
@@ -64,8 +63,8 @@ namespace WixToolset.Bal
                case BalSymbolDefinitionType.WixStdbaOverridableVariable:
                    return BalSymbolDefinitions.WixStdbaOverridableVariable;
-                case BalSymbolDefinitionType.WixMbaPrereqOptions:
+                case BalSymbolDefinitionType.WixPrereqOptions:
-                    return BalSymbolDefinitions.WixMbaPrereqOptions;
+                    return BalSymbolDefinitions.WixPrereqOptions;
                case BalSymbolDefinitionType.WixBalBootstrapperApplication:
                    return BalSymbolDefinitions.WixBalBootstrapperApplication;
@@ -77,16 +76,17 @@ namespace WixToolset.Bal
        static BalSymbolDefinitions()
        {
+#pragma warning disable 0612 // obsolete
            WixBalBAFactoryAssembly.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag);
+#pragma warning restore 0612
            WixBalBAFunctions.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag);
            WixBalCondition.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag);
            WixBalPackageInfo.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag);
-            WixDncOptions.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag);
+            WixPrereqInformation.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag);
-            WixMbaPrereqInformation.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag);
            WixStdbaCommandLine.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag);
            WixStdbaOptions.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag);
            WixStdbaOverridableVariable.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag);
-            WixMbaPrereqOptions.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag);
+            WixPrereqOptions.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag);
        }
    }
 }
diff --git a/src/ext/Bal/wixext/Symbols/WixBalBAFactoryAssemblySymbol.cs b/src/ext/Bal/wixext/Symbols/WixBalBAFactoryAssemblySymbol.cs
index 52042e4c..3ce535a3 100644
--- a/src/ext/Bal/wixext/Symbols/WixBalBAFactoryAssemblySymbol.cs
+++ b/src/ext/Bal/wixext/Symbols/WixBalBAFactoryAssemblySymbol.cs
@@ -2,11 +2,13 @@
 namespace WixToolset.Bal
 {
+    using System;
    using WixToolset.Data;
    using WixToolset.Bal.Symbols;
    public static partial class BalSymbolDefinitions
    {
+        [Obsolete]
        public static readonly IntermediateSymbolDefinition WixBalBAFactoryAssembly = new IntermediateSymbolDefinition(
            BalSymbolDefinitionType.WixBalBAFactoryAssembly.ToString(),
            new[]
@@ -20,14 +22,17 @@ namespace WixToolset.Bal
 namespace WixToolset.Bal.Symbols
 {
+    using System;
    using WixToolset.Data;
+    [Obsolete]
    public enum WixBalBAFactorySymbolFields
    {
        PayloadId,
        FilePath,
    }
+    [Obsolete]
    public class WixBalBAFactoryAssemblySymbol : IntermediateSymbol
    {
        public WixBalBAFactoryAssemblySymbol() : base(BalSymbolDefinitions.WixBalBAFactoryAssembly, null, null)
@@ -52,4 +57,4 @@ namespace WixToolset.Bal.Symbols
            set => this.Set((int)WixBalBAFactorySymbolFields.FilePath, value);
        }
    }
-}
-\ No newline at end of file
+}
diff --git a/src/ext/Bal/wixext/Symbols/WixBalBootstrapperApplicationSymbol.cs b/src/ext/Bal/wixext/Symbols/WixBalBootstrapperApplicationSymbol.cs
index 7096930d..47e930c2 100644
--- a/src/ext/Bal/wixext/Symbols/WixBalBootstrapperApplicationSymbol.cs
+++ b/src/ext/Bal/wixext/Symbols/WixBalBootstrapperApplicationSymbol.cs
@@ -19,15 +19,19 @@ namespace WixToolset.Bal
 namespace WixToolset.Bal.Symbols
 {
+    using System;
    using WixToolset.Data;
    public enum WixBalBootstrapperApplicationType
    {
        Unknown,
        Standard,
+        [Obsolete]
        ManagedHost,
+        [Obsolete]
        DotNetCoreHost,
        InternalUi,
+        Prerequisite,
    }
    public enum WixBalBootstrapperApplicationSymbolFields
diff --git a/src/ext/Bal/wixext/Symbols/WixDncOptionsSymbol.cs b/src/ext/Bal/wixext/Symbols/WixDncOptionsSymbol.cs
deleted file mode 100644
index b9a41c21..00000000
--- a/src/ext/Bal/wixext/Symbols/WixDncOptionsSymbol.cs
+++ /dev/null
@@ -1,47 +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.
-namespace WixToolset.Bal
-{
-    using WixToolset.Data;
-    using WixToolset.Bal.Symbols;
-    public static partial class BalSymbolDefinitions
-    {
-        public static readonly IntermediateSymbolDefinition WixDncOptions = new IntermediateSymbolDefinition(
-            BalSymbolDefinitionType.WixDncOptions.ToString(),
-            new[]
-            {
-                new IntermediateFieldDefinition(nameof(WixDncOptionsSymbolFields.SelfContainedDeployment), IntermediateFieldType.Number),
-            },
-            typeof(WixDncOptionsSymbol));
-    }
-}
-namespace WixToolset.Bal.Symbols
-{
-    using WixToolset.Data;
-    public enum WixDncOptionsSymbolFields
-    {
-        SelfContainedDeployment,
-    }
-    public class WixDncOptionsSymbol : IntermediateSymbol
-    {
-        public WixDncOptionsSymbol() : base(BalSymbolDefinitions.WixDncOptions, null, null)
-        {
-        }
-        public WixDncOptionsSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixDncOptions, sourceLineNumber, id)
-        {
-        }
-        public IntermediateField this[WixDncOptionsSymbolFields index] => this.Fields[(int)index];
-        public int SelfContainedDeployment
-        {
-            get => this.Fields[(int)WixDncOptionsSymbolFields.SelfContainedDeployment].AsNumber();
-            set => this.Set((int)WixDncOptionsSymbolFields.SelfContainedDeployment, value);
-        }
-    }
-}
-\ No newline at end of file
diff --git a/src/ext/Bal/wixext/Symbols/WixMbaPrereqInformationSymbol.cs b/src/ext/Bal/wixext/Symbols/WixMbaPrereqInformationSymbol.cs
deleted file mode 100644
index e4d78da0..00000000
--- a/src/ext/Bal/wixext/Symbols/WixMbaPrereqInformationSymbol.cs
+++ /dev/null
@@ -1,63 +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.
-namespace WixToolset.Bal
-{
-    using WixToolset.Data;
-    using WixToolset.Bal.Symbols;
-    public static partial class BalSymbolDefinitions
-    {
-        public static readonly IntermediateSymbolDefinition WixMbaPrereqInformation = new IntermediateSymbolDefinition(
-            BalSymbolDefinitionType.WixMbaPrereqInformation.ToString(),
-            new[]
-            {
-                new IntermediateFieldDefinition(nameof(WixMbaPrereqInformationSymbolFields.PackageId), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixMbaPrereqInformationSymbolFields.LicenseFile), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixMbaPrereqInformationSymbolFields.LicenseUrl), IntermediateFieldType.String),
-            },
-            typeof(WixMbaPrereqInformationSymbol));
-    }
-}
-namespace WixToolset.Bal.Symbols
-{
-    using WixToolset.Data;
-    public enum WixMbaPrereqInformationSymbolFields
-    {
-        PackageId,
-        LicenseFile,
-        LicenseUrl,
-    }
-    public class WixMbaPrereqInformationSymbol : IntermediateSymbol
-    {
-        public WixMbaPrereqInformationSymbol() : base(BalSymbolDefinitions.WixMbaPrereqInformation, null, null)
-        {
-        }
-        public WixMbaPrereqInformationSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixMbaPrereqInformation, sourceLineNumber, id)
-        {
-        }
-        public IntermediateField this[WixMbaPrereqInformationSymbolFields index] => this.Fields[(int)index];
-        public string PackageId
-        {
-            get => this.Fields[(int)WixMbaPrereqInformationSymbolFields.PackageId].AsString();
-            set => this.Set((int)WixMbaPrereqInformationSymbolFields.PackageId, value);
-        }
-        public string LicenseFile
-        {
-            get => this.Fields[(int)WixMbaPrereqInformationSymbolFields.LicenseFile].AsString();
-            set => this.Set((int)WixMbaPrereqInformationSymbolFields.LicenseFile, value);
-        }
-        public string LicenseUrl
-        {
-            get => this.Fields[(int)WixMbaPrereqInformationSymbolFields.LicenseUrl].AsString();
-            set => this.Set((int)WixMbaPrereqInformationSymbolFields.LicenseUrl, value);
-        }
-    }
-}
-\ No newline at end of file
diff --git a/src/ext/Bal/wixext/Symbols/WixMbaPrereqOptionsSymbol.cs b/src/ext/Bal/wixext/Symbols/WixMbaPrereqOptionsSymbol.cs
deleted file mode 100644
index 66374579..00000000
--- a/src/ext/Bal/wixext/Symbols/WixMbaPrereqOptionsSymbol.cs
+++ /dev/null
@@ -1,47 +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.
-namespace WixToolset.Bal
-{
-    using WixToolset.Data;
-    using WixToolset.Bal.Symbols;
-    public static partial class BalSymbolDefinitions
-    {
-        public static readonly IntermediateSymbolDefinition WixMbaPrereqOptions = new IntermediateSymbolDefinition(
-            BalSymbolDefinitionType.WixMbaPrereqOptions.ToString(),
-            new[]
-            {
-                new IntermediateFieldDefinition(nameof(WixMbaPrereqOptionsSymbolFields.AlwaysInstallPrereqs), IntermediateFieldType.Number),
-            },
-            typeof(WixMbaPrereqOptionsSymbol));
-    }
-}
-namespace WixToolset.Bal.Symbols
-{
-    using WixToolset.Data;
-    public enum WixMbaPrereqOptionsSymbolFields
-    {
-        AlwaysInstallPrereqs,
-    }
-    public class WixMbaPrereqOptionsSymbol : IntermediateSymbol
-    {
-        public WixMbaPrereqOptionsSymbol() : base(BalSymbolDefinitions.WixMbaPrereqOptions, null, null)
-        {
-        }
-        public WixMbaPrereqOptionsSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixMbaPrereqOptions, sourceLineNumber, id)
-        {
-        }
-        public IntermediateField this[WixMbaPrereqOptionsSymbolFields index] => this.Fields[(int)index];
-        public int AlwaysInstallPrereqs
-        {
-            get => this.Fields[(int)WixMbaPrereqOptionsSymbolFields.AlwaysInstallPrereqs].AsNumber();
-            set => this.Set((int)WixMbaPrereqOptionsSymbolFields.AlwaysInstallPrereqs, value);
-        }
-    }
-}
diff --git a/src/ext/Bal/wixext/Symbols/WixPrereqInformationSymbol.cs b/src/ext/Bal/wixext/Symbols/WixPrereqInformationSymbol.cs
new file mode 100644
index 00000000..4b5e301e
--- /dev/null
+++ b/src/ext/Bal/wixext/Symbols/WixPrereqInformationSymbol.cs
@@ -0,0 +1,63 @@
+// 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 WixToolset.Bal
+{
+    using WixToolset.Data;
+    using WixToolset.Bal.Symbols;
+    public static partial class BalSymbolDefinitions
+    {
+        public static readonly IntermediateSymbolDefinition WixPrereqInformation = new IntermediateSymbolDefinition(
+            BalSymbolDefinitionType.WixPrereqInformation.ToString(),
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixPrereqInformationSymbolFields.PackageId), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixPrereqInformationSymbolFields.LicenseFile), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixPrereqInformationSymbolFields.LicenseUrl), IntermediateFieldType.String),
+            },
+            typeof(WixPrereqInformationSymbol));
+    }
+}
+namespace WixToolset.Bal.Symbols
+{
+    using WixToolset.Data;
+    public enum WixPrereqInformationSymbolFields
+    {
+        PackageId,
+        LicenseFile,
+        LicenseUrl,
+    }
+    public class WixPrereqInformationSymbol : IntermediateSymbol
+    {
+        public WixPrereqInformationSymbol() : base(BalSymbolDefinitions.WixPrereqInformation, null, null)
+        {
+        }
+        public WixPrereqInformationSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixPrereqInformation, sourceLineNumber, id)
+        {
+        }
+        public IntermediateField this[WixPrereqInformationSymbolFields index] => this.Fields[(int)index];
+        public string PackageId
+        {
+            get => this.Fields[(int)WixPrereqInformationSymbolFields.PackageId].AsString();
+            set => this.Set((int)WixPrereqInformationSymbolFields.PackageId, value);
+        }
+        public string LicenseFile
+        {
+            get => this.Fields[(int)WixPrereqInformationSymbolFields.LicenseFile].AsString();
+            set => this.Set((int)WixPrereqInformationSymbolFields.LicenseFile, value);
+        }
+        public string LicenseUrl
+        {
+            get => this.Fields[(int)WixPrereqInformationSymbolFields.LicenseUrl].AsString();
+            set => this.Set((int)WixPrereqInformationSymbolFields.LicenseUrl, value);
+        }
+    }
+}
diff --git a/src/ext/Bal/wixext/Symbols/WixPrereqOptionsSymbol.cs b/src/ext/Bal/wixext/Symbols/WixPrereqOptionsSymbol.cs
new file mode 100644
index 00000000..a351d7da
--- /dev/null
+++ b/src/ext/Bal/wixext/Symbols/WixPrereqOptionsSymbol.cs
@@ -0,0 +1,63 @@
+// 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 WixToolset.Bal
+{
+    using WixToolset.Data;
+    using WixToolset.Bal.Symbols;
+    public static partial class BalSymbolDefinitions
+    {
+        public static readonly IntermediateSymbolDefinition WixPrereqOptions = new IntermediateSymbolDefinition(
+            BalSymbolDefinitionType.WixPrereqOptions.ToString(),
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixPrereqOptionsSymbolFields.Primary), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixPrereqOptionsSymbolFields.HandleHelp), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixPrereqOptionsSymbolFields.HandleLayout), IntermediateFieldType.Number),
+            },
+            typeof(WixPrereqOptionsSymbol));
+    }
+}
+namespace WixToolset.Bal.Symbols
+{
+    using WixToolset.Data;
+    public enum WixPrereqOptionsSymbolFields
+    {
+        Primary,
+        HandleHelp,
+        HandleLayout,
+    }
+    public class WixPrereqOptionsSymbol : IntermediateSymbol
+    {
+        public WixPrereqOptionsSymbol() : base(BalSymbolDefinitions.WixPrereqOptions, null, null)
+        {
+        }
+        public WixPrereqOptionsSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixPrereqOptions, sourceLineNumber, id)
+        {
+        }
+        public IntermediateField this[WixPrereqOptionsSymbolFields index] => this.Fields[(int)index];
+        public int Primary
+        {
+            get => this.Fields[(int)WixPrereqOptionsSymbolFields.Primary].AsNumber();
+            set => this.Set((int)WixPrereqOptionsSymbolFields.Primary, value);
+        }
+        public int? HandleHelp
+        {
+            get => (int?)this.Fields[(int)WixPrereqOptionsSymbolFields.HandleHelp];
+            set => this.Set((int)WixPrereqOptionsSymbolFields.HandleHelp, value);
+        }
+        public int? HandleLayout
+        {
+            get => (int?)this.Fields[(int)WixPrereqOptionsSymbolFields.HandleLayout];
+            set => this.Set((int)WixPrereqOptionsSymbolFields.HandleLayout, value);
+        }
+    }
+}
diff --git a/src/ext/Bal/wixiuiba/WixInternalUIBootstrapperApplication.h b/src/ext/Bal/wixiuiba/WixInternalUIBootstrapperApplication.h
deleted file mode 100644
index b0b782dd..00000000
--- a/src/ext/Bal/wixiuiba/WixInternalUIBootstrapperApplication.h
+++ /dev/null
@@ -1,18 +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 CreateBootstrapperApplication(
-    __in HMODULE hModule,
-    __in_opt PREQBA_DATA* pPrereqData,
-    __in IBootstrapperEngine* pEngine,
-    __in const BOOTSTRAPPER_CREATE_ARGS* pArgs,
-    __inout BOOTSTRAPPER_CREATE_RESULTS* pResults,
-    __out IBootstrapperApplication** ppApplication
-    );
-void DestroyBootstrapperApplication(
-    __in IBootstrapperApplication* pApplication,
-    __in const BOOTSTRAPPER_DESTROY_ARGS* pArgs,
-    __inout BOOTSTRAPPER_DESTROY_RESULTS* pResults
-    );
diff --git a/src/ext/Bal/wixiuiba/precomp.h b/src/ext/Bal/wixiuiba/precomp.h
index 89ec6eab..cb6730fd 100644
--- a/src/ext/Bal/wixiuiba/precomp.h
+++ b/src/ext/Bal/wixiuiba/precomp.h
@@ -15,8 +15,9 @@
 #include <strutil.h>
 #include <xmlutil.h>
-#include <BootstrapperEngine.h>
+#include <baenginetypes.h>
-#include <BootstrapperApplication.h>
+#include <batypes.h>
 #include <IBootstrapperEngine.h>
 #include <IBootstrapperApplication.h>
@@ -24,7 +25,4 @@
 #include <balinfo.h>
 #include <balcondition.h>
-#include <preqba.h>
 #include "WixInternalUIBootstrapperApplication.h"
-#include "wixiuiba.h"
diff --git a/src/ext/Bal/wixiuiba/wixiuiba.cpp b/src/ext/Bal/wixiuiba/wixiuiba.cpp
index 3e751893..92261e9b 100644
--- a/src/ext/Bal/wixiuiba/wixiuiba.cpp
+++ b/src/ext/Bal/wixiuiba/wixiuiba.cpp
@@ -2,191 +2,27 @@
 #include "precomp.h"
-static INTERNAL_UI_BA_STATE vstate = { };
-// internal function declarations
-static HRESULT LoadModulePaths(
-    __in INTERNAL_UI_BA_STATE* pState
-    );
-static HRESULT LoadInternalUIBAConfiguration(
-    __in INTERNAL_UI_BA_STATE* pState,
-    __in const BOOTSTRAPPER_CREATE_ARGS* pArgs
-    );
-static HRESULT CreatePrerequisiteBA(
-    __in INTERNAL_UI_BA_STATE* pState,
-    __in IBootstrapperEngine* pEngine,
-    __in const BOOTSTRAPPER_CREATE_ARGS* pArgs,
-    __inout BOOTSTRAPPER_CREATE_RESULTS* pResults
-    );
 // function definitions
-extern "C" BOOL WINAPI DllMain(
+EXTERN_C int WINAPI wWinMain(
    __in HINSTANCE hInstance,
-    __in DWORD dwReason,
+    __in_opt HINSTANCE /* hPrevInstance */,
-    __in LPVOID /*pvReserved*/
+    __in_z_opt LPWSTR /*lpCmdLine*/,
-    )
+    __in int /*nCmdShow*/
-{
-    switch (dwReason)
-    {
-    case DLL_PROCESS_ATTACH:
-        ::DisableThreadLibraryCalls(hInstance);
-        vstate.hInstance = hInstance;
-        break;
-    case DLL_PROCESS_DETACH:
-        vstate.hInstance = NULL;
-        break;
-    }
-    return TRUE;
-}
-// Note: This function assumes that COM was already initialized on the thread.
-extern "C" HRESULT WINAPI BootstrapperApplicationCreate(
-    __in const BOOTSTRAPPER_CREATE_ARGS* pArgs,
-    __inout BOOTSTRAPPER_CREATE_RESULTS* pResults
-    )
-{
-    HRESULT hr = S_OK; 
-    IBootstrapperEngine* pEngine = NULL;
-    hr = BalInitializeFromCreateArgs(pArgs, &pEngine);
-    ExitOnFailure(hr, "Failed to initialize Bal.");
-    if (!vstate.fInitialized)
-    {
-        hr = XmlInitialize();
-        BalExitOnFailure(hr, "Failed to initialize XML.");
-        hr = LoadModulePaths(&vstate);
-        BalExitOnFailure(hr, "Failed to load the module paths.");
-        hr = LoadInternalUIBAConfiguration(&vstate, pArgs);
-        BalExitOnFailure(hr, "Failed to get the InternalUIBA configuration.");
-        vstate.fInitialized = TRUE;
-    }
-    if (vstate.prereqData.fAlwaysInstallPrereqs && !vstate.prereqData.fCompleted ||
-        FAILED(vstate.prereqData.hrFatalError))
-    {
-        BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Loading prerequisite bootstrapper application.");
-        hr = CreatePrerequisiteBA(&vstate, pEngine, pArgs, pResults);
-        BalExitOnFailure(hr, "Failed to create the pre-requisite bootstrapper application.");
-    }
-    else
-    {
-        hr = CreateBootstrapperApplication(vstate.hInstance, &vstate.prereqData, pEngine, pArgs, pResults, &vstate.pApplication);
-        BalExitOnFailure(hr, "Failed to create bootstrapper application interface.");
-    }
-LExit:
-    ReleaseNullObject(pEngine);
-    return hr;
-}
-extern "C" void WINAPI BootstrapperApplicationDestroy(
-    __in const BOOTSTRAPPER_DESTROY_ARGS* pArgs,
-    __in BOOTSTRAPPER_DESTROY_RESULTS* pResults
-    )
-{
-    BOOTSTRAPPER_DESTROY_RESULTS childResults = { };
-    if (vstate.hPrereqModule)
-    {
-        PFN_BOOTSTRAPPER_APPLICATION_DESTROY pfnDestroy = reinterpret_cast<PFN_BOOTSTRAPPER_APPLICATION_DESTROY>(::GetProcAddress(vstate.hPrereqModule, "PrereqBootstrapperApplicationDestroy"));
-        if (pfnDestroy)
-        {
-            (*pfnDestroy)(pArgs, &childResults);
-        }
-        ::FreeLibrary(vstate.hPrereqModule);
-        vstate.hPrereqModule = NULL;
-    }
-    if (vstate.pApplication)
-    {
-        DestroyBootstrapperApplication(vstate.pApplication, pArgs, pResults);
-        ReleaseNullObject(vstate.pApplication);
-    }
-    BalUninitialize();
-    // Need to keep track of state between reloads.
-    pResults->fDisableUnloading = TRUE;
-}
-static HRESULT LoadModulePaths(
-    __in INTERNAL_UI_BA_STATE* pState
-    )
-{
-    HRESULT hr = S_OK;
-    LPWSTR sczFullPath = NULL;
-    hr = PathForCurrentProcess(&sczFullPath, pState->hInstance);
-    ExitOnFailure(hr, "Failed to get the full host path.");
-    hr = PathGetDirectory(sczFullPath, &pState->sczAppBase);
-    ExitOnFailure(hr, "Failed to get the directory of the full process path.");
-LExit:
-    ReleaseStr(sczFullPath);
-    return hr;
-}
-static HRESULT LoadInternalUIBAConfiguration(
-    __in INTERNAL_UI_BA_STATE* pState,
-    __in const BOOTSTRAPPER_CREATE_ARGS* /*pArgs*/
    )
 {
    HRESULT hr = S_OK;
+    IBootstrapperApplication* pApplication = NULL;
-    pState->prereqData.fAlwaysInstallPrereqs = TRUE;
+    hr = CreateWixInternalUIBootstrapperApplication(hInstance, &pApplication);
-    pState->prereqData.fPerformHelp = TRUE;
+    ExitOnFailure(hr, "Failed to create WiX internal UI bootstrapper application.");
-    pState->prereqData.fPerformLayout = TRUE;
-    return hr;
-}
-static HRESULT CreatePrerequisiteBA(
-    __in INTERNAL_UI_BA_STATE* pState,
-    __in IBootstrapperEngine* pEngine,
-    __in const BOOTSTRAPPER_CREATE_ARGS* pArgs,
-    __inout BOOTSTRAPPER_CREATE_RESULTS* pResults
-    )
-{
-    HRESULT hr = S_OK;
-    LPWSTR sczPrereqPath = NULL;
-    HMODULE hModule = NULL;
-    hr = PathConcat(pState->sczAppBase, L"prereqba.dll", &sczPrereqPath);
-    BalExitOnFailure(hr, "Failed to get path to pre-requisite BA.");
-    hModule = ::LoadLibraryExW(sczPrereqPath, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
-    ExitOnNullWithLastError(hModule, hr, "Failed to load pre-requisite BA DLL.");
-    PFN_PREQ_BOOTSTRAPPER_APPLICATION_CREATE pfnCreate = reinterpret_cast<PFN_PREQ_BOOTSTRAPPER_APPLICATION_CREATE>(::GetProcAddress(hModule, "PrereqBootstrapperApplicationCreate"));
-    ExitOnNullWithLastError(pfnCreate, hr, "Failed to get PrereqBootstrapperApplicationCreate entry-point from: %ls", sczPrereqPath);
-    hr = pfnCreate(&pState->prereqData, pEngine, pArgs, pResults);
-    ExitOnFailure(hr, "Failed to create prequisite bootstrapper app.");
-    pState->hPrereqModule = hModule;
+    hr = BootstrapperApplicationRun(pApplication);
-    hModule = NULL;
+    ExitOnFailure(hr, "Failed to run WiX internal UI bootstrapper application.");
 LExit:
-    if (hModule)
+    ReleaseObject(pApplication);
-    {
-        ::FreeLibrary(hModule);
-    }
-    ReleaseStr(sczPrereqPath);
-    return hr;
+    return 0;
 }
diff --git a/src/ext/Bal/wixiuiba/wixiuiba.def b/src/ext/Bal/wixiuiba/wixiuiba.def
deleted file mode 100644
index 4488df94..00000000
--- a/src/ext/Bal/wixiuiba/wixiuiba.def
+++ /dev/null
@@ -1,6 +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.
-EXPORTS
-    BootstrapperApplicationCreate
-    BootstrapperApplicationDestroy
diff --git a/src/ext/Bal/wixiuiba/wixiuiba.rc b/src/ext/Bal/wixiuiba/wixiuiba.rc
new file mode 100644
index 00000000..a029458e
--- /dev/null
+++ b/src/ext/Bal/wixiuiba/wixiuiba.rc
@@ -0,0 +1 @@
+// 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.
diff --git a/src/ext/Bal/wixiuiba/wixiuiba.vcxproj b/src/ext/Bal/wixiuiba/wixiuiba.vcxproj
index 29c7cb50..6b20db30 100644
--- a/src/ext/Bal/wixiuiba/wixiuiba.vcxproj
+++ b/src/ext/Bal/wixiuiba/wixiuiba.vcxproj
@@ -1,7 +1,7 @@
 <?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" Toolsxmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|ARM64">
      <Configuration>Debug</Configuration>
@@ -31,39 +31,58 @@
  <PropertyGroup Label="Globals">
    <ProjectGuid>{0F73E566-925C-448D-99CB-3A7F5DF399C8}</ProjectGuid>
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <Keyword>Win32Proj</Keyword>
+    <ConfigurationType>Application</ConfigurationType>
+    <ProjectSubSystem>Windows</ProjectSubSystem>
    <CharacterSet>Unicode</CharacterSet>
-    <TargetName>wixiuiba</TargetName>
+    <Description>WiX Internal UI Bootstrapper Application</Description>
-    <ProjectModuleDefinitionFile>wixiuiba.def</ProjectModuleDefinitionFile>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
  <PropertyGroup>
-    <ProjectAdditionalIncludeDirectories>..\wixstdba\inc</ProjectAdditionalIncludeDirectories>
+    <ProjectAdditionalIncludeDirectories>$(ProjectDir)..\stdbas\inc</ProjectAdditionalIncludeDirectories>
-    <ProjectAdditionalLinkLibraries>shlwapi.lib</ProjectAdditionalLinkLibraries>
+    <ProjectAdditionalLinkLibraries>stdbas.res</ProjectAdditionalLinkLibraries>
  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <Link>
+      <DelayLoadDLLs>version.dll</DelayLoadDLLs>
+      <AdditionalOptions>/DEPENDENTLOADFLAG:0x800 %(AdditionalOptions)</AdditionalOptions>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="precomp.h" />
+    <ClInclude Include="wixiuiba.h" />
+  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="precomp.cpp">
      <PrecompiledHeader>Create</PrecompiledHeader>
    </ClCompile>
-    <ClCompile Include="WixInternalUIBootstrapperApplication.cpp" />
    <ClCompile Include="wixiuiba.cpp" />
  </ItemGroup>
  <ItemGroup>
-    <ClInclude Include="precomp.h" />
+    <Manifest Include="..\stdbas\stdbas.manifest" />
-    <ClInclude Include="WixInternalUIBootstrapperApplication.h" />
+    <ResourceCompile Include="wixiuiba.rc" />
-    <ClInclude Include="wixiuiba.h" />
  </ItemGroup>
  <ItemGroup>
-    <None Include="wixiuiba.def" />
+    <ProjectReference Include="..\stdbas\stdbas.vcxproj">
+      <Project>{DBBF5F32-BAEA-46A8-99A0-17277A906456}</Project>
+    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
    <PackageReference Include="WixToolset.BalUtil" />
    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
  </ItemGroup>
diff --git a/src/ext/Bal/wixlib/BalExtension_platform.wxi b/src/ext/Bal/wixlib/BalExtension_platform.wxi
deleted file mode 100644
index bb922317..00000000
--- a/src/ext/Bal/wixlib/BalExtension_platform.wxi
+++ /dev/null
@@ -1,75 +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 xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <?include ..\..\caDecor.wxi ?>
-    <Fragment>
-        <BootstrapperApplication Id="WixDotNetCoreBootstrapperApplicationHost$(var.Suffix)">
-            <BootstrapperApplicationDll Id="WixDotNetCoreBootstrapperApplicationHost" SourceFile="!(bindpath.dnchost.$(var.platform))\dnchost.dll" />
-            <Payload SourceFile="!(bindpath.wixstdba.$(var.platform))\wixstdba.dll" Name="dncpreq.dll" />
-        </BootstrapperApplication>
-    </Fragment>
-    <Fragment>
-        <BootstrapperApplication Id="WixDotNetCoreBootstrapperApplicationHost.Standard$(var.Suffix)">
-            <PayloadGroupRef Id="DncPreqStandardPayloads" />
-        </BootstrapperApplication>
-        <BootstrapperApplicationRef Id="WixDotNetCoreBootstrapperApplicationHost$(var.Suffix)" />
-    </Fragment>
-    <Fragment>
-        <BootstrapperApplication Id="WixInternalUIBootstrapperApplication$(var.Suffix)">
-            <BootstrapperApplicationDll Id="WixInternalUIBootstrapperApplication" SourceFile="!(bindpath.wixiuiba.$(var.platform))\wixiuiba.dll" />
-            <Payload SourceFile="!(bindpath.wixstdba.$(var.platform))\wixstdba.dll" Name="prereqba.dll" />
-        </BootstrapperApplication>
-    </Fragment>
-    <Fragment>
-        <BootstrapperApplication Id="WixInternalUIBootstrapperApplication.Standard$(var.Suffix)">
-            <PayloadGroupRef Id="WixIuibaStandardPayloads" />
-        </BootstrapperApplication>
-        <BootstrapperApplicationRef Id="WixInternalUIBootstrapperApplication$(var.Suffix)" />
-    </Fragment>
-    <Fragment>
-        <BootstrapperApplication Id="WixStandardBootstrapperApplication$(var.Suffix)">
-            <BootstrapperApplicationDll Id="WixStandardBootstrapperApplication" SourceFile="!(bindpath.wixstdba.$(var.platform))\wixstdba.dll" />
-        </BootstrapperApplication>
-    </Fragment>
-    <Fragment>
-        <BootstrapperApplication Id="WixStandardBootstrapperApplication.RtfLicense$(var.Suffix)">
-            <PayloadGroupRef Id="WixStdbaRtfLicensePayloads" />
-        </BootstrapperApplication>
-        <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication$(var.Suffix)" />
-    </Fragment>
-    <Fragment>
-        <BootstrapperApplication Id="WixStandardBootstrapperApplication.RtfLargeLicense$(var.Suffix)">
-            <PayloadGroupRef Id="WixStdbaRtfLargeLicensePayloads" />
-        </BootstrapperApplication>
-        <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication$(var.Suffix)" />
-    </Fragment>
-    <Fragment>
-        <BootstrapperApplication Id="WixStandardBootstrapperApplication.HyperlinkLicense$(var.Suffix)">
-            <PayloadGroupRef Id="WixStdbaHyperlinkLicensePayloads" />
-        </BootstrapperApplication>
-        <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication$(var.Suffix)" />
-    </Fragment>
-    <Fragment>
-        <BootstrapperApplication Id="WixStandardBootstrapperApplication.HyperlinkLargeLicense$(var.Suffix)">
-            <PayloadGroupRef Id="WixStdbaHyperlinkLargeLicensePayloads" />
-        </BootstrapperApplication>
-        <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication$(var.Suffix)" />
-    </Fragment>
-    <Fragment>
-        <BootstrapperApplication Id="WixStandardBootstrapperApplication.HyperlinkSidebarLicense$(var.Suffix)">
-            <PayloadGroupRef Id="WixStdbaHyperlinkSidebarLicensePayloads" />
-        </BootstrapperApplication>
-        <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication$(var.Suffix)" />
-    </Fragment>
-</Include>
diff --git a/src/ext/Bal/wixlib/Dnc.wxs b/src/ext/Bal/wixlib/Dnc.wxs
deleted file mode 100644
index 242bb30e..00000000
--- a/src/ext/Bal/wixlib/Dnc.wxs
+++ /dev/null
@@ -1,15 +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. -->
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <!--
-     Dnc.wxs - .NET Core BA resources.
-    -->
-    <Fragment>
-        <PayloadGroup Id="DncPreqStandardPayloads">
-            <Payload Name="mbapreq.thm" SourceFile="!(wix.DncPreqbaThemeXml=SourceDir\dncpreq.thm)" />
-            <Payload Name="mbapreq.png" SourceFile="!(wix.DncPreqbaLogo=SourceDir\mbapreq.png)" />
-            <Payload Name="mbapreq.wxl" SourceFile="!(wix.DncPreqbaThemeWxl=SourceDir\dncpreq.wxl)" />
-        </PayloadGroup>
-    </Fragment>
-</Wix>
diff --git a/src/ext/Bal/wixlib/Mba.wxs b/src/ext/Bal/wixlib/Mba.wxs
deleted file mode 100644
index 2d407c88..00000000
--- a/src/ext/Bal/wixlib/Mba.wxs
+++ /dev/null
@@ -1,43 +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. -->
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <!--
-     Mba.wxs - Managed BA resources.
-    -->
-    <Fragment>
-        <PayloadGroup Id="WixManagedBootstrapperApplicationHostManagedPayloads">
-            <Payload SourceFile="WixToolset.Mba.Host.dll" />
-        </PayloadGroup>
-    </Fragment>
-    <Fragment>
-        <PayloadGroup Id="MbaPreqStandardPayloads">
-            <Payload Name="mbapreq.thm" SourceFile="!(wix.PreqbaThemeXml=SourceDir\mbapreq.thm)" />
-            <Payload Name="mbapreq.png" SourceFile="!(wix.PreqbaLogo=SourceDir\mbapreq.png)" />
-            <Payload Name="mbapreq.wxl" SourceFile="!(wix.PreqbaThemeWxl=SourceDir\mbapreq.wxl)" />
-            <Payload Name="1028\mbapreq.wxl" SourceFile="!(wix.PreqbaThemeWxl1028=SourceDir\1028\mbapreq.wxl)" />
-            <Payload Name="1029\mbapreq.wxl" SourceFile="!(wix.PreqbaThemeWxl1029=SourceDir\1029\mbapreq.wxl)" />
-            <Payload Name="1030\mbapreq.wxl" SourceFile="!(wix.PreqbaThemeWxl1030=SourceDir\1030\mbapreq.wxl)" />
-            <Payload Name="1031\mbapreq.wxl" SourceFile="!(wix.PreqbaThemeWxl1031=SourceDir\1031\mbapreq.wxl)" />
-            <Payload Name="1032\mbapreq.wxl" SourceFile="!(wix.PreqbaThemeWxl1032=SourceDir\1032\mbapreq.wxl)" />
-            <Payload Name="1035\mbapreq.wxl" SourceFile="!(wix.PreqbaThemeWxl1035=SourceDir\1035\mbapreq.wxl)" />
-            <Payload Name="1036\mbapreq.wxl" SourceFile="!(wix.PreqbaThemeWxl1036=SourceDir\1036\mbapreq.wxl)" />
-            <Payload Name="1038\mbapreq.wxl" SourceFile="!(wix.PreqbaThemeWxl1038=SourceDir\1038\mbapreq.wxl)" />
-            <Payload Name="1040\mbapreq.wxl" SourceFile="!(wix.PreqbaThemeWxl1040=SourceDir\1040\mbapreq.wxl)" />
-            <Payload Name="1041\mbapreq.wxl" SourceFile="!(wix.PreqbaThemeWxl1041=SourceDir\1041\mbapreq.wxl)" />
-            <Payload Name="1042\mbapreq.wxl" SourceFile="!(wix.PreqbaThemeWxl1042=SourceDir\1042\mbapreq.wxl)" />
-            <Payload Name="1043\mbapreq.wxl" SourceFile="!(wix.PreqbaThemeWxl1043=SourceDir\1043\mbapreq.wxl)" />
-            <Payload Name="1044\mbapreq.wxl" SourceFile="!(wix.PreqbaThemeWxl1044=SourceDir\1044\mbapreq.wxl)" />
-            <Payload Name="1045\mbapreq.wxl" SourceFile="!(wix.PreqbaThemeWxl1045=SourceDir\1045\mbapreq.wxl)" />
-            <Payload Name="1046\mbapreq.wxl" SourceFile="!(wix.PreqbaThemeWxl1046=SourceDir\1046\mbapreq.wxl)" />
-            <Payload Name="1049\mbapreq.wxl" SourceFile="!(wix.PreqbaThemeWxl1049=SourceDir\1049\mbapreq.wxl)" />
-            <Payload Name="1051\mbapreq.wxl" SourceFile="!(wix.PreqbaThemeWxl1051=SourceDir\1051\mbapreq.wxl)" />
-            <Payload Name="1053\mbapreq.wxl" SourceFile="!(wix.PreqbaThemeWxl1053=SourceDir\1053\mbapreq.wxl)" />
-            <Payload Name="1055\mbapreq.wxl" SourceFile="!(wix.PreqbaThemeWxl1055=SourceDir\1055\mbapreq.wxl)" />
-            <Payload Name="1060\mbapreq.wxl" SourceFile="!(wix.PreqbaThemeWxl1060=SourceDir\1060\mbapreq.wxl)" />
-            <Payload Name="2052\mbapreq.wxl" SourceFile="!(wix.PreqbaThemeWxl2052=SourceDir\2052\mbapreq.wxl)" />
-            <Payload Name="2070\mbapreq.wxl" SourceFile="!(wix.PreqbaThemeWxl2070=SourceDir\2070\mbapreq.wxl)" />
-            <Payload Name="3082\mbapreq.wxl" SourceFile="!(wix.PreqbaThemeWxl3082=SourceDir\3082\mbapreq.wxl)" />
-        </PayloadGroup>
-    </Fragment>
-</Wix>
diff --git a/src/ext/Bal/wixlib/Mbahost_platform.wxi b/src/ext/Bal/wixlib/Mbahost_platform.wxi
deleted file mode 100644
index 3ea7840f..00000000
--- a/src/ext/Bal/wixlib/Mbahost_platform.wxi
+++ /dev/null
@@ -1,21 +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 xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <?include ..\..\caDecor.wxi ?>
-    <Fragment>
-        <BootstrapperApplication Id="WixManagedBootstrapperApplicationHost$(var.Suffix)">
-            <BootstrapperApplicationDll Id="WixManagedBootstrapperApplicationHost" SourceFile="!(bindpath.mbahost.$(var.platform))\mbahost.dll" />
-            <Payload SourceFile="!(bindpath.wixstdba.$(var.platform))\wixstdba.dll" Name="mbapreq.dll" />
-            <PayloadGroupRef Id="WixManagedBootstrapperApplicationHostManagedPayloads" />
-        </BootstrapperApplication>
-    </Fragment>
-    <Fragment>
-        <BootstrapperApplication Id="WixManagedBootstrapperApplicationHost.Standard$(var.Suffix)">
-            <PayloadGroupRef Id="MbaPreqStandardPayloads" />
-        </BootstrapperApplication>
-        <BootstrapperApplicationRef Id="WixManagedBootstrapperApplicationHost$(var.Suffix)" />
-    </Fragment>
-</Include>
diff --git a/src/ext/Bal/wixlib/bal.wixproj b/src/ext/Bal/wixlib/bal.wixproj
index 9e1b111a..31369115 100644
--- a/src/ext/Bal/wixlib/bal.wixproj
+++ b/src/ext/Bal/wixlib/bal.wixproj
@@ -7,14 +7,13 @@
  </PropertyGroup>
  <ItemGroup>
-    <BindPath Include="..\wixstdba\Resources\" />
+    <BindPath Include="..\stdbas\Resources\" />
    <BindPath Include="$(OutputPath)net462" />
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\dnchost\dnchost.vcxproj" Platforms="arm64,x86,x64" />
-    <ProjectReference Include="..\mbahost\mbahost.vcxproj" Platforms="arm64,x86,x64" />
    <ProjectReference Include="..\wixiuiba\wixiuiba.vcxproj" Platforms="arm64,x86,x64" />
+    <ProjectReference Include="..\wixprqba\wixprqba.vcxproj" Platforms="arm64,x86,x64" />
    <ProjectReference Include="..\wixstdba\wixstdba.vcxproj" Platforms="arm64,x86,x64" />
  </ItemGroup>
diff --git a/src/ext/Bal/wixlib/BalExtension_arm64.wxs b/src/ext/Bal/wixlib/bal_arm64.wxs
index 9a1ca60c..4ddbfc47 100644
--- a/src/ext/Bal/wixlib/BalExtension_arm64.wxs
+++ b/src/ext/Bal/wixlib/bal_arm64.wxs
@@ -2,6 +2,5 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
    <?define platform=arm64 ?>
-    <?include BalExtension_platform.wxi ?>
+    <?include bal_platform.wxi ?>
-    <?include Mbahost_platform.wxi ?>
 </Wix>
diff --git a/src/ext/Bal/wixlib/bal_platform.wxi b/src/ext/Bal/wixlib/bal_platform.wxi
new file mode 100644
index 00000000..af58f4c3
--- /dev/null
+++ b/src/ext/Bal/wixlib/bal_platform.wxi
@@ -0,0 +1,34 @@
+<!-- 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 xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <?include ..\..\caDecor.wxi ?>
+    <Fragment>
+        <PayloadGroup Id="WixStandardBootstrapperApplication$(var.Suffix)">
+            <Payload Id="WixStandardBootstrapperApplication$(var.Suffix)"
+                     SourceFile="!(bindpath.wixstdba.$(var.platform))\wixstdba.exe" />
+        </PayloadGroup>
+    </Fragment>
+    <Fragment>
+        <PayloadGroup Id="WixInternalUIBootstrapperApplication$(var.Suffix)">
+            <Payload Id="WixInternalUIBootstrapperApplication$(var.Suffix)"
+                     SourceFile="!(bindpath.wixiuiba.$(var.platform))\wixiuiba.exe" />
+        </PayloadGroup>
+        <!-- Internal UI BA depends on the PrereqBA for layout and help (and prerequisites if there are any). -->
+        <BootstrapperApplicationRef Id="WixPrereqBootstrapperApplication.Primary$(var.Suffix)" />
+    </Fragment>
+    <Fragment>
+        <BootstrapperApplication Id="WixPrereqBootstrapperApplication.Primary$(var.Suffix)"
+                                 SourceFile="!(bindpath.wixprqba.$(var.platform))\wixprqba.exe" />
+    </Fragment>
+    <Fragment>
+        <BootstrapperApplication Id="WixPrereqBootstrapperApplication.Secondary$(var.Suffix)"
+                                 SourceFile="!(bindpath.wixprqba.$(var.platform))\wixprqba.exe"
+                                 Secondary="yes" />
+    </Fragment>
+</Include>
diff --git a/src/ext/Bal/wixlib/BalExtension_x64.wxs b/src/ext/Bal/wixlib/bal_x64.wxs
index e5252718..f2c62418 100644
--- a/src/ext/Bal/wixlib/BalExtension_x64.wxs
+++ b/src/ext/Bal/wixlib/bal_x64.wxs
@@ -3,6 +3,5 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
    <?define platform=x64 ?>
-    <?include BalExtension_platform.wxi ?>
+    <?include bal_platform.wxi ?>
-    <?include Mbahost_platform.wxi ?>
 </Wix>
diff --git a/src/ext/Bal/wixlib/BalExtension_x86.wxs b/src/ext/Bal/wixlib/bal_x86.wxs
index 1045160d..e00115b2 100644
--- a/src/ext/Bal/wixlib/BalExtension_x86.wxs
+++ b/src/ext/Bal/wixlib/bal_x86.wxs
@@ -3,6 +3,5 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
    <?define platform=x86 ?>
-    <?include BalExtension_platform.wxi ?>
+    <?include bal_platform.wxi ?>
-    <?include Mbahost_platform.wxi ?>
 </Wix>
diff --git a/src/ext/Bal/wixlib/wixiuiba.wxs b/src/ext/Bal/wixlib/wixiuiba.wxs
index 5501a23f..a7885ffb 100644
--- a/src/ext/Bal/wixlib/wixiuiba.wxs
+++ b/src/ext/Bal/wixlib/wixiuiba.wxs
@@ -4,9 +4,9 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
    <Fragment>
        <PayloadGroup Id="WixIuibaStandardPayloads">
-            <Payload Name="mbapreq.thm" SourceFile="!(wix.WixIuibaThemeXml=SourceDir\iuipreq.thm)" />
+            <Payload Name="wixpreq.thm" SourceFile="!(wix.WixIuibaThemeXml=SourceDir\iuipreq.thm)" />
-            <Payload Name="mbapreq.png" SourceFile="!(wix.WixIuibaLogo=SourceDir\mbapreq.png)" />
+            <Payload Name="wixpreq.png" SourceFile="!(wix.WixIuibaLogo=SourceDir\wixpreq.png)" />
-            <Payload Name="mbapreq.wxl" SourceFile="!(wix.WixIuibaThemeWxl=SourceDir\iuipreq.wxl)" />
+            <Payload Name="wixpreq.wxl" SourceFile="!(wix.WixIuibaThemeWxl=SourceDir\wixpreq.wxl)" />
        </PayloadGroup>
    </Fragment>
 </Wix>
diff --git a/src/ext/Bal/wixlib/wixprqba.wxs b/src/ext/Bal/wixlib/wixprqba.wxs
new file mode 100644
index 00000000..72b92f1f
--- /dev/null
+++ b/src/ext/Bal/wixlib/wixprqba.wxs
@@ -0,0 +1,36 @@
+<!-- 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">
+    <Fragment>
+        <PayloadGroup Id="WixPreqbaStandardPayloads">
+            <Payload Name="wixpreq.thm" SourceFile="!(wix.WixPreqbaThemeXml=SourceDir\wixpreq.thm)" />
+            <Payload Name="wixpreq.png" SourceFile="!(wix.WixPreqbaLogo=SourceDir\wixpreq.png)" />
+            <Payload Name="wixpreq.wxl" SourceFile="!(wix.WixPreqbaThemeWxl=SourceDir\wixpreq.wxl)" />
+            <!--
+            <Payload Name="1028\wixpreq.wxl" SourceFile="!(wix.WixPreqbaThemeWxl1028=SourceDir\1028\wixpreq.wxl)" />
+            <Payload Name="1029\wixpreq.wxl" SourceFile="!(wix.WixPreqbaThemeWxl1029=SourceDir\1029\wixpreq.wxl)" />
+            <Payload Name="1030\wixpreq.wxl" SourceFile="!(wix.WixPreqbaThemeWxl1030=SourceDir\1030\wixpreq.wxl)" />
+            <Payload Name="1031\wixpreq.wxl" SourceFile="!(wix.WixPreqbaThemeWxl1031=SourceDir\1031\wixpreq.wxl)" />
+            <Payload Name="1032\wixpreq.wxl" SourceFile="!(wix.WixPreqbaThemeWxl1032=SourceDir\1032\wixpreq.wxl)" />
+            <Payload Name="1035\wixpreq.wxl" SourceFile="!(wix.WixPreqbaThemeWxl1035=SourceDir\1035\wixpreq.wxl)" />
+            <Payload Name="1036\wixpreq.wxl" SourceFile="!(wix.WixPreqbaThemeWxl1036=SourceDir\1036\wixpreq.wxl)" />
+            <Payload Name="1038\wixpreq.wxl" SourceFile="!(wix.WixPreqbaThemeWxl1038=SourceDir\1038\wixpreq.wxl)" />
+            <Payload Name="1040\wixpreq.wxl" SourceFile="!(wix.WixPreqbaThemeWxl1040=SourceDir\1040\wixpreq.wxl)" />
+            <Payload Name="1041\wixpreq.wxl" SourceFile="!(wix.WixPreqbaThemeWxl1041=SourceDir\1041\wixpreq.wxl)" />
+            <Payload Name="1042\wixpreq.wxl" SourceFile="!(wix.WixPreqbaThemeWxl1042=SourceDir\1042\wixpreq.wxl)" />
+            <Payload Name="1043\wixpreq.wxl" SourceFile="!(wix.WixPreqbaThemeWxl1043=SourceDir\1043\wixpreq.wxl)" />
+            <Payload Name="1044\wixpreq.wxl" SourceFile="!(wix.WixPreqbaThemeWxl1044=SourceDir\1044\wixpreq.wxl)" />
+            <Payload Name="1045\wixpreq.wxl" SourceFile="!(wix.WixPreqbaThemeWxl1045=SourceDir\1045\wixpreq.wxl)" />
+            <Payload Name="1046\wixpreq.wxl" SourceFile="!(wix.WixPreqbaThemeWxl1046=SourceDir\1046\wixpreq.wxl)" />
+            <Payload Name="1049\wixpreq.wxl" SourceFile="!(wix.WixPreqbaThemeWxl1049=SourceDir\1049\wixpreq.wxl)" />
+            <Payload Name="1051\wixpreq.wxl" SourceFile="!(wix.WixPreqbaThemeWxl1051=SourceDir\1051\wixpreq.wxl)" />
+            <Payload Name="1053\wixpreq.wxl" SourceFile="!(wix.WixPreqbaThemeWxl1053=SourceDir\1053\wixpreq.wxl)" />
+            <Payload Name="1055\wixpreq.wxl" SourceFile="!(wix.WixPreqbaThemeWxl1055=SourceDir\1055\wixpreq.wxl)" />
+            <Payload Name="1060\wixpreq.wxl" SourceFile="!(wix.WixPreqbaThemeWxl1060=SourceDir\1060\wixpreq.wxl)" />
+            <Payload Name="2052\wixpreq.wxl" SourceFile="!(wix.WixPreqbaThemeWxl2052=SourceDir\2052\wixpreq.wxl)" />
+            <Payload Name="2070\wixpreq.wxl" SourceFile="!(wix.WixPreqbaThemeWxl2070=SourceDir\2070\wixpreq.wxl)" />
+            <Payload Name="3082\wixpreq.wxl" SourceFile="!(wix.WixPreqbaThemeWxl3082=SourceDir\3082\wixpreq.wxl)" />
+            -->
+        </PayloadGroup>
+    </Fragment>
+</Wix>
diff --git a/src/ext/Bal/mbahost/precomp.cpp b/src/ext/Bal/wixprqba/precomp.cpp
index 37664a1c..37664a1c 100644
--- a/src/ext/Bal/mbahost/precomp.cpp
+++ b/src/ext/Bal/wixprqba/precomp.cpp
diff --git a/src/ext/Bal/wixprqba/precomp.h b/src/ext/Bal/wixprqba/precomp.h
new file mode 100644
index 00000000..8844d150
--- /dev/null
+++ b/src/ext/Bal/wixprqba/precomp.h
@@ -0,0 +1,47 @@
+#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>
+#pragma warning(push)
+#pragma warning(disable:4458) // declaration of 'xxx' hides class member
+#include <gdiplus.h>
+#pragma warning(pop)
+#include <msiquery.h>
+#include <objbase.h>
+#include <shlobj.h>
+#include <shlwapi.h>
+#include <stdlib.h>
+#include <strsafe.h>
+#include <stddef.h>
+#include <dutil.h>
+#include <apputil.h>
+#include <memutil.h>
+#include <dictutil.h>
+#include <dirutil.h>
+#include <fileutil.h>
+#include <locutil.h>
+#include <logutil.h>
+#include <pathutil.h>
+#include <resrutil.h>
+#include <shelutil.h>
+#include <strutil.h>
+#include <wndutil.h>
+#include <thmutil.h>
+#include <verutil.h>
+#include <uriutil.h>
+#include <xmlutil.h>
+#include <IBootstrapperEngine.h>
+#include <IBootstrapperApplication.h>
+#include <balutil.h>
+#include <balinfo.h>
+#include <balcondition.h>
+#include <BAFunctions.h>
+#include "WixStandardBootstrapperApplication.h"
diff --git a/src/ext/Bal/wixprqba/wixprqba.cpp b/src/ext/Bal/wixprqba/wixprqba.cpp
new file mode 100644
index 00000000..c6e5dfef
--- /dev/null
+++ b/src/ext/Bal/wixprqba/wixprqba.cpp
@@ -0,0 +1,25 @@
+// 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"
+EXTERN_C int WINAPI wWinMain(
+    __in HINSTANCE hInstance,
+    __in_opt HINSTANCE /* hPrevInstance */,
+    __in_z_opt LPWSTR /*lpCmdLine*/,
+    __in int /*nCmdShow*/
+    )
+{
+    HRESULT hr = S_OK;
+    IBootstrapperApplication* pApplication = NULL;
+    hr = CreateWixPrerequisiteBootstrapperApplication(hInstance, &pApplication);
+    ExitOnFailure(hr, "Failed to create WiX prerequisite bootstrapper application.");
+    hr = BootstrapperApplicationRun(pApplication);
+    ExitOnFailure(hr, "Failed to run WiX prerequisite bootstrapper application.");
+LExit:
+    ReleaseObject(pApplication);
+    return 0;
+}
diff --git a/src/ext/Bal/wixprqba/wixprqba.rc b/src/ext/Bal/wixprqba/wixprqba.rc
new file mode 100644
index 00000000..a029458e
--- /dev/null
+++ b/src/ext/Bal/wixprqba/wixprqba.rc
@@ -0,0 +1 @@
+// 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.
diff --git a/src/ext/Bal/mbahost/mbahost.vcxproj b/src/ext/Bal/wixprqba/wixprqba.vcxproj
index 7764e4d4..b992fe14 100644
--- a/src/ext/Bal/mbahost/mbahost.vcxproj
+++ b/src/ext/Bal/wixprqba/wixprqba.vcxproj
@@ -1,7 +1,7 @@
 <?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" Toolsxmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|ARM64">
      <Configuration>Debug</Configuration>
@@ -30,46 +30,59 @@
  </ItemGroup>
  <PropertyGroup Label="Globals">
-    <ProjectGuid>{12C87C77-3547-44F8-8134-29BC915CB19D}</ProjectGuid>
+    <ProjectGuid>{662B4347-1BC1-4042-B628-EC92B1158F4F}</ProjectGuid>
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <Keyword>Win32Proj</Keyword>
+    <ConfigurationType>Application</ConfigurationType>
+    <ProjectSubSystem>Windows</ProjectSubSystem>
    <CharacterSet>Unicode</CharacterSet>
-    <TargetName>mbahost</TargetName>
+    <Description>WiX Prerequisite Bootstrapper Application</Description>
-    <ProjectModuleDefinitionFile>mbahost.def</ProjectModuleDefinitionFile>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
  <PropertyGroup>
-    <ProjectAdditionalIncludeDirectories>$(BaseOutputPath)obj;..\wixstdba\inc</ProjectAdditionalIncludeDirectories>
+    <ProjectAdditionalIncludeDirectories>$(ProjectDir)..\stdbas\inc</ProjectAdditionalIncludeDirectories>
-    <ProjectAdditionalLinkLibraries>shlwapi.lib</ProjectAdditionalLinkLibraries>
+    <ProjectAdditionalLinkLibraries>comctl32.lib;gdiplus.lib;rpcrt4.lib;shlwapi.lib;wininet.lib;stdbas.res</ProjectAdditionalLinkLibraries>
  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <Link>
+      <DelayLoadDLLs>comctl32.dll;gdiplus.dll;shlwapi.dll;version.dll;wininet.dll</DelayLoadDLLs>
+      <AdditionalOptions>/DEPENDENTLOADFLAG:0x800 %(AdditionalOptions)</AdditionalOptions>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="precomp.h" />
+    <ClInclude Include="resource.h" />
+  </ItemGroup>
  <ItemGroup>
-    <ClCompile Include="mbahost.cpp" />
    <ClCompile Include="precomp.cpp">
      <PrecompiledHeader>Create</PrecompiledHeader>
    </ClCompile>
+    <ClCompile Include="wixprqba.cpp" />
  </ItemGroup>
  <ItemGroup>
-    <ClInclude Include="mbahost.h" />
+    <Manifest Include="..\stdbas\stdbas.manifest" />
-    <ClInclude Include="precomp.h" />
+    <ResourceCompile Include="wixprqba.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="mbahost.def" />
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\WixToolset.Mba.Host\WixToolset.Mba.Host.csproj">
+    <ProjectReference Include="..\stdbas\stdbas.vcxproj">
-      <Project>{f2ba1935-70fa-4156-b161-fd03850b4faa}</Project>
+      <Project>{DBBF5F32-BAEA-46A8-99A0-17277A906456}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-      <SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
    <PackageReference Include="WixToolset.BalUtil" />
    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
  </ItemGroup>
diff --git a/src/ext/Bal/wixstdba/Resources/dncpreq.thm b/src/ext/Bal/wixstdba/Resources/dncpreq.thm
deleted file mode 100644
index fda84004..00000000
--- a/src/ext/Bal/wixstdba/Resources/dncpreq.thm
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Theme xmlns="http://wixtoolset.org/schemas/v4/thmutil">
-    <Font Id="0" Height="-12" Weight="500" Foreground="windowtext" Background="window">Segoe UI</Font>
-    <Font Id="1" Height="-24" Weight="500" Foreground="windowtext">Segoe UI</Font>
-    <Font Id="2" Height="-22" Weight="500" Foreground="graytext">Segoe UI</Font>
-    <Font Id="3" Height="-12" Weight="500" Foreground="windowtext" Background="window">Segoe UI</Font>
-    <Window Width="485" Height="300" HexStyle="100a0000" FontId="0" Caption="#(loc.Caption)">
-        <ImageControl X="11" Y="11" Width="64" Height="64" ImageFile="mbapreq.png" Visible="yes"/>
-        <Label X="80" Y="11" Width="-11" Height="96" FontId="1" Visible="yes" DisablePrefix="yes">#(loc.Title)</Label>
-        <Page Name="Help">
-            <Label X="11" Y="112" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.HelpHeader)</Label>
-            <Label X="11" Y="153" Width="-11" Height="-35" FontId="3" DisablePrefix="yes">#(loc.HelpText)</Label>
-            <Button Name="HelpCloseButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">
-                <Text>#(loc.HelpCloseButton)</Text>
-                <CloseWindowAction />
-            </Button>
-        </Page>
-        <Page Name="Install">
-            <Hypertext Name="EulaHyperlink" X="11" Y="121" Width="-11" Height="34" TabStop="yes" FontId="3">#(loc.InstallLicenseTerms)</Hypertext>
-            <Button Name="InstallButton" X="-91" Y="-11" Width="130" Height="23" TabStop="yes" FontId="0">#(loc.InstallAcceptAndInstallButton)</Button>
-            <Button Name="InstallDeclineButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">
-                <Text>#(loc.InstallDeclineButton)</Text>
-                <CloseWindowAction />
-            </Button>
-        </Page>
-        <Page Name="Progress">
-            <Label X="11" Y="112" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.ProgressHeader)</Label>
-            <Label X="11" Y="153" Width="70" Height="17" FontId="3" DisablePrefix="yes">#(loc.ProgressLabel)</Label>
-            <Label Name="OverallProgressPackageText" X="85" Y="153" Width="-11" Height="17" FontId="3" DisablePrefix="yes">[ProgressPackageName]</Label>
-            <Progressbar Name="OverallCalculatedProgressbar" X="11" Y="175" Width="-11" Height="15" />
-            <Button Name="ProgressCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.ProgressCancelButton)</Button>
-        </Page>
-        <Page Name="Success">
-            <Label X="11" Y="112" Width="-11" Height="30" FontId="2" DisablePrefix="yes">
-                <Text>#(loc.SuccessHeader)</Text>
-            </Label>
-            <Label X="-11" Y="-20" Width="400" Height="34" FontId="3" DisablePrefix="yes">
-                <Text>#(loc.SuccessRestartText)</Text>
-            </Label>
-            <Button Name="SuccessRestartButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.SuccessRestartButton)</Button>
-            <Button Name="SuccessCloseButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">
-                <Text>#(loc.SuccessCloseButton)</Text>
-                <CloseWindowAction />
-            </Button>
-        </Page>
-        <Page Name="Failure">
-            <Label X="11" Y="112" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.FailureHeader)</Label>
-            <Hypertext Name="FailureLogFileLink" X="11" Y="153" Width="-11" Height="51" FontId="3" TabStop="yes" HideWhenDisabled="yes">#(loc.FailureLogLinkText)</Hypertext>
-            <Hypertext Name="FailureMessageText" X="22" Y="190" Width="-11" Height="51" FontId="3" TabStop="yes" HideWhenDisabled="yes"/>
-            <Label X="-11" Y="-20" Width="400" Height="34" FontId="3" DisablePrefix="yes" VisibleCondition="WixStdBARestartRequired">#(loc.FailureRestartText)</Label>
-            <Button Name="FailureRestartButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.FailureRestartButton)</Button>
-            <Button Name="FailureCloseButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">
-                <Text>#(loc.FailureCloseButton)</Text>
-                <CloseWindowAction />
-            </Button>
-        </Page>
-    </Window>
-</Theme>
diff --git a/src/ext/Bal/wixstdba/Resources/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/mbapreq.wxl
deleted file mode 100644
index c7df9ec8..00000000
--- a/src/ext/Bal/wixstdba/Resources/mbapreq.wxl
+++ /dev/null
@@ -1,36 +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. -->
-<WixLocalization Culture="en-us" Language="1033" xmlns="http://wixtoolset.org/schemas/v4/wxl">
-  <String Id="Caption" Value="[WixBundleName] Setup" />
-  <String Id="Title" Value="Microsoft .NET Framework required for [WixBundleName] setup" />
-  <String Id="ConfirmCancelMessage" Value="Are you sure you want to cancel?" />
-  <String Id="HelpHeader" Value="Setup Help" />
-  <String Id="HelpText" Value="/passive | /quiet -  displays minimal UI with no prompts or displays no UI and&#xA;   no prompts. By default UI and all prompts are displayed.&#xA;&#xA;/norestart   - suppress any attempts to restart. By default UI will prompt before restart.&#xA;/log log.txt - logs to a specific file. By default a log file is created in %TEMP%." />
-  <String Id="HelpCloseButton" Value="&amp;Close" />
-  <String Id="InstallLicenseTerms" Value="Click the &quot;Accept and Install&quot; button to accept the Microsoft .NET Framework &lt;a href=&quot;#&quot;&gt;license terms&lt;/a&gt;." />
-  <String Id="InstallAcceptAndInstallButton" Value="&amp;Accept and Install" />
-  <String Id="InstallDeclineButton" Value="&amp;Decline" />
-  <String Id="ProgressHeader" Value="Setup Progress" />
-  <String Id="ProgressLabel" Value="Processing:" />
-  <String Id="ProgressCancelButton" Value="&amp;Cancel" />
-  <String Id="SuccessHeader" Value="Microsoft .NET Framework Setup Successful" />
-  <String Id="SuccessRestartText" Value="You must restart your computer before [WixBundleName] setup can continue." />
-  <String Id="SuccessRestartButton" Value="&amp;Restart" />
-  <String Id="SuccessCloseButton" Value="&amp;Close" />
-  <String Id="FailureHeader" Value="Setup Failed" />
-  <String Id="FailureLogLinkText" Value="One or more issues caused the setup to fail. Please fix the issues and then retry setup. For more information see the &lt;a href=&quot;#&quot;&gt;log file&lt;/a&gt;." />
-  <String Id="FailureRestartText" Value="You must restart your computer to complete the rollback of the software." />
-  <String Id="FailureRestartButton" Value="&amp;Restart" />
-  <String Id="FailureCloseButton" Value="&amp;Close" />
-  <String Id="NET452WIN7RTMErrorMessage" Value="[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment." />
-  <String Id="PREREQBAINFINITELOOPErrorMessage" Value="[WixBundleName] failed to load the .NET Framework runtime even though all of the prerequisites are installed." />
-  <String Id="FilesInUseTitle" Value="Files In Use" />
-  <String Id="FilesInUseLabel" Value="The following applications are using files that need to be updated:" />
-  <String Id="FilesInUseNetfxCloseRadioButton" Value="Close the &amp;applications." />
-  <String Id="FilesInUseCloseRadioButton" Value="Close the &amp;applications and attempt to restart them." />
-  <String Id="FilesInUseDontCloseRadioButton" Value="&amp;Do not close applications. A reboot will be required." />
-  <String Id="FilesInUseRetryButton" Value="&amp;Retry" />
-  <String Id="FilesInUseIgnoreButton" Value="&amp;Ignore" />
-  <String Id="FilesInUseExitButton" Value="E&amp;xit" />
-</WixLocalization>
diff --git a/src/ext/Bal/wixstdba/inc/preqba.h b/src/ext/Bal/wixstdba/inc/preqba.h
deleted file mode 100644
index 25fa7105..00000000
--- a/src/ext/Bal/wixstdba/inc/preqba.h
+++ /dev/null
@@ -1,19 +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.
-struct PREQBA_DATA
-{
-    HRESULT hrFatalError;
-    BOOL fAlwaysInstallPrereqs;
-    BOOL fPerformHelp;
-    BOOL fPerformLayout;
-    BOOL fCompleted;
-};
-extern "C" typedef HRESULT(WINAPI* PFN_PREQ_BOOTSTRAPPER_APPLICATION_CREATE)(
-    __in PREQBA_DATA* pPreqData,
-    __in IBootstrapperEngine* pEngine,
-    __in const BOOTSTRAPPER_CREATE_ARGS* pArgs,
-    __inout BOOTSTRAPPER_CREATE_RESULTS* pResults
-    );
diff --git a/src/ext/Bal/wixstdba/precomp.h b/src/ext/Bal/wixstdba/precomp.h
index 290c125b..8844d150 100644
--- a/src/ext/Bal/wixstdba/precomp.h
+++ b/src/ext/Bal/wixstdba/precomp.h
@@ -35,8 +35,6 @@
 #include <uriutil.h>
 #include <xmlutil.h>
-#include <BootstrapperEngine.h>
-#include <BootstrapperApplication.h>
 #include <IBootstrapperEngine.h>
 #include <IBootstrapperApplication.h>
@@ -46,20 +44,4 @@
 #include <BAFunctions.h>
-#include "inc\preqba.h"
+#include "WixStandardBootstrapperApplication.h"
-#include "wixstdba.messages.h"
-HRESULT CreateBootstrapperApplication(
-    __in HMODULE hModule,
-    __in_opt PREQBA_DATA* pPrereqData,
-    __in IBootstrapperEngine* pEngine,
-    __in const BOOTSTRAPPER_CREATE_ARGS* pArgs,
-    __inout BOOTSTRAPPER_CREATE_RESULTS* pResults,
-    __out IBootstrapperApplication** ppApplication
-    );
-void DestroyBootstrapperApplication(
-    __in IBootstrapperApplication* pApplication,
-    __in const BOOTSTRAPPER_DESTROY_ARGS* pArgs,
-    __inout BOOTSTRAPPER_DESTROY_RESULTS* pResults
-    );
diff --git a/src/ext/Bal/wixstdba/resource.h b/src/ext/Bal/wixstdba/resource.h
deleted file mode 100644
index 149a8ff4..00000000
--- a/src/ext/Bal/wixstdba/resource.h
+++ /dev/null
@@ -1,15 +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.
-#define IDC_STATIC                      -1
-// Next default values for new objects
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        102
-#define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1003
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif
diff --git a/src/ext/Bal/wixstdba/wixstdba.cpp b/src/ext/Bal/wixstdba/wixstdba.cpp
index 47f3f677..1024848d 100644
--- a/src/ext/Bal/wixstdba/wixstdba.cpp
+++ b/src/ext/Bal/wixstdba/wixstdba.cpp
@@ -2,9 +2,6 @@
 #include "precomp.h"
-static HINSTANCE vhInstance = NULL;
-static IBootstrapperApplication* vpApplication = NULL;
 static void CALLBACK WixstdbaTraceError(
    __in_z LPCSTR szFile,
    __in int iLine,
@@ -15,94 +12,28 @@ static void CALLBACK WixstdbaTraceError(
    __in va_list args
    );
-extern "C" BOOL WINAPI DllMain(
+EXTERN_C int WINAPI wWinMain(
-    IN HINSTANCE hInstance,
+    __in HINSTANCE hInstance,
-    IN DWORD dwReason,
+    __in_opt HINSTANCE /* hPrevInstance */,
-    IN LPVOID /* pvReserved */
+    __in_z_opt LPWSTR /*lpCmdLine*/,
-    )
+    __in int /*nCmdShow*/
-{
-    switch(dwReason)
-    {
-    case DLL_PROCESS_ATTACH:
-        ::DisableThreadLibraryCalls(hInstance);
-        vhInstance = hInstance;
-        break;
-    case DLL_PROCESS_DETACH:
-        vhInstance = NULL;
-        break;
-    }
-    return TRUE;
-}
-extern "C" HRESULT WINAPI BootstrapperApplicationCreate(
-    __in const BOOTSTRAPPER_CREATE_ARGS* pArgs,
-    __inout BOOTSTRAPPER_CREATE_RESULTS* pResults
    )
 {
    HRESULT hr = S_OK;
-    IBootstrapperEngine* pEngine = NULL;
+    IBootstrapperApplication* pApplication = NULL;
    DutilInitialize(&WixstdbaTraceError);
-    hr = BalInitializeFromCreateArgs(pArgs, &pEngine);
+    hr = CreateWixStandardBootstrapperApplication(hInstance, &pApplication);
-    ExitOnFailure(hr, "Failed to initialize Bal.");
+    ExitOnFailure(hr, "Failed to create WiX standard bootstrapper application.");
-    hr = CreateBootstrapperApplication(vhInstance, NULL, pEngine, pArgs, pResults, &vpApplication);
+    hr = BootstrapperApplicationRun(pApplication);
-    BalExitOnFailure(hr, "Failed to create bootstrapper application interface.");
+    ExitOnFailure(hr, "Failed to run WiX standard bootstrapper application.");
 LExit:
-    ReleaseObject(pEngine);
+    ReleaseObject(pApplication);
-    return hr;
-}
-extern "C" void WINAPI BootstrapperApplicationDestroy(
-    __in const BOOTSTRAPPER_DESTROY_ARGS* pArgs,
-    __in BOOTSTRAPPER_DESTROY_RESULTS* pResults
-    )
-{
-    if (vpApplication)
-    {
-        DestroyBootstrapperApplication(vpApplication, pArgs, pResults);
-    }
-    ReleaseNullObject(vpApplication);
+    return 0;
-    BalUninitialize();
-    DutilUninitialize();
-}
-extern "C" HRESULT WINAPI PrereqBootstrapperApplicationCreate(
-    __in_opt PREQBA_DATA* pPrereqData,
-    __in IBootstrapperEngine* pEngine,
-    __in const BOOTSTRAPPER_CREATE_ARGS* pArgs,
-    __inout BOOTSTRAPPER_CREATE_RESULTS* pResults
-    )
-{
-    HRESULT hr = S_OK;
-    DutilInitialize(&WixstdbaTraceError);
-    BalInitialize(pEngine);
-    hr = CreateBootstrapperApplication(vhInstance, pPrereqData, pEngine, pArgs, pResults, &vpApplication);
-    BalExitOnFailure(hr, "Failed to create prerequisite bootstrapper application interface.");
-LExit:
-    return hr;
-}
-extern "C" void WINAPI PrereqBootstrapperApplicationDestroy(
-    __in const BOOTSTRAPPER_DESTROY_ARGS* pArgs,
-    __in BOOTSTRAPPER_DESTROY_RESULTS* pResults
-    )
-{
-    BootstrapperApplicationDestroy(pArgs, pResults);
 }
 static void CALLBACK WixstdbaTraceError(
diff --git a/src/ext/Bal/wixstdba/wixstdba.def b/src/ext/Bal/wixstdba/wixstdba.def
deleted file mode 100644
index e377196b..00000000
--- a/src/ext/Bal/wixstdba/wixstdba.def
+++ /dev/null
@@ -1,8 +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.
-EXPORTS
-    BootstrapperApplicationCreate
-    BootstrapperApplicationDestroy
-    PrereqBootstrapperApplicationCreate
-    PrereqBootstrapperApplicationDestroy
diff --git a/src/ext/Bal/wixstdba/wixstdba.rc b/src/ext/Bal/wixstdba/wixstdba.rc
new file mode 100644
index 00000000..a029458e
--- /dev/null
+++ b/src/ext/Bal/wixstdba/wixstdba.rc
@@ -0,0 +1 @@
+// 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.
diff --git a/src/ext/Bal/wixstdba/wixstdba.vcxproj b/src/ext/Bal/wixstdba/wixstdba.vcxproj
index 9df3d5fd..e8317fbf 100644
--- a/src/ext/Bal/wixstdba/wixstdba.vcxproj
+++ b/src/ext/Bal/wixstdba/wixstdba.vcxproj
@@ -1,7 +1,7 @@
 <?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" Toolsxmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|ARM64">
      <Configuration>Debug</Configuration>
@@ -31,49 +31,58 @@
  <PropertyGroup Label="Globals">
    <ProjectGuid>{41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}</ProjectGuid>
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <Keyword>Win32Proj</Keyword>
+    <ConfigurationType>Application</ConfigurationType>
+    <ProjectSubSystem>Windows</ProjectSubSystem>
    <CharacterSet>Unicode</CharacterSet>
-    <TargetName>WixStdBA</TargetName>
+    <Description>WiX Standard Bootstrapper Application</Description>
-    <ProjectModuleDefinitionFile>wixstdba.def</ProjectModuleDefinitionFile>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
  <PropertyGroup>
-    <ProjectAdditionalLinkLibraries>comctl32.lib;gdiplus.lib;msimg32.lib;shlwapi.lib;wininet.lib;wixstdba.res</ProjectAdditionalLinkLibraries>
+    <ProjectAdditionalIncludeDirectories>$(ProjectDir)..\stdbas\inc</ProjectAdditionalIncludeDirectories>
+    <ProjectAdditionalLinkLibraries>comctl32.lib;gdiplus.lib;rpcrt4.lib;shlwapi.lib;wininet.lib;stdbas.res</ProjectAdditionalLinkLibraries>
  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <Link>
+      <DelayLoadDLLs>comctl32.dll;gdiplus.dll;shlwapi.dll;version.dll;wininet.dll</DelayLoadDLLs>
+      <AdditionalOptions>/DEPENDENTLOADFLAG:0x800 %(AdditionalOptions)</AdditionalOptions>
+    </Link>
+  </ItemDefinitionGroup>
  <ItemGroup>
-    <ClCompile Include="precomp.cpp">
-      <PrecompiledHeader>Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="WixStandardBootstrapperApplication.cpp" />
-    <ClCompile Include="wixstdba.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="inc\preqba.h" />
    <ClInclude Include="precomp.h" />
    <ClInclude Include="resource.h" />
  </ItemGroup>
  <ItemGroup>
-    <None Include="wixstdba.def" />
+    <ClCompile Include="precomp.cpp">
+      <PrecompiledHeader>Create</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="wixstdba.cpp" />
  </ItemGroup>
  <ItemGroup>
-    <None Include="packages.config" />
+    <Manifest Include="..\stdbas\stdbas.manifest" />
+    <ResourceCompile Include="wixstdba.rc" />
  </ItemGroup>
  <ItemGroup>
-    <CustomBuild Include="wixstdba.mc">
+    <ProjectReference Include="..\stdbas\stdbas.vcxproj">
-      <Message>Compiling message file...</Message>
+      <Project>{DBBF5F32-BAEA-46A8-99A0-17277A906456}</Project>
-      <Command>mc.exe -h "$(IntDir)." -r "$(IntDir)." -A -c -z wixstdba.messages "$(InputDir)wixstdba.mc"
+    </ProjectReference>
-rc.exe -fo "$(OutDir)wixstdba.res" "$(IntDir)wixstdba.messages.rc"</Command>
-      <Outputs>$(IntDir)wixstdba.messages.h;$(IntDir)wixstdba.messages.rc</Outputs>
-    </CustomBuild>
  </ItemGroup>
  <ItemGroup>
    <PackageReference Include="WixToolset.BalUtil" />
    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
  </ItemGroup>
diff --git a/src/ext/Dependency/ca/wixdepca.cpp b/src/ext/Dependency/ca/wixdepca.cpp
index 87610420..dc967a1d 100644
--- a/src/ext/Dependency/ca/wixdepca.cpp
+++ b/src/ext/Dependency/ca/wixdepca.cpp
@@ -209,7 +209,7 @@ static HRESULT EnsureRequiredDependencies(
        // Send a yes/no message with a warning icon since continuing could be detrimental.
        // This is sent as a USER message to better detect whether a user or dependency-aware bootstrapper is responding
-        // or if Windows Installer or a dependency-unaware boostrapper is returning a typical default response.
+        // or if Windows Installer or a dependency-unaware bootstrapper is returning a typical default response.
        er = WcaProcessMessage(static_cast<INSTALLMESSAGE>(INSTALLMESSAGE_USER | MB_ICONWARNING | MB_YESNO | MB_DEFBUTTON2), hDependencyRec);
        switch (er)
        {
@@ -359,7 +359,7 @@ static HRESULT EnsureAbsentDependents(
        // Send a yes/no message with a warning icon since continuing could be detrimental.
        // This is sent as a USER message to better detect whether a user or dependency-aware bootstrapper is responding
-        // or if Windows Installer or a dependency-unaware boostrapper is returning a typical default response.
+        // or if Windows Installer or a dependency-unaware bootstrapper is returning a typical default response.
        er = WcaProcessMessage(static_cast<INSTALLMESSAGE>(INSTALLMESSAGE_USER | MB_ICONWARNING | MB_YESNO | MB_DEFBUTTON2), hDependencyRec);
        switch (er)
        {
diff --git a/src/ext/NetFx/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/NetCore3_Platform.wxi b/src/ext/NetFx/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/NetCore3_Platform.wxi
index affe0143..e8f981ea 100644
--- a/src/ext/NetFx/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/NetCore3_Platform.wxi
+++ b/src/ext/NetFx/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/NetCore3_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/ext/NetFx/wixlib/NetFx462.wxs b/src/ext/NetFx/wixlib/NetFx462.wxs
index 904d2be0..57407bcd 100644
--- a/src/ext/NetFx/wixlib/NetFx462.wxs
+++ b/src/ext/NetFx/wixlib/NetFx462.wxs
@@ -40,7 +40,7 @@
      <PackageGroupRef Id="$(var.NetFx462WebId)" />
    </PackageGroup>
-    <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx462WebId)" LicenseUrl="$(var.NetFx462EulaLink)" />
+    <bal:BootstrapperApplicationPrerequisiteInformation PackageId="$(var.NetFx462WebId)" LicenseUrl="$(var.NetFx462EulaLink)" />
  </Fragment>
  <Fragment>
@@ -62,6 +62,6 @@
      <PackageGroupRef Id="$(var.NetFx462RedistId)" />
    </PackageGroup>
-    <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx462RedistId)" LicenseUrl="$(var.NetFx462EulaLink)" />
+    <bal:BootstrapperApplicationPrerequisiteInformation PackageId="$(var.NetFx462RedistId)" LicenseUrl="$(var.NetFx462EulaLink)" />
  </Fragment>
 </Wix>
diff --git a/src/ext/NetFx/wixlib/NetFx472.wxs b/src/ext/NetFx/wixlib/NetFx472.wxs
index 15cb0de2..7d2ce72d 100644
--- a/src/ext/NetFx/wixlib/NetFx472.wxs
+++ b/src/ext/NetFx/wixlib/NetFx472.wxs
@@ -40,7 +40,7 @@
      <PackageGroupRef Id="$(var.NetFx472WebId)" />
    </PackageGroup>
-    <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx472WebId)" LicenseUrl="$(var.NetFx472EulaLink)" />
+    <bal:BootstrapperApplicationPrerequisiteInformation PackageId="$(var.NetFx472WebId)" LicenseUrl="$(var.NetFx472EulaLink)" />
  </Fragment>
  <Fragment>
@@ -62,6 +62,6 @@
      <PackageGroupRef Id="$(var.NetFx472RedistId)" />
    </PackageGroup>
-    <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx472RedistId)" LicenseUrl="$(var.NetFx472EulaLink)" />
+    <bal:BootstrapperApplicationPrerequisiteInformation PackageId="$(var.NetFx472RedistId)" LicenseUrl="$(var.NetFx472EulaLink)" />
  </Fragment>
 </Wix>
diff --git a/src/ext/NetFx/wixlib/NetFx48.wxs b/src/ext/NetFx/wixlib/NetFx48.wxs
index fc2f97f5..395a0b47 100644
--- a/src/ext/NetFx/wixlib/NetFx48.wxs
+++ b/src/ext/NetFx/wixlib/NetFx48.wxs
@@ -40,7 +40,7 @@
      <PackageGroupRef Id="$(var.NetFx48WebId)" />
    </PackageGroup>
-    <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx48WebId)" LicenseUrl="$(var.NetFx48EulaLink)" />
+    <bal:BootstrapperApplicationPrerequisiteInformation PackageId="$(var.NetFx48WebId)" LicenseUrl="$(var.NetFx48EulaLink)" />
  </Fragment>
  <Fragment>
@@ -62,6 +62,6 @@
      <PackageGroupRef Id="$(var.NetFx48RedistId)" />
    </PackageGroup>
-    <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx48RedistId)" LicenseUrl="$(var.NetFx48EulaLink)" />
+    <bal:BootstrapperApplicationPrerequisiteInformation PackageId="$(var.NetFx48RedistId)" LicenseUrl="$(var.NetFx48EulaLink)" />
  </Fragment>
 </Wix>
diff --git a/src/ext/NetFx/wixlib/NetFx481.wxs b/src/ext/NetFx/wixlib/NetFx481.wxs
index b0da8bb0..dc29a585 100644
--- a/src/ext/NetFx/wixlib/NetFx481.wxs
+++ b/src/ext/NetFx/wixlib/NetFx481.wxs
@@ -63,7 +63,7 @@
      <PackageGroupRef Id="$(var.NetFx481WebId)" />
    </PackageGroup>
-    <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx481WebId)" LicenseUrl="$(var.NetFx481EulaLink)" />
+    <bal:BootstrapperApplicationPrerequisiteInformation PackageId="$(var.NetFx481WebId)" LicenseUrl="$(var.NetFx481EulaLink)" />
  </Fragment>
  <Fragment>
@@ -74,28 +74,28 @@
    <WixVariable Id="NetFx481RedistPackageDirectory" Value="redist\" Overridable="yes" />
    <PackageGroup Id="$(var.NetFx481RedistId)">
-      <ExePackage 
+      <ExePackage
-        CacheId="$(var.NetFx481RedistId)_AFBF0B8B6A18F7E23CCA1DDCD0AC1A55B4035173" 
+        CacheId="$(var.NetFx481RedistId)_AFBF0B8B6A18F7E23CCA1DDCD0AC1A55B4035173"
-        InstallArguments="/q /norestart /log &quot;[NetFx481RedistLog].html&quot;" 
+        InstallArguments="/q /norestart /log &quot;[NetFx481RedistLog].html&quot;"
-        PerMachine="yes" 
+        PerMachine="yes"
-        DetectCondition="!(wix.NetFx481RedistDetectCondition)" 
+        DetectCondition="!(wix.NetFx481RedistDetectCondition)"
-        InstallCondition="!(wix.NetFx481RedistInstallCondition)" 
+        InstallCondition="!(wix.NetFx481RedistInstallCondition)"
-        Id="$(var.NetFx481RedistId)" 
+        Id="$(var.NetFx481RedistId)"
-        Vital="yes" 
+        Vital="yes"
-        Permanent="yes" 
+        Permanent="yes"
-        Protocol="netfx4" 
+        Protocol="netfx4"
-        LogPathVariable="NetFx481RedistLog" 
+        LogPathVariable="NetFx481RedistLog"
        Cache="remove">
-        <ExePackagePayload 
+        <ExePackagePayload
-          Name="!(wix.NetFx481RedistPackageDirectory)ndp481-x86-x64-allos-enu.exe" 
+          Name="!(wix.NetFx481RedistPackageDirectory)ndp481-x86-x64-allos-enu.exe"
-          DownloadUrl="$(var.NetFx481RedistLink)" 
+          DownloadUrl="$(var.NetFx481RedistLink)"
-          ProductName="Microsoft .NET Framework 4.8.1" 
+          ProductName="Microsoft .NET Framework 4.8.1"
-          Description="Microsoft .NET Framework 4.8.1 Setup" 
+          Description="Microsoft .NET Framework 4.8.1 Setup"
-          CertificatePublicKey="0A7D1EFF01D4EBAD21E85C51499576EBAA40E676" 
+          CertificatePublicKey="0A7D1EFF01D4EBAD21E85C51499576EBAA40E676"
-          CertificateThumbprint="AFBF0B8B6A18F7E23CCA1DDCD0AC1A55B4035173" 
+          CertificateThumbprint="AFBF0B8B6A18F7E23CCA1DDCD0AC1A55B4035173"
-          Size="63610344" 
+          Size="63610344"
-          Version="4.8.09037.06" 
+          Version="4.8.09037.06"
          />
      </ExePackage>
    </PackageGroup>
@@ -106,6 +106,6 @@
      <PackageGroupRef Id="$(var.NetFx481RedistId)" />
    </PackageGroup>
-    <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx481RedistId)" LicenseUrl="$(var.NetFx481EulaLink)" />
+    <bal:BootstrapperApplicationPrerequisiteInformation PackageId="$(var.NetFx481RedistId)" LicenseUrl="$(var.NetFx481EulaLink)" />
  </Fragment>
 </Wix>
diff --git a/src/ext/Util/ca/test.cpp b/src/ext/Util/ca/test.cpp
index c4d215f0..e9d02ed3 100644
--- a/src/ext/Util/ca/test.cpp
+++ b/src/ext/Util/ca/test.cpp
@@ -216,7 +216,7 @@ static DWORD WINAPI ThreadProc(
    // Create the window to handle reboots without activating it.
    hWnd = ::CreateWindowExW(WS_EX_TOOLWINDOW, wc.lpszClassName, NULL, WS_POPUP | WS_VISIBLE, CW_USEDEFAULT, SW_SHOWNA, 0, 0, HWND_DESKTOP, NULL, pContext->hInstance, NULL);
-    ExitOnNullWithLastError(hWnd, hr, "Failed to create window.");
+    ExitOnNullWithLastError(hWnd, hr, "Failed to create test UI thread window.");
    // Persist the window handle and let the caller know we've initialized.
    pContext->hWnd = hWnd;
diff --git a/src/ext/Util/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.wxs b/src/ext/Util/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.wxs
index 45147066..09ce72a5 100644
--- a/src/ext/Util/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.wxs
+++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/BundleWithSearches/Bundle.wxs
@@ -1,8 +1,6 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
    <Bundle Name="!(loc.BundleName)" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
-        <BootstrapperApplication>
+        <BootstrapperApplication SourceFile="fakeba.dll" />
-            <BootstrapperApplicationDll SourceFile="fakeba.dll" />
-        </BootstrapperApplication>
        <util:RegistrySearchRef Id="RegistrySearchId" />
        <util:RegistrySearchRef Id="RegistrySearchId64" />
diff --git a/src/ext/Util/test/WixToolsetTest.Util/TestData/BundleWithSearches/BundleUsingBuiltinVariableNames.wxs b/src/ext/Util/test/WixToolsetTest.Util/TestData/BundleWithSearches/BundleUsingBuiltinVariableNames.wxs
index cc7162d7..db36f9b4 100644
--- a/src/ext/Util/test/WixToolsetTest.Util/TestData/BundleWithSearches/BundleUsingBuiltinVariableNames.wxs
+++ b/src/ext/Util/test/WixToolsetTest.Util/TestData/BundleWithSearches/BundleUsingBuiltinVariableNames.wxs
@@ -1,8 +1,6 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
    <Bundle Name="!(loc.BundleName)" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
-        <BootstrapperApplication>
+        <BootstrapperApplication SourceFile="fakeba.dll" />
-            <BootstrapperApplicationDll SourceFile="fakeba.dll" />
-        </BootstrapperApplication>
        <util:RegistrySearchRef Id="RegistrySearchId" />
        <util:RegistrySearchRef Id="RegistrySearchId64" />
diff --git a/src/ext/Util/wixext/UtilCompiler.cs b/src/ext/Util/wixext/UtilCompiler.cs
index f7bb0614..6221c052 100644
--- a/src/ext/Util/wixext/UtilCompiler.cs
+++ b/src/ext/Util/wixext/UtilCompiler.cs
@@ -800,7 +800,7 @@ namespace WixToolset.Util
            }
            var componentKeyPath = this.CreateComponentKeyPath();
-            componentKeyPath.Id = id.Id;
+            componentKeyPath.Id = id;
            componentKeyPath.Explicit = isKeyPath;
            componentKeyPath.Type = PossibleKeyPathType.Registry;
            return componentKeyPath;