From b4ccbbff24bb44419fd53ad5cd8b27685e0af5fc Mon Sep 17 00:00:00 2001 From: agneszitte Date: Thu, 4 Sep 2025 11:42:41 -0400 Subject: [PATCH 1/2] =?UTF-8?q?chore:=20Pin=20Svg.Skia=20to=203.0.3=20in?= =?UTF-8?q?=20templates/sdk=20to=20avoid=20breaking=20changes=20introduced?= =?UTF-8?q?=20with=20version=20=E2=89=A5=203.0.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 3f42acb16c0f86e1d9412b73c2bbad87ecb5c521) # Conflicts: # src/Uno.Sdk/ReadMe.md # src/Uno.Sdk/packages.json --- src/Uno.Sdk/ReadMe.md | 8 ++++++++ src/Uno.Sdk/packages.json | 6 +++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/Uno.Sdk/ReadMe.md b/src/Uno.Sdk/ReadMe.md index f115f0f76..e0bd82224 100644 --- a/src/Uno.Sdk/ReadMe.md +++ b/src/Uno.Sdk/ReadMe.md @@ -16,7 +16,11 @@ The Uno.Sdk powers the Uno Platform Single Project, including the ability to imp | UnoDspTasksVersion | 1.4.0 | | UnoResizetizerVersion | 1.10.3 | | SkiaSharpVersion | 3.119.0 | +<<<<<<< HEAD | SvgSkiaVersion | 3.0.5 | +======= +| SvgSkiaVersion | 3.0.3 | +>>>>>>> 3f42acb (chore: Pin Svg.Skia to 3.0.3 in templates/sdk to avoid breaking changes introduced with version ≥ 3.0.4) | WinAppSdkVersion | 1.7.250606001 | | WinAppSdkBuildToolsVersion | 10.0.26100.4948 | | MicrosoftLoggingVersion** | 8.0.1 | @@ -156,7 +160,11 @@ The Uno.Sdk powers the Uno Platform Single Project, including the ability to imp }, { "group": "SvgSkia", +<<<<<<< HEAD "version": "3.0.5", +======= + "version": "3.0.3", +>>>>>>> 3f42acb (chore: Pin Svg.Skia to 3.0.3 in templates/sdk to avoid breaking changes introduced with version ≥ 3.0.4) "packages": [ "Svg.Skia" ] diff --git a/src/Uno.Sdk/packages.json b/src/Uno.Sdk/packages.json index 622053641..6da9299e4 100644 --- a/src/Uno.Sdk/packages.json +++ b/src/Uno.Sdk/packages.json @@ -114,7 +114,11 @@ }, { "group": "SvgSkia", +<<<<<<< HEAD "version": "3.0.5", +======= + "version": "3.0.3", +>>>>>>> 3f42acb (chore: Pin Svg.Skia to 3.0.3 in templates/sdk to avoid breaking changes introduced with version ≥ 3.0.4) "packages": [ "Svg.Skia" ] @@ -346,4 +350,4 @@ "Microsoft.Web.WebView2" ] } -] \ No newline at end of file +] From 06288550cd278024f376a67a05cca351d94c3a97 Mon Sep 17 00:00:00 2001 From: agneszitte Date: Fri, 5 Sep 2025 10:14:31 -0400 Subject: [PATCH 2/2] chore: Adjust automatic cherry-pick that failed for the backport of #1753 --- src/Uno.Sdk/ReadMe.md | 8 -------- src/Uno.Sdk/packages.json | 4 ---- 2 files changed, 12 deletions(-) diff --git a/src/Uno.Sdk/ReadMe.md b/src/Uno.Sdk/ReadMe.md index e0bd82224..b875d0aba 100644 --- a/src/Uno.Sdk/ReadMe.md +++ b/src/Uno.Sdk/ReadMe.md @@ -16,11 +16,7 @@ The Uno.Sdk powers the Uno Platform Single Project, including the ability to imp | UnoDspTasksVersion | 1.4.0 | | UnoResizetizerVersion | 1.10.3 | | SkiaSharpVersion | 3.119.0 | -<<<<<<< HEAD -| SvgSkiaVersion | 3.0.5 | -======= | SvgSkiaVersion | 3.0.3 | ->>>>>>> 3f42acb (chore: Pin Svg.Skia to 3.0.3 in templates/sdk to avoid breaking changes introduced with version ≥ 3.0.4) | WinAppSdkVersion | 1.7.250606001 | | WinAppSdkBuildToolsVersion | 10.0.26100.4948 | | MicrosoftLoggingVersion** | 8.0.1 | @@ -160,11 +156,7 @@ The Uno.Sdk powers the Uno Platform Single Project, including the ability to imp }, { "group": "SvgSkia", -<<<<<<< HEAD - "version": "3.0.5", -======= "version": "3.0.3", ->>>>>>> 3f42acb (chore: Pin Svg.Skia to 3.0.3 in templates/sdk to avoid breaking changes introduced with version ≥ 3.0.4) "packages": [ "Svg.Skia" ] diff --git a/src/Uno.Sdk/packages.json b/src/Uno.Sdk/packages.json index 6da9299e4..9c7ac917a 100644 --- a/src/Uno.Sdk/packages.json +++ b/src/Uno.Sdk/packages.json @@ -114,11 +114,7 @@ }, { "group": "SvgSkia", -<<<<<<< HEAD - "version": "3.0.5", -======= "version": "3.0.3", ->>>>>>> 3f42acb (chore: Pin Svg.Skia to 3.0.3 in templates/sdk to avoid breaking changes introduced with version ≥ 3.0.4) "packages": [ "Svg.Skia" ]