Add support for Bitmap on Windows 5.0 and 6.0

src/FreeImage-dotnet-core/Classes/FreeImageBitmap.cs

@@ -45,7 +45,7 @@
 using System.Diagnostics;
 using System.Reflection;
 
-#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20
+#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER
 using System.Runtime.Serialization;
 #endif
 
@@ -54,7 +54,7 @@ namespace FreeImageAPI
 	/// <summary>
 	/// Encapsulates a FreeImage-bitmap.
 	/// </summary>
-#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20
+#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER
 	[Serializable, Guid("64a4c935-b757-499c-ab8c-6110316a9e51")]
 	public class FreeImageBitmap : MarshalByRefObject, ICloneable, IDisposable, IEnumerable, ISerializable
 #else
@@ -234,7 +234,7 @@ public FreeImageBitmap(FreeImageBitmap original, int width, int height)
 			AddMemoryPressure();
 		}
 
-#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20
+#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER
 
 		/// <summary>
 		/// Initializes a new instance of the <see cref="FreeImageBitmap"/> class
@@ -610,7 +610,7 @@ public FreeImageBitmap(Type type, string resource)
 		{
 		}
 
-#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20
+#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER
 
 		/// <summary>
 		/// Initializes a new instance of the <see cref="FreeImageBitmap"/> class bases on the specified size
@@ -921,7 +921,7 @@ public FreeImageBitmap(int width, int height, int stride, int bpp, FREE_IMAGE_TY
 			AddMemoryPressure();
 		}
 
-#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20
+#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER
 
 		/// <summary>
 		/// Initializes a new instance of the <see cref="FreeImageBitmap"/> class.
@@ -967,7 +967,7 @@ public FreeImageBitmap(SerializationInfo info, StreamingContext context)
 
 #region Operators
 
-#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20
+#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER
 
 		/// <summary>
 		/// Converts a <see cref="FreeImageBitmap"/> instance to a <see cref="Bitmap"/> instance.
@@ -1554,7 +1554,7 @@ public int[] PropertyIdList
 			}
 		}
 
-#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20
+#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER
 
 		/// <summary>
 		/// Gets all the property items (pieces of metadata) stored in this <see cref="FreeImageBitmap"/>.
@@ -1766,7 +1766,7 @@ public RectangleF GetBounds(ref GraphicsUnit pageUnit)
 					(float)FreeImage.GetHeight(dib));
 		}
 
-#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20
+#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER
 
 		/// <summary>
 		/// Gets the specified property item from this <see cref="FreeImageBitmap"/>.
@@ -1835,7 +1835,7 @@ public FreeImageBitmap GetThumbnailImage(int maxPixelSize, bool convert)
 			return result;
 		}
 
-#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20
+#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER
 
 		/// <summary>
 		/// Converts this <see cref="FreeImageBitmap"/> instance to a <see cref="Bitmap"/> instance.
@@ -2557,7 +2557,7 @@ public void SelectActiveFrame(int frameIndex)
 			}
         }
 
-#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20
+#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER
 
 		/// <summary>
 		/// Creates a GDI bitmap object from this <see cref="FreeImageBitmap"/>.
@@ -2726,7 +2726,7 @@ public void SetResolution(float xDpi, float yDpi)
 			FreeImage.SetResolutionY(dib, (uint)yDpi);
 		}
 
-#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20
+#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER
 
 		/// <summary>
 		/// This function is not yet implemented.
@@ -3771,7 +3771,7 @@ public override int GetHashCode()
 
 #region Static functions
 
-#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20
+#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER
 
 		/// <summary>
 		/// Returns a value that indicates whether the pixel format for this <see cref="FreeImageBitmap"/> contains alpha information.
@@ -3857,7 +3857,7 @@ public static FreeImageBitmap FromFile(string filename, bool useEmbeddedColorMan
 			return new FreeImageBitmap(filename);
 		}
 
-#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20
+#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER
 
 		/// <summary>
 		/// Creates a <see cref="FreeImageBitmap"/> from a handle to a GDI bitmap.
@@ -3931,7 +3931,7 @@ public static FreeImageBitmap FromStream(Stream stream, bool useEmbeddedColorMan
 			return new FreeImageBitmap(stream);
 		}
 
