diff options
Diffstat (limited to 'src/wix/WixToolset.Core/ExtensibilityServices/ParseHelper.cs')
-rw-r--r-- | src/wix/WixToolset.Core/ExtensibilityServices/ParseHelper.cs | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/src/wix/WixToolset.Core/ExtensibilityServices/ParseHelper.cs b/src/wix/WixToolset.Core/ExtensibilityServices/ParseHelper.cs index 9046f423..9c507dff 100644 --- a/src/wix/WixToolset.Core/ExtensibilityServices/ParseHelper.cs +++ b/src/wix/WixToolset.Core/ExtensibilityServices/ParseHelper.cs | |||
@@ -780,28 +780,9 @@ namespace WixToolset.Core.ExtensibilityServices | |||
780 | Overridable = overridable, | 780 | Overridable = overridable, |
781 | }); | 781 | }); |
782 | 782 | ||
783 | if (null != beforeAction) | 783 | if (beforeAction != null || afterAction != null) |
784 | { | 784 | { |
785 | if (WindowsInstallerStandard.IsStandardAction(beforeAction)) | 785 | this.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.WixAction, sequence.ToString(), beforeAction ?? afterAction); |
786 | { | ||
787 | this.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.WixAction, sequence.ToString(), beforeAction); | ||
788 | } | ||
789 | else | ||
790 | { | ||
791 | this.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.CustomAction, beforeAction); | ||
792 | } | ||
793 | } | ||
794 | |||
795 | if (null != afterAction) | ||
796 | { | ||
797 | if (WindowsInstallerStandard.IsStandardAction(afterAction)) | ||
798 | { | ||
799 | this.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.WixAction, sequence.ToString(), afterAction); | ||
800 | } | ||
801 | else | ||
802 | { | ||
803 | this.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.CustomAction, afterAction); | ||
804 | } | ||
805 | } | 786 | } |
806 | 787 | ||
807 | return actionSymbol; | 788 | return actionSymbol; |