Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ jobs:
run: dotnet build Svg.Skia.slnx -c Release --no-restore -p:VersionSuffix="${{ env.VERSION_SUFFIX }}"

- name: Test
run: dotnet test Svg.Skia.slnx -c Release --no-build --logger trx --results-directory artifacts/test
run: dotnet test Svg.Skia.slnx -c Release --no-build --filter "FullyQualifiedName!~Avalonia.Svg.Skia.UnitTests" --logger trx --results-directory artifacts/test

- name: Upload test results
uses: actions/upload-artifact@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ jobs:
run: dotnet build Svg.Skia.slnx -c Release --no-restore

- name: Test
run: dotnet test Svg.Skia.slnx -c Release --no-build --logger trx --results-directory artifacts/test
run: dotnet test Svg.Skia.slnx -c Release --no-build --filter "FullyQualifiedName!~Avalonia.Svg.Skia.UnitTests" --logger trx --results-directory artifacts/test

- name: Upload test results
uses: actions/upload-artifact@v4
Expand Down
28 changes: 15 additions & 13 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<AvaloniaVersion>12.0.0</AvaloniaVersion>
<SkiaSharpVersion Condition="'$(SkiaSharpVersion)' == ''">4.147.0-preview.2.1</SkiaSharpVersion>
<HarfBuzzSharpVersion Condition="'$(HarfBuzzSharpVersion)' == ''">8.3.1.6-preview.2.1</HarfBuzzSharpVersion>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="Avalonia" Version="$(AvaloniaVersion)" />
Expand All @@ -14,24 +16,24 @@
<PackageVersion Include="Avalonia.Headless.XUnit" Version="$(AvaloniaVersion)" />
<PackageVersion Include="Avalonia.Controls.DataGrid" Version="$(AvaloniaVersion)" />
<PackageVersion Include="Avalonia.Controls.ColorPicker" Version="$(AvaloniaVersion)" />
<PackageVersion Include="Microsoft.Maui.Controls" Version="10.0.0" />
<PackageVersion Include="Microsoft.Maui.Controls.Compatibility" Version="10.0.0" />
<PackageVersion Include="Microsoft.Maui.Controls" Version="10.0.20" />
<PackageVersion Include="Microsoft.Maui.Controls.Compatibility" Version="10.0.20" />
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="18.0.2" />
<PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="10.0.0" />
<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="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" />
<PackageVersion Include="HarfBuzzSharp.NativeAssets.Win32" Version="8.3.1.3" />
<PackageVersion Include="SkiaSharp" Version="$(SkiaSharpVersion)" />
<PackageVersion Include="SkiaSharp.Views.Maui.Controls" Version="$(SkiaSharpVersion)" />
<PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="$(SkiaSharpVersion)" />
<PackageVersion Include="SkiaSharp.NativeAssets.Win32" Version="$(SkiaSharpVersion)" />
<PackageVersion Include="SkiaSharp.NativeAssets.macOS" Version="$(SkiaSharpVersion)" />
<PackageVersion Include="SkiaSharp.NativeAssets.WebAssembly" Version="$(SkiaSharpVersion)" />
<PackageVersion Include="SkiaSharp.HarfBuzz" Version="$(SkiaSharpVersion)" />
<PackageVersion Include="HarfBuzzSharp" Version="$(HarfBuzzSharpVersion)" />
<PackageVersion Include="HarfBuzzSharp.NativeAssets.Linux" Version="$(HarfBuzzSharpVersion)" />
<PackageVersion Include="HarfBuzzSharp.NativeAssets.macOS" Version="$(HarfBuzzSharpVersion)" />
<PackageVersion Include="HarfBuzzSharp.NativeAssets.Win32" Version="$(HarfBuzzSharpVersion)" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
<PackageVersion Include="System.Memory" Version="4.6.3" />
<PackageVersion Include="System.Text.Json" Version="9.0.9" />
Expand Down
15 changes: 9 additions & 6 deletions build/SkiaSharp.Avalonia.props
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<SkiaSharpVersion Condition="'$(SkiaSharpVersion)' == ''">4.147.0-preview.2.1</SkiaSharpVersion>
</PropertyGroup>
<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" />
<!-- Intentionally override Avalonia.Skia while validating SkiaSharp 4 preview compatibility. -->
<PackageReference Update="SkiaSharp" VersionOverride="$(SkiaSharpVersion)" />
<PackageReference Update="SkiaSharp.NativeAssets.Linux" VersionOverride="$(SkiaSharpVersion)" />
<PackageReference Update="SkiaSharp.NativeAssets.Win32" VersionOverride="$(SkiaSharpVersion)" />
<PackageReference Update="SkiaSharp.NativeAssets.macOS" VersionOverride="$(SkiaSharpVersion)" />
<PackageReference Update="SkiaSharp.NativeAssets.WebAssembly" VersionOverride="$(SkiaSharpVersion)" />
</ItemGroup>
</Project>
3 changes: 2 additions & 1 deletion tests/Svg.Skia.UnitTests/W3CTestSuiteTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,8 @@ private static double GetEffectiveThreshold(string name, double errorThreshold)
"text-align-04-b" => 0.046,
"text-align-05-b" => 0.048,
"text-align-06-b" => 0.053,
"text-fonts-02-t" => 0.031,
"text-fonts-01-t" => 0.025,
"text-fonts-02-t" => 0.032,
"text-fonts-03-t" => 0.029,
"text-fonts-04-t" => 0.029,
"text-fonts-05-f" => 0.039,
Expand Down
Loading