Prevent source directories from being harvested.

Fixes wixtoolset/issues#8096.
wixtoolset · Apr 4, 2024 · 765036d · 765036d
1 parent 289c93d
commit 765036d
Show file tree

Hide file tree

Showing 4 changed files with 196 additions and 207 deletions.
diff --git a/src/internal/SetBuildNumber/Directory.Packages.props.pp b/src/internal/SetBuildNumber/Directory.Packages.props.pp
@@ -5,6 +5,7 @@
     <PackageVersion Include="WixToolset.Dtf.CustomAction" Version="{packageversion}" />
     <PackageVersion Include="WixToolset.Dtf.Resources" Version="{packageversion}" />
     <PackageVersion Include="WixToolset.Dtf.WindowsInstaller" Version="{packageversion}" />
+    <PackageVersion Include="WixToolset.Dtf.WindowsInstaller.Package" Version="{packageversion}" />
 
     <PackageVersion Include="WixInternal.TestSupport" Version="{packageversion}" />
     <PackageVersion Include="WixInternal.TestSupport.Native" Version="{packageversion}" />

diff --git a/src/wix/WixToolset.Core/HarvestFilesCommand.cs b/src/wix/WixToolset.Core/HarvestFilesCommand.cs
@@ -128,7 +128,7 @@ private void HarvestFiles(HarvestFilesSymbol harvestFile, IntermediateSection se
         private IEnumerable<WildcardFile> GetWildcardFiles(HarvestFilesSymbol harvestFile, IEnumerable<string> patterns)
         {
             var sourceLineNumbers = harvestFile.SourceLineNumbers;
-            var sourcePath = harvestFile.SourcePath;
+            var sourcePath = harvestFile.SourcePath?.TrimEnd(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);
 
             var files = new List<WildcardFile>();
 
@@ -158,7 +158,7 @@ private IEnumerable<WildcardFile> GetWildcardFiles(HarvestFilesSymbol harvestFil
                     else if (!Path.IsPathRooted(directoryPortion))
                     {
                         directoryPortion = Path.Combine(sourceDirectory, directoryPortion);
-                        recursiveDirOffset = sourceDirectory.Length + 1;
+                        recursiveDirOffset = directoryPortion.Length + 1;
                     }
 
                     var foundFiles = Directory.EnumerateFiles(directoryPortion, filePortion, recursive ? SearchOption.AllDirectories : SearchOption.TopDirectoryOnly);