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 +-- .../Bind/BindTransformCommand.cs | 8 +-- .../Bind/CopyTransformDataCommand.cs | 6 +- .../Bind/CreateCabinetsCommand.cs | 4 +- .../Bind/CreateOutputFromIRCommand.cs | 76 +++++++++++----------- .../Bind/GenerateDatabaseCommand.cs | 4 +- .../Bind/MergeModulesCommand.cs | 2 +- .../Bind/ModularizeCommand.cs | 4 +- .../Bind/UpdateMediaSequencesCommand.cs | 4 +- .../Decompile/Decompiler.cs | 6 +- src/WixToolset.Core.WindowsInstaller/Differ.cs | 8 +-- src/WixToolset.Core.WindowsInstaller/Patch.cs | 6 +- .../Unbind/ExtractCabinetsCommand.cs | 4 +- .../Unbind/UnbindDatabaseCommand.cs | 8 +-- .../Unbind/UnbindTranformCommand.cs | 12 ++-- src/WixToolset.Core.WindowsInstaller/Validator.cs | 4 +- .../ValidatorExtension.cs | 4 +- .../WindowsInstallerBackendHelper.cs | 4 +- .../ExampleWindowsInstallerBackendExtension.cs | 2 +- .../WixToolsetTest.CoreIntegration/MsiFixture.cs | 6 +- 20 files changed, 91 insertions(+), 91 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 } // 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; diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/BindTransformCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/BindTransformCommand.cs index 2936ad7b..8757024e 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/BindTransformCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/BindTransformCommand.cs @@ -21,7 +21,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind public string TempFilesLocation { private get; set; } - public Output Transform { private get; set; } + public WindowsInstallerData Transform { private get; set; } public IMessaging Messaging { private get; set; } @@ -31,8 +31,8 @@ namespace WixToolset.Core.WindowsInstaller.Bind { int transformFlags = 0; - Output targetOutput = new Output(null); - Output updatedOutput = new Output(null); + WindowsInstallerData targetOutput = new WindowsInstallerData(null); + WindowsInstallerData updatedOutput = new WindowsInstallerData(null); // TODO: handle added columns @@ -456,7 +456,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind return compared.Value; } - private void GenerateDatabase(Output output, string outputPath, bool keepAddedColumns) + private void GenerateDatabase(WindowsInstallerData output, string outputPath, bool keepAddedColumns) { var command = new GenerateDatabaseCommand(); command.Codepage = output.Codepage; diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CopyTransformDataCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CopyTransformDataCommand.cs index a2cf2076..1651f9d8 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/CopyTransformDataCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/CopyTransformDataCommand.cs @@ -22,7 +22,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind public IMessaging Messaging { private get; set; } - public Output Output { private get; set; } + public WindowsInstallerData Output { private get; set; } public TableDefinitionCollection TableDefinitions { private get; set; } @@ -431,7 +431,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind /// The primary authoring transform. /// The secondary patch transform. /// The file row that contains information about the patched file. - private void AddPatchFilesActionToSequenceTable(SequenceTable table, Output mainTransform, Output pairedTransform, Row mainFileRow) + private void AddPatchFilesActionToSequenceTable(SequenceTable table, WindowsInstallerData mainTransform, WindowsInstallerData pairedTransform, Row mainFileRow) { // Find/add PatchFiles action (also determine sequence for it). // Search mainTransform first, then pairedTransform (pairedTransform overrides). @@ -524,7 +524,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind /// Signal a warning if a non-keypath file was changed in a patch without also changing the keypath file of the component. /// /// The output to validate. - private void ValidateFileRowChanges(Output transform) + private void ValidateFileRowChanges(WindowsInstallerData transform) { Table componentTable = transform.Tables["Component"]; Table fileTable = transform.Tables["File"]; diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs index a9b0f5f5..50dc7e3f 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs @@ -69,7 +69,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind public IEnumerable BackendExtensions { private get; set; } - public Output Output { private get; set; } + public WindowsInstallerData Output { private get; set; } public string LayoutDirectory { private get; set; } @@ -180,7 +180,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind /// MediaRow containing information about the cabinet. /// Collection of files in this cabinet. /// created CabinetWorkItem object - private CabinetWorkItem CreateCabinetWorkItem(Output output, string cabinetDir, MediaTuple mediaRow, CompressionLevel compressionLevel, IEnumerable fileFacades) + private CabinetWorkItem CreateCabinetWorkItem(WindowsInstallerData output, string cabinetDir, MediaTuple mediaRow, CompressionLevel compressionLevel, IEnumerable fileFacades) { CabinetWorkItem cabinetWorkItem = null; string tempCabinetFileX = Path.Combine(this.TempFilesLocation, mediaRow.Cabinet); diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs index 081644cb..d7056bb8 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs @@ -36,11 +36,11 @@ namespace WixToolset.Core.WindowsInstaller.Bind private IntermediateSection Section { get; } - public Output Output { get; private set; } + public WindowsInstallerData Output { get; private set; } public void Execute() { - var output = new Output(this.Section.Tuples.First().SourceLineNumbers); + var output = new WindowsInstallerData(this.Section.Tuples.First().SourceLineNumbers); output.Codepage = this.Section.Codepage; output.Type = SectionTypeToOutputType(this.Section.Type); @@ -49,7 +49,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind this.Output = output; } - private void AddSectionToOutput(IntermediateSection section, Output output) + private void AddSectionToOutput(IntermediateSection section, WindowsInstallerData output) { foreach (var tuple in section.Tuples) { @@ -243,7 +243,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind } } - private void AddAssemblyTuple(AssemblyTuple tuple, Output output) + private void AddAssemblyTuple(AssemblyTuple tuple, WindowsInstallerData output) { var attributes = tuple.Type == AssemblyType.Win32Assembly ? 1 : (int?)null; @@ -256,7 +256,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind row[4] = attributes; } - private void AddBBControlTuple(BBControlTuple tuple, Output output) + private void AddBBControlTuple(BBControlTuple tuple, WindowsInstallerData output) { var attributes = tuple.Attributes; attributes |= tuple.Enabled ? WindowsInstallerConstants.MsidbControlAttributesEnabled : 0; @@ -281,7 +281,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind row[8] = tuple.Text; } - private void AddClassTuple(ClassTuple tuple, Output output) + private void AddClassTuple(ClassTuple tuple, WindowsInstallerData output) { var table = output.EnsureTable(this.TableDefinitions["Class"]); var row = table.CreateRow(tuple.SourceLineNumbers); @@ -300,7 +300,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind row[12] = tuple.RelativePath ? (int?)1 : null; } - private void AddControlTuple(ControlTuple tuple, Output output) + private void AddControlTuple(ControlTuple tuple, WindowsInstallerData output) { var text = tuple.Text; var attributes = tuple.Attributes; @@ -340,7 +340,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind row[10] = tuple.Help; } - private void AddComponentTuple(ComponentTuple tuple, Output output) + private void AddComponentTuple(ComponentTuple tuple, WindowsInstallerData output) { var attributes = ComponentLocation.Either == tuple.Location ? WindowsInstallerConstants.MsidbComponentAttributesOptional : 0; attributes |= ComponentLocation.SourceOnly == tuple.Location ? WindowsInstallerConstants.MsidbComponentAttributesSourceOnly : 0; @@ -365,7 +365,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind row[5] = tuple.KeyPath; } - private void AddCustomActionTuple(CustomActionTuple tuple, Output output) + private void AddCustomActionTuple(CustomActionTuple tuple, WindowsInstallerData output) { var type = tuple.Win64 ? WindowsInstallerConstants.MsidbCustomActionType64BitScript : 0; type |= tuple.IgnoreResult ? WindowsInstallerConstants.MsidbCustomActionTypeContinue : 0; @@ -401,7 +401,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind row[4] = tuple.PatchUninstall ? (int?)WindowsInstallerConstants.MsidbCustomActionTypePatchUninstall : null; } - private void AddDialogTuple(DialogTuple tuple, Output output) + private void AddDialogTuple(DialogTuple tuple, WindowsInstallerData output) { var attributes = tuple.Visible ? WindowsInstallerConstants.MsidbDialogAttributesVisible : 0; attributes|= tuple.Modal ? WindowsInstallerConstants.MsidbDialogAttributesModal : 0; @@ -431,7 +431,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind output.EnsureTable(this.TableDefinitions["ListBox"]); } - private void AddDirectoryTuple(DirectoryTuple tuple, Output output) + private void AddDirectoryTuple(DirectoryTuple tuple, WindowsInstallerData output) { var sourceName = GetMsiFilenameValue(tuple.SourceShortName, tuple.SourceName); var targetName = GetMsiFilenameValue(tuple.ShortName, tuple.Name); @@ -450,7 +450,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind row[2] = defaultDir; } - private void AddEnvironmentTuple(EnvironmentTuple tuple, Output output) + private void AddEnvironmentTuple(EnvironmentTuple tuple, WindowsInstallerData output) { var action = String.Empty; var system = tuple.System ? "*" : String.Empty; @@ -488,7 +488,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind row[3] = tuple.ComponentRef; } - private void AddFeatureTuple(FeatureTuple tuple, Output output) + private void AddFeatureTuple(FeatureTuple tuple, WindowsInstallerData output) { var attributes = tuple.DisallowAbsent ? WindowsInstallerConstants.MsidbFeatureAttributesUIDisallowAbsent : 0; attributes |= tuple.DisallowAdvertise ? WindowsInstallerConstants.MsidbFeatureAttributesDisallowAdvertise : 0; @@ -508,7 +508,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind row[7] = attributes; } - private void AddFileTuple(FileTuple tuple, Output output) + private void AddFileTuple(FileTuple tuple, WindowsInstallerData output) { var table = output.EnsureTable(this.TableDefinitions["File"]); var row = (FileRow)table.CreateRow(tuple.SourceLineNumbers); @@ -537,7 +537,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind } } - private void AddIniFileTuple(IniFileTuple tuple, Output output) + private void AddIniFileTuple(IniFileTuple tuple, WindowsInstallerData output) { var tableName = (InifFileActionType.AddLine == tuple.Action || InifFileActionType.AddTag == tuple.Action || InifFileActionType.CreateLine == tuple.Action) ? "IniFile" : "RemoveIniFile"; @@ -553,7 +553,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind row[7] = tuple.ComponentRef; } - private void AddMediaTuple(MediaTuple tuple, Output output) + private void AddMediaTuple(MediaTuple tuple, WindowsInstallerData output) { if (this.Section.Type != SectionType.Module) { @@ -568,7 +568,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind } } - private void AddModuleConfigurationTuple(ModuleConfigurationTuple tuple, Output output) + private void AddModuleConfigurationTuple(ModuleConfigurationTuple tuple, WindowsInstallerData output) { var table = output.EnsureTable(this.TableDefinitions["ModuleConfiguration"]); var row = table.CreateRow(tuple.SourceLineNumbers); @@ -585,7 +585,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind row[9] = tuple.HelpKeyword; } - private void AddMsiEmbeddedUITuple(MsiEmbeddedUITuple tuple, Output output) + private void AddMsiEmbeddedUITuple(MsiEmbeddedUITuple tuple, WindowsInstallerData output) { var attributes = tuple.EntryPoint ? WindowsInstallerConstants.MsidbEmbeddedUI : 0; attributes |= tuple.SupportsBasicUI ? WindowsInstallerConstants.MsidbEmbeddedHandlesBasic : 0; @@ -599,7 +599,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind row[4] = tuple.Source; } - private void AddMsiFileHashTuple(MsiFileHashTuple tuple, Output output) + private void AddMsiFileHashTuple(MsiFileHashTuple tuple, WindowsInstallerData output) { var table = output.EnsureTable(this.TableDefinitions["MsiFileHash"]); var row = table.CreateRow(tuple.SourceLineNumbers); @@ -611,7 +611,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind row[5] = tuple.HashPart4; } - private void AddMsiServiceConfigTuple(MsiServiceConfigTuple tuple, Output output) + private void AddMsiServiceConfigTuple(MsiServiceConfigTuple tuple, WindowsInstallerData output) { var events = tuple.OnInstall ? WindowsInstallerConstants.MsidbServiceConfigEventInstall : 0; events |= tuple.OnReinstall ? WindowsInstallerConstants.MsidbServiceConfigEventReinstall : 0; @@ -627,7 +627,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind row[5] = tuple.ComponentRef; } - private void AddMsiServiceConfigFailureActionsTuple(MsiServiceConfigFailureActionsTuple tuple, Output output) + private void AddMsiServiceConfigFailureActionsTuple(MsiServiceConfigFailureActionsTuple tuple, WindowsInstallerData output) { var events = tuple.OnInstall ? WindowsInstallerConstants.MsidbServiceConfigEventInstall : 0; events |= tuple.OnReinstall ? WindowsInstallerConstants.MsidbServiceConfigEventReinstall : 0; @@ -646,7 +646,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind row[8] = tuple.ComponentRef; } - private void AddMoveFileTuple(MoveFileTuple tuple, Output output) + private void AddMoveFileTuple(MoveFileTuple tuple, WindowsInstallerData output) { var table = output.EnsureTable(this.TableDefinitions["MoveFile"]); var row = table.CreateRow(tuple.SourceLineNumbers); @@ -659,7 +659,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind row[6] = tuple.Delete ? WindowsInstallerConstants.MsidbMoveFileOptionsMove : 0; } - private void AddPropertyTuple(PropertyTuple tuple, Output output) + private void AddPropertyTuple(PropertyTuple tuple, WindowsInstallerData output) { if (String.IsNullOrEmpty(tuple.Value)) { @@ -672,7 +672,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind row.Value = tuple.Value; } - private void AddRemoveFileTuple(RemoveFileTuple tuple, Output output) + private void AddRemoveFileTuple(RemoveFileTuple tuple, WindowsInstallerData output) { var installMode = tuple.OnInstall == true ? WindowsInstallerConstants.MsidbRemoveFileInstallModeOnInstall : 0; installMode |= tuple.OnUninstall == true ? WindowsInstallerConstants.MsidbRemoveFileInstallModeOnRemove : 0; @@ -686,7 +686,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind row[4] = installMode; } - private void AddRegistryTuple(RegistryTuple tuple, Output output) + private void AddRegistryTuple(RegistryTuple tuple, WindowsInstallerData output) { var value = tuple.Value; @@ -738,7 +738,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind row[5] = tuple.ComponentRef; } - private void AddRegLocatorTuple(RegLocatorTuple tuple, Output output) + private void AddRegLocatorTuple(RegLocatorTuple tuple, WindowsInstallerData output) { var type = (int)tuple.Type; type |= tuple.Win64 ? WindowsInstallerConstants.MsidbLocatorType64bit : 0; @@ -752,7 +752,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind row[4] = type; } - private void AddRemoveRegistryTuple(RemoveRegistryTuple tuple, Output output) + private void AddRemoveRegistryTuple(RemoveRegistryTuple tuple, WindowsInstallerData output) { if (tuple.Action == RemoveRegistryActionType.RemoveOnInstall) { @@ -776,7 +776,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind } } - private void AddServiceControlTuple(ServiceControlTuple tuple, Output output) + private void AddServiceControlTuple(ServiceControlTuple tuple, WindowsInstallerData output) { var events = tuple.InstallRemove ? WindowsInstallerConstants.MsidbServiceControlEventDelete : 0; events |= tuple.UninstallRemove ? WindowsInstallerConstants.MsidbServiceControlEventUninstallDelete : 0; @@ -795,7 +795,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind row[5] = tuple.ComponentRef; } - private void AddServiceInstallTuple(ServiceInstallTuple tuple, Output output) + private void AddServiceInstallTuple(ServiceInstallTuple tuple, WindowsInstallerData output) { var errorControl = (int)tuple.ErrorControl; errorControl |= tuple.Vital ? WindowsInstallerConstants.MsidbServiceInstallErrorControlVital : 0; @@ -820,7 +820,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind row[12] = tuple.Description; } - private void AddShortcutTuple(ShortcutTuple tuple, Output output) + private void AddShortcutTuple(ShortcutTuple tuple, WindowsInstallerData output) { var table = output.EnsureTable(this.TableDefinitions["Shortcut"]); var row = table.CreateRow(tuple.SourceLineNumbers); @@ -842,7 +842,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind row[15] = tuple.DescriptionResourceId; } - private void AddTextStyleTuple(TextStyleTuple tuple, Output output) + private void AddTextStyleTuple(TextStyleTuple tuple, WindowsInstallerData output) { var styleBits = tuple.Bold ? WindowsInstallerConstants.MsidbTextStyleStyleBitsBold : 0; styleBits |= tuple.Italic ? WindowsInstallerConstants.MsidbTextStyleStyleBitsItalic : 0; @@ -867,7 +867,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind row[4] = styleBits == 0 ? null : (int?)styleBits; } - private void AddUpgradeTuple(UpgradeTuple tuple, Output output) + private void AddUpgradeTuple(UpgradeTuple tuple, WindowsInstallerData output) { var table = output.EnsureTable(this.TableDefinitions["Upgrade"]); var row = (UpgradeRow)table.CreateRow(tuple.SourceLineNumbers); @@ -887,7 +887,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind row.Attributes = attributes; } - private void AddWixActionTuple(WixActionTuple tuple, Output output) + private void AddWixActionTuple(WixActionTuple tuple, WindowsInstallerData output) { // Get the table definition for the action (and ensure the proper table exists for a module). TableDefinition sequenceTableDefinition = null; @@ -977,7 +977,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind } } - private void AddWixCustomRowTuple(WixCustomRowTuple tuple, Output output) + private void AddWixCustomRowTuple(WixCustomRowTuple tuple, WindowsInstallerData output) { var customTableDefinition = this.TableDefinitions[tuple.Table]; @@ -1058,13 +1058,13 @@ namespace WixToolset.Core.WindowsInstaller.Bind } } - private void AddWixEnsureTableTuple(WixEnsureTableTuple tuple, Output output) + private void AddWixEnsureTableTuple(WixEnsureTableTuple tuple, WindowsInstallerData output) { var tableDefinition = this.TableDefinitions[tuple.Table]; output.EnsureTable(tableDefinition); } - private void AddWixMediaTemplateTuple(WixMediaTemplateTuple tuple, Output output) + private void AddWixMediaTemplateTuple(WixMediaTemplateTuple tuple, WindowsInstallerData output) { var table = output.EnsureTable(this.TableDefinitions["WixMediaTemplate"]); var row = (WixMediaTemplateRow)table.CreateRow(tuple.SourceLineNumbers); @@ -1076,7 +1076,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind row.MaximumCabinetSizeForLargeFileSplitting = tuple.MaximumCabinetSizeForLargeFileSplitting ?? MaxValueOfMaxCabSizeForLargeFileSplitting; } - private void AddTupleFromExtension(IntermediateTuple tuple, Output output) + private void AddTupleFromExtension(IntermediateTuple tuple, WindowsInstallerData output) { foreach (var extension in this.BackendExtensions) { @@ -1087,7 +1087,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind } } - private void AddTupleDefaultly(IntermediateTuple tuple, Output output, bool idIsPrimaryKey = false, string tableName = null) + private void AddTupleDefaultly(IntermediateTuple tuple, WindowsInstallerData output, bool idIsPrimaryKey = false, string tableName = null) { if (!this.TableDefinitions.TryGet(tableName ?? tuple.Definition.Name, out var tableDefinition)) { diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/GenerateDatabaseCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/GenerateDatabaseCommand.cs index 84c2dcfd..6b365ecd 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/GenerateDatabaseCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/GenerateDatabaseCommand.cs @@ -30,7 +30,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind public IMessaging Messaging { private get; set; } - public Output Output { private get; set; } + public WindowsInstallerData Output { private get; set; } public string OutputPath { private get; set; } @@ -350,7 +350,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind } } - private void BindTransform(Output transform, string outputPath) + private void BindTransform(WindowsInstallerData transform, string outputPath) { var command = new BindTransformCommand(); command.Messaging = this.Messaging; diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/MergeModulesCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/MergeModulesCommand.cs index 3c8b4999..7ee33997 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/MergeModulesCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/MergeModulesCommand.cs @@ -25,7 +25,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind public IMessaging Messaging { private get; set; } - public Output Output { private get; set; } + public WindowsInstallerData Output { private get; set; } public string OutputPath { private get; set; } diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/ModularizeCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/ModularizeCommand.cs index f0a43085..64257ccf 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/ModularizeCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/ModularizeCommand.cs @@ -15,7 +15,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind internal class ModularizeCommand { - public ModularizeCommand(Output output, string modularizationGuid, IEnumerable suppressTuples) + public ModularizeCommand(WindowsInstallerData output, string modularizationGuid, IEnumerable suppressTuples) { this.Output = output; this.ModularizationGuid = modularizationGuid; @@ -24,7 +24,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind this.SuppressModularizationIdentifiers = new HashSet(suppressTuples.Select(s => s.Id.Id)); } - private Output Output { get; } + private WindowsInstallerData Output { get; } private string ModularizationGuid { get; } diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/UpdateMediaSequencesCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/UpdateMediaSequencesCommand.cs index 889d5df2..f9e3bd5a 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/UpdateMediaSequencesCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/UpdateMediaSequencesCommand.cs @@ -11,13 +11,13 @@ namespace WixToolset.Core.WindowsInstaller.Bind internal class UpdateMediaSequencesCommand { - public UpdateMediaSequencesCommand(Output output, List fileFacades) + public UpdateMediaSequencesCommand(WindowsInstallerData output, List fileFacades) { this.Output = output; this.FileFacades = fileFacades; } - private Output Output { get; } + private WindowsInstallerData Output { get; } private List FileFacades { get; } diff --git a/src/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs b/src/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs index b4d25786..ba515d69 100644 --- a/src/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs +++ b/src/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs @@ -100,7 +100,7 @@ namespace WixToolset.Core.WindowsInstaller /// /// The output to decompile. /// The serialized WiX source code. - public XDocument Decompile(Output output) + public XDocument Decompile(WindowsInstallerData output) { if (null == output) { @@ -3024,7 +3024,7 @@ namespace WixToolset.Core.WindowsInstaller /// Decompile the tables. /// /// The output being decompiled. - private void DecompileTables(Output output) + private void DecompileTables(WindowsInstallerData output) { var sortedTableNames = this.GetSortedTableNames(); @@ -3387,7 +3387,7 @@ namespace WixToolset.Core.WindowsInstaller /// The output being decompiled. /// The name of a table. /// true if the table should be decompiled; false otherwise. - private bool DecompilableTable(Output output, string tableName) + private bool DecompilableTable(WindowsInstallerData output, string tableName) { switch (tableName) { diff --git a/src/WixToolset.Core.WindowsInstaller/Differ.cs b/src/WixToolset.Core.WindowsInstaller/Differ.cs index 209773e0..32172ffd 100644 --- a/src/WixToolset.Core.WindowsInstaller/Differ.cs +++ b/src/WixToolset.Core.WindowsInstaller/Differ.cs @@ -81,7 +81,7 @@ namespace WixToolset.Core.WindowsInstaller /// The target output. /// The updated output. /// The transform. - public Output Diff(Output targetOutput, Output updatedOutput) + public WindowsInstallerData Diff(WindowsInstallerData targetOutput, WindowsInstallerData updatedOutput) { return this.Diff(targetOutput, updatedOutput, 0); } @@ -93,9 +93,9 @@ namespace WixToolset.Core.WindowsInstaller /// The updated output. /// /// The transform. - public Output Diff(Output targetOutput, Output updatedOutput, TransformFlags validationFlags) + public WindowsInstallerData Diff(WindowsInstallerData targetOutput, WindowsInstallerData updatedOutput, TransformFlags validationFlags) { - Output transform = new Output(null); + WindowsInstallerData transform = new WindowsInstallerData(null); transform.Type = OutputType.Transform; transform.Codepage = updatedOutput.Codepage; this.transformSummaryInfo = new SummaryInformationStreams(); @@ -338,7 +338,7 @@ namespace WixToolset.Core.WindowsInstaller return comparedRow; } - private List CompareTables(Output targetOutput, Table targetTable, Table updatedTable, out TableOperation operation) + private List CompareTables(WindowsInstallerData targetOutput, Table targetTable, Table updatedTable, out TableOperation operation) { List rows = new List(); operation = TableOperation.None; diff --git a/src/WixToolset.Core.WindowsInstaller/Patch.cs b/src/WixToolset.Core.WindowsInstaller/Patch.cs index c1914aca..6549e830 100644 --- a/src/WixToolset.Core.WindowsInstaller/Patch.cs +++ b/src/WixToolset.Core.WindowsInstaller/Patch.cs @@ -15,10 +15,10 @@ namespace WixToolset.Data public class Patch { private List inspectorExtensions; - private Output patch; + private WindowsInstallerData patch; private TableDefinitionCollection tableDefinitions; - public Output PatchOutput + public WindowsInstallerData PatchOutput { get { return this.patch; } } @@ -40,7 +40,7 @@ namespace WixToolset.Data public void Load(string patchPath) { - this.patch = Output.Load(patchPath, false); + this.patch = WindowsInstallerData.Load(patchPath, false); } /// 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(); diff --git a/src/WixToolset.Core.WindowsInstaller/Validator.cs b/src/WixToolset.Core.WindowsInstaller/Validator.cs index e19feb22..1c9cdc2f 100644 --- a/src/WixToolset.Core.WindowsInstaller/Validator.cs +++ b/src/WixToolset.Core.WindowsInstaller/Validator.cs @@ -27,7 +27,7 @@ namespace WixToolset.Core.WindowsInstaller private string actionName; private StringCollection cubeFiles; private ValidatorExtension extension; - private Output output; + private WindowsInstallerData output; private InstallUIHandler validationUIHandler; private bool validationSessionComplete; private readonly IMessaging messaging; @@ -64,7 +64,7 @@ namespace WixToolset.Core.WindowsInstaller /// Gets or sets the output used for finding source line information. /// /// The output used for finding source line information. - public Output Output + public WindowsInstallerData Output { // cache Output object until validation for changes in extension get { return this.output; } diff --git a/src/WixToolset.Core.WindowsInstaller/ValidatorExtension.cs b/src/WixToolset.Core.WindowsInstaller/ValidatorExtension.cs index 48f73bf2..97208ddb 100644 --- a/src/WixToolset.Core.WindowsInstaller/ValidatorExtension.cs +++ b/src/WixToolset.Core.WindowsInstaller/ValidatorExtension.cs @@ -16,7 +16,7 @@ namespace WixToolset.Extensibility { private string databaseFile; private Hashtable indexedSourceLineNumbers; - private Output output; + private WindowsInstallerData output; private SourceLineNumber sourceLineNumbers; private readonly IMessaging messaging; @@ -42,7 +42,7 @@ namespace WixToolset.Extensibility /// Gets or sets the for finding source line information. /// /// The for finding source line information. - public Output Output + public WindowsInstallerData Output { get { return this.output; } set { this.output = value; } diff --git a/src/WixToolset.Core/ExtensibilityServices/WindowsInstallerBackendHelper.cs b/src/WixToolset.Core/ExtensibilityServices/WindowsInstallerBackendHelper.cs index 26982ad6..a99f5c7a 100644 --- a/src/WixToolset.Core/ExtensibilityServices/WindowsInstallerBackendHelper.cs +++ b/src/WixToolset.Core/ExtensibilityServices/WindowsInstallerBackendHelper.cs @@ -9,9 +9,9 @@ namespace WixToolset.Core.ExtensibilityServices internal class WindowsInstallerBackendHelper : IWindowsInstallerBackendHelper { - public bool TryAddTupleToOutputMatchingTableDefinitions(IntermediateTuple tuple, Output output, TableDefinition[] tableDefinitions) => this.TryAddTupleToOutputMatchingTableDefinitions(tuple, output, tableDefinitions, false); + public bool TryAddTupleToOutputMatchingTableDefinitions(IntermediateTuple tuple, WindowsInstallerData output, TableDefinition[] tableDefinitions) => this.TryAddTupleToOutputMatchingTableDefinitions(tuple, output, tableDefinitions, false); - public bool TryAddTupleToOutputMatchingTableDefinitions(IntermediateTuple tuple, Output output, TableDefinition[] tableDefinitions, bool columnZeroIsId) + public bool TryAddTupleToOutputMatchingTableDefinitions(IntermediateTuple tuple, WindowsInstallerData output, TableDefinition[] tableDefinitions, bool columnZeroIsId) { var tableDefinition = tableDefinitions.FirstOrDefault(t => t.Name == tuple.Definition.Name); diff --git a/src/test/Example.Extension/ExampleWindowsInstallerBackendExtension.cs b/src/test/Example.Extension/ExampleWindowsInstallerBackendExtension.cs index c5aeadba..d6741bc1 100644 --- a/src/test/Example.Extension/ExampleWindowsInstallerBackendExtension.cs +++ b/src/test/Example.Extension/ExampleWindowsInstallerBackendExtension.cs @@ -8,7 +8,7 @@ namespace Example.Extension internal class ExampleWindowsInstallerBackendExtension : BaseWindowsInstallerBackendBinderExtension { - public override bool TryAddTupleToOutput(IntermediateTuple tuple, Output output) + public override bool TryAddTupleToOutput(IntermediateTuple tuple, WindowsInstallerData output) { #if ALTERNATIVE_TO_USING_HELPER switch (tuple.Definition.Name) diff --git a/src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs b/src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs index 1be60587..21b6e9ce 100644 --- a/src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs +++ b/src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs @@ -312,7 +312,7 @@ namespace WixToolsetTest.CoreIntegration var pdbPath = Path.Combine(intermediateFolder, @"bin\test.wixpdb"); Assert.True(File.Exists(pdbPath)); - var output = Output.Load(pdbPath, suppressVersionCheck: true); + var output = WindowsInstallerData.Load(pdbPath, suppressVersionCheck: true); Assert.NotNull(output); } } @@ -700,7 +700,7 @@ namespace WixToolsetTest.CoreIntegration result.AssertSuccess(); - var output = Output.Load(Path.Combine(baseFolder, @"bin\test.wixpdb"), false); + var output = WindowsInstallerData.Load(Path.Combine(baseFolder, @"bin\test.wixpdb"), false); var caRows = output.Tables["CustomAction"].Rows.Single(); Assert.Equal("SetINSTALLLOCATION", caRows.FieldAsString(0)); Assert.Equal("51", caRows.FieldAsString(1)); @@ -776,7 +776,7 @@ namespace WixToolsetTest.CoreIntegration result.AssertSuccess(); - var output = Output.Load(Path.Combine(intermediateFolder, @"bin\test.wixpdb"), false); + var output = WindowsInstallerData.Load(Path.Combine(intermediateFolder, @"bin\test.wixpdb"), false); Assert.NotEmpty(output.SubStorages); } } -- cgit v1.2.3-55-g6feb