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/libs/dutil/WixToolset.DUtil/dutil.vcxproj           | 1 -
 src/libs/dutil/dutil_t.proj                             | 4 +---
 src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj | 8 ++++++++
 src/libs/libs.cmd                                       | 4 +++-
 4 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'src/libs')

diff --git a/src/libs/dutil/WixToolset.DUtil/dutil.vcxproj b/src/libs/dutil/WixToolset.DUtil/dutil.vcxproj
index cf38e8ae..ba9e801e 100644
--- a/src/libs/dutil/WixToolset.DUtil/dutil.vcxproj
+++ b/src/libs/dutil/WixToolset.DUtil/dutil.vcxproj
@@ -33,7 +33,6 @@
     <ProjectGuid>{1244E671-F108-4334-BA52-8A7517F26ECD}</ProjectGuid>
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <TargetName>dutil</TargetName>
-    <MultiTargetLibrary>true</MultiTargetLibrary>
     <CharacterSet>MultiByte</CharacterSet>
     <Description>WiX Toolset native library foundation</Description>
     <PackageId>WixToolset.DUtil</PackageId>
diff --git a/src/libs/dutil/dutil_t.proj b/src/libs/dutil/dutil_t.proj
index 90d66440..ee33dae1 100644
--- a/src/libs/dutil/dutil_t.proj
+++ b/src/libs/dutil/dutil_t.proj
@@ -1,11 +1,9 @@
 <Project Sdk="Microsoft.Build.Traversal">
   <ItemGroup>
-    <ProjectReference Include="WixToolset.DUtil\dutil.vcxproj" Properties="Platform=x86" />
+    <ProjectReference Include="test\DUtilUnitTest\DUtilUnitTest.vcxproj" Properties="Platform=x86" />
     <ProjectReference Include="WixToolset.DUtil\dutil.vcxproj" Properties="Platform=x64" />
     <ProjectReference Include="WixToolset.DUtil\dutil.vcxproj" Properties="Platform=ARM64" />
 
-    <ProjectReference Include="test\DUtilUnitTest\DUtilUnitTest.vcxproj" Targets="Test" />
-
     <ProjectReference Include="WixToolset.DUtil\dutil.vcxproj" Targets="PackNative" />
   </ItemGroup>
 </Project>
diff --git a/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj b/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj
index cd8d16c4..9fca2608 100644
--- a/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj
+++ b/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj
@@ -9,10 +9,18 @@
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
 
   <PropertyGroup Label="Globals">
diff --git a/src/libs/libs.cmd b/src/libs/libs.cmd
index ddc2e1d6..2cc56239 100644
--- a/src/libs/libs.cmd
+++ b/src/libs/libs.cmd
@@ -8,7 +8,9 @@
 
 @echo Building libs %_C%
 
-msbuild -Restore libs_t.proj -p:Configuration=%_C% -nologo -m -bl:..\..\build\logs\libs_build.binlog || exit /b
+msbuild -Restore libs_t.proj -p:Configuration=%_C% -nologo -m -warnaserror -bl:..\..\build\logs\libs_build.binlog || exit /b
+
+msbuild dutil\test\DutilUnitTest -t:Test -p:Configuration=%_C% -nologo || exit /b
 
 @popd
 @endlocal
-- 
cgit v1.2.3-55-g6feb