aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBob Arnson <bob@firegiant.com>2021-03-15 20:44:36 -0400
committerBob Arnson <bob@firegiant.com>2021-03-15 20:48:08 -0400
commit1c23520ed490b56e292dc1544463af83807745ad (patch)
tree63ca5b7d0d7ff09c41b1c9c6557bce1e3fd0ba2e /src
parent05c6fb7eb86f63fe662f3e88de2922cd1bdadf31 (diff)
downloadwix-1c23520ed490b56e292dc1544463af83807745ad.tar.gz
wix-1c23520ed490b56e292dc1544463af83807745ad.tar.bz2
wix-1c23520ed490b56e292dc1544463af83807745ad.zip
Demote CollidingModularizationTypes from error to warning
Diffstat (limited to 'src')
-rw-r--r--src/WixToolset.Core.WindowsInstaller/Bind/CreateWindowsInstallerDataFromIRCommand.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CreateWindowsInstallerDataFromIRCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CreateWindowsInstallerDataFromIRCommand.cs
index 0ce67591..bc95fd4c 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/CreateWindowsInstallerDataFromIRCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/CreateWindowsInstallerDataFromIRCommand.cs
@@ -1409,7 +1409,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
1409 } 1409 }
1410 else if (keyTableDefinition.Columns[keyColumnIndex - 1].ModularizeType != columnDefinition.ModularizeType && ColumnModularizeType.CompanionFile != columnDefinition.ModularizeType) 1410 else if (keyTableDefinition.Columns[keyColumnIndex - 1].ModularizeType != columnDefinition.ModularizeType && ColumnModularizeType.CompanionFile != columnDefinition.ModularizeType)
1411 { 1411 {
1412 this.Messaging.Write(ErrorMessages.CollidingModularizationTypes(tableDefinition.Name, columnDefinition.Name, columnDefinition.KeyTable, keyColumnIndex, columnDefinition.ModularizeType.ToString(), keyTableDefinition.Columns[keyColumnIndex - 1].ModularizeType.ToString())); 1412 this.Messaging.Write(WarningMessages.CollidingModularizationTypes(tableDefinition.Name, columnDefinition.Name, columnDefinition.KeyTable, keyColumnIndex, columnDefinition.ModularizeType.ToString(), keyTableDefinition.Columns[keyColumnIndex - 1].ModularizeType.ToString()));
1413 } 1413 }
1414 } 1414 }
1415 // else - ignore missing table definitions as that error is caught in other places 1415 // else - ignore missing table definitions as that error is caught in other places