aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.Core
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2018-07-23 14:30:31 -0700
committerRob Mensching <rob@firegiant.com>2018-07-23 14:30:31 -0700
commitc64faa7f6cb789a0756dff725146728889df8311 (patch)
tree20f9a24566abaa43b056b3c32ee4f78a8975ca4b /src/WixToolset.Core
parent5a1afc9030a1fcc101b6bb52b576fbbfa3ad33c2 (diff)
downloadwix-c64faa7f6cb789a0756dff725146728889df8311.tar.gz
wix-c64faa7f6cb789a0756dff725146728889df8311.tar.bz2
wix-c64faa7f6cb789a0756dff725146728889df8311.zip
Remove special handling to pdb path in Layout command
Diffstat (limited to 'src/WixToolset.Core')
-rw-r--r--src/WixToolset.Core/Layout.cs31
1 files changed, 11 insertions, 20 deletions
diff --git a/src/WixToolset.Core/Layout.cs b/src/WixToolset.Core/Layout.cs
index a44c212d..a5e885e5 100644
--- a/src/WixToolset.Core/Layout.cs
+++ b/src/WixToolset.Core/Layout.cs
@@ -79,14 +79,17 @@ namespace WixToolset.Core
79 this.CreateContentsFile(context.ContentsFile, context.ContentFilePaths); 79 this.CreateContentsFile(context.ContentsFile, context.ContentFilePaths);
80 } 80 }
81 81
82 if (!String.IsNullOrEmpty(context.OutputsFile) && context.FileTransfers != null) 82 if (context.FileTransfers != null)
83 { 83 {
84 this.CreateOutputsFile(context.OutputsFile, context.FileTransfers, context.OutputPdbPath); 84 if (!String.IsNullOrEmpty(context.OutputsFile))
85 } 85 {
86 this.CreateOutputsFile(context.OutputsFile, context.FileTransfers);
87 }
86 88
87 if (!String.IsNullOrEmpty(context.BuiltOutputsFile) && context.FileTransfers != null) 89 if (!String.IsNullOrEmpty(context.BuiltOutputsFile))
88 { 90 {
89 this.CreateBuiltOutputsFile(context.BuiltOutputsFile, context.FileTransfers, context.OutputPdbPath); 91 this.CreateBuiltOutputsFile(context.BuiltOutputsFile, context.FileTransfers);
92 }
90 } 93 }
91 } 94 }
92 95
@@ -121,8 +124,7 @@ namespace WixToolset.Core
121 /// </summary> 124 /// </summary>
122 /// <param name="path">Path to write file.</param> 125 /// <param name="path">Path to write file.</param>
123 /// <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>
124 /// <param name="pdbPath">Optional path to created .wixpdb.</param> 127 private void CreateOutputsFile(string path, IEnumerable<FileTransfer> fileTransfers)
125 private void CreateOutputsFile(string path, IEnumerable<FileTransfer> fileTransfers, string pdbPath)
126 { 128 {
127 var directory = Path.GetDirectoryName(path); 129 var directory = Path.GetDirectoryName(path);
128 Directory.CreateDirectory(directory); 130 Directory.CreateDirectory(directory);
@@ -139,11 +141,6 @@ namespace WixToolset.Core
139 outputs.WriteLine(fileTransfer.Destination); 141 outputs.WriteLine(fileTransfer.Destination);
140 } 142 }
141 } 143 }
142
143 if (!String.IsNullOrEmpty(pdbPath))
144 {
145 outputs.WriteLine(Path.GetFullPath(pdbPath));
146 }
147 } 144 }
148 } 145 }
149 146
@@ -152,8 +149,7 @@ namespace WixToolset.Core
152 /// </summary> 149 /// </summary>
153 /// <param name="path">Path to write file.</param> 150 /// <param name="path">Path to write file.</param>
154 /// <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>
155 /// <param name="pdbPath">Optional path to created .wixpdb.</param> 152 private void CreateBuiltOutputsFile(string path, IEnumerable<FileTransfer> fileTransfers)
156 private void CreateBuiltOutputsFile(string path, IEnumerable<FileTransfer> fileTransfers, string pdbPath)
157 { 153 {
158 var directory = Path.GetDirectoryName(path); 154 var directory = Path.GetDirectoryName(path);
159 Directory.CreateDirectory(directory); 155 Directory.CreateDirectory(directory);
@@ -169,11 +165,6 @@ namespace WixToolset.Core
169 outputs.WriteLine(fileTransfer.Destination); 165 outputs.WriteLine(fileTransfer.Destination);
170 } 166 }
171 } 167 }
172
173 if (!String.IsNullOrEmpty(pdbPath))
174 {
175 outputs.WriteLine(Path.GetFullPath(pdbPath));
176 }
177 } 168 }
178 } 169 }
179 } 170 }