From: Levi Broderick <GrabYourPitchforks@users.noreply.github.com>
Date: Sat, 23 Jul 2022 07:50:02 +0000 (-0700)
Subject: Improve reliability of WarningsAsErrors replacement (#72070)
X-Git-Tag: accepted/tizen/unified/riscv/20231226.055536~7602
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=44397be6cc2c3c0264fb29db90e36c6d4a8ba48e;p=platform%2Fupstream%2Fdotnet%2Fruntime.git

Improve reliability of WarningsAsErrors replacement (#72070)

* Improve reliability of WarningsAsErrors replacement

* PR feedback

Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>

Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
---

diff --git a/src/libraries/Directory.Build.targets b/src/libraries/Directory.Build.targets
index 090f6d3..9869891 100644
--- a/src/libraries/Directory.Build.targets
+++ b/src/libraries/Directory.Build.targets
@@ -33,8 +33,13 @@
          SYSLIB0036: Regex.CompileToAssembly
     -->
     <NoWarn Condition="'$(IsPartialFacadeAssembly)' == 'true'">$(NoWarn);SYSLIB0003;SYSLIB0004;SYSLIB0015;SYSLIB0017;SYSLIB0021;SYSLIB0022;SYSLIB0023;SYSLIB0025;SYSLIB0032;SYSLIB0036</NoWarn>
-    <!-- Reset these properties back to blank, since they are defaulted by Microsoft.NET.Sdk -->
-    <WarningsAsErrors Condition="'$(WarningsAsErrors)' == 'NU1605'" />
+    <!-- Microsoft.NET.Sdk enables some warnings as errors out of the box.
+         We want to remove some items from this list so they don't fail the build.
+         Can't use 'WarningsNotAsErrors' element because vbproj doesn't honor it.
+         Items to remove:
+         NU1605: Package downgrade detected
+    -->
+    <WarningsAsErrors>$(WarningsAsErrors.Replace('NU1605', ''))</WarningsAsErrors>
 
     <IsRuntimeAndReferenceAssembly Condition="'$(IsRuntimeAndReferenceAssembly)' == '' and
                                               '$(IsSourceProject)' == 'true' and