Move the BootstrapperApplication out of proc

6 files changed, 28 insertions, 49 deletions

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>