From 5be795c6bcbc03bc37f7cf7c758298ccfaa884ca Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Fri, 31 Dec 2021 16:20:11 -0600
Subject: 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.
---
 src/burn/burn.cmd                               | 4 +++-
 src/burn/burn.sln                               | 7 ++++---
 src/burn/burn_t.proj                            | 8 ++++----
 src/burn/engine/engine.vcxproj                  | 2 +-
 src/burn/test/BurnUnitTest/BurnUnitTest.vcxproj | 9 ---------
 5 files changed, 12 insertions(+), 18 deletions(-)

(limited to 'src/burn')

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 @@
 
 nuget restore || exit /b
 
-msbuild burn_t.proj -p:Configuration=%_C% -nologo -m -bl:..\..\build\logs\burn_build.binlog || exit /b
+msbuild burn_t.proj -p:Configuration=%_C% -nologo -m -warnaserror -bl:..\..\build\logs\burn_build.binlog || exit /b
+
+msbuild test\BurnUnitTest -t:Test -p:Configuration=%_C% -nologo || exit /b
 
 @popd
 @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
 		{C38373AA-882F-4F55-B03F-2AAB4BFBE3F1}.Release|x64.Build.0 = Release|x64
 		{C38373AA-882F-4F55-B03F-2AAB4BFBE3F1}.Release|x86.ActiveCfg = Release|Win32
 		{C38373AA-882F-4F55-B03F-2AAB4BFBE3F1}.Release|x86.Build.0 = Release|Win32
-		{9D1F1BA3-9393-4833-87A3-D5F1FC08EF67}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{9D1F1BA3-9393-4833-87A3-D5F1FC08EF67}.Debug|ARM64.ActiveCfg = Debug|x64
 		{9D1F1BA3-9393-4833-87A3-D5F1FC08EF67}.Debug|x64.ActiveCfg = Debug|x64
 		{9D1F1BA3-9393-4833-87A3-D5F1FC08EF67}.Debug|x64.Build.0 = Debug|x64
 		{9D1F1BA3-9393-4833-87A3-D5F1FC08EF67}.Debug|x86.ActiveCfg = Debug|Win32
 		{9D1F1BA3-9393-4833-87A3-D5F1FC08EF67}.Debug|x86.Build.0 = Debug|Win32
-		{9D1F1BA3-9393-4833-87A3-D5F1FC08EF67}.Release|ARM64.ActiveCfg = Release|ARM64
-		{9D1F1BA3-9393-4833-87A3-D5F1FC08EF67}.Release|x64.ActiveCfg = Release|Win32
+		{9D1F1BA3-9393-4833-87A3-D5F1FC08EF67}.Release|ARM64.ActiveCfg = Release|x64
+		{9D1F1BA3-9393-4833-87A3-D5F1FC08EF67}.Release|x64.ActiveCfg = Release|x64
+		{9D1F1BA3-9393-4833-87A3-D5F1FC08EF67}.Release|x64.Build.0 = Release|x64
 		{9D1F1BA3-9393-4833-87A3-D5F1FC08EF67}.Release|x86.ActiveCfg = Release|Win32
 		{9D1F1BA3-9393-4833-87A3-D5F1FC08EF67}.Release|x86.Build.0 = Release|Win32
 	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 @@
 <Project Sdk="Microsoft.Build.Traversal">
   <ItemGroup>
-    <ProjectReference Include="test\BurnUnitTest\BurnUnitTest.vcxproj" Targets="Test" />
+    <ProjectReference Include="test\BurnUnitTest\BurnUnitTest.vcxproj" Properties="Platform=x86" BuildInParallel="false" />
 
-    <ProjectReference Include="burn.sln" Properties="Platform=x86" />
-    <ProjectReference Include="burn.sln" Properties="Platform=x64" />
-    <ProjectReference Include="burn.sln" Properties="Platform=ARM64" />
+    <ProjectReference Include="stub\stub.vcxproj" Properties="Platform=x86" />
+    <ProjectReference Include="stub\stub.vcxproj" Properties="Platform=x64" />
+    <ProjectReference Include="stub\stub.vcxproj" Properties="Platform=ARM64" />
 
     <ProjectReference Include="stub\stub.vcxproj" Targets="PackNative" />
   </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 @@
       <Message>Compiling message file...</Message>
       <Command>mc.exe -h "$(IntDir)." -r "$(IntDir)." -A -c -z engine.messages "$(InputDir)engine.mc"
 rc.exe -fo "$(OutDir)engine.res" "$(IntDir)engine.messages.rc"</Command>
-      <Outputs>$(IntDir)engine.messages.h;$(IntDir)engine.messages.rc;$(OutDir)engine.res</Outputs>
+      <Outputs>$(IntDir)engine.messages.h;$(IntDir)engine.messages.rc</Outputs>
     </CustomBuild>
   </ItemGroup>
 
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 @@
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|ARM64">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -25,10 +21,6 @@
       <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM64">
-      <Configuration>Release</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
   </ItemGroup>
 
   <PropertyGroup Label="Globals">
@@ -78,7 +70,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="packages.config" />
     <ResourceCompile Include="BurnUnitTest.rc" />
   </ItemGroup>
 
-- 
cgit v1.2.3-55-g6feb