From 0d3d54992104288e9ee0c834d0b96e8502fd2d42 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Thu, 11 Jan 2024 18:26:20 -0800
Subject: Move the BootstrapperApplication out of proc

---
 .../burn/TestData/TestBA/TestBAWixlib/NetCore6_Platform.wxi   |  8 ++++----
 src/test/burn/TestData/TestBA/TestBAWixlib/TestBA.wxs         | 11 ++++-------
 src/test/burn/TestData/TestBA/TestBAWixlib/WixBA.wxs          |  6 ++----
 src/test/burn/TestData/TestBA/TestBAWixlib_x64/TestBA_x64.wxs | 11 ++++-------
 src/test/burn/TestData/TestBA/TestBAWixlib_x64/WixBA_x64.wxs  |  5 ++---
 5 files changed, 16 insertions(+), 25 deletions(-)

(limited to 'src/test/burn/TestData/TestBA')

diff --git a/src/test/burn/TestData/TestBA/TestBAWixlib/NetCore6_Platform.wxi b/src/test/burn/TestData/TestBA/TestBAWixlib/NetCore6_Platform.wxi
index c09c3624..e3458815 100644
--- a/src/test/burn/TestData/TestBA/TestBAWixlib/NetCore6_Platform.wxi
+++ b/src/test/burn/TestData/TestBA/TestBAWixlib/NetCore6_Platform.wxi
@@ -35,7 +35,7 @@
       <PackageGroupRef Id="$(var.AspNetCoreRedistId)" />
     </PackageGroup>
 
-    <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.AspNetCoreRedistId)" LicenseUrl="$(var.NetCoreEulaLink)" />
+    <bal:BootstrapperApplicationPrerequisiteInformation PackageId="$(var.AspNetCoreRedistId)" LicenseUrl="$(var.NetCoreEulaLink)" />
   </Fragment>
 
   <Fragment>
@@ -43,7 +43,7 @@
       <PackageGroupRef Id="$(var.DesktopNetCoreRedistId)" />
     </PackageGroup>
 
-    <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.DesktopNetCoreRedistId)" LicenseUrl="$(var.NetCoreEulaLink)" />
+    <bal:BootstrapperApplicationPrerequisiteInformation PackageId="$(var.DesktopNetCoreRedistId)" LicenseUrl="$(var.NetCoreEulaLink)" />
   </Fragment>
 
   <Fragment>
@@ -51,7 +51,7 @@
       <PackageGroupRef Id="$(var.DotNetCoreRedistId)" />
     </PackageGroup>
 
-    <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.DotNetCoreRedistId)" LicenseUrl="$(var.NetCoreEulaLink)" />
+    <bal:BootstrapperApplicationPrerequisiteInformation PackageId="$(var.DotNetCoreRedistId)" LicenseUrl="$(var.NetCoreEulaLink)" />
   </Fragment>
 
   <Fragment>
@@ -59,6 +59,6 @@
       <PackageGroupRef Id="$(var.DotNetCoreSdkRedistId)" />
     </PackageGroup>
 
-    <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.DotNetCoreSdkRedistId)" LicenseUrl="$(var.NetCoreEulaLink)" />
+    <bal:BootstrapperApplicationPrerequisiteInformation PackageId="$(var.DotNetCoreSdkRedistId)" LicenseUrl="$(var.NetCoreEulaLink)" />
   </Fragment>
 </Include>
diff --git a/src/test/burn/TestData/TestBA/TestBAWixlib/TestBA.wxs b/src/test/burn/TestData/TestBA/TestBAWixlib/TestBA.wxs
index 2db22e4b..98c3acb2 100644
--- a/src/test/burn/TestData/TestBA/TestBAWixlib/TestBA.wxs
+++ b/src/test/burn/TestData/TestBA/TestBAWixlib/TestBA.wxs
@@ -1,13 +1,12 @@
 <!-- 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>
+    <BootstrapperApplication SourceFile="!(bindpath.dncx86)\TestBA.exe">
       <Payload SourceFile="!(bindpath.dncx86)\TestBA.deps.json" />
-      <Payload SourceFile="!(bindpath.dncx86)\TestBA.dll" bal:BAFactoryAssembly="yes" />
+      <Payload SourceFile="!(bindpath.dncx86)\TestBA.dll" />
       <Payload SourceFile="!(bindpath.dncx86)\TestBA.runtimeconfig.json" />
       <Payload SourceFile="!(bindpath.dncx86)\mbanative.dll" />
       <Payload SourceFile="!(bindpath.dncx86)\WixToolset.Mba.Core.dll" />
-      <bal:WixDotNetCoreBootstrapperApplicationHost />
     </BootstrapperApplication>
 
     <PackageGroup Id="TestBAdnc">
@@ -15,12 +14,10 @@
     </PackageGroup>
   </Fragment>
   <Fragment>
-    <BootstrapperApplication>
-      <Payload Name="WixToolset.Mba.Host.config" SourceFile="!(bindpath.net2x86)\TestBA.BootstrapperCore.config" />
-      <Payload SourceFile="!(bindpath.net2x86)\TestBA.dll" />
+    <BootstrapperApplication SourceFile="!(bindpath.net2x86)\TestBA.exe">
+      <Payload SourceFile="!(bindpath.net2x86)\TestBA.exe.config" />
       <Payload SourceFile="!(bindpath.net2x86)\mbanative.dll" />
       <Payload SourceFile="!(bindpath.net2x86)\WixToolset.Mba.Core.dll" />
