Add option to hosts to always install prereqs.

Add PrereqPackage to BundlePackage

Implements 4718

2 files changed, 14 insertions, 3 deletions

diff --git a/src/test/burn/TestData/PrereqBaTests/BundleB/BundleB.wixproj b/src/test/burn/TestData/PrereqBaTests/BundleB/BundleB.wixproj
index d4288d4b..843b382a 100644
--- a/src/test/burn/TestData/PrereqBaTests/BundleB/BundleB.wixproj
+++ b/src/test/burn/TestData/PrereqBaTests/BundleB/BundleB.wixproj
@@ -13,9 +13,12 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\PackageB\PackageB.wixproj" />
-    <ProjectReference Include="..\PackageF\PackageF.wixproj" />
+    <ProjectReference Include="..\PackageC\PackageC.wixproj" />
+    <ProjectReference Include="..\PrereqBaf\PrereqBaf.vcxproj" />
+    <ProjectReference Include="..\ReplaceConfig\ReplaceConfig.vcxproj" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.Util.wixext" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/test/burn/TestData/PrereqBaTests/BundleB/BundleB.wxs b/src/test/burn/TestData/PrereqBaTests/BundleB/BundleB.wxs
index 603c3aee..b7742582 100644
--- a/src/test/burn/TestData/PrereqBaTests/BundleB/BundleB.wxs
+++ b/src/test/burn/TestData/PrereqBaTests/BundleB/BundleB.wxs
@@ -1,21 +1,29 @@
 <!-- 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">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
   <Fragment>
     <BootstrapperApplication Id="BrokenMba">
+      <Payload Name="good.config" SourceFile="!(bindpath.net2x86)\TestBA.BootstrapperCore.config" />
       <Payload Name="WixToolset.Mba.Host.config" SourceFile="bad.config" />
       <Payload SourceFile="!(bindpath.net2x86)\TestBA.dll" />
       <Payload SourceFile="!(bindpath.net2x86)\mbanative.dll" />
       <Payload SourceFile="!(bindpath.net2x86)\WixToolset.Mba.Core.dll" />
+      <Payload SourceFile="$(var.PrereqBaf.TargetPath)" bal:BAFunctions="yes" />
       <bal:WixManagedBootstrapperApplicationHost />
     </BootstrapperApplication>
   </Fragment>
 
   <Fragment>
+    <util:FileSearch Variable="GoodConfigPresent" Path="[BARuntimeDirectory]\good.config" Result="exists" />
+    <Variable Name="CAUSEINFINITELOOP" bal:Overridable="yes" />
+
     <PackageGroup Id="BundlePackages">
+      <ExePackage SourceFile="$(var.ReplaceConfig.TargetPath)" bal:PrereqPackage="yes"
+                  Permanent="yes" DetectCondition="NOT GoodConfigPresent OR CAUSEINFINITELOOP = 1"
+                  InstallArguments="&quot;[BARuntimeDirectory]WixToolset.Mba.Host.config&quot; &quot;[BARuntimeDirectory]good.config&quot; &quot;[BARuntimeDirectory]bad.config&quot;" />
       <MsiPackage Id="PackageB" SourceFile="$(var.PackageB.TargetPath)" bal:PrereqPackage="yes" Permanent="yes" />
-      <MsiPackage Id="PackageF" SourceFile="$(var.PackageF.TargetPath)" />
+      <MsiPackage Id="PackageC" SourceFile="$(var.PackageC.TargetPath)" />
     </PackageGroup>
   </Fragment>
 </Wix>