aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2021-03-19 10:25:49 -0700
committerRob Mensching <rob@firegiant.com>2021-03-19 10:27:25 -0700
commit958d089f2a09b01c497d0bec8014bdfcea6313c3 (patch)
tree3bd21d4fa4935a155236b3a38a1f599f2f4f21b0 /src
parent19e92bd1fde66afe6592c186bbfd23d5da9e90ee (diff)
downloadwix-958d089f2a09b01c497d0bec8014bdfcea6313c3.tar.gz
wix-958d089f2a09b01c497d0bec8014bdfcea6313c3.tar.bz2
wix-958d089f2a09b01c497d0bec8014bdfcea6313c3.zip
Add warning for defaulting an invalid environment variable value
Diffstat (limited to 'src')
-rw-r--r--src/WixToolset.Data/WarningMessages.cs6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/WixToolset.Data/WarningMessages.cs b/src/WixToolset.Data/WarningMessages.cs
index 60be6dea..db3b35e3 100644
--- a/src/WixToolset.Data/WarningMessages.cs
+++ b/src/WixToolset.Data/WarningMessages.cs
@@ -683,6 +683,11 @@ namespace WixToolset.Data
683 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: table '{0}' uses type {4} and table '{2}' uses type {5}. Change one of the modularization types so that they match.", tableName, columnName, foreignTableName, foreignColumnNumber, modularizationType, foreignModularizationType); 683 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: table '{0}' uses type {4} and table '{2}' uses type {5}. Change one of the modularization types so that they match.", tableName, columnName, foreignTableName, foreignColumnNumber, modularizationType, foreignModularizationType);
684 } 684 }
685 685
686 public static Message InvalidEnvironmentVariable(string environmentVariable, string value, string defaultValue)
687 {
688 return Message(null, Ids.InvalidEnvironmentVariable, "The {0} environment variable is set to an invalid value of '{1}'. The default value '{2}' will be used instead.", environmentVariable, value, defaultValue);
689 }
690
686 private static Message Message(SourceLineNumber sourceLineNumber, Ids id, string format, params object[] args) 691 private static Message Message(SourceLineNumber sourceLineNumber, Ids id, string format, params object[] args)
687 { 692 {
688 return new Message(sourceLineNumber, MessageLevel.Warning, (int)id, format, args); 693 return new Message(sourceLineNumber, MessageLevel.Warning, (int)id, format, args);
@@ -821,6 +826,7 @@ namespace WixToolset.Data
821 ExperimentalBundlePlatform = 1154, 826 ExperimentalBundlePlatform = 1154,
822 DefiningWellKnownDirectoryDeprecated = 1155, 827 DefiningWellKnownDirectoryDeprecated = 1155,
823 CollidingModularizationTypes = 1156, 828 CollidingModularizationTypes = 1156,
829 InvalidEnvironmentVariable = 1157,
824 } 830 }
825 } 831 }
826} 832}