Merge pull request #21 from DarthAffe/Net6Fixes

Net6 fixes
DarthAffe · Sep 23, 2023 · fb4876e · fb4876e
2 parents 5eb8b56 + f4ef78f
commit fb4876e
Show file tree

Hide file tree

Showing 14 changed files with 94 additions and 26 deletions.
diff --git a/ScreenCapture.NET.DX11/ScreenCapture.NET.DX11.csproj b/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>
@@ -28,9 +29,9 @@
     <PackageReleaseNotes>
     </PackageReleaseNotes>
 
-    <Version>2.0.0</Version>
-    <AssemblyVersion>2.0.0</AssemblyVersion>
-    <FileVersion>2.0.0</FileVersion>
+    <Version>2.0.2</Version>
+    <AssemblyVersion>2.0.2</AssemblyVersion>
+    <FileVersion>2.0.2</FileVersion>
 
     <OutputPath>..\bin\</OutputPath>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>

diff --git a/ScreenCapture.NET.DX9/ScreenCapture.NET.DX9.csproj b/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>
@@ -28,9 +29,9 @@
     <PackageReleaseNotes>
     </PackageReleaseNotes>
 
-    <Version>2.0.0</Version>
-    <AssemblyVersion>2.0.0</AssemblyVersion>
-    <FileVersion>2.0.0</FileVersion>
+    <Version>2.0.2</Version>
+    <AssemblyVersion>2.0.2</AssemblyVersion>
+    <FileVersion>2.0.2</FileVersion>
 
     <OutputPath>..\bin\</OutputPath>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>

diff --git a/ScreenCapture.NET.X11/ScreenCapture.NET.X11.csproj b/ScreenCapture.NET.X11/ScreenCapture.NET.X11.csproj
@@ -29,9 +29,9 @@
     <PackageReleaseNotes>
     </PackageReleaseNotes>
 
-    <Version>2.0.0</Version>
-    <AssemblyVersion>2.0.0</AssemblyVersion>
-    <FileVersion>2.0.0</FileVersion>
+    <Version>2.0.2</Version>
+    <AssemblyVersion>2.0.2</AssemblyVersion>
+    <FileVersion>2.0.2</FileVersion>
 
     <OutputPath>..\bin\</OutputPath>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>

diff --git a/ScreenCapture.NET/Model/CaptureZone.cs b/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
 

diff --git a/ScreenCapture.NET/Model/Colors/ColorABGR.cs b/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>

diff --git a/ScreenCapture.NET/Model/Colors/ColorARGB.cs b/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;

diff --git a/ScreenCapture.NET/Model/Colors/ColorBGR.cs b/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;

diff --git a/ScreenCapture.NET/Model/Colors/ColorBGRA.cs b/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
 

diff --git a/ScreenCapture.NET/Model/Colors/ColorRGB.cs b/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;

diff --git a/ScreenCapture.NET/Model/Colors/ColorRGBA.cs 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;

diff --git a/ScreenCapture.NET/Model/Colors/IColor.cs 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
 }
diff --git a/ScreenCapture.NET/Model/Image.cs b/ScreenCapture.NET/Model/Image.cs
@@ -18,8 +18,21 @@ public sealed class Image<TColor> : IImage
     private readonly int _y;
     private readonly int _stride;
 
+#if NET7_0_OR_GREATER
     /// <inheritdoc />
-    public ColorFormat ColorFormat => TColor.ColorFormat;
+    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 Width { get; }
@@ -28,7 +41,7 @@ public sealed class Image<TColor> : IImage
     public int Height { get; }
 
     /// <inheritdoc />
-    public int SizeInBytes => Width * Height * TColor.ColorFormat.BytesPerPixel;
+    public int SizeInBytes => Width * Height * ColorFormat.BytesPerPixel;
 
     #endregion
 
@@ -96,7 +109,7 @@ public void CopyTo(in Span<byte> destination)
         if (destination == null) throw new ArgumentNullException(nameof(destination));
         if (destination.Length < SizeInBytes) throw new ArgumentException("The destination is too small to fit this image.", nameof(destination));
 
-        int targetStride = Width * TColor.ColorFormat.BytesPerPixel;
+        int targetStride = Width * ColorFormat.BytesPerPixel;
         IImage.IImageRows rows = Rows;
         Span<byte> target = destination;
         foreach (IImage.IImageRow row in rows)
@@ -211,8 +224,13 @@ private sealed class ImageRow : IImage.IImageRow
         /// <inheritdoc />
         public int Length => _length;
 
+#if NET7_0_OR_GREATER
         /// <inheritdoc />
         public int SizeInBytes => Length * TColor.ColorFormat.BytesPerPixel;
+#else
+        /// <inheritdoc />
+        public int SizeInBytes => Length * default(TColor).Net6ColorFormat.BytesPerPixel;
+#endif
 
         #endregion
 
@@ -349,8 +367,13 @@ private sealed class ImageColumn : IImage.IImageColumn
         /// <inheritdoc />
         public int Length => _length;
 
+#if NET7_0_OR_GREATER
         /// <inheritdoc />
         public int SizeInBytes => Length * TColor.ColorFormat.BytesPerPixel;
+#else
+        /// <inheritdoc />
+        public int SizeInBytes => Length * default(TColor).Net6ColorFormat.BytesPerPixel;
+#endif
 
         #endregion
 

diff --git a/ScreenCapture.NET/ScreenCapture.NET.csproj b/ScreenCapture.NET/ScreenCapture.NET.csproj
@@ -26,12 +26,12 @@
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
 
     <PackageReleaseNotes>
-Reworked most of the data handling and splitted capture-logic into separate packages.
+Fixed issues with .NET 6
     </PackageReleaseNotes>
 
-    <Version>2.0.1</Version>
-    <AssemblyVersion>2.0.1</AssemblyVersion>
-    <FileVersion>2.0.1</FileVersion>
+    <Version>2.0.2</Version>
+    <AssemblyVersion>2.0.2</AssemblyVersion>
+    <FileVersion>2.0.2</FileVersion>
 
     <OutputPath>..\bin\</OutputPath>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>

diff --git a/Tests/ScreenCapture.NET.Tests/ScreenCapture.NET.Tests.csproj b/Tests/ScreenCapture.NET.Tests/ScreenCapture.NET.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
     <Nullable>enable</Nullable>
 
     <IsPackable>false</IsPackable>