diff options
author | Rob Mensching <rob@firegiant.com> | 2021-04-21 11:53:24 -0700 |
---|---|---|
committer | Rob Mensching <rob@firegiant.com> | 2021-04-29 16:36:02 -0700 |
commit | b6c44ffcf2ef7a706598fe218523ec377e96cc47 (patch) | |
tree | 712bd2b337a197644c1ac88bef96ccf8d3b779d6 /src/test | |
parent | 752f0e0576dc27e937c553ed9dce5576bd388e95 (diff) | |
download | wix-b6c44ffcf2ef7a706598fe218523ec377e96cc47.tar.gz wix-b6c44ffcf2ef7a706598fe218523ec377e96cc47.tar.bz2 wix-b6c44ffcf2ef7a706598fe218523ec377e96cc47.zip |
Migrate Burn API headers to balutil repository
Diffstat (limited to 'src/test')
-rw-r--r-- | src/test/BurnUnitTest/BurnUnitTest.vcxproj | 25 | ||||
-rw-r--r-- | src/test/BurnUnitTest/packages.config | 7 |
2 files changed, 20 insertions, 12 deletions
diff --git a/src/test/BurnUnitTest/BurnUnitTest.vcxproj b/src/test/BurnUnitTest/BurnUnitTest.vcxproj index 99db505d..33c8ed6c 100644 --- a/src/test/BurnUnitTest/BurnUnitTest.vcxproj +++ b/src/test/BurnUnitTest/BurnUnitTest.vcxproj | |||
@@ -1,10 +1,10 @@ | |||
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\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" /> | 5 | <Import Project="..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.57\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.57\build\WixToolset.BootstrapperCore.Native.props')" /> |
7 | <Import Project="..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.props" Condition="Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.props')" /> | 6 | <Import Project="..\..\..\packages\WixToolset.DUtil.4.0.70\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\packages\WixToolset.DUtil.4.0.70\build\WixToolset.DUtil.props')" /> |
7 | <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')" /> | ||
8 | <ItemGroup Label="ProjectConfigurations"> | 8 | <ItemGroup Label="ProjectConfigurations"> |
9 | <ProjectConfiguration Include="Debug|ARM64"> | 9 | <ProjectConfiguration Include="Debug|ARM64"> |
10 | <Configuration>Debug</Configuration> | 10 | <Configuration>Debug</Configuration> |
@@ -23,6 +23,7 @@ | |||
23 | <Platform>Win32</Platform> | 23 | <Platform>Win32</Platform> |
24 | </ProjectConfiguration> | 24 | </ProjectConfiguration> |
25 | </ItemGroup> | 25 | </ItemGroup> |
26 | |||
26 | <PropertyGroup Label="Globals"> | 27 | <PropertyGroup Label="Globals"> |
27 | <ProjectTypes>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}</ProjectTypes> | 28 | <ProjectTypes>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}</ProjectTypes> |
28 | <ProjectGuid>{9D1F1BA3-9393-4833-87A3-D5F1FC08EF67}</ProjectGuid> | 29 | <ProjectGuid>{9D1F1BA3-9393-4833-87A3-D5F1FC08EF67}</ProjectGuid> |
@@ -31,13 +32,18 @@ | |||
31 | <ConfigurationType>DynamicLibrary</ConfigurationType> | 32 | <ConfigurationType>DynamicLibrary</ConfigurationType> |
32 | <CharacterSet>Unicode</CharacterSet> | 33 | <CharacterSet>Unicode</CharacterSet> |
33 | <CLRSupport>true</CLRSupport> | 34 | <CLRSupport>true</CLRSupport> |
35 | <SignOutput>false</SignOutput> | ||
34 | </PropertyGroup> | 36 | </PropertyGroup> |
37 | |||
35 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | 38 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> |
36 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | 39 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> |
40 | |||
37 | <PropertyGroup> | 41 | <PropertyGroup> |
38 | <ProjectAdditionalIncludeDirectories>..\..\engine;..\..\WixToolset.BootstrapperCore.Native\inc</ProjectAdditionalIncludeDirectories> | 42 | <ProjectAdditionalIncludeDirectories Condition=" '$(DirectReference)'=='true' ">$(ProjectDir)..\..\..\..\balutil\src\WixToolset.BootstrapperCore.Native\inc</ProjectAdditionalIncludeDirectories> |
43 | <ProjectAdditionalIncludeDirectories>$(ProjectAdditionalIncludeDirectories);..\..\engine</ProjectAdditionalIncludeDirectories> | ||
39 | <ProjectAdditionalLinkLibraries>cabinet.lib;crypt32.lib;msi.lib;rpcrt4.lib;shlwapi.lib;wininet.lib</ProjectAdditionalLinkLibraries> | 44 | <ProjectAdditionalLinkLibraries>cabinet.lib;crypt32.lib;msi.lib;rpcrt4.lib;shlwapi.lib;wininet.lib</ProjectAdditionalLinkLibraries> |
40 | </PropertyGroup> | 45 | </PropertyGroup> |
46 | |||
41 | <ItemGroup> | 47 | <ItemGroup> |
42 | <ClCompile Include="AssemblyInfo.cpp" /> | 48 | <ClCompile Include="AssemblyInfo.cpp" /> |
43 | <ClCompile Include="CacheTest.cpp" /> | 49 | <ClCompile Include="CacheTest.cpp" /> |
@@ -86,7 +92,7 @@ | |||
86 | </ItemGroup> | 92 | </ItemGroup> |
87 | <ItemGroup> | 93 | <ItemGroup> |
88 | <ProjectReference Include="..\..\engine\engine.vcxproj"> | 94 | <ProjectReference Include="..\..\engine\engine.vcxproj"> |
89 | <Project>{8119537D-E1D9-6591-D51A-49768A2F9C37}</Project> | 95 | <Project>{8119537D-E1D9-6591-D51A-49770A2F9C37}</Project> |
90 | </ProjectReference> | 96 | </ProjectReference> |
91 | </ItemGroup> | 97 | </ItemGroup> |
92 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | 98 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
@@ -95,8 +101,9 @@ | |||
95 | <PropertyGroup> | 101 | <PropertyGroup> |
96 | <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> | 102 | <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> |
97 | </PropertyGroup> | 103 | </PropertyGroup> |
98 | <Error Condition="!Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.props'))" /> | 104 | <Error Condition="!Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\build\WixBuildTools.TestSupport.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\build\WixBuildTools.TestSupport.Native.props'))" /> |
99 | <Error Condition="!Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.targets'))" /> | 105 | <Error Condition="!Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\build\WixBuildTools.TestSupport.Native.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\build\WixBuildTools.TestSupport.Native.targets'))" /> |
100 | <Error Condition="!Exists('..\..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props'))" /> | 106 | <Error Condition="!Exists('..\..\..\packages\WixToolset.DUtil.4.0.70\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.DUtil.4.0.70\build\WixToolset.DUtil.props'))" /> |
107 | <Error Condition="!Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.57\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.57\build\WixToolset.BootstrapperCore.Native.props'))" /> | ||
101 | </Target> | 108 | </Target> |
102 | </Project> \ No newline at end of file | 109 | </Project> |
diff --git a/src/test/BurnUnitTest/packages.config b/src/test/BurnUnitTest/packages.config index 1eb30932..1d36c387 100644 --- a/src/test/BurnUnitTest/packages.config +++ b/src/test/BurnUnitTest/packages.config | |||
@@ -1,9 +1,10 @@ | |||
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 | <packages> | 3 | <packages> |
4 | <package id="WixBuildTools.TestSupport" version="4.0.50" /> | 4 | <package id="WixBuildTools.TestSupport" version="4.0.47" /> |
5 | <package id="WixBuildTools.TestSupport.Native" version="4.0.50" /> | 5 | <package id="WixBuildTools.TestSupport.Native" version="4.0.47" /> |
6 | <package id="WixToolset.DUtil" version="4.0.72" targetFramework="native" /> | 6 | <package id="WixToolset.DUtil" version="4.0.70" targetFramework="native" /> |
7 | <package id="WixToolset.BootstrapperCore.Native" version="4.0.57" targetFramework="native" /> | ||
7 | <package id="xunit.abstractions" version="2.0.3" /> | 8 | <package id="xunit.abstractions" version="2.0.3" /> |
8 | <package id="xunit.assert" version="2.4.1" /> | 9 | <package id="xunit.assert" version="2.4.1" /> |
9 | <package id="xunit.core" version="2.4.1" /> | 10 | <package id="xunit.core" version="2.4.1" /> |