aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.Data/ErrorMessages.cs
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2021-01-08 13:46:29 -0800
committerRob Mensching <rob@firegiant.com>2021-01-08 15:39:53 -0800
commitcce48bc96c334acc9a60bce4172f6d463a4dbbd1 (patch)
tree2445f0e50eb04473adc9a5878e5667e0cdf1c45a /src/WixToolset.Data/ErrorMessages.cs
parent772262429cda01740b310fc87c05140740e7f870 (diff)
downloadwix-cce48bc96c334acc9a60bce4172f6d463a4dbbd1.tar.gz
wix-cce48bc96c334acc9a60bce4172f6d463a4dbbd1.tar.bz2
wix-cce48bc96c334acc9a60bce4172f6d463a4dbbd1.zip
Add messages for ExePackage/@DetectCondition recommendations
First part of fix for wixtoolset/issues#6197
Diffstat (limited to 'src/WixToolset.Data/ErrorMessages.cs')
-rw-r--r--src/WixToolset.Data/ErrorMessages.cs6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/WixToolset.Data/ErrorMessages.cs b/src/WixToolset.Data/ErrorMessages.cs
index 9e051e00..644f08d7 100644
--- a/src/WixToolset.Data/ErrorMessages.cs
+++ b/src/WixToolset.Data/ErrorMessages.cs
@@ -438,6 +438,11 @@ namespace WixToolset.Data
438 return Message(sourceLineNumbers, Ids.ExpectedAttributeInElementOrParent, "The {0}/@{1} attribute was not found or empty; it is required, or it can be specified in the parent {2}/@{3} attribute.", elementName, attributeName, parentElementName, parentAttributeName); 438 return Message(sourceLineNumbers, Ids.ExpectedAttributeInElementOrParent, "The {0}/@{1} attribute was not found or empty; it is required, or it can be specified in the parent {2}/@{3} attribute.", elementName, attributeName, parentElementName, parentAttributeName);
439 } 439 }
440 440
441 public static Message ExpectedAttributeWithValueWithOtherAttribute(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string attributeName2)
442 {
443 return Message(sourceLineNumbers, Ids.ExpectedAttributeWithValueWithOtherAttribute, "The {0}/@{1} attribute is required to have a value when attribute {2} is present.", elementName, attributeName, attributeName2);
444 }
445
441 public static Message ExpectedAttributeOrElement(SourceLineNumber sourceLineNumbers, string parentElement, string attribute, string childElement) 446 public static Message ExpectedAttributeOrElement(SourceLineNumber sourceLineNumbers, string parentElement, string attribute, string childElement)
442 { 447 {
443 return Message(sourceLineNumbers, Ids.ExpectedAttributeOrElement, "Element '{0}' missing attribute '{1}' or child element '{2}'. Exactly one of those is required.", parentElement, attribute, childElement); 448 return Message(sourceLineNumbers, Ids.ExpectedAttributeOrElement, "Element '{0}' missing attribute '{1}' or child element '{2}'. Exactly one of those is required.", parentElement, attribute, childElement);
@@ -2692,6 +2697,7 @@ namespace WixToolset.Data
2692 CircularSearchReference = 398, 2697 CircularSearchReference = 398,
2693 UnknownSymbolType = 399, 2698 UnknownSymbolType = 399,
2694 IllegalInnerText = 400, 2699 IllegalInnerText = 400,
2700 ExpectedAttributeWithValueWithOtherAttribute = 401,
2695 } 2701 }
2696 } 2702 }
2697} 2703}