aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.Core/Compiler.cs
diff options
context:
space:
mode:
authorBob Arnson <bob@firegiant.com>2019-11-05 19:27:06 -0500
committerBob Arnson <bob@firegiant.com>2019-11-05 19:32:42 -0500
commit0f65aaaca2faf1b6fc233c445216d547f08c6fa5 (patch)
tree656e070ac1fe3b8e609002196f325386f6220731 /src/WixToolset.Core/Compiler.cs
parente6f381b0ce2011ced88697ca7ddaae8a053b57d7 (diff)
downloadwix-0f65aaaca2faf1b6fc233c445216d547f08c6fa5.tar.gz
wix-0f65aaaca2faf1b6fc233c445216d547f08c6fa5.tar.bz2
wix-0f65aaaca2faf1b6fc233c445216d547f08c6fa5.zip
Move creation of hidden properties...
...for deferred CAs with HideTarget="yes" to the MSI backend where it belongs.
Diffstat (limited to 'src/WixToolset.Core/Compiler.cs')
-rw-r--r--src/WixToolset.Core/Compiler.cs10
1 files changed, 1 insertions, 9 deletions
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
3561 PatchUninstall = patchUninstall, 3561 PatchUninstall = patchUninstall,
3562 TSAware = tsAware, 3562 TSAware = tsAware,
3563 Win64 = win64, 3563 Win64 = win64,
3564 Hidden = hidden,
3564 }; 3565 };
3565 3566
3566 this.Core.AddTuple(tuple); 3567 this.Core.AddTuple(tuple);
@@ -3569,15 +3570,6 @@ namespace WixToolset.Core
3569 { 3570 {
3570 this.Core.AddTuple(new WixSuppressModularizationTuple(sourceLineNumbers, id)); 3571 this.Core.AddTuple(new WixSuppressModularizationTuple(sourceLineNumbers, id));
3571 } 3572 }
3572
3573 // For deferred CAs that specify HideTarget we should also hide the CA data property for the action.
3574 if (hidden &&
3575 (CustomActionExecutionType.Deferred == executionType ||
3576 CustomActionExecutionType.Commit == executionType ||
3577 CustomActionExecutionType.Rollback == executionType))
3578 {
3579 this.AddWixPropertyRow(sourceLineNumbers, id, false, false, hidden);
3580 }
3581 } 3573 }
3582 } 3574 }
3583 3575