aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.Core.WindowsInstaller/Bind/UpdateTransformsWithFileFacades.cs
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2020-06-25 14:43:50 -0700
committerRob Mensching <rob@firegiant.com>2020-06-25 14:50:31 -0700
commit38afa9e7bc7eacc021f8805f607368a05751e3c3 (patch)
tree803b0a8d9a06a7d6f7c4df408437017ae21a883e /src/WixToolset.Core.WindowsInstaller/Bind/UpdateTransformsWithFileFacades.cs
parent8968578d50858721317d410549a9f9b5c62bf1f7 (diff)
downloadwix-38afa9e7bc7eacc021f8805f607368a05751e3c3.tar.gz
wix-38afa9e7bc7eacc021f8805f607368a05751e3c3.tar.bz2
wix-38afa9e7bc7eacc021f8805f607368a05751e3c3.zip
The Great Tuple to Symbol Rename (tm)
Diffstat (limited to 'src/WixToolset.Core.WindowsInstaller/Bind/UpdateTransformsWithFileFacades.cs')
-rw-r--r--src/WixToolset.Core.WindowsInstaller/Bind/UpdateTransformsWithFileFacades.cs14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/UpdateTransformsWithFileFacades.cs b/src/WixToolset.Core.WindowsInstaller/Bind/UpdateTransformsWithFileFacades.cs
index 2af45e77..944fb224 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/UpdateTransformsWithFileFacades.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/UpdateTransformsWithFileFacades.cs
@@ -7,7 +7,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
7 using System.Linq; 7 using System.Linq;
8 using WixToolset.Core.Bind; 8 using WixToolset.Core.Bind;
9 using WixToolset.Data; 9 using WixToolset.Data;
10 using WixToolset.Data.Tuples; 10 using WixToolset.Data.Symbols;
11 using WixToolset.Data.WindowsInstaller; 11 using WixToolset.Data.WindowsInstaller;
12 using WixToolset.Data.WindowsInstaller.Rows; 12 using WixToolset.Data.WindowsInstaller.Rows;
13 using WixToolset.Extensibility.Services; 13 using WixToolset.Extensibility.Services;
@@ -307,9 +307,9 @@ namespace WixToolset.Core.WindowsInstaller.Bind
307 ref duplicateFilesSequence); 307 ref duplicateFilesSequence);
308 if (!hasPatchFilesAction) 308 if (!hasPatchFilesAction)
309 { 309 {
310 WindowsInstallerStandard.TryGetStandardAction(tableName, "PatchFiles", out var patchFilesActionTuple); 310 WindowsInstallerStandard.TryGetStandardAction(tableName, "PatchFiles", out var patchFilesActionSymbol);
311 311
312 var sequence = patchFilesActionTuple.Sequence; 312 var sequence = patchFilesActionSymbol.Sequence;
313 313
314 // Test for default sequence value's appropriateness 314 // Test for default sequence value's appropriateness
315 if (installFilesSequence >= sequence || (0 != duplicateFilesSequence && duplicateFilesSequence <= sequence)) 315 if (installFilesSequence >= sequence || (0 != duplicateFilesSequence && duplicateFilesSequence <= sequence))
@@ -318,14 +318,14 @@ namespace WixToolset.Core.WindowsInstaller.Bind
318 { 318 {
319 if (duplicateFilesSequence < installFilesSequence) 319 if (duplicateFilesSequence < installFilesSequence)
320 { 320 {
321 throw new WixException(ErrorMessages.InsertInvalidSequenceActionOrder(mainFileRow.SourceLineNumbers, tableName, "InstallFiles", "DuplicateFiles", patchFilesActionTuple.Action)); 321 throw new WixException(ErrorMessages.InsertInvalidSequenceActionOrder(mainFileRow.SourceLineNumbers, tableName, "InstallFiles", "DuplicateFiles", patchFilesActionSymbol.Action));
322 } 322 }
323 else 323 else
324 { 324 {
325 sequence = (duplicateFilesSequence + installFilesSequence) / 2; 325 sequence = (duplicateFilesSequence + installFilesSequence) / 2;
326 if (installFilesSequence == sequence || duplicateFilesSequence == sequence) 326 if (installFilesSequence == sequence || duplicateFilesSequence == sequence)
327 { 327 {
328 throw new WixException(ErrorMessages.InsertSequenceNoSpace(mainFileRow.SourceLineNumbers, tableName, "InstallFiles", "DuplicateFiles", patchFilesActionTuple.Action)); 328 throw new WixException(ErrorMessages.InsertSequenceNoSpace(mainFileRow.SourceLineNumbers, tableName, "InstallFiles", "DuplicateFiles", patchFilesActionSymbol.Action));
329 } 329 }
330 } 330 }
331 } 331 }
@@ -342,8 +342,8 @@ namespace WixToolset.Core.WindowsInstaller.Bind
342 } 342 }
343 343
344 var patchAction = sequenceTable.CreateRow(null); 344 var patchAction = sequenceTable.CreateRow(null);
345 patchAction[0] = patchFilesActionTuple.Action; 345 patchAction[0] = patchFilesActionSymbol.Action;
346 patchAction[1] = patchFilesActionTuple.Condition; 346 patchAction[1] = patchFilesActionSymbol.Condition;
347 patchAction[2] = sequence; 347 patchAction[2] = sequence;
348 patchAction.Operation = RowOperation.Add; 348 patchAction.Operation = RowOperation.Add;
349 } 349 }