From ff5239a0078cbb1a2e1f151d061b58cc537f59ce Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 2 Jun 2022 19:02:14 +0200 Subject: [PATCH] Merge the "classic" projects (#2092) --- .../HarfBuzzSharp.Android.csproj | 23 -- .../HarfBuzzSharp.Classic.csproj | 61 ++++ .../HarfBuzzSharp.OSX.csproj | 19 - .../HarfBuzzSharp.Tizen.csproj | 23 -- .../HarfBuzzSharp.UWP.csproj | 22 -- .../HarfBuzzSharp.iOS.csproj | 19 - binding/HarfBuzzSharp.sln | 67 ---- .../HarfBuzzSharp.tvOS.csproj | 19 - .../HarfBuzzSharp.watchOS.csproj | 19 - binding/HarfBuzzSharp/HarfBuzzSharp.csproj | 3 +- .../nuget/build/tizen40/HarfBuzzSharp.targets | 0 .../SkiaSharp.Android.csproj | 22 -- .../SkiaSharp.Classic.csproj | 72 ++++ binding/SkiaSharp.OSX/SkiaSharp.OSX.csproj | 18 - .../SkiaSharp.Tizen/SkiaSharp.Tizen.csproj | 23 -- binding/SkiaSharp.UWP/SkiaSharp.UWP.csproj | 33 -- binding/SkiaSharp.iOS/SkiaSharp.iOS.csproj | 18 - binding/SkiaSharp.sln | 67 ---- binding/SkiaSharp.tvOS/SkiaSharp.tvOS.csproj | 18 - .../SkiaSharp.watchOS.csproj | 18 - binding/SkiaSharp/SkiaSharp.csproj | 3 +- .../nuget/build/tizen40/SkiaSharp.targets | 0 build.cake | 30 +- ...p.Views.Maui.Controls.Compatibility.nuspec | 6 +- nuget/SkiaSharp.Views.Maui.Controls.nuspec | 6 +- nuget/SkiaSharp.Views.Maui.Core.nuspec | 6 +- nuget/SkiaSharp.Views.Uno.WinUI.nuspec | 4 +- nuget/SkiaSharp.Views.WinUI.nuspec | 24 +- samples/Basic/Android/SkiaSharpSample.sln | 2 +- .../SkiaSharpSample/SkiaSharpSample.csproj | 4 +- samples/Basic/ElmSharp/SkiaSharpSample.sln | 2 +- .../SkiaSharpSample/SkiaSharpSample.csproj | 2 +- .../SkiaSharpSample/SkiaSharpSample.csproj | 8 +- samples/Basic/Tizen/SkiaSharpSample.sln | 2 +- .../SkiaSharpSample/SkiaSharpSample.csproj | 2 +- samples/Basic/UWP/SkiaSharpSample.sln | 2 +- .../SkiaSharpSample/SkiaSharpSample.csproj | 4 +- .../SkiaSharpSample.Android.csproj | 4 +- samples/Basic/Uno/SkiaSharpSample.Mac.sln | 30 +- .../SkiaSharpSample.UWP.csproj | 4 +- samples/Basic/Uno/SkiaSharpSample.Windows.sln | 24 +- .../SkiaSharpSample.iOS.csproj | 4 +- .../SkiaSharpSample.macOS.csproj | 4 +- samples/Basic/Uno/SkiaSharpSample.sln | 92 +---- .../SkiaSharpSample.Android.csproj | 4 +- .../Xamarin.Forms/SkiaSharpSample.Linux.sln | 2 +- .../Xamarin.Forms/SkiaSharpSample.Mac.sln | 44 +-- .../SkiaSharpSample.Tizen.csproj | 2 +- .../SkiaSharpSample.UWP.csproj | 4 +- .../Xamarin.Forms/SkiaSharpSample.Windows.sln | 46 +-- .../SkiaSharpSample.iOS.csproj | 4 +- .../SkiaSharpSample.macOS.csproj | 4 +- .../Basic/Xamarin.Forms/SkiaSharpSample.sln | 122 +------ samples/Basic/iOS/SkiaSharpSample.sln | 2 +- .../SkiaSharpSample/SkiaSharpSample.csproj | 4 +- samples/Basic/macOS/SkiaSharpSample.sln | 2 +- .../SkiaSharpSample/SkiaSharpSample.csproj | 4 +- samples/Basic/tvOS/SkiaSharpSample.sln | 2 +- .../SkiaSharpSample/SkiaSharpSample.csproj | 4 +- .../SkiaSharpSample.OnWatch.csproj | 4 +- .../SkiaSharpSample.OnWatchExtension.csproj | 4 +- samples/Basic/watchOS/SkiaSharpSample.sln | 2 +- samples/Gallery/UWP/SkiaSharpSample.sln | 4 +- .../SkiaSharpSample/SkiaSharpSample.csproj | 8 +- .../SkiaSharpSample.Android.csproj | 8 +- samples/Gallery/Uno/SkiaSharpSample.Mac.sln | 60 +--- .../SkiaSharpSample.UWP.csproj | 8 +- .../Gallery/Uno/SkiaSharpSample.Windows.sln | 48 +-- .../SkiaSharpSample.iOS.csproj | 8 +- .../SkiaSharpSample.macOS.csproj | 8 +- samples/Gallery/Uno/SkiaSharpSample.sln | 184 +--------- .../Xamarin.Forms/Android/Android.csproj | 8 +- samples/Gallery/Xamarin.Forms/Mac/Mac.csproj | 8 +- .../Xamarin.Forms/SkiaSharpSample.Linux.sln | 4 +- .../Xamarin.Forms/SkiaSharpSample.Mac.sln | 108 +----- .../Xamarin.Forms/SkiaSharpSample.Windows.sln | 48 +-- .../Gallery/Xamarin.Forms/SkiaSharpSample.sln | 244 +------------ .../Xamarin.Forms/Tizen/TizenOS.csproj | 4 +- samples/Gallery/Xamarin.Forms/UWP/UWP.csproj | 8 +- samples/Gallery/Xamarin.Forms/iOS/iOS.csproj | 8 +- samples/Gallery/macOS/SkiaSharpSample.sln | 4 +- .../SkiaSharpSample/SkiaSharpSample.csproj | 8 +- samples/Gallery/tvOS/SkiaSharpSample.sln | 4 +- .../SkiaSharpSample/SkiaSharpSample.csproj | 8 +- scripts/azure-templates-bootstrapper.yml | 25 +- scripts/get-free-space.ps1 | 7 + scripts/get-largest-folders.ps1 | 9 + scripts/install-vs.ps1 | 8 +- source/SkiaSharp.Build.props | 29 ++ .../SkiaSharp.HarfBuzz.csproj | 2 +- .../SkiaSharp.Views.Forms.Android.csproj | 2 +- .../SkiaSharp.Views.Forms.Mac.csproj | 2 +- .../SkiaSharp.Views.Forms.Tizen.csproj | 2 +- .../SkiaSharp.Views.Forms.UWP.csproj | 2 +- .../SkiaSharp.Views.Forms.iOS.csproj | 2 +- ...p.Views.Maui.Controls.Compatibility.csproj | 3 +- .../SkiaSharp.Views.Maui.Controls.csproj | 3 +- .../SkiaSharp.Views.Maui.Core.csproj | 3 +- .../SkiaSharp.Views.Uno.Android.csproj | 2 +- .../SkiaSharp.Views.Uno.Mac.csproj | 2 +- .../SkiaSharp.Views.Uno.iOS.csproj | 2 +- .../SkiaSharp.Views.WinUI.csproj | 2 +- .../SkiaSharp.Views.Android.csproj | 2 +- .../SkiaSharp.Views.Mac.csproj | 2 +- .../SkiaSharp.Views.Tizen.csproj | 2 +- .../SkiaSharp.Views.UWP.csproj | 2 +- .../SkiaSharp.Views.iOS.csproj | 2 +- .../SkiaSharp.Views.tvOS.csproj | 2 +- .../SkiaSharp.Views.watchOS.csproj | 2 +- .../SkiaSharp.Views/SkiaSharp.Views.csproj | 2 +- source/SkiaSharpSource.Linux.sln | 4 +- source/SkiaSharpSource.Mac.sln | 324 ------------------ source/SkiaSharpSource.Mac.slnf | 38 ++ source/SkiaSharpSource.Windows-net6.slnf | 6 +- source/SkiaSharpSource.Windows-netfx.slnf | 16 +- source/SkiaSharpSource.Windows.sln | 311 ----------------- source/SkiaSharpSource.Windows.slnf | 41 +++ source/SkiaSharpSource.sln | 97 +----- tests/SkiaSharp.Android.Tests.sln | 4 +- .../SkiaSharp.Android.Tests.csproj | 8 +- tests/SkiaSharp.iOS.Tests.sln | 4 +- .../SkiaSharp.iOS.Tests.csproj | 8 +- 122 files changed, 500 insertions(+), 2377 deletions(-) delete mode 100644 binding/HarfBuzzSharp.Android/HarfBuzzSharp.Android.csproj create mode 100644 binding/HarfBuzzSharp.Classic/HarfBuzzSharp.Classic.csproj delete mode 100644 binding/HarfBuzzSharp.OSX/HarfBuzzSharp.OSX.csproj delete mode 100644 binding/HarfBuzzSharp.Tizen/HarfBuzzSharp.Tizen.csproj delete mode 100644 binding/HarfBuzzSharp.UWP/HarfBuzzSharp.UWP.csproj delete mode 100644 binding/HarfBuzzSharp.iOS/HarfBuzzSharp.iOS.csproj delete mode 100644 binding/HarfBuzzSharp.sln delete mode 100644 binding/HarfBuzzSharp.tvOS/HarfBuzzSharp.tvOS.csproj delete mode 100644 binding/HarfBuzzSharp.watchOS/HarfBuzzSharp.watchOS.csproj rename binding/{HarfBuzzSharp.Tizen => HarfBuzzSharp}/nuget/build/tizen40/HarfBuzzSharp.targets (100%) delete mode 100644 binding/SkiaSharp.Android/SkiaSharp.Android.csproj create mode 100644 binding/SkiaSharp.Classic/SkiaSharp.Classic.csproj delete mode 100644 binding/SkiaSharp.OSX/SkiaSharp.OSX.csproj delete mode 100644 binding/SkiaSharp.Tizen/SkiaSharp.Tizen.csproj delete mode 100644 binding/SkiaSharp.UWP/SkiaSharp.UWP.csproj delete mode 100644 binding/SkiaSharp.iOS/SkiaSharp.iOS.csproj delete mode 100644 binding/SkiaSharp.sln delete mode 100644 binding/SkiaSharp.tvOS/SkiaSharp.tvOS.csproj delete mode 100644 binding/SkiaSharp.watchOS/SkiaSharp.watchOS.csproj rename binding/{SkiaSharp.Tizen => SkiaSharp}/nuget/build/tizen40/SkiaSharp.targets (100%) create mode 100644 scripts/get-free-space.ps1 create mode 100644 scripts/get-largest-folders.ps1 delete mode 100644 source/SkiaSharpSource.Mac.sln create mode 100644 source/SkiaSharpSource.Mac.slnf delete mode 100644 source/SkiaSharpSource.Windows.sln create mode 100644 source/SkiaSharpSource.Windows.slnf diff --git a/binding/HarfBuzzSharp.Android/HarfBuzzSharp.Android.csproj b/binding/HarfBuzzSharp.Android/HarfBuzzSharp.Android.csproj deleted file mode 100644 index 2550cab01..000000000 --- a/binding/HarfBuzzSharp.Android/HarfBuzzSharp.Android.csproj +++ /dev/null @@ -1,23 +0,0 @@ - - - monoandroid10.0 - HarfBuzzSharp - HarfBuzzSharp - HarfBuzzSharp - monoandroid1.0 - $(DefineConstants);HARFBUZZ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/binding/HarfBuzzSharp.Classic/HarfBuzzSharp.Classic.csproj b/binding/HarfBuzzSharp.Classic/HarfBuzzSharp.Classic.csproj new file mode 100644 index 000000000..14aac409e --- /dev/null +++ b/binding/HarfBuzzSharp.Classic/HarfBuzzSharp.Classic.csproj @@ -0,0 +1,61 @@ + + + $(ClassicTargetFrameworks) + HarfBuzzSharp + HarfBuzzSharp + HarfBuzzSharp + $(DefineConstants);HARFBUZZ + monoandroid1.0 + $(DefineConstants);__MACOS__ + $(DefineConstants);__TIZEN__; + false + 6.0.0.14995 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/binding/HarfBuzzSharp.OSX/HarfBuzzSharp.OSX.csproj b/binding/HarfBuzzSharp.OSX/HarfBuzzSharp.OSX.csproj deleted file mode 100644 index 3aabe54c9..000000000 --- a/binding/HarfBuzzSharp.OSX/HarfBuzzSharp.OSX.csproj +++ /dev/null @@ -1,19 +0,0 @@ - - - xamarinmac2.0 - HarfBuzzSharp - HarfBuzzSharp - HarfBuzzSharp - $(DefineConstants);HARFBUZZ;__MACOS__ - - - - - - - - - - - - \ No newline at end of file diff --git a/binding/HarfBuzzSharp.Tizen/HarfBuzzSharp.Tizen.csproj b/binding/HarfBuzzSharp.Tizen/HarfBuzzSharp.Tizen.csproj deleted file mode 100644 index ab4b35e15..000000000 --- a/binding/HarfBuzzSharp.Tizen/HarfBuzzSharp.Tizen.csproj +++ /dev/null @@ -1,23 +0,0 @@ - - - tizen40 - HarfBuzzSharp - HarfBuzzSharp - False - false - HarfBuzzSharp - $(DefineConstants);HARFBUZZ;__TIZEN__; - - - - - - - - - - - - - - diff --git a/binding/HarfBuzzSharp.UWP/HarfBuzzSharp.UWP.csproj b/binding/HarfBuzzSharp.UWP/HarfBuzzSharp.UWP.csproj deleted file mode 100644 index 096394808..000000000 --- a/binding/HarfBuzzSharp.UWP/HarfBuzzSharp.UWP.csproj +++ /dev/null @@ -1,22 +0,0 @@ - - - uap10.0.10240;uap10.0.16299 - HarfBuzzSharp - HarfBuzzSharp - HarfBuzzSharp - $(DefineConstants);HARFBUZZ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/binding/HarfBuzzSharp.iOS/HarfBuzzSharp.iOS.csproj b/binding/HarfBuzzSharp.iOS/HarfBuzzSharp.iOS.csproj deleted file mode 100644 index 3160dcc6e..000000000 --- a/binding/HarfBuzzSharp.iOS/HarfBuzzSharp.iOS.csproj +++ /dev/null @@ -1,19 +0,0 @@ - - - xamarinios1.0 - HarfBuzzSharp - HarfBuzzSharp - HarfBuzzSharp - $(DefineConstants);HARFBUZZ - - - - - - - - - - - - \ No newline at end of file diff --git a/binding/HarfBuzzSharp.sln b/binding/HarfBuzzSharp.sln deleted file mode 100644 index ba854db39..000000000 --- a/binding/HarfBuzzSharp.sln +++ /dev/null @@ -1,67 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29515.35 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.OSX", "HarfBuzzSharp.OSX\HarfBuzzSharp.OSX.csproj", "{30952C22-D566-488F-9D7A-2411B027D6CA}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.iOS", "HarfBuzzSharp.iOS\HarfBuzzSharp.iOS.csproj", "{E8192110-FCF9-4972-9472-7408BC2CA56B}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.tvOS", "HarfBuzzSharp.tvOS\HarfBuzzSharp.tvOS.csproj", "{8D646738-458A-441F-B69B-253EF058A812}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.watchOS", "HarfBuzzSharp.watchOS\HarfBuzzSharp.watchOS.csproj", "{0C940695-4868-4CF7-7D16-266BDD88A812}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.Android", "HarfBuzzSharp.Android\HarfBuzzSharp.Android.csproj", "{E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp", "HarfBuzzSharp\HarfBuzzSharp.csproj", "{9B6AABD6-65BD-467E-9DFA-FCC261525B48}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.UWP", "HarfBuzzSharp.UWP\HarfBuzzSharp.UWP.csproj", "{6D1E1F39-EF70-4211-A518-BBBAF02D6FFF}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.Tizen", "HarfBuzzSharp.Tizen\HarfBuzzSharp.Tizen.csproj", "{D0CBD4FC-4329-4D79-959B-47FDCFAE2869}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {30952C22-D566-488F-9D7A-2411B027D6CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {30952C22-D566-488F-9D7A-2411B027D6CA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {30952C22-D566-488F-9D7A-2411B027D6CA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {30952C22-D566-488F-9D7A-2411B027D6CA}.Release|Any CPU.Build.0 = Release|Any CPU - {E8192110-FCF9-4972-9472-7408BC2CA56B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E8192110-FCF9-4972-9472-7408BC2CA56B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E8192110-FCF9-4972-9472-7408BC2CA56B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E8192110-FCF9-4972-9472-7408BC2CA56B}.Release|Any CPU.Build.0 = Release|Any CPU - {8D646738-458A-441F-B69B-253EF058A812}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8D646738-458A-441F-B69B-253EF058A812}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8D646738-458A-441F-B69B-253EF058A812}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8D646738-458A-441F-B69B-253EF058A812}.Release|Any CPU.Build.0 = Release|Any CPU - {0C940695-4868-4CF7-7D16-266BDD88A812}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0C940695-4868-4CF7-7D16-266BDD88A812}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0C940695-4868-4CF7-7D16-266BDD88A812}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0C940695-4868-4CF7-7D16-266BDD88A812}.Release|Any CPU.Build.0 = Release|Any CPU - {E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}.Release|Any CPU.Build.0 = Release|Any CPU - {9B6AABD6-65BD-467E-9DFA-FCC261525B48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9B6AABD6-65BD-467E-9DFA-FCC261525B48}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9B6AABD6-65BD-467E-9DFA-FCC261525B48}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9B6AABD6-65BD-467E-9DFA-FCC261525B48}.Release|Any CPU.Build.0 = Release|Any CPU - {6D1E1F39-EF70-4211-A518-BBBAF02D6FFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6D1E1F39-EF70-4211-A518-BBBAF02D6FFF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6D1E1F39-EF70-4211-A518-BBBAF02D6FFF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6D1E1F39-EF70-4211-A518-BBBAF02D6FFF}.Release|Any CPU.Build.0 = Release|Any CPU - {D0CBD4FC-4329-4D79-959B-47FDCFAE2869}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D0CBD4FC-4329-4D79-959B-47FDCFAE2869}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D0CBD4FC-4329-4D79-959B-47FDCFAE2869}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D0CBD4FC-4329-4D79-959B-47FDCFAE2869}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {675DCAD3-0B5E-47EE-A0A9-5ED940B8B0AE} - EndGlobalSection -EndGlobal diff --git a/binding/HarfBuzzSharp.tvOS/HarfBuzzSharp.tvOS.csproj b/binding/HarfBuzzSharp.tvOS/HarfBuzzSharp.tvOS.csproj deleted file mode 100644 index 518774fdf..000000000 --- a/binding/HarfBuzzSharp.tvOS/HarfBuzzSharp.tvOS.csproj +++ /dev/null @@ -1,19 +0,0 @@ - - - xamarintvos1.0 - HarfBuzzSharp - HarfBuzzSharp - HarfBuzzSharp - $(DefineConstants);HARFBUZZ - - - - - - - - - - - - \ No newline at end of file diff --git a/binding/HarfBuzzSharp.watchOS/HarfBuzzSharp.watchOS.csproj b/binding/HarfBuzzSharp.watchOS/HarfBuzzSharp.watchOS.csproj deleted file mode 100644 index 62d7abbcd..000000000 --- a/binding/HarfBuzzSharp.watchOS/HarfBuzzSharp.watchOS.csproj +++ /dev/null @@ -1,19 +0,0 @@ - - - xamarinwatchos1.0 - HarfBuzzSharp - HarfBuzzSharp - HarfBuzzSharp - $(DefineConstants);HARFBUZZ - - - - - - - - - - - - \ No newline at end of file diff --git a/binding/HarfBuzzSharp/HarfBuzzSharp.csproj b/binding/HarfBuzzSharp/HarfBuzzSharp.csproj index 46cbe6a56..22aa41c01 100644 --- a/binding/HarfBuzzSharp/HarfBuzzSharp.csproj +++ b/binding/HarfBuzzSharp/HarfBuzzSharp.csproj @@ -1,7 +1,6 @@  - netstandard1.3;netstandard2.0;net462 - $(TargetFrameworks);net6.0-ios;net6.0-maccatalyst;net6.0-tvos;net6.0-macos;net6.0-android + $(AllTargetFrameworks) HarfBuzzSharp HarfBuzzSharp HarfBuzzSharp diff --git a/binding/HarfBuzzSharp.Tizen/nuget/build/tizen40/HarfBuzzSharp.targets b/binding/HarfBuzzSharp/nuget/build/tizen40/HarfBuzzSharp.targets similarity index 100% rename from binding/HarfBuzzSharp.Tizen/nuget/build/tizen40/HarfBuzzSharp.targets rename to binding/HarfBuzzSharp/nuget/build/tizen40/HarfBuzzSharp.targets diff --git a/binding/SkiaSharp.Android/SkiaSharp.Android.csproj b/binding/SkiaSharp.Android/SkiaSharp.Android.csproj deleted file mode 100644 index fe85f45f8..000000000 --- a/binding/SkiaSharp.Android/SkiaSharp.Android.csproj +++ /dev/null @@ -1,22 +0,0 @@ - - - monoandroid10.0 - SkiaSharp - SkiaSharp - SkiaSharp - monoandroid1.0 - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/binding/SkiaSharp.Classic/SkiaSharp.Classic.csproj b/binding/SkiaSharp.Classic/SkiaSharp.Classic.csproj new file mode 100644 index 000000000..e6df9fc4e --- /dev/null +++ b/binding/SkiaSharp.Classic/SkiaSharp.Classic.csproj @@ -0,0 +1,72 @@ + + + $(ClassicTargetFrameworks) + SkiaSharp + SkiaSharp + SkiaSharp + monoandroid1.0 + $(DefineConstants);__MACOS__ + $(DefineConstants);__TIZEN__; + false + 6.0.0.14995 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/binding/SkiaSharp.OSX/SkiaSharp.OSX.csproj b/binding/SkiaSharp.OSX/SkiaSharp.OSX.csproj deleted file mode 100644 index ff286833a..000000000 --- a/binding/SkiaSharp.OSX/SkiaSharp.OSX.csproj +++ /dev/null @@ -1,18 +0,0 @@ - - - xamarinmac2.0 - SkiaSharp - SkiaSharp - SkiaSharp - - - - - - - - - - - - \ No newline at end of file diff --git a/binding/SkiaSharp.Tizen/SkiaSharp.Tizen.csproj b/binding/SkiaSharp.Tizen/SkiaSharp.Tizen.csproj deleted file mode 100644 index 7203a20f8..000000000 --- a/binding/SkiaSharp.Tizen/SkiaSharp.Tizen.csproj +++ /dev/null @@ -1,23 +0,0 @@ - - - tizen40 - SkiaSharp - SkiaSharp - False - false - SkiaSharp - $(DefineConstants);__TIZEN__; - - - - - - - - - - - - - - diff --git a/binding/SkiaSharp.UWP/SkiaSharp.UWP.csproj b/binding/SkiaSharp.UWP/SkiaSharp.UWP.csproj deleted file mode 100644 index c62cc55a9..000000000 --- a/binding/SkiaSharp.UWP/SkiaSharp.UWP.csproj +++ /dev/null @@ -1,33 +0,0 @@ - - - uap10.0.10240;uap10.0.16299 - SkiaSharp - SkiaSharp - SkiaSharp - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/binding/SkiaSharp.iOS/SkiaSharp.iOS.csproj b/binding/SkiaSharp.iOS/SkiaSharp.iOS.csproj deleted file mode 100644 index f8f6f023b..000000000 --- a/binding/SkiaSharp.iOS/SkiaSharp.iOS.csproj +++ /dev/null @@ -1,18 +0,0 @@ - - - xamarinios1.0 - SkiaSharp - SkiaSharp - SkiaSharp - - - - - - - - - - - - \ No newline at end of file diff --git a/binding/SkiaSharp.sln b/binding/SkiaSharp.sln deleted file mode 100644 index ced5c897e..000000000 --- a/binding/SkiaSharp.sln +++ /dev/null @@ -1,67 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29515.35 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Android", "SkiaSharp.Android\SkiaSharp.Android.csproj", "{C737DC80-5B71-4B26-A2DC-DA30421788B0}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.iOS", "SkiaSharp.iOS\SkiaSharp.iOS.csproj", "{6A678CFB-21A7-4E81-8909-FD72ABBFD408}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.tvOS", "SkiaSharp.tvOS\SkiaSharp.tvOS.csproj", "{5180E370-A455-42BB-99F9-97BD269B8A52}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.watchOS", "SkiaSharp.watchOS\SkiaSharp.watchOS.csproj", "{099A4BAD-6CF7-4898-9D16-266BDD844F95}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.OSX", "SkiaSharp.OSX\SkiaSharp.OSX.csproj", "{4588A759-3853-49B8-8A68-6C7917BE9220}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.UWP", "SkiaSharp.UWP\SkiaSharp.UWP.csproj", "{BAB615AA-956E-4079-B260-DD7B1F52EC7D}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp", "SkiaSharp\SkiaSharp.csproj", "{4E0924F8-D546-4428-9412-4B9411FBA5FF}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Tizen", "SkiaSharp.Tizen\SkiaSharp.Tizen.csproj", "{A48813C8-9C4A-477F-A34C-FCAFFE751037}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {C737DC80-5B71-4B26-A2DC-DA30421788B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C737DC80-5B71-4B26-A2DC-DA30421788B0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C737DC80-5B71-4B26-A2DC-DA30421788B0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C737DC80-5B71-4B26-A2DC-DA30421788B0}.Release|Any CPU.Build.0 = Release|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Release|Any CPU.Build.0 = Release|Any CPU - {5180E370-A455-42BB-99F9-97BD269B8A52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5180E370-A455-42BB-99F9-97BD269B8A52}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5180E370-A455-42BB-99F9-97BD269B8A52}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5180E370-A455-42BB-99F9-97BD269B8A52}.Release|Any CPU.Build.0 = Release|Any CPU - {099A4BAD-6CF7-4898-9D16-266BDD844F95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {099A4BAD-6CF7-4898-9D16-266BDD844F95}.Debug|Any CPU.Build.0 = Debug|Any CPU - {099A4BAD-6CF7-4898-9D16-266BDD844F95}.Release|Any CPU.ActiveCfg = Release|Any CPU - {099A4BAD-6CF7-4898-9D16-266BDD844F95}.Release|Any CPU.Build.0 = Release|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Release|Any CPU.Build.0 = Release|Any CPU - {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Release|Any CPU.Build.0 = Release|Any CPU - {4E0924F8-D546-4428-9412-4B9411FBA5FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4E0924F8-D546-4428-9412-4B9411FBA5FF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4E0924F8-D546-4428-9412-4B9411FBA5FF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4E0924F8-D546-4428-9412-4B9411FBA5FF}.Release|Any CPU.Build.0 = Release|Any CPU - {A48813C8-9C4A-477F-A34C-FCAFFE751037}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A48813C8-9C4A-477F-A34C-FCAFFE751037}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A48813C8-9C4A-477F-A34C-FCAFFE751037}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A48813C8-9C4A-477F-A34C-FCAFFE751037}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {43994D8B-018E-4297-B592-6BEDC30E542A} - EndGlobalSection -EndGlobal diff --git a/binding/SkiaSharp.tvOS/SkiaSharp.tvOS.csproj b/binding/SkiaSharp.tvOS/SkiaSharp.tvOS.csproj deleted file mode 100644 index 2729cb06f..000000000 --- a/binding/SkiaSharp.tvOS/SkiaSharp.tvOS.csproj +++ /dev/null @@ -1,18 +0,0 @@ - - - xamarintvos1.0 - SkiaSharp - SkiaSharp - SkiaSharp - - - - - - - - - - - - \ No newline at end of file diff --git a/binding/SkiaSharp.watchOS/SkiaSharp.watchOS.csproj b/binding/SkiaSharp.watchOS/SkiaSharp.watchOS.csproj deleted file mode 100644 index 7272c8c46..000000000 --- a/binding/SkiaSharp.watchOS/SkiaSharp.watchOS.csproj +++ /dev/null @@ -1,18 +0,0 @@ - - - xamarinwatchos1.0 - SkiaSharp - SkiaSharp - SkiaSharp - - - - - - - - - - - - \ No newline at end of file diff --git a/binding/SkiaSharp/SkiaSharp.csproj b/binding/SkiaSharp/SkiaSharp.csproj index 44235e826..27814eeca 100644 --- a/binding/SkiaSharp/SkiaSharp.csproj +++ b/binding/SkiaSharp/SkiaSharp.csproj @@ -1,7 +1,6 @@  - netstandard1.3;netstandard2.0;net462 - $(TargetFrameworks);net6.0-ios;net6.0-maccatalyst;net6.0-tvos;net6.0-macos;net6.0-android + $(AllTargetFrameworks) SkiaSharp SkiaSharp SkiaSharp diff --git a/binding/SkiaSharp.Tizen/nuget/build/tizen40/SkiaSharp.targets b/binding/SkiaSharp/nuget/build/tizen40/SkiaSharp.targets similarity index 100% rename from binding/SkiaSharp.Tizen/nuget/build/tizen40/SkiaSharp.targets rename to binding/SkiaSharp/nuget/build/tizen40/SkiaSharp.targets diff --git a/build.cake b/build.cake index 2383698d4..1c04df3ab 100644 --- a/build.cake +++ b/build.cake @@ -34,7 +34,6 @@ var SKIP_EXTERNALS = Argument ("skipexternals", "") .ToLower ().Split (new [] { ',' }, StringSplitOptions.RemoveEmptyEntries); var SKIP_BUILD = Argument ("skipbuild", false); var PACK_ALL_PLATFORMS = Argument ("packall", Argument ("PackAllPlatforms", false)); -var BUILD_ALL_PLATFORMS = Argument ("buildall", Argument ("BuildAllPlatforms", false)); var PRINT_ALL_ENV_VARS = Argument ("printAllEnvVars", false); var UNSUPPORTED_TESTS = Argument ("unsupportedTests", ""); var THROW_ON_TEST_FAILURE = Argument ("throwOnTestFailure", true); @@ -153,14 +152,12 @@ Task ("libs") { // build the managed libraries var platform = ""; - if (!BUILD_ALL_PLATFORMS) { - if (IsRunningOnWindows ()) { - platform = ".Windows"; - } else if (IsRunningOnMacOs ()) { - platform = ".Mac"; - } else if (IsRunningOnLinux ()) { - platform = ".Linux"; - } + if (IsRunningOnWindows ()) { + platform = ".Windows"; + } else if (IsRunningOnMacOs ()) { + platform = ".Mac"; + } else if (IsRunningOnLinux ()) { + platform = ".Linux"; } var net6 = $"./source/SkiaSharpSource{platform}-net6.slnf"; @@ -171,7 +168,12 @@ Task ("libs") if (FileExists (netfx)) RunMSBuild (netfx, properties: new Dictionary { { "BuildingForNet6", "false" } }); } else { - RunMSBuild ($"./source/SkiaSharpSource{platform}.sln"); + var slnf = $"./source/SkiaSharpSource{platform}.slnf"; + var sln = $"./source/SkiaSharpSource{platform}.sln"; + if (FileExists (slnf)) + RunMSBuild (slnf); + else + RunMSBuild (sln); } // assemble the mdoc docs @@ -298,6 +300,9 @@ Task ("tests-android") FilePath csproj = "./tests/SkiaSharp.Android.Tests/SkiaSharp.Android.Tests.csproj"; RunMSBuild (csproj, targets: new [] { "SignAndroidPackage" }, + properties: new Dictionary { + { "BuildTestOnly", "true" }, + }, platform: "AnyCPU", configuration: "Debug"); // run the tests @@ -338,7 +343,10 @@ Task ("tests-ios") // package the app FilePath csproj = "./tests/SkiaSharp.iOS.Tests/SkiaSharp.iOS.Tests.csproj"; RunMSBuild (csproj, - properties: new Dictionary { { "BuildIpa", "true" } }, + properties: new Dictionary { + { "BuildIpa", "true" }, + { "BuildTestOnly", "true" }, + }, platform: "iPhoneSimulator", configuration: "Debug"); // run the tests diff --git a/nuget/SkiaSharp.Views.Maui.Controls.Compatibility.nuspec b/nuget/SkiaSharp.Views.Maui.Controls.Compatibility.nuspec index 266832f20..329cc3106 100644 --- a/nuget/SkiaSharp.Views.Maui.Controls.Compatibility.nuspec +++ b/nuget/SkiaSharp.Views.Maui.Controls.Compatibility.nuspec @@ -39,7 +39,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release - + @@ -56,8 +56,8 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release - - + + diff --git a/nuget/SkiaSharp.Views.Maui.Controls.nuspec b/nuget/SkiaSharp.Views.Maui.Controls.nuspec index ce2e24db0..c34e99d27 100644 --- a/nuget/SkiaSharp.Views.Maui.Controls.nuspec +++ b/nuget/SkiaSharp.Views.Maui.Controls.nuspec @@ -39,7 +39,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release - + @@ -56,8 +56,8 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release - - + + diff --git a/nuget/SkiaSharp.Views.Maui.Core.nuspec b/nuget/SkiaSharp.Views.Maui.Core.nuspec index e7c8d80b7..7fcbf135b 100644 --- a/nuget/SkiaSharp.Views.Maui.Core.nuspec +++ b/nuget/SkiaSharp.Views.Maui.Core.nuspec @@ -42,7 +42,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release - + @@ -60,8 +60,8 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release - - + + diff --git a/nuget/SkiaSharp.Views.Uno.WinUI.nuspec b/nuget/SkiaSharp.Views.Uno.WinUI.nuspec index 4a2d65c49..577e8ab3c 100644 --- a/nuget/SkiaSharp.Views.Uno.WinUI.nuspec +++ b/nuget/SkiaSharp.Views.Uno.WinUI.nuspec @@ -48,7 +48,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release - + @@ -82,7 +82,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release - + diff --git a/nuget/SkiaSharp.Views.WinUI.nuspec b/nuget/SkiaSharp.Views.WinUI.nuspec index bcb646ae4..8e09c87d0 100644 --- a/nuget/SkiaSharp.Views.WinUI.nuspec +++ b/nuget/SkiaSharp.Views.WinUI.nuspec @@ -27,15 +27,15 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release © Microsoft Corporation. All rights reserved. - + - + - + @@ -45,15 +45,15 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release - - - - - - - - - + + + + + + + + + diff --git a/samples/Basic/Android/SkiaSharpSample.sln b/samples/Basic/Android/SkiaSharpSample.sln index 46d0f62c4..c8718d781 100644 --- a/samples/Basic/Android/SkiaSharpSample.sln +++ b/samples/Basic/Android/SkiaSharpSample.sln @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.27130.2010 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Android", "..\..\..\binding\SkiaSharp.Android\SkiaSharp.Android.csproj", "{C737DC80-5B71-4B26-A2DC-DA30421788B0}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Classic", "..\..\..\binding\SkiaSharp.Classic\SkiaSharp.Classic.csproj", "{C737DC80-5B71-4B26-A2DC-DA30421788B0}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Views.Android", "..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.Android\SkiaSharp.Views.Android.csproj", "{926C8D29-E047-4F4E-8B35-852E47BFA9F5}" EndProject diff --git a/samples/Basic/Android/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/Android/SkiaSharpSample/SkiaSharpSample.csproj index f8b47e76b..05b7b1d6b 100644 --- a/samples/Basic/Android/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/Android/SkiaSharpSample/SkiaSharpSample.csproj @@ -66,9 +66,9 @@ {926C8D29-E047-4F4E-8B35-852E47BFA9F5} SkiaSharp.Views.Android - + {C737DC80-5B71-4B26-A2DC-DA30421788B0} - SkiaSharp.Android + SkiaSharp.Classic diff --git a/samples/Basic/ElmSharp/SkiaSharpSample.sln b/samples/Basic/ElmSharp/SkiaSharpSample.sln index 6ba0b5c9f..6c3b613ae 100644 --- a/samples/Basic/ElmSharp/SkiaSharpSample.sln +++ b/samples/Basic/ElmSharp/SkiaSharpSample.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.27130.2010 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Tizen", "..\..\..\binding\SkiaSharp.Tizen\SkiaSharp.Tizen.csproj", "{A7B25831-3EA3-4F88-AA82-4D4CA66B19C6}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Classic", "..\..\..\binding\SkiaSharp.Classic\SkiaSharp.Classic.csproj", "{A7B25831-3EA3-4F88-AA82-4D4CA66B19C6}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Tizen", "..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.Tizen\SkiaSharp.Views.Tizen.csproj", "{E0AAA975-BCF0-46F9-8E95-407FD6931850}" EndProject diff --git a/samples/Basic/ElmSharp/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/ElmSharp/SkiaSharpSample/SkiaSharpSample.csproj index 70c082c08..ef6d672cb 100644 --- a/samples/Basic/ElmSharp/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/ElmSharp/SkiaSharpSample/SkiaSharpSample.csproj @@ -9,7 +9,7 @@ - + diff --git a/samples/Basic/Maui/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/Maui/SkiaSharpSample/SkiaSharpSample.csproj index 05409c2ba..3ad92c507 100644 --- a/samples/Basic/Maui/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/Maui/SkiaSharpSample/SkiaSharpSample.csproj @@ -28,10 +28,10 @@ + + + + --> diff --git a/samples/Basic/Tizen/SkiaSharpSample.sln b/samples/Basic/Tizen/SkiaSharpSample.sln index f7c00e199..b7c6878a9 100644 --- a/samples/Basic/Tizen/SkiaSharpSample.sln +++ b/samples/Basic/Tizen/SkiaSharpSample.sln @@ -5,7 +5,7 @@ VisualStudioVersion = 15.0.27130.2010 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharpSample", "SkiaSharpSample\SkiaSharpSample.csproj", "{B178E8E3-A5AD-4C98-B365-86E05EE53643}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Tizen", "..\..\..\binding\SkiaSharp.Tizen\SkiaSharp.Tizen.csproj", "{A7B25831-3EA3-4F88-AA82-4D4CA66B19C6}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Classic", "..\..\..\binding\SkiaSharp.Classic\SkiaSharp.Classic.csproj", "{A7B25831-3EA3-4F88-AA82-4D4CA66B19C6}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Tizen", "..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.Tizen\SkiaSharp.Views.Tizen.csproj", "{E0AAA975-BCF0-46F9-8E95-407FD6931850}" EndProject diff --git a/samples/Basic/Tizen/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/Tizen/SkiaSharpSample/SkiaSharpSample.csproj index c67f7d36c..7f623d674 100644 --- a/samples/Basic/Tizen/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/Tizen/SkiaSharpSample/SkiaSharpSample.csproj @@ -14,7 +14,7 @@ - + diff --git a/samples/Basic/UWP/SkiaSharpSample.sln b/samples/Basic/UWP/SkiaSharpSample.sln index 79d57ae9f..f884b338f 100644 --- a/samples/Basic/UWP/SkiaSharpSample.sln +++ b/samples/Basic/UWP/SkiaSharpSample.sln @@ -5,7 +5,7 @@ VisualStudioVersion = 16.0.30126.178 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.UWP", "..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.UWP\SkiaSharp.Views.UWP.csproj", "{8BB20362-91A2-4206-944D-634070EAC6F3}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.UWP", "..\..\..\binding\SkiaSharp.UWP\SkiaSharp.UWP.csproj", "{BAB615AA-956E-4079-B260-DD7B1F52EC7D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Classic", "..\..\..\binding\SkiaSharp.Classic\SkiaSharp.Classic.csproj", "{BAB615AA-956E-4079-B260-DD7B1F52EC7D}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpSample", "SkiaSharpSample\SkiaSharpSample.csproj", "{91B64285-C797-49FD-8252-EAD97BA38E27}" EndProject diff --git a/samples/Basic/UWP/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/UWP/SkiaSharpSample/SkiaSharpSample.csproj index 7d6a60186..7b3148fdb 100644 --- a/samples/Basic/UWP/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/UWP/SkiaSharpSample/SkiaSharpSample.csproj @@ -117,9 +117,9 @@ - + {bab615aa-956e-4079-b260-dd7b1f52ec7d} - SkiaSharp.UWP + SkiaSharp.Classic {8bb20362-91a2-4206-944d-634070eac6f3} diff --git a/samples/Basic/Uno/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj b/samples/Basic/Uno/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj index 636db1bb9..018c70dc1 100644 --- a/samples/Basic/Uno/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj +++ b/samples/Basic/Uno/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj @@ -66,9 +66,9 @@ - + {C737DC80-5B71-4B26-A2DC-DA30421788B0} - SkiaSharp.Android + SkiaSharp.Classic {9e1af626-f23d-486a-bc3a-11a49553540f} diff --git a/samples/Basic/Uno/SkiaSharpSample.Mac.sln b/samples/Basic/Uno/SkiaSharpSample.Mac.sln index 4df7e10f9..4ba53cb58 100644 --- a/samples/Basic/Uno/SkiaSharpSample.Mac.sln +++ b/samples/Basic/Uno/SkiaSharpSample.Mac.sln @@ -17,11 +17,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Uno.iOS", " EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Uno.Android", "..\..\..\source\SkiaSharp.Views.Uno\SkiaSharp.Views.Uno.Android\SkiaSharp.Views.Uno.Android.csproj", "{9E1AF626-F23D-486A-BC3A-11A49553540F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Android", "..\..\..\binding\SkiaSharp.Android\SkiaSharp.Android.csproj", "{EEE85A59-6C9E-4AA9-A89D-B4A205B53BDE}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.iOS", "..\..\..\binding\SkiaSharp.iOS\SkiaSharp.iOS.csproj", "{E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.OSX", "..\..\..\binding\SkiaSharp.OSX\SkiaSharp.OSX.csproj", "{816E7EC5-91AF-4BCE-ACB7-52725EE475B8}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Classic", "..\..\..\binding\SkiaSharp.Classic\SkiaSharp.Classic.csproj", "{EEE85A59-6C9E-4AA9-A89D-B4A205B53BDE}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp", "..\..\..\binding\SkiaSharp\SkiaSharp.csproj", "{409AF271-D8B7-4F79-B293-02F562A51955}" EndProject @@ -131,30 +127,6 @@ Global {EEE85A59-6C9E-4AA9-A89D-B4A205B53BDE}.Release|iPhone.Build.0 = Release|Any CPU {EEE85A59-6C9E-4AA9-A89D-B4A205B53BDE}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU {EEE85A59-6C9E-4AA9-A89D-B4A205B53BDE}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Debug|iPhone.Build.0 = Debug|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Release|Any CPU.Build.0 = Release|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Release|iPhone.ActiveCfg = Release|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Release|iPhone.Build.0 = Release|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Debug|iPhone.Build.0 = Debug|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Release|Any CPU.Build.0 = Release|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Release|iPhone.ActiveCfg = Release|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Release|iPhone.Build.0 = Release|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Release|iPhoneSimulator.Build.0 = Release|Any CPU {409AF271-D8B7-4F79-B293-02F562A51955}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {409AF271-D8B7-4F79-B293-02F562A51955}.Debug|Any CPU.Build.0 = Debug|Any CPU {409AF271-D8B7-4F79-B293-02F562A51955}.Debug|iPhone.ActiveCfg = Debug|Any CPU diff --git a/samples/Basic/Uno/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj b/samples/Basic/Uno/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj index 46125183a..4c190cc1a 100644 --- a/samples/Basic/Uno/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj +++ b/samples/Basic/Uno/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj @@ -120,9 +120,9 @@ - + {bab615aa-956e-4079-b260-dd7b1f52ec7d} - SkiaSharp.UWP + SkiaSharp.Classic {8bb20362-91a2-4206-944d-634070eac6f3} diff --git a/samples/Basic/Uno/SkiaSharpSample.Windows.sln b/samples/Basic/Uno/SkiaSharpSample.Windows.sln index 43e347295..d33145d1d 100644 --- a/samples/Basic/Uno/SkiaSharpSample.Windows.sln +++ b/samples/Basic/Uno/SkiaSharpSample.Windows.sln @@ -11,12 +11,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpSample.UWP", "Skia EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Uno.Android", "..\..\..\source\SkiaSharp.Views.Uno\SkiaSharp.Views.Uno.Android\SkiaSharp.Views.Uno.Android.csproj", "{9E1AF626-F23D-486A-BC3A-11A49553540F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Android", "..\..\..\binding\SkiaSharp.Android\SkiaSharp.Android.csproj", "{EEE85A59-6C9E-4AA9-A89D-B4A205B53BDE}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Classic", "..\..\..\binding\SkiaSharp.Classic\SkiaSharp.Classic.csproj", "{EEE85A59-6C9E-4AA9-A89D-B4A205B53BDE}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.UWP", "..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.UWP\SkiaSharp.Views.UWP.csproj", "{5ABDBD0B-87CB-4C9B-9EDE-360062E74BC7}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.UWP", "..\..\..\binding\SkiaSharp.UWP\SkiaSharp.UWP.csproj", "{6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharpSample.Wasm", "SkiaSharpSample.Wasm\SkiaSharpSample.Wasm.csproj", "{9726301D-8A93-4A06-88DF-92BA01CF80AD}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Uno.Wasm", "..\..\..\source\SkiaSharp.Views.Uno\SkiaSharp.Views.Uno.Wasm\SkiaSharp.Views.Uno.Wasm.csproj", "{1787D9BF-9815-4E1D-BDEB-9994859FE91E}" @@ -163,26 +161,6 @@ Global {5ABDBD0B-87CB-4C9B-9EDE-360062E74BC7}.Release|x64.Build.0 = Release|Any CPU {5ABDBD0B-87CB-4C9B-9EDE-360062E74BC7}.Release|x86.ActiveCfg = Release|Any CPU {5ABDBD0B-87CB-4C9B-9EDE-360062E74BC7}.Release|x86.Build.0 = Release|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Debug|ARM.ActiveCfg = Debug|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Debug|ARM.Build.0 = Debug|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Debug|ARM64.Build.0 = Debug|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Debug|x64.ActiveCfg = Debug|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Debug|x64.Build.0 = Debug|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Debug|x86.ActiveCfg = Debug|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Debug|x86.Build.0 = Debug|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Release|Any CPU.Build.0 = Release|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Release|ARM.ActiveCfg = Release|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Release|ARM.Build.0 = Release|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Release|ARM64.ActiveCfg = Release|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Release|ARM64.Build.0 = Release|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Release|x64.ActiveCfg = Release|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Release|x64.Build.0 = Release|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Release|x86.ActiveCfg = Release|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Release|x86.Build.0 = Release|Any CPU {9726301D-8A93-4A06-88DF-92BA01CF80AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9726301D-8A93-4A06-88DF-92BA01CF80AD}.Debug|Any CPU.Build.0 = Debug|Any CPU {9726301D-8A93-4A06-88DF-92BA01CF80AD}.Debug|ARM.ActiveCfg = Debug|Any CPU diff --git a/samples/Basic/Uno/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj b/samples/Basic/Uno/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj index 260b336e5..203e77398 100644 --- a/samples/Basic/Uno/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj +++ b/samples/Basic/Uno/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj @@ -104,9 +104,9 @@ - + {6A678CFB-21A7-4E81-8909-FD72ABBFD408} - SkiaSharp.iOS + SkiaSharp.Classic {9b0eb9f0-6114-4adf-8a4b-562daeb29c48} diff --git a/samples/Basic/Uno/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj b/samples/Basic/Uno/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj index bb32649ba..55ee5ce03 100644 --- a/samples/Basic/Uno/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj +++ b/samples/Basic/Uno/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj @@ -50,9 +50,9 @@ - + {816e7ec5-91af-4bce-acb7-52725ee475b8} - SkiaSharp.OSX + SkiaSharp.Classic {052ce6f4-abc1-4419-902f-999250d2ec83} diff --git a/samples/Basic/Uno/SkiaSharpSample.sln b/samples/Basic/Uno/SkiaSharpSample.sln index f543aae26..6010b005e 100644 --- a/samples/Basic/Uno/SkiaSharpSample.sln +++ b/samples/Basic/Uno/SkiaSharpSample.sln @@ -18,16 +18,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Uno.iOS", " EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Uno.Android", "..\..\..\source\SkiaSharp.Views.Uno\SkiaSharp.Views.Uno.Android\SkiaSharp.Views.Uno.Android.csproj", "{9E1AF626-F23D-486A-BC3A-11A49553540F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Android", "..\..\..\binding\SkiaSharp.Android\SkiaSharp.Android.csproj", "{EEE85A59-6C9E-4AA9-A89D-B4A205B53BDE}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.iOS", "..\..\..\binding\SkiaSharp.iOS\SkiaSharp.iOS.csproj", "{E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.OSX", "..\..\..\binding\SkiaSharp.OSX\SkiaSharp.OSX.csproj", "{816E7EC5-91AF-4BCE-ACB7-52725EE475B8}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Classic", "..\..\..\binding\SkiaSharp.Classic\SkiaSharp.Classic.csproj", "{EEE85A59-6C9E-4AA9-A89D-B4A205B53BDE}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.UWP", "..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.UWP\SkiaSharp.Views.UWP.csproj", "{5ABDBD0B-87CB-4C9B-9EDE-360062E74BC7}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.UWP", "..\..\..\binding\SkiaSharp.UWP\SkiaSharp.UWP.csproj", "{6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharpSample.Wasm", "SkiaSharpSample.Wasm\SkiaSharpSample.Wasm.csproj", "{9726301D-8A93-4A06-88DF-92BA01CF80AD}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Uno.Wasm", "..\..\..\source\SkiaSharp.Views.Uno\SkiaSharp.Views.Uno.Wasm\SkiaSharp.Views.Uno.Wasm.csproj", "{1787D9BF-9815-4E1D-BDEB-9994859FE91E}" @@ -321,62 +315,6 @@ Global {EEE85A59-6C9E-4AA9-A89D-B4A205B53BDE}.Release|x64.Build.0 = Release|Any CPU {EEE85A59-6C9E-4AA9-A89D-B4A205B53BDE}.Release|x86.ActiveCfg = Release|Any CPU {EEE85A59-6C9E-4AA9-A89D-B4A205B53BDE}.Release|x86.Build.0 = Release|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Debug|ARM.ActiveCfg = Debug|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Debug|ARM.Build.0 = Debug|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Debug|ARM64.Build.0 = Debug|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Debug|iPhone.Build.0 = Debug|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Debug|x64.ActiveCfg = Debug|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Debug|x64.Build.0 = Debug|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Debug|x86.ActiveCfg = Debug|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Debug|x86.Build.0 = Debug|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Release|Any CPU.Build.0 = Release|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Release|ARM.ActiveCfg = Release|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Release|ARM.Build.0 = Release|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Release|ARM64.ActiveCfg = Release|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Release|ARM64.Build.0 = Release|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Release|iPhone.ActiveCfg = Release|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Release|iPhone.Build.0 = Release|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Release|x64.ActiveCfg = Release|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Release|x64.Build.0 = Release|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Release|x86.ActiveCfg = Release|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Release|x86.Build.0 = Release|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Debug|ARM.ActiveCfg = Debug|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Debug|ARM.Build.0 = Debug|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Debug|ARM64.Build.0 = Debug|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Debug|iPhone.Build.0 = Debug|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Debug|x64.ActiveCfg = Debug|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Debug|x64.Build.0 = Debug|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Debug|x86.ActiveCfg = Debug|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Debug|x86.Build.0 = Debug|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Release|Any CPU.Build.0 = Release|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Release|ARM.ActiveCfg = Release|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Release|ARM.Build.0 = Release|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Release|ARM64.ActiveCfg = Release|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Release|ARM64.Build.0 = Release|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Release|iPhone.ActiveCfg = Release|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Release|iPhone.Build.0 = Release|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Release|x64.ActiveCfg = Release|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Release|x64.Build.0 = Release|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Release|x86.ActiveCfg = Release|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Release|x86.Build.0 = Release|Any CPU {5ABDBD0B-87CB-4C9B-9EDE-360062E74BC7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {5ABDBD0B-87CB-4C9B-9EDE-360062E74BC7}.Debug|Any CPU.Build.0 = Debug|Any CPU {5ABDBD0B-87CB-4C9B-9EDE-360062E74BC7}.Debug|ARM.ActiveCfg = Debug|Any CPU @@ -405,34 +343,6 @@ Global {5ABDBD0B-87CB-4C9B-9EDE-360062E74BC7}.Release|x64.Build.0 = Release|Any CPU {5ABDBD0B-87CB-4C9B-9EDE-360062E74BC7}.Release|x86.ActiveCfg = Release|Any CPU {5ABDBD0B-87CB-4C9B-9EDE-360062E74BC7}.Release|x86.Build.0 = Release|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Debug|ARM.ActiveCfg = Debug|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Debug|ARM.Build.0 = Debug|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Debug|ARM64.Build.0 = Debug|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Debug|iPhone.Build.0 = Debug|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Debug|x64.ActiveCfg = Debug|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Debug|x64.Build.0 = Debug|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Debug|x86.ActiveCfg = Debug|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Debug|x86.Build.0 = Debug|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Release|Any CPU.Build.0 = Release|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Release|ARM.ActiveCfg = Release|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Release|ARM.Build.0 = Release|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Release|ARM64.ActiveCfg = Release|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Release|ARM64.Build.0 = Release|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Release|iPhone.ActiveCfg = Release|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Release|iPhone.Build.0 = Release|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Release|x64.ActiveCfg = Release|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Release|x64.Build.0 = Release|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Release|x86.ActiveCfg = Release|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Release|x86.Build.0 = Release|Any CPU {9726301D-8A93-4A06-88DF-92BA01CF80AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9726301D-8A93-4A06-88DF-92BA01CF80AD}.Debug|Any CPU.Build.0 = Debug|Any CPU {9726301D-8A93-4A06-88DF-92BA01CF80AD}.Debug|ARM.ActiveCfg = Debug|Any CPU diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj b/samples/Basic/Xamarin.Forms/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj index 2b8adeea4..12e74d8c2 100644 --- a/samples/Basic/Xamarin.Forms/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj +++ b/samples/Basic/Xamarin.Forms/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj @@ -53,9 +53,9 @@ - + {c737dc80-5b71-4b26-a2dc-da30421788b0} - SkiaSharp.Android + SkiaSharp.Classic {2f94f024-1841-47e8-b521-74aa4e3eba54} diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample.Linux.sln b/samples/Basic/Xamarin.Forms/SkiaSharpSample.Linux.sln index 06121aca5..639e36f16 100644 --- a/samples/Basic/Xamarin.Forms/SkiaSharpSample.Linux.sln +++ b/samples/Basic/Xamarin.Forms/SkiaSharpSample.Linux.sln @@ -13,7 +13,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharpSample", "SkiaShar EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharpSample.Tizen", "SkiaSharpSample.Tizen\SkiaSharpSample.Tizen.csproj", "{B7066619-8AF0-4980-A83D-49A8B9007523}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Tizen", "..\..\..\binding\SkiaSharp.Tizen\SkiaSharp.Tizen.csproj", "{A7B25831-3EA3-4F88-AA82-4D4CA66B19C6}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Classic", "..\..\..\binding\SkiaSharp.Classic\SkiaSharp.Classic.csproj", "{A7B25831-3EA3-4F88-AA82-4D4CA66B19C6}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Tizen", "..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.Tizen\SkiaSharp.Views.Tizen.csproj", "{E0AAA975-BCF0-46F9-8E95-407FD6931850}" EndProject diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample.Mac.sln b/samples/Basic/Xamarin.Forms/SkiaSharpSample.Mac.sln index bc3e2aacd..7d8f297d1 100644 --- a/samples/Basic/Xamarin.Forms/SkiaSharpSample.Mac.sln +++ b/samples/Basic/Xamarin.Forms/SkiaSharpSample.Mac.sln @@ -3,11 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.27130.2010 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Android", "..\..\..\binding\SkiaSharp.Android\SkiaSharp.Android.csproj", "{C737DC80-5B71-4B26-A2DC-DA30421788B0}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.iOS", "..\..\..\binding\SkiaSharp.iOS\SkiaSharp.iOS.csproj", "{6A678CFB-21A7-4E81-8909-FD72ABBFD408}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.OSX", "..\..\..\binding\SkiaSharp.OSX\SkiaSharp.OSX.csproj", "{4588A759-3853-49B8-8A68-6C7917BE9220}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Classic", "..\..\..\binding\SkiaSharp.Classic\SkiaSharp.Classic.csproj", "{C737DC80-5B71-4B26-A2DC-DA30421788B0}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp", "..\..\..\binding\SkiaSharp\SkiaSharp.csproj", "{4E0924F8-D546-4428-9412-4B9411FBA5FF}" EndProject @@ -35,8 +31,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpSample.iOS", "Skia EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpSample.macOS", "SkiaSharpSample.macOS\SkiaSharpSample.macOS.csproj", "{1D7EC18C-1780-4C46-8736-A3661DA20AEE}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Tizen", "..\..\..\binding\SkiaSharp.Tizen\SkiaSharp.Tizen.csproj", "{8B624EFE-6F9E-4153-8AE7-2B4143EC1FE8}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Tizen", "..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.Tizen\SkiaSharp.Views.Tizen.csproj", "{973E39F9-2415-41BC-B442-2EFFD5F3F91E}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Forms.Tizen", "..\..\..\source\SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.Tizen\SkiaSharp.Views.Forms.Tizen.csproj", "{173BEFE8-FEA9-45E7-9821-92F8D6B439D7}" @@ -69,30 +63,6 @@ Global {C737DC80-5B71-4B26-A2DC-DA30421788B0}.Release|iPhone.Build.0 = Release|Any CPU {C737DC80-5B71-4B26-A2DC-DA30421788B0}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU {C737DC80-5B71-4B26-A2DC-DA30421788B0}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Debug|iPhone.Build.0 = Debug|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Release|Any CPU.Build.0 = Release|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Release|iPhone.ActiveCfg = Release|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Release|iPhone.Build.0 = Release|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Debug|iPhone.Build.0 = Debug|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Release|Any CPU.Build.0 = Release|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Release|iPhone.ActiveCfg = Release|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Release|iPhone.Build.0 = Release|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Release|iPhoneSimulator.Build.0 = Release|Any CPU {4E0924F8-D546-4428-9412-4B9411FBA5FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4E0924F8-D546-4428-9412-4B9411FBA5FF}.Debug|Any CPU.Build.0 = Debug|Any CPU {4E0924F8-D546-4428-9412-4B9411FBA5FF}.Debug|iPhone.ActiveCfg = Debug|Any CPU @@ -261,18 +231,6 @@ Global {1D7EC18C-1780-4C46-8736-A3661DA20AEE}.Release|iPhone.Build.0 = Release|Any CPU {1D7EC18C-1780-4C46-8736-A3661DA20AEE}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU {1D7EC18C-1780-4C46-8736-A3661DA20AEE}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {8B624EFE-6F9E-4153-8AE7-2B4143EC1FE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8B624EFE-6F9E-4153-8AE7-2B4143EC1FE8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8B624EFE-6F9E-4153-8AE7-2B4143EC1FE8}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {8B624EFE-6F9E-4153-8AE7-2B4143EC1FE8}.Debug|iPhone.Build.0 = Debug|Any CPU - {8B624EFE-6F9E-4153-8AE7-2B4143EC1FE8}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {8B624EFE-6F9E-4153-8AE7-2B4143EC1FE8}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {8B624EFE-6F9E-4153-8AE7-2B4143EC1FE8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8B624EFE-6F9E-4153-8AE7-2B4143EC1FE8}.Release|Any CPU.Build.0 = Release|Any CPU - {8B624EFE-6F9E-4153-8AE7-2B4143EC1FE8}.Release|iPhone.ActiveCfg = Release|Any CPU - {8B624EFE-6F9E-4153-8AE7-2B4143EC1FE8}.Release|iPhone.Build.0 = Release|Any CPU - {8B624EFE-6F9E-4153-8AE7-2B4143EC1FE8}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {8B624EFE-6F9E-4153-8AE7-2B4143EC1FE8}.Release|iPhoneSimulator.Build.0 = Release|Any CPU {973E39F9-2415-41BC-B442-2EFFD5F3F91E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {973E39F9-2415-41BC-B442-2EFFD5F3F91E}.Debug|Any CPU.Build.0 = Debug|Any CPU {973E39F9-2415-41BC-B442-2EFFD5F3F91E}.Debug|iPhone.ActiveCfg = Debug|Any CPU diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample.Tizen/SkiaSharpSample.Tizen.csproj b/samples/Basic/Xamarin.Forms/SkiaSharpSample.Tizen/SkiaSharpSample.Tizen.csproj index b859b8b9c..63299d6e1 100644 --- a/samples/Basic/Xamarin.Forms/SkiaSharpSample.Tizen/SkiaSharpSample.Tizen.csproj +++ b/samples/Basic/Xamarin.Forms/SkiaSharpSample.Tizen/SkiaSharpSample.Tizen.csproj @@ -19,7 +19,7 @@ - + diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj b/samples/Basic/Xamarin.Forms/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj index 4072fc569..93d63ca19 100644 --- a/samples/Basic/Xamarin.Forms/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj +++ b/samples/Basic/Xamarin.Forms/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj @@ -118,9 +118,9 @@ - + {bab615aa-956e-4079-b260-dd7b1f52ec7d} - SkiaSharp.UWP + SkiaSharp.Classic {3a1277b5-cfae-48cc-b64b-4dae1222a3eb} diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample.Windows.sln b/samples/Basic/Xamarin.Forms/SkiaSharpSample.Windows.sln index dbbda5adf..dfef34222 100644 --- a/samples/Basic/Xamarin.Forms/SkiaSharpSample.Windows.sln +++ b/samples/Basic/Xamarin.Forms/SkiaSharpSample.Windows.sln @@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Forms.UWP", EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.UWP", "..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.UWP\SkiaSharp.Views.UWP.csproj", "{8BB20362-91A2-4206-944D-634070EAC6F3}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.UWP", "..\..\..\binding\SkiaSharp.UWP\SkiaSharp.UWP.csproj", "{BAB615AA-956E-4079-B260-DD7B1F52EC7D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Classic", "..\..\..\binding\SkiaSharp.Classic\SkiaSharp.Classic.csproj", "{BAB615AA-956E-4079-B260-DD7B1F52EC7D}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.WPF", "..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.WPF\SkiaSharp.Views.WPF.csproj", "{743CF830-D458-41A9-865A-F85126562015}" EndProject @@ -19,8 +19,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpSample.UWP", "Skia EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharpSample", "SkiaSharpSample\SkiaSharpSample.csproj", "{B178E8E3-A5AD-4C98-B365-86E05EE53643}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Tizen", "..\..\..\binding\SkiaSharp.Tizen\SkiaSharp.Tizen.csproj", "{2DE8E184-D6F5-4760-AEC9-9B9DD8419701}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Tizen", "..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.Tizen\SkiaSharp.Views.Tizen.csproj", "{FC2B2B83-0A2B-4833-A1E0-C99F0FAF77E2}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Forms.Tizen", "..\..\..\source\SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.Tizen\SkiaSharp.Views.Forms.Tizen.csproj", "{61C08F1C-2818-4581-9236-A91346A5FDFD}" @@ -33,8 +31,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Forms.Andro EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Android", "..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.Android\SkiaSharp.Views.Android.csproj", "{4D08B41A-372A-44BB-9DDE-A268703DA3FB}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Android", "..\..\..\binding\SkiaSharp.Android\SkiaSharp.Android.csproj", "{5F6EAF9E-C34E-4A06-BCDB-907A6FE163E7}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Forms.WPF", "..\..\..\source\SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.WPF\SkiaSharp.Views.Forms.WPF.csproj", "{3E27D220-E905-421C-8864-E0E0860711EC}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpSample.WPF", "SkiaSharpSample.WPF\SkiaSharpSample.WPF.csproj", "{748981C3-5D0F-462A-9F56-A3C6D792ED30}" @@ -227,26 +223,6 @@ Global {B178E8E3-A5AD-4C98-B365-86E05EE53643}.Release|x64.Build.0 = Release|Any CPU {B178E8E3-A5AD-4C98-B365-86E05EE53643}.Release|x86.ActiveCfg = Release|Any CPU {B178E8E3-A5AD-4C98-B365-86E05EE53643}.Release|x86.Build.0 = Release|Any CPU - {2DE8E184-D6F5-4760-AEC9-9B9DD8419701}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2DE8E184-D6F5-4760-AEC9-9B9DD8419701}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2DE8E184-D6F5-4760-AEC9-9B9DD8419701}.Debug|ARM.ActiveCfg = Debug|Any CPU - {2DE8E184-D6F5-4760-AEC9-9B9DD8419701}.Debug|ARM.Build.0 = Debug|Any CPU - {2DE8E184-D6F5-4760-AEC9-9B9DD8419701}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {2DE8E184-D6F5-4760-AEC9-9B9DD8419701}.Debug|ARM64.Build.0 = Debug|Any CPU - {2DE8E184-D6F5-4760-AEC9-9B9DD8419701}.Debug|x64.ActiveCfg = Debug|Any CPU - {2DE8E184-D6F5-4760-AEC9-9B9DD8419701}.Debug|x64.Build.0 = Debug|Any CPU - {2DE8E184-D6F5-4760-AEC9-9B9DD8419701}.Debug|x86.ActiveCfg = Debug|Any CPU - {2DE8E184-D6F5-4760-AEC9-9B9DD8419701}.Debug|x86.Build.0 = Debug|Any CPU - {2DE8E184-D6F5-4760-AEC9-9B9DD8419701}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2DE8E184-D6F5-4760-AEC9-9B9DD8419701}.Release|Any CPU.Build.0 = Release|Any CPU - {2DE8E184-D6F5-4760-AEC9-9B9DD8419701}.Release|ARM.ActiveCfg = Release|Any CPU - {2DE8E184-D6F5-4760-AEC9-9B9DD8419701}.Release|ARM.Build.0 = Release|Any CPU - {2DE8E184-D6F5-4760-AEC9-9B9DD8419701}.Release|ARM64.ActiveCfg = Release|Any CPU - {2DE8E184-D6F5-4760-AEC9-9B9DD8419701}.Release|ARM64.Build.0 = Release|Any CPU - {2DE8E184-D6F5-4760-AEC9-9B9DD8419701}.Release|x64.ActiveCfg = Release|Any CPU - {2DE8E184-D6F5-4760-AEC9-9B9DD8419701}.Release|x64.Build.0 = Release|Any CPU - {2DE8E184-D6F5-4760-AEC9-9B9DD8419701}.Release|x86.ActiveCfg = Release|Any CPU - {2DE8E184-D6F5-4760-AEC9-9B9DD8419701}.Release|x86.Build.0 = Release|Any CPU {FC2B2B83-0A2B-4833-A1E0-C99F0FAF77E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {FC2B2B83-0A2B-4833-A1E0-C99F0FAF77E2}.Debug|Any CPU.Build.0 = Debug|Any CPU {FC2B2B83-0A2B-4833-A1E0-C99F0FAF77E2}.Debug|ARM.ActiveCfg = Debug|Any CPU @@ -377,26 +353,6 @@ Global {4D08B41A-372A-44BB-9DDE-A268703DA3FB}.Release|x64.Build.0 = Release|Any CPU {4D08B41A-372A-44BB-9DDE-A268703DA3FB}.Release|x86.ActiveCfg = Release|Any CPU {4D08B41A-372A-44BB-9DDE-A268703DA3FB}.Release|x86.Build.0 = Release|Any CPU - {5F6EAF9E-C34E-4A06-BCDB-907A6FE163E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5F6EAF9E-C34E-4A06-BCDB-907A6FE163E7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5F6EAF9E-C34E-4A06-BCDB-907A6FE163E7}.Debug|ARM.ActiveCfg = Debug|Any CPU - {5F6EAF9E-C34E-4A06-BCDB-907A6FE163E7}.Debug|ARM.Build.0 = Debug|Any CPU - {5F6EAF9E-C34E-4A06-BCDB-907A6FE163E7}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {5F6EAF9E-C34E-4A06-BCDB-907A6FE163E7}.Debug|ARM64.Build.0 = Debug|Any CPU - {5F6EAF9E-C34E-4A06-BCDB-907A6FE163E7}.Debug|x64.ActiveCfg = Debug|Any CPU - {5F6EAF9E-C34E-4A06-BCDB-907A6FE163E7}.Debug|x64.Build.0 = Debug|Any CPU - {5F6EAF9E-C34E-4A06-BCDB-907A6FE163E7}.Debug|x86.ActiveCfg = Debug|Any CPU - {5F6EAF9E-C34E-4A06-BCDB-907A6FE163E7}.Debug|x86.Build.0 = Debug|Any CPU - {5F6EAF9E-C34E-4A06-BCDB-907A6FE163E7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5F6EAF9E-C34E-4A06-BCDB-907A6FE163E7}.Release|Any CPU.Build.0 = Release|Any CPU - {5F6EAF9E-C34E-4A06-BCDB-907A6FE163E7}.Release|ARM.ActiveCfg = Release|Any CPU - {5F6EAF9E-C34E-4A06-BCDB-907A6FE163E7}.Release|ARM.Build.0 = Release|Any CPU - {5F6EAF9E-C34E-4A06-BCDB-907A6FE163E7}.Release|ARM64.ActiveCfg = Release|Any CPU - {5F6EAF9E-C34E-4A06-BCDB-907A6FE163E7}.Release|ARM64.Build.0 = Release|Any CPU - {5F6EAF9E-C34E-4A06-BCDB-907A6FE163E7}.Release|x64.ActiveCfg = Release|Any CPU - {5F6EAF9E-C34E-4A06-BCDB-907A6FE163E7}.Release|x64.Build.0 = Release|Any CPU - {5F6EAF9E-C34E-4A06-BCDB-907A6FE163E7}.Release|x86.ActiveCfg = Release|Any CPU - {5F6EAF9E-C34E-4A06-BCDB-907A6FE163E7}.Release|x86.Build.0 = Release|Any CPU {3E27D220-E905-421C-8864-E0E0860711EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3E27D220-E905-421C-8864-E0E0860711EC}.Debug|Any CPU.Build.0 = Debug|Any CPU {3E27D220-E905-421C-8864-E0E0860711EC}.Debug|ARM.ActiveCfg = Debug|Any CPU diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj b/samples/Basic/Xamarin.Forms/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj index 43ba5f139..856fc89c7 100644 --- a/samples/Basic/Xamarin.Forms/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj +++ b/samples/Basic/Xamarin.Forms/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj @@ -72,9 +72,9 @@ - + {6a678cfb-21a7-4e81-8909-fd72abbfd408} - SkiaSharp.iOS + SkiaSharp.Classic {4ac36d63-bf11-445f-81ee-107c0cef4fc9} diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj b/samples/Basic/Xamarin.Forms/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj index 670ff4c6e..f7bc271a1 100644 --- a/samples/Basic/Xamarin.Forms/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj +++ b/samples/Basic/Xamarin.Forms/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj @@ -69,9 +69,9 @@ {DA5DA4D8-4885-4AF2-96BB-AE803C344AB0} SkiaSharp.Views.Forms.Mac - + {4588A759-3853-49B8-8A68-6C7917BE9220} - SkiaSharp.OSX + SkiaSharp.Classic {B178E8E3-A5AD-4C98-B365-86E05EE53643} diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample.sln b/samples/Basic/Xamarin.Forms/SkiaSharpSample.sln index 488ceb803..fb0d9dcf5 100644 --- a/samples/Basic/Xamarin.Forms/SkiaSharpSample.sln +++ b/samples/Basic/Xamarin.Forms/SkiaSharpSample.sln @@ -17,13 +17,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Mac", "..\. EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.UWP", "..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.UWP\SkiaSharp.Views.UWP.csproj", "{8BB20362-91A2-4206-944D-634070EAC6F3}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Android", "..\..\..\binding\SkiaSharp.Android\SkiaSharp.Android.csproj", "{C737DC80-5B71-4B26-A2DC-DA30421788B0}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.iOS", "..\..\..\binding\SkiaSharp.iOS\SkiaSharp.iOS.csproj", "{6A678CFB-21A7-4E81-8909-FD72ABBFD408}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.OSX", "..\..\..\binding\SkiaSharp.OSX\SkiaSharp.OSX.csproj", "{4588A759-3853-49B8-8A68-6C7917BE9220}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.UWP", "..\..\..\binding\SkiaSharp.UWP\SkiaSharp.UWP.csproj", "{BAB615AA-956E-4079-B260-DD7B1F52EC7D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Classic", "..\..\..\binding\SkiaSharp.Classic\SkiaSharp.Classic.csproj", "{C737DC80-5B71-4B26-A2DC-DA30421788B0}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.WPF", "..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.WPF\SkiaSharp.Views.WPF.csproj", "{743CF830-D458-41A9-865A-F85126562015}" EndProject @@ -47,8 +41,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpSample.macOS", "Sk EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharpSample.Tizen", "SkiaSharpSample.Tizen\SkiaSharpSample.Tizen.csproj", "{B7066619-8AF0-4980-A83D-49A8B9007523}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Tizen", "..\..\..\binding\SkiaSharp.Tizen\SkiaSharp.Tizen.csproj", "{A7B25831-3EA3-4F88-AA82-4D4CA66B19C6}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Tizen", "..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.Tizen\SkiaSharp.Views.Tizen.csproj", "{E0AAA975-BCF0-46F9-8E95-407FD6931850}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Forms.Tizen", "..\..\..\source\SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.Tizen\SkiaSharp.Views.Forms.Tizen.csproj", "{CB4BF122-0676-4487-A95D-3BA9E3CD6049}" @@ -307,90 +299,6 @@ Global {C737DC80-5B71-4B26-A2DC-DA30421788B0}.Release|x64.Build.0 = Release|Any CPU {C737DC80-5B71-4B26-A2DC-DA30421788B0}.Release|x86.ActiveCfg = Release|Any CPU {C737DC80-5B71-4B26-A2DC-DA30421788B0}.Release|x86.Build.0 = Release|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Debug|ARM.ActiveCfg = Debug|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Debug|ARM.Build.0 = Debug|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Debug|ARM64.Build.0 = Debug|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Debug|iPhone.Build.0 = Debug|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Debug|x64.ActiveCfg = Debug|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Debug|x64.Build.0 = Debug|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Debug|x86.ActiveCfg = Debug|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Debug|x86.Build.0 = Debug|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Release|Any CPU.Build.0 = Release|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Release|ARM.ActiveCfg = Release|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Release|ARM.Build.0 = Release|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Release|ARM64.ActiveCfg = Release|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Release|ARM64.Build.0 = Release|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Release|iPhone.ActiveCfg = Release|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Release|iPhone.Build.0 = Release|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Release|x64.ActiveCfg = Release|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Release|x64.Build.0 = Release|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Release|x86.ActiveCfg = Release|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Release|x86.Build.0 = Release|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Debug|ARM.ActiveCfg = Debug|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Debug|ARM.Build.0 = Debug|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Debug|ARM64.Build.0 = Debug|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Debug|iPhone.Build.0 = Debug|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Debug|x64.ActiveCfg = Debug|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Debug|x64.Build.0 = Debug|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Debug|x86.ActiveCfg = Debug|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Debug|x86.Build.0 = Debug|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Release|Any CPU.Build.0 = Release|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Release|ARM.ActiveCfg = Release|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Release|ARM.Build.0 = Release|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Release|ARM64.ActiveCfg = Release|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Release|ARM64.Build.0 = Release|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Release|iPhone.ActiveCfg = Release|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Release|iPhone.Build.0 = Release|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Release|x64.ActiveCfg = Release|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Release|x64.Build.0 = Release|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Release|x86.ActiveCfg = Release|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Release|x86.Build.0 = Release|Any CPU - {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Debug|ARM.ActiveCfg = Debug|Any CPU - {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Debug|ARM.Build.0 = Debug|Any CPU - {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Debug|ARM64.Build.0 = Debug|Any CPU - {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Debug|iPhone.Build.0 = Debug|Any CPU - {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Debug|x64.ActiveCfg = Debug|Any CPU - {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Debug|x64.Build.0 = Debug|Any CPU - {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Debug|x86.ActiveCfg = Debug|Any CPU - {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Debug|x86.Build.0 = Debug|Any CPU - {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Release|Any CPU.Build.0 = Release|Any CPU - {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Release|ARM.ActiveCfg = Release|Any CPU - {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Release|ARM.Build.0 = Release|Any CPU - {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Release|ARM64.ActiveCfg = Release|Any CPU - {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Release|ARM64.Build.0 = Release|Any CPU - {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Release|iPhone.ActiveCfg = Release|Any CPU - {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Release|iPhone.Build.0 = Release|Any CPU - {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Release|x64.ActiveCfg = Release|Any CPU - {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Release|x64.Build.0 = Release|Any CPU - {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Release|x86.ActiveCfg = Release|Any CPU - {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Release|x86.Build.0 = Release|Any CPU {743CF830-D458-41A9-865A-F85126562015}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {743CF830-D458-41A9-865A-F85126562015}.Debug|Any CPU.Build.0 = Debug|Any CPU {743CF830-D458-41A9-865A-F85126562015}.Debug|ARM.ActiveCfg = Debug|Any CPU @@ -741,34 +649,6 @@ Global {B7066619-8AF0-4980-A83D-49A8B9007523}.Release|x64.Build.0 = Release|Any CPU {B7066619-8AF0-4980-A83D-49A8B9007523}.Release|x86.ActiveCfg = Release|Any CPU {B7066619-8AF0-4980-A83D-49A8B9007523}.Release|x86.Build.0 = Release|Any CPU - {A7B25831-3EA3-4F88-AA82-4D4CA66B19C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A7B25831-3EA3-4F88-AA82-4D4CA66B19C6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A7B25831-3EA3-4F88-AA82-4D4CA66B19C6}.Debug|ARM.ActiveCfg = Debug|Any CPU - {A7B25831-3EA3-4F88-AA82-4D4CA66B19C6}.Debug|ARM.Build.0 = Debug|Any CPU - {A7B25831-3EA3-4F88-AA82-4D4CA66B19C6}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {A7B25831-3EA3-4F88-AA82-4D4CA66B19C6}.Debug|ARM64.Build.0 = Debug|Any CPU - {A7B25831-3EA3-4F88-AA82-4D4CA66B19C6}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {A7B25831-3EA3-4F88-AA82-4D4CA66B19C6}.Debug|iPhone.Build.0 = Debug|Any CPU - {A7B25831-3EA3-4F88-AA82-4D4CA66B19C6}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {A7B25831-3EA3-4F88-AA82-4D4CA66B19C6}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {A7B25831-3EA3-4F88-AA82-4D4CA66B19C6}.Debug|x64.ActiveCfg = Debug|Any CPU - {A7B25831-3EA3-4F88-AA82-4D4CA66B19C6}.Debug|x64.Build.0 = Debug|Any CPU - {A7B25831-3EA3-4F88-AA82-4D4CA66B19C6}.Debug|x86.ActiveCfg = Debug|Any CPU - {A7B25831-3EA3-4F88-AA82-4D4CA66B19C6}.Debug|x86.Build.0 = Debug|Any CPU - {A7B25831-3EA3-4F88-AA82-4D4CA66B19C6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A7B25831-3EA3-4F88-AA82-4D4CA66B19C6}.Release|Any CPU.Build.0 = Release|Any CPU - {A7B25831-3EA3-4F88-AA82-4D4CA66B19C6}.Release|ARM.ActiveCfg = Release|Any CPU - {A7B25831-3EA3-4F88-AA82-4D4CA66B19C6}.Release|ARM.Build.0 = Release|Any CPU - {A7B25831-3EA3-4F88-AA82-4D4CA66B19C6}.Release|ARM64.ActiveCfg = Release|Any CPU - {A7B25831-3EA3-4F88-AA82-4D4CA66B19C6}.Release|ARM64.Build.0 = Release|Any CPU - {A7B25831-3EA3-4F88-AA82-4D4CA66B19C6}.Release|iPhone.ActiveCfg = Release|Any CPU - {A7B25831-3EA3-4F88-AA82-4D4CA66B19C6}.Release|iPhone.Build.0 = Release|Any CPU - {A7B25831-3EA3-4F88-AA82-4D4CA66B19C6}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {A7B25831-3EA3-4F88-AA82-4D4CA66B19C6}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {A7B25831-3EA3-4F88-AA82-4D4CA66B19C6}.Release|x64.ActiveCfg = Release|Any CPU - {A7B25831-3EA3-4F88-AA82-4D4CA66B19C6}.Release|x64.Build.0 = Release|Any CPU - {A7B25831-3EA3-4F88-AA82-4D4CA66B19C6}.Release|x86.ActiveCfg = Release|Any CPU - {A7B25831-3EA3-4F88-AA82-4D4CA66B19C6}.Release|x86.Build.0 = Release|Any CPU {E0AAA975-BCF0-46F9-8E95-407FD6931850}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E0AAA975-BCF0-46F9-8E95-407FD6931850}.Debug|Any CPU.Build.0 = Debug|Any CPU {E0AAA975-BCF0-46F9-8E95-407FD6931850}.Debug|ARM.ActiveCfg = Debug|Any CPU diff --git a/samples/Basic/iOS/SkiaSharpSample.sln b/samples/Basic/iOS/SkiaSharpSample.sln index 22ef94f8c..35d15b0dc 100644 --- a/samples/Basic/iOS/SkiaSharpSample.sln +++ b/samples/Basic/iOS/SkiaSharpSample.sln @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.27130.2010 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.iOS", "..\..\..\binding\SkiaSharp.iOS\SkiaSharp.iOS.csproj", "{6A678CFB-21A7-4E81-8909-FD72ABBFD408}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Classic", "..\..\..\binding\SkiaSharp.Classic\SkiaSharp.Classic.csproj", "{6A678CFB-21A7-4E81-8909-FD72ABBFD408}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Views.iOS", "..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.iOS\SkiaSharp.Views.iOS.csproj", "{74C78108-9199-4A7A-928C-FC4DC57D0AE4}" EndProject diff --git a/samples/Basic/iOS/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/iOS/SkiaSharpSample/SkiaSharpSample.csproj index d6524b6a5..cd682a831 100644 --- a/samples/Basic/iOS/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/iOS/SkiaSharpSample/SkiaSharpSample.csproj @@ -91,9 +91,9 @@ - + {6A678CFB-21A7-4E81-8909-FD72ABBFD408} - SkiaSharp.iOS + SkiaSharp.Classic {74C78108-9199-4A7A-928C-FC4DC57D0AE4} diff --git a/samples/Basic/macOS/SkiaSharpSample.sln b/samples/Basic/macOS/SkiaSharpSample.sln index eaac29378..5a5b4621d 100644 --- a/samples/Basic/macOS/SkiaSharpSample.sln +++ b/samples/Basic/macOS/SkiaSharpSample.sln @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.27130.2010 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.OSX", "..\..\..\binding\SkiaSharp.OSX\SkiaSharp.OSX.csproj", "{4588A759-3853-49B8-8A68-6C7917BE9220}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Classic", "..\..\..\binding\SkiaSharp.Classic\SkiaSharp.Classic.csproj", "{4588A759-3853-49B8-8A68-6C7917BE9220}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Views.Mac", "..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.Mac\SkiaSharp.Views.Mac.csproj", "{809A15DC-E675-4A24-83FA-DF13160F7E4C}" EndProject diff --git a/samples/Basic/macOS/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/macOS/SkiaSharpSample/SkiaSharpSample.csproj index 89aac0122..a8b8976ed 100644 --- a/samples/Basic/macOS/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/macOS/SkiaSharpSample/SkiaSharpSample.csproj @@ -57,9 +57,9 @@ - + {4588A759-3853-49B8-8A68-6C7917BE9220} - SkiaSharp.OSX + SkiaSharp.Classic {809A15DC-E675-4A24-83FA-DF13160F7E4C} diff --git a/samples/Basic/tvOS/SkiaSharpSample.sln b/samples/Basic/tvOS/SkiaSharpSample.sln index 259b6f6b1..a2d3131c5 100644 --- a/samples/Basic/tvOS/SkiaSharpSample.sln +++ b/samples/Basic/tvOS/SkiaSharpSample.sln @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.27130.2010 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.tvOS", "..\..\..\binding\SkiaSharp.tvOS\SkiaSharp.tvOS.csproj", "{5180E370-A455-42BB-99F9-97BD269B8A52}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Classic", "..\..\..\binding\SkiaSharp.Classic\SkiaSharp.Classic.csproj", "{5180E370-A455-42BB-99F9-97BD269B8A52}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Views.tvOS", "..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.tvOS\SkiaSharp.Views.tvOS.csproj", "{E5973829-6C8B-43E4-B81B-C8492DF26C90}" EndProject diff --git a/samples/Basic/tvOS/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/tvOS/SkiaSharpSample/SkiaSharpSample.csproj index 82cdf59bd..7669c80de 100644 --- a/samples/Basic/tvOS/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/tvOS/SkiaSharpSample/SkiaSharpSample.csproj @@ -130,9 +130,9 @@ - + {5180E370-A455-42BB-99F9-97BD269B8A52} - SkiaSharp.tvOS + SkiaSharp.Classic {E5973829-6C8B-43E4-B81B-C8492DF26C90} diff --git a/samples/Basic/watchOS/SkiaSharpSample.OnWatch/SkiaSharpSample.OnWatch.csproj b/samples/Basic/watchOS/SkiaSharpSample.OnWatch/SkiaSharpSample.OnWatch.csproj index 915722d26..0e69c303c 100644 --- a/samples/Basic/watchOS/SkiaSharpSample.OnWatch/SkiaSharpSample.OnWatch.csproj +++ b/samples/Basic/watchOS/SkiaSharpSample.OnWatch/SkiaSharpSample.OnWatch.csproj @@ -91,9 +91,9 @@ {9B82BB1F-18DD-47A6-B4DD-10310A27FE00} SkiaSharpSample.OnWatchExtension - + {099A4BAD-6CF7-4898-9D16-266BDD844F95} - SkiaSharp.watchOS + SkiaSharp.Classic {9E850CCA-54CC-4CEB-B2C2-E32EF4A17D61} diff --git a/samples/Basic/watchOS/SkiaSharpSample.OnWatchExtension/SkiaSharpSample.OnWatchExtension.csproj b/samples/Basic/watchOS/SkiaSharpSample.OnWatchExtension/SkiaSharpSample.OnWatchExtension.csproj index da02c4e83..3e5fd49f1 100644 --- a/samples/Basic/watchOS/SkiaSharpSample.OnWatchExtension/SkiaSharpSample.OnWatchExtension.csproj +++ b/samples/Basic/watchOS/SkiaSharpSample.OnWatchExtension/SkiaSharpSample.OnWatchExtension.csproj @@ -86,9 +86,9 @@ - + {099A4BAD-6CF7-4898-9D16-266BDD844F95} - SkiaSharp.watchOS + SkiaSharp.Classic {9E850CCA-54CC-4CEB-B2C2-E32EF4A17D61} diff --git a/samples/Basic/watchOS/SkiaSharpSample.sln b/samples/Basic/watchOS/SkiaSharpSample.sln index 7c7f7e875..1bcc6f814 100644 --- a/samples/Basic/watchOS/SkiaSharpSample.sln +++ b/samples/Basic/watchOS/SkiaSharpSample.sln @@ -4,7 +4,7 @@ VisualStudioVersion = 15.0.27130.2010 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpSample", "SkiaSharpSample\SkiaSharpSample.csproj", "{6CED4AD7-C942-4511-9FE6-27964375CB00}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.watchOS", "..\..\..\binding\SkiaSharp.watchOS\SkiaSharp.watchOS.csproj", "{099A4BAD-6CF7-4898-9D16-266BDD844F95}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Classic", "..\..\..\binding\SkiaSharp.Classic\SkiaSharp.Classic.csproj", "{099A4BAD-6CF7-4898-9D16-266BDD844F95}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpSample.OnWatch", "SkiaSharpSample.OnWatch\SkiaSharpSample.OnWatch.csproj", "{9AB199EB-47A5-41F6-9AFB-489A59BFEBE5}" EndProject diff --git a/samples/Gallery/UWP/SkiaSharpSample.sln b/samples/Gallery/UWP/SkiaSharpSample.sln index 85cbf2858..c02dd94fe 100644 --- a/samples/Gallery/UWP/SkiaSharpSample.sln +++ b/samples/Gallery/UWP/SkiaSharpSample.sln @@ -5,11 +5,11 @@ VisualStudioVersion = 16.0.30126.178 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.UWP", "..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.UWP\SkiaSharp.Views.UWP.csproj", "{8BB20362-91A2-4206-944D-634070EAC6F3}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.UWP", "..\..\..\binding\SkiaSharp.UWP\SkiaSharp.UWP.csproj", "{BAB615AA-956E-4079-B260-DD7B1F52EC7D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Classic", "..\..\..\binding\SkiaSharp.Classic\SkiaSharp.Classic.csproj", "{BAB615AA-956E-4079-B260-DD7B1F52EC7D}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.HarfBuzz", "..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.csproj", "{233220CC-F0F3-4C44-9736-ED2CFC363FD3}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.UWP", "..\..\..\binding\HarfBuzzSharp.UWP\HarfBuzzSharp.UWP.csproj", "{6D1E1F39-EF70-4211-A518-BBBAF02D6FFF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.Classic", "..\..\..\binding\HarfBuzzSharp.Classic\HarfBuzzSharp.Classic.csproj", "{6D1E1F39-EF70-4211-A518-BBBAF02D6FFF}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpSample", "SkiaSharpSample\SkiaSharpSample.csproj", "{BFC6B190-A17C-4538-B2C6-EEDA46D87EFE}" EndProject diff --git a/samples/Gallery/UWP/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Gallery/UWP/SkiaSharpSample/SkiaSharpSample.csproj index 8b9b4ff39..3ce0ac8d4 100644 --- a/samples/Gallery/UWP/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Gallery/UWP/SkiaSharpSample/SkiaSharpSample.csproj @@ -118,13 +118,13 @@ - + {6d1e1f39-ef70-4211-a518-bbbaf02d6fff} - HarfBuzzSharp.UWP + HarfBuzzSharp.Classic - + {bab615aa-956e-4079-b260-dd7b1f52ec7d} - SkiaSharp.UWP + SkiaSharp.Classic {233220cc-f0f3-4c44-9736-ed2cfc363fd3} diff --git a/samples/Gallery/Uno/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj b/samples/Gallery/Uno/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj index 050043276..a2fd4c35e 100644 --- a/samples/Gallery/Uno/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj +++ b/samples/Gallery/Uno/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj @@ -67,13 +67,13 @@ - + {2416e0ea-e7c9-4599-8c01-de92f2da0c8e} - HarfBuzzSharp.Android + HarfBuzzSharp.Classic - + {C737DC80-5B71-4B26-A2DC-DA30421788B0} - SkiaSharp.Android + SkiaSharp.Classic {731bccc9-4e61-4410-aaf2-897d7e1e88ad} diff --git a/samples/Gallery/Uno/SkiaSharpSample.Mac.sln b/samples/Gallery/Uno/SkiaSharpSample.Mac.sln index 229cd3759..ca85dff83 100644 --- a/samples/Gallery/Uno/SkiaSharpSample.Mac.sln +++ b/samples/Gallery/Uno/SkiaSharpSample.Mac.sln @@ -17,22 +17,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Uno.iOS", " EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Uno.Android", "..\..\..\source\SkiaSharp.Views.Uno\SkiaSharp.Views.Uno.Android\SkiaSharp.Views.Uno.Android.csproj", "{9E1AF626-F23D-486A-BC3A-11A49553540F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Android", "..\..\..\binding\SkiaSharp.Android\SkiaSharp.Android.csproj", "{EEE85A59-6C9E-4AA9-A89D-B4A205B53BDE}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.iOS", "..\..\..\binding\SkiaSharp.iOS\SkiaSharp.iOS.csproj", "{E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.OSX", "..\..\..\binding\SkiaSharp.OSX\SkiaSharp.OSX.csproj", "{816E7EC5-91AF-4BCE-ACB7-52725EE475B8}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Classic", "..\..\..\binding\SkiaSharp.Classic\SkiaSharp.Classic.csproj", "{EEE85A59-6C9E-4AA9-A89D-B4A205B53BDE}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp", "..\..\..\binding\SkiaSharp\SkiaSharp.csproj", "{409AF271-D8B7-4F79-B293-02F562A51955}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.Android", "..\..\..\binding\HarfBuzzSharp.Android\HarfBuzzSharp.Android.csproj", "{5397E13D-6FCE-4F91-B5CE-FEDBE45E0A28}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.Classic", "..\..\..\binding\HarfBuzzSharp.Classic\HarfBuzzSharp.Classic.csproj", "{5397E13D-6FCE-4F91-B5CE-FEDBE45E0A28}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp", "..\..\..\binding\HarfBuzzSharp\HarfBuzzSharp.csproj", "{7FD1A613-2B03-4B32-9A9E-6D4FD2E44A92}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.iOS", "..\..\..\binding\HarfBuzzSharp.iOS\HarfBuzzSharp.iOS.csproj", "{288C869A-1EAD-4FD2-A8FE-0213EB4B5B0A}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.OSX", "..\..\..\binding\HarfBuzzSharp.OSX\HarfBuzzSharp.OSX.csproj", "{B5F9CA08-26C1-40FF-92C5-AAA4B04A1D17}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.HarfBuzz", "..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.csproj", "{E2FD0BFD-D17E-4E8A-8E83-D5FCDE1F6FAE}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Uno.Skia", "..\..\..\source\SkiaSharp.Views.Uno\SkiaSharp.Views.Uno.Skia\SkiaSharp.Views.Uno.Skia.csproj", "{48DE405A-9432-40D1-AE6E-86CE2E0CE89A}" @@ -143,30 +135,6 @@ Global {EEE85A59-6C9E-4AA9-A89D-B4A205B53BDE}.Release|iPhone.Build.0 = Release|Any CPU {EEE85A59-6C9E-4AA9-A89D-B4A205B53BDE}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU {EEE85A59-6C9E-4AA9-A89D-B4A205B53BDE}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Debug|iPhone.Build.0 = Debug|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Release|Any CPU.Build.0 = Release|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Release|iPhone.ActiveCfg = Release|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Release|iPhone.Build.0 = Release|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Debug|iPhone.Build.0 = Debug|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Release|Any CPU.Build.0 = Release|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Release|iPhone.ActiveCfg = Release|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Release|iPhone.Build.0 = Release|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Release|iPhoneSimulator.Build.0 = Release|Any CPU {409AF271-D8B7-4F79-B293-02F562A51955}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {409AF271-D8B7-4F79-B293-02F562A51955}.Debug|Any CPU.Build.0 = Debug|Any CPU {409AF271-D8B7-4F79-B293-02F562A51955}.Debug|iPhone.ActiveCfg = Debug|Any CPU @@ -203,30 +171,6 @@ Global {7FD1A613-2B03-4B32-9A9E-6D4FD2E44A92}.Release|iPhone.Build.0 = Release|Any CPU {7FD1A613-2B03-4B32-9A9E-6D4FD2E44A92}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU {7FD1A613-2B03-4B32-9A9E-6D4FD2E44A92}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {288C869A-1EAD-4FD2-A8FE-0213EB4B5B0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {288C869A-1EAD-4FD2-A8FE-0213EB4B5B0A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {288C869A-1EAD-4FD2-A8FE-0213EB4B5B0A}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {288C869A-1EAD-4FD2-A8FE-0213EB4B5B0A}.Debug|iPhone.Build.0 = Debug|Any CPU - {288C869A-1EAD-4FD2-A8FE-0213EB4B5B0A}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {288C869A-1EAD-4FD2-A8FE-0213EB4B5B0A}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {288C869A-1EAD-4FD2-A8FE-0213EB4B5B0A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {288C869A-1EAD-4FD2-A8FE-0213EB4B5B0A}.Release|Any CPU.Build.0 = Release|Any CPU - {288C869A-1EAD-4FD2-A8FE-0213EB4B5B0A}.Release|iPhone.ActiveCfg = Release|Any CPU - {288C869A-1EAD-4FD2-A8FE-0213EB4B5B0A}.Release|iPhone.Build.0 = Release|Any CPU - {288C869A-1EAD-4FD2-A8FE-0213EB4B5B0A}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {288C869A-1EAD-4FD2-A8FE-0213EB4B5B0A}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {B5F9CA08-26C1-40FF-92C5-AAA4B04A1D17}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B5F9CA08-26C1-40FF-92C5-AAA4B04A1D17}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B5F9CA08-26C1-40FF-92C5-AAA4B04A1D17}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {B5F9CA08-26C1-40FF-92C5-AAA4B04A1D17}.Debug|iPhone.Build.0 = Debug|Any CPU - {B5F9CA08-26C1-40FF-92C5-AAA4B04A1D17}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {B5F9CA08-26C1-40FF-92C5-AAA4B04A1D17}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {B5F9CA08-26C1-40FF-92C5-AAA4B04A1D17}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B5F9CA08-26C1-40FF-92C5-AAA4B04A1D17}.Release|Any CPU.Build.0 = Release|Any CPU - {B5F9CA08-26C1-40FF-92C5-AAA4B04A1D17}.Release|iPhone.ActiveCfg = Release|Any CPU - {B5F9CA08-26C1-40FF-92C5-AAA4B04A1D17}.Release|iPhone.Build.0 = Release|Any CPU - {B5F9CA08-26C1-40FF-92C5-AAA4B04A1D17}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {B5F9CA08-26C1-40FF-92C5-AAA4B04A1D17}.Release|iPhoneSimulator.Build.0 = Release|Any CPU {E2FD0BFD-D17E-4E8A-8E83-D5FCDE1F6FAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E2FD0BFD-D17E-4E8A-8E83-D5FCDE1F6FAE}.Debug|Any CPU.Build.0 = Debug|Any CPU {E2FD0BFD-D17E-4E8A-8E83-D5FCDE1F6FAE}.Debug|iPhone.ActiveCfg = Debug|Any CPU diff --git a/samples/Gallery/Uno/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj b/samples/Gallery/Uno/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj index aa87e3965..7061a57a3 100644 --- a/samples/Gallery/Uno/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj +++ b/samples/Gallery/Uno/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj @@ -121,13 +121,13 @@ - + {6d1e1f39-ef70-4211-a518-bbbaf02d6fff} - HarfBuzzSharp.UWP + HarfBuzzSharp.Classic - + {bab615aa-956e-4079-b260-dd7b1f52ec7d} - SkiaSharp.UWP + SkiaSharp.Classic {233220cc-f0f3-4c44-9736-ed2cfc363fd3} diff --git a/samples/Gallery/Uno/SkiaSharpSample.Windows.sln b/samples/Gallery/Uno/SkiaSharpSample.Windows.sln index 87b57cb0b..5d7803122 100644 --- a/samples/Gallery/Uno/SkiaSharpSample.Windows.sln +++ b/samples/Gallery/Uno/SkiaSharpSample.Windows.sln @@ -11,12 +11,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpSample.UWP", "Skia EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Uno.Android", "..\..\..\source\SkiaSharp.Views.Uno\SkiaSharp.Views.Uno.Android\SkiaSharp.Views.Uno.Android.csproj", "{9E1AF626-F23D-486A-BC3A-11A49553540F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Android", "..\..\..\binding\SkiaSharp.Android\SkiaSharp.Android.csproj", "{EEE85A59-6C9E-4AA9-A89D-B4A205B53BDE}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Classic", "..\..\..\binding\SkiaSharp.Classic\SkiaSharp.Classic.csproj", "{EEE85A59-6C9E-4AA9-A89D-B4A205B53BDE}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.UWP", "..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.UWP\SkiaSharp.Views.UWP.csproj", "{5ABDBD0B-87CB-4C9B-9EDE-360062E74BC7}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.UWP", "..\..\..\binding\SkiaSharp.UWP\SkiaSharp.UWP.csproj", "{6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharpSample.Wasm", "SkiaSharpSample.Wasm\SkiaSharpSample.Wasm.csproj", "{9726301D-8A93-4A06-88DF-92BA01CF80AD}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Uno.Wasm", "..\..\..\source\SkiaSharp.Views.Uno\SkiaSharp.Views.Uno.Wasm\SkiaSharp.Views.Uno.Wasm.csproj", "{1787D9BF-9815-4E1D-BDEB-9994859FE91E}" @@ -25,9 +23,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp", "..\..\..\bindi EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp", "..\..\..\binding\HarfBuzzSharp\HarfBuzzSharp.csproj", "{B4F8D378-9DD2-4D4A-AEFC-04705DF2F240}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.Android", "..\..\..\binding\HarfBuzzSharp.Android\HarfBuzzSharp.Android.csproj", "{CDB278FF-2188-4B0B-9EE9-9D310363E733}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.UWP", "..\..\..\binding\HarfBuzzSharp.UWP\HarfBuzzSharp.UWP.csproj", "{7B18043D-8B3C-4A90-A0E6-A586785F0742}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.Classic", "..\..\..\binding\HarfBuzzSharp.Classic\HarfBuzzSharp.Classic.csproj", "{CDB278FF-2188-4B0B-9EE9-9D310363E733}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.HarfBuzz", "..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.csproj", "{99DC411D-8FC3-4D60-B217-47EAAE54E21F}" EndProject @@ -181,26 +177,6 @@ Global {5ABDBD0B-87CB-4C9B-9EDE-360062E74BC7}.Release|x64.Build.0 = Release|Any CPU {5ABDBD0B-87CB-4C9B-9EDE-360062E74BC7}.Release|x86.ActiveCfg = Release|Any CPU {5ABDBD0B-87CB-4C9B-9EDE-360062E74BC7}.Release|x86.Build.0 = Release|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Debug|ARM.ActiveCfg = Debug|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Debug|ARM.Build.0 = Debug|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Debug|ARM64.Build.0 = Debug|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Debug|x64.ActiveCfg = Debug|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Debug|x64.Build.0 = Debug|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Debug|x86.ActiveCfg = Debug|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Debug|x86.Build.0 = Debug|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Release|Any CPU.Build.0 = Release|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Release|ARM.ActiveCfg = Release|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Release|ARM.Build.0 = Release|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Release|ARM64.ActiveCfg = Release|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Release|ARM64.Build.0 = Release|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Release|x64.ActiveCfg = Release|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Release|x64.Build.0 = Release|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Release|x86.ActiveCfg = Release|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Release|x86.Build.0 = Release|Any CPU {9726301D-8A93-4A06-88DF-92BA01CF80AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9726301D-8A93-4A06-88DF-92BA01CF80AD}.Debug|Any CPU.Build.0 = Debug|Any CPU {9726301D-8A93-4A06-88DF-92BA01CF80AD}.Debug|ARM.ActiveCfg = Debug|Any CPU @@ -301,26 +277,6 @@ Global {CDB278FF-2188-4B0B-9EE9-9D310363E733}.Release|x64.Build.0 = Release|Any CPU {CDB278FF-2188-4B0B-9EE9-9D310363E733}.Release|x86.ActiveCfg = Release|Any CPU {CDB278FF-2188-4B0B-9EE9-9D310363E733}.Release|x86.Build.0 = Release|Any CPU - {7B18043D-8B3C-4A90-A0E6-A586785F0742}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7B18043D-8B3C-4A90-A0E6-A586785F0742}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7B18043D-8B3C-4A90-A0E6-A586785F0742}.Debug|ARM.ActiveCfg = Debug|Any CPU - {7B18043D-8B3C-4A90-A0E6-A586785F0742}.Debug|ARM.Build.0 = Debug|Any CPU - {7B18043D-8B3C-4A90-A0E6-A586785F0742}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {7B18043D-8B3C-4A90-A0E6-A586785F0742}.Debug|ARM64.Build.0 = Debug|Any CPU - {7B18043D-8B3C-4A90-A0E6-A586785F0742}.Debug|x64.ActiveCfg = Debug|Any CPU - {7B18043D-8B3C-4A90-A0E6-A586785F0742}.Debug|x64.Build.0 = Debug|Any CPU - {7B18043D-8B3C-4A90-A0E6-A586785F0742}.Debug|x86.ActiveCfg = Debug|Any CPU - {7B18043D-8B3C-4A90-A0E6-A586785F0742}.Debug|x86.Build.0 = Debug|Any CPU - {7B18043D-8B3C-4A90-A0E6-A586785F0742}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7B18043D-8B3C-4A90-A0E6-A586785F0742}.Release|Any CPU.Build.0 = Release|Any CPU - {7B18043D-8B3C-4A90-A0E6-A586785F0742}.Release|ARM.ActiveCfg = Release|Any CPU - {7B18043D-8B3C-4A90-A0E6-A586785F0742}.Release|ARM.Build.0 = Release|Any CPU - {7B18043D-8B3C-4A90-A0E6-A586785F0742}.Release|ARM64.ActiveCfg = Release|Any CPU - {7B18043D-8B3C-4A90-A0E6-A586785F0742}.Release|ARM64.Build.0 = Release|Any CPU - {7B18043D-8B3C-4A90-A0E6-A586785F0742}.Release|x64.ActiveCfg = Release|Any CPU - {7B18043D-8B3C-4A90-A0E6-A586785F0742}.Release|x64.Build.0 = Release|Any CPU - {7B18043D-8B3C-4A90-A0E6-A586785F0742}.Release|x86.ActiveCfg = Release|Any CPU - {7B18043D-8B3C-4A90-A0E6-A586785F0742}.Release|x86.Build.0 = Release|Any CPU {99DC411D-8FC3-4D60-B217-47EAAE54E21F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {99DC411D-8FC3-4D60-B217-47EAAE54E21F}.Debug|Any CPU.Build.0 = Debug|Any CPU {99DC411D-8FC3-4D60-B217-47EAAE54E21F}.Debug|ARM.ActiveCfg = Debug|Any CPU diff --git a/samples/Gallery/Uno/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj b/samples/Gallery/Uno/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj index 638cc38f8..f3545ea6e 100644 --- a/samples/Gallery/Uno/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj +++ b/samples/Gallery/Uno/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj @@ -110,13 +110,13 @@ - + {33c80641-94c5-4d6a-b9fa-5a7deef7efe6} - HarfBuzzSharp.iOS + HarfBuzzSharp.Classic - + {6A678CFB-21A7-4E81-8909-FD72ABBFD408} - SkiaSharp.iOS + SkiaSharp.Classic {731bccc9-4e61-4410-aaf2-897d7e1e88ad} diff --git a/samples/Gallery/Uno/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj b/samples/Gallery/Uno/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj index 65f007979..63c8964dd 100644 --- a/samples/Gallery/Uno/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj +++ b/samples/Gallery/Uno/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj @@ -51,13 +51,13 @@ - + {bc6753cf-0be7-4a2b-a793-7ef715cd3799} - HarfBuzzSharp.OSX + HarfBuzzSharp.Classic - + {816e7ec5-91af-4bce-acb7-52725ee475b8} - SkiaSharp.OSX + SkiaSharp.Classic {731bccc9-4e61-4410-aaf2-897d7e1e88ad} diff --git a/samples/Gallery/Uno/SkiaSharpSample.sln b/samples/Gallery/Uno/SkiaSharpSample.sln index 563867fbd..399aa4941 100644 --- a/samples/Gallery/Uno/SkiaSharpSample.sln +++ b/samples/Gallery/Uno/SkiaSharpSample.sln @@ -19,16 +19,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Uno.iOS", " EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Uno.Android", "..\..\..\source\SkiaSharp.Views.Uno\SkiaSharp.Views.Uno.Android\SkiaSharp.Views.Uno.Android.csproj", "{9E1AF626-F23D-486A-BC3A-11A49553540F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Android", "..\..\..\binding\SkiaSharp.Android\SkiaSharp.Android.csproj", "{EEE85A59-6C9E-4AA9-A89D-B4A205B53BDE}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.iOS", "..\..\..\binding\SkiaSharp.iOS\SkiaSharp.iOS.csproj", "{E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.OSX", "..\..\..\binding\SkiaSharp.OSX\SkiaSharp.OSX.csproj", "{816E7EC5-91AF-4BCE-ACB7-52725EE475B8}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Classic", "..\..\..\binding\SkiaSharp.Classic\SkiaSharp.Classic.csproj", "{EEE85A59-6C9E-4AA9-A89D-B4A205B53BDE}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.UWP", "..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.UWP\SkiaSharp.Views.UWP.csproj", "{5ABDBD0B-87CB-4C9B-9EDE-360062E74BC7}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.UWP", "..\..\..\binding\SkiaSharp.UWP\SkiaSharp.UWP.csproj", "{6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharpSample.Wasm", "SkiaSharpSample.Wasm\SkiaSharpSample.Wasm.csproj", "{9726301D-8A93-4A06-88DF-92BA01CF80AD}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Uno.Wasm", "..\..\..\source\SkiaSharp.Views.Uno\SkiaSharp.Views.Uno.Wasm\SkiaSharp.Views.Uno.Wasm.csproj", "{1787D9BF-9815-4E1D-BDEB-9994859FE91E}" @@ -39,13 +33,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Uno.Referen EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp", "..\..\..\binding\HarfBuzzSharp\HarfBuzzSharp.csproj", "{02380F3E-7987-4ABF-8922-9216149AE336}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.Android", "..\..\..\binding\HarfBuzzSharp.Android\HarfBuzzSharp.Android.csproj", "{2416E0EA-E7C9-4599-8C01-DE92F2DA0C8E}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.iOS", "..\..\..\binding\HarfBuzzSharp.iOS\HarfBuzzSharp.iOS.csproj", "{33C80641-94C5-4D6A-B9FA-5A7DEEF7EFE6}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.OSX", "..\..\..\binding\HarfBuzzSharp.OSX\HarfBuzzSharp.OSX.csproj", "{BC6753CF-0BE7-4A2B-A793-7EF715CD3799}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.UWP", "..\..\..\binding\HarfBuzzSharp.UWP\HarfBuzzSharp.UWP.csproj", "{BF7F2983-0E86-4411-A814-49D49B839E3A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.Classic", "..\..\..\binding\HarfBuzzSharp.Classic\HarfBuzzSharp.Classic.csproj", "{2416E0EA-E7C9-4599-8C01-DE92F2DA0C8E}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.HarfBuzz", "..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.csproj", "{731BCCC9-4E61-4410-AAF2-897D7E1E88AD}" EndProject @@ -346,62 +334,6 @@ Global {EEE85A59-6C9E-4AA9-A89D-B4A205B53BDE}.Release|x64.Build.0 = Release|Any CPU {EEE85A59-6C9E-4AA9-A89D-B4A205B53BDE}.Release|x86.ActiveCfg = Release|Any CPU {EEE85A59-6C9E-4AA9-A89D-B4A205B53BDE}.Release|x86.Build.0 = Release|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Debug|ARM.ActiveCfg = Debug|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Debug|ARM.Build.0 = Debug|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Debug|ARM64.Build.0 = Debug|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Debug|iPhone.Build.0 = Debug|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Debug|x64.ActiveCfg = Debug|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Debug|x64.Build.0 = Debug|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Debug|x86.ActiveCfg = Debug|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Debug|x86.Build.0 = Debug|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Release|Any CPU.Build.0 = Release|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Release|ARM.ActiveCfg = Release|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Release|ARM.Build.0 = Release|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Release|ARM64.ActiveCfg = Release|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Release|ARM64.Build.0 = Release|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Release|iPhone.ActiveCfg = Release|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Release|iPhone.Build.0 = Release|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Release|x64.ActiveCfg = Release|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Release|x64.Build.0 = Release|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Release|x86.ActiveCfg = Release|Any CPU - {E5F30ED8-6DC4-4674-B50D-01DDF8A16BD1}.Release|x86.Build.0 = Release|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Debug|ARM.ActiveCfg = Debug|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Debug|ARM.Build.0 = Debug|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Debug|ARM64.Build.0 = Debug|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Debug|iPhone.Build.0 = Debug|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Debug|x64.ActiveCfg = Debug|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Debug|x64.Build.0 = Debug|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Debug|x86.ActiveCfg = Debug|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Debug|x86.Build.0 = Debug|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Release|Any CPU.Build.0 = Release|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Release|ARM.ActiveCfg = Release|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Release|ARM.Build.0 = Release|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Release|ARM64.ActiveCfg = Release|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Release|ARM64.Build.0 = Release|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Release|iPhone.ActiveCfg = Release|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Release|iPhone.Build.0 = Release|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Release|x64.ActiveCfg = Release|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Release|x64.Build.0 = Release|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Release|x86.ActiveCfg = Release|Any CPU - {816E7EC5-91AF-4BCE-ACB7-52725EE475B8}.Release|x86.Build.0 = Release|Any CPU {5ABDBD0B-87CB-4C9B-9EDE-360062E74BC7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {5ABDBD0B-87CB-4C9B-9EDE-360062E74BC7}.Debug|Any CPU.Build.0 = Debug|Any CPU {5ABDBD0B-87CB-4C9B-9EDE-360062E74BC7}.Debug|ARM.ActiveCfg = Debug|Any CPU @@ -430,34 +362,6 @@ Global {5ABDBD0B-87CB-4C9B-9EDE-360062E74BC7}.Release|x64.Build.0 = Release|Any CPU {5ABDBD0B-87CB-4C9B-9EDE-360062E74BC7}.Release|x86.ActiveCfg = Release|Any CPU {5ABDBD0B-87CB-4C9B-9EDE-360062E74BC7}.Release|x86.Build.0 = Release|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Debug|ARM.ActiveCfg = Debug|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Debug|ARM.Build.0 = Debug|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Debug|ARM64.Build.0 = Debug|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Debug|iPhone.Build.0 = Debug|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Debug|x64.ActiveCfg = Debug|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Debug|x64.Build.0 = Debug|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Debug|x86.ActiveCfg = Debug|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Debug|x86.Build.0 = Debug|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Release|Any CPU.Build.0 = Release|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Release|ARM.ActiveCfg = Release|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Release|ARM.Build.0 = Release|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Release|ARM64.ActiveCfg = Release|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Release|ARM64.Build.0 = Release|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Release|iPhone.ActiveCfg = Release|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Release|iPhone.Build.0 = Release|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Release|x64.ActiveCfg = Release|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Release|x64.Build.0 = Release|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Release|x86.ActiveCfg = Release|Any CPU - {6FF6B08F-0A69-41A4-8F53-8FE9B7FB4A67}.Release|x86.Build.0 = Release|Any CPU {9726301D-8A93-4A06-88DF-92BA01CF80AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9726301D-8A93-4A06-88DF-92BA01CF80AD}.Debug|Any CPU.Build.0 = Debug|Any CPU {9726301D-8A93-4A06-88DF-92BA01CF80AD}.Debug|ARM.ActiveCfg = Debug|Any CPU @@ -626,90 +530,6 @@ Global {2416E0EA-E7C9-4599-8C01-DE92F2DA0C8E}.Release|x64.Build.0 = Release|Any CPU {2416E0EA-E7C9-4599-8C01-DE92F2DA0C8E}.Release|x86.ActiveCfg = Release|Any CPU {2416E0EA-E7C9-4599-8C01-DE92F2DA0C8E}.Release|x86.Build.0 = Release|Any CPU - {33C80641-94C5-4D6A-B9FA-5A7DEEF7EFE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {33C80641-94C5-4D6A-B9FA-5A7DEEF7EFE6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {33C80641-94C5-4D6A-B9FA-5A7DEEF7EFE6}.Debug|ARM.ActiveCfg = Debug|Any CPU - {33C80641-94C5-4D6A-B9FA-5A7DEEF7EFE6}.Debug|ARM.Build.0 = Debug|Any CPU - {33C80641-94C5-4D6A-B9FA-5A7DEEF7EFE6}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {33C80641-94C5-4D6A-B9FA-5A7DEEF7EFE6}.Debug|ARM64.Build.0 = Debug|Any CPU - {33C80641-94C5-4D6A-B9FA-5A7DEEF7EFE6}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {33C80641-94C5-4D6A-B9FA-5A7DEEF7EFE6}.Debug|iPhone.Build.0 = Debug|Any CPU - {33C80641-94C5-4D6A-B9FA-5A7DEEF7EFE6}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {33C80641-94C5-4D6A-B9FA-5A7DEEF7EFE6}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {33C80641-94C5-4D6A-B9FA-5A7DEEF7EFE6}.Debug|x64.ActiveCfg = Debug|Any CPU - {33C80641-94C5-4D6A-B9FA-5A7DEEF7EFE6}.Debug|x64.Build.0 = Debug|Any CPU - {33C80641-94C5-4D6A-B9FA-5A7DEEF7EFE6}.Debug|x86.ActiveCfg = Debug|Any CPU - {33C80641-94C5-4D6A-B9FA-5A7DEEF7EFE6}.Debug|x86.Build.0 = Debug|Any CPU - {33C80641-94C5-4D6A-B9FA-5A7DEEF7EFE6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {33C80641-94C5-4D6A-B9FA-5A7DEEF7EFE6}.Release|Any CPU.Build.0 = Release|Any CPU - {33C80641-94C5-4D6A-B9FA-5A7DEEF7EFE6}.Release|ARM.ActiveCfg = Release|Any CPU - {33C80641-94C5-4D6A-B9FA-5A7DEEF7EFE6}.Release|ARM.Build.0 = Release|Any CPU - {33C80641-94C5-4D6A-B9FA-5A7DEEF7EFE6}.Release|ARM64.ActiveCfg = Release|Any CPU - {33C80641-94C5-4D6A-B9FA-5A7DEEF7EFE6}.Release|ARM64.Build.0 = Release|Any CPU - {33C80641-94C5-4D6A-B9FA-5A7DEEF7EFE6}.Release|iPhone.ActiveCfg = Release|Any CPU - {33C80641-94C5-4D6A-B9FA-5A7DEEF7EFE6}.Release|iPhone.Build.0 = Release|Any CPU - {33C80641-94C5-4D6A-B9FA-5A7DEEF7EFE6}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {33C80641-94C5-4D6A-B9FA-5A7DEEF7EFE6}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {33C80641-94C5-4D6A-B9FA-5A7DEEF7EFE6}.Release|x64.ActiveCfg = Release|Any CPU - {33C80641-94C5-4D6A-B9FA-5A7DEEF7EFE6}.Release|x64.Build.0 = Release|Any CPU - {33C80641-94C5-4D6A-B9FA-5A7DEEF7EFE6}.Release|x86.ActiveCfg = Release|Any CPU - {33C80641-94C5-4D6A-B9FA-5A7DEEF7EFE6}.Release|x86.Build.0 = Release|Any CPU - {BC6753CF-0BE7-4A2B-A793-7EF715CD3799}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BC6753CF-0BE7-4A2B-A793-7EF715CD3799}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BC6753CF-0BE7-4A2B-A793-7EF715CD3799}.Debug|ARM.ActiveCfg = Debug|Any CPU - {BC6753CF-0BE7-4A2B-A793-7EF715CD3799}.Debug|ARM.Build.0 = Debug|Any CPU - {BC6753CF-0BE7-4A2B-A793-7EF715CD3799}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {BC6753CF-0BE7-4A2B-A793-7EF715CD3799}.Debug|ARM64.Build.0 = Debug|Any CPU - {BC6753CF-0BE7-4A2B-A793-7EF715CD3799}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {BC6753CF-0BE7-4A2B-A793-7EF715CD3799}.Debug|iPhone.Build.0 = Debug|Any CPU - {BC6753CF-0BE7-4A2B-A793-7EF715CD3799}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {BC6753CF-0BE7-4A2B-A793-7EF715CD3799}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {BC6753CF-0BE7-4A2B-A793-7EF715CD3799}.Debug|x64.ActiveCfg = Debug|Any CPU - {BC6753CF-0BE7-4A2B-A793-7EF715CD3799}.Debug|x64.Build.0 = Debug|Any CPU - {BC6753CF-0BE7-4A2B-A793-7EF715CD3799}.Debug|x86.ActiveCfg = Debug|Any CPU - {BC6753CF-0BE7-4A2B-A793-7EF715CD3799}.Debug|x86.Build.0 = Debug|Any CPU - {BC6753CF-0BE7-4A2B-A793-7EF715CD3799}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BC6753CF-0BE7-4A2B-A793-7EF715CD3799}.Release|Any CPU.Build.0 = Release|Any CPU - {BC6753CF-0BE7-4A2B-A793-7EF715CD3799}.Release|ARM.ActiveCfg = Release|Any CPU - {BC6753CF-0BE7-4A2B-A793-7EF715CD3799}.Release|ARM.Build.0 = Release|Any CPU - {BC6753CF-0BE7-4A2B-A793-7EF715CD3799}.Release|ARM64.ActiveCfg = Release|Any CPU - {BC6753CF-0BE7-4A2B-A793-7EF715CD3799}.Release|ARM64.Build.0 = Release|Any CPU - {BC6753CF-0BE7-4A2B-A793-7EF715CD3799}.Release|iPhone.ActiveCfg = Release|Any CPU - {BC6753CF-0BE7-4A2B-A793-7EF715CD3799}.Release|iPhone.Build.0 = Release|Any CPU - {BC6753CF-0BE7-4A2B-A793-7EF715CD3799}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {BC6753CF-0BE7-4A2B-A793-7EF715CD3799}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {BC6753CF-0BE7-4A2B-A793-7EF715CD3799}.Release|x64.ActiveCfg = Release|Any CPU - {BC6753CF-0BE7-4A2B-A793-7EF715CD3799}.Release|x64.Build.0 = Release|Any CPU - {BC6753CF-0BE7-4A2B-A793-7EF715CD3799}.Release|x86.ActiveCfg = Release|Any CPU - {BC6753CF-0BE7-4A2B-A793-7EF715CD3799}.Release|x86.Build.0 = Release|Any CPU - {BF7F2983-0E86-4411-A814-49D49B839E3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BF7F2983-0E86-4411-A814-49D49B839E3A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BF7F2983-0E86-4411-A814-49D49B839E3A}.Debug|ARM.ActiveCfg = Debug|Any CPU - {BF7F2983-0E86-4411-A814-49D49B839E3A}.Debug|ARM.Build.0 = Debug|Any CPU - {BF7F2983-0E86-4411-A814-49D49B839E3A}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {BF7F2983-0E86-4411-A814-49D49B839E3A}.Debug|ARM64.Build.0 = Debug|Any CPU - {BF7F2983-0E86-4411-A814-49D49B839E3A}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {BF7F2983-0E86-4411-A814-49D49B839E3A}.Debug|iPhone.Build.0 = Debug|Any CPU - {BF7F2983-0E86-4411-A814-49D49B839E3A}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {BF7F2983-0E86-4411-A814-49D49B839E3A}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {BF7F2983-0E86-4411-A814-49D49B839E3A}.Debug|x64.ActiveCfg = Debug|Any CPU - {BF7F2983-0E86-4411-A814-49D49B839E3A}.Debug|x64.Build.0 = Debug|Any CPU - {BF7F2983-0E86-4411-A814-49D49B839E3A}.Debug|x86.ActiveCfg = Debug|Any CPU - {BF7F2983-0E86-4411-A814-49D49B839E3A}.Debug|x86.Build.0 = Debug|Any CPU - {BF7F2983-0E86-4411-A814-49D49B839E3A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BF7F2983-0E86-4411-A814-49D49B839E3A}.Release|Any CPU.Build.0 = Release|Any CPU - {BF7F2983-0E86-4411-A814-49D49B839E3A}.Release|ARM.ActiveCfg = Release|Any CPU - {BF7F2983-0E86-4411-A814-49D49B839E3A}.Release|ARM.Build.0 = Release|Any CPU - {BF7F2983-0E86-4411-A814-49D49B839E3A}.Release|ARM64.ActiveCfg = Release|Any CPU - {BF7F2983-0E86-4411-A814-49D49B839E3A}.Release|ARM64.Build.0 = Release|Any CPU - {BF7F2983-0E86-4411-A814-49D49B839E3A}.Release|iPhone.ActiveCfg = Release|Any CPU - {BF7F2983-0E86-4411-A814-49D49B839E3A}.Release|iPhone.Build.0 = Release|Any CPU - {BF7F2983-0E86-4411-A814-49D49B839E3A}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {BF7F2983-0E86-4411-A814-49D49B839E3A}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {BF7F2983-0E86-4411-A814-49D49B839E3A}.Release|x64.ActiveCfg = Release|Any CPU - {BF7F2983-0E86-4411-A814-49D49B839E3A}.Release|x64.Build.0 = Release|Any CPU - {BF7F2983-0E86-4411-A814-49D49B839E3A}.Release|x86.ActiveCfg = Release|Any CPU - {BF7F2983-0E86-4411-A814-49D49B839E3A}.Release|x86.Build.0 = Release|Any CPU {731BCCC9-4E61-4410-AAF2-897D7E1E88AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {731BCCC9-4E61-4410-AAF2-897D7E1E88AD}.Debug|Any CPU.Build.0 = Debug|Any CPU {731BCCC9-4E61-4410-AAF2-897D7E1E88AD}.Debug|ARM.ActiveCfg = Debug|Any CPU diff --git a/samples/Gallery/Xamarin.Forms/Android/Android.csproj b/samples/Gallery/Xamarin.Forms/Android/Android.csproj index 1d4093812..1b2bcf27b 100644 --- a/samples/Gallery/Xamarin.Forms/Android/Android.csproj +++ b/samples/Gallery/Xamarin.Forms/Android/Android.csproj @@ -58,13 +58,13 @@ - + {e6b786c4-3bf9-4a42-9a4a-08002ae3fdad} - HarfBuzzSharp.Android + HarfBuzzSharp.Classic - + {c737dc80-5b71-4b26-a2dc-da30421788b0} - SkiaSharp.Android + SkiaSharp.Classic {233220cc-f0f3-4c44-9736-ed2cfc363fd3} diff --git a/samples/Gallery/Xamarin.Forms/Mac/Mac.csproj b/samples/Gallery/Xamarin.Forms/Mac/Mac.csproj index e65f1b23e..0796f7bd5 100644 --- a/samples/Gallery/Xamarin.Forms/Mac/Mac.csproj +++ b/samples/Gallery/Xamarin.Forms/Mac/Mac.csproj @@ -61,13 +61,13 @@ - + {30952C22-D566-488F-9D7A-2411B027D6CA} - HarfBuzzSharp.OSX + HarfBuzzSharp.Classic - + {4588A759-3853-49B8-8A68-6C7917BE9220} - SkiaSharp.OSX + SkiaSharp.Classic {233220cc-f0f3-4c44-9736-ed2cfc363fd3} diff --git a/samples/Gallery/Xamarin.Forms/SkiaSharpSample.Linux.sln b/samples/Gallery/Xamarin.Forms/SkiaSharpSample.Linux.sln index 8067987b8..9590fcb21 100644 --- a/samples/Gallery/Xamarin.Forms/SkiaSharpSample.Linux.sln +++ b/samples/Gallery/Xamarin.Forms/SkiaSharpSample.Linux.sln @@ -11,7 +11,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Forms", ".. 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}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Classic", "..\..\..\binding\SkiaSharp.Classic\SkiaSharp.Classic.csproj", "{A7B25831-3EA3-4F88-AA82-4D4CA66B19C6}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Tizen", "..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.Tizen\SkiaSharp.Views.Tizen.csproj", "{E0AAA975-BCF0-46F9-8E95-407FD6931850}" EndProject @@ -19,7 +19,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Forms.Tizen EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.HarfBuzz", "..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.csproj", "{AB78DAB0-3C24-4E2D-A87E-5E7140D5BF04}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.Tizen", "..\..\..\binding\HarfBuzzSharp.Tizen\HarfBuzzSharp.Tizen.csproj", "{4D4FD6E5-6956-437E-A2FD-425D5E309192}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.Classic", "..\..\..\binding\HarfBuzzSharp.Classic\HarfBuzzSharp.Classic.csproj", "{4D4FD6E5-6956-437E-A2FD-425D5E309192}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/samples/Gallery/Xamarin.Forms/SkiaSharpSample.Mac.sln b/samples/Gallery/Xamarin.Forms/SkiaSharpSample.Mac.sln index 8063ebd27..c82900813 100644 --- a/samples/Gallery/Xamarin.Forms/SkiaSharpSample.Mac.sln +++ b/samples/Gallery/Xamarin.Forms/SkiaSharpSample.Mac.sln @@ -5,17 +5,9 @@ VisualStudioVersion = 15.0.27130.2010 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp", "..\..\..\binding\HarfBuzzSharp\HarfBuzzSharp.csproj", "{DD3EAFFF-E420-4AC3-925D-501EAE140B49}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HarfBuzzSharp.OSX", "..\..\..\binding\HarfBuzzSharp.OSX\HarfBuzzSharp.OSX.csproj", "{30952C22-D566-488F-9D7A-2411B027D6CA}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HarfBuzzSharp.Classic", "..\..\..\binding\HarfBuzzSharp.Classic\HarfBuzzSharp.Classic.csproj", "{30952C22-D566-488F-9D7A-2411B027D6CA}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HarfBuzzSharp.iOS", "..\..\..\binding\HarfBuzzSharp.iOS\HarfBuzzSharp.iOS.csproj", "{E8192110-FCF9-4972-9472-7408BC2CA56B}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HarfBuzzSharp.Android", "..\..\..\binding\HarfBuzzSharp.Android\HarfBuzzSharp.Android.csproj", "{E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Android", "..\..\..\binding\SkiaSharp.Android\SkiaSharp.Android.csproj", "{C737DC80-5B71-4B26-A2DC-DA30421788B0}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.iOS", "..\..\..\binding\SkiaSharp.iOS\SkiaSharp.iOS.csproj", "{6A678CFB-21A7-4E81-8909-FD72ABBFD408}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.OSX", "..\..\..\binding\SkiaSharp.OSX\SkiaSharp.OSX.csproj", "{4588A759-3853-49B8-8A68-6C7917BE9220}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Classic", "..\..\..\binding\SkiaSharp.Classic\SkiaSharp.Classic.csproj", "{C737DC80-5B71-4B26-A2DC-DA30421788B0}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp", "..\..\..\binding\SkiaSharp\SkiaSharp.csproj", "{4E0924F8-D546-4428-9412-4B9411FBA5FF}" EndProject @@ -107,54 +99,6 @@ Global {30952C22-D566-488F-9D7A-2411B027D6CA}.Release|x64.Build.0 = Release|Any CPU {30952C22-D566-488F-9D7A-2411B027D6CA}.Release|x86.ActiveCfg = Release|Any CPU {30952C22-D566-488F-9D7A-2411B027D6CA}.Release|x86.Build.0 = Release|Any CPU - {E8192110-FCF9-4972-9472-7408BC2CA56B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E8192110-FCF9-4972-9472-7408BC2CA56B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E8192110-FCF9-4972-9472-7408BC2CA56B}.Debug|ARM.ActiveCfg = Debug|Any CPU - {E8192110-FCF9-4972-9472-7408BC2CA56B}.Debug|ARM.Build.0 = Debug|Any CPU - {E8192110-FCF9-4972-9472-7408BC2CA56B}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {E8192110-FCF9-4972-9472-7408BC2CA56B}.Debug|iPhone.Build.0 = Debug|Any CPU - {E8192110-FCF9-4972-9472-7408BC2CA56B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {E8192110-FCF9-4972-9472-7408BC2CA56B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {E8192110-FCF9-4972-9472-7408BC2CA56B}.Debug|x64.ActiveCfg = Debug|Any CPU - {E8192110-FCF9-4972-9472-7408BC2CA56B}.Debug|x64.Build.0 = Debug|Any CPU - {E8192110-FCF9-4972-9472-7408BC2CA56B}.Debug|x86.ActiveCfg = Debug|Any CPU - {E8192110-FCF9-4972-9472-7408BC2CA56B}.Debug|x86.Build.0 = Debug|Any CPU - {E8192110-FCF9-4972-9472-7408BC2CA56B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E8192110-FCF9-4972-9472-7408BC2CA56B}.Release|Any CPU.Build.0 = Release|Any CPU - {E8192110-FCF9-4972-9472-7408BC2CA56B}.Release|ARM.ActiveCfg = Release|Any CPU - {E8192110-FCF9-4972-9472-7408BC2CA56B}.Release|ARM.Build.0 = Release|Any CPU - {E8192110-FCF9-4972-9472-7408BC2CA56B}.Release|iPhone.ActiveCfg = Release|Any CPU - {E8192110-FCF9-4972-9472-7408BC2CA56B}.Release|iPhone.Build.0 = Release|Any CPU - {E8192110-FCF9-4972-9472-7408BC2CA56B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {E8192110-FCF9-4972-9472-7408BC2CA56B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {E8192110-FCF9-4972-9472-7408BC2CA56B}.Release|x64.ActiveCfg = Release|Any CPU - {E8192110-FCF9-4972-9472-7408BC2CA56B}.Release|x64.Build.0 = Release|Any CPU - {E8192110-FCF9-4972-9472-7408BC2CA56B}.Release|x86.ActiveCfg = Release|Any CPU - {E8192110-FCF9-4972-9472-7408BC2CA56B}.Release|x86.Build.0 = Release|Any CPU - {E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}.Debug|ARM.ActiveCfg = Debug|Any CPU - {E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}.Debug|ARM.Build.0 = Debug|Any CPU - {E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}.Debug|iPhone.Build.0 = Debug|Any CPU - {E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}.Debug|x64.ActiveCfg = Debug|Any CPU - {E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}.Debug|x64.Build.0 = Debug|Any CPU - {E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}.Debug|x86.ActiveCfg = Debug|Any CPU - {E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}.Debug|x86.Build.0 = Debug|Any CPU - {E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}.Release|Any CPU.Build.0 = Release|Any CPU - {E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}.Release|ARM.ActiveCfg = Release|Any CPU - {E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}.Release|ARM.Build.0 = Release|Any CPU - {E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}.Release|iPhone.ActiveCfg = Release|Any CPU - {E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}.Release|iPhone.Build.0 = Release|Any CPU - {E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}.Release|x64.ActiveCfg = Release|Any CPU - {E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}.Release|x64.Build.0 = Release|Any CPU - {E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}.Release|x86.ActiveCfg = Release|Any CPU - {E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}.Release|x86.Build.0 = Release|Any CPU {C737DC80-5B71-4B26-A2DC-DA30421788B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C737DC80-5B71-4B26-A2DC-DA30421788B0}.Debug|Any CPU.Build.0 = Debug|Any CPU {C737DC80-5B71-4B26-A2DC-DA30421788B0}.Debug|ARM.ActiveCfg = Debug|Any CPU @@ -179,54 +123,6 @@ Global {C737DC80-5B71-4B26-A2DC-DA30421788B0}.Release|x64.Build.0 = Release|Any CPU {C737DC80-5B71-4B26-A2DC-DA30421788B0}.Release|x86.ActiveCfg = Release|Any CPU {C737DC80-5B71-4B26-A2DC-DA30421788B0}.Release|x86.Build.0 = Release|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Debug|ARM.ActiveCfg = Debug|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Debug|ARM.Build.0 = Debug|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Debug|iPhone.Build.0 = Debug|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Debug|x64.ActiveCfg = Debug|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Debug|x64.Build.0 = Debug|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Debug|x86.ActiveCfg = Debug|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Debug|x86.Build.0 = Debug|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Release|Any CPU.Build.0 = Release|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Release|ARM.ActiveCfg = Release|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Release|ARM.Build.0 = Release|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Release|iPhone.ActiveCfg = Release|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Release|iPhone.Build.0 = Release|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Release|x64.ActiveCfg = Release|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Release|x64.Build.0 = Release|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Release|x86.ActiveCfg = Release|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Release|x86.Build.0 = Release|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Debug|ARM.ActiveCfg = Debug|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Debug|ARM.Build.0 = Debug|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Debug|iPhone.Build.0 = Debug|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Debug|x64.ActiveCfg = Debug|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Debug|x64.Build.0 = Debug|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Debug|x86.ActiveCfg = Debug|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Debug|x86.Build.0 = Debug|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Release|Any CPU.Build.0 = Release|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Release|ARM.ActiveCfg = Release|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Release|ARM.Build.0 = Release|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Release|iPhone.ActiveCfg = Release|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Release|iPhone.Build.0 = Release|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Release|x64.ActiveCfg = Release|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Release|x64.Build.0 = Release|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Release|x86.ActiveCfg = Release|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Release|x86.Build.0 = Release|Any CPU {4E0924F8-D546-4428-9412-4B9411FBA5FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4E0924F8-D546-4428-9412-4B9411FBA5FF}.Debug|Any CPU.Build.0 = Debug|Any CPU {4E0924F8-D546-4428-9412-4B9411FBA5FF}.Debug|ARM.ActiveCfg = Debug|Any CPU diff --git a/samples/Gallery/Xamarin.Forms/SkiaSharpSample.Windows.sln b/samples/Gallery/Xamarin.Forms/SkiaSharpSample.Windows.sln index 2dcb507b6..f2fecd251 100644 --- a/samples/Gallery/Xamarin.Forms/SkiaSharpSample.Windows.sln +++ b/samples/Gallery/Xamarin.Forms/SkiaSharpSample.Windows.sln @@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Forms.UWP", EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.UWP", "..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.UWP\SkiaSharp.Views.UWP.csproj", "{8BB20362-91A2-4206-944D-634070EAC6F3}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.UWP", "..\..\..\binding\SkiaSharp.UWP\SkiaSharp.UWP.csproj", "{BAB615AA-956E-4079-B260-DD7B1F52EC7D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Classic", "..\..\..\binding\SkiaSharp.Classic\SkiaSharp.Classic.csproj", "{BAB615AA-956E-4079-B260-DD7B1F52EC7D}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp", "..\..\..\binding\SkiaSharp\SkiaSharp.csproj", "{4E0924F8-D546-4428-9412-4B9411FBA5FF}" EndProject @@ -17,7 +17,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.HarfBuzz", "..\.. 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("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.UWP", "..\..\..\binding\HarfBuzzSharp.UWP\HarfBuzzSharp.UWP.csproj", "{6D1E1F39-EF70-4211-A518-BBBAF02D6FFF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.Classic", "..\..\..\binding\HarfBuzzSharp.Classic\HarfBuzzSharp.Classic.csproj", "{6D1E1F39-EF70-4211-A518-BBBAF02D6FFF}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core", "Core\Core.csproj", "{9AE564B8-2EF7-4102-B83A-89A03D4EA05C}" EndProject @@ -29,10 +29,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Forms.Andro EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Android", "..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.Android\SkiaSharp.Views.Android.csproj", "{F540C501-0BBC-4FCB-800B-3D9EB742A2B9}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Android", "..\..\..\binding\SkiaSharp.Android\SkiaSharp.Android.csproj", "{877F90A3-0C72-41E9-85AE-C24D2623524C}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.Android", "..\..\..\binding\HarfBuzzSharp.Android\HarfBuzzSharp.Android.csproj", "{C7A025EB-740B-4C4A-91E4-3DF6248AABAD}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WPF", "WPF\WPF.csproj", "{748981C3-5D0F-462A-9F56-A3C6D792ED30}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Desktop.Common", "..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.Desktop.Common\SkiaSharp.Views.Desktop.Common.csproj", "{28299971-B249-427B-ADDB-61B46637F343}" @@ -337,46 +333,6 @@ Global {F540C501-0BBC-4FCB-800B-3D9EB742A2B9}.Release|x64.Build.0 = Release|Any CPU {F540C501-0BBC-4FCB-800B-3D9EB742A2B9}.Release|x86.ActiveCfg = Release|Any CPU {F540C501-0BBC-4FCB-800B-3D9EB742A2B9}.Release|x86.Build.0 = Release|Any CPU - {877F90A3-0C72-41E9-85AE-C24D2623524C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {877F90A3-0C72-41E9-85AE-C24D2623524C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {877F90A3-0C72-41E9-85AE-C24D2623524C}.Debug|ARM.ActiveCfg = Debug|Any CPU - {877F90A3-0C72-41E9-85AE-C24D2623524C}.Debug|ARM.Build.0 = Debug|Any CPU - {877F90A3-0C72-41E9-85AE-C24D2623524C}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {877F90A3-0C72-41E9-85AE-C24D2623524C}.Debug|ARM64.Build.0 = Debug|Any CPU - {877F90A3-0C72-41E9-85AE-C24D2623524C}.Debug|x64.ActiveCfg = Debug|Any CPU - {877F90A3-0C72-41E9-85AE-C24D2623524C}.Debug|x64.Build.0 = Debug|Any CPU - {877F90A3-0C72-41E9-85AE-C24D2623524C}.Debug|x86.ActiveCfg = Debug|Any CPU - {877F90A3-0C72-41E9-85AE-C24D2623524C}.Debug|x86.Build.0 = Debug|Any CPU - {877F90A3-0C72-41E9-85AE-C24D2623524C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {877F90A3-0C72-41E9-85AE-C24D2623524C}.Release|Any CPU.Build.0 = Release|Any CPU - {877F90A3-0C72-41E9-85AE-C24D2623524C}.Release|ARM.ActiveCfg = Release|Any CPU - {877F90A3-0C72-41E9-85AE-C24D2623524C}.Release|ARM.Build.0 = Release|Any CPU - {877F90A3-0C72-41E9-85AE-C24D2623524C}.Release|ARM64.ActiveCfg = Release|Any CPU - {877F90A3-0C72-41E9-85AE-C24D2623524C}.Release|ARM64.Build.0 = Release|Any CPU - {877F90A3-0C72-41E9-85AE-C24D2623524C}.Release|x64.ActiveCfg = Release|Any CPU - {877F90A3-0C72-41E9-85AE-C24D2623524C}.Release|x64.Build.0 = Release|Any CPU - {877F90A3-0C72-41E9-85AE-C24D2623524C}.Release|x86.ActiveCfg = Release|Any CPU - {877F90A3-0C72-41E9-85AE-C24D2623524C}.Release|x86.Build.0 = Release|Any CPU - {C7A025EB-740B-4C4A-91E4-3DF6248AABAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C7A025EB-740B-4C4A-91E4-3DF6248AABAD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C7A025EB-740B-4C4A-91E4-3DF6248AABAD}.Debug|ARM.ActiveCfg = Debug|Any CPU - {C7A025EB-740B-4C4A-91E4-3DF6248AABAD}.Debug|ARM.Build.0 = Debug|Any CPU - {C7A025EB-740B-4C4A-91E4-3DF6248AABAD}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {C7A025EB-740B-4C4A-91E4-3DF6248AABAD}.Debug|ARM64.Build.0 = Debug|Any CPU - {C7A025EB-740B-4C4A-91E4-3DF6248AABAD}.Debug|x64.ActiveCfg = Debug|Any CPU - {C7A025EB-740B-4C4A-91E4-3DF6248AABAD}.Debug|x64.Build.0 = Debug|Any CPU - {C7A025EB-740B-4C4A-91E4-3DF6248AABAD}.Debug|x86.ActiveCfg = Debug|Any CPU - {C7A025EB-740B-4C4A-91E4-3DF6248AABAD}.Debug|x86.Build.0 = Debug|Any CPU - {C7A025EB-740B-4C4A-91E4-3DF6248AABAD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C7A025EB-740B-4C4A-91E4-3DF6248AABAD}.Release|Any CPU.Build.0 = Release|Any CPU - {C7A025EB-740B-4C4A-91E4-3DF6248AABAD}.Release|ARM.ActiveCfg = Release|Any CPU - {C7A025EB-740B-4C4A-91E4-3DF6248AABAD}.Release|ARM.Build.0 = Release|Any CPU - {C7A025EB-740B-4C4A-91E4-3DF6248AABAD}.Release|ARM64.ActiveCfg = Release|Any CPU - {C7A025EB-740B-4C4A-91E4-3DF6248AABAD}.Release|ARM64.Build.0 = Release|Any CPU - {C7A025EB-740B-4C4A-91E4-3DF6248AABAD}.Release|x64.ActiveCfg = Release|Any CPU - {C7A025EB-740B-4C4A-91E4-3DF6248AABAD}.Release|x64.Build.0 = Release|Any CPU - {C7A025EB-740B-4C4A-91E4-3DF6248AABAD}.Release|x86.ActiveCfg = Release|Any CPU - {C7A025EB-740B-4C4A-91E4-3DF6248AABAD}.Release|x86.Build.0 = Release|Any CPU {748981C3-5D0F-462A-9F56-A3C6D792ED30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {748981C3-5D0F-462A-9F56-A3C6D792ED30}.Debug|Any CPU.Build.0 = Debug|Any CPU {748981C3-5D0F-462A-9F56-A3C6D792ED30}.Debug|ARM.ActiveCfg = Debug|Any CPU diff --git a/samples/Gallery/Xamarin.Forms/SkiaSharpSample.sln b/samples/Gallery/Xamarin.Forms/SkiaSharpSample.sln index ad1253015..04d05e51a 100644 --- a/samples/Gallery/Xamarin.Forms/SkiaSharpSample.sln +++ b/samples/Gallery/Xamarin.Forms/SkiaSharpSample.sln @@ -17,13 +17,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Mac", "..\. EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.UWP", "..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.UWP\SkiaSharp.Views.UWP.csproj", "{8BB20362-91A2-4206-944D-634070EAC6F3}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Android", "..\..\..\binding\SkiaSharp.Android\SkiaSharp.Android.csproj", "{C737DC80-5B71-4B26-A2DC-DA30421788B0}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.iOS", "..\..\..\binding\SkiaSharp.iOS\SkiaSharp.iOS.csproj", "{6A678CFB-21A7-4E81-8909-FD72ABBFD408}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.OSX", "..\..\..\binding\SkiaSharp.OSX\SkiaSharp.OSX.csproj", "{4588A759-3853-49B8-8A68-6C7917BE9220}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.UWP", "..\..\..\binding\SkiaSharp.UWP\SkiaSharp.UWP.csproj", "{BAB615AA-956E-4079-B260-DD7B1F52EC7D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Classic", "..\..\..\binding\SkiaSharp.Classic\SkiaSharp.Classic.csproj", "{C737DC80-5B71-4B26-A2DC-DA30421788B0}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp", "..\..\..\binding\SkiaSharp\SkiaSharp.csproj", "{4E0924F8-D546-4428-9412-4B9411FBA5FF}" EndProject @@ -33,16 +27,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp", "..\..\..\b EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.HarfBuzz", "..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.csproj", "{233220CC-F0F3-4C44-9736-ED2CFC363FD3}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.OSX", "..\..\..\binding\HarfBuzzSharp.OSX\HarfBuzzSharp.OSX.csproj", "{30952C22-D566-488F-9D7A-2411B027D6CA}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.iOS", "..\..\..\binding\HarfBuzzSharp.iOS\HarfBuzzSharp.iOS.csproj", "{E8192110-FCF9-4972-9472-7408BC2CA56B}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.Android", "..\..\..\binding\HarfBuzzSharp.Android\HarfBuzzSharp.Android.csproj", "{E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.Classic", "..\..\..\binding\HarfBuzzSharp.Classic\HarfBuzzSharp.Classic.csproj", "{30952C22-D566-488F-9D7A-2411B027D6CA}" 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("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.UWP", "..\..\..\binding\HarfBuzzSharp.UWP\HarfBuzzSharp.UWP.csproj", "{6D1E1F39-EF70-4211-A518-BBBAF02D6FFF}" -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}" @@ -55,10 +43,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UWP", "UWP\UWP.csproj", "{9 EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TizenOS", "Tizen\TizenOS.csproj", "{A41BC5F6-3879-4708-816D-52DDF5B8F003}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.Tizen", "..\..\..\binding\HarfBuzzSharp.Tizen\HarfBuzzSharp.Tizen.csproj", "{D5495F6D-5654-4E83-8368-519AD142E7D9}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Tizen", "..\..\..\binding\SkiaSharp.Tizen\SkiaSharp.Tizen.csproj", "{59D0CF15-7389-4020-83B7-A7A91395E10C}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Tizen", "..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.Tizen\SkiaSharp.Views.Tizen.csproj", "{1F94DFAC-9FF7-4530-B5A1-11DE0EFA6D19}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Forms.Tizen", "..\..\..\source\SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.Tizen\SkiaSharp.Views.Forms.Tizen.csproj", "{64BCF04F-8944-4459-B7C7-63D4024DBE53}" @@ -315,90 +299,6 @@ Global {C737DC80-5B71-4B26-A2DC-DA30421788B0}.Release|x64.Build.0 = Release|Any CPU {C737DC80-5B71-4B26-A2DC-DA30421788B0}.Release|x86.ActiveCfg = Release|Any CPU {C737DC80-5B71-4B26-A2DC-DA30421788B0}.Release|x86.Build.0 = Release|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Debug|ARM.ActiveCfg = Debug|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Debug|ARM.Build.0 = Debug|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Debug|ARM64.Build.0 = Debug|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Debug|iPhone.Build.0 = Debug|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Debug|x64.ActiveCfg = Debug|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Debug|x64.Build.0 = Debug|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Debug|x86.ActiveCfg = Debug|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Debug|x86.Build.0 = Debug|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Release|Any CPU.Build.0 = Release|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Release|ARM.ActiveCfg = Release|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Release|ARM.Build.0 = Release|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Release|ARM64.ActiveCfg = Release|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Release|ARM64.Build.0 = Release|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Release|iPhone.ActiveCfg = Release|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Release|iPhone.Build.0 = Release|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Release|x64.ActiveCfg = Release|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Release|x64.Build.0 = Release|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Release|x86.ActiveCfg = Release|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Release|x86.Build.0 = Release|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Debug|ARM.ActiveCfg = Debug|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Debug|ARM.Build.0 = Debug|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Debug|ARM64.Build.0 = Debug|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Debug|iPhone.Build.0 = Debug|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Debug|x64.ActiveCfg = Debug|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Debug|x64.Build.0 = Debug|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Debug|x86.ActiveCfg = Debug|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Debug|x86.Build.0 = Debug|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Release|Any CPU.Build.0 = Release|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Release|ARM.ActiveCfg = Release|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Release|ARM.Build.0 = Release|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Release|ARM64.ActiveCfg = Release|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Release|ARM64.Build.0 = Release|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Release|iPhone.ActiveCfg = Release|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Release|iPhone.Build.0 = Release|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Release|x64.ActiveCfg = Release|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Release|x64.Build.0 = Release|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Release|x86.ActiveCfg = Release|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Release|x86.Build.0 = Release|Any CPU - {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Debug|ARM.ActiveCfg = Debug|Any CPU - {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Debug|ARM.Build.0 = Debug|Any CPU - {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Debug|ARM64.Build.0 = Debug|Any CPU - {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Debug|iPhone.Build.0 = Debug|Any CPU - {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Debug|x64.ActiveCfg = Debug|Any CPU - {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Debug|x64.Build.0 = Debug|Any CPU - {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Debug|x86.ActiveCfg = Debug|Any CPU - {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Debug|x86.Build.0 = Debug|Any CPU - {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Release|Any CPU.Build.0 = Release|Any CPU - {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Release|ARM.ActiveCfg = Release|Any CPU - {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Release|ARM.Build.0 = Release|Any CPU - {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Release|ARM64.ActiveCfg = Release|Any CPU - {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Release|ARM64.Build.0 = Release|Any CPU - {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Release|iPhone.ActiveCfg = Release|Any CPU - {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Release|iPhone.Build.0 = Release|Any CPU - {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Release|x64.ActiveCfg = Release|Any CPU - {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Release|x64.Build.0 = Release|Any CPU - {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Release|x86.ActiveCfg = Release|Any CPU - {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Release|x86.Build.0 = Release|Any CPU {4E0924F8-D546-4428-9412-4B9411FBA5FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4E0924F8-D546-4428-9412-4B9411FBA5FF}.Debug|Any CPU.Build.0 = Debug|Any CPU {4E0924F8-D546-4428-9412-4B9411FBA5FF}.Debug|ARM.ActiveCfg = Debug|Any CPU @@ -539,62 +439,6 @@ Global {30952C22-D566-488F-9D7A-2411B027D6CA}.Release|x64.Build.0 = Release|Any CPU {30952C22-D566-488F-9D7A-2411B027D6CA}.Release|x86.ActiveCfg = Release|Any CPU {30952C22-D566-488F-9D7A-2411B027D6CA}.Release|x86.Build.0 = Release|Any CPU - {E8192110-FCF9-4972-9472-7408BC2CA56B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E8192110-FCF9-4972-9472-7408BC2CA56B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E8192110-FCF9-4972-9472-7408BC2CA56B}.Debug|ARM.ActiveCfg = Debug|Any CPU - {E8192110-FCF9-4972-9472-7408BC2CA56B}.Debug|ARM.Build.0 = Debug|Any CPU - {E8192110-FCF9-4972-9472-7408BC2CA56B}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {E8192110-FCF9-4972-9472-7408BC2CA56B}.Debug|ARM64.Build.0 = Debug|Any CPU - {E8192110-FCF9-4972-9472-7408BC2CA56B}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {E8192110-FCF9-4972-9472-7408BC2CA56B}.Debug|iPhone.Build.0 = Debug|Any CPU - {E8192110-FCF9-4972-9472-7408BC2CA56B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {E8192110-FCF9-4972-9472-7408BC2CA56B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {E8192110-FCF9-4972-9472-7408BC2CA56B}.Debug|x64.ActiveCfg = Debug|Any CPU - {E8192110-FCF9-4972-9472-7408BC2CA56B}.Debug|x64.Build.0 = Debug|Any CPU - {E8192110-FCF9-4972-9472-7408BC2CA56B}.Debug|x86.ActiveCfg = Debug|Any CPU - {E8192110-FCF9-4972-9472-7408BC2CA56B}.Debug|x86.Build.0 = Debug|Any CPU - {E8192110-FCF9-4972-9472-7408BC2CA56B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E8192110-FCF9-4972-9472-7408BC2CA56B}.Release|Any CPU.Build.0 = Release|Any CPU - {E8192110-FCF9-4972-9472-7408BC2CA56B}.Release|ARM.ActiveCfg = Release|Any CPU - {E8192110-FCF9-4972-9472-7408BC2CA56B}.Release|ARM.Build.0 = Release|Any CPU - {E8192110-FCF9-4972-9472-7408BC2CA56B}.Release|ARM64.ActiveCfg = Release|Any CPU - {E8192110-FCF9-4972-9472-7408BC2CA56B}.Release|ARM64.Build.0 = Release|Any CPU - {E8192110-FCF9-4972-9472-7408BC2CA56B}.Release|iPhone.ActiveCfg = Release|Any CPU - {E8192110-FCF9-4972-9472-7408BC2CA56B}.Release|iPhone.Build.0 = Release|Any CPU - {E8192110-FCF9-4972-9472-7408BC2CA56B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {E8192110-FCF9-4972-9472-7408BC2CA56B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {E8192110-FCF9-4972-9472-7408BC2CA56B}.Release|x64.ActiveCfg = Release|Any CPU - {E8192110-FCF9-4972-9472-7408BC2CA56B}.Release|x64.Build.0 = Release|Any CPU - {E8192110-FCF9-4972-9472-7408BC2CA56B}.Release|x86.ActiveCfg = Release|Any CPU - {E8192110-FCF9-4972-9472-7408BC2CA56B}.Release|x86.Build.0 = Release|Any CPU - {E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}.Debug|ARM.ActiveCfg = Debug|Any CPU - {E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}.Debug|ARM.Build.0 = Debug|Any CPU - {E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}.Debug|ARM64.Build.0 = Debug|Any CPU - {E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}.Debug|iPhone.Build.0 = Debug|Any CPU - {E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}.Debug|x64.ActiveCfg = Debug|Any CPU - {E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}.Debug|x64.Build.0 = Debug|Any CPU - {E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}.Debug|x86.ActiveCfg = Debug|Any CPU - {E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}.Debug|x86.Build.0 = Debug|Any CPU - {E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}.Release|Any CPU.Build.0 = Release|Any CPU - {E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}.Release|ARM.ActiveCfg = Release|Any CPU - {E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}.Release|ARM.Build.0 = Release|Any CPU - {E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}.Release|ARM64.ActiveCfg = Release|Any CPU - {E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}.Release|ARM64.Build.0 = Release|Any CPU - {E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}.Release|iPhone.ActiveCfg = Release|Any CPU - {E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}.Release|iPhone.Build.0 = Release|Any CPU - {E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}.Release|x64.ActiveCfg = Release|Any CPU - {E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}.Release|x64.Build.0 = Release|Any CPU - {E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}.Release|x86.ActiveCfg = Release|Any CPU - {E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}.Release|x86.Build.0 = Release|Any CPU {99411A8A-1F8C-469C-AC10-E72F28EDB376}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {99411A8A-1F8C-469C-AC10-E72F28EDB376}.Debug|Any CPU.Build.0 = Debug|Any CPU {99411A8A-1F8C-469C-AC10-E72F28EDB376}.Debug|ARM.ActiveCfg = Debug|Any CPU @@ -623,34 +467,6 @@ Global {99411A8A-1F8C-469C-AC10-E72F28EDB376}.Release|x64.Build.0 = Release|Any CPU {99411A8A-1F8C-469C-AC10-E72F28EDB376}.Release|x86.ActiveCfg = Release|Any CPU {99411A8A-1F8C-469C-AC10-E72F28EDB376}.Release|x86.Build.0 = Release|Any CPU - {6D1E1F39-EF70-4211-A518-BBBAF02D6FFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6D1E1F39-EF70-4211-A518-BBBAF02D6FFF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6D1E1F39-EF70-4211-A518-BBBAF02D6FFF}.Debug|ARM.ActiveCfg = Debug|Any CPU - {6D1E1F39-EF70-4211-A518-BBBAF02D6FFF}.Debug|ARM.Build.0 = Debug|Any CPU - {6D1E1F39-EF70-4211-A518-BBBAF02D6FFF}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {6D1E1F39-EF70-4211-A518-BBBAF02D6FFF}.Debug|ARM64.Build.0 = Debug|Any CPU - {6D1E1F39-EF70-4211-A518-BBBAF02D6FFF}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {6D1E1F39-EF70-4211-A518-BBBAF02D6FFF}.Debug|iPhone.Build.0 = Debug|Any CPU - {6D1E1F39-EF70-4211-A518-BBBAF02D6FFF}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {6D1E1F39-EF70-4211-A518-BBBAF02D6FFF}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {6D1E1F39-EF70-4211-A518-BBBAF02D6FFF}.Debug|x64.ActiveCfg = Debug|Any CPU - {6D1E1F39-EF70-4211-A518-BBBAF02D6FFF}.Debug|x64.Build.0 = Debug|Any CPU - {6D1E1F39-EF70-4211-A518-BBBAF02D6FFF}.Debug|x86.ActiveCfg = Debug|Any CPU - {6D1E1F39-EF70-4211-A518-BBBAF02D6FFF}.Debug|x86.Build.0 = Debug|Any CPU - {6D1E1F39-EF70-4211-A518-BBBAF02D6FFF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6D1E1F39-EF70-4211-A518-BBBAF02D6FFF}.Release|Any CPU.Build.0 = Release|Any CPU - {6D1E1F39-EF70-4211-A518-BBBAF02D6FFF}.Release|ARM.ActiveCfg = Release|Any CPU - {6D1E1F39-EF70-4211-A518-BBBAF02D6FFF}.Release|ARM.Build.0 = Release|Any CPU - {6D1E1F39-EF70-4211-A518-BBBAF02D6FFF}.Release|ARM64.ActiveCfg = Release|Any CPU - {6D1E1F39-EF70-4211-A518-BBBAF02D6FFF}.Release|ARM64.Build.0 = Release|Any CPU - {6D1E1F39-EF70-4211-A518-BBBAF02D6FFF}.Release|iPhone.ActiveCfg = Release|Any CPU - {6D1E1F39-EF70-4211-A518-BBBAF02D6FFF}.Release|iPhone.Build.0 = Release|Any CPU - {6D1E1F39-EF70-4211-A518-BBBAF02D6FFF}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {6D1E1F39-EF70-4211-A518-BBBAF02D6FFF}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {6D1E1F39-EF70-4211-A518-BBBAF02D6FFF}.Release|x64.ActiveCfg = Release|Any CPU - {6D1E1F39-EF70-4211-A518-BBBAF02D6FFF}.Release|x64.Build.0 = Release|Any CPU - {6D1E1F39-EF70-4211-A518-BBBAF02D6FFF}.Release|x86.ActiveCfg = Release|Any CPU - {6D1E1F39-EF70-4211-A518-BBBAF02D6FFF}.Release|x86.Build.0 = Release|Any CPU {B8A92B38-B7DB-450B-8D16-301404E9EADC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B8A92B38-B7DB-450B-8D16-301404E9EADC}.Debug|Any CPU.Build.0 = Debug|Any CPU {B8A92B38-B7DB-450B-8D16-301404E9EADC}.Debug|Any CPU.Deploy.0 = Debug|Any CPU @@ -861,62 +677,6 @@ Global {A41BC5F6-3879-4708-816D-52DDF5B8F003}.Release|x64.Build.0 = Release|Any CPU {A41BC5F6-3879-4708-816D-52DDF5B8F003}.Release|x86.ActiveCfg = Release|Any CPU {A41BC5F6-3879-4708-816D-52DDF5B8F003}.Release|x86.Build.0 = Release|Any CPU - {D5495F6D-5654-4E83-8368-519AD142E7D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D5495F6D-5654-4E83-8368-519AD142E7D9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D5495F6D-5654-4E83-8368-519AD142E7D9}.Debug|ARM.ActiveCfg = Debug|Any CPU - {D5495F6D-5654-4E83-8368-519AD142E7D9}.Debug|ARM.Build.0 = Debug|Any CPU - {D5495F6D-5654-4E83-8368-519AD142E7D9}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {D5495F6D-5654-4E83-8368-519AD142E7D9}.Debug|ARM64.Build.0 = Debug|Any CPU - {D5495F6D-5654-4E83-8368-519AD142E7D9}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {D5495F6D-5654-4E83-8368-519AD142E7D9}.Debug|iPhone.Build.0 = Debug|Any CPU - {D5495F6D-5654-4E83-8368-519AD142E7D9}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {D5495F6D-5654-4E83-8368-519AD142E7D9}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {D5495F6D-5654-4E83-8368-519AD142E7D9}.Debug|x64.ActiveCfg = Debug|Any CPU - {D5495F6D-5654-4E83-8368-519AD142E7D9}.Debug|x64.Build.0 = Debug|Any CPU - {D5495F6D-5654-4E83-8368-519AD142E7D9}.Debug|x86.ActiveCfg = Debug|Any CPU - {D5495F6D-5654-4E83-8368-519AD142E7D9}.Debug|x86.Build.0 = Debug|Any CPU - {D5495F6D-5654-4E83-8368-519AD142E7D9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D5495F6D-5654-4E83-8368-519AD142E7D9}.Release|Any CPU.Build.0 = Release|Any CPU - {D5495F6D-5654-4E83-8368-519AD142E7D9}.Release|ARM.ActiveCfg = Release|Any CPU - {D5495F6D-5654-4E83-8368-519AD142E7D9}.Release|ARM.Build.0 = Release|Any CPU - {D5495F6D-5654-4E83-8368-519AD142E7D9}.Release|ARM64.ActiveCfg = Release|Any CPU - {D5495F6D-5654-4E83-8368-519AD142E7D9}.Release|ARM64.Build.0 = Release|Any CPU - {D5495F6D-5654-4E83-8368-519AD142E7D9}.Release|iPhone.ActiveCfg = Release|Any CPU - {D5495F6D-5654-4E83-8368-519AD142E7D9}.Release|iPhone.Build.0 = Release|Any CPU - {D5495F6D-5654-4E83-8368-519AD142E7D9}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {D5495F6D-5654-4E83-8368-519AD142E7D9}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {D5495F6D-5654-4E83-8368-519AD142E7D9}.Release|x64.ActiveCfg = Release|Any CPU - {D5495F6D-5654-4E83-8368-519AD142E7D9}.Release|x64.Build.0 = Release|Any CPU - {D5495F6D-5654-4E83-8368-519AD142E7D9}.Release|x86.ActiveCfg = Release|Any CPU - {D5495F6D-5654-4E83-8368-519AD142E7D9}.Release|x86.Build.0 = Release|Any CPU - {59D0CF15-7389-4020-83B7-A7A91395E10C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {59D0CF15-7389-4020-83B7-A7A91395E10C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {59D0CF15-7389-4020-83B7-A7A91395E10C}.Debug|ARM.ActiveCfg = Debug|Any CPU - {59D0CF15-7389-4020-83B7-A7A91395E10C}.Debug|ARM.Build.0 = Debug|Any CPU - {59D0CF15-7389-4020-83B7-A7A91395E10C}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {59D0CF15-7389-4020-83B7-A7A91395E10C}.Debug|ARM64.Build.0 = Debug|Any CPU - {59D0CF15-7389-4020-83B7-A7A91395E10C}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {59D0CF15-7389-4020-83B7-A7A91395E10C}.Debug|iPhone.Build.0 = Debug|Any CPU - {59D0CF15-7389-4020-83B7-A7A91395E10C}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {59D0CF15-7389-4020-83B7-A7A91395E10C}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {59D0CF15-7389-4020-83B7-A7A91395E10C}.Debug|x64.ActiveCfg = Debug|Any CPU - {59D0CF15-7389-4020-83B7-A7A91395E10C}.Debug|x64.Build.0 = Debug|Any CPU - {59D0CF15-7389-4020-83B7-A7A91395E10C}.Debug|x86.ActiveCfg = Debug|Any CPU - {59D0CF15-7389-4020-83B7-A7A91395E10C}.Debug|x86.Build.0 = Debug|Any CPU - {59D0CF15-7389-4020-83B7-A7A91395E10C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {59D0CF15-7389-4020-83B7-A7A91395E10C}.Release|Any CPU.Build.0 = Release|Any CPU - {59D0CF15-7389-4020-83B7-A7A91395E10C}.Release|ARM.ActiveCfg = Release|Any CPU - {59D0CF15-7389-4020-83B7-A7A91395E10C}.Release|ARM.Build.0 = Release|Any CPU - {59D0CF15-7389-4020-83B7-A7A91395E10C}.Release|ARM64.ActiveCfg = Release|Any CPU - {59D0CF15-7389-4020-83B7-A7A91395E10C}.Release|ARM64.Build.0 = Release|Any CPU - {59D0CF15-7389-4020-83B7-A7A91395E10C}.Release|iPhone.ActiveCfg = Release|Any CPU - {59D0CF15-7389-4020-83B7-A7A91395E10C}.Release|iPhone.Build.0 = Release|Any CPU - {59D0CF15-7389-4020-83B7-A7A91395E10C}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {59D0CF15-7389-4020-83B7-A7A91395E10C}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {59D0CF15-7389-4020-83B7-A7A91395E10C}.Release|x64.ActiveCfg = Release|Any CPU - {59D0CF15-7389-4020-83B7-A7A91395E10C}.Release|x64.Build.0 = Release|Any CPU - {59D0CF15-7389-4020-83B7-A7A91395E10C}.Release|x86.ActiveCfg = Release|Any CPU - {59D0CF15-7389-4020-83B7-A7A91395E10C}.Release|x86.Build.0 = Release|Any CPU {1F94DFAC-9FF7-4530-B5A1-11DE0EFA6D19}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1F94DFAC-9FF7-4530-B5A1-11DE0EFA6D19}.Debug|Any CPU.Build.0 = Debug|Any CPU {1F94DFAC-9FF7-4530-B5A1-11DE0EFA6D19}.Debug|ARM.ActiveCfg = Debug|Any CPU diff --git a/samples/Gallery/Xamarin.Forms/Tizen/TizenOS.csproj b/samples/Gallery/Xamarin.Forms/Tizen/TizenOS.csproj index b0bf66d5b..5aa6dc164 100644 --- a/samples/Gallery/Xamarin.Forms/Tizen/TizenOS.csproj +++ b/samples/Gallery/Xamarin.Forms/Tizen/TizenOS.csproj @@ -16,10 +16,10 @@ - + - + diff --git a/samples/Gallery/Xamarin.Forms/UWP/UWP.csproj b/samples/Gallery/Xamarin.Forms/UWP/UWP.csproj index 55ca8bfbd..515f9b62a 100644 --- a/samples/Gallery/Xamarin.Forms/UWP/UWP.csproj +++ b/samples/Gallery/Xamarin.Forms/UWP/UWP.csproj @@ -119,13 +119,13 @@ - + {6d1e1f39-ef70-4211-a518-bbbaf02d6fff} - HarfBuzzSharp.UWP + HarfBuzzSharp.Classic - + {bab615aa-956e-4079-b260-dd7b1f52ec7d} - SkiaSharp.UWP + SkiaSharp.Classic {233220cc-f0f3-4c44-9736-ed2cfc363fd3} diff --git a/samples/Gallery/Xamarin.Forms/iOS/iOS.csproj b/samples/Gallery/Xamarin.Forms/iOS/iOS.csproj index a28b1309c..9c090da19 100644 --- a/samples/Gallery/Xamarin.Forms/iOS/iOS.csproj +++ b/samples/Gallery/Xamarin.Forms/iOS/iOS.csproj @@ -114,13 +114,13 @@ - + {e8192110-fcf9-4972-9472-7408bc2ca56b} - HarfBuzzSharp.iOS + HarfBuzzSharp.Classic - + {6a678cfb-21a7-4e81-8909-fd72abbfd408} - SkiaSharp.iOS + SkiaSharp.Classic {233220cc-f0f3-4c44-9736-ed2cfc363fd3} diff --git a/samples/Gallery/macOS/SkiaSharpSample.sln b/samples/Gallery/macOS/SkiaSharpSample.sln index a96dc579a..afccf0956 100644 --- a/samples/Gallery/macOS/SkiaSharpSample.sln +++ b/samples/Gallery/macOS/SkiaSharpSample.sln @@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.27130.2010 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.OSX", "..\..\..\binding\SkiaSharp.OSX\SkiaSharp.OSX.csproj", "{4588A759-3853-49B8-8A68-6C7917BE9220}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Classic", "..\..\..\binding\SkiaSharp.Classic\SkiaSharp.Classic.csproj", "{4588A759-3853-49B8-8A68-6C7917BE9220}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HarfBuzzSharp.OSX", "..\..\..\binding\HarfBuzzSharp.OSX\HarfBuzzSharp.OSX.csproj", "{30952C22-D566-488F-9D7A-2411B027D6CA}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HarfBuzzSharp.Classic", "..\..\..\binding\HarfBuzzSharp.Classic\HarfBuzzSharp.Classic.csproj", "{30952C22-D566-488F-9D7A-2411B027D6CA}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Views.Mac", "..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.Mac\SkiaSharp.Views.Mac.csproj", "{809A15DC-E675-4A24-83FA-DF13160F7E4C}" EndProject diff --git a/samples/Gallery/macOS/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Gallery/macOS/SkiaSharpSample/SkiaSharpSample.csproj index bb2814201..c8f84a0f3 100644 --- a/samples/Gallery/macOS/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Gallery/macOS/SkiaSharpSample/SkiaSharpSample.csproj @@ -56,17 +56,17 @@ - + {30952C22-D566-488F-9D7A-2411B027D6CA} - HarfBuzzSharp.OSX + HarfBuzzSharp.Classic {233220cc-f0f3-4c44-9736-ed2cfc363fd3} SkiaSharp.HarfBuzz - + {4588A759-3853-49B8-8A68-6C7917BE9220} - SkiaSharp.OSX + SkiaSharp.Classic {809A15DC-E675-4A24-83FA-DF13160F7E4C} diff --git a/samples/Gallery/tvOS/SkiaSharpSample.sln b/samples/Gallery/tvOS/SkiaSharpSample.sln index 866a8cbac..0818fa862 100644 --- a/samples/Gallery/tvOS/SkiaSharpSample.sln +++ b/samples/Gallery/tvOS/SkiaSharpSample.sln @@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.27130.2010 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.tvOS", "..\..\..\binding\SkiaSharp.tvOS\SkiaSharp.tvOS.csproj", "{5180E370-A455-42BB-99F9-97BD269B8A52}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Classic", "..\..\..\binding\SkiaSharp.Classic\SkiaSharp.Classic.csproj", "{5180E370-A455-42BB-99F9-97BD269B8A52}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HarfBuzzSharp.tvOS", "..\..\..\binding\HarfBuzzSharp.tvOS\HarfBuzzSharp.tvOS.csproj", "{8D646738-458A-441F-B69B-253EF058A812}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HarfBuzzSharp.Classic", "..\..\..\binding\HarfBuzzSharp.Classic\HarfBuzzSharp.Classic.csproj", "{8D646738-458A-441F-B69B-253EF058A812}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Views.tvOS", "..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.tvOS\SkiaSharp.Views.tvOS.csproj", "{E5973829-6C8B-43E4-B81B-C8492DF26C90}" EndProject diff --git a/samples/Gallery/tvOS/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Gallery/tvOS/SkiaSharpSample/SkiaSharpSample.csproj index 1b0044694..69732a874 100644 --- a/samples/Gallery/tvOS/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Gallery/tvOS/SkiaSharpSample/SkiaSharpSample.csproj @@ -86,13 +86,13 @@ - + {8d646738-458a-441f-b69b-253ef058a812} - HarfBuzzSharp.tvOS + HarfBuzzSharp.Classic - + {5180e370-a455-42bb-99f9-97bd269b8a52} - SkiaSharp.tvOS + SkiaSharp.Classic {233220cc-f0f3-4c44-9736-ed2cfc363fd3} diff --git a/scripts/azure-templates-bootstrapper.yml b/scripts/azure-templates-bootstrapper.yml index 1b0849387..071e0e5e4 100644 --- a/scripts/azure-templates-bootstrapper.yml +++ b/scripts/azure-templates-bootstrapper.yml @@ -64,6 +64,10 @@ jobs: - pwsh: .\scripts\get-build-type.ps1 -ExternalsBuildId '${{ parameters.buildExternals }}' displayName: Determine build type + - pwsh: ./scripts/get-free-space.ps1 + displayName: Display the free space to debug out of space errors + condition: always() + # provisioning steps - ${{ if ne(parameters.vmImage.provisioningSteps, '') }}: - ${{ parameters.vmImage.provisioningSteps }} @@ -130,9 +134,9 @@ jobs: condition: and(succeeded(), eq(variables['DOWNLOAD_EXTERNALS'], '')) # install extra bits for the managed builds - - ${{ if and(not(startsWith(parameters.name, 'native_')), not(endsWith(parameters.name, '_linux'))) }}: - # install the bits needed for Android - - ${{ if eq(parameters.installAndroidSdk, 'true') }}: + - ${{ if not(startsWith(parameters.name, 'native_')) }}: + # install the bits needed for Android on macOS and Windows + - ${{ if and(eq(parameters.installAndroidSdk, 'true'), not(endsWith(parameters.name, '_linux'))) }}: # install the correct version of the JDK for .NET 6 - pwsh: | if ("$env:JAVA_HOME_11_X64") { @@ -188,7 +192,6 @@ jobs: version: 6.0.x retryCountOnTaskFailure: 3 displayName: Install .NET Core 6.0.x - # install the bits needed for .NET 6 builds - pwsh: .\scripts\install-dotnet.ps1 -Version $env:DOTNET_VERSION_PREVIEW -InstallDir "$env:AGENT_TOOLSDIRECTORY/dotnet" displayName: Install the preview version of .NET Core retryCountOnTaskFailure: 3 @@ -287,6 +290,10 @@ jobs: - ${{ if ne(length(parameters.preBuildSteps), 0) }}: - ${{ parameters.preBuildSteps }} + - pwsh: ./scripts/get-free-space.ps1 + displayName: Display the free space to debug out of space errors + condition: always() + # build - ${{ if eq(parameters.docker, '') }}: - ${{ if endsWith(parameters.name, '_windows') }}: @@ -302,7 +309,6 @@ jobs: # There seems to be a bug in some verions of mspdbcmf.exe. This looks to be fixed in a VS preview. AppxSymbolPackageEnabled: false displayName: Run the bootstrapper for ${{ parameters.target }} - retryCountOnTaskFailure: 3 condition: and(succeeded(), eq(variables['DOWNLOAD_EXTERNALS'], '')) - ${{ if not(endsWith(parameters.name, '_windows')) }}: - bash: | @@ -313,7 +319,6 @@ jobs: env: JavaSdkDirectory: $(JAVA_HOME) displayName: Run the bootstrapper for ${{ parameters.target }} - retryCountOnTaskFailure: 3 condition: and(succeeded(), eq(variables['DOWNLOAD_EXTERNALS'], '')) - ${{ if ne(parameters.docker, '') }}: - task: Docker@2 @@ -334,6 +339,14 @@ jobs: displayName: Run the bootstrapper for ${{ parameters.target }} using the Docker image condition: and(succeeded(), eq(variables['DOWNLOAD_EXTERNALS'], '')) + - pwsh: ./scripts/get-free-space.ps1 + displayName: Display the free space to debug out of space errors + condition: always() + + - pwsh: ./scripts/get-largest-folders.ps1 + displayName: Display the full folder size to debug out of space errors + condition: always() + # post-build steps - ${{ parameters.postBuildSteps }} diff --git a/scripts/get-free-space.ps1 b/scripts/get-free-space.ps1 new file mode 100644 index 000000000..4d6118e09 --- /dev/null +++ b/scripts/get-free-space.ps1 @@ -0,0 +1,7 @@ +$ErrorActionPreference = 'Stop' + +if ($IsLinux -or $IsMacOS) { + Write-Host "Not supported yet." +} else { + Get-Volume +} diff --git a/scripts/get-largest-folders.ps1 b/scripts/get-largest-folders.ps1 new file mode 100644 index 000000000..abce2d58c --- /dev/null +++ b/scripts/get-largest-folders.ps1 @@ -0,0 +1,9 @@ +$ErrorActionPreference = 'Stop' + +Get-ChildItem . -Directory -Recurse -Depth 0 | + Sort-Object FullName | + Select-Object ` + FullName, + @{ Name="Size (MB)"; Expression={ [Math]::Round((Get-ChildItem $_ -Recurse | Measure-Object -Property Length -Sum -EA 0).Sum / 1MB, 2) } } | + Sort-Object "Size (MB)" -Descending | + Format-Table -AutoSize diff --git a/scripts/install-vs.ps1 b/scripts/install-vs.ps1 index 3985c7d8e..485a3b26f 100644 --- a/scripts/install-vs.ps1 +++ b/scripts/install-vs.ps1 @@ -1,6 +1,7 @@ Param( [string] $Version, - [string] $TestPath = "2022\Preview" + [string] $TestPath = "2022\Preview", + [boolean] $RemoveExisting = $false ) $ErrorActionPreference = 'Stop' @@ -18,6 +19,11 @@ if ("$env:AGENT_TEMPDIRECTORY") { $startTime = Get-Date +if ($RemoveExisting) { + Write-Host "Removing previous Visual Studio..." + & 'C:\Program Files (x86)\Microsoft Visual Studio\Installer\InstallCleanup.exe' -f +} + Write-Host "Downloading Visual Studio Installer..." Invoke-WebRequest -UseBasicParsing ` -Uri "https://aka.ms/vs/install/latest/vs_setup.exe" ` diff --git a/source/SkiaSharp.Build.props b/source/SkiaSharp.Build.props index 82acabcf5..c2c383dce 100644 --- a/source/SkiaSharp.Build.props +++ b/source/SkiaSharp.Build.props @@ -12,6 +12,8 @@ $([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows))) $([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX))) $([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux))) + true + false @@ -25,6 +27,33 @@ 10.0 + + + tizen40 + $(ClassicTargetFrameworks);xamarinios1.0;xamarintvos1.0;xamarinwatchos1.0;xamarinmac2.0 + $(ClassicTargetFrameworks);monoandroid10.0 + $(ClassicTargetFrameworks);uap10.0.10240;uap10.0.16299 + + + + + netstandard1.3;netstandard2.0;net462 + net6.0-ios;net6.0-maccatalyst;net6.0-tvos;net6.0-macos;net6.0-android + net6.0;$(Net6PlatformTargetFrameworks) + + + + + $(BasicTargetFrameworks) + $(AllTargetFrameworks);$(Net6TargetFrameworks) + + + + + net6.0;net6.0-ios;net6.0-maccatalyst;net6.0-android + $(MauiTargetFrameworks);net6.0-windows10.0.19041.0 + + portable true diff --git a/source/SkiaSharp.HarfBuzz/SkiaSharp.HarfBuzz/SkiaSharp.HarfBuzz.csproj b/source/SkiaSharp.HarfBuzz/SkiaSharp.HarfBuzz/SkiaSharp.HarfBuzz.csproj index 754c43f35..45a7a65e6 100644 --- a/source/SkiaSharp.HarfBuzz/SkiaSharp.HarfBuzz/SkiaSharp.HarfBuzz.csproj +++ b/source/SkiaSharp.HarfBuzz/SkiaSharp.HarfBuzz/SkiaSharp.HarfBuzz.csproj @@ -1,6 +1,6 @@  - netstandard1.3;netstandard2.0;net462 + $(BasicTargetFrameworks) SkiaSharp.HarfBuzz SkiaSharp.HarfBuzz SkiaSharp.HarfBuzz 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 fef217338..02df82e30 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 @@ -11,7 +11,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 7f3214c0a..d988876fa 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 @@ -14,7 +14,7 @@ - + diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Tizen/SkiaSharp.Views.Forms.Tizen.csproj b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Tizen/SkiaSharp.Views.Forms.Tizen.csproj index 1058d783e..84d46c1a1 100755 --- a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Tizen/SkiaSharp.Views.Forms.Tizen.csproj +++ b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Tizen/SkiaSharp.Views.Forms.Tizen.csproj @@ -13,7 +13,7 @@ - + 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 71494587c..14f9c728b 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 @@ -11,7 +11,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 2c7b12a0c..5c4143688 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 @@ -10,7 +10,7 @@ - + diff --git a/source/SkiaSharp.Views.Maui/SkiaSharp.Views.Maui.Controls.Compatibility/SkiaSharp.Views.Maui.Controls.Compatibility.csproj b/source/SkiaSharp.Views.Maui/SkiaSharp.Views.Maui.Controls.Compatibility/SkiaSharp.Views.Maui.Controls.Compatibility.csproj index 120d1702c..bad16e5ed 100644 --- a/source/SkiaSharp.Views.Maui/SkiaSharp.Views.Maui.Controls.Compatibility/SkiaSharp.Views.Maui.Controls.Compatibility.csproj +++ b/source/SkiaSharp.Views.Maui/SkiaSharp.Views.Maui.Controls.Compatibility/SkiaSharp.Views.Maui.Controls.Compatibility.csproj @@ -1,7 +1,6 @@  - net6.0;net6.0-ios;net6.0-maccatalyst;net6.0-android - $(TargetFrameworks);net6.0-windows10.0.19041 + $(MauiTargetFrameworks) 10.0.17763.0 SkiaSharp.Views.Maui.Controls.Compatibility SkiaSharp.Views.Maui.Controls.Compatibility diff --git a/source/SkiaSharp.Views.Maui/SkiaSharp.Views.Maui.Controls/SkiaSharp.Views.Maui.Controls.csproj b/source/SkiaSharp.Views.Maui/SkiaSharp.Views.Maui.Controls/SkiaSharp.Views.Maui.Controls.csproj index f764f3caf..26ac71720 100644 --- a/source/SkiaSharp.Views.Maui/SkiaSharp.Views.Maui.Controls/SkiaSharp.Views.Maui.Controls.csproj +++ b/source/SkiaSharp.Views.Maui/SkiaSharp.Views.Maui.Controls/SkiaSharp.Views.Maui.Controls.csproj @@ -1,7 +1,6 @@  - net6.0;net6.0-ios;net6.0-maccatalyst;net6.0-android - $(TargetFrameworks);net6.0-windows10.0.19041 + $(MauiTargetFrameworks) 10.0.17763.0 SkiaSharp.Views.Maui.Controls SkiaSharp.Views.Maui.Controls diff --git a/source/SkiaSharp.Views.Maui/SkiaSharp.Views.Maui.Core/SkiaSharp.Views.Maui.Core.csproj b/source/SkiaSharp.Views.Maui/SkiaSharp.Views.Maui.Core/SkiaSharp.Views.Maui.Core.csproj index ee327139e..5190d174a 100644 --- a/source/SkiaSharp.Views.Maui/SkiaSharp.Views.Maui.Core/SkiaSharp.Views.Maui.Core.csproj +++ b/source/SkiaSharp.Views.Maui/SkiaSharp.Views.Maui.Core/SkiaSharp.Views.Maui.Core.csproj @@ -1,7 +1,6 @@  - net6.0;net6.0-ios;net6.0-maccatalyst;net6.0-android - $(TargetFrameworks);net6.0-windows10.0.19041 + $(MauiTargetFrameworks) 10.0.17763.0 SkiaSharp.Views.Maui.Core SkiaSharp.Views.Maui.Core diff --git a/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.Android/SkiaSharp.Views.Uno.Android.csproj b/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.Android/SkiaSharp.Views.Uno.Android.csproj index 6325b2cda..4338890b4 100644 --- a/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.Android/SkiaSharp.Views.Uno.Android.csproj +++ b/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.Android/SkiaSharp.Views.Uno.Android.csproj @@ -11,7 +11,7 @@ - + diff --git a/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.Mac/SkiaSharp.Views.Uno.Mac.csproj b/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.Mac/SkiaSharp.Views.Uno.Mac.csproj index f23fdc922..4bc14b629 100644 --- a/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.Mac/SkiaSharp.Views.Uno.Mac.csproj +++ b/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.Mac/SkiaSharp.Views.Uno.Mac.csproj @@ -11,7 +11,7 @@ - + diff --git a/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.iOS/SkiaSharp.Views.Uno.iOS.csproj b/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.iOS/SkiaSharp.Views.Uno.iOS.csproj index 1df08a77a..6df25e7a5 100644 --- a/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.iOS/SkiaSharp.Views.Uno.iOS.csproj +++ b/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.iOS/SkiaSharp.Views.Uno.iOS.csproj @@ -10,7 +10,7 @@ - + diff --git a/source/SkiaSharp.Views.WinUI/SkiaSharp.Views.WinUI/SkiaSharp.Views.WinUI.csproj b/source/SkiaSharp.Views.WinUI/SkiaSharp.Views.WinUI/SkiaSharp.Views.WinUI.csproj index 503259b80..f20745b9a 100644 --- a/source/SkiaSharp.Views.WinUI/SkiaSharp.Views.WinUI/SkiaSharp.Views.WinUI.csproj +++ b/source/SkiaSharp.Views.WinUI/SkiaSharp.Views.WinUI/SkiaSharp.Views.WinUI.csproj @@ -1,6 +1,6 @@  - net5.0-windows10.0.18362;net6.0-windows10.0.18362;net6.0-windows10.0.19041 + net5.0-windows10.0.18362.0;net6.0-windows10.0.18362.0;net6.0-windows10.0.19041.0 10.0.17763.0 SkiaSharp.Views.Windows SkiaSharp.Views.Windows diff --git a/source/SkiaSharp.Views/SkiaSharp.Views.Android/SkiaSharp.Views.Android.csproj b/source/SkiaSharp.Views/SkiaSharp.Views.Android/SkiaSharp.Views.Android.csproj index ac768f4d9..0cc7bd590 100644 --- a/source/SkiaSharp.Views/SkiaSharp.Views.Android/SkiaSharp.Views.Android.csproj +++ b/source/SkiaSharp.Views/SkiaSharp.Views.Android/SkiaSharp.Views.Android.csproj @@ -7,7 +7,7 @@ monoandroid1.0 - + diff --git a/source/SkiaSharp.Views/SkiaSharp.Views.Mac/SkiaSharp.Views.Mac.csproj b/source/SkiaSharp.Views/SkiaSharp.Views.Mac/SkiaSharp.Views.Mac.csproj index 7f4429431..540f54b81 100644 --- a/source/SkiaSharp.Views/SkiaSharp.Views.Mac/SkiaSharp.Views.Mac.csproj +++ b/source/SkiaSharp.Views/SkiaSharp.Views.Mac/SkiaSharp.Views.Mac.csproj @@ -7,7 +7,7 @@ $(DefineConstants);__MACOS__ - + diff --git a/source/SkiaSharp.Views/SkiaSharp.Views.Tizen/SkiaSharp.Views.Tizen.csproj b/source/SkiaSharp.Views/SkiaSharp.Views.Tizen/SkiaSharp.Views.Tizen.csproj index 4ad10d069..70dd21d41 100755 --- a/source/SkiaSharp.Views/SkiaSharp.Views.Tizen/SkiaSharp.Views.Tizen.csproj +++ b/source/SkiaSharp.Views/SkiaSharp.Views.Tizen/SkiaSharp.Views.Tizen.csproj @@ -12,7 +12,7 @@ - + diff --git a/source/SkiaSharp.Views/SkiaSharp.Views.UWP/SkiaSharp.Views.UWP.csproj b/source/SkiaSharp.Views/SkiaSharp.Views.UWP/SkiaSharp.Views.UWP.csproj index fc5ab8e34..ca715fe41 100644 --- a/source/SkiaSharp.Views/SkiaSharp.Views.UWP/SkiaSharp.Views.UWP.csproj +++ b/source/SkiaSharp.Views/SkiaSharp.Views.UWP/SkiaSharp.Views.UWP.csproj @@ -7,7 +7,7 @@ uap10.0 - + diff --git a/source/SkiaSharp.Views/SkiaSharp.Views.iOS/SkiaSharp.Views.iOS.csproj b/source/SkiaSharp.Views/SkiaSharp.Views.iOS/SkiaSharp.Views.iOS.csproj index 722de74fc..c384edf5c 100644 --- a/source/SkiaSharp.Views/SkiaSharp.Views.iOS/SkiaSharp.Views.iOS.csproj +++ b/source/SkiaSharp.Views/SkiaSharp.Views.iOS/SkiaSharp.Views.iOS.csproj @@ -6,7 +6,7 @@ SkiaSharp.Views - + diff --git a/source/SkiaSharp.Views/SkiaSharp.Views.tvOS/SkiaSharp.Views.tvOS.csproj b/source/SkiaSharp.Views/SkiaSharp.Views.tvOS/SkiaSharp.Views.tvOS.csproj index 9af4bc7e0..e4903ecdb 100644 --- a/source/SkiaSharp.Views/SkiaSharp.Views.tvOS/SkiaSharp.Views.tvOS.csproj +++ b/source/SkiaSharp.Views/SkiaSharp.Views.tvOS/SkiaSharp.Views.tvOS.csproj @@ -6,7 +6,7 @@ SkiaSharp.Views - + diff --git a/source/SkiaSharp.Views/SkiaSharp.Views.watchOS/SkiaSharp.Views.watchOS.csproj b/source/SkiaSharp.Views/SkiaSharp.Views.watchOS/SkiaSharp.Views.watchOS.csproj index 60db3148a..dc58a7791 100644 --- a/source/SkiaSharp.Views/SkiaSharp.Views.watchOS/SkiaSharp.Views.watchOS.csproj +++ b/source/SkiaSharp.Views/SkiaSharp.Views.watchOS/SkiaSharp.Views.watchOS.csproj @@ -6,7 +6,7 @@ SkiaSharp.Views - + diff --git a/source/SkiaSharp.Views/SkiaSharp.Views/SkiaSharp.Views.csproj b/source/SkiaSharp.Views/SkiaSharp.Views/SkiaSharp.Views.csproj index 9f20be594..535c3c701 100644 --- a/source/SkiaSharp.Views/SkiaSharp.Views/SkiaSharp.Views.csproj +++ b/source/SkiaSharp.Views/SkiaSharp.Views/SkiaSharp.Views.csproj @@ -1,6 +1,6 @@  - net6.0-ios;net6.0-maccatalyst;net6.0-tvos;net6.0-macos;net6.0-android + $(Net6PlatformTargetFrameworks) SkiaSharp.Views SkiaSharp.Views diff --git a/source/SkiaSharpSource.Linux.sln b/source/SkiaSharpSource.Linux.sln index cdf481221..4e6577121 100644 --- a/source/SkiaSharpSource.Linux.sln +++ b/source/SkiaSharpSource.Linux.sln @@ -27,9 +27,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Tizen", "Sk EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Forms.Tizen", "SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.Tizen\SkiaSharp.Views.Forms.Tizen.csproj", "{857CB6E9-BA27-4E94-A2D7-58BFF1EE193A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Tizen", "..\binding\SkiaSharp.Tizen\SkiaSharp.Tizen.csproj", "{6ADD085E-75AC-4924-AC54-798B2FA1C697}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Classic", "..\binding\SkiaSharp.Classic\SkiaSharp.Classic.csproj", "{6ADD085E-75AC-4924-AC54-798B2FA1C697}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.Tizen", "..\binding\HarfBuzzSharp.Tizen\HarfBuzzSharp.Tizen.csproj", "{DE587D56-A4EC-43F8-BA34-7EB811FC35D0}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.Classic", "..\binding\HarfBuzzSharp.Classic\HarfBuzzSharp.Classic.csproj", "{DE587D56-A4EC-43F8-BA34-7EB811FC35D0}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Gtk3", "SkiaSharp.Views\SkiaSharp.Views.Gtk3\SkiaSharp.Views.Gtk3.csproj", "{E20EECC0-6534-4625-AEDA-38D6EE0A99A0}" EndProject diff --git a/source/SkiaSharpSource.Mac.sln b/source/SkiaSharpSource.Mac.sln deleted file mode 100644 index 788afa416..000000000 --- a/source/SkiaSharpSource.Mac.sln +++ /dev/null @@ -1,324 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.3.32505.426 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Android", "..\binding\SkiaSharp.Android\SkiaSharp.Android.csproj", "{C737DC80-5B71-4B26-A2DC-DA30421788B0}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.iOS", "..\binding\SkiaSharp.iOS\SkiaSharp.iOS.csproj", "{6A678CFB-21A7-4E81-8909-FD72ABBFD408}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.tvOS", "..\binding\SkiaSharp.tvOS\SkiaSharp.tvOS.csproj", "{5180E370-A455-42BB-99F9-97BD269B8A52}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.watchOS", "..\binding\SkiaSharp.watchOS\SkiaSharp.watchOS.csproj", "{099A4BAD-6CF7-4898-9D16-266BDD844F95}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.OSX", "..\binding\SkiaSharp.OSX\SkiaSharp.OSX.csproj", "{4588A759-3853-49B8-8A68-6C7917BE9220}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Forms.Android", "SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.Android\SkiaSharp.Views.Forms.Android.csproj", "{2F94F024-1841-47E8-B521-74AA4E3EBA54}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Forms.iOS", "SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.iOS\SkiaSharp.Views.Forms.iOS.csproj", "{4AC36D63-BF11-445F-81EE-107C0CEF4FC9}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Forms", "SkiaSharp.Views.Forms\SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.csproj", "{1555D119-8598-4E4D-91AC-D313F94A1673}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.iOS", "SkiaSharp.Views\SkiaSharp.Views.iOS\SkiaSharp.Views.iOS.csproj", "{74C78108-9199-4A7A-928C-FC4DC57D0AE4}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Android", "SkiaSharp.Views\SkiaSharp.Views.Android\SkiaSharp.Views.Android.csproj", "{926C8D29-E047-4F4E-8B35-852E47BFA9F5}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Mac", "SkiaSharp.Views\SkiaSharp.Views.Mac\SkiaSharp.Views.Mac.csproj", "{809A15DC-E675-4A24-83FA-DF13160F7E4C}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.tvOS", "SkiaSharp.Views\SkiaSharp.Views.tvOS\SkiaSharp.Views.tvOS.csproj", "{E5973829-6C8B-43E4-B81B-C8492DF26C90}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.watchOS", "SkiaSharp.Views\SkiaSharp.Views.watchOS\SkiaSharp.Views.watchOS.csproj", "{9E850CCA-54CC-4CEB-B2C2-E32EF4A17D61}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SkiaSharp", "SkiaSharp", "{C335869B-7CC8-4239-B4A5-8031AA9758D3}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SkiaSharp.Views", "SkiaSharp.Views", "{F19E1537-81B2-4D4F-A69E-78DC73ACC141}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SkiaSharp.Views.Forms", "SkiaSharp.Views.Forms", "{EB592D4C-48E1-498D-8A9F-3AEA0C7FAB30}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Forms.Mac", "SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.Mac\SkiaSharp.Views.Forms.Mac.csproj", "{DA5DA4D8-4885-4AF2-96BB-AE803C344AB0}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HarfBuzzSharp", "HarfBuzzSharp", "{56AE868D-7AD9-4DFC-BD27-6BBA8DC9F75A}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SkiaSharp.HarfBuzz", "SkiaSharp.HarfBuzz", "{0E7AB0DC-0965-4BE8-BE1D-4ED18F3F97EB}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.HarfBuzz", "SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.csproj", "{7CAD1912-05A5-42E5-B7BA-81BB051F0566}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.iOS", "..\binding\HarfBuzzSharp.iOS\HarfBuzzSharp.iOS.csproj", "{E8192110-FCF9-4972-9472-7408BC2CA56B}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.OSX", "..\binding\HarfBuzzSharp.OSX\HarfBuzzSharp.OSX.csproj", "{30952C22-D566-488F-9D7A-2411B027D6CA}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.tvOS", "..\binding\HarfBuzzSharp.tvOS\HarfBuzzSharp.tvOS.csproj", "{8D646738-458A-441F-B69B-253EF058A812}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.watchOS", "..\binding\HarfBuzzSharp.watchOS\HarfBuzzSharp.watchOS.csproj", "{0C940695-4868-4CF7-7D16-266BDD88A812}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.Android", "..\binding\HarfBuzzSharp.Android\HarfBuzzSharp.Android.csproj", "{E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Gtk", "SkiaSharp.Views\SkiaSharp.Views.Gtk\SkiaSharp.Views.Gtk.csproj", "{67A502A4-E8B2-419A-811E-5A634B29C8D7}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.Tizen", "..\binding\HarfBuzzSharp.Tizen\HarfBuzzSharp.Tizen.csproj", "{C04A659E-5738-49EF-9455-044947792A0C}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Tizen", "..\binding\SkiaSharp.Tizen\SkiaSharp.Tizen.csproj", "{7A4C851F-9FD6-480B-A341-7DF1A498AC74}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Tizen", "SkiaSharp.Views\SkiaSharp.Views.Tizen\SkiaSharp.Views.Tizen.csproj", "{5BB78887-E0EA-4367-AE14-793CEC9125A4}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Forms.Tizen", "SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.Tizen\SkiaSharp.Views.Forms.Tizen.csproj", "{9EEF1A57-C2E5-47C4-9ABA-93DDC931B050}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Gtk3", "SkiaSharp.Views\SkiaSharp.Views.Gtk3\SkiaSharp.Views.Gtk3.csproj", "{E20EECC0-6534-4625-AEDA-38D6EE0A99A0}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Desktop.Common", "SkiaSharp.Views\SkiaSharp.Views.Desktop.Common\SkiaSharp.Views.Desktop.Common.csproj", "{6FB08346-1A02-4793-B5E1-4F739C6342D5}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Forms.GTK", "SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.GTK\SkiaSharp.Views.Forms.GTK.csproj", "{9EEF1A57-C2E5-47C4-9ABA-A3DDC931B051}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SkiaSharp.Vulkan", "SkiaSharp.Vulkan", "{66A0800A-CA70-4AC2-88B7-8E7C4CA7C914}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Vulkan.SharpVk", "SkiaSharp.Vulkan\SkiaSharp.Vulkan.SharpVk\SkiaSharp.Vulkan.SharpVk.csproj", "{4606F63B-F0B1-418E-8B45-844361E17EB1}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SkiaSharp.Views.Uno", "SkiaSharp.Views.Uno", "{E53351EA-FE40-47D2-B388-4A75DA6CCD71}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Uno.Android", "SkiaSharp.Views.Uno\SkiaSharp.Views.Uno.Android\SkiaSharp.Views.Uno.Android.csproj", "{D35B20BC-838A-4C1E-B427-4269F6387CAB}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Uno.iOS", "SkiaSharp.Views.Uno\SkiaSharp.Views.Uno.iOS\SkiaSharp.Views.Uno.iOS.csproj", "{6F92F6C5-6249-4A42-A028-DE1118D3CF78}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Uno.Mac", "SkiaSharp.Views.Uno\SkiaSharp.Views.Uno.Mac\SkiaSharp.Views.Uno.Mac.csproj", "{E0FF9BFF-2253-4486-A8E2-94312D09D056}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Uno.Wasm", "SkiaSharp.Views.Uno\SkiaSharp.Views.Uno.Wasm\SkiaSharp.Views.Uno.Wasm.csproj", "{242213FA-1F0E-40BB-A9B2-6FEE82B5D216}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Uno.Reference", "SkiaSharp.Views.Uno\SkiaSharp.Views.Uno.Reference\SkiaSharp.Views.Uno.Reference.csproj", "{D5C7D157-609E-4D64-8E42-C1DB0FAA86EB}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp", "..\binding\SkiaSharp\SkiaSharp.csproj", "{57F4EA34-01A7-4214-AEA7-4550D756D50E}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp", "..\binding\HarfBuzzSharp\HarfBuzzSharp.csproj", "{B81B4103-5324-4229-8DA6-E99913529D13}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Uno.Skia", "SkiaSharp.Views.Uno\SkiaSharp.Views.Uno.Skia\SkiaSharp.Views.Uno.Skia.csproj", "{A84C9753-A343-4A21-8337-147E5B93B055}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.DotNet.Interactive", "SkiaSharp.DotNet.Interactive\SkiaSharp.DotNet.Interactive.csproj", "{A23C2451-BBCE-4309-B80F-CEE482A140C7}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SkiaSharp.DotNet.Interactive", "SkiaSharp.DotNet.Interactive", "{A54F6AE5-2921-4C68-846A-25D38F1C2E7E}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Uno.WinUI.Reference", "SkiaSharp.Views.Uno\SkiaSharp.Views.Uno.WinUI.Reference\SkiaSharp.Views.Uno.WinUI.Reference.csproj", "{F483A168-3001-41E7-A349-11729D9ABC58}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Uno.WinUI.Skia", "SkiaSharp.Views.Uno\SkiaSharp.Views.Uno.WinUI.Skia\SkiaSharp.Views.Uno.WinUI.Skia.csproj", "{1C7CFC34-CFB9-4E2D-80B8-0011BB3DD2FD}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Uno.WinUI.Wasm", "SkiaSharp.Views.Uno\SkiaSharp.Views.Uno.WinUI.Wasm\SkiaSharp.Views.Uno.WinUI.Wasm.csproj", "{C27C5CF3-AA98-4C08-9EA7-64F98F8AFF27}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {C737DC80-5B71-4B26-A2DC-DA30421788B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C737DC80-5B71-4B26-A2DC-DA30421788B0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C737DC80-5B71-4B26-A2DC-DA30421788B0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C737DC80-5B71-4B26-A2DC-DA30421788B0}.Release|Any CPU.Build.0 = Release|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Release|Any CPU.Build.0 = Release|Any CPU - {5180E370-A455-42BB-99F9-97BD269B8A52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5180E370-A455-42BB-99F9-97BD269B8A52}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5180E370-A455-42BB-99F9-97BD269B8A52}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5180E370-A455-42BB-99F9-97BD269B8A52}.Release|Any CPU.Build.0 = Release|Any CPU - {099A4BAD-6CF7-4898-9D16-266BDD844F95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {099A4BAD-6CF7-4898-9D16-266BDD844F95}.Debug|Any CPU.Build.0 = Debug|Any CPU - {099A4BAD-6CF7-4898-9D16-266BDD844F95}.Release|Any CPU.ActiveCfg = Release|Any CPU - {099A4BAD-6CF7-4898-9D16-266BDD844F95}.Release|Any CPU.Build.0 = Release|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Release|Any CPU.Build.0 = Release|Any CPU - {2F94F024-1841-47E8-B521-74AA4E3EBA54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2F94F024-1841-47E8-B521-74AA4E3EBA54}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2F94F024-1841-47E8-B521-74AA4E3EBA54}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2F94F024-1841-47E8-B521-74AA4E3EBA54}.Release|Any CPU.Build.0 = Release|Any CPU - {4AC36D63-BF11-445F-81EE-107C0CEF4FC9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4AC36D63-BF11-445F-81EE-107C0CEF4FC9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4AC36D63-BF11-445F-81EE-107C0CEF4FC9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4AC36D63-BF11-445F-81EE-107C0CEF4FC9}.Release|Any CPU.Build.0 = Release|Any CPU - {1555D119-8598-4E4D-91AC-D313F94A1673}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1555D119-8598-4E4D-91AC-D313F94A1673}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1555D119-8598-4E4D-91AC-D313F94A1673}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1555D119-8598-4E4D-91AC-D313F94A1673}.Release|Any CPU.Build.0 = Release|Any CPU - {74C78108-9199-4A7A-928C-FC4DC57D0AE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {74C78108-9199-4A7A-928C-FC4DC57D0AE4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {74C78108-9199-4A7A-928C-FC4DC57D0AE4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {74C78108-9199-4A7A-928C-FC4DC57D0AE4}.Release|Any CPU.Build.0 = Release|Any CPU - {926C8D29-E047-4F4E-8B35-852E47BFA9F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {926C8D29-E047-4F4E-8B35-852E47BFA9F5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {926C8D29-E047-4F4E-8B35-852E47BFA9F5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {926C8D29-E047-4F4E-8B35-852E47BFA9F5}.Release|Any CPU.Build.0 = Release|Any CPU - {809A15DC-E675-4A24-83FA-DF13160F7E4C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {809A15DC-E675-4A24-83FA-DF13160F7E4C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {809A15DC-E675-4A24-83FA-DF13160F7E4C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {809A15DC-E675-4A24-83FA-DF13160F7E4C}.Release|Any CPU.Build.0 = Release|Any CPU - {E5973829-6C8B-43E4-B81B-C8492DF26C90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E5973829-6C8B-43E4-B81B-C8492DF26C90}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E5973829-6C8B-43E4-B81B-C8492DF26C90}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E5973829-6C8B-43E4-B81B-C8492DF26C90}.Release|Any CPU.Build.0 = Release|Any CPU - {9E850CCA-54CC-4CEB-B2C2-E32EF4A17D61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9E850CCA-54CC-4CEB-B2C2-E32EF4A17D61}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9E850CCA-54CC-4CEB-B2C2-E32EF4A17D61}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9E850CCA-54CC-4CEB-B2C2-E32EF4A17D61}.Release|Any CPU.Build.0 = Release|Any CPU - {DA5DA4D8-4885-4AF2-96BB-AE803C344AB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DA5DA4D8-4885-4AF2-96BB-AE803C344AB0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DA5DA4D8-4885-4AF2-96BB-AE803C344AB0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DA5DA4D8-4885-4AF2-96BB-AE803C344AB0}.Release|Any CPU.Build.0 = Release|Any CPU - {7CAD1912-05A5-42E5-B7BA-81BB051F0566}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7CAD1912-05A5-42E5-B7BA-81BB051F0566}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7CAD1912-05A5-42E5-B7BA-81BB051F0566}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7CAD1912-05A5-42E5-B7BA-81BB051F0566}.Release|Any CPU.Build.0 = Release|Any CPU - {E8192110-FCF9-4972-9472-7408BC2CA56B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E8192110-FCF9-4972-9472-7408BC2CA56B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E8192110-FCF9-4972-9472-7408BC2CA56B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E8192110-FCF9-4972-9472-7408BC2CA56B}.Release|Any CPU.Build.0 = Release|Any CPU - {30952C22-D566-488F-9D7A-2411B027D6CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {30952C22-D566-488F-9D7A-2411B027D6CA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {30952C22-D566-488F-9D7A-2411B027D6CA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {30952C22-D566-488F-9D7A-2411B027D6CA}.Release|Any CPU.Build.0 = Release|Any CPU - {8D646738-458A-441F-B69B-253EF058A812}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8D646738-458A-441F-B69B-253EF058A812}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8D646738-458A-441F-B69B-253EF058A812}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8D646738-458A-441F-B69B-253EF058A812}.Release|Any CPU.Build.0 = Release|Any CPU - {0C940695-4868-4CF7-7D16-266BDD88A812}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0C940695-4868-4CF7-7D16-266BDD88A812}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0C940695-4868-4CF7-7D16-266BDD88A812}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0C940695-4868-4CF7-7D16-266BDD88A812}.Release|Any CPU.Build.0 = Release|Any CPU - {E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}.Release|Any CPU.Build.0 = Release|Any CPU - {67A502A4-E8B2-419A-811E-5A634B29C8D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {67A502A4-E8B2-419A-811E-5A634B29C8D7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {67A502A4-E8B2-419A-811E-5A634B29C8D7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {67A502A4-E8B2-419A-811E-5A634B29C8D7}.Release|Any CPU.Build.0 = Release|Any CPU - {C04A659E-5738-49EF-9455-044947792A0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C04A659E-5738-49EF-9455-044947792A0C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C04A659E-5738-49EF-9455-044947792A0C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C04A659E-5738-49EF-9455-044947792A0C}.Release|Any CPU.Build.0 = Release|Any CPU - {7A4C851F-9FD6-480B-A341-7DF1A498AC74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7A4C851F-9FD6-480B-A341-7DF1A498AC74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7A4C851F-9FD6-480B-A341-7DF1A498AC74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7A4C851F-9FD6-480B-A341-7DF1A498AC74}.Release|Any CPU.Build.0 = Release|Any CPU - {5BB78887-E0EA-4367-AE14-793CEC9125A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5BB78887-E0EA-4367-AE14-793CEC9125A4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5BB78887-E0EA-4367-AE14-793CEC9125A4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5BB78887-E0EA-4367-AE14-793CEC9125A4}.Release|Any CPU.Build.0 = Release|Any CPU - {9EEF1A57-C2E5-47C4-9ABA-93DDC931B050}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9EEF1A57-C2E5-47C4-9ABA-93DDC931B050}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9EEF1A57-C2E5-47C4-9ABA-93DDC931B050}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9EEF1A57-C2E5-47C4-9ABA-93DDC931B050}.Release|Any CPU.Build.0 = Release|Any CPU - {E20EECC0-6534-4625-AEDA-38D6EE0A99A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E20EECC0-6534-4625-AEDA-38D6EE0A99A0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E20EECC0-6534-4625-AEDA-38D6EE0A99A0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E20EECC0-6534-4625-AEDA-38D6EE0A99A0}.Release|Any CPU.Build.0 = Release|Any CPU - {6FB08346-1A02-4793-B5E1-4F739C6342D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6FB08346-1A02-4793-B5E1-4F739C6342D5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6FB08346-1A02-4793-B5E1-4F739C6342D5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6FB08346-1A02-4793-B5E1-4F739C6342D5}.Release|Any CPU.Build.0 = Release|Any CPU - {9EEF1A57-C2E5-47C4-9ABA-A3DDC931B051}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9EEF1A57-C2E5-47C4-9ABA-A3DDC931B051}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9EEF1A57-C2E5-47C4-9ABA-A3DDC931B051}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9EEF1A57-C2E5-47C4-9ABA-A3DDC931B051}.Release|Any CPU.Build.0 = Release|Any CPU - {4606F63B-F0B1-418E-8B45-844361E17EB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4606F63B-F0B1-418E-8B45-844361E17EB1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4606F63B-F0B1-418E-8B45-844361E17EB1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4606F63B-F0B1-418E-8B45-844361E17EB1}.Release|Any CPU.Build.0 = Release|Any CPU - {D35B20BC-838A-4C1E-B427-4269F6387CAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D35B20BC-838A-4C1E-B427-4269F6387CAB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D35B20BC-838A-4C1E-B427-4269F6387CAB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D35B20BC-838A-4C1E-B427-4269F6387CAB}.Release|Any CPU.Build.0 = Release|Any CPU - {6F92F6C5-6249-4A42-A028-DE1118D3CF78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6F92F6C5-6249-4A42-A028-DE1118D3CF78}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6F92F6C5-6249-4A42-A028-DE1118D3CF78}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6F92F6C5-6249-4A42-A028-DE1118D3CF78}.Release|Any CPU.Build.0 = Release|Any CPU - {E0FF9BFF-2253-4486-A8E2-94312D09D056}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E0FF9BFF-2253-4486-A8E2-94312D09D056}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E0FF9BFF-2253-4486-A8E2-94312D09D056}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E0FF9BFF-2253-4486-A8E2-94312D09D056}.Release|Any CPU.Build.0 = Release|Any CPU - {242213FA-1F0E-40BB-A9B2-6FEE82B5D216}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {242213FA-1F0E-40BB-A9B2-6FEE82B5D216}.Debug|Any CPU.Build.0 = Debug|Any CPU - {242213FA-1F0E-40BB-A9B2-6FEE82B5D216}.Release|Any CPU.ActiveCfg = Release|Any CPU - {242213FA-1F0E-40BB-A9B2-6FEE82B5D216}.Release|Any CPU.Build.0 = Release|Any CPU - {D5C7D157-609E-4D64-8E42-C1DB0FAA86EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D5C7D157-609E-4D64-8E42-C1DB0FAA86EB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D5C7D157-609E-4D64-8E42-C1DB0FAA86EB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D5C7D157-609E-4D64-8E42-C1DB0FAA86EB}.Release|Any CPU.Build.0 = Release|Any CPU - {57F4EA34-01A7-4214-AEA7-4550D756D50E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {57F4EA34-01A7-4214-AEA7-4550D756D50E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {57F4EA34-01A7-4214-AEA7-4550D756D50E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {57F4EA34-01A7-4214-AEA7-4550D756D50E}.Release|Any CPU.Build.0 = Release|Any CPU - {B81B4103-5324-4229-8DA6-E99913529D13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B81B4103-5324-4229-8DA6-E99913529D13}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B81B4103-5324-4229-8DA6-E99913529D13}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B81B4103-5324-4229-8DA6-E99913529D13}.Release|Any CPU.Build.0 = Release|Any CPU - {A84C9753-A343-4A21-8337-147E5B93B055}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A84C9753-A343-4A21-8337-147E5B93B055}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A84C9753-A343-4A21-8337-147E5B93B055}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A84C9753-A343-4A21-8337-147E5B93B055}.Release|Any CPU.Build.0 = Release|Any CPU - {A23C2451-BBCE-4309-B80F-CEE482A140C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A23C2451-BBCE-4309-B80F-CEE482A140C7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A23C2451-BBCE-4309-B80F-CEE482A140C7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A23C2451-BBCE-4309-B80F-CEE482A140C7}.Release|Any CPU.Build.0 = Release|Any CPU - {F483A168-3001-41E7-A349-11729D9ABC58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F483A168-3001-41E7-A349-11729D9ABC58}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F483A168-3001-41E7-A349-11729D9ABC58}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F483A168-3001-41E7-A349-11729D9ABC58}.Release|Any CPU.Build.0 = Release|Any CPU - {1C7CFC34-CFB9-4E2D-80B8-0011BB3DD2FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1C7CFC34-CFB9-4E2D-80B8-0011BB3DD2FD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1C7CFC34-CFB9-4E2D-80B8-0011BB3DD2FD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1C7CFC34-CFB9-4E2D-80B8-0011BB3DD2FD}.Release|Any CPU.Build.0 = Release|Any CPU - {C27C5CF3-AA98-4C08-9EA7-64F98F8AFF27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C27C5CF3-AA98-4C08-9EA7-64F98F8AFF27}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C27C5CF3-AA98-4C08-9EA7-64F98F8AFF27}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C27C5CF3-AA98-4C08-9EA7-64F98F8AFF27}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {C737DC80-5B71-4B26-A2DC-DA30421788B0} = {C335869B-7CC8-4239-B4A5-8031AA9758D3} - {6A678CFB-21A7-4E81-8909-FD72ABBFD408} = {C335869B-7CC8-4239-B4A5-8031AA9758D3} - {5180E370-A455-42BB-99F9-97BD269B8A52} = {C335869B-7CC8-4239-B4A5-8031AA9758D3} - {099A4BAD-6CF7-4898-9D16-266BDD844F95} = {C335869B-7CC8-4239-B4A5-8031AA9758D3} - {4588A759-3853-49B8-8A68-6C7917BE9220} = {C335869B-7CC8-4239-B4A5-8031AA9758D3} - {2F94F024-1841-47E8-B521-74AA4E3EBA54} = {EB592D4C-48E1-498D-8A9F-3AEA0C7FAB30} - {4AC36D63-BF11-445F-81EE-107C0CEF4FC9} = {EB592D4C-48E1-498D-8A9F-3AEA0C7FAB30} - {1555D119-8598-4E4D-91AC-D313F94A1673} = {EB592D4C-48E1-498D-8A9F-3AEA0C7FAB30} - {74C78108-9199-4A7A-928C-FC4DC57D0AE4} = {F19E1537-81B2-4D4F-A69E-78DC73ACC141} - {926C8D29-E047-4F4E-8B35-852E47BFA9F5} = {F19E1537-81B2-4D4F-A69E-78DC73ACC141} - {809A15DC-E675-4A24-83FA-DF13160F7E4C} = {F19E1537-81B2-4D4F-A69E-78DC73ACC141} - {E5973829-6C8B-43E4-B81B-C8492DF26C90} = {F19E1537-81B2-4D4F-A69E-78DC73ACC141} - {9E850CCA-54CC-4CEB-B2C2-E32EF4A17D61} = {F19E1537-81B2-4D4F-A69E-78DC73ACC141} - {DA5DA4D8-4885-4AF2-96BB-AE803C344AB0} = {EB592D4C-48E1-498D-8A9F-3AEA0C7FAB30} - {7CAD1912-05A5-42E5-B7BA-81BB051F0566} = {0E7AB0DC-0965-4BE8-BE1D-4ED18F3F97EB} - {E8192110-FCF9-4972-9472-7408BC2CA56B} = {56AE868D-7AD9-4DFC-BD27-6BBA8DC9F75A} - {30952C22-D566-488F-9D7A-2411B027D6CA} = {56AE868D-7AD9-4DFC-BD27-6BBA8DC9F75A} - {8D646738-458A-441F-B69B-253EF058A812} = {56AE868D-7AD9-4DFC-BD27-6BBA8DC9F75A} - {0C940695-4868-4CF7-7D16-266BDD88A812} = {56AE868D-7AD9-4DFC-BD27-6BBA8DC9F75A} - {E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD} = {56AE868D-7AD9-4DFC-BD27-6BBA8DC9F75A} - {67A502A4-E8B2-419A-811E-5A634B29C8D7} = {F19E1537-81B2-4D4F-A69E-78DC73ACC141} - {C04A659E-5738-49EF-9455-044947792A0C} = {56AE868D-7AD9-4DFC-BD27-6BBA8DC9F75A} - {7A4C851F-9FD6-480B-A341-7DF1A498AC74} = {C335869B-7CC8-4239-B4A5-8031AA9758D3} - {5BB78887-E0EA-4367-AE14-793CEC9125A4} = {F19E1537-81B2-4D4F-A69E-78DC73ACC141} - {9EEF1A57-C2E5-47C4-9ABA-93DDC931B050} = {EB592D4C-48E1-498D-8A9F-3AEA0C7FAB30} - {E20EECC0-6534-4625-AEDA-38D6EE0A99A0} = {EB592D4C-48E1-498D-8A9F-3AEA0C7FAB30} - {6FB08346-1A02-4793-B5E1-4F739C6342D5} = {EB592D4C-48E1-498D-8A9F-3AEA0C7FAB30} - {9EEF1A57-C2E5-47C4-9ABA-A3DDC931B051} = {EB592D4C-48E1-498D-8A9F-3AEA0C7FAB30} - {4606F63B-F0B1-418E-8B45-844361E17EB1} = {66A0800A-CA70-4AC2-88B7-8E7C4CA7C914} - {D35B20BC-838A-4C1E-B427-4269F6387CAB} = {E53351EA-FE40-47D2-B388-4A75DA6CCD71} - {6F92F6C5-6249-4A42-A028-DE1118D3CF78} = {E53351EA-FE40-47D2-B388-4A75DA6CCD71} - {E0FF9BFF-2253-4486-A8E2-94312D09D056} = {E53351EA-FE40-47D2-B388-4A75DA6CCD71} - {242213FA-1F0E-40BB-A9B2-6FEE82B5D216} = {E53351EA-FE40-47D2-B388-4A75DA6CCD71} - {D5C7D157-609E-4D64-8E42-C1DB0FAA86EB} = {E53351EA-FE40-47D2-B388-4A75DA6CCD71} - {57F4EA34-01A7-4214-AEA7-4550D756D50E} = {C335869B-7CC8-4239-B4A5-8031AA9758D3} - {B81B4103-5324-4229-8DA6-E99913529D13} = {56AE868D-7AD9-4DFC-BD27-6BBA8DC9F75A} - {A84C9753-A343-4A21-8337-147E5B93B055} = {E53351EA-FE40-47D2-B388-4A75DA6CCD71} - {A23C2451-BBCE-4309-B80F-CEE482A140C7} = {A54F6AE5-2921-4C68-846A-25D38F1C2E7E} - {F483A168-3001-41E7-A349-11729D9ABC58} = {E53351EA-FE40-47D2-B388-4A75DA6CCD71} - {1C7CFC34-CFB9-4E2D-80B8-0011BB3DD2FD} = {E53351EA-FE40-47D2-B388-4A75DA6CCD71} - {C27C5CF3-AA98-4C08-9EA7-64F98F8AFF27} = {E53351EA-FE40-47D2-B388-4A75DA6CCD71} - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {4B8BED07-EA83-4BC1-B3BB-6B8EBC54C25F} - EndGlobalSection -EndGlobal diff --git a/source/SkiaSharpSource.Mac.slnf b/source/SkiaSharpSource.Mac.slnf new file mode 100644 index 000000000..56b2fdbd1 --- /dev/null +++ b/source/SkiaSharpSource.Mac.slnf @@ -0,0 +1,38 @@ +{ + "solution": { + "path": "SkiaSharpSource.sln", + "projects": [ + "..\\binding\\HarfBuzzSharp.Classic\\HarfBuzzSharp.Classic.csproj", + "..\\binding\\HarfBuzzSharp\\HarfBuzzSharp.csproj", + "..\\binding\\SkiaSharp.Classic\\SkiaSharp.Classic.csproj", + "..\\binding\\SkiaSharp\\SkiaSharp.csproj", + "SkiaSharp.DotNet.Interactive\\SkiaSharp.DotNet.Interactive.csproj", + "SkiaSharp.HarfBuzz\\SkiaSharp.HarfBuzz\\SkiaSharp.HarfBuzz.csproj", + "SkiaSharp.Views.Forms\\SkiaSharp.Views.Forms.Android\\SkiaSharp.Views.Forms.Android.csproj", + "SkiaSharp.Views.Forms\\SkiaSharp.Views.Forms.GTK\\SkiaSharp.Views.Forms.GTK.csproj", + "SkiaSharp.Views.Forms\\SkiaSharp.Views.Forms.iOS\\SkiaSharp.Views.Forms.iOS.csproj", + "SkiaSharp.Views.Forms\\SkiaSharp.Views.Forms.Mac\\SkiaSharp.Views.Forms.Mac.csproj", + "SkiaSharp.Views.Forms\\SkiaSharp.Views.Forms.Tizen\\SkiaSharp.Views.Forms.Tizen.csproj", + "SkiaSharp.Views.Forms\\SkiaSharp.Views.Forms\\SkiaSharp.Views.Forms.csproj", + "SkiaSharp.Views.Uno\\SkiaSharp.Views.Uno.Android\\SkiaSharp.Views.Uno.Android.csproj", + "SkiaSharp.Views.Uno\\SkiaSharp.Views.Uno.iOS\\SkiaSharp.Views.Uno.iOS.csproj", + "SkiaSharp.Views.Uno\\SkiaSharp.Views.Uno.Mac\\SkiaSharp.Views.Uno.Mac.csproj", + "SkiaSharp.Views.Uno\\SkiaSharp.Views.Uno.Reference\\SkiaSharp.Views.Uno.Reference.csproj", + "SkiaSharp.Views.Uno\\SkiaSharp.Views.Uno.Skia\\SkiaSharp.Views.Uno.Skia.csproj", + "SkiaSharp.Views.Uno\\SkiaSharp.Views.Uno.Wasm\\SkiaSharp.Views.Uno.Wasm.csproj", + "SkiaSharp.Views.Uno\\SkiaSharp.Views.Uno.WinUI.Reference\\SkiaSharp.Views.Uno.WinUI.Reference.csproj", + "SkiaSharp.Views.Uno\\SkiaSharp.Views.Uno.WinUI.Skia\\SkiaSharp.Views.Uno.WinUI.Skia.csproj", + "SkiaSharp.Views.Uno\\SkiaSharp.Views.Uno.WinUI.Wasm\\SkiaSharp.Views.Uno.WinUI.Wasm.csproj", + "SkiaSharp.Views\\SkiaSharp.Views.Android\\SkiaSharp.Views.Android.csproj", + "SkiaSharp.Views\\SkiaSharp.Views.Desktop.Common\\SkiaSharp.Views.Desktop.Common.csproj", + "SkiaSharp.Views\\SkiaSharp.Views.Gtk\\SkiaSharp.Views.Gtk.csproj", + "SkiaSharp.Views\\SkiaSharp.Views.Gtk3\\SkiaSharp.Views.Gtk3.csproj", + "SkiaSharp.Views\\SkiaSharp.Views.iOS\\SkiaSharp.Views.iOS.csproj", + "SkiaSharp.Views\\SkiaSharp.Views.Mac\\SkiaSharp.Views.Mac.csproj", + "SkiaSharp.Views\\SkiaSharp.Views.Tizen\\SkiaSharp.Views.Tizen.csproj", + "SkiaSharp.Views\\SkiaSharp.Views.tvOS\\SkiaSharp.Views.tvOS.csproj", + "SkiaSharp.Views\\SkiaSharp.Views.watchOS\\SkiaSharp.Views.watchOS.csproj", + "SkiaSharp.Vulkan\\SkiaSharp.Vulkan.SharpVk\\SkiaSharp.Vulkan.SharpVk.csproj", + ] + } +} diff --git a/source/SkiaSharpSource.Windows-net6.slnf b/source/SkiaSharpSource.Windows-net6.slnf index fcf235a73..343794f25 100644 --- a/source/SkiaSharpSource.Windows-net6.slnf +++ b/source/SkiaSharpSource.Windows-net6.slnf @@ -1,16 +1,16 @@ { "solution": { - "path": "SkiaSharpSource.Windows.sln", + "path": "SkiaSharpSource.sln", "projects": [ "..\\binding\\HarfBuzzSharp\\HarfBuzzSharp.csproj", "..\\binding\\SkiaSharp\\SkiaSharp.csproj", + "SkiaSharp.Views.Blazor\\SkiaSharp.Views.Blazor\\SkiaSharp.Views.Blazor.csproj", "SkiaSharp.Views.Maui\\SkiaSharp.Views.Maui.Controls.Compatibility\\SkiaSharp.Views.Maui.Controls.Compatibility.csproj", "SkiaSharp.Views.Maui\\SkiaSharp.Views.Maui.Controls\\SkiaSharp.Views.Maui.Controls.csproj", "SkiaSharp.Views.Maui\\SkiaSharp.Views.Maui.Core\\SkiaSharp.Views.Maui.Core.csproj", "SkiaSharp.Views.Uno\\SkiaSharp.Views.Uno.WinUI.Mobile\\SkiaSharp.Views.Uno.WinUI.Mobile.csproj", "SkiaSharp.Views.WinUI\\SkiaSharp.Views.WinUI\\SkiaSharp.Views.WinUI.csproj", - "SkiaSharp.Views.Blazor\\SkiaSharp.Views.Blazor\\SkiaSharp.Views.Blazor.csproj", - "SkiaSharp.Views\\SkiaSharp.Views\\SkiaSharp.Views.csproj" + "SkiaSharp.Views\\SkiaSharp.Views\\SkiaSharp.Views.csproj", ] } } \ No newline at end of file diff --git a/source/SkiaSharpSource.Windows-netfx.slnf b/source/SkiaSharpSource.Windows-netfx.slnf index a047dca41..829105ac6 100644 --- a/source/SkiaSharpSource.Windows-netfx.slnf +++ b/source/SkiaSharpSource.Windows-netfx.slnf @@ -1,14 +1,10 @@ { "solution": { - "path": "SkiaSharpSource.Windows.sln", + "path": "SkiaSharpSource.sln", "projects": [ - "..\\binding\\HarfBuzzSharp.Android\\HarfBuzzSharp.Android.csproj", - "..\\binding\\HarfBuzzSharp.Tizen\\HarfBuzzSharp.Tizen.csproj", - "..\\binding\\HarfBuzzSharp.UWP\\HarfBuzzSharp.UWP.csproj", + "..\\binding\\HarfBuzzSharp.Classic\\HarfBuzzSharp.Classic.csproj", "..\\binding\\HarfBuzzSharp\\HarfBuzzSharp.csproj", - "..\\binding\\SkiaSharp.Android\\SkiaSharp.Android.csproj", - "..\\binding\\SkiaSharp.Tizen\\SkiaSharp.Tizen.csproj", - "..\\binding\\SkiaSharp.UWP\\SkiaSharp.UWP.csproj", + "..\\binding\\SkiaSharp.Classic\\SkiaSharp.Classic.csproj", "..\\binding\\SkiaSharp\\SkiaSharp.csproj", "SkiaSharp.DotNet.Interactive\\SkiaSharp.DotNet.Interactive.csproj", "SkiaSharp.HarfBuzz\\SkiaSharp.HarfBuzz\\SkiaSharp.HarfBuzz.csproj", @@ -21,8 +17,8 @@ "SkiaSharp.Views.Uno\\SkiaSharp.Views.Uno.Reference\\SkiaSharp.Views.Uno.Reference.csproj", "SkiaSharp.Views.Uno\\SkiaSharp.Views.Uno.Skia\\SkiaSharp.Views.Uno.Skia.csproj", "SkiaSharp.Views.Uno\\SkiaSharp.Views.Uno.Wasm\\SkiaSharp.Views.Uno.Wasm.csproj", - "SkiaSharp.Views.Uno\\SkiaSharp.Views.Uno.WinUI.Reference\\SkiaSharp.Views.Uno.WinUI.Reference.csproj", "SkiaSharp.Views.Uno\\SkiaSharp.Views.Uno.WinUI.Mobile\\SkiaSharp.Views.Uno.WinUI.Mobile.csproj", + "SkiaSharp.Views.Uno\\SkiaSharp.Views.Uno.WinUI.Reference\\SkiaSharp.Views.Uno.WinUI.Reference.csproj", "SkiaSharp.Views.Uno\\SkiaSharp.Views.Uno.WinUI.Skia\\SkiaSharp.Views.Uno.WinUI.Skia.csproj", "SkiaSharp.Views.Uno\\SkiaSharp.Views.Uno.WinUI.Wasm\\SkiaSharp.Views.Uno.WinUI.Wasm.csproj", "SkiaSharp.Views.WinUI\\SkiaSharp.Views.WinUI\\SkiaSharp.Views.WinUI.csproj", @@ -32,9 +28,9 @@ "SkiaSharp.Views\\SkiaSharp.Views.Gtk3\\SkiaSharp.Views.Gtk3.csproj", "SkiaSharp.Views\\SkiaSharp.Views.Tizen\\SkiaSharp.Views.Tizen.csproj", "SkiaSharp.Views\\SkiaSharp.Views.UWP\\SkiaSharp.Views.UWP.csproj", - "SkiaSharp.Views\\SkiaSharp.Views.WPF\\SkiaSharp.Views.WPF.csproj", "SkiaSharp.Views\\SkiaSharp.Views.WindowsForms\\SkiaSharp.Views.WindowsForms.csproj", - "SkiaSharp.Vulkan\\SkiaSharp.Vulkan.SharpVk\\SkiaSharp.Vulkan.SharpVk.csproj" + "SkiaSharp.Views\\SkiaSharp.Views.WPF\\SkiaSharp.Views.WPF.csproj", + "SkiaSharp.Vulkan\\SkiaSharp.Vulkan.SharpVk\\SkiaSharp.Vulkan.SharpVk.csproj", ] } } diff --git a/source/SkiaSharpSource.Windows.sln b/source/SkiaSharpSource.Windows.sln deleted file mode 100644 index 175385cf3..000000000 --- a/source/SkiaSharpSource.Windows.sln +++ /dev/null @@ -1,311 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31717.149 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Forms.UWP", "SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.UWP\SkiaSharp.Views.Forms.UWP.csproj", "{3A1277B5-CFAE-48CC-B64B-4DAE1222A3EB}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Forms", "SkiaSharp.Views.Forms\SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.csproj", "{1555D119-8598-4E4D-91AC-D313F94A1673}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Desktop", "SkiaSharp.Views\SkiaSharp.Views.Desktop\SkiaSharp.Views.Desktop.csproj", "{E5A90865-C185-45AD-88D1-6DA7D6004B03}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.UWP", "SkiaSharp.Views\SkiaSharp.Views.UWP\SkiaSharp.Views.UWP.csproj", "{8BB20362-91A2-4206-944D-634070EAC6F3}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.UWP", "..\binding\SkiaSharp.UWP\SkiaSharp.UWP.csproj", "{BAB615AA-956E-4079-B260-DD7B1F52EC7D}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SkiaSharp", "SkiaSharp", "{C335869B-7CC8-4239-B4A5-8031AA9758D3}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SkiaSharp.Views", "SkiaSharp.Views", "{F19E1537-81B2-4D4F-A69E-78DC73ACC141}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.WPF", "SkiaSharp.Views\SkiaSharp.Views.WPF\SkiaSharp.Views.WPF.csproj", "{743CF830-D458-41A9-865A-F85126562015}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SkiaSharp.Views.Forms", "SkiaSharp.Views.Forms", "{D40675E1-610D-4BBB-AA2A-BEF020717431}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HarfBuzzSharp", "HarfBuzzSharp", "{9F016D5D-C7BF-45C7-BC0C-5A6E721DCF9E}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SkiaSharp.HarfBuzz", "SkiaSharp.HarfBuzz", "{EDCCEA7A-E6CD-4311-B686-41D7CA40DF85}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.HarfBuzz", "SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.csproj", "{7CAD1912-05A5-42E5-B7BA-81BB051F0566}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.UWP", "..\binding\HarfBuzzSharp.UWP\HarfBuzzSharp.UWP.csproj", "{6D1E1F39-EF70-4211-A518-BBBAF02D6FFF}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp", "..\binding\HarfBuzzSharp\HarfBuzzSharp.csproj", "{2E3C9751-6A89-4510-AC4C-225A909460A0}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp", "..\binding\SkiaSharp\SkiaSharp.csproj", "{7BFEC966-9910-49BA-A7D4-6204C30E3174}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.Tizen", "..\binding\HarfBuzzSharp.Tizen\HarfBuzzSharp.Tizen.csproj", "{A3FFAEF0-53D8-4AAB-A2FD-C29DC76C1E62}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Tizen", "..\binding\SkiaSharp.Tizen\SkiaSharp.Tizen.csproj", "{4923892F-AE34-4C55-B03D-68D03885B835}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Tizen", "SkiaSharp.Views\SkiaSharp.Views.Tizen\SkiaSharp.Views.Tizen.csproj", "{A9C01292-FD99-4135-A089-325157D1F530}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Forms.Tizen", "SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.Tizen\SkiaSharp.Views.Forms.Tizen.csproj", "{17693608-910C-484E-A4D2-485A3888268D}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.Android", "..\binding\HarfBuzzSharp.Android\HarfBuzzSharp.Android.csproj", "{24A470FB-FB81-4DDA-B163-F2A875F4571D}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Android", "..\binding\SkiaSharp.Android\SkiaSharp.Android.csproj", "{BA052CAC-8269-4BDE-A295-5C15B3741AE5}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Android", "SkiaSharp.Views\SkiaSharp.Views.Android\SkiaSharp.Views.Android.csproj", "{84DF14D9-41D5-49E5-8065-3582DADB40E9}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Forms.Android", "SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.Android\SkiaSharp.Views.Forms.Android.csproj", "{7F31BE1B-39D7-46D2-8E9A-36C6FF8A2876}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Gtk3", "SkiaSharp.Views\SkiaSharp.Views.Gtk3\SkiaSharp.Views.Gtk3.csproj", "{E20EECC0-6534-4625-AEDA-38D6EE0A99A0}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.WindowsForms", "SkiaSharp.Views\SkiaSharp.Views.WindowsForms\SkiaSharp.Views.WindowsForms.csproj", "{EDFAEF02-C462-4953-9CA4-4525479DD027}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Desktop.Common", "SkiaSharp.Views\SkiaSharp.Views.Desktop.Common\SkiaSharp.Views.Desktop.Common.csproj", "{6FB08346-1A02-4793-B5E1-4F739C6342D5}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Forms.WPF", "SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.WPF\SkiaSharp.Views.Forms.WPF.csproj", "{F55B16B3-4427-45EA-A93C-E12A7409E37D}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SkiaSharp.Vulkan", "SkiaSharp.Vulkan", "{66A0800A-CA70-4AC2-88B7-8E7C4CA7C914}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Vulkan.SharpVk", "SkiaSharp.Vulkan\SkiaSharp.Vulkan.SharpVk\SkiaSharp.Vulkan.SharpVk.csproj", "{4606F63B-F0B1-418E-8B45-844361E17EB1}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SkiaSharp.Views.Uno", "SkiaSharp.Views.Uno", "{E53351EA-FE40-47D2-B388-4A75DA6CCD71}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Uno.Android", "SkiaSharp.Views.Uno\SkiaSharp.Views.Uno.Android\SkiaSharp.Views.Uno.Android.csproj", "{D35B20BC-838A-4C1E-B427-4269F6387CAB}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Uno.Wasm", "SkiaSharp.Views.Uno\SkiaSharp.Views.Uno.Wasm\SkiaSharp.Views.Uno.Wasm.csproj", "{F675A841-ECDB-4571-8AA3-7D4642FD57DB}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Uno.Reference", "SkiaSharp.Views.Uno\SkiaSharp.Views.Uno.Reference\SkiaSharp.Views.Uno.Reference.csproj", "{D5C7D157-609E-4D64-8E42-C1DB0FAA86EB}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Uno.Skia", "SkiaSharp.Views.Uno\SkiaSharp.Views.Uno.Skia\SkiaSharp.Views.Uno.Skia.csproj", "{A84C9753-A343-4A21-8337-147E5B93B055}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.WinUI", "SkiaSharp.Views.WinUI\SkiaSharp.Views.WinUI\SkiaSharp.Views.WinUI.csproj", "{F50AE765-D9B9-4025-88A8-E8B080D5D624}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SkiaSharp.Views.WinUI", "SkiaSharp.Views.WinUI", "{32AE56A0-F3E1-4721-9BED-B1F609DEA8E8}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SkiaSharp.DotNet.Interactive", "SkiaSharp.DotNet.Interactive", "{B7F572BF-AD3F-4AC8-A654-3ED241E3ECA4}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.DotNet.Interactive", "SkiaSharp.DotNet.Interactive\SkiaSharp.DotNet.Interactive.csproj", "{73185ECB-5A38-447C-95CF-D32D6784B97D}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SkiaSharp.Views.Maui", "SkiaSharp.Views.Maui", "{47A83C7D-EEAB-4149-A58B-CA179DDCB101}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Maui.Core", "SkiaSharp.Views.Maui\SkiaSharp.Views.Maui.Core\SkiaSharp.Views.Maui.Core.csproj", "{311626D1-3052-489D-886A-AFD42188A59C}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Maui.Controls", "SkiaSharp.Views.Maui\SkiaSharp.Views.Maui.Controls\SkiaSharp.Views.Maui.Controls.csproj", "{6E87DBC1-26AB-43A0-B930-BED14A89C7D7}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Maui.Controls.Compatibility", "SkiaSharp.Views.Maui\SkiaSharp.Views.Maui.Controls.Compatibility\SkiaSharp.Views.Maui.Controls.Compatibility.csproj", "{F8A5A8CA-3EF6-4930-82A6-7B50841D0837}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views", "SkiaSharp.Views\SkiaSharp.Views\SkiaSharp.Views.csproj", "{F6CC1833-34A9-4F46-A1D9-3A7424E83A85}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SkiaSharp.Views.Blazor", "SkiaSharp.Views.Blazor", "{E38691EF-D00A-4A7D-A8C4-711FF5243F2B}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Blazor", "SkiaSharp.Views.Blazor\SkiaSharp.Views.Blazor\SkiaSharp.Views.Blazor.csproj", "{9956E64A-D5BF-47C7-BC7D-FAB082EE87B0}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Uno.WinUI.Wasm", "SkiaSharp.Views.Uno\SkiaSharp.Views.Uno.WinUI.Wasm\SkiaSharp.Views.Uno.WinUI.Wasm.csproj", "{A81638C4-7370-4244-BE44-DA4D6A370111}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Uno.WinUI.Skia", "SkiaSharp.Views.Uno\SkiaSharp.Views.Uno.WinUI.Skia\SkiaSharp.Views.Uno.WinUI.Skia.csproj", "{67264FC2-406C-4DAB-A8D1-281E38C3C025}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Uno.WinUI.Mobile", "SkiaSharp.Views.Uno\SkiaSharp.Views.Uno.WinUI.Mobile\SkiaSharp.Views.Uno.WinUI.Mobile.csproj", "{024366EA-FB6E-4CBE-930E-0567D70C222E}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Uno.WinUI.Reference", "SkiaSharp.Views.Uno\SkiaSharp.Views.Uno.WinUI.Reference\SkiaSharp.Views.Uno.WinUI.Reference.csproj", "{9ECDDA6A-E0EA-4A6F-AFF7-99D18459BD02}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {3A1277B5-CFAE-48CC-B64B-4DAE1222A3EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3A1277B5-CFAE-48CC-B64B-4DAE1222A3EB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3A1277B5-CFAE-48CC-B64B-4DAE1222A3EB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3A1277B5-CFAE-48CC-B64B-4DAE1222A3EB}.Release|Any CPU.Build.0 = Release|Any CPU - {1555D119-8598-4E4D-91AC-D313F94A1673}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1555D119-8598-4E4D-91AC-D313F94A1673}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1555D119-8598-4E4D-91AC-D313F94A1673}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1555D119-8598-4E4D-91AC-D313F94A1673}.Release|Any CPU.Build.0 = Release|Any CPU - {E5A90865-C185-45AD-88D1-6DA7D6004B03}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E5A90865-C185-45AD-88D1-6DA7D6004B03}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E5A90865-C185-45AD-88D1-6DA7D6004B03}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E5A90865-C185-45AD-88D1-6DA7D6004B03}.Release|Any CPU.Build.0 = Release|Any CPU - {8BB20362-91A2-4206-944D-634070EAC6F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8BB20362-91A2-4206-944D-634070EAC6F3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8BB20362-91A2-4206-944D-634070EAC6F3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8BB20362-91A2-4206-944D-634070EAC6F3}.Release|Any CPU.Build.0 = Release|Any CPU - {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Release|Any CPU.Build.0 = Release|Any CPU - {743CF830-D458-41A9-865A-F85126562015}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {743CF830-D458-41A9-865A-F85126562015}.Debug|Any CPU.Build.0 = Debug|Any CPU - {743CF830-D458-41A9-865A-F85126562015}.Release|Any CPU.ActiveCfg = Release|Any CPU - {743CF830-D458-41A9-865A-F85126562015}.Release|Any CPU.Build.0 = Release|Any CPU - {7CAD1912-05A5-42E5-B7BA-81BB051F0566}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7CAD1912-05A5-42E5-B7BA-81BB051F0566}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7CAD1912-05A5-42E5-B7BA-81BB051F0566}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7CAD1912-05A5-42E5-B7BA-81BB051F0566}.Release|Any CPU.Build.0 = Release|Any CPU - {6D1E1F39-EF70-4211-A518-BBBAF02D6FFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6D1E1F39-EF70-4211-A518-BBBAF02D6FFF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6D1E1F39-EF70-4211-A518-BBBAF02D6FFF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6D1E1F39-EF70-4211-A518-BBBAF02D6FFF}.Release|Any CPU.Build.0 = Release|Any CPU - {2E3C9751-6A89-4510-AC4C-225A909460A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2E3C9751-6A89-4510-AC4C-225A909460A0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2E3C9751-6A89-4510-AC4C-225A909460A0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2E3C9751-6A89-4510-AC4C-225A909460A0}.Release|Any CPU.Build.0 = Release|Any CPU - {7BFEC966-9910-49BA-A7D4-6204C30E3174}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7BFEC966-9910-49BA-A7D4-6204C30E3174}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7BFEC966-9910-49BA-A7D4-6204C30E3174}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7BFEC966-9910-49BA-A7D4-6204C30E3174}.Release|Any CPU.Build.0 = Release|Any CPU - {A3FFAEF0-53D8-4AAB-A2FD-C29DC76C1E62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A3FFAEF0-53D8-4AAB-A2FD-C29DC76C1E62}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A3FFAEF0-53D8-4AAB-A2FD-C29DC76C1E62}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A3FFAEF0-53D8-4AAB-A2FD-C29DC76C1E62}.Release|Any CPU.Build.0 = Release|Any CPU - {4923892F-AE34-4C55-B03D-68D03885B835}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4923892F-AE34-4C55-B03D-68D03885B835}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4923892F-AE34-4C55-B03D-68D03885B835}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4923892F-AE34-4C55-B03D-68D03885B835}.Release|Any CPU.Build.0 = Release|Any CPU - {A9C01292-FD99-4135-A089-325157D1F530}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A9C01292-FD99-4135-A089-325157D1F530}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A9C01292-FD99-4135-A089-325157D1F530}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A9C01292-FD99-4135-A089-325157D1F530}.Release|Any CPU.Build.0 = Release|Any CPU - {17693608-910C-484E-A4D2-485A3888268D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {17693608-910C-484E-A4D2-485A3888268D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {17693608-910C-484E-A4D2-485A3888268D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {17693608-910C-484E-A4D2-485A3888268D}.Release|Any CPU.Build.0 = Release|Any CPU - {24A470FB-FB81-4DDA-B163-F2A875F4571D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {24A470FB-FB81-4DDA-B163-F2A875F4571D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {24A470FB-FB81-4DDA-B163-F2A875F4571D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {24A470FB-FB81-4DDA-B163-F2A875F4571D}.Release|Any CPU.Build.0 = Release|Any CPU - {BA052CAC-8269-4BDE-A295-5C15B3741AE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BA052CAC-8269-4BDE-A295-5C15B3741AE5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BA052CAC-8269-4BDE-A295-5C15B3741AE5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BA052CAC-8269-4BDE-A295-5C15B3741AE5}.Release|Any CPU.Build.0 = Release|Any CPU - {84DF14D9-41D5-49E5-8065-3582DADB40E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {84DF14D9-41D5-49E5-8065-3582DADB40E9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {84DF14D9-41D5-49E5-8065-3582DADB40E9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {84DF14D9-41D5-49E5-8065-3582DADB40E9}.Release|Any CPU.Build.0 = Release|Any CPU - {7F31BE1B-39D7-46D2-8E9A-36C6FF8A2876}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7F31BE1B-39D7-46D2-8E9A-36C6FF8A2876}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7F31BE1B-39D7-46D2-8E9A-36C6FF8A2876}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7F31BE1B-39D7-46D2-8E9A-36C6FF8A2876}.Release|Any CPU.Build.0 = Release|Any CPU - {E20EECC0-6534-4625-AEDA-38D6EE0A99A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E20EECC0-6534-4625-AEDA-38D6EE0A99A0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E20EECC0-6534-4625-AEDA-38D6EE0A99A0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E20EECC0-6534-4625-AEDA-38D6EE0A99A0}.Release|Any CPU.Build.0 = Release|Any CPU - {EDFAEF02-C462-4953-9CA4-4525479DD027}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EDFAEF02-C462-4953-9CA4-4525479DD027}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EDFAEF02-C462-4953-9CA4-4525479DD027}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EDFAEF02-C462-4953-9CA4-4525479DD027}.Release|Any CPU.Build.0 = Release|Any CPU - {6FB08346-1A02-4793-B5E1-4F739C6342D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6FB08346-1A02-4793-B5E1-4F739C6342D5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6FB08346-1A02-4793-B5E1-4F739C6342D5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6FB08346-1A02-4793-B5E1-4F739C6342D5}.Release|Any CPU.Build.0 = Release|Any CPU - {F55B16B3-4427-45EA-A93C-E12A7409E37D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F55B16B3-4427-45EA-A93C-E12A7409E37D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F55B16B3-4427-45EA-A93C-E12A7409E37D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F55B16B3-4427-45EA-A93C-E12A7409E37D}.Release|Any CPU.Build.0 = Release|Any CPU - {4606F63B-F0B1-418E-8B45-844361E17EB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4606F63B-F0B1-418E-8B45-844361E17EB1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4606F63B-F0B1-418E-8B45-844361E17EB1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4606F63B-F0B1-418E-8B45-844361E17EB1}.Release|Any CPU.Build.0 = Release|Any CPU - {D35B20BC-838A-4C1E-B427-4269F6387CAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D35B20BC-838A-4C1E-B427-4269F6387CAB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D35B20BC-838A-4C1E-B427-4269F6387CAB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D35B20BC-838A-4C1E-B427-4269F6387CAB}.Release|Any CPU.Build.0 = Release|Any CPU - {F675A841-ECDB-4571-8AA3-7D4642FD57DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F675A841-ECDB-4571-8AA3-7D4642FD57DB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F675A841-ECDB-4571-8AA3-7D4642FD57DB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F675A841-ECDB-4571-8AA3-7D4642FD57DB}.Release|Any CPU.Build.0 = Release|Any CPU - {D5C7D157-609E-4D64-8E42-C1DB0FAA86EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D5C7D157-609E-4D64-8E42-C1DB0FAA86EB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D5C7D157-609E-4D64-8E42-C1DB0FAA86EB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D5C7D157-609E-4D64-8E42-C1DB0FAA86EB}.Release|Any CPU.Build.0 = Release|Any CPU - {A84C9753-A343-4A21-8337-147E5B93B055}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A84C9753-A343-4A21-8337-147E5B93B055}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A84C9753-A343-4A21-8337-147E5B93B055}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A84C9753-A343-4A21-8337-147E5B93B055}.Release|Any CPU.Build.0 = Release|Any CPU - {F50AE765-D9B9-4025-88A8-E8B080D5D624}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F50AE765-D9B9-4025-88A8-E8B080D5D624}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F50AE765-D9B9-4025-88A8-E8B080D5D624}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F50AE765-D9B9-4025-88A8-E8B080D5D624}.Release|Any CPU.Build.0 = Release|Any CPU - {73185ECB-5A38-447C-95CF-D32D6784B97D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {73185ECB-5A38-447C-95CF-D32D6784B97D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {73185ECB-5A38-447C-95CF-D32D6784B97D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {73185ECB-5A38-447C-95CF-D32D6784B97D}.Release|Any CPU.Build.0 = Release|Any CPU - {311626D1-3052-489D-886A-AFD42188A59C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {311626D1-3052-489D-886A-AFD42188A59C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {311626D1-3052-489D-886A-AFD42188A59C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {311626D1-3052-489D-886A-AFD42188A59C}.Release|Any CPU.Build.0 = Release|Any CPU - {6E87DBC1-26AB-43A0-B930-BED14A89C7D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6E87DBC1-26AB-43A0-B930-BED14A89C7D7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6E87DBC1-26AB-43A0-B930-BED14A89C7D7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6E87DBC1-26AB-43A0-B930-BED14A89C7D7}.Release|Any CPU.Build.0 = Release|Any CPU - {F8A5A8CA-3EF6-4930-82A6-7B50841D0837}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F8A5A8CA-3EF6-4930-82A6-7B50841D0837}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F8A5A8CA-3EF6-4930-82A6-7B50841D0837}.Debug|Any CPU.Deploy.0 = Debug|Any CPU - {F8A5A8CA-3EF6-4930-82A6-7B50841D0837}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F8A5A8CA-3EF6-4930-82A6-7B50841D0837}.Release|Any CPU.Build.0 = Release|Any CPU - {F8A5A8CA-3EF6-4930-82A6-7B50841D0837}.Release|Any CPU.Deploy.0 = Release|Any CPU - {F6CC1833-34A9-4F46-A1D9-3A7424E83A85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F6CC1833-34A9-4F46-A1D9-3A7424E83A85}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F6CC1833-34A9-4F46-A1D9-3A7424E83A85}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F6CC1833-34A9-4F46-A1D9-3A7424E83A85}.Release|Any CPU.Build.0 = Release|Any CPU - {9956E64A-D5BF-47C7-BC7D-FAB082EE87B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9956E64A-D5BF-47C7-BC7D-FAB082EE87B0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9956E64A-D5BF-47C7-BC7D-FAB082EE87B0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9956E64A-D5BF-47C7-BC7D-FAB082EE87B0}.Release|Any CPU.Build.0 = Release|Any CPU - {A81638C4-7370-4244-BE44-DA4D6A370111}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A81638C4-7370-4244-BE44-DA4D6A370111}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A81638C4-7370-4244-BE44-DA4D6A370111}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A81638C4-7370-4244-BE44-DA4D6A370111}.Release|Any CPU.Build.0 = Release|Any CPU - {67264FC2-406C-4DAB-A8D1-281E38C3C025}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {67264FC2-406C-4DAB-A8D1-281E38C3C025}.Debug|Any CPU.Build.0 = Debug|Any CPU - {67264FC2-406C-4DAB-A8D1-281E38C3C025}.Release|Any CPU.ActiveCfg = Release|Any CPU - {67264FC2-406C-4DAB-A8D1-281E38C3C025}.Release|Any CPU.Build.0 = Release|Any CPU - {024366EA-FB6E-4CBE-930E-0567D70C222E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {024366EA-FB6E-4CBE-930E-0567D70C222E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {024366EA-FB6E-4CBE-930E-0567D70C222E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {024366EA-FB6E-4CBE-930E-0567D70C222E}.Release|Any CPU.Build.0 = Release|Any CPU - {9ECDDA6A-E0EA-4A6F-AFF7-99D18459BD02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9ECDDA6A-E0EA-4A6F-AFF7-99D18459BD02}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9ECDDA6A-E0EA-4A6F-AFF7-99D18459BD02}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9ECDDA6A-E0EA-4A6F-AFF7-99D18459BD02}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {3A1277B5-CFAE-48CC-B64B-4DAE1222A3EB} = {D40675E1-610D-4BBB-AA2A-BEF020717431} - {1555D119-8598-4E4D-91AC-D313F94A1673} = {D40675E1-610D-4BBB-AA2A-BEF020717431} - {E5A90865-C185-45AD-88D1-6DA7D6004B03} = {F19E1537-81B2-4D4F-A69E-78DC73ACC141} - {8BB20362-91A2-4206-944D-634070EAC6F3} = {F19E1537-81B2-4D4F-A69E-78DC73ACC141} - {BAB615AA-956E-4079-B260-DD7B1F52EC7D} = {C335869B-7CC8-4239-B4A5-8031AA9758D3} - {743CF830-D458-41A9-865A-F85126562015} = {F19E1537-81B2-4D4F-A69E-78DC73ACC141} - {7CAD1912-05A5-42E5-B7BA-81BB051F0566} = {EDCCEA7A-E6CD-4311-B686-41D7CA40DF85} - {6D1E1F39-EF70-4211-A518-BBBAF02D6FFF} = {9F016D5D-C7BF-45C7-BC0C-5A6E721DCF9E} - {2E3C9751-6A89-4510-AC4C-225A909460A0} = {9F016D5D-C7BF-45C7-BC0C-5A6E721DCF9E} - {7BFEC966-9910-49BA-A7D4-6204C30E3174} = {C335869B-7CC8-4239-B4A5-8031AA9758D3} - {A3FFAEF0-53D8-4AAB-A2FD-C29DC76C1E62} = {9F016D5D-C7BF-45C7-BC0C-5A6E721DCF9E} - {4923892F-AE34-4C55-B03D-68D03885B835} = {C335869B-7CC8-4239-B4A5-8031AA9758D3} - {A9C01292-FD99-4135-A089-325157D1F530} = {F19E1537-81B2-4D4F-A69E-78DC73ACC141} - {17693608-910C-484E-A4D2-485A3888268D} = {D40675E1-610D-4BBB-AA2A-BEF020717431} - {24A470FB-FB81-4DDA-B163-F2A875F4571D} = {9F016D5D-C7BF-45C7-BC0C-5A6E721DCF9E} - {BA052CAC-8269-4BDE-A295-5C15B3741AE5} = {C335869B-7CC8-4239-B4A5-8031AA9758D3} - {84DF14D9-41D5-49E5-8065-3582DADB40E9} = {F19E1537-81B2-4D4F-A69E-78DC73ACC141} - {7F31BE1B-39D7-46D2-8E9A-36C6FF8A2876} = {D40675E1-610D-4BBB-AA2A-BEF020717431} - {E20EECC0-6534-4625-AEDA-38D6EE0A99A0} = {F19E1537-81B2-4D4F-A69E-78DC73ACC141} - {EDFAEF02-C462-4953-9CA4-4525479DD027} = {F19E1537-81B2-4D4F-A69E-78DC73ACC141} - {6FB08346-1A02-4793-B5E1-4F739C6342D5} = {F19E1537-81B2-4D4F-A69E-78DC73ACC141} - {F55B16B3-4427-45EA-A93C-E12A7409E37D} = {D40675E1-610D-4BBB-AA2A-BEF020717431} - {4606F63B-F0B1-418E-8B45-844361E17EB1} = {66A0800A-CA70-4AC2-88B7-8E7C4CA7C914} - {D35B20BC-838A-4C1E-B427-4269F6387CAB} = {E53351EA-FE40-47D2-B388-4A75DA6CCD71} - {F675A841-ECDB-4571-8AA3-7D4642FD57DB} = {E53351EA-FE40-47D2-B388-4A75DA6CCD71} - {D5C7D157-609E-4D64-8E42-C1DB0FAA86EB} = {E53351EA-FE40-47D2-B388-4A75DA6CCD71} - {A84C9753-A343-4A21-8337-147E5B93B055} = {E53351EA-FE40-47D2-B388-4A75DA6CCD71} - {F50AE765-D9B9-4025-88A8-E8B080D5D624} = {32AE56A0-F3E1-4721-9BED-B1F609DEA8E8} - {73185ECB-5A38-447C-95CF-D32D6784B97D} = {B7F572BF-AD3F-4AC8-A654-3ED241E3ECA4} - {311626D1-3052-489D-886A-AFD42188A59C} = {47A83C7D-EEAB-4149-A58B-CA179DDCB101} - {6E87DBC1-26AB-43A0-B930-BED14A89C7D7} = {47A83C7D-EEAB-4149-A58B-CA179DDCB101} - {F8A5A8CA-3EF6-4930-82A6-7B50841D0837} = {47A83C7D-EEAB-4149-A58B-CA179DDCB101} - {F6CC1833-34A9-4F46-A1D9-3A7424E83A85} = {F19E1537-81B2-4D4F-A69E-78DC73ACC141} - {9956E64A-D5BF-47C7-BC7D-FAB082EE87B0} = {E38691EF-D00A-4A7D-A8C4-711FF5243F2B} - {A81638C4-7370-4244-BE44-DA4D6A370111} = {E53351EA-FE40-47D2-B388-4A75DA6CCD71} - {67264FC2-406C-4DAB-A8D1-281E38C3C025} = {E53351EA-FE40-47D2-B388-4A75DA6CCD71} - {024366EA-FB6E-4CBE-930E-0567D70C222E} = {E53351EA-FE40-47D2-B388-4A75DA6CCD71} - {9ECDDA6A-E0EA-4A6F-AFF7-99D18459BD02} = {E53351EA-FE40-47D2-B388-4A75DA6CCD71} - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {63A8C36E-4917-46DB-9AAD-522B8EC00C23} - EndGlobalSection -EndGlobal diff --git a/source/SkiaSharpSource.Windows.slnf b/source/SkiaSharpSource.Windows.slnf new file mode 100644 index 000000000..8d1f7a06d --- /dev/null +++ b/source/SkiaSharpSource.Windows.slnf @@ -0,0 +1,41 @@ +{ + "solution": { + "path": "SkiaSharpSource.sln", + "projects": [ + "..\\binding\\HarfBuzzSharp.Classic\\HarfBuzzSharp.Classic.csproj", + "..\\binding\\HarfBuzzSharp\\HarfBuzzSharp.csproj", + "..\\binding\\SkiaSharp.Classic\\SkiaSharp.Classic.csproj", + "..\\binding\\SkiaSharp\\SkiaSharp.csproj", + "SkiaSharp.DotNet.Interactive\\SkiaSharp.DotNet.Interactive.csproj", + "SkiaSharp.HarfBuzz\\SkiaSharp.HarfBuzz\\SkiaSharp.HarfBuzz.csproj", + "SkiaSharp.Views.Blazor\\SkiaSharp.Views.Blazor\\SkiaSharp.Views.Blazor.csproj", + "SkiaSharp.Views.Forms\\SkiaSharp.Views.Forms.Android\\SkiaSharp.Views.Forms.Android.csproj", + "SkiaSharp.Views.Forms\\SkiaSharp.Views.Forms.Tizen\\SkiaSharp.Views.Forms.Tizen.csproj", + "SkiaSharp.Views.Forms\\SkiaSharp.Views.Forms.UWP\\SkiaSharp.Views.Forms.UWP.csproj", + "SkiaSharp.Views.Forms\\SkiaSharp.Views.Forms.WPF\\SkiaSharp.Views.Forms.WPF.csproj", + "SkiaSharp.Views.Forms\\SkiaSharp.Views.Forms\\SkiaSharp.Views.Forms.csproj", + "SkiaSharp.Views.Maui\\SkiaSharp.Views.Maui.Controls.Compatibility\\SkiaSharp.Views.Maui.Controls.Compatibility.csproj", + "SkiaSharp.Views.Maui\\SkiaSharp.Views.Maui.Controls\\SkiaSharp.Views.Maui.Controls.csproj", + "SkiaSharp.Views.Maui\\SkiaSharp.Views.Maui.Core\\SkiaSharp.Views.Maui.Core.csproj", + "SkiaSharp.Views.Uno\\SkiaSharp.Views.Uno.Android\\SkiaSharp.Views.Uno.Android.csproj", + "SkiaSharp.Views.Uno\\SkiaSharp.Views.Uno.Reference\\SkiaSharp.Views.Uno.Reference.csproj", + "SkiaSharp.Views.Uno\\SkiaSharp.Views.Uno.Skia\\SkiaSharp.Views.Uno.Skia.csproj", + "SkiaSharp.Views.Uno\\SkiaSharp.Views.Uno.Wasm\\SkiaSharp.Views.Uno.Wasm.csproj", + "SkiaSharp.Views.Uno\\SkiaSharp.Views.Uno.WinUI.Mobile\\SkiaSharp.Views.Uno.WinUI.Mobile.csproj", + "SkiaSharp.Views.Uno\\SkiaSharp.Views.Uno.WinUI.Reference\\SkiaSharp.Views.Uno.WinUI.Reference.csproj", + "SkiaSharp.Views.Uno\\SkiaSharp.Views.Uno.WinUI.Skia\\SkiaSharp.Views.Uno.WinUI.Skia.csproj", + "SkiaSharp.Views.Uno\\SkiaSharp.Views.Uno.WinUI.Wasm\\SkiaSharp.Views.Uno.WinUI.Wasm.csproj", + "SkiaSharp.Views.WinUI\\SkiaSharp.Views.WinUI\\SkiaSharp.Views.WinUI.csproj", + "SkiaSharp.Views\\SkiaSharp.Views.Android\\SkiaSharp.Views.Android.csproj", + "SkiaSharp.Views\\SkiaSharp.Views.Desktop.Common\\SkiaSharp.Views.Desktop.Common.csproj", + "SkiaSharp.Views\\SkiaSharp.Views.Desktop\\SkiaSharp.Views.Desktop.csproj", + "SkiaSharp.Views\\SkiaSharp.Views.Gtk3\\SkiaSharp.Views.Gtk3.csproj", + "SkiaSharp.Views\\SkiaSharp.Views.Tizen\\SkiaSharp.Views.Tizen.csproj", + "SkiaSharp.Views\\SkiaSharp.Views.UWP\\SkiaSharp.Views.UWP.csproj", + "SkiaSharp.Views\\SkiaSharp.Views.WindowsForms\\SkiaSharp.Views.WindowsForms.csproj", + "SkiaSharp.Views\\SkiaSharp.Views.WPF\\SkiaSharp.Views.WPF.csproj", + "SkiaSharp.Views\\SkiaSharp.Views\\SkiaSharp.Views.csproj", + "SkiaSharp.Vulkan\\SkiaSharp.Vulkan.SharpVk\\SkiaSharp.Vulkan.SharpVk.csproj", + ] + } +} \ No newline at end of file diff --git a/source/SkiaSharpSource.sln b/source/SkiaSharpSource.sln index 13c77d1e3..fc9af0cf8 100644 --- a/source/SkiaSharpSource.sln +++ b/source/SkiaSharpSource.sln @@ -25,18 +25,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Desktop", " EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.UWP", "SkiaSharp.Views\SkiaSharp.Views.UWP\SkiaSharp.Views.UWP.csproj", "{8BB20362-91A2-4206-944D-634070EAC6F3}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Android", "..\binding\SkiaSharp.Android\SkiaSharp.Android.csproj", "{C737DC80-5B71-4B26-A2DC-DA30421788B0}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.iOS", "..\binding\SkiaSharp.iOS\SkiaSharp.iOS.csproj", "{6A678CFB-21A7-4E81-8909-FD72ABBFD408}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.tvOS", "..\binding\SkiaSharp.tvOS\SkiaSharp.tvOS.csproj", "{5180E370-A455-42BB-99F9-97BD269B8A52}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.watchOS", "..\binding\SkiaSharp.watchOS\SkiaSharp.watchOS.csproj", "{099A4BAD-6CF7-4898-9D16-266BDD844F95}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.OSX", "..\binding\SkiaSharp.OSX\SkiaSharp.OSX.csproj", "{4588A759-3853-49B8-8A68-6C7917BE9220}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.UWP", "..\binding\SkiaSharp.UWP\SkiaSharp.UWP.csproj", "{BAB615AA-956E-4079-B260-DD7B1F52EC7D}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SkiaSharp", "SkiaSharp", "{C335869B-7CC8-4239-B4A5-8031AA9758D3}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SkiaSharp.Views", "SkiaSharp.Views", "{F19E1537-81B2-4D4F-A69E-78DC73ACC141}" @@ -57,23 +45,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.HarfBuzz", "SkiaS EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp", "..\binding\HarfBuzzSharp\HarfBuzzSharp.csproj", "{DD3EAFFF-E420-4AC3-925D-501EAE140B49}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.OSX", "..\binding\HarfBuzzSharp.OSX\HarfBuzzSharp.OSX.csproj", "{30952C22-D566-488F-9D7A-2411B027D6CA}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.iOS", "..\binding\HarfBuzzSharp.iOS\HarfBuzzSharp.iOS.csproj", "{E8192110-FCF9-4972-9472-7408BC2CA56B}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.tvOS", "..\binding\HarfBuzzSharp.tvOS\HarfBuzzSharp.tvOS.csproj", "{8D646738-458A-441F-B69B-253EF058A812}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.watchOS", "..\binding\HarfBuzzSharp.watchOS\HarfBuzzSharp.watchOS.csproj", "{0C940695-4868-4CF7-7D16-266BDD88A812}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.Android", "..\binding\HarfBuzzSharp.Android\HarfBuzzSharp.Android.csproj", "{E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.UWP", "..\binding\HarfBuzzSharp.UWP\HarfBuzzSharp.UWP.csproj", "{6D1E1F39-EF70-4211-A518-BBBAF02D6FFF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.Classic", "..\binding\HarfBuzzSharp.Classic\HarfBuzzSharp.Classic.csproj", "{30952C22-D566-488F-9D7A-2411B027D6CA}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Gtk", "SkiaSharp.Views\SkiaSharp.Views.Gtk\SkiaSharp.Views.Gtk.csproj", "{67A502A4-E8B2-419A-811E-5A634B29C8D7}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.Tizen", "..\binding\HarfBuzzSharp.Tizen\HarfBuzzSharp.Tizen.csproj", "{FE1BCB7F-27F1-4135-8BC5-5A185FC7018C}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Tizen", "..\binding\SkiaSharp.Tizen\SkiaSharp.Tizen.csproj", "{2F11ED02-B0A7-4844-B90D-1A8A3D42D621}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Classic", "..\binding\SkiaSharp.Classic\SkiaSharp.Classic.csproj", "{2F11ED02-B0A7-4844-B90D-1A8A3D42D621}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Tizen", "SkiaSharp.Views\SkiaSharp.Views.Tizen\SkiaSharp.Views.Tizen.csproj", "{73F40BE5-2548-4330-B676-CF4E03754F51}" EndProject @@ -133,6 +109,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Uno.WinUI.M EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Uno.WinUI.Reference", "SkiaSharp.Views.Uno\SkiaSharp.Views.Uno.WinUI.Reference\SkiaSharp.Views.Uno.WinUI.Reference.csproj", "{E5D299A3-548F-4529-B804-436228685E8D}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SkiaSharp.Views.Blazor", "SkiaSharp.Views.Blazor", "{A534A8E1-BC73-40FD-A1F2-4D0BFC1C3B9B}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Blazor", "SkiaSharp.Views.Blazor\SkiaSharp.Views.Blazor\SkiaSharp.Views.Blazor.csproj", "{49CD7B31-1E15-4843-97CF-829449D1180E}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -183,30 +163,6 @@ Global {8BB20362-91A2-4206-944D-634070EAC6F3}.Debug|Any CPU.Build.0 = Debug|Any CPU {8BB20362-91A2-4206-944D-634070EAC6F3}.Release|Any CPU.ActiveCfg = Release|Any CPU {8BB20362-91A2-4206-944D-634070EAC6F3}.Release|Any CPU.Build.0 = Release|Any CPU - {C737DC80-5B71-4B26-A2DC-DA30421788B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C737DC80-5B71-4B26-A2DC-DA30421788B0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C737DC80-5B71-4B26-A2DC-DA30421788B0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C737DC80-5B71-4B26-A2DC-DA30421788B0}.Release|Any CPU.Build.0 = Release|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6A678CFB-21A7-4E81-8909-FD72ABBFD408}.Release|Any CPU.Build.0 = Release|Any CPU - {5180E370-A455-42BB-99F9-97BD269B8A52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5180E370-A455-42BB-99F9-97BD269B8A52}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5180E370-A455-42BB-99F9-97BD269B8A52}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5180E370-A455-42BB-99F9-97BD269B8A52}.Release|Any CPU.Build.0 = Release|Any CPU - {099A4BAD-6CF7-4898-9D16-266BDD844F95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {099A4BAD-6CF7-4898-9D16-266BDD844F95}.Debug|Any CPU.Build.0 = Debug|Any CPU - {099A4BAD-6CF7-4898-9D16-266BDD844F95}.Release|Any CPU.ActiveCfg = Release|Any CPU - {099A4BAD-6CF7-4898-9D16-266BDD844F95}.Release|Any CPU.Build.0 = Release|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4588A759-3853-49B8-8A68-6C7917BE9220}.Release|Any CPU.Build.0 = Release|Any CPU - {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Release|Any CPU.Build.0 = Release|Any CPU {743CF830-D458-41A9-865A-F85126562015}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {743CF830-D458-41A9-865A-F85126562015}.Debug|Any CPU.Build.0 = Debug|Any CPU {743CF830-D458-41A9-865A-F85126562015}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -231,34 +187,10 @@ Global {30952C22-D566-488F-9D7A-2411B027D6CA}.Debug|Any CPU.Build.0 = Debug|Any CPU {30952C22-D566-488F-9D7A-2411B027D6CA}.Release|Any CPU.ActiveCfg = Release|Any CPU {30952C22-D566-488F-9D7A-2411B027D6CA}.Release|Any CPU.Build.0 = Release|Any CPU - {E8192110-FCF9-4972-9472-7408BC2CA56B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E8192110-FCF9-4972-9472-7408BC2CA56B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E8192110-FCF9-4972-9472-7408BC2CA56B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E8192110-FCF9-4972-9472-7408BC2CA56B}.Release|Any CPU.Build.0 = Release|Any CPU - {8D646738-458A-441F-B69B-253EF058A812}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8D646738-458A-441F-B69B-253EF058A812}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8D646738-458A-441F-B69B-253EF058A812}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8D646738-458A-441F-B69B-253EF058A812}.Release|Any CPU.Build.0 = Release|Any CPU - {0C940695-4868-4CF7-7D16-266BDD88A812}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0C940695-4868-4CF7-7D16-266BDD88A812}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0C940695-4868-4CF7-7D16-266BDD88A812}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0C940695-4868-4CF7-7D16-266BDD88A812}.Release|Any CPU.Build.0 = Release|Any CPU - {E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}.Release|Any CPU.Build.0 = Release|Any CPU - {6D1E1F39-EF70-4211-A518-BBBAF02D6FFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6D1E1F39-EF70-4211-A518-BBBAF02D6FFF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6D1E1F39-EF70-4211-A518-BBBAF02D6FFF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6D1E1F39-EF70-4211-A518-BBBAF02D6FFF}.Release|Any CPU.Build.0 = Release|Any CPU {67A502A4-E8B2-419A-811E-5A634B29C8D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {67A502A4-E8B2-419A-811E-5A634B29C8D7}.Debug|Any CPU.Build.0 = Debug|Any CPU {67A502A4-E8B2-419A-811E-5A634B29C8D7}.Release|Any CPU.ActiveCfg = Release|Any CPU {67A502A4-E8B2-419A-811E-5A634B29C8D7}.Release|Any CPU.Build.0 = Release|Any CPU - {FE1BCB7F-27F1-4135-8BC5-5A185FC7018C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FE1BCB7F-27F1-4135-8BC5-5A185FC7018C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FE1BCB7F-27F1-4135-8BC5-5A185FC7018C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FE1BCB7F-27F1-4135-8BC5-5A185FC7018C}.Release|Any CPU.Build.0 = Release|Any CPU {2F11ED02-B0A7-4844-B90D-1A8A3D42D621}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2F11ED02-B0A7-4844-B90D-1A8A3D42D621}.Debug|Any CPU.Build.0 = Debug|Any CPU {2F11ED02-B0A7-4844-B90D-1A8A3D42D621}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -361,6 +293,10 @@ Global {E5D299A3-548F-4529-B804-436228685E8D}.Debug|Any CPU.Build.0 = Debug|Any CPU {E5D299A3-548F-4529-B804-436228685E8D}.Release|Any CPU.ActiveCfg = Release|Any CPU {E5D299A3-548F-4529-B804-436228685E8D}.Release|Any CPU.Build.0 = Release|Any CPU + {49CD7B31-1E15-4843-97CF-829449D1180E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {49CD7B31-1E15-4843-97CF-829449D1180E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {49CD7B31-1E15-4843-97CF-829449D1180E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {49CD7B31-1E15-4843-97CF-829449D1180E}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -377,25 +313,13 @@ Global {9E850CCA-54CC-4CEB-B2C2-E32EF4A17D61} = {F19E1537-81B2-4D4F-A69E-78DC73ACC141} {E5A90865-C185-45AD-88D1-6DA7D6004B03} = {F19E1537-81B2-4D4F-A69E-78DC73ACC141} {8BB20362-91A2-4206-944D-634070EAC6F3} = {F19E1537-81B2-4D4F-A69E-78DC73ACC141} - {C737DC80-5B71-4B26-A2DC-DA30421788B0} = {C335869B-7CC8-4239-B4A5-8031AA9758D3} - {6A678CFB-21A7-4E81-8909-FD72ABBFD408} = {C335869B-7CC8-4239-B4A5-8031AA9758D3} - {5180E370-A455-42BB-99F9-97BD269B8A52} = {C335869B-7CC8-4239-B4A5-8031AA9758D3} - {099A4BAD-6CF7-4898-9D16-266BDD844F95} = {C335869B-7CC8-4239-B4A5-8031AA9758D3} - {4588A759-3853-49B8-8A68-6C7917BE9220} = {C335869B-7CC8-4239-B4A5-8031AA9758D3} - {BAB615AA-956E-4079-B260-DD7B1F52EC7D} = {C335869B-7CC8-4239-B4A5-8031AA9758D3} {743CF830-D458-41A9-865A-F85126562015} = {F19E1537-81B2-4D4F-A69E-78DC73ACC141} {4E0924F8-D546-4428-9412-4B9411FBA5FF} = {C335869B-7CC8-4239-B4A5-8031AA9758D3} {DA5DA4D8-4885-4AF2-96BB-AE803C344AB0} = {DCADA8CC-D50A-4BD9-B2E6-86696A43D819} {7CAD1912-05A5-42E5-B7BA-81BB051F0566} = {B2F89188-A459-4CC2-B348-9429FBF67C51} {DD3EAFFF-E420-4AC3-925D-501EAE140B49} = {2F28C1EB-D020-4A3A-948F-DF0AD0FDCC53} {30952C22-D566-488F-9D7A-2411B027D6CA} = {2F28C1EB-D020-4A3A-948F-DF0AD0FDCC53} - {E8192110-FCF9-4972-9472-7408BC2CA56B} = {2F28C1EB-D020-4A3A-948F-DF0AD0FDCC53} - {8D646738-458A-441F-B69B-253EF058A812} = {2F28C1EB-D020-4A3A-948F-DF0AD0FDCC53} - {0C940695-4868-4CF7-7D16-266BDD88A812} = {2F28C1EB-D020-4A3A-948F-DF0AD0FDCC53} - {E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD} = {2F28C1EB-D020-4A3A-948F-DF0AD0FDCC53} - {6D1E1F39-EF70-4211-A518-BBBAF02D6FFF} = {2F28C1EB-D020-4A3A-948F-DF0AD0FDCC53} {67A502A4-E8B2-419A-811E-5A634B29C8D7} = {F19E1537-81B2-4D4F-A69E-78DC73ACC141} - {FE1BCB7F-27F1-4135-8BC5-5A185FC7018C} = {2F28C1EB-D020-4A3A-948F-DF0AD0FDCC53} {2F11ED02-B0A7-4844-B90D-1A8A3D42D621} = {C335869B-7CC8-4239-B4A5-8031AA9758D3} {73F40BE5-2548-4330-B676-CF4E03754F51} = {F19E1537-81B2-4D4F-A69E-78DC73ACC141} {9E78300A-8251-4D87-B384-789F41088FB1} = {DCADA8CC-D50A-4BD9-B2E6-86696A43D819} @@ -421,6 +345,7 @@ Global {70257CDC-1D0E-4C40-A6C1-7043FAFBBE3B} = {E53351EA-FE40-47D2-B388-4A75DA6CCD71} {7F5BA5C1-F3AF-468F-97B2-EE20ECC5A9C3} = {E53351EA-FE40-47D2-B388-4A75DA6CCD71} {E5D299A3-548F-4529-B804-436228685E8D} = {E53351EA-FE40-47D2-B388-4A75DA6CCD71} + {49CD7B31-1E15-4843-97CF-829449D1180E} = {A534A8E1-BC73-40FD-A1F2-4D0BFC1C3B9B} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {67EACD19-0CEA-4127-9842-549AA6FB84C9} diff --git a/tests/SkiaSharp.Android.Tests.sln b/tests/SkiaSharp.Android.Tests.sln index ba713466a..d88ee5bdf 100644 --- a/tests/SkiaSharp.Android.Tests.sln +++ b/tests/SkiaSharp.Android.Tests.sln @@ -5,9 +5,9 @@ VisualStudioVersion = 16.0.31004.235 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Android.Tests", "SkiaSharp.Android.Tests\SkiaSharp.Android.Tests.csproj", "{CB2072E0-A437-4811-AE17-16CAE0DDA1B1}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.Android", "..\binding\HarfBuzzSharp.Android\HarfBuzzSharp.Android.csproj", "{7F5C82DF-976E-4973-AFDF-C2E178B19774}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.Classic", "..\binding\HarfBuzzSharp.Classic\HarfBuzzSharp.Classic.csproj", "{7F5C82DF-976E-4973-AFDF-C2E178B19774}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Android", "..\binding\SkiaSharp.Android\SkiaSharp.Android.csproj", "{D7E86B8F-4E7D-4BE9-A740-D0F5AC9392E5}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Classic", "..\binding\SkiaSharp.Classic\SkiaSharp.Classic.csproj", "{D7E86B8F-4E7D-4BE9-A740-D0F5AC9392E5}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.HarfBuzz", "..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.csproj", "{4C5F53B5-9DFD-4CC6-8FAE-98B4F40CB33A}" EndProject diff --git a/tests/SkiaSharp.Android.Tests/SkiaSharp.Android.Tests.csproj b/tests/SkiaSharp.Android.Tests/SkiaSharp.Android.Tests.csproj index af48416ad..1ed0e50d9 100644 --- a/tests/SkiaSharp.Android.Tests/SkiaSharp.Android.Tests.csproj +++ b/tests/SkiaSharp.Android.Tests/SkiaSharp.Android.Tests.csproj @@ -72,13 +72,13 @@ - + {7f5c82df-976e-4973-afdf-c2e178b19774} - HarfBuzzSharp.Android + HarfBuzzSharp.Classic - + {d7e86b8f-4e7d-4be9-a740-d0f5ac9392e5} - SkiaSharp.Android + SkiaSharp.Classic {4c5f53b5-9dfd-4cc6-8fae-98b4f40cb33a} diff --git a/tests/SkiaSharp.iOS.Tests.sln b/tests/SkiaSharp.iOS.Tests.sln index 3f0330ab2..07639ab64 100644 --- a/tests/SkiaSharp.iOS.Tests.sln +++ b/tests/SkiaSharp.iOS.Tests.sln @@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.808.5 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.iOS", "..\binding\SkiaSharp.iOS\SkiaSharp.iOS.csproj", "{A4146A87-DB60-4A17-A179-0E2E4255A08E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Classic", "..\binding\SkiaSharp.Classic\SkiaSharp.Classic.csproj", "{A4146A87-DB60-4A17-A179-0E2E4255A08E}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.iOS", "..\binding\HarfBuzzSharp.iOS\HarfBuzzSharp.iOS.csproj", "{D958E2E9-DE32-42E8-AB10-D25E4186C4E1}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.Classic", "..\binding\HarfBuzzSharp.Classic\HarfBuzzSharp.Classic.csproj", "{D958E2E9-DE32-42E8-AB10-D25E4186C4E1}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.HarfBuzz", "..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.csproj", "{A5614B8C-31C8-43A3-9BF9-2719E4BE4D36}" EndProject diff --git a/tests/SkiaSharp.iOS.Tests/SkiaSharp.iOS.Tests.csproj b/tests/SkiaSharp.iOS.Tests/SkiaSharp.iOS.Tests.csproj index d000600b1..caf66393e 100644 --- a/tests/SkiaSharp.iOS.Tests/SkiaSharp.iOS.Tests.csproj +++ b/tests/SkiaSharp.iOS.Tests/SkiaSharp.iOS.Tests.csproj @@ -115,17 +115,17 @@ - + {D958E2E9-DE32-42E8-AB10-D25E4186C4E1} - HarfBuzzSharp.iOS + HarfBuzzSharp.Classic {A5614B8C-31C8-43A3-9BF9-2719E4BE4D36} SkiaSharp.HarfBuzz - + {A4146A87-DB60-4A17-A179-0E2E4255A08E} - SkiaSharp.iOS + SkiaSharp.Classic {0254162B-6B4A-459E-BD96-3A42A104C144}