Test fix for warning suppression

(Didn't realize this PR was still not updated for tooling module, but that does make this fix easier to test...)
CommunityToolkit · Mar 28, 2023 · 3c4ef88 · 3c4ef88
1 parent 9b60883
commit 3c4ef88
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 14 deletions.
diff --git a/components/TransitionHelper/src/CommunityToolkit.Labs.WinUI.TransitionHelper.csproj b/components/TransitionHelper/src/CommunityToolkit.Labs.WinUI.TransitionHelper.csproj
@@ -9,7 +9,7 @@
 
     <!-- TODO: Putting here as seems to get flagged on different partials, need to deal with TokenSource being disposible -->
     <!-- See: https://github.com/CommunityToolkit/Labs-Windows/issues/407 -->
-    <NoWarn>CA1001</NoWarn>
+    <NoWarn>$(NoWarn);CA1001</NoWarn>
   </PropertyGroup>
 
   <!-- Sets this up as a toolkit component's source project -->

diff --git a/tooling/MultiTarget/MultiTarget.props b/tooling/MultiTarget/MultiTarget.props
@@ -40,7 +40,7 @@
 
   <PropertyGroup>
     <!-- These suppressions are for references between generated assemblies and that VS can keep in the Error List once resolved -->
-    <NoWarn>WMC1006;CS8034;</NoWarn>
+    <NoWarn>$(NoWarn);WMC1006;CS8034;</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/tooling/MultiTarget/Uno.props b/tooling/MultiTarget/Uno.props
@@ -21,8 +21,8 @@
         <PackageReference Include="Uno.UI.Skia.Wpf" Version="4.6.18" />
     </ItemGroup>
     <PropertyGroup Condition="'$(IsWpfHead)' == 'true'">
-        <!-- Ignorable issue from SkiaSharp package, see: https://github.com/CommunityToolkit/Labs-Windows/pull/119#issuecomment-1125373091 -->
-        <NoWarn>NU1701</NoWarn>
+        <!-- NU1701 Ignorable issue from SkiaSharp package, see: https://github.com/CommunityToolkit/Labs-Windows/pull/119#issuecomment-1125373091 -->
+        <NoWarn>$(NoWarn);NU1701</NoWarn>
     </PropertyGroup>
 
     <ItemGroup Condition="'$(IsWasmHead)' == 'true'">

diff --git a/tooling/ProjectHeads/Head.Uwp.props b/tooling/ProjectHeads/Head.Uwp.props
@@ -17,6 +17,7 @@
         <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
         <WindowsXamlEnableOverview>true</WindowsXamlEnableOverview>
         <AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
+        <NoWarn>$(NoWarn);2008</NoWarn>
     </PropertyGroup>
 
     <PropertyGroup Condition="'$(Configuration)' == 'Release'">
@@ -27,19 +28,15 @@
         <DebugSymbols>true</DebugSymbols>
         <OutputPath>bin\x86\Debug\</OutputPath>
         <DefineConstants>$(DefineConstants);DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-        <NoWarn>;2008</NoWarn>
         <DebugType>full</DebugType>
         <PlatformTarget>x86</PlatformTarget>
         <UseVSHostingProcess>false</UseVSHostingProcess>
-        <ErrorReport>prompt</ErrorReport>
-        <Prefer32Bit>true</Prefer32Bit>
     </PropertyGroup>
 
     <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
         <OutputPath>bin\x86\Release\</OutputPath>
         <DefineConstants>$(DefineConstants);TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
         <Optimize>true</Optimize>
-        <NoWarn>;2008</NoWarn>
         <DebugType>pdbonly</DebugType>
         <PlatformTarget>x86</PlatformTarget>
         <UseVSHostingProcess>false</UseVSHostingProcess>
@@ -51,7 +48,6 @@
         <DebugSymbols>true</DebugSymbols>
         <OutputPath>bin\ARM\Debug\</OutputPath>
         <DefineConstants>$(DefineConstants);DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-        <NoWarn>;2008</NoWarn>
         <DebugType>full</DebugType>
         <PlatformTarget>ARM</PlatformTarget>
         <UseVSHostingProcess>false</UseVSHostingProcess>
@@ -63,7 +59,6 @@
         <OutputPath>bin\ARM\Release\</OutputPath>
         <DefineConstants>$(DefineConstants);TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
         <Optimize>true</Optimize>
-        <NoWarn>;2008</NoWarn>
         <DebugType>pdbonly</DebugType>
         <PlatformTarget>ARM</PlatformTarget>
         <UseVSHostingProcess>false</UseVSHostingProcess>
@@ -75,7 +70,6 @@
         <DebugSymbols>true</DebugSymbols>
         <OutputPath>bin\ARM64\Debug\</OutputPath>
         <DefineConstants>$(DefineConstants);DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-        <NoWarn>;2008</NoWarn>
         <DebugType>full</DebugType>
         <PlatformTarget>ARM64</PlatformTarget>
         <UseVSHostingProcess>false</UseVSHostingProcess>
@@ -87,7 +81,6 @@
         <OutputPath>bin\ARM64\Release\</OutputPath>
         <DefineConstants>$(DefineConstants);TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
         <Optimize>true</Optimize>
-        <NoWarn>;2008</NoWarn>
         <DebugType>pdbonly</DebugType>
         <PlatformTarget>ARM64</PlatformTarget>
         <UseVSHostingProcess>false</UseVSHostingProcess>
@@ -99,7 +92,6 @@
         <DebugSymbols>true</DebugSymbols>
         <OutputPath>bin\x64\Debug\</OutputPath>
         <DefineConstants>$(DefineConstants);DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-        <NoWarn>;2008</NoWarn>
         <DebugType>full</DebugType>
         <PlatformTarget>x64</PlatformTarget>
         <UseVSHostingProcess>false</UseVSHostingProcess>
@@ -111,7 +103,6 @@
         <OutputPath>bin\x64\Release\</OutputPath>
         <DefineConstants>$(DefineConstants);TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
         <Optimize>true</Optimize>
-        <NoWarn>;2008</NoWarn>
         <DebugType>pdbonly</DebugType>
         <PlatformTarget>x64</PlatformTarget>
         <UseVSHostingProcess>false</UseVSHostingProcess>