Centralize NETSTANDARD2_1_OR_GREATER define in .targets

CommunityToolkit · Nov 22, 2022 · 765901a · 765901a
1 parent 9d9de23
commit 765901a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 29 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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>