build: migrate to avalonia 12

HelloWRC · HelloWRC · commit 0ce38103937f · 2026-04-25T15:04:49.000+08:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -23,9 +23,9 @@ jobs:
     - name: Upload Nuget packages to GitHub registry
       if: ${{ github.event_name != 'pull_request' }}
       env:
-        GHPKG_KEY: ${{ secrets.GHPKG_KEY }}
+        GHPKG_KEY: ${{ secrets.GITHUB_TOKEN }}
       run: |
-        dotnet nuget add source --username HelloWRC --password $env:GHPKG_KEY --store-password-in-clear-text --name github "https://nuget.pkg.github.com/ClassIsland/index.json"
+        dotnet nuget add source --username github --password $env:GHPKG_KEY --store-password-in-clear-text --name github "https://nuget.pkg.github.com/ClassIsland/index.json"
         dotnet nuget push .\out\*.nupkg -k $env:GHPKG_KEY --source "github" --skip-duplicate
     - name: Upload Nuget packages to NuGet Gallery
       if: ${{ startsWith(github.ref, 'refs/tags/') && github.event_name != 'pull_request' }}
diff --git a/ColorTextBlock.Avalonia/CTextBlock.cs b/ColorTextBlock.Avalonia/CTextBlock.cs
@@ -597,7 +597,7 @@ protected override Size ArrangeOverride(Size finalSize)
 
                 indicator.Control.Arrange(new Rect(indicator.Left, indicator.Top, indicator.Width, indicator.Height));
             }
-            if (MathUtilities.AreClose(_constraint.Width, finalSize.Width))
+            if (MyMathUtils.AreClose(_constraint.Width, finalSize.Width))
             {
                 return finalSize;
             }
