Fixed issues with seemingly incompatible language features in .NET 6

Author: DarthAffe

ScreenCapture.NET.DX11/ScreenCapture.NET.DX11.csproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net7.0-windows;net6.0-windows</TargetFrameworks>
+    <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

ScreenCapture.NET.DX9/ScreenCapture.NET.DX9.csproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net7.0-windows;net6.0-windows</TargetFrameworks>
+    <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

ScreenCapture.NET/Model/CaptureZone.cs

@@ -20,12 +20,21 @@ public sealed class CaptureZone<TColor> : ICaptureZone
     /// <inheritdoc />
     public Display Display { get; }
 
+#if NET7_0_OR_GREATER
     /// <inheritdoc />
     public ColorFormat ColorFormat
     {
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         get => TColor.ColorFormat;
     }
+#else
+    /// <inheritdoc />
+    public ColorFormat ColorFormat
+    {
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        get => default(TColor).Net6ColorFormat;
+    }
+#endif
 
     /// <inheritdoc />
     public int X { get; internal set; }
@@ -95,7 +104,7 @@ IImage ICaptureZone.Image
     /// <inheritdoc />
     public bool IsUpdateRequested { get; private set; }
 
-    #endregion
+#endregion
 
     #region Events
 

ScreenCapture.NET/Model/Colors/ColorABGR.cs

@@ -17,6 +17,11 @@ namespace ScreenCapture.NET;
     /// <inheritdoc />
     public static ColorFormat ColorFormat => ColorFormat.ABGR;
 
+#if !NET7_0_OR_GREATER
+    /// <inheritdoc />
+    public ColorFormat Net6ColorFormat => ColorFormat;
+#endif
+
     private readonly byte _a;
     private readonly byte _b;
     private readonly byte _g;
@@ -39,7 +44,7 @@ namespace ScreenCapture.NET;
     #endregion
 
     #region Constructors
-    
+
     /// <summary>
     /// Initializes a new instance of the <see cref="ColorABGR"/> class.
     /// </summary>

ScreenCapture.NET/Model/Colors/ColorARGB.cs

@@ -13,10 +13,15 @@ namespace ScreenCapture.NET;
 public readonly struct ColorARGB : IColor
 {
     #region Properties & Fields
-
+    
     /// <inheritdoc />
     public static ColorFormat ColorFormat => ColorFormat.ARGB;
 
+#if !NET7_0_OR_GREATER
+    /// <inheritdoc />
+    public ColorFormat Net6ColorFormat => ColorFormat;
+#endif
+
     private readonly byte _a;
     private readonly byte _r;
     private readonly byte _g;

ScreenCapture.NET/Model/Colors/ColorBGR.cs

@@ -13,10 +13,15 @@ namespace ScreenCapture.NET;
 public readonly struct ColorBGR : IColor
 {
     #region Properties & Fields
-
+    
     /// <inheritdoc />
     public static ColorFormat ColorFormat => ColorFormat.BGR;
 
+#if !NET7_0_OR_GREATER
+    /// <inheritdoc />
+    public ColorFormat Net6ColorFormat => ColorFormat;
+#endif
+
     private readonly byte _b;
     private readonly byte _g;
     private readonly byte _r;

ScreenCapture.NET/Model/Colors/ColorBGRA.cs

@@ -13,10 +13,15 @@ namespace ScreenCapture.NET;
 public readonly struct ColorBGRA : IColor
 {
     #region Properties & Fields
-
+    
     /// <inheritdoc />
     public static ColorFormat ColorFormat => ColorFormat.BGRA;
 
+#if !NET7_0_OR_GREATER
+    /// <inheritdoc />
+    public ColorFormat Net6ColorFormat => ColorFormat;
+#endif
+
     private readonly byte _b;
     private readonly byte _g;
     private readonly byte _r;
@@ -36,7 +41,7 @@ namespace ScreenCapture.NET;
     public byte A => _a;
     // ReSharper restore ConvertToAutoPropertyWhenPossible
 
-    #endregion
+#endregion
 
     #region Constructors
 

ScreenCapture.NET/Model/Colors/ColorRGB.cs

@@ -13,10 +13,15 @@ namespace ScreenCapture.NET;
 public readonly struct ColorRGB : IColor
 {
     #region Properties & Fields
-
+    
     /// <inheritdoc />
     public static ColorFormat ColorFormat => ColorFormat.RGB;
 
+#if !NET7_0_OR_GREATER
+    /// <inheritdoc />
+    public ColorFormat Net6ColorFormat => ColorFormat;
+#endif
+
     private readonly byte _r;
     private readonly byte _g;
     private readonly byte _b;

ScreenCapture.NET/Model/Colors/ColorRGBA.cs

@@ -17,6 +17,11 @@ namespace ScreenCapture.NET;
     /// <inheritdoc />
     public static ColorFormat ColorFormat => ColorFormat.RGBA;
 
+#if !NET7_0_OR_GREATER
+    /// <inheritdoc />
+    public ColorFormat Net6ColorFormat => ColorFormat;
+#endif
+
     private readonly byte _r;
     private readonly byte _g;
     private readonly byte _b;

ScreenCapture.NET/Model/Colors/IColor.cs

@@ -27,8 +27,12 @@ public interface IColor
     /// </summary>
     byte A { get; }
 
+#if NET7_0_OR_GREATER
     /// <summary>
     /// Gets the color-format of this color.
     /// </summary>
     public static virtual ColorFormat ColorFormat => throw new NotSupportedException();
+#else
+    public ColorFormat Net6ColorFormat { get; }
+#endif
 }