Skip to content

Commit 3abb44f

Browse files
mattleibowtj-devel709
mattleibow
authored and
tj-devel709
committed
Update SkiaSharp (#26373)
* Update SkiaSharp package versions * Update GTK to match the new versions * Use the new SkiaSharp APIs in resizetizer * Regenerate resizetizer test images * Improve test assertions * Color ToString is invariant * Update Graphics.Skia with new SkiaSharp APIs * Regenerate graphics images * Force all images to be regenerated on CI * Fix stack overflow by setting the typeface
1 parent b136d04 commit 3abb44f

File tree

624 files changed

+298
-150
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

624 files changed

+298
-150
lines changed

‎eng/Versions.props‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -120,16 +120,16 @@
120120
- Feed URI in the nuget.config
121121
- Native assets build and sha
122122
-->
123-
<_SkiaSharpVersion>2.88.8</_SkiaSharpVersion>
124-
<_SkiaSharpExtendedVersion>2.0.0</_SkiaSharpExtendedVersion>
125-
<_HarfBuzzSharpVersion>7.3.0.2</_HarfBuzzSharpVersion>
126-
<_SkiaSharpNativeAssetsVersion>0.0.0-commit.7af1d0840a381c0ce7ef2877454a88dbb2949686.1086</_SkiaSharpNativeAssetsVersion>
123+
<_SkiaSharpVersion>3.116.1</_SkiaSharpVersion>
124+
<_SkiaSharpExtendedVersion>3.0.0-preview.13</_SkiaSharpExtendedVersion>
125+
<_HarfBuzzSharpVersion>8.3.0.1</_HarfBuzzSharpVersion>
126+
<_SkiaSharpNativeAssetsVersion>0.0.0-commit.e57e2a11dac4ccc72bea52939dede49816842005.1728</_SkiaSharpNativeAssetsVersion>
127127
<MicrosoftTemplateEngineTasksVersion>7.0.120</MicrosoftTemplateEngineTasksVersion>
128128
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>9.0.0-prerelease.25113.3</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
129129
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>9.0.0-prerelease.25113.3</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
130130
<MicrosoftDotNetXHarnessCLIVersion>9.0.0-prerelease.25113.3</MicrosoftDotNetXHarnessCLIVersion>
131131
<TizenUIExtensionsVersion>0.9.2</TizenUIExtensionsVersion>
132-
<SvgSkiaPackageVersion>1.0.0.16</SvgSkiaPackageVersion>
132+
<SvgSkiaPackageVersion>2.0.0.4</SvgSkiaPackageVersion>
133133
<FizzlerPackageVersion>1.3.0</FizzlerPackageVersion>
134134
<TizenUIExtensionsVersion>0.9.0</TizenUIExtensionsVersion>
135135
<ExCSSPackageVersion>4.2.3</ExCSSPackageVersion>

‎src/Graphics/samples/GraphicsTester.Skia.Gtk/GraphicsTester.Skia.Gtk.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<ItemGroup>
1919
<PackageReference Include="SkiaSharp.NativeAssets.Linux" />
2020
<PackageReference Include="SkiaSharp.Views.Gtk3" />
21-
<PackageReference Include="GtkSharp" Version="3.24.24.34" />
21+
<PackageReference Include="GtkSharp" Version="3.24.24.95" />
2222
</ItemGroup>
2323

2424
</Project>

‎src/Graphics/samples/GraphicsTester.Skia.Gtk/MainWindow.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public MainWindow() : base(WindowType.Toplevel)
3939

4040
Titlebar = headerBar;
4141

42-
var hpanned = new HPaned
42+
var hpanned = new Paned(Orientation.Horizontal)
4343
{
4444
Position = 300
4545
};

‎src/Graphics/src/Graphics.Skia/PublicAPI/net-android/PublicAPI.Unshipped.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,7 @@
11
#nullable enable
2+
Microsoft.Maui.Graphics.Skia.SKFontExtensions
3+
static Microsoft.Maui.Graphics.Skia.SKFontExtensions.CreateCopy(this SkiaSharp.SKFont? font) -> SkiaSharp.SKFont?
4+
~Microsoft.Maui.Graphics.Skia.SkiaCanvasState.FontFont.get -> SkiaSharp.SKFont
5+
~Microsoft.Maui.Graphics.Skia.SkiaCanvasState.FontFont.set -> void
6+
~Microsoft.Maui.Graphics.Skia.SkiaCanvasState.Reset(SkiaSharp.SKPaint fontPaint, SkiaSharp.SKFont fontFont, SkiaSharp.SKPaint fillPaint, SkiaSharp.SKPaint strokePaint) -> void
7+
~Microsoft.Maui.Graphics.Skia.SkiaTextLayout.SkiaTextLayout(string value, Microsoft.Maui.Graphics.RectF rect, Microsoft.Maui.Graphics.ITextAttributes textAttributes, Microsoft.Maui.Graphics.LayoutLine callback, Microsoft.Maui.Graphics.TextFlow textFlow = Microsoft.Maui.Graphics.TextFlow.ClipBounds, SkiaSharp.SKFont font = null) -> void

‎src/Graphics/src/Graphics.Skia/PublicAPI/net-ios/PublicAPI.Unshipped.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,7 @@
11
#nullable enable
2+
Microsoft.Maui.Graphics.Skia.SKFontExtensions
3+
static Microsoft.Maui.Graphics.Skia.SKFontExtensions.CreateCopy(this SkiaSharp.SKFont? font) -> SkiaSharp.SKFont?
4+
~Microsoft.Maui.Graphics.Skia.SkiaCanvasState.FontFont.get -> SkiaSharp.SKFont
5+
~Microsoft.Maui.Graphics.Skia.SkiaCanvasState.FontFont.set -> void
6+
~Microsoft.Maui.Graphics.Skia.SkiaCanvasState.Reset(SkiaSharp.SKPaint fontPaint, SkiaSharp.SKFont fontFont, SkiaSharp.SKPaint fillPaint, SkiaSharp.SKPaint strokePaint) -> void
7+
~Microsoft.Maui.Graphics.Skia.SkiaTextLayout.SkiaTextLayout(string value, Microsoft.Maui.Graphics.RectF rect, Microsoft.Maui.Graphics.ITextAttributes textAttributes, Microsoft.Maui.Graphics.LayoutLine callback, Microsoft.Maui.Graphics.TextFlow textFlow = Microsoft.Maui.Graphics.TextFlow.ClipBounds, SkiaSharp.SKFont font = null) -> void

‎src/Graphics/src/Graphics.Skia/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,7 @@
11
#nullable enable
2+
Microsoft.Maui.Graphics.Skia.SKFontExtensions
3+
static Microsoft.Maui.Graphics.Skia.SKFontExtensions.CreateCopy(this SkiaSharp.SKFont? font) -> SkiaSharp.SKFont?
4+
~Microsoft.Maui.Graphics.Skia.SkiaCanvasState.FontFont.get -> SkiaSharp.SKFont
5+
~Microsoft.Maui.Graphics.Skia.SkiaCanvasState.FontFont.set -> void
6+
~Microsoft.Maui.Graphics.Skia.SkiaCanvasState.Reset(SkiaSharp.SKPaint fontPaint, SkiaSharp.SKFont fontFont, SkiaSharp.SKPaint fillPaint, SkiaSharp.SKPaint strokePaint) -> void
7+
~Microsoft.Maui.Graphics.Skia.SkiaTextLayout.SkiaTextLayout(string value, Microsoft.Maui.Graphics.RectF rect, Microsoft.Maui.Graphics.ITextAttributes textAttributes, Microsoft.Maui.Graphics.LayoutLine callback, Microsoft.Maui.Graphics.TextFlow textFlow = Microsoft.Maui.Graphics.TextFlow.ClipBounds, SkiaSharp.SKFont font = null) -> void

‎src/Graphics/src/Graphics.Skia/PublicAPI/net-macos/PublicAPI.Unshipped.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,7 @@
11
#nullable enable
2+
Microsoft.Maui.Graphics.Skia.SKFontExtensions
3+
static Microsoft.Maui.Graphics.Skia.SKFontExtensions.CreateCopy(this SkiaSharp.SKFont? font) -> SkiaSharp.SKFont?
4+
~Microsoft.Maui.Graphics.Skia.SkiaCanvasState.FontFont.get -> SkiaSharp.SKFont
5+
~Microsoft.Maui.Graphics.Skia.SkiaCanvasState.FontFont.set -> void
6+
~Microsoft.Maui.Graphics.Skia.SkiaCanvasState.Reset(SkiaSharp.SKPaint fontPaint, SkiaSharp.SKFont fontFont, SkiaSharp.SKPaint fillPaint, SkiaSharp.SKPaint strokePaint) -> void
7+
~Microsoft.Maui.Graphics.Skia.SkiaTextLayout.SkiaTextLayout(string value, Microsoft.Maui.Graphics.RectF rect, Microsoft.Maui.Graphics.ITextAttributes textAttributes, Microsoft.Maui.Graphics.LayoutLine callback, Microsoft.Maui.Graphics.TextFlow textFlow = Microsoft.Maui.Graphics.TextFlow.ClipBounds, SkiaSharp.SKFont font = null) -> void

‎src/Graphics/src/Graphics.Skia/PublicAPI/net-tizen/PublicAPI.Unshipped.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,7 @@
11
#nullable enable
2+
Microsoft.Maui.Graphics.Skia.SKFontExtensions
3+
static Microsoft.Maui.Graphics.Skia.SKFontExtensions.CreateCopy(this SkiaSharp.SKFont? font) -> SkiaSharp.SKFont?
4+
~Microsoft.Maui.Graphics.Skia.SkiaCanvasState.FontFont.get -> SkiaSharp.SKFont
5+
~Microsoft.Maui.Graphics.Skia.SkiaCanvasState.FontFont.set -> void
6+
~Microsoft.Maui.Graphics.Skia.SkiaCanvasState.Reset(SkiaSharp.SKPaint fontPaint, SkiaSharp.SKFont fontFont, SkiaSharp.SKPaint fillPaint, SkiaSharp.SKPaint strokePaint) -> void
7+
~Microsoft.Maui.Graphics.Skia.SkiaTextLayout.SkiaTextLayout(string value, Microsoft.Maui.Graphics.RectF rect, Microsoft.Maui.Graphics.ITextAttributes textAttributes, Microsoft.Maui.Graphics.LayoutLine callback, Microsoft.Maui.Graphics.TextFlow textFlow = Microsoft.Maui.Graphics.TextFlow.ClipBounds, SkiaSharp.SKFont font = null) -> void

‎src/Graphics/src/Graphics.Skia/PublicAPI/net-windows/PublicAPI.Unshipped.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,7 @@
11
#nullable enable
2+
Microsoft.Maui.Graphics.Skia.SKFontExtensions
3+
static Microsoft.Maui.Graphics.Skia.SKFontExtensions.CreateCopy(this SkiaSharp.SKFont? font) -> SkiaSharp.SKFont?
4+
~Microsoft.Maui.Graphics.Skia.SkiaCanvasState.FontFont.get -> SkiaSharp.SKFont
5+
~Microsoft.Maui.Graphics.Skia.SkiaCanvasState.FontFont.set -> void
6+
~Microsoft.Maui.Graphics.Skia.SkiaCanvasState.Reset(SkiaSharp.SKPaint fontPaint, SkiaSharp.SKFont fontFont, SkiaSharp.SKPaint fillPaint, SkiaSharp.SKPaint strokePaint) -> void
7+
~Microsoft.Maui.Graphics.Skia.SkiaTextLayout.SkiaTextLayout(string value, Microsoft.Maui.Graphics.RectF rect, Microsoft.Maui.Graphics.ITextAttributes textAttributes, Microsoft.Maui.Graphics.LayoutLine callback, Microsoft.Maui.Graphics.TextFlow textFlow = Microsoft.Maui.Graphics.TextFlow.ClipBounds, SkiaSharp.SKFont font = null) -> void

‎src/Graphics/src/Graphics.Skia/PublicAPI/net/PublicAPI.Unshipped.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,7 @@
11
#nullable enable
2+
Microsoft.Maui.Graphics.Skia.SKFontExtensions
3+
static Microsoft.Maui.Graphics.Skia.SKFontExtensions.CreateCopy(this SkiaSharp.SKFont? font) -> SkiaSharp.SKFont?
4+
~Microsoft.Maui.Graphics.Skia.SkiaCanvasState.FontFont.get -> SkiaSharp.SKFont
5+
~Microsoft.Maui.Graphics.Skia.SkiaCanvasState.FontFont.set -> void
6+
~Microsoft.Maui.Graphics.Skia.SkiaCanvasState.Reset(SkiaSharp.SKPaint fontPaint, SkiaSharp.SKFont fontFont, SkiaSharp.SKPaint fillPaint, SkiaSharp.SKPaint strokePaint) -> void
7+
~Microsoft.Maui.Graphics.Skia.SkiaTextLayout.SkiaTextLayout(string value, Microsoft.Maui.Graphics.RectF rect, Microsoft.Maui.Graphics.ITextAttributes textAttributes, Microsoft.Maui.Graphics.LayoutLine callback, Microsoft.Maui.Graphics.TextFlow textFlow = Microsoft.Maui.Graphics.TextFlow.ClipBounds, SkiaSharp.SKFont font = null) -> void

0 commit comments

Comments
 (0)