Modernize to .NET 9, MAUI, and SkiaSharp v3

.github/workflows/CI-Maui.yml

@@ -0,0 +1,58 @@
+name: Publish Microcharts NuGet packages to GitHub
+
+on:
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+jobs:
+  Maui-nuget-Builds:
+
+    runs-on: windows-latest
+
+    steps:
+
+    - name: Clone source
+      uses: actions/checkout@v4.0.0
+      with:
+        fetch-depth: 0
+
+    - name: Install .NET SDK
+      uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: 10.0.x
+        source-url: https://nuget.pkg.github.com/follesoe/index.json
+      env:
+        NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
+
+    - name: Install .NET MAUI Workloads
+      run: |
+        dotnet workload install android
+        dotnet workload install ios
+        dotnet workload install maccatalyst
+        dotnet workload install maui
+        dotnet workload list
+
+    - name: Build and pack Microcharts.Core
+      run: |
+        dotnet pack --configuration=Release -p:VersionPrelease=.${{ github.run_number }} Sources\Microcharts\Microcharts.csproj
+
+    - name: Build and pack Microcharts.Maui
+      run: |
+        dotnet pack --configuration=Release -p:VersionPrelease=.${{ github.run_number }} Sources\Microcharts.Maui\Microcharts.Maui.csproj
+
+    - name: Build and pack Microcharts.iOS
+      run: |
+        dotnet pack --configuration=Release -p:VersionPrelease=.${{ github.run_number }} Sources\Microcharts.iOS\Microcharts.iOS.csproj
+
+    - name: Build and pack Microcharts.Droid
+      run: |
+        dotnet pack --configuration=Release -p:VersionPrelease=.${{ github.run_number }} Sources\Microcharts.Droid\Microcharts.Droid.csproj
+
+    - name: Build and pack Microcharts.Metapackage
+      run: |
+        dotnet pack --configuration=Release -p:VersionPrelease=.${{ github.run_number }} Sources\Microcharts.Metapackage\Microcharts.Metapackage.csproj
+
+    - name: Publish packages to GitHub
+      run: |
+        dotnet nuget add source --username follesoe --password ${{ secrets.GITHUB_TOKEN }} --store-password-in-clear-text --name github "https://nuget.pkg.github.com/follesoe/index.json"
+        dotnet nuget push artifacts\*.nupkg --skip-duplicate --no-symbols  --source "github"

.github/workflows/CI-Windows.yml

@@ -13,73 +13,41 @@ jobs:
     runs-on: windows-latest
     steps:
     - name: Clone source
-      uses: actions/checkout@v3.1.0
+      uses: actions/checkout@v4
       with:
         fetch-depth: 0
 
-    - name: Add MSBuild to PATH (Windows)
-      uses: microsoft/setup-msbuild@v1.1.3
-
     - name: Install .NET SDK
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
       with:
         dotnet-version: |
-          6.0.x
-          7.0.x
+          10.0.x
 
-    - name: "Install .NET cross-plat and MAUI workloads"
+    - name: "Install .NET workloads"
       run: |
         dotnet workload install android
         dotnet workload install ios
         dotnet workload install maccatalyst
         dotnet workload install maui
         dotnet workload list
 
