diff options
author | Rob Mensching <rob@firegiant.com> | 2021-04-22 06:31:03 -0700 |
---|---|---|
committer | Rob Mensching <rob@firegiant.com> | 2021-04-29 16:21:09 -0700 |
commit | f39e7a3e164d0736e45049e5726d0da2013da3c9 (patch) | |
tree | aea365ce11f41ad1c78de6997d916890dfb61b45 /src/test/DUtilUnitTest | |
parent | bcd3ee7ab858d62beb36af9f5986544b68a3dd35 (diff) | |
download | wix-f39e7a3e164d0736e45049e5726d0da2013da3c9.tar.gz wix-f39e7a3e164d0736e45049e5726d0da2013da3c9.tar.bz2 wix-f39e7a3e164d0736e45049e5726d0da2013da3c9.zip |
Update to latest build infrastructure
Diffstat (limited to 'src/test/DUtilUnitTest')
-rw-r--r-- | src/test/DUtilUnitTest/DUtilUnitTest.vcxproj | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/test/DUtilUnitTest/DUtilUnitTest.vcxproj b/src/test/DUtilUnitTest/DUtilUnitTest.vcxproj index 32463262..18410e5d 100644 --- a/src/test/DUtilUnitTest/DUtilUnitTest.vcxproj +++ b/src/test/DUtilUnitTest/DUtilUnitTest.vcxproj | |||
@@ -1,7 +1,6 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> | 2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> |
3 | 3 | ||
4 | |||
5 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 4 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
6 | <Import Project="..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\build\WixBuildTools.TestSupport.Native.props" Condition="Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\build\WixBuildTools.TestSupport.Native.props')" /> | 5 | <Import Project="..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\build\WixBuildTools.TestSupport.Native.props" Condition="Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\build\WixBuildTools.TestSupport.Native.props')" /> |
7 | <ItemGroup Label="ProjectConfigurations"> | 6 | <ItemGroup Label="ProjectConfigurations"> |
@@ -14,6 +13,7 @@ | |||
14 | <Platform>Win32</Platform> | 13 | <Platform>Win32</Platform> |
15 | </ProjectConfiguration> | 14 | </ProjectConfiguration> |
16 | </ItemGroup> | 15 | </ItemGroup> |
16 | |||
17 | <PropertyGroup Label="Globals"> | 17 | <PropertyGroup Label="Globals"> |
18 | <ProjectTypes>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}</ProjectTypes> | 18 | <ProjectTypes>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}</ProjectTypes> |
19 | <ProjectGuid>{AB7EE608-E5FB-42A5-831F-0DEEEA141223}</ProjectGuid> | 19 | <ProjectGuid>{AB7EE608-E5FB-42A5-831F-0DEEEA141223}</ProjectGuid> |
@@ -22,13 +22,17 @@ | |||
22 | <ConfigurationType>DynamicLibrary</ConfigurationType> | 22 | <ConfigurationType>DynamicLibrary</ConfigurationType> |
23 | <CharacterSet>Unicode</CharacterSet> | 23 | <CharacterSet>Unicode</CharacterSet> |
24 | <CLRSupport>true</CLRSupport> | 24 | <CLRSupport>true</CLRSupport> |
25 | <SignOutput>false</SignOutput> | ||
25 | </PropertyGroup> | 26 | </PropertyGroup> |
27 | |||
26 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | 28 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> |
27 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | 29 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> |
30 | |||
28 | <PropertyGroup> | 31 | <PropertyGroup> |
29 | <ProjectAdditionalIncludeDirectories>..\..\dutil\inc</ProjectAdditionalIncludeDirectories> | 32 | <ProjectAdditionalIncludeDirectories>..\..\dutil\inc</ProjectAdditionalIncludeDirectories> |
30 | <ProjectAdditionalLinkLibraries>rpcrt4.lib;Mpr.lib;Ws2_32.lib;urlmon.lib;wininet.lib</ProjectAdditionalLinkLibraries> | 33 | <ProjectAdditionalLinkLibraries>rpcrt4.lib;Mpr.lib;Ws2_32.lib;urlmon.lib;wininet.lib</ProjectAdditionalLinkLibraries> |
31 | </PropertyGroup> | 34 | </PropertyGroup> |
35 | |||
32 | <ItemGroup> | 36 | <ItemGroup> |
33 | <ClCompile Include="ApupUtilTests.cpp" /> | 37 | <ClCompile Include="ApupUtilTests.cpp" /> |
34 | <ClCompile Include="AssemblyInfo.cpp" /> | 38 | <ClCompile Include="AssemblyInfo.cpp" /> |
@@ -52,17 +56,21 @@ | |||
52 | <ClCompile Include="UriUtilTest.cpp" /> | 56 | <ClCompile Include="UriUtilTest.cpp" /> |
53 | <ClCompile Include="VerUtilTests.cpp" /> | 57 | <ClCompile Include="VerUtilTests.cpp" /> |
54 | </ItemGroup> | 58 | </ItemGroup> |
59 | |||
55 | <ItemGroup> | 60 | <ItemGroup> |
56 | <ClInclude Include="precomp.h" /> | 61 | <ClInclude Include="precomp.h" /> |
57 | <ClInclude Include="error.h" /> | 62 | <ClInclude Include="error.h" /> |
58 | </ItemGroup> | 63 | </ItemGroup> |
64 | |||
59 | <ItemGroup> | 65 | <ItemGroup> |
60 | <None Include="packages.config" /> | 66 | <None Include="packages.config" /> |
61 | <ResourceCompile Include="UnitTest.rc" /> | 67 | <ResourceCompile Include="UnitTest.rc" /> |
62 | </ItemGroup> | 68 | </ItemGroup> |
69 | |||
63 | <ItemGroup> | 70 | <ItemGroup> |
64 | <None Include="TestData\ApupUtilTests\FeedBv2.0.xml" CopyToOutputDirectory="PreserveNewest" /> | 71 | <None Include="TestData\ApupUtilTests\FeedBv2.0.xml" CopyToOutputDirectory="PreserveNewest" /> |
65 | </ItemGroup> | 72 | </ItemGroup> |
73 | |||
66 | <ItemGroup> | 74 | <ItemGroup> |
67 | <Reference Include="System" /> | 75 | <Reference Include="System" /> |
68 | <Reference Include="System.Core" /> | 76 | <Reference Include="System.Core" /> |
@@ -73,6 +81,7 @@ | |||
73 | <HintPath>..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\lib\net472\WixBuildTools.TestSupport.Native.dll</HintPath> | 81 | <HintPath>..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\lib\net472\WixBuildTools.TestSupport.Native.dll</HintPath> |
74 | </Reference> | 82 | </Reference> |
75 | </ItemGroup> | 83 | </ItemGroup> |
84 | |||
76 | <ItemGroup> | 85 | <ItemGroup> |
77 | <ProjectReference Include="..\..\dutil\dutil.vcxproj"> | 86 | <ProjectReference Include="..\..\dutil\dutil.vcxproj"> |
78 | <Project>{1244E671-F108-4334-BA52-8A7517F26ECD}</Project> | 87 | <Project>{1244E671-F108-4334-BA52-8A7517F26ECD}</Project> |