aboutsummaryrefslogtreecommitdiff
path: root/src/wixext/UtilCompiler.cs
diff options
context:
space:
mode:
Diffstat (limited to 'src/wixext/UtilCompiler.cs')
-rw-r--r--src/wixext/UtilCompiler.cs23
1 files changed, 3 insertions, 20 deletions
diff --git a/src/wixext/UtilCompiler.cs b/src/wixext/UtilCompiler.cs
index f7f37fab..acd96e15 100644
--- a/src/wixext/UtilCompiler.cs
+++ b/src/wixext/UtilCompiler.cs
@@ -761,6 +761,9 @@ namespace WixToolset.Util
761 case "Id": 761 case "Id":
762 id = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib); 762 id = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib);
763 break; 763 break;
764 case "Condition":
765 condition = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
766 break;
764 case "Description": 767 case "Description":
765 description = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); 768 description = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
766 break; 769 break;
@@ -870,9 +873,6 @@ namespace WixToolset.Util
870 this.Messaging.Write(ErrorMessages.IllegalAttributeWithOtherAttribute(sourceLineNumbers, element.Name.LocalName, "TerminateProcess", "RebootPrompt", "yes")); 873 this.Messaging.Write(ErrorMessages.IllegalAttributeWithOtherAttribute(sourceLineNumbers, element.Name.LocalName, "TerminateProcess", "RebootPrompt", "yes"));
871 } 874 }
872 875
873 // get the condition from the inner text of the element
874 condition = this.ParseHelper.GetConditionInnerText(element);
875
876 this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); 876 this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element);
877 877
878 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "CloseApplications", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); 878 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "CloseApplications", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64);
@@ -3606,23 +3606,6 @@ namespace WixToolset.Util
3606 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, UtilSymbolDefinitions.XmlConfig, elementId); 3606 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, UtilSymbolDefinitions.XmlConfig, elementId);
3607 } 3607 }
3608 3608
3609 var innerText = this.ParseHelper.GetTrimmedInnerText(element);
3610 if (null != value)
3611 {
3612 // cannot specify both the value attribute and inner text
3613 if (!String.IsNullOrEmpty(innerText))
3614 {
3615 this.Messaging.Write(ErrorMessages.IllegalAttributeWithInnerText(sourceLineNumbers, element.Name.LocalName, "Value"));
3616 }
3617 }
3618 else // value attribute not specified
3619 {
3620 if (!String.IsNullOrEmpty(innerText))
3621 {
3622 value = innerText;
3623 }
3624 }
3625
3626 // find unexpected child elements 3609 // find unexpected child elements
3627 foreach (var child in element.Elements()) 3610 foreach (var child in element.Elements())
3628 { 3611 {