diff options
Diffstat (limited to 'src/WixToolset.Core/Compiler.cs')
| -rw-r--r-- | src/WixToolset.Core/Compiler.cs | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/WixToolset.Core/Compiler.cs b/src/WixToolset.Core/Compiler.cs index 2ef85ff0..7be581bc 100644 --- a/src/WixToolset.Core/Compiler.cs +++ b/src/WixToolset.Core/Compiler.cs | |||
| @@ -3159,10 +3159,10 @@ namespace WixToolset.Core | |||
| 3159 | case "Id": | 3159 | case "Id": |
| 3160 | id = this.Core.GetAttributeIdentifier(sourceLineNumbers, attrib); | 3160 | id = this.Core.GetAttributeIdentifier(sourceLineNumbers, attrib); |
| 3161 | break; | 3161 | break; |
| 3162 | case "BinaryKey": | 3162 | case "BinaryRef": |
| 3163 | if (null != source) | 3163 | if (null != source) |
| 3164 | { | 3164 | { |
| 3165 | this.Core.Write(ErrorMessages.CustomActionMultipleSources(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, "BinaryKey", "Directory", "FileKey", "Property", "Script")); | 3165 | this.Core.Write(ErrorMessages.CustomActionMultipleSources(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, "BinaryRef", "Directory", "FileRef", "Property", "Script")); |
| 3166 | } | 3166 | } |
| 3167 | source = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib); | 3167 | source = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib); |
| 3168 | sourceType = CustomActionSourceType.Binary; | 3168 | sourceType = CustomActionSourceType.Binary; |
| @@ -3171,7 +3171,7 @@ namespace WixToolset.Core | |||
| 3171 | case "Directory": | 3171 | case "Directory": |
| 3172 | if (null != source) | 3172 | if (null != source) |
| 3173 | { | 3173 | { |
| 3174 | this.Core.Write(ErrorMessages.CustomActionMultipleSources(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, "BinaryKey", "Directory", "FileKey", "Property", "Script")); | 3174 | this.Core.Write(ErrorMessages.CustomActionMultipleSources(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, "BinaryKey", "Directory", "FileRef", "Property", "Script")); |
| 3175 | } | 3175 | } |
| 3176 | source = this.Core.CreateDirectoryReferenceFromInlineSyntax(sourceLineNumbers, attrib, null); | 3176 | source = this.Core.CreateDirectoryReferenceFromInlineSyntax(sourceLineNumbers, attrib, null); |
| 3177 | sourceType = CustomActionSourceType.Directory; | 3177 | sourceType = CustomActionSourceType.Directory; |
| @@ -3239,10 +3239,10 @@ namespace WixToolset.Core | |||
| 3239 | break; | 3239 | break; |
| 3240 | } | 3240 | } |
| 3241 | break; | 3241 | break; |
| 3242 | case "FileKey": | 3242 | case "FileRef": |
| 3243 | if (null != source) | 3243 | if (null != source) |
| 3244 | { | 3244 | { |
| 3245 | this.Core.Write(ErrorMessages.CustomActionMultipleSources(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, "BinaryKey", "Directory", "FileKey", "Property", "Script")); | 3245 | this.Core.Write(ErrorMessages.CustomActionMultipleSources(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, "BinaryRef", "Directory", "FileRef", "Property", "Script")); |
| 3246 | } | 3246 | } |
| 3247 | source = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib); | 3247 | source = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib); |
| 3248 | sourceType = CustomActionSourceType.File; | 3248 | sourceType = CustomActionSourceType.File; |
| @@ -3268,7 +3268,7 @@ namespace WixToolset.Core | |||
| 3268 | case "Property": | 3268 | case "Property": |
| 3269 | if (null != source) | 3269 | if (null != source) |
| 3270 | { | 3270 | { |
| 3271 | this.Core.Write(ErrorMessages.CustomActionMultipleSources(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, "BinaryKey", "Directory", "FileKey", "Property", "Script")); | 3271 | this.Core.Write(ErrorMessages.CustomActionMultipleSources(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, "BinaryRef", "Directory", "FileRef", "Property", "Script")); |
| 3272 | } | 3272 | } |
| 3273 | source = this.Core.GetAttributeValue(sourceLineNumbers, attrib); | 3273 | source = this.Core.GetAttributeValue(sourceLineNumbers, attrib); |
| 3274 | sourceType = CustomActionSourceType.Property; | 3274 | sourceType = CustomActionSourceType.Property; |
| @@ -3299,7 +3299,7 @@ namespace WixToolset.Core | |||
| 3299 | case "Script": | 3299 | case "Script": |
| 3300 | if (null != source) | 3300 | if (null != source) |
| 3301 | { | 3301 | { |
| 3302 | this.Core.Write(ErrorMessages.CustomActionMultipleSources(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, "BinaryKey", "Directory", "FileKey", "Property", "Script")); | 3302 | this.Core.Write(ErrorMessages.CustomActionMultipleSources(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, "BinaryRef", "Directory", "FileRef", "Property", "Script")); |
| 3303 | } | 3303 | } |
| 3304 | 3304 | ||
| 3305 | if (null != target) | 3305 | if (null != target) |
| @@ -3394,7 +3394,7 @@ namespace WixToolset.Core | |||
| 3394 | { | 3394 | { |
| 3395 | if (null == source) | 3395 | if (null == source) |
| 3396 | { | 3396 | { |
| 3397 | this.Core.Write(ErrorMessages.IllegalAttributeWithoutOtherAttributes(sourceLineNumbers, node.Name.LocalName, "VBScriptCall", "BinaryKey", "FileKey", "Property")); | 3397 | this.Core.Write(ErrorMessages.IllegalAttributeWithoutOtherAttributes(sourceLineNumbers, node.Name.LocalName, "VBScriptCall", "BinaryRef", "FileRef", "Property")); |
| 3398 | } | 3398 | } |
| 3399 | else if (CustomActionSourceType.Directory == sourceType) | 3399 | else if (CustomActionSourceType.Directory == sourceType) |
| 3400 | { | 3400 | { |
| @@ -3405,7 +3405,7 @@ namespace WixToolset.Core | |||
| 3405 | { | 3405 | { |
| 3406 | if (null == source) | 3406 | if (null == source) |
| 3407 | { | 3407 | { |
| 3408 | this.Core.Write(ErrorMessages.IllegalAttributeWithoutOtherAttributes(sourceLineNumbers, node.Name.LocalName, "JScriptCall", "BinaryKey", "FileKey", "Property")); | 3408 | this.Core.Write(ErrorMessages.IllegalAttributeWithoutOtherAttributes(sourceLineNumbers, node.Name.LocalName, "JScriptCall", "BinaryRef", "FileRef", "Property")); |
| 3409 | } | 3409 | } |
| 3410 | else if (CustomActionSourceType.Directory == sourceType) | 3410 | else if (CustomActionSourceType.Directory == sourceType) |
| 3411 | { | 3411 | { |
| @@ -3416,7 +3416,7 @@ namespace WixToolset.Core | |||
| 3416 | { | 3416 | { |
| 3417 | if (null == source) | 3417 | if (null == source) |
| 3418 | { | 3418 | { |
| 3419 | this.Core.Write(ErrorMessages.IllegalAttributeWithoutOtherAttributes(sourceLineNumbers, node.Name.LocalName, "ExeCommand", "BinaryKey", "Directory", "FileKey", "Property")); | 3419 | this.Core.Write(ErrorMessages.IllegalAttributeWithoutOtherAttributes(sourceLineNumbers, node.Name.LocalName, "ExeCommand", "BinaryRef", "Directory", "FileRef", "Property")); |
| 3420 | } | 3420 | } |
| 3421 | } | 3421 | } |
| 3422 | else if (CustomActionTargetType.TextData == targetType && CustomActionSourceType.Directory != sourceType && CustomActionSourceType.Property != sourceType && CustomActionSourceType.File != sourceType) | 3422 | else if (CustomActionTargetType.TextData == targetType && CustomActionSourceType.Directory != sourceType && CustomActionSourceType.Property != sourceType && CustomActionSourceType.File != sourceType) |
