From af854e4c8341cc90fb41c8b5122d4308574e8a9a Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Mon, 9 Nov 2020 15:48:37 -0500 Subject: Obsolete long-deprecated elements and attributes. --- src/WixToolset.Core/Compiler.cs | 13 ------- src/WixToolset.Core/Compiler_2.cs | 41 +++++----------------- src/WixToolset.Core/Compiler_Module.cs | 50 --------------------------- src/WixToolset.Core/Compiler_PatchCreation.cs | 40 --------------------- 4 files changed, 9 insertions(+), 135 deletions(-) (limited to 'src') diff --git a/src/WixToolset.Core/Compiler.cs b/src/WixToolset.Core/Compiler.cs index 8d110ac3..addb9750 100644 --- a/src/WixToolset.Core/Compiler.cs +++ b/src/WixToolset.Core/Compiler.cs @@ -694,16 +694,6 @@ namespace WixToolset.Core id = this.Core.GetAttributeIdentifier(sourceLineNumbers, attrib); break; case "SourceFile": - case "src": - if (null != sourceFile) - { - this.Core.Write(ErrorMessages.IllegalAttributeWithOtherAttribute(sourceLineNumbers, node.Name.LocalName, "SourceFile", "src")); - } - - if ("src" == attrib.Name.LocalName) - { - this.Core.Write(WarningMessages.DeprecatedAttribute(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, "SourceFile")); - } sourceFile = this.Core.GetAttributeValue(sourceLineNumbers, attrib); break; case "SuppressModularization": @@ -6252,9 +6242,6 @@ namespace WixToolset.Core case "Icon": this.ParseIconElement(child); break; - case "IgnoreModularization": - this.ParseIgnoreModularizationElement(child); - break; case "Media": this.ParseMediaElement(child, null); break; diff --git a/src/WixToolset.Core/Compiler_2.cs b/src/WixToolset.Core/Compiler_2.cs index a3bc09b6..f55264e5 100644 --- a/src/WixToolset.Core/Compiler_2.cs +++ b/src/WixToolset.Core/Compiler_2.cs @@ -4774,7 +4774,6 @@ namespace WixToolset.Core string argument = null; string command = null; var sequence = CompilerConstants.IntegerNotSet; - string target = null; string targetFile = null; string targetProperty = null; @@ -4796,10 +4795,6 @@ namespace WixToolset.Core case "Sequence": sequence = this.Core.GetAttributeIntegerValue(sourceLineNumbers, attrib, 1, Int16.MaxValue); break; - case "Target": - target = this.Core.GetAttributeValue(sourceLineNumbers, attrib); - this.Core.Write(WarningMessages.DeprecatedAttribute(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, "TargetFile", "TargetProperty")); - break; case "TargetFile": targetFile = this.Core.GetAttributeValue(sourceLineNumbers, attrib); this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.File, targetFile); @@ -4823,16 +4818,6 @@ namespace WixToolset.Core this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Id")); } - if (null != target && null != targetFile) - { - this.Core.Write(ErrorMessages.IllegalAttributeWithOtherAttribute(sourceLineNumbers, node.Name.LocalName, "Target", "TargetFile")); - } - - if (null != target && null != targetProperty) - { - this.Core.Write(ErrorMessages.IllegalAttributeWithOtherAttribute(sourceLineNumbers, node.Name.LocalName, "Target", "TargetProperty")); - } - if (null != targetFile && null != targetProperty) { this.Core.Write(ErrorMessages.IllegalAttributeWithOtherAttribute(sourceLineNumbers, node.Name.LocalName, "TargetFile", "TargetProperty")); @@ -4842,11 +4827,6 @@ namespace WixToolset.Core if (YesNoType.Yes == advertise) { - if (null != target) - { - this.Core.Write(ErrorMessages.IllegalAttributeWhenAdvertised(sourceLineNumbers, node.Name.LocalName, "Target")); - } - if (null != targetFile) { this.Core.Write(ErrorMessages.IllegalAttributeWhenAdvertised(sourceLineNumbers, node.Name.LocalName, "TargetFile")); @@ -4880,22 +4860,19 @@ namespace WixToolset.Core this.Core.Write(ErrorMessages.IllegalAttributeWithOtherAttribute(sourceLineNumbers, node.Name.LocalName, "Sequence", "Advertise", "no")); } - if (null == target && null == targetFile && null == targetProperty) + if (null == targetFile && null == targetProperty) { this.Core.Write(ErrorMessages.ExpectedAttributesWithOtherAttribute(sourceLineNumbers, node.Name.LocalName, "TargetFile", "TargetProperty", "Advertise", "no")); } - if (null == target) + string target = null; + if (null != targetFile) { - if (null != targetFile) - { - target = String.Concat("\"[#", targetFile, "]\""); - } - - if (null != targetProperty) - { - target = String.Concat("\"[", targetProperty, "]\""); - } + target = String.Concat("\"[#", targetFile, "]\""); + } + else if (null != targetProperty) + { + target = String.Concat("\"[", targetProperty, "]\""); } if (null != argument) @@ -4903,7 +4880,7 @@ namespace WixToolset.Core target = String.Concat(target, " ", argument); } - var prefix = (null != progId ? progId : String.Concat(".", extension)); + var prefix = progId ?? String.Concat(".", extension); if (null != command) { diff --git a/src/WixToolset.Core/Compiler_Module.cs b/src/WixToolset.Core/Compiler_Module.cs index 2f926d82..d730ae5d 100644 --- a/src/WixToolset.Core/Compiler_Module.cs +++ b/src/WixToolset.Core/Compiler_Module.cs @@ -181,9 +181,6 @@ namespace WixToolset.Core case "Icon": this.ParseIconElement(child); break; - case "IgnoreModularization": - this.ParseIgnoreModularizationElement(child); - break; case "IgnoreTable": this.ParseIgnoreTableElement(child); break; @@ -624,53 +621,6 @@ namespace WixToolset.Core } } - /// - /// Parses an ignore modularization element. - /// - /// XmlNode on an IgnoreModulatization element. - private void ParseIgnoreModularizationElement(XElement node) - { - var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); - string name = null; - - this.Core.Write(WarningMessages.DeprecatedIgnoreModularizationElement(sourceLineNumbers)); - - foreach (var attrib in node.Attributes()) - { - if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || CompilerCore.WixNamespace == attrib.Name.Namespace) - { - switch (attrib.Name.LocalName) - { - case "Name": - name = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib); - break; - case "Type": - // this is actually not used - break; - default: - this.Core.UnexpectedAttribute(node, attrib); - break; - } - } - else - { - this.Core.ParseExtensionAttribute(node, attrib); - } - } - - if (null == name) - { - this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Name")); - } - - this.Core.ParseForExtensionElements(node); - - if (!this.Core.EncounteredError) - { - this.Core.AddSymbol(new WixSuppressModularizationSymbol(sourceLineNumbers, new Identifier(AccessModifier.Private, name))); - } - } - /// /// Parses an IgnoreTable element. /// diff --git a/src/WixToolset.Core/Compiler_PatchCreation.cs b/src/WixToolset.Core/Compiler_PatchCreation.cs index ddd07654..c1c593c2 100644 --- a/src/WixToolset.Core/Compiler_PatchCreation.cs +++ b/src/WixToolset.Core/Compiler_PatchCreation.cs @@ -305,29 +305,9 @@ namespace WixToolset.Core } break; case "SourceFile": - case "src": - if (null != sourceFile) - { - this.Core.Write(ErrorMessages.IllegalAttributeWithOtherAttribute(sourceLineNumbers, node.Name.LocalName, "src", "SourceFile")); - } - - if ("src" == attrib.Name.LocalName) - { - this.Core.Write(WarningMessages.DeprecatedAttribute(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, "SourceFile")); - } sourceFile = this.Core.GetAttributeValue(sourceLineNumbers, attrib); break; case "SourcePatch": - case "srcPatch": - if (null != sourcePatch) - { - this.Core.Write(ErrorMessages.IllegalAttributeWithOtherAttribute(sourceLineNumbers, node.Name.LocalName, "srcPatch", "SourcePatch")); - } - - if ("srcPatch" == attrib.Name.LocalName) - { - this.Core.Write(WarningMessages.DeprecatedAttribute(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, "SourcePatch")); - } sourcePatch = this.Core.GetAttributeValue(sourceLineNumbers, attrib); break; default: @@ -518,16 +498,6 @@ namespace WixToolset.Core order = this.Core.GetAttributeIntegerValue(sourceLineNumbers, attrib, Int32.MinValue + 2, Int32.MaxValue); break; case "SourceFile": - case "src": - if (null != sourceFile) - { - this.Core.Write(ErrorMessages.IllegalAttributeWithOtherAttribute(sourceLineNumbers, node.Name.LocalName, "src", "SourceFile")); - } - - if ("src" == attrib.Name.LocalName) - { - this.Core.Write(WarningMessages.DeprecatedAttribute(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, "SourceFile")); - } sourceFile = this.Core.GetAttributeValue(sourceLineNumbers, attrib); break; case "Validation": @@ -727,16 +697,6 @@ namespace WixToolset.Core order = this.Core.GetAttributeIntegerValue(sourceLineNumbers, attrib, Int32.MinValue + 2, Int32.MaxValue); break; case "Source": - case "src": - if (null != source) - { - this.Core.Write(ErrorMessages.IllegalAttributeWithOtherAttribute(sourceLineNumbers, node.Name.LocalName, "src", "Source")); - } - - if ("src" == attrib.Name.LocalName) - { - this.Core.Write(WarningMessages.DeprecatedAttribute(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, "Source")); - } source = this.Core.GetAttributeValue(sourceLineNumbers, attrib); break; default: -- cgit v1.2.3-55-g6feb