diff options
Diffstat (limited to 'src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs')
| -rw-r--r-- | src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs index 77d0c9bb..a783ebaa 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs | |||
| @@ -312,7 +312,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 312 | } | 312 | } |
| 313 | 313 | ||
| 314 | // Time to create the output object. Try to put as much above here as possible, updating the IR is better. | 314 | // Time to create the output object. Try to put as much above here as possible, updating the IR is better. |
| 315 | Output output; | 315 | WindowsInstallerData output; |
| 316 | { | 316 | { |
| 317 | var command = new CreateOutputFromIRCommand(this.Messaging, section, tableDefinitions, this.BackendExtensions); | 317 | var command = new CreateOutputFromIRCommand(this.Messaging, section, tableDefinitions, this.BackendExtensions); |
| 318 | command.Execute(); | 318 | command.Execute(); |
| @@ -534,7 +534,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 534 | this.TrackedFiles = trackedFiles; | 534 | this.TrackedFiles = trackedFiles; |
| 535 | } | 535 | } |
| 536 | 536 | ||
| 537 | private WixOutput CreateWixout(List<ITrackedFile> trackedFiles, Intermediate intermediate, Output output) | 537 | private WixOutput CreateWixout(List<ITrackedFile> trackedFiles, Intermediate intermediate, WindowsInstallerData output) |
| 538 | { | 538 | { |
| 539 | WixOutput wixout; | 539 | WixOutput wixout; |
| 540 | 540 | ||
| @@ -834,7 +834,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 834 | /// Duplicate GUIDs without conditions are an error condition; with conditions, it's a | 834 | /// Duplicate GUIDs without conditions are an error condition; with conditions, it's a |
| 835 | /// warning, as the conditions might be mutually exclusive. | 835 | /// warning, as the conditions might be mutually exclusive. |
| 836 | /// </remarks> | 836 | /// </remarks> |
| 837 | private void ValidateComponentGuids(Output output) | 837 | private void ValidateComponentGuids(WindowsInstallerData output) |
| 838 | { | 838 | { |
| 839 | Table componentTable = output.Tables["Component"]; | 839 | Table componentTable = output.Tables["Component"]; |
| 840 | if (null != componentTable) | 840 | if (null != componentTable) |
| @@ -874,7 +874,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 874 | /// Update Control and BBControl text by reading from files when necessary. | 874 | /// Update Control and BBControl text by reading from files when necessary. |
| 875 | /// </summary> | 875 | /// </summary> |
| 876 | /// <param name="output">Internal representation of the msi database to operate upon.</param> | 876 | /// <param name="output">Internal representation of the msi database to operate upon.</param> |
| 877 | private void UpdateControlText(Output output) | 877 | private void UpdateControlText(WindowsInstallerData output) |
| 878 | { | 878 | { |
| 879 | var command = new UpdateControlTextCommand(); | 879 | var command = new UpdateControlTextCommand(); |
| 880 | command.Messaging = this.Messaging; | 880 | command.Messaging = this.Messaging; |
| @@ -925,7 +925,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 925 | /// <param name="databaseFile">The database file to create.</param> | 925 | /// <param name="databaseFile">The database file to create.</param> |
| 926 | /// <param name="keepAddedColumns">Whether to keep columns added in a transform.</param> | 926 | /// <param name="keepAddedColumns">Whether to keep columns added in a transform.</param> |
| 927 | /// <param name="useSubdirectory">Whether to use a subdirectory based on the <paramref name="databaseFile"/> file name for intermediate files.</param> | 927 | /// <param name="useSubdirectory">Whether to use a subdirectory based on the <paramref name="databaseFile"/> file name for intermediate files.</param> |
| 928 | private IEnumerable<ITrackedFile> GenerateDatabase(Output output, TableDefinitionCollection tableDefinitions, string databaseFile, bool keepAddedColumns, bool useSubdirectory) | 928 | private IEnumerable<ITrackedFile> GenerateDatabase(WindowsInstallerData output, TableDefinitionCollection tableDefinitions, string databaseFile, bool keepAddedColumns, bool useSubdirectory) |
| 929 | { | 929 | { |
| 930 | var command = new GenerateDatabaseCommand(); | 930 | var command = new GenerateDatabaseCommand(); |
| 931 | command.BackendHelper = this.BackendHelper; | 931 | command.BackendHelper = this.BackendHelper; |
