@joebigelow / wix / commits / 8bb7f447

Demote CollidingModularizationTypes from error to warning

Bob Arnson committed Mar 15, 2021 at 20:41 UTC 8bb7f447b3a44c6f7dfeb3a413c402903f72386f

2 files changed +6 -5

src/WixToolset.Data/ErrorMessages.cs

-5

@@ -168,11 +168,6 @@ namespace WixToolset.Data

168 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);

169 }

170

171 - public static Message CollidingModularizationTypes(string tableName, string columnName, string foreignTableName, int foreignColumnNumber, string modularizationType, string foreignModularizationType)

172 - {

173 - 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);

174 - }

175 -

171 public static Message ComponentExpectedFeature(SourceLineNumber sourceLineNumbers, string component, string type, string target)

172 {

173 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);

src/WixToolset.Data/WarningMessages.cs

@@ -678,6 +678,11 @@ namespace WixToolset.Data

678 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);

679 }

680

681 + public static Message CollidingModularizationTypes(string tableName, string columnName, string foreignTableName, int foreignColumnNumber, string modularizationType, string foreignModularizationType)

682 + {

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 + }

685 +

686 private static Message Message(SourceLineNumber sourceLineNumber, Ids id, string format, params object[] args)

687 {

688 return new Message(sourceLineNumber, MessageLevel.Warning, (int)id, format, args);

@@ -815,6 +820,7 @@ namespace WixToolset.Data

820 DetectConditionRecommended = 1153,

821 ExperimentalBundlePlatform = 1154,

822 DefiningWellKnownDirectoryDeprecated = 1155,

823 + CollidingModularizationTypes = 1156,

824 }

825 }

826 }