Use !NETSTANDARD2_0 instead of NETSTANDARD2_1.

dlemstra · dlemstra · commit 412a42d7cda4 · 2024-07-28T16:38:21.000+02:00
diff --git a/src/Magick.NET.Core/Netstandard21/Factories/IMagickImageCollectionFactory{TQuantumType}.cs b/src/Magick.NET.Core/Netstandard21/Factories/IMagickImageCollectionFactory{TQuantumType}.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright Dirk Lemstra https://github.com/dlemstra/Magick.NET.
 // Licensed under the Apache License, Version 2.0.
 
-#if NETSTANDARD2_1
+#if !NETSTANDARD2_0
 
 using System;
 using System.Buffers;
diff --git a/src/Magick.NET.Core/Netstandard21/Factories/IMagickImageFactory{TQuantumType}.cs b/src/Magick.NET.Core/Netstandard21/Factories/IMagickImageFactory{TQuantumType}.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright Dirk Lemstra https://github.com/dlemstra/Magick.NET.
 // Licensed under the Apache License, Version 2.0.
 
-#if NETSTANDARD2_1
+#if !NETSTANDARD2_0
 
 using System;
 using System.Buffers;
diff --git a/src/Magick.NET.Core/Netstandard21/Factories/IMagickImageInfoFactory.cs b/src/Magick.NET.Core/Netstandard21/Factories/IMagickImageInfoFactory.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright Dirk Lemstra https://github.com/dlemstra/Magick.NET.
 // Licensed under the Apache License, Version 2.0.
 
-#if NETSTANDARD2_1
+#if !NETSTANDARD2_0
 
 using System;
 using System.Buffers;
diff --git a/src/Magick.NET.Core/Netstandard21/IMagickImage.cs b/src/Magick.NET.Core/Netstandard21/IMagickImage.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright Dirk Lemstra https://github.com/dlemstra/Magick.NET.
 // Licensed under the Apache License, Version 2.0.
 
-#if NETSTANDARD2_1
+#if !NETSTANDARD2_0
 
 using System;
 using System.Buffers;
diff --git a/src/Magick.NET.Core/Netstandard21/IMagickImageCollection.cs b/src/Magick.NET.Core/Netstandard21/IMagickImageCollection.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright Dirk Lemstra https://github.com/dlemstra/Magick.NET.
 // Licensed under the Apache License, Version 2.0.
 
-#if NETSTANDARD2_1
+#if !NETSTANDARD2_0
 
 using System;
 using System.Buffers;
diff --git a/src/Magick.NET.Core/Netstandard21/IMagickImageCollection{TQuantumType}.cs b/src/Magick.NET.Core/Netstandard21/IMagickImageCollection{TQuantumType}.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright Dirk Lemstra https://github.com/dlemstra/Magick.NET.
 // Licensed under the Apache License, Version 2.0.
 
-#if NETSTANDARD2_1
+#if !NETSTANDARD2_0
 
 using System;
 using System.Buffers;
diff --git a/src/Magick.NET.Core/Netstandard21/IMagickImageInfo.cs b/src/Magick.NET.Core/Netstandard21/IMagickImageInfo.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright Dirk Lemstra https://github.com/dlemstra/Magick.NET.
 // Licensed under the Apache License, Version 2.0.
 
-#if NETSTANDARD2_1
+#if !NETSTANDARD2_0
 
 using System;
 using System.Buffers;
diff --git a/src/Magick.NET.Core/Netstandard21/IMagickImageInfo{TQuantumType}.cs b/src/Magick.NET.Core/Netstandard21/IMagickImageInfo{TQuantumType}.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright Dirk Lemstra https://github.com/dlemstra/Magick.NET.
 // Licensed under the Apache License, Version 2.0.
 
-#if NETSTANDARD2_1
+#if !NETSTANDARD2_0
 
 using System;
 using System.Buffers;
diff --git a/src/Magick.NET.Core/Netstandard21/IMagickImage{TQuantumType}.cs b/src/Magick.NET.Core/Netstandard21/IMagickImage{TQuantumType}.cs
@@ -1,7 +1,7 @@
 // Copyright Dirk Lemstra https://github.com/dlemstra/Magick.NET.
 // Licensed under the Apache License, Version 2.0.
 
