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 --- .../Unbind/ExtractCabinetsCommand.cs | 4 ++-- .../Unbind/UnbindDatabaseCommand.cs | 8 ++++---- .../Unbind/UnbindTranformCommand.cs | 12 ++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) (limited to 'src/WixToolset.Core.WindowsInstaller/Unbind') diff --git a/src/WixToolset.Core.WindowsInstaller/Unbind/ExtractCabinetsCommand.cs b/src/WixToolset.Core.WindowsInstaller/Unbind/ExtractCabinetsCommand.cs index 57547d4f..86eaa945 100644 --- a/src/WixToolset.Core.WindowsInstaller/Unbind/ExtractCabinetsCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Unbind/ExtractCabinetsCommand.cs @@ -15,7 +15,7 @@ namespace WixToolset.Core.WindowsInstaller.Unbind internal class ExtractCabinetsCommand { - public ExtractCabinetsCommand(Output output, Database database, string inputFilePath, string exportBasePath, string intermediateFolder, bool treatOutputAsModule = false) + public ExtractCabinetsCommand(WindowsInstallerData output, Database database, string inputFilePath, string exportBasePath, string intermediateFolder, bool treatOutputAsModule = false) { this.Output = output; this.Database = database; @@ -27,7 +27,7 @@ namespace WixToolset.Core.WindowsInstaller.Unbind public string[] ExtractedFiles { get; private set; } - private Output Output { get; } + private WindowsInstallerData Output { get; } private Database Database { get; } diff --git a/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindDatabaseCommand.cs b/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindDatabaseCommand.cs index 0699199b..2a26be8c 100644 --- a/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindDatabaseCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindDatabaseCommand.cs @@ -57,12 +57,12 @@ namespace WixToolset.Core.WindowsInstaller.Unbind private int SectionCount { get; set; } - public Output Execute() + public WindowsInstallerData Execute() { this.exportedFiles = new List(); string modularizationGuid = null; - var output = new Output(new SourceLineNumber(this.DatabasePath)); + var output = new WindowsInstallerData(new SourceLineNumber(this.DatabasePath)); View validationView = null; // set the output type @@ -442,7 +442,7 @@ namespace WixToolset.Core.WindowsInstaller.Unbind /// /// The path to the msi database file in an admin image. /// The Output that represents the msi database. - private void GenerateWixFileTable(string databaseFile, Output output) + private void GenerateWixFileTable(string databaseFile, WindowsInstallerData output) { throw new NotImplementedException(); #if TODO_FIX_UNBINDING_FILES @@ -605,7 +605,7 @@ namespace WixToolset.Core.WindowsInstaller.Unbind /// Creates section ids on rows which form logical groupings of resources. /// /// The Output that represents the msi database. - private void GenerateSectionIds(Output output) + private void GenerateSectionIds(WindowsInstallerData output) { // First assign and index section ids for the tables that are in their own sections. this.AssignSectionIdsToTable(output.Tables["Binary"], 0); diff --git a/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindTranformCommand.cs b/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindTranformCommand.cs index bf282e99..bdf8d542 100644 --- a/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindTranformCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindTranformCommand.cs @@ -39,9 +39,9 @@ namespace WixToolset.Core.WindowsInstaller.Unbind private string EmptyFile { get; set; } - public Output Execute() + public WindowsInstallerData Execute() { - Output transform = new Output(new SourceLineNumber(this.TransformFile)); + WindowsInstallerData transform = new WindowsInstallerData(new SourceLineNumber(this.TransformFile)); transform.Type = OutputType.Transform; // get the summary information table @@ -63,7 +63,7 @@ namespace WixToolset.Core.WindowsInstaller.Unbind } // create a schema msi which hopefully matches the table schemas in the transform - Output schemaOutput = new Output(null); + WindowsInstallerData schemaOutput = new WindowsInstallerData(null); string msiDatabaseFile = Path.Combine(this.IntermediateFolder, "schema.msi"); foreach (TableDefinition tableDefinition in this.TableDefinitions) { @@ -88,7 +88,7 @@ namespace WixToolset.Core.WindowsInstaller.Unbind // unbind the database var unbindCommand = new UnbindDatabaseCommand(this.Messaging, msiDatabase, msiDatabaseFile, OutputType.Product, this.ExportBasePath, this.IntermediateFolder, false, false, skipSummaryInfo: true); - Output transformViewOutput = unbindCommand.Execute(); + WindowsInstallerData transformViewOutput = unbindCommand.Execute(); // index the added and possibly modified rows (added rows may also appears as modified rows) transformViewTable = transformViewOutput.Tables["_TransformView"]; @@ -158,7 +158,7 @@ namespace WixToolset.Core.WindowsInstaller.Unbind // unbind the database var unbindCommand = new UnbindDatabaseCommand(this.Messaging, msiDatabase, msiDatabaseFile, OutputType.Product, this.ExportBasePath, this.IntermediateFolder, false, false, skipSummaryInfo: true); - Output output = unbindCommand.Execute(); + WindowsInstallerData output = unbindCommand.Execute(); // index all the rows to easily find modified rows Hashtable rows = new Hashtable(); @@ -240,7 +240,7 @@ namespace WixToolset.Core.WindowsInstaller.Unbind return transform; } - private void GenerateDatabase(Output output, string databaseFile) + private void GenerateDatabase(WindowsInstallerData output, string databaseFile) { var command = new GenerateDatabaseCommand(); command.Extensions = Array.Empty(); -- cgit v1.2.3-55-g6feb