-    - name: "Restore NuGet packages (Windows)"
-      run: msbuild /t:restore /p:Configuration=Release Sources/Microcharts.sln /bl:win-restore-build.binlog
-
-    - name: "Publish restore bin logs as artifacts"
-      uses: actions/upload-artifact@v3
-      with:
-        name: msbuild-binlogs
-        path: '**/*.binlog'
-      if: always()
-
-    - name: "Build and pack Microcharts"
-      run: msbuild /t:build,pack /p:Configuration=Release Sources/Microcharts/Microcharts.csproj
-
-    - name: "Build and pack Microcharts Android"
-      run: msbuild /t:build,pack /p:Configuration=Release Sources/Microcharts.Droid/Microcharts.Droid.csproj
-
-    - name: "Build and pack Microcharts Xamarin.Forms"
-      run: msbuild /t:build,pack /p:Configuration=Release Sources/Microcharts.Forms/Microcharts.Forms.csproj
-
-    - name: "Build and pack Microcharts iOS"
-      run: msbuild /t:build,pack /p:Configuration=Release Sources/Microcharts.iOS/Microcharts.iOS.csproj
-
-    - name: "Build and pack Microcharts UWP"
-      run: msbuild /t:build,pack /p:Configuration=Release Sources/Microcharts.Uwp/Microcharts.Uwp.csproj
-
-    - name: "Build and pack Microcharts Avalonia"
-      run: msbuild /t:build,pack /p:Configuration=Release Sources/Microcharts.Avalonia/Microcharts.Avalonia.csproj
-
-    - name: "Build and pack Microcharts Eto"
-      run: msbuild /t:build,pack /p:Configuration=Release Sources/Microcharts.Eto/Microcharts.Eto.csproj
+    - name: "Restore and build solution"
+      run: dotnet build Sources/Microcharts.Maui.sln --configuration Release
 
-    - name: "Build and pack Microcharts .NET MAUI"
-      run: msbuild /t:build,pack /p:Configuration=Release Sources/Microcharts.Maui/Microcharts.Maui.csproj
+    - name: "Pack Microcharts Core"
+      run: dotnet pack Sources/Microcharts/Microcharts.csproj --configuration Release --no-build
 
-    - name: "Build and pack Microcharts Uno"
-      run: msbuild /t:build,pack /p:Configuration=Release Sources/Microcharts.Uno/Microcharts.Uno.csproj
+    - name: "Pack Microcharts Droid"
+      run: dotnet pack Sources/Microcharts.Droid/Microcharts.Droid.csproj --configuration Release --no-build
 
-    - name: "Build and pack Microcharts Uno WinUI"
-      run: msbuild /t:build,pack /p:Configuration=Release Sources/Microcharts.Uno.WinUI/Microcharts.Uno.WinUI.csproj
+    - name: "Pack Microcharts iOS"
+      run: dotnet pack Sources/Microcharts.iOS/Microcharts.iOS.csproj --configuration Release --no-build
 
-    - name: "Build and pack Microcharts WinUI"
-      run: msbuild /t:build,pack /p:Configuration=Release Sources/Microcharts.WinUI/Microcharts.WinUI.csproj
+    - name: "Pack Microcharts MAUI"
+      run: dotnet pack Sources/Microcharts.Maui/Microcharts.Maui.csproj --configuration Release --no-build
 
-    - name: "Build and pack Microcharts Meta-package"
-      run: dotnet pack Sources/Microcharts.Metapackage/Microcharts.Metapackage.csproj
+    - name: "Pack Microcharts Meta-package"
+      run: dotnet pack Sources/Microcharts.Metapackage/Microcharts.Metapackage.csproj --configuration Release
 
     - name: Publish packages to nuget.org
       run: |

.github/workflows/pull-request.yml

@@ -12,90 +12,47 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-latest, macos-latest]
+        os: [windows-latest, macos-26]
     steps:
       - name: Clone source
-        uses: actions/checkout@v3.1.0
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
-      - name: Add MSBuild to PATH (Windows)
-        uses: microsoft/setup-msbuild@v1.1.3
-        if: matrix.os == 'windows-latest'
-
       - name: Install .NET SDK
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
-            6.0.x
-            7.0.x
+            10.0.x
 
-      - name: "Install .NET cross-plat and MAUI workloads"
+      - name: "Install .NET workloads"
         run: |
           dotnet workload install android
           dotnet workload install ios
           dotnet workload install maccatalyst
           dotnet workload install maui
           dotnet workload list
 
