Allow "." as valid Directory SourceName
Fixes 7384
Rob Mensching committed
Apr 18, 2023 at 08:43 UTC
45f6dcfcdc4e5ed9350733825d8bcc5ed74f24ba
2 files changed
+2
-2
src/wix/WixToolset.Core.WindowsInstaller/Bind/CreateWindowsInstallerDataFromIRCommand.cs
+1
-1
@@ -507,7 +507,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
507
shortName = this.CreateShortName(name, false, "Directory", symbol.ParentDirectoryRef);
508
}
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
{
512
sourceShortname = this.CreateShortName(symbol.SourceName, false, "Directory", symbol.ParentDirectoryRef);
513
}
src/wix/test/WixToolsetTest.CoreIntegration/TestData/SingleFile/Package.wxs
+1
-1
@@ -11,7 +11,7 @@
11
12
<Fragment>
13
<StandardDirectory Id="ProgramFilesFolder">
14
- <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
14
+ <Directory Id="INSTALLFOLDER" Name="MsiPackage" SourceName="." />
15
</StandardDirectory>
16
</Fragment>
17
</Wix>