From 765901aace14dc24d22f1f657ebdf51870b5eb47 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Tue, 22 Nov 2022 17:27:34 +0100
Subject: [PATCH] Centralize NETSTANDARD2_1_OR_GREATER define in .targets

---
 .../CommunityToolkit.Common.csproj              |  5 -----
 .../CommunityToolkit.Diagnostics.csproj         | 17 +++--------------
 .../CommunityToolkit.HighPerformance.csproj     | 11 +----------
 src/Directory.Build.targets                     |  5 +++++
 4 files changed, 9 insertions(+), 29 deletions(-)

diff --git a/src/CommunityToolkit.Common/CommunityToolkit.Common.csproj b/src/CommunityToolkit.Common/CommunityToolkit.Common.csproj
index 43324e44..f2d7cb70 100644
--- a/src/CommunityToolkit.Common/CommunityToolkit.Common.csproj
+++ b/src/CommunityToolkit.Common/CommunityToolkit.Common.csproj
@@ -14,11 +14,6 @@
     <PackageTags>Incremental;Loading;Collection;IncrementalLoadingCollection;String;Array;Extensions;Helpers</PackageTags>
   </PropertyGroup>
 
-  <!-- .NET Standard 2.1 and .NET 6 already have [NotNullIfNotNull] and [NotNullWhen] -->
-  <PropertyGroup Condition="'$(TargetFramework)' == 'net6.0'">
-    <DefineConstants>NETSTANDARD2_1_OR_GREATER</DefineConstants>
-  </PropertyGroup>
-
   <!-- Necessary polyfills -->
   <PropertyGroup>
     <PolySharpIncludeGeneratedTypes>
diff --git a/src/CommunityToolkit.Diagnostics/CommunityToolkit.Diagnostics.csproj b/src/CommunityToolkit.Diagnostics/CommunityToolkit.Diagnostics.csproj
index 68867263..6cd510f1 100644
--- a/src/CommunityToolkit.Diagnostics/CommunityToolkit.Diagnostics.csproj
+++ b/src/CommunityToolkit.Diagnostics/CommunityToolkit.Diagnostics.csproj
@@ -15,31 +15,20 @@
   </PropertyGroup>
 
   <Choose>
-    <When Condition="'$(TargetFramework)' == 'netstandard2.0'">
 
-      <!-- .NET Standard 2.0 doesn't have the Span<T> type -->
+    <!-- .NET Standard 2.0 doesn't have the Span<T> type -->
+    <When Condition="'$(TargetFramework)' == 'netstandard2.0'">
       <ItemGroup>
         <PackageReference Include="System.Memory" Version="4.5.5" />
       </ItemGroup>
     </When>
 
+    <!-- .NET Standard 2.1 doesn't have the Unsafe type -->
     <When Condition="'$(TargetFramework)' == 'netstandard2.1'">
-      <PropertyGroup>
-        <DefineConstants>NETSTANDARD2_1_OR_GREATER</DefineConstants>
-      </PropertyGroup>
-
-      <!-- .NET Standard 2.1 doesn't have the Unsafe type -->
       <ItemGroup>
         <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
       </ItemGroup>
     </When>
-
-    <!-- For the .NET 6 target, simply define NETSTANDARD2_1_OR_GREATER too -->
-    <When Condition="'$(TargetFramework)' == 'net6.0'">
-      <PropertyGroup>
-        <DefineConstants>NETSTANDARD2_1_OR_GREATER</DefineConstants>
-      </PropertyGroup>
-    </When>
   </Choose>
 
   <!-- Necessary polyfills -->
diff --git a/src/CommunityToolkit.HighPerformance/CommunityToolkit.HighPerformance.csproj b/src/CommunityToolkit.HighPerformance/CommunityToolkit.HighPerformance.csproj
index 2f4b00bf..1639b330 100644
--- a/src/CommunityToolkit.HighPerformance/CommunityToolkit.HighPerformance.csproj
+++ b/src/CommunityToolkit.HighPerformance/CommunityToolkit.HighPerformance.csproj
@@ -42,21 +42,12 @@
       </ItemGroup>
     </When>
 
+    <!-- .NET Standard 2.1 doesn't have the Unsafe type -->
     <When Condition="'$(TargetFramework)' == 'netstandard2.1'">
-
-      <!-- .NET Standard 2.1 doesn't have the Unsafe type -->
       <ItemGroup>
         <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
       </ItemGroup>
     </When>
-
-    <When Condition="'$(TargetFramework)' == 'net6.0' OR '$(TargetFramework)' == 'net7.0'">
-
-      <!-- NETSTANDARD2_1_OR_GREATER: includes both .NET Standard 2.1 and .NET 6 and above -->
-      <PropertyGroup>
-        <DefineConstants>NETSTANDARD2_1_OR_GREATER</DefineConstants>
-      </PropertyGroup>
-    </When>
   </Choose>
 
   <!-- Necessary polyfills -->
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
index 94c099ce..36dde4ce 100644
--- a/src/Directory.Build.targets
+++ b/src/Directory.Build.targets
@@ -2,6 +2,11 @@
 <Project>
   <Import Project="..\Directory.Build.targets" />
 
+  <!-- Define NETSTANDARD2_1_OR_GREATER for .NET Standard 2.1 targets and above -->
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net6.0' OR '$(TargetFramework)' == 'net6.0' OR '$(TargetFramework)' == 'net7.0'">
+    <DefineConstants>NETSTANDARD2_1_OR_GREATER</DefineConstants>
+  </PropertyGroup>
+
   <!-- Configure trimming for projects on .NET 6 and above -->
   <PropertyGroup Condition="'$(TargetFramework)' == 'net6.0' OR '$(TargetFramework)' == 'net7.0'">
     <EnableTrimAnalyzer>true</EnableTrimAnalyzer>