diff --git a/VERSIONS.txt b/VERSIONS.txt index 4da1eaca..e6a3e0cc 100644 --- a/VERSIONS.txt +++ b/VERSIONS.txt @@ -5,7 +5,7 @@ mdoc release 5.6.0 harfbuzz release 1.4.6 skia release m60 xunit.runner.console release 2.3.1 -Xamarin.Forms release 2.5.0.77107 +Xamarin.Forms release 2.5.0.280555 # native sonames libSkiaSharp soname 60.1.0 diff --git a/externals/depot_tools b/externals/depot_tools index 4732b3b1..c7d0b340 160000 --- a/externals/depot_tools +++ b/externals/depot_tools @@ -1 +1 @@ -Subproject commit 4732b3b1c4bf3f5e05eeafd38e5980b77bde8f8d +Subproject commit c7d0b34084e589a895875beb9cd7ca0ba961fd4f diff --git a/externals/skia b/externals/skia index bb553479..26241dac 160000 --- a/externals/skia +++ b/externals/skia @@ -1 +1 @@ -Subproject commit bb553479de64257435be51fd83a60ef5b198eb44 +Subproject commit 26241daca4676782152056f05a8dd21a31d43747 diff --git a/nuget/SkiaSharp.Views.Forms.nuspec b/nuget/SkiaSharp.Views.Forms.nuspec index f7f82846..9354f9be 100644 --- a/nuget/SkiaSharp.Views.Forms.nuspec +++ b/nuget/SkiaSharp.Views.Forms.nuspec @@ -28,26 +28,26 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release - + - + - + - + - + diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj b/samples/Basic/Xamarin.Forms/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj index 1afe92b3..3915e40b 100644 --- a/samples/Basic/Xamarin.Forms/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj +++ b/samples/Basic/Xamarin.Forms/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj @@ -47,7 +47,7 @@ - + diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj b/samples/Basic/Xamarin.Forms/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj index 092fdffd..2abeb335 100644 --- a/samples/Basic/Xamarin.Forms/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj +++ b/samples/Basic/Xamarin.Forms/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj @@ -92,7 +92,7 @@ - + diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj b/samples/Basic/Xamarin.Forms/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj index 7b971282..4db8e380 100644 --- a/samples/Basic/Xamarin.Forms/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj +++ b/samples/Basic/Xamarin.Forms/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj @@ -69,7 +69,7 @@ - + diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj b/samples/Basic/Xamarin.Forms/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj index 46e1802b..13dc976f 100644 --- a/samples/Basic/Xamarin.Forms/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj +++ b/samples/Basic/Xamarin.Forms/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj @@ -55,7 +55,7 @@ - + diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/Xamarin.Forms/SkiaSharpSample/SkiaSharpSample.csproj index ffab1fef..14e01f50 100644 --- a/samples/Basic/Xamarin.Forms/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/Xamarin.Forms/SkiaSharpSample/SkiaSharpSample.csproj @@ -5,7 +5,7 @@ - + diff --git a/samples/Gallery/Xamarin.Forms/Android/Android.csproj b/samples/Gallery/Xamarin.Forms/Android/Android.csproj index 77ef2db6..25cd5b23 100644 --- a/samples/Gallery/Xamarin.Forms/Android/Android.csproj +++ b/samples/Gallery/Xamarin.Forms/Android/Android.csproj @@ -52,7 +52,7 @@ - + diff --git a/samples/Gallery/Xamarin.Forms/Core/Core.csproj b/samples/Gallery/Xamarin.Forms/Core/Core.csproj index dee3e986..5343694b 100644 --- a/samples/Gallery/Xamarin.Forms/Core/Core.csproj +++ b/samples/Gallery/Xamarin.Forms/Core/Core.csproj @@ -6,7 +6,7 @@ - + diff --git a/samples/Gallery/Xamarin.Forms/Mac/Mac.csproj b/samples/Gallery/Xamarin.Forms/Mac/Mac.csproj index 4a8a7a6c..1a1827c7 100644 --- a/samples/Gallery/Xamarin.Forms/Mac/Mac.csproj +++ b/samples/Gallery/Xamarin.Forms/Mac/Mac.csproj @@ -55,7 +55,7 @@ - + diff --git a/samples/Gallery/Xamarin.Forms/UWP/UWP.csproj b/samples/Gallery/Xamarin.Forms/UWP/UWP.csproj index 5708ec77..23cda9a3 100644 --- a/samples/Gallery/Xamarin.Forms/UWP/UWP.csproj +++ b/samples/Gallery/Xamarin.Forms/UWP/UWP.csproj @@ -92,7 +92,7 @@ - + diff --git a/samples/Gallery/Xamarin.Forms/iOS/iOS.csproj b/samples/Gallery/Xamarin.Forms/iOS/iOS.csproj index 0074c49c..d6f7b756 100644 --- a/samples/Gallery/Xamarin.Forms/iOS/iOS.csproj +++ b/samples/Gallery/Xamarin.Forms/iOS/iOS.csproj @@ -112,7 +112,7 @@ - + diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Android/SkiaSharp.Views.Forms.Android.csproj b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Android/SkiaSharp.Views.Forms.Android.csproj index 3581b4eb..6c8914d3 100644 --- a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Android/SkiaSharp.Views.Forms.Android.csproj +++ b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Android/SkiaSharp.Views.Forms.Android.csproj @@ -47,7 +47,7 @@ - + diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Mac/SkiaSharp.Views.Forms.Mac.csproj b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Mac/SkiaSharp.Views.Forms.Mac.csproj index 2450a5d9..cb48d1c3 100644 --- a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Mac/SkiaSharp.Views.Forms.Mac.csproj +++ b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Mac/SkiaSharp.Views.Forms.Mac.csproj @@ -55,7 +55,7 @@ - + diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.NetStandard/SkiaSharp.Views.Forms.NetStandard.csproj b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.NetStandard/SkiaSharp.Views.Forms.NetStandard.csproj index bfa7979f..5228b32f 100644 --- a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.NetStandard/SkiaSharp.Views.Forms.NetStandard.csproj +++ b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.NetStandard/SkiaSharp.Views.Forms.NetStandard.csproj @@ -16,7 +16,7 @@ bin\Release\ - + diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.UWP/SkiaSharp.Views.Forms.UWP.csproj b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.UWP/SkiaSharp.Views.Forms.UWP.csproj index d595f65c..a7c61736 100644 --- a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.UWP/SkiaSharp.Views.Forms.UWP.csproj +++ b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.UWP/SkiaSharp.Views.Forms.UWP.csproj @@ -44,7 +44,7 @@ - + diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.iOS/SkiaSharp.Views.Forms.iOS.csproj b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.iOS/SkiaSharp.Views.Forms.iOS.csproj index f25fcc2c..987af1f1 100644 --- a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.iOS/SkiaSharp.Views.Forms.iOS.csproj +++ b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.iOS/SkiaSharp.Views.Forms.iOS.csproj @@ -53,7 +53,7 @@ - + diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.csproj b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.csproj index 4e0e79cd..67363f8d 100644 --- a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.csproj +++ b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.csproj @@ -20,7 +20,7 @@ - +