diff options
| author | Rob Mensching <rob@firegiant.com> | 2019-09-26 13:10:37 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2019-10-07 11:59:14 -0700 |
| commit | 3b98dac62b47d590f3465985362d6e6fd100b1c0 (patch) | |
| tree | dc3370c0300c219a9b82956f606398ad5493fa8f /src | |
| parent | 49b2da817e5d584e7acb8f716c0466bfd4fdc510 (diff) | |
| download | wix-3b98dac62b47d590f3465985362d6e6fd100b1c0.tar.gz wix-3b98dac62b47d590f3465985362d6e6fd100b1c0.tar.bz2 wix-3b98dac62b47d590f3465985362d6e6fd100b1c0.zip | |
Fix Directory.DefaultDir handling when creating MSI
Diffstat (limited to 'src')
| -rw-r--r-- | src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs | 4 |
1 files 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 | |||
| 342 | 342 | ||
| 343 | private void AddDirectoryTuple(DirectoryTuple tuple, Output output) | 343 | private void AddDirectoryTuple(DirectoryTuple tuple, Output output) |
| 344 | { | 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); | 346 | var targetName = GetMsiFilenameValue(tuple.ShortName, tuple.Name); |
| 347 | 347 | ||
| 348 | if (String.IsNullOrEmpty(targetName)) | 348 | if (String.IsNullOrEmpty(targetName)) |
| @@ -350,7 +350,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 350 | targetName = "."; | 350 | targetName = "."; |
| 351 | } | 351 | } |
| 352 | 352 | ||
| 353 | var defaultDir = String.IsNullOrEmpty(shortName)? targetName : shortName + ":" + targetName; | 353 | var defaultDir = String.IsNullOrEmpty(sourceName) ? targetName : targetName + ":" + sourceName ; |
| 354 | 354 | ||
| 355 | var table = output.EnsureTable(this.TableDefinitions["Directory"]); | 355 | var table = output.EnsureTable(this.TableDefinitions["Directory"]); |
| 356 | var row = table.CreateRow(tuple.SourceLineNumbers); | 356 | var row = table.CreateRow(tuple.SourceLineNumbers); |