From 2fa6703a77d547fb076cc3cdbb99b11bd4f5c039 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Tue, 18 Apr 2023 08:43:26 -0700
Subject: Allow "." as valid Directory SourceName

Fixes 7384
---
 .../Bind/CreateWindowsInstallerDataFromIRCommand.cs                     | 2 +-
 .../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
                 shortName = this.CreateShortName(name, false, "Directory", symbol.ParentDirectoryRef);
             }
 
-            if (String.IsNullOrEmpty(sourceShortname) && !String.IsNullOrEmpty(symbol.SourceName) && !this.BackendHelper.IsValidShortFilename(symbol.SourceName, false))
+            if (String.IsNullOrEmpty(sourceShortname) && !String.IsNullOrEmpty(symbol.SourceName) && symbol.SourceName != "." && !this.BackendHelper.IsValidShortFilename(symbol.SourceName, false))
             {
                 sourceShortname = this.CreateShortName(symbol.SourceName, false, "Directory", symbol.ParentDirectoryRef);
             }
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 @@
 
   <Fragment>
     <StandardDirectory Id="ProgramFilesFolder">
-      <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
+      <Directory Id="INSTALLFOLDER" Name="MsiPackage" SourceName="." />
     </StandardDirectory>
   </Fragment>
 </Wix>
-- 
cgit v1.2.3-55-g6feb