aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2020-06-12 12:55:28 -0700
committerRob Mensching <rob@firegiant.com>2020-06-13 09:22:27 -0700
commitc0f1332a0e18e9d506fe80c328548b001dcf93df (patch)
tree4980dddd35350e79b00a61574feafa859e857e3f /src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs
parent167d26d002b1412e72d96ed2bbc0761fc0f1344b (diff)
downloadwix-c0f1332a0e18e9d506fe80c328548b001dcf93df.tar.gz
wix-c0f1332a0e18e9d506fe80c328548b001dcf93df.tar.bz2
wix-c0f1332a0e18e9d506fe80c328548b001dcf93df.zip
Remove use of remaining WixXxxRows
Diffstat (limited to 'src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs')
-rw-r--r--src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs23
1 files changed, 4 insertions, 19 deletions
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs
index 21c39423..448ed607 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs
@@ -15,9 +15,6 @@ namespace WixToolset.Core.WindowsInstaller.Bind
15 15
16 internal class CreateOutputFromIRCommand 16 internal class CreateOutputFromIRCommand
17 { 17 {
18 private const int DefaultMaximumUncompressedMediaSize = 200; // Default value is 200 MB
19 private const int MaxValueOfMaxCabSizeForLargeFileSplitting = 2 * 1024; // 2048 MB (i.e. 2 GB)
20
21 public CreateOutputFromIRCommand(IMessaging messaging, IntermediateSection section, TableDefinitionCollection tableDefinitions, IEnumerable<IWindowsInstallerBackendBinderExtension> backendExtensions, IWindowsInstallerBackendHelper backendHelper) 18 public CreateOutputFromIRCommand(IMessaging messaging, IntermediateSection section, TableDefinitionCollection tableDefinitions, IEnumerable<IWindowsInstallerBackendBinderExtension> backendExtensions, IWindowsInstallerBackendHelper backendHelper)
22 { 19 {
23 this.Messaging = messaging; 20 this.Messaging = messaging;
@@ -189,10 +186,6 @@ namespace WixToolset.Core.WindowsInstaller.Bind
189 this.AddWixActionTuple((WixActionTuple)tuple); 186 this.AddWixActionTuple((WixActionTuple)tuple);
190 break; 187 break;
191 188
192 case TupleDefinitionType.WixMediaTemplate:
193 this.AddWixMediaTemplateTuple((WixMediaTemplateTuple)tuple);
194 break;
195
196 case TupleDefinitionType.WixCustomTableCell: 189 case TupleDefinitionType.WixCustomTableCell:
197 this.IndexCustomTableCellTuple((WixCustomTableCellTuple)tuple, cellsByTableAndRowId); 190 this.IndexCustomTableCellTuple((WixCustomTableCellTuple)tuple, cellsByTableAndRowId);
198 break; 191 break;
@@ -202,6 +195,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
202 break; 195 break;
203 196
204 // Tuples used internally and are not added to the output. 197 // Tuples used internally and are not added to the output.
198 case TupleDefinitionType.WixBuildInfo:
205 case TupleDefinitionType.WixComponentGroup: 199 case TupleDefinitionType.WixComponentGroup:
206 case TupleDefinitionType.WixComplexReference: 200 case TupleDefinitionType.WixComplexReference:
207 case TupleDefinitionType.WixDeltaPatchFile: 201 case TupleDefinitionType.WixDeltaPatchFile:
@@ -211,6 +205,8 @@ namespace WixToolset.Core.WindowsInstaller.Bind
211 case TupleDefinitionType.WixInstanceComponent: 205 case TupleDefinitionType.WixInstanceComponent:
212 case TupleDefinitionType.WixInstanceTransforms: 206 case TupleDefinitionType.WixInstanceTransforms:
213 case TupleDefinitionType.WixFeatureModules: 207 case TupleDefinitionType.WixFeatureModules:
208 case TupleDefinitionType.WixGroup:
209 case TupleDefinitionType.WixMediaTemplate:
214 case TupleDefinitionType.WixMerge: 210 case TupleDefinitionType.WixMerge:
215 case TupleDefinitionType.WixOrdering: 211 case TupleDefinitionType.WixOrdering:
216 case TupleDefinitionType.WixPatchBaseline: 212 case TupleDefinitionType.WixPatchBaseline:
@@ -946,7 +942,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
946 } 942 }
947 else 943 else
948 { 944 {
949 bool after = (null == tuple.Before); 945 var after = (null == tuple.Before);
950 row[2] = after ? tuple.After : tuple.Before; 946 row[2] = after ? tuple.After : tuple.Before;
951 row[3] = after ? 1 : 0; 947 row[3] = after ? 1 : 0;
952 } 948 }
@@ -1052,17 +1048,6 @@ namespace WixToolset.Core.WindowsInstaller.Bind
1052 this.Output.EnsureTable(tableDefinition); 1048 this.Output.EnsureTable(tableDefinition);
1053 } 1049 }
1054 1050
1055 private void AddWixMediaTemplateTuple(WixMediaTemplateTuple tuple)
1056 {
1057 var row = (WixMediaTemplateRow)this.CreateRow(tuple, "WixMediaTemplate");
1058 row.CabinetTemplate = tuple.CabinetTemplate;
1059 row.CompressionLevel = tuple.CompressionLevel;
1060 row.DiskPrompt = tuple.DiskPrompt;
1061 row.VolumeLabel = tuple.VolumeLabel;
1062 row.MaximumUncompressedMediaSize = tuple.MaximumUncompressedMediaSize ?? DefaultMaximumUncompressedMediaSize;
1063 row.MaximumCabinetSizeForLargeFileSplitting = tuple.MaximumCabinetSizeForLargeFileSplitting ?? MaxValueOfMaxCabSizeForLargeFileSplitting;
1064 }
1065
1066 private bool AddTupleFromExtension(IntermediateTuple tuple) 1051 private bool AddTupleFromExtension(IntermediateTuple tuple)
1067 { 1052 {
1068 foreach (var extension in this.BackendExtensions) 1053 foreach (var extension in this.BackendExtensions)