From ed0fb39537c0cfb13922537a26f9d895180d42d8 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Tue, 23 Jun 2020 00:56:36 -0700 Subject: Remove obsolete inner text handling --- src/WixToolset.Core/Common.cs | 6 +- src/WixToolset.Core/Compiler.cs | 188 --------------------- src/WixToolset.Core/CompilerCore.cs | 20 --- src/WixToolset.Core/Compiler_2.cs | 113 +------------ src/WixToolset.Core/Compiler_Bundle.cs | 5 - src/WixToolset.Core/Compiler_EmbeddedUI.cs | 6 - src/WixToolset.Core/Compiler_UI.cs | 43 ----- .../BundleCustomTable/BundleCustomTable.wxs | 24 +-- .../CustomAction/UnscheduledCustomAction.wxs | 2 +- .../TestData/CustomTable/CustomTable.wxs | 16 +- .../TestData/CustomTable/CustomTableWithFile.wxs | 8 +- .../PackageComponents.wxs | 15 +- 12 files changed, 37 insertions(+), 409 deletions(-) diff --git a/src/WixToolset.Core/Common.cs b/src/WixToolset.Core/Common.cs index e6f30e0c..183d7abd 100644 --- a/src/WixToolset.Core/Common.cs +++ b/src/WixToolset.Core/Common.cs @@ -690,10 +690,8 @@ namespace WixToolset.Core /// /// Gets the text of an XElement. /// - /// Source line information about the owner element. - /// The attribute containing the value to get. - /// A delegate that receives error messages. - /// The attribute's YesNoType value. + /// Element to get text. + /// The element's text. internal static string GetInnerText(XElement node) { var text = node.Nodes().Where(n => XmlNodeType.Text == n.NodeType || XmlNodeType.CDATA == n.NodeType).Cast().FirstOrDefault(); diff --git a/src/WixToolset.Core/Compiler.cs b/src/WixToolset.Core/Compiler.cs index 5bd923dd..28290569 100644 --- a/src/WixToolset.Core/Compiler.cs +++ b/src/WixToolset.Core/Compiler.cs @@ -2319,14 +2319,6 @@ namespace WixToolset.Core case "Class": this.ParseClassElement(child, id.Id, YesNoType.NotSet, null, null, null, null); break; - case "Condition": - if (null != condition) - { - var childSourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); - this.Core.Write(ErrorMessages.TooManyChildren(childSourceLineNumbers, node.Name.LocalName, child.Name.LocalName)); - } - condition = this.ParseConditionElement(child, node.Name.LocalName, null, null); - break; case "CopyFile": this.ParseCopyFileElement(child, id.Id, null); break; @@ -3382,17 +3374,12 @@ namespace WixToolset.Core win64 = true; } - // get the inner text if any exists - var innerText = this.Core.GetTrimmedInnerText(node); - // if we have an in-lined Script CustomAction ensure no source or target attributes were provided if (inlineScript) { if (String.IsNullOrEmpty(scriptFile)) { this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "ScriptFile", "Script")); - - target = innerText; } } else if (CustomActionTargetType.VBScript == targetType) // non-inline vbscript @@ -3428,10 +3415,6 @@ namespace WixToolset.Core { this.Core.Write(ErrorMessages.IllegalAttributeWithoutOtherAttributes(sourceLineNumbers, node.Name.LocalName, "Value", "Directory", "Property", "Error")); } - else if (!String.IsNullOrEmpty(innerText)) // inner text cannot be specified with non-script CAs - { - this.Core.Write(ErrorMessages.CustomActionIllegalInnerText(sourceLineNumbers, node.Name.LocalName, innerText, "Script")); - } if (!inlineScript && !String.IsNullOrEmpty(scriptFile)) { @@ -4053,11 +4036,6 @@ namespace WixToolset.Core this.Core.Write(ErrorMessages.ExpectedAttribute(childSourceLineNumbers, child.Name.LocalName, "Column")); } - if (String.IsNullOrEmpty(data)) - { - data = Common.GetInnerText(child); - } - if (!this.Core.EncounteredError) { this.Core.AddTuple(new WixCustomTableCellTuple(childSourceLineNumbers, new Identifier(AccessModifier.Private, tableId, rowId, columnName)) @@ -4864,9 +4842,6 @@ namespace WixToolset.Core case "Component": this.ParseComponentElement(child, ComplexReferenceParentType.Feature, id.Id, null, CompilerConstants.IntegerNotSet, null, null); break; - case "Condition": - this.ParseConditionElement(child, node.Name.LocalName, id.Id, null); - break; case "Feature": this.ParseFeatureElement(child, ComplexReferenceParentType.Feature, id.Id, ref childDisplay); break; @@ -5368,11 +5343,6 @@ namespace WixToolset.Core id = CompilerConstants.IllegalInteger; } - if (String.IsNullOrEmpty(message)) - { - message = Common.GetInnerText(node); - } - this.Core.ParseForExtensionElements(node); if (!this.Core.EncounteredError) @@ -6232,9 +6202,6 @@ namespace WixToolset.Core case "ComponentGroup": this.ParseComponentGroupElement(child, ComplexReferenceParentType.Unknown, id?.Id); break; - case "Condition": - this.ParseConditionElement(child, node.Name.LocalName, null, null); - break; case "Container": this.ParseContainerElement(child); break; @@ -6418,161 +6385,6 @@ namespace WixToolset.Core } } - /// - /// Parses a condition element. - /// - /// Element to parse. - /// LocalName of the parent element. - /// Id of the parent element. - /// Dialog of the parent element if its a Control. - /// The condition if one was found. - private string ParseConditionElement(XElement node, string parentElementLocalName, string id, string dialog) - { - var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); - string action = null; - string condition = null; - var level = CompilerConstants.IntegerNotSet; - string message = null; - - foreach (var attrib in node.Attributes()) - { - if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || CompilerCore.WixNamespace == attrib.Name.Namespace) - { - switch (attrib.Name.LocalName) - { - case "Action": - if ("Control" == parentElementLocalName) - { - action = this.Core.GetAttributeValue(sourceLineNumbers, attrib); - switch (action) - { - case "default": - action = "Default"; - break; - case "disable": - action = "Disable"; - break; - case "enable": - action = "Enable"; - break; - case "hide": - action = "Hide"; - break; - case "show": - action = "Show"; - break; - case "": - break; - default: - this.Core.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, action, "default", "disable", "enable", "hide", "show")); - break; - } - } - else - { - this.Core.UnexpectedAttribute(node, attrib); - } - break; - case "Level": - if ("Feature" == parentElementLocalName) - { - level = this.Core.GetAttributeIntegerValue(sourceLineNumbers, attrib, 0, Int16.MaxValue); - } - else - { - this.Core.UnexpectedAttribute(node, attrib); - } - break; - case "Message": - if ("Fragment" == parentElementLocalName || "Product" == parentElementLocalName) - { - message = this.Core.GetAttributeValue(sourceLineNumbers, attrib); - } - else - { - this.Core.UnexpectedAttribute(node, attrib); - } - break; - default: - this.Core.UnexpectedAttribute(node, attrib); - break; - } - } - else - { - this.Core.ParseExtensionAttribute(node, attrib); - } - } - - // get the condition from the inner text of the element - condition = this.Core.GetConditionInnerText(node); - - this.Core.ParseForExtensionElements(node); - - // the condition should not be empty - if (null == condition || 0 == condition.Length) - { - condition = null; - this.Core.Write(ErrorMessages.ConditionExpected(sourceLineNumbers, node.Name.LocalName)); - } - - switch (parentElementLocalName) - { - case "Control": - if (null == action) - { - this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Action")); - } - - if (!this.Core.EncounteredError) - { - this.Core.AddTuple(new ControlConditionTuple(sourceLineNumbers) - { - DialogRef = dialog, - ControlRef = id, - Action = action, - Condition = condition, - }); - } - break; - case "Feature": - if (CompilerConstants.IntegerNotSet == level) - { - this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Level")); - level = CompilerConstants.IllegalInteger; - } - - if (!this.Core.EncounteredError) - { - this.Core.AddTuple(new ConditionTuple(sourceLineNumbers) - { - FeatureRef = id, - Level = level, - Condition = condition - }); - } - break; - case "Fragment": - case "Product": - if (null == message) - { - this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Message")); - } - - if (!this.Core.EncounteredError) - { - this.Core.AddTuple(new LaunchConditionTuple(sourceLineNumbers) - { - Condition = condition, - Description = message - }); - } - break; - } - - return condition; - } - /// /// Parses a IniFile element. /// diff --git a/src/WixToolset.Core/CompilerCore.cs b/src/WixToolset.Core/CompilerCore.cs index 93f9276c..5d0edaf1 100644 --- a/src/WixToolset.Core/CompilerCore.cs +++ b/src/WixToolset.Core/CompilerCore.cs @@ -321,26 +321,6 @@ namespace WixToolset.Core return Common.IsValidModuleOrBundleVersion(version); } - /// - /// Get an element's inner text and trims any extra whitespace. - /// - /// The element with inner text to be trimmed. - /// The node's inner text trimmed. - public string GetTrimmedInnerText(XElement element) - { - return this.parseHelper.GetTrimmedInnerText(element); - } - - /// - /// Gets element's inner text and ensure's it is safe for use in a condition by trimming any extra whitespace. - /// - /// The element to ensure inner text is a condition. - /// The value converted into a safe condition. - public string GetConditionInnerText(XElement element) - { - return this.parseHelper.GetConditionInnerText(element); - } - /// /// Creates a version 3 name-based UUID. /// diff --git a/src/WixToolset.Core/Compiler_2.cs b/src/WixToolset.Core/Compiler_2.cs index df4c037d..18a0366e 100644 --- a/src/WixToolset.Core/Compiler_2.cs +++ b/src/WixToolset.Core/Compiler_2.cs @@ -186,9 +186,6 @@ namespace WixToolset.Core case "ComponentGroup": this.ParseComponentGroupElement(child, ComplexReferenceParentType.Unknown, null); break; - case "Condition": - this.ParseConditionElement(child, node.Name.LocalName, null, null); - break; case "CustomAction": this.ParseCustomActionElement(child); break; @@ -228,6 +225,9 @@ namespace WixToolset.Core case "InstanceTransforms": this.ParseInstanceTransformsElement(child); break; + case "Launch": + this.ParseLaunchElement(child); + break; case "MajorUpgrade": this.ParseMajorUpgradeElement(child, contextValues); break; @@ -1235,31 +1235,7 @@ namespace WixToolset.Core id = this.Core.CreateIdentifier("pme", objectId, tableName, sddl); } - foreach (var child in node.Elements()) - { - if (CompilerCore.WixNamespace == child.Name.Namespace) - { - switch (child.Name.LocalName) - { - case "Condition": - if (null != condition) - { - var childSourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); - this.Core.Write(ErrorMessages.TooManyChildren(childSourceLineNumbers, node.Name.LocalName, child.Name.LocalName)); - } - - condition = this.ParseConditionElement(child, node.Name.LocalName, null, null); - break; - default: - this.Core.UnexpectedElement(node, child); - break; - } - } - else - { - this.Core.ParseExtensionElement(node, child); - } - } + this.Core.ParseForExtensionElements(node); if (!this.Core.EncounteredError) { @@ -1537,20 +1513,6 @@ namespace WixToolset.Core this.Core.Write(ErrorMessages.CannotAuthorSpecialProperties(sourceLineNumbers, id.Id)); } - var innerText = this.Core.GetTrimmedInnerText(node); - if (null != value) - { - // cannot specify both the value attribute and inner text - if (!String.IsNullOrEmpty(innerText)) - { - this.Core.Write(ErrorMessages.IllegalAttributeWithInnerText(sourceLineNumbers, node.Name.LocalName, "Value")); - } - } - else // value attribute not specified, use inner text if any. - { - value = innerText; - } - if ("ErrorDialog" == id.Id) { this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.Dialog, value); @@ -2090,11 +2052,6 @@ namespace WixToolset.Core } } - if (multiStringValue == null) - { - multiStringValue = Common.GetInnerText(node); - } - if (multiStringValue == null) { this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Value")); @@ -2683,12 +2640,6 @@ namespace WixToolset.Core } } - // Get the condition from the inner text of the element. - if (condition == null) - { - condition = this.Core.GetConditionInnerText(child); - } - if (customAction && "Custom" == actionName) { this.Core.Write(ErrorMessages.ExpectedAttribute(childSourceLineNumbers, child.Name.LocalName, "Action")); @@ -3152,11 +3103,6 @@ namespace WixToolset.Core } } - if (privilege == null) - { - privilege = Common.GetInnerText(node); - } - if (privilege == null) { this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Name")); @@ -3518,11 +3464,6 @@ namespace WixToolset.Core } } - if (argument == null) - { - argument = this.Core.GetTrimmedInnerText(node); - } - if (argument == null) { this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Value")); @@ -3860,11 +3801,6 @@ namespace WixToolset.Core } } - if (condition == null) - { - condition = this.Core.GetConditionInnerText(node); - } - if (null == id) { this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Id")); @@ -3957,29 +3893,6 @@ namespace WixToolset.Core this.Core.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, sequenceValue, "execute", "ui", "both")); break; } - //if (0 < sequenceValue.Length) - //{ - // var sequenceType = Wix.Enums.ParseSequenceType(sequenceValue); - // switch (sequenceType) - // { - // case Wix.SequenceType.execute: - // sequences = new string[] { "InstallExecuteSequence" }; - // break; - // case Wix.SequenceType.ui: - // sequences = new string[] { "InstallUISequence" }; - // break; - // case Wix.SequenceType.first: - // firstSequence = true; - // // default puts it in both sequence which is what we want - // break; - // case Wix.SequenceType.both: - // // default so no work necessary. - // break; - // default: - // this.Core.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, sequenceValue, "execute", "ui", "both")); - // break; - // } - //} break; case "Value": value = this.Core.GetAttributeValue(sourceLineNumbers, attrib, EmptyRule.CanBeEmpty); @@ -3995,11 +3908,6 @@ namespace WixToolset.Core } } - if (condition == null) - { - condition = this.Core.GetConditionInnerText(node); - } - if (null == id) { this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Id")); @@ -4528,19 +4436,6 @@ namespace WixToolset.Core id = this.Core.CreateIdentifier("scp", shortcutId, key.ToUpperInvariant()); } - var innerText = this.Core.GetTrimmedInnerText(node); - if (!String.IsNullOrEmpty(innerText)) - { - if (String.IsNullOrEmpty(value)) - { - value = innerText; - } - else // cannot specify both the value attribute and inner text - { - this.Core.Write(ErrorMessages.IllegalAttributeWithInnerText(sourceLineNumbers, node.Name.LocalName, "Value")); - } - } - if (String.IsNullOrEmpty(value)) { this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Value")); diff --git a/src/WixToolset.Core/Compiler_Bundle.cs b/src/WixToolset.Core/Compiler_Bundle.cs index 2b274474..d88cb7f5 100644 --- a/src/WixToolset.Core/Compiler_Bundle.cs +++ b/src/WixToolset.Core/Compiler_Bundle.cs @@ -1056,11 +1056,6 @@ namespace WixToolset.Core this.Core.Write(ErrorMessages.ExpectedAttribute(childSourceLineNumbers, child.Name.LocalName, "Id")); } - if (String.IsNullOrEmpty(value)) - { - value = Common.GetInnerText(child); - } - if (!this.Core.EncounteredError) { this.Core.AddTuple(new WixBundleCustomDataCellTuple(childSourceLineNumbers, new Identifier(AccessModifier.Private, customDataId, elementId, attributeName)) diff --git a/src/WixToolset.Core/Compiler_EmbeddedUI.cs b/src/WixToolset.Core/Compiler_EmbeddedUI.cs index 1827a200..847ee2a8 100644 --- a/src/WixToolset.Core/Compiler_EmbeddedUI.cs +++ b/src/WixToolset.Core/Compiler_EmbeddedUI.cs @@ -80,12 +80,6 @@ namespace WixToolset.Core } } - if (condition == null) - { - // Get the condition from the inner text of the element. - condition = this.Core.GetConditionInnerText(node); - } - if (null == id) { id = this.Core.CreateIdentifier("mec", source, type.ToString()); diff --git a/src/WixToolset.Core/Compiler_UI.cs b/src/WixToolset.Core/Compiler_UI.cs index 5c2400e4..5066ff1a 100644 --- a/src/WixToolset.Core/Compiler_UI.cs +++ b/src/WixToolset.Core/Compiler_UI.cs @@ -700,11 +700,6 @@ namespace WixToolset.Core this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Action")); } - if (null == message) - { - message = Common.GetInnerText(node); - } - this.Core.ParseForExtensionElements(node); if (!this.Core.EncounteredError) @@ -751,11 +746,6 @@ namespace WixToolset.Core } } - if (null == text) - { - text = Common.GetInnerText(node); - } - if (null == id) { id = this.Core.CreateIdentifier("txt", text); @@ -1270,26 +1260,6 @@ namespace WixToolset.Core this.Core.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, iconSizeValue, "16", "32", "48")); break; } - //if (0 < iconSizeValue.Length) - //{ - // var iconsSizeType = Wix.Control.ParseIconSizeType(iconSizeValue); - // switch (iconsSizeType) - // { - // case Wix.Control.IconSizeType.Item16: - // this.Core.TrySetBitFromName(specialAttributes, "Icon16", YesNoType.Yes, bits, 16); - // break; - // case Wix.Control.IconSizeType.Item32: - // this.Core.TrySetBitFromName(specialAttributes, "Icon32", YesNoType.Yes, bits, 16); - // break; - // case Wix.Control.IconSizeType.Item48: - // this.Core.TrySetBitFromName(specialAttributes, "Icon16", YesNoType.Yes, bits, 16); - // this.Core.TrySetBitFromName(specialAttributes, "Icon32", YesNoType.Yes, bits, 16); - // break; - // default: - // this.Core.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, iconSizeValue, "16", "32", "48")); - // break; - // } - //} } else { @@ -1411,9 +1381,6 @@ namespace WixToolset.Core case "ComboBox": this.ParseControlGroupElement(child, TupleDefinitionType.ComboBox, "ListItem"); break; - case "Condition": - this.ParseConditionElement(child, node.Name.LocalName, controlId.Id, dialog); - break; case "ListBox": this.ParseControlGroupElement(child, TupleDefinitionType.ListBox, "ListItem"); break; @@ -1456,11 +1423,6 @@ namespace WixToolset.Core } } - if (null == text) - { - text = Common.GetInnerText(child); - } - if (!String.IsNullOrEmpty(text) && null != sourceFile) { this.Core.Write(ErrorMessages.IllegalAttributeWithOtherAttribute(childSourceLineNumbers, child.Name.LocalName, "SourceFile", "Text")); @@ -1728,11 +1690,6 @@ namespace WixToolset.Core } } - if (null == condition) - { - condition = this.Core.GetConditionInnerText(node); - } - if (null == control) { this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Control")); diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/BundleCustomTable/BundleCustomTable.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/BundleCustomTable/BundleCustomTable.wxs index 8482a57e..db755171 100644 --- a/src/test/WixToolsetTest.CoreIntegration/TestData/BundleCustomTable/BundleCustomTable.wxs +++ b/src/test/WixToolsetTest.CoreIntegration/TestData/BundleCustomTable/BundleCustomTable.wxs @@ -10,12 +10,12 @@ - one - two + + - < - > + + @@ -28,23 +28,23 @@ - 1 - 2 + + - one - two + + - < - > + + - 1 - 2 + + diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/UnscheduledCustomAction.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/UnscheduledCustomAction.wxs index 2846d16e..0784824a 100644 --- a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/UnscheduledCustomAction.wxs +++ b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/UnscheduledCustomAction.wxs @@ -27,7 +27,7 @@ - Progess2Text + diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/CustomTable.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/CustomTable.wxs index 51aee5f2..7f4a43e5 100644 --- a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/CustomTable.wxs +++ b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/CustomTable.wxs @@ -9,12 +9,12 @@ - Row1 - test.txt + + - Row2 - test.txt + + @@ -22,12 +22,12 @@ - RowA - test.txt + + - RowB - test.txt + + diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/CustomTableWithFile.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/CustomTableWithFile.wxs index ad5ed233..08a9c470 100644 --- a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/CustomTableWithFile.wxs +++ b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomTable/CustomTableWithFile.wxs @@ -9,12 +9,12 @@ - Row1 - file1.txt + + - SourceDir\file2.txt - Row2 + + diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/DialogsInInstallUISequence/PackageComponents.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/DialogsInInstallUISequence/PackageComponents.wxs index 1101d901..c6deb864 100644 --- a/src/test/WixToolsetTest.CoreIntegration/TestData/DialogsInInstallUISequence/PackageComponents.wxs +++ b/src/test/WixToolsetTest.CoreIntegration/TestData/DialogsInInstallUISequence/PackageComponents.wxs @@ -4,16 +4,13 @@ - - Installed - Installed - + - + @@ -29,8 +26,8 @@ Installed AND PATCH - Installed AND PATCH - NOT Installed + + -- cgit v1.2.3-55-g6feb