aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.Data/WarningMessages.cs
diff options
context:
space:
mode:
Diffstat (limited to 'src/WixToolset.Data/WarningMessages.cs')
-rw-r--r--src/WixToolset.Data/WarningMessages.cs17
1 files changed, 14 insertions, 3 deletions
diff --git a/src/WixToolset.Data/WarningMessages.cs b/src/WixToolset.Data/WarningMessages.cs
index 12c8a160..a28b0fc3 100644
--- a/src/WixToolset.Data/WarningMessages.cs
+++ b/src/WixToolset.Data/WarningMessages.cs
@@ -112,9 +112,14 @@ namespace WixToolset.Data
112 return Message(sourceLineNumbers, Ids.DeprecatedAttribute, "The {0}/@{1} attribute has been deprecated. Please use the {2} or {3} attribute instead.", elementName, attributeName, newAttributeName1, newAttributeName2); 112 return Message(sourceLineNumbers, Ids.DeprecatedAttribute, "The {0}/@{1} attribute has been deprecated. Please use the {2} or {3} attribute instead.", elementName, attributeName, newAttributeName1, newAttributeName2);
113 } 113 }
114 114
115 public static Message DeprecatedAttributeValue(SourceLineNumber sourceLineNumbers, string attributeValue, string elementName, string attributeName)
116 {
117 return Message(sourceLineNumbers, Ids.DeprecatedAttributeValue, "The value \"{0}\" for the {1}/@{2} attribute has been deprecated. Remove the attribute.", attributeValue, elementName, attributeName);
118 }
119
115 public static Message DeprecatedAttributeValue(SourceLineNumber sourceLineNumbers, string attributeValue, string elementName, string attributeName, string newAttributeValue) 120 public static Message DeprecatedAttributeValue(SourceLineNumber sourceLineNumbers, string attributeValue, string elementName, string attributeName, string newAttributeValue)
116 { 121 {
117 return Message(sourceLineNumbers, Ids.DeprecatedAttributeValue, "The value \"{0}\" for the {1}/@{2} attribute has been deprecated. Please use \"{3}\" instead.", attributeValue, elementName, attributeName, newAttributeValue); 122 return Message(sourceLineNumbers, Ids.DeprecatedAttributeValue, "The value \"{0}\" for the {1}/@{2} attribute has been deprecated. Please use \"{3}\" instead.", attributeValue, elementName, attributeName, newAttributeValue);
118 } 123 }
119 124
120 public static Message DeprecatedCommandLineSwitch(string oldSwitch) 125 public static Message DeprecatedCommandLineSwitch(string oldSwitch)
@@ -139,12 +144,12 @@ namespace WixToolset.Data
139 144
140 public static Message DeprecatedElement(SourceLineNumber sourceLineNumbers, string elementName, string newElementName) 145 public static Message DeprecatedElement(SourceLineNumber sourceLineNumbers, string elementName, string newElementName)
141 { 146 {
142 return Message(sourceLineNumbers, Ids.DeprecatedElement, "The {0} element has been deprecated. Please use the {1} element instead.", elementName, newElementName); 147 return Message(sourceLineNumbers, Ids.DeprecatedElement, "The {0} element has been deprecated. Please use the {1} element instead.", elementName, newElementName);
143 } 148 }
144 149
145 public static Message DeprecatedElement(SourceLineNumber sourceLineNumbers, string elementName, string newElementName1, string newElementName2) 150 public static Message DeprecatedElement(SourceLineNumber sourceLineNumbers, string elementName, string newElementName1, string newElementName2)
146 { 151 {
147 return Message(sourceLineNumbers, Ids.DeprecatedElement, "The {0} element has been deprecated. Please use the {1} or {2} element instead.", elementName, newElementName1, newElementName2); 152 return Message(sourceLineNumbers, Ids.DeprecatedElement, "The {0} element has been deprecated. Please use the {1} or {2} element instead.", elementName, newElementName1, newElementName2);
148 } 153 }
149 154
150 public static Message DeprecatedIgnoreModularizationElement(SourceLineNumber sourceLineNumbers) 155 public static Message DeprecatedIgnoreModularizationElement(SourceLineNumber sourceLineNumbers)
@@ -582,6 +587,11 @@ namespace WixToolset.Data
582 return Message(null, Ids.TargetDirCorrectedDefaultDir, "The Directory with Id 'TARGETDIR' must have the value 'SourceDir' in its 'DefaultDir' column. This has been automatically corrected for you in the decompiled output."); 587 return Message(null, Ids.TargetDirCorrectedDefaultDir, "The Directory with Id 'TARGETDIR' must have the value 'SourceDir' in its 'DefaultDir' column. This has been automatically corrected for you in the decompiled output.");
583 } 588 }
584 589
590 public static Message DefiningWellKnownDirectoryDeprecated(SourceLineNumber sourceLineNumbers, string directoryId)
591 {
592 return Message(null, Ids.DefiningWellKnownDirectoryDeprecated, "It is no longer necessary to define Directory with Id '{0}'. One will be provided automatically. Remove the Directory element.", directoryId);
593 }
594
585 public static Message TooManyProgIds(SourceLineNumber sourceLineNumbers, string clsId, string progId, string otherClsId) 595 public static Message TooManyProgIds(SourceLineNumber sourceLineNumbers, string clsId, string progId, string otherClsId)
586 { 596 {
587 return Message(sourceLineNumbers, Ids.TooManyProgIds, "Class '{0}' tried to use ProgId '{1}' which has already been associated with class '{2}'. This information will be left out of the decompiled output.", clsId, progId, otherClsId); 597 return Message(sourceLineNumbers, Ids.TooManyProgIds, "Class '{0}' tried to use ProgId '{1}' which has already been associated with class '{2}'. This information will be left out of the decompiled output.", clsId, progId, otherClsId);
@@ -804,6 +814,7 @@ namespace WixToolset.Data
804 PathCanonicalized = 1152, 814 PathCanonicalized = 1152,
805 DetectConditionRecommended = 1153, 815 DetectConditionRecommended = 1153,
806 ExperimentalBundlePlatform = 1154, 816 ExperimentalBundlePlatform = 1154,
817 DefiningWellKnownDirectoryDeprecated = 1155,
807 } 818 }
808 } 819 }
809} 820}