aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.Data/ErrorMessages.cs
diff options
context:
space:
mode:
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 4d972903..6759b14a 100644
--- a/src/WixToolset.Data/ErrorMessages.cs
+++ b/src/WixToolset.Data/ErrorMessages.cs
@@ -173,6 +173,11 @@ namespace WixToolset.Data
173 return Message(sourceLineNumbers, Ids.CheckBoxValueOnlyValidWithCheckBox, "A {0} element was specified with Type='{1}' and a CheckBoxValue. Check box values can only be specified with Type='CheckBox'.", elementName, controlType); 173 return Message(sourceLineNumbers, Ids.CheckBoxValueOnlyValidWithCheckBox, "A {0} element was specified with Type='{1}' and a CheckBoxValue. Check box values can only be specified with Type='CheckBox'.", elementName, controlType);
174 } 174 }
175 175
176 public static Message CircularSearchReference(string chain)
177 {
178 return Message(null, Ids.CircularSearchReference, "A circular reference of search ordering constraints was detected: {0}. Search ordering references must form a directed acyclic graph.", chain);
179 }
180
176 public static Message CollidingModularizationTypes(string tableName, string columnName, string foreignTableName, int foreignColumnNumber, string modularizationType, string foreignModularizationType) 181 public static Message CollidingModularizationTypes(string tableName, string columnName, string foreignTableName, int foreignColumnNumber, string modularizationType, string foreignModularizationType)
177 { 182 {
178 return Message(null, Ids.CollidingModularizationTypes, "The definition for the '{0}' table's '{1}' column is a foreign key relationship to the '{2}' table's column number {3}. The modularization types of the two column definitions differ: one is {4} and the other is {5}. Change one of the modularization types so that they match.", tableName, columnName, foreignTableName, foreignColumnNumber, modularizationType, foreignModularizationType); 183 return Message(null, Ids.CollidingModularizationTypes, "The definition for the '{0}' table's '{1}' column is a foreign key relationship to the '{2}' table's column number {3}. The modularization types of the two column definitions differ: one is {4} and the other is {5}. Change one of the modularization types so that they match.", tableName, columnName, foreignTableName, foreignColumnNumber, modularizationType, foreignModularizationType);
@@ -2664,6 +2669,7 @@ namespace WixToolset.Data
2664 IntermediatesMustBeCompiled = 395, 2669 IntermediatesMustBeCompiled = 395,
2665 IntermediatesMustBeResolved = 396, 2670 IntermediatesMustBeResolved = 396,
2666 MissingBundleSearch = 397, 2671 MissingBundleSearch = 397,
2672 CircularSearchReference = 398,
2667 } 2673 }
2668 } 2674 }
2669} 2675}