summaryrefslogtreecommitdiff
path: root/src/ext/Bal/wixext/BalErrors.cs
diff options
context:
space:
mode:
Diffstat (limited to 'src/ext/Bal/wixext/BalErrors.cs')
-rw-r--r--src/ext/Bal/wixext/BalErrors.cs12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/ext/Bal/wixext/BalErrors.cs b/src/ext/Bal/wixext/BalErrors.cs
index a7a00a4b..cc4c6d41 100644
--- a/src/ext/Bal/wixext/BalErrors.cs
+++ b/src/ext/Bal/wixext/BalErrors.cs
@@ -78,9 +78,14 @@ namespace WixToolset.Bal
78 return Message(sourceLineNumbers, Ids.MultiplePrimaryPackageType2, "The location of the package related to the previous error."); 78 return Message(sourceLineNumbers, Ids.MultiplePrimaryPackageType2, "The location of the package related to the previous error.");
79 } 79 }
80 80
81 public static Message NonUpperCaseOverridableVariable(SourceLineNumber sourceLineNumbers, string name, string expectedName) 81 public static Message OverridableVariableCollision(SourceLineNumber sourceLineNumbers, string name, string collisionName)
82 { 82 {
83 return Message(sourceLineNumbers, Ids.NonUpperCaseOverridableVariable, "Overridable variable '{0}' must be '{1}' with Bundle/@CommandLineVariables value 'upperCase'.", name, expectedName); 83 return Message(sourceLineNumbers, Ids.OverridableVariableCollision, "Overridable variable '{0}' collides with '{1}' with Bundle/@CommandLineVariables value 'caseInsensitive'.", name, collisionName);
84 }
85
86 public static Message OverridableVariableCollision2(SourceLineNumber sourceLineNumbers)
87 {
88 return Message(sourceLineNumbers, Ids.OverridableVariableCollision2, "The location of the Variable related to the previous error.");
84 } 89 }
85 90
86 private static Message Message(SourceLineNumber sourceLineNumber, Ids id, string format, params object[] args) 91 private static Message Message(SourceLineNumber sourceLineNumber, Ids id, string format, params object[] args)
@@ -101,7 +106,6 @@ namespace WixToolset.Bal
101 MultipleBAFunctions = 6804, 106 MultipleBAFunctions = 6804,
102 BAFunctionsPayloadRequiredInUXContainer = 6805, 107 BAFunctionsPayloadRequiredInUXContainer = 6805,
103 MissingDNCPrereq = 6806, 108 MissingDNCPrereq = 6806,
104 NonUpperCaseOverridableVariable = 6807,
105 MissingIUIPrimaryPackage = 6808, 109 MissingIUIPrimaryPackage = 6808,
106 MultiplePrimaryPackageType = 6809, 110 MultiplePrimaryPackageType = 6809,
107 MultiplePrimaryPackageType2 = 6810, 111 MultiplePrimaryPackageType2 = 6810,
@@ -110,6 +114,8 @@ namespace WixToolset.Bal
110 IuibaPermanentPrimaryPackageType = 6813, 114 IuibaPermanentPrimaryPackageType = 6813,
111 IuibaNonMsiPrimaryPackage = 6814, 115 IuibaNonMsiPrimaryPackage = 6814,
112 IuibaPrimaryPackageEnableFeatureSelection = 6815, 116 IuibaPrimaryPackageEnableFeatureSelection = 6815,
117 OverridableVariableCollision = 6816,
118 OverridableVariableCollision2 = 6817,
113 } 119 }
114 } 120 }
115} 121}