Remove special handling to pdb path in Layout command
Rob Mensching committed
Jul 23, 2018 at 14:30 UTC
c64faa7f6cb789a0756dff725146728889df8311
1 file changed
+11
-20
src/WixToolset.Core/Layout.cs
+11
-20
@@ -79,14 +79,17 @@ namespace WixToolset.Core
79
this.CreateContentsFile(context.ContentsFile, context.ContentFilePaths);
80
}
81
82
- if (!String.IsNullOrEmpty(context.OutputsFile) && context.FileTransfers != null)
82
+ if (context.FileTransfers != null)
83
{
84
- this.CreateOutputsFile(context.OutputsFile, context.FileTransfers, context.OutputPdbPath);
85
- }
84
+ if (!String.IsNullOrEmpty(context.OutputsFile))
85
+ {
86
+ this.CreateOutputsFile(context.OutputsFile, context.FileTransfers);
87
+ }
88
87
- if (!String.IsNullOrEmpty(context.BuiltOutputsFile) && context.FileTransfers != null)
88
- {
89
- this.CreateBuiltOutputsFile(context.BuiltOutputsFile, context.FileTransfers, context.OutputPdbPath);
89
+ if (!String.IsNullOrEmpty(context.BuiltOutputsFile))
90
+ {
91
+ this.CreateBuiltOutputsFile(context.BuiltOutputsFile, context.FileTransfers);
92
+ }
93
}
94
}
95
@@ -121,8 +124,7 @@ namespace WixToolset.Core
124
/// </summary>
125
/// <param name="path">Path to write file.</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>
125
- private void CreateOutputsFile(string path, IEnumerable<FileTransfer> fileTransfers, string pdbPath)
127
+ private void CreateOutputsFile(string path, IEnumerable<FileTransfer> fileTransfers)
128
{
129
var directory = Path.GetDirectoryName(path);
130
Directory.CreateDirectory(directory);
@@ -139,11 +141,6 @@ namespace WixToolset.Core
141
outputs.WriteLine(fileTransfer.Destination);
142
}
143
}
142
-
143
- if (!String.IsNullOrEmpty(pdbPath))
144
- {
145
- outputs.WriteLine(Path.GetFullPath(pdbPath));
146
- }
144
}
145
}
146
@@ -152,8 +149,7 @@ namespace WixToolset.Core
149
/// </summary>
150
/// <param name="path">Path to write file.</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>
156
- private void CreateBuiltOutputsFile(string path, IEnumerable<FileTransfer> fileTransfers, string pdbPath)
152
+ private void CreateBuiltOutputsFile(string path, IEnumerable<FileTransfer> fileTransfers)
153
{
154
var directory = Path.GetDirectoryName(path);
155
Directory.CreateDirectory(directory);
@@ -169,11 +165,6 @@ namespace WixToolset.Core
165
outputs.WriteLine(fileTransfer.Destination);
166
}
167
}
172
-
173
- if (!String.IsNullOrEmpty(pdbPath))
174
- {
175
- outputs.WriteLine(Path.GetFullPath(pdbPath));
176
- }
168
}
169
}
170
}