diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2023-01-18 19:03:44 -0600 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2023-01-18 20:07:03 -0600 |
commit | 7a0aa56131ba7fa3b63788908c164d0f8118e3fc (patch) | |
tree | de06072b4bcf95c77afbae6efbf31df83f2848e0 /src/ext/Bal/wixext/BalCompiler.cs | |
parent | d180bc6df297422f189ffd08a0dd558bfbeba1ca (diff) | |
download | wix-7a0aa56131ba7fa3b63788908c164d0f8118e3fc.tar.gz wix-7a0aa56131ba7fa3b63788908c164d0f8118e3fc.tar.bz2 wix-7a0aa56131ba7fa3b63788908c164d0f8118e3fc.zip |
Improve error messages from BalBurnBackendExtension.
Diffstat (limited to 'src/ext/Bal/wixext/BalCompiler.cs')
-rw-r--r-- | src/ext/Bal/wixext/BalCompiler.cs | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/ext/Bal/wixext/BalCompiler.cs b/src/ext/Bal/wixext/BalCompiler.cs index bd2fb4a2..731943ee 100644 --- a/src/ext/Bal/wixext/BalCompiler.cs +++ b/src/ext/Bal/wixext/BalCompiler.cs | |||
@@ -581,7 +581,7 @@ namespace WixToolset.Bal | |||
581 | break; | 581 | break; |
582 | } | 582 | } |
583 | 583 | ||
584 | this.CreateBARef(section, sourceLineNumbers, node, baId); | 584 | this.CreateBARef(section, sourceLineNumbers, node, baId, WixBalBootstrapperApplicationType.InternalUi); |
585 | } | 585 | } |
586 | } | 586 | } |
587 | 587 | ||
@@ -860,7 +860,7 @@ namespace WixToolset.Bal | |||
860 | break; | 860 | break; |
861 | } | 861 | } |
862 | 862 | ||
863 | this.CreateBARef(section, sourceLineNumbers, node, baId); | 863 | this.CreateBARef(section, sourceLineNumbers, node, baId, WixBalBootstrapperApplicationType.Standard); |
864 | } | 864 | } |
865 | } | 865 | } |
866 | 866 | ||
@@ -963,7 +963,7 @@ namespace WixToolset.Bal | |||
963 | break; | 963 | break; |
964 | } | 964 | } |
965 | 965 | ||
966 | this.CreateBARef(section, sourceLineNumbers, node, baId); | 966 | this.CreateBARef(section, sourceLineNumbers, node, baId, WixBalBootstrapperApplicationType.ManagedHost); |
967 | 967 | ||
968 | if (alwaysInstallPrereqs) | 968 | if (alwaysInstallPrereqs) |
969 | { | 969 | { |
@@ -1086,7 +1086,7 @@ namespace WixToolset.Bal | |||
1086 | break; | 1086 | break; |
1087 | } | 1087 | } |
1088 | 1088 | ||
1089 | this.CreateBARef(section, sourceLineNumbers, node, baId); | 1089 | this.CreateBARef(section, sourceLineNumbers, node, baId, WixBalBootstrapperApplicationType.DotNetCoreHost); |
1090 | 1090 | ||
1091 | if (alwaysInstallPrereqs) | 1091 | if (alwaysInstallPrereqs) |
1092 | { | 1092 | { |
@@ -1098,7 +1098,7 @@ namespace WixToolset.Bal | |||
1098 | } | 1098 | } |
1099 | } | 1099 | } |
1100 | 1100 | ||
1101 | private void CreateBARef(IntermediateSection section, SourceLineNumber sourceLineNumbers, XElement node, string name) | 1101 | private void CreateBARef(IntermediateSection section, SourceLineNumber sourceLineNumbers, XElement node, string name, WixBalBootstrapperApplicationType baType) |
1102 | { | 1102 | { |
1103 | var id = this.ParseHelper.CreateIdentifierValueFromPlatform(name, this.Context.Platform, BurnPlatforms.X86 | BurnPlatforms.X64 | BurnPlatforms.ARM64); | 1103 | var id = this.ParseHelper.CreateIdentifierValueFromPlatform(name, this.Context.Platform, BurnPlatforms.X86 | BurnPlatforms.X64 | BurnPlatforms.ARM64); |
1104 | if (id == null) | 1104 | if (id == null) |
@@ -1109,6 +1109,11 @@ namespace WixToolset.Bal | |||
1109 | if (!this.Messaging.EncounteredError) | 1109 | if (!this.Messaging.EncounteredError) |
1110 | { | 1110 | { |
1111 | this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.WixBootstrapperApplication, id); | 1111 | this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.WixBootstrapperApplication, id); |
1112 | |||
1113 | section.AddSymbol(new WixBalBootstrapperApplicationSymbol(sourceLineNumbers) | ||
1114 | { | ||
1115 | Type = baType, | ||
1116 | }); | ||
1112 | } | 1117 | } |
1113 | } | 1118 | } |
1114 | } | 1119 | } |