18 files changed, 267 insertions, 12 deletions

diff --git a/src/TestData/MsiTransaction/BundleBv1/BundleB.wxi b/src/TestData/MsiTransaction/BundleBv1/BundleB.wxi
index cb7a602d..943b8b48 100644
--- a/src/TestData/MsiTransaction/BundleBv1/BundleB.wxi
+++ b/src/TestData/MsiTransaction/BundleBv1/BundleB.wxi
@@ -11,7 +11,6 @@
     <Variable Name="TestGroupName" Value="$(var.TestGroupName)" />
 
     <Chain>
-      <PackageGroupRef Id="TestBA" />
       <PackageGroupRef Id="BundlePackages" />
     </Chain>
   </Bundle>
diff --git a/src/TestData/MsiTransaction/BundleBv1/BundleBv1.wxs b/src/TestData/MsiTransaction/BundleBv1/BundleBv1.wxs
index 420d5157..1a24f53e 100644
--- a/src/TestData/MsiTransaction/BundleBv1/BundleBv1.wxs
+++ b/src/TestData/MsiTransaction/BundleBv1/BundleBv1.wxs
@@ -5,6 +5,7 @@
   <?include BundleB.wxi ?>
   <Fragment>
     <PackageGroup Id="BundlePackages">
+      <PackageGroupRef Id="TestBA" />
       <MsiPackage Id="PackageB" SourceFile="$(var.PackageBv1.TargetPath)" />
     </PackageGroup>
   </Fragment>
diff --git a/src/TestData/MsiTransaction/BundleBv2/BundleBv2.wxs b/src/TestData/MsiTransaction/BundleBv2/BundleBv2.wxs
index 39197d7d..33665860 100644
--- a/src/TestData/MsiTransaction/BundleBv2/BundleBv2.wxs
+++ b/src/TestData/MsiTransaction/BundleBv2/BundleBv2.wxs
@@ -5,6 +5,7 @@
   <?include ..\BundleBv1\BundleB.wxi ?>
   <Fragment>
     <PackageGroup Id="BundlePackages">
+      <PackageGroupRef Id="TestBAdnc" />
       <MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)" />
       <RollbackBoundary Transaction="yes" />
       <MsiPackage Id="PackageB" SourceFile="$(var.PackageBv2.TargetPath)" />
