aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.Core.WindowsInstaller/Bind/ProcessUncompressedFilesCommand.cs
diff options
context:
space:
mode:
Diffstat (limited to 'src/WixToolset.Core.WindowsInstaller/Bind/ProcessUncompressedFilesCommand.cs')
-rw-r--r--src/WixToolset.Core.WindowsInstaller/Bind/ProcessUncompressedFilesCommand.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/ProcessUncompressedFilesCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/ProcessUncompressedFilesCommand.cs
index 373ada38..13d47215 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/ProcessUncompressedFilesCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/ProcessUncompressedFilesCommand.cs
@@ -86,14 +86,14 @@ namespace WixToolset.Core.WindowsInstaller.Bind
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
89 fileQueryRecord[1] = facade.File.Id.Id; 89 fileQueryRecord[1] = facade.Id;
90 fileView.Execute(fileQueryRecord); 90 fileView.Execute(fileQueryRecord);
91 91
92 using (Record fileRecord = fileView.Fetch()) 92 using (Record fileRecord = fileView.Fetch())
93 { 93 {
94 if (null == fileRecord) 94 if (null == fileRecord)
95 { 95 {
96 throw new WixException(ErrorMessages.FileIdentifierNotFound(facade.File.SourceLineNumbers, facade.File.Id.Id)); 96 throw new WixException(ErrorMessages.FileIdentifierNotFound(facade.SourceLineNumber, facade.Id));
97 } 97 }
98 98
99 relativeFileLayoutPath = this.PathResolver.GetFileSourcePath(directories, fileRecord[1], fileRecord[2], this.Compressed, this.LongNamesInImage); 99 relativeFileLayoutPath = this.PathResolver.GetFileSourcePath(directories, fileRecord[1], fileRecord[2], this.Compressed, this.LongNamesInImage);
@@ -102,7 +102,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
102 // finally put together the base media layout path and the relative file layout path 102 // finally put together the base media layout path and the relative file layout path
103 var fileLayoutPath = Path.Combine(mediaLayoutDirectory, relativeFileLayoutPath); 103 var fileLayoutPath = Path.Combine(mediaLayoutDirectory, relativeFileLayoutPath);
104 104
105 var transfer = this.BackendHelper.CreateFileTransfer(facade.File.Source.Path, fileLayoutPath, false, facade.File.SourceLineNumbers); 105 var transfer = this.BackendHelper.CreateFileTransfer(facade.SourcePath, fileLayoutPath, false, facade.SourceLineNumber);
106 fileTransfers.Add(transfer); 106 fileTransfers.Add(transfer);
107 107
108 // Track the location where the cabinet will be placed. If the transfer is 108 // Track the location where the cabinet will be placed. If the transfer is
@@ -110,7 +110,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
110 // because if the source and destination of the transfer is the same, we 110 // because if the source and destination of the transfer is the same, we
111 // don't want to clean the file because we'd be deleting the original 111 // don't want to clean the file because we'd be deleting the original
112 // (and that would be bad). 112 // (and that would be bad).
113 var tracked = this.BackendHelper.TrackFile(transfer.Destination, TrackedFileType.Final, facade.File.SourceLineNumbers); 113 var tracked = this.BackendHelper.TrackFile(transfer.Destination, TrackedFileType.Final, facade.SourceLineNumber);
114 tracked.Clean = !transfer.Redundant; 114 tracked.Clean = !transfer.Redundant;
115 115
116 trackedFiles.Add(tracked); 116 trackedFiles.Add(tracked);