diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2020-08-01 09:36:12 -0600 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2020-08-09 10:33:49 -0600 |
commit | 3f8e35223216ebbe7f6683a5031a5a97bbc66d5a (patch) | |
tree | 2cd73b5fab393dc6c4d6cca5da481ef6bbaf4518 /src/test | |
parent | d21eed76c48960707561c45c492c10a6a23c052e (diff) | |
download | wix-3f8e35223216ebbe7f6683a5031a5a97bbc66d5a.tar.gz wix-3f8e35223216ebbe7f6683a5031a5a97bbc66d5a.tar.bz2 wix-3f8e35223216ebbe7f6683a5031a5a97bbc66d5a.zip |
Update splash screen to be per-monitor DPI aware.
Remove GDI+ from engine since the higher quality scaling isn't worth the additional dependency.
Diffstat (limited to 'src/test')
-rw-r--r-- | src/test/BurnUnitTest/BurnUnitTest.vcxproj | 6 | ||||
-rw-r--r-- | src/test/BurnUnitTest/packages.config | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/test/BurnUnitTest/BurnUnitTest.vcxproj b/src/test/BurnUnitTest/BurnUnitTest.vcxproj index eb2ec4ea..fda7cb7b 100644 --- a/src/test/BurnUnitTest/BurnUnitTest.vcxproj +++ b/src/test/BurnUnitTest/BurnUnitTest.vcxproj | |||
@@ -4,7 +4,7 @@ | |||
4 | 4 | ||
5 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 5 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
6 | <Import Project="..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.40\build\WixBuildTools.TestSupport.Native.props" Condition="Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.40\build\WixBuildTools.TestSupport.Native.props')" /> | 6 | <Import Project="..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.40\build\WixBuildTools.TestSupport.Native.props" Condition="Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.40\build\WixBuildTools.TestSupport.Native.props')" /> |
7 | <Import Project="..\..\..\packages\WixToolset.DUtil.4.0.45\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\packages\WixToolset.DUtil.4.0.45\build\WixToolset.DUtil.props')" /> | 7 | <Import Project="..\..\..\packages\WixToolset.DUtil.4.0.49\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\packages\WixToolset.DUtil.4.0.49\build\WixToolset.DUtil.props')" /> |
8 | <ItemGroup Label="ProjectConfigurations"> | 8 | <ItemGroup Label="ProjectConfigurations"> |
9 | <ProjectConfiguration Include="Debug|Win32"> | 9 | <ProjectConfiguration Include="Debug|Win32"> |
10 | <Configuration>Debug</Configuration> | 10 | <Configuration>Debug</Configuration> |
@@ -28,7 +28,7 @@ | |||
28 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | 28 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> |
29 | <PropertyGroup> | 29 | <PropertyGroup> |
30 | <ProjectAdditionalIncludeDirectories>..\..\engine;..\..\WixToolset.BootstrapperCore.Native\inc</ProjectAdditionalIncludeDirectories> | 30 | <ProjectAdditionalIncludeDirectories>..\..\engine;..\..\WixToolset.BootstrapperCore.Native\inc</ProjectAdditionalIncludeDirectories> |
31 | <ProjectAdditionalLinkLibraries>cabinet.lib;crypt32.lib;msi.lib;rpcrt4.lib;shlwapi.lib;wininet.lib;wintrust.lib;gdiplus.lib</ProjectAdditionalLinkLibraries> | 31 | <ProjectAdditionalLinkLibraries>cabinet.lib;crypt32.lib;msi.lib;rpcrt4.lib;shlwapi.lib;wininet.lib;wintrust.lib</ProjectAdditionalLinkLibraries> |
32 | </PropertyGroup> | 32 | </PropertyGroup> |
33 | <ItemGroup> | 33 | <ItemGroup> |
34 | <ClCompile Include="AssemblyInfo.cpp" /> | 34 | <ClCompile Include="AssemblyInfo.cpp" /> |
@@ -80,6 +80,6 @@ | |||
80 | </PropertyGroup> | 80 | </PropertyGroup> |
81 | <Error Condition="!Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.40\build\WixBuildTools.TestSupport.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.40\build\WixBuildTools.TestSupport.Native.props'))" /> | 81 | <Error Condition="!Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.40\build\WixBuildTools.TestSupport.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.40\build\WixBuildTools.TestSupport.Native.props'))" /> |
82 | <Error Condition="!Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.40\build\WixBuildTools.TestSupport.Native.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.40\build\WixBuildTools.TestSupport.Native.targets'))" /> | 82 | <Error Condition="!Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.40\build\WixBuildTools.TestSupport.Native.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.40\build\WixBuildTools.TestSupport.Native.targets'))" /> |
83 | <Error Condition="!Exists('..\..\..\packages\WixToolset.DUtil.4.0.45\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.DUtil.4.0.45\build\WixToolset.DUtil.props'))" /> | 83 | <Error Condition="!Exists('..\..\..\packages\WixToolset.DUtil.4.0.49\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.DUtil.4.0.49\build\WixToolset.DUtil.props'))" /> |
84 | </Target> | 84 | </Target> |
85 | </Project> | 85 | </Project> |
diff --git a/src/test/BurnUnitTest/packages.config b/src/test/BurnUnitTest/packages.config index 24bfe34a..e537bcdb 100644 --- a/src/test/BurnUnitTest/packages.config +++ b/src/test/BurnUnitTest/packages.config | |||
@@ -9,5 +9,5 @@ | |||
9 | <package id="xunit.runner.visualstudio" version="2.4.1" /> | 9 | <package id="xunit.runner.visualstudio" version="2.4.1" /> |
10 | <package id="WixBuildTools.TestSupport" version="4.0.40" /> | 10 | <package id="WixBuildTools.TestSupport" version="4.0.40" /> |
11 | <package id="WixBuildTools.TestSupport.Native" version="4.0.40" /> | 11 | <package id="WixBuildTools.TestSupport.Native" version="4.0.40" /> |
12 | <package id="WixToolset.DUtil" version="4.0.45" targetFramework="native" /> | 12 | <package id="WixToolset.DUtil" version="4.0.49" targetFramework="native" /> |
13 | </packages> \ No newline at end of file | 13 | </packages> \ No newline at end of file |