diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2022-06-03 17:50:22 -0500 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2022-06-07 19:44:36 -0500 |
| commit | 8810aa8908ed7887616d86dd5fb821fcfa92f444 (patch) | |
| tree | 8bc05667c36cc0d3db73504c867e85b01f1a79b0 /src/burn/test | |
| parent | 266b097c0b0a13dd4934f55f61cad62ffcbb953d (diff) | |
| download | wix-8810aa8908ed7887616d86dd5fb821fcfa92f444.tar.gz wix-8810aa8908ed7887616d86dd5fb821fcfa92f444.tar.bz2 wix-8810aa8908ed7887616d86dd5fb821fcfa92f444.zip | |
Update Burn algorithm for picking elevated temp path to use SystemTemp.
Diffstat (limited to 'src/burn/test')
| -rw-r--r-- | src/burn/test/BurnUnitTest/BurnUnitTest.vcxproj | 2 | ||||
| -rw-r--r-- | src/burn/test/BurnUnitTest/CacheTest.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/burn/test/BurnUnitTest/BurnUnitTest.vcxproj b/src/burn/test/BurnUnitTest/BurnUnitTest.vcxproj index b05666b2..e1a28712 100644 --- a/src/burn/test/BurnUnitTest/BurnUnitTest.vcxproj +++ b/src/burn/test/BurnUnitTest/BurnUnitTest.vcxproj | |||
| @@ -40,7 +40,7 @@ | |||
| 40 | 40 | ||
| 41 | <PropertyGroup> | 41 | <PropertyGroup> |
| 42 | <ProjectAdditionalIncludeDirectories>$(ProjectAdditionalIncludeDirectories);$(BurnGeneratedHeaderDirectory);..\..\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;engine.res</ProjectAdditionalLinkLibraries> | 43 | <ProjectAdditionalLinkLibraries>cabinet.lib;crypt32.lib;msi.lib;rpcrt4.lib;shlwapi.lib;userenv.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/CacheTest.cpp b/src/burn/test/BurnUnitTest/CacheTest.cpp index eb0b31ab..2bec05fe 100644 --- a/src/burn/test/BurnUnitTest/CacheTest.cpp +++ b/src/burn/test/BurnUnitTest/CacheTest.cpp | |||
| @@ -92,6 +92,8 @@ namespace Bootstrapper | |||
| 92 | VerifyBaseWorkingFolder(L"B:\\TEST\\TMP\\", cache.rgsczPotentialBaseWorkingFolders[0]); | 92 | VerifyBaseWorkingFolder(L"B:\\TEST\\TMP\\", cache.rgsczPotentialBaseWorkingFolders[0]); |
| 93 | CacheUninitialize(&cache); | 93 | CacheUninitialize(&cache); |
| 94 | 94 | ||
| 95 | // First fallback is impractical to mock out - %windir%\SystemTemp on Win11 when running as SYSTEM. | ||
| 96 | |||
| 95 | hr = RegCreate(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Policies\\WiX\\Burn", GENERIC_WRITE, &hkBurnPolicy); | 97 | hr = RegCreate(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Policies\\WiX\\Burn", GENERIC_WRITE, &hkBurnPolicy); |
| 96 | NativeAssert::Succeeded(hr, "Failed to create Burn policy key."); | 98 | NativeAssert::Succeeded(hr, "Failed to create Burn policy key."); |
| 97 | 99 | ||