Fix Directory.DefaultDir handling when creating MSI
Rob Mensching committed
Sep 26, 2019 at 13:10 UTC
3b98dac62b47d590f3465985362d6e6fd100b1c0
1 file changed
+2
-2
src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs
+2
-2
@@ -342,7 +342,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
342
343
private void AddDirectoryTuple(DirectoryTuple tuple, Output output)
344
{
345
- var shortName = GetMsiFilenameValue(tuple.SourceShortName, tuple.SourceName);
345
+ var sourceName = GetMsiFilenameValue(tuple.SourceShortName, tuple.SourceName);
346
var targetName = GetMsiFilenameValue(tuple.ShortName, tuple.Name);
347
348
if (String.IsNullOrEmpty(targetName))
@@ -350,7 +350,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
350
targetName = ".";
351
}
352
353
- var defaultDir = String.IsNullOrEmpty(shortName)? targetName : shortName + ":" + targetName;
353
+ var defaultDir = String.IsNullOrEmpty(sourceName) ? targetName : targetName + ":" + sourceName ;
354
355
var table = output.EnsureTable(this.TableDefinitions["Directory"]);
356
var row = table.CreateRow(tuple.SourceLineNumbers);