diff options
| author | Rob Mensching <rob@firegiant.com> | 2018-07-26 23:52:12 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2018-07-27 11:31:18 -0700 |
| commit | 854e616eb3516c7405691b679617aa08c1dd1cdd (patch) | |
| tree | ce7694749bf88bc796825b84fbc4f9d8acae331d /src/WixToolset.Core/Layout.cs | |
| parent | c64faa7f6cb789a0756dff725146728889df8311 (diff) | |
| download | wix-854e616eb3516c7405691b679617aa08c1dd1cdd.tar.gz wix-854e616eb3516c7405691b679617aa08c1dd1cdd.tar.bz2 wix-854e616eb3516c7405691b679617aa08c1dd1cdd.zip | |
Support change of FileTransfer to interface
Diffstat (limited to 'src/WixToolset.Core/Layout.cs')
| -rw-r--r-- | src/WixToolset.Core/Layout.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/WixToolset.Core/Layout.cs b/src/WixToolset.Core/Layout.cs index a5e885e5..28c9d5fc 100644 --- a/src/WixToolset.Core/Layout.cs +++ b/src/WixToolset.Core/Layout.cs | |||
| @@ -28,7 +28,7 @@ namespace WixToolset.Core | |||
| 28 | 28 | ||
| 29 | private IMessaging Messaging { get; } | 29 | private IMessaging Messaging { get; } |
| 30 | 30 | ||
| 31 | public IEnumerable<FileTransfer> FileTransfers { get; set; } | 31 | public IEnumerable<IFileTransfer> FileTransfers { get; set; } |
| 32 | 32 | ||
| 33 | public IEnumerable<string> ContentFilePaths { get; set; } | 33 | public IEnumerable<string> ContentFilePaths { get; set; } |
| 34 | 34 | ||
| @@ -124,14 +124,14 @@ namespace WixToolset.Core | |||
| 124 | /// </summary> | 124 | /// </summary> |
| 125 | /// <param name="path">Path to write file.</param> | 125 | /// <param name="path">Path to write file.</param> |
| 126 | /// <param name="fileTransfers">Collection of files that were transferred to the output directory.</param> | 126 | /// <param name="fileTransfers">Collection of files that were transferred to the output directory.</param> |
| 127 | private void CreateOutputsFile(string path, IEnumerable<FileTransfer> fileTransfers) | 127 | private void CreateOutputsFile(string path, IEnumerable<IFileTransfer> fileTransfers) |
| 128 | { | 128 | { |
| 129 | var directory = Path.GetDirectoryName(path); | 129 | var directory = Path.GetDirectoryName(path); |
| 130 | Directory.CreateDirectory(directory); | 130 | Directory.CreateDirectory(directory); |
| 131 | 131 | ||
| 132 | using (var outputs = new StreamWriter(path, false)) | 132 | using (var outputs = new StreamWriter(path, false)) |
| 133 | { | 133 | { |
| 134 | foreach (FileTransfer fileTransfer in fileTransfers) | 134 | foreach (var fileTransfer in fileTransfers) |
| 135 | { | 135 | { |
| 136 | // Don't list files where the source is the same as the destination since | 136 | // Don't list files where the source is the same as the destination since |
| 137 | // that might be the only place the file exists. The outputs file is often | 137 | // that might be the only place the file exists. The outputs file is often |
| @@ -149,18 +149,18 @@ namespace WixToolset.Core | |||
| 149 | /// </summary> | 149 | /// </summary> |
| 150 | /// <param name="path">Path to write file.</param> | 150 | /// <param name="path">Path to write file.</param> |
| 151 | /// <param name="fileTransfers">Collection of files that were transferred to the output directory.</param> | 151 | /// <param name="fileTransfers">Collection of files that were transferred to the output directory.</param> |
| 152 | private void CreateBuiltOutputsFile(string path, IEnumerable<FileTransfer> fileTransfers) | 152 | private void CreateBuiltOutputsFile(string path, IEnumerable<IFileTransfer> fileTransfers) |
| 153 | { | 153 | { |
| 154 | var directory = Path.GetDirectoryName(path); | 154 | var directory = Path.GetDirectoryName(path); |
| 155 | Directory.CreateDirectory(directory); | 155 | Directory.CreateDirectory(directory); |
| 156 | 156 | ||
| 157 | using (var outputs = new StreamWriter(path, false)) | 157 | using (var outputs = new StreamWriter(path, false)) |
| 158 | { | 158 | { |
| 159 | foreach (FileTransfer fileTransfer in fileTransfers) | 159 | foreach (var fileTransfer in fileTransfers) |
| 160 | { | 160 | { |
| 161 | // Only write the built file transfers. Also, skip redundant | 161 | // Only write the built file transfers. Also, skip redundant |
| 162 | // files for the same reason spelled out in this.CreateOutputsFile(). | 162 | // files for the same reason spelled out in this.CreateOutputsFile(). |
| 163 | if (fileTransfer.Built && !fileTransfer.Redundant) | 163 | if (fileTransfer.Type == FileTransferType.Built && !fileTransfer.Redundant) |
| 164 | { | 164 | { |
| 165 | outputs.WriteLine(fileTransfer.Destination); | 165 | outputs.WriteLine(fileTransfer.Destination); |
| 166 | } | 166 | } |
