diff options
author | Rob Mensching <rob@firegiant.com> | 2023-04-18 08:43:26 -0700 |
---|---|---|
committer | Rob Mensching <rob@firegiant.com> | 2023-04-18 11:46:53 -0700 |
commit | 45f6dcfcdc4e5ed9350733825d8bcc5ed74f24ba (patch) | |
tree | f6a94d20d96aea4d587f77badd72c7687b56572b | |
parent | dbbce9a1a489419271dad960757f764e4ad5508d (diff) | |
download | wix-45f6dcfcdc4e5ed9350733825d8bcc5ed74f24ba.tar.gz wix-45f6dcfcdc4e5ed9350733825d8bcc5ed74f24ba.tar.bz2 wix-45f6dcfcdc4e5ed9350733825d8bcc5ed74f24ba.zip |
Allow "." as valid Directory SourceName
Fixes 7384
-rw-r--r-- | src/wix/WixToolset.Core.WindowsInstaller/Bind/CreateWindowsInstallerDataFromIRCommand.cs | 2 | ||||
-rw-r--r-- | src/wix/test/WixToolsetTest.CoreIntegration/TestData/SingleFile/Package.wxs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Bind/CreateWindowsInstallerDataFromIRCommand.cs b/src/wix/WixToolset.Core.WindowsInstaller/Bind/CreateWindowsInstallerDataFromIRCommand.cs index 960d298e..42493484 100644 --- a/src/wix/WixToolset.Core.WindowsInstaller/Bind/CreateWindowsInstallerDataFromIRCommand.cs +++ b/src/wix/WixToolset.Core.WindowsInstaller/Bind/CreateWindowsInstallerDataFromIRCommand.cs | |||
@@ -507,7 +507,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
507 | shortName = this.CreateShortName(name, false, "Directory", symbol.ParentDirectoryRef); | 507 | shortName = this.CreateShortName(name, false, "Directory", symbol.ParentDirectoryRef); |
508 | } | 508 | } |
509 | 509 | ||
510 | if (String.IsNullOrEmpty(sourceShortname) && !String.IsNullOrEmpty(symbol.SourceName) && !this.BackendHelper.IsValidShortFilename(symbol.SourceName, false)) | 510 | if (String.IsNullOrEmpty(sourceShortname) && !String.IsNullOrEmpty(symbol.SourceName) && symbol.SourceName != "." && !this.BackendHelper.IsValidShortFilename(symbol.SourceName, false)) |
511 | { | 511 | { |
512 | sourceShortname = this.CreateShortName(symbol.SourceName, false, "Directory", symbol.ParentDirectoryRef); | 512 | sourceShortname = this.CreateShortName(symbol.SourceName, false, "Directory", symbol.ParentDirectoryRef); |
513 | } | 513 | } |
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/SingleFile/Package.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/SingleFile/Package.wxs index d7b5bdc0..3cab4267 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/SingleFile/Package.wxs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/SingleFile/Package.wxs | |||
@@ -11,7 +11,7 @@ | |||
11 | 11 | ||
12 | <Fragment> | 12 | <Fragment> |
13 | <StandardDirectory Id="ProgramFilesFolder"> | 13 | <StandardDirectory Id="ProgramFilesFolder"> |
14 | <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> | 14 | <Directory Id="INSTALLFOLDER" Name="MsiPackage" SourceName="." /> |
15 | </StandardDirectory> | 15 | </StandardDirectory> |
16 | </Fragment> | 16 | </Fragment> |
17 | </Wix> | 17 | </Wix> |