Skip to content

Update SVG upstream and complete SkiaSharp 3 AOT cleanup #527

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wieslawsoltes merged 9 commits into from
May 13, 2026
Merged

Update SVG upstream and complete SkiaSharp 3 AOT cleanup #527

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f558c2e
Update SVG upstream submodule
wieslawsoltes May 13, 2026
7f107ee
Update SkiaSharp package references to v3
wieslawsoltes May 13, 2026
5a1b6ed
Use static SkiaSharp sampling APIs
wieslawsoltes May 13, 2026
044acd4
Make animation conversions trim safe
wieslawsoltes May 13, 2026
ddf08e7
Preserve JavaScript DOM raw attributes
wieslawsoltes May 13, 2026
afc7049
Make SvgML enum bridge trim safe
wieslawsoltes May 13, 2026
c6c3e1e
Copy DOM state for element clones
wieslawsoltes May 13, 2026
a1576e2
Preserve empty DOM attributes
wieslawsoltes May 13, 2026
31176a9
Sync DOM style state after CSSOM changes
wieslawsoltes May 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
<PackageVersion Include="Mono.Cecil" Version="0.11.6" />
<PackageVersion Include="Svg" Version="3.4.4" />
<PackageVersion Include="ExCSS" Version="4.3.1" />
<PackageVersion Include="SkiaSharp" Version="2.88.9" />
<PackageVersion Include="SkiaSharp.Views.Maui.Controls" Version="2.88.9" />
<PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="2.88.9" />
<PackageVersion Include="SkiaSharp.NativeAssets.Win32" Version="2.88.9" />
<PackageVersion Include="SkiaSharp.NativeAssets.macOS" Version="2.88.9" />
<PackageVersion Include="SkiaSharp.NativeAssets.WebAssembly" Version="2.88.9" />
<PackageVersion Include="SkiaSharp.HarfBuzz" Version="2.88.9" />
<PackageVersion Include="SkiaSharp" Version="3.119.2" />
<PackageVersion Include="SkiaSharp.Views.Maui.Controls" Version="3.119.2" />
<PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="3.119.2" />
<PackageVersion Include="SkiaSharp.NativeAssets.Win32" Version="3.119.2" />
<PackageVersion Include="SkiaSharp.NativeAssets.macOS" Version="3.119.2" />
<PackageVersion Include="SkiaSharp.NativeAssets.WebAssembly" Version="3.119.2" />
<PackageVersion Include="SkiaSharp.HarfBuzz" Version="3.119.2" />
<PackageVersion Include="HarfBuzzSharp" Version="8.3.1.3" />
<PackageVersion Include="HarfBuzzSharp.NativeAssets.Linux" Version="8.3.1.3" />
<PackageVersion Include="HarfBuzzSharp.NativeAssets.macOS" Version="8.3.1.3" />
Expand Down
3 changes: 1 addition & 2 deletions Svg.Skia.slnx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,9 @@
<File Path="build/ReferenceAssemblies.props" />
<File Path="build/SignAssembly.props" />
<File Path="build/SixLabors.ImageSharp.props" />
<File Path="build/SkiaSharp.Avalonia.props" />
<File Path="build/SkiaSharp.Native.props" />
<File Path="build/SkiaSharp.Native.v3.props" />
<File Path="build/SkiaSharp.props" />
<File Path="build/SkiaSharp.v3.props" />
<File Path="build/SourceLink.props" />
<File Path="build/SvgML.Weaving.targets" />
<File Path="build/Svg.props" />
Expand Down
11 changes: 11 additions & 0 deletions build/SkiaSharp.Avalonia.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<!-- Keep direct SkiaSharp references aligned with Avalonia.Skia's SkiaSharp dependency. -->
<PackageReference Update="SkiaSharp" VersionOverride="3.119.3-preview.1.1" />
<PackageReference Update="SkiaSharp.NativeAssets.Linux" VersionOverride="3.119.3-preview.1.1" />
<PackageReference Update="SkiaSharp.NativeAssets.Win32" VersionOverride="3.119.3-preview.1.1" />
<PackageReference Update="SkiaSharp.NativeAssets.macOS" VersionOverride="3.119.3-preview.1.1" />
<PackageReference Update="SkiaSharp.NativeAssets.WebAssembly" VersionOverride="3.119.3-preview.1.1" />
</ItemGroup>
</Project>
9 changes: 0 additions & 9 deletions build/SkiaSharp.Native.v3.props
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions build/SkiaSharp.v3.props
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion externals/SVG
Open in desktop
Submodule SVG updated 25 files
+1 −1 .github/workflows/builddocs.yml
+2 −2 .github/workflows/runtests.yml
+230 −230 Source/Css/ExSvgElementOps.cs
+227 −227 Source/DataTypes/EnumConverters.cs
+2 −8 Source/DataTypes/SvgAspectRatio.cs
+1 −1 Source/DataTypes/SvgElementStyle.cs
+108 −119 Source/DataTypes/SvgOrient.cs
+52 −76 Source/DataTypes/SvgOrientConverter.cs
+2 −8 Source/DataTypes/SvgPoint.cs
+1 −1 Source/Exceptions/SvgException.cs
+23 −23 Source/Exceptions/SvgGdiPlusCannotBeLoadedException.cs
+2 −2 Source/Painting/SvgColourConverter.cs
+2 −2 Source/Painting/SvgFillRule.cs
+1 −1 Source/Painting/SvgGradientSpreadMethod.cs
+14 −14 Source/Paths/SvgPathBuilder.cs
+2 −3 Source/SvgDocument.cs
+13 −9 Source/SvgElement.cs
+1 −1 Source/SvgElementAttribute.cs
+64 −64 Source/SvgModel.cs
+177 −179 Source/SvgOptions.cs
+441 −506 Source/System/Drawing/ColorConverter.cs
+129 −129 Source/Text/SvgDominantBaseline.cs
+1 −1 Source/Text/SvgTextAnchor.cs
+2 −2 Source/Transforms/SvgTransformCollection.cs
+158 −158 Source/Transforms/SvgTransformConverter.cs
5 changes: 3 additions & 2 deletions samples/AvalonDraw/AvalonDraw.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@
<Import Project="..\..\build\Avalonia.Themes.Fluent.props" />
<Import Project="..\..\build\Avalonia.Desktop.props" />
<Import Project="..\..\build\Avalonia.Diagnostics.props" />
<Import Project="..\..\build\SkiaSharp.v3.props" />
<Import Project="..\..\build\SkiaSharp.Native.v3.props" />
<Import Project="..\..\build\SkiaSharp.props" />
<Import Project="..\..\build\SkiaSharp.Native.props" />
<Import Project="..\..\build\SkiaSharp.Avalonia.props" />

