Add option to hosts to always install prereqs.

Add PrereqPackage to BundlePackage

Implements 4718

4 files changed, 79 insertions, 1 deletions

diff --git a/src/ext/Bal/wixext/BalBurnBackendExtension.cs b/src/ext/Bal/wixext/BalBurnBackendExtension.cs
index 3b19ae78..d34c159a 100644
--- a/src/ext/Bal/wixext/BalBurnBackendExtension.cs
+++ b/src/ext/Bal/wixext/BalBurnBackendExtension.cs
@@ -24,6 +24,7 @@ namespace WixToolset.Bal
             BalSymbolDefinitions.WixMbaPrereqInformation,
             BalSymbolDefinitions.WixStdbaOptions,
             BalSymbolDefinitions.WixStdbaOverridableVariable,
+            BalSymbolDefinitions.WixMbaPrereqOptions,
         };
 
         protected override IReadOnlyCollection<IntermediateSymbolDefinition> SymbolDefinitions => BurnSymbolDefinitions;
diff --git a/src/ext/Bal/wixext/BalCompiler.cs b/src/ext/Bal/wixext/BalCompiler.cs
index 267345e7..1721f252 100644
--- a/src/ext/Bal/wixext/BalCompiler.cs
+++ b/src/ext/Bal/wixext/BalCompiler.cs
@@ -117,6 +117,7 @@ namespace WixToolset.Bal
 
             switch (parentElement.Name.LocalName)
             {
+                case "BundlePackage":
                 case "ExePackage":
                 case "MsiPackage":
                 case "MspPackage":
@@ -216,7 +217,7 @@ namespace WixToolset.Bal
                             case "PrereqPackage":
                                 if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attribute))
                                 {
-                                    if (!this.prereqInfoSymbolsByPackageId.TryGetValue(packageId, out prereqInfo))
+                                    if (!this.prereqInfoSymbolsByPackageId.TryGetValue(packageId, out _))
                                     {
                                         prereqInfo = section.AddSymbol(new WixMbaPrereqInformationSymbol(sourceLineNumbers)
                                         {
@@ -703,6 +704,7 @@ namespace WixToolset.Bal
         private void ParseWixManagedBootstrapperApplicationHostElement(Intermediate intermediate, IntermediateSection section, XElement node)
         {
             var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(node);
+            bool alwaysInstallPrereqs = false;
             string logoFile = null;
             string themeFile = null;
             string localizationFile = null;
@@ -714,6 +716,9 @@ namespace WixToolset.Bal
                 {
                     switch (attrib.Name.LocalName)
                     {
+                        case "AlwaysInstallPrereqs":
+                            alwaysInstallPrereqs = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib) == YesNoType.Yes;
+                            break;
                         case "LogoFile":
                             logoFile = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
                             break;
@@ -792,6 +797,14 @@ namespace WixToolset.Bal
                 }
 
                 this.CreateBARef(section, sourceLineNumbers, node, baId);
+
+                if (alwaysInstallPrereqs)
+                {
+                    section.AddSymbol(new WixMbaPrereqOptionsSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "WixMbaPrereqOptions"))
+                    {
+                        AlwaysInstallPrereqs = 1,
+                    });
+                }
             }
         }
 
@@ -802,6 +815,7 @@ namespace WixToolset.Bal
         private void ParseWixDotNetCoreBootstrapperApplicationHostElement(Intermediate intermediate, IntermediateSection section, XElement node)
         {
             var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(node);
+            bool alwaysInstallPrereqs = false;
             string logoFile = null;
             string themeFile = null;
             string localizationFile = null;
@@ -814,6 +828,9 @@ namespace WixToolset.Bal
                 {
                     switch (attrib.Name.LocalName)
                     {
+                        case "AlwaysInstallPrereqs":
+                            alwaysInstallPrereqs = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib) == YesNoType.Yes;
+                            break;
                         case "LogoFile":
                             logoFile = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
                             break;
@@ -903,6 +920,14 @@ namespace WixToolset.Bal
                 }
 
                 this.CreateBARef(section, sourceLineNumbers, node, baId);
+
+                if (alwaysInstallPrereqs)
+                {
+                    section.AddSymbol(new WixMbaPrereqOptionsSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "WixMbaPrereqOptions"))
+                    {
+                        AlwaysInstallPrereqs = 1,
+                    });
+                }
             }
         }
 
