Remove MEND.
Sean Hall committed
Dec 7, 2021 at 18:40 UTC
1d58b3333d1d694d08b68f6c87223aa504bfe773
5 files changed
+1
-27
src/api/burn/WixToolset.BootstrapperCore.Native/inc/BootstrapperEngine.h
-2
@@ -37,7 +37,6 @@ enum BOOTSTRAPPER_ACTION_STATE
37
BOOTSTRAPPER_ACTION_STATE_UNINSTALL,
38
BOOTSTRAPPER_ACTION_STATE_INSTALL,
39
BOOTSTRAPPER_ACTION_STATE_MODIFY,
40
- BOOTSTRAPPER_ACTION_STATE_MEND,
40
BOOTSTRAPPER_ACTION_STATE_REPAIR,
41
BOOTSTRAPPER_ACTION_STATE_MINOR_UPGRADE,
42
};
@@ -58,7 +57,6 @@ enum BOOTSTRAPPER_REQUEST_STATE
57
BOOTSTRAPPER_REQUEST_STATE_ABSENT,
58
BOOTSTRAPPER_REQUEST_STATE_CACHE,
59
BOOTSTRAPPER_REQUEST_STATE_PRESENT,
61
- BOOTSTRAPPER_REQUEST_STATE_MEND,
60
BOOTSTRAPPER_REQUEST_STATE_REPAIR,
61
};
62
src/api/burn/WixToolset.Mba.Core/IBootstrapperEngine.cs
-10
@@ -307,11 +307,6 @@ namespace WixToolset.Mba.Core
307
/// </summary>
308
Modify,
309
310
- /// <summary>
311
- ///
312
- /// </summary>
313
- Mend,
314
-
310
/// <summary>
311
///
312
/// </summary>
@@ -492,11 +487,6 @@ namespace WixToolset.Mba.Core
487
/// </summary>
488
Present,
489
495
- /// <summary>
496
- ///
497
- /// </summary>
498
- Mend,
499
-
490
/// <summary>
491
///
492
/// </summary>
src/burn/engine/dependency.cpp
-2
@@ -1045,7 +1045,6 @@ static void CalculateDependencyActionStates(
1045
}
1046
break;
1047
case BOOTSTRAPPER_REQUEST_STATE_PRESENT: __fallthrough;
1048
- case BOOTSTRAPPER_REQUEST_STATE_MEND: __fallthrough;
1048
case BOOTSTRAPPER_REQUEST_STATE_REPAIR:
1049
// Register if the package is requested but already installed.
1050
switch (pPackage->currentState)
@@ -1069,7 +1068,6 @@ static void CalculateDependencyActionStates(
1068
break;
1069
case BOOTSTRAPPER_ACTION_STATE_INSTALL: __fallthrough;
1070
case BOOTSTRAPPER_ACTION_STATE_MODIFY: __fallthrough;
1072
- case BOOTSTRAPPER_ACTION_STATE_MEND: __fallthrough;
1071
case BOOTSTRAPPER_ACTION_STATE_REPAIR: __fallthrough;
1072
case BOOTSTRAPPER_ACTION_STATE_MINOR_UPGRADE: __fallthrough;
1073
*pDependencyExecuteAction = BURN_DEPENDENCY_ACTION_REGISTER;
src/burn/engine/logging.cpp
-4
@@ -365,8 +365,6 @@ extern "C" LPCSTR LoggingActionStateToString(
365
return "Install";
366
case BOOTSTRAPPER_ACTION_STATE_MODIFY:
367
return "Modify";
368
- case BOOTSTRAPPER_ACTION_STATE_MEND:
369
- return "Mend";
368
case BOOTSTRAPPER_ACTION_STATE_REPAIR:
369
return "Repair";
370
case BOOTSTRAPPER_ACTION_STATE_MINOR_UPGRADE:
@@ -738,8 +736,6 @@ extern "C" LPCSTR LoggingRequestStateToString(
736
return "Cache";
737
case BOOTSTRAPPER_REQUEST_STATE_PRESENT:
738
return "Present";
741
- case BOOTSTRAPPER_REQUEST_STATE_MEND:
742
- return "Mend";
739
case BOOTSTRAPPER_REQUEST_STATE_REPAIR:
740
return "Repair";
741
default:
src/burn/engine/msiengine.cpp
+1
-9
@@ -790,7 +790,7 @@ extern "C" HRESULT MsiEnginePlanCalculatePackage(
790
{
791
case BOOTSTRAPPER_PACKAGE_STATE_PRESENT: __fallthrough;
792
case BOOTSTRAPPER_PACKAGE_STATE_SUPERSEDED:
793
- if (BOOTSTRAPPER_REQUEST_STATE_PRESENT == pPackage->requested || BOOTSTRAPPER_REQUEST_STATE_MEND == pPackage->requested || BOOTSTRAPPER_REQUEST_STATE_REPAIR == pPackage->requested)
793
+ if (BOOTSTRAPPER_REQUEST_STATE_PRESENT == pPackage->requested || BOOTSTRAPPER_REQUEST_STATE_REPAIR == pPackage->requested)
794
{
795
hr = VerCompareParsedVersions(pVersion, pInstalledVersion, &nCompareResult);
796
ExitOnFailure(hr, "Failed to compare '%ls' to '%ls' for planning.", pVersion->sczVersion, pInstalledVersion->sczVersion);
@@ -802,10 +802,6 @@ extern "C" HRESULT MsiEnginePlanCalculatePackage(
802
{
803
execute = BOOTSTRAPPER_ACTION_STATE_MINOR_UPGRADE;
804
}
805
- else if (BOOTSTRAPPER_REQUEST_STATE_MEND == pPackage->requested)
806
- {
807
- execute = BOOTSTRAPPER_ACTION_STATE_MEND;
808
- }
805
else if (BOOTSTRAPPER_REQUEST_STATE_REPAIR == pPackage->requested)
806
{
807
execute = BOOTSTRAPPER_ACTION_STATE_REPAIR;
@@ -835,7 +831,6 @@ extern "C" HRESULT MsiEnginePlanCalculatePackage(
831
switch (pPackage->requested)
832
{
833
case BOOTSTRAPPER_REQUEST_STATE_PRESENT: __fallthrough;
838
- case BOOTSTRAPPER_REQUEST_STATE_MEND: __fallthrough;
834
case BOOTSTRAPPER_REQUEST_STATE_REPAIR:
835
execute = BOOTSTRAPPER_ACTION_STATE_INSTALL;
836
break;
@@ -882,7 +877,6 @@ extern "C" HRESULT MsiEnginePlanCalculatePackage(
877
// remove the package during rollback.
878
if (pPackage->fUninstallable &&
879
(BOOTSTRAPPER_REQUEST_STATE_PRESENT == pPackage->requested ||
885
- BOOTSTRAPPER_REQUEST_STATE_MEND == pPackage->requested ||
880
BOOTSTRAPPER_REQUEST_STATE_REPAIR == pPackage->requested))
881
{
882
rollback = BOOTSTRAPPER_ACTION_STATE_UNINSTALL;
@@ -1201,7 +1195,6 @@ extern "C" HRESULT MsiEngineExecutePackage(
1195
break;
1196
1197
case BOOTSTRAPPER_ACTION_STATE_MODIFY: __fallthrough;
1204
- case BOOTSTRAPPER_ACTION_STATE_MEND: __fallthrough;
1198
case BOOTSTRAPPER_ACTION_STATE_REPAIR:
1199
hr = WiuInstallProduct(sczMsiPath, sczProperties, &restart);
1200
ExitOnFailure(hr, "Failed to run maintenance mode for MSI package.");
@@ -1281,7 +1274,6 @@ extern "C" HRESULT MsiEngineConcatBurnProperties(
1274
}
1275
break;
1276
case BOOTSTRAPPER_ACTION_STATE_REPAIR: __fallthrough;
1284
- case BOOTSTRAPPER_ACTION_STATE_MEND: __fallthrough;
1277
case BOOTSTRAPPER_ACTION_STATE_MODIFY:
1278
if (fMsiPackage)
1279
{