diff options
Diffstat (limited to 'src/wixext/BalCompiler.cs')
-rw-r--r-- | src/wixext/BalCompiler.cs | 41 |
1 files changed, 13 insertions, 28 deletions
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 | |||
549 | 549 | ||
550 | if (!this.Messaging.EncounteredError) | 550 | if (!this.Messaging.EncounteredError) |
551 | { | 551 | { |
552 | this.CreateBARef(section, sourceLineNumbers, node, "WixStandardBootstrapperApplication"); | ||
553 | |||
554 | if (!String.IsNullOrEmpty(launchTarget)) | 552 | if (!String.IsNullOrEmpty(launchTarget)) |
555 | { | 553 | { |
556 | section.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "LaunchTarget")) | 554 | section.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "LaunchTarget")) |
@@ -674,30 +672,27 @@ namespace WixToolset.Bal | |||
674 | } | 672 | } |
675 | } | 673 | } |
676 | 674 | ||
677 | string themePayloadGroup = null; | 675 | var baId = "WixStandardBootstrapperApplication"; |
678 | switch (theme) | 676 | switch (theme) |
679 | { | 677 | { |
680 | case WixStandardBootstrapperApplicationTheme.HyperlinkLargeLicense: | 678 | case WixStandardBootstrapperApplicationTheme.HyperlinkLargeLicense: |
681 | themePayloadGroup = "WixStdbaHyperlinkLargeLicensePayloads"; | 679 | baId = "WixStandardBootstrapperApplication.HyperlinkLargeLicense"; |
682 | break; | 680 | break; |
683 | case WixStandardBootstrapperApplicationTheme.HyperlinkLicense: | 681 | case WixStandardBootstrapperApplicationTheme.HyperlinkLicense: |
684 | themePayloadGroup = "WixStdbaHyperlinkLicensePayloads"; | 682 | baId = "WixStandardBootstrapperApplication.HyperlinkLicense"; |
685 | break; | 683 | break; |
686 | case WixStandardBootstrapperApplicationTheme.HyperlinkSidebarLicense: | 684 | case WixStandardBootstrapperApplicationTheme.HyperlinkSidebarLicense: |
687 | themePayloadGroup = "WixStdbaHyperlinkSidebarLicensePayloads"; | 685 | baId = "WixStandardBootstrapperApplication.HyperlinkSidebarLicense"; |
688 | break; | 686 | break; |
689 | case WixStandardBootstrapperApplicationTheme.RtfLargeLicense: | 687 | case WixStandardBootstrapperApplicationTheme.RtfLargeLicense: |
690 | themePayloadGroup = "WixStdbaRtfLargeLicensePayloads"; | 688 | baId = "WixStandardBootstrapperApplication.RtfLargeLicense"; |
691 | break; | 689 | break; |
692 | case WixStandardBootstrapperApplicationTheme.RtfLicense: | 690 | case WixStandardBootstrapperApplicationTheme.RtfLicense: |
693 | themePayloadGroup = "WixStdbaRtfLicensePayloads"; | 691 | baId = "WixStandardBootstrapperApplication.RtfLicense"; |
694 | break; | 692 | break; |
695 | } | 693 | } |
696 | 694 | ||
697 | if (themePayloadGroup != null) | 695 | this.CreateBARef(section, sourceLineNumbers, node, baId); |
698 | { | ||
699 | this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.WixBundlePayloadGroup, themePayloadGroup); | ||
700 | } | ||
701 | } | 696 | } |
702 | } | 697 | } |
703 | 698 | ||
@@ -759,8 +754,6 @@ namespace WixToolset.Bal | |||
759 | 754 | ||
760 | if (!this.Messaging.EncounteredError) | 755 | if (!this.Messaging.EncounteredError) |
761 | { | 756 | { |
762 | this.CreateBARef(section, sourceLineNumbers, node, "WixManagedBootstrapperApplicationHost"); | ||
763 | |||
764 | if (!String.IsNullOrEmpty(logoFile)) | 757 | if (!String.IsNullOrEmpty(logoFile)) |
765 | { | 758 | { |
766 | section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "PreqbaLogo")) | 759 | section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "PreqbaLogo")) |
@@ -785,18 +778,15 @@ namespace WixToolset.Bal | |||
785 | }); | 778 | }); |
786 | } | 779 | } |
787 | 780 | ||
788 | string themePayloadGroup = null; | 781 | var baId = "WixManagedBootstrapperApplicationHost"; |
789 | switch (theme) | 782 | switch (theme) |
790 | { | 783 | { |
791 | case WixManagedBootstrapperApplicationHostTheme.Standard: | 784 | case WixManagedBootstrapperApplicationHostTheme.Standard: |
792 | themePayloadGroup = "MbaPreqStandardPayloads"; | 785 | baId = "WixManagedBootstrapperApplicationHost.Standard"; |
793 | break; | 786 | break; |
794 | } | 787 | } |
795 | 788 | ||
796 | if (themePayloadGroup != null) | 789 | this.CreateBARef(section, sourceLineNumbers, node, baId); |
797 | { | ||
798 | this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.WixBundlePayloadGroup, themePayloadGroup); | ||
799 | } | ||
800 | } | 790 | } |
801 | } | 791 | } |
802 | 792 | ||
@@ -867,8 +857,6 @@ namespace WixToolset.Bal | |||
867 | 857 | ||
868 | if (!this.Messaging.EncounteredError) | 858 | if (!this.Messaging.EncounteredError) |
869 | { | 859 | { |
870 | this.CreateBARef(section, sourceLineNumbers, node, "WixDotNetCoreBootstrapperApplicationHost"); | ||
871 | |||
872 | if (!String.IsNullOrEmpty(logoFile)) | 860 | if (!String.IsNullOrEmpty(logoFile)) |
873 | { | 861 | { |
874 | section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "DncPreqbaLogo")) | 862 | section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "DncPreqbaLogo")) |
@@ -901,18 +889,15 @@ namespace WixToolset.Bal | |||
901 | }); | 889 | }); |
902 | } | 890 | } |
903 | 891 | ||
904 | string themePayloadGroup = null; | 892 | var baId = "WixDotNetCoreBootstrapperApplicationHost"; |
905 | switch (theme) | 893 | switch (theme) |
906 | { | 894 | { |
907 | case WixDotNetCoreBootstrapperApplicationHostTheme.Standard: | 895 | case WixDotNetCoreBootstrapperApplicationHostTheme.Standard: |
908 | themePayloadGroup = "DncPreqStandardPayloads"; | 896 | baId = "WixDotNetCoreBootstrapperApplicationHost.Standard"; |
909 | break; | 897 | break; |
910 | } | 898 | } |
911 | 899 | ||
912 | if (themePayloadGroup != null) | 900 | this.CreateBARef(section, sourceLineNumbers, node, baId); |
913 | { | ||
914 | this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.WixBundlePayloadGroup, themePayloadGroup); | ||
915 | } | ||
916 | } | 901 | } |
917 | } | 902 | } |
918 | 903 | ||