use standard NETCOREAPP3_1_OR_GREATER directive

SixLabors · Nov 26, 2021 · e10126e · e10126e
1 parent 9ec8dc7
commit e10126e
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 10 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -33,8 +33,4 @@
   <PropertyGroup Condition="$(Configuration.StartsWith('Release')) == true">
     <Optimize>true</Optimize>
   </PropertyGroup>
-
-  <PropertyGroup>
-    <DefineConstants Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)','netcoreapp3.1'))">$(DefineConstants);NETCORE31COMPATIBLE</DefineConstants>
-  </PropertyGroup>
 </Project>
diff --git a/src/ImageSharp/Memory/Allocators/Internals/Gen2GcCallback.cs b/src/ImageSharp/Memory/Allocators/Internals/Gen2GcCallback.cs
@@ -3,7 +3,7 @@
 
 // Port of BCL internal utility:
 // https://github.com/dotnet/runtime/blob/57bfe474518ab5b7cfe6bf7424a79ce3af9d6657/src/libraries/System.Private.CoreLib/src/System/Gen2GcCallback.cs
-#if NETCORE31COMPATIBLE
+#if NETCOREAPP3_1_OR_GREATER
 using System;
 using System.Runtime.ConstrainedExecution;
 using System.Runtime.InteropServices;

diff --git a/src/ImageSharp/Memory/Allocators/Internals/UniformUnmanagedMemoryPool.cs b/src/ImageSharp/Memory/Allocators/Internals/UniformUnmanagedMemoryPool.cs
@@ -42,7 +42,7 @@ public UniformUnmanagedMemoryPool(int bufferLength, int capacity, TrimSettings t
             if (trimSettings.Enabled)
             {
                 UpdateTimer(trimSettings, this);
-#if NETCORE31COMPATIBLE
+#if NETCOREAPP3_1_OR_GREATER || NETFRAMEWORK
                 Gen2GcCallback.Register(s => ((UniformUnmanagedMemoryPool)s).Trim(), this);
 #endif
                 this.lastTrimTimestamp = Stopwatch.ElapsedMilliseconds;
@@ -328,7 +328,7 @@ private bool TrimLowPressure(UnmanagedMemoryHandle[] buffersLocal)
 
         private bool IsHighMemoryPressure()
         {
-#if NETCORE31COMPATIBLE
+#if NETCOREAPP3_1_OR_GREATER
             GCMemoryInfo memoryInfo = GC.GetGCMemoryInfo();
             return memoryInfo.MemoryLoadBytes >= memoryInfo.HighMemoryLoadThresholdBytes * this.trimSettings.HighPressureThresholdRate;
 #else

diff --git a/src/ImageSharp/Memory/Allocators/UniformUnmanagedMemoryPoolMemoryAllocator.cs b/src/ImageSharp/Memory/Allocators/UniformUnmanagedMemoryPoolMemoryAllocator.cs
@@ -146,7 +146,7 @@ internal override MemoryGroup<T> AllocateGroup<T>(
 
         private static long GetDefaultMaxPoolSizeBytes()
         {
-#if NETCORE31COMPATIBLE
+#if NETCOREAPP3_1_OR_GREATER
             // On 64 bit .NET Core 3.1+, set the pool size to a portion of the total available memory.
             // There is a bug in GC.GetGCMemoryInfo() on .NET 5 + 32 bit, making TotalAvailableMemoryBytes unreliable:
             // https://github.com/dotnet/runtime/issues/55126#issuecomment-876779327

diff --git a/tests/ImageSharp.Tests/ImageSharp.Tests.csproj b/tests/ImageSharp.Tests/ImageSharp.Tests.csproj
@@ -7,7 +7,6 @@
     <Platforms>AnyCPU;x64;x86</Platforms>
     <RootNamespace>SixLabors.ImageSharp.Tests</RootNamespace>
     <Configurations>Debug;Release;Debug-InnerLoop;Release-InnerLoop</Configurations>
-    <DefineConstants Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)','netcoreapp3.1'))">$(DefineConstants);NETCORE31COMPATIBLE</DefineConstants>
   </PropertyGroup>
 
   <Choose>

diff --git a/tests/ImageSharp.Tests/Memory/Allocators/UniformUnmanagedMemoryPoolTests.Trim.cs b/tests/ImageSharp.Tests/Memory/Allocators/UniformUnmanagedMemoryPoolTests.Trim.cs
@@ -90,7 +90,7 @@ static void LeakPoolInstance()
                 }
             }
 
-#if NETCORE31COMPATIBLE
+#if NETCOREAPP3_1_OR_GREATER
             public static readonly bool Is32BitProcess = !Environment.Is64BitProcess;
             private static readonly List<byte[]> PressureArrays = new();