Replace System.Drawing.Common with SkiaSharp to improve cross platform support (#61)

* SkiaSharp implementation

* Target NET 8

* Improved ImageMaker performances

* Target NET 8

* Removed System.Drawing references

* Fix spectrogram orientation

* Fix Colormap

* modernize tests

* modernize demo

* Spectrogram: resolve warnings

* demo: resolve warnings

* nuget: version 2.0.0-alpha

* Colormap: replace with a single class that uses ScottPlot

* CICS: build and test with .NET 8

---------

Co-authored-by: Scott W Harden <[email protected]>

Author: vadd98

.github/workflows/ci.yaml

@@ -17,31 +17,24 @@ jobs:
     runs-on: windows-latest
     steps:
       - name: 🛒 Checkout
-        uses: actions/checkout@v2
-
-      - name: ✨ Setup .NET 6
-        uses: actions/setup-dotnet@v1
+        uses: actions/checkout@v4
+      - name: ✨ Setup .NET 8
+        uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: "6.0.x"
-
+          dotnet-version: "8.0.x"
       - name: 🚚 Restore
         run: dotnet restore src
-
       - name: 🛠️ Build
-        run: dotnet build src --configuration Release --no-restore
-
+        run: dotnet build src --configuration Release
       - name: 🧪 Test
-        run: dotnet test src --configuration Release --no-build
-
+        run: dotnet test src --configuration Release
       - name: 📦 Pack
-        run: dotnet pack src --configuration Release --no-build
-
+        run: dotnet pack src --configuration Release
       - name: 🔑 Configure Secrets
         if: github.event_name == 'release'
         uses: nuget/setup-nuget@v1
         with:
           nuget-api-key: ${{ secrets.NUGET_API_KEY }}
-
-      - name: 🚀 Deploy Package
+      - name: 🚀 Deploy NuGet Package
         if: github.event_name == 'release'
         run: nuget push "src\Spectrogram\bin\Release\*.nupkg" -SkipDuplicate -Source https://api.nuget.org/v3/index.json

src/Spectrogram.MicrophoneDemo/App.config

@@ -9,6 +9,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using SkiaSharp.Views.Desktop;
 
 namespace Spectrogram.MicrophoneDemo
 {
@@ -64,7 +65,7 @@ private void StartListening()
             pbSpectrogram.Height = spec.Height;
 
             pbScaleVert.Image?.Dispose();
-            pbScaleVert.Image = spec.GetVerticalScale(pbScaleVert.Width);
+            pbScaleVert.Image = spec.GetVerticalScale(pbScaleVert.Width).ToBitmap();
             pbScaleVert.Height = spec.Height;
         }
 
@@ -85,7 +86,7 @@ private void timer1_Tick(object sender, EventArgs e)
                 using (var gfx = Graphics.FromImage(bmpSpec))
                 using (var pen = new Pen(Color.White))
                 {
-                    gfx.DrawImage(bmpSpecIndexed, 0, 0);
+                    gfx.DrawImage(bmpSpecIndexed.ToBitmap(), 0, 0);
                     if (cbRoll.Checked)
                     {
                         gfx.DrawLine(pen, spec.NextColumnIndex, 0, spec.NextColumnIndex, pbSpectrogram.Height);

src/Spectrogram.MicrophoneDemo/FormMicrophone.cs

@@ -1,16 +1,11 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
+using System.Runtime.Versioning;
 using System.Windows.Forms;
 
 namespace Spectrogram.MicrophoneDemo
 {
     static class Program
     {
-        /// <summary>
-        /// The main entry point for the application.
-        /// </summary>
         [STAThread]
         static void Main()
         {

src/Spectrogram.MicrophoneDemo/Program.cs

@@ -1,19 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>net6.0-windows</TargetFramework>
+        <TargetFramework>net8.0-windows</TargetFramework>
         <OutputType>WinExe</OutputType>
-        <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
         <UseWindowsForms>true</UseWindowsForms>
         <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
+        <NoWarn>NU1701</NoWarn>
     </PropertyGroup>
     <ItemGroup>
         <ProjectReference Include="..\Spectrogram\Spectrogram.csproj" />
-    </ItemGroup>
-    <ItemGroup>
-        <PackageReference Include="FftSharp" Version="2.0.0" />
-        <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-        <PackageReference Include="NAudio" Version="1.10.0" />
-        <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
-        <PackageReference Include="System.Drawing.Common" Version="5.0.0" />
+        <PackageReference Include="FftSharp" Version="2.1.0" />
+        <PackageReference Include="NAudio" Version="2.2.1" />
+        <PackageReference Include="SkiaSharp.Views" Version="2.88.8" />
     </ItemGroup>
 </Project>