diff --git a/src/TestData/PrereqBa/BundleA/BundleA.wixproj b/src/TestData/PrereqBa/BundleA/BundleA.wixproj
new file mode 100644
index 00000000..ab4c0499
--- /dev/null
+++ b/src/TestData/PrereqBa/BundleA/BundleA.wixproj
@@ -0,0 +1,16 @@
+<!-- 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>
+  </PropertyGroup>
+  <ItemGroup>
+    <BindInputPaths Include="$(OutputPath)..\net5.0-windows\win-x86" BindName="dnc5x86" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PackageA\PackageA.wixproj" />
+    <ProjectReference Include="..\PackageF\PackageF.wixproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.77" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/TestData/PrereqBa/BundleA/BundleA.wxi b/src/TestData/PrereqBa/BundleA/BundleA.wxi
new file mode 100644
index 00000000..23623ffb
--- /dev/null
+++ b/src/TestData/PrereqBa/BundleA/BundleA.wxi
@@ -0,0 +1,17 @@
+<!-- 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. -->
+
+<?ifndef Version?>
+<?define Version = 1.0.0.0?>
+<?endif?>
+
+<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Bundle Name="~$(var.TestGroupName) - Bundle A" Version="$(var.Version)" UpgradeCode="{A4456636-916A-43A0-87BF-A897C2717A00}" Compressed="yes">
+    <Log Prefix="~$(var.TestGroupName)_BundleA" />
+
+    <Variable Name="TestGroupName" Value="$(var.TestGroupName)" />
+
+    <Chain>
+      <PackageGroupRef Id="BundlePackages" />
+    </Chain>
+  </Bundle>
+</Include>
diff --git a/src/TestData/PrereqBa/BundleA/BundleA.wxs b/src/TestData/PrereqBa/BundleA/BundleA.wxs
new file mode 100644
index 00000000..53139834
--- /dev/null
+++ b/src/TestData/PrereqBa/BundleA/BundleA.wxs
@@ -0,0 +1,21 @@
+<!-- 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">
+  <?include BundleA.wxi ?>
+  <Fragment>
+    <BootstrapperApplication>
+      <Payload SourceFile="!(bindpath.dnc5x86)\TestBA.deps.json" />
+      <Payload SourceFile="!(bindpath.dnc5x86)\TestBA.dll" bal:BAFactoryAssembly="yes" />
+      <Payload Name="TestBA.runtimeconfig.json" SourceFile="bad.runtimeconfig.json" />
+      <Payload SourceFile="!(bindpath.dnc5x86)\mbanative.dll" />
+      <Payload SourceFile="!(bindpath.dnc5x86)\WixToolset.Mba.Core.dll" />
+      <bal:WixDotNetCoreBootstrapperApplicationHost />
+    </BootstrapperApplication>
+
+    <PackageGroup Id="BundlePackages">
+      <MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)" bal:PrereqPackage="yes" Permanent="yes" />
+      <MsiPackage Id="PackageF" SourceFile="$(var.PackageF.TargetPath)" />
+    </PackageGroup>
+  </Fragment>
+</Wix>
diff --git a/src/TestData/PrereqBa/BundleA/bad.runtimeconfig.json b/src/TestData/PrereqBa/BundleA/bad.runtimeconfig.json
new file mode 100644
index 00000000..07a1a830
--- /dev/null
+++ b/src/TestData/PrereqBa/BundleA/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
diff --git a/src/TestData/PrereqBa/BundleB/BundleB.wixproj b/src/TestData/PrereqBa/BundleB/BundleB.wixproj
new file mode 100644
index 00000000..7d4d1ebd
--- /dev/null
+++ b/src/TestData/PrereqBa/BundleB/BundleB.wixproj
@@ -0,0 +1,16 @@
+<!-- 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>
+  </PropertyGroup>
+  <ItemGroup>
+    <BindInputPaths Include="$(OutputPath)..\net35\win-x86" BindName="net2x86" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PackageB\PackageB.wixproj" />
+    <ProjectReference Include="..\PackageF\PackageF.wixproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.77" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/TestData/PrereqBa/BundleB/BundleB.wxi b/src/TestData/PrereqBa/BundleB/BundleB.wxi
new file mode 100644
index 00000000..6bfeb213
--- /dev/null
+++ b/src/TestData/PrereqBa/BundleB/BundleB.wxi
@@ -0,0 +1,17 @@
+<!-- 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. -->
+
+<?ifndef Version?>
+<?define Version = 1.0.0.0?>
+<?endif?>
+
+<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Bundle Name="~$(var.TestGroupName) - Bundle B" Version="$(var.Version)" UpgradeCode="{157A1FBA-3825-4AAA-B13D-F45435A79D64}" Compressed="yes">
+    <Log Prefix="~$(var.TestGroupName)_BundleB" />
+
+    <Variable Name="TestGroupName" Value="$(var.TestGroupName)" />
+
+    <Chain>
+      <PackageGroupRef Id="BundlePackages" />
+    </Chain>
+  </Bundle>
+</Include>
diff --git a/src/TestData/PrereqBa/BundleB/BundleB.wxs b/src/TestData/PrereqBa/BundleB/BundleB.wxs
new file mode 100644
index 00000000..57d8a552
--- /dev/null
+++ b/src/TestData/PrereqBa/BundleB/BundleB.wxs
@@ -0,0 +1,20 @@
+<!-- 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">
+  <?include BundleB.wxi ?>
+  <Fragment>
+    <BootstrapperApplication>
+      <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" />
+      <bal:WixManagedBootstrapperApplicationHost />
+    </BootstrapperApplication>
+
+    <PackageGroup Id="BundlePackages">
+      <MsiPackage Id="PackageB" SourceFile="$(var.PackageB.TargetPath)" bal:PrereqPackage="yes" Permanent="yes" />
+      <MsiPackage Id="PackageF" SourceFile="$(var.PackageF.TargetPath)" />
+    </PackageGroup>
+  </Fragment>
+</Wix>
diff --git a/src/TestData/PrereqBa/BundleB/bad.config b/src/TestData/PrereqBa/BundleB/bad.config
new file mode 100644
index 00000000..1512e59a
--- /dev/null
+++ b/src/TestData/PrereqBa/BundleB/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>
diff --git a/src/TestData/PrereqBa/PackageA/PackageA.wixproj b/src/TestData/PrereqBa/PackageA/PackageA.wixproj
new file mode 100644
index 00000000..d46982fa
--- /dev/null
+++ b/src/TestData/PrereqBa/PackageA/PackageA.wixproj
@@ -0,0 +1,9 @@
+<!-- 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>
+    <UpgradeCode>{A13BFF68-61DF-4015-9AD1-03854B5E0212}</UpgradeCode>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\Package.wxs" Link="Package.wxs" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/TestData/PrereqBa/PackageB/PackageB.wixproj b/src/TestData/PrereqBa/PackageB/PackageB.wixproj
new file mode 100644
index 00000000..d5edf338
--- /dev/null
+++ b/src/TestData/PrereqBa/PackageB/PackageB.wixproj
@@ -0,0 +1,9 @@
+<!-- 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>
+    <UpgradeCode>{3DD4621A-F7AB-4548-89A8-6DCB0A9BC954}</UpgradeCode>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\Package.wxs" Link="Package.wxs" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/TestData/PrereqBa/PackageF/PackageF.wixproj b/src/TestData/PrereqBa/PackageF/PackageF.wixproj
new file mode 100644
index 00000000..3d52e939
--- /dev/null
+++ b/src/TestData/PrereqBa/PackageF/PackageF.wixproj
@@ -0,0 +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. -->
+<Project Sdk="WixToolset.Sdk">
+  <PropertyGroup>
+    <UpgradeCode>{7DEEE928-CD7F-49AD-8000-2ED6339D8A78}</UpgradeCode>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\PackageFail.wxs" Link="PackageFail.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Util.wixext" Version="4.0.66" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/TestData/TestBA/TestBAWixlib/TestBA.wxs b/src/TestData/TestBA/TestBAWixlib/TestBA.wxs
index 56ddd1aa..348a0cbb 100644
--- a/src/TestData/TestBA/TestBAWixlib/TestBA.wxs
+++ b/src/TestData/TestBA/TestBAWixlib/TestBA.wxs
@@ -2,10 +2,24 @@
 <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.x86)\TestBA.BootstrapperCore.config" />
