From 51eb65176dbb8ff7c7a6f7f3e8cfc71f258fba02 Mon Sep 17 00:00:00 2001
From: Paul Irwin <paulirwin@gmail.com>
Date: Thu, 28 Mar 2024 17:29:00 -0600
Subject: [PATCH] Move net5.0 warning suppression to combined group

---
 TestTargetFramework.props | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/TestTargetFramework.props b/TestTargetFramework.props
index 6bb22df5ea..3b863803db 100644
--- a/TestTargetFramework.props
+++ b/TestTargetFramework.props
@@ -63,13 +63,11 @@
     <IsTestProject>true</IsTestProject>
   </PropertyGroup>
 
-  <PropertyGroup Label="net5.0 Warnings to be Disabled in Test Projects" Condition=" '$(TargetFramework)' == 'net5.0' ">
-    <!-- We purposely test on EoL frameworks for testing netstandard2.1, but we want to keep this warning in production code. -->
-    <CheckEolTargetFramework>false</CheckEolTargetFramework>
-  </PropertyGroup>
-
   <PropertyGroup Label="Warnings to be Disabled in Test Projects">
 
+    <!-- We purposely test on EoL frameworks for testing netstandard2.1, but we want to keep this warning in production code. -->
+    <CheckEolTargetFramework Condition=" '$(TargetFramework)' == 'net5.0' ">false</CheckEolTargetFramework>
+
     <NoWarn Label="Nested types should not be visible">$(NoWarn);CA1034</NoWarn>
     <NoWarn Label="Use Literals Where Appropriate">$(NoWarn);CA1802</NoWarn>
     <NoWarn Label="Do not ignore method results">$(NoWarn);CA1806</NoWarn>