Merge matherm-aboehm/4493-fix-itemtypes to close #16

wixtoolset · Dec 26, 2021 · 36aaa15 · 36aaa15
2 parents 1e1b540 + 9574705
commit 36aaa15
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/src/votive.shared/WixProjectFileConstants.cs b/src/votive.shared/WixProjectFileConstants.cs
@@ -17,6 +17,7 @@ internal static class WixProjectFileConstants
         public const string AllowUnresolvedReferences = "AllowUnresolvedReferences";
         public const string BackwardsCompatibleGuidGeneration = "BackwardsCompatibleGuidGeneration";
         public const string BaseInputPaths = "BaseInputPaths";
+        public const string BindInputPaths = "BindInputPaths";
         public const string CabinetCachePath = "CabinetCachePath";
         public const string CabinetCreationThreadCount = "CabinetCreationThreadCount";
         public const string CompilerAdditionalOptions = "CompilerAdditionalOptions";
@@ -39,6 +40,7 @@ internal static class WixProjectFileConstants
         public const string LibVerboseOutput = "LibVerboseOutput";
         public const string LinkerAdditionalOptions = "LinkerAdditionalOptions";
         public const string LinkerBaseInputPaths = "LinkerBaseInputPaths";
+        public const string LinkerBindInputPaths = "LinkerBindInputPaths";
         public const string LinkerBindFiles = "LinkerBindFiles";
         public const string LinkerPedantic = "LinkerPedantic";
         public const string LinkerSuppressIntermediateFileVersionMatching = "LinkerSuppressIntermediateFileVersionMatching";

diff --git a/src/votive.shared/WixProjectNode.cs b/src/votive.shared/WixProjectNode.cs
@@ -402,6 +402,10 @@ protected override bool FilterItemTypeToBeAddedToHierarchy(string itemType)
         {
             return (String.Compare(itemType, WixProjectFileConstants.WixExtension, StringComparison.OrdinalIgnoreCase) == 0) ||
                 (String.Compare(itemType, WixProjectFileConstants.WixLibrary, StringComparison.OrdinalIgnoreCase) == 0) ||
+                (String.Compare(itemType, WixProjectFileConstants.BaseInputPaths, StringComparison.OrdinalIgnoreCase) == 0) ||
+                (String.Compare(itemType, WixProjectFileConstants.BindInputPaths, StringComparison.OrdinalIgnoreCase) == 0) ||
+                (String.Compare(itemType, WixProjectFileConstants.LinkerBaseInputPaths, StringComparison.OrdinalIgnoreCase) == 0) ||
+                (String.Compare(itemType, WixProjectFileConstants.LinkerBindInputPaths, StringComparison.OrdinalIgnoreCase) == 0) ||
                 base.FilterItemTypeToBeAddedToHierarchy(itemType);
         }