diff options
| author | Rob Mensching <rob@firegiant.com> | 2023-05-30 08:28:14 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2023-06-03 01:24:39 -0700 |
| commit | 856658a8cbbf5bac9c0bf5cfced01a009c59f80d (patch) | |
| tree | 739a0cc7419c3b83757fa0dd0dde874b052c332f | |
| parent | 36e3408d6f99da692fff5720ff2867faad2803ea (diff) | |
| download | wix-856658a8cbbf5bac9c0bf5cfced01a009c59f80d.tar.gz wix-856658a8cbbf5bac9c0bf5cfced01a009c59f80d.tar.bz2 wix-856658a8cbbf5bac9c0bf5cfced01a009c59f80d.zip | |
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
| -rw-r--r-- | src/api/burn/WixToolset.Mba.Core/IBootstrapperEngine.cs | 11 | ||||
| -rw-r--r-- | 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 25ce52df..3f90639f 100644 --- a/src/api/burn/WixToolset.Mba.Core/IBootstrapperEngine.cs +++ b/src/api/burn/WixToolset.Mba.Core/IBootstrapperEngine.cs | |||
| @@ -408,11 +408,6 @@ namespace WixToolset.Mba.Core | |||
| 408 | Absent, | 408 | Absent, |
| 409 | 409 | ||
| 410 | /// <summary> | 410 | /// <summary> |
| 411 | /// The package is not installed but is in the package cache. | ||
| 412 | /// </summary> | ||
| 413 | Cached, | ||
| 414 | |||
| 415 | /// <summary> | ||
| 416 | /// The package is installed. | 411 | /// The package is installed. |
| 417 | /// </summary> | 412 | /// </summary> |
| 418 | Present, | 413 | Present, |
| @@ -421,6 +416,12 @@ namespace WixToolset.Mba.Core | |||
| 421 | /// The package is on the machine but not active, so only uninstall operations are allowed. | 416 | /// The package is on the machine but not active, so only uninstall operations are allowed. |
| 422 | /// </summary> | 417 | /// </summary> |
| 423 | Superseded, | 418 | Superseded, |
| 419 | |||
| 420 | /// <summary> | ||
| 421 | /// This value is no longer used. See the DetectPackageCompleteEventArgs.Cached value instead. | ||
| 422 | /// </summary> | ||
| 423 | [Obsolete("Use DetectPackageCompleteEventArgs.Cached instead.")] | ||
| 424 | Cached = Present, | ||
| 424 | } | 425 | } |
| 425 | 426 | ||
| 426 | /// <summary> | 427 | /// <summary> |
diff --git a/src/test/burn/TestBA/TestBA.cs b/src/test/burn/TestBA/TestBA.cs index 01109911..43c1584b 100644 --- a/src/test/burn/TestBA/TestBA.cs +++ b/src/test/burn/TestBA/TestBA.cs | |||
| @@ -299,7 +299,7 @@ namespace WixToolset.Test.BA | |||
| 299 | args.CacheType = cacheType; | 299 | args.CacheType = cacheType; |
| 300 | } | 300 | } |
| 301 | 301 | ||
| 302 | this.Log("OnPlanPackageBegin() - id: {0}, defaultState: {1}, requestedState: {2}, defaultCache: {3}, requestedCache: {4}", args.PackageId, args.RecommendedState, args.State, args.RecommendedCacheType, args.CacheType); | 302 | 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); |
| 303 | } | 303 | } |
| 304 | 304 | ||
| 305 | protected override void OnPlanPatchTarget(PlanPatchTargetEventArgs args) | 305 | protected override void OnPlanPatchTarget(PlanPatchTargetEventArgs args) |
