From 83ba22c84fda77055912006f44f18420a717a3ae Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 21 Nov 2019 21:26:38 +0200 Subject: [PATCH] Updated all the samples (#1021) * Updated all the samples with new things * Update the docs --- VERSIONS.txt | 1 + cake/UpdateDocs.cake | 11 ++- cake/UtilsManaged.cake | 1 + changelogs/SkiaSharp/1.68.1/SkiaSharp.md | 5 +- docs | 2 +- .../Properties/AndroidManifest.xml | 2 +- .../SkiaSharpSample/SkiaSharpSample.csproj | 4 +- .../SkiaSharpSample/SkiaSharpSample.csproj | 10 +-- .../SkiaSharpSample/SkiaSharpSample.csproj | 7 +- .../Properties/AndroidManifest.xml | 2 +- .../SkiaSharpSample.Android.csproj | 6 +- .../SkiaSharpSample.Tizen.csproj | 7 +- .../SkiaSharpSample.iOS.csproj | 8 +-- .../SkiaSharpSample.macOS.csproj | 7 +- .../SkiaSharpSample/SkiaSharpSample.csproj | 16 ++--- .../SkiaSharpSample/SkiaSharpSample.csproj | 4 +- .../SkiaSharpSample/SkiaSharpSample.csproj | 8 +-- .../InterfaceController.cs | 2 +- .../SkiaSharpSample/SkiaSharpSample.csproj | 8 +-- samples/Gallery/Desktop/SkiaSharpSample.sln | 10 --- .../SkiaSharpSample/SkiaSharpSample.csproj | 8 ++- .../PlatformShared/PlatformShared.projitems | 14 ---- .../PlatformShared/PlatformShared.shproj | 13 ---- .../PlatformShared/SamplesInitializer.cs | 71 ++++--------------- samples/Gallery/Shared/SamplesManager.cs | 2 +- samples/Gallery/Shared/Shared.projitems | 21 ------ samples/Gallery/Shared/Shared.shproj | 13 ---- samples/Gallery/UWP/SkiaSharpSample.sln | 10 --- .../SkiaSharpSample/SkiaSharpSample.csproj | 10 ++- samples/Gallery/WPF/SkiaSharpSample.sln | 10 --- .../SkiaSharpSample/SkiaSharpSample.csproj | 8 ++- .../Xamarin.Forms/Android/Android.csproj | 11 ++- .../Xamarin.Forms/Android/MainActivity.cs | 8 +++ .../Android/Properties/AndroidManifest.xml | 12 +--- .../Gallery/Xamarin.Forms/Core/Core.csproj | 7 +- samples/Gallery/Xamarin.Forms/Mac/Mac.csproj | 15 ++-- .../Xamarin.Forms/SkiaSharpSample.Linux.sln | 8 --- .../Xamarin.Forms/SkiaSharpSample.Mac.sln | 11 --- .../Xamarin.Forms/SkiaSharpSample.Windows.sln | 11 --- .../Gallery/Xamarin.Forms/SkiaSharpSample.sln | 13 ---- .../Xamarin.Forms/Tizen/TizenOS.csproj | 12 ++-- samples/Gallery/Xamarin.Forms/UWP/UWP.csproj | 5 +- samples/Gallery/Xamarin.Forms/WPF/WPF.csproj | 4 +- samples/Gallery/Xamarin.Forms/iOS/iOS.csproj | 12 ++-- samples/Gallery/macOS/SkiaSharpSample.sln | 10 --- .../SkiaSharpSample/SkiaSharpSample.csproj | 17 ++++- samples/Gallery/tvOS/SkiaSharpSample.sln | 10 --- .../SkiaSharpSample/SkiaSharpSample.csproj | 20 ++++-- 48 files changed, 172 insertions(+), 315 deletions(-) delete mode 100644 samples/Gallery/PlatformShared/PlatformShared.projitems delete mode 100644 samples/Gallery/PlatformShared/PlatformShared.shproj delete mode 100644 samples/Gallery/Shared/Shared.projitems delete mode 100644 samples/Gallery/Shared/Shared.shproj diff --git a/VERSIONS.txt b/VERSIONS.txt index 69a4e9efd6..183f7ce2e2 100644 --- a/VERSIONS.txt +++ b/VERSIONS.txt @@ -16,6 +16,7 @@ Cake release 0.35.0 GtkSharp release 3.22.24.37 GLibSharp release 3.22.24.37 AtkSharp release 3.22.24.37 +System.Memory release 4.5.3 # additional references used by the tooling OpenTK.GLControl reference 1.1.2349.61993 diff --git a/cake/UpdateDocs.cake b/cake/UpdateDocs.cake index 6789c10475..096f56c83e 100644 --- a/cake/UpdateDocs.cake +++ b/cake/UpdateDocs.cake @@ -35,7 +35,7 @@ void CopyChangelogs (DirectoryPath diffRoot, string id, string version) } } -Task ("docs-download-output") +Task ("docs-download-build-artifact") .IsDependentOn ("download-last-successful-build") .Does (() => { @@ -45,6 +45,11 @@ Task ("docs-download-output") CleanDirectories ("./output"); DownloadFile(url, "./output/nuget.zip"); +}); + +Task ("docs-expand-build-artifact") + .Does (() => +{ Unzip ("./output/nuget.zip", "./output"); MoveDirectory ("./output/nuget", "./output/nugets"); @@ -56,6 +61,10 @@ Task ("docs-download-output") } }); +Task ("docs-download-output") + .IsDependentOn ("docs-download-build-artifact") + .IsDependentOn ("docs-expand-build-artifact"); + Task ("docs-api-diff") .Does (async () => { diff --git a/cake/UtilsManaged.cake b/cake/UtilsManaged.cake index 1c128d6e6e..d3be215ca7 100644 --- a/cake/UtilsManaged.cake +++ b/cake/UtilsManaged.cake @@ -377,6 +377,7 @@ async Task CreateNuGetDiffAsync () await AddDep ("GtkSharp", "netstandard2.0"); await AddDep ("GLibSharp", "netstandard2.0"); await AddDep ("AtkSharp", "netstandard2.0"); + await AddDep ("System.Memory", "netstandard2.0"); return comparer; diff --git a/changelogs/SkiaSharp/1.68.1/SkiaSharp.md b/changelogs/SkiaSharp/1.68.1/SkiaSharp.md index 6a23b50f69..cae0b7b995 100644 --- a/changelogs/SkiaSharp/1.68.1/SkiaSharp.md +++ b/changelogs/SkiaSharp/1.68.1/SkiaSharp.md @@ -572,9 +572,12 @@ protected override void DisposeNative (); #### Type Changed: SkiaSharp.SKTypeface -Added property: +Added properties: ```csharp +public bool IsBold { get; } +public bool IsFixedPitch { get; } +public bool IsItalic { get; } public int TableCount { get; } ``` diff --git a/docs b/docs index 5126a653ef..06af499f4c 160000 --- a/docs +++ b/docs @@ -1 +1 @@ -Subproject commit 5126a653eff7d99a54c7b64ae30003d0b7f9b6ed +Subproject commit 06af499f4ce08b2b0300860ac7f1784ff12b2f54 diff --git a/samples/Basic/Android/SkiaSharpSample/Properties/AndroidManifest.xml b/samples/Basic/Android/SkiaSharpSample/Properties/AndroidManifest.xml index 5a3ac1affa..a8c017647b 100644 --- a/samples/Basic/Android/SkiaSharpSample/Properties/AndroidManifest.xml +++ b/samples/Basic/Android/SkiaSharpSample/Properties/AndroidManifest.xml @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/samples/Basic/Android/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/Android/SkiaSharpSample/SkiaSharpSample.csproj index 94c4091402..26a13948b7 100644 --- a/samples/Basic/Android/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/Android/SkiaSharpSample/SkiaSharpSample.csproj @@ -15,7 +15,6 @@ Properties\AndroidManifest.xml Resources Assets - false armeabi-v7a;x86;arm64-v8a;x86_64 @@ -27,6 +26,7 @@ prompt 4 None + d8 true @@ -38,6 +38,8 @@ true false Full + d8 + r8 diff --git a/samples/Basic/ElmSharp/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/ElmSharp/SkiaSharpSample/SkiaSharpSample.csproj index 8cfa918e3d..dead957b4a 100644 --- a/samples/Basic/ElmSharp/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/ElmSharp/SkiaSharpSample/SkiaSharpSample.csproj @@ -1,4 +1,4 @@ - + tizen40 @@ -13,12 +13,6 @@ None - - - - - - @@ -39,6 +33,4 @@ - - diff --git a/samples/Basic/Tizen/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/Tizen/SkiaSharpSample/SkiaSharpSample.csproj index 3a00de6434..feb7207798 100644 --- a/samples/Basic/Tizen/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/Tizen/SkiaSharpSample/SkiaSharpSample.csproj @@ -1,4 +1,4 @@ - + tizen40 @@ -16,9 +16,6 @@ - - - @@ -43,6 +40,4 @@ - - diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample.Android/Properties/AndroidManifest.xml b/samples/Basic/Xamarin.Forms/SkiaSharpSample.Android/Properties/AndroidManifest.xml index c2b3620cca..83e790ffb8 100644 --- a/samples/Basic/Xamarin.Forms/SkiaSharpSample.Android/Properties/AndroidManifest.xml +++ b/samples/Basic/Xamarin.Forms/SkiaSharpSample.Android/Properties/AndroidManifest.xml @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj b/samples/Basic/Xamarin.Forms/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj index 7731d0b00d..df310c022f 100644 --- a/samples/Basic/Xamarin.Forms/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj +++ b/samples/Basic/Xamarin.Forms/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj @@ -15,7 +15,6 @@ Properties\AndroidManifest.xml Resources Assets - false armeabi-v7a;x86;arm64-v8a;x86_64 @@ -27,6 +26,7 @@ prompt 4 None + d8 true @@ -38,6 +38,8 @@ true false Full + d8 + r8 @@ -63,7 +65,7 @@ SkiaSharp.Views.Android - {7CF655F1-590C-4A0B-92A4-78D104AD38E9} + {B178E8E3-A5AD-4C98-B365-86E05EE53643} SkiaSharpSample diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample.Tizen/SkiaSharpSample.Tizen.csproj b/samples/Basic/Xamarin.Forms/SkiaSharpSample.Tizen/SkiaSharpSample.Tizen.csproj index a9a3cb71a1..8b539ba84d 100644 --- a/samples/Basic/Xamarin.Forms/SkiaSharpSample.Tizen/SkiaSharpSample.Tizen.csproj +++ b/samples/Basic/Xamarin.Forms/SkiaSharpSample.Tizen/SkiaSharpSample.Tizen.csproj @@ -1,4 +1,4 @@ - + tizen40 @@ -20,9 +20,6 @@ - - - @@ -48,6 +45,4 @@ - - diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj b/samples/Basic/Xamarin.Forms/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj index 46dddb6a59..6124e04f88 100644 --- a/samples/Basic/Xamarin.Forms/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj +++ b/samples/Basic/Xamarin.Forms/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj @@ -23,7 +23,7 @@ prompt 4 false - x86_64 + i386, x86_64 None true @@ -34,7 +34,7 @@ prompt 4 None - x86_64 + i386, x86_64 false @@ -46,7 +46,7 @@ prompt 4 false - ARM64 + ARMv7, ARM64 iPhone Developer true Entitlements.plist @@ -57,7 +57,7 @@ bin\iPhone\Release prompt 4 - ARM64 + ARMv7, ARM64 false iPhone Developer Entitlements.plist diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj b/samples/Basic/Xamarin.Forms/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj index 8f472cd306..0e0e82667c 100644 --- a/samples/Basic/Xamarin.Forms/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj +++ b/samples/Basic/Xamarin.Forms/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj @@ -28,9 +28,10 @@ true true true - + NSUrlSessionHandler + None pdbonly @@ -46,8 +47,10 @@ true true Full - + NSUrlSessionHandler + None + --linkskip=Xamarin.Forms.Platform.macOS diff --git a/samples/Basic/iOS/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/iOS/SkiaSharpSample/SkiaSharpSample.csproj index 94667ac665..eb0104ba67 100644 --- a/samples/Basic/iOS/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/iOS/SkiaSharpSample/SkiaSharpSample.csproj @@ -25,8 +25,8 @@ true 41640 None - x86_64 - HttpClientHandler + i386, x86_64 + NSUrlSessionHandler false Entitlements.plist @@ -42,8 +42,8 @@ true Entitlements.plist Full - ARM64 - HttpClientHandler + ARMv7, ARM64 + NSUrlSessionHandler @@ -56,8 +56,8 @@ iPhone Developer true None - x86_64 - HttpClientHandler + i386, x86_64 + NSUrlSessionHandler @@ -78,8 +78,8 @@ Entitlements.plist 59169 SdkOnly - ARM64 - HttpClientHandler + ARMv7, ARM64 + NSUrlSessionHandler diff --git a/samples/Basic/macOS/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/macOS/SkiaSharpSample/SkiaSharpSample.csproj index 2db38bee48..9842563b19 100644 --- a/samples/Basic/macOS/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/macOS/SkiaSharpSample/SkiaSharpSample.csproj @@ -28,7 +28,7 @@ true true true - + NSUrlSessionHandler None @@ -47,7 +47,7 @@ true true Full - + NSUrlSessionHandler None diff --git a/samples/Basic/tvOS/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/tvOS/SkiaSharpSample/SkiaSharpSample.csproj index 6a2da9e474..5db435a0e3 100644 --- a/samples/Basic/tvOS/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/tvOS/SkiaSharpSample/SkiaSharpSample.csproj @@ -26,7 +26,7 @@ 19489 None x86_64 - HttpClientHandler + NSUrlSessionHandler false @@ -44,7 +44,7 @@ Entitlements.plist Full ARM64 - HttpClientHandler + NSUrlSessionHandler @@ -58,7 +58,7 @@ true None x86_64 - HttpClientHandler + NSUrlSessionHandler @@ -80,7 +80,7 @@ 17830 SdkOnly ARM64 - HttpClientHandler + NSUrlSessionHandler diff --git a/samples/Basic/watchOS/SkiaSharpSample.OnWatchExtension/InterfaceController.cs b/samples/Basic/watchOS/SkiaSharpSample.OnWatchExtension/InterfaceController.cs index 3d45aede32..ba0e06507a 100644 --- a/samples/Basic/watchOS/SkiaSharpSample.OnWatchExtension/InterfaceController.cs +++ b/samples/Basic/watchOS/SkiaSharpSample.OnWatchExtension/InterfaceController.cs @@ -31,7 +31,7 @@ public override void Awake(NSObject context) using (var path = new SKPath()) { - path.AddRoundedRect(new SKRect(5, 5, bitmap.Width - 5, bitmap.Height - 5), 5, 5); + path.AddRoundRect(new SKRect(5, 5, bitmap.Width - 5, bitmap.Height - 5), 5, 5); canvas.ClipPath(path); } diff --git a/samples/Basic/watchOS/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/watchOS/SkiaSharpSample/SkiaSharpSample.csproj index c5662918df..20da3e9092 100644 --- a/samples/Basic/watchOS/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/watchOS/SkiaSharpSample/SkiaSharpSample.csproj @@ -25,7 +25,7 @@ 30348 None i386, x86_64 - HttpClientHandler + NSUrlSessionHandler pdbonly @@ -38,7 +38,7 @@ Entitlements.plist Full ARMv7, ARM64 - HttpClientHandler + NSUrlSessionHandler pdbonly @@ -50,7 +50,7 @@ true None i386, x86_64 - HttpClientHandler + NSUrlSessionHandler true @@ -70,7 +70,7 @@ 45476 SdkOnly ARMv7, ARM64 - HttpClientHandler + NSUrlSessionHandler diff --git a/samples/Gallery/Desktop/SkiaSharpSample.sln b/samples/Gallery/Desktop/SkiaSharpSample.sln index 06a2a34786..c6b0e15a73 100644 --- a/samples/Gallery/Desktop/SkiaSharpSample.sln +++ b/samples/Gallery/Desktop/SkiaSharpSample.sln @@ -9,10 +9,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.Desktop", ".. EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.HarfBuzz.Desktop", "..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.Desktop\SkiaSharp.HarfBuzz.Desktop.csproj", "{233220CC-F0F3-4C44-9736-ED2CFC363FD3}" EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "PlatformShared", "..\PlatformShared\PlatformShared.shproj", "{0CC41AB0-0C4C-4DAA-8F10-A249725EBF5D}" -EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Shared", "..\Shared\Shared.shproj", "{509B233A-35A0-41CA-A585-0B1A9F79D470}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpSample", "SkiaSharpSample\SkiaSharpSample.csproj", "{F9B5AA70-AA4E-438D-A48E-CF5B638E55A8}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Desktop.Common", "..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.Desktop.Common\SkiaSharp.Views.Desktop.Common.csproj", "{6D71FECC-A676-4942-AD04-776F24BE3EA2}" @@ -20,12 +16,6 @@ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.WindowsForms", "..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.WindowsForms\SkiaSharp.Views.WindowsForms.csproj", "{6F752AA5-4676-4092-A219-CBA38F1B7954}" EndProject Global - GlobalSection(SharedMSBuildProjectFiles) = preSolution - ..\PlatformShared\PlatformShared.projitems*{0cc41ab0-0c4c-4daa-8f10-a249725ebf5d}*SharedItemsImports = 13 - ..\Shared\Shared.projitems*{509b233a-35a0-41ca-a585-0b1a9f79d470}*SharedItemsImports = 13 - ..\PlatformShared\PlatformShared.projitems*{f9b5aa70-aa4e-438d-a48e-cf5b638e55a8}*SharedItemsImports = 4 - ..\Shared\Shared.projitems*{f9b5aa70-aa4e-438d-a48e-cf5b638e55a8}*SharedItemsImports = 4 - EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Debug|x64 = Debug|x64 diff --git a/samples/Gallery/Desktop/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Gallery/Desktop/SkiaSharpSample/SkiaSharpSample.csproj index 9e23defedd..09362b76fe 100644 --- a/samples/Gallery/Desktop/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Gallery/Desktop/SkiaSharpSample/SkiaSharpSample.csproj @@ -151,10 +151,12 @@ - + + + + + - - diff --git a/samples/Gallery/PlatformShared/PlatformShared.projitems b/samples/Gallery/PlatformShared/PlatformShared.projitems deleted file mode 100644 index 2753ceb6e3..0000000000 --- a/samples/Gallery/PlatformShared/PlatformShared.projitems +++ /dev/null @@ -1,14 +0,0 @@ - - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - true - 0cc41ab0-0c4c-4daa-8f10-a249725ebf5d - - - SkiaSharpSample - - - - - \ No newline at end of file diff --git a/samples/Gallery/PlatformShared/PlatformShared.shproj b/samples/Gallery/PlatformShared/PlatformShared.shproj deleted file mode 100644 index b4125ad0ef..0000000000 --- a/samples/Gallery/PlatformShared/PlatformShared.shproj +++ /dev/null @@ -1,13 +0,0 @@ - - - - 0cc41ab0-0c4c-4daa-8f10-a249725ebf5d - 14.0 - - - - - - - - diff --git a/samples/Gallery/PlatformShared/SamplesInitializer.cs b/samples/Gallery/PlatformShared/SamplesInitializer.cs index 7ea4cbd2cd..0e1d7ae444 100644 --- a/samples/Gallery/PlatformShared/SamplesInitializer.cs +++ b/samples/Gallery/PlatformShared/SamplesInitializer.cs @@ -1,10 +1,12 @@ using System; using System.IO; using System.Linq; +using Xamarin.Essentials; #if WINDOWS_UWP using Windows.ApplicationModel; using Windows.Storage; using Windows.System; +using Launcher = Xamarin.Essentials.Launcher; #elif __MACOS__ using AppKit; using Foundation; @@ -23,6 +25,11 @@ using Xamarin.Forms.Platform.Tizen; #endif +namespace Xamarin.Essentials +{ + // dummy placeholder +} + namespace SkiaSharpSample { public static class SamplesInitializer @@ -37,7 +44,7 @@ public static void Init() #elif __IOS__ || __TVOS__ || __MACOS__ var path = NSBundle.MainBundle.PathForResource(Path.GetFileNameWithoutExtension(fontName), Path.GetExtension(fontName)); #elif __ANDROID__ - var path = Path.Combine(Application.Context.CacheDir.AbsolutePath, fontName); + var path = Path.Combine(FileSystem.CacheDirectory, fontName); using (var asset = Application.Context.Assets.Open(Path.Combine("Media", fontName))) using (var dest = File.Open(path, FileMode.Create)) { @@ -50,17 +57,12 @@ public static void Init() var path = ResourcePath.GetPath(fontName); #endif -#if WINDOWS_UWP - var localStorage = ApplicationData.Current.LocalFolder.Path; -#elif __IOS__ || __TVOS__ - var documents = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments); - var localStorage = Path.Combine(documents, "..", "Library"); -#elif __MACOS__ || __ANDROID__ +#if WINDOWS_UWP || __IOS__ || __TVOS__ || __ANDROID__ || __TIZEN__ + var localStorage = FileSystem.AppDataDirectory; +#elif __MACOS__ var localStorage = System.Environment.GetFolderPath(System.Environment.SpecialFolder.MyDocuments); #elif __DESKTOP__ var localStorage = System.Windows.Forms.Application.LocalUserAppDataPath; -#elif __TIZEN__ - var localStorage = Application.Current.DirectoryInfo.Data; #endif SamplesManager.ContentFontPath = path; @@ -74,9 +76,9 @@ public static void Init() private static async void OnOpenSampleFile(string path) { -#if WINDOWS_UWP - var file = await StorageFile.GetFileFromPathAsync(path); - await Launcher.LaunchFileAsync(file); +#if WINDOWS_UWP || __TVOS__ || __IOS__ || __ANDROID__ || __TIZEN__ + var title = "Open " + Path.GetExtension(path).ToUpperInvariant(); + await Launcher.OpenAsync(new OpenFileRequest(title, new ReadOnlyFile(path))); #elif __MACOS__ if (!NSWorkspace.SharedWorkspace.OpenFile(path)) { @@ -86,53 +88,8 @@ private static async void OnOpenSampleFile(string path) alert.InformativeText = "Unable to open file."; alert.RunSheetModal(NSApplication.SharedApplication.MainWindow); } -#elif __TVOS__ -#elif __IOS__ - // the external / shared location - var external = Path.Combine(Path.GetTempPath(), "SkiaSharpSample"); - if (!Directory.Exists(external)) - { - Directory.CreateDirectory(external); - } - // copy file to external - var newPath = Path.Combine(external, Path.GetFileName(path)); - File.Copy(path, newPath); - // open the file - var vc = Xamarin.Forms.Platform.iOS.Platform.GetRenderer(Xamarin.Forms.Application.Current.MainPage) as UIViewController; - var resourceToOpen = NSUrl.FromFilename(newPath); - var controller = UIDocumentInteractionController.FromUrl(resourceToOpen); - if (!controller.PresentOpenInMenu(vc.View.Bounds, vc.View, true)) - { - new UIAlertView("SkiaSharp", "Unable to open file.", (IUIAlertViewDelegate)null, "OK").Show(); - } -#elif __ANDROID__ - // the external / shared location - var external = Path.Combine(Android.OS.Environment.ExternalStorageDirectory.AbsolutePath, "SkiaSharpSample"); - if (!Directory.Exists(external)) - { - Directory.CreateDirectory(external); - } - // copy file to external - var newPath = Path.Combine(external, Path.GetFileName(path)); - File.Copy(path, newPath); - // open the file - var uri = Android.Net.Uri.FromFile(new Java.IO.File(newPath)); - var intent = new Intent(Intent.ActionView, uri); - intent.AddFlags(ActivityFlags.NewTask); - Application.Context.StartActivity(intent); #elif __DESKTOP__ Process.Start(path); -#elif __TIZEN__ - var appControl = new AppControl - { - Operation = AppControlOperations.View, - Uri = "file://" + path - }; - var matchedApplications = AppControl.GetMatchedApplicationIds(appControl); - if (matchedApplications.Any()) - { - AppControl.SendLaunchRequest(appControl); - } #endif } } diff --git a/samples/Gallery/Shared/SamplesManager.cs b/samples/Gallery/Shared/SamplesManager.cs index 99bdde48e1..b0e0d49f19 100644 --- a/samples/Gallery/Shared/SamplesManager.cs +++ b/samples/Gallery/Shared/SamplesManager.cs @@ -71,7 +71,7 @@ private static string GetAssemblyVersion() var apiAssembly = typeof(T).Assembly; var attributes = apiAssembly.GetCustomAttributes(typeof(AssemblyInformationalVersionAttribute)); var attribute = (AssemblyInformationalVersionAttribute)attributes.FirstOrDefault(); - return attribute.InformationalVersion; + return attribute?.InformationalVersion ?? ""; } } } diff --git a/samples/Gallery/Shared/Shared.projitems b/samples/Gallery/Shared/Shared.projitems deleted file mode 100644 index 5a073b70a0..0000000000 --- a/samples/Gallery/Shared/Shared.projitems +++ /dev/null @@ -1,21 +0,0 @@ - - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - true - 509b233a-35a0-41ca-a585-0b1a9f79d470 - - - SkiaSharpSample - - - - - - - - - - - - \ No newline at end of file diff --git a/samples/Gallery/Shared/Shared.shproj b/samples/Gallery/Shared/Shared.shproj deleted file mode 100644 index 99005a5c9b..0000000000 --- a/samples/Gallery/Shared/Shared.shproj +++ /dev/null @@ -1,13 +0,0 @@ - - - - 509b233a-35a0-41ca-a585-0b1a9f79d470 - 14.0 - - - - - - - - diff --git a/samples/Gallery/UWP/SkiaSharpSample.sln b/samples/Gallery/UWP/SkiaSharpSample.sln index 96d7802fb8..ddc3ddd044 100644 --- a/samples/Gallery/UWP/SkiaSharpSample.sln +++ b/samples/Gallery/UWP/SkiaSharpSample.sln @@ -11,10 +11,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.HarfBuzz", "..\.. EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HarfBuzzSharp.UWP", "..\..\..\binding\HarfBuzzSharp.UWP\HarfBuzzSharp.UWP.csproj", "{6D1E1F39-EF70-4211-A518-BBBAF02D6FFF}" EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "PlatformShared", "..\PlatformShared\PlatformShared.shproj", "{0CC41AB0-0C4C-4DAA-8F10-A249725EBF5D}" -EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Shared", "..\Shared\Shared.shproj", "{509B233A-35A0-41CA-A585-0B1A9F79D470}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpSample", "SkiaSharpSample\SkiaSharpSample.csproj", "{BFC6B190-A17C-4538-B2C6-EEDA46D87EFE}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.NetStandard", "..\..\..\binding\HarfBuzzSharp.NetStandard\HarfBuzzSharp.NetStandard.csproj", "{083CAE88-1CB4-4D59-AB34-7BA1665140E6}" @@ -22,12 +18,6 @@ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.NetStandard", "..\..\..\binding\SkiaSharp.NetStandard\SkiaSharp.NetStandard.csproj", "{7B8EC15C-BC89-4A83-8FFB-15F19EBCA66C}" EndProject Global - GlobalSection(SharedMSBuildProjectFiles) = preSolution - ..\PlatformShared\PlatformShared.projitems*{0cc41ab0-0c4c-4daa-8f10-a249725ebf5d}*SharedItemsImports = 13 - ..\Shared\Shared.projitems*{509b233a-35a0-41ca-a585-0b1a9f79d470}*SharedItemsImports = 13 - ..\PlatformShared\PlatformShared.projitems*{bfc6b190-a17c-4538-b2c6-eeda46d87efe}*SharedItemsImports = 4 - ..\Shared\Shared.projitems*{bfc6b190-a17c-4538-b2c6-eeda46d87efe}*SharedItemsImports = 4 - EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Debug|ARM = Debug|ARM diff --git a/samples/Gallery/UWP/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Gallery/UWP/SkiaSharpSample/SkiaSharpSample.csproj index 99922394ca..e1fd3b4c51 100644 --- a/samples/Gallery/UWP/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Gallery/UWP/SkiaSharpSample/SkiaSharpSample.csproj @@ -91,6 +91,7 @@ + @@ -165,8 +166,13 @@ Designer - - + + + + + + + 14.0 diff --git a/samples/Gallery/WPF/SkiaSharpSample.sln b/samples/Gallery/WPF/SkiaSharpSample.sln index bc865119c3..0b845ec4d8 100644 --- a/samples/Gallery/WPF/SkiaSharpSample.sln +++ b/samples/Gallery/WPF/SkiaSharpSample.sln @@ -9,10 +9,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.WPF", "..\. EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.Desktop", "..\..\..\binding\HarfBuzzSharp.Desktop\HarfBuzzSharp.Desktop.csproj", "{2AE5D8C5-EAC6-4515-89F2-A4994B41C925}" EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "PlatformShared", "..\PlatformShared\PlatformShared.shproj", "{0CC41AB0-0C4C-4DAA-8F10-A249725EBF5D}" -EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Shared", "..\Shared\Shared.shproj", "{509B233A-35A0-41CA-A585-0B1A9F79D470}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpSample", "SkiaSharpSample\SkiaSharpSample.csproj", "{74178C7C-19A0-45E6-8EFB-F4DB7EE37C6F}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.HarfBuzz.Desktop", "..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.Desktop\SkiaSharp.HarfBuzz.Desktop.csproj", "{156FADFB-602E-4658-A235-D4D24CD46F09}" @@ -22,12 +18,6 @@ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.WindowsForms", "..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.WindowsForms\SkiaSharp.Views.WindowsForms.csproj", "{A1334727-7CC6-43AC-A617-EEFE2174F454}" EndProject Global - GlobalSection(SharedMSBuildProjectFiles) = preSolution - ..\PlatformShared\PlatformShared.projitems*{0cc41ab0-0c4c-4daa-8f10-a249725ebf5d}*SharedItemsImports = 13 - ..\Shared\Shared.projitems*{509b233a-35a0-41ca-a585-0b1a9f79d470}*SharedItemsImports = 13 - ..\PlatformShared\PlatformShared.projitems*{74178c7c-19a0-45e6-8efb-f4db7ee37c6f}*SharedItemsImports = 4 - ..\Shared\Shared.projitems*{74178c7c-19a0-45e6-8efb-f4db7ee37c6f}*SharedItemsImports = 4 - EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Debug|x64 = Debug|x64 diff --git a/samples/Gallery/WPF/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Gallery/WPF/SkiaSharpSample/SkiaSharpSample.csproj index 8bebcd3120..fe00690deb 100644 --- a/samples/Gallery/WPF/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Gallery/WPF/SkiaSharpSample/SkiaSharpSample.csproj @@ -169,10 +169,12 @@ - + + + + + - - diff --git a/samples/Gallery/Xamarin.Forms/Android/Android.csproj b/samples/Gallery/Xamarin.Forms/Android/Android.csproj index aed7a0a5b4..23d33eb5a5 100644 --- a/samples/Gallery/Xamarin.Forms/Android/Android.csproj +++ b/samples/Gallery/Xamarin.Forms/Android/Android.csproj @@ -16,7 +16,6 @@ Resources\Resource.Designer.cs Off Properties\AndroidManifest.xml - false v9.0 armeabi-v7a;x86;arm64-v8a;x86_64 @@ -30,6 +29,7 @@ 4 True None + d8 pdbonly @@ -41,6 +41,8 @@ False Full true + d8 + r8 @@ -51,6 +53,7 @@ + @@ -75,7 +78,7 @@ SkiaSharp.Views.Android - {E01FBABA-8DA1-432B-9253-F4ABE13A3A6A} + {9AE564B8-2EF7-4102-B83A-89A03D4EA05C} Core @@ -130,6 +133,8 @@ - + + + \ No newline at end of file diff --git a/samples/Gallery/Xamarin.Forms/Android/MainActivity.cs b/samples/Gallery/Xamarin.Forms/Android/MainActivity.cs index ab56ac9619..b5e4af6cf7 100644 --- a/samples/Gallery/Xamarin.Forms/Android/MainActivity.cs +++ b/samples/Gallery/Xamarin.Forms/Android/MainActivity.cs @@ -16,9 +16,17 @@ protected override void OnCreate(Bundle bundle) base.OnCreate(bundle); + Xamarin.Essentials.Platform.Init(this, bundle); Forms.Init(this, bundle); LoadApplication(new App()); } + + public override void OnRequestPermissionsResult(int requestCode, string[] permissions, Permission[] grantResults) + { + Xamarin.Essentials.Platform.OnRequestPermissionsResult(requestCode, permissions, grantResults); + + base.OnRequestPermissionsResult(requestCode, permissions, grantResults); + } } } diff --git a/samples/Gallery/Xamarin.Forms/Android/Properties/AndroidManifest.xml b/samples/Gallery/Xamarin.Forms/Android/Properties/AndroidManifest.xml index 3f6bd98dcb..c1a9ec566b 100644 --- a/samples/Gallery/Xamarin.Forms/Android/Properties/AndroidManifest.xml +++ b/samples/Gallery/Xamarin.Forms/Android/Properties/AndroidManifest.xml @@ -1,11 +1,5 @@  - - - + + + \ No newline at end of file diff --git a/samples/Gallery/Xamarin.Forms/Core/Core.csproj b/samples/Gallery/Xamarin.Forms/Core/Core.csproj index 5bdd9332b1..c2733b3fb4 100644 --- a/samples/Gallery/Xamarin.Forms/Core/Core.csproj +++ b/samples/Gallery/Xamarin.Forms/Core/Core.csproj @@ -16,6 +16,11 @@ - + + + + + + \ No newline at end of file diff --git a/samples/Gallery/Xamarin.Forms/Mac/Mac.csproj b/samples/Gallery/Xamarin.Forms/Mac/Mac.csproj index 18ed42c617..fc543d55d5 100644 --- a/samples/Gallery/Xamarin.Forms/Mac/Mac.csproj +++ b/samples/Gallery/Xamarin.Forms/Mac/Mac.csproj @@ -28,9 +28,10 @@ true true true - + NSUrlSessionHandler + None @@ -45,9 +46,11 @@ true true true - SdkOnly - + Full + NSUrlSessionHandler + None + --linkskip=Xamarin.Forms.Platform.macOS @@ -79,7 +82,7 @@ SkiaSharp.Views.Mac - {E01FBABA-8DA1-432B-9253-F4ABE13A3A6A} + {9AE564B8-2EF7-4102-B83A-89A03D4EA05C} Core @@ -123,6 +126,8 @@ Resources\content-font.ttf - + + + \ No newline at end of file diff --git a/samples/Gallery/Xamarin.Forms/SkiaSharpSample.Linux.sln b/samples/Gallery/Xamarin.Forms/SkiaSharpSample.Linux.sln index c4dc076f0f..98760107df 100644 --- a/samples/Gallery/Xamarin.Forms/SkiaSharpSample.Linux.sln +++ b/samples/Gallery/Xamarin.Forms/SkiaSharpSample.Linux.sln @@ -9,10 +9,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.NetStandard", EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Forms", "..\..\..\source\SkiaSharp.Views.Forms\SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.csproj", "{99411A8A-1F8C-469C-AC10-E72F28EDB376}" EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "PlatformShared", "..\PlatformShared\PlatformShared.shproj", "{0CC41AB0-0C4C-4DAA-8F10-A249725EBF5D}" -EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Shared", "..\Shared\Shared.shproj", "{509B233A-35A0-41CA-A585-0B1A9F79D470}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core", "Core\Core.csproj", "{9AE564B8-2EF7-4102-B83A-89A03D4EA05C}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Tizen", "..\..\..\binding\SkiaSharp.Tizen\SkiaSharp.Tizen.csproj", "{A7B25831-3EA3-4F88-AA82-4D4CA66B19C6}" @@ -26,10 +22,6 @@ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.Tizen", "..\..\..\binding\HarfBuzzSharp.Tizen\HarfBuzzSharp.Tizen.csproj", "{4D4FD6E5-6956-437E-A2FD-425D5E309192}" EndProject Global - GlobalSection(SharedMSBuildProjectFiles) = preSolution - ..\PlatformShared\PlatformShared.projitems*{0cc41ab0-0c4c-4daa-8f10-a249725ebf5d}*SharedItemsImports = 13 - ..\Shared\Shared.projitems*{509b233a-35a0-41ca-a585-0b1a9f79d470}*SharedItemsImports = 13 - EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Debug|ARM = Debug|ARM diff --git a/samples/Gallery/Xamarin.Forms/SkiaSharpSample.Mac.sln b/samples/Gallery/Xamarin.Forms/SkiaSharpSample.Mac.sln index 174c173030..17dedf1d00 100644 --- a/samples/Gallery/Xamarin.Forms/SkiaSharpSample.Mac.sln +++ b/samples/Gallery/Xamarin.Forms/SkiaSharpSample.Mac.sln @@ -35,10 +35,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Views.Forms.Andro EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Views.Forms.iOS", "..\..\..\source\SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.iOS\SkiaSharp.Views.Forms.iOS.csproj", "{4AC36D63-BF11-445F-81EE-107C0CEF4FC9}" EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "PlatformShared", "..\PlatformShared\PlatformShared.shproj", "{0CC41AB0-0C4C-4DAA-8F10-A249725EBF5D}" -EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Shared", "..\Shared\Shared.shproj", "{509B233A-35A0-41CA-A585-0B1A9F79D470}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Android", "Android\Android.csproj", "{B8A92B38-B7DB-450B-8D16-301404E9EADC}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core", "Core\Core.csproj", "{9AE564B8-2EF7-4102-B83A-89A03D4EA05C}" @@ -48,13 +44,6 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mac", "Mac\Mac.csproj", "{91F5C72A-74D7-4C3F-8761-F692D4300660}" EndProject Global - GlobalSection(SharedMSBuildProjectFiles) = preSolution - ..\PlatformShared\PlatformShared.projitems*{05a70f82-973a-4402-adb9-2684d5e9f0c8}*SharedItemsImports = 4 - ..\PlatformShared\PlatformShared.projitems*{0cc41ab0-0c4c-4daa-8f10-a249725ebf5d}*SharedItemsImports = 13 - ..\Shared\Shared.projitems*{509b233a-35a0-41ca-a585-0b1a9f79d470}*SharedItemsImports = 13 - ..\PlatformShared\PlatformShared.projitems*{91f5c72a-74d7-4c3f-8761-f692d4300660}*SharedItemsImports = 4 - ..\PlatformShared\PlatformShared.projitems*{b8a92b38-b7db-450b-8d16-301404e9eadc}*SharedItemsImports = 4 - EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Debug|ARM = Debug|ARM diff --git a/samples/Gallery/Xamarin.Forms/SkiaSharpSample.Windows.sln b/samples/Gallery/Xamarin.Forms/SkiaSharpSample.Windows.sln index 6a71b44048..5b1f381189 100644 --- a/samples/Gallery/Xamarin.Forms/SkiaSharpSample.Windows.sln +++ b/samples/Gallery/Xamarin.Forms/SkiaSharpSample.Windows.sln @@ -19,10 +19,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Forms", ".. EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.UWP", "..\..\..\binding\HarfBuzzSharp.UWP\HarfBuzzSharp.UWP.csproj", "{6D1E1F39-EF70-4211-A518-BBBAF02D6FFF}" EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "PlatformShared", "..\PlatformShared\PlatformShared.shproj", "{0CC41AB0-0C4C-4DAA-8F10-A249725EBF5D}" -EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Shared", "..\Shared\Shared.shproj", "{509B233A-35A0-41CA-A585-0B1A9F79D470}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core", "Core\Core.csproj", "{9AE564B8-2EF7-4102-B83A-89A03D4EA05C}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UWP", "UWP\UWP.csproj", "{99F08DB7-A06E-4814-BDD6-BB87DBE278AF}" @@ -54,13 +50,6 @@ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Forms.WPF", "..\..\..\source\SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.WPF\SkiaSharp.Views.Forms.WPF.csproj", "{B24C9E89-0D1A-4210-A554-C37085761919}" EndProject Global - GlobalSection(SharedMSBuildProjectFiles) = preSolution - ..\PlatformShared\PlatformShared.projitems*{0cc41ab0-0c4c-4daa-8f10-a249725ebf5d}*SharedItemsImports = 13 - ..\Shared\Shared.projitems*{509b233a-35a0-41ca-a585-0b1a9f79d470}*SharedItemsImports = 13 - ..\PlatformShared\PlatformShared.projitems*{748981c3-5d0f-462a-9f56-a3c6d792ed30}*SharedItemsImports = 4 - ..\PlatformShared\PlatformShared.projitems*{99f08db7-a06e-4814-bdd6-bb87dbe278af}*SharedItemsImports = 4 - ..\PlatformShared\PlatformShared.projitems*{b8a92b38-b7db-450b-8d16-301404e9eadc}*SharedItemsImports = 4 - EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Debug|ARM = Debug|ARM diff --git a/samples/Gallery/Xamarin.Forms/SkiaSharpSample.sln b/samples/Gallery/Xamarin.Forms/SkiaSharpSample.sln index c4147d8788..578797a407 100644 --- a/samples/Gallery/Xamarin.Forms/SkiaSharpSample.sln +++ b/samples/Gallery/Xamarin.Forms/SkiaSharpSample.sln @@ -43,10 +43,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Forms", ".. EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.UWP", "..\..\..\binding\HarfBuzzSharp.UWP\HarfBuzzSharp.UWP.csproj", "{6D1E1F39-EF70-4211-A518-BBBAF02D6FFF}" EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "PlatformShared", "..\PlatformShared\PlatformShared.shproj", "{0CC41AB0-0C4C-4DAA-8F10-A249725EBF5D}" -EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Shared", "..\Shared\Shared.shproj", "{509B233A-35A0-41CA-A585-0B1A9F79D470}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Android", "Android\Android.csproj", "{B8A92B38-B7DB-450B-8D16-301404E9EADC}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core", "Core\Core.csproj", "{9AE564B8-2EF7-4102-B83A-89A03D4EA05C}" @@ -82,15 +78,6 @@ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.Desktop", "..\..\..\binding\HarfBuzzSharp.Desktop\HarfBuzzSharp.Desktop.csproj", "{B650BA9B-8EBF-4B2D-BA6A-C26A675A6760}" EndProject Global - GlobalSection(SharedMSBuildProjectFiles) = preSolution - ..\PlatformShared\PlatformShared.projitems*{05a70f82-973a-4402-adb9-2684d5e9f0c8}*SharedItemsImports = 4 - ..\PlatformShared\PlatformShared.projitems*{0cc41ab0-0c4c-4daa-8f10-a249725ebf5d}*SharedItemsImports = 13 - ..\Shared\Shared.projitems*{509b233a-35a0-41ca-a585-0b1a9f79d470}*SharedItemsImports = 13 - ..\PlatformShared\PlatformShared.projitems*{748981c3-5d0f-462a-9f56-a3c6d792ed30}*SharedItemsImports = 4 - ..\PlatformShared\PlatformShared.projitems*{91f5c72a-74d7-4c3f-8761-f692d4300660}*SharedItemsImports = 4 - ..\PlatformShared\PlatformShared.projitems*{99f08db7-a06e-4814-bdd6-bb87dbe278af}*SharedItemsImports = 4 - ..\PlatformShared\PlatformShared.projitems*{b8a92b38-b7db-450b-8d16-301404e9eadc}*SharedItemsImports = 4 - EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Debug|ARM = Debug|ARM diff --git a/samples/Gallery/Xamarin.Forms/Tizen/TizenOS.csproj b/samples/Gallery/Xamarin.Forms/Tizen/TizenOS.csproj index 78828cfb91..ab374f80c2 100644 --- a/samples/Gallery/Xamarin.Forms/Tizen/TizenOS.csproj +++ b/samples/Gallery/Xamarin.Forms/Tizen/TizenOS.csproj @@ -1,4 +1,4 @@ - + tizen40 @@ -18,9 +18,7 @@ - - - + @@ -63,11 +61,11 @@ - + + + - - diff --git a/samples/Gallery/Xamarin.Forms/UWP/UWP.csproj b/samples/Gallery/Xamarin.Forms/UWP/UWP.csproj index 647a63cf14..df1e1c42b2 100644 --- a/samples/Gallery/Xamarin.Forms/UWP/UWP.csproj +++ b/samples/Gallery/Xamarin.Forms/UWP/UWP.csproj @@ -92,6 +92,7 @@ + @@ -174,7 +175,9 @@ Designer - + + + 14.0 diff --git a/samples/Gallery/Xamarin.Forms/WPF/WPF.csproj b/samples/Gallery/Xamarin.Forms/WPF/WPF.csproj index 30ab2a41f6..4a035e6629 100644 --- a/samples/Gallery/Xamarin.Forms/WPF/WPF.csproj +++ b/samples/Gallery/Xamarin.Forms/WPF/WPF.csproj @@ -140,7 +140,9 @@ Always - + + + diff --git a/samples/Gallery/Xamarin.Forms/iOS/iOS.csproj b/samples/Gallery/Xamarin.Forms/iOS/iOS.csproj index 57239074ab..390c435853 100644 --- a/samples/Gallery/Xamarin.Forms/iOS/iOS.csproj +++ b/samples/Gallery/Xamarin.Forms/iOS/iOS.csproj @@ -24,7 +24,6 @@ i386, x86_64 None True - False False False @@ -44,7 +43,6 @@ Full i386, x86_64 false - False False False @@ -55,6 +53,7 @@ Default NSUrlSessionHandler False + iPhone Developer true @@ -69,7 +68,6 @@ iPhone Developer True Entitlements.plist - SdkOnly False False @@ -92,7 +90,6 @@ false iPhone Developer Entitlements.plist - Full False False @@ -112,6 +109,7 @@ + @@ -136,7 +134,7 @@ SkiaSharp.Views.iOS - {E01FBABA-8DA1-432B-9253-F4ABE13A3A6A} + {9AE564B8-2EF7-4102-B83A-89A03D4EA05C} Core @@ -169,6 +167,8 @@ - + + + \ No newline at end of file diff --git a/samples/Gallery/macOS/SkiaSharpSample.sln b/samples/Gallery/macOS/SkiaSharpSample.sln index 7cf1afa3d0..a96dc579ab 100644 --- a/samples/Gallery/macOS/SkiaSharpSample.sln +++ b/samples/Gallery/macOS/SkiaSharpSample.sln @@ -11,19 +11,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Views.Mac", "..\. EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.HarfBuzz", "..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.csproj", "{233220CC-F0F3-4C44-9736-ED2CFC363FD3}" EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "PlatformShared", "..\PlatformShared\PlatformShared.shproj", "{0CC41AB0-0C4C-4DAA-8F10-A249725EBF5D}" -EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Shared", "..\Shared\Shared.shproj", "{509B233A-35A0-41CA-A585-0B1A9F79D470}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpSample", "SkiaSharpSample\SkiaSharpSample.csproj", "{1BCAB142-0AEF-4ED1-A9A2-271D0A84C56A}" EndProject Global - GlobalSection(SharedMSBuildProjectFiles) = preSolution - ..\PlatformShared\PlatformShared.projitems*{0cc41ab0-0c4c-4daa-8f10-a249725ebf5d}*SharedItemsImports = 13 - ..\PlatformShared\PlatformShared.projitems*{1bcab142-0aef-4ed1-a9a2-271d0a84c56a}*SharedItemsImports = 4 - ..\Shared\Shared.projitems*{1bcab142-0aef-4ed1-a9a2-271d0a84c56a}*SharedItemsImports = 4 - ..\Shared\Shared.projitems*{509b233a-35a0-41ca-a585-0b1a9f79d470}*SharedItemsImports = 13 - EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU diff --git a/samples/Gallery/macOS/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Gallery/macOS/SkiaSharpSample/SkiaSharpSample.csproj index 4fffb2f084..583cc4734f 100644 --- a/samples/Gallery/macOS/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Gallery/macOS/SkiaSharpSample/SkiaSharpSample.csproj @@ -27,6 +27,10 @@ true true true + NSUrlSessionHandler + None + Mac Developer + 3rd Party Mac Developer Installer @@ -42,6 +46,10 @@ true true Full + Mac Developer + 3rd Party Mac Developer Installer + NSUrlSessionHandler + None @@ -101,7 +109,12 @@ Resources\content-font.ttf - - + + + + + + + \ No newline at end of file diff --git a/samples/Gallery/tvOS/SkiaSharpSample.sln b/samples/Gallery/tvOS/SkiaSharpSample.sln index 4d9824d7ec..866a8cbacb 100644 --- a/samples/Gallery/tvOS/SkiaSharpSample.sln +++ b/samples/Gallery/tvOS/SkiaSharpSample.sln @@ -11,19 +11,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Views.tvOS", "..\ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.HarfBuzz", "..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.csproj", "{233220CC-F0F3-4C44-9736-ED2CFC363FD3}" EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "PlatformShared", "..\PlatformShared\PlatformShared.shproj", "{0CC41AB0-0C4C-4DAA-8F10-A249725EBF5D}" -EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Shared", "..\Shared\Shared.shproj", "{509B233A-35A0-41CA-A585-0B1A9F79D470}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpSample", "SkiaSharpSample\SkiaSharpSample.csproj", "{28E3F6BA-ECCD-4925-B322-2BB47304A76C}" EndProject Global - GlobalSection(SharedMSBuildProjectFiles) = preSolution - ..\PlatformShared\PlatformShared.projitems*{0cc41ab0-0c4c-4daa-8f10-a249725ebf5d}*SharedItemsImports = 13 - ..\PlatformShared\PlatformShared.projitems*{28e3f6ba-eccd-4925-b322-2bb47304a76c}*SharedItemsImports = 4 - ..\Shared\Shared.projitems*{28e3f6ba-eccd-4925-b322-2bb47304a76c}*SharedItemsImports = 4 - ..\Shared\Shared.projitems*{509b233a-35a0-41ca-a585-0b1a9f79d470}*SharedItemsImports = 13 - EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Debug|iPhone = Debug|iPhone diff --git a/samples/Gallery/tvOS/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Gallery/tvOS/SkiaSharpSample/SkiaSharpSample.csproj index 72f1c3b0dc..b9b64530a0 100644 --- a/samples/Gallery/tvOS/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Gallery/tvOS/SkiaSharpSample/SkiaSharpSample.csproj @@ -24,7 +24,7 @@ true None x86_64 - HttpClientHandler + NSUrlSessionHandler Default @@ -40,7 +40,7 @@ Entitlements.plist Full ARM64 - HttpClientHandler + NSUrlSessionHandler Default @@ -52,7 +52,7 @@ iPhone Developer Full x86_64 - HttpClientHandler + NSUrlSessionHandler Default @@ -72,7 +72,7 @@ Entitlements.plist SdkOnly ARM64 - HttpClientHandler + NSUrlSessionHandler Default @@ -81,6 +81,9 @@ + + + {8d646738-458a-441f-b69b-253ef058a812} @@ -140,7 +143,12 @@ Resources\content-font.ttf - - + + + + + + + \ No newline at end of file