Move the BootstrapperApplication out of proc

6 files changed, 59 insertions, 63 deletions

diff --git a/src/test/burn/TestBA/TestBA.BootstrapperCore.config b/src/test/burn/TestBA/App.config
index 55876a00..f9811b74 100644
--- a/src/test/burn/TestBA/TestBA.BootstrapperCore.config
+++ b/src/test/burn/TestBA/App.config
@@ -3,16 +3,8 @@
 
 
 <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" />
         <supportedRuntime version="v2.0.50727" />
     </startup>
-    <wix.bootstrapper>
-        <host assemblyName="TestBA" />
-    </wix.bootstrapper>
 </configuration>
diff --git a/src/test/burn/TestBA/Program.cs b/src/test/burn/TestBA/Program.cs
new file mode 100644
index 00000000..6986a057
--- /dev/null
+++ b/src/test/burn/TestBA/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 WixToolset.Test.BA
+{
+    using WixToolset.Mba.Core;
+
+    internal class Program
+    {
+        private static int Main()
+        {
+            var application = new TestBA();
+
+            ManagedBootstrapperApplication.Run(application);
+
+            return 0;
+        }
+    }
+}
diff --git a/src/test/burn/TestBA/TestBA.cs b/src/test/burn/TestBA/TestBA.cs
index 43c1584b..8a116957 100644
--- a/src/test/burn/TestBA/TestBA.cs
+++ b/src/test/burn/TestBA/TestBA.cs
@@ -42,17 +42,15 @@ namespace WixToolset.Test.BA
         private int retryExecuteFilesInUse;
         private bool rollingBack;
 
-        private IBootstrapperCommand Command { get; }
+        private IBootstrapperCommand Command { get; set; }
 
         private IEngine Engine => this.engine;
 
         /// <summary>
         /// Initializes test user experience.
         /// </summary>
-        public TestBA(IEngine engine, IBootstrapperCommand bootstrapperCommand)
-            : base(engine)
+        public TestBA()
         {
-            this.Command = bootstrapperCommand;
             this.wait = new ManualResetEvent(false);
         }
 
@@ -66,6 +64,12 @@ namespace WixToolset.Test.BA
         /// </summary>
         private bool UpdateAvailable { get; set; }
 
+        protected override void OnCreate(CreateEventArgs args)
+        {
+            base.OnCreate(args);
+            this.Command = args.Command;
+        }
+
         /// <summary>
         /// UI Thread entry point for TestUX.
         /// </summary>
@@ -97,7 +101,7 @@ namespace WixToolset.Test.BA
                 {
                     this.updateBundlePath = arg.Substring(14);
                     FileInfo info = new FileInfo(this.updateBundlePath);
-                    this.Engine.SetUpdate(this.updateBundlePath, null, info.Length, UpdateHashType.None, null);
+                    this.Engine.SetUpdate(this.updateBundlePath, null, info.Length, UpdateHashType.None, null, null);
                     this.UpdateAvailable = true;
                     this.action = LaunchAction.UpdateReplaceEmbedded;
                 }
@@ -124,9 +128,8 @@ namespace WixToolset.Test.BA
 
             base.OnStartup(args);
 
-            int redetectCount;
             string redetect = this.ReadPackageAction(null, "RedetectCount");
-            if (String.IsNullOrEmpty(redetect) || !Int32.TryParse(redetect, out redetectCount))
+            if (String.IsNullOrEmpty(redetect) || !Int32.TryParse(redetect, out var redetectCount))
             {
                 redetectCount = 0;
             }
@@ -163,7 +166,7 @@ namespace WixToolset.Test.BA
             if (this.action == LaunchAction.Help)
             {
                 this.Log("This is a BA for automated testing");
-                this.Engine.Quit(0);
+                this.ShutdownUiThread(0);
                 return;
             }
 
