From 313feeabd8c22a38bc1c5247f2e1bded20359ad7 Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Mon, 12 Oct 2020 15:56:07 -0400 Subject: Add CreateFolders standard action... ...when there are Component symbols to install. --- src/WixToolset.Core.WindowsInstaller/Bind/SequenceActionsCommand.cs | 1 + src/test/WixToolsetTest.CoreIntegration/CustomActionFixture.cs | 2 ++ src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs | 2 ++ 3 files changed, 5 insertions(+) (limited to 'src') diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/SequenceActionsCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/SequenceActionsCommand.cs index 93e25878..d33836c3 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/SequenceActionsCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/SequenceActionsCommand.cs @@ -425,6 +425,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind set.Add("InstallExecuteSequence/RegisterComPlus"); set.Add("InstallExecuteSequence/UnregisterComPlus"); break; + case SymbolDefinitionType.Component: case SymbolDefinitionType.CreateFolder: set.Add("InstallExecuteSequence/CreateFolders"); set.Add("InstallExecuteSequence/RemoveFolders"); diff --git a/src/test/WixToolsetTest.CoreIntegration/CustomActionFixture.cs b/src/test/WixToolsetTest.CoreIntegration/CustomActionFixture.cs index 1cab928e..967c38f8 100644 --- a/src/test/WixToolsetTest.CoreIntegration/CustomActionFixture.cs +++ b/src/test/WixToolsetTest.CoreIntegration/CustomActionFixture.cs @@ -106,6 +106,7 @@ namespace WixToolsetTest.CoreIntegration "CustomAction:DiscardOptimismAllBeingsWhoProceed\t19\t\tAbandon hope all ye who enter here.\t", "InstallExecuteSequence:CostFinalize\t\t1000", "InstallExecuteSequence:CostInitialize\t\t800", + "InstallExecuteSequence:CreateFolders\t\t3700", "InstallExecuteSequence:CustomAction2\t\t801", "InstallExecuteSequence:FileCost\t\t900", "InstallExecuteSequence:FindRelatedProducts\t\t25", @@ -122,6 +123,7 @@ namespace WixToolsetTest.CoreIntegration "InstallExecuteSequence:RegisterUser\t\t6000", "InstallExecuteSequence:RemoveExistingProducts\t\t1401", "InstallExecuteSequence:RemoveFiles\t\t3500", + "InstallExecuteSequence:RemoveFolders\t\t3600", "InstallExecuteSequence:UnpublishFeatures\t\t1800", "InstallExecuteSequence:ValidateProductID\t\t700", "InstallUISequence:CostFinalize\t\t1000", diff --git a/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs b/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs index f5353c87..6409676e 100644 --- a/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs +++ b/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs @@ -590,6 +590,7 @@ namespace WixToolsetTest.CoreIntegration { "InstallExecuteSequence:CostFinalize\t\t1000", "InstallExecuteSequence:CostInitialize\t\t800", + "InstallExecuteSequence:CreateFolders\t\t3700", "InstallExecuteSequence:FileCost\t\t900", "InstallExecuteSequence:FindRelatedProducts\t\t25", "InstallExecuteSequence:InstallFiles\t\t4000", @@ -605,6 +606,7 @@ namespace WixToolsetTest.CoreIntegration "InstallExecuteSequence:RegisterUser\t\t6000", "InstallExecuteSequence:RemoveExistingProducts\t\t1401", "InstallExecuteSequence:RemoveFiles\t\t3500", + "InstallExecuteSequence:RemoveFolders\t\t3600", "InstallExecuteSequence:UnpublishFeatures\t\t1800", "InstallExecuteSequence:ValidateProductID\t\t700", }, results); -- cgit v1.2.3-55-g6feb