diff options
Diffstat (limited to 'src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs')
| -rw-r--r-- | src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs index c9659287..5c84a82f 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs | |||
| @@ -134,7 +134,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 134 | bool compressed; | 134 | bool compressed; |
| 135 | bool longNames; | 135 | bool longNames; |
| 136 | int installerVersion; | 136 | int installerVersion; |
| 137 | string modularizationGuid; | 137 | string modularizationSuffix; |
| 138 | { | 138 | { |
| 139 | var command = new BindSummaryInfoCommand(section); | 139 | var command = new BindSummaryInfoCommand(section); |
| 140 | command.Execute(); | 140 | command.Execute(); |
| @@ -142,7 +142,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 142 | compressed = command.Compressed; | 142 | compressed = command.Compressed; |
| 143 | longNames = command.LongNames; | 143 | longNames = command.LongNames; |
| 144 | installerVersion = command.InstallerVersion; | 144 | installerVersion = command.InstallerVersion; |
| 145 | modularizationGuid = command.ModularizationGuid; | 145 | modularizationSuffix = command.ModularizationSuffix; |
| 146 | } | 146 | } |
| 147 | 147 | ||
| 148 | // Add binder variables for all properties. | 148 | // Add binder variables for all properties. |
| @@ -362,7 +362,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 362 | // Modularize identifiers. | 362 | // Modularize identifiers. |
| 363 | if (OutputType.Module == output.Type) | 363 | if (OutputType.Module == output.Type) |
| 364 | { | 364 | { |
| 365 | var command = new ModularizeCommand(output, modularizationGuid, section.Tuples.OfType<WixSuppressModularizationTuple>()); | 365 | var command = new ModularizeCommand(output, modularizationSuffix, section.Tuples.OfType<WixSuppressModularizationTuple>()); |
| 366 | command.Execute(); | 366 | command.Execute(); |
| 367 | } | 367 | } |
| 368 | else if (output.Type == OutputType.Patch) | 368 | else if (output.Type == OutputType.Patch) |
| @@ -448,6 +448,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 448 | command.BackendExtensions = this.BackendExtensions; | 448 | command.BackendExtensions = this.BackendExtensions; |
| 449 | command.LayoutDirectory = layoutDirectory; | 449 | command.LayoutDirectory = layoutDirectory; |
| 450 | command.Compressed = compressed; | 450 | command.Compressed = compressed; |
| 451 | command.ModularizationSuffix = modularizationSuffix; | ||
| 451 | command.FileRowsByCabinet = filesByCabinetMedia; | 452 | command.FileRowsByCabinet = filesByCabinetMedia; |
| 452 | command.ResolveMedia = this.ResolveMedia; | 453 | command.ResolveMedia = this.ResolveMedia; |
| 453 | command.TableDefinitions = tableDefinitions; | 454 | command.TableDefinitions = tableDefinitions; |
