Fix theme PayloadGroupRefs and BalBurnBackendExtension.

4 files changed, 66 insertions, 35 deletions

diff --git a/src/test/WixToolsetTest.Bal/BalExtensionFixture.cs b/src/test/WixToolsetTest.Bal/BalExtensionFixture.cs
index 277a941a..2ff57c55 100644
--- a/src/test/WixToolsetTest.Bal/BalExtensionFixture.cs
+++ b/src/test/WixToolsetTest.Bal/BalExtensionFixture.cs
@@ -42,6 +42,8 @@ namespace WixToolsetTest.Bal
                 var balPackageInfos = extractResult.SelectBADataNodes("/ba:BootstrapperApplicationData/ba:WixBalPackageInfo");
                 var balPackageInfo = (XmlNode)Assert.Single(balPackageInfos);
                 Assert.Equal("<WixBalPackageInfo PackageId='test.msi' DisplayInternalUICondition='1' />", balPackageInfo.GetTestXml());
+
+                Assert.True(File.Exists(Path.Combine(baFolderPath, "thm.wxl")));
             }
         }
 
diff --git a/src/wixext/BalBurnBackendExtension.cs b/src/wixext/BalBurnBackendExtension.cs
index 7e481ee9..bf96e388 100644
--- a/src/wixext/BalBurnBackendExtension.cs
+++ b/src/wixext/BalBurnBackendExtension.cs
@@ -34,7 +34,7 @@ namespace WixToolset.Bal
             var intermediate = this.Context.IntermediateRepresentation;
             var section = intermediate.Sections.Single();
 
-            var baSymbol = section.Symbols.OfType<WixBootstrapperApplicationSymbol>().SingleOrDefault();
+            var baSymbol = section.Symbols.OfType<WixBootstrapperApplicationDllSymbol>().SingleOrDefault();
             var baId = baSymbol?.Id?.Id;
             if (null == baId)
             {
@@ -77,8 +77,8 @@ namespace WixToolset.Bal
             {
                 foreach (var payloadPropertiesSymbol in payloadPropertiesSymbols)
                 {
-                    // TODO: Make core WiX canonicalize Name (this won't catch '.\bafunctions.dll').
-                    if (string.Equals(payloadPropertiesSymbol.Name, "bafunctions.dll", StringComparison.OrdinalIgnoreCase))
+                    if (string.Equals(payloadPropertiesSymbol.Name, "bafunctions.dll", StringComparison.OrdinalIgnoreCase) &&
+                        BurnConstants.BurnUXContainerName == payloadPropertiesSymbol.ContainerRef)
                     {
                         this.Messaging.Write(BalWarnings.UnmarkedBAFunctionsDLL(payloadPropertiesSymbol.SourceLineNumbers));
                     }
diff --git a/src/wixext/BalCompiler.cs b/src/wixext/BalCompiler.cs
index c01905cc..eab374ce 100644
--- a/src/wixext/BalCompiler.cs
+++ b/src/wixext/BalCompiler.cs
@@ -549,8 +549,6 @@ namespace WixToolset.Bal
 
             if (!this.Messaging.EncounteredError)
             {
-                this.CreateBARef(section, sourceLineNumbers, node, "WixStandardBootstrapperApplication");
-
                 if (!String.IsNullOrEmpty(launchTarget))
                 {
                     section.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "LaunchTarget"))
@@ -674,30 +672,27 @@ namespace WixToolset.Bal
                     }
                 }
 
-                string themePayloadGroup = null;
+                var baId = "WixStandardBootstrapperApplication";
                 switch (theme)
                 {
                     case WixStandardBootstrapperApplicationTheme.HyperlinkLargeLicense:
-                        themePayloadGroup = "WixStdbaHyperlinkLargeLicensePayloads";
+                        baId = "WixStandardBootstrapperApplication.HyperlinkLargeLicense";
                         break;
                     case WixStandardBootstrapperApplicationTheme.HyperlinkLicense:
-                        themePayloadGroup = "WixStdbaHyperlinkLicensePayloads";
+                        baId = "WixStandardBootstrapperApplication.HyperlinkLicense";
                         break;
                     case WixStandardBootstrapperApplicationTheme.HyperlinkSidebarLicense:
-                        themePayloadGroup = "WixStdbaHyperlinkSidebarLicensePayloads";
+                        baId = "WixStandardBootstrapperApplication.HyperlinkSidebarLicense";
                         break;
                     case WixStandardBootstrapperApplicationTheme.RtfLargeLicense:
-                        themePayloadGroup = "WixStdbaRtfLargeLicensePayloads";
+                        baId = "WixStandardBootstrapperApplication.RtfLargeLicense";
                         break;
                     case WixStandardBootstrapperApplicationTheme.RtfLicense:
-                        themePayloadGroup = "WixStdbaRtfLicensePayloads";
+                        baId = "WixStandardBootstrapperApplication.RtfLicense";
                         break;
                 }
 
-                if (themePayloadGroup != null)
-                {
-                    this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.WixBundlePayloadGroup, themePayloadGroup);
-                }
+                this.CreateBARef(section, sourceLineNumbers, node, baId);
             }
         }
 