-      <bal:WixManagedBootstrapperApplicationHost />
     </BootstrapperApplication>
 
     <PackageGroup Id="TestBA">
diff --git a/src/test/burn/TestData/TestBA/TestBAWixlib/WixBA.wxs b/src/test/burn/TestData/TestBA/TestBAWixlib/WixBA.wxs
index c6da2a17..3d4eb274 100644
--- a/src/test/burn/TestData/TestBA/TestBAWixlib/WixBA.wxs
+++ b/src/test/burn/TestData/TestBA/TestBAWixlib/WixBA.wxs
@@ -1,13 +1,11 @@
 <!-- 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" />
+    <BootstrapperApplication SourceFile="!(bindpath.net4x86)\WixToolset.WixBA.exe">
+      <Payload SourceFile="!(bindpath.net4x86)\WixToolset.WixBA.exe.config" />
       <Payload SourceFile="!(bindpath.net4x86)\mbanative.dll" />
       <Payload SourceFile="!(bindpath.net4x86)\WixToolset.Mba.Core.dll" />
       <Payload SourceFile='..\..\..\..\..\..\License.txt' />
-      <bal:WixManagedBootstrapperApplicationHost />
     </BootstrapperApplication>
 
     <PackageGroup Id="WixBA">
diff --git a/src/test/burn/TestData/TestBA/TestBAWixlib_x64/TestBA_x64.wxs b/src/test/burn/TestData/TestBA/TestBAWixlib_x64/TestBA_x64.wxs
index f6a6382b..08d428a1 100644
--- a/src/test/burn/TestData/TestBA/TestBAWixlib_x64/TestBA_x64.wxs
+++ b/src/test/burn/TestData/TestBA/TestBAWixlib_x64/TestBA_x64.wxs
@@ -1,13 +1,12 @@
 <!-- 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>
+    <BootstrapperApplication SourceFile="!(bindpath.dncx64)\TestBA.exe">
       <Payload SourceFile="!(bindpath.dncx64)\TestBA.deps.json" />
-      <Payload SourceFile="!(bindpath.dncx64)\TestBA.dll" bal:BAFactoryAssembly="yes" />
+      <Payload SourceFile="!(bindpath.dncx64)\TestBA.dll" />
       <Payload SourceFile="!(bindpath.dncx64)\TestBA.runtimeconfig.json" />
       <Payload SourceFile="!(bindpath.dncx64)\mbanative.dll" />
       <Payload SourceFile="!(bindpath.dncx64)\WixToolset.Mba.Core.dll" />
-      <bal:WixDotNetCoreBootstrapperApplicationHost />
     </BootstrapperApplication>
 
     <PackageGroup Id="TestBAdnc_x64">
@@ -15,12 +14,10 @@
     </PackageGroup>
   </Fragment>
   <Fragment>
-    <BootstrapperApplication>
-      <Payload Name="WixToolset.Mba.Host.config" SourceFile="!(bindpath.net2x64)\TestBA.BootstrapperCore.config" />
-      <Payload SourceFile="!(bindpath.net2x64)\TestBA.dll" />
+    <BootstrapperApplication SourceFile="!(bindpath.net2x64)\TestBA.exe">
+      <Payload SourceFile="!(bindpath.net2x64)\TestBA.exe.config" />
       <Payload SourceFile="!(bindpath.net2x64)\mbanative.dll" />
       <Payload SourceFile="!(bindpath.net2x64)\WixToolset.Mba.Core.dll" />
-      <bal:WixManagedBootstrapperApplicationHost />
     </BootstrapperApplication>
 
     <PackageGroup Id="TestBA_x64">
diff --git a/src/test/burn/TestData/TestBA/TestBAWixlib_x64/WixBA_x64.wxs b/src/test/burn/TestData/TestBA/TestBAWixlib_x64/WixBA_x64.wxs
index e9cd9827..ef465e23 100644
--- a/src/test/burn/TestData/TestBA/TestBAWixlib_x64/WixBA_x64.wxs
+++ b/src/test/burn/TestData/TestBA/TestBAWixlib_x64/WixBA_x64.wxs
@@ -1,14 +1,13 @@
 <!-- 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" xmlns:netfx="http://wixtoolset.org/schemas/v4/wxs/netfx">
   <Fragment>
-    <BootstrapperApplication>
+    <BootstrapperApplication SourceFile="!(bindpath.dncx64)\WixToolset.WixBA.exe">
       <Payload SourceFile="!(bindpath.dncx64)\WixToolset.WixBA.deps.json" />
-      <Payload SourceFile="!(bindpath.dncx64)\WixToolset.WixBA.dll" bal:BAFactoryAssembly="yes" />
+      <Payload SourceFile="!(bindpath.dncx64)\WixToolset.WixBA.dll" />
       <Payload SourceFile="!(bindpath.dncx64)\WixToolset.WixBA.runtimeconfig.json" />
       <Payload SourceFile="!(bindpath.dncx64)\mbanative.dll" />
       <Payload SourceFile="!(bindpath.dncx64)\WixToolset.Mba.Core.dll" />
       <Payload SourceFile='..\..\..\..\..\..\License.txt' />
-      <bal:WixDotNetCoreBootstrapperApplicationHost />
     </BootstrapperApplication>
 
     <PackageGroup Id="WixBAdnc_x64">
-- 
cgit v1.2.3-55-g6feb