From bc9343ad5c6133ae5f2d5233837beeee7041a292 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Tue, 30 May 2023 08:28:14 -0700 Subject: [PATCH] Obsolete removed PackageState.Cached value A package's cached status is no longer set via the PackageState. The value was removed in native code but the managed code was missed throwing off the enum mapping. Fixes 7399 --- .../burn/WixToolset.Mba.Core/IBootstrapperEngine.cs | 11 ++++++----- src/test/burn/TestBA/TestBA.cs | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/api/burn/WixToolset.Mba.Core/IBootstrapperEngine.cs b/src/api/burn/WixToolset.Mba.Core/IBootstrapperEngine.cs index 25ce52dff..3f90639fe 100644 --- a/src/api/burn/WixToolset.Mba.Core/IBootstrapperEngine.cs +++ b/src/api/burn/WixToolset.Mba.Core/IBootstrapperEngine.cs @@ -407,11 +407,6 @@ public enum PackageState /// Absent, - /// - /// The package is not installed but is in the package cache. - /// - Cached, - /// /// The package is installed. /// @@ -421,6 +416,12 @@ public enum PackageState /// The package is on the machine but not active, so only uninstall operations are allowed. /// Superseded, + + /// + /// This value is no longer used. See the DetectPackageCompleteEventArgs.Cached value instead. + /// + [Obsolete("Use DetectPackageCompleteEventArgs.Cached instead.")] + Cached = Present, } /// diff --git a/src/test/burn/TestBA/TestBA.cs b/src/test/burn/TestBA/TestBA.cs index 01109911e..43c1584b6 100644 --- a/src/test/burn/TestBA/TestBA.cs +++ b/src/test/burn/TestBA/TestBA.cs @@ -299,7 +299,7 @@ protected override void OnPlanPackageBegin(PlanPackageBeginEventArgs args) args.CacheType = cacheType; } - this.Log("OnPlanPackageBegin() - id: {0}, defaultState: {1}, requestedState: {2}, defaultCache: {3}, requestedCache: {4}", args.PackageId, args.RecommendedState, args.State, args.RecommendedCacheType, args.CacheType); + this.Log("OnPlanPackageBegin() - id: {0}, currentState: {1}, defaultState: {2}, requestedState: {3}, defaultCache: {4}, requestedCache: {5}", args.PackageId, args.CurrentState, args.RecommendedState, args.State, args.RecommendedCacheType, args.CacheType); } protected override void OnPlanPatchTarget(PlanPatchTargetEventArgs args)