diff options
Diffstat (limited to 'src/WixToolset.Core/Compiler.cs')
-rw-r--r-- | src/WixToolset.Core/Compiler.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/WixToolset.Core/Compiler.cs b/src/WixToolset.Core/Compiler.cs index c641bceb..6cc3a2e8 100644 --- a/src/WixToolset.Core/Compiler.cs +++ b/src/WixToolset.Core/Compiler.cs | |||
@@ -3331,7 +3331,7 @@ namespace WixToolset.Core | |||
3331 | break; | 3331 | break; |
3332 | } | 3332 | } |
3333 | break; | 3333 | break; |
3334 | case "ScriptFile": | 3334 | case "ScriptSourceFile": |
3335 | scriptFile = this.Core.GetAttributeValue(sourceLineNumbers, attrib); | 3335 | scriptFile = this.Core.GetAttributeValue(sourceLineNumbers, attrib); |
3336 | break; | 3336 | break; |
3337 | case "SuppressModularization": | 3337 | case "SuppressModularization": |
@@ -3387,7 +3387,7 @@ namespace WixToolset.Core | |||
3387 | { | 3387 | { |
3388 | if (String.IsNullOrEmpty(scriptFile)) | 3388 | if (String.IsNullOrEmpty(scriptFile)) |
3389 | { | 3389 | { |
3390 | this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "ScriptFile", "Script")); | 3390 | this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "ScriptSourceFile", "Script")); |
3391 | } | 3391 | } |
3392 | } | 3392 | } |
3393 | else if (CustomActionTargetType.VBScript == targetType) // non-inline vbscript | 3393 | else if (CustomActionTargetType.VBScript == targetType) // non-inline vbscript |
@@ -3426,7 +3426,7 @@ namespace WixToolset.Core | |||
3426 | 3426 | ||
3427 | if (!inlineScript && !String.IsNullOrEmpty(scriptFile)) | 3427 | if (!inlineScript && !String.IsNullOrEmpty(scriptFile)) |
3428 | { | 3428 | { |
3429 | this.Core.Write(ErrorMessages.IllegalAttributeWithoutOtherAttributes(sourceLineNumbers, node.Name.LocalName, "ScriptFile", "Script")); | 3429 | this.Core.Write(ErrorMessages.IllegalAttributeWithoutOtherAttributes(sourceLineNumbers, node.Name.LocalName, "ScriptSourceFile", "Script")); |
3430 | } | 3430 | } |
3431 | 3431 | ||
3432 | if (win64 && CustomActionTargetType.VBScript != targetType && CustomActionTargetType.JScript != targetType) | 3432 | if (win64 && CustomActionTargetType.VBScript != targetType && CustomActionTargetType.JScript != targetType) |