@@ -759,8 +754,6 @@ namespace WixToolset.Bal
 
             if (!this.Messaging.EncounteredError)
             {
-                this.CreateBARef(section, sourceLineNumbers, node, "WixManagedBootstrapperApplicationHost");
-
                 if (!String.IsNullOrEmpty(logoFile))
                 {
                     section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "PreqbaLogo"))
@@ -785,18 +778,15 @@ namespace WixToolset.Bal
                     });
                 }
 
-                string themePayloadGroup = null;
+                var baId = "WixManagedBootstrapperApplicationHost";
                 switch (theme)
                 {
                     case WixManagedBootstrapperApplicationHostTheme.Standard:
-                        themePayloadGroup = "MbaPreqStandardPayloads";
+                        baId = "WixManagedBootstrapperApplicationHost.Standard";
                         break;
                 }
 
-                if (themePayloadGroup != null)
-                {
-                    this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.WixBundlePayloadGroup, themePayloadGroup);
-                }
+                this.CreateBARef(section, sourceLineNumbers, node, baId);
             }
         }
 
@@ -867,8 +857,6 @@ namespace WixToolset.Bal
 
             if (!this.Messaging.EncounteredError)
             {
-                this.CreateBARef(section, sourceLineNumbers, node, "WixDotNetCoreBootstrapperApplicationHost");
-
                 if (!String.IsNullOrEmpty(logoFile))
                 {
                     section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "DncPreqbaLogo"))
@@ -901,18 +889,15 @@ namespace WixToolset.Bal
                     });
                 }
 
-                string themePayloadGroup = null;
+                var baId = "WixDotNetCoreBootstrapperApplicationHost";
                 switch (theme)
                 {
                     case WixDotNetCoreBootstrapperApplicationHostTheme.Standard:
-                        themePayloadGroup = "DncPreqStandardPayloads";
+                        baId = "WixDotNetCoreBootstrapperApplicationHost.Standard";
                         break;
                 }
 
-                if (themePayloadGroup != null)
-                {
-                    this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.WixBundlePayloadGroup, themePayloadGroup);
-                }
+                this.CreateBARef(section, sourceLineNumbers, node, baId);
             }
         }
 
diff --git a/src/wixlib/BalExtension_platform.wxi b/src/wixlib/BalExtension_platform.wxi
index fa7d1182..33122fb2 100644
--- a/src/wixlib/BalExtension_platform.wxi
+++ b/src/wixlib/BalExtension_platform.wxi
@@ -1,25 +1,69 @@
-<!-- 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. -->
+<!-- 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. -->
 
 
 <Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
     <?include caDecor.wxi ?>
     <Fragment>
         <BootstrapperApplication Id="WixDotNetCoreBootstrapperApplicationHost$(var.Suffix)">