-#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20
+#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER
 
 		/// <summary>
 		/// Returns the color depth, in number of bits per pixel,
@@ -4327,7 +4327,7 @@ private void LoadFromStream(Stream stream, FREE_IMAGE_FORMAT format, FREE_IMAGE_
 		/// <summary>
 		/// Helper class to store informations for <see cref="FreeImageBitmap.SaveAdd()"/>.
 		/// </summary>
-#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20
+#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER
 		private sealed class SaveInformation : ICloneable
 #else
 		private sealed class SaveInformation
@@ -4420,7 +4420,7 @@ IEnumerator IEnumerable.GetEnumerator()
 			return GetScanlines().GetEnumerator();
 		}
 
-#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20
+#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER
 
 		void ISerializable.GetObjectData(SerializationInfo info, StreamingContext context)
 		{

src/FreeImage-dotnet-core/Classes/MemoryArray.cs

@@ -16,7 +16,7 @@ namespace FreeImageAPI
 	/// Use <see cref="System.Int32"/> instead of <see cref="System.Boolean"/> and
 	/// <see cref="System.Byte"/> instead of <see cref="System.Char"/>.
 	/// </remarks>
-#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20
+#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER
 	public unsafe class MemoryArray<T> : IDisposable, ICloneable, ICollection, IEnumerable<T>, IEquatable<MemoryArray<T>> where T : struct
 #else
 	public unsafe class MemoryArray<T> : IDisposable, ICollection, IEnumerable<T>, IEquatable<MemoryArray<T>> where T : struct

src/FreeImage-dotnet-core/Classes/MetadataTag.cs

@@ -44,7 +44,7 @@ namespace FreeImageAPI.Metadata
 	/// <summary>
 	/// Manages metadata objects and operations.
 	/// </summary>
-#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20
+#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER
 	public sealed class MetadataTag : IComparable, IComparable<MetadataTag>, ICloneable, IEquatable<MetadataTag>, IDisposable
 #else
 	public sealed class MetadataTag : IComparable, IComparable<MetadataTag>, IEquatable<MetadataTag>, IDisposable
@@ -611,7 +611,7 @@ public bool AddToImage(FIBITMAP dib)
 			return FreeImage.GetMetadata(_model, dib, _key, out tag);
 		}
 
-#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20
+#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER
 
 		/// <summary>
 		/// Gets a .NET PropertyItem for this metadata tag.

src/FreeImage-dotnet-core/FreeImage-dotnet-core.csproj

@@ -5,7 +5,7 @@
 	<AssemblyTitle>FreeImage dotnet core</AssemblyTitle>
 	<VersionPrefix>4.3.6</VersionPrefix>
 	<Authors></Authors>
-	<TargetFrameworks>netstandard2.0;netstandard1.6;netstandard1.5;netstandard1.4;netstandard1.3;net461;net46;net452;net451;net45;net40</TargetFrameworks>
+	<TargetFrameworks>netstandard2.0;netstandard1.6;netstandard1.5;netstandard1.4;netstandard1.3;net6.0-windows;net5.0-windows;net461;net46;net452;net451;net45;net40</TargetFrameworks>
 	<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 	<AssemblyName>FreeImage-dotnet-core</AssemblyName>
 	<PackageId>FreeImage-dotnet-core</PackageId>
@@ -16,7 +16,7 @@
 	<RepositoryType>git</RepositoryType>
 	<RepositoryUrl>https://github.com/matgr1/FreeImage-dotnet-core</RepositoryUrl>
 	<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-	<Version>4.3.6</Version>