@@ -610,7 +610,7 @@ protected override Size ArrangeOverride(Size finalSize)
 
         protected override Size MeasureOverride(Size availableSize)
         {
-            if (_measured.Width == 0d || !MathUtilities.AreClose(availableSize.Width, _constraint.Width) || _measureRequested)
+            if (_measured.Width == 0d || !MyMathUtils.AreClose(availableSize.Width, _constraint.Width) || _measureRequested)
             {
                 _measureRequested = false;
                 _constraint = availableSize;
diff --git a/ColorTextBlock.Avalonia/MyMathUtils.cs b/ColorTextBlock.Avalonia/MyMathUtils.cs
@@ -0,0 +1,16 @@
+using System;
+
+namespace ColorTextBlock.Avalonia
+{
+    internal class MyMathUtils
+    {
+        public static bool AreClose(double value1, double value2)
+        {
+            if (value1 == value2)
+                return true;
+            double num1 = (Math.Abs(value1) + Math.Abs(value2) + 10.0) * 2.220446049250313E-16;
+            double num2 = value1 - value2;
+            return -num1 < num2 && num1 > num2;
+        }
+    }
+}
diff --git a/Markdown.Avalonia.Svg/Markdown.Avalonia.Svg.csproj b/Markdown.Avalonia.Svg/Markdown.Avalonia.Svg.csproj
@@ -18,7 +18,7 @@
 
   <ItemGroup>
     <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
-    <PackageReference Include="Avalonia.Svg" Version="$(AvaloniaSvgVersion)" />
+    <PackageReference Include="Svg.Controls.Avalonia" Version="$(AvaloniaSvgVersion)" />
   </ItemGroup>
   
   <ItemGroup>
diff --git a/Markdown.Avalonia.Svg/SvgImageResolver.cs b/Markdown.Avalonia.Svg/SvgImageResolver.cs
@@ -6,21 +6,23 @@
 using Avalonia.Media;
 using Markdown.Avalonia.Utils;
 using System.Threading.Tasks;
+using Svg.Model.Services;
+using Svg.Skia;
 
 namespace Markdown.Avalonia.Svg
 {
     internal class SvgImageResolver : IImageResolver
     {
-        private static readonly AvaloniaAssetLoader _svgAssetLoader = new();
+        private static readonly AvaloniaSvgAssetLoader _svgAssetLoader = new();
 
         public async Task<IImage?> Load(Stream stream)
         {
             var task = Task.Run(() =>
             {
                 if (IsSvgFile(stream))
                 {
-                    var document = SvgExtensions.Open(stream);
-                    var picture = document is { } ? SvgExtensions.ToModel(document, _svgAssetLoader, out _, out _) : default;
+                    var document = SvgService.Open(stream);
+                    var picture = document is { } ? SvgSceneRuntime.CreateModel(document, _svgAssetLoader) : default;
                     var svgsrc = new SvgSource() { Picture = picture };
                     return (IImage)new VectorImage() { Source = svgsrc };
                 }
diff --git a/Markdown.Avalonia.SyntaxHigh/CodeBlockElement.cs b/Markdown.Avalonia.SyntaxHigh/CodeBlockElement.cs
@@ -7,6 +7,7 @@
 using Markdown.Avalonia.SyntaxHigh.Extensions;
 using ColorDocument.Avalonia;
 using System.Text;
+using Avalonia.Input.Platform;
 
 namespace Markdown.Avalonia.SyntaxHigh
 {
diff --git a/Markdown.Avalonia.SyntaxHigh/Extensions/SyntaxHighlightWrapperExtension.cs b/Markdown.Avalonia.SyntaxHigh/Extensions/SyntaxHighlightWrapperExtension.cs
@@ -52,7 +52,7 @@ public override object ProvideValue(IServiceProvider serviceProvider)
 
             return new MultiBinding()
             {
-                Bindings = new IBinding[] { brush, provider, tag },
+                Bindings = new [] { brush, provider, tag },
                 Converter = new SyntaxHighlightWrapperConverter()
             };
         }
diff --git a/Markdown.Avalonia.Tight/Extensions/AlphaExtension.cs b/Markdown.Avalonia.Tight/Extensions/AlphaExtension.cs
@@ -36,7 +36,7 @@ public override object ProvideValue(IServiceProvider serviceProvider)
 
             return new MultiBinding()
             {
-                Bindings = new IBinding[] { brush },
+                Bindings = new [] { brush },
                 Converter = new AlphaConverter(_alpha)
             };
         }
diff --git a/Markdown.Avalonia.Tight/Extensions/ComplementaryExtension.cs b/Markdown.Avalonia.Tight/Extensions/ComplementaryExtension.cs
@@ -28,7 +28,7 @@ public override object ProvideValue(IServiceProvider serviceProvider)
 
             return new MultiBinding()
             {
-                Bindings = new IBinding[] { brush },
+                Bindings = new [] { brush },
                 Converter = new ComplementaryConverter()
             };
         }
diff --git a/Markdown.Avalonia.Tight/Extensions/DivideColorExtension.cs b/Markdown.Avalonia.Tight/Extensions/DivideColorExtension.cs
@@ -27,7 +27,7 @@ public DivideColorExtension(string frm, string to, double relate)
 
         public override object ProvideValue(IServiceProvider serviceProvider)
         {
-            IBinding left;
+            BindingBase left;
             if (Color.TryParse(_frmKey, out var leftColor))
             {
                 left = new Binding()
@@ -41,7 +41,7 @@ public override object ProvideValue(IServiceProvider serviceProvider)
                 left = lftExt.ProvideValue(serviceProvider);
             }
 
-            IBinding right;
+            BindingBase right;
             if (Color.TryParse(_toKey, out var rightColor))
             {
                 right = new Binding()
@@ -57,7 +57,7 @@ public override object ProvideValue(IServiceProvider serviceProvider)
 
             return new MultiBinding()
             {
-                Bindings = new IBinding[] { left, right },
+                Bindings = new [] { left, right },
                 Converter = new DivideConverter(_relate)
             };
         }
diff --git a/Markdown.Avalonia.Tight/Extensions/MultiplyExtension.cs b/Markdown.Avalonia.Tight/Extensions/MultiplyExtension.cs
@@ -36,7 +36,7 @@ public override object ProvideValue(IServiceProvider serviceProvider)
 
             return new MultiBinding()
             {
-                Bindings = new IBinding[] { brush },
+                Bindings = new [] { brush },
                 Converter = new MultiplyConverter(_scale)
             };
         }
diff --git a/Markdown.Avalonia.props b/Markdown.Avalonia.props
@@ -4,11 +4,11 @@
     <DemoAppTargetFrameworks>net8</DemoAppTargetFrameworks>
     <TestTargetFrameworks>net8</TestTargetFrameworks>
     <PackageTargetFrameworks>net8</PackageTargetFrameworks>
-    <AvaloniaVersion>11.3.6</AvaloniaVersion>
-    <DemoAvaloniaVersion>11.3.6</DemoAvaloniaVersion>
+    <AvaloniaVersion>12.0.0</AvaloniaVersion>
+    <DemoAvaloniaVersion>12.0.999-cibuild0060150-alpha</DemoAvaloniaVersion>
     <EnableAvaloniaEdit>enabled</EnableAvaloniaEdit>
-    <AvaloniaEditVersion>11.0.0</AvaloniaEditVersion>
-    <AvaloniaSvgVersion>11.0.0</AvaloniaSvgVersion>
+    <AvaloniaEditVersion>12.0.0-rc1</AvaloniaEditVersion>
+    <AvaloniaSvgVersion>12.0.0.5</AvaloniaSvgVersion>
 
     <PackageProjectUrl>https://github.com/ClassIsland/Markdown.Avalonia</PackageProjectUrl>
     
@@ -22,7 +22,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <PackageVersion>11.0.3-a1</PackageVersion>
+    <PackageVersion>12.0.0</PackageVersion>
   </PropertyGroup>
 
 </Project>
diff --git a/demos/Markdown.AvaloniaDemo/Markdown.AvaloniaDemo.csproj b/demos/Markdown.AvaloniaDemo/Markdown.AvaloniaDemo.csproj
@@ -21,7 +21,6 @@
   <ItemGroup>
     <PackageReference Include="Avalonia" Version="$(DemoAvaloniaVersion)" />
     <PackageReference Include="Avalonia.Desktop" Version="$(DemoAvaloniaVersion)" />
-    <PackageReference Include="Avalonia.Diagnostics" Version="$(DemoAvaloniaVersion)" />
     <PackageReference Include="Avalonia.Themes.Simple" Version="$(DemoAvaloniaVersion)" />
     <PackageReference Include="Avalonia.ReactiveUI" Version="$(DemoAvaloniaVersion)" />
     <PackageReference Include="Avalonia.Markup.Xaml.Loader" Version="$(DemoAvaloniaVersion)" />
diff --git a/demos/Markdown.AvaloniaDemo/Views/MainWindow.axaml.cs b/demos/Markdown.AvaloniaDemo/Views/MainWindow.axaml.cs
@@ -16,7 +16,7 @@ public MainWindow()
 
             _breadcrumb = this.FindControl<Label>("Breadcrumb");
 #if DEBUG
-            this.AttachDevTools();
+            
 # endif
         }
 
diff --git a/demos/Markdown.AvaloniaFluentDemo/Markdown.AvaloniaFluentDemo.csproj b/demos/Markdown.AvaloniaFluentDemo/Markdown.AvaloniaFluentDemo.csproj
@@ -8,6 +8,7 @@
     <TargetFrameworks>$(DemoAppTargetFrameworks)</TargetFrameworks>
     <LangVersion>9</LangVersion>
     <Nullable>disable</Nullable>
+      <AvaloniaUseCompiledBindingsByDefault>false</AvaloniaUseCompiledBindingsByDefault>
   </PropertyGroup>
   <ItemGroup>
     <AvaloniaResource Include="Assets\**" />

Original file line number	Diff line number	Diff line change
`@@ -597,7 +597,7 @@ protected override Size ArrangeOverride(Size finalSize)`
`597`	`597`
`598`	`598`	`indicator.Control.Arrange(new Rect(indicator.Left, indicator.Top, indicator.Width, indicator.Height));`
`599`	`599`	`}`
`600`		`- if (MathUtilities.AreClose(_constraint.Width, finalSize.Width))`
	`600`	`+ if (MyMathUtils.AreClose(_constraint.Width, finalSize.Width))`
`601`	`601`	`{`
`602`	`602`	`return finalSize;`
`603`	`603`	`}`
`@@ -610,7 +610,7 @@ protected override Size ArrangeOverride(Size finalSize)`
`610`	`610`
`611`	`611`	`protected override Size MeasureOverride(Size availableSize)`
`612`	`612`	`{`
`613`		`- if (_measured.Width == 0d \|\| !MathUtilities.AreClose(availableSize.Width, _constraint.Width) \|\| _measureRequested)`
	`613`	`+ if (_measured.Width == 0d \|\| !MyMathUtils.AreClose(availableSize.Width, _constraint.Width) \|\| _measureRequested)`
`614`	`614`	`{`
`615`	`615`	`_measureRequested = false;`
`616`	`616`	`_constraint = availableSize;`
Original file line number	Diff line number	Diff line change
`@@ -6,21 +6,23 @@`
`6`	`6`	`using Avalonia.Media;`
`7`	`7`	`using Markdown.Avalonia.Utils;`
`8`	`8`	`using System.Threading.Tasks;`
	`9`	`+using Svg.Model.Services;`
	`10`	`+using Svg.Skia;`
`9`	`11`
`10`	`12`	`namespace Markdown.Avalonia.Svg`
`11`	`13`	`{`
`12`	`14`	`internal class SvgImageResolver : IImageResolver`
`13`	`15`	`{`
`14`		`- private static readonly AvaloniaAssetLoader _svgAssetLoader = new();`
	`16`	`+ private static readonly AvaloniaSvgAssetLoader _svgAssetLoader = new();`
`15`	`17`
`16`	`18`	`public async Task<IImage?> Load(Stream stream)`
`17`	`19`	`{`
`18`	`20`	`var task = Task.Run(() =>`
`19`	`21`	`{`
`20`	`22`	`if (IsSvgFile(stream))`
`21`	`23`	`{`
`22`		`- var document = SvgExtensions.Open(stream);`
`23`		`- var picture = document is { } ? SvgExtensions.ToModel(document, _svgAssetLoader, out _, out _) : default;`
	`24`	`+ var document = SvgService.Open(stream);`
	`25`	`+ var picture = document is { } ? SvgSceneRuntime.CreateModel(document, _svgAssetLoader) : default;`
`24`	`26`	`var svgsrc = new SvgSource() { Picture = picture };`
`25`	`27`	`return (IImage)new VectorImage() { Source = svgsrc };`
`26`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`using Markdown.Avalonia.SyntaxHigh.Extensions;`
`8`	`8`	`using ColorDocument.Avalonia;`
`9`	`9`	`using System.Text;`
	`10`	`+using Avalonia.Input.Platform;`
`10`	`11`
`11`	`12`	`namespace Markdown.Avalonia.SyntaxHigh`
`12`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public override object ProvideValue(IServiceProvider serviceProvider)`
`52`	`52`
`53`	`53`	`return new MultiBinding()`
`54`	`54`	`{`
`55`		`- Bindings = new IBinding[] { brush, provider, tag },`
	`55`	`+ Bindings = new [] { brush, provider, tag },`
`56`	`56`	`Converter = new SyntaxHighlightWrapperConverter()`
`57`	`57`	`};`
`58`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public override object ProvideValue(IServiceProvider serviceProvider)`
`36`	`36`
`37`	`37`	`return new MultiBinding()`
`38`	`38`	`{`
`39`		`- Bindings = new IBinding[] { brush },`
	`39`	`+ Bindings = new [] { brush },`
`40`	`40`	`Converter = new AlphaConverter(_alpha)`
`41`	`41`	`};`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public override object ProvideValue(IServiceProvider serviceProvider)`
`28`	`28`
`29`	`29`	`return new MultiBinding()`
`30`	`30`	`{`
`31`		`- Bindings = new IBinding[] { brush },`
	`31`	`+ Bindings = new [] { brush },`
`32`	`32`	`Converter = new ComplementaryConverter()`
`33`	`33`	`};`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public DivideColorExtension(string frm, string to, double relate)`
`27`	`27`
`28`	`28`	`public override object ProvideValue(IServiceProvider serviceProvider)`
`29`	`29`	`{`
`30`		`- IBinding left;`
	`30`	`+ BindingBase left;`
`31`	`31`	`if (Color.TryParse(_frmKey, out var leftColor))`
`32`	`32`	`{`
`33`	`33`	`left = new Binding()`
`@@ -41,7 +41,7 @@ public override object ProvideValue(IServiceProvider serviceProvider)`
`41`	`41`	`left = lftExt.ProvideValue(serviceProvider);`
`42`	`42`	`}`
`43`	`43`
`44`		`- IBinding right;`
	`44`	`+ BindingBase right;`
`45`	`45`	`if (Color.TryParse(_toKey, out var rightColor))`
`46`	`46`	`{`
`47`	`47`	`right = new Binding()`
`@@ -57,7 +57,7 @@ public override object ProvideValue(IServiceProvider serviceProvider)`
`57`	`57`
`58`	`58`	`return new MultiBinding()`
`59`	`59`	`{`
`60`		`- Bindings = new IBinding[] { left, right },`
	`60`	`+ Bindings = new [] { left, right },`
`61`	`61`	`Converter = new DivideConverter(_relate)`
`62`	`62`	`};`
`63`	`63`	`}`