diff options
author | Bob Arnson <bob@firegiant.com> | 2021-12-26 23:23:24 -0500 |
---|---|---|
committer | Bob Arnson <github@bobs.org> | 2021-12-27 09:33:51 -0500 |
commit | 4c34ad46d0eb664a48dc2b4a7696cd96c3c3a56a (patch) | |
tree | 32a66d0aecaa829ef48322d70414dee44346fa20 /src/burn/test/BurnUnitTest | |
parent | 113aed110c01913941c6e6e7d24c0ce42b1f91b6 (diff) | |
download | wix-4c34ad46d0eb664a48dc2b4a7696cd96c3c3a56a.tar.gz wix-4c34ad46d0eb664a48dc2b4a7696cd96c3c3a56a.tar.bz2 wix-4c34ad46d0eb664a48dc2b4a7696cd96c3c3a56a.zip |
Remove RebootRequired per...
...https://github.com/wixtoolset/issues/issues/6668.
Diffstat (limited to 'src/burn/test/BurnUnitTest')
-rw-r--r-- | src/burn/test/BurnUnitTest/BurnUnitTest.vcxproj | 20 | ||||
-rw-r--r-- | src/burn/test/BurnUnitTest/RegistrationTest.cpp | 1 |
2 files changed, 14 insertions, 7 deletions
diff --git a/src/burn/test/BurnUnitTest/BurnUnitTest.vcxproj b/src/burn/test/BurnUnitTest/BurnUnitTest.vcxproj index c038dccd..714b6549 100644 --- a/src/burn/test/BurnUnitTest/BurnUnitTest.vcxproj +++ b/src/burn/test/BurnUnitTest/BurnUnitTest.vcxproj | |||
@@ -5,22 +5,30 @@ | |||
5 | <Import Project="..\..\..\internal\WixBuildTools.TestSupport.Native\build\WixBuildTools.TestSupport.Native.props" /> | 5 | <Import Project="..\..\..\internal\WixBuildTools.TestSupport.Native\build\WixBuildTools.TestSupport.Native.props" /> |
6 | 6 | ||
7 | <ItemGroup Label="ProjectConfigurations"> | 7 | <ItemGroup Label="ProjectConfigurations"> |
8 | <ProjectConfiguration Include="Debug|ARM64"> | ||
9 | <Configuration>Debug</Configuration> | ||
10 | <Platform>ARM64</Platform> | ||
11 | </ProjectConfiguration> | ||
12 | <ProjectConfiguration Include="Debug|Win32"> | 8 | <ProjectConfiguration Include="Debug|Win32"> |
13 | <Configuration>Debug</Configuration> | 9 | <Configuration>Debug</Configuration> |
14 | <Platform>Win32</Platform> | 10 | <Platform>Win32</Platform> |
15 | </ProjectConfiguration> | 11 | </ProjectConfiguration> |
16 | <ProjectConfiguration Include="Release|ARM64"> | 12 | <ProjectConfiguration Include="Debug|x64"> |
17 | <Configuration>Release</Configuration> | 13 | <Configuration>Debug</Configuration> |
14 | <Platform>x64</Platform> | ||
15 | </ProjectConfiguration> | ||
16 | <ProjectConfiguration Include="Debug|ARM64"> | ||
17 | <Configuration>Debug</Configuration> | ||
18 | <Platform>ARM64</Platform> | 18 | <Platform>ARM64</Platform> |
19 | </ProjectConfiguration> | 19 | </ProjectConfiguration> |
20 | <ProjectConfiguration Include="Release|Win32"> | 20 | <ProjectConfiguration Include="Release|Win32"> |
21 | <Configuration>Release</Configuration> | 21 | <Configuration>Release</Configuration> |
22 | <Platform>Win32</Platform> | 22 | <Platform>Win32</Platform> |
23 | </ProjectConfiguration> | 23 | </ProjectConfiguration> |
24 | <ProjectConfiguration Include="Release|x64"> | ||
25 | <Configuration>Release</Configuration> | ||
26 | <Platform>x64</Platform> | ||
27 | </ProjectConfiguration> | ||
28 | <ProjectConfiguration Include="Release|ARM64"> | ||
29 | <Configuration>Release</Configuration> | ||
30 | <Platform>ARM64</Platform> | ||
31 | </ProjectConfiguration> | ||
24 | </ItemGroup> | 32 | </ItemGroup> |
25 | 33 | ||
26 | <PropertyGroup Label="Globals"> | 34 | <PropertyGroup Label="Globals"> |
diff --git a/src/burn/test/BurnUnitTest/RegistrationTest.cpp b/src/burn/test/BurnUnitTest/RegistrationTest.cpp index 94937ef6..3cf15d10 100644 --- a/src/burn/test/BurnUnitTest/RegistrationTest.cpp +++ b/src/burn/test/BurnUnitTest/RegistrationTest.cpp | |||
@@ -369,7 +369,6 @@ namespace Bootstrapper | |||
369 | TestThrowOnFailure(hr, L"Failed to set registration variables."); | 369 | TestThrowOnFailure(hr, L"Failed to set registration variables."); |
370 | 370 | ||
371 | Assert::Equal(1ll, VariableGetNumericHelper(&variables, BURN_BUNDLE_INSTALLED)); | 371 | Assert::Equal(1ll, VariableGetNumericHelper(&variables, BURN_BUNDLE_INSTALLED)); |
372 | Assert::Equal(1ll, VariableGetNumericHelper(&variables, BURN_REBOOT_PENDING)); | ||
373 | Assert::Equal<String^>(gcnew String(L"foo"), VariableGetStringHelper(&variables, BURN_BUNDLE_TAG)); | 372 | Assert::Equal<String^>(gcnew String(L"foo"), VariableGetStringHelper(&variables, BURN_BUNDLE_TAG)); |
374 | Assert::Equal<String^>(gcnew String(L"bar"), VariableGetStringHelper(&variables, BURN_BUNDLE_PROVIDER_KEY)); | 373 | Assert::Equal<String^>(gcnew String(L"bar"), VariableGetStringHelper(&variables, BURN_BUNDLE_PROVIDER_KEY)); |
375 | Assert::Equal<String^>(gcnew String(L"1.0.0.0"), VariableGetVersionHelper(&variables, BURN_BUNDLE_VERSION)); | 374 | Assert::Equal<String^>(gcnew String(L"1.0.0.0"), VariableGetVersionHelper(&variables, BURN_BUNDLE_VERSION)); |