diff --git a/src/ext/Bal/wixext/Symbols/BalSymbolDefinitions.cs b/src/ext/Bal/wixext/Symbols/BalSymbolDefinitions.cs
index 90865621..9010ce2d 100644
--- a/src/ext/Bal/wixext/Symbols/BalSymbolDefinitions.cs
+++ b/src/ext/Bal/wixext/Symbols/BalSymbolDefinitions.cs
@@ -16,6 +16,7 @@ namespace WixToolset.Bal
         WixMbaPrereqInformation,
         WixStdbaOptions,
         WixStdbaOverridableVariable,
+        WixMbaPrereqOptions,
     }
 
     public static partial class BalSymbolDefinitions
@@ -60,6 +61,9 @@ namespace WixToolset.Bal
                 case BalSymbolDefinitionType.WixStdbaOverridableVariable:
                     return BalSymbolDefinitions.WixStdbaOverridableVariable;
 
+                case BalSymbolDefinitionType.WixMbaPrereqOptions:
+                    return BalSymbolDefinitions.WixMbaPrereqOptions;
+
                 default:
                     throw new ArgumentOutOfRangeException(nameof(type));
             }
@@ -75,6 +79,7 @@ namespace WixToolset.Bal
             WixMbaPrereqInformation.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag);
             WixStdbaOptions.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag);
             WixStdbaOverridableVariable.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag);
+            WixMbaPrereqOptions.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag);
         }
     }
 }
diff --git a/src/ext/Bal/wixext/Symbols/WixMbaPrereqOptionsSymbol.cs b/src/ext/Bal/wixext/Symbols/WixMbaPrereqOptionsSymbol.cs
new file mode 100644
index 00000000..66374579
--- /dev/null
+++ b/src/ext/Bal/wixext/Symbols/WixMbaPrereqOptionsSymbol.cs
@@ -0,0 +1,47 @@
+// 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 WixToolset.Bal
+{
+    using WixToolset.Data;
+    using WixToolset.Bal.Symbols;
+
+    public static partial class BalSymbolDefinitions
+    {
+        public static readonly IntermediateSymbolDefinition WixMbaPrereqOptions = new IntermediateSymbolDefinition(
+            BalSymbolDefinitionType.WixMbaPrereqOptions.ToString(),
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixMbaPrereqOptionsSymbolFields.AlwaysInstallPrereqs), IntermediateFieldType.Number),
+            },
+            typeof(WixMbaPrereqOptionsSymbol));
+    }
+}
+
+namespace WixToolset.Bal.Symbols
+{
+    using WixToolset.Data;
+
+    public enum WixMbaPrereqOptionsSymbolFields
+    {
+        AlwaysInstallPrereqs,
+    }
+
+    public class WixMbaPrereqOptionsSymbol : IntermediateSymbol
+    {
+        public WixMbaPrereqOptionsSymbol() : base(BalSymbolDefinitions.WixMbaPrereqOptions, null, null)
+        {
+        }
+
+        public WixMbaPrereqOptionsSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixMbaPrereqOptions, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixMbaPrereqOptionsSymbolFields index] => this.Fields[(int)index];
+
+        public int AlwaysInstallPrereqs
+        {
+            get => this.Fields[(int)WixMbaPrereqOptionsSymbolFields.AlwaysInstallPrereqs].AsNumber();
+            set => this.Set((int)WixMbaPrereqOptionsSymbolFields.AlwaysInstallPrereqs, value);
+        }
+    }
+}