summaryrefslogtreecommitdiff
path: root/src/api/burn/WixToolset.Mba.Core/BootstrapperApplication.cs
diff options
context:
space:
mode:
authorNir Bar <nir.bar@panel-sw.co.il>2022-12-06 13:22:41 +0200
committerSean Hall <r.sean.hall@gmail.com>2022-12-12 21:50:39 -0600
commit50e24e9cf2084b6cb67b5d8fc509163061408bb6 (patch)
tree05c9df57480eb6308c3462c13847b43288f9dbb4 /src/api/burn/WixToolset.Mba.Core/BootstrapperApplication.cs
parentc54f3083489827a1e57c6fd7f3d76f62ddc6e85e (diff)
downloadwix-50e24e9cf2084b6cb67b5d8fc509163061408bb6.tar.gz
wix-50e24e9cf2084b6cb67b5d8fc509163061408bb6.tar.bz2
wix-50e24e9cf2084b6cb67b5d8fc509163061408bb6.zip
Use MSI transaction end result to detect whether reboot is needed
Diffstat (limited to 'src/api/burn/WixToolset.Mba.Core/BootstrapperApplication.cs')
-rw-r--r--src/api/burn/WixToolset.Mba.Core/BootstrapperApplication.cs12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/api/burn/WixToolset.Mba.Core/BootstrapperApplication.cs b/src/api/burn/WixToolset.Mba.Core/BootstrapperApplication.cs
index ecc99069..b23cb3b2 100644
--- a/src/api/burn/WixToolset.Mba.Core/BootstrapperApplication.cs
+++ b/src/api/burn/WixToolset.Mba.Core/BootstrapperApplication.cs
@@ -60,7 +60,7 @@ namespace WixToolset.Mba.Core
60 60
61 /// <inheritdoc/> 61 /// <inheritdoc/>
62 public event EventHandler<DetectCompatibleMsiPackageEventArgs> DetectCompatibleMsiPackage; 62 public event EventHandler<DetectCompatibleMsiPackageEventArgs> DetectCompatibleMsiPackage;
63 63
64 /// <inheritdoc/> 64 /// <inheritdoc/>
65 public event EventHandler<DetectRelatedMsiPackageEventArgs> DetectRelatedMsiPackage; 65 public event EventHandler<DetectRelatedMsiPackageEventArgs> DetectRelatedMsiPackage;
66 66
@@ -1985,11 +1985,12 @@ namespace WixToolset.Mba.Core
1985 return args.HResult; 1985 return args.HResult;
1986 } 1986 }
1987 1987
1988 int IBootstrapperApplication.OnCommitMsiTransactionComplete(string transactionId, int hrStatus) 1988 int IBootstrapperApplication.OnCommitMsiTransactionComplete(string transactionId, int hrStatus, ApplyRestart restart, BOOTSTRAPPER_EXECUTEMSITRANSACTIONCOMPLETE_ACTION recommendation, ref BOOTSTRAPPER_EXECUTEMSITRANSACTIONCOMPLETE_ACTION pAction)
1989 { 1989 {
1990 CommitMsiTransactionCompleteEventArgs args = new CommitMsiTransactionCompleteEventArgs(transactionId, hrStatus); 1990 CommitMsiTransactionCompleteEventArgs args = new CommitMsiTransactionCompleteEventArgs(transactionId, hrStatus, restart, recommendation, pAction);
1991 this.OnCommitMsiTransactionComplete(args); 1991 this.OnCommitMsiTransactionComplete(args);
1992 1992
1993 pAction = args.Action;
1993 return args.HResult; 1994 return args.HResult;
1994 } 1995 }
1995 1996
@@ -2001,11 +2002,12 @@ namespace WixToolset.Mba.Core
2001 return args.HResult; 2002 return args.HResult;
2002 } 2003 }
2003 2004
2004 int IBootstrapperApplication.OnRollbackMsiTransactionComplete(string transactionId, int hrStatus) 2005 int IBootstrapperApplication.OnRollbackMsiTransactionComplete(string transactionId, int hrStatus, ApplyRestart restart, BOOTSTRAPPER_EXECUTEMSITRANSACTIONCOMPLETE_ACTION recommendation, ref BOOTSTRAPPER_EXECUTEMSITRANSACTIONCOMPLETE_ACTION pAction)
2005 { 2006 {
2006 RollbackMsiTransactionCompleteEventArgs args = new RollbackMsiTransactionCompleteEventArgs(transactionId, hrStatus); 2007 RollbackMsiTransactionCompleteEventArgs args = new RollbackMsiTransactionCompleteEventArgs(transactionId, hrStatus, restart, recommendation, pAction);
2007 this.OnRollbackMsiTransactionComplete(args); 2008 this.OnRollbackMsiTransactionComplete(args);
2008 2009
2010 pAction = args.Action;
2009 return args.HResult; 2011 return args.HResult;
2010 } 2012 }
2011 2013