-      - name: "Restore NuGet packages (Windows)"
-        run: msbuild /t:restore /p:Configuration=Release Sources/Microcharts.sln /bl:win-restore-build.binlog
-        if: matrix.os == 'windows-latest'
-
-      - name: "Restore NuGet packages (Mac)"
-        run: msbuild /t:restore /p:Configuration=Release Sources/Microcharts-mac.slnf /bl:mac-restore-build.binlog
-        if: matrix.os == 'macos-latest'
-
-      - name: "Publish bin logs as artifacts"
-        uses: actions/upload-artifact@v3
+      - name: Select Xcode
+        if: matrix.os == 'macos-26'
+        uses: maxim-lobanov/setup-xcode@v1
         with:
-          name: msbuild-binlogs
-          path: '**/*.binlog'
-        if: always()
-
-      - name: "Build and pack Microcharts"
-        run: msbuild /t:build,pack /p:Configuration=Release Sources/Microcharts/Microcharts.csproj
-
-      - name: "Build and pack Microcharts Android"
-        run: msbuild /t:build,pack /p:Configuration=Release Sources/Microcharts.Droid/Microcharts.Droid.csproj
-
-      - name: "Build and pack Microcharts Xamarin.Forms"
-        run: msbuild /t:build,pack /p:Configuration=Release Sources/Microcharts.Forms/Microcharts.Forms.csproj
-
-      - name: "Build and pack Microcharts iOS"
-        run: msbuild /t:build,pack /p:Configuration=Release Sources/Microcharts.iOS/Microcharts.iOS.csproj
-
-      - name: "Build and pack Microcharts macOS"
-        run: msbuild /t:build,pack /p:Configuration=Release Sources/Microcharts.macOS/Microcharts.macOS.csproj
-        if: matrix.os == 'macos-latest'
-
-      - name: "Build and pack Microcharts UWP"
-        run: msbuild /t:build,pack /p:Configuration=Release Sources/Microcharts.Uwp/Microcharts.Uwp.csproj
-        if: matrix.os == 'windows-latest'
-
-      - name: "Build and pack Microcharts Avalonia"
-        run: msbuild /t:build,pack /p:Configuration=Release Sources/Microcharts.Avalonia/Microcharts.Avalonia.csproj
-        if: matrix.os == 'windows-latest'
+          xcode-version: '26.3'
 
-      - name: "Build and pack Microcharts Eto"
-        run: msbuild /t:build,pack /p:Configuration=Release Sources/Microcharts.Eto/Microcharts.Eto.csproj
-        if: matrix.os == 'windows-latest'
+      - name: "Build solution"
+        run: dotnet build Sources/Microcharts.Maui.sln --configuration Release
 
-      - name: "Build and pack Microcharts .NET MAUI"
-        run: msbuild /t:build,pack /p:Configuration=Release Sources/Microcharts.Maui/Microcharts.Maui.csproj
-        if: matrix.os == 'windows-latest'
+      - name: "Pack Microcharts Core"
+        run: dotnet pack Sources/Microcharts/Microcharts.csproj --configuration Release --no-build
 
-      - name: "Build and pack Microcharts Uno"
-        run: msbuild /t:build,pack /p:Configuration=Release Sources/Microcharts.Uno/Microcharts.Uno.csproj
-        if: matrix.os == 'windows-latest'
+      - name: "Pack Microcharts Droid"
+        run: dotnet pack Sources/Microcharts.Droid/Microcharts.Droid.csproj --configuration Release --no-build
 
-      - name: "Build and pack Microcharts Uno WinUI"
-        run: msbuild /t:build,pack /p:Configuration=Release Sources/Microcharts.Uno.WinUI/Microcharts.Uno.WinUI.csproj
-        if: matrix.os == 'windows-latest'
+      - name: "Pack Microcharts iOS"
+        run: dotnet pack Sources/Microcharts.iOS/Microcharts.iOS.csproj --configuration Release --no-build
 
