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/UpdateMediaSequencesCommand.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/UpdateMediaSequencesCommand.cs')
| -rw-r--r-- | src/WixToolset.Core.WindowsInstaller/Bind/UpdateMediaSequencesCommand.cs | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/UpdateMediaSequencesCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/UpdateMediaSequencesCommand.cs index bf28b279..d3f2b9ea 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/UpdateMediaSequencesCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/UpdateMediaSequencesCommand.cs | |||
| @@ -6,7 +6,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 6 | using System.Linq; | 6 | using System.Linq; |
| 7 | using WixToolset.Core.Bind; | 7 | using WixToolset.Core.Bind; |
| 8 | using WixToolset.Data; | 8 | using WixToolset.Data; |
| 9 | using WixToolset.Data.Tuples; | 9 | using WixToolset.Data.Symbols; |
| 10 | 10 | ||
| 11 | internal class UpdateMediaSequencesCommand | 11 | internal class UpdateMediaSequencesCommand |
| 12 | { | 12 | { |
| @@ -22,7 +22,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 22 | 22 | ||
| 23 | public void Execute() | 23 | public void Execute() |
| 24 | { | 24 | { |
| 25 | var mediaRows = this.Section.Tuples.OfType<MediaTuple>().ToDictionary(t => t.DiskId); | 25 | var mediaRows = this.Section.Symbols.OfType<MediaSymbol>().ToDictionary(t => t.DiskId); |
| 26 | 26 | ||
| 27 | // Calculate sequence numbers and media disk id layout for all file media information objects. | 27 | // Calculate sequence numbers and media disk id layout for all file media information objects. |
| 28 | if (SectionType.Module == this.Section.Type) | 28 | if (SectionType.Module == this.Section.Type) |
| @@ -37,25 +37,25 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 37 | else | 37 | else |
| 38 | { | 38 | { |
| 39 | var lastSequence = 0; | 39 | var lastSequence = 0; |
| 40 | MediaTuple mediaTuple = null; | 40 | MediaSymbol mediaSymbol = null; |
| 41 | var patchGroups = new Dictionary<int, List<FileFacade>>(); | 41 | var patchGroups = new Dictionary<int, List<FileFacade>>(); |
| 42 | 42 | ||
| 43 | // sequence the non-patch-added files | 43 | // sequence the non-patch-added files |
| 44 | foreach (var facade in this.FileFacades) | 44 | foreach (var facade in this.FileFacades) |
| 45 | { | 45 | { |
| 46 | if (null == mediaTuple) | 46 | if (null == mediaSymbol) |
| 47 | { | 47 | { |
| 48 | mediaTuple = mediaRows[facade.DiskId]; | 48 | mediaSymbol = mediaRows[facade.DiskId]; |
| 49 | if (SectionType.Patch == this.Section.Type) | 49 | if (SectionType.Patch == this.Section.Type) |
| 50 | { | 50 | { |
| 51 | // patch Media cannot start at zero | 51 | // patch Media cannot start at zero |
| 52 | lastSequence = mediaTuple.LastSequence ?? 1; | 52 | lastSequence = mediaSymbol.LastSequence ?? 1; |
| 53 | } | 53 | } |
| 54 | } | 54 | } |
| 55 | else if (mediaTuple.DiskId != facade.DiskId) | 55 | else if (mediaSymbol.DiskId != facade.DiskId) |
| 56 | { | 56 | { |
| 57 | mediaTuple.LastSequence = lastSequence; | 57 | mediaSymbol.LastSequence = lastSequence; |
| 58 | mediaTuple = mediaRows[facade.DiskId]; | 58 | mediaSymbol = mediaRows[facade.DiskId]; |
| 59 | } | 59 | } |
| 60 | 60 | ||
| 61 | if (facade.PatchGroup.HasValue) | 61 | if (facade.PatchGroup.HasValue) |
| @@ -74,10 +74,10 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 74 | } | 74 | } |
| 75 | } | 75 | } |
| 76 | 76 | ||
| 77 | if (null != mediaTuple) | 77 | if (null != mediaSymbol) |
| 78 | { | 78 | { |
| 79 | mediaTuple.LastSequence = lastSequence; | 79 | mediaSymbol.LastSequence = lastSequence; |
| 80 | mediaTuple = null; | 80 | mediaSymbol = null; |
| 81 | } | 81 | } |
| 82 | 82 | ||
| 83 | // sequence the patch-added files | 83 | // sequence the patch-added files |
| @@ -85,23 +85,23 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 85 | { | 85 | { |
| 86 | foreach (var facade in patchGroup) | 86 | foreach (var facade in patchGroup) |
| 87 | { | 87 | { |
| 88 | if (null == mediaTuple) | 88 | if (null == mediaSymbol) |
| 89 | { | 89 | { |
| 90 | mediaTuple = mediaRows[facade.DiskId]; | 90 | mediaSymbol = mediaRows[facade.DiskId]; |
| 91 | } | 91 | } |
| 92 | else if (mediaTuple.DiskId != facade.DiskId) | 92 | else if (mediaSymbol.DiskId != facade.DiskId) |
| 93 | { | 93 | { |
| 94 | mediaTuple.LastSequence = lastSequence; | 94 | mediaSymbol.LastSequence = lastSequence; |
| 95 | mediaTuple = mediaRows[facade.DiskId]; | 95 | mediaSymbol = mediaRows[facade.DiskId]; |
| 96 | } | 96 | } |
| 97 | 97 | ||
| 98 | facade.Sequence = ++lastSequence; | 98 | facade.Sequence = ++lastSequence; |
| 99 | } | 99 | } |
| 100 | } | 100 | } |
| 101 | 101 | ||
| 102 | if (null != mediaTuple) | 102 | if (null != mediaSymbol) |
| 103 | { | 103 | { |
| 104 | mediaTuple.LastSequence = lastSequence; | 104 | mediaSymbol.LastSequence = lastSequence; |
| 105 | } | 105 | } |
| 106 | } | 106 | } |
| 107 | } | 107 | } |
