Let BA override the package's cache type during Plan.

Rename cache types to REMOVE, KEEP, FORCE.
Change implementation of FORCE to not be through CACHED request state.
Create package condition enum so BA can tell when InstallCondition wasn't specified.
Tell BA when package is cached.
Tell BA when package is planned to be cached and uncached.

1 files changed, 4 insertions, 4 deletions

diff --git a/src/engine/package.cpp b/src/engine/package.cpp
index dd4e498a..3f8c8b0f 100644
--- a/src/engine/package.cpp
+++ b/src/engine/package.cpp
@@ -118,20 +118,20 @@ extern "C" HRESULT PackagesParseFromXml(
         {
             if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, scz, -1, L"remove", -1))
             {
-                pPackage->cacheType = BURN_CACHE_TYPE_NO;
+                pPackage->authoredCacheType = BOOTSTRAPPER_CACHE_TYPE_REMOVE;
             }
             else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, scz, -1, L"keep", -1))
             {
-                pPackage->cacheType = BURN_CACHE_TYPE_YES;
+                pPackage->authoredCacheType = BOOTSTRAPPER_CACHE_TYPE_KEEP;
             }
             else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, scz, -1, L"force", -1))
             {
-                pPackage->cacheType = BURN_CACHE_TYPE_ALWAYS;
+                pPackage->authoredCacheType = BOOTSTRAPPER_CACHE_TYPE_FORCE;
             }
             else
             {
                 hr = E_UNEXPECTED;
-                ExitOnFailure(hr, "Invalid cache type: %ls", scz);
+                ExitOnRootFailure(hr, "Invalid cache type: %ls", scz);
             }
         }
         ExitOnFailure(hr, "Failed to get @Cache.");