Skip to content

Commit 66ab9fa

Browse files
authored
Merge pull request #38 from CommunityToolkit/llama/nowarn
Ensure `<NoWarn>` blocks in props/proj files don't conflict and overwrite one another
2 parents d34f725 + 4272f10 commit 66ab9fa

File tree

3 files changed

+4
-11
lines changed

3 files changed

+4
-11
lines changed

MultiTarget/MultiTarget.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040

4141
<PropertyGroup>
4242
<!-- These suppressions are for references between generated assemblies and that VS can keep in the Error List once resolved -->
43-
<NoWarn>WMC1006;CS8034;</NoWarn>
43+
<NoWarn>$(NoWarn);WMC1006;CS8034;</NoWarn>
4444
</PropertyGroup>
4545

4646
<ItemGroup>

MultiTarget/Uno.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
</ItemGroup>
2323
<PropertyGroup Condition="'$(IsWpfHead)' == 'true'">
2424
<!-- Ignorable issue from SkiaSharp package, see: https://github.com/CommunityToolkit/Labs-Windows/pull/119#issuecomment-1125373091 -->
25-
<NoWarn>NU1701</NoWarn>
25+
<NoWarn>$(NoWarn);NU1701</NoWarn>
2626
</PropertyGroup>
2727

2828
<ItemGroup Condition="'$(IsWasmHead)' == 'true'">

ProjectHeads/Head.Uwp.props

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
<ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1818
<WindowsXamlEnableOverview>true</WindowsXamlEnableOverview>
1919
<AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
20+
<NoWarn>$(NoWarn);2008</NoWarn>
2021
</PropertyGroup>
2122

2223
<PropertyGroup Condition="'$(Configuration)' == 'Release'">
@@ -26,8 +27,7 @@
2627
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
2728
<DebugSymbols>true</DebugSymbols>
2829
<OutputPath>bin\x86\Debug\</OutputPath>
29-
<DefineConstants>$(DefineConstants);DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
30-
<NoWarn>;2008</NoWarn>
30+
<DefineConstants>$(DefineConstants);DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
3131
<DebugType>full</DebugType>
3232
<PlatformTarget>x86</PlatformTarget>
3333
<UseVSHostingProcess>false</UseVSHostingProcess>
@@ -39,7 +39,6 @@
3939
<OutputPath>bin\x86\Release\</OutputPath>
4040
<DefineConstants>$(DefineConstants);TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
4141
<Optimize>true</Optimize>
42-
<NoWarn>;2008</NoWarn>
4342
<DebugType>pdbonly</DebugType>
4443
<PlatformTarget>x86</PlatformTarget>
4544
<UseVSHostingProcess>false</UseVSHostingProcess>
@@ -51,7 +50,6 @@
5150
<DebugSymbols>true</DebugSymbols>
5251
<OutputPath>bin\ARM\Debug\</OutputPath>
5352
<DefineConstants>$(DefineConstants);DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
54-
<NoWarn>;2008</NoWarn>
5553
<DebugType>full</DebugType>
5654
<PlatformTarget>ARM</PlatformTarget>
5755
<UseVSHostingProcess>false</UseVSHostingProcess>
@@ -63,7 +61,6 @@
6361
<OutputPath>bin\ARM\Release\</OutputPath>
6462
<DefineConstants>$(DefineConstants);TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
6563
<Optimize>true</Optimize>
66-
<NoWarn>;2008</NoWarn>
6764
<DebugType>pdbonly</DebugType>
6865
<PlatformTarget>ARM</PlatformTarget>
6966
<UseVSHostingProcess>false</UseVSHostingProcess>
@@ -75,7 +72,6 @@
7572
<DebugSymbols>true</DebugSymbols>
7673
<OutputPath>bin\ARM64\Debug\</OutputPath>
7774
<DefineConstants>$(DefineConstants);DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
78-
<NoWarn>;2008</NoWarn>
7975
<DebugType>full</DebugType>
8076
<PlatformTarget>ARM64</PlatformTarget>
8177
<UseVSHostingProcess>false</UseVSHostingProcess>
@@ -87,7 +83,6 @@
8783
<OutputPath>bin\ARM64\Release\</OutputPath>
8884
<DefineConstants>$(DefineConstants);TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
8985
<Optimize>true</Optimize>
90-
<NoWarn>;2008</NoWarn>
9186
<DebugType>pdbonly</DebugType>
9287
<PlatformTarget>ARM64</PlatformTarget>
9388
<UseVSHostingProcess>false</UseVSHostingProcess>
@@ -99,7 +94,6 @@
9994
<DebugSymbols>true</DebugSymbols>
10095
<OutputPath>bin\x64\Debug\</OutputPath>
10196
<DefineConstants>$(DefineConstants);DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
102-
<NoWarn>;2008</NoWarn>
10397
<DebugType>full</DebugType>
10498
<PlatformTarget>x64</PlatformTarget>
10599
<UseVSHostingProcess>false</UseVSHostingProcess>
@@ -111,7 +105,6 @@
111105
<OutputPath>bin\x64\Release\</OutputPath>
112106
<DefineConstants>$(DefineConstants);TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
113107
<Optimize>true</Optimize>
114-
<NoWarn>;2008</NoWarn>
115108
<DebugType>pdbonly</DebugType>
116109
<PlatformTarget>x64</PlatformTarget>
117110
<UseVSHostingProcess>false</UseVSHostingProcess>

0 commit comments

Comments
 (0)