From 8bb7f447b3a44c6f7dfeb3a413c402903f72386f Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Mon, 15 Mar 2021 20:41:08 -0400 Subject: Demote CollidingModularizationTypes from error to warning --- src/WixToolset.Data/ErrorMessages.cs | 5 ----- src/WixToolset.Data/WarningMessages.cs | 6 ++++++ 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/WixToolset.Data/ErrorMessages.cs b/src/WixToolset.Data/ErrorMessages.cs index 34192da4..ffd975e3 100644 --- a/src/WixToolset.Data/ErrorMessages.cs +++ b/src/WixToolset.Data/ErrorMessages.cs @@ -168,11 +168,6 @@ namespace WixToolset.Data 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); } - public static Message CollidingModularizationTypes(string tableName, string columnName, string foreignTableName, int foreignColumnNumber, string modularizationType, string foreignModularizationType) - { - 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); - } - public static Message ComponentExpectedFeature(SourceLineNumber sourceLineNumbers, string component, string type, string target) { return Message(sourceLineNumbers, Ids.ComponentExpectedFeature, "The component '{0}' is not assigned to a feature. The component's {1} '{2}' requires it to be assigned to at least one feature.", component, type, target); diff --git a/src/WixToolset.Data/WarningMessages.cs b/src/WixToolset.Data/WarningMessages.cs index edd06981..4e261f4c 100644 --- a/src/WixToolset.Data/WarningMessages.cs +++ b/src/WixToolset.Data/WarningMessages.cs @@ -678,6 +678,11 @@ namespace WixToolset.Data return Message(sourceLineNumbers, Ids.VersionTruncated, "Product version {0} in package '{1}' is not valid per the MSI SDK and cannot be represented in a bundle. It has been truncated to {2}.", originalVersion, package, truncatedVersion); } + public static Message CollidingModularizationTypes(string tableName, string columnName, string foreignTableName, int foreignColumnNumber, string modularizationType, string foreignModularizationType) + { + 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); + } + private static Message Message(SourceLineNumber sourceLineNumber, Ids id, string format, params object[] args) { return new Message(sourceLineNumber, MessageLevel.Warning, (int)id, format, args); @@ -815,6 +820,7 @@ namespace WixToolset.Data DetectConditionRecommended = 1153, ExperimentalBundlePlatform = 1154, DefiningWellKnownDirectoryDeprecated = 1155, + CollidingModularizationTypes = 1156, } } } -- cgit v1.2.3-55-g6feb