-      - name: "Build and pack Microcharts WinUI"
-        run: msbuild /t:build,pack /p:Configuration=Release Sources/Microcharts.WinUI/Microcharts.WinUI.csproj
-        if: matrix.os == 'windows-latest'
+      - name: "Pack Microcharts MAUI"
+        run: dotnet pack Sources/Microcharts.Maui/Microcharts.Maui.csproj --configuration Release --no-build
 
-      - name: "Build and pack Microcharts Meta-package"
-        run: dotnet pack Sources/Microcharts.Metapackage/Microcharts.Metapackage.csproj
+      - name: "Pack Microcharts Meta-package"
+        run: dotnet pack Sources/Microcharts.Metapackage/Microcharts.Metapackage.csproj --configuration Release

.gitignore

@@ -99,7 +99,6 @@ paket-files/
 # this file can be merge conflict hell, never commit these.
 Sources/Microcharts.Droid/Resources/Resource.designer.cs
 Sources/Microcharts.Samples.Droid/Resources/Resource.designer.cs
-Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms.Android/Resources/Resource.designer.cs
 /Sources/.vsconfig
 /Sources/NuGet.config
 /Sources/Microcharts.Samples.Android/Resources/Resource.designer.cs

CONTRIBUTING.md

@@ -1,7 +1,8 @@
+
 ### I wish to help, what's the basics to what I need to know?
 
-first and foremost, thank you for your help and interest.
+First and foremost, thank you for your help and interest!
 
-master currently has 1.0 code so it's best to put new things in there unless it's a fix for the 0.9 codebase which then you develop off the develop branch.
+Master currently has 1.0 code so it's best to put new things in there unless it's a fix for the 0.9 codebase which then you develop off the develop branch.
 
-if you're adding a new framework (MAUI, UWP), please ensure you'll be around to actively support it, please no web frameworks as the library is largely used by the mobile & desktop community of the .NET family.
+If you're adding a new framework (Avalonian, Uno), please ensure you'll be around to actively support it. Please no web frameworks as the library is largely used by the mobile & desktop community of the .NET family.

README.md

