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/GetFileFacadesCommand.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/GetFileFacadesCommand.cs')
| -rw-r--r-- | src/WixToolset.Core.WindowsInstaller/Bind/GetFileFacadesCommand.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/GetFileFacadesCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/GetFileFacadesCommand.cs index 55171da4..c918e866 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/GetFileFacadesCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/GetFileFacadesCommand.cs | |||
| @@ -8,7 +8,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 8 | using System.Linq; | 8 | using System.Linq; |
| 9 | using WixToolset.Core.Bind; | 9 | using WixToolset.Core.Bind; |
| 10 | using WixToolset.Data; | 10 | using WixToolset.Data; |
| 11 | using WixToolset.Data.Tuples; | 11 | using WixToolset.Data.Symbols; |
| 12 | 12 | ||
| 13 | internal class GetFileFacadesCommand | 13 | internal class GetFileFacadesCommand |
| 14 | { | 14 | { |
| @@ -25,10 +25,10 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 25 | { | 25 | { |
| 26 | var facades = new List<FileFacade>(); | 26 | var facades = new List<FileFacade>(); |
| 27 | 27 | ||
| 28 | var assemblyFile = this.Section.Tuples.OfType<AssemblyTuple>().ToDictionary(t => t.Id.Id); | 28 | var assemblyFile = this.Section.Symbols.OfType<AssemblySymbol>().ToDictionary(t => t.Id.Id); |
| 29 | //var deltaPatchFiles = this.Section.Tuples.OfType<WixDeltaPatchFileTuple>().ToDictionary(t => t.Id.Id); | 29 | //var deltaPatchFiles = this.Section.Symbols.OfType<WixDeltaPatchFileSymbol>().ToDictionary(t => t.Id.Id); |
| 30 | 30 | ||
| 31 | foreach (var file in this.Section.Tuples.OfType<FileTuple>()) | 31 | foreach (var file in this.Section.Symbols.OfType<FileSymbol>()) |
| 32 | { | 32 | { |
| 33 | assemblyFile.TryGetValue(file.Id.Id, out var assembly); | 33 | assemblyFile.TryGetValue(file.Id.Id, out var assembly); |
| 34 | 34 | ||
| @@ -49,13 +49,13 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 49 | /// <summary> | 49 | /// <summary> |
| 50 | /// Merge data from the WixPatchSymbolPaths rows into the WixDeltaPatchFile rows. | 50 | /// Merge data from the WixPatchSymbolPaths rows into the WixDeltaPatchFile rows. |
| 51 | /// </summary> | 51 | /// </summary> |
| 52 | public void ResolveDeltaPatchSymbolPaths(Dictionary<string, WixDeltaPatchFileTuple> deltaPatchFiles, IEnumerable<FileFacade> facades) | 52 | public void ResolveDeltaPatchSymbolPaths(Dictionary<string, WixDeltaPatchFileSymbol> deltaPatchFiles, IEnumerable<FileFacade> facades) |
| 53 | { | 53 | { |
| 54 | ILookup<string, FileFacade> filesByComponent = null; | 54 | ILookup<string, FileFacade> filesByComponent = null; |
| 55 | ILookup<string, FileFacade> filesByDirectory = null; | 55 | ILookup<string, FileFacade> filesByDirectory = null; |
| 56 | ILookup<string, FileFacade> filesByDiskId = null; | 56 | ILookup<string, FileFacade> filesByDiskId = null; |
| 57 | 57 | ||
| 58 | foreach (var row in this.Section.Tuples.OfType<WixDeltaPatchSymbolPathsTuple>().OrderBy(r => r.SymbolType)) | 58 | foreach (var row in this.Section.Symbols.OfType<WixDeltaPatchSymbolPathsSymbol>().OrderBy(r => r.SymbolType)) |
| 59 | { | 59 | { |
| 60 | switch (row.SymbolType) | 60 | switch (row.SymbolType) |
| 61 | { | 61 | { |
| @@ -119,7 +119,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 119 | /// <param name="row">Row from the WixPatchSymbolsPaths table.</param> | 119 | /// <param name="row">Row from the WixPatchSymbolsPaths table.</param> |
| 120 | /// <param name="file">FileRow into which to set symbol information.</param> | 120 | /// <param name="file">FileRow into which to set symbol information.</param> |
| 121 | /// <comment>This includes PreviousData as well.</comment> | 121 | /// <comment>This includes PreviousData as well.</comment> |
| 122 | private void MergeSymbolPaths(WixDeltaPatchSymbolPathsTuple row, WixDeltaPatchFileTuple file) | 122 | private void MergeSymbolPaths(WixDeltaPatchSymbolPathsSymbol row, WixDeltaPatchFileSymbol file) |
| 123 | { | 123 | { |
| 124 | if (file.SymbolPaths is null) | 124 | if (file.SymbolPaths is null) |
| 125 | { | 125 | { |
