From 523c66a62a619e6aa9f30070173ea33edfb5e328 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Sun, 29 Dec 2024 18:01:20 -0800 Subject: Rename "bundle id" concept to "bundle code" The "bundle id" always had more in common with the PackageCode from the Windows Installer. With the introduction of an actual Id attribute on the Bundle element, there is potential for confusion, so there is finally real motivation to rename "bundle id" to "bundle code". --- src/burn/test/BurnUnitTest/RelatedBundleTest.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/burn/test/BurnUnitTest/RelatedBundleTest.cpp') diff --git a/src/burn/test/BurnUnitTest/RelatedBundleTest.cpp b/src/burn/test/BurnUnitTest/RelatedBundleTest.cpp index 4fee1b1d..9feb85d6 100644 --- a/src/burn/test/BurnUnitTest/RelatedBundleTest.cpp +++ b/src/burn/test/BurnUnitTest/RelatedBundleTest.cpp @@ -48,8 +48,8 @@ namespace Bootstrapper L" " L" " L" " - L" " - L" " + L" " + L" " L" " L" " L""; @@ -100,8 +100,8 @@ namespace Bootstrapper L" " L" " L" " - L" " - L" " + L" " + L" " L" " L" " L""; @@ -142,7 +142,7 @@ namespace Bootstrapper this->RegisterFakeBundle(L"{3DB49D3D-1FB8-4147-A465-BBE8BFD0DAD0}", L"{89FDAE1F-8CC1-48B9-B930-3945E0D3E7F0}", NULL, L"4.0.0.0", FALSE); } - void RegisterFakeBundle(LPCWSTR wzBundleId, LPCWSTR wzUpgradeCodes, LPCWSTR wzCachePath, LPCWSTR wzVersion, BOOL fPerMachine) + void RegisterFakeBundle(LPCWSTR wzBundleCode, LPCWSTR wzUpgradeCodes, LPCWSTR wzCachePath, LPCWSTR wzVersion, BOOL fPerMachine) { HRESULT hr = S_OK; LPWSTR* rgsczUpgradeCodes = NULL; @@ -157,12 +157,12 @@ namespace Bootstrapper hr = StrSplitAllocArray(&rgsczUpgradeCodes, reinterpret_cast(&cUpgradeCodes), wzUpgradeCodes, L";"); NativeAssert::Succeeded(hr, "Failed to split upgrade codes."); - hr = StrAllocFormatted(&sczRegistrationKey, L"%s\\%s", BURN_REGISTRATION_REGISTRY_UNINSTALL_KEY, wzBundleId); + hr = StrAllocFormatted(&sczRegistrationKey, L"%s\\%s", BURN_REGISTRATION_REGISTRY_UNINSTALL_KEY, wzBundleCode); NativeAssert::Succeeded(hr, "Failed to build uninstall registry key path."); if (!wzCachePath) { - hr = StrAllocFormatted(&sczCachePath, L"%ls.exe", wzBundleId); + hr = StrAllocFormatted(&sczCachePath, L"%ls.exe", wzBundleCode); NativeAssert::Succeeded(hr, "Failed to build cache path."); wzCachePath = sczCachePath; -- cgit v1.2.3-55-g6feb