<ItemGroup>
<PackageReference Include="Avalonia.Controls.DataGrid" />
Expand Down
5 changes: 3 additions & 2 deletions samples/AvaloniaControlsSample/AvaloniaControlsSample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@
<Import Project="..\..\build\Avalonia.Themes.Fluent.props" />
<Import Project="..\..\build\Avalonia.Desktop.props" />
<Import Project="..\..\build\Avalonia.Diagnostics.props" />
<Import Project="..\..\build\SkiaSharp.v3.props" />
<Import Project="..\..\build\SkiaSharp.Native.v3.props" />
<Import Project="..\..\build\SkiaSharp.props" />
<Import Project="..\..\build\SkiaSharp.Native.props" />
<Import Project="..\..\build\SkiaSharp.Avalonia.props" />

<ItemGroup>
<ProjectReference Include="..\..\src\Skia.Controls.Avalonia\Skia.Controls.Avalonia.csproj" />
Expand Down
5 changes: 3 additions & 2 deletions samples/AvaloniaSKPictureImageSample/AvaloniaSKPictureImageSample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@
<Import Project="..\..\build\Avalonia.Themes.Fluent.props" />
<Import Project="..\..\build\Avalonia.Desktop.props" />
<Import Project="..\..\build\Avalonia.Diagnostics.props" />
<Import Project="..\..\build\SkiaSharp.v3.props" />
<Import Project="..\..\build\SkiaSharp.Native.v3.props" />
<Import Project="..\..\build\SkiaSharp.props" />
<Import Project="..\..\build\SkiaSharp.Native.props" />
<Import Project="..\..\build\SkiaSharp.Avalonia.props" />

