61 files changed, 256 insertions, 1010 deletions
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)"'