From d686f0d92fc14940441dbf53c28547a975572f92 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Thu, 23 Apr 2020 12:01:31 +1000
Subject: Add ManagedBootstrapperApplicationPrereqInformation element to move
 prereq info back to NetFx.

---
 src/wixext/BalCompiler.cs | 65 +++++++++++++++++++++++++++++++++++++++++++++++
 src/wixext/bal.xsd        | 29 +++++++++++++++++++++
 2 files changed, 94 insertions(+)

(limited to 'src/wixext')

diff --git a/src/wixext/BalCompiler.cs b/src/wixext/BalCompiler.cs
index c291d41f..da32234c 100644
--- a/src/wixext/BalCompiler.cs
+++ b/src/wixext/BalCompiler.cs
@@ -46,6 +46,9 @@ namespace WixToolset.Bal
                         case "Condition":
                             this.ParseConditionElement(intermediate, section, element);
                             break;
+                        case "ManagedBootstrapperApplicationPrereqInformation":
+                            this.ParseMbaPrereqInfoElement(intermediate, section, element);
+                            break;
                         default:
                             this.ParseHelper.UnexpectedElement(parentElement, element);
                             break;
@@ -292,6 +295,68 @@ namespace WixToolset.Bal
             }
         }
 
+        /// <summary>
+        /// Parses a Condition element for Bundles.
+        /// </summary>
+        /// <param name="node">The element to parse.</param>
+        private void ParseMbaPrereqInfoElement(Intermediate intermediate, IntermediateSection section, XElement node)
+        {
+            var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(node);
+            string packageId = null;
+            string licenseFile = null;
+            string licenseUrl = null;
+
+            foreach (var attrib in node.Attributes())
+            {
+                if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace)
+                {
+                    switch (attrib.Name.LocalName)
+                    {
+                        case "LicenseFile":
+                            licenseFile = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        case "LicenseUrl":
+                            licenseUrl = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        case "PackageId":
+                            packageId = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
+                            break;
+                        default:
+                            this.ParseHelper.UnexpectedAttribute(node, attrib);
+                            break;
+                    }
+                }
+                else
+                {
+                    this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, node, attrib);
+                }
+            }
+
+            this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, node);
+
+            if (null == packageId)
+            {
+                this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "PackageId"));
+            }
+
+            if (null == licenseFile && null == licenseUrl ||
+                null != licenseFile && null != licenseUrl)
+            {
+                this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "LicenseFile", "LicenseUrl", true));
+            }
+
+            if (!this.Messaging.EncounteredError)
+            {
+                section.AddTuple(new WixMbaPrereqInformationTuple(sourceLineNumbers)
+                {
+                    PackageId = packageId,
+                    LicenseFile = licenseFile,
+                    LicenseUrl = licenseUrl,
+                });
+                this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.WixBundlePackage, packageId);
+            }
+        }
+
         /// <summary>
         /// Parses a WixStandardBootstrapperApplication element for Bundles.
         /// </summary>
diff --git a/src/wixext/bal.xsd b/src/wixext/bal.xsd
index 73f10540..3081a279 100644
--- a/src/wixext/bal.xsd
+++ b/src/wixext/bal.xsd
@@ -186,6 +186,35 @@
         </xs:complexType>
     </xs:element>
 
+    <xs:element name="ManagedBootstrapperApplicationPrereqInformation">
+        <xs:annotation>
+            <xs:documentation>
+                Adds license information for a prereq package, should only be used when unable to add the license attributes to the package directly.
+            </xs:documentation>
+            <xs:appinfo>
+                <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Bundle" />
+                <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Fragment" />
+            </xs:appinfo>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:attribute name="PackageId" type="xs:string" use="required">
+                <xs:annotation>
+                    <xs:documentation>Id of the target package.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="LicenseFile" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation>Source file of the license. May not be used with LicenseUrl.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="LicenseUrl" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation>Source url of the license. May not be used with LicenseFile.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+        </xs:complexType>
+    </xs:element>
+
     <xs:attribute name="BAFunctions" type="YesNoType">
         <xs:annotation>
             <xs:documentation>
-- 
cgit v1.2.3-55-g6feb