From 6eab6255f832007886c4b01861dc39d5582177ef Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Sat, 26 Oct 2019 13:40:49 -0700 Subject: Update to WindowsInstallerData rename from Data --- .../Bind/BindDatabaseCommand.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs') 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 } // Time to create the output object. Try to put as much above here as possible, updating the IR is better. - Output output; + WindowsInstallerData output; { var command = new CreateOutputFromIRCommand(this.Messaging, section, tableDefinitions, this.BackendExtensions); command.Execute(); @@ -534,7 +534,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind this.TrackedFiles = trackedFiles; } - private WixOutput CreateWixout(List trackedFiles, Intermediate intermediate, Output output) + private WixOutput CreateWixout(List trackedFiles, Intermediate intermediate, WindowsInstallerData output) { WixOutput wixout; @@ -834,7 +834,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind /// Duplicate GUIDs without conditions are an error condition; with conditions, it's a /// warning, as the conditions might be mutually exclusive. /// - private void ValidateComponentGuids(Output output) + private void ValidateComponentGuids(WindowsInstallerData output) { Table componentTable = output.Tables["Component"]; if (null != componentTable) @@ -874,7 +874,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind /// Update Control and BBControl text by reading from files when necessary. /// /// Internal representation of the msi database to operate upon. - private void UpdateControlText(Output output) + private void UpdateControlText(WindowsInstallerData output) { var command = new UpdateControlTextCommand(); command.Messaging = this.Messaging; @@ -925,7 +925,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind /// The database file to create. /// Whether to keep columns added in a transform. /// Whether to use a subdirectory based on the file name for intermediate files. - private IEnumerable GenerateDatabase(Output output, TableDefinitionCollection tableDefinitions, string databaseFile, bool keepAddedColumns, bool useSubdirectory) + private IEnumerable GenerateDatabase(WindowsInstallerData output, TableDefinitionCollection tableDefinitions, string databaseFile, bool keepAddedColumns, bool useSubdirectory) { var command = new GenerateDatabaseCommand(); command.BackendHelper = this.BackendHelper; -- cgit v1.2.3-55-g6feb