From 85e611c40c3c8bf3ff3b06b52d53d046bc8ff392 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Tue, 2 Mar 2021 01:49:28 -0800 Subject: Remove references to "Output" and use "Data" instead --- .../Bind/CreateCabinetsCommand.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs') diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs index f0acd3d4..9f94b2c7 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs @@ -72,7 +72,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind public IEnumerable BackendExtensions { private get; set; } - public WindowsInstallerData Output { private get; set; } + public WindowsInstallerData Data { private get; set; } public string LayoutDirectory { private get; set; } @@ -115,7 +115,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind var compressionLevel = mediaSymbol.CompressionLevel ?? this.DefaultCompressionLevel ?? CompressionLevel.Medium; var cabinetDir = this.ResolveMedia(mediaSymbol, mediaSymbol.Layout, this.LayoutDirectory); - var cabinetWorkItem = this.CreateCabinetWorkItem(this.Output, cabinetDir, mediaSymbol, compressionLevel, files); + var cabinetWorkItem = this.CreateCabinetWorkItem(this.Data, cabinetDir, mediaSymbol, compressionLevel, files); if (null != cabinetWorkItem) { cabinetBuilder.Enqueue(cabinetWorkItem); @@ -171,13 +171,13 @@ namespace WixToolset.Core.WindowsInstaller.Bind /// /// Creates a work item to create a cabinet. /// - /// Output for the current database. + /// Windows Installer data for the current database. /// Directory to create cabinet in. /// Media symbol containing information about the cabinet. /// Desired compression level. /// Collection of files in this cabinet. /// created CabinetWorkItem object - private CabinetWorkItem CreateCabinetWorkItem(WindowsInstallerData output, string cabinetDir, MediaSymbol mediaSymbol, CompressionLevel compressionLevel, IEnumerable fileFacades) + private CabinetWorkItem CreateCabinetWorkItem(WindowsInstallerData data, string cabinetDir, MediaSymbol mediaSymbol, CompressionLevel compressionLevel, IEnumerable fileFacades) { CabinetWorkItem cabinetWorkItem = null; var tempCabinetFileX = Path.Combine(this.IntermediateFolder, mediaSymbol.Cabinet); @@ -189,7 +189,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind var cabinetName = mediaSymbol.Cabinet.TrimStart('#'); // If building a patch, remind them to run -p for torch. - if (OutputType.Patch == output.Type) + if (OutputType.Patch == data.Type) { this.Messaging.Write(WarningMessages.EmptyCabinet(mediaSymbol.SourceLineNumbers, cabinetName, true)); } @@ -234,7 +234,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind if (mediaSymbol.Cabinet.StartsWith("#", StringComparison.Ordinal)) { - var streamsTable = output.EnsureTable(this.TableDefinitions["_Streams"]); + var streamsTable = data.EnsureTable(this.TableDefinitions["_Streams"]); var streamRow = streamsTable.CreateRow(mediaSymbol.SourceLineNumbers); streamRow[0] = mediaSymbol.Cabinet.Substring(1); -- cgit v1.2.3-55-g6feb