From 34e002b3a9043ff3062c676c74fb124b5feef784 Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Fri, 1 Nov 2019 19:24:45 -0400 Subject: Fix error checking on CustomAction/@Error. --- src/WixToolset.Core/Compiler.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/WixToolset.Core/Compiler.cs') diff --git a/src/WixToolset.Core/Compiler.cs b/src/WixToolset.Core/Compiler.cs index ae99b673..ee460edc 100644 --- a/src/WixToolset.Core/Compiler.cs +++ b/src/WixToolset.Core/Compiler.cs @@ -3501,9 +3501,9 @@ namespace WixToolset.Core this.Core.Write(ErrorMessages.IllegalAttributeWithoutOtherAttributes(sourceLineNumbers, node.Name.LocalName, "ExeCommand", "BinaryKey", "Directory", "FileKey", "Property")); } } - else if (CustomActionTargetType.TextData == targetType && CustomActionSourceType.Directory != sourceType && CustomActionSourceType.Property != sourceType) + else if (CustomActionTargetType.TextData == targetType && CustomActionSourceType.Directory != sourceType && CustomActionSourceType.Property != sourceType && CustomActionSourceType.File != sourceType) { - this.Core.Write(ErrorMessages.IllegalAttributeWithoutOtherAttributes(sourceLineNumbers, node.Name.LocalName, "Value", "Directory", "Property")); + 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 { -- cgit v1.2.3-55-g6feb