-            <BootstrapperApplicationDll SourceFile="!(bindpath.$(var.platform))\dnchost.dll" />
+            <BootstrapperApplicationDll Id="WixDotNetCoreBootstrapperApplicationHost" SourceFile="!(bindpath.$(var.platform))\dnchost.dll" />
             <Payload SourceFile="!(bindpath.$(var.platform))\wixstdba.dll" Name="dncpreq.dll" />
             <PayloadGroupRef Id="WixDotNetCoreBootstrapperApplicationHostManagedPayloads" />
         </BootstrapperApplication>
     </Fragment>
     <Fragment>
+        <BootstrapperApplication Id="WixDotNetCoreBootstrapperApplicationHost.Standard$(var.Suffix)">
+            <PayloadGroupRef Id="DncPreqStandardPayloads" />
+        </BootstrapperApplication>
+        <BootstrapperApplicationRef Id="WixDotNetCoreBootstrapperApplicationHost$(var.Suffix)" />
+    </Fragment>
+    
+    <Fragment>
         <BootstrapperApplication Id="WixManagedBootstrapperApplicationHost$(var.Suffix)">
-            <BootstrapperApplicationDll SourceFile="!(bindpath.$(var.platform))\mbahost.dll" />
+            <BootstrapperApplicationDll Id="WixManagedBootstrapperApplicationHost" SourceFile="!(bindpath.$(var.platform))\mbahost.dll" />
             <Payload SourceFile="!(bindpath.$(var.platform))\wixstdba.dll" Name="mbapreq.dll" />
             <PayloadGroupRef Id="WixManagedBootstrapperApplicationHostManagedPayloads" />
         </BootstrapperApplication>
     </Fragment>
     <Fragment>
+        <BootstrapperApplication Id="WixManagedBootstrapperApplicationHost.Standard$(var.Suffix)">
+            <PayloadGroupRef Id="MbaPreqStandardPayloads" />
+        </BootstrapperApplication>
+        <BootstrapperApplicationRef Id="WixManagedBootstrapperApplicationHost$(var.Suffix)" />
+    </Fragment>
+
+    <Fragment>
         <BootstrapperApplication Id="WixStandardBootstrapperApplication$(var.Suffix)">
-            <BootstrapperApplicationDll SourceFile="!(bindpath.$(var.platform))\wixstdba.dll" />
+            <BootstrapperApplicationDll Id="WixStandardBootstrapperApplication" SourceFile="!(bindpath.$(var.platform))\wixstdba.dll" />
+        </BootstrapperApplication>
+    </Fragment>
+    <Fragment>
+        <BootstrapperApplication Id="WixStandardBootstrapperApplication.RtfLicense$(var.Suffix)">
+            <PayloadGroupRef Id="WixStdbaRtfLicensePayloads" />
+        </BootstrapperApplication>
+        <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication$(var.Suffix)" />
+    </Fragment>
+    <Fragment>
+        <BootstrapperApplication Id="WixStandardBootstrapperApplication.RtfLargeLicense$(var.Suffix)">
+            <PayloadGroupRef Id="WixStdbaRtfLargeLicensePayloads" />
+        </BootstrapperApplication>
+        <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication$(var.Suffix)" />
+    </Fragment>
+    <Fragment>
+        <BootstrapperApplication Id="WixStandardBootstrapperApplication.HyperlinkLicense$(var.Suffix)">
+            <PayloadGroupRef Id="WixStdbaHyperlinkLicensePayloads" />
+        </BootstrapperApplication>
+        <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication$(var.Suffix)" />
+    </Fragment>
+    <Fragment>
+        <BootstrapperApplication Id="WixStandardBootstrapperApplication.HyperlinkLargeLicense$(var.Suffix)">
+            <PayloadGroupRef Id="WixStdbaHyperlinkLargeLicensePayloads" />
+        </BootstrapperApplication>
+        <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication$(var.Suffix)" />
+    </Fragment>
+    <Fragment>
+        <BootstrapperApplication Id="WixStandardBootstrapperApplication.HyperlinkSidebarLicense$(var.Suffix)">
+            <PayloadGroupRef Id="WixStdbaHyperlinkSidebarLicensePayloads" />
         </BootstrapperApplication>
+        <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication$(var.Suffix)" />
     </Fragment>
 </Include>