From 5cbe372f0a512babc5db7f519fc407eb40606346 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Tue, 30 Mar 2021 19:04:12 -0500 Subject: Rename cache types in the manifest to remove, keep, force. Contributes to #5125 --- src/engine/engine.vcxproj | 4 ++-- src/engine/package.cpp | 6 +++--- src/engine/packages.config | 2 +- src/stub/packages.config | 2 +- src/stub/stub.vcxproj | 4 ++-- src/test/BurnUnitTest/BurnUnitTest.vcxproj | 4 ++-- .../TestData/PlanTest/BasicFunctionality_BundleA_manifest.xml | 2 +- .../TestData/PlanTest/MsiTransaction_BundleAv1_manifest.xml | 2 +- .../BurnUnitTest/TestData/PlanTest/Slipstream_BundleA_manifest.xml | 2 +- src/test/BurnUnitTest/packages.config | 2 +- 10 files changed, 15 insertions(+), 15 deletions(-) (limited to 'src') diff --git a/src/engine/engine.vcxproj b/src/engine/engine.vcxproj index 263edf12..e418e6f4 100644 --- a/src/engine/engine.vcxproj +++ b/src/engine/engine.vcxproj @@ -1,7 +1,7 @@ - + Debug @@ -165,7 +165,7 @@ rc.exe -fo "$(OutDir)engine.res" "$(IntDir)engine.messages.rc" This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + \ No newline at end of file diff --git a/src/engine/package.cpp b/src/engine/package.cpp index 124b356b..6ff59fe4 100644 --- a/src/engine/package.cpp +++ b/src/engine/package.cpp @@ -116,15 +116,15 @@ extern "C" HRESULT PackagesParseFromXml( hr = XmlGetAttributeEx(pixnNode, L"Cache", &scz); if (SUCCEEDED(hr)) { - if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, scz, -1, L"no", -1)) + if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, scz, -1, L"remove", -1)) { pPackage->cacheType = BURN_CACHE_TYPE_NO; } - else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, scz, -1, L"yes", -1)) + else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, scz, -1, L"keep", -1)) { pPackage->cacheType = BURN_CACHE_TYPE_YES; } - else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, scz, -1, L"always", -1)) + else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, scz, -1, L"force", -1)) { pPackage->cacheType = BURN_CACHE_TYPE_ALWAYS; } diff --git a/src/engine/packages.config b/src/engine/packages.config index 56c62f29..84e3078b 100644 --- a/src/engine/packages.config +++ b/src/engine/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/stub/packages.config b/src/stub/packages.config index 7d0212ac..44bf19aa 100644 --- a/src/stub/packages.config +++ b/src/stub/packages.config @@ -4,5 +4,5 @@ - + \ No newline at end of file diff --git a/src/stub/stub.vcxproj b/src/stub/stub.vcxproj index f13d5ed9..f235a1fd 100644 --- a/src/stub/stub.vcxproj +++ b/src/stub/stub.vcxproj @@ -5,7 +5,7 @@ - + @@ -117,6 +117,6 @@ - + \ No newline at end of file diff --git a/src/test/BurnUnitTest/BurnUnitTest.vcxproj b/src/test/BurnUnitTest/BurnUnitTest.vcxproj index 2ca7219e..529ab727 100644 --- a/src/test/BurnUnitTest/BurnUnitTest.vcxproj +++ b/src/test/BurnUnitTest/BurnUnitTest.vcxproj @@ -4,7 +4,7 @@ - + Debug @@ -97,6 +97,6 @@ - + \ No newline at end of file diff --git a/src/test/BurnUnitTest/TestData/PlanTest/BasicFunctionality_BundleA_manifest.xml b/src/test/BurnUnitTest/TestData/PlanTest/BasicFunctionality_BundleA_manifest.xml index e5aeb515..65e3c63d 100644 --- a/src/test/BurnUnitTest/TestData/PlanTest/BasicFunctionality_BundleA_manifest.xml +++ b/src/test/BurnUnitTest/TestData/PlanTest/BasicFunctionality_BundleA_manifest.xml @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/test/BurnUnitTest/TestData/PlanTest/MsiTransaction_BundleAv1_manifest.xml b/src/test/BurnUnitTest/TestData/PlanTest/MsiTransaction_BundleAv1_manifest.xml index 6ed7e01b..cca9a982 100644 --- a/src/test/BurnUnitTest/TestData/PlanTest/MsiTransaction_BundleAv1_manifest.xml +++ b/src/test/BurnUnitTest/TestData/PlanTest/MsiTransaction_BundleAv1_manifest.xml @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/test/BurnUnitTest/TestData/PlanTest/Slipstream_BundleA_manifest.xml b/src/test/BurnUnitTest/TestData/PlanTest/Slipstream_BundleA_manifest.xml index 4b5cab6f..996976b2 100644 --- a/src/test/BurnUnitTest/TestData/PlanTest/Slipstream_BundleA_manifest.xml +++ b/src/test/BurnUnitTest/TestData/PlanTest/Slipstream_BundleA_manifest.xml @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/test/BurnUnitTest/packages.config b/src/test/BurnUnitTest/packages.config index e232db0a..accce624 100644 --- a/src/test/BurnUnitTest/packages.config +++ b/src/test/BurnUnitTest/packages.config @@ -10,5 +10,5 @@ - + \ No newline at end of file -- cgit v1.2.3-55-g6feb