Add support for FDD in DotNetCoreBootstrapperApplicationHost.

6 files changed, 203 insertions, 9 deletions

diff --git a/src/wixext/BalBurnBackendExtension.cs b/src/wixext/BalBurnBackendExtension.cs
index 71cd2d92..c81955be 100644
--- a/src/wixext/BalBurnBackendExtension.cs
+++ b/src/wixext/BalBurnBackendExtension.cs
@@ -28,15 +28,17 @@ namespace WixToolset.Bal
 
             var isStdBA = baId.StartsWith("WixStandardBootstrapperApplication");
             var isMBA = baId.StartsWith("ManagedBootstrapperApplicationHost");
+            var isDNC = baId.StartsWith("DotNetCoreBootstrapperApplicationHost");
+            var isSCD = isDNC && this.VerifySCD(section);
 
-            if (isStdBA || isMBA)
+            if (isStdBA || isMBA || isDNC)
             {
                 this.VerifyBAFunctions(section);
             }
 
-            if (isMBA)
+            if (isMBA || (isDNC && !isSCD))
             {
-                this.VerifyPrereqPackages(section);
+                this.VerifyPrereqPackages(section, isDNC);
             }
         }
 
@@ -78,12 +80,13 @@ namespace WixToolset.Bal
             }
         }
 
-        private void VerifyPrereqPackages(IntermediateSection section)
+        private void VerifyPrereqPackages(IntermediateSection section, bool isDNC)
         {
             var prereqInfoTuples = section.Tuples.OfType<WixMbaPrereqInformationTuple>().ToList();
             if (prereqInfoTuples.Count == 0)
             {
-                this.Messaging.Write(BalErrors.MissingPrereq());
+                var message = isDNC ? BalErrors.MissingDNCPrereq() : BalErrors.MissingMBAPrereq();
+                this.Messaging.Write(message);
                 return;
             }
 
@@ -115,5 +118,18 @@ namespace WixToolset.Bal
                 }
             }
         }
+
+        private bool VerifySCD(IntermediateSection section)
+        {
+            var isSCD = false;
+
+            var dncOptions = section.Tuples.OfType<WixDncOptionsTuple>().SingleOrDefault();
+            if (dncOptions != null)
+            {
+                isSCD = dncOptions.SelfContainedDeployment != 0;
+            }
+
+            return isSCD;
+        }
     }
 }
diff --git a/src/wixext/BalCompiler.cs b/src/wixext/BalCompiler.cs
index 33400f3b..dfe29bde 100644
--- a/src/wixext/BalCompiler.cs
+++ b/src/wixext/BalCompiler.cs
@@ -63,6 +63,9 @@ namespace WixToolset.Bal
                         case "WixManagedBootstrapperApplicationHost":
                             this.ParseWixManagedBootstrapperApplicationHostElement(intermediate, section, element);
                             break;
+                        case "WixDotNetCoreBootstrapperApplication":
+                            this.ParseWixDotNetCoreBootstrapperApplicationElement(intermediate, section, element);
+                            break;
                         default:
                             this.ParseHelper.UnexpectedElement(parentElement, element);
                             break;
@@ -200,7 +203,9 @@ namespace WixToolset.Bal
                             case "BAFactoryAssembly":
                                 if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attribute))
                                 {
-                                    section.AddTuple(new WixBalBAFactoryAssemblyTuple(sourceLineNumbers)
+                                    // There can only be one.
+                                    var id = new Identifier(AccessModifier.Public, "TheBAFactoryAssembly");
+                                    section.AddTuple(new WixBalBAFactoryAssemblyTuple(sourceLineNumbers, id)
                                     {
                                         PayloadId = payloadId,
                                     });
@@ -655,5 +660,84 @@ namespace WixToolset.Bal
                 }
             }
         }
