Allow the BA to override the bundle relation type during plan.

4 files changed, 121 insertions, 1 deletions

diff --git a/src/api/burn/WixToolset.Mba.Core/BootstrapperApplication.cs b/src/api/burn/WixToolset.Mba.Core/BootstrapperApplication.cs
index 1df992be..fd36cf26 100644
--- a/src/api/burn/WixToolset.Mba.Core/BootstrapperApplication.cs
+++ b/src/api/burn/WixToolset.Mba.Core/BootstrapperApplication.cs
@@ -89,6 +89,9 @@ namespace WixToolset.Mba.Core
         public event EventHandler<PlanRelatedBundleEventArgs> PlanRelatedBundle;
 
         /// <inheritdoc/>
+        public event EventHandler<PlanRelatedBundleTypeEventArgs> PlanRelatedBundleType;
+
+        /// <inheritdoc/>
         public event EventHandler<PlanRollbackBoundaryEventArgs> PlanRollbackBoundary;
 
         /// <inheritdoc/>
@@ -534,6 +537,19 @@ namespace WixToolset.Mba.Core
         }
 
         /// <summary>
+        /// Called by the engine, raises the <see cref="PlanRelatedBundleType"/> event.
+        /// </summary>
+        /// <param name="args">Additional arguments for this event.</param>
+        protected virtual void OnPlanRelatedBundleType(PlanRelatedBundleTypeEventArgs args)
+        {
+            EventHandler<PlanRelatedBundleTypeEventArgs> handler = this.PlanRelatedBundleType;
+            if (null != handler)
+            {
+                handler(this, args);
+            }
+        }
+
+        /// <summary>
         /// Called by the engine, raises the <see cref="PlanRollbackBoundary"/> event.
         /// </summary>
         protected virtual void OnPlanRollbackBoundary(PlanRollbackBoundaryEventArgs args)
@@ -1514,6 +1530,16 @@ namespace WixToolset.Mba.Core
             return args.HResult;
         }
 
+        int IBootstrapperApplication.OnPlanRelatedBundleType(string wzBundleId, RelatedBundlePlanType recommendedType, ref RelatedBundlePlanType pRequestedType, ref bool fCancel)
+        {
+            PlanRelatedBundleTypeEventArgs args = new PlanRelatedBundleTypeEventArgs(wzBundleId, recommendedType, pRequestedType, fCancel);
+            this.OnPlanRelatedBundleType(args);
+
+            pRequestedType = args.Type;
+            fCancel = args.Cancel;
+            return args.HResult;
+        }
+
         int IBootstrapperApplication.OnPlanRollbackBoundary(string wzRollbackBoundaryId, bool fRecommendedTransaction, ref bool fTransaction, ref bool fCancel)
         {
             PlanRollbackBoundaryEventArgs args = new PlanRollbackBoundaryEventArgs(wzRollbackBoundaryId, fRecommendedTransaction, fTransaction, fCancel);
diff --git a/src/api/burn/WixToolset.Mba.Core/EventArgs.cs b/src/api/burn/WixToolset.Mba.Core/EventArgs.cs
index 816757cc..d8ec7998 100644
--- a/src/api/burn/WixToolset.Mba.Core/EventArgs.cs
+++ b/src/api/burn/WixToolset.Mba.Core/EventArgs.cs
@@ -746,6 +746,37 @@ namespace WixToolset.Mba.Core
     }
 
     /// <summary>
+    /// Event arguments for <see cref="IDefaultBootstrapperApplication.PlanRelatedBundleType"/>
+    /// </summary>
+    [Serializable]
+    public class PlanRelatedBundleTypeEventArgs : CancellableHResultEventArgs
+    {
+        /// <summary />
+        public PlanRelatedBundleTypeEventArgs(string bundleId, RelatedBundlePlanType recommendedType, RelatedBundlePlanType type, bool cancelRecommendation)
+            : base(cancelRecommendation)
+        {
+            this.BundleId = bundleId;
+            this.RecommendedType = recommendedType;
+            this.Type = type;
+        }
+
+        /// <summary>
+        /// Gets the identity of the bundle to plan for.
+        /// </summary>
+        public string BundleId { get; private set; }
+
+        /// <summary>
+        /// Gets the recommended plan type for the bundle.
+        /// </summary>
+        public RelatedBundlePlanType RecommendedType { get; private set; }
+
+        /// <summary>
+        /// Gets or sets the plan type for the bundle.
+        /// </summary>
+        public RelatedBundlePlanType Type { get; set; }
+    }
+
+    /// <summary>
     /// Event arguments for <see cref="IDefaultBootstrapperApplication.PlanPackageBegin"/>
     /// </summary>
     [Serializable]
