diff options
author | Rob Mensching <rob@firegiant.com> | 2023-08-07 15:43:10 -0700 |
---|---|---|
committer | Rob Mensching <rob@firegiant.com> | 2023-08-08 09:00:26 -0700 |
commit | 205215078d3b7bd9c7459307bc792d52ec404760 (patch) | |
tree | 208b1b33bf7d910f5f40ee42a59704ab528afe86 /src/api | |
parent | 1ef2fac522e39384fd8379256b9ce9ef750e18c9 (diff) | |
download | wix-205215078d3b7bd9c7459307bc792d52ec404760.tar.gz wix-205215078d3b7bd9c7459307bc792d52ec404760.tar.bz2 wix-205215078d3b7bd9c7459307bc792d52ec404760.zip |
Fix the use of ModuleSubstitution table
Addresses two issues in the creation of configurable merge modules. First, the
ModuleConfiguration table Id should not be modularized. Second, the
ModuleSubstitution table was never created. Fixing both of those allows
configurable merge modules to work again.
Fixes 7559
Diffstat (limited to 'src/api')
-rw-r--r-- | src/api/wix/WixToolset.Data/WindowsInstaller/WindowsInstallerTableDefinitions.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/api/wix/WixToolset.Data/WindowsInstaller/WindowsInstallerTableDefinitions.cs b/src/api/wix/WixToolset.Data/WindowsInstaller/WindowsInstallerTableDefinitions.cs index b0fde6a7..9f0cdd96 100644 --- a/src/api/wix/WixToolset.Data/WindowsInstaller/WindowsInstallerTableDefinitions.cs +++ b/src/api/wix/WixToolset.Data/WindowsInstaller/WindowsInstallerTableDefinitions.cs | |||
@@ -1455,7 +1455,7 @@ namespace WixToolset.Data.WindowsInstaller | |||
1455 | SymbolDefinitions.ModuleConfiguration, | 1455 | SymbolDefinitions.ModuleConfiguration, |
1456 | new[] | 1456 | new[] |
1457 | { | 1457 | { |
1458 | new ColumnDefinition("Name", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Unique identifier for this row."), | 1458 | new ColumnDefinition("Name", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Unique identifier for this row.", modularizeType: ColumnModularizeType.None), |
1459 | new ColumnDefinition("Format", ColumnType.Number, 2, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 0, maxValue: 3, description: "Format of this item."), | 1459 | new ColumnDefinition("Format", ColumnType.Number, 2, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 0, maxValue: 3, description: "Format of this item."), |
1460 | new ColumnDefinition("Type", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Additional type information for this item."), | 1460 | new ColumnDefinition("Type", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Additional type information for this item."), |
1461 | new ColumnDefinition("ContextData", ColumnType.Localized, 0, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Additional context information about this item."), | 1461 | new ColumnDefinition("ContextData", ColumnType.Localized, 0, primaryKey: false, nullable: true, ColumnCategory.Text, description: "Additional context information about this item."), |