aboutsummaryrefslogtreecommitdiff
path: root/src/burn
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2021-12-31 16:20:11 -0600
committerSean Hall <r.sean.hall@gmail.com>2022-01-01 10:24:08 -0600
commit5be795c6bcbc03bc37f7cf7c758298ccfaa884ca (patch)
treef13c40af4a20cfbffaa474e656e145cdda16919e /src/burn
parent37790ecdc4509d6dd3533933bb9131823f98a0ed (diff)
downloadwix-5be795c6bcbc03bc37f7cf7c758298ccfaa884ca.tar.gz
wix-5be795c6bcbc03bc37f7cf7c758298ccfaa884ca.tar.bz2
wix-5be795c6bcbc03bc37f7cf7c758298ccfaa884ca.zip
Remove warnings and make sure more don't creep in.
Tests are not run inside of traversal projects so that skipped test warnings don't fail the build.
Diffstat (limited to 'src/burn')
-rw-r--r--src/burn/burn.cmd4
-rw-r--r--src/burn/burn.sln7
-rw-r--r--src/burn/burn_t.proj8
-rw-r--r--src/burn/engine/engine.vcxproj2
-rw-r--r--src/burn/test/BurnUnitTest/BurnUnitTest.vcxproj9
5 files changed, 12 insertions, 18 deletions
diff --git a/src/burn/burn.cmd b/src/burn/burn.cmd
index 8c5010b5..b7c171c5 100644
--- a/src/burn/burn.cmd
+++ b/src/burn/burn.cmd
@@ -12,7 +12,9 @@
12 12
13nuget restore || exit /b 13nuget restore || exit /b
14 14
15msbuild burn_t.proj -p:Configuration=%_C% -nologo -m -bl:..\..\build\logs\burn_build.binlog || exit /b 15msbuild burn_t.proj -p:Configuration=%_C% -nologo -m -warnaserror -bl:..\..\build\logs\burn_build.binlog || exit /b
16
17msbuild test\BurnUnitTest -t:Test -p:Configuration=%_C% -nologo || exit /b
16 18
17@popd 19@popd
18@endlocal 20@endlocal
diff --git a/src/burn/burn.sln b/src/burn/burn.sln
index 0a6227a5..c820a467 100644
--- a/src/burn/burn.sln
+++ b/src/burn/burn.sln
@@ -43,13 +43,14 @@ Global
43 {C38373AA-882F-4F55-B03F-2AAB4BFBE3F1}.Release|x64.Build.0 = Release|x64 43 {C38373AA-882F-4F55-B03F-2AAB4BFBE3F1}.Release|x64.Build.0 = Release|x64
44 {C38373AA-882F-4F55-B03F-2AAB4BFBE3F1}.Release|x86.ActiveCfg = Release|Win32 44 {C38373AA-882F-4F55-B03F-2AAB4BFBE3F1}.Release|x86.ActiveCfg = Release|Win32
45 {C38373AA-882F-4F55-B03F-2AAB4BFBE3F1}.Release|x86.Build.0 = Release|Win32 45 {C38373AA-882F-4F55-B03F-2AAB4BFBE3F1}.Release|x86.Build.0 = Release|Win32
46 {9D1F1BA3-9393-4833-87A3-D5F1FC08EF67}.Debug|ARM64.ActiveCfg = Debug|ARM64 46 {9D1F1BA3-9393-4833-87A3-D5F1FC08EF67}.Debug|ARM64.ActiveCfg = Debug|x64
47 {9D1F1BA3-9393-4833-87A3-D5F1FC08EF67}.Debug|x64.ActiveCfg = Debug|x64 47 {9D1F1BA3-9393-4833-87A3-D5F1FC08EF67}.Debug|x64.ActiveCfg = Debug|x64
48 {9D1F1BA3-9393-4833-87A3-D5F1FC08EF67}.Debug|x64.Build.0 = Debug|x64 48 {9D1F1BA3-9393-4833-87A3-D5F1FC08EF67}.Debug|x64.Build.0 = Debug|x64
49 {9D1F1BA3-9393-4833-87A3-D5F1FC08EF67}.Debug|x86.ActiveCfg = Debug|Win32 49 {9D1F1BA3-9393-4833-87A3-D5F1FC08EF67}.Debug|x86.ActiveCfg = Debug|Win32
50 {9D1F1BA3-9393-4833-87A3-D5F1FC08EF67}.Debug|x86.Build.0 = Debug|Win32 50 {9D1F1BA3-9393-4833-87A3-D5F1FC08EF67}.Debug|x86.Build.0 = Debug|Win32
51 {9D1F1BA3-9393-4833-87A3-D5F1FC08EF67}.Release|ARM64.ActiveCfg = Release|ARM64 51 {9D1F1BA3-9393-4833-87A3-D5F1FC08EF67}.Release|ARM64.ActiveCfg = Release|x64
52 {9D1F1BA3-9393-4833-87A3-D5F1FC08EF67}.Release|x64.ActiveCfg = Release|Win32 52 {9D1F1BA3-9393-4833-87A3-D5F1FC08EF67}.Release|x64.ActiveCfg = Release|x64
53 {9D1F1BA3-9393-4833-87A3-D5F1FC08EF67}.Release|x64.Build.0 = Release|x64
53 {9D1F1BA3-9393-4833-87A3-D5F1FC08EF67}.Release|x86.ActiveCfg = Release|Win32 54 {9D1F1BA3-9393-4833-87A3-D5F1FC08EF67}.Release|x86.ActiveCfg = Release|Win32
54 {9D1F1BA3-9393-4833-87A3-D5F1FC08EF67}.Release|x86.Build.0 = Release|Win32 55 {9D1F1BA3-9393-4833-87A3-D5F1FC08EF67}.Release|x86.Build.0 = Release|Win32
55 EndGlobalSection 56 EndGlobalSection
diff --git a/src/burn/burn_t.proj b/src/burn/burn_t.proj
index 0eed26ed..ffc0c780 100644
--- a/src/burn/burn_t.proj
+++ b/src/burn/burn_t.proj
@@ -1,10 +1,10 @@
1<Project Sdk="Microsoft.Build.Traversal"> 1<Project Sdk="Microsoft.Build.Traversal">
2 <ItemGroup> 2 <ItemGroup>
3 <ProjectReference Include="test\BurnUnitTest\BurnUnitTest.vcxproj" Targets="Test" /> 3 <ProjectReference Include="test\BurnUnitTest\BurnUnitTest.vcxproj" Properties="Platform=x86" BuildInParallel="false" />
4 4
5 <ProjectReference Include="burn.sln" Properties="Platform=x86" /> 5 <ProjectReference Include="stub\stub.vcxproj" Properties="Platform=x86" />
6 <ProjectReference Include="burn.sln" Properties="Platform=x64" /> 6 <ProjectReference Include="stub\stub.vcxproj" Properties="Platform=x64" />
7 <ProjectReference Include="burn.sln" Properties="Platform=ARM64" /> 7 <ProjectReference Include="stub\stub.vcxproj" Properties="Platform=ARM64" />
8 8
9 <ProjectReference Include="stub\stub.vcxproj" Targets="PackNative" /> 9 <ProjectReference Include="stub\stub.vcxproj" Targets="PackNative" />
10 </ItemGroup> 10 </ItemGroup>
diff --git a/src/burn/engine/engine.vcxproj b/src/burn/engine/engine.vcxproj
index ae28d728..3d6ed181 100644
--- a/src/burn/engine/engine.vcxproj
+++ b/src/burn/engine/engine.vcxproj
@@ -147,7 +147,7 @@
147 <Message>Compiling message file...</Message> 147 <Message>Compiling message file...</Message>
148 <Command>mc.exe -h "$(IntDir)." -r "$(IntDir)." -A -c -z engine.messages "$(InputDir)engine.mc" 148 <Command>mc.exe -h "$(IntDir)." -r "$(IntDir)." -A -c -z engine.messages "$(InputDir)engine.mc"
149rc.exe -fo "$(OutDir)engine.res" "$(IntDir)engine.messages.rc"</Command> 149rc.exe -fo "$(OutDir)engine.res" "$(IntDir)engine.messages.rc"</Command>
150 <Outputs>$(IntDir)engine.messages.h;$(IntDir)engine.messages.rc;$(OutDir)engine.res</Outputs> 150 <Outputs>$(IntDir)engine.messages.h;$(IntDir)engine.messages.rc</Outputs>
151 </CustomBuild> 151 </CustomBuild>
152 </ItemGroup> 152 </ItemGroup>
153 153
diff --git a/src/burn/test/BurnUnitTest/BurnUnitTest.vcxproj b/src/burn/test/BurnUnitTest/BurnUnitTest.vcxproj
index 714b6549..248d7bbb 100644
--- a/src/burn/test/BurnUnitTest/BurnUnitTest.vcxproj
+++ b/src/burn/test/BurnUnitTest/BurnUnitTest.vcxproj
@@ -13,10 +13,6 @@
13 <Configuration>Debug</Configuration> 13 <Configuration>Debug</Configuration>
14 <Platform>x64</Platform> 14 <Platform>x64</Platform>
15 </ProjectConfiguration> 15 </ProjectConfiguration>
16 <ProjectConfiguration Include="Debug|ARM64">
17 <Configuration>Debug</Configuration>
18 <Platform>ARM64</Platform>
19 </ProjectConfiguration>
20 <ProjectConfiguration Include="Release|Win32"> 16 <ProjectConfiguration Include="Release|Win32">
21 <Configuration>Release</Configuration> 17 <Configuration>Release</Configuration>
22 <Platform>Win32</Platform> 18 <Platform>Win32</Platform>
@@ -25,10 +21,6 @@
25 <Configuration>Release</Configuration> 21 <Configuration>Release</Configuration>
26 <Platform>x64</Platform> 22 <Platform>x64</Platform>
27 </ProjectConfiguration> 23 </ProjectConfiguration>
28 <ProjectConfiguration Include="Release|ARM64">
29 <Configuration>Release</Configuration>
30 <Platform>ARM64</Platform>
31 </ProjectConfiguration>
32 </ItemGroup> 24 </ItemGroup>
33 25
34 <PropertyGroup Label="Globals"> 26 <PropertyGroup Label="Globals">
@@ -78,7 +70,6 @@
78 </ItemGroup> 70 </ItemGroup>
79 71
80 <ItemGroup> 72 <ItemGroup>
81 <None Include="packages.config" />
82 <ResourceCompile Include="BurnUnitTest.rc" /> 73 <ResourceCompile Include="BurnUnitTest.rc" />
83 </ItemGroup> 74 </ItemGroup>
84 75