Update to Avalonia v12

.github/workflows/ci.yml

@@ -19,8 +19,8 @@ jobs:
         uses: actions/setup-dotnet@v1
         with:
           dotnet-version: | 
-            6.x
             8.x
+            10.x
       - name: List dotnet sdks
         run: dotnet --info
       - name: Run the Cake script

appveyor.yml

@@ -25,7 +25,7 @@ test: false
 
 install:
   - ps: Invoke-WebRequest 'https://dot.net/v1/dotnet-install.ps1' -OutFile 'dotnet-install.ps1'
-  - ps: ./dotnet-install.ps1 -Version 8.0.403 -InstallDir "C:\Program Files\dotnet"
+  - ps: ./dotnet-install.ps1 -Channel 10.0 -InstallDir "C:\Program Files\dotnet"
 
 pull_requests:
   do_not_increment_build_number: false

global.json

@@ -1,6 +1,6 @@
 {
     "sdk": {
-        "version": "8.0.403",
+        "version": "10.0.100",
         "rollForward": "feature",
         "allowPrerelease": false
     }

src/Directory.Build.props

@@ -1,14 +1,11 @@
 <Project>
 
     <PropertyGroup>
-        <TargetFrameworks>net8.0;net6.0;netstandard2.0</TargetFrameworks>
+        <TargetFrameworks>net8.0;net10.0</TargetFrameworks>
 
         <AnalysisLevel>latest</AnalysisLevel>
         <LangVersion>latest</LangVersion>
         <EnableTrimAnalyzer>true</EnableTrimAnalyzer>
-
-        <Nullable>disable</Nullable>
-
         <GenerateLibraryLayout>true</GenerateLibraryLayout>
     </PropertyGroup>
 

src/Directory.Packages.props

@@ -1,24 +1,20 @@
 <Project>
-    <!--
+  <!--
       This enabled central package management. 
       This allows for controling all NuGet packages within the Directory.Packages.props file
       See https://learn.microsoft.com/nuget/consume-packages/Central-Package-Management?WT.mc_id=DT-MVP-5003472
       -->
-
-    <PropertyGroup>
-        <!-- This property enables the Central Package Management feature -->
-        <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-        <!-- https://learn.microsoft.com/nuget/consume-packages/Central-Package-Management?WT.mc_id=DT-MVP-5003472#transitive-pinning -->
-        <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
-        <AvaloniaVersion>11.0.13</AvaloniaVersion>
-    </PropertyGroup>
-
-    <ItemGroup>
-        <PackageVersion Include="Avalonia" Version="$(AvaloniaVersion)" />
-
-        <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
-        <PackageVersion Include="JetBrains.Annotations" Version="2024.3.0" />
-        <PackageVersion Include="System.Text.Json" Version="8.0.5" />
-    </ItemGroup>
-
+  <PropertyGroup>
+    <!-- This property enables the Central Package Management feature -->
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+    <!-- https://learn.microsoft.com/nuget/consume-packages/Central-Package-Management?WT.mc_id=DT-MVP-5003472#transitive-pinning -->
+    <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
+    <AvaloniaVersion>12.0.1</AvaloniaVersion>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageVersion Include="Avalonia" Version="$(AvaloniaVersion)" />
+    <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="10.0.202" />
+    <PackageVersion Include="JetBrains.Annotations" Version="2025.2.4" />
+    <PackageVersion Include="System.Text.Json" Version="10.0.6" />
+  </ItemGroup>
 </Project>

src/IconPacks.Avalonia.BootstrapIcons/Converter/PackIconBootstrapIconsKindToImageConverter.cs

@@ -1,21 +1,8 @@
-using Avalonia.Media;
-using IconPacks.Avalonia.Core;
-using IconPacks.Avalonia.Core.Converter;
+using IconPacks.Avalonia.Core.Converter;
 
 namespace IconPacks.Avalonia.BootstrapIcons.Converter
 {
     public class PackIconBootstrapIconsKindToImageConverter : PackIconKindToImageConverterBase
     {
-        /// <inheritdoc />
-        protected override string GetPathData(object iconKind)
-        {
-            string data = null;
-            if (iconKind is PackIconBootstrapIconsKind kind)
-            {
-                PackIconDataFactory<PackIconBootstrapIconsKind>.DataIndex.Value?.TryGetValue(kind, out data);
-            }
-
-            return data;
-        }
     }
 }

src/IconPacks.Avalonia.BootstrapIcons/PackIconBootstrapIcons.cs

@@ -1,5 +1,4 @@
 using Avalonia;
-using Avalonia.Media;
 using IconPacks.Avalonia.Core;
 using IconPacks.Avalonia.Core.Attributes;
 
@@ -45,9 +44,7 @@ protected override void UpdateData()
         {
             if (Kind != default)
             {
-                string data = null;
-                PackIconDataFactory<PackIconBootstrapIconsKind>.DataIndex.Value?.TryGetValue(Kind, out data);
-                this.Data = data != null ? StreamGeometry.Parse(data) : null;
+                this.Data = PackIconGeometryCache.GetOrAdd(Kind);
             }
             else
             {

src/IconPacks.Avalonia.BootstrapIcons/PackIconBootstrapIconsExtension.cs

@@ -1,5 +1,5 @@
 using System;
-using Avalonia.Markup.Xaml;
+using Avalonia.Metadata;
 using IconPacks.Avalonia.Core;
 
 namespace IconPacks.Avalonia.BootstrapIcons

src/IconPacks.Avalonia.BootstrapIcons/PackIconBootstrapIconsImageExtension.cs

@@ -1,6 +1,6 @@
 using System;
-using Avalonia.Markup.Xaml;
 using Avalonia.Media;
+using Avalonia.Metadata;
 using IconPacks.Avalonia.Core;
 
 namespace IconPacks.Avalonia.BootstrapIcons
@@ -22,17 +22,5 @@ public override object ProvideValue(IServiceProvider serviceProvider)
         {
             return CreateImageSource(this.Kind, this.Brush ?? Brushes.Black);
         }
-
-        /// <inheritdoc />
-        protected override string GetPathData(object iconKind)
-        {
-            string data = null;
-            if (iconKind is PackIconBootstrapIconsKind kind)
-            {
-                PackIconDataFactory<PackIconBootstrapIconsKind>.DataIndex.Value?.TryGetValue(kind, out data);
-            }
-
-            return data;
-        }
     }
 }

src/IconPacks.Avalonia.BoxIcons/Converter/PackIconBoxIconsKindToImageConverter.cs

@@ -1,21 +1,8 @@
-using Avalonia.Media;
-using IconPacks.Avalonia.Core;
-using IconPacks.Avalonia.Core.Converter;
+using IconPacks.Avalonia.Core.Converter;
 
 namespace IconPacks.Avalonia.BoxIcons.Converter
 {
     public class PackIconBoxIconsKindToImageConverter : PackIconKindToImageConverterBase
     {
-        /// <inheritdoc />
-        protected override string GetPathData(object iconKind)
-        {
-            string data = null;
-            if (iconKind is PackIconBoxIconsKind kind)
-            {
-                PackIconDataFactory<PackIconBoxIconsKind>.DataIndex.Value?.TryGetValue(kind, out data);
-            }
-
-            return data;
-        }
     }
 }

src/IconPacks.Avalonia.BoxIcons/PackIconBoxIcons.cs

@@ -1,5 +1,4 @@
 using Avalonia;
-using Avalonia.Media;
 using IconPacks.Avalonia.Core;
 using IconPacks.Avalonia.Core.Attributes;
 
@@ -45,9 +44,7 @@ protected override void UpdateData()
         {
             if (Kind != default)
             {
-                string data = null;
-                PackIconDataFactory<PackIconBoxIconsKind>.DataIndex.Value?.TryGetValue(Kind, out data);
-                this.Data = data != null ? StreamGeometry.Parse(data) : null;
+                Data = PackIconGeometryCache.GetOrAdd(Kind);
             }
             else
             {

src/IconPacks.Avalonia.BoxIcons/PackIconBoxIconsExtension.cs

@@ -1,5 +1,5 @@
 using System;
-using Avalonia.Markup.Xaml;
+using Avalonia.Metadata;
 using IconPacks.Avalonia.Core;
 
 namespace IconPacks.Avalonia.BoxIcons

src/IconPacks.Avalonia.BoxIcons/PackIconBoxIconsImageExtension.cs

@@ -1,6 +1,6 @@
 using System;
-using Avalonia.Markup.Xaml;
 using Avalonia.Media;
+using Avalonia.Metadata;
 using IconPacks.Avalonia.Core;
 
 namespace IconPacks.Avalonia.BoxIcons
@@ -22,17 +22,5 @@ public override object ProvideValue(IServiceProvider serviceProvider)
         {
             return CreateImageSource(this.Kind, this.Brush ?? Brushes.Black);
         }
-
-        /// <inheritdoc />
-        protected override string GetPathData(object iconKind)
-        {
-            string data = null;
-            if (iconKind is PackIconBoxIconsKind kind)
-            {
-                PackIconDataFactory<PackIconBoxIconsKind>.DataIndex.Value?.TryGetValue(kind, out data);
-            }
-
-            return data;
-        }
     }
 }

src/IconPacks.Avalonia.BoxIcons2/Converter/PackIconBoxIcons2KindToImageConverter.cs

@@ -1,21 +1,8 @@
-using Avalonia.Media;
-using IconPacks.Avalonia.Core;
-using IconPacks.Avalonia.Core.Converter;
+using IconPacks.Avalonia.Core.Converter;
 
 namespace IconPacks.Avalonia.BoxIcons2.Converter
 {
     public class PackIconBoxIcons2KindToImageConverter : PackIconKindToImageConverterBase
     {
-        /// <inheritdoc />
-        protected override string GetPathData(object iconKind)
-        {
-            string data = null;
-            if (iconKind is PackIconBoxIcons2Kind kind)
-            {
-                PackIconDataFactory<PackIconBoxIcons2Kind>.DataIndex.Value?.TryGetValue(kind, out data);
-            }
-
-            return data;
-        }
     }
 }

src/IconPacks.Avalonia.BoxIcons2/PackIconBoxIcons2.cs

@@ -1,5 +1,4 @@
 using Avalonia;
-using Avalonia.Media;
 using IconPacks.Avalonia.Core;
 using IconPacks.Avalonia.Core.Attributes;
 
@@ -45,9 +44,7 @@ protected override void UpdateData()
         {
             if (Kind != default)
             {
-                string data = null;
-                PackIconDataFactory<PackIconBoxIcons2Kind>.DataIndex.Value?.TryGetValue(Kind, out data);
-                this.Data = data != null ? StreamGeometry.Parse(data) : null;
+                this.Data = PackIconGeometryCache.GetOrAdd(Kind);
             }
             else
             {

src/IconPacks.Avalonia.BoxIcons2/PackIconBoxIcons2Extension.cs

@@ -1,5 +1,5 @@
 using System;
-using Avalonia.Markup.Xaml;
+using Avalonia.Metadata;
 using IconPacks.Avalonia.Core;
 
 namespace IconPacks.Avalonia.BoxIcons2

src/IconPacks.Avalonia.BoxIcons2/PackIconBoxIcons2ImageExtension.cs

@@ -1,6 +1,6 @@
 using System;
-using Avalonia.Markup.Xaml;
 using Avalonia.Media;
+using Avalonia.Metadata;
 using IconPacks.Avalonia.Core;
 
 namespace IconPacks.Avalonia.BoxIcons2
@@ -22,17 +22,5 @@ public override object ProvideValue(IServiceProvider serviceProvider)
         {
             return CreateImageSource(this.Kind, this.Brush ?? Brushes.Black);
         }
-
-        /// <inheritdoc />
-        protected override string GetPathData(object iconKind)
-        {
-            string data = null;
-            if (iconKind is PackIconBoxIcons2Kind kind)
-            {
-                PackIconDataFactory<PackIconBoxIcons2Kind>.DataIndex.Value?.TryGetValue(kind, out data);
-            }
-
-            return data;
-        }
     }
 }

src/IconPacks.Avalonia.CircumIcons/Converter/PackIconCircumIconsKindToImageConverter.cs

@@ -1,21 +1,8 @@
-using Avalonia.Media;
-using IconPacks.Avalonia.Core;
-using IconPacks.Avalonia.Core.Converter;
+using IconPacks.Avalonia.Core.Converter;
 
 namespace IconPacks.Avalonia.CircumIcons.Converter
 {
     public class PackIconCircumIconsKindToImageConverter : PackIconKindToImageConverterBase
     {
-        /// <inheritdoc />
-        protected override string GetPathData(object iconKind)
-        {
-            string data = null;
-            if (iconKind is PackIconCircumIconsKind kind)
-            {
-                PackIconDataFactory<PackIconCircumIconsKind>.DataIndex.Value?.TryGetValue(kind, out data);
-            }
-
-            return data;
-        }
     }
 }

src/IconPacks.Avalonia.CircumIcons/PackIconCircumIcons.cs

@@ -1,5 +1,4 @@
 using Avalonia;
-using Avalonia.Media;
 using IconPacks.Avalonia.Core;
 using IconPacks.Avalonia.Core.Attributes;
 
@@ -45,9 +44,7 @@ protected override void UpdateData()
         {
             if (Kind != default)
             {
-                string data = null;
-                PackIconDataFactory<PackIconCircumIconsKind>.DataIndex.Value?.TryGetValue(Kind, out data);
-                this.Data = data != null ? StreamGeometry.Parse(data) : null;
+                this.Data = PackIconGeometryCache.GetOrAdd(Kind);
             }
             else
             {

src/IconPacks.Avalonia.CircumIcons/PackIconCircumIconsExtension.cs

@@ -1,5 +1,5 @@
 using System;
-using Avalonia.Markup.Xaml;
+using Avalonia.Metadata;
 using IconPacks.Avalonia.Core;
 
 namespace IconPacks.Avalonia.CircumIcons

src/IconPacks.Avalonia.CircumIcons/PackIconCircumIconsImageExtension.cs

@@ -1,6 +1,6 @@
 using System;
-using Avalonia.Markup.Xaml;
 using Avalonia.Media;
+using Avalonia.Metadata;
 using IconPacks.Avalonia.Core;
 
 namespace IconPacks.Avalonia.CircumIcons
@@ -22,17 +22,5 @@ public override object ProvideValue(IServiceProvider serviceProvider)
         {
             return CreateImageSource(this.Kind, this.Brush ?? Brushes.Black);
         }
-
-        /// <inheritdoc />
-        protected override string GetPathData(object iconKind)
-        {
-            string data = null;
-            if (iconKind is PackIconCircumIconsKind kind)
-            {
-                PackIconDataFactory<PackIconCircumIconsKind>.DataIndex.Value?.TryGetValue(kind, out data);
-            }
-
-            return data;
-        }
     }
 }