+	<Version>4.3.7</Version>
 	<Description>This is a clone of the FreeImage .NET project (http://freeimage.sourceforge.net/) modified to work with dotnet core. Note that all functions that use System.Drawing.Bitmap have been removed from the netstandard framework versions as there is no implementation for this class.
 
 FreeImage native binaries are included in the nuget package for Windows x86/x64, Ubuntu x64 (^16.04), and OSX x64 (^10.10).
@@ -79,6 +79,14 @@ This is for FreeImage version 3.17.0 (The version number of this package no long
 	<PackageReference Include="System.Drawing-dotnet-core" Version="1.2.3" />
   </ItemGroup>
 
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0-windows' ">
+    <PackageReference Include="System.Drawing.Common" Version="6.0.0" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net5.0-windows' ">
+    <PackageReference Include="System.Drawing.Common" Version="5.0.0" />
+  </ItemGroup>
+
   <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
 	<Reference Include="System.Drawing" />
 	<Reference Include="System.Xml" />

src/FreeImage-dotnet-core/FreeImageStaticImports.cs

@@ -42,7 +42,7 @@ namespace FreeImageAPI
 {
     public static partial class FreeImage
     {
-#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20
+#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER
         // this isn't really valid... could be Mono on another platform... how do we tell in this case?
         public const bool IsWindows = true;
 #else

src/FreeImage-dotnet-core/FreeImageWrapper.cs

@@ -168,7 +168,7 @@ internal static Assembly GetFreeImageAssembly()
 
         internal static Assembly GetAssembly(Type type)
         {
-#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20
+#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER
 			return Assembly.GetAssembly(type);
 #else
             return type.GetTypeInfo().Assembly;
@@ -215,7 +215,7 @@ public static void ValidateAvailability()
             {
                 throw new FreeImageException("FreeImage library not found", e);
             }
-#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20
+#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER
 			catch (EntryPointNotFoundException e)
 			{
 				throw new FreeImageException("FreeImage entry point not found", e);
@@ -573,7 +573,7 @@ public static FIBITMAP AllocateExT<T>(FREE_IMAGE_TYPE type, int width, int heigh
             }
         }
 
-#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20
+#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER
 
 		/// <summary>
 		/// Converts a FreeImage bitmap to a .NET <see cref="System.Drawing.Bitmap"/>.
@@ -931,7 +931,7 @@ public static unsafe FIBITMAP ConvertFromRawBits(
             return dib;
         }
 
-#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20
+#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER
 
 		/// <summary>
 		/// Saves a .NET <see cref="System.Drawing.Bitmap"/> to a file.
@@ -1084,7 +1084,7 @@ public static FIBITMAP LoadEx(string filename, FREE_IMAGE_LOAD_FLAGS flags, ref
             return dib;
         }
 
-#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20
+#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER
 
 		/// <summary>
 		/// Loads a .NET <see cref="System.Drawing.Bitmap"/> from a file.
@@ -2281,7 +2281,7 @@ public static FREE_IMAGE_FORMAT GetFileTypeFromStream(Stream stream)
 
         #region Pixel access functions
 
-#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20
+#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER
 
         /// <summary>
         /// Retrieves an hBitmap for a FreeImage bitmap.
@@ -2779,7 +2779,7 @@ public static bool GetFormatParameters(
             return result;
         }
 
-#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20
+#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER
 
 		/// <summary>
 		/// Returns the <see cref="FREE_IMAGE_FORMAT"/> for the specified
@@ -5144,7 +5144,7 @@ public static unsafe void CopyMemory(Array dest, Array src, long len)
 
         internal static string ColorToString(Color color)
         {
-#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20
+#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER
 			return string.Format(
 				System.Globalization.CultureInfo.CurrentCulture,
 				"{{Name={0}, ARGB=({1}, {2}, {3}, {4})}}",
@@ -5249,7 +5249,7 @@ internal static bool CheckColorType<T>(FREE_IMAGE_TYPE imageType, T color)
 
         #region Dll-Imports
 
-#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20
+#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER
         /// <summary>
         /// Retrieves a handle to a display device context (DC) for the client area of a specified window
         /// or for the entire screen. You can use the returned handle in subsequent GDI functions to draw in the DC.

src/FreeImage-dotnet-core/Structs/BITMAP.cs

@@ -67,7 +67,7 @@ namespace FreeImageAPI
 	/// Each device has a unique color format. To transfer a bitmap from one device to another,
 	/// use the <b>GetDIBits</b> and <b>SetDIBits</b> functions.
 	/// </remarks>
-#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20
+#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER
 	[Serializable, StructLayout(LayoutKind.Sequential)]
 #else
 	[StructLayout(LayoutKind.Sequential)]

src/FreeImage-dotnet-core/Structs/BITMAPINFO.cs

@@ -60,7 +60,7 @@ namespace FreeImageAPI
 	/// Unless the application has exclusive use and control of the bitmap, the bitmap color table
 	/// should contain explicit RGB values.
 	/// </remarks>
-#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20
+#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER
 	[Serializable, StructLayout(LayoutKind.Sequential)]
 #else
 	[StructLayout(LayoutKind.Sequential)]

src/FreeImage-dotnet-core/Structs/BITMAPINFOHEADER.cs

@@ -47,7 +47,7 @@ namespace FreeImageAPI
 	/// <b>BITMAPINFOHEADER</b> structure and a color table to provide a complete
 	/// definition of the dimensions and colors of a DIB.
 	/// </remarks>
-#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20
+#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER
 	[Serializable, StructLayout(LayoutKind.Sequential)]
 #else
 	[StructLayout(LayoutKind.Sequential)]

src/FreeImage-dotnet-core/Structs/FI16RGB555.cs

@@ -70,7 +70,7 @@ namespace FreeImageAPI
 	///	Color another = fi16rgb.Color;
 	/// </code>
 	/// </example>
-#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20
+#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER
 	[Serializable, StructLayout(LayoutKind.Sequential)]
 #else
 	[StructLayout(LayoutKind.Sequential)]

src/FreeImage-dotnet-core/Structs/FI16RGB565.cs

@@ -70,7 +70,7 @@ namespace FreeImageAPI
 	///	Color another = fi16rgb.Color;
 	/// </code>
 	/// </example>
-#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20
+#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER
 	[Serializable, StructLayout(LayoutKind.Sequential)]
 #else
 	[StructLayout(LayoutKind.Sequential)]

src/FreeImage-dotnet-core/Structs/FI1BIT.cs

@@ -9,7 +9,7 @@ namespace FreeImageAPI
 	/// The <b>FI1BIT</b> structure represents a single bit.
 	/// It's value can be <i>0</i> or <i>1</i>.
 	/// </summary>
-#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20
+#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER
 	[DebuggerDisplay("{value}"),
 	Serializable]
 #else

src/FreeImage-dotnet-core/Structs/FI4BIT.cs

@@ -9,7 +9,7 @@ namespace FreeImageAPI
 	/// The <b>FI4BIT</b> structure represents the half of a <see cref="Byte"/>.
 	/// It's valuerange is between <i>0</i> and <i>15</i>.
 	/// </summary>
-#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20
+#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER
 	[DebuggerDisplay("{value}"),
 	Serializable]
 #else

src/FreeImage-dotnet-core/Structs/FIBITMAP.cs

@@ -46,7 +46,7 @@ namespace FreeImageAPI
 	/// access to either a singlepage bitmap or exactly one page of
 	/// a multipage bitmap.
 	/// </remarks>
-#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20
+#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER
 	[Serializable, StructLayout(LayoutKind.Sequential)]
 #else
 	[StructLayout(LayoutKind.Sequential)]

src/FreeImage-dotnet-core/Structs/FICOMPLEX.cs

@@ -42,7 +42,7 @@ namespace FreeImageAPI
 	/// The <b>FICOMPLEX</b> structure describes a color consisting of a real and an imaginary part.
 	/// Each part is using 4 bytes of data.
 	/// </summary>
-#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20
+#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER
 	[Serializable, StructLayout(LayoutKind.Sequential)]
 #else
 	[StructLayout(LayoutKind.Sequential)]

src/FreeImage-dotnet-core/Structs/FIICCPROFILE.cs

@@ -41,7 +41,7 @@ namespace FreeImageAPI
 	/// <summary>
 	/// This Structure contains ICC-Profile data.
 	/// </summary>
-#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20
+#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER
 	[Serializable, StructLayout(LayoutKind.Sequential)]
 #else
 	[StructLayout(LayoutKind.Sequential)]

src/FreeImage-dotnet-core/Structs/FIMEMORY.cs

@@ -41,7 +41,7 @@ namespace FreeImageAPI
 	/// <summary>
 	/// The <b>FIMEMORY</b> structure is a handle to an opened memory stream.
 	/// </summary>
-#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20
+#if NET462 || NET461 || NET46 || NET452 || NET451 || NET45 || NET40 || NET35 || NET20 || NET5_0_OR_GREATER
 	[Serializable, StructLayout(LayoutKind.Sequential)]
 #else
 	[StructLayout(LayoutKind.Sequential)]