diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2022-04-13 10:14:45 -0500 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2022-04-13 13:13:48 -0500 |
| commit | 4c3640ad5ef05b5be44df2aee2a23baa40471422 (patch) | |
| tree | b9aab6744e812298db3f4a98bc389ec5f212e80d /src/burn/test/BurnUnitTest | |
| parent | 3704a5547766581b15690b6535d03568afcfc2a0 (diff) | |
| download | wix-4c3640ad5ef05b5be44df2aee2a23baa40471422.tar.gz wix-4c3640ad5ef05b5be44df2aee2a23baa40471422.tar.bz2 wix-4c3640ad5ef05b5be44df2aee2a23baa40471422.zip | |
Write EngineVersion, ProtocolVersion, and Win64 to the Burn manifest.
Diffstat (limited to 'src/burn/test/BurnUnitTest')
| -rw-r--r-- | src/burn/test/BurnUnitTest/BurnTestFixture.h | 2 | ||||
| -rw-r--r-- | src/burn/test/BurnUnitTest/BurnUnitTest.vcxproj | 4 | ||||
| -rw-r--r-- | src/burn/test/BurnUnitTest/ManifestTest.cpp | 10 | ||||
| -rw-r--r-- | src/burn/test/BurnUnitTest/precomp.h | 2 |
4 files changed, 13 insertions, 5 deletions
diff --git a/src/burn/test/BurnUnitTest/BurnTestFixture.h b/src/burn/test/BurnUnitTest/BurnTestFixture.h index 103972ef..470c81c1 100644 --- a/src/burn/test/BurnUnitTest/BurnTestFixture.h +++ b/src/burn/test/BurnUnitTest/BurnTestFixture.h | |||
| @@ -33,7 +33,7 @@ namespace Bootstrapper | |||
| 33 | 33 | ||
| 34 | this->testDirectory = WixBuildTools::TestSupport::TestData::Get(); | 34 | this->testDirectory = WixBuildTools::TestSupport::TestData::Get(); |
| 35 | 35 | ||
| 36 | LogInitialize(::GetModuleHandleW(NULL)); | 36 | LogInitialize(::GetModuleHandleW(L"BurnUnitTest.dll")); |
| 37 | 37 | ||
| 38 | LogSetLevel(REPORT_DEBUG, FALSE); | 38 | LogSetLevel(REPORT_DEBUG, FALSE); |
| 39 | 39 | ||
diff --git a/src/burn/test/BurnUnitTest/BurnUnitTest.vcxproj b/src/burn/test/BurnUnitTest/BurnUnitTest.vcxproj index b0159840..b05666b2 100644 --- a/src/burn/test/BurnUnitTest/BurnUnitTest.vcxproj +++ b/src/burn/test/BurnUnitTest/BurnUnitTest.vcxproj | |||
| @@ -39,8 +39,8 @@ | |||
| 39 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | 39 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> |
| 40 | 40 | ||
| 41 | <PropertyGroup> | 41 | <PropertyGroup> |
| 42 | <ProjectAdditionalIncludeDirectories>$(ProjectAdditionalIncludeDirectories);..\..\engine;..\..\..\api\burn\WixToolset.BootstrapperCore.Native\inc;..\..\..\libs\dutil\WixToolset.Dutil\inc</ProjectAdditionalIncludeDirectories> | 42 | <ProjectAdditionalIncludeDirectories>$(ProjectAdditionalIncludeDirectories);$(BurnGeneratedHeaderDirectory);..\..\engine;..\..\..\api\burn\WixToolset.BootstrapperCore.Native\inc;..\..\..\libs\dutil\WixToolset.Dutil\inc</ProjectAdditionalIncludeDirectories> |
| 43 | <ProjectAdditionalLinkLibraries>cabinet.lib;crypt32.lib;msi.lib;rpcrt4.lib;shlwapi.lib;wininet.lib;wintrust.lib;$(RootBuildFolder)libs\$(Configuration)\$(WixNativeSdkLibraryToolset)\$(PlatformTarget)\dutil.lib</ProjectAdditionalLinkLibraries> | 43 | <ProjectAdditionalLinkLibraries>cabinet.lib;crypt32.lib;msi.lib;rpcrt4.lib;shlwapi.lib;wininet.lib;wintrust.lib;$(RootBuildFolder)libs\$(Configuration)\$(WixNativeSdkLibraryToolset)\$(PlatformTarget)\dutil.lib;engine.res</ProjectAdditionalLinkLibraries> |
| 44 | </PropertyGroup> | 44 | </PropertyGroup> |
| 45 | 45 | ||
| 46 | <ItemGroup> | 46 | <ItemGroup> |
diff --git a/src/burn/test/BurnUnitTest/ManifestTest.cpp b/src/burn/test/BurnUnitTest/ManifestTest.cpp index 6973c772..d899e3f9 100644 --- a/src/burn/test/BurnUnitTest/ManifestTest.cpp +++ b/src/burn/test/BurnUnitTest/ManifestTest.cpp | |||
| @@ -30,7 +30,13 @@ namespace Bootstrapper | |||
| 30 | try | 30 | try |
| 31 | { | 31 | { |
| 32 | LPCSTR szDocument = | 32 | LPCSTR szDocument = |
| 33 | "<Bundle>" | 33 | "<BurnManifest EngineVersion='" szVerMajorMinorBuild "' ProtocolVersion='1' Win64='" |
| 34 | #if !defined(_WIN64) | ||
| 35 | "no" | ||
| 36 | #else | ||
| 37 | "yes" | ||
| 38 | #endif | ||
| 39 | "'>" | ||
| 34 | " <UX UxDllPayloadId='ux.dll'>" | 40 | " <UX UxDllPayloadId='ux.dll'>" |
| 35 | " <Payload Id='ux.dll' FilePath='ux.dll' Packaging='embedded' SourcePath='ux.dll' Hash='000000000000' />" | 41 | " <Payload Id='ux.dll' FilePath='ux.dll' Packaging='embedded' SourcePath='ux.dll' Hash='000000000000' />" |
| 36 | " </UX>" | 42 | " </UX>" |
| @@ -38,7 +44,7 @@ namespace Bootstrapper | |||
| 38 | " <Variable Id='Variable1' Type='numeric' Value='1' Hidden='no' Persisted='no' />" | 44 | " <Variable Id='Variable1' Type='numeric' Value='1' Hidden='no' Persisted='no' />" |
| 39 | " <RegistrySearch Id='Search1' Type='exists' Root='HKLM' Key='SOFTWARE\\Microsoft' Variable='Variable1' Condition='0' />" | 45 | " <RegistrySearch Id='Search1' Type='exists' Root='HKLM' Key='SOFTWARE\\Microsoft' Variable='Variable1' Condition='0' />" |
| 40 | " <CommandLine Variables='upperCase' />" | 46 | " <CommandLine Variables='upperCase' />" |
| 41 | "</Bundle>"; | 47 | "</BurnManifest>"; |
| 42 | 48 | ||
| 43 | hr = CacheInitialize(&engineState.cache, &engineState.internalCommand); | 49 | hr = CacheInitialize(&engineState.cache, &engineState.internalCommand); |
| 44 | TestThrowOnFailure(hr, L"Failed initialize cache."); | 50 | TestThrowOnFailure(hr, L"Failed initialize cache."); |
diff --git a/src/burn/test/BurnUnitTest/precomp.h b/src/burn/test/BurnUnitTest/precomp.h index ded9fc2d..11e54284 100644 --- a/src/burn/test/BurnUnitTest/precomp.h +++ b/src/burn/test/BurnUnitTest/precomp.h | |||
| @@ -71,6 +71,8 @@ | |||
| 71 | #include "splashscreen.h" | 71 | #include "splashscreen.h" |
| 72 | #include "detect.h" | 72 | #include "detect.h" |
| 73 | 73 | ||
| 74 | #include "engine.version.h" | ||
| 75 | |||
| 74 | #pragma managed | 76 | #pragma managed |
| 75 | #include <vcclr.h> | 77 | #include <vcclr.h> |
| 76 | 78 | ||