From 4c40c45c99dcdd25d514d5249c8991432f11b52a Mon Sep 17 00:00:00 2001
From: "Nikola Milosavljevic (CLR) false" <nikolam@microsoft.com>
Date: Mon, 7 Apr 2025 19:53:52 -0700
Subject: [PATCH 1/2] Suppress IDE0031 warnings in VMR

---
 .../src/System.Private.Windows.Core.csproj                      | 2 ++
 src/System.Windows.Forms/System.Windows.Forms.csproj            | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/System.Private.Windows.Core/src/System.Private.Windows.Core.csproj b/src/System.Private.Windows.Core/src/System.Private.Windows.Core.csproj
index a57794cc65a..e45a4393888 100644
--- a/src/System.Private.Windows.Core/src/System.Private.Windows.Core.csproj
+++ b/src/System.Private.Windows.Core/src/System.Private.Windows.Core.csproj
@@ -21,6 +21,8 @@
       SYSLIB5005: System.Formats.Nrbf is experimental
     -->
     <NoWarn>$(NoWarn);CS3016;SYSLIB5005</NoWarn>
+    <!-- Reenable when fixes are made for IDE0031 warnings that VMR treats as errors. -->
+    <NoWarn Condition="'$(DotNetBuild)' == 'true'">$(NoWarn);IDE0031</NoWarn>
     <Deterministic>true</Deterministic>
     <ProduceReferenceAssembly>true</ProduceReferenceAssembly>
     <UsePublicApiAnalyzers>false</UsePublicApiAnalyzers>
diff --git a/src/System.Windows.Forms/System.Windows.Forms.csproj b/src/System.Windows.Forms/System.Windows.Forms.csproj
index 7c7a3233561..fd294943381 100644
--- a/src/System.Windows.Forms/System.Windows.Forms.csproj
+++ b/src/System.Windows.Forms/System.Windows.Forms.csproj
@@ -15,6 +15,8 @@
       SYSLIB5005: System.Formats.Nrbf is experimental
     -->
     <NoWarn>$(NoWarn);SYSLIB5005</NoWarn>
+    <!-- Reenable when fixes are made for IDE0031 warnings that VMR treats as errors. -->
+    <NoWarn Condition="'$(DotNetBuild)' == 'true'">$(NoWarn);IDE0031</NoWarn>
     <Win32Manifest>Resources\System\Windows\Forms\XPThemes.manifest</Win32Manifest>
     <Deterministic>true</Deterministic>
     <ProduceReferenceAssembly>true</ProduceReferenceAssembly>

From 222d0308590d1747dd114736987106dab44f1db8 Mon Sep 17 00:00:00 2001
From: Nikola Milosavljevic <nikolam@microsoft.com>
Date: Mon, 7 Apr 2025 21:37:48 -0700
Subject: [PATCH 2/2] Update
 src/System.Private.Windows.Core/src/System.Private.Windows.Core.csproj

Co-authored-by: Tanya Solyanik <tanyaso@microsoft.com>
---
 .../src/System.Private.Windows.Core.csproj                     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/System.Private.Windows.Core/src/System.Private.Windows.Core.csproj b/src/System.Private.Windows.Core/src/System.Private.Windows.Core.csproj
index e45a4393888..93daffd0b4c 100644
--- a/src/System.Private.Windows.Core/src/System.Private.Windows.Core.csproj
+++ b/src/System.Private.Windows.Core/src/System.Private.Windows.Core.csproj
@@ -21,7 +21,8 @@
       SYSLIB5005: System.Formats.Nrbf is experimental
     -->
     <NoWarn>$(NoWarn);CS3016;SYSLIB5005</NoWarn>
-    <!-- Reenable when fixes are made for IDE0031 warnings that VMR treats as errors. -->
+    <!-- Reenable when SDK and dotnet Preview 4 versions flow into this repo and we are in sync with VMR. -->
+    <!-- tracking https://github.com/dotnet/winforms/issues/13261 -->
     <NoWarn Condition="'$(DotNetBuild)' == 'true'">$(NoWarn);IDE0031</NoWarn>
     <Deterministic>true</Deterministic>
     <ProduceReferenceAssembly>true</ProduceReferenceAssembly>