Move creation of hidden properties...

...for deferred CAs with HideTarget="yes" to the MSI backend where it belongs.

4 files changed, 20 insertions, 13 deletions

diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CreateSpecialPropertiesCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CreateSpecialPropertiesCommand.cs
index e6c089a1..8f769904 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/CreateSpecialPropertiesCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/CreateSpecialPropertiesCommand.cs
@@ -20,9 +20,9 @@ namespace WixToolset.Core.WindowsInstaller.Bind
         public void Execute()
         {
             // Create lists of the properties that contribute to the special lists of properties.
-            SortedSet<string> adminProperties = new SortedSet<string>();
-            SortedSet<string> secureProperties = new SortedSet<string>();
-            SortedSet<string> hiddenProperties = new SortedSet<string>();
+            var adminProperties = new SortedSet<string>();
+            var secureProperties = new SortedSet<string>();
+            var hiddenProperties = new SortedSet<string>();
 
             foreach (var wixPropertyRow in this.Section.Tuples.OfType<WixPropertyTuple>())
             {
@@ -42,6 +42,15 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                 }
             }
 
+            // Hide properties for in-script custom actions that have HideTarget set.
+            var hideTargetCustomActions = this.Section.Tuples.OfType<CustomActionTuple>().Where(
+                ca => ca.Hidden
+                && (ca.ExecutionType == CustomActionExecutionType.Deferred
+                || ca.ExecutionType == CustomActionExecutionType.Commit
+                || ca.ExecutionType == CustomActionExecutionType.Rollback))
+                .Select(ca => ca.Id.Id);
+            hiddenProperties.UnionWith(hideTargetCustomActions);
+
             if (0 < adminProperties.Count)
             {
                 var tuple = new PropertyTuple(null, new Identifier(AccessModifier.Private, "AdminProperties"));
diff --git a/src/WixToolset.Core/Compiler.cs b/src/WixToolset.Core/Compiler.cs
index ee460edc..b983981b 100644
--- a/src/WixToolset.Core/Compiler.cs
+++ b/src/WixToolset.Core/Compiler.cs
@@ -3561,6 +3561,7 @@ namespace WixToolset.Core
                     PatchUninstall = patchUninstall,
                     TSAware = tsAware,
                     Win64 = win64,
+                    Hidden = hidden,
                 };
 
                 this.Core.AddTuple(tuple);
@@ -3569,15 +3570,6 @@ namespace WixToolset.Core
                 {
                     this.Core.AddTuple(new WixSuppressModularizationTuple(sourceLineNumbers, id));
                 }
-
-                // For deferred CAs that specify HideTarget we should also hide the CA data property for the action.
-                if (hidden &&
-                    (CustomActionExecutionType.Deferred == executionType ||
-                     CustomActionExecutionType.Commit == executionType ||
-                     CustomActionExecutionType.Rollback == executionType))
-                {
-                    this.AddWixPropertyRow(sourceLineNumbers, id, false, false, hidden);
-                }
             }
         }
 
diff --git a/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs b/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
index fff37618..febf3b62 100644
--- a/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
@@ -3,6 +3,7 @@
 namespace WixToolsetTest.CoreIntegration
 {
     using System.IO;
+    using System.Linq;
     using WixBuildTools.TestSupport;
     using WixToolset.Core.TestPackage;
     using Xunit;
@@ -281,8 +282,12 @@ namespace WixToolsetTest.CoreIntegration
                 {
                     "Binary:Binary1\t[Binary data]",
                     "CustomAction:CustomAction1\t1\tBinary1\tInvalidEntryPoint\t",
+                    "CustomAction:CustomActionWithHiddenTarget\t9217\tBinary1\tInvalidEntryPoint\t",
                     "CustomAction:DiscardOptimismAllBeingsWhoProceed\t19\t\tAbandon hope all ye who enter here.\t",
                 }, results);
+                var properties = Query.QueryDatabase(msiPath, new[] { "Property" });
+                var hiddenProperties = properties.Where(q => q.StartsWith("Property:MsiHiddenProperties")).Single();
+                Assert.Equal("Property:MsiHiddenProperties\tCustomActionWithHiddenTarget", hiddenProperties);
             }
         }
 
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/UnscheduledCustomAction.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/UnscheduledCustomAction.wxs
index e4b066e9..00ac2810 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/UnscheduledCustomAction.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/UnscheduledCustomAction.wxs
@@ -6,7 +6,8 @@
         </ComponentGroup>
 
         <Binary Id="Binary1" SourceFile="test.txt"></Binary>
-        <CustomAction Id="CustomAction1" BinaryKey="Binary1" DllEntry="InvalidEntryPoint"></CustomAction>
+        <CustomAction Id="CustomAction1" BinaryKey="Binary1" DllEntry="InvalidEntryPoint" />
         <CustomAction Id="DiscardOptimismAllBeingsWhoProceed" Error="Abandon hope all ye who enter here." />
+        <CustomAction Id="CustomActionWithHiddenTarget" BinaryKey="Binary1" DllEntry="InvalidEntryPoint" Execute="deferred" HideTarget="yes" />
     </Fragment>
 </Wix>