From edccb203c421d2bd820062024088c6698424d9ee Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Wed, 4 Feb 2026 20:47:04 -0500 Subject: Support dual-purpose packages in Burn. Fixes https://github.com/wixtoolset/issues/issues/8958 --- .../WixInternal.TestSupport.Native/NativeAssert.h | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'src/internal') diff --git a/src/internal/WixInternal.TestSupport.Native/NativeAssert.h b/src/internal/WixInternal.TestSupport.Native/NativeAssert.h index 9ca04fea..8663c511 100644 --- a/src/internal/WixInternal.TestSupport.Native/NativeAssert.h +++ b/src/internal/WixInternal.TestSupport.Native/NativeAssert.h @@ -43,6 +43,16 @@ namespace TestSupport { WixAssert::StringEqual(NativeAssert::LPWSTRToString(expected), NativeAssert::LPWSTRToString(actual), ignoreCase); } + static void StringEqual(LPCSTR expected, LPCSTR actual) + { + NativeAssert::StringEqual(expected, actual, FALSE); + } + + static void StringEqual(LPCSTR expected, LPCSTR actual, BOOL ignoreCase) + { + WixAssert::StringEqual(NativeAssert::LPSTRToString(expected), NativeAssert::LPSTRToString(actual), ignoreCase); + } + static void Succeeded(HRESULT hr, LPCSTR zFormat, LPCSTR zArg, ... array^ zArgs) { array^ formatArgs = gcnew array(zArgs->Length + 1); @@ -91,10 +101,11 @@ namespace TestSupport { } private: - static String^ LPSTRToString(LPCSTR z) + static String^ LPSTRToString(LPCSTR sz) { - return z ? gcnew String(z) : nullptr; + return sz ? gcnew String(sz) : nullptr; } + static String^ LPWSTRToString(LPCWSTR wz) { return wz ? gcnew String(wz) : nullptr; -- cgit v1.2.3-55-g6feb