aboutsummaryrefslogtreecommitdiff
path: root/src/burn
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2022-05-16 16:03:25 -0500
committerSean Hall <r.sean.hall@gmail.com>2022-05-17 22:54:13 -0500
commit0ea53e27361cbfe664df98d717e55005f329aff1 (patch)
treed75e02fadee9669593ca3ccf28401b67064244af /src/burn
parentd5985a1688bc878e42ffd3ce3939fa52303cab16 (diff)
downloadwix-0ea53e27361cbfe664df98d717e55005f329aff1.tar.gz
wix-0ea53e27361cbfe664df98d717e55005f329aff1.tar.bz2
wix-0ea53e27361cbfe664df98d717e55005f329aff1.zip
Store the prefix character in VERUTIL_VERSION.
Fix edge case where version string is all v's.
Diffstat (limited to 'src/burn')
-rw-r--r--src/burn/test/BurnUnitTest/RegistrationTest.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/burn/test/BurnUnitTest/RegistrationTest.cpp b/src/burn/test/BurnUnitTest/RegistrationTest.cpp
index 9aadc2cc..883b9cc8 100644
--- a/src/burn/test/BurnUnitTest/RegistrationTest.cpp
+++ b/src/burn/test/BurnUnitTest/RegistrationTest.cpp
@@ -559,6 +559,7 @@ namespace Bootstrapper
559 L" <Variable Id='MyBurnVariable2' Type='string' Value='foo' Hidden='no' Persisted='yes' />" 559 L" <Variable Id='MyBurnVariable2' Type='string' Value='foo' Hidden='no' Persisted='yes' />"
560 L" <Variable Id='MyBurnVariable3' Type='version' Value='v1.1-alpha' Hidden='no' Persisted='yes' />" 560 L" <Variable Id='MyBurnVariable3' Type='version' Value='v1.1-alpha' Hidden='no' Persisted='yes' />"
561 L" <Variable Id='MyBurnVariable4' Type='string' Value='foo' Hidden='no' Persisted='no' />" 561 L" <Variable Id='MyBurnVariable4' Type='string' Value='foo' Hidden='no' Persisted='no' />"
562 L" <Variable Id='MyBurnVariable5' Type='version' Hidden='no' Persisted='yes' />"
562 L" <CommandLine Variables='upperCase' />" 563 L" <CommandLine Variables='upperCase' />"
563 L"</Bundle>"; 564 L"</Bundle>";
564 565
@@ -597,6 +598,7 @@ namespace Bootstrapper
597 VariableSetNumericHelper(&variables, L"MyBurnVariable1", 42); 598 VariableSetNumericHelper(&variables, L"MyBurnVariable1", 42);
598 VariableSetStringHelper(&variables, L"MyBurnVariable2", L"bar", FALSE); 599 VariableSetStringHelper(&variables, L"MyBurnVariable2", L"bar", FALSE);
599 VariableSetVersionHelper(&variables, L"MyBurnVariable3", L"v1.0-beta"); 600 VariableSetVersionHelper(&variables, L"MyBurnVariable3", L"v1.0-beta");
601 VariableSetVersionHelper(&variables, L"MyBurnVariable5", L"vvv");
600 602
601 hr = VariableSerialize(&variables, TRUE, &pbBuffer, &cbBuffer); 603 hr = VariableSerialize(&variables, TRUE, &pbBuffer, &cbBuffer);
602 TestThrowOnFailure(hr, "Failed to serialize variables."); 604 TestThrowOnFailure(hr, "Failed to serialize variables.");
@@ -616,6 +618,7 @@ namespace Bootstrapper
616 this->ValidateVariableKey(L"MyBurnVariable1", gcnew String(L"42")); 618 this->ValidateVariableKey(L"MyBurnVariable1", gcnew String(L"42"));
617 this->ValidateVariableKey(L"MyBurnVariable2", gcnew String(L"bar")); 619 this->ValidateVariableKey(L"MyBurnVariable2", gcnew String(L"bar"));
618 this->ValidateVariableKey(L"MyBurnVariable3", gcnew String(L"1.0-beta")); 620 this->ValidateVariableKey(L"MyBurnVariable3", gcnew String(L"1.0-beta"));
621 this->ValidateVariableKey(L"MyBurnVariable5", gcnew String(L"vvv"));
619 this->ValidateVariableKeyEmpty(L"WixBundleForcedRestartPackage"); 622 this->ValidateVariableKeyEmpty(L"WixBundleForcedRestartPackage");
620 623
621 hr = StrAlloc(&sczRelatedBundleId, MAX_GUID_CHARS + 1); 624 hr = StrAlloc(&sczRelatedBundleId, MAX_GUID_CHARS + 1);