From fa401b98dce4090398e8c1af9ce3d886e4a8c8ee Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 17 Aug 2023 06:54:03 +0800 Subject: [PATCH 01/14] Try and follow more dotnet versions (#2556) (#2557) (cherry picked from commit 75835ccd4a1b88ab3df6ad0ef14c0812151439fd) Co-authored-by: Matthew Leibowitz --- scripts/azure-pipelines-complete.yml | 4 ++-- scripts/azure-pipelines.yml | 4 ++-- scripts/azure-templates-stages.yml | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/azure-pipelines-complete.yml b/scripts/azure-pipelines-complete.yml index 3a0e9a57a6..a8bb73045f 100644 --- a/scripts/azure-pipelines-complete.yml +++ b/scripts/azure-pipelines-complete.yml @@ -1,12 +1,12 @@ trigger: - main - develop - - patch/* + - release/* pr: - main - develop - - patch/* + - release/* parameters: - name: buildExternals diff --git a/scripts/azure-pipelines.yml b/scripts/azure-pipelines.yml index 2f34477a62..c533c17092 100644 --- a/scripts/azure-pipelines.yml +++ b/scripts/azure-pipelines.yml @@ -1,12 +1,12 @@ trigger: - main - develop - - patch/* + - release/* pr: - main - develop - - patch/* + - release/* parameters: - name: buildExternals diff --git a/scripts/azure-templates-stages.yml b/scripts/azure-templates-stages.yml index c8503a0225..99590f16c4 100644 --- a/scripts/azure-templates-stages.yml +++ b/scripts/azure-templates-stages.yml @@ -566,9 +566,9 @@ stages: jobs: - template: sign-artifacts/jobs/v2.yml@xamarin-templates parameters: - ${{ if or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), startsWith(variables['Build.SourceBranch'], 'refs/heads/patch/')) }}: + ${{ if or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release/')) }}: signType: 'Real' - ${{ if not(or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), startsWith(variables['Build.SourceBranch'], 'refs/heads/patch/'))) }}: + ${{ if not(or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'))) }}: signType: 'Test' - ${{ if and(eq(variables['System.TeamProject'], 'devdiv'), ne(parameters.buildPipelineType, 'tests'), ne(variables['System.PullRequest.IsFork'], 'true')) }}: @@ -912,7 +912,7 @@ stages: name: native_checks_windows displayName: Run Code Checks buildPipelineType: ${{ parameters.buildPipelineType }} - condition: or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), startsWith(variables['Build.SourceBranch'], 'refs/heads/patch/')) + condition: or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release/')) vmImage: ${{ parameters.VM_IMAGE_WINDOWS}} target: git-sync-deps installWindowsSdk: false From 39c88ed1a68e5606782ce8e896e356213e17c5e8 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 17 Aug 2023 00:57:36 +0200 Subject: [PATCH 02/14] Bump SkiaSharp versions --- VERSIONS.txt | 94 +++++++++++++-------------- scripts/azure-pipelines-variables.yml | 4 +- 2 files changed, 49 insertions(+), 49 deletions(-) diff --git a/VERSIONS.txt b/VERSIONS.txt index 242179bc0c..4092c65f3d 100644 --- a/VERSIONS.txt +++ b/VERSIONS.txt @@ -45,58 +45,58 @@ HarfBuzz soname 0.20802.0 # SkiaSharp.dll SkiaSharp assembly 2.88.0.0 -SkiaSharp file 2.88.3.0 +SkiaSharp file 2.88.5.0 # HarfBuzzSharp.dll HarfBuzzSharp assembly 1.0.0.0 -HarfBuzzSharp file 2.8.2.4 +HarfBuzzSharp file 2.8.2.5 # nuget versions -SkiaSharp nuget 2.88.4 -SkiaSharp.NativeAssets.Linux nuget 2.88.4 -SkiaSharp.NativeAssets.Linux.NoDependencies nuget 2.88.4 -SkiaSharp.NativeAssets.NanoServer nuget 2.88.4 -SkiaSharp.NativeAssets.WebAssembly nuget 2.88.4 -SkiaSharp.NativeAssets.Android nuget 2.88.4 -SkiaSharp.NativeAssets.iOS nuget 2.88.4 -SkiaSharp.NativeAssets.MacCatalyst nuget 2.88.4 -SkiaSharp.NativeAssets.macOS nuget 2.88.4 -SkiaSharp.NativeAssets.Tizen nuget 2.88.4 -SkiaSharp.NativeAssets.tvOS nuget 2.88.4 -SkiaSharp.NativeAssets.UWP nuget 2.88.4 -SkiaSharp.NativeAssets.watchOS nuget 2.88.4 -SkiaSharp.NativeAssets.Win32 nuget 2.88.4 -SkiaSharp.Views nuget 2.88.4 -SkiaSharp.Views.Desktop.Common nuget 2.88.4 -SkiaSharp.Views.Gtk2 nuget 2.88.4 -SkiaSharp.Views.Gtk3 nuget 2.88.4 -SkiaSharp.Views.WindowsForms nuget 2.88.4 -SkiaSharp.Views.WPF nuget 2.88.4 -SkiaSharp.Views.Forms nuget 2.88.4 -SkiaSharp.Views.Forms.WPF nuget 2.88.4 -SkiaSharp.Views.Forms.GTK nuget 2.88.4 -SkiaSharp.Views.Uno nuget 2.88.4 -SkiaSharp.Views.Uno.WinUI nuget 2.88.4 -SkiaSharp.Views.WinUI nuget 2.88.4 -SkiaSharp.Views.Maui.Core nuget 2.88.4 -SkiaSharp.Views.Maui.Controls nuget 2.88.4 -SkiaSharp.Views.Maui.Controls.Compatibility nuget 2.88.4 -SkiaSharp.Views.Blazor nuget 2.88.4 -SkiaSharp.HarfBuzz nuget 2.88.4 -SkiaSharp.Skottie nuget 2.88.4 -SkiaSharp.Vulkan.SharpVk nuget 2.88.4 -HarfBuzzSharp nuget 2.8.2.4 -HarfBuzzSharp.NativeAssets.Android nuget 2.8.2.4 -HarfBuzzSharp.NativeAssets.iOS nuget 2.8.2.4 -HarfBuzzSharp.NativeAssets.Linux nuget 2.8.2.4 -HarfBuzzSharp.NativeAssets.MacCatalyst nuget 2.8.2.4 -HarfBuzzSharp.NativeAssets.macOS nuget 2.8.2.4 -HarfBuzzSharp.NativeAssets.Tizen nuget 2.8.2.4 -HarfBuzzSharp.NativeAssets.tvOS nuget 2.8.2.4 -HarfBuzzSharp.NativeAssets.UWP nuget 2.8.2.4 -HarfBuzzSharp.NativeAssets.watchOS nuget 2.8.2.4 -HarfBuzzSharp.NativeAssets.WebAssembly nuget 2.8.2.4 -HarfBuzzSharp.NativeAssets.Win32 nuget 2.8.2.4 +SkiaSharp nuget 2.88.5 +SkiaSharp.NativeAssets.Linux nuget 2.88.5 +SkiaSharp.NativeAssets.Linux.NoDependencies nuget 2.88.5 +SkiaSharp.NativeAssets.NanoServer nuget 2.88.5 +SkiaSharp.NativeAssets.WebAssembly nuget 2.88.5 +SkiaSharp.NativeAssets.Android nuget 2.88.5 +SkiaSharp.NativeAssets.iOS nuget 2.88.5 +SkiaSharp.NativeAssets.MacCatalyst nuget 2.88.5 +SkiaSharp.NativeAssets.macOS nuget 2.88.5 +SkiaSharp.NativeAssets.Tizen nuget 2.88.5 +SkiaSharp.NativeAssets.tvOS nuget 2.88.5 +SkiaSharp.NativeAssets.UWP nuget 2.88.5 +SkiaSharp.NativeAssets.watchOS nuget 2.88.5 +SkiaSharp.NativeAssets.Win32 nuget 2.88.5 +SkiaSharp.Views nuget 2.88.5 +SkiaSharp.Views.Desktop.Common nuget 2.88.5 +SkiaSharp.Views.Gtk2 nuget 2.88.5 +SkiaSharp.Views.Gtk3 nuget 2.88.5 +SkiaSharp.Views.WindowsForms nuget 2.88.5 +SkiaSharp.Views.WPF nuget 2.88.5 +SkiaSharp.Views.Forms nuget 2.88.5 +SkiaSharp.Views.Forms.WPF nuget 2.88.5 +SkiaSharp.Views.Forms.GTK nuget 2.88.5 +SkiaSharp.Views.Uno nuget 2.88.5 +SkiaSharp.Views.Uno.WinUI nuget 2.88.5 +SkiaSharp.Views.WinUI nuget 2.88.5 +SkiaSharp.Views.Maui.Core nuget 2.88.5 +SkiaSharp.Views.Maui.Controls nuget 2.88.5 +SkiaSharp.Views.Maui.Controls.Compatibility nuget 2.88.5 +SkiaSharp.Views.Blazor nuget 2.88.5 +SkiaSharp.HarfBuzz nuget 2.88.5 +SkiaSharp.Skottie nuget 2.88.5 +SkiaSharp.Vulkan.SharpVk nuget 2.88.5 +HarfBuzzSharp nuget 2.8.2.5 +HarfBuzzSharp.NativeAssets.Android nuget 2.8.2.5 +HarfBuzzSharp.NativeAssets.iOS nuget 2.8.2.5 +HarfBuzzSharp.NativeAssets.Linux nuget 2.8.2.5 +HarfBuzzSharp.NativeAssets.MacCatalyst nuget 2.8.2.5 +HarfBuzzSharp.NativeAssets.macOS nuget 2.8.2.5 +HarfBuzzSharp.NativeAssets.Tizen nuget 2.8.2.5 +HarfBuzzSharp.NativeAssets.tvOS nuget 2.8.2.5 +HarfBuzzSharp.NativeAssets.UWP nuget 2.8.2.5 +HarfBuzzSharp.NativeAssets.watchOS nuget 2.8.2.5 +HarfBuzzSharp.NativeAssets.WebAssembly nuget 2.8.2.5 +HarfBuzzSharp.NativeAssets.Win32 nuget 2.8.2.5 # nuget replacement versions Xamarin.Forms nuget 4.8.0.1821 diff --git a/scripts/azure-pipelines-variables.yml b/scripts/azure-pipelines-variables.yml index 42f0463e1f..5b978ba6f4 100644 --- a/scripts/azure-pipelines-variables.yml +++ b/scripts/azure-pipelines-variables.yml @@ -1,12 +1,12 @@ variables: - SKIASHARP_VERSION: 2.88.4 + SKIASHARP_VERSION: 2.88.5 FEATURE_NAME_PREFIX: 'feature/' VERBOSITY: normal GIT_SHA: $(Build.SourceVersion) GIT_BRANCH_NAME: $(Build.SourceBranch) GIT_URL: $(Build.Repository.Uri) FEATURE_NAME: '' - PREVIEW_LABEL: 'preview' + PREVIEW_LABEL: 'preview.1' BUILD_NUMBER: $[counter(format('_{0}_{1}_{2}__', variables['SKIASHARP_VERSION'], variables['Build.SourceBranch'], variables['PREVIEW_LABEL']), 1)] BUILD_COUNTER: $[counter('global_counter', 1)] TIZEN_LINUX_PACKAGES: libxcb-icccm4 libxcb-render-util0 gettext libxcb-image0 libsdl1.2debian libv4l-0 libxcb-randr0 bridge-utils libxcb-shape0 libpython2.7 openvpn From 01e0fcbfe990cd88727ce18878c9e79304f0f351 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 18 Aug 2023 15:08:41 +0200 Subject: [PATCH 03/14] fix(uno): Ensure that the canvas' context is active when rendering (#2559) (#2560) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit d5bcfdf3ef9285891cd264fb9e6b12acd9de3097) Co-authored-by: Jérôme Laban --- .../WasmScripts/SkiaSharp.Views.Uno.Wasm.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.WinUI.Wasm/WasmScripts/SkiaSharp.Views.Uno.Wasm.js b/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.WinUI.Wasm/WasmScripts/SkiaSharp.Views.Uno.Wasm.js index 31627e273c..b7f80f4bd4 100644 --- a/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.WinUI.Wasm/WasmScripts/SkiaSharp.Views.Uno.Wasm.js +++ b/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.WinUI.Wasm/WasmScripts/SkiaSharp.Views.Uno.Wasm.js @@ -106,6 +106,9 @@ this.currentRequest = window.requestAnimationFrame(() => { if (this.requestRender) { + // make current for this canvas instance + GL.makeContextCurrent(this.glCtx); + this.requestRender(); } @@ -178,12 +181,12 @@ throw `No with id ${canvasOrCanvasId} was found`; } - var ctx = SKSwapChainPanel.createWebGLContext(canvas); - if (!ctx || ctx < 0) + this.glCtx = SKSwapChainPanel.createWebGLContext(canvas); + if (!this.glCtx || this.glCtx < 0) throw `Failed to create WebGL context: err ${ctx}`; // make current - GL.makeContextCurrent(ctx); + GL.makeContextCurrent(this.glCtx); // Starting from .NET 7 the GLctx is defined in an inaccessible scope // when the current GL context changes. We need to pick it up from the @@ -196,7 +199,7 @@ // read values this.canvas = canvas; return { - ctx: ctx, + ctx: this.glCtx, fbo: currentGLctx.getParameter(currentGLctx.FRAMEBUFFER_BINDING), stencil: currentGLctx.getParameter(currentGLctx.STENCIL_BITS), sample: 0, // TODO: currentGLctx.getParameter(GLctx.SAMPLES) From 83ef108ab984065c6f33018b4a5c051e152bc9be Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 19 Aug 2023 11:00:07 +0200 Subject: [PATCH 04/14] fix(skxamlcanvas): [Wasm] Don't fail when the canvas can't be found (#2563) (#2564) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 7f9951d108d137e0fb43948065896ed7729d795e) Co-authored-by: Jérôme Laban --- .../WasmScripts/SkiaSharp.Views.Uno.Wasm.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.WinUI.Wasm/WasmScripts/SkiaSharp.Views.Uno.Wasm.js b/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.WinUI.Wasm/WasmScripts/SkiaSharp.Views.Uno.Wasm.js index b7f80f4bd4..8bb78cd85c 100644 --- a/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.WinUI.Wasm/WasmScripts/SkiaSharp.Views.Uno.Wasm.js +++ b/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.WinUI.Wasm/WasmScripts/SkiaSharp.Views.Uno.Wasm.js @@ -10,6 +10,11 @@ static invalidateCanvas(pData, canvasId, width, height) { var htmlCanvas = document.getElementById(canvasId); + + if (!htmlCanvas) { + return false; + } + htmlCanvas.width = width; htmlCanvas.height = height; From 1198bef8431d26081226e5d6e5b58d9ad0cd3505 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 22 Aug 2023 08:05:59 +0800 Subject: [PATCH 05/14] Floor outwards when converting to SKRectI (#2568) (#2574) Truncation will chop off parts, and this will lose value. Flooring outwards ensure that the size touches the edge of the containing rect. This is useful that any partial overhang with integer sizes can be clipped when drawing. (cherry picked from commit 8fd4dc535aac99f6efda5e8edcf64b793d012fdc) Co-authored-by: Matthew Leibowitz --- binding/Binding/MathTypes.cs | 4 +- tests/Tests/SKBasicTypesTest.cs | 114 ++++++++++++++++++++------------ 2 files changed, 73 insertions(+), 45 deletions(-) diff --git a/binding/Binding/MathTypes.cs b/binding/Binding/MathTypes.cs index 74f51a7fb5..d1efe92f88 100644 --- a/binding/Binding/MathTypes.cs +++ b/binding/Binding/MathTypes.cs @@ -549,10 +549,10 @@ public readonly SKRectI Standardized { } public readonly SKRectI AspectFit (SKSizeI size) => - Truncate (((SKRect)this).AspectFit (size)); + Floor (((SKRect)this).AspectFit (size)); public readonly SKRectI AspectFill (SKSizeI size) => - Truncate (((SKRect)this).AspectFill (size)); + Floor (((SKRect)this).AspectFill (size)); public static SKRectI Ceiling (SKRect value) => Ceiling (value, false); diff --git a/tests/Tests/SKBasicTypesTest.cs b/tests/Tests/SKBasicTypesTest.cs index bfdc243ec8..216c6f36d4 100644 --- a/tests/Tests/SKBasicTypesTest.cs +++ b/tests/Tests/SKBasicTypesTest.cs @@ -5,10 +5,10 @@ namespace SkiaSharp.Tests { - public class SKBasicTypesTest : SKTest + public class SKImageInfoTest : SKTest { [SkippableFact] - public void ImageInfoMethodsDoNotModifySource() + public void MethodsDoNotModifySource() { var info = new SKImageInfo(100, 30, SKColorType.Rgb565, SKAlphaType.Unpremul); @@ -19,9 +19,12 @@ public void ImageInfoMethodsDoNotModifySource() Assert.Equal(SKColorType.Rgb565, info.ColorType); Assert.Equal(SKColorType.Gray8, copy.ColorType); } + } + public class SKRectTest : SKTest + { [SkippableFact] - public void RectangleHasCorrectProperties() + public void HasCorrectProperties() { var rect = new SKRect(15, 25, 55, 75); @@ -38,7 +41,7 @@ public void RectangleHasCorrectProperties() } [SkippableFact] - public void RectangleOffsetsCorrectly() + public void OffsetsCorrectly() { var expected = new SKRect(25, 30, 65, 80); @@ -53,7 +56,7 @@ public void RectangleOffsetsCorrectly() } [SkippableFact] - public void RectangleInflatesCorrectly() + public void InflatesCorrectly() { var rect = new SKRect(15, 25, 55, 75); @@ -71,7 +74,7 @@ public void RectangleInflatesCorrectly() } [SkippableFact] - public void RectangleStandardizeCorrectly() + public void StandardizeCorrectly() { var rect = new SKRect(5, 5, 15, 15); Assert.Equal(10, rect.Width); @@ -95,48 +98,73 @@ public void RectangleStandardizeCorrectly() Assert.Equal(rect, negWH.Standardized); } - [SkippableFact] - public void RectangleAspectFitIsCorrect() + [SkippableTheory] + [InlineData(/*frame:*/ 5, 5, 20, 20, /*size:*/ 5, 10, /*result:*/ 5 + 5, 5 + 0, 10, 20)] // tall image in a square frame + [InlineData(/*frame:*/ 5, 5, 20, 20, /*size:*/ 10, 5, /*result:*/ 5 + 0, 5 + 5, 20, 10)] // wide image in a square frame + public void AspectFitIsCorrect(float rX, float rY, float rW, float rH, float sW, float sH, float eX, float eY, float eW, float eH) { - var bigRect = SKRect.Create(5, 5, 20, 20); - var tallSize = new SKSize(5, 10); - var wideSize = new SKSize(10, 5); - - var fitTall = bigRect.AspectFit(tallSize); - Assert.Equal(5 + 5, fitTall.Left); - Assert.Equal(5 + 0, fitTall.Top); - Assert.Equal(10, fitTall.Width); - Assert.Equal(20, fitTall.Height); - - var fitWide = bigRect.AspectFit(wideSize); - Assert.Equal(5 + 0, fitWide.Left); - Assert.Equal(5 + 5, fitWide.Top); - Assert.Equal(20, fitWide.Width); - Assert.Equal(10, fitWide.Height); + var expected = SKRect.Create(eX, eY, eW, eH); + + var bigRect = SKRect.Create(rX, rY, rW, rH); + var imageSize = new SKSize(sW, sH); + + var fit = bigRect.AspectFit(imageSize); + + Assert.Equal(expected, fit); } - [SkippableFact] - public void RectangleAspectFillIsCorrect() + [SkippableTheory] + [InlineData(/*frame:*/ 5, 5, 20, 20, /*size:*/ 5, 10, /*result:*/ 5 + 0, 5 - 10, 20, 40)] // tall image in a square frame + [InlineData(/*frame:*/ 5, 5, 20, 20, /*size:*/ 10, 5, /*result:*/ 5 - 10, 5 + 0, 40, 20)] // wide image in a square frame + [InlineData(/*frame:*/ 0, 0, 1024, 767, /*size:*/ 1024, 1024, /*result:*/ 0, -128.5f, 1024, 1024)] // #2562 + public void AspectFillIsCorrect(float rX, float rY, float rW, float rH, float sW, float sH, float eX, float eY, float eW, float eH) + { + var expected = SKRect.Create(eX, eY, eW, eH); + + var bigRect = SKRect.Create(rX, rY, rW, rH); + var imageSize = new SKSize(sW, sH); + + var fit = bigRect.AspectFill(imageSize); + + Assert.Equal(expected, fit); + } + } + + public class SKRectITest : SKTest + { + [SkippableTheory] + [InlineData(/*frame:*/ 5, 5, 20, 20, /*size:*/ 5, 10, /*result:*/ 5 + 5, 5 + 0, 10, 20)] // tall image in a square frame + [InlineData(/*frame:*/ 5, 5, 20, 20, /*size:*/ 10, 5, /*result:*/ 5 + 0, 5 + 5, 20, 10)] // wide image in a square frame + public void AspectFitIsCorrect(int rX, int rY, int rW, int rH, int sW, int sH, int eX, int eY, int eW, int eH) + { + var expected = SKRectI.Create(eX, eY, eW, eH); + + var bigRect = SKRectI.Create(rX, rY, rW, rH); + var imageSize = new SKSizeI(sW, sH); + + var fit = bigRect.AspectFit(imageSize); + + Assert.Equal(expected, fit); + } + + [SkippableTheory] + [InlineData(/*frame:*/ 5, 5, 20, 20, /*size:*/ 5, 10, /*result:*/ 5 + 0, 5 - 10, 20, 40)] // tall image in a square frame + [InlineData(/*frame:*/ 5, 5, 20, 20, /*size:*/ 10, 5, /*result:*/ 5 - 10, 5 + 0, 40, 20)] // wide image in a square frame + [InlineData(/*frame:*/ 0, 0, 1024, 767, /*size:*/ 1024, 1024, /*result:*/ 0, -129f, 1024, 1024)] // #2562 + public void AspectFillIsCorrect(int rX, int rY, int rW, int rH, int sW, int sH, int eX, int eY, int eW, int eH) { - var bigRect = SKRect.Create(5, 5, 20, 20); - var tallSize = new SKSize(5, 10); - var wideSize = new SKSize(10, 5); - - var fitTall = bigRect.AspectFill(tallSize); - Assert.Equal(5 + 0, fitTall.Left); - Assert.Equal(5 - 10, fitTall.Top); - Assert.Equal(20, fitTall.Width); - Assert.Equal(40, fitTall.Height); - - var fitWide = bigRect.AspectFill(wideSize); - Assert.Equal(5 - 10, fitWide.Left); - Assert.Equal(5 + 0, fitWide.Top); - Assert.Equal(40, fitWide.Width); - Assert.Equal(20, fitWide.Height); + var expected = SKRectI.Create(eX, eY, eW, eH); + + var bigRect = SKRectI.Create(rX, rY, rW, rH); + var imageSize = new SKSizeI(sW, sH); + + var fit = bigRect.AspectFill(imageSize); + + Assert.Equal(expected, fit); } [SkippableFact] - public void SKRectICeilingWorksAsExpected() + public void CeilingWorksAsExpected() { Assert.Equal(new SKRectI(6, 6, 21, 21), SKRectI.Ceiling(new SKRect(5.5f, 5.5f, 20.5f, 20.5f))); Assert.Equal(new SKRectI(5, 5, 21, 21), SKRectI.Ceiling(new SKRect(5.5f, 5.5f, 20.5f, 20.5f), true)); @@ -147,7 +175,7 @@ public void SKRectICeilingWorksAsExpected() } [SkippableFact] - public void SKRectIFloorWorksAsExpected() + public void FloorWorksAsExpected() { Assert.Equal(new SKRectI(5, 5, 20, 20), SKRectI.Floor(new SKRect(5.5f, 5.5f, 20.5f, 20.5f))); Assert.Equal(new SKRectI(6, 6, 20, 20), SKRectI.Floor(new SKRect(5.5f, 5.5f, 20.5f, 20.5f), true)); @@ -158,7 +186,7 @@ public void SKRectIFloorWorksAsExpected() } [SkippableFact] - public void SKRectIRoundWorksAsExpected() + public void RoundWorksAsExpected() { Assert.Equal(new SKRectI(6, 6, 21, 21), SKRectI.Round(new SKRect(5.51f, 5.51f, 20.51f, 20.51f))); Assert.Equal(new SKRectI(5, 6, 20, 21), SKRectI.Round(new SKRect(5.41f, 5.61f, 20.41f, 20.61f))); From 1f58bb6371de4158cbdd6e9eee67fc6395c8732a Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Tue, 22 Aug 2023 20:03:21 +0200 Subject: [PATCH 06/14] Bump the SkiaSharp versions --- VERSIONS.txt | 94 +++++++++++++-------------- scripts/azure-pipelines-variables.yml | 2 +- 2 files changed, 48 insertions(+), 48 deletions(-) diff --git a/VERSIONS.txt b/VERSIONS.txt index 4092c65f3d..743048fef4 100644 --- a/VERSIONS.txt +++ b/VERSIONS.txt @@ -45,58 +45,58 @@ HarfBuzz soname 0.20802.0 # SkiaSharp.dll SkiaSharp assembly 2.88.0.0 -SkiaSharp file 2.88.5.0 +SkiaSharp file 2.88.6.0 # HarfBuzzSharp.dll HarfBuzzSharp assembly 1.0.0.0 -HarfBuzzSharp file 2.8.2.5 +HarfBuzzSharp file 2.8.2.6 # nuget versions -SkiaSharp nuget 2.88.5 -SkiaSharp.NativeAssets.Linux nuget 2.88.5 -SkiaSharp.NativeAssets.Linux.NoDependencies nuget 2.88.5 -SkiaSharp.NativeAssets.NanoServer nuget 2.88.5 -SkiaSharp.NativeAssets.WebAssembly nuget 2.88.5 -SkiaSharp.NativeAssets.Android nuget 2.88.5 -SkiaSharp.NativeAssets.iOS nuget 2.88.5 -SkiaSharp.NativeAssets.MacCatalyst nuget 2.88.5 -SkiaSharp.NativeAssets.macOS nuget 2.88.5 -SkiaSharp.NativeAssets.Tizen nuget 2.88.5 -SkiaSharp.NativeAssets.tvOS nuget 2.88.5 -SkiaSharp.NativeAssets.UWP nuget 2.88.5 -SkiaSharp.NativeAssets.watchOS nuget 2.88.5 -SkiaSharp.NativeAssets.Win32 nuget 2.88.5 -SkiaSharp.Views nuget 2.88.5 -SkiaSharp.Views.Desktop.Common nuget 2.88.5 -SkiaSharp.Views.Gtk2 nuget 2.88.5 -SkiaSharp.Views.Gtk3 nuget 2.88.5 -SkiaSharp.Views.WindowsForms nuget 2.88.5 -SkiaSharp.Views.WPF nuget 2.88.5 -SkiaSharp.Views.Forms nuget 2.88.5 -SkiaSharp.Views.Forms.WPF nuget 2.88.5 -SkiaSharp.Views.Forms.GTK nuget 2.88.5 -SkiaSharp.Views.Uno nuget 2.88.5 -SkiaSharp.Views.Uno.WinUI nuget 2.88.5 -SkiaSharp.Views.WinUI nuget 2.88.5 -SkiaSharp.Views.Maui.Core nuget 2.88.5 -SkiaSharp.Views.Maui.Controls nuget 2.88.5 -SkiaSharp.Views.Maui.Controls.Compatibility nuget 2.88.5 -SkiaSharp.Views.Blazor nuget 2.88.5 -SkiaSharp.HarfBuzz nuget 2.88.5 -SkiaSharp.Skottie nuget 2.88.5 -SkiaSharp.Vulkan.SharpVk nuget 2.88.5 -HarfBuzzSharp nuget 2.8.2.5 -HarfBuzzSharp.NativeAssets.Android nuget 2.8.2.5 -HarfBuzzSharp.NativeAssets.iOS nuget 2.8.2.5 -HarfBuzzSharp.NativeAssets.Linux nuget 2.8.2.5 -HarfBuzzSharp.NativeAssets.MacCatalyst nuget 2.8.2.5 -HarfBuzzSharp.NativeAssets.macOS nuget 2.8.2.5 -HarfBuzzSharp.NativeAssets.Tizen nuget 2.8.2.5 -HarfBuzzSharp.NativeAssets.tvOS nuget 2.8.2.5 -HarfBuzzSharp.NativeAssets.UWP nuget 2.8.2.5 -HarfBuzzSharp.NativeAssets.watchOS nuget 2.8.2.5 -HarfBuzzSharp.NativeAssets.WebAssembly nuget 2.8.2.5 -HarfBuzzSharp.NativeAssets.Win32 nuget 2.8.2.5 +SkiaSharp nuget 2.88.6 +SkiaSharp.NativeAssets.Linux nuget 2.88.6 +SkiaSharp.NativeAssets.Linux.NoDependencies nuget 2.88.6 +SkiaSharp.NativeAssets.NanoServer nuget 2.88.6 +SkiaSharp.NativeAssets.WebAssembly nuget 2.88.6 +SkiaSharp.NativeAssets.Android nuget 2.88.6 +SkiaSharp.NativeAssets.iOS nuget 2.88.6 +SkiaSharp.NativeAssets.MacCatalyst nuget 2.88.6 +SkiaSharp.NativeAssets.macOS nuget 2.88.6 +SkiaSharp.NativeAssets.Tizen nuget 2.88.6 +SkiaSharp.NativeAssets.tvOS nuget 2.88.6 +SkiaSharp.NativeAssets.UWP nuget 2.88.6 +SkiaSharp.NativeAssets.watchOS nuget 2.88.6 +SkiaSharp.NativeAssets.Win32 nuget 2.88.6 +SkiaSharp.Views nuget 2.88.6 +SkiaSharp.Views.Desktop.Common nuget 2.88.6 +SkiaSharp.Views.Gtk2 nuget 2.88.6 +SkiaSharp.Views.Gtk3 nuget 2.88.6 +SkiaSharp.Views.WindowsForms nuget 2.88.6 +SkiaSharp.Views.WPF nuget 2.88.6 +SkiaSharp.Views.Forms nuget 2.88.6 +SkiaSharp.Views.Forms.WPF nuget 2.88.6 +SkiaSharp.Views.Forms.GTK nuget 2.88.6 +SkiaSharp.Views.Uno nuget 2.88.6 +SkiaSharp.Views.Uno.WinUI nuget 2.88.6 +SkiaSharp.Views.WinUI nuget 2.88.6 +SkiaSharp.Views.Maui.Core nuget 2.88.6 +SkiaSharp.Views.Maui.Controls nuget 2.88.6 +SkiaSharp.Views.Maui.Controls.Compatibility nuget 2.88.6 +SkiaSharp.Views.Blazor nuget 2.88.6 +SkiaSharp.HarfBuzz nuget 2.88.6 +SkiaSharp.Skottie nuget 2.88.6 +SkiaSharp.Vulkan.SharpVk nuget 2.88.6 +HarfBuzzSharp nuget 2.8.2.6 +HarfBuzzSharp.NativeAssets.Android nuget 2.8.2.6 +HarfBuzzSharp.NativeAssets.iOS nuget 2.8.2.6 +HarfBuzzSharp.NativeAssets.Linux nuget 2.8.2.6 +HarfBuzzSharp.NativeAssets.MacCatalyst nuget 2.8.2.6 +HarfBuzzSharp.NativeAssets.macOS nuget 2.8.2.6 +HarfBuzzSharp.NativeAssets.Tizen nuget 2.8.2.6 +HarfBuzzSharp.NativeAssets.tvOS nuget 2.8.2.6 +HarfBuzzSharp.NativeAssets.UWP nuget 2.8.2.6 +HarfBuzzSharp.NativeAssets.watchOS nuget 2.8.2.6 +HarfBuzzSharp.NativeAssets.WebAssembly nuget 2.8.2.6 +HarfBuzzSharp.NativeAssets.Win32 nuget 2.8.2.6 # nuget replacement versions Xamarin.Forms nuget 4.8.0.1821 diff --git a/scripts/azure-pipelines-variables.yml b/scripts/azure-pipelines-variables.yml index 5b978ba6f4..881e4ec579 100644 --- a/scripts/azure-pipelines-variables.yml +++ b/scripts/azure-pipelines-variables.yml @@ -1,5 +1,5 @@ variables: - SKIASHARP_VERSION: 2.88.5 + SKIASHARP_VERSION: 2.88.6 FEATURE_NAME_PREFIX: 'feature/' VERBOSITY: normal GIT_SHA: $(Build.SourceVersion) From ce7dc3e9cc12e85557c2c4f5fdcbe820a0e22eaa Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Tue, 22 Aug 2023 20:10:23 +0200 Subject: [PATCH 07/14] Revert "Bump the SkiaSharp versions" This reverts commit 1f58bb6371de4158cbdd6e9eee67fc6395c8732a. --- VERSIONS.txt | 94 +++++++++++++-------------- scripts/azure-pipelines-variables.yml | 2 +- 2 files changed, 48 insertions(+), 48 deletions(-) diff --git a/VERSIONS.txt b/VERSIONS.txt index 743048fef4..4092c65f3d 100644 --- a/VERSIONS.txt +++ b/VERSIONS.txt @@ -45,58 +45,58 @@ HarfBuzz soname 0.20802.0 # SkiaSharp.dll SkiaSharp assembly 2.88.0.0 -SkiaSharp file 2.88.6.0 +SkiaSharp file 2.88.5.0 # HarfBuzzSharp.dll HarfBuzzSharp assembly 1.0.0.0 -HarfBuzzSharp file 2.8.2.6 +HarfBuzzSharp file 2.8.2.5 # nuget versions -SkiaSharp nuget 2.88.6 -SkiaSharp.NativeAssets.Linux nuget 2.88.6 -SkiaSharp.NativeAssets.Linux.NoDependencies nuget 2.88.6 -SkiaSharp.NativeAssets.NanoServer nuget 2.88.6 -SkiaSharp.NativeAssets.WebAssembly nuget 2.88.6 -SkiaSharp.NativeAssets.Android nuget 2.88.6 -SkiaSharp.NativeAssets.iOS nuget 2.88.6 -SkiaSharp.NativeAssets.MacCatalyst nuget 2.88.6 -SkiaSharp.NativeAssets.macOS nuget 2.88.6 -SkiaSharp.NativeAssets.Tizen nuget 2.88.6 -SkiaSharp.NativeAssets.tvOS nuget 2.88.6 -SkiaSharp.NativeAssets.UWP nuget 2.88.6 -SkiaSharp.NativeAssets.watchOS nuget 2.88.6 -SkiaSharp.NativeAssets.Win32 nuget 2.88.6 -SkiaSharp.Views nuget 2.88.6 -SkiaSharp.Views.Desktop.Common nuget 2.88.6 -SkiaSharp.Views.Gtk2 nuget 2.88.6 -SkiaSharp.Views.Gtk3 nuget 2.88.6 -SkiaSharp.Views.WindowsForms nuget 2.88.6 -SkiaSharp.Views.WPF nuget 2.88.6 -SkiaSharp.Views.Forms nuget 2.88.6 -SkiaSharp.Views.Forms.WPF nuget 2.88.6 -SkiaSharp.Views.Forms.GTK nuget 2.88.6 -SkiaSharp.Views.Uno nuget 2.88.6 -SkiaSharp.Views.Uno.WinUI nuget 2.88.6 -SkiaSharp.Views.WinUI nuget 2.88.6 -SkiaSharp.Views.Maui.Core nuget 2.88.6 -SkiaSharp.Views.Maui.Controls nuget 2.88.6 -SkiaSharp.Views.Maui.Controls.Compatibility nuget 2.88.6 -SkiaSharp.Views.Blazor nuget 2.88.6 -SkiaSharp.HarfBuzz nuget 2.88.6 -SkiaSharp.Skottie nuget 2.88.6 -SkiaSharp.Vulkan.SharpVk nuget 2.88.6 -HarfBuzzSharp nuget 2.8.2.6 -HarfBuzzSharp.NativeAssets.Android nuget 2.8.2.6 -HarfBuzzSharp.NativeAssets.iOS nuget 2.8.2.6 -HarfBuzzSharp.NativeAssets.Linux nuget 2.8.2.6 -HarfBuzzSharp.NativeAssets.MacCatalyst nuget 2.8.2.6 -HarfBuzzSharp.NativeAssets.macOS nuget 2.8.2.6 -HarfBuzzSharp.NativeAssets.Tizen nuget 2.8.2.6 -HarfBuzzSharp.NativeAssets.tvOS nuget 2.8.2.6 -HarfBuzzSharp.NativeAssets.UWP nuget 2.8.2.6 -HarfBuzzSharp.NativeAssets.watchOS nuget 2.8.2.6 -HarfBuzzSharp.NativeAssets.WebAssembly nuget 2.8.2.6 -HarfBuzzSharp.NativeAssets.Win32 nuget 2.8.2.6 +SkiaSharp nuget 2.88.5 +SkiaSharp.NativeAssets.Linux nuget 2.88.5 +SkiaSharp.NativeAssets.Linux.NoDependencies nuget 2.88.5 +SkiaSharp.NativeAssets.NanoServer nuget 2.88.5 +SkiaSharp.NativeAssets.WebAssembly nuget 2.88.5 +SkiaSharp.NativeAssets.Android nuget 2.88.5 +SkiaSharp.NativeAssets.iOS nuget 2.88.5 +SkiaSharp.NativeAssets.MacCatalyst nuget 2.88.5 +SkiaSharp.NativeAssets.macOS nuget 2.88.5 +SkiaSharp.NativeAssets.Tizen nuget 2.88.5 +SkiaSharp.NativeAssets.tvOS nuget 2.88.5 +SkiaSharp.NativeAssets.UWP nuget 2.88.5 +SkiaSharp.NativeAssets.watchOS nuget 2.88.5 +SkiaSharp.NativeAssets.Win32 nuget 2.88.5 +SkiaSharp.Views nuget 2.88.5 +SkiaSharp.Views.Desktop.Common nuget 2.88.5 +SkiaSharp.Views.Gtk2 nuget 2.88.5 +SkiaSharp.Views.Gtk3 nuget 2.88.5 +SkiaSharp.Views.WindowsForms nuget 2.88.5 +SkiaSharp.Views.WPF nuget 2.88.5 +SkiaSharp.Views.Forms nuget 2.88.5 +SkiaSharp.Views.Forms.WPF nuget 2.88.5 +SkiaSharp.Views.Forms.GTK nuget 2.88.5 +SkiaSharp.Views.Uno nuget 2.88.5 +SkiaSharp.Views.Uno.WinUI nuget 2.88.5 +SkiaSharp.Views.WinUI nuget 2.88.5 +SkiaSharp.Views.Maui.Core nuget 2.88.5 +SkiaSharp.Views.Maui.Controls nuget 2.88.5 +SkiaSharp.Views.Maui.Controls.Compatibility nuget 2.88.5 +SkiaSharp.Views.Blazor nuget 2.88.5 +SkiaSharp.HarfBuzz nuget 2.88.5 +SkiaSharp.Skottie nuget 2.88.5 +SkiaSharp.Vulkan.SharpVk nuget 2.88.5 +HarfBuzzSharp nuget 2.8.2.5 +HarfBuzzSharp.NativeAssets.Android nuget 2.8.2.5 +HarfBuzzSharp.NativeAssets.iOS nuget 2.8.2.5 +HarfBuzzSharp.NativeAssets.Linux nuget 2.8.2.5 +HarfBuzzSharp.NativeAssets.MacCatalyst nuget 2.8.2.5 +HarfBuzzSharp.NativeAssets.macOS nuget 2.8.2.5 +HarfBuzzSharp.NativeAssets.Tizen nuget 2.8.2.5 +HarfBuzzSharp.NativeAssets.tvOS nuget 2.8.2.5 +HarfBuzzSharp.NativeAssets.UWP nuget 2.8.2.5 +HarfBuzzSharp.NativeAssets.watchOS nuget 2.8.2.5 +HarfBuzzSharp.NativeAssets.WebAssembly nuget 2.8.2.5 +HarfBuzzSharp.NativeAssets.Win32 nuget 2.8.2.5 # nuget replacement versions Xamarin.Forms nuget 4.8.0.1821 diff --git a/scripts/azure-pipelines-variables.yml b/scripts/azure-pipelines-variables.yml index 881e4ec579..5b978ba6f4 100644 --- a/scripts/azure-pipelines-variables.yml +++ b/scripts/azure-pipelines-variables.yml @@ -1,5 +1,5 @@ variables: - SKIASHARP_VERSION: 2.88.6 + SKIASHARP_VERSION: 2.88.5 FEATURE_NAME_PREFIX: 'feature/' VERBOSITY: normal GIT_SHA: $(Build.SourceVersion) From debf49dbea4e27099906c9800d3d68f425dc81df Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Tue, 22 Aug 2023 20:10:56 +0200 Subject: [PATCH 08/14] Bump the SkiaSharp preview number to 2 --- scripts/azure-pipelines-variables.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/azure-pipelines-variables.yml b/scripts/azure-pipelines-variables.yml index 5b978ba6f4..130a2f6750 100644 --- a/scripts/azure-pipelines-variables.yml +++ b/scripts/azure-pipelines-variables.yml @@ -6,7 +6,7 @@ variables: GIT_BRANCH_NAME: $(Build.SourceBranch) GIT_URL: $(Build.Repository.Uri) FEATURE_NAME: '' - PREVIEW_LABEL: 'preview.1' + PREVIEW_LABEL: 'preview.2' BUILD_NUMBER: $[counter(format('_{0}_{1}_{2}__', variables['SKIASHARP_VERSION'], variables['Build.SourceBranch'], variables['PREVIEW_LABEL']), 1)] BUILD_COUNTER: $[counter('global_counter', 1)] TIZEN_LINUX_PACKAGES: libxcb-icccm4 libxcb-render-util0 gettext libxcb-image0 libsdl1.2debian libv4l-0 libxcb-randr0 bridge-utils libxcb-shape0 libpython2.7 openvpn From eeff8ede7ff225d7b4de86181f86a74bbf793219 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Tue, 22 Aug 2023 20:03:21 +0200 Subject: [PATCH 09/14] Bump the SkiaSharp versions --- VERSIONS.txt | 94 +++++++++++++-------------- scripts/azure-pipelines-variables.yml | 4 +- 2 files changed, 49 insertions(+), 49 deletions(-) diff --git a/VERSIONS.txt b/VERSIONS.txt index 4092c65f3d..743048fef4 100644 --- a/VERSIONS.txt +++ b/VERSIONS.txt @@ -45,58 +45,58 @@ HarfBuzz soname 0.20802.0 # SkiaSharp.dll SkiaSharp assembly 2.88.0.0 -SkiaSharp file 2.88.5.0 +SkiaSharp file 2.88.6.0 # HarfBuzzSharp.dll HarfBuzzSharp assembly 1.0.0.0 -HarfBuzzSharp file 2.8.2.5 +HarfBuzzSharp file 2.8.2.6 # nuget versions -SkiaSharp nuget 2.88.5 -SkiaSharp.NativeAssets.Linux nuget 2.88.5 -SkiaSharp.NativeAssets.Linux.NoDependencies nuget 2.88.5 -SkiaSharp.NativeAssets.NanoServer nuget 2.88.5 -SkiaSharp.NativeAssets.WebAssembly nuget 2.88.5 -SkiaSharp.NativeAssets.Android nuget 2.88.5 -SkiaSharp.NativeAssets.iOS nuget 2.88.5 -SkiaSharp.NativeAssets.MacCatalyst nuget 2.88.5 -SkiaSharp.NativeAssets.macOS nuget 2.88.5 -SkiaSharp.NativeAssets.Tizen nuget 2.88.5 -SkiaSharp.NativeAssets.tvOS nuget 2.88.5 -SkiaSharp.NativeAssets.UWP nuget 2.88.5 -SkiaSharp.NativeAssets.watchOS nuget 2.88.5 -SkiaSharp.NativeAssets.Win32 nuget 2.88.5 -SkiaSharp.Views nuget 2.88.5 -SkiaSharp.Views.Desktop.Common nuget 2.88.5 -SkiaSharp.Views.Gtk2 nuget 2.88.5 -SkiaSharp.Views.Gtk3 nuget 2.88.5 -SkiaSharp.Views.WindowsForms nuget 2.88.5 -SkiaSharp.Views.WPF nuget 2.88.5 -SkiaSharp.Views.Forms nuget 2.88.5 -SkiaSharp.Views.Forms.WPF nuget 2.88.5 -SkiaSharp.Views.Forms.GTK nuget 2.88.5 -SkiaSharp.Views.Uno nuget 2.88.5 -SkiaSharp.Views.Uno.WinUI nuget 2.88.5 -SkiaSharp.Views.WinUI nuget 2.88.5 -SkiaSharp.Views.Maui.Core nuget 2.88.5 -SkiaSharp.Views.Maui.Controls nuget 2.88.5 -SkiaSharp.Views.Maui.Controls.Compatibility nuget 2.88.5 -SkiaSharp.Views.Blazor nuget 2.88.5 -SkiaSharp.HarfBuzz nuget 2.88.5 -SkiaSharp.Skottie nuget 2.88.5 -SkiaSharp.Vulkan.SharpVk nuget 2.88.5 -HarfBuzzSharp nuget 2.8.2.5 -HarfBuzzSharp.NativeAssets.Android nuget 2.8.2.5 -HarfBuzzSharp.NativeAssets.iOS nuget 2.8.2.5 -HarfBuzzSharp.NativeAssets.Linux nuget 2.8.2.5 -HarfBuzzSharp.NativeAssets.MacCatalyst nuget 2.8.2.5 -HarfBuzzSharp.NativeAssets.macOS nuget 2.8.2.5 -HarfBuzzSharp.NativeAssets.Tizen nuget 2.8.2.5 -HarfBuzzSharp.NativeAssets.tvOS nuget 2.8.2.5 -HarfBuzzSharp.NativeAssets.UWP nuget 2.8.2.5 -HarfBuzzSharp.NativeAssets.watchOS nuget 2.8.2.5 -HarfBuzzSharp.NativeAssets.WebAssembly nuget 2.8.2.5 -HarfBuzzSharp.NativeAssets.Win32 nuget 2.8.2.5 +SkiaSharp nuget 2.88.6 +SkiaSharp.NativeAssets.Linux nuget 2.88.6 +SkiaSharp.NativeAssets.Linux.NoDependencies nuget 2.88.6 +SkiaSharp.NativeAssets.NanoServer nuget 2.88.6 +SkiaSharp.NativeAssets.WebAssembly nuget 2.88.6 +SkiaSharp.NativeAssets.Android nuget 2.88.6 +SkiaSharp.NativeAssets.iOS nuget 2.88.6 +SkiaSharp.NativeAssets.MacCatalyst nuget 2.88.6 +SkiaSharp.NativeAssets.macOS nuget 2.88.6 +SkiaSharp.NativeAssets.Tizen nuget 2.88.6 +SkiaSharp.NativeAssets.tvOS nuget 2.88.6 +SkiaSharp.NativeAssets.UWP nuget 2.88.6 +SkiaSharp.NativeAssets.watchOS nuget 2.88.6 +SkiaSharp.NativeAssets.Win32 nuget 2.88.6 +SkiaSharp.Views nuget 2.88.6 +SkiaSharp.Views.Desktop.Common nuget 2.88.6 +SkiaSharp.Views.Gtk2 nuget 2.88.6 +SkiaSharp.Views.Gtk3 nuget 2.88.6 +SkiaSharp.Views.WindowsForms nuget 2.88.6 +SkiaSharp.Views.WPF nuget 2.88.6 +SkiaSharp.Views.Forms nuget 2.88.6 +SkiaSharp.Views.Forms.WPF nuget 2.88.6 +SkiaSharp.Views.Forms.GTK nuget 2.88.6 +SkiaSharp.Views.Uno nuget 2.88.6 +SkiaSharp.Views.Uno.WinUI nuget 2.88.6 +SkiaSharp.Views.WinUI nuget 2.88.6 +SkiaSharp.Views.Maui.Core nuget 2.88.6 +SkiaSharp.Views.Maui.Controls nuget 2.88.6 +SkiaSharp.Views.Maui.Controls.Compatibility nuget 2.88.6 +SkiaSharp.Views.Blazor nuget 2.88.6 +SkiaSharp.HarfBuzz nuget 2.88.6 +SkiaSharp.Skottie nuget 2.88.6 +SkiaSharp.Vulkan.SharpVk nuget 2.88.6 +HarfBuzzSharp nuget 2.8.2.6 +HarfBuzzSharp.NativeAssets.Android nuget 2.8.2.6 +HarfBuzzSharp.NativeAssets.iOS nuget 2.8.2.6 +HarfBuzzSharp.NativeAssets.Linux nuget 2.8.2.6 +HarfBuzzSharp.NativeAssets.MacCatalyst nuget 2.8.2.6 +HarfBuzzSharp.NativeAssets.macOS nuget 2.8.2.6 +HarfBuzzSharp.NativeAssets.Tizen nuget 2.8.2.6 +HarfBuzzSharp.NativeAssets.tvOS nuget 2.8.2.6 +HarfBuzzSharp.NativeAssets.UWP nuget 2.8.2.6 +HarfBuzzSharp.NativeAssets.watchOS nuget 2.8.2.6 +HarfBuzzSharp.NativeAssets.WebAssembly nuget 2.8.2.6 +HarfBuzzSharp.NativeAssets.Win32 nuget 2.8.2.6 # nuget replacement versions Xamarin.Forms nuget 4.8.0.1821 diff --git a/scripts/azure-pipelines-variables.yml b/scripts/azure-pipelines-variables.yml index 130a2f6750..881e4ec579 100644 --- a/scripts/azure-pipelines-variables.yml +++ b/scripts/azure-pipelines-variables.yml @@ -1,12 +1,12 @@ variables: - SKIASHARP_VERSION: 2.88.5 + SKIASHARP_VERSION: 2.88.6 FEATURE_NAME_PREFIX: 'feature/' VERBOSITY: normal GIT_SHA: $(Build.SourceVersion) GIT_BRANCH_NAME: $(Build.SourceBranch) GIT_URL: $(Build.Repository.Uri) FEATURE_NAME: '' - PREVIEW_LABEL: 'preview.2' + PREVIEW_LABEL: 'preview.1' BUILD_NUMBER: $[counter(format('_{0}_{1}_{2}__', variables['SKIASHARP_VERSION'], variables['Build.SourceBranch'], variables['PREVIEW_LABEL']), 1)] BUILD_COUNTER: $[counter('global_counter', 1)] TIZEN_LINUX_PACKAGES: libxcb-icccm4 libxcb-render-util0 gettext libxcb-image0 libsdl1.2debian libv4l-0 libxcb-randr0 bridge-utils libxcb-shape0 libpython2.7 openvpn From cea7a493623c9b1c6f1983b6f81b41b27b0604e3 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Tue, 22 Aug 2023 21:52:37 +0200 Subject: [PATCH 10/14] Preview 0 should be used for non-release branches --- scripts/azure-pipelines-variables.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/azure-pipelines-variables.yml b/scripts/azure-pipelines-variables.yml index 881e4ec579..fc2809ff29 100644 --- a/scripts/azure-pipelines-variables.yml +++ b/scripts/azure-pipelines-variables.yml @@ -6,7 +6,7 @@ variables: GIT_BRANCH_NAME: $(Build.SourceBranch) GIT_URL: $(Build.Repository.Uri) FEATURE_NAME: '' - PREVIEW_LABEL: 'preview.1' + PREVIEW_LABEL: 'preview.0' BUILD_NUMBER: $[counter(format('_{0}_{1}_{2}__', variables['SKIASHARP_VERSION'], variables['Build.SourceBranch'], variables['PREVIEW_LABEL']), 1)] BUILD_COUNTER: $[counter('global_counter', 1)] TIZEN_LINUX_PACKAGES: libxcb-icccm4 libxcb-render-util0 gettext libxcb-image0 libsdl1.2debian libv4l-0 libxcb-randr0 bridge-utils libxcb-shape0 libpython2.7 openvpn From 20c8c7087f486e832188e3a77031332aa7e7e8b1 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 24 Aug 2023 02:58:45 +0200 Subject: [PATCH 11/14] Update libjpeg-turbo to 3.0.0 --- externals/skia | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/externals/skia b/externals/skia index 0c511b3c83..35e6ada6f5 160000 --- a/externals/skia +++ b/externals/skia @@ -1 +1 @@ -Subproject commit 0c511b3c833e441cb9edd6be1d13d2b3dd20c6b8 +Subproject commit 35e6ada6f5b0eaa430b3399e507c6641896da5c6 From 88e8e783cf6db163f3f364faf292780818e8a6a3 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 24 Aug 2023 05:14:07 +0200 Subject: [PATCH 12/14] Fix the build --- externals/skia | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/externals/skia b/externals/skia index ef121e7ed5..b7b5917b63 160000 --- a/externals/skia +++ b/externals/skia @@ -1 +1 @@ -Subproject commit ef121e7ed5b4aa9951ed3cf753f356be1ea5afd3 +Subproject commit b7b5917b63f0d9969ed1974de1dcb2a0af90ca64 From 5ad534d5ff1b1126db13bb205259a603f3de0654 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Fri, 25 Aug 2023 02:46:30 +0200 Subject: [PATCH 13/14] Try again --- externals/skia | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/externals/skia b/externals/skia index b7b5917b63..03479bf7cd 160000 --- a/externals/skia +++ b/externals/skia @@ -1 +1 @@ -Subproject commit b7b5917b63f0d9969ed1974de1dcb2a0af90ca64 +Subproject commit 03479bf7cdee87359696d673e67ae5aa03b55f0c From a10ffdd573b4efb0edc81b6d3b9817cdbd5c4a8d Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Fri, 25 Aug 2023 16:54:01 +0200 Subject: [PATCH 14/14] Update the externals --- externals/skia | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/externals/skia b/externals/skia index 03479bf7cd..b286cfa75e 160000 --- a/externals/skia +++ b/externals/skia @@ -1 +1 @@ -Subproject commit 03479bf7cdee87359696d673e67ae5aa03b55f0c +Subproject commit b286cfa75e42263367d39c6f5fbba26d37edda49