<ItemGroup>
<AdditionalFiles Include="Assets/__tiger.svg" NamespaceName="AvaloniaSKPictureImageSample" ClassName="Tiger" />
Expand Down
5 changes: 3 additions & 2 deletions samples/AvaloniaSvgSkiaSample/AvaloniaSvgSkiaSample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@
<Import Project="..\..\build\Avalonia.Themes.Fluent.props" />
<Import Project="..\..\build\Avalonia.Desktop.props" />
<Import Project="..\..\build\Avalonia.Diagnostics.props" />
<Import Project="..\..\build\SkiaSharp.v3.props" />
<Import Project="..\..\build\SkiaSharp.Native.v3.props" />
<Import Project="..\..\build\SkiaSharp.props" />
<Import Project="..\..\build\SkiaSharp.Native.props" />
<Import Project="..\..\build\SkiaSharp.Avalonia.props" />

<ItemGroup>
<ProjectReference Include="..\..\src\Svg.Controls.Skia.Avalonia\Svg.Controls.Skia.Avalonia.csproj" />
Expand Down
5 changes: 3 additions & 2 deletions samples/AvaloniaSvgSkiaStylingSample/AvaloniaSvgSkiaStylingSample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@
<Import Project="..\..\build\Avalonia.Themes.Fluent.props" />
<Import Project="..\..\build\Avalonia.Desktop.props" />
<Import Project="..\..\build\Avalonia.Diagnostics.props" />
<Import Project="..\..\build\SkiaSharp.v3.props" />
<Import Project="..\..\build\SkiaSharp.Native.v3.props" />
<Import Project="..\..\build\SkiaSharp.props" />
<Import Project="..\..\build\SkiaSharp.Native.props" />
<Import Project="..\..\build\SkiaSharp.Avalonia.props" />

<ItemGroup>
<ProjectReference Include="..\..\src\Svg.Controls.Skia.Avalonia\Svg.Controls.Skia.Avalonia.csproj" />
Expand Down
4 changes: 2 additions & 2 deletions samples/Svg.Skia.Converter/Svg.Skia.Converter.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@

<Import Project="..\..\build\SignAssembly.props" />
<Import Project="..\..\build\ReferenceAssemblies.props" />
<Import Project="..\..\build\SkiaSharp.v3.props" />
<Import Project="..\..\build\SkiaSharp.Native.v3.props" />
<Import Project="..\..\build\SkiaSharp.props" />
<Import Project="..\..\build\SkiaSharp.Native.props" />
<Import Project="..\..\build\Newtonsoft.Json.props" />
<Import Project="..\..\build\System.CommandLine.props" />
<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions samples/Svg.SourceGenerator.Skia.Sample/Svg.SourceGenerator.Skia.Sample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
<AdditionalFiles Include="Svg/pservers-pattern-01-b.svg" />
</ItemGroup>

<Import Project="..\..\build\SkiaSharp.v3.props" />
<Import Project="..\..\build\SkiaSharp.Native.v3.props" />
<Import Project="..\..\build\SkiaSharp.props" />
<Import Project="..\..\build\SkiaSharp.Native.props" />

<ItemGroup>
<ProjectReference Include="..\..\src\Svg.Model\Svg.Model.csproj" />
Expand Down
4 changes: 2 additions & 2 deletions samples/SvgToPng/SvgToPng.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@

<Import Project="..\..\build\SignAssembly.props" />
<Import Project="..\..\build\ReferenceAssemblies.props" />
<Import Project="..\..\build\SkiaSharp.v3.props" />
<Import Project="..\..\build\SkiaSharp.Native.v3.props" />
<Import Project="..\..\build\SkiaSharp.props" />
<Import Project="..\..\build\SkiaSharp.Native.props" />
<Import Project="..\..\build\Newtonsoft.Json.props" />

<ItemGroup>
Expand Down
5 changes: 3 additions & 2 deletions samples/TestApp/TestApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,9 @@
<Import Project="..\..\build\Avalonia.Themes.Fluent.props" />
<Import Project="..\..\build\Avalonia.Diagnostics.props" />
<Import Project="..\..\build\Avalonia.Desktop.props" />
<Import Project="..\..\build\SkiaSharp.v3.props" />
<Import Project="..\..\build\SkiaSharp.Native.v3.props" />
<Import Project="..\..\build\SkiaSharp.props" />
<Import Project="..\..\build\SkiaSharp.Native.props" />
<Import Project="..\..\build\SkiaSharp.Avalonia.props" />
<Import Project="..\..\build\Newtonsoft.Json.props" />

<ItemGroup>
Expand Down
Loading
Loading