diff options
| author | Rob Mensching <rob@firegiant.com> | 2019-05-22 00:58:13 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2019-05-23 16:02:37 -0700 |
| commit | d0462be8000f18aa7dc0791d02142f000bb19fbf (patch) | |
| tree | 072aabc2bd9b8f171e17654473f85c44a8a42a66 /src/WixToolset.Core.WindowsInstaller/Bind/UpdateMediaSequencesCommand.cs | |
| parent | 1ed894bc0f39397ec7f7f6344370fc2123420c43 (diff) | |
| download | wix-d0462be8000f18aa7dc0791d02142f000bb19fbf.tar.gz wix-d0462be8000f18aa7dc0791d02142f000bb19fbf.tar.bz2 wix-d0462be8000f18aa7dc0791d02142f000bb19fbf.zip | |
Integrate latest changes to tuple definitions
Diffstat (limited to 'src/WixToolset.Core.WindowsInstaller/Bind/UpdateMediaSequencesCommand.cs')
| -rw-r--r-- | src/WixToolset.Core.WindowsInstaller/Bind/UpdateMediaSequencesCommand.cs | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/UpdateMediaSequencesCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/UpdateMediaSequencesCommand.cs index 0767adb0..e6738bb7 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/UpdateMediaSequencesCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/UpdateMediaSequencesCommand.cs | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. | 1 | // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. |
| 2 | 2 | ||
| 3 | namespace WixToolset.Core.WindowsInstaller.Bind | 3 | namespace WixToolset.Core.WindowsInstaller.Bind |
| 4 | { | 4 | { |
| @@ -6,13 +6,12 @@ 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; | ||
| 10 | using WixToolset.Data.WindowsInstaller; | 9 | using WixToolset.Data.WindowsInstaller; |
| 11 | using WixToolset.Data.WindowsInstaller.Rows; | 10 | using WixToolset.Data.WindowsInstaller.Rows; |
| 12 | 11 | ||
| 13 | internal class UpdateMediaSequencesCommand | 12 | internal class UpdateMediaSequencesCommand |
| 14 | { | 13 | { |
| 15 | public UpdateMediaSequencesCommand(Output output, List<FileFacade> fileFacades, Dictionary<int, MediaTuple> assignedMediaRows) | 14 | public UpdateMediaSequencesCommand(Output output, List<FileFacade> fileFacades) |
| 16 | { | 15 | { |
| 17 | this.Output = output; | 16 | this.Output = output; |
| 18 | this.FileFacades = fileFacades; | 17 | this.FileFacades = fileFacades; |
| @@ -34,7 +33,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 34 | 33 | ||
| 35 | // Order by Component to group the files by directory. | 34 | // Order by Component to group the files by directory. |
| 36 | var optimized = this.OptimizedFileFacades(); | 35 | var optimized = this.OptimizedFileFacades(); |
| 37 | foreach (var fileId in optimized.Select(f => f.File.File)) | 36 | foreach (var fileId in optimized.Select(f => f.File.Id.Id)) |
| 38 | { | 37 | { |
| 39 | var fileRow = fileRows.Get(fileId); | 38 | var fileRow = fileRows.Get(fileId); |
| 40 | fileRow.Sequence = ++lastSequence; | 39 | fileRow.Sequence = ++lastSequence; |
| @@ -77,7 +76,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 77 | } | 76 | } |
| 78 | else | 77 | else |
| 79 | { | 78 | { |
| 80 | var fileRow = fileRows.Get(facade.File.File); | 79 | var fileRow = fileRows.Get(facade.File.Id.Id); |
| 81 | fileRow.Sequence = ++lastSequence; | 80 | fileRow.Sequence = ++lastSequence; |
| 82 | } | 81 | } |
| 83 | } | 82 | } |
| @@ -103,7 +102,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 103 | mediaRow = mediaRows.Get(facade.WixFile.DiskId); | 102 | mediaRow = mediaRows.Get(facade.WixFile.DiskId); |
| 104 | } | 103 | } |
| 105 | 104 | ||
| 106 | var fileRow = fileRows.Get(facade.File.File); | 105 | var fileRow = fileRows.Get(facade.File.Id.Id); |
| 107 | fileRow.Sequence = ++lastSequence; | 106 | fileRow.Sequence = ++lastSequence; |
| 108 | } | 107 | } |
| 109 | } | 108 | } |
