From d87e14bd1400ca561542b2e6ce1a69366c7812f7 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Thu, 27 Jan 2022 20:36:21 -0600
Subject: Fix NoWarn being overridden and use PackageReference for TestSupport.

---
 src/internal/WixBuildTools.MsgGen/WixBuildTools.MsgGen.csproj           | 2 +-
 src/internal/WixBuildTools.TestSupport/WixBuildTools.TestSupport.csproj | 2 +-
 src/internal/WixBuildTools.XsdGen/WixBuildTools.XsdGen.csproj           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/internal')

diff --git a/src/internal/WixBuildTools.MsgGen/WixBuildTools.MsgGen.csproj b/src/internal/WixBuildTools.MsgGen/WixBuildTools.MsgGen.csproj
index 0be55c43..861f1679 100644
--- a/src/internal/WixBuildTools.MsgGen/WixBuildTools.MsgGen.csproj
+++ b/src/internal/WixBuildTools.MsgGen/WixBuildTools.MsgGen.csproj
@@ -7,7 +7,7 @@
     <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
     <DebugType>embedded</DebugType>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
-    <NoWarn>CS0618</NoWarn>
+    <NoWarn>$(NoWarn);CS0618</NoWarn>
     <SignOutput>false</SignOutput>
   </PropertyGroup>
 
diff --git a/src/internal/WixBuildTools.TestSupport/WixBuildTools.TestSupport.csproj b/src/internal/WixBuildTools.TestSupport/WixBuildTools.TestSupport.csproj
index 3006e784..d614476f 100644
--- a/src/internal/WixBuildTools.TestSupport/WixBuildTools.TestSupport.csproj
+++ b/src/internal/WixBuildTools.TestSupport/WixBuildTools.TestSupport.csproj
@@ -9,7 +9,7 @@
     <DebugType>embedded</DebugType>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <CreateDocumentationFile>true</CreateDocumentationFile>
-    <NoWarn>CS1591</NoWarn>
+    <NoWarn>$(NoWarn);CS1591</NoWarn>
     <SignOutput>false</SignOutput>
   </PropertyGroup>
 
diff --git a/src/internal/WixBuildTools.XsdGen/WixBuildTools.XsdGen.csproj b/src/internal/WixBuildTools.XsdGen/WixBuildTools.XsdGen.csproj
index dd5a8272..031245ba 100644
--- a/src/internal/WixBuildTools.XsdGen/WixBuildTools.XsdGen.csproj
+++ b/src/internal/WixBuildTools.XsdGen/WixBuildTools.XsdGen.csproj
@@ -9,7 +9,7 @@
     <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
     <DebugType>embedded</DebugType>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
-    <NoWarn>CS0618</NoWarn>
+    <NoWarn>$(NoWarn);CS0618</NoWarn>
     <SignOutput>false</SignOutput>
   </PropertyGroup>
 
-- 
cgit v1.2.3-55-g6feb