+
+        /// <summary>
+        /// Parses a WixDotNetCoreBootstrapperApplication element for Bundles.
+        /// </summary>
+        /// <param name="node">The element to parse.</param>
+        private void ParseWixDotNetCoreBootstrapperApplicationElement(Intermediate intermediate, IntermediateSection section, XElement node)
+        {
+            var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(node);
+            string logoFile = null;
+            string themeFile = null;
+            string localizationFile = null;
+            var selfContainedDeployment = YesNoType.NotSet;
+
+            foreach (var attrib in node.Attributes())
+            {
+                if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace)
+                {
+                    switch (attrib.Name.LocalName)
+                    {
+                        case "LogoFile":
+                            logoFile = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        case "ThemeFile":
+                            themeFile = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        case "LocalizationFile":
+                            localizationFile = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        case "SelfContainedDeployment":
+                            selfContainedDeployment = this.ParseHelper.GetAttributeYesNoValue(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 (!this.Messaging.EncounteredError)
+            {
+                if (!String.IsNullOrEmpty(logoFile))
+                {
+                    section.AddTuple(new WixVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "DncPreqbaLogo"))
+                    {
+                        Value = logoFile,
+                    });
+                }
+
+                if (!String.IsNullOrEmpty(themeFile))
+                {
+                    section.AddTuple(new WixVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "DncPreqbaThemeXml"))
+                    {
+                        Value = themeFile,
+                    });
+                }
+
+                if (!String.IsNullOrEmpty(localizationFile))
+                {
+                    section.AddTuple(new WixVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "DncPreqbaThemeWxl"))
+                    {
+                        Value = localizationFile,
+                    });
+                }
+
+                if (YesNoType.Yes == selfContainedDeployment)
+                {
+                    section.AddTuple(new WixDncOptionsTuple(sourceLineNumbers)
+                    {
+                        SelfContainedDeployment = 1,
+                    });
+                }
+            }
+        }
     }
 }
diff --git a/src/wixext/BalErrors.cs b/src/wixext/BalErrors.cs
index 5591ae1d..bc0186c1 100644
--- a/src/wixext/BalErrors.cs
+++ b/src/wixext/BalErrors.cs
@@ -18,9 +18,14 @@ namespace WixToolset.Bal
             return Message(sourceLineNumbers, Ids.BAFunctionsPayloadRequiredInUXContainer, "The BAFunctions DLL Payload element must be located inside the BootstrapperApplication container.");
         }
 
-        public static Message MissingPrereq()
+        public static Message MissingDNCPrereq()
         {
-            return Message(null, Ids.MissingPrereq, "There must be at least one PrereqPackage when using the ManagedBootstrapperApplicationHost.\nThis is typically done by using the WixNetFxExtension and referencing one of the NetFxAsPrereq package groups.");
+            return Message(null, Ids.MissingDNCPrereq, "There must be at least one PrereqPackage when using the DotNetCoreBootstrapperApplicationHost with SelfContainedDeployment set to \"no\".");
+        }
+
+        public static Message MissingMBAPrereq()
+        {
+            return Message(null, Ids.MissingMBAPrereq, "There must be at least one PrereqPackage when using the ManagedBootstrapperApplicationHost.\nThis is typically done by using the WixNetFxExtension and referencing one of the NetFxAsPrereq package groups.");
         }
 
         public static Message MultipleBAFunctions(SourceLineNumber sourceLineNumbers)
@@ -46,10 +51,11 @@ namespace WixToolset.Bal
         public enum Ids
         {
             AttributeRequiresPrereqPackage = 6801,
-            MissingPrereq = 6802,
+            MissingMBAPrereq = 6802,
             MultiplePrereqLicenses = 6803,
             MultipleBAFunctions = 6804,
             BAFunctionsPayloadRequiredInUXContainer = 6805,
+            MissingDNCPrereq = 6806,
         }
     }
 }
diff --git a/src/wixext/Tuples/BalTupleDefinitions.cs b/src/wixext/Tuples/BalTupleDefinitions.cs
index 48199f95..9a294703 100644
--- a/src/wixext/Tuples/BalTupleDefinitions.cs
+++ b/src/wixext/Tuples/BalTupleDefinitions.cs
@@ -11,6 +11,7 @@ namespace WixToolset.Bal
         WixBalBAFactoryAssembly,
         WixBalBAFunctions,
         WixBalCondition,
+        WixDncOptions,
         WixMbaPrereqInformation,
         WixStdbaOptions,
         WixStdbaOverridableVariable,
@@ -43,6 +44,9 @@ namespace WixToolset.Bal
                 case BalTupleDefinitionType.WixBalCondition:
                     return BalTupleDefinitions.WixBalCondition;
 
