Add RepairCondition.

Fixes 6758

5 files changed, 21 insertions, 4 deletions

diff --git a/src/api/burn/WixToolset.Mba.Core/BootstrapperApplication.cs b/src/api/burn/WixToolset.Mba.Core/BootstrapperApplication.cs
index 41738bf6..6738a4a6 100644
--- a/src/api/burn/WixToolset.Mba.Core/BootstrapperApplication.cs
+++ b/src/api/burn/WixToolset.Mba.Core/BootstrapperApplication.cs
@@ -1598,9 +1598,9 @@ namespace WixToolset.Mba.Core
             return args.HResult;
         }
 
-        int IBootstrapperApplication.OnPlanPackageBegin(string wzPackageId, PackageState state, bool fCached, BOOTSTRAPPER_PACKAGE_CONDITION_RESULT installCondition, RequestState recommendedState, BOOTSTRAPPER_CACHE_TYPE recommendedCacheType, ref RequestState pRequestedState, ref BOOTSTRAPPER_CACHE_TYPE pRequestedCacheType, ref bool fCancel)
+        int IBootstrapperApplication.OnPlanPackageBegin(string wzPackageId, PackageState state, bool fCached, BOOTSTRAPPER_PACKAGE_CONDITION_RESULT installCondition, BOOTSTRAPPER_PACKAGE_CONDITION_RESULT repairCondition, RequestState recommendedState, BOOTSTRAPPER_CACHE_TYPE recommendedCacheType, ref RequestState pRequestedState, ref BOOTSTRAPPER_CACHE_TYPE pRequestedCacheType, ref bool fCancel)
         {
-            PlanPackageBeginEventArgs args = new PlanPackageBeginEventArgs(wzPackageId, state, fCached, installCondition, recommendedState, recommendedCacheType, pRequestedState, pRequestedCacheType, fCancel);
+            PlanPackageBeginEventArgs args = new PlanPackageBeginEventArgs(wzPackageId, state, fCached, installCondition, repairCondition, recommendedState, recommendedCacheType, pRequestedState, pRequestedCacheType, fCancel);
             this.OnPlanPackageBegin(args);
 
             pRequestedState = args.State;
diff --git a/src/api/burn/WixToolset.Mba.Core/EventArgs.cs b/src/api/burn/WixToolset.Mba.Core/EventArgs.cs
index 07b14b3d..d79ac402 100644
--- a/src/api/burn/WixToolset.Mba.Core/EventArgs.cs
+++ b/src/api/burn/WixToolset.Mba.Core/EventArgs.cs
@@ -783,13 +783,14 @@ namespace WixToolset.Mba.Core
     public class PlanPackageBeginEventArgs : CancellableHResultEventArgs
     {
         /// <summary />
-        public PlanPackageBeginEventArgs(string packageId, PackageState currentState, bool cached, BOOTSTRAPPER_PACKAGE_CONDITION_RESULT installCondition, RequestState recommendedState, BOOTSTRAPPER_CACHE_TYPE recommendedCacheType, RequestState state, BOOTSTRAPPER_CACHE_TYPE cacheType, bool cancelRecommendation)
+        public PlanPackageBeginEventArgs(string packageId, PackageState currentState, bool cached, BOOTSTRAPPER_PACKAGE_CONDITION_RESULT installCondition, BOOTSTRAPPER_PACKAGE_CONDITION_RESULT repairCondition, RequestState recommendedState, BOOTSTRAPPER_CACHE_TYPE recommendedCacheType, RequestState state, BOOTSTRAPPER_CACHE_TYPE cacheType, bool cancelRecommendation)
             : base(cancelRecommendation)
         {
             this.PackageId = packageId;
             this.CurrentState = currentState;
             this.Cached = cached;
             this.InstallCondition = installCondition;
+            this.RepairCondition = repairCondition;
             this.RecommendedState = recommendedState;
             this.RecommendedCacheType = recommendedCacheType;
             this.State = state;
@@ -817,6 +818,11 @@ namespace WixToolset.Mba.Core
         public BOOTSTRAPPER_PACKAGE_CONDITION_RESULT InstallCondition { get; private set; }
 
         /// <summary>
+        /// Gets the evaluated result of the package's repair condition.
+        /// </summary>
+        public BOOTSTRAPPER_PACKAGE_CONDITION_RESULT RepairCondition { get; private set; }
+
+        /// <summary>
         /// Gets the recommended requested state for the package.
         /// </summary>
         public RequestState RecommendedState { get; private set; }
diff --git a/src/api/burn/WixToolset.Mba.Core/IBootstrapperApplication.cs b/src/api/burn/WixToolset.Mba.Core/IBootstrapperApplication.cs
index ae642474..2877d4de 100644
--- a/src/api/burn/WixToolset.Mba.Core/IBootstrapperApplication.cs
+++ b/src/api/burn/WixToolset.Mba.Core/IBootstrapperApplication.cs
@@ -314,6 +314,7 @@ namespace WixToolset.Mba.Core
             [MarshalAs(UnmanagedType.U4)] PackageState state,
             [MarshalAs(UnmanagedType.Bool)] bool fCached,
             [MarshalAs(UnmanagedType.U4)] BOOTSTRAPPER_PACKAGE_CONDITION_RESULT installCondition,
+            [MarshalAs(UnmanagedType.U4)] BOOTSTRAPPER_PACKAGE_CONDITION_RESULT repairCondition,
             [MarshalAs(UnmanagedType.U4)] RequestState recommendedState,
             [MarshalAs(UnmanagedType.U4)] BOOTSTRAPPER_CACHE_TYPE recommendedCacheType,
             [MarshalAs(UnmanagedType.U4)] ref RequestState pRequestedState,
diff --git a/src/api/burn/WixToolset.Mba.Core/IPackageInfo.cs b/src/api/burn/WixToolset.Mba.Core/IPackageInfo.cs
index a1d99b10..ee3be820 100644
--- a/src/api/burn/WixToolset.Mba.Core/IPackageInfo.cs
+++ b/src/api/burn/WixToolset.Mba.Core/IPackageInfo.cs
@@ -45,6 +45,11 @@ namespace WixToolset.Mba.Core
         /// <summary>
         /// 
         /// </summary>
+        string RepairCondition { get; }
+
+        /// <summary>
+        /// 
+        /// </summary>
         bool Permanent { get; }
 
         /// <summary>
@@ -87,4 +92,4 @@ namespace WixToolset.Mba.Core
         /// </summary>
         bool Vital { get; }
     }
-}
\ No newline at end of file
+}
diff --git a/src/api/burn/WixToolset.Mba.Core/PackageInfo.cs b/src/api/burn/WixToolset.Mba.Core/PackageInfo.cs
index 39fe4d73..e400cbe4 100644
--- a/src/api/burn/WixToolset.Mba.Core/PackageInfo.cs
+++ b/src/api/burn/WixToolset.Mba.Core/PackageInfo.cs
@@ -102,6 +102,9 @@ namespace WixToolset.Mba.Core
         public string InstallCondition { get; internal set; }
 
         /// <inheritdoc/>
+        public string RepairCondition { get; internal set; }
+
+        /// <inheritdoc/>
         public BOOTSTRAPPER_CACHE_TYPE CacheType { get; internal set; }
 
         /// <inheritdoc/>
@@ -174,6 +177,8 @@ namespace WixToolset.Mba.Core
 
                 package.InstallCondition = BootstrapperApplicationData.GetAttribute(node, "InstallCondition");
 
+                package.RepairCondition = BootstrapperApplicationData.GetAttribute(node, "RepairCondition");
+
                 packagesById.Add(package.Id, package);
             }