5 files changed, 1 insertions, 18 deletions

diff --git a/src/api/burn/WixToolset.BootstrapperCore.Native/inc/BootstrapperApplication.h b/src/api/burn/WixToolset.BootstrapperCore.Native/inc/BootstrapperApplication.h
index 2ffcf9d6..e5f924c8 100644
--- a/src/api/burn/WixToolset.BootstrapperCore.Native/inc/BootstrapperApplication.h
+++ b/src/api/burn/WixToolset.BootstrapperCore.Native/inc/BootstrapperApplication.h
@@ -23,7 +23,6 @@ enum BOOTSTRAPPER_RESUME_TYPE
     BOOTSTRAPPER_RESUME_TYPE_NONE,
     BOOTSTRAPPER_RESUME_TYPE_INVALID,        // resume information is present but invalid
     BOOTSTRAPPER_RESUME_TYPE_INTERRUPTED,    // relaunched after an unexpected interruption
-    BOOTSTRAPPER_RESUME_TYPE_REBOOT_PENDING, // reboot has not taken place yet
     BOOTSTRAPPER_RESUME_TYPE_REBOOT,         // relaunched after reboot
     BOOTSTRAPPER_RESUME_TYPE_SUSPEND,        // relaunched after suspend
     BOOTSTRAPPER_RESUME_TYPE_ARP,            // launched from ARP
diff --git a/src/api/burn/WixToolset.Mba.Core/IBootstrapperApplication.cs b/src/api/burn/WixToolset.Mba.Core/IBootstrapperApplication.cs
index f0c0b7ec..c6a8fc14 100644
--- a/src/api/burn/WixToolset.Mba.Core/IBootstrapperApplication.cs
+++ b/src/api/burn/WixToolset.Mba.Core/IBootstrapperApplication.cs
@@ -1394,11 +1394,6 @@ namespace WixToolset.Mba.Core
         Interrupted,
 
         /// <summary>
-        /// A reboot is pending.
-        /// </summary>
-        RebootPending,
-
-        /// <summary>
         /// The bundle was re-launched after a reboot.
         /// </summary>
         Reboot,
diff --git a/src/burn/engine/apply.cpp b/src/burn/engine/apply.cpp
index 0467132e..dfaba3f2 100644
--- a/src/burn/engine/apply.cpp
+++ b/src/burn/engine/apply.cpp
@@ -387,7 +387,7 @@ extern "C" HRESULT ApplyRegister(
     ExitOnRootFailure(hr, "BA aborted register begin.");
 
     // If we have a resume mode that suggests the bundle is on the machine.
-    if (BOOTSTRAPPER_RESUME_TYPE_REBOOT_PENDING < pEngineState->command.resumeType)
+    if (BOOTSTRAPPER_RESUME_TYPE_REBOOT <= pEngineState->command.resumeType)
     {
         // resume previous session
         if (pEngineState->registration.fPerMachine)
diff --git a/src/burn/engine/core.cpp b/src/burn/engine/core.cpp
index 812c7261..96845655 100644
--- a/src/burn/engine/core.cpp
+++ b/src/burn/engine/core.cpp
@@ -676,16 +676,6 @@ extern "C" HRESULT CoreApply(
 
     pEngineState->plan.fAffectedMachineState = pEngineState->plan.fCanAffectMachineState;
 
-    // Abort if could affect machine state and this bundle already requires a restart.
-    if (pEngineState->plan.fCanAffectMachineState && BOOTSTRAPPER_RESUME_TYPE_REBOOT_PENDING == pEngineState->command.resumeType)
-    {
-        restart = BOOTSTRAPPER_APPLY_RESTART_REQUIRED;
-
-        hr = HRESULT_FROM_WIN32(ERROR_FAIL_NOACTION_REBOOT);
-        UserExperienceSendError(&pEngineState->userExperience, BOOTSTRAPPER_ERROR_TYPE_APPLY, NULL, hr, NULL, MB_ICONERROR | MB_OK, IDNOACTION); // ignore return value.
-        ExitFunction();
-    }
-
     hr = ApplyLock(FALSE, &hLock);
     ExitOnFailure(hr, "Another per-user setup is already executing.");
 
diff --git a/src/burn/test/BurnUnitTest/RegistrationTest.cpp b/src/burn/test/BurnUnitTest/RegistrationTest.cpp
index 3cf15d10..dbcd2613 100644
--- a/src/burn/test/BurnUnitTest/RegistrationTest.cpp
+++ b/src/burn/test/BurnUnitTest/RegistrationTest.cpp
@@ -854,7 +854,6 @@ namespace Bootstrapper
     //BOOTSTRAPPER_RESUME_TYPE_NONE,
     //BOOTSTRAPPER_RESUME_TYPE_INVALID,        // resume information is present but invalid
     //BOOTSTRAPPER_RESUME_TYPE_UNEXPECTED,     // relaunched after an unexpected interruption
-    //BOOTSTRAPPER_RESUME_TYPE_REBOOT_PENDING, // reboot has not taken place yet
     //BOOTSTRAPPER_RESUME_TYPE_REBOOT,         // relaunched after reboot
     //BOOTSTRAPPER_RESUME_TYPE_SUSPEND,        // relaunched after suspend
     //BOOTSTRAPPER_RESUME_TYPE_ARP,            // launched from ARP