Add option to hosts to always install prereqs.

Add PrereqPackage to BundlePackage

Implements 4718

3 files changed, 70 insertions, 0 deletions

diff --git a/src/test/burn/TestData/PrereqBaTests/BundleD/BundleD.wixproj b/src/test/burn/TestData/PrereqBaTests/BundleD/BundleD.wixproj
new file mode 100644
index 00000000..314fe2e2
--- /dev/null
+++ b/src/test/burn/TestData/PrereqBaTests/BundleD/BundleD.wixproj
@@ -0,0 +1,24 @@
+<!-- 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>BrokenMbaAlwaysPrereq</BA>
+    <UpgradeCode>{415CA128-60E1-4D16-ACE8-A1D43E98B997}</UpgradeCode>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net35\win-x86" BindName="net2x86" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PackageB\PackageB.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/BundleD/BundleD.wxs b/src/test/burn/TestData/PrereqBaTests/BundleD/BundleD.wxs
new file mode 100644
index 00000000..0e866295
--- /dev/null
+++ b/src/test/burn/TestData/PrereqBaTests/BundleD/BundleD.wxs
@@ -0,0 +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" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+  <Fragment>
+    <BootstrapperApplication Id="BrokenMbaAlwaysPrereq">
+      <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 AlwaysInstallPrereqs="yes" />
+    </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="PackageC" SourceFile="$(var.PackageC.TargetPath)" />
+    </PackageGroup>
+  </Fragment>
+</Wix>
diff --git a/src/test/burn/TestData/PrereqBaTests/BundleD/bad.config b/src/test/burn/TestData/PrereqBaTests/BundleD/bad.config
new file mode 100644
index 00000000..1512e59a
--- /dev/null
+++ b/src/test/burn/TestData/PrereqBaTests/BundleD/bad.config
@@ -0,0 +1,17 @@
+<?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=v5.8" />
+    </startup>
+    <wix.bootstrapper>
+        <host assemblyName="TestBA" />
+    </wix.bootstrapper>
+</configuration>