From b7da89f3b870b61e032650da4dc5d4c720db43bf Mon Sep 17 00:00:00 2001 From: Michal Dobrodenka Date: Wed, 18 Apr 2018 17:27:54 +0200 Subject: [PATCH 1/2] iOS SKCanvasView - Disposing UIGraphics context to help GC --- .../SkiaSharp.Views.AppleiOS/SKCanvasView.cs | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/source/SkiaSharp.Views/SkiaSharp.Views.AppleiOS/SKCanvasView.cs b/source/SkiaSharp.Views/SkiaSharp.Views.AppleiOS/SKCanvasView.cs index 76b6b7f7..081df59a 100644 --- a/source/SkiaSharp.Views/SkiaSharp.Views.AppleiOS/SKCanvasView.cs +++ b/source/SkiaSharp.Views/SkiaSharp.Views.AppleiOS/SKCanvasView.cs @@ -85,17 +85,20 @@ namespace SkiaSharp.Views.iOS if (designMode || drawable == null) return; - var ctx = UIGraphics.GetCurrentContext(); + using (var ctx = UIGraphics.GetCurrentContext()) + { + // create the skia context + SKImageInfo info; + using (var surface = drawable.CreateSurface(Bounds, IgnorePixelScaling ? 1 : ContentScaleFactor, out info)) + { - // create the skia context - SKImageInfo info; - var surface = drawable.CreateSurface(Bounds, IgnorePixelScaling ? 1 : ContentScaleFactor, out info); + // draw on the image using SKiaSharp + DrawInSurface(surface, info); - // draw on the image using SKiaSharp - DrawInSurface(surface, info); - - // draw the surface to the context - drawable.DrawSurface(ctx, Bounds, info, surface); + // draw the surface to the context + drawable.DrawSurface(ctx, Bounds, info, surface); + } + } } public event EventHandler PaintSurface; From f0cea333c5c8e6a8823a8b633d600ab4af9f27bd Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Sat, 21 Apr 2018 01:54:12 +0200 Subject: [PATCH 2/2] SkiaSharp.HarfBuzz.NetStandard is no longer used - using SkiaSharp.HarfBuzz instead --- samples/Gallery/Desktop/SkiaSharpSample.sln | 2 +- .../SkiaSharpSample/SkiaSharpSample.csproj | 4 +-- samples/Gallery/UWP/SkiaSharpSample.sln | 2 +- .../SkiaSharpSample/SkiaSharpSample.csproj | 4 +-- samples/Gallery/WPF/SkiaSharpSample.sln | 2 +- .../SkiaSharpSample/SkiaSharpSample.csproj | 4 +-- .../Xamarin.Forms/Android/Android.csproj | 4 +-- .../Gallery/Xamarin.Forms/Core/Core.csproj | 2 +- samples/Gallery/Xamarin.Forms/Mac/Mac.csproj | 4 +-- .../Xamarin.Forms/SkiaSharpSample.Mac.sln | 2 +- .../Xamarin.Forms/SkiaSharpSample.Windows.sln | 2 +- .../Gallery/Xamarin.Forms/SkiaSharpSample.sln | 2 +- samples/Gallery/Xamarin.Forms/UWP/UWP.csproj | 4 +-- samples/Gallery/Xamarin.Forms/iOS/iOS.csproj | 4 +-- samples/Gallery/macOS/SkiaSharpSample.sln | 2 +- .../SkiaSharpSample/SkiaSharpSample.csproj | 4 +-- samples/Gallery/tvOS/SkiaSharpSample.sln | 2 +- .../SkiaSharpSample/SkiaSharpSample.csproj | 4 +-- .../SkiaSharp.HarfBuzz.NetStandard.csproj | 29 ------------------- 19 files changed, 27 insertions(+), 56 deletions(-) delete mode 100644 source/SkiaSharp.HarfBuzz/SkiaSharp.HarfBuzz.NetStandard/SkiaSharp.HarfBuzz.NetStandard.csproj diff --git a/samples/Gallery/Desktop/SkiaSharpSample.sln b/samples/Gallery/Desktop/SkiaSharpSample.sln index f9eda316..a7a1da3a 100644 --- a/samples/Gallery/Desktop/SkiaSharpSample.sln +++ b/samples/Gallery/Desktop/SkiaSharpSample.sln @@ -19,7 +19,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HarfBuzzSharp.Desktop", ".. EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SkiaSharp.HarfBuzz.Shared", "..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.Shared\SkiaSharp.HarfBuzz.Shared.shproj", "{C3E63B2D-95D4-4C3F-B10F-7A0AACF94980}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.HarfBuzz.NetStandard", "..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.NetStandard\SkiaSharp.HarfBuzz.NetStandard.csproj", "{233220CC-F0F3-4C44-9736-ED2CFC363FD3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.HarfBuzz", "..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.csproj", "{233220CC-F0F3-4C44-9736-ED2CFC363FD3}" EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "PlatformShared", "..\PlatformShared\PlatformShared.shproj", "{0CC41AB0-0C4C-4DAA-8F10-A249725EBF5D}" EndProject diff --git a/samples/Gallery/Desktop/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Gallery/Desktop/SkiaSharpSample/SkiaSharpSample.csproj index aa3a694b..dddb6379 100644 --- a/samples/Gallery/Desktop/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Gallery/Desktop/SkiaSharpSample/SkiaSharpSample.csproj @@ -97,9 +97,9 @@ {eb1bbdcc-fb07-40d5-8b9e-0079e2c2f2df} SkiaSharp.Desktop - + {233220cc-f0f3-4c44-9736-ed2cfc363fd3} - SkiaSharp.HarfBuzz.NetStandard + SkiaSharp.HarfBuzz {e5a90865-c185-45ad-88d1-6da7d6004b03} diff --git a/samples/Gallery/UWP/SkiaSharpSample.sln b/samples/Gallery/UWP/SkiaSharpSample.sln index 0c777f53..71de60a6 100644 --- a/samples/Gallery/UWP/SkiaSharpSample.sln +++ b/samples/Gallery/UWP/SkiaSharpSample.sln @@ -17,7 +17,7 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "HarfBuzzSharp.Shared", "..\ EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SkiaSharp.HarfBuzz.Shared", "..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.Shared\SkiaSharp.HarfBuzz.Shared.shproj", "{C3E63B2D-95D4-4C3F-B10F-7A0AACF94980}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.HarfBuzz.NetStandard", "..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.NetStandard\SkiaSharp.HarfBuzz.NetStandard.csproj", "{233220CC-F0F3-4C44-9736-ED2CFC363FD3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.HarfBuzz", "..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.csproj", "{233220CC-F0F3-4C44-9736-ED2CFC363FD3}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HarfBuzzSharp.UWP", "..\..\..\binding\HarfBuzzSharp.UWP\HarfBuzzSharp.UWP.csproj", "{6D1E1F39-EF70-4211-A518-BBBAF02D6FFF}" EndProject diff --git a/samples/Gallery/UWP/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Gallery/UWP/SkiaSharpSample/SkiaSharpSample.csproj index c93b47bc..f26936f5 100644 --- a/samples/Gallery/UWP/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Gallery/UWP/SkiaSharpSample/SkiaSharpSample.csproj @@ -101,9 +101,9 @@ {bab615aa-956e-4079-b260-dd7b1f52ec7d} SkiaSharp.UWP - + {233220cc-f0f3-4c44-9736-ed2cfc363fd3} - SkiaSharp.HarfBuzz.NetStandard + SkiaSharp.HarfBuzz {8bb20362-91a2-4206-944d-634070eac6f3} diff --git a/samples/Gallery/WPF/SkiaSharpSample.sln b/samples/Gallery/WPF/SkiaSharpSample.sln index 982ba937..1a3b0c9f 100644 --- a/samples/Gallery/WPF/SkiaSharpSample.sln +++ b/samples/Gallery/WPF/SkiaSharpSample.sln @@ -27,7 +27,7 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Shared", "..\Shared\Shared. EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpSample", "SkiaSharpSample\SkiaSharpSample.csproj", "{74178C7C-19A0-45E6-8EFB-F4DB7EE37C6F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.HarfBuzz.NetStandard", "..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.NetStandard\SkiaSharp.HarfBuzz.NetStandard.csproj", "{156FADFB-602E-4658-A235-D4D24CD46F09}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.HarfBuzz", "..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.csproj", "{156FADFB-602E-4658-A235-D4D24CD46F09}" EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution diff --git a/samples/Gallery/WPF/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Gallery/WPF/SkiaSharpSample/SkiaSharpSample.csproj index 24446062..e28d70a3 100644 --- a/samples/Gallery/WPF/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Gallery/WPF/SkiaSharpSample/SkiaSharpSample.csproj @@ -105,9 +105,9 @@ {eb1bbdcc-fb07-40d5-8b9e-0079e2c2f2df} SkiaSharp.Desktop - + {156fadfb-602e-4658-a235-d4d24cd46f09} - SkiaSharp.HarfBuzz.NetStandard + SkiaSharp.HarfBuzz {e5a90865-c185-45ad-88d1-6da7d6004b03} diff --git a/samples/Gallery/Xamarin.Forms/Android/Android.csproj b/samples/Gallery/Xamarin.Forms/Android/Android.csproj index 25cd5b23..6828fdd9 100644 --- a/samples/Gallery/Xamarin.Forms/Android/Android.csproj +++ b/samples/Gallery/Xamarin.Forms/Android/Android.csproj @@ -63,9 +63,9 @@ {c737dc80-5b71-4b26-a2dc-da30421788b0} SkiaSharp.Android - + {233220cc-f0f3-4c44-9736-ed2cfc363fd3} - SkiaSharp.HarfBuzz.NetStandard + SkiaSharp.HarfBuzz {2f94f024-1841-47e8-b521-74aa4e3eba54} diff --git a/samples/Gallery/Xamarin.Forms/Core/Core.csproj b/samples/Gallery/Xamarin.Forms/Core/Core.csproj index 7cb87690..061164e0 100644 --- a/samples/Gallery/Xamarin.Forms/Core/Core.csproj +++ b/samples/Gallery/Xamarin.Forms/Core/Core.csproj @@ -12,7 +12,7 @@ - + diff --git a/samples/Gallery/Xamarin.Forms/Mac/Mac.csproj b/samples/Gallery/Xamarin.Forms/Mac/Mac.csproj index 1a1827c7..bf4ac562 100644 --- a/samples/Gallery/Xamarin.Forms/Mac/Mac.csproj +++ b/samples/Gallery/Xamarin.Forms/Mac/Mac.csproj @@ -66,9 +66,9 @@ {4588A759-3853-49B8-8A68-6C7917BE9220} SkiaSharp.OSX - + {233220cc-f0f3-4c44-9736-ed2cfc363fd3} - SkiaSharp.HarfBuzz.NetStandard + SkiaSharp.HarfBuzz {da5da4d8-4885-4af2-96bb-ae803c344ab0} diff --git a/samples/Gallery/Xamarin.Forms/SkiaSharpSample.Mac.sln b/samples/Gallery/Xamarin.Forms/SkiaSharpSample.Mac.sln index 0f234565..c46108f7 100644 --- a/samples/Gallery/Xamarin.Forms/SkiaSharpSample.Mac.sln +++ b/samples/Gallery/Xamarin.Forms/SkiaSharpSample.Mac.sln @@ -27,7 +27,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.NetStandard", ".. EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SkiaSharp.HarfBuzz.Shared", "..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.Shared\SkiaSharp.HarfBuzz.Shared.shproj", "{C3E63B2D-95D4-4C3F-B10F-7A0AACF94980}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.HarfBuzz.NetStandard", "..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.NetStandard\SkiaSharp.HarfBuzz.NetStandard.csproj", "{233220CC-F0F3-4C44-9736-ED2CFC363FD3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.HarfBuzz", "..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.csproj", "{233220CC-F0F3-4C44-9736-ED2CFC363FD3}" 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/Gallery/Xamarin.Forms/SkiaSharpSample.Windows.sln b/samples/Gallery/Xamarin.Forms/SkiaSharpSample.Windows.sln index 6147ea50..a9e52ca0 100644 --- a/samples/Gallery/Xamarin.Forms/SkiaSharpSample.Windows.sln +++ b/samples/Gallery/Xamarin.Forms/SkiaSharpSample.Windows.sln @@ -27,7 +27,7 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SkiaSharp.HarfBuzz.Shared", EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.NetStandard", "..\..\..\binding\HarfBuzzSharp.NetStandard\HarfBuzzSharp.NetStandard.csproj", "{DD3EAFFF-E420-4AC3-925D-501EAE140B49}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.HarfBuzz.NetStandard", "..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.NetStandard\SkiaSharp.HarfBuzz.NetStandard.csproj", "{233220CC-F0F3-4C44-9736-ED2CFC363FD3}" +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}") = "SkiaSharp.Views.Forms", "..\..\..\source\SkiaSharp.Views.Forms\SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.csproj", "{99411A8A-1F8C-469C-AC10-E72F28EDB376}" EndProject diff --git a/samples/Gallery/Xamarin.Forms/SkiaSharpSample.sln b/samples/Gallery/Xamarin.Forms/SkiaSharpSample.sln index 4d736877..d0300f02 100644 --- a/samples/Gallery/Xamarin.Forms/SkiaSharpSample.sln +++ b/samples/Gallery/Xamarin.Forms/SkiaSharpSample.sln @@ -49,7 +49,7 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SkiaSharp.HarfBuzz.Shared", EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.NetStandard", "..\..\..\binding\HarfBuzzSharp.NetStandard\HarfBuzzSharp.NetStandard.csproj", "{DD3EAFFF-E420-4AC3-925D-501EAE140B49}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.HarfBuzz.NetStandard", "..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.NetStandard\SkiaSharp.HarfBuzz.NetStandard.csproj", "{233220CC-F0F3-4C44-9736-ED2CFC363FD3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.HarfBuzz", "..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.csproj", "{233220CC-F0F3-4C44-9736-ED2CFC363FD3}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HarfBuzzSharp.OSX", "..\..\..\binding\HarfBuzzSharp.OSX\HarfBuzzSharp.OSX.csproj", "{30952C22-D566-488F-9D7A-2411B027D6CA}" EndProject diff --git a/samples/Gallery/Xamarin.Forms/UWP/UWP.csproj b/samples/Gallery/Xamarin.Forms/UWP/UWP.csproj index 23cda9a3..7c09df93 100644 --- a/samples/Gallery/Xamarin.Forms/UWP/UWP.csproj +++ b/samples/Gallery/Xamarin.Forms/UWP/UWP.csproj @@ -103,9 +103,9 @@ {bab615aa-956e-4079-b260-dd7b1f52ec7d} SkiaSharp.UWP - + {233220cc-f0f3-4c44-9736-ed2cfc363fd3} - SkiaSharp.HarfBuzz.NetStandard + SkiaSharp.HarfBuzz {3a1277b5-cfae-48cc-b64b-4dae1222a3eb} diff --git a/samples/Gallery/Xamarin.Forms/iOS/iOS.csproj b/samples/Gallery/Xamarin.Forms/iOS/iOS.csproj index d6f7b756..d6602684 100644 --- a/samples/Gallery/Xamarin.Forms/iOS/iOS.csproj +++ b/samples/Gallery/Xamarin.Forms/iOS/iOS.csproj @@ -123,9 +123,9 @@ {6a678cfb-21a7-4e81-8909-fd72abbfd408} SkiaSharp.iOS - + {233220cc-f0f3-4c44-9736-ed2cfc363fd3} - SkiaSharp.HarfBuzz.NetStandard + SkiaSharp.HarfBuzz {4ac36d63-bf11-445f-81ee-107c0cef4fc9} diff --git a/samples/Gallery/macOS/SkiaSharpSample.sln b/samples/Gallery/macOS/SkiaSharpSample.sln index 24ad52c5..6b8d4f80 100644 --- a/samples/Gallery/macOS/SkiaSharpSample.sln +++ b/samples/Gallery/macOS/SkiaSharpSample.sln @@ -21,7 +21,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Views.Mac", "..\. EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SkiaSharp.HarfBuzz.Shared", "..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.Shared\SkiaSharp.HarfBuzz.Shared.shproj", "{C3E63B2D-95D4-4C3F-B10F-7A0AACF94980}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.HarfBuzz.NetStandard", "..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.NetStandard\SkiaSharp.HarfBuzz.NetStandard.csproj", "{233220CC-F0F3-4C44-9736-ED2CFC363FD3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.HarfBuzz", "..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.csproj", "{233220CC-F0F3-4C44-9736-ED2CFC363FD3}" EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "PlatformShared", "..\PlatformShared\PlatformShared.shproj", "{0CC41AB0-0C4C-4DAA-8F10-A249725EBF5D}" EndProject diff --git a/samples/Gallery/macOS/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Gallery/macOS/SkiaSharpSample/SkiaSharpSample.csproj index 91f61f06..89c504b4 100644 --- a/samples/Gallery/macOS/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Gallery/macOS/SkiaSharpSample/SkiaSharpSample.csproj @@ -57,9 +57,9 @@ {30952C22-D566-488F-9D7A-2411B027D6CA} HarfBuzzSharp.OSX - + {233220cc-f0f3-4c44-9736-ed2cfc363fd3} - SkiaSharp.HarfBuzz.NetStandard + SkiaSharp.HarfBuzz {4588A759-3853-49B8-8A68-6C7917BE9220} diff --git a/samples/Gallery/tvOS/SkiaSharpSample.sln b/samples/Gallery/tvOS/SkiaSharpSample.sln index a3817d0e..1144f86f 100644 --- a/samples/Gallery/tvOS/SkiaSharpSample.sln +++ b/samples/Gallery/tvOS/SkiaSharpSample.sln @@ -23,7 +23,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Views.tvOS", "..\ EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SkiaSharp.HarfBuzz.Shared", "..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.Shared\SkiaSharp.HarfBuzz.Shared.shproj", "{C3E63B2D-95D4-4C3F-B10F-7A0AACF94980}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.HarfBuzz.NetStandard", "..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.NetStandard\SkiaSharp.HarfBuzz.NetStandard.csproj", "{233220CC-F0F3-4C44-9736-ED2CFC363FD3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.HarfBuzz", "..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.csproj", "{233220CC-F0F3-4C44-9736-ED2CFC363FD3}" EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "PlatformShared", "..\PlatformShared\PlatformShared.shproj", "{0CC41AB0-0C4C-4DAA-8F10-A249725EBF5D}" EndProject diff --git a/samples/Gallery/tvOS/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Gallery/tvOS/SkiaSharpSample/SkiaSharpSample.csproj index 8a575619..09f17ff3 100644 --- a/samples/Gallery/tvOS/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Gallery/tvOS/SkiaSharpSample/SkiaSharpSample.csproj @@ -94,9 +94,9 @@ {5180e370-a455-42bb-99f9-97bd269b8a52} SkiaSharp.tvOS - + {233220cc-f0f3-4c44-9736-ed2cfc363fd3} - SkiaSharp.HarfBuzz.NetStandard + SkiaSharp.HarfBuzz {e5973829-6c8b-43e4-b81b-c8492df26c90} diff --git a/source/SkiaSharp.HarfBuzz/SkiaSharp.HarfBuzz.NetStandard/SkiaSharp.HarfBuzz.NetStandard.csproj b/source/SkiaSharp.HarfBuzz/SkiaSharp.HarfBuzz.NetStandard/SkiaSharp.HarfBuzz.NetStandard.csproj deleted file mode 100644 index 6df7d6e9..00000000 --- a/source/SkiaSharp.HarfBuzz/SkiaSharp.HarfBuzz.NetStandard/SkiaSharp.HarfBuzz.NetStandard.csproj +++ /dev/null @@ -1,29 +0,0 @@ - - - - netstandard1.3 - library - SkiaSharp.HarfBuzz - SkiaSharp.HarfBuzz - False - False - - - true - true - ..\..\..\mono.snk - - - TRACE;DEBUG;NET_STANDARD - bin\Debug\ - - - TRACE;NET_STANDARD - bin\Release\ - - - - - - - \ No newline at end of file