Skip to content
This repository was archived by the owner on Feb 14, 2025. It is now read-only.

Commit 9574705

Browse files
matherm-aboehmrobmen
authored andcommitted
Filter out BindInputPaths and related item types
Fixes wixtoolset/issues#4493
1 parent 1e1b540 commit 9574705

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

src/votive.shared/WixProjectFileConstants.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ internal static class WixProjectFileConstants
1717
public const string AllowUnresolvedReferences = "AllowUnresolvedReferences";
1818
public const string BackwardsCompatibleGuidGeneration = "BackwardsCompatibleGuidGeneration";
1919
public const string BaseInputPaths = "BaseInputPaths";
20+
public const string BindInputPaths = "BindInputPaths";
2021
public const string CabinetCachePath = "CabinetCachePath";
2122
public const string CabinetCreationThreadCount = "CabinetCreationThreadCount";
2223
public const string CompilerAdditionalOptions = "CompilerAdditionalOptions";
@@ -39,6 +40,7 @@ internal static class WixProjectFileConstants
3940
public const string LibVerboseOutput = "LibVerboseOutput";
4041
public const string LinkerAdditionalOptions = "LinkerAdditionalOptions";
4142
public const string LinkerBaseInputPaths = "LinkerBaseInputPaths";
43+
public const string LinkerBindInputPaths = "LinkerBindInputPaths";
4244
public const string LinkerBindFiles = "LinkerBindFiles";
4345
public const string LinkerPedantic = "LinkerPedantic";
4446
public const string LinkerSuppressIntermediateFileVersionMatching = "LinkerSuppressIntermediateFileVersionMatching";

src/votive.shared/WixProjectNode.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -402,6 +402,10 @@ protected override bool FilterItemTypeToBeAddedToHierarchy(string itemType)
402402
{
403403
return (String.Compare(itemType, WixProjectFileConstants.WixExtension, StringComparison.OrdinalIgnoreCase) == 0) ||
404404
(String.Compare(itemType, WixProjectFileConstants.WixLibrary, StringComparison.OrdinalIgnoreCase) == 0) ||
405+
(String.Compare(itemType, WixProjectFileConstants.BaseInputPaths, StringComparison.OrdinalIgnoreCase) == 0) ||
406+
(String.Compare(itemType, WixProjectFileConstants.BindInputPaths, StringComparison.OrdinalIgnoreCase) == 0) ||
407+
(String.Compare(itemType, WixProjectFileConstants.LinkerBaseInputPaths, StringComparison.OrdinalIgnoreCase) == 0) ||
408+
(String.Compare(itemType, WixProjectFileConstants.LinkerBindInputPaths, StringComparison.OrdinalIgnoreCase) == 0) ||
405409
base.FilterItemTypeToBeAddedToHierarchy(itemType);
406410
}
407411

0 commit comments

Comments
 (0)