diff options
Diffstat (limited to 'src/WixToolset.Core.Burn/Bundles/OrderPackagesAndRollbackBoundariesCommand.cs')
-rw-r--r-- | src/WixToolset.Core.Burn/Bundles/OrderPackagesAndRollbackBoundariesCommand.cs | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/WixToolset.Core.Burn/Bundles/OrderPackagesAndRollbackBoundariesCommand.cs b/src/WixToolset.Core.Burn/Bundles/OrderPackagesAndRollbackBoundariesCommand.cs index 19fd7619..ccf6b1c2 100644 --- a/src/WixToolset.Core.Burn/Bundles/OrderPackagesAndRollbackBoundariesCommand.cs +++ b/src/WixToolset.Core.Burn/Bundles/OrderPackagesAndRollbackBoundariesCommand.cs | |||
@@ -6,13 +6,12 @@ namespace WixToolset.Core.Burn.Bundles | |||
6 | using System.Collections.Generic; | 6 | using System.Collections.Generic; |
7 | using System.Linq; | 7 | using System.Linq; |
8 | using WixToolset.Data; | 8 | using WixToolset.Data; |
9 | using WixToolset.Data.Burn; | ||
9 | using WixToolset.Data.Symbols; | 10 | using WixToolset.Data.Symbols; |
10 | using WixToolset.Extensibility.Services; | 11 | using WixToolset.Extensibility.Services; |
11 | 12 | ||
12 | internal class OrderPackagesAndRollbackBoundariesCommand | 13 | internal class OrderPackagesAndRollbackBoundariesCommand |
13 | { | 14 | { |
14 | private const string DefaultBoundaryId = "WixDefaultBoundary"; | ||
15 | |||
16 | public OrderPackagesAndRollbackBoundariesCommand(IMessaging messaging, IntermediateSection section, IDictionary<string, PackageFacade> packageFacades) | 15 | public OrderPackagesAndRollbackBoundariesCommand(IMessaging messaging, IntermediateSection section, IDictionary<string, PackageFacade> packageFacades) |
17 | { | 16 | { |
18 | this.Messaging = messaging; | 17 | this.Messaging = messaging; |
@@ -47,14 +46,14 @@ namespace WixToolset.Core.Burn.Bundles | |||
47 | // We handle uninstall (aka: backwards) rollback boundaries after | 46 | // We handle uninstall (aka: backwards) rollback boundaries after |
48 | // we get these install/repair (aka: forward) rollback boundaries | 47 | // we get these install/repair (aka: forward) rollback boundaries |
49 | // defined. | 48 | // defined. |
50 | var pendingRollbackBoundary = new WixBundleRollbackBoundarySymbol(null, new Identifier(AccessModifier.Section, DefaultBoundaryId)) { Vital = true }; | 49 | var pendingRollbackBoundary = new WixBundleRollbackBoundarySymbol(null, new Identifier(AccessModifier.Section, BurnConstants.BundleDefaultBoundaryId)) { Vital = true }; |
51 | var lastRollbackBoundary = pendingRollbackBoundary; | 50 | var lastRollbackBoundary = pendingRollbackBoundary; |
52 | var boundaryHadX86Package = false; | 51 | var boundaryHadX86Package = false; |
53 | var warnedMsiTransaction = false; | 52 | var warnedMsiTransaction = false; |
54 | 53 | ||
55 | foreach (var groupSymbol in groupSymbols) | 54 | foreach (var groupSymbol in groupSymbols) |
56 | { | 55 | { |
57 | if (ComplexReferenceChildType.Package == groupSymbol.ChildType && ComplexReferenceParentType.PackageGroup == groupSymbol.ParentType && "WixChain" == groupSymbol.ParentId) | 56 | if (ComplexReferenceChildType.Package == groupSymbol.ChildType && ComplexReferenceParentType.PackageGroup == groupSymbol.ParentType && BurnConstants.BundleChainPackageGroupId == groupSymbol.ParentId) |
58 | { | 57 | { |
59 | if (this.PackageFacades.TryGetValue(groupSymbol.ChildId, out var facade)) | 58 | if (this.PackageFacades.TryGetValue(groupSymbol.ChildId, out var facade)) |
60 | { | 59 | { |
@@ -63,7 +62,7 @@ namespace WixToolset.Core.Burn.Bundles | |||
63 | if (null != pendingRollbackBoundary) | 62 | if (null != pendingRollbackBoundary) |
64 | { | 63 | { |
65 | // If we used the default boundary, ensure the symbol is added to the section. | 64 | // If we used the default boundary, ensure the symbol is added to the section. |
66 | if (pendingRollbackBoundary.Id.Id == DefaultBoundaryId) | 65 | if (pendingRollbackBoundary.Id.Id == BurnConstants.BundleDefaultBoundaryId) |
67 | { | 66 | { |
68 | this.Section.AddSymbol(pendingRollbackBoundary); | 67 | this.Section.AddSymbol(pendingRollbackBoundary); |
69 | } | 68 | } |
@@ -97,7 +96,7 @@ namespace WixToolset.Core.Burn.Bundles | |||
97 | var nextRollbackBoundary = boundariesById[groupSymbol.ChildId]; | 96 | var nextRollbackBoundary = boundariesById[groupSymbol.ChildId]; |
98 | if (null != pendingRollbackBoundary) | 97 | if (null != pendingRollbackBoundary) |
99 | { | 98 | { |
100 | if (pendingRollbackBoundary.Id.Id != DefaultBoundaryId) | 99 | if (pendingRollbackBoundary.Id.Id != BurnConstants.BundleDefaultBoundaryId) |
101 | { | 100 | { |
102 | this.Messaging.Write(WarningMessages.DiscardedRollbackBoundary(nextRollbackBoundary.SourceLineNumbers, nextRollbackBoundary.Id.Id)); | 101 | this.Messaging.Write(WarningMessages.DiscardedRollbackBoundary(nextRollbackBoundary.SourceLineNumbers, nextRollbackBoundary.Id.Id)); |
103 | } | 102 | } |