Add option to hosts to always install prereqs.

Add PrereqPackage to BundlePackage

Implements 4718

3 files changed, 64 insertions, 0 deletions

diff --git a/src/test/burn/TestData/PrereqBaTests/BundleC/BundleC.wixproj b/src/test/burn/TestData/PrereqBaTests/BundleC/BundleC.wixproj
new file mode 100644
index 00000000..81641f66
--- /dev/null
+++ b/src/test/burn/TestData/PrereqBaTests/BundleC/BundleC.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>BrokenDncAlwaysPrereq</BA>
+    <UpgradeCode>{D2763AB7-979B-485C-AE52-DD03C23CCB93}</UpgradeCode>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net6.0-windows\win-x86" BindName="dncx86" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PackageA\PackageA.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/BundleC/BundleC.wxs b/src/test/burn/TestData/PrereqBaTests/BundleC/BundleC.wxs
new file mode 100644
index 00000000..fe9425f7
--- /dev/null
+++ b/src/test/burn/TestData/PrereqBaTests/BundleC/BundleC.wxs
@@ -0,0 +1,30 @@
+<!-- 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="BrokenDncAlwaysPrereq">
+      <Payload SourceFile="!(bindpath.dncx86)\TestBA.deps.json" />
+      <Payload SourceFile="!(bindpath.dncx86)\TestBA.dll" bal:BAFactoryAssembly="yes" />
+      <Payload Name="good.runtimeconfig.json" SourceFile="!(bindpath.dncx86)\TestBA.runtimeconfig.json" />
+      <Payload Name="TestBA.runtimeconfig.json" SourceFile="bad.runtimeconfig.json" />
+      <Payload SourceFile="!(bindpath.dncx86)\mbanative.dll" />
+      <Payload SourceFile="!(bindpath.dncx86)\WixToolset.Mba.Core.dll" />
+      <Payload SourceFile="$(var.PrereqBaf.TargetPath)" bal:BAFunctions="yes" />
+      <bal:WixDotNetCoreBootstrapperApplicationHost AlwaysInstallPrereqs="yes" />
+    </BootstrapperApplication>
+  </Fragment>
+
+  <Fragment>
+    <util:FileSearch Variable="GoodConfigPresent" Path="[BARuntimeDirectory]\good.runtimeconfig.json" 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]TestBA.runtimeconfig.json&quot; &quot;[BARuntimeDirectory]good.runtimeconfig.json&quot; &quot;[BARuntimeDirectory]bad.runtimeconfig.json&quot;" />
+      <MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)" bal:PrereqPackage="yes" Permanent="yes" />
+      <MsiPackage Id="PackageC" SourceFile="$(var.PackageC.TargetPath)" Cache="force" />
+    </PackageGroup>
+  </Fragment>
+</Wix>
diff --git a/src/test/burn/TestData/PrereqBaTests/BundleC/bad.runtimeconfig.json b/src/test/burn/TestData/PrereqBaTests/BundleC/bad.runtimeconfig.json
new file mode 100644
index 00000000..07a1a830
--- /dev/null
+++ b/src/test/burn/TestData/PrereqBaTests/BundleC/bad.runtimeconfig.json
@@ -0,0 +1,10 @@
+{
+  "runtimeOptions": {
+    "tfm": "net5.5",
+    "rollForward": "Disable",
+    "framework": {
+      "name": "Microsoft.WindowsDesktop.App",
+      "version": "5.5.0"
+    }
+  }
+}
\ No newline at end of file