From 3b98dac62b47d590f3465985362d6e6fd100b1c0 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Thu, 26 Sep 2019 13:10:37 -0700 Subject: Fix Directory.DefaultDir handling when creating MSI --- .../Bind/CreateOutputFromIRCommand.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs index bddb3da2..f76cd227 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs @@ -342,7 +342,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind private void AddDirectoryTuple(DirectoryTuple tuple, Output output) { - var shortName = GetMsiFilenameValue(tuple.SourceShortName, tuple.SourceName); + var sourceName = GetMsiFilenameValue(tuple.SourceShortName, tuple.SourceName); var targetName = GetMsiFilenameValue(tuple.ShortName, tuple.Name); if (String.IsNullOrEmpty(targetName)) @@ -350,7 +350,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind targetName = "."; } - var defaultDir = String.IsNullOrEmpty(shortName)? targetName : shortName + ":" + targetName; + var defaultDir = String.IsNullOrEmpty(sourceName) ? targetName : targetName + ":" + sourceName ; var table = output.EnsureTable(this.TableDefinitions["Directory"]); var row = table.CreateRow(tuple.SourceLineNumbers); -- cgit v1.2.3-55-g6feb