diff --git a/src/api/burn/WixToolset.Mba.Core/IBootstrapperApplication.cs b/src/api/burn/WixToolset.Mba.Core/IBootstrapperApplication.cs
index 489e3b6d..4ab0f8d9 100644
--- a/src/api/burn/WixToolset.Mba.Core/IBootstrapperApplication.cs
+++ b/src/api/burn/WixToolset.Mba.Core/IBootstrapperApplication.cs
@@ -1148,6 +1148,18 @@ namespace WixToolset.Mba.Core
             [MarshalAs(UnmanagedType.U4)] ref RequestState pRequestedState,
             [MarshalAs(UnmanagedType.Bool)] ref bool fCancel
             );
+
+        /// <summary>
+        /// See <see cref="IDefaultBootstrapperApplication.PlanRelatedBundleType"/>.
+        /// </summary>
+        [PreserveSig]
+        [return: MarshalAs(UnmanagedType.I4)]
+        int OnPlanRelatedBundleType(
+            [MarshalAs(UnmanagedType.LPWStr)] string wzBundleId,
+            [MarshalAs(UnmanagedType.U4)] RelatedBundlePlanType recommendedType,
+            [MarshalAs(UnmanagedType.U4)] ref RelatedBundlePlanType pRequestedType,
+            [MarshalAs(UnmanagedType.Bool)] ref bool fCancel
+            );
     }
 
     /// <summary>
@@ -1669,7 +1681,12 @@ namespace WixToolset.Mba.Core
         /// <summary>
         /// 
         /// </summary>
-        Dependent,
+        DependentAddon,
+
+        /// <summary>
+        /// 
+        /// </summary>
+        DependentPatch,
 
         /// <summary>
         /// 
@@ -1678,6 +1695,47 @@ namespace WixToolset.Mba.Core
     }
 
     /// <summary>
+    /// The planned relation type for related bundles.
+    /// </summary>
+    public enum RelatedBundlePlanType
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        None,
+
+        /// <summary>
+        /// 
+        /// </summary>
+        Downgrade,
+
+        /// <summary>
+        /// 
+        /// </summary>
+        Upgrade,
+
+        /// <summary>
+        /// 
+        /// </summary>
+        Addon,
+
+        /// <summary>
+        /// 
+        /// </summary>
+        Patch,
+
+        /// <summary>
+        /// 
+        /// </summary>
+        DependentAddon,
+
+        /// <summary>
+        /// 
+        /// </summary>
+        DependentPatch,
+    }
+
+    /// <summary>
     /// One or more reasons why the application is requested to be closed or is being closed.
     /// </summary>
     [Flags]
diff --git a/src/api/burn/WixToolset.Mba.Core/IDefaultBootstrapperApplication.cs b/src/api/burn/WixToolset.Mba.Core/IDefaultBootstrapperApplication.cs
index c237cb9d..ebd1580b 100644
--- a/src/api/burn/WixToolset.Mba.Core/IDefaultBootstrapperApplication.cs
+++ b/src/api/burn/WixToolset.Mba.Core/IDefaultBootstrapperApplication.cs
@@ -334,6 +334,11 @@ namespace WixToolset.Mba.Core
         event EventHandler<PlanRelatedBundleEventArgs> PlanRelatedBundle;
 
         /// <summary>
+        /// Fired when the engine has begun planning the related bundle relation type.
+        /// </summary>
+        event EventHandler<PlanRelatedBundleTypeEventArgs> PlanRelatedBundleType;
+
+        /// <summary>
         /// Fired when the engine has begun planning an upgrade related bundle for restoring in case of failure.
         /// </summary>
         event EventHandler<PlanRestoreRelatedBundleEventArgs> PlanRestoreRelatedBundle;