-      <Payload SourceFile="!(bindpath.x86)\TestBA.dll" />
-      <Payload SourceFile="!(bindpath.x86)\mbanative.dll" />
-      <Payload SourceFile="!(bindpath.x86)\WixToolset.Mba.Core.dll" />
+      <Payload SourceFile="!(bindpath.dnc5x86)\TestBA.deps.json" />
+      <Payload SourceFile="!(bindpath.dnc5x86)\TestBA.dll" bal:BAFactoryAssembly="yes" />
+      <Payload SourceFile="!(bindpath.dnc5x86)\TestBA.runtimeconfig.json" />
+      <Payload SourceFile="!(bindpath.dnc5x86)\mbanative.dll" />
+      <Payload SourceFile="!(bindpath.dnc5x86)\WixToolset.Mba.Core.dll" />
+      <bal:WixDotNetCoreBootstrapperApplicationHost />
+    </BootstrapperApplication>
+
+    <PackageGroup Id="TestBAdnc">
+      <PackageGroupRef Id="NetFx48WebAsPrereq" /> <!-- Yes, this is wrong but we don't have .NET 5 packages yet -->
+    </PackageGroup>
+  </Fragment>
+  <Fragment>
+    <BootstrapperApplication>
+      <Payload Name="WixToolset.Mba.Host.config" SourceFile="!(bindpath.net2x86)\TestBA.BootstrapperCore.config" />
+      <Payload SourceFile="!(bindpath.net2x86)\TestBA.dll" />
+      <Payload SourceFile="!(bindpath.net2x86)\mbanative.dll" />
+      <Payload SourceFile="!(bindpath.net2x86)\WixToolset.Mba.Core.dll" />
       <bal:WixManagedBootstrapperApplicationHost />
     </BootstrapperApplication>
 
diff --git a/src/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj b/src/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj
index ee63707e..7dd1798c 100644
--- a/src/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj
+++ b/src/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj
@@ -6,7 +6,8 @@
     <Cultures>en-us</Cultures>
   </PropertyGroup>
   <ItemGroup>
-    <BindInputPaths Include="$(OutputPath)..\net35\win-x86" BindName="x86" />
+    <BindInputPaths Include="$(OutputPath)..\net35\win-x86" BindName="net2x86" />
+    <BindInputPaths Include="$(OutputPath)..\net5.0-windows\win-x86" BindName="dnc5x86" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Utilities\TestBA\TestBA.csproj" />
diff --git a/src/Utilities/TestBA/TestBA.csproj b/src/Utilities/TestBA/TestBA.csproj
index f23235b9..796a0dfd 100644
--- a/src/Utilities/TestBA/TestBA.csproj
+++ b/src/Utilities/TestBA/TestBA.csproj
@@ -3,22 +3,21 @@
 
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net35</TargetFramework>
+    <TargetFrameworks>net35;net5.0-windows</TargetFrameworks>
     <AssemblyName>TestBA</AssemblyName>
     <RootNamespace>WixToolset.Test.BA</RootNamespace>
     <DebugType>embedded</DebugType>
     <RuntimeIdentifier>win-x86</RuntimeIdentifier>
