diff options
Diffstat (limited to 'src/WixToolset.Core/Compiler_2.cs')
-rw-r--r-- | src/WixToolset.Core/Compiler_2.cs | 51 |
1 files changed, 2 insertions, 49 deletions
diff --git a/src/WixToolset.Core/Compiler_2.cs b/src/WixToolset.Core/Compiler_2.cs index f42c9da1..0efaec6e 100644 --- a/src/WixToolset.Core/Compiler_2.cs +++ b/src/WixToolset.Core/Compiler_2.cs | |||
@@ -4126,18 +4126,7 @@ namespace WixToolset.Core | |||
4126 | 4126 | ||
4127 | foreach (var sequence in sequences) | 4127 | foreach (var sequence in sequences) |
4128 | { | 4128 | { |
4129 | var sequenceId = new Identifier(AccessModifier.Public, sequence.ToString(), actionName); | 4129 | this.Core.ScheduleActionTuple(sourceLineNumbers, AccessModifier.Public, sequence, actionName, condition, afterAction: "CostInitialize"); |
4130 | |||
4131 | var sequenceTuple = new WixActionTuple(sourceLineNumbers, sequenceId) | ||
4132 | { | ||
4133 | SequenceTable = sequence, | ||
4134 | Action = actionName, | ||
4135 | Condition = condition, | ||
4136 | After = "CostInialize", | ||
4137 | Overridable = false | ||
4138 | }; | ||
4139 | |||
4140 | this.Core.AddTuple(tuple); | ||
4141 | } | 4130 | } |
4142 | } | 4131 | } |
4143 | } | 4132 | } |
@@ -4287,43 +4276,7 @@ namespace WixToolset.Core | |||
4287 | 4276 | ||
4288 | foreach (var sequence in sequences) | 4277 | foreach (var sequence in sequences) |
4289 | { | 4278 | { |
4290 | var sequenceId = new Identifier(AccessModifier.Public, sequence.ToString(), actionName); | 4279 | this.Core.ScheduleActionTuple(sourceLineNumbers, AccessModifier.Public, sequence, actionName, condition, beforeAction, afterAction); |
4291 | |||
4292 | var sequenceTuple = new WixActionTuple(sourceLineNumbers, sequenceId) | ||
4293 | { | ||
4294 | SequenceTable = sequence, | ||
4295 | Action = actionName, | ||
4296 | Condition = condition, | ||
4297 | Before = beforeAction, | ||
4298 | After = afterAction, | ||
4299 | Overridable = false | ||
4300 | }; | ||
4301 | |||
4302 | this.Core.AddTuple(tuple); | ||
4303 | |||
4304 | if (null != beforeAction) | ||
4305 | { | ||
4306 | if (WindowsInstallerStandard.IsStandardAction(beforeAction)) | ||
4307 | { | ||
4308 | this.Core.CreateSimpleReference(sourceLineNumbers, "WixAction", sequence.ToString(), beforeAction); | ||
4309 | } | ||
4310 | else | ||
4311 | { | ||
4312 | this.Core.CreateSimpleReference(sourceLineNumbers, "CustomAction", beforeAction); | ||
4313 | } | ||
4314 | } | ||
4315 | |||
4316 | if (null != afterAction) | ||
4317 | { | ||
4318 | if (WindowsInstallerStandard.IsStandardAction(afterAction)) | ||
4319 | { | ||
4320 | this.Core.CreateSimpleReference(sourceLineNumbers, "WixAction", sequence.ToString(), afterAction); | ||
4321 | } | ||
4322 | else | ||
4323 | { | ||
4324 | this.Core.CreateSimpleReference(sourceLineNumbers, "CustomAction", afterAction); | ||
4325 | } | ||
4326 | } | ||
4327 | } | 4280 | } |
4328 | } | 4281 | } |
4329 | } | 4282 | } |