Automatically uninstall the bundle after Quit if eligible.

For now, the requirements are:
* The bundle is installed and
* The bundle is per-user or has already elevated and
* No non-permanent packages are installed and
* No non-permanent packages are cached and
* No related bundle would run by default during uninstall and
* The bundle didn't Uninstall/Cache/Install/Modify/Repair and
* The BA didn't opt out of this behavior

1 files changed, 4 insertions, 0 deletions

diff --git a/src/WixToolset.BootstrapperCore.Native/inc/BootstrapperApplication.h b/src/WixToolset.BootstrapperCore.Native/inc/BootstrapperApplication.h
index c0baa958..48bd813d 100644
--- a/src/WixToolset.BootstrapperCore.Native/inc/BootstrapperApplication.h
+++ b/src/WixToolset.BootstrapperCore.Native/inc/BootstrapperApplication.h
@@ -221,6 +221,9 @@ enum BOOTSTRAPPER_SHUTDOWN_ACTION
     // restart the engine which will load the bootstrapper application again.
     // Typically used to switch from a native bootstrapper application to a managed one.
     BOOTSTRAPPER_SHUTDOWN_ACTION_RELOAD_BOOTSTRAPPER,
+    // Opts out of the engine behavior of trying to uninstall itself
+    // when no non-permanent packages are installed.
+    BOOTSTRAPPER_SHUTDOWN_ACTION_SKIP_CLEANUP,
 };
 
 enum BURN_MSI_PROPERTY
@@ -470,6 +473,7 @@ struct BA_ONDETECTCOMPLETE_ARGS
 {
     DWORD cbSize;
     HRESULT hrStatus;
+    BOOL fEligibleForCleanup;
 };
 
 struct BA_ONDETECTCOMPLETE_RESULTS