From d0462be8000f18aa7dc0791d02142f000bb19fbf Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Wed, 22 May 2019 00:58:13 -0700 Subject: Integrate latest changes to tuple definitions --- .../Bind/ProcessUncompressedFilesCommand.cs | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'src/WixToolset.Core.WindowsInstaller/Bind/ProcessUncompressedFilesCommand.cs') diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/ProcessUncompressedFilesCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/ProcessUncompressedFilesCommand.cs index f5561b42..369c241c 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/ProcessUncompressedFilesCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/ProcessUncompressedFilesCommand.cs @@ -54,8 +54,6 @@ namespace WixToolset.Core.WindowsInstaller.Bind var mediaRows = this.Section.Tuples.OfType().ToDictionary(t => t.DiskId); - var wixMediaRows = this.Section.Tuples.OfType().ToDictionary(t => t.DiskId_); - using (Database db = new Database(this.DatabasePath, OpenDatabase.ReadOnly)) { using (View directoryView = db.OpenExecuteView("SELECT `Directory`, `Directory_Parent`, `DefaultDir` FROM `Directory`")) @@ -85,25 +83,20 @@ namespace WixToolset.Core.WindowsInstaller.Bind { var mediaTuple = mediaRows[facade.WixFile.DiskId]; string relativeFileLayoutPath = null; - string mediaLayoutFolder = null; - - if (wixMediaRows.TryGetValue(facade.WixFile.DiskId, out var wixMediaRow)) - { - mediaLayoutFolder = wixMediaRow.Layout; - } + string mediaLayoutFolder = mediaTuple.Layout; var mediaLayoutDirectory = this.ResolveMedia(mediaTuple, mediaLayoutFolder, this.LayoutDirectory); // setup up the query record and find the appropriate file in the // previously executed file view - fileQueryRecord[1] = facade.File.File; + fileQueryRecord[1] = facade.File.Id.Id; fileView.Execute(fileQueryRecord); using (Record fileRecord = fileView.Fetch()) { if (null == fileRecord) { - throw new WixException(ErrorMessages.FileIdentifierNotFound(facade.File.SourceLineNumbers, facade.File.File)); + throw new WixException(ErrorMessages.FileIdentifierNotFound(facade.File.SourceLineNumbers, facade.File.Id.Id)); } relativeFileLayoutPath = PathResolver.GetFileSourcePath(directories, fileRecord[1], fileRecord[2], this.Compressed, this.LongNamesInImage); -- cgit v1.2.3-55-g6feb