-#if NETSTANDARD2_1
+#if !NETSTANDARD2_0
 
 using System;
 using System.Buffers;
diff --git a/src/Magick.NET.Core/Netstandard21/Pixels/IPixelCollection{TQuantumType}.cs b/src/Magick.NET.Core/Netstandard21/Pixels/IPixelCollection{TQuantumType}.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright Dirk Lemstra https://github.com/dlemstra/Magick.NET.
 // Licensed under the Apache License, Version 2.0.
 
-#if NETSTANDARD2_1
+#if !NETSTANDARD2_0
 
 using System;
 
diff --git a/src/Magick.NET.Core/Netstandard21/Profiles/IImageProfile.cs b/src/Magick.NET.Core/Netstandard21/Profiles/IImageProfile.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright Dirk Lemstra https://github.com/dlemstra/Magick.NET.
 // Licensed under the Apache License, Version 2.0.
 
-#if NETSTANDARD2_1
+#if !NETSTANDARD2_0
 
 using System;
 
diff --git a/src/Magick.NET.Core/Netstandard21/Profiles/ImageProfile.cs b/src/Magick.NET.Core/Netstandard21/Profiles/ImageProfile.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright Dirk Lemstra https://github.com/dlemstra/Magick.NET.
 // Licensed under the Apache License, Version 2.0.
 
-#if NETSTANDARD2_1
+#if !NETSTANDARD2_0
 
 using System;
 
diff --git a/src/Magick.NET.Core/Profiles/ImageProfile.cs b/src/Magick.NET.Core/Profiles/ImageProfile.cs
@@ -119,7 +119,7 @@ public bool Equals(IImageProfile? other)
     /// Returns the <see cref="byte"/> array of this profile.
     /// </summary>
     /// <returns>A <see cref="byte"/> array.</returns>
-#if NETSTANDARD2_1
+#if !NETSTANDARD2_0
     [Obsolete($"This property will be removed in the next major release, use {nameof(ToByteArray)} or {nameof(ToReadOnlySpan)} instead.")]
 #else
     [Obsolete($"This property will be removed in the next major release, use {nameof(ToByteArray)} instead.")]
diff --git a/src/Magick.NET/Native/MagickFormatInfo.cs b/src/Magick.NET/Native/MagickFormatInfo.cs
@@ -36,7 +36,7 @@ private partial class NativeMagickFormatInfo : ConstNativeInstance
         [Throws]
         public static partial MagickFormatInfo? GetInfoWithBlob(byte[] data, nuint length);
 
-#if NETSTANDARD2_1
+#if !NETSTANDARD2_0
         [Throws]
         public static partial MagickFormatInfo? GetInfoWithBlob(ReadOnlySpan<byte> data, nuint length);
 #endif
diff --git a/src/Magick.NET/Native/MagickImage.cs b/src/Magick.NET/Native/MagickImage.cs
@@ -633,7 +633,7 @@ private unsafe sealed partial class NativeMagickImage : NativeInstance
         [ReadInstance]
         public partial void ReadBlob(IMagickSettings<QuantumType>? settings, byte[] data, nuint offset, nuint length);
 
-#if NETSTANDARD2_1
+#if !NETSTANDARD2_0
         [Throws]
         [ReadInstance]
         public partial void ReadBlob(IMagickSettings<QuantumType>? settings, ReadOnlySpan<byte> data, nuint offset, nuint length);
diff --git a/src/Magick.NET/Native/MagickImageCollection.cs b/src/Magick.NET/Native/MagickImageCollection.cs
@@ -95,7 +95,7 @@ private unsafe partial class NativeMagickImageCollection : NativeHelper
         [Cleanup(Name = nameof(Dispose))]
         public partial IntPtr ReadBlob(IMagickSettings<QuantumType>? settings, byte[] data, nuint offset, nuint length);
 
-#if NETSTANDARD2_1
+#if !NETSTANDARD2_0
         [Throws]
         [Cleanup(Name = nameof(Dispose))]
         public partial IntPtr ReadBlob(IMagickSettings<QuantumType>? settings, ReadOnlySpan<byte> data, nuint offset, nuint length);
