From fea4fe44cdc1734c2453de35133899ed46d95634 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Wed, 1 Jul 2020 01:59:15 -0700 Subject: Make Feature/@Absent and Feature/@AllowAdvertise consistent Fixes wixtoolset/issues#5990 --- src/WixToolset.Core/Compiler.cs | 36 +++--------------------------------- 1 file changed, 3 insertions(+), 33 deletions(-) (limited to 'src') diff --git a/src/WixToolset.Core/Compiler.cs b/src/WixToolset.Core/Compiler.cs index e598f540..4d0e608b 100644 --- a/src/WixToolset.Core/Compiler.cs +++ b/src/WixToolset.Core/Compiler.cs @@ -4698,41 +4698,11 @@ namespace WixToolset.Core case "Id": id = this.Core.GetAttributeIdentifier(sourceLineNumbers, attrib); break; - case "Absent": - var absentValue = this.Core.GetAttributeValue(sourceLineNumbers, attrib); - switch (absentValue) - { - case "allow": // this is the default - break; - case "disallow": - //bits |= MsiInterop.MsidbFeatureAttributesUIDisallowAbsent; - disallowAbsent = true; - break; - case "": - break; - default: - this.Core.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, absentValue, "allow", "disallow")); - break; - } + case "AllowAbsent": + disallowAbsent = (this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib) == YesNoType.No); break; case "AllowAdvertise": - var advertiseValue = this.Core.GetAttributeValue(sourceLineNumbers, attrib); - switch (advertiseValue) - { - case "disallow": - case "no": - //bits |= MsiInterop.MsidbFeatureAttributesDisallowAdvertise; - disallowAdvertise = true; - break; - case "allow": - case "yes": // this is the default - break; - case "": - break; - default: - this.Core.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, advertiseValue, "no", "system", "yes")); - break; - } + disallowAdvertise = (this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib) == YesNoType.No); break; case "ConfigurableDirectory": configurableDirectory = this.Core.CreateDirectoryReferenceFromInlineSyntax(sourceLineNumbers, attrib, null); -- cgit v1.2.3-55-g6feb