@@ -3,8 +3,6 @@
 [![Mac Builds](https://github.com/dotnet-ad/Microcharts/actions/workflows/CI-MacOS.yml/badge.svg)](https://github.com/dotnet-ad/Microcharts/actions/workflows/CI-MacOS.yml)
 [![Windows Builds](https://github.com/dotnet-ad/Microcharts/actions/workflows/CI-Windows.yml/badge.svg)](https://github.com/dotnet-ad/Microcharts/actions/workflows/CI-Windows.yml)
 
-[Looking for more contributors](https://github.com/microcharts-dotnet/Microcharts/discussions/274)
-
 ## Version 1.0.0 Beta is now available
 
 [![NuGet](https://img.shields.io/nuget/vpre/Microcharts.Forms.svg?label=Microcharts.Forms)](https://www.nuget.org/packages/Microcharts.Forms/)
@@ -24,7 +22,7 @@ read our [wiki](https://github.com/dotnet-ad/Microcharts/wiki) to learn more abo
 
 ## About
 
-This project is just simple drawing on top of the awesome [SkiaSharp](https://github.com/mono/SkiaSharp) library. The purpose is not to have an heavily customizable charting library. If you want so, simply fork the code, since all of this is fairly simple. Their is no interaction, nor animation at the moment.
+This project is just simple drawing on top of the awesome [SkiaSharp](https://github.com/mono/SkiaSharp) library. The purpose is not to have an heavily customizable charting library. If you want so, simply fork the code, since all of this is fairly simple.
 
 ## Contributions
 
@@ -44,21 +42,15 @@ More info on how you can help can be found [here](https://github.com/dotnet-ad/M
 
 Available on NuGet
 
-**NET Standard 2.0, Xamarin.iOS, Xamarin.Android, UWP**
-
-[![NuGet](https://img.shields.io/nuget/v/Microcharts.svg?label=NuGet)](https://www.nuget.org/packages/Microcharts/)
-
-
-**Xamarin.Forms (.NET Standard 2.0)**
-
-[![NuGet](https://img.shields.io/nuget/v/Microcharts.Forms.svg?label=NuGet)](https://www.nuget.org/packages/Microcharts.Forms/)
+* [Microcharts](https://www.nuget.org/packages/Microcharts/)
+* [Microcharts.Core](https://www.nuget.org/packages/Microcharts.Core/)
+* [Microcharts.Maui](https://www.nuget.org/packages/Microcharts.Maui/)
+* [Microcharts.iOS](https://www.nuget.org/packages/Microcharts.iOS/)
+* [Microcharts.Android](https://www.nuget.org/packages/Microcharts.Droid/)
 
 **.NET MAUI**
 
-Not yet available through NuGet.
-
-> [!IMPORTANT]
-> Don't forget to call `UseMicrocharts()` on `MauiAppBuilder` in the `MauiProgram` class.
+Don't forget to call `UseMicrocharts()` on `MauiAppBuilder` in the `MauiProgram` class.
 
 ## Tutorials
 
@@ -68,12 +60,9 @@ Not yet available through NuGet.
 
 Built in views are provided for:
 
-* **UWP**
-* **Xamarin.Forms**, **Xamarin.iOS** and **Xamarin.Android**, **Xamarin.macOS**
-* **.NET MAUI** (Windows, Android, iOS, and macOS)
-* **WinUI** (Windows App SDK)
-* And any other **.NET Standard 2.0** [SkiaSharp](https://github.com/mono/SkiaSharp) supported platform is also compatible (see one of the included `ChartView` implementations for more details).
+* .NET 9.0 (on all platforms)
+* MAUI (Windows, Android, iOS, and macOS Catalyst)
 
 ## License
 
-MIT © [Aloïs Deniel](https://aloisdeniel.com) & [Ed Lomonaco](https://edlomonaco.dev)
+MIT © [Aloïs Deniel](https://aloisdeniel.com), [Ed Lomonaco](https://edlomonaco.dev) & [Jonas Follesø](https://github.com/follesoe)

Sources/.editorconfig

@@ -9,4 +9,7 @@ trim_trailing_whitespace=true
 insert_final_newline=true
 
 [*.json]
+indent_size = 2
+
+[*.csproj]
 indent_size = 2

Sources/Directory.Build.props

@@ -6,7 +6,7 @@
 
     <PropertyGroup>
         <!-- Change these two values to control the version -->
-        <VersionMain>1.0.1</VersionMain>
+        <VersionMain>2.0.0</VersionMain>
         <VersionPrelease></VersionPrelease>
     </PropertyGroup>
 
@@ -21,6 +21,7 @@
         <!-- Common NuGet package metadata -->
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <Authors>Microcharts Team</Authors>
+        <Owners>Microcharts Team</Owners>
         <NeutralLanguage>en</NeutralLanguage>
         <RepositoryUrl>https://github.com/microcharts-dotnet/Microcharts.git</RepositoryUrl>
         <PackageProjectUrl>https://github.com/microcharts-dotnet/Microcharts</PackageProjectUrl>
@@ -29,8 +30,13 @@
         <PackageVersion>$(VersionMain)$(VersionPrelease)</PackageVersion>
         <PackageOutputPath>$(MSBuildThisFileDirectory)..\artifacts</PackageOutputPath>
         <LicenseFile>$(MSBuildThisFileDirectory)..\LICENSE</LicenseFile>
+        <PackageIcon>Icon.png</PackageIcon>
     </PropertyGroup>
 
+    <ItemGroup Label="PackageIcon">
+        <None Include="$(MSBuildThisFileDirectory)/../Assets/Icon.png" Pack="true" Visible="false" PackagePath=""/>
+    </ItemGroup>
+
     <Target Name="PrintRID"
          BeforeTargets="BeforeBuild">
         <Message Text="Operating System: Windows"