diff options
| author | Rob Mensching <rob@firegiant.com> | 2021-04-06 15:56:45 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2021-04-06 16:10:05 -0700 |
| commit | f3a228eaf7d40bcd46b64c3d49aa23df23e79aec (patch) | |
| tree | 759d4994003d0ad430e934ab97fa647c470fb396 /src/WixToolset.Core.WindowsInstaller/Bind/CreateWindowsInstallerDataFromIRCommand.cs | |
| parent | 86e59fdbc94ae661ca682f04cddb60d7830ae8a8 (diff) | |
| download | wix-f3a228eaf7d40bcd46b64c3d49aa23df23e79aec.tar.gz wix-f3a228eaf7d40bcd46b64c3d49aa23df23e79aec.tar.bz2 wix-f3a228eaf7d40bcd46b64c3d49aa23df23e79aec.zip | |
Discards source directory name when identical to target name
Fixes wixtoolset/issues#6418
Diffstat (limited to 'src/WixToolset.Core.WindowsInstaller/Bind/CreateWindowsInstallerDataFromIRCommand.cs')
| -rw-r--r-- | src/WixToolset.Core.WindowsInstaller/Bind/CreateWindowsInstallerDataFromIRCommand.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CreateWindowsInstallerDataFromIRCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CreateWindowsInstallerDataFromIRCommand.cs index cee87df0..d34ca3fe 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/CreateWindowsInstallerDataFromIRCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/CreateWindowsInstallerDataFromIRCommand.cs | |||
| @@ -513,7 +513,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 513 | targetName = "."; | 513 | targetName = "."; |
| 514 | } | 514 | } |
| 515 | 515 | ||
| 516 | var defaultDir = String.IsNullOrEmpty(sourceName) ? targetName : targetName + ":" + sourceName; | 516 | var defaultDir = String.IsNullOrEmpty(sourceName) || sourceName == targetName ? targetName : targetName + ":" + sourceName; |
| 517 | 517 | ||
| 518 | var row = this.CreateRow(symbol, "Directory"); | 518 | var row = this.CreateRow(symbol, "Directory"); |
| 519 | row[0] = symbol.Id.Id; | 519 | row[0] = symbol.Id.Id; |