aboutsummaryrefslogtreecommitdiff
path: root/src/api/burn/test/BalUtilUnitTest
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2021-04-26 11:31:05 -0700
committerRob Mensching <rob@firegiant.com>2021-05-11 11:14:01 -0700
commitdf016066100df955d5ff98811e113fb2b1bd4b8a (patch)
treea27b35a3651ca7b1d8c4bb7c7483ec2f92583e08 /src/api/burn/test/BalUtilUnitTest
parentdc6022da6cdbb9d7ca54c4a36485ceead07feaaf (diff)
downloadwix-df016066100df955d5ff98811e113fb2b1bd4b8a.tar.gz
wix-df016066100df955d5ff98811e113fb2b1bd4b8a.tar.bz2
wix-df016066100df955d5ff98811e113fb2b1bd4b8a.zip
Implement integrated build process
Diffstat (limited to 'src/api/burn/test/BalUtilUnitTest')
-rw-r--r--src/api/burn/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj42
-rw-r--r--src/api/burn/test/BalUtilUnitTest/packages.config15
2 files changed, 13 insertions, 44 deletions
diff --git a/src/api/burn/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj b/src/api/burn/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj
index d3a81e2a..345c324c 100644
--- a/src/api/burn/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj
+++ b/src/api/burn/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj
@@ -3,9 +3,8 @@
3 3
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\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props')" /> 6 <Import Project="..\..\..\..\internal\WixBuildTools.TestSupport.Native\build\WixBuildTools.TestSupport.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')" /> 7
8 <Import Project="..\..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" />
9 <ItemGroup Label="ProjectConfigurations"> 8 <ItemGroup Label="ProjectConfigurations">
10 <ProjectConfiguration Include="Debug|Win32"> 9 <ProjectConfiguration Include="Debug|Win32">
11 <Configuration>Debug</Configuration> 10 <Configuration>Debug</Configuration>
@@ -16,6 +15,7 @@
16 <Platform>Win32</Platform> 15 <Platform>Win32</Platform>
17 </ProjectConfiguration> 16 </ProjectConfiguration>
18 </ItemGroup> 17 </ItemGroup>
18
19 <PropertyGroup Label="Globals"> 19 <PropertyGroup Label="Globals">
20 <ProjectTypes>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}</ProjectTypes> 20 <ProjectTypes>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}</ProjectTypes>
21 <ProjectGuid>{9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631}</ProjectGuid> 21 <ProjectGuid>{9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631}</ProjectGuid>
@@ -26,12 +26,15 @@
26 <CLRSupport>true</CLRSupport> 26 <CLRSupport>true</CLRSupport>
27 <SignOutput>false</SignOutput> 27 <SignOutput>false</SignOutput>
28 </PropertyGroup> 28 </PropertyGroup>
29
29 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> 30 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
30 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 31 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
32
31 <PropertyGroup> 33 <PropertyGroup>
32 <ProjectAdditionalIncludeDirectories>..\..\balutil\inc</ProjectAdditionalIncludeDirectories> 34 <ProjectAdditionalIncludeDirectories>..\..\balutil\inc;..\..\WixToolset.BootstrapperCore.Native\inc;..\..\..\..\libs\dutil\WixToolset.Dutil\inc</ProjectAdditionalIncludeDirectories>
33 <ProjectAdditionalLinkLibraries>comctl32.lib;gdiplus.lib;msimg32.lib;shlwapi.lib;wininet.lib</ProjectAdditionalLinkLibraries> 35 <ProjectAdditionalLinkLibraries>comctl32.lib;gdiplus.lib;msimg32.lib;shlwapi.lib;$(RootBuildFolder)libs\$(Configuration)\$(PlatformToolset)\$(PlatformTarget)\dutil.lib</ProjectAdditionalLinkLibraries>
34 </PropertyGroup> 36 </PropertyGroup>
37
35 <ItemGroup> 38 <ItemGroup>
36 <ClCompile Include="precomp.cpp"> 39 <ClCompile Include="precomp.cpp">
37 <PrecompiledHeader>Create</PrecompiledHeader> 40 <PrecompiledHeader>Create</PrecompiledHeader>
@@ -41,36 +44,17 @@
41 <ClCompile Include="TestBAFunctions.cpp" /> 44 <ClCompile Include="TestBAFunctions.cpp" />
42 <ClCompile Include="TestBootstrapperApplication.cpp" /> 45 <ClCompile Include="TestBootstrapperApplication.cpp" />
43 </ItemGroup> 46 </ItemGroup>
47
44 <ItemGroup> 48 <ItemGroup>
45 <ClInclude Include="precomp.h" /> 49 <ClInclude Include="precomp.h" />
46 </ItemGroup> 50 </ItemGroup>
47 <ItemGroup> 51
48 <None Include="packages.config" />
49 </ItemGroup>
50 <ItemGroup>
51 <Reference Include="System" />
52 <Reference Include="System.Core" />
53 <Reference Include="WixBuildTools.TestSupport">
54 <HintPath>..\..\..\packages\WixBuildTools.TestSupport.4.0.50\lib\net472\WixBuildTools.TestSupport.dll</HintPath>
55 </Reference>
56 <Reference Include="WixBuildTools.TestSupport.Native">
57 <HintPath>..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\lib\net472\WixBuildTools.TestSupport.Native.dll</HintPath>
58 </Reference>
59 </ItemGroup>
60 <ItemGroup> 52 <ItemGroup>
61 <ProjectReference Include="..\..\balutil\balutil.vcxproj"> 53 <ProjectReference Include="..\..\balutil\balutil.vcxproj">
62 <Project>{EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}</Project> 54 <Project>{EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}</Project>
63 </ProjectReference> 55 </ProjectReference>
64 </ItemGroup> 56 </ItemGroup>
57
65 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> 58 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
66 <Import Project="..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.targets" Condition="Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.targets')" /> 59 <Import Project="..\..\..\..\internal\WixBuildTools.TestSupport.Native\build\WixBuildTools.TestSupport.Native.targets" />
67 <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> 60</Project>
68 <PropertyGroup>
69 <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>
70 </PropertyGroup>
71 <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'))" />
72 <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'))" />
73 <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'))" />
74 <Error Condition="!Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props'))" />
75 </Target>
76</Project> \ No newline at end of file
diff --git a/src/api/burn/test/BalUtilUnitTest/packages.config b/src/api/burn/test/BalUtilUnitTest/packages.config
deleted file mode 100644
index 6d381fbe..00000000
--- a/src/api/burn/test/BalUtilUnitTest/packages.config
+++ /dev/null
@@ -1,15 +0,0 @@
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. -->
3<packages>
4 <package id="WixBuildTools.TestSupport" version="4.0.50" />
5 <package id="WixBuildTools.TestSupport.Native" version="4.0.50" />
6 <package id="WixToolset.BootstrapperCore.Native" version="4.0.141" targetFramework="native" />
7 <package id="WixToolset.DUtil" version="4.0.72" targetFramework="native" />
8 <package id="xunit.abstractions" version="2.0.3" />
9 <package id="xunit.assert" version="2.4.1" />
10 <package id="xunit.core" version="2.4.1" />
11 <package id="xunit.extensibility.core" version="2.4.1" />
12 <package id="xunit.extensibility.execution" version="2.4.1" />
13 <package id="xunit.runner.msbuild" version="2.4.1" />
14 <package id="xunit.runner.visualstudio" version="2.4.1" />
15</packages> \ No newline at end of file