aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2021-03-02 01:49:28 -0800
committerRob Mensching <rob@firegiant.com>2021-03-02 02:21:22 -0800
commit85e611c40c3c8bf3ff3b06b52d53d046bc8ff392 (patch)
tree88687390ed6041716580ffd4f288bdc2efe03f86 /src/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs
parent16c221a8663361ff29e140a0a395d3173daa0625 (diff)
downloadwix-85e611c40c3c8bf3ff3b06b52d53d046bc8ff392.tar.gz
wix-85e611c40c3c8bf3ff3b06b52d53d046bc8ff392.tar.bz2
wix-85e611c40c3c8bf3ff3b06b52d53d046bc8ff392.zip
Remove references to "Output" and use "Data" instead
Diffstat (limited to 'src/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs')
-rw-r--r--src/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs12
1 files changed, 6 insertions, 6 deletions
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
72 72
73 public IEnumerable<IWindowsInstallerBackendBinderExtension> BackendExtensions { private get; set; } 73 public IEnumerable<IWindowsInstallerBackendBinderExtension> BackendExtensions { private get; set; }
74 74
75 public WindowsInstallerData Output { private get; set; } 75 public WindowsInstallerData Data { private get; set; }
76 76
77 public string LayoutDirectory { private get; set; } 77 public string LayoutDirectory { private get; set; }
78 78
@@ -115,7 +115,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
115 var compressionLevel = mediaSymbol.CompressionLevel ?? this.DefaultCompressionLevel ?? CompressionLevel.Medium; 115 var compressionLevel = mediaSymbol.CompressionLevel ?? this.DefaultCompressionLevel ?? CompressionLevel.Medium;
116 var cabinetDir = this.ResolveMedia(mediaSymbol, mediaSymbol.Layout, this.LayoutDirectory); 116 var cabinetDir = this.ResolveMedia(mediaSymbol, mediaSymbol.Layout, this.LayoutDirectory);
117 117
118 var cabinetWorkItem = this.CreateCabinetWorkItem(this.Output, cabinetDir, mediaSymbol, compressionLevel, files); 118 var cabinetWorkItem = this.CreateCabinetWorkItem(this.Data, cabinetDir, mediaSymbol, compressionLevel, files);
119 if (null != cabinetWorkItem) 119 if (null != cabinetWorkItem)
120 { 120 {
121 cabinetBuilder.Enqueue(cabinetWorkItem); 121 cabinetBuilder.Enqueue(cabinetWorkItem);
@@ -171,13 +171,13 @@ namespace WixToolset.Core.WindowsInstaller.Bind
171 /// <summary> 171 /// <summary>
172 /// Creates a work item to create a cabinet. 172 /// Creates a work item to create a cabinet.
173 /// </summary> 173 /// </summary>
174 /// <param name="output">Output for the current database.</param> 174 /// <param name="data">Windows Installer data for the current database.</param>
175 /// <param name="cabinetDir">Directory to create cabinet in.</param> 175 /// <param name="cabinetDir">Directory to create cabinet in.</param>
176 /// <param name="mediaSymbol">Media symbol containing information about the cabinet.</param> 176 /// <param name="mediaSymbol">Media symbol containing information about the cabinet.</param>
177 /// <param name="compressionLevel">Desired compression level.</param> 177 /// <param name="compressionLevel">Desired compression level.</param>
178 /// <param name="fileFacades">Collection of files in this cabinet.</param> 178 /// <param name="fileFacades">Collection of files in this cabinet.</param>
179 /// <returns>created CabinetWorkItem object</returns> 179 /// <returns>created CabinetWorkItem object</returns>
180 private CabinetWorkItem CreateCabinetWorkItem(WindowsInstallerData output, string cabinetDir, MediaSymbol mediaSymbol, CompressionLevel compressionLevel, IEnumerable<FileFacade> fileFacades) 180 private CabinetWorkItem CreateCabinetWorkItem(WindowsInstallerData data, string cabinetDir, MediaSymbol mediaSymbol, CompressionLevel compressionLevel, IEnumerable<FileFacade> fileFacades)
181 { 181 {
182 CabinetWorkItem cabinetWorkItem = null; 182 CabinetWorkItem cabinetWorkItem = null;
183 var tempCabinetFileX = Path.Combine(this.IntermediateFolder, mediaSymbol.Cabinet); 183 var tempCabinetFileX = Path.Combine(this.IntermediateFolder, mediaSymbol.Cabinet);
@@ -189,7 +189,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
189 var cabinetName = mediaSymbol.Cabinet.TrimStart('#'); 189 var cabinetName = mediaSymbol.Cabinet.TrimStart('#');
190 190
191 // If building a patch, remind them to run -p for torch. 191 // If building a patch, remind them to run -p for torch.
192 if (OutputType.Patch == output.Type) 192 if (OutputType.Patch == data.Type)
193 { 193 {
194 this.Messaging.Write(WarningMessages.EmptyCabinet(mediaSymbol.SourceLineNumbers, cabinetName, true)); 194 this.Messaging.Write(WarningMessages.EmptyCabinet(mediaSymbol.SourceLineNumbers, cabinetName, true));
195 } 195 }
@@ -234,7 +234,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
234 234
235 if (mediaSymbol.Cabinet.StartsWith("#", StringComparison.Ordinal)) 235 if (mediaSymbol.Cabinet.StartsWith("#", StringComparison.Ordinal))
236 { 236 {
237 var streamsTable = output.EnsureTable(this.TableDefinitions["_Streams"]); 237 var streamsTable = data.EnsureTable(this.TableDefinitions["_Streams"]);
238 238
239 var streamRow = streamsTable.CreateRow(mediaSymbol.SourceLineNumbers); 239 var streamRow = streamsTable.CreateRow(mediaSymbol.SourceLineNumbers);
240 streamRow[0] = mediaSymbol.Cabinet.Substring(1); 240 streamRow[0] = mediaSymbol.Cabinet.Substring(1);