diff options
| author | Rob Mensching <rob@firegiant.com> | 2020-06-25 14:43:50 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2020-06-25 14:50:31 -0700 |
| commit | 38afa9e7bc7eacc021f8805f607368a05751e3c3 (patch) | |
| tree | 803b0a8d9a06a7d6f7c4df408437017ae21a883e /src/WixToolset.Core.WindowsInstaller/Bind/CopyTransformDataCommand.cs | |
| parent | 8968578d50858721317d410549a9f9b5c62bf1f7 (diff) | |
| download | wix-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/CopyTransformDataCommand.cs')
| -rw-r--r-- | src/WixToolset.Core.WindowsInstaller/Bind/CopyTransformDataCommand.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CopyTransformDataCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CopyTransformDataCommand.cs index 0dcce61b..8a85a975 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/CopyTransformDataCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/CopyTransformDataCommand.cs | |||
| @@ -11,7 +11,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 11 | using System.Linq; | 11 | using System.Linq; |
| 12 | using WixToolset.Core.Bind; | 12 | using WixToolset.Core.Bind; |
| 13 | using WixToolset.Data; | 13 | using WixToolset.Data; |
| 14 | using WixToolset.Data.Tuples; | 14 | using WixToolset.Data.Symbols; |
| 15 | using WixToolset.Data.WindowsInstaller; | 15 | using WixToolset.Data.WindowsInstaller; |
| 16 | using WixToolset.Data.WindowsInstaller.Rows; | 16 | using WixToolset.Data.WindowsInstaller.Rows; |
| 17 | using WixToolset.Extensibility; | 17 | using WixToolset.Extensibility; |
| @@ -463,9 +463,9 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 463 | ref duplicateFilesSequence); | 463 | ref duplicateFilesSequence); |
| 464 | if (!hasPatchFilesAction) | 464 | if (!hasPatchFilesAction) |
| 465 | { | 465 | { |
| 466 | WindowsInstallerStandard.TryGetStandardAction(tableName, "PatchFiles", out var patchFilesActionTuple); | 466 | WindowsInstallerStandard.TryGetStandardAction(tableName, "PatchFiles", out var patchFilesActionSymbol); |
| 467 | 467 | ||
| 468 | var sequence = patchFilesActionTuple.Sequence; | 468 | var sequence = patchFilesActionSymbol.Sequence; |
| 469 | 469 | ||
| 470 | // Test for default sequence value's appropriateness | 470 | // Test for default sequence value's appropriateness |
| 471 | if (installFilesSequence >= sequence || (0 != duplicateFilesSequence && duplicateFilesSequence <= sequence)) | 471 | if (installFilesSequence >= sequence || (0 != duplicateFilesSequence && duplicateFilesSequence <= sequence)) |
| @@ -474,14 +474,14 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 474 | { | 474 | { |
| 475 | if (duplicateFilesSequence < installFilesSequence) | 475 | if (duplicateFilesSequence < installFilesSequence) |
| 476 | { | 476 | { |
| 477 | throw new WixException(ErrorMessages.InsertInvalidSequenceActionOrder(mainFileRow.SourceLineNumbers, tableName, "InstallFiles", "DuplicateFiles", patchFilesActionTuple.Action)); | 477 | throw new WixException(ErrorMessages.InsertInvalidSequenceActionOrder(mainFileRow.SourceLineNumbers, tableName, "InstallFiles", "DuplicateFiles", patchFilesActionSymbol.Action)); |
| 478 | } | 478 | } |
| 479 | else | 479 | else |
| 480 | { | 480 | { |
| 481 | sequence = (duplicateFilesSequence + installFilesSequence) / 2; | 481 | sequence = (duplicateFilesSequence + installFilesSequence) / 2; |
| 482 | if (installFilesSequence == sequence || duplicateFilesSequence == sequence) | 482 | if (installFilesSequence == sequence || duplicateFilesSequence == sequence) |
| 483 | { | 483 | { |
| 484 | throw new WixException(ErrorMessages.InsertSequenceNoSpace(mainFileRow.SourceLineNumbers, tableName, "InstallFiles", "DuplicateFiles", patchFilesActionTuple.Action)); | 484 | throw new WixException(ErrorMessages.InsertSequenceNoSpace(mainFileRow.SourceLineNumbers, tableName, "InstallFiles", "DuplicateFiles", patchFilesActionSymbol.Action)); |
| 485 | } | 485 | } |
| 486 | } | 486 | } |
| 487 | } | 487 | } |
| @@ -498,8 +498,8 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 498 | } | 498 | } |
| 499 | 499 | ||
| 500 | var patchAction = sequenceTable.CreateRow(null); | 500 | var patchAction = sequenceTable.CreateRow(null); |
| 501 | patchAction[0] = patchFilesActionTuple.Action; | 501 | patchAction[0] = patchFilesActionSymbol.Action; |
| 502 | patchAction[1] = patchFilesActionTuple.Condition; | 502 | patchAction[1] = patchFilesActionSymbol.Condition; |
| 503 | patchAction[2] = sequence; | 503 | patchAction[2] = sequence; |
| 504 | patchAction.Operation = RowOperation.Add; | 504 | patchAction.Operation = RowOperation.Add; |
| 505 | } | 505 | } |
