From 38afa9e7bc7eacc021f8805f607368a05751e3c3 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Thu, 25 Jun 2020 14:43:50 -0700 Subject: The Great Tuple to Symbol Rename (tm) --- .../Bind/GetFileFacadesCommand.cs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/WixToolset.Core.WindowsInstaller/Bind/GetFileFacadesCommand.cs') 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 using System.Linq; using WixToolset.Core.Bind; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; internal class GetFileFacadesCommand { @@ -25,10 +25,10 @@ namespace WixToolset.Core.WindowsInstaller.Bind { var facades = new List(); - var assemblyFile = this.Section.Tuples.OfType().ToDictionary(t => t.Id.Id); - //var deltaPatchFiles = this.Section.Tuples.OfType().ToDictionary(t => t.Id.Id); + var assemblyFile = this.Section.Symbols.OfType().ToDictionary(t => t.Id.Id); + //var deltaPatchFiles = this.Section.Symbols.OfType().ToDictionary(t => t.Id.Id); - foreach (var file in this.Section.Tuples.OfType()) + foreach (var file in this.Section.Symbols.OfType()) { assemblyFile.TryGetValue(file.Id.Id, out var assembly); @@ -49,13 +49,13 @@ namespace WixToolset.Core.WindowsInstaller.Bind /// /// Merge data from the WixPatchSymbolPaths rows into the WixDeltaPatchFile rows. /// - public void ResolveDeltaPatchSymbolPaths(Dictionary deltaPatchFiles, IEnumerable facades) + public void ResolveDeltaPatchSymbolPaths(Dictionary deltaPatchFiles, IEnumerable facades) { ILookup filesByComponent = null; ILookup filesByDirectory = null; ILookup filesByDiskId = null; - foreach (var row in this.Section.Tuples.OfType().OrderBy(r => r.SymbolType)) + foreach (var row in this.Section.Symbols.OfType().OrderBy(r => r.SymbolType)) { switch (row.SymbolType) { @@ -119,7 +119,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind /// Row from the WixPatchSymbolsPaths table. /// FileRow into which to set symbol information. /// This includes PreviousData as well. - private void MergeSymbolPaths(WixDeltaPatchSymbolPathsTuple row, WixDeltaPatchFileTuple file) + private void MergeSymbolPaths(WixDeltaPatchSymbolPathsSymbol row, WixDeltaPatchFileSymbol file) { if (file.SymbolPaths is null) { -- cgit v1.2.3-55-g6feb