diff options
Diffstat (limited to 'src/WixToolset.Mba.Core')
| -rw-r--r-- | src/WixToolset.Mba.Core/BootstrapperApplication.cs | 4 | ||||
| -rw-r--r-- | src/WixToolset.Mba.Core/EventArgs.cs | 13 | ||||
| -rw-r--r-- | src/WixToolset.Mba.Core/IBootstrapperApplication.cs | 1 |
3 files changed, 13 insertions, 5 deletions
diff --git a/src/WixToolset.Mba.Core/BootstrapperApplication.cs b/src/WixToolset.Mba.Core/BootstrapperApplication.cs index f8ac2a1e..249c17c9 100644 --- a/src/WixToolset.Mba.Core/BootstrapperApplication.cs +++ b/src/WixToolset.Mba.Core/BootstrapperApplication.cs | |||
| @@ -1466,9 +1466,9 @@ namespace WixToolset.Mba.Core | |||
| 1466 | return args.HResult; | 1466 | return args.HResult; |
| 1467 | } | 1467 | } |
| 1468 | 1468 | ||
| 1469 | int IBootstrapperApplication.OnExecutePackageBegin(string wzPackageId, bool fExecute, ref bool fCancel) | 1469 | int IBootstrapperApplication.OnExecutePackageBegin(string wzPackageId, bool fExecute, ActionState action, ref bool fCancel) |
| 1470 | { | 1470 | { |
| 1471 | ExecutePackageBeginEventArgs args = new ExecutePackageBeginEventArgs(wzPackageId, fExecute, fCancel); | 1471 | ExecutePackageBeginEventArgs args = new ExecutePackageBeginEventArgs(wzPackageId, fExecute, action, fCancel); |
| 1472 | this.OnExecutePackageBegin(args); | 1472 | this.OnExecutePackageBegin(args); |
| 1473 | 1473 | ||
| 1474 | fCancel = args.Cancel; | 1474 | fCancel = args.Cancel; |
diff --git a/src/WixToolset.Mba.Core/EventArgs.cs b/src/WixToolset.Mba.Core/EventArgs.cs index 83c0c96a..ca0fa173 100644 --- a/src/WixToolset.Mba.Core/EventArgs.cs +++ b/src/WixToolset.Mba.Core/EventArgs.cs | |||
| @@ -1501,13 +1501,15 @@ namespace WixToolset.Mba.Core | |||
| 1501 | /// Creates a new instance of the <see cref="ExecutePackageBeginEventArgs"/> class. | 1501 | /// Creates a new instance of the <see cref="ExecutePackageBeginEventArgs"/> class. |
| 1502 | /// </summary> | 1502 | /// </summary> |
| 1503 | /// <param name="packageId">The identity of the package to act on.</param> | 1503 | /// <param name="packageId">The identity of the package to act on.</param> |
| 1504 | /// <param name="shouldExecute">Whether the package should really be acted on.</param> | 1504 | /// <param name="shouldExecute">Whether the package is being executed or rolled back.</param> |
| 1505 | /// <param name="action">The action about to be executed.</param> | ||
| 1505 | /// <param name="cancelRecommendation">The recommendation from the engine.</param> | 1506 | /// <param name="cancelRecommendation">The recommendation from the engine.</param> |
| 1506 | public ExecutePackageBeginEventArgs(string packageId, bool shouldExecute, bool cancelRecommendation) | 1507 | public ExecutePackageBeginEventArgs(string packageId, bool shouldExecute, ActionState action, bool cancelRecommendation) |
| 1507 | : base(cancelRecommendation) | 1508 | : base(cancelRecommendation) |
| 1508 | { | 1509 | { |
| 1509 | this.PackageId = packageId; | 1510 | this.PackageId = packageId; |
| 1510 | this.ShouldExecute = shouldExecute; | 1511 | this.ShouldExecute = shouldExecute; |
| 1512 | this.Action = action; | ||
| 1511 | } | 1513 | } |
| 1512 | 1514 | ||
| 1513 | /// <summary> | 1515 | /// <summary> |
| @@ -1516,9 +1518,14 @@ namespace WixToolset.Mba.Core | |||
| 1516 | public string PackageId { get; private set; } | 1518 | public string PackageId { get; private set; } |
| 1517 | 1519 | ||
| 1518 | /// <summary> | 1520 | /// <summary> |
| 1519 | /// Gets whether the package should really be acted on. | 1521 | /// Gets whether the package is being executed or rolled back. |
| 1520 | /// </summary> | 1522 | /// </summary> |
| 1521 | public bool ShouldExecute { get; private set; } | 1523 | public bool ShouldExecute { get; private set; } |
| 1524 | |||
| 1525 | /// <summary> | ||
| 1526 | /// Gets the action about to be executed. | ||
| 1527 | /// </summary> | ||
| 1528 | public ActionState Action { get; private set; } | ||
| 1522 | } | 1529 | } |
| 1523 | 1530 | ||
| 1524 | /// <summary> | 1531 | /// <summary> |
diff --git a/src/WixToolset.Mba.Core/IBootstrapperApplication.cs b/src/WixToolset.Mba.Core/IBootstrapperApplication.cs index 8e5d2aeb..c4daaf32 100644 --- a/src/WixToolset.Mba.Core/IBootstrapperApplication.cs +++ b/src/WixToolset.Mba.Core/IBootstrapperApplication.cs | |||
| @@ -392,6 +392,7 @@ namespace WixToolset.Mba.Core | |||
| 392 | int OnExecutePackageBegin( | 392 | int OnExecutePackageBegin( |
| 393 | [MarshalAs(UnmanagedType.LPWStr)] string wzPackageId, | 393 | [MarshalAs(UnmanagedType.LPWStr)] string wzPackageId, |
| 394 | [MarshalAs(UnmanagedType.Bool)] bool fExecute, | 394 | [MarshalAs(UnmanagedType.Bool)] bool fExecute, |
| 395 | [MarshalAs(UnmanagedType.U4)] ActionState action, | ||
| 395 | [MarshalAs(UnmanagedType.Bool)] ref bool fCancel | 396 | [MarshalAs(UnmanagedType.Bool)] ref bool fCancel |
| 396 | ); | 397 | ); |
| 397 | 398 | ||