@@ -176,20 +179,15 @@ namespace WixToolset.Test.BA
 
         protected override void Run()
         {
-            this.dummyWindow = new Form();
-            this.windowHandle = this.dummyWindow.Handle;
+            using (this.dummyWindow = new Form())
+            {
+                this.windowHandle = this.dummyWindow.Handle;
 
-            this.Log("Running TestBA application");
-            this.wait.Set();
-            Application.Run();
-        }
+                this.Log("Running TestBA application");
+                this.wait.Set();
 
-        private void ShutdownUiThread()
-        {
-            if (this.dummyWindow != null)
-            {
-                this.dummyWindow.Invoke(new Action(Application.ExitThread));
-                this.dummyWindow.Dispose();
+                Application.Run();
+                this.dummyWindow = null;
             }
 
             var exitCode = this.result;
@@ -201,6 +199,23 @@ namespace WixToolset.Test.BA
             this.Engine.Quit(exitCode);
         }
 
+        private void ShutdownUiThread(int? exitCode = null)
+        {
+            try
+            {
+                if (exitCode.HasValue)
+                {
+                    this.result = exitCode.Value;
+                }
+
+                this.dummyWindow?.Invoke(new Action(Application.ExitThread));
+            }
+            catch (Exception e)
+            {
+                this.Log("Failed to shutdown TestBA window, exception: {0}", e.Message);
+            }
+        }
+
         protected override void OnDetectUpdateBegin(DetectUpdateBeginEventArgs args)
         {
             this.Log("OnDetectUpdateBegin");
@@ -220,7 +235,7 @@ namespace WixToolset.Test.BA
             if (!this.UpdateAvailable && this.Engine.CompareVersions(e.Version, this.Version) > 0)
             {
                 this.Log(String.Format("Selected update v{0}", e.Version));
-                this.Engine.SetUpdate(null, e.UpdateLocation, e.Size, e.HashAlgorithm, e.Hash);
+                this.Engine.SetUpdate(null, e.UpdateLocation, e.Size, e.HashAlgorithm, e.Hash, null);
                 this.UpdateAvailable = true;
             }
         }
@@ -575,8 +590,7 @@ namespace WixToolset.Test.BA
             // Output what the privileges are now.
             this.Log("After elevation: WixBundleElevated = {0}", this.Engine.GetVariableNumeric("WixBundleElevated"));
 
-            this.result = args.Status;
-            this.ShutdownUiThread();
+            this.ShutdownUiThread(args.Status);
         }
 
         protected override void OnUnregisterBegin(UnregisterBeginEventArgs args)
diff --git a/src/test/burn/TestBA/TestBA.csproj b/src/test/burn/TestBA/TestBA.csproj
index 77f90ede..715ac5bc 100644
--- a/src/test/burn/TestBA/TestBA.csproj
+++ b/src/test/burn/TestBA/TestBA.csproj
@@ -4,25 +4,22 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>net462;net6.0-windows</TargetFrameworks>
+    <OutputType>WinExe</OutputType>
     <AssemblyName>TestBA</AssemblyName>
     <RootNamespace>WixToolset.Test.BA</RootNamespace>
     <DebugType>embedded</DebugType>
     <RuntimeIdentifier>win-x86</RuntimeIdentifier>
     <EnableDynamicLoading>true</EnableDynamicLoading>
     <UseWindowsForms>true</UseWindowsForms>
+    <SelfContained>false</SelfContained>
     <RollForward>Major</RollForward>
   </PropertyGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)'=='net462' ">
-    <Content Include="TestBA.BootstrapperCore.config" CopyToOutputDirectory="PreserveNewest" />
     <Reference Include="System.Windows.Forms" />
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="WixToolset.Mba.Core" />
   </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFrameworkIdentifier)'!='.NETFramework' ">
-    <PackageReference Include="WixToolset.Dnc.HostGenerator" />
-  </ItemGroup>
 </Project>
diff --git a/src/test/burn/TestBA/TestBAFactory.cs b/src/test/burn/TestBA/TestBAFactory.cs
deleted file mode 100644
index ba1de367..00000000
--- a/src/test/burn/TestBA/TestBAFactory.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(WixToolset.Test.BA.TestBAFactory))]
-namespace WixToolset.Test.BA
-{
-    using WixToolset.Mba.Core;
-
-    public class TestBAFactory : 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 TestBA(engine, bootstrapperCommand);
-        }
-    }
-}
diff --git a/src/test/burn/TestBA/TestBA_x64.csproj b/src/test/burn/TestBA/TestBA_x64.csproj
index 0669eee1..1f8659a0 100644
--- a/src/test/burn/TestBA/TestBA_x64.csproj
+++ b/src/test/burn/TestBA/TestBA_x64.csproj
@@ -4,25 +4,22 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>net462;net6.0-windows</TargetFrameworks>
+    <OutputType>WinExe</OutputType>
     <AssemblyName>TestBA</AssemblyName>
     <RootNamespace>WixToolset.Test.BA</RootNamespace>
     <DebugType>embedded</DebugType>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <EnableDynamicLoading>true</EnableDynamicLoading>
     <UseWindowsForms>true</UseWindowsForms>
+    <SelfContained>false</SelfContained>
     <RollForward>Major</RollForward>
   </PropertyGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)'=='net462' ">
-    <Content Include="TestBA.BootstrapperCore.config" CopyToOutputDirectory="PreserveNewest" />
     <Reference Include="System.Windows.Forms" />
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="WixToolset.Mba.Core" />
   </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFrameworkIdentifier)'!='.NETFramework' ">
-    <PackageReference Include="WixToolset.Dnc.HostGenerator" />
-  </ItemGroup>
 </Project>