aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.Core.WindowsInstaller/Bind/ProcessUncompressedFilesCommand.cs
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2019-05-23 15:37:56 -0700
committerRob Mensching <rob@firegiant.com>2019-05-23 16:02:37 -0700
commit354f6d5b79404544cb7c0e11a0d9212b4780ce09 (patch)
tree1082ce6dd66604f7da315d6a15c85ac3f56b745a /src/WixToolset.Core.WindowsInstaller/Bind/ProcessUncompressedFilesCommand.cs
parent3051bf2fc300df125115c9538a0bfc8256bfde6a (diff)
downloadwix-354f6d5b79404544cb7c0e11a0d9212b4780ce09.tar.gz
wix-354f6d5b79404544cb7c0e11a0d9212b4780ce09.tar.bz2
wix-354f6d5b79404544cb7c0e11a0d9212b4780ce09.zip
Integrate latest Data changes for FileTuple and AssemblyTuple
Diffstat (limited to 'src/WixToolset.Core.WindowsInstaller/Bind/ProcessUncompressedFilesCommand.cs')
-rw-r--r--src/WixToolset.Core.WindowsInstaller/Bind/ProcessUncompressedFilesCommand.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/ProcessUncompressedFilesCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/ProcessUncompressedFilesCommand.cs
index 369c241c..61e82f68 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/ProcessUncompressedFilesCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/ProcessUncompressedFilesCommand.cs
@@ -81,7 +81,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
81 // for each file in the array of uncompressed files 81 // for each file in the array of uncompressed files
82 foreach (FileFacade facade in this.FileFacades) 82 foreach (FileFacade facade in this.FileFacades)
83 { 83 {
84 var mediaTuple = mediaRows[facade.WixFile.DiskId]; 84 var mediaTuple = mediaRows[facade.DiskId];
85 string relativeFileLayoutPath = null; 85 string relativeFileLayoutPath = null;
86 string mediaLayoutFolder = mediaTuple.Layout; 86 string mediaLayoutFolder = mediaTuple.Layout;
87 87
@@ -105,7 +105,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
105 // finally put together the base media layout path and the relative file layout path 105 // finally put together the base media layout path and the relative file layout path
106 var fileLayoutPath = Path.Combine(mediaLayoutDirectory, relativeFileLayoutPath); 106 var fileLayoutPath = Path.Combine(mediaLayoutDirectory, relativeFileLayoutPath);
107 107
108 var transfer = this.BackendHelper.CreateFileTransfer(facade.WixFile.Source.Path, fileLayoutPath, false, facade.File.SourceLineNumbers); 108 var transfer = this.BackendHelper.CreateFileTransfer(facade.File.Source.Path, fileLayoutPath, false, facade.File.SourceLineNumbers);
109 fileTransfers.Add(transfer); 109 fileTransfers.Add(transfer);
110 110
111 // Track the location where the cabinet will be placed. If the transfer is 111 // Track the location where the cabinet will be placed. If the transfer is