Add tests for WixBA.

16 files changed, 202 insertions, 149 deletions

diff --git a/src/test/burn/BurnE2ETests.sln b/src/test/burn/BurnE2ETests.sln
index f7850250..5d69855c 100644
--- a/src/test/burn/BurnE2ETests.sln
+++ b/src/test/burn/BurnE2ETests.sln
@@ -9,6 +9,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestExe", "TestExe\TestExe.
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixTestTools", "WixTestTools\WixTestTools.csproj", "{3D3B02F3-79B6-4BD5-AD49-2889DA3849A7}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.WixBA", "WixToolset.WixBA\WixToolset.WixBA.csproj", "{7C27518B-84AD-4679-8EF4-29DF552CF1AC}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.BurnE2E", "WixToolsetTest.BurnE2E\WixToolsetTest.BurnE2E.csproj", "{FED9D707-E5C3-4867-87B0-FABDB5EB0823}"
 EndProject
 Global
@@ -69,6 +71,18 @@ Global
                 {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Release|x64.Build.0 = Release|Any CPU
                 {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Release|x86.ActiveCfg = Release|Any CPU
                 {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Release|x86.Build.0 = Release|Any CPU
+                {7C27518B-84AD-4679-8EF4-29DF552CF1AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {7C27518B-84AD-4679-8EF4-29DF552CF1AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {7C27518B-84AD-4679-8EF4-29DF552CF1AC}.Debug|x64.ActiveCfg = Debug|Any CPU
+                {7C27518B-84AD-4679-8EF4-29DF552CF1AC}.Debug|x64.Build.0 = Debug|Any CPU
+                {7C27518B-84AD-4679-8EF4-29DF552CF1AC}.Debug|x86.ActiveCfg = Debug|Any CPU
+                {7C27518B-84AD-4679-8EF4-29DF552CF1AC}.Debug|x86.Build.0 = Debug|Any CPU
+                {7C27518B-84AD-4679-8EF4-29DF552CF1AC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {7C27518B-84AD-4679-8EF4-29DF552CF1AC}.Release|Any CPU.Build.0 = Release|Any CPU
+                {7C27518B-84AD-4679-8EF4-29DF552CF1AC}.Release|x64.ActiveCfg = Release|Any CPU
+                {7C27518B-84AD-4679-8EF4-29DF552CF1AC}.Release|x64.Build.0 = Release|Any CPU
+                {7C27518B-84AD-4679-8EF4-29DF552CF1AC}.Release|x86.ActiveCfg = Release|Any CPU
+                {7C27518B-84AD-4679-8EF4-29DF552CF1AC}.Release|x86.Build.0 = Release|Any CPU
         EndGlobalSection
         GlobalSection(SolutionProperties) = preSolution
                 HideSolutionNode = FALSE
diff --git a/src/test/burn/TestData/BasicFunctionalityTests/BundleD/BundleD.wixproj b/src/test/burn/TestData/BasicFunctionalityTests/BundleD/BundleD.wixproj
new file mode 100644
index 00000000..a2af1aa5
--- /dev/null
+++ b/src/test/burn/TestData/BasicFunctionalityTests/BundleD/BundleD.wixproj
@@ -0,0 +1,20 @@
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+<Project Sdk="WixToolset.Sdk">
+  <PropertyGroup>
+    <OutputType>Bundle</OutputType>
+    <BA>WixBA</BA>
+    <UpgradeCode>{2557AA80-E432-48BF-BF01-DD27DD1BD291}</UpgradeCode>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
+    <Compile Include="..\BundleA\BundleA.wxs" Link="BundleD.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PackageA\PackageA.wixproj" />
+    <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.NetFx.wixext" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/test/burn/TestData/BasicFunctionalityTests/BundleD_x64/BundleD_x64.wixproj b/src/test/burn/TestData/BasicFunctionalityTests/BundleD_x64/BundleD_x64.wixproj
new file mode 100644
index 00000000..338d523d
--- /dev/null
+++ b/src/test/burn/TestData/BasicFunctionalityTests/BundleD_x64/BundleD_x64.wixproj
@@ -0,0 +1,21 @@
+<!-- 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">
+  <PropertyGroup>
+    <OutputType>Bundle</OutputType>
+    <BA>WixBAdnc_x64</BA>
+    <UpgradeCode>{62E3DFA4-6849-44F0-93A1-C8F60DBB76E3}</UpgradeCode>
+    <InstallerPlatform>x64</InstallerPlatform>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
+    <Compile Include="..\BundleA_x64\BundleA_x64.wxs" Link="BundleD_x64.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PackageA_x64\PackageA_x64.wixproj" />
+    <ProjectReference Include="..\..\TestBA\TestBAWixlib_x64\testbawixlib_x64.wixproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.NetFx.wixext" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/test/burn/TestData/Templates/Bundle.wxs b/src/test/burn/TestData/Templates/Bundle.wxs
index 06409504..b211d9c3 100644
--- a/src/test/burn/TestData/Templates/Bundle.wxs
+++ b/src/test/burn/TestData/Templates/Bundle.wxs
@@ -22,6 +22,10 @@
       <!-- pulled in through the PackageGroupRef below -->
     <?elseif $(var.BA) = "TestBAdnc_x64"?>
       <!-- pulled in through the PackageGroupRef below -->
+    <?elseif $(var.BA) = "WixBA"?>
+      <!-- pulled in through the PackageGroupRef below -->
+    <?elseif $(var.BA) = "WixBAdnc_x64"?>
+      <!-- pulled in through the PackageGroupRef below -->
     <?elseif $(var.BA) = "hyperlinkLicense"?>
       <BootstrapperApplication>
         <bal:WixStandardBootstrapperApplication LicenseUrl="" Theme="hyperlinkLicense" />
@@ -39,6 +43,10 @@
         <PackageGroupRef Id="TestBA_x64" />
       <?elseif $(var.BA) = "TestBAdnc_x64"?>
         <PackageGroupRef Id="TestBAdnc_x64" />
+      <?elseif $(var.BA) = "WixBA"?>
+        <PackageGroupRef Id="WixBA" />
+      <?elseif $(var.BA) = "WixBAdnc_x64"?>
+        <PackageGroupRef Id="WixBAdnc_x64" />
       <?endif?>
 
       <PackageGroupRef Id="BundlePackages" />
diff --git a/src/test/burn/TestData/TestBA/TestBAWixlib/WixBA.wxs b/src/test/burn/TestData/TestBA/TestBAWixlib/WixBA.wxs
new file mode 100644
index 00000000..c6da2a17
--- /dev/null
+++ b/src/test/burn/TestData/TestBA/TestBAWixlib/WixBA.wxs
@@ -0,0 +1,17 @@
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
+  <Fragment>
+    <BootstrapperApplication>
+      <Payload Name="WixToolset.Mba.Host.config" SourceFile="!(bindpath.net4x86)\WixBA.BootstrapperCore.config" />
+      <Payload SourceFile="!(bindpath.net4x86)\WixToolset.WixBA.dll" />
+      <Payload SourceFile="!(bindpath.net4x86)\mbanative.dll" />
+      <Payload SourceFile="!(bindpath.net4x86)\WixToolset.Mba.Core.dll" />
+      <Payload SourceFile='..\..\..\..\..\..\License.txt' />
+      <bal:WixManagedBootstrapperApplicationHost />
+    </BootstrapperApplication>
+
+    <PackageGroup Id="WixBA">
+      <PackageGroupRef Id="NetFx48WebAsPrereq" />
+    </PackageGroup>
+  </Fragment>
+</Wix>
diff --git a/src/test/burn/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj b/src/test/burn/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj
index d2ab7907..fa153974 100644
--- a/src/test/burn/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj
+++ b/src/test/burn/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj
@@ -7,11 +7,13 @@
   </PropertyGroup>
   <ItemGroup>
     <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net35\win-x86" BindName="net2x86" />
+    <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net45\win-x86" BindName="net4x86" />
     <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net5.0-windows\win-x86" BindName="dnc5x86" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\TestBA\TestBA.csproj" />
     <ProjectReference Include="..\..\..\TestExe\TestExe.csproj" />
+    <ProjectReference Include="..\..\..\WixToolset.WixBA\WixToolset.WixBA.csproj" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="WixToolset.Bal.wixext" />
diff --git a/src/test/burn/TestData/TestBA/TestBAWixlib_x64/WixBA_x64.wxs b/src/test/burn/TestData/TestBA/TestBAWixlib_x64/WixBA_x64.wxs
new file mode 100644
index 00000000..f28b6b70
--- /dev/null
+++ b/src/test/burn/TestData/TestBA/TestBAWixlib_x64/WixBA_x64.wxs
@@ -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. -->
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
+  <Fragment>
+    <BootstrapperApplication>
+      <Payload SourceFile="!(bindpath.dnc5x64)\WixToolset.WixBA.deps.json" />
+      <Payload SourceFile="!(bindpath.dnc5x64)\WixToolset.WixBA.dll" bal:BAFactoryAssembly="yes" />
+      <Payload SourceFile="!(bindpath.dnc5x64)\WixToolset.WixBA.runtimeconfig.json" />
+      <Payload SourceFile="!(bindpath.dnc5x64)\mbanative.dll" />
+      <Payload SourceFile="!(bindpath.dnc5x64)\WixToolset.Mba.Core.dll" />
+      <Payload SourceFile='..\..\..\..\..\..\License.txt' />
+      <bal:WixDotNetCoreBootstrapperApplicationHost />
+    </BootstrapperApplication>
+
+    <PackageGroup Id="WixBAdnc_x64">
+      <PackageGroupRef Id="NetFx48WebAsPrereq" /> <!-- Yes, this is wrong but we don't have .NET 5 packages yet -->
+    </PackageGroup>
+  </Fragment>
+</Wix>
diff --git a/src/test/burn/TestData/TestBA/TestBAWixlib_x64/testbawixlib_x64.wixproj b/src/test/burn/TestData/TestBA/TestBAWixlib_x64/testbawixlib_x64.wixproj
index 7f3c5890..9055382f 100644
--- a/src/test/burn/TestData/TestBA/TestBAWixlib_x64/testbawixlib_x64.wixproj
+++ b/src/test/burn/TestData/TestBA/TestBAWixlib_x64/testbawixlib_x64.wixproj
@@ -8,11 +8,13 @@
   </PropertyGroup>
   <ItemGroup>
     <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net35\win-x64" BindName="net2x64" />
+    <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net45\win-x64" BindName="net4x64" />
     <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net5.0-windows\win-x64" BindName="dnc5x64" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\TestBA\TestBA_x64.csproj" />
     <ProjectReference Include="..\..\..\TestExe\TestExe_x64.csproj" />
+    <ProjectReference Include="..\..\..\WixToolset.WixBA\WixToolset.WixBA_x64.csproj" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="WixToolset.Bal.wixext" />
diff --git a/src/test/burn/WixToolset.WixBA/InstallationViewModel.cs b/src/test/burn/WixToolset.WixBA/InstallationViewModel.cs
index 2beebd02..410ab110 100644
--- a/src/test/burn/WixToolset.WixBA/InstallationViewModel.cs
+++ b/src/test/burn/WixToolset.WixBA/InstallationViewModel.cs
@@ -461,8 +461,8 @@ namespace WixToolset.WixBA
 
         private void PlanPackageBegin(object sender, PlanPackageBeginEventArgs e)
         {
-            // If we're able to run our BA, we don't want to install the .NET Framework since the framework on the machine is already good enough.
-            if ( e.PackageId.StartsWith("NetFx4", StringComparison.OrdinalIgnoreCase))
+            // If we're able to run our BA, we don't want to install .NET since the one on the machine is already good enough.
+            if (e.PackageId.StartsWith("NetFx4", StringComparison.OrdinalIgnoreCase) || e.PackageId.StartsWith("DesktopNetCoreRuntime", StringComparison.OrdinalIgnoreCase))
             {
                 e.State = RequestState.None;
             }
diff --git a/src/test/burn/WixToolset.WixBA/RootView.xaml b/src/test/burn/WixToolset.WixBA/RootView.xaml
index b7d535d1..df638c4d 100644
--- a/src/test/burn/WixToolset.WixBA/RootView.xaml
+++ b/src/test/burn/WixToolset.WixBA/RootView.xaml
@@ -19,7 +19,7 @@
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="pack://application:,,,/WixBA;component/Styles.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/WixToolset.WixBA;component/Styles.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Window.Resources>
diff --git a/src/test/burn/WixToolset.WixBA/Styles.xaml b/src/test/burn/WixToolset.WixBA/Styles.xaml
index fa0afc4f..4e0b21a8 100644
--- a/src/test/burn/WixToolset.WixBA/Styles.xaml
+++ b/src/test/burn/WixToolset.WixBA/Styles.xaml
@@ -18,8 +18,8 @@
     <System:Double x:Key="FontSizeButton">14</System:Double>
 
     <!-- Images -->
-    <BitmapImage x:Key="LogoOverLightBackground" UriSource="pack://application:,,,/WixBA;component/resources/logo-white-hollow.png" />
-    <BitmapImage x:Key="LogoOverDarkBackground" UriSource="pack://application:,,,/WixBA;component/resources/logo-black-hollow.png" />
+    <BitmapImage x:Key="LogoOverLightBackground" UriSource="pack://application:,,,/WixToolset.WixBA;component/resources/logo-white-hollow.png" />
+    <BitmapImage x:Key="LogoOverDarkBackground" UriSource="pack://application:,,,/WixToolset.WixBA;component/resources/logo-black-hollow.png" />
 
     <!-- Colors -->
     <Color x:Key="ProgressIndicatorColor">#FF1EF1E8</Color>
diff --git a/src/test/burn/WixToolset.WixBA/UpdateViewModel.cs b/src/test/burn/WixToolset.WixBA/UpdateViewModel.cs
index 80d894cb..dc98c858 100644
--- a/src/test/burn/WixToolset.WixBA/UpdateViewModel.cs
+++ b/src/test/burn/WixToolset.WixBA/UpdateViewModel.cs
@@ -38,6 +38,7 @@ namespace WixToolset.WixBA
             WixBA.Model.Bootstrapper.DetectUpdateBegin += this.DetectUpdateBegin;
             WixBA.Model.Bootstrapper.DetectUpdate += this.DetectUpdate;
             WixBA.Model.Bootstrapper.DetectUpdateComplete += this.DetectUpdateComplete;
+            WixBA.Model.Bootstrapper.DetectComplete += this.DetectComplete;
 
             this.root.PropertyChanged += new PropertyChangedEventHandler(this.RootPropertyChanged);
 
@@ -201,7 +202,15 @@ namespace WixToolset.WixBA
             else if ((LaunchAction.Uninstall == WixBA.Model.Command.Action) || (UpdateState.Initializing == this.State) || (UpdateState.Checking == this.State))
             {
                 this.State = UpdateState.Unknown;
-            }            
+            }
+        }
+
+        private void DetectComplete(object sender, DetectCompleteEventArgs e)
+        {
+            if (this.State == UpdateState.Initializing || this.State == UpdateState.Checking)
+            {
+                this.State = UpdateState.Unknown;
+            }
         }
     }
 }
diff --git a/src/test/burn/WixToolset.WixBA/WixBA.cs b/src/test/burn/WixToolset.WixBA/WixBA.cs
index 2d680c7e..68288f2d 100644
--- a/src/test/burn/WixToolset.WixBA/WixBA.cs
+++ b/src/test/burn/WixToolset.WixBA/WixBA.cs
@@ -163,19 +163,19 @@ namespace WixToolset.WixBA
             WixBA.Model = new Model(this);
             WixBA.Dispatcher = Threading.Dispatcher.CurrentDispatcher;
             RootViewModel viewModel = new RootViewModel();
-
-            // Kick off detect which will populate the view models.
-            this.Engine.Detect();
+            WixBA.View = new RootView(viewModel);
 
             // Create a Window to show UI.
             if (WixBA.Model.Command.Display == Display.Passive ||
                 WixBA.Model.Command.Display == Display.Full)
             {
                 this.Engine.Log(LogLevel.Verbose, "Creating a UI.");
-                WixBA.View = new RootView(viewModel);
                 WixBA.View.Show();
             }
 
+            // Kick off detect which will populate the view models.
+            this.Engine.Detect();
+
             Threading.Dispatcher.Run();
 
             this.PostTelemetry();
diff --git a/src/test/burn/WixToolset.WixBA/WixToolset.WixBA.csproj b/src/test/burn/WixToolset.WixBA/WixToolset.WixBA.csproj
index 72ef5795..2a2a0073 100644
--- a/src/test/burn/WixToolset.WixBA/WixToolset.WixBA.csproj
+++ b/src/test/burn/WixToolset.WixBA/WixToolset.WixBA.csproj
@@ -2,7 +2,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="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net45</TargetFramework>
+    <TargetFrameworks>net45;net5.0-windows</TargetFrameworks>
     <AssemblyName>WixToolset.WixBA</AssemblyName>
     <RootNamespace>WixToolset.WixBA</RootNamespace>
     <DebugType>embedded</DebugType>
@@ -13,38 +13,28 @@
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
     <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+    <EnableDynamicLoading>true</EnableDynamicLoading>
+    <UseWPF>true</UseWPF>
+    <RollForward>Major</RollForward>
+    <!-- https://stackoverflow.com/questions/58844785/how-to-reference-system-windows-forms-in-net-core-3-0-for-wpf-apps -->
+    <UseWindowsForms>true</UseWindowsForms>
   </PropertyGroup>
-  <ItemGroup>
-    <Page Include="Styles.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="RootView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <None Include="WixBA.BootstrapperCore.config">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <SubType>Designer</SubType>
-    </None>
+  <ItemGroup Condition="'$(TargetFramework)'=='net45'">
+    <Content Include="WixBA.BootstrapperCore.config" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\logo-white-hollow.png" />
     <Resource Include="Resources\logo-black-hollow.png" />
   </ItemGroup>
-  <ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)'=='net45'">
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xaml" />
     <Reference Include="WindowsBase" />
   </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="WixToolset.Mba.Core" Version="4.0.0-preview.0-build.0" />
-  </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
-    <PackageReference Include="GitInfo" Version="2.1.2" PrivateAssets="All" />
+    <PackageReference Include="WixToolset.Mba.Core" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/test/burn/WixToolset.WixBA/WixToolset.WixBA_x64.csproj b/src/test/burn/WixToolset.WixBA/WixToolset.WixBA_x64.csproj
new file mode 100644
index 00000000..bc1aa7bf
--- /dev/null
+++ b/src/test/burn/WixToolset.WixBA/WixToolset.WixBA_x64.csproj
@@ -0,0 +1,40 @@
+<?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>
+    <TargetFrameworks>net45;net5.0-windows</TargetFrameworks>
+    <AssemblyName>WixToolset.WixBA</AssemblyName>
+    <RootNamespace>WixToolset.WixBA</RootNamespace>
+    <DebugType>embedded</DebugType>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <AssemblyTitle>WixToolset.WixBA</AssemblyTitle>
+    <Description>WiX Bootstrapper Application</Description>
+    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
+    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
+    <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
+    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+    <EnableDynamicLoading>true</EnableDynamicLoading>
+    <UseWPF>true</UseWPF>
+    <RollForward>Major</RollForward>
+    <!-- https://stackoverflow.com/questions/58844785/how-to-reference-system-windows-forms-in-net-core-3-0-for-wpf-apps -->
+    <UseWindowsForms>true</UseWindowsForms>
+  </PropertyGroup>
+  <ItemGroup Condition="'$(TargetFramework)'=='net45'">
+    <Content Include="WixBA.BootstrapperCore.config" CopyToOutputDirectory="PreserveNewest" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\logo-white-hollow.png" />
+    <Resource Include="Resources\logo-black-hollow.png" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)'=='net45'">
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xaml" />
+    <Reference Include="WindowsBase" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Mba.Core" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/test/burn/WixToolsetTest.BurnE2E/BasicFunctionalityTests.cs b/src/test/burn/WixToolsetTest.BurnE2E/BasicFunctionalityTests.cs
index 5df86fff..f8361d90 100644
--- a/src/test/burn/WixToolsetTest.BurnE2E/BasicFunctionalityTests.cs
+++ b/src/test/burn/WixToolsetTest.BurnE2E/BasicFunctionalityTests.cs
@@ -14,163 +14,75 @@ namespace WixToolsetTest.BurnE2E
         [Fact]
         public void CanInstallAndUninstallSimpleBundle_x86_wixstdba()
         {
-            var packageA = this.CreatePackageInstaller("PackageA");
-
-            var bundleA = this.CreateBundleInstaller("BundleA");
-
-            var packageASourceCodeInstalled = packageA.GetInstalledFilePath("Package.wxs");
-
-            // Source file should *not* be installed
-            Assert.False(File.Exists(packageASourceCodeInstalled), $"Package A payload should not be there on test start: {packageASourceCodeInstalled}");
-
-            bundleA.Install();
-
-            var cachedBundlePath = bundleA.VerifyRegisteredAndInPackageCache();
-
-            // Source file should be installed
-            Assert.True(File.Exists(packageASourceCodeInstalled), String.Concat("Should have found Package A payload installed at: ", packageASourceCodeInstalled));
-
-            bundleA.Uninstall(cachedBundlePath);
-
-            // Source file should *not* be installed
-            Assert.False(File.Exists(packageASourceCodeInstalled), String.Concat("Package A payload should have been removed by uninstall from: ", packageASourceCodeInstalled));
-
-            bundleA.VerifyUnregisteredAndRemovedFromPackageCache(cachedBundlePath);
+            this.CanInstallAndUninstallSimpleBundle("PackageA", "BundleA");
         }
 
         [Fact]
         public void CanInstallAndUninstallSimpleBundle_x86_testba()
         {
-            var packageA = this.CreatePackageInstaller("PackageA");
-
-            var bundleB = this.CreateBundleInstaller("BundleB");
-
-            var packageASourceCodeInstalled = packageA.GetInstalledFilePath("Package.wxs");
-
-            // Source file should *not* be installed
-            Assert.False(File.Exists(packageASourceCodeInstalled), $"Package A payload should not be there on test start: {packageASourceCodeInstalled}");
-
-            bundleB.Install();
-
-            var cachedBundlePath = bundleB.VerifyRegisteredAndInPackageCache();
-
-            // Source file should be installed
-            Assert.True(File.Exists(packageASourceCodeInstalled), String.Concat("Should have found Package A payload installed at: ", packageASourceCodeInstalled));
-
-            bundleB.Uninstall(cachedBundlePath);
-
-            // Source file should *not* be installed
-            Assert.False(File.Exists(packageASourceCodeInstalled), String.Concat("Package A payload should have been removed by uninstall from: ", packageASourceCodeInstalled));
-
-            bundleB.VerifyUnregisteredAndRemovedFromPackageCache(cachedBundlePath);
+            this.CanInstallAndUninstallSimpleBundle("PackageA", "BundleB");
         }
 
         [Fact]
         public void CanInstallAndUninstallSimpleBundle_x86_dnctestba()
         {
-            var packageA = this.CreatePackageInstaller("PackageA");
-
-            var bundleC = this.CreateBundleInstaller("BundleC");
-
-            var packageASourceCodeInstalled = packageA.GetInstalledFilePath("Package.wxs");
-
-            // Source file should *not* be installed
-            Assert.False(File.Exists(packageASourceCodeInstalled), $"Package A payload should not be there on test start: {packageASourceCodeInstalled}");
-
-            bundleC.Install();
-
-            var cachedBundlePath = bundleC.VerifyRegisteredAndInPackageCache();
-
-            // Source file should be installed
-            Assert.True(File.Exists(packageASourceCodeInstalled), String.Concat("Should have found Package A payload installed at: ", packageASourceCodeInstalled));
-
-            bundleC.Uninstall(cachedBundlePath);
-
-            // Source file should *not* be installed
-            Assert.False(File.Exists(packageASourceCodeInstalled), String.Concat("Package A payload should have been removed by uninstall from: ", packageASourceCodeInstalled));
+            this.CanInstallAndUninstallSimpleBundle("PackageA", "BundleC");
+        }
 
-            bundleC.VerifyUnregisteredAndRemovedFromPackageCache(cachedBundlePath);
+        [Fact]
+        public void CanInstallAndUninstallSimpleBundle_x86_wixba()
+        {
+            this.CanInstallAndUninstallSimpleBundle("PackageA", "BundleD");
         }
 
         [Fact]
         public void CanInstallAndUninstallSimpleBundle_x64_wixstdba()
         {
-            var packageA_x64 = this.CreatePackageInstaller("PackageA_x64");
-
-            var bundleA_x64 = this.CreateBundleInstaller("BundleA_x64");
-
-            var packageASourceCodeInstalled = packageA_x64.GetInstalledFilePath("Package.wxs");
-
-            // Source file should *not* be installed
-            Assert.False(File.Exists(packageASourceCodeInstalled), $"Package A x64 payload should not be there on test start: {packageASourceCodeInstalled}");
-
-            bundleA_x64.Install();
-
-            var cachedBundlePath = bundleA_x64.VerifyRegisteredAndInPackageCache();
-
-            // Source file should be installed
-            Assert.True(File.Exists(packageASourceCodeInstalled), String.Concat("Should have found Package A x64 payload installed at: ", packageASourceCodeInstalled));
-
-            bundleA_x64.Uninstall(cachedBundlePath);
-
-            // Source file should *not* be installed
-            Assert.False(File.Exists(packageASourceCodeInstalled), String.Concat("Package A x64 payload should have been removed by uninstall from: ", packageASourceCodeInstalled));
-
-            bundleA_x64.VerifyUnregisteredAndRemovedFromPackageCache(cachedBundlePath);
+            this.CanInstallAndUninstallSimpleBundle("PackageA_x64", "BundleA_x64");
         }
 
         [Fact]
         public void CanInstallAndUninstallSimpleBundle_x64_testba()
         {
-            var packageA_x64 = this.CreatePackageInstaller("PackageA_x64");
-
-            var bundleB_x64 = this.CreateBundleInstaller("BundleB_x64");
-
-            var packageASourceCodeInstalled = packageA_x64.GetInstalledFilePath("Package.wxs");
-
-            // Source file should *not* be installed
-            Assert.False(File.Exists(packageASourceCodeInstalled), $"Package A x64 payload should not be there on test start: {packageASourceCodeInstalled}");
-
-            bundleB_x64.Install();
-
-            var cachedBundlePath = bundleB_x64.VerifyRegisteredAndInPackageCache();
-
-            // Source file should be installed
-            Assert.True(File.Exists(packageASourceCodeInstalled), String.Concat("Should have found Package A x64 payload installed at: ", packageASourceCodeInstalled));
-
-            bundleB_x64.Uninstall(cachedBundlePath);
-
-            // Source file should *not* be installed
-            Assert.False(File.Exists(packageASourceCodeInstalled), String.Concat("Package A x64 payload should have been removed by uninstall from: ", packageASourceCodeInstalled));
-
-            bundleB_x64.VerifyUnregisteredAndRemovedFromPackageCache(cachedBundlePath);
+            this.CanInstallAndUninstallSimpleBundle("PackageA_x64", "BundleB_x64");
         }
 
         [Fact]
         public void CanInstallAndUninstallSimpleBundle_x64_dnctestba()
         {
-            var packageA_x64 = this.CreatePackageInstaller("PackageA_x64");
+            this.CanInstallAndUninstallSimpleBundle("PackageA_x64", "BundleC_x64");
+        }
+
+        [Fact]
+        public void CanInstallAndUninstallSimpleBundle_x64_dncwixba()
+        {
+            this.CanInstallAndUninstallSimpleBundle("PackageA_x64", "BundleD_x64");
+        }
+
+        private void CanInstallAndUninstallSimpleBundle(string packageName, string bundleName)
+        {
+            var package = this.CreatePackageInstaller(packageName);
 
-            var bundleC_x64 = this.CreateBundleInstaller("BundleC_x64");
+            var bundle = this.CreateBundleInstaller(bundleName);
 
-            var packageASourceCodeInstalled = packageA_x64.GetInstalledFilePath("Package.wxs");
+            var packageSourceCodeInstalled = package.GetInstalledFilePath("Package.wxs");
 
             // Source file should *not* be installed
-            Assert.False(File.Exists(packageASourceCodeInstalled), $"Package A x64 payload should not be there on test start: {packageASourceCodeInstalled}");
+            Assert.False(File.Exists(packageSourceCodeInstalled), $"{packageName} payload should not be there on test start: {packageSourceCodeInstalled}");
 
-            bundleC_x64.Install();
+            bundle.Install();
 
-            var cachedBundlePath = bundleC_x64.VerifyRegisteredAndInPackageCache();
+            var cachedBundlePath = bundle.VerifyRegisteredAndInPackageCache();
 
             // Source file should be installed
-            Assert.True(File.Exists(packageASourceCodeInstalled), String.Concat("Should have found Package A x64 payload installed at: ", packageASourceCodeInstalled));
+            Assert.True(File.Exists(packageSourceCodeInstalled), $"Should have found {packageName} payload installed at: {packageSourceCodeInstalled}");
 
-            bundleC_x64.Uninstall(cachedBundlePath);
+            bundle.Uninstall(cachedBundlePath);
 
             // Source file should *not* be installed
-            Assert.False(File.Exists(packageASourceCodeInstalled), String.Concat("Package A x64 payload should have been removed by uninstall from: ", packageASourceCodeInstalled));
+            Assert.False(File.Exists(packageSourceCodeInstalled), $"{packageName} payload should have been removed by uninstall from: {packageSourceCodeInstalled}");
 
-            bundleC_x64.VerifyUnregisteredAndRemovedFromPackageCache(cachedBundlePath);
+            bundle.VerifyUnregisteredAndRemovedFromPackageCache(cachedBundlePath);
         }
     }
 }