aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.Core.WindowsInstaller/Bind/ProcessUncompressedFilesCommand.cs
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2020-06-25 14:43:50 -0700
committerRob Mensching <rob@firegiant.com>2020-06-25 14:50:31 -0700
commit38afa9e7bc7eacc021f8805f607368a05751e3c3 (patch)
tree803b0a8d9a06a7d6f7c4df408437017ae21a883e /src/WixToolset.Core.WindowsInstaller/Bind/ProcessUncompressedFilesCommand.cs
parent8968578d50858721317d410549a9f9b5c62bf1f7 (diff)
downloadwix-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/ProcessUncompressedFilesCommand.cs')
-rw-r--r--src/WixToolset.Core.WindowsInstaller/Bind/ProcessUncompressedFilesCommand.cs12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/ProcessUncompressedFilesCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/ProcessUncompressedFilesCommand.cs
index 13d47215..ab5ebd4b 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/ProcessUncompressedFilesCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/ProcessUncompressedFilesCommand.cs
@@ -9,7 +9,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
9 using WixToolset.Core.Bind; 9 using WixToolset.Core.Bind;
10 using WixToolset.Core.WindowsInstaller.Msi; 10 using WixToolset.Core.WindowsInstaller.Msi;
11 using WixToolset.Data; 11 using WixToolset.Data;
12 using WixToolset.Data.Tuples; 12 using WixToolset.Data.Symbols;
13 using WixToolset.Extensibility.Data; 13 using WixToolset.Extensibility.Data;
14 using WixToolset.Extensibility.Services; 14 using WixToolset.Extensibility.Services;
15 15
@@ -41,7 +41,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
41 41
42 public bool LongNamesInImage { private get; set; } 42 public bool LongNamesInImage { private get; set; }
43 43
44 public Func<MediaTuple, string, string, string> ResolveMedia { private get; set; } 44 public Func<MediaSymbol, string, string, string> ResolveMedia { private get; set; }
45 45
46 public IEnumerable<IFileTransfer> FileTransfers { get; private set; } 46 public IEnumerable<IFileTransfer> FileTransfers { get; private set; }
47 47
@@ -55,7 +55,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
55 55
56 var directories = new Dictionary<string, IResolvedDirectory>(); 56 var directories = new Dictionary<string, IResolvedDirectory>();
57 57
58 var mediaRows = this.Section.Tuples.OfType<MediaTuple>().ToDictionary(t => t.DiskId); 58 var mediaRows = this.Section.Symbols.OfType<MediaSymbol>().ToDictionary(t => t.DiskId);
59 59
60 using (var db = new Database(this.DatabasePath, OpenDatabase.ReadOnly)) 60 using (var db = new Database(this.DatabasePath, OpenDatabase.ReadOnly))
61 { 61 {
@@ -78,11 +78,11 @@ namespace WixToolset.Core.WindowsInstaller.Bind
78 // for each file in the array of uncompressed files 78 // for each file in the array of uncompressed files
79 foreach (FileFacade facade in this.FileFacades) 79 foreach (FileFacade facade in this.FileFacades)
80 { 80 {
81 var mediaTuple = mediaRows[facade.DiskId]; 81 var mediaSymbol = mediaRows[facade.DiskId];
82 string relativeFileLayoutPath = null; 82 string relativeFileLayoutPath = null;
83 string mediaLayoutFolder = mediaTuple.Layout; 83 string mediaLayoutFolder = mediaSymbol.Layout;
84 84
85 var mediaLayoutDirectory = this.ResolveMedia(mediaTuple, mediaLayoutFolder, this.LayoutDirectory); 85 var mediaLayoutDirectory = this.ResolveMedia(mediaSymbol, mediaLayoutFolder, this.LayoutDirectory);
86 86
87 // setup up the query record and find the appropriate file in the 87 // setup up the query record and find the appropriate file in the
88 // previously executed file view 88 // previously executed file view