+    <EnableDynamicLoading>true</EnableDynamicLoading>
+    <UseWindowsForms>true</UseWindowsForms>
   </PropertyGroup>
 
-  <ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)'=='net35' ">
     <Content Include="TestBA.BootstrapperCore.config" CopyToOutputDirectory="PreserveNewest" />
+    <Reference Include="System.Windows.Forms" />
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="WixToolset.Mba.Core" Version="4.0.45" />
   </ItemGroup>
-
-  <ItemGroup>
-    <Reference Include="System.Windows.Forms" />
-  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/WixToolsetTest.BurnE2E/PrereqBaTests.cs b/src/WixToolsetTest.BurnE2E/PrereqBaTests.cs
new file mode 100644
index 00000000..c10736b1
--- /dev/null
+++ b/src/WixToolsetTest.BurnE2E/PrereqBaTests.cs
@@ -0,0 +1,76 @@
+// 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 WixToolsetTest.BurnE2E
+{
+    using System;
+    using System.IO;
+    using Xunit;
+    using Xunit.Abstractions;
+
+    public class PrereqBaTests : BurnE2ETests
+    {
+        public PrereqBaTests(ITestOutputHelper testOutputHelper) : base(testOutputHelper, "PrereqBa") { }
+
+        /// <summary>
+        /// This bundle purposely provides a .runtimeconfig.json file that requires a version of .NET Core that doesn't exist,
+        /// with an MSI package to represent the prerequisite package.
+        /// This verifies that:
+        ///   The preqba doesn't infinitely reload itself after failing to load the managed BA.
+        ///   The engine automatically uninstalls the bundle since only permanent packages were installed.
+        /// </summary>
+        [Fact]
+        public void DncPreqBaDetectsInfiniteLoop()
+        {
+            var packageA = this.CreatePackageInstaller("PackageA");
+            this.CreatePackageInstaller("PackageF");
+
+            var bundleA = this.CreateBundleInstaller("BundleA");
+
+            var packageASourceCodeInstalled = packageA.GetInstalledFilePath("Package.wxs");
+
+            // Source file should *not* be installed
+            Assert.False(File.Exists(packageASourceCodeInstalled), $"Package A payload should not be there on test start: {packageASourceCodeInstalled}");
+
+            bundleA.Install();
+
+            // Part of the test is Install actually completing.
+
+            // Source file should be installed
+            Assert.True(File.Exists(packageASourceCodeInstalled), String.Concat("Should have found Package A payload installed at: ", packageASourceCodeInstalled));
+
+            // No non-permanent packages should have ended up installed or cached so it should have unregistered.
+            bundleA.VerifyUnregisteredAndRemovedFromPackageCache();
+        }
+
+        /// <summary>
+        /// This bundle purposely provides a WixToolset.Mba.Host.config file that requires a version of .NET Framework that doesn't exist,
+        /// with an MSI package to represent the prerequisite package.
+        /// This verifies that:
+        ///   The preqba doesn't infinitely reload itself after failing to load the managed BA.
+        ///   The engine automatically uninstalls the bundle since only permanent packages were installed.
+        /// </summary>
+        [Fact]
+        public void MbaPreqBaDetectsInfiniteLoop()
+        {
+            var packageB = this.CreatePackageInstaller("PackageB");
+            this.CreatePackageInstaller("PackageF");
+
+            var bundleB = this.CreateBundleInstaller("BundleB");
+
+            var packageBSourceCodeInstalled = packageB.GetInstalledFilePath("Package.wxs");
+
+            // Source file should *not* be installed
+            Assert.False(File.Exists(packageBSourceCodeInstalled), $"Package B payload should not be there on test start: {packageBSourceCodeInstalled}");
+
+            bundleB.Install();
+
+            // Part of the test is Install actually completing.
+
+            // Source file should be installed
+            Assert.True(File.Exists(packageBSourceCodeInstalled), String.Concat("Should have found Package B payload installed at: ", packageBSourceCodeInstalled));
+
+            // No non-permanent packages should have ended up installed or cached so it should have unregistered.
+            bundleB.VerifyUnregisteredAndRemovedFromPackageCache();
+        }
+    }
+}