Skip to content
/ wix Public
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/wix/WixToolset.Core/HarvestFilesAndPayloadsCommand.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ namespace WixToolset.Core
internal class HarvestFilesAndPayloadsCommand
{
private const string BindPathOpenString = "!(bindpath.";
private static readonly char[] SplitSemicolons = { ';' };

public HarvestFilesAndPayloadsCommand(IOptimizeContext context)
{
Expand Down Expand Up @@ -54,8 +55,8 @@ private void HarvestFiles(HarvestFilesSymbol harvestFile, IntermediateSection se
{
var unusedSectionCachedInlinedDirectoryIds = new Dictionary<string, string>();

var inclusions = harvestFile.Inclusions.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries);
var exclusions = harvestFile.Exclusions.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries);
var inclusions = harvestFile.Inclusions.Split(SplitSemicolons, StringSplitOptions.RemoveEmptyEntries);
var exclusions = harvestFile.Exclusions.Split(SplitSemicolons, StringSplitOptions.RemoveEmptyEntries);

var comparer = new WildcardFileComparer();

Expand Down Expand Up @@ -312,12 +313,12 @@ private class WildcardFileComparer : IEqualityComparer<WildcardFile>
{
public bool Equals(WildcardFile x, WildcardFile y)
{
return x?.Path == y?.Path;
return StringComparer.OrdinalIgnoreCase.Equals(x?.Path, y?.Path);
}

public int GetHashCode(WildcardFile obj)
{
return obj?.Path?.GetHashCode() ?? 0;
return obj?.Path is null ? 0 : StringComparer.OrdinalIgnoreCase.GetHashCode(obj.Path);
}
}
}
Expand Down
27 changes: 27 additions & 0 deletions src/wix/test/WixToolsetTest.CoreIntegration/HarvestFilesFixture.cs
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,33 @@ public void CanHarvestFilesInDirectory()
Build("Directory.wxs", (msiPath, _) => AssertFileIdsAndTargetPaths(msiPath, expected));
}

[Fact]
public void CanHarvestFilesWithCaseInsensitiveExcludeSubdirectory()
{
var expected = new[]
{
@"flsYgiwrDUkZnBEK6iUMkxxaJlD8yQ=PFiles\MsiPackage\test1.txt",
@"flslrDWblm4pE.4i4jR58_XyYMmR8I=PFiles\MsiPackage\files1_sub1\files1_sub2\test120.txt",
@"flsj.cb0sFWqIPHPFSKJSEEaPDuAQ4=PFiles\MsiPackage\test2.txt",
};

Build("CaseInsensitiveExcludeSubdir.wxs", (msiPath, _) => AssertFileIdsAndTargetPaths(msiPath, expected));
}

[Fact]
public void CanHarvestFilesWithCaseInsensitiveIncludeExclude()
{
var expected = new[]
{
@"flsaFu0CvigRX6Psea0ic6ZWevzLmI=PFiles\MsiPackage\test3.txt",
@"flsJBy_HKCNejalUyud4HisGqhd72E=PFiles\MsiPackage\test4.txt",
@"fls05.yw49T0FVAq3Wvq2ihNp3KWfI=PFiles\MsiPackage\files2_sub2\test20.txt",
@"flsf0falU_gCTJjtbSCNiFpJQ1d8EM=PFiles\MsiPackage\files2_sub2\test21.txt",
};

Build("CaseInsensitiveIncludeExclude.wxs", (msiPath, _) => AssertFileIdsAndTargetPaths(msiPath, expected));
}

[Fact]
public void CanHarvestFilesInDirectoryRef()
{
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
<Package Id="WixTest.MsiPackage" Name="MsiPackage" Version="1.0.0.0" Manufacturer="Example Corporation">
<StandardDirectory Id="ProgramFilesFolder">
<Directory Id="INSTALLFOLDER" Name="MsiPackage" FileSource="$(sys.SOURCEFILEDIR)">
<Files Include="files1\**">
<Exclude Files="FILES1\FILES1_SUB1\*" />
</Files>
</Directory>
</StandardDirectory>
</Package>
</Wix>
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
<Package Id="WixTest.MsiPackage" Name="MsiPackage" Version="1.0.0.0" Manufacturer="Example Corporation">
<StandardDirectory Id="ProgramFilesFolder">
<Directory Id="INSTALLFOLDER" Name="MsiPackage" FileSource="$(sys.SOURCEFILEDIR)">
<Files Include="FILES2\**\*.TXT">
<Exclude Files="files2\NOTATEST.txt" />
</Files>
</Directory>
</StandardDirectory>
</Package>
</Wix>