diff --git a/src/Magick.NET/Native/Pixels/PixelCollection.cs b/src/Magick.NET/Native/Pixels/PixelCollection.cs
@@ -34,7 +34,7 @@ private partial class NativePixelCollection : NativeInstance
         [SetInstance]
         public partial void SetArea(nint x, nint y, nuint width, nuint height, QuantumType[] values, nuint length);
 
-#if NETSTANDARD2_1
+#if !NETSTANDARD2_0
         [Throws]
         [SetInstance]
         public partial void SetArea(nint x, nint y, nuint width, nuint height, ReadOnlySpan<QuantumType> values, nuint length);
diff --git a/src/Magick.NET/Netstandard21/Extensions/IExifProfileExtensions.cs b/src/Magick.NET/Netstandard21/Extensions/IExifProfileExtensions.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright Dirk Lemstra https://github.com/dlemstra/Magick.NET.
 // Licensed under the Apache License, Version 2.0.
 
-#if NETSTANDARD2_1
+#if !NETSTANDARD2_0
 
 #if Q8
 using QuantumType = System.Byte;
diff --git a/src/Magick.NET/Netstandard21/Factories/MagickImageCollectionFactory.cs b/src/Magick.NET/Netstandard21/Factories/MagickImageCollectionFactory.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright Dirk Lemstra https://github.com/dlemstra/Magick.NET.
 // Licensed under the Apache License, Version 2.0.
 
-#if NETSTANDARD2_1
+#if !NETSTANDARD2_0
 
 using System;
 using System.Buffers;
diff --git a/src/Magick.NET/Netstandard21/Factories/MagickImageFactory.cs b/src/Magick.NET/Netstandard21/Factories/MagickImageFactory.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright Dirk Lemstra https://github.com/dlemstra/Magick.NET.
 // Licensed under the Apache License, Version 2.0.
 
-#if NETSTANDARD2_1
+#if !NETSTANDARD2_0
 
 using System;
 using System.Buffers;
diff --git a/src/Magick.NET/Netstandard21/Factories/MagickImageInfoFactory.cs b/src/Magick.NET/Netstandard21/Factories/MagickImageInfoFactory.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright Dirk Lemstra https://github.com/dlemstra/Magick.NET.
 // Licensed under the Apache License, Version 2.0.
 
-#if NETSTANDARD2_1
+#if !NETSTANDARD2_0
 
 using System;
 using System.Buffers;
diff --git a/src/Magick.NET/Netstandard21/Helpers/BufferWriterWrapper.cs b/src/Magick.NET/Netstandard21/Helpers/BufferWriterWrapper.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright Dirk Lemstra https://github.com/dlemstra/Magick.NET.
 // Licensed under the Apache License, Version 2.0.
 
-#if NETSTANDARD2_1
+#if !NETSTANDARD2_0
 
 using System;
 using System.Buffers;
diff --git a/src/Magick.NET/Netstandard21/Helpers/ReadOnlySequenceWrapper.cs b/src/Magick.NET/Netstandard21/Helpers/ReadOnlySequenceWrapper.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright Dirk Lemstra https://github.com/dlemstra/Magick.NET.
 // Licensed under the Apache License, Version 2.0.
 
-#if NETSTANDARD2_1
+#if !NETSTANDARD2_0
 
 using System;
 using System.Buffers;
diff --git a/src/Magick.NET/Netstandard21/Helpers/Throw.cs b/src/Magick.NET/Netstandard21/Helpers/Throw.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright Dirk Lemstra https://github.com/dlemstra/Magick.NET.
 // Licensed under the Apache License, Version 2.0.
 
-#if NETSTANDARD2_1
+#if !NETSTANDARD2_0
 
 using System;
 using System.Buffers;
diff --git a/src/Magick.NET/Netstandard21/MagickFormatInfo.cs b/src/Magick.NET/Netstandard21/MagickFormatInfo.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright Dirk Lemstra https://github.com/dlemstra/Magick.NET.
 // Licensed under the Apache License, Version 2.0.
 
-#if NETSTANDARD2_1
+#if !NETSTANDARD2_0
 
 using System;
 using System.Buffers;
diff --git a/src/Magick.NET/Netstandard21/MagickImage.cs b/src/Magick.NET/Netstandard21/MagickImage.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright Dirk Lemstra https://github.com/dlemstra/Magick.NET.
 // Licensed under the Apache License, Version 2.0.
 
-#if NETSTANDARD2_1
+#if !NETSTANDARD2_0
 
 using System;
 using System.Buffers;
diff --git a/src/Magick.NET/Netstandard21/MagickImageCollection.cs b/src/Magick.NET/Netstandard21/MagickImageCollection.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright Dirk Lemstra https://github.com/dlemstra/Magick.NET.
 // Licensed under the Apache License, Version 2.0.
 
-#if NETSTANDARD2_1
+#if !NETSTANDARD2_0
 using System;
 using System.Buffers;
 
diff --git a/src/Magick.NET/Netstandard21/MagickImageInfo.cs b/src/Magick.NET/Netstandard21/MagickImageInfo.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright Dirk Lemstra https://github.com/dlemstra/Magick.NET.
 // Licensed under the Apache License, Version 2.0.
 
-#if NETSTANDARD2_1
+#if !NETSTANDARD2_0
 
 using System;
 using System.Buffers;
diff --git a/src/Magick.NET/Netstandard21/Pixels/PixelCollection.cs b/src/Magick.NET/Netstandard21/Pixels/PixelCollection.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright Dirk Lemstra https://github.com/dlemstra/Magick.NET.
 // Licensed under the Apache License, Version 2.0.
 
-#if NETSTANDARD2_1
+#if !NETSTANDARD2_0
 
 using System;
 
diff --git a/src/Magick.NET/Netstandard21/Pixels/SafePixelCollection.cs b/src/Magick.NET/Netstandard21/Pixels/SafePixelCollection.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright Dirk Lemstra https://github.com/dlemstra/Magick.NET.
 // Licensed under the Apache License, Version 2.0.
 
-#if NETSTANDARD2_1
+#if !NETSTANDARD2_0
 
 using System;
 
diff --git a/src/Magick.NET/Netstandard21/Pixels/UnsafePixelCollection.cs b/src/Magick.NET/Netstandard21/Pixels/UnsafePixelCollection.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright Dirk Lemstra https://github.com/dlemstra/Magick.NET.
 // Licensed under the Apache License, Version 2.0.
 
-#if NETSTANDARD2_1
+#if !NETSTANDARD2_0
 
 using System;
 
diff --git a/src/Shared/FileHelper.cs b/src/Shared/FileHelper.cs
@@ -33,7 +33,7 @@ public static string GetFullPath(string path)
 
     public static async Task<byte[]> ReadAllBytesAsync(string fileName, CancellationToken cancellationToken)
     {
-#if NETSTANDARD2_1
+#if !NETSTANDARD2_0
         return await File.ReadAllBytesAsync(fileName, cancellationToken).ConfigureAwait(false);
 #else
         using var fileStream = File.OpenRead(fileName);
@@ -45,7 +45,7 @@ public static async Task<byte[]> ReadAllBytesAsync(string fileName, Cancellation
 
     internal static async Task WriteAllBytesAsync(string fileName, byte[] bytes, CancellationToken cancellationToken)
     {
-#if NETSTANDARD2_1
+#if !NETSTANDARD2_0
         await File.WriteAllBytesAsync(fileName, bytes, cancellationToken).ConfigureAwait(false);
 #else
         using var fileStream = File.Open(fileName, FileMode.Create, FileAccess.Write);
diff --git a/src/Shared/NotNullAttribute.cs b/src/Shared/NotNullAttribute.cs
@@ -1,7 +1,7 @@
 // Copyright Dirk Lemstra https://github.com/dlemstra/Magick.NET.
 // Licensed under the Apache License, Version 2.0.
 
-#if !NETSTANDARD2_1 && !NETCOREAPP
+#if NETSTANDARD2_0 || NET462
 
 namespace System.Diagnostics.CodeAnalysis;
 