+                case BalTupleDefinitionType.WixDncOptions:
+                    return BalTupleDefinitions.WixDncOptions;
+
                 case BalTupleDefinitionType.WixMbaPrereqInformation:
                     return BalTupleDefinitions.WixMbaPrereqInformation;
 
@@ -62,6 +66,7 @@ namespace WixToolset.Bal
             WixBalBAFactoryAssembly.AddTag(BurnConstants.BootstrapperApplicationDataTupleDefinitionTag);
             WixBalBAFunctions.AddTag(BurnConstants.BootstrapperApplicationDataTupleDefinitionTag);
             WixBalCondition.AddTag(BurnConstants.BootstrapperApplicationDataTupleDefinitionTag);
+            WixDncOptions.AddTag(BurnConstants.BootstrapperApplicationDataTupleDefinitionTag);
             WixMbaPrereqInformation.AddTag(BurnConstants.BootstrapperApplicationDataTupleDefinitionTag);
             WixStdbaOptions.AddTag(BurnConstants.BootstrapperApplicationDataTupleDefinitionTag);
             WixStdbaOverridableVariable.AddTag(BurnConstants.BootstrapperApplicationDataTupleDefinitionTag);
diff --git a/src/wixext/Tuples/WixDncOptionsTuple.cs b/src/wixext/Tuples/WixDncOptionsTuple.cs
new file mode 100644
index 00000000..8a36879b
--- /dev/null
+++ b/src/wixext/Tuples/WixDncOptionsTuple.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.Tuples;
+
+    public static partial class BalTupleDefinitions
+    {
+        public static readonly IntermediateTupleDefinition WixDncOptions = new IntermediateTupleDefinition(
+            BalTupleDefinitionType.WixDncOptions.ToString(),
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixDncOptionsTupleFields.SelfContainedDeployment), IntermediateFieldType.Number),
+            },
+            typeof(WixDncOptionsTuple));
+    }
+}
+
+namespace WixToolset.Bal.Tuples
+{
+    using WixToolset.Data;
+
+    public enum WixDncOptionsTupleFields
+    {
+        SelfContainedDeployment,
+    }
+
+    public class WixDncOptionsTuple : IntermediateTuple
+    {
+        public WixDncOptionsTuple() : base(BalTupleDefinitions.WixDncOptions, null, null)
+        {
+        }
+
+        public WixDncOptionsTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalTupleDefinitions.WixDncOptions, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixDncOptionsTupleFields index] => this.Fields[(int)index];
+
+        public int SelfContainedDeployment
+        {
+            get => this.Fields[(int)WixDncOptionsTupleFields.SelfContainedDeployment].AsNumber();
+            set => this.Set((int)WixDncOptionsTupleFields.SelfContainedDeployment, value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/wixext/bal.xsd b/src/wixext/bal.xsd
index 52f9142f..ee1f8cec 100644
--- a/src/wixext/bal.xsd
+++ b/src/wixext/bal.xsd
@@ -215,6 +215,42 @@
         </xs:complexType>
     </xs:element>
 
+    <xs:element name="WixDotNetCoreBootstrapperApplication">
+        <xs:annotation>
+            <xs:documentation>
+                Configures the DotNetCoreBootstrapperApplicationHost for a Bundle.
+            </xs:documentation>
+            <xs:appinfo>
+                <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="BootstrapperApplicationRef" />
+            </xs:appinfo>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:attribute name="LogoFile" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation>Source file of the logo graphic.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="ThemeFile" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation>Source file of the theme XML.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="LocalizationFile" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation>Source file of the theme localization .wxl file.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="SelfContainedDeployment" type="YesNoType">
+                <xs:annotation>
+                    <xs:documentation>
+                        Whether the .NET Core BA was published as self-contained (SCD).
+                        If using PublishTrimmed in the .NET Core project, there must be an item group with &lt;TrimmerRootAssembly Include="System.Runtime.Loader" /&gt;
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+        </xs:complexType>
+    </xs:element>
+
     <xs:attribute name="BAFactoryAssembly" type="YesNoType">
         <xs:annotation>
             <xs:documentation>