diff options
| author | Rob Mensching <rob@firegiant.com> | 2019-05-08 14:13:31 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2019-05-08 14:44:43 -0700 |
| commit | 75fd55d5a71c492c6ea904768858c51aa97da29f (patch) | |
| tree | 610047db1d5759a726ce88277bb2dfddcd01da45 /src/WixToolset.Core.WindowsInstaller/Bind/SequenceActionsCommand.cs | |
| parent | d1dbe29f3856d012acf5f96e8e66c43b74ab490d (diff) | |
| download | wix-75fd55d5a71c492c6ea904768858c51aa97da29f.tar.gz wix-75fd55d5a71c492c6ea904768858c51aa97da29f.tar.bz2 wix-75fd55d5a71c492c6ea904768858c51aa97da29f.zip | |
Use new strongly typed tuples
Diffstat (limited to 'src/WixToolset.Core.WindowsInstaller/Bind/SequenceActionsCommand.cs')
| -rw-r--r-- | src/WixToolset.Core.WindowsInstaller/Bind/SequenceActionsCommand.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/SequenceActionsCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/SequenceActionsCommand.cs index 20df1fe8..f1a47f70 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/SequenceActionsCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/SequenceActionsCommand.cs | |||
| @@ -9,6 +9,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 9 | using WixToolset.Core.Native; | 9 | using WixToolset.Core.Native; |
| 10 | using WixToolset.Data; | 10 | using WixToolset.Data; |
| 11 | using WixToolset.Data.Tuples; | 11 | using WixToolset.Data.Tuples; |
| 12 | using WixToolset.Data.WindowsInstaller; | ||
| 12 | using WixToolset.Extensibility.Services; | 13 | using WixToolset.Extensibility.Services; |
| 13 | 14 | ||
| 14 | internal class SequenceActionsCommand | 15 | internal class SequenceActionsCommand |
| @@ -184,7 +185,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 184 | } | 185 | } |
| 185 | else | 186 | else |
| 186 | { | 187 | { |
| 187 | scheduledActionRows = ScheduleActions(requiredActionRows); | 188 | scheduledActionRows = this.ScheduleActions(requiredActionRows); |
| 188 | } | 189 | } |
| 189 | 190 | ||
| 190 | // Remove all existing WixActionTuples from the section then add the | 191 | // Remove all existing WixActionTuples from the section then add the |
| @@ -537,7 +538,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 537 | 538 | ||
| 538 | // Only add the MigrateFeatureStates action if MigrateFeature attribute is set on | 539 | // Only add the MigrateFeatureStates action if MigrateFeature attribute is set on |
| 539 | // at least one UpgradeVersion element. | 540 | // at least one UpgradeVersion element. |
| 540 | if (this.Section.Tuples.OfType<UpgradeTuple>().Any(t => (t.Attributes & MsiInterop.MsidbUpgradeAttributesMigrateFeatures) == MsiInterop.MsidbUpgradeAttributesMigrateFeatures)) | 541 | if (this.Section.Tuples.OfType<UpgradeTuple>().Any(t => t.MigrateFeatures)) |
| 541 | { | 542 | { |
| 542 | set.Add("InstallExecuteSequence/MigrateFeatureStates"); | 543 | set.Add("InstallExecuteSequence/MigrateFeatureStates"); |
| 543 | set.Add("InstallUISequence/MigrateFeatureStates"); | 544 | set.Add("InstallUISequence/MigrateFeatureStates"); |
