Merge pull request #85 from mono/pdf-merge

Adding PDF Support

binding/Binding/Binding.projitems

@@ -15,6 +15,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)SKImageFilter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)SKColorFilter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)SKPaint.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)SKDocument.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)SKSurface.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)SKCanvas.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)SKShader.cs" />

binding/Binding/SKDocument.cs

@@ -0,0 +1,72 @@
+//
+// Bindings for SKDocument
+//
+// Author:
+//   Matthew Leibowitz
+//
+// Copyright 2016 Xamarin Inc
+//
+using System;
+
+namespace SkiaSharp
+{
+	public class SKDocument : SKObject
+	{
+		public const float DefaultRasterDpi = 72.0f;
+
+		[Preserve]
+		internal SKDocument(IntPtr handle)
+			: base (handle)
+		{
+		}
+
+		protected override void Dispose (bool disposing)
+		{
+			if (Handle != IntPtr.Zero) {
+				SkiaApi.sk_document_unref (Handle);
+			}
+
+			base.Dispose (disposing);
+		}
+
+		public void Abort ()
+		{
+			SkiaApi.sk_document_abort (Handle);
+		}
+
+		public SKCanvas BeginPage (float width, float height)
+		{
+			return GetObject<SKCanvas> (SkiaApi.sk_document_begin_page (Handle, width, height, IntPtr.Zero));
+		}
+
+		public SKCanvas BeginPage (float width, float height, SKRect content)
+		{
+			return GetObject<SKCanvas> (SkiaApi.sk_document_begin_page (Handle, width, height, ref content));
+		}
+
+		public void EndPage ()
+		{
+			SkiaApi.sk_document_end_page (Handle);
+		}
+
+		public bool Close ()
+		{
+			return SkiaApi.sk_document_close (Handle);
+		}
+
+		public static SKDocument CreatePdf (string path, float dpi = DefaultRasterDpi)
+		{
+			return GetObject<SKDocument> (SkiaApi.sk_document_create_pdf_from_filename (path, dpi));
+		}
+
+		public static SKDocument CreatePdf (SKWStream stream, float dpi = DefaultRasterDpi)
+		{
+			if (stream == null) {
+				throw new ArgumentNullException (nameof(stream));
+			}
+
+			return GetObject<SKDocument> (SkiaApi.sk_document_create_pdf_from_stream(stream.Handle, dpi));
+		}
+	}
+}
+

binding/Binding/SKManagedStream.cs

@@ -58,6 +58,7 @@ namespace SkiaSharp
 
 		private readonly Stream stream;
 		private readonly bool disposeStream;
+		private bool isDisposed;
 
 		static SKManagedStream()
 		{
@@ -91,7 +92,12 @@ namespace SkiaSharp
 		}
 
 		public SKManagedStream (Stream managedStream, bool disposeManagedStream)
-			: base (SkiaApi.sk_managedstream_new ())
+			: this (managedStream, disposeManagedStream, true)
+		{
+		}
+
+		private SKManagedStream (Stream managedStream, bool disposeManagedStream, bool owns)
+			: base (SkiaApi.sk_managedstream_new (), owns)
 		{
 			if (Handle == IntPtr.Zero) {
 				throw new InvalidOperationException ("Unable to create a new SKManagedStream instance.");
@@ -104,6 +110,12 @@ namespace SkiaSharp
 			disposeStream = disposeManagedStream;
 		}
 
+		void DisposeFromNative ()
+		{
+			isDisposed = true;
+			Dispose ();
+		}
+
 		protected override void Dispose (bool disposing)
 		{
 			lock (managedStreams){
@@ -116,6 +128,10 @@ namespace SkiaSharp
 				stream.Dispose ();
 			}
 
+			if (!isDisposed && Handle != IntPtr.Zero && OwnsHandle) {
+				SkiaApi.sk_memorystream_destroy (Handle);
+			}
+
 			base.Dispose (disposing);
 		}
 
@@ -229,7 +245,8 @@ namespace SkiaSharp
 		private static IntPtr CreateNewInternal (IntPtr managedStreamPtr)
 		{
 			var managedStream = AsManagedStream (managedStreamPtr);
-			var newStream = new SKManagedStream (managedStream.stream);
+			var newStream = new SKManagedStream (managedStream.stream, false, false);
+			managedStream.TakeOwnership (newStream);
 			return newStream.Handle;
 		}
 		#if __IOS__
@@ -239,7 +256,7 @@ namespace SkiaSharp
 		{
 			SKManagedStream managedStream;
 			if (AsManagedStream (managedStreamPtr, out managedStream)) {
-				managedStream.Dispose ();
+				managedStream.DisposeFromNative ();
 			} else {
 				Debug.WriteLine ("Destroying disposed SKManagedStream: " + managedStreamPtr);
 			}

binding/Binding/SKObject.cs

@@ -19,23 +19,30 @@ namespace SkiaSharp
 	{
 		private static readonly Dictionary<IntPtr, WeakReference> instances = new Dictionary<IntPtr, WeakReference>();
 
+		private readonly List<SKObject> ownedObjects = new List<SKObject>();
 		private IntPtr handle;
 
 		[Preserve]
 		internal SKObject(IntPtr handle)
 		{
 			Handle = handle;
+			OwnsHandle = false;
+		}
+
+		[Preserve]
+		internal SKObject(IntPtr handle, bool owns)
+		{
+			Handle = handle;
+			OwnsHandle = owns;
 		}
 
 		~SKObject()
 		{
-			var h = handle;
-
 			Dispose(false);
-
-			DeregisterHandle(h, this);
 		}
 
+		protected bool OwnsHandle { get; private set; }
+
 		public IntPtr Handle
 		{
 			get { return handle; }
@@ -48,25 +55,33 @@ namespace SkiaSharp
 
 		public void Dispose()
 		{
-			var h = handle;
-
 			Dispose(true);
-
-			if (h != IntPtr.Zero)
-			{
-				DeregisterHandle(h, this);
-				handle = IntPtr.Zero;
-			}
-
 			GC.SuppressFinalize(this);
 		}
 
 		protected virtual void Dispose(bool disposing)
 		{
+			lock (ownedObjects)
+			{
+				foreach (var child in ownedObjects)
+				{
+					child.Dispose();
+				}
+				ownedObjects.Clear();
+			}
+
+			DeregisterHandle(handle, this);
+			handle = IntPtr.Zero;
 		}
 
 		internal static TSkiaObject GetObject<TSkiaObject>(IntPtr handle)
 			where TSkiaObject : SKObject
+		{
+			return GetObject<TSkiaObject>(handle, null);
+		}
+
+		internal static TSkiaObject GetObject<TSkiaObject>(IntPtr handle, bool? owns)
+			where TSkiaObject : SKObject
 		{
 			if (handle == IntPtr.Zero)
 			{
@@ -91,13 +106,13 @@ namespace SkiaSharp
 			// TODO: we could probably cache this
 			var type = typeof(TSkiaObject);
 			var constructor = type.GetTypeInfo().DeclaredConstructors.FirstOrDefault(c => 
-				c.GetParameters().Length == 1 && 
-				c.GetParameters()[0].ParameterType == typeof(IntPtr));
+				(owns == null && c.GetParameters().Length == 1 && c.GetParameters()[0].ParameterType == typeof(IntPtr)) ||
+				(owns != null && c.GetParameters().Length == 2 && c.GetParameters()[0].ParameterType == typeof(IntPtr) && c.GetParameters()[1].ParameterType == typeof(bool)));
 			if (constructor == null)
 			{
-				throw new MissingMethodException("No constructor found for " + type.FullName + ".ctor(System.IntPtr)");
+				throw new MissingMethodException($"No constructor found for {type.FullName}.ctor(System.IntPtr{(owns==null?"":", System.Boolean")})");
 			}
-			return (TSkiaObject)constructor.Invoke(new object[] { handle });
+			return (TSkiaObject)constructor.Invoke(owns == null ? new object[] { handle } : new object[] { handle, owns });
 		}
 
 		internal static void RegisterHandle(IntPtr handle, SKObject instance)
@@ -154,5 +169,14 @@ namespace SkiaSharp
 				}
 			}
 		}
+
+		internal void TakeOwnership(SKObject obj)
+		{
+			lock (ownedObjects)
+			{
+				ownedObjects.Add(obj);
+			}
+			obj.OwnsHandle = false;
+		}
 	}
 }

binding/Binding/SKStream.cs

@@ -12,11 +12,16 @@ namespace SkiaSharp
 {
 	public abstract class SKStream : SKObject
 	{
-		internal SKStream (IntPtr handle)
+		private SKStream (IntPtr handle)
 			: base (handle)
 		{
 		}
 		
+		internal SKStream (IntPtr handle, bool owns)
+			: base (handle, owns)
+		{
+		}
+		
 		public bool IsAtEnd {
 			get {
 				return SkiaApi.sk_stream_is_at_end (Handle);
@@ -112,70 +117,90 @@ namespace SkiaSharp
 
 	public abstract class SKStreamRewindable : SKStream
 	{
-		internal SKStreamRewindable (IntPtr handle)
-			: base (handle)
+		internal SKStreamRewindable (IntPtr handle, bool owns)
+			: base (handle, owns)
 		{
 		}
 	}
 
 	public abstract class SKStreamSeekable : SKStreamRewindable
 	{
-		internal SKStreamSeekable (IntPtr handle)
-			: base (handle)
+		internal SKStreamSeekable (IntPtr handle, bool owns)
+			: base (handle, owns)
 		{
 		}
 	}
 
 	public abstract class SKStreamAsset : SKStreamSeekable
 	{
-		internal SKStreamAsset (IntPtr handle)
-			: base (handle)
+		internal SKStreamAsset (IntPtr handle, bool owns)
+			: base (handle, owns)
 		{
 		}
 	}
 
+	internal class SKStreamAssetImplementation : SKStreamAsset
+	{
+		[Preserve]
+		internal SKStreamAssetImplementation (IntPtr handle, bool owns)
+			: base (handle, owns)
+		{
+		}
+
+		protected override void Dispose (bool disposing)
+		{
+			if (Handle != IntPtr.Zero && OwnsHandle) {
+				SkiaApi.sk_stream_asset_destroy (Handle);
+			}
+
+			base.Dispose (disposing);
+		}
+	}
+
 	public abstract class SKStreamMemory : SKStreamAsset
 	{
-		internal SKStreamMemory (IntPtr handle)
-			: base (handle)
+		internal SKStreamMemory (IntPtr handle, bool owns)
+			: base (handle, owns)
 		{
 		}
 	}
 
 	public class SKFileStream : SKStreamAsset
 	{
-		internal static bool linkskip = true;
-		static SKFileStream ()
-		{
-			if (!linkskip) {
-				new SKFileStream (IntPtr.Zero);
-			}
-		}
-
-		internal SKFileStream (IntPtr handle)
-			: base (handle)
+		[Preserve]
+		internal SKFileStream (IntPtr handle, bool owns)
+			: base (handle, owns)
 		{
 		}
 
 		public SKFileStream (string path)
-			: base (SkiaApi.sk_filestream_new (path))
+			: base (SkiaApi.sk_filestream_new (path), true)
 		{
 			if (Handle == IntPtr.Zero) {
 				throw new InvalidOperationException ("Unable to create a new SKFileStream instance.");
 			}
 		}
+
+		protected override void Dispose (bool disposing)
+		{
+			if (Handle != IntPtr.Zero && OwnsHandle) {
+				SkiaApi.sk_filestream_destroy (Handle);
+			}
+
+			base.Dispose (disposing);
+		}
 	}
 
 	public class SKMemoryStream : SKStreamMemory
 	{
 		[Preserve]
-		internal SKMemoryStream(IntPtr handle)
-			: base (handle)
+		internal SKMemoryStream (IntPtr handle, bool owns)
+			: base (handle, owns)
 		{
 		}
 
 		public SKMemoryStream ()
-			: this (SkiaApi.sk_memorystream_new ())
+			: this (SkiaApi.sk_memorystream_new (), true)
 		{
 			if (Handle == IntPtr.Zero) {
 				throw new InvalidOperationException ("Unable to create a new SKMemoryStream instance.");
@@ -183,7 +208,7 @@ namespace SkiaSharp
 		}
 
 		public SKMemoryStream (ulong length)
-			: this(SkiaApi.sk_memorystream_new_with_length ((IntPtr)length))
+			: this(SkiaApi.sk_memorystream_new_with_length ((IntPtr)length), true)
 		{
 			if (Handle == IntPtr.Zero) {
 				throw new InvalidOperationException ("Unable to create a new SKMemoryStream instance.");
@@ -191,7 +216,7 @@ namespace SkiaSharp
 		}
 
 		internal SKMemoryStream (IntPtr data, IntPtr length, bool copyData = false)
-			: this(SkiaApi.sk_memorystream_new_with_data (data, length, copyData))
+			: this(SkiaApi.sk_memorystream_new_with_data (data, length, copyData), true)
 		{
 			if (Handle == IntPtr.Zero) {
 				throw new InvalidOperationException ("Unable to create a new SKMemoryStream instance.");
@@ -199,7 +224,7 @@ namespace SkiaSharp
 		}
 
 		public SKMemoryStream (SKData data)
-			: this(SkiaApi.sk_memorystream_new_with_skdata (data))
+			: this(SkiaApi.sk_memorystream_new_with_skdata (data), true)
 		{
 			if (Handle == IntPtr.Zero) {
 				throw new InvalidOperationException ("Unable to create a new SKMemoryStream instance.");
@@ -212,6 +237,15 @@ namespace SkiaSharp
 			SetMemory (data);
 		}
 
+		protected override void Dispose (bool disposing)
+		{
+			if (Handle != IntPtr.Zero && OwnsHandle) {
+				SkiaApi.sk_memorystream_destroy (Handle);
+			}
+
+			base.Dispose (disposing);
+		}
+
 		internal void SetMemory (IntPtr data, IntPtr length, bool copyData = false)
 		{
 			SkiaApi.sk_memorystream_set_memory (Handle, data, length, copyData);
@@ -227,4 +261,173 @@ namespace SkiaSharp
 			SetMemory (data, (IntPtr)data.Length, true);
 		}
 	}
+
+	public abstract class SKWStream : SKObject
+	{
+		private SKWStream (IntPtr handle)
+			: base (handle)
+		{
+		}
+		
+		internal SKWStream (IntPtr handle, bool owns)
+			: base (handle, owns)
+		{
+		}
+		
+		public int BytesWritten {
+			get {
+				return (int)SkiaApi.sk_wstream_bytes_written (Handle);
+			}
+		}
+
+		public bool Write (byte[] buffer, int size)
+		{
+			unsafe {
+				fixed (byte *b = &buffer [0]) {
+					return SkiaApi.sk_wstream_write (Handle, (IntPtr) b, (IntPtr)size);
+				}
+			}
+		}
+
+		public void NewLine ()
+		{
+			SkiaApi.sk_wstream_newline (Handle);
+		}
+
+		public void Flush ()
+		{
+			SkiaApi.sk_wstream_flush (Handle);
+		}
+
+		public bool Write8 (Byte value)
+		{
+			return SkiaApi.sk_wstream_write_8 (Handle, value);
+		}
+
+		public bool Write16 (UInt16 value)
+		{
+			return SkiaApi.sk_wstream_write_16 (Handle, value);
+		}
+
+		public bool Write32 (UInt32 value)
+		{
+			return SkiaApi.sk_wstream_write_32 (Handle, value);
+		}
+
+		public bool WriteText (string value)
+		{
+			return SkiaApi.sk_wstream_write_text (Handle, value);
+		}
+
+		public bool WriteDecimalAsTest (Int32 value)
+		{
+			return SkiaApi.sk_wstream_write_dec_as_text (Handle, value);
+		}
+
+		public bool WriteBigDecimalAsText (Int64 value, int digits)
+		{
+			return SkiaApi.sk_wstream_write_bigdec_as_text (Handle, value, digits);
+		}
+
+		public bool WriteHexAsText (UInt32 value, int digits)
+		{
+			return SkiaApi.sk_wstream_write_hex_as_text (Handle, value, digits);
+		}
+
+		public bool WriteScalarAsText (float value)
+		{
+			return SkiaApi.sk_wstream_write_scalar_as_text (Handle, value);
+		}
+
+		public bool WriteBool (bool value)
+		{
+			return SkiaApi.sk_wstream_write_bool (Handle, value);
+		}
+
+		public bool WriteScalar (float value)
+		{
+			return SkiaApi.sk_wstream_write_scalar (Handle, value);
+		}
+
+		public bool WritePackedUInt32 (UInt32 value)
+		{
+			return SkiaApi.sk_wstream_write_packed_uint (Handle, (IntPtr)value);
+		}
+
+		public bool WriteStream (SKStream input, int length)
+		{
+			if (input == null) {
+				throw new ArgumentNullException (nameof(input));
+			}
+
+			return SkiaApi.sk_wstream_write_stream (Handle, input.Handle, (IntPtr)length);
+		}
+
+		public static int GetSizeOfPackedUInt32 (UInt32 value)
+		{
+			return SkiaApi.sk_wstream_get_size_of_packed_uint ((IntPtr) value);
+		}
+	}
+
+	public class SKFileWStream : SKWStream
+	{
+		[Preserve]
+		internal SKFileWStream (IntPtr handle, bool owns)
+			: base (handle, owns)
+		{
+		}
+
+		public SKFileWStream (string path)
+			: base (SkiaApi.sk_filewstream_new (path), true)
+		{
+			if (Handle == IntPtr.Zero) {
+				throw new InvalidOperationException ("Unable to create a new SKFileWStream instance.");
+			}
+		}
+
+		protected override void Dispose (bool disposing)
+		{
+			if (Handle != IntPtr.Zero && OwnsHandle) {
+				SkiaApi.sk_filewstream_destroy (Handle);
+			}
+
+			base.Dispose (disposing);
+		}
+	}
+
+	public class SKDynamicMemoryWStream : SKWStream
+	{
+		[Preserve]
+		internal SKDynamicMemoryWStream (IntPtr handle, bool owns)
+			: base (handle, owns)
+		{
+		}
+
+		public SKDynamicMemoryWStream ()
+			: base (SkiaApi.sk_dynamicmemorywstream_new (), true)
+		{
+			if (Handle == IntPtr.Zero) {
+				throw new InvalidOperationException ("Unable to create a new SKDynamicMemoryWStream instance.");
+			}
+		}
+
+		public SKData CopyToData ()
+		{
+			return GetObject<SKData> (SkiaApi.sk_dynamicmemorywstream_copy_to_data (Handle));
+		}
+
+		public SKStreamAsset DetachAsStream ()
+		{
+			return GetObject<SKStreamAssetImplementation> (SkiaApi.sk_dynamicmemorywstream_detach_as_stream (Handle), true);
+		}
+
+		protected override void Dispose (bool disposing)
+		{
+			if (Handle != IntPtr.Zero && OwnsHandle) {
+				SkiaApi.sk_dynamicmemorywstream_destroy (Handle);
+			}
+
+			base.Dispose (disposing);
+		}
+	}
 }

binding/Binding/SKTypeface.cs

@@ -53,7 +53,9 @@ namespace SkiaSharp
 		{
 			if (stream == null)
 				throw new ArgumentNullException ("stream");
-			return GetObject<SKTypeface> (SkiaApi.sk_typeface_create_from_stream (stream.Handle, index));
+			var typeface = GetObject<SKTypeface> (SkiaApi.sk_typeface_create_from_stream (stream.Handle, index));
+			typeface?.TakeOwnership (stream);
+			return typeface;
 		}
 
 		public int CountGlyphs (string str)

binding/Binding/SkiaApi.cs

@@ -28,11 +28,15 @@ using sk_stream_memorystream_t = System.IntPtr;
 using sk_stream_assetstream_t = System.IntPtr;
 using sk_stream_managedstream_t = System.IntPtr;
 using sk_stream_streamrewindable_t = System.IntPtr;
+using sk_wstream_t = System.IntPtr;
+using sk_wstream_dynamicmemorystream_t = System.IntPtr;
+using sk_wstream_filestream_t = System.IntPtr;
 using sk_bitmap_t = System.IntPtr;
 using sk_imagedecoder_t = System.IntPtr;
 using sk_imagefilter_croprect_t = System.IntPtr;
 using sk_imagefilter_t = System.IntPtr;
 using sk_colorfilter_t = System.IntPtr;
+using sk_document_t = System.IntPtr;
 
 namespace SkiaSharp
 {
@@ -549,7 +553,7 @@ namespace SkiaSharp
 		[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
 		public extern static sk_typeface_t sk_typeface_create_from_name(string str, SKTypefaceStyle style);
 		[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
-		public extern static sk_typeface_t sk_typeface_create_from_typeface(IntPtr typeface, SKTypefaceStyle style);
+		public extern static sk_typeface_t sk_typeface_create_from_typeface(sk_typeface_t typeface, SKTypefaceStyle style);
 		[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
 		public extern static sk_typeface_t sk_typeface_create_from_file(string path, int index);
 		[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
@@ -570,6 +574,13 @@ namespace SkiaSharp
 		public extern static IntPtr sk_typeface_get_table_data(sk_typeface_t typeface, sk_font_table_tag_t tag, IntPtr offset, IntPtr length, byte[] data);
 
 		// Streams
+		[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
+		public extern static void sk_memorystream_destroy(sk_stream_memorystream_t stream);
+		[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
+		public extern static void sk_filestream_destroy(sk_stream_filestream_t stream);
+		[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
+		public extern static void sk_stream_asset_destroy(sk_stream_assetstream_t stream);
+
 		[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
 		public extern static IntPtr sk_stream_read(sk_stream_t stream, IntPtr buffer, IntPtr size);
 		[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
@@ -621,11 +632,85 @@ namespace SkiaSharp
 		[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
 		public extern static void sk_memorystream_set_memory(sk_stream_memorystream_t s, byte[] data, IntPtr length, bool copyData);
 
+		// Managed streams
 		[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
 		public extern static sk_stream_managedstream_t sk_managedstream_new();
 		[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
 		public extern static void sk_managedstream_set_delegates(IntPtr pRead, IntPtr pPeek, IntPtr pIsAtEnd, IntPtr pRewind, IntPtr pGetPosition, IntPtr pSeek, IntPtr pMove, IntPtr pGetLength, IntPtr pCreateNew, IntPtr pDestroy);
 
+		// Writeable streams
+		[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
+		public extern static void sk_filewstream_destroy(sk_wstream_filestream_t cstream);
+		[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
+		public extern static void sk_dynamicmemorywstream_destroy(sk_wstream_dynamicmemorystream_t cstream);
+
+		[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
+		public extern static sk_wstream_filestream_t sk_filewstream_new(string path);
+		[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
+		public extern static sk_wstream_dynamicmemorystream_t sk_dynamicmemorywstream_new();
+		[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
+		public extern static sk_data_t sk_dynamicmemorywstream_copy_to_data(sk_wstream_dynamicmemorystream_t cstream);
+		[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
+		public extern static sk_stream_assetstream_t sk_dynamicmemorywstream_detach_as_stream(sk_wstream_dynamicmemorystream_t cstream);
+		[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
+		public extern static bool sk_wstream_write(sk_wstream_t cstream, IntPtr buffer, IntPtr size);
+		[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
+		public extern static bool sk_wstream_write(sk_wstream_t cstream, byte[] buffer, IntPtr size);
+		[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
+		public extern static void sk_wstream_newline(sk_wstream_t cstream);
+		[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
+		public extern static void sk_wstream_flush(sk_wstream_t cstream);
+		[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
+		public extern static IntPtr sk_wstream_bytes_written(sk_wstream_t cstream);
+		[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
+		public extern static bool sk_wstream_write_8(sk_wstream_t cstream, Byte value);
+		[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
+		public extern static bool sk_wstream_write_16(sk_wstream_t cstream, UInt16 value);
+		[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
+		public extern static bool sk_wstream_write_32(sk_wstream_t cstream, UInt32 value);
+		[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
+		public extern static bool sk_wstream_write_text(sk_wstream_t cstream, string value);
+		[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
+		public extern static bool sk_wstream_write_dec_as_text(sk_wstream_t cstream, Int32 value);
+		[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
+		public extern static bool sk_wstream_write_bigdec_as_text(sk_wstream_t cstream, Int64 value, int minDigits);
+		[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
+		public extern static bool sk_wstream_write_hex_as_text(sk_wstream_t cstream, UInt32 value, int minDigits);
+		[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
+		public extern static bool sk_wstream_write_scalar_as_text(sk_wstream_t cstream, float value);
+		[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
+		public extern static bool sk_wstream_write_bool(sk_wstream_t cstream, bool value);
+		[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
+		public extern static bool sk_wstream_write_scalar(sk_wstream_t cstream, float value);
+		[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
+		public extern static bool sk_wstream_write_packed_uint(sk_wstream_t cstream, IntPtr value);
+		[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
+		public extern static bool sk_wstream_write_stream(sk_wstream_t cstream, sk_stream_t input, IntPtr length);
+		[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
+		public extern static int sk_wstream_get_size_of_packed_uint(IntPtr value);
+
+		// Document
+		[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
+		public extern static void sk_document_unref(sk_document_t document);
+		[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
+		public extern static sk_document_t sk_document_create_pdf_from_stream(sk_wstream_t stream, float dpi);
+		[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
+		public extern static sk_document_t sk_document_create_pdf_from_filename(string path, float dpi);
+		//[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
+		//public extern static sk_document_t sk_document_create_xps_from_stream(sk_wstream_t stream, float dpi);
+		//[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
+		//public extern static sk_document_t sk_document_create_xps_from_filename(string path, float dpi);
+		[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
+		public extern static sk_canvas_t sk_document_begin_page(sk_document_t document, float width, float height, ref SKRect content);
+		[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
+		public extern static sk_canvas_t sk_document_begin_page(sk_document_t document, float width, float height, IntPtr content);
+		[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
+		public extern static void sk_document_end_page(sk_document_t document);
+		[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
+		public extern static bool sk_document_close(sk_document_t document);
+		[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
+		public extern static void sk_document_abort(sk_document_t document);
+
 		// Bitmap
 		[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
 		public extern static sk_bitmap_t sk_bitmap_new();

binding/SkiaSharp/Properties/SkiaSharpAssemblyInfo.cs

@@ -17,8 +17,8 @@
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
 
 [assembly: AssemblyVersion ("1.49.0.0")]
-[assembly: AssemblyFileVersion ("1.49.3.0")]
-[assembly: AssemblyInformationalVersion ("1.49.3.0-{GIT_SHA}")]
+[assembly: AssemblyFileVersion ("1.49.4.0")]
+[assembly: AssemblyInformationalVersion ("1.49.4.0-{GIT_SHA}")]
 
 // The following attributes are used to specify the signing key for the assembly,
 // if desired. See the Mono documentation for more information about signing.

bootstrapper.sh

@@ -42,7 +42,7 @@ fi
 # Download NuGet if it does not exist.
 if [ ! -f $NUGET_EXE ]; then
     echo "Downloading NuGet..."
-    curl -Lsfo $NUGET_EXE https://dist.nuget.org/win-x86-commandline/v2.8.6/nuget.exe
+    curl -Lsfo $NUGET_EXE https://dist.nuget.org/win-x86-commandline/latest/nuget.exe
     if [ $? -ne 0 ]; then
         echo "An error occured while downloading nuget.exe."
         exit 1

build.cake

@@ -8,7 +8,7 @@ using System.Xml.Linq;
 
 var TARGET = Argument ("t", Argument ("target", Argument ("Target", "Default")));
 
-var NuGetSources = new [] { "https://www.nuget.org/api/v2/" };
+var NuGetSources = new [] { "https://api.nuget.org/v3/index.json", "https://www.myget.org/F/xamprojectci/api/v2" };
 var NugetToolPath = GetToolPath ("../nuget.exe");
 var XamarinComponentToolPath = GetToolPath ("../xamarin-component.exe");
 var CakeToolPath = GetToolPath ("Cake.exe");
@@ -73,7 +73,10 @@ FilePath GetMDocPath ()
 var RunNuGetRestore = new Action<FilePath> ((solution) =>
 {
     NuGetRestore (solution, new NuGetRestoreSettings { 
-        ToolPath = NugetToolPath
+        ToolPath = NugetToolPath,
+        Source = NuGetSources,
+        NoCache = true,
+        Verbosity = NuGetVerbosity.Detailed
     });
 });
 
@@ -198,9 +201,14 @@ var AddXValue = new Action<XElement, string, string> ((root, element, value) =>
     var node = root.Element (MSBuildNS + element);
     if (node == null)
         root.Add (new XElement (MSBuildNS + element, value));
-    else
+    else if (!node.Value.Contains (value))
         node.Value += value;
 });
+var RemoveXValue = new Action<XElement, string, string> ((root, element, value) => {
+    var node = root.Element (MSBuildNS + element);
+    if (node != null)
+        node.Value = node.Value.Replace (value, string.Empty);
+});
 var SetXValues = new Action<XElement, string[], string, string> ((root, parents, element, value) => {
     IEnumerable<XElement> nodes = new [] { root };
     foreach (var p in parents) {
@@ -219,6 +227,41 @@ var AddXValues = new Action<XElement, string[], string, string> ((root, parents,
         AddXValue (n, element, value);
     }
 });
+var RemoveXValues = new Action<XElement, string[], string, string> ((root, parents, element, value) => {
+    IEnumerable<XElement> nodes = new [] { root };
+    foreach (var p in parents) {
+        nodes = nodes.Elements (MSBuildNS + p);
+    }
+    foreach (var n in nodes) {
+        RemoveXValue (n, element, value);
+    }
+});
+var RemoveFileReference = new Action<XElement, string> ((root, filename) => {
+    var element = root
+        .Elements (MSBuildNS + "ItemGroup")
+        .Elements (MSBuildNS + "ClCompile")
+        .Where (e => e.Attribute ("Include") != null)
+        .Where (e => e.Attribute ("Include").Value.Contains (filename))
+        .FirstOrDefault ();
+    if (element != null) {
+        element.Remove ();
+    }
+});
+var AddFileReference = new Action<XElement, string> ((root, filename) => {
+    var element = root
+        .Elements (MSBuildNS + "ItemGroup")
+        .Elements (MSBuildNS + "ClCompile")
+        .Where (e => e.Attribute ("Include") != null)
+        .Where (e => e.Attribute ("Include").Value.Contains (filename))
+        .FirstOrDefault ();
+    if (element == null) {
+        root.Elements (MSBuildNS + "ItemGroup")
+            .Elements (MSBuildNS + "ClCompile")
+            .Last ()
+            .Parent
+            .Add (new XElement (MSBuildNS + "ClCompile", new XAttribute ("Include", filename)));
+    }
+});
 
 // find a better place for this / or fix the path issue
 var VisualStudioPathFixup = new Action (() => {
@@ -362,11 +405,15 @@ Task ("externals-uwp")
             // update and reload
             if (platform.ToUpper () == "ARM") {
                 ReplaceTextInFiles (projectFile, "Win32", "ARM");
-                ReplaceTextInFiles (projectFile, "SkTLS_win.cpp", "SkTLS_none.cpp");
                 xdoc = XDocument.Load (projectFile);
             }
         }
         
+        var rootNamespace = xdoc.Root
+            .Elements (MSBuildNS + "PropertyGroup")
+            .Elements (MSBuildNS + "RootNamespace")
+            .Select (e => e.Value)
+            .FirstOrDefault ();
         var globals = xdoc.Root
             .Elements (MSBuildNS + "PropertyGroup")
             .Where (e => e.Attribute ("Label") != null && e.Attribute ("Label").Value == "Globals")
@@ -403,6 +450,29 @@ Task ("externals-uwp")
             .Elements (MSBuildNS + "AdditionalDependencies")
             .Remove ();
             
+        // remove sfntly as this is not supported for winrt
+        RemoveXValues (xdoc.Root, new [] { "ItemDefinitionGroup", "ClCompile" }, "PreprocessorDefinitions", "SK_SFNTLY_SUBSETTER=\"font_subsetter.h\"");
+        
+        if (rootNamespace == "ports" && platform.ToUpper () == "ARM") {
+            // TLS is not available on ARM
+            AddFileReference (xdoc.Root, @"..\..\src\ports\SkTLS_none.cpp");
+            RemoveFileReference (xdoc.Root, "SkTLS_win.cpp");
+        } else if (rootNamespace == "zlib" && platform.ToUpper () == "ARM") {
+            // x86 instructions are not available on ARM
+            RemoveFileReference (xdoc.Root, "x86.c");
+        } else if (rootNamespace == "zlib_x86_simd" && platform.ToUpper () == "ARM") {
+            // SIMD is not available on ARM
+            AddFileReference (xdoc.Root, @"..\..\third_party\externals\zlib\simd_stub.c");
+            RemoveFileReference (xdoc.Root, "crc_folding.c");
+            RemoveFileReference (xdoc.Root, "fill_window_sse.c");
+        } else if (rootNamespace == "skgpu" ) {
+            // GL is not available to WinRT
+            RemoveFileReference (xdoc.Root, "GrGLCreateNativeInterface_none.cpp");
+            AddFileReference (xdoc.Root, @"..\..\src\gpu\gl\GrGLCreateNativeInterface_none.cpp");
+            RemoveFileReference (xdoc.Root, "GrGLCreateNativeInterface_win.cpp");
+            RemoveFileReference (xdoc.Root, "SkCreatePlatformGLContext_win.cpp");
+        } 
+
         xdoc.Save (projectFile);
     });
 
@@ -428,13 +498,13 @@ Task ("externals-uwp")
     // set up the gyp environment variables
     AppendEnvironmentVariable ("PATH", DEPOT_PATH.FullPath);
 
-    RunGyp ("skia_arch_type='x86_64' skia_gpu=0", "ninja,msvs");
+    RunGyp ("skia_arch_type='x86_64'", "ninja,msvs");
     buildArch ("x64", "x64");
     
-    RunGyp ("skia_arch_type='x86' skia_gpu=0", "ninja,msvs");
+    RunGyp ("skia_arch_type='x86'", "ninja,msvs");
     buildArch ("Win32", "x86");
     
-    RunGyp ("skia_arch_type='arm' arm_version=7 arm_neon=0 skia_gpu=0", "ninja,msvs");
+    RunGyp ("skia_arch_type='arm' arm_version=7 arm_neon=0", "ninja,msvs");
     buildArch ("ARM", "arm");
 });
 // this builds the native C and C++ externals for Mac OS X
@@ -533,7 +603,7 @@ Task ("externals-android")
     
     var buildArch = new Action<string, string> ((arch, folder) => {
         StartProcess (SKIA_PATH.CombineWithFilePath ("platform_tools/android/bin/android_ninja").FullPath, new ProcessSettings {
-            Arguments = "-d " + arch + " \"skia_lib\"",
+            Arguments = "-d " + arch + " skia_lib pdf sfntly icuuc",
             WorkingDirectory = SKIA_PATH.FullPath,
         });
     });
@@ -673,7 +743,7 @@ Task ("tests")
         DotNetBuild ("./tests/SkiaSharp.Desktop.Tests/SkiaSharp.Desktop.Tests.sln", c => { 
             c.Configuration = "Release"; 
         });
-        RunTests("./tests/SkiaSharp.Desktop.Tests/bin/Release/SkiaSharp.Desktop.Tests.dll");
+        RunTests("./tests/SkiaSharp.Desktop.Tests/bin/AnyCPU/Release/SkiaSharp.Desktop.Tests.dll");
     }
 });
 
@@ -690,13 +760,24 @@ Task ("samples")
         DotNetBuild ("./samples/Skia.OSX.Demo/Skia.OSX.Demo.sln", c => { 
             c.Configuration = "Release"; 
         });
-        RunNuGetRestore ("./samples/Skia.Forms.Demo/Skia.Forms.Demo.sln");
-        DotNetBuild ("./samples/Skia.Forms.Demo/Skia.Forms.Demo.sln", c => { 
+        RunNuGetRestore ("./samples/Skia.Forms.Demo/Skia.Forms.Demo.Mac.sln");
+        DotNetBuild ("./samples/Skia.Forms.Demo/Skia.Forms.Demo.Mac.sln", c => { 
             c.Configuration = "Release"; 
             c.Properties ["Platform"] = new [] { "iPhone" };
         });
     }
     
+    if (IsRunningOnWindows ()) {
+        RunNuGetRestore ("./samples/Skia.UWP.Demo/Skia.UWP.Demo.sln");
+        DotNetBuild ("./samples/Skia.UWP.Demo/Skia.UWP.Demo.sln", c => { 
+            c.Configuration = "Release"; 
+        });
+        RunNuGetRestore ("./samples/Skia.Forms.Demo/Skia.Forms.Demo.Windows.sln");
+        DotNetBuild ("./samples/Skia.Forms.Demo/Skia.Forms.Demo.Windows.sln", c => { 
+            c.Configuration = "Release"; 
+        });
+    }
+    
     RunNuGetRestore ("./samples/Skia.WindowsDesktop.Demo/Skia.WindowsDesktop.Demo.sln");
     DotNetBuild ("./samples/Skia.WindowsDesktop.Demo/Skia.WindowsDesktop.Demo.sln", c => { 
         c.Configuration = "Release"; 
@@ -770,13 +851,20 @@ Task ("component")
 
 Task ("clean")
     .IsDependentOn ("clean-externals")
+    .IsDependentOn ("clean-managed")
     .Does (() => 
 {
-    CleanDirectories ("./binding/**/bin");
-    CleanDirectories ("./binding/**/obj");
+});
+Task ("clean-managed").Does (() => 
+{
+    CleanDirectories ("./binding/*/bin");
+    CleanDirectories ("./binding/*/obj");
 
-    CleanDirectories ("./samples/**/bin");
-    CleanDirectories ("./samples/**/obj");
+    CleanDirectories ("./samples/*/bin");
+    CleanDirectories ("./samples/*/obj");
+    CleanDirectories ("./samples/*/*/bin");
+    CleanDirectories ("./samples/*/*/obj");
+    CleanDirectories ("./samples/*/packages");
 
     CleanDirectories ("./tests/**/bin");
     CleanDirectories ("./tests/**/obj");

docs/en/SkiaSharp/SKDocument.xml

@@ -0,0 +1,192 @@
+<Type Name="SKDocument" FullName="SkiaSharp.SKDocument">
+  <TypeSignature Language="C#" Value="public class SKDocument : SkiaSharp.SKObject" />
+  <TypeSignature Language="ILAsm" Value=".class public auto ansi beforefieldinit SKDocument extends SkiaSharp.SKObject" />
+  <AssemblyInfo>
+    <AssemblyName>SkiaSharp</AssemblyName>
+    <AssemblyVersion>1.49.0.0</AssemblyVersion>
+  </AssemblyInfo>
+  <Base>
+    <BaseTypeName>SkiaSharp.SKObject</BaseTypeName>
+  </Base>
+  <Interfaces />
+  <Docs>
+    <summary>To be added.</summary>
+    <remarks>To be added.</remarks>
+  </Docs>
+  <Members>
+    <Member MemberName="Abort">
+      <MemberSignature Language="C#" Value="public void Abort ();" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance void Abort() cil managed" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyVersion>1.49.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters />
+      <Docs>
+        <summary>To be added.</summary>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="BeginPage">
+      <MemberSignature Language="C#" Value="public SkiaSharp.SKCanvas BeginPage (float width, float height);" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance class SkiaSharp.SKCanvas BeginPage(float32 width, float32 height) cil managed" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyVersion>1.49.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>SkiaSharp.SKCanvas</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="width" Type="System.Single" />
+        <Parameter Name="height" Type="System.Single" />
+      </Parameters>
+      <Docs>
+        <param name="width">To be added.</param>
+        <param name="height">To be added.</param>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="BeginPage">
+      <MemberSignature Language="C#" Value="public SkiaSharp.SKCanvas BeginPage (float width, float height, SkiaSharp.SKRect content);" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance class SkiaSharp.SKCanvas BeginPage(float32 width, float32 height, valuetype SkiaSharp.SKRect content) cil managed" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyVersion>1.49.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>SkiaSharp.SKCanvas</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="width" Type="System.Single" />
+        <Parameter Name="height" Type="System.Single" />
+        <Parameter Name="content" Type="SkiaSharp.SKRect" />
+      </Parameters>
+      <Docs>
+        <param name="width">To be added.</param>
+        <param name="height">To be added.</param>
+        <param name="content">To be added.</param>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="Close">
+      <MemberSignature Language="C#" Value="public bool Close ();" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance bool Close() cil managed" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyVersion>1.49.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.Boolean</ReturnType>
+      </ReturnValue>
+      <Parameters />
+      <Docs>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="CreatePdf">
+      <MemberSignature Language="C#" Value="public static SkiaSharp.SKDocument CreatePdf (SkiaSharp.SKWStream stream, float dpi = 72);" />
+      <MemberSignature Language="ILAsm" Value=".method public static hidebysig class SkiaSharp.SKDocument CreatePdf(class SkiaSharp.SKWStream stream, float32 dpi) cil managed" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyVersion>1.49.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>SkiaSharp.SKDocument</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="stream" Type="SkiaSharp.SKWStream" />
+        <Parameter Name="dpi" Type="System.Single" />
+      </Parameters>
+      <Docs>
+        <param name="stream">To be added.</param>
+        <param name="dpi">To be added.</param>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="CreatePdf">
+      <MemberSignature Language="C#" Value="public static SkiaSharp.SKDocument CreatePdf (string path, float dpi = 72);" />
+      <MemberSignature Language="ILAsm" Value=".method public static hidebysig class SkiaSharp.SKDocument CreatePdf(string path, float32 dpi) cil managed" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyVersion>1.49.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>SkiaSharp.SKDocument</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="path" Type="System.String" />
+        <Parameter Name="dpi" Type="System.Single" />
+      </Parameters>
+      <Docs>
+        <param name="path">To be added.</param>
+        <param name="dpi">To be added.</param>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="DefaultRasterDpi">
+      <MemberSignature Language="C#" Value="public const float DefaultRasterDpi = 72;" />
+      <MemberSignature Language="ILAsm" Value=".field public static literal float32 DefaultRasterDpi = (72)" />
+      <MemberType>Field</MemberType>
+      <AssemblyInfo>
+        <AssemblyVersion>1.49.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.Single</ReturnType>
+      </ReturnValue>
+      <MemberValue>72</MemberValue>
+      <Docs>
+        <summary>To be added.</summary>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="Dispose">
+      <MemberSignature Language="C#" Value="protected override void Dispose (bool disposing);" />
+      <MemberSignature Language="ILAsm" Value=".method familyhidebysig virtual instance void Dispose(bool disposing) cil managed" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyVersion>1.49.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="disposing" Type="System.Boolean" />
+      </Parameters>
+      <Docs>
+        <param name="disposing">To be added.</param>
+        <summary>To be added.</summary>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="EndPage">
+      <MemberSignature Language="C#" Value="public void EndPage ();" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance void EndPage() cil managed" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyVersion>1.49.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters />
+      <Docs>
+        <summary>To be added.</summary>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+  </Members>
+</Type>

docs/en/SkiaSharp/SKDynamicMemoryWStream.xml

@@ -0,0 +1,84 @@
+<Type Name="SKDynamicMemoryWStream" FullName="SkiaSharp.SKDynamicMemoryWStream">
+  <TypeSignature Language="C#" Value="public class SKDynamicMemoryWStream : SkiaSharp.SKWStream" />
+  <TypeSignature Language="ILAsm" Value=".class public auto ansi beforefieldinit SKDynamicMemoryWStream extends SkiaSharp.SKWStream" />
+  <AssemblyInfo>
+    <AssemblyName>SkiaSharp</AssemblyName>
+    <AssemblyVersion>1.49.0.0</AssemblyVersion>
+  </AssemblyInfo>
+  <Base>
+    <BaseTypeName>SkiaSharp.SKWStream</BaseTypeName>
+  </Base>
+  <Interfaces />
+  <Docs>
+    <summary>To be added.</summary>
+    <remarks>To be added.</remarks>
+  </Docs>
+  <Members>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public SKDynamicMemoryWStream ();" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor() cil managed" />
+      <MemberType>Constructor</MemberType>
+      <AssemblyInfo>
+        <AssemblyVersion>1.49.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <Parameters />
+      <Docs>
+        <summary>To be added.</summary>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="CopyToData">
+      <MemberSignature Language="C#" Value="public SkiaSharp.SKData CopyToData ();" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance class SkiaSharp.SKData CopyToData() cil managed" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyVersion>1.49.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>SkiaSharp.SKData</ReturnType>
+      </ReturnValue>
+      <Parameters />
+      <Docs>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="DetachAsStream">
+      <MemberSignature Language="C#" Value="public SkiaSharp.SKStreamAsset DetachAsStream ();" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance class SkiaSharp.SKStreamAsset DetachAsStream() cil managed" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyVersion>1.49.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>SkiaSharp.SKStreamAsset</ReturnType>
+      </ReturnValue>
+      <Parameters />
+      <Docs>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="Dispose">
+      <MemberSignature Language="C#" Value="protected override void Dispose (bool disposing);" />
+      <MemberSignature Language="ILAsm" Value=".method familyhidebysig virtual instance void Dispose(bool disposing) cil managed" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyVersion>1.49.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="disposing" Type="System.Boolean" />
+      </Parameters>
+      <Docs>
+        <param name="disposing">To be added.</param>
+        <summary>To be added.</summary>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+  </Members>
+</Type>

docs/en/SkiaSharp/SKFileStream.xml

@@ -1,6 +1,6 @@
 <Type Name="SKFileStream" FullName="SkiaSharp.SKFileStream">
   <TypeSignature Language="C#" Value="public class SKFileStream : SkiaSharp.SKStreamAsset" />
-  <TypeSignature Language="ILAsm" Value=".class public auto ansi SKFileStream extends SkiaSharp.SKStreamAsset" />
+  <TypeSignature Language="ILAsm" Value=".class public auto ansi beforefieldinit SKFileStream extends SkiaSharp.SKStreamAsset" />
   <AssemblyInfo>
     <AssemblyName>SkiaSharp</AssemblyName>
     <AssemblyVersion>1.0.0.0</AssemblyVersion>
@@ -34,5 +34,24 @@
         </remarks>
       </Docs>
     </Member>
+    <Member MemberName="Dispose">
+      <MemberSignature Language="C#" Value="protected override void Dispose (bool disposing);" />
+      <MemberSignature Language="ILAsm" Value=".method familyhidebysig virtual instance void Dispose(bool disposing) cil managed" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyVersion>1.49.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="disposing" Type="System.Boolean" />
+      </Parameters>
+      <Docs>
+        <param name="disposing">To be added.</param>
+        <summary>To be added.</summary>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
   </Members>
 </Type>

docs/en/SkiaSharp/SKFileWStream.xml

@@ -0,0 +1,53 @@
+<Type Name="SKFileWStream" FullName="SkiaSharp.SKFileWStream">
+  <TypeSignature Language="C#" Value="public class SKFileWStream : SkiaSharp.SKWStream" />
+  <TypeSignature Language="ILAsm" Value=".class public auto ansi beforefieldinit SKFileWStream extends SkiaSharp.SKWStream" />
+  <AssemblyInfo>
+    <AssemblyName>SkiaSharp</AssemblyName>
+    <AssemblyVersion>1.49.0.0</AssemblyVersion>
+  </AssemblyInfo>
+  <Base>
+    <BaseTypeName>SkiaSharp.SKWStream</BaseTypeName>
+  </Base>
+  <Interfaces />
+  <Docs>
+    <summary>To be added.</summary>
+    <remarks>To be added.</remarks>
+  </Docs>
+  <Members>
+    <Member MemberName=".ctor">
+      <MemberSignature Language="C#" Value="public SKFileWStream (string path);" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig specialname rtspecialname instance void .ctor(string path) cil managed" />
+      <MemberType>Constructor</MemberType>
+      <AssemblyInfo>
+        <AssemblyVersion>1.49.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <Parameters>
+        <Parameter Name="path" Type="System.String" />
+      </Parameters>
+      <Docs>
+        <param name="path">To be added.</param>
+        <summary>To be added.</summary>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="Dispose">
+      <MemberSignature Language="C#" Value="protected override void Dispose (bool disposing);" />
+      <MemberSignature Language="ILAsm" Value=".method familyhidebysig virtual instance void Dispose(bool disposing) cil managed" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyVersion>1.49.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="disposing" Type="System.Boolean" />
+      </Parameters>
+      <Docs>
+        <param name="disposing">To be added.</param>
+        <summary>To be added.</summary>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+  </Members>
+</Type>

docs/en/SkiaSharp/SKMemoryStream.xml

@@ -80,6 +80,25 @@
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
+    <Member MemberName="Dispose">
+      <MemberSignature Language="C#" Value="protected override void Dispose (bool disposing);" />
+      <MemberSignature Language="ILAsm" Value=".method familyhidebysig virtual instance void Dispose(bool disposing) cil managed" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyVersion>1.49.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="disposing" Type="System.Boolean" />
+      </Parameters>
+      <Docs>
+        <param name="disposing">To be added.</param>
+        <summary>To be added.</summary>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
     <Member MemberName="SetMemory">
       <MemberSignature Language="C#" Value="public void SetMemory (byte[] data);" />
       <MemberSignature Language="ILAsm" Value=".method public hidebysig instance void SetMemory(unsigned int8[] data) cil managed" />

docs/en/SkiaSharp/SKObject.xml

@@ -90,5 +90,21 @@
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
+    <Member MemberName="OwnsHandle">
+      <MemberSignature Language="C#" Value="protected bool OwnsHandle { get; }" />
+      <MemberSignature Language="ILAsm" Value=".property instance bool OwnsHandle" />
+      <MemberType>Property</MemberType>
+      <AssemblyInfo>
+        <AssemblyVersion>1.49.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.Boolean</ReturnType>
+      </ReturnValue>
+      <Docs>
+        <summary>To be added.</summary>
+        <value>To be added.</value>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
   </Members>
 </Type>

docs/en/SkiaSharp/SKTypeface.xml

@@ -143,6 +143,22 @@
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
+    <Member MemberName="FamilyName">
+      <MemberSignature Language="C#" Value="public string FamilyName { get; }" />
+      <MemberSignature Language="ILAsm" Value=".property instance string FamilyName" />
+      <MemberType>Property</MemberType>
+      <AssemblyInfo>
+        <AssemblyVersion>1.49.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.String</ReturnType>
+      </ReturnValue>
+      <Docs>
+        <summary>To be added.</summary>
+        <value>To be added.</value>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
     <Member MemberName="FromFamilyName">
       <MemberSignature Language="C#" Value="public static SkiaSharp.SKTypeface FromFamilyName (string familyName, SkiaSharp.SKTypefaceStyle style = SkiaSharp.SKTypefaceStyle.Normal);" />
       <MemberSignature Language="ILAsm" Value=".method public static hidebysig class SkiaSharp.SKTypeface FromFamilyName(string familyName, valuetype SkiaSharp.SKTypefaceStyle style) cil managed" />
@@ -212,15 +228,15 @@
         <Parameter Name="index" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="stream">Input stream</param>
-        <param name="index">the font face index.</param>
-        <summary>Return a new typeface given a stream. </summary>
+        <param name="stream">The input stream.</param>
+        <param name="index">The font face index.</param>
+        <summary>Return a new typeface given a stream. Ownership of the stream is transferred, so the caller must not reference it again.</summary>
         <returns>If the stream is not a valid font file, returns <paramref name="null" />. </returns>
         <remarks>
           <para>
           </para>
           <example>
-            <code lang="C#"><![CDATA[using (var stream = new SKFileStream (“myfont.ttf"))
+            <code lang="C#"><![CDATA[var stream = new SKFileStream (“myfont.ttf”);
 using (var tf = SKTypeface.FromStream (stream)) {
     paint.Color = XamDkBlue;
     paint.TextSize = 60;
@@ -257,5 +273,64 @@ using (var tf = SKTypeface.FromStream (stream)) {
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
+    <Member MemberName="GetTableData">
+      <MemberSignature Language="C#" Value="public byte[] GetTableData (uint tag);" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance unsigned int8[] GetTableData(unsigned int32 tag) cil managed" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyVersion>1.49.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.Byte[]</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="tag" Type="System.UInt32" />
+      </Parameters>
+      <Docs>
+        <param name="tag">To be added.</param>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="GetTableTags">
+      <MemberSignature Language="C#" Value="public uint[] GetTableTags ();" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance unsigned int32[] GetTableTags() cil managed" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyVersion>1.49.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.UInt32[]</ReturnType>
+      </ReturnValue>
+      <Parameters />
+      <Docs>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="TryGetTableData">
+      <MemberSignature Language="C#" Value="public bool TryGetTableData (uint tag, out byte[] tableData);" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance bool TryGetTableData(unsigned int32 tag, unsigned int8[] tableData) cil managed" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyVersion>1.49.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.Boolean</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="tag" Type="System.UInt32" />
+        <Parameter Name="tableData" Type="System.Byte[]&amp;" RefType="out" />
+      </Parameters>
+      <Docs>
+        <param name="tag">To be added.</param>
+        <param name="tableData">To be added.</param>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
   </Members>
 </Type>

docs/en/SkiaSharp/SKWStream.xml

@@ -0,0 +1,354 @@
+<Type Name="SKWStream" FullName="SkiaSharp.SKWStream">
+  <TypeSignature Language="C#" Value="public abstract class SKWStream : SkiaSharp.SKObject" />
+  <TypeSignature Language="ILAsm" Value=".class public auto ansi abstract beforefieldinit SKWStream extends SkiaSharp.SKObject" />
+  <AssemblyInfo>
+    <AssemblyName>SkiaSharp</AssemblyName>
+    <AssemblyVersion>1.49.0.0</AssemblyVersion>
+  </AssemblyInfo>
+  <Base>
+    <BaseTypeName>SkiaSharp.SKObject</BaseTypeName>
+  </Base>
+  <Interfaces />
+  <Docs>
+    <summary>To be added.</summary>
+    <remarks>To be added.</remarks>
+  </Docs>
+  <Members>
+    <Member MemberName="BytesWritten">
+      <MemberSignature Language="C#" Value="public int BytesWritten { get; }" />
+      <MemberSignature Language="ILAsm" Value=".property instance int32 BytesWritten" />
+      <MemberType>Property</MemberType>
+      <AssemblyInfo>
+        <AssemblyVersion>1.49.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.Int32</ReturnType>
+      </ReturnValue>
+      <Docs>
+        <summary>To be added.</summary>
+        <value>To be added.</value>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="Flush">
+      <MemberSignature Language="C#" Value="public void Flush ();" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance void Flush() cil managed" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyVersion>1.49.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters />
+      <Docs>
+        <summary>To be added.</summary>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="GetSizeOfPackedUInt32">
+      <MemberSignature Language="C#" Value="public static int GetSizeOfPackedUInt32 (uint value);" />
+      <MemberSignature Language="ILAsm" Value=".method public static hidebysig int32 GetSizeOfPackedUInt32(unsigned int32 value) cil managed" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyVersion>1.49.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.Int32</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="value" Type="System.UInt32" />
+      </Parameters>
+      <Docs>
+        <param name="value">To be added.</param>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="NewLine">
+      <MemberSignature Language="C#" Value="public void NewLine ();" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance void NewLine() cil managed" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyVersion>1.49.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters />
+      <Docs>
+        <summary>To be added.</summary>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="Write">
+      <MemberSignature Language="C#" Value="public bool Write (byte[] buffer, int size);" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance bool Write(unsigned int8[] buffer, int32 size) cil managed" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyVersion>1.49.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.Boolean</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="buffer" Type="System.Byte[]" />
+        <Parameter Name="size" Type="System.Int32" />
+      </Parameters>
+      <Docs>
+        <param name="buffer">To be added.</param>
+        <param name="size">To be added.</param>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="Write16">
+      <MemberSignature Language="C#" Value="public bool Write16 (ushort value);" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance bool Write16(unsigned int16 value) cil managed" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyVersion>1.49.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.Boolean</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="value" Type="System.UInt16" />
+      </Parameters>
+      <Docs>
+        <param name="value">To be added.</param>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="Write32">
+      <MemberSignature Language="C#" Value="public bool Write32 (uint value);" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance bool Write32(unsigned int32 value) cil managed" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyVersion>1.49.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.Boolean</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="value" Type="System.UInt32" />
+      </Parameters>
+      <Docs>
+        <param name="value">To be added.</param>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="Write8">
+      <MemberSignature Language="C#" Value="public bool Write8 (byte value);" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance bool Write8(unsigned int8 value) cil managed" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyVersion>1.49.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.Boolean</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="value" Type="System.Byte" />
+      </Parameters>
+      <Docs>
+        <param name="value">To be added.</param>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="WriteBigDecimalAsText">
+      <MemberSignature Language="C#" Value="public bool WriteBigDecimalAsText (long value, int digits);" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance bool WriteBigDecimalAsText(int64 value, int32 digits) cil managed" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyVersion>1.49.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.Boolean</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="value" Type="System.Int64" />
+        <Parameter Name="digits" Type="System.Int32" />
+      </Parameters>
+      <Docs>
+        <param name="value">To be added.</param>
+        <param name="digits">To be added.</param>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="WriteBool">
+      <MemberSignature Language="C#" Value="public bool WriteBool (bool value);" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance bool WriteBool(bool value) cil managed" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyVersion>1.49.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.Boolean</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="value" Type="System.Boolean" />
+      </Parameters>
+      <Docs>
+        <param name="value">To be added.</param>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="WriteDecimalAsTest">
+      <MemberSignature Language="C#" Value="public bool WriteDecimalAsTest (int value);" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance bool WriteDecimalAsTest(int32 value) cil managed" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyVersion>1.49.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.Boolean</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="value" Type="System.Int32" />
+      </Parameters>
+      <Docs>
+        <param name="value">To be added.</param>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="WriteHexAsText">
+      <MemberSignature Language="C#" Value="public bool WriteHexAsText (uint value, int digits);" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance bool WriteHexAsText(unsigned int32 value, int32 digits) cil managed" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyVersion>1.49.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.Boolean</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="value" Type="System.UInt32" />
+        <Parameter Name="digits" Type="System.Int32" />
+      </Parameters>
+      <Docs>
+        <param name="value">To be added.</param>
+        <param name="digits">To be added.</param>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="WritePackedUInt32">
+      <MemberSignature Language="C#" Value="public bool WritePackedUInt32 (uint value);" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance bool WritePackedUInt32(unsigned int32 value) cil managed" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyVersion>1.49.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.Boolean</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="value" Type="System.UInt32" />
+      </Parameters>
+      <Docs>
+        <param name="value">To be added.</param>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="WriteScalar">
+      <MemberSignature Language="C#" Value="public bool WriteScalar (float value);" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance bool WriteScalar(float32 value) cil managed" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyVersion>1.49.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.Boolean</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="value" Type="System.Single" />
+      </Parameters>
+      <Docs>
+        <param name="value">To be added.</param>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="WriteScalarAsText">
+      <MemberSignature Language="C#" Value="public bool WriteScalarAsText (float value);" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance bool WriteScalarAsText(float32 value) cil managed" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyVersion>1.49.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.Boolean</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="value" Type="System.Single" />
+      </Parameters>
+      <Docs>
+        <param name="value">To be added.</param>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="WriteStream">
+      <MemberSignature Language="C#" Value="public bool WriteStream (SkiaSharp.SKStream input, int length);" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance bool WriteStream(class SkiaSharp.SKStream input, int32 length) cil managed" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyVersion>1.49.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.Boolean</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="input" Type="SkiaSharp.SKStream" />
+        <Parameter Name="length" Type="System.Int32" />
+      </Parameters>
+      <Docs>
+        <param name="input">To be added.</param>
+        <param name="length">To be added.</param>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="WriteText">
+      <MemberSignature Language="C#" Value="public bool WriteText (string value);" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance bool WriteText(string value) cil managed" />
+      <MemberType>Method</MemberType>
+      <AssemblyInfo>
+        <AssemblyVersion>1.49.0.0</AssemblyVersion>
+      </AssemblyInfo>
+      <ReturnValue>
+        <ReturnType>System.Boolean</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="value" Type="System.String" />
+      </Parameters>
+      <Docs>
+        <param name="value">To be added.</param>
+        <summary>To be added.</summary>
+        <returns>To be added.</returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+  </Members>
+</Type>

docs/en/index.xml

@@ -18,10 +18,10 @@
           <AttributeName>System.Reflection.AssemblyDescription("")</AttributeName>
         </Attribute>
         <Attribute>
-          <AttributeName>System.Reflection.AssemblyFileVersion("1.49.3.0")</AttributeName>
+          <AttributeName>System.Reflection.AssemblyFileVersion("1.49.4.0")</AttributeName>
         </Attribute>
         <Attribute>
-          <AttributeName>System.Reflection.AssemblyInformationalVersion("1.49.3.0")</AttributeName>
+          <AttributeName>System.Reflection.AssemblyInformationalVersion("1.49.4.0")</AttributeName>
         </Attribute>
         <Attribute>
           <AttributeName>System.Reflection.AssemblyProduct("SkiaSharp")</AttributeName>
@@ -56,9 +56,12 @@
       <Type Name="SKCropRectFlags" Kind="Enumeration" />
       <Type Name="SKData" Kind="Class" />
       <Type Name="SKDisplacementMapEffectChannelSelectorType" Kind="Enumeration" />
+      <Type Name="SKDocument" Kind="Class" />
       <Type Name="SKDropShadowImageFilterShadowMode" Kind="Enumeration" />
+      <Type Name="SKDynamicMemoryWStream" Kind="Class" />
       <Type Name="SKEncoding" Kind="Enumeration" />
       <Type Name="SKFileStream" Kind="Class" />
+      <Type Name="SKFileWStream" Kind="Class" />
       <Type Name="SKFilterQuality" Kind="Enumeration" />
       <Type Name="SKFontMetrics" Kind="Structure" />
       <Type Name="SkiaExtensions" Kind="Class" />
@@ -108,6 +111,7 @@
       <Type Name="SKTextEncoding" Kind="Enumeration" />
       <Type Name="SKTypeface" Kind="Class" />
       <Type Name="SKTypefaceStyle" Kind="Enumeration" />
+      <Type Name="SKWStream" Kind="Class" />
       <Type Name="SKXferMode" Kind="Enumeration" />
     </Namespace>
   </Types>

native-builds/libSkiaSharp_android/jni/SkiaSharp.mk

@@ -12,7 +12,8 @@ LOCAL_STATIC_LIBRARIES := libskia_ports libskia_skgpu libskia_images libskia_opt
                           libskia_opts_avx libskia_opts_ssse3 libskia_opts_sse41         \
                           libjpeg-turbo libwebp_dec libwebp_demux libwebp_enc            \
                           libwebp_dsp libwebp_dsp_neon libwebp_utils libwebp_dsp_enc     \
-                          libgiflib libcpu_features libwebp_dsp_neon
+                          libgiflib libcpu_features libwebp_dsp_neon libskia_pdf         \
+                          libsfntly libicuuc
 
 LOCAL_LDLIBS           := -llog -landroid -lEGL -lGLESv2 -lz
 

native-builds/libSkiaSharp_android/jni/skia_prebuilt.mk

@@ -160,3 +160,18 @@ LOCAL_MODULE := libgiflib
 LOCAL_SRC_FILES := $(SKIA_ANDROID_RELEASE)/obj/gyp/libgiflib.a
 include $(PREBUILT_STATIC_LIBRARY)
 
+include $(CLEAR_VARS)
+LOCAL_MODULE := libskia_pdf
+LOCAL_SRC_FILES := $(SKIA_ANDROID_RELEASE)/libskia_pdf.a
+include $(PREBUILT_STATIC_LIBRARY)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libsfntly
+LOCAL_SRC_FILES := $(SKIA_ANDROID_RELEASE)/obj/gyp/libsfntly.a
+include $(PREBUILT_STATIC_LIBRARY)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libicuuc
+LOCAL_SRC_FILES := $(SKIA_ANDROID_RELEASE)/obj/gyp/libicuuc.a
+include $(PREBUILT_STATIC_LIBRARY)
+

native-builds/libSkiaSharp_osx/libSkiaSharp.xcodeproj/project.pbxproj

@@ -40,6 +40,14 @@
 		342959F61C6173F900BF1BB6 /* libwebp_enc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 342959E91C61737400BF1BB6 /* libwebp_enc.a */; };
 		342959F71C6173F900BF1BB6 /* libwebp_utils.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 342959EB1C61737400BF1BB6 /* libwebp_utils.a */; };
 		343DAE301C3F26CF00FAD826 /* SkiaKeeper.c in Sources */ = {isa = PBXBuildFile; fileRef = 343DAE2E1C3F26CF00FAD826 /* SkiaKeeper.c */; };
+		3460AD3E1D0157F10051FEA0 /* libskia_codec_android.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34FEFE951D015718002A83B6 /* libskia_codec_android.a */; };
+		3460AD3F1D0157F10051FEA0 /* libskia_codec.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34FEFE921D015718002A83B6 /* libskia_codec.a */; };
+		3460AD401D0157F10051FEA0 /* libskia_pdf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34FEFEB91D015718002A83B6 /* libskia_pdf.a */; };
+		3460AD781D0158370051FEA0 /* libgiflib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34FEFE981D015718002A83B6 /* libgiflib.a */; };
+		3460AD791D0158370051FEA0 /* libpng_static.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34FEFEA51D015718002A83B6 /* libpng_static.a */; };
+		34FEFECE1D01572D002A83B6 /* libicuuc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34FEFE9B1D015718002A83B6 /* libicuuc.a */; };
+		34FEFECF1D01572D002A83B6 /* libsfntly.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34FEFEBC1D015718002A83B6 /* libsfntly.a */; };
+		34FEFED11D015733002A83B6 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 34FEFED01D015733002A83B6 /* libz.tbd */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -225,13 +233,6 @@
 			remoteGlobalIDString = 6EB7C6A4C955592AFCAF5F41;
 			remoteInfo = utils;
 		};
-		21C951E81C03D528003A1E1D /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 21C951E01C03D528003A1E1D /* utils.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = C9856C17693315AA9B404186;
-			remoteInfo = android_utils;
-		};
 		21C951EA1C03D532003A1E1D /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 21C951E01C03D528003A1E1D /* utils.xcodeproj */;
@@ -386,6 +387,160 @@
 			remoteGlobalIDString = 4BE5C0FF1EE57DDD7E318BD3;
 			remoteInfo = genmodule;
 		};
+		3460AD621D0158270051FEA0 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 34FEFE781D015718002A83B6 /* codec_android.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = 3A5E239D7941326C84BF7962;
+			remoteInfo = codec_android;
+		};
+		3460AD641D0158270051FEA0 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 34FEFE7B1D015718002A83B6 /* codec.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = 016C72E9392A6EDCADA353AB;
+			remoteInfo = codec;
+		};
+		3460AD661D0158270051FEA0 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 3429598C1C616FA000BF1BB6 /* libjpeg-turbo.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = B589593D38BB52075B6EE7B2;
+			remoteInfo = "libjpeg-turbo";
+		};
+		3460AD681D0158270051FEA0 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 34FEFE841D015718002A83B6 /* libpng.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = 8ED0FBBBD08C4B5967CE24C3;
+			remoteInfo = libpng_static;
+		};
+		3460AD6A1D0158270051FEA0 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 342959D41C61737400BF1BB6 /* libwebp.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = 06D6CEB264457DF20731B2AB;
+			remoteInfo = libwebp_dec;
+		};
+		3460AD6C1D0158270051FEA0 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 342959D41C61737400BF1BB6 /* libwebp.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = C7C48B5CEBCB5F16079F2659;
+			remoteInfo = libwebp_demux;
+		};
+		3460AD6E1D0158270051FEA0 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 342959D41C61737400BF1BB6 /* libwebp.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = EF4F4DAE03D0B2D442A5E75C;
+			remoteInfo = libwebp_dsp;
+		};
+		3460AD701D0158270051FEA0 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 342959D41C61737400BF1BB6 /* libwebp.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = 9AE87FBCC50847E54181717B;
+			remoteInfo = libwebp_enc;
+		};
+		3460AD721D0158270051FEA0 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 342959D41C61737400BF1BB6 /* libwebp.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = D5FEE9A767851EE663B14DC1;
+			remoteInfo = libwebp_utils;
+		};
+		3460AD741D0158270051FEA0 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 34FEFE7E1D015718002A83B6 /* giflib.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = C4DF5DDD02EB6772E63E8297;
+			remoteInfo = giflib;
+		};
+		3460AD761D0158270051FEA0 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 34FEFE871D015718002A83B6 /* pdf.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = C37161A72930D0F121229C3F;
+			remoteInfo = pdf;
+		};
+		34FEFE911D015718002A83B6 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 34FEFE7B1D015718002A83B6 /* codec.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 0BFE658677B927B8AD47CA56;
+			remoteInfo = codec;
+		};
+		34FEFE941D015718002A83B6 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 34FEFE781D015718002A83B6 /* codec_android.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = D7C9B9DBD5E0F2F792C4F528;
+			remoteInfo = codec_android;
+		};
+		34FEFE971D015718002A83B6 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 34FEFE7E1D015718002A83B6 /* giflib.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 02416B678B4C01D8DEE485DE;
+			remoteInfo = giflib;
+		};
+		34FEFE9A1D015718002A83B6 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 34FEFE811D015718002A83B6 /* icu.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 47A48DEFDFDD22CF05CDA95B;
+			remoteInfo = icuuc;
+		};
+		34FEFEA41D015718002A83B6 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 34FEFE841D015718002A83B6 /* libpng.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = F7809684C4703FEA247919D7;
+			remoteInfo = libpng_static;
+		};
+		34FEFEA61D015718002A83B6 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 34FEFE841D015718002A83B6 /* libpng.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = E39C49F89C198F5DCCBEC9D6;
+			remoteInfo = libpng_static_neon;
+		};
+		34FEFEB61D015718002A83B6 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 34FEFE871D015718002A83B6 /* pdf.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 929452BCB7CCAAD11CC1835D;
+			remoteInfo = nopdf;
+		};
+		34FEFEB81D015718002A83B6 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 34FEFE871D015718002A83B6 /* pdf.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 0DC15EA4ADE06EC812B0409E;
+			remoteInfo = pdf;
+		};
+		34FEFEBB1D015718002A83B6 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 34FEFE8A1D015718002A83B6 /* sfntly.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 70CCA63D0A9AF8CD04A019F9;
+			remoteInfo = sfntly;
+		};
+		34FEFECA1D015725002A83B6 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 34FEFE811D015718002A83B6 /* icu.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = A8365F341FF32481B097DC30;
+			remoteInfo = icuuc;
+		};
+		34FEFECC1D015725002A83B6 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 34FEFE8A1D015718002A83B6 /* sfntly.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = 94EC2B00B9A5217A42B1C7D4;
+			remoteInfo = sfntly;
+		};
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
@@ -417,6 +572,15 @@
 		342959D41C61737400BF1BB6 /* libwebp.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = libwebp.xcodeproj; path = ../../skia/out/gyp/libwebp.xcodeproj; sourceTree = "<group>"; };
 		342959F81C61748A00BF1BB6 /* yasm.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = yasm.xcodeproj; path = ../../skia/out/gyp/yasm.xcodeproj; sourceTree = "<group>"; };
 		343DAE2E1C3F26CF00FAD826 /* SkiaKeeper.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SkiaKeeper.c; path = ../src/SkiaKeeper.c; sourceTree = "<group>"; };
+		34FEFE781D015718002A83B6 /* codec_android.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = codec_android.xcodeproj; path = ../../skia/out/gyp/codec_android.xcodeproj; sourceTree = "<group>"; };
+		34FEFE7B1D015718002A83B6 /* codec.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = codec.xcodeproj; path = ../../skia/out/gyp/codec.xcodeproj; sourceTree = "<group>"; };
+		34FEFE7E1D015718002A83B6 /* giflib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = giflib.xcodeproj; path = ../../skia/out/gyp/giflib.xcodeproj; sourceTree = "<group>"; };
+		34FEFE811D015718002A83B6 /* icu.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = icu.xcodeproj; path = ../../skia/out/gyp/icu.xcodeproj; sourceTree = "<group>"; };
+		34FEFE841D015718002A83B6 /* libpng.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = libpng.xcodeproj; path = ../../skia/out/gyp/libpng.xcodeproj; sourceTree = "<group>"; };
+		34FEFE871D015718002A83B6 /* pdf.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = pdf.xcodeproj; path = ../../skia/out/gyp/pdf.xcodeproj; sourceTree = "<group>"; };
+		34FEFE8A1D015718002A83B6 /* sfntly.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = sfntly.xcodeproj; path = ../../skia/out/gyp/sfntly.xcodeproj; sourceTree = "<group>"; };
+		34FEFE8D1D015718002A83B6 /* skia_lib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = skia_lib.xcodeproj; path = ../../skia/out/gyp/skia_lib.xcodeproj; sourceTree = "<group>"; };
+		34FEFED01D015733002A83B6 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -424,6 +588,14 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				3460AD781D0158370051FEA0 /* libgiflib.a in Frameworks */,
+				3460AD791D0158370051FEA0 /* libpng_static.a in Frameworks */,
+				3460AD3E1D0157F10051FEA0 /* libskia_codec_android.a in Frameworks */,
+				3460AD3F1D0157F10051FEA0 /* libskia_codec.a in Frameworks */,
+				3460AD401D0157F10051FEA0 /* libskia_pdf.a in Frameworks */,
+				34FEFED11D015733002A83B6 /* libz.tbd in Frameworks */,
+				34FEFECE1D01572D002A83B6 /* libicuuc.a in Frameworks */,
+				34FEFECF1D01572D002A83B6 /* libsfntly.a in Frameworks */,
 				342959F21C6173F900BF1BB6 /* libwebp_dec.a in Frameworks */,
 				342959F31C6173F900BF1BB6 /* libwebp_demux.a in Frameworks */,
 				342959F41C6173F900BF1BB6 /* libwebp_dsp_enc.a in Frameworks */,
@@ -459,6 +631,7 @@
 		21C9514C1C03D27A003A1E1D = {
 			isa = PBXGroup;
 			children = (
+				34FEFED01D015733002A83B6 /* libz.tbd */,
 				343DAE2D1C3F26BF00FAD826 /* Source */,
 				21C951651C03D2E3003A1E1D /* skia_libs */,
 				21C951561C03D27A003A1E1D /* Products */,
@@ -476,6 +649,14 @@
 		21C951651C03D2E3003A1E1D /* skia_libs */ = {
 			isa = PBXGroup;
 			children = (
+				34FEFE781D015718002A83B6 /* codec_android.xcodeproj */,
+				34FEFE7B1D015718002A83B6 /* codec.xcodeproj */,
+				34FEFE7E1D015718002A83B6 /* giflib.xcodeproj */,
+				34FEFE811D015718002A83B6 /* icu.xcodeproj */,
+				34FEFE841D015718002A83B6 /* libpng.xcodeproj */,
+				34FEFE871D015718002A83B6 /* pdf.xcodeproj */,
+				34FEFE8A1D015718002A83B6 /* sfntly.xcodeproj */,
+				34FEFE8D1D015718002A83B6 /* skia_lib.xcodeproj */,
 				342959F81C61748A00BF1BB6 /* yasm.xcodeproj */,
 				342959D41C61737400BF1BB6 /* libwebp.xcodeproj */,
 				342959891C616FA000BF1BB6 /* libjpeg-turbo-selector.xcodeproj */,
@@ -574,7 +755,6 @@
 			isa = PBXGroup;
 			children = (
 				21C951E71C03D528003A1E1D /* libskia_utils.a */,
-				21C951E91C03D528003A1E1D /* libskia_android_utils.a */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -645,6 +825,71 @@
 			name = Source;
 			sourceTree = "<group>";
 		};
+		34FEFE791D015718002A83B6 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				34FEFE951D015718002A83B6 /* libskia_codec_android.a */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		34FEFE7C1D015718002A83B6 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				34FEFE921D015718002A83B6 /* libskia_codec.a */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		34FEFE7F1D015718002A83B6 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				34FEFE981D015718002A83B6 /* libgiflib.a */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		34FEFE821D015718002A83B6 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				34FEFE9B1D015718002A83B6 /* libicuuc.a */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		34FEFE851D015718002A83B6 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				34FEFEA51D015718002A83B6 /* libpng_static.a */,
+				34FEFEA71D015718002A83B6 /* libpng_static_neon.a */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		34FEFE881D015718002A83B6 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				34FEFEB71D015718002A83B6 /* libnopdf.a */,
+				34FEFEB91D015718002A83B6 /* libskia_pdf.a */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		34FEFE8B1D015718002A83B6 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				34FEFEBC1D015718002A83B6 /* libsfntly.a */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		34FEFE8E1D015718002A83B6 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */
@@ -672,6 +917,19 @@
 			buildRules = (
 			);
 			dependencies = (
+				3460AD631D0158270051FEA0 /* PBXTargetDependency */,
+				3460AD651D0158270051FEA0 /* PBXTargetDependency */,
+				3460AD671D0158270051FEA0 /* PBXTargetDependency */,
+				3460AD691D0158270051FEA0 /* PBXTargetDependency */,
+				3460AD6B1D0158270051FEA0 /* PBXTargetDependency */,
+				3460AD6D1D0158270051FEA0 /* PBXTargetDependency */,
+				3460AD6F1D0158270051FEA0 /* PBXTargetDependency */,
+				3460AD711D0158270051FEA0 /* PBXTargetDependency */,
+				3460AD731D0158270051FEA0 /* PBXTargetDependency */,
+				3460AD751D0158270051FEA0 /* PBXTargetDependency */,
+				3460AD771D0158270051FEA0 /* PBXTargetDependency */,
+				34FEFECB1D015725002A83B6 /* PBXTargetDependency */,
+				34FEFECD1D015725002A83B6 /* PBXTargetDependency */,
 				342959F11C6173E900BF1BB6 /* PBXTargetDependency */,
 				342959EF1C6173E400BF1BB6 /* PBXTargetDependency */,
 				342959ED1C6173DE00BF1BB6 /* PBXTargetDependency */,
@@ -719,6 +977,14 @@
 			productRefGroup = 21C951561C03D27A003A1E1D /* Products */;
 			projectDirPath = "";
 			projectReferences = (
+				{
+					ProductGroup = 34FEFE7C1D015718002A83B6 /* Products */;
+					ProjectRef = 34FEFE7B1D015718002A83B6 /* codec.xcodeproj */;
+				},
+				{
+					ProductGroup = 34FEFE791D015718002A83B6 /* Products */;
+					ProjectRef = 34FEFE781D015718002A83B6 /* codec_android.xcodeproj */;
+				},
 				{
 					ProductGroup = 21C9516D1C03D36D003A1E1D /* Products */;
 					ProjectRef = 21C9516C1C03D36D003A1E1D /* core.xcodeproj */;
@@ -731,10 +997,18 @@
 					ProductGroup = 21C951EE1C03D551003A1E1D /* Products */;
 					ProjectRef = 21C951ED1C03D551003A1E1D /* etc1.xcodeproj */;
 				},
+				{
+					ProductGroup = 34FEFE7F1D015718002A83B6 /* Products */;
+					ProjectRef = 34FEFE7E1D015718002A83B6 /* giflib.xcodeproj */;
+				},
 				{
 					ProductGroup = 21C951A21C03D39B003A1E1D /* Products */;
 					ProjectRef = 21C951A11C03D39B003A1E1D /* gpu.xcodeproj */;
 				},
+				{
+					ProductGroup = 34FEFE821D015718002A83B6 /* Products */;
+					ProjectRef = 34FEFE811D015718002A83B6 /* icu.xcodeproj */;
+				},
 				{
 					ProductGroup = 21C9517F1C03D38A003A1E1D /* Products */;
 					ProjectRef = 21C9517E1C03D38A003A1E1D /* images.xcodeproj */;
@@ -751,6 +1025,10 @@
 					ProductGroup = 3429598D1C616FA000BF1BB6 /* Products */;
 					ProjectRef = 3429598C1C616FA000BF1BB6 /* libjpeg-turbo.xcodeproj */;
 				},
+				{
+					ProductGroup = 34FEFE851D015718002A83B6 /* Products */;
+					ProjectRef = 34FEFE841D015718002A83B6 /* libpng.xcodeproj */;
+				},
 				{
 					ProductGroup = 342959D51C61737400BF1BB6 /* Products */;
 					ProjectRef = 342959D41C61737400BF1BB6 /* libwebp.xcodeproj */;
@@ -759,6 +1037,10 @@
 					ProductGroup = 21C951891C03D392003A1E1D /* Products */;
 					ProjectRef = 21C951881C03D392003A1E1D /* opts.xcodeproj */;
 				},
+				{
+					ProductGroup = 34FEFE881D015718002A83B6 /* Products */;
+					ProjectRef = 34FEFE871D015718002A83B6 /* pdf.xcodeproj */;
+				},
 				{
 					ProductGroup = 21C951CF1C03D4B8003A1E1D /* Products */;
 					ProjectRef = 21C951CE1C03D4B8003A1E1D /* ports.xcodeproj */;
@@ -767,6 +1049,14 @@
 					ProductGroup = 21C951671C03D363003A1E1D /* Products */;
 					ProjectRef = 21C951661C03D363003A1E1D /* sfnt.xcodeproj */;
 				},
+				{
+					ProductGroup = 34FEFE8B1D015718002A83B6 /* Products */;
+					ProjectRef = 34FEFE8A1D015718002A83B6 /* sfntly.xcodeproj */;
+				},
+				{
+					ProductGroup = 34FEFE8E1D015718002A83B6 /* Products */;
+					ProjectRef = 34FEFE8D1D015718002A83B6 /* skia_lib.xcodeproj */;
+				},
 				{
 					ProductGroup = 21C951E11C03D528003A1E1D /* Products */;
 					ProjectRef = 21C951E01C03D528003A1E1D /* utils.xcodeproj */;
@@ -889,13 +1179,6 @@
 			remoteRef = 21C951E61C03D528003A1E1D /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		21C951E91C03D528003A1E1D /* libskia_android_utils.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = libskia_android_utils.a;
-			remoteRef = 21C951E81C03D528003A1E1D /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
 		21C951F21C03D551003A1E1D /* libetc1.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
@@ -1015,6 +1298,69 @@
 			remoteRef = 34295A151C61748B00BF1BB6 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
+		34FEFE921D015718002A83B6 /* libskia_codec.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libskia_codec.a;
+			remoteRef = 34FEFE911D015718002A83B6 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		34FEFE951D015718002A83B6 /* libskia_codec_android.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libskia_codec_android.a;
+			remoteRef = 34FEFE941D015718002A83B6 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		34FEFE981D015718002A83B6 /* libgiflib.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libgiflib.a;
+			remoteRef = 34FEFE971D015718002A83B6 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		34FEFE9B1D015718002A83B6 /* libicuuc.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libicuuc.a;
+			remoteRef = 34FEFE9A1D015718002A83B6 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		34FEFEA51D015718002A83B6 /* libpng_static.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libpng_static.a;
+			remoteRef = 34FEFEA41D015718002A83B6 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		34FEFEA71D015718002A83B6 /* libpng_static_neon.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libpng_static_neon.a;
+			remoteRef = 34FEFEA61D015718002A83B6 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		34FEFEB71D015718002A83B6 /* libnopdf.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libnopdf.a;
+			remoteRef = 34FEFEB61D015718002A83B6 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		34FEFEB91D015718002A83B6 /* libskia_pdf.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libskia_pdf.a;
+			remoteRef = 34FEFEB81D015718002A83B6 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		34FEFEBC1D015718002A83B6 /* libsfntly.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libsfntly.a;
+			remoteRef = 34FEFEBB1D015718002A83B6 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
 /* End PBXReferenceProxy section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -1112,6 +1458,71 @@
 			name = libwebp_dsp_enc;
 			targetProxy = 342959F01C6173E900BF1BB6 /* PBXContainerItemProxy */;
 		};
+		3460AD631D0158270051FEA0 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = codec_android;
+			targetProxy = 3460AD621D0158270051FEA0 /* PBXContainerItemProxy */;
+		};
+		3460AD651D0158270051FEA0 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = codec;
+			targetProxy = 3460AD641D0158270051FEA0 /* PBXContainerItemProxy */;
+		};
+		3460AD671D0158270051FEA0 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = "libjpeg-turbo";
+			targetProxy = 3460AD661D0158270051FEA0 /* PBXContainerItemProxy */;
+		};
+		3460AD691D0158270051FEA0 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = libpng_static;
+			targetProxy = 3460AD681D0158270051FEA0 /* PBXContainerItemProxy */;
+		};
+		3460AD6B1D0158270051FEA0 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = libwebp_dec;
+			targetProxy = 3460AD6A1D0158270051FEA0 /* PBXContainerItemProxy */;
+		};
+		3460AD6D1D0158270051FEA0 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = libwebp_demux;
+			targetProxy = 3460AD6C1D0158270051FEA0 /* PBXContainerItemProxy */;
+		};
+		3460AD6F1D0158270051FEA0 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = libwebp_dsp;
+			targetProxy = 3460AD6E1D0158270051FEA0 /* PBXContainerItemProxy */;
+		};
+		3460AD711D0158270051FEA0 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = libwebp_enc;
+			targetProxy = 3460AD701D0158270051FEA0 /* PBXContainerItemProxy */;
+		};
+		3460AD731D0158270051FEA0 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = libwebp_utils;
+			targetProxy = 3460AD721D0158270051FEA0 /* PBXContainerItemProxy */;
+		};
+		3460AD751D0158270051FEA0 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = giflib;
+			targetProxy = 3460AD741D0158270051FEA0 /* PBXContainerItemProxy */;
+		};
+		3460AD771D0158270051FEA0 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = pdf;
+			targetProxy = 3460AD761D0158270051FEA0 /* PBXContainerItemProxy */;
+		};
+		34FEFECB1D015725002A83B6 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = icuuc;
+			targetProxy = 34FEFECA1D015725002A83B6 /* PBXContainerItemProxy */;
+		};
+		34FEFECD1D015725002A83B6 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = sfntly;
+			targetProxy = 34FEFECC1D015725002A83B6 /* PBXContainerItemProxy */;
+		};
 /* End PBXTargetDependency section */
 
 /* Begin XCBuildConfiguration section */

native-builds/libSkiaSharp_uwp/libSkiaSharp.vcxproj

@@ -140,7 +140,7 @@
       <CompileAsWinRT>false</CompileAsWinRT>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;SK_INTERNAL;SK_GAMMA_SRGB;SK_GAMMA_APPLY_TO_A8;SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=1;SK_SUPPORT_GPU=1;SK_SUPPORT_OPENCL=0;SK_FORCE_DISTANCE_FIELD_TEXT=0;SK_BUILD_FOR_WIN32;_CRT_SECURE_NO_WARNINGS;GR_GL_FUNCTION_TYPE=__stdcall;_HAS_EXCEPTIONS=0;SK_DEVELOPER=1;;_WINDOWS;_USRDLL;LIBSKIA_WINDOWS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;SK_INTERNAL;SK_GAMMA_SRGB;SK_GAMMA_APPLY_TO_A8;SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=1;SK_SUPPORT_GPU=1;SK_SUPPORT_OPENCL=0;SK_FORCE_DISTANCE_FIELD_TEXT=0;SK_BUILD_FOR_WIN32;SK_BUILD_FOR_WINRT;_CRT_SECURE_NO_WARNINGS;GR_GL_FUNCTION_TYPE=__stdcall;_HAS_EXCEPTIONS=0;SK_DEVELOPER=1;;_WINDOWS;_USRDLL;LIBSKIA_WINDOWS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>..\..\skia\include\c;..\..\skia\include\config;..\..\skia\include\core;..\..\skia\include\pathops;..\..\skia\include\pipe;..\..\skia\include\ports;..\..\skia\include\private;..\..\skia\include\utils;..\..\skia\include\images;..\..\skia\src\c;..\..\skia\src\core;..\..\skia\src\sfnt;..\..\skia\src\image;..\..\skia\src\opts;..\..\skia\src\utils;..\..\gyp\config\win;..\..\skia\include\gpu;..\..\skia\src\gpu;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
@@ -160,7 +160,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>SK_INTERNAL;SK_GAMMA_SRGB;SK_GAMMA_APPLY_TO_A8;SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=1;SK_SUPPORT_GPU=1;SK_SUPPORT_OPENCL=0;SK_FORCE_DISTANCE_FIELD_TEXT=0;SK_BUILD_FOR_WIN32;_CRT_SECURE_NO_WARNINGS;GR_GL_FUNCTION_TYPE=__stdcall;_HAS_EXCEPTIONS=0;;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBSKIA_WINDOWS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>SK_INTERNAL;SK_GAMMA_SRGB;SK_GAMMA_APPLY_TO_A8;SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=1;SK_SUPPORT_GPU=1;SK_SUPPORT_OPENCL=0;SK_FORCE_DISTANCE_FIELD_TEXT=0;SK_BUILD_FOR_WIN32;SK_BUILD_FOR_WINRT;_CRT_SECURE_NO_WARNINGS;GR_GL_FUNCTION_TYPE=__stdcall;_HAS_EXCEPTIONS=0;;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBSKIA_WINDOWS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>..\..\skia\include\c;..\..\skia\include\config;..\..\skia\include\core;..\..\skia\include\pathops;..\..\skia\include\pipe;..\..\skia\include\ports;..\..\skia\include\private;..\..\skia\include\utils;..\..\skia\include\images;..\..\skia\src\c;..\..\skia\src\core;..\..\skia\src\sfnt;..\..\skia\src\image;..\..\skia\src\opts;..\..\skia\src\utils;..\..\gyp\config\win;..\..\skia\include\gpu;..\..\skia\src\gpu;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
@@ -178,7 +178,7 @@
       <CompileAsWinRT>false</CompileAsWinRT>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;SK_INTERNAL;SK_GAMMA_SRGB;SK_GAMMA_APPLY_TO_A8;SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=1;SK_SUPPORT_GPU=1;SK_SUPPORT_OPENCL=0;SK_FORCE_DISTANCE_FIELD_TEXT=0;SK_BUILD_FOR_WIN32;_CRT_SECURE_NO_WARNINGS;GR_GL_FUNCTION_TYPE=__stdcall;_HAS_EXCEPTIONS=0;SK_DEVELOPER=1;;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBSKIA_WINDOWS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;SK_INTERNAL;SK_GAMMA_SRGB;SK_GAMMA_APPLY_TO_A8;SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=1;SK_SUPPORT_GPU=1;SK_SUPPORT_OPENCL=0;SK_FORCE_DISTANCE_FIELD_TEXT=0;SK_BUILD_FOR_WIN32;SK_BUILD_FOR_WINRT;_CRT_SECURE_NO_WARNINGS;GR_GL_FUNCTION_TYPE=__stdcall;_HAS_EXCEPTIONS=0;SK_DEVELOPER=1;;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBSKIA_WINDOWS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>..\..\skia\include\c;..\..\skia\include\config;..\..\skia\include\core;..\..\skia\include\pathops;..\..\skia\include\pipe;..\..\skia\include\ports;..\..\skia\include\private;..\..\skia\include\utils;..\..\skia\include\images;..\..\skia\src\c;..\..\skia\src\core;..\..\skia\src\sfnt;..\..\skia\src\image;..\..\skia\src\opts;..\..\skia\src\utils;..\..\gyp\config\win;..\..\skia\include\gpu;..\..\skia\src\gpu;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
@@ -199,7 +199,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>SK_INTERNAL;SK_GAMMA_SRGB;SK_GAMMA_APPLY_TO_A8;SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=1;SK_SUPPORT_GPU=1;SK_SUPPORT_OPENCL=0;SK_FORCE_DISTANCE_FIELD_TEXT=0;SK_BUILD_FOR_WIN32;_CRT_SECURE_NO_WARNINGS;GR_GL_FUNCTION_TYPE=__stdcall;_HAS_EXCEPTIONS=0;;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBSKIA_WINDOWS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>SK_INTERNAL;SK_GAMMA_SRGB;SK_GAMMA_APPLY_TO_A8;SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=1;SK_SUPPORT_GPU=1;SK_SUPPORT_OPENCL=0;SK_FORCE_DISTANCE_FIELD_TEXT=0;SK_BUILD_FOR_WIN32;SK_BUILD_FOR_WINRT;_CRT_SECURE_NO_WARNINGS;GR_GL_FUNCTION_TYPE=__stdcall;_HAS_EXCEPTIONS=0;;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBSKIA_WINDOWS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>..\..\skia\include\c;..\..\skia\include\config;..\..\skia\include\core;..\..\skia\include\pathops;..\..\skia\include\pipe;..\..\skia\include\ports;..\..\skia\include\private;..\..\skia\include\utils;..\..\skia\include\images;..\..\skia\src\c;..\..\skia\src\core;..\..\skia\src\sfnt;..\..\skia\src\image;..\..\skia\src\opts;..\..\skia\src\utils;..\..\gyp\config\win;..\..\skia\include\gpu;..\..\skia\src\gpu;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
@@ -220,7 +220,7 @@
       <CompileAsWinRT>false</CompileAsWinRT>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;SK_INTERNAL;SK_GAMMA_SRGB;SK_GAMMA_APPLY_TO_A8;SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=1;SK_SUPPORT_GPU=1;SK_SUPPORT_OPENCL=0;SK_FORCE_DISTANCE_FIELD_TEXT=0;SK_BUILD_FOR_WIN32;_CRT_SECURE_NO_WARNINGS;GR_GL_FUNCTION_TYPE=__stdcall;_HAS_EXCEPTIONS=0;SK_DEVELOPER=1;;_WINDOWS;_USRDLL;LIBSKIA_WINDOWS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;SK_INTERNAL;SK_GAMMA_SRGB;SK_GAMMA_APPLY_TO_A8;SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=1;SK_SUPPORT_GPU=1;SK_SUPPORT_OPENCL=0;SK_FORCE_DISTANCE_FIELD_TEXT=0;SK_BUILD_FOR_WIN32;SK_BUILD_FOR_WINRT;_CRT_SECURE_NO_WARNINGS;GR_GL_FUNCTION_TYPE=__stdcall;_HAS_EXCEPTIONS=0;SK_DEVELOPER=1;;_WINDOWS;_USRDLL;LIBSKIA_WINDOWS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>..\..\skia\include\c;..\..\skia\include\config;..\..\skia\include\core;..\..\skia\include\pathops;..\..\skia\include\pipe;..\..\skia\include\ports;..\..\skia\include\private;..\..\skia\include\utils;..\..\skia\include\images;..\..\skia\src\c;..\..\skia\src\core;..\..\skia\src\sfnt;..\..\skia\src\image;..\..\skia\src\opts;..\..\skia\src\utils;..\..\gyp\config\win;..\..\skia\include\gpu;..\..\skia\src\gpu;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
@@ -241,7 +241,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>SK_INTERNAL;SK_GAMMA_SRGB;SK_GAMMA_APPLY_TO_A8;SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=1;SK_SUPPORT_GPU=1;SK_SUPPORT_OPENCL=0;SK_FORCE_DISTANCE_FIELD_TEXT=0;SK_BUILD_FOR_WIN32;_CRT_SECURE_NO_WARNINGS;GR_GL_FUNCTION_TYPE=__stdcall;_HAS_EXCEPTIONS=0;;NDEBUG;_WINDOWS;_USRDLL;LIBSKIA_WINDOWS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>SK_INTERNAL;SK_GAMMA_SRGB;SK_GAMMA_APPLY_TO_A8;SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=1;SK_SUPPORT_GPU=1;SK_SUPPORT_OPENCL=0;SK_FORCE_DISTANCE_FIELD_TEXT=0;SK_BUILD_FOR_WIN32;SK_BUILD_FOR_WINRT;_CRT_SECURE_NO_WARNINGS;GR_GL_FUNCTION_TYPE=__stdcall;_HAS_EXCEPTIONS=0;;NDEBUG;_WINDOWS;_USRDLL;LIBSKIA_WINDOWS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>..\..\skia\include\c;..\..\skia\include\config;..\..\skia\include\core;..\..\skia\include\pathops;..\..\skia\include\pipe;..\..\skia\include\ports;..\..\skia\include\private;..\..\skia\include\utils;..\..\skia\include\images;..\..\skia\src\c;..\..\skia\src\core;..\..\skia\src\sfnt;..\..\skia\src\image;..\..\skia\src\opts;..\..\skia\src\utils;..\..\gyp\config\win;..\..\skia\include\gpu;..\..\skia\src\gpu;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
@@ -267,12 +267,21 @@
     <ClInclude Include="..\src\sk_xamarin.h" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\skia\out\gyp\codec.vcxproj">
+      <Project>{16f70b29-3f1a-5d36-8fd9-e069d7ed5320}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\skia\out\gyp\codec_android.vcxproj">
+      <Project>{33835bfb-8f8b-4120-2d5c-973a743f30a5}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\..\skia\out\gyp\core.vcxproj">
       <Project>{b7760b5e-bfa8-486b-acfd-49e3a6de8e76}</Project>
     </ProjectReference>
     <ProjectReference Include="..\..\skia\out\gyp\effects.vcxproj">
       <Project>{200809b7-4c62-7592-f47e-bf262809fa50}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\..\skia\out\gyp\giflib.vcxproj">
+      <Project>{ba21e9d1-3d2f-7622-2e1f-fbf186ff5677}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\..\skia\out\gyp\images.vcxproj">
       <Project>{31057ac5-dc70-dea7-3e96-9c6fa063245e}</Project>
     </ProjectReference>
@@ -285,6 +294,9 @@
     <ProjectReference Include="..\..\skia\out\gyp\libjpeg-turbo.vcxproj">
       <Project>{bf42c422-f0ea-bd6c-5e01-abf4694803b5}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\..\skia\out\gyp\libpng_static.vcxproj">
+      <Project>{35bbcd7a-909d-957f-ada0-c09939e0916f}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\..\skia\out\gyp\libSkKTX.vcxproj">
       <Project>{c984027d-7bfe-3d92-8d87-082486d7334e}</Project>
     </ProjectReference>
@@ -324,18 +336,33 @@
     <ProjectReference Condition="'$(Platform)'!='ARM'" Include="..\..\skia\out\gyp\opts_ssse3.vcxproj">
       <Project>{5716a271-a36f-abb0-bdfd-776fd2fa1a41}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\..\skia\out\gyp\pdf.vcxproj">
+      <Project>{b8aa38a8-c1f9-7c27-270f-199d0891282c}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\..\skia\out\gyp\ports.vcxproj">
       <Project>{b15878d6-6997-adc9-ac65-516a7f578db2}</Project>
     </ProjectReference>
     <ProjectReference Include="..\..\skia\out\gyp\sfnt.vcxproj">
       <Project>{43c5db31-68d1-5452-4bf0-ad0ab84b2e52}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\..\skia\out\gyp\skgpu.vcxproj">
+      <Project>{13574ed5-427a-5ff2-e79d-092ab3ab24e2}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\..\skia\out\gyp\utils.vcxproj">
       <Project>{0f11cc16-0734-803c-1c14-7a44fb13c2da}</Project>
     </ProjectReference>
     <ProjectReference Include="..\..\skia\out\gyp\yasm-win.vcxproj">
       <Project>{79ae5c41-8c67-f7c0-8693-f259da7c914b}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\..\skia\out\gyp\zlib.vcxproj">
+      <Project>{4c5035c1-74ba-cf3d-79b1-471c205a490d}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\skia\out\gyp\zlib_x86_simd.vcxproj" Condition="'$(Platform)'!='ARM'">
+      <Project>{4844151d-e943-c99d-d340-683a26e22fc7}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\skia\out\gyp\zlib_x86_simd.vcxproj">
+      <Project>{4844151d-e943-c99d-d340-683a26e22fc7}</Project>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

native-builds/libSkiaSharp_uwp/libSkiaSharp_ARM.sln

@@ -47,6 +47,26 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_demux", "..\..\skia
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_dsp_enc", "..\..\skia\out\gyp\libwebp_dsp_enc.vcxproj", "{4B9B6627-AAA4-9BEB-B6A3-3EDDD01788CB}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pdf", "..\..\skia\out\gyp\pdf.vcxproj", "{B8AA38A8-C1F9-7C27-270F-199D0891282C}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "skia_lib", "..\..\skia\out\gyp\skia_lib.vcxproj", "{70A43075-F008-E167-05C8-978BE66FE588}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "codec", "..\..\skia\out\gyp\codec.vcxproj", "{16F70B29-3F1A-5D36-8FD9-E069D7ED5320}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "codec_android", "..\..\skia\out\gyp\codec_android.vcxproj", "{33835BFB-8F8B-4120-2D5C-973A743F30A5}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "giflib", "..\..\skia\out\gyp\giflib.vcxproj", "{BA21E9D1-3D2F-7622-2E1F-FBF186FF5677}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "..\..\skia\out\gyp\libpng.vcxproj", "{244A967D-9EDE-F233-1CFA-A22A1B666A3E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng_static", "..\..\skia\out\gyp\libpng_static.vcxproj", "{35BBCD7A-909D-957F-ADA0-C09939E0916F}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\..\skia\out\gyp\zlib.vcxproj", "{4C5035C1-74BA-CF3D-79B1-471C205A490D}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "skgpu", "..\..\skia\out\gyp\skgpu.vcxproj", "{13574ED5-427A-5FF2-E79D-092AB3AB24E2}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib_x86_simd", "..\..\skia\out\gyp\zlib_x86_simd.vcxproj", "{4844151D-E943-C99D-D340-683A26E22FC7}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|ARM = Debug|ARM
@@ -137,6 +157,46 @@ Global
 		{4B9B6627-AAA4-9BEB-B6A3-3EDDD01788CB}.Debug|ARM.Build.0 = Debug|ARM
 		{4B9B6627-AAA4-9BEB-B6A3-3EDDD01788CB}.Release|ARM.ActiveCfg = Release|ARM
 		{4B9B6627-AAA4-9BEB-B6A3-3EDDD01788CB}.Release|ARM.Build.0 = Release|ARM
+		{B8AA38A8-C1F9-7C27-270F-199D0891282C}.Debug|ARM.ActiveCfg = Debug|ARM
+		{B8AA38A8-C1F9-7C27-270F-199D0891282C}.Debug|ARM.Build.0 = Debug|ARM
+		{B8AA38A8-C1F9-7C27-270F-199D0891282C}.Release|ARM.ActiveCfg = Release|ARM
+		{B8AA38A8-C1F9-7C27-270F-199D0891282C}.Release|ARM.Build.0 = Release|ARM
+		{70A43075-F008-E167-05C8-978BE66FE588}.Debug|ARM.ActiveCfg = Debug|Win32
+		{70A43075-F008-E167-05C8-978BE66FE588}.Debug|ARM.Build.0 = Debug|Win32
+		{70A43075-F008-E167-05C8-978BE66FE588}.Release|ARM.ActiveCfg = Release|Win32
+		{70A43075-F008-E167-05C8-978BE66FE588}.Release|ARM.Build.0 = Release|Win32
+		{16F70B29-3F1A-5D36-8FD9-E069D7ED5320}.Debug|ARM.ActiveCfg = Debug|ARM
+		{16F70B29-3F1A-5D36-8FD9-E069D7ED5320}.Debug|ARM.Build.0 = Debug|ARM
+		{16F70B29-3F1A-5D36-8FD9-E069D7ED5320}.Release|ARM.ActiveCfg = Release|ARM
+		{16F70B29-3F1A-5D36-8FD9-E069D7ED5320}.Release|ARM.Build.0 = Release|ARM
+		{33835BFB-8F8B-4120-2D5C-973A743F30A5}.Debug|ARM.ActiveCfg = Debug|ARM
+		{33835BFB-8F8B-4120-2D5C-973A743F30A5}.Debug|ARM.Build.0 = Debug|ARM
+		{33835BFB-8F8B-4120-2D5C-973A743F30A5}.Release|ARM.ActiveCfg = Release|ARM
+		{33835BFB-8F8B-4120-2D5C-973A743F30A5}.Release|ARM.Build.0 = Release|ARM
+		{BA21E9D1-3D2F-7622-2E1F-FBF186FF5677}.Debug|ARM.ActiveCfg = Debug|ARM
+		{BA21E9D1-3D2F-7622-2E1F-FBF186FF5677}.Debug|ARM.Build.0 = Debug|ARM
+		{BA21E9D1-3D2F-7622-2E1F-FBF186FF5677}.Release|ARM.ActiveCfg = Release|ARM
+		{BA21E9D1-3D2F-7622-2E1F-FBF186FF5677}.Release|ARM.Build.0 = Release|ARM
+		{244A967D-9EDE-F233-1CFA-A22A1B666A3E}.Debug|ARM.ActiveCfg = Debug|Win32
+		{244A967D-9EDE-F233-1CFA-A22A1B666A3E}.Debug|ARM.Build.0 = Debug|Win32
+		{244A967D-9EDE-F233-1CFA-A22A1B666A3E}.Release|ARM.ActiveCfg = Release|Win32
+		{244A967D-9EDE-F233-1CFA-A22A1B666A3E}.Release|ARM.Build.0 = Release|Win32
+		{35BBCD7A-909D-957F-ADA0-C09939E0916F}.Debug|ARM.ActiveCfg = Debug|ARM
+		{35BBCD7A-909D-957F-ADA0-C09939E0916F}.Debug|ARM.Build.0 = Debug|ARM
+		{35BBCD7A-909D-957F-ADA0-C09939E0916F}.Release|ARM.ActiveCfg = Release|ARM
+		{35BBCD7A-909D-957F-ADA0-C09939E0916F}.Release|ARM.Build.0 = Release|ARM
+		{4C5035C1-74BA-CF3D-79B1-471C205A490D}.Debug|ARM.ActiveCfg = Debug|ARM
+		{4C5035C1-74BA-CF3D-79B1-471C205A490D}.Debug|ARM.Build.0 = Debug|ARM
+		{4C5035C1-74BA-CF3D-79B1-471C205A490D}.Release|ARM.ActiveCfg = Release|ARM
+		{4C5035C1-74BA-CF3D-79B1-471C205A490D}.Release|ARM.Build.0 = Release|ARM
+		{13574ED5-427A-5FF2-E79D-092AB3AB24E2}.Debug|ARM.ActiveCfg = Debug|ARM
+		{13574ED5-427A-5FF2-E79D-092AB3AB24E2}.Debug|ARM.Build.0 = Debug|ARM
+		{13574ED5-427A-5FF2-E79D-092AB3AB24E2}.Release|ARM.ActiveCfg = Release|ARM
+		{13574ED5-427A-5FF2-E79D-092AB3AB24E2}.Release|ARM.Build.0 = Release|ARM
+		{4844151D-E943-C99D-D340-683A26E22FC7}.Debug|ARM.ActiveCfg = Debug|ARM
+		{4844151D-E943-C99D-D340-683A26E22FC7}.Debug|ARM.Build.0 = Debug|ARM
+		{4844151D-E943-C99D-D340-683A26E22FC7}.Release|ARM.ActiveCfg = Release|ARM
+		{4844151D-E943-C99D-D340-683A26E22FC7}.Release|ARM.Build.0 = Release|ARM
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -162,5 +222,15 @@ Global
 		{4ACA2A52-6F01-9BA3-08B0-6B75FD198F9A} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
 		{B6991969-ED48-FD8C-9059-7EF50BD9ABB7} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
 		{4B9B6627-AAA4-9BEB-B6A3-3EDDD01788CB} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{B8AA38A8-C1F9-7C27-270F-199D0891282C} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{70A43075-F008-E167-05C8-978BE66FE588} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{16F70B29-3F1A-5D36-8FD9-E069D7ED5320} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{33835BFB-8F8B-4120-2D5C-973A743F30A5} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{BA21E9D1-3D2F-7622-2E1F-FBF186FF5677} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{244A967D-9EDE-F233-1CFA-A22A1B666A3E} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{35BBCD7A-909D-957F-ADA0-C09939E0916F} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{4C5035C1-74BA-CF3D-79B1-471C205A490D} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{13574ED5-427A-5FF2-E79D-092AB3AB24E2} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{4844151D-E943-C99D-D340-683A26E22FC7} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
 	EndGlobalSection
 EndGlobal

native-builds/libSkiaSharp_uwp/libSkiaSharp_x64.sln

@@ -53,6 +53,26 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_demux", "..\..\skia
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_dsp_enc", "..\..\skia\out\gyp\libwebp_dsp_enc.vcxproj", "{4B9B6627-AAA4-9BEB-B6A3-3EDDD01788CB}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pdf", "..\..\skia\out\gyp\pdf.vcxproj", "{B8AA38A8-C1F9-7C27-270F-199D0891282C}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "skia_lib", "..\..\skia\out\gyp\skia_lib.vcxproj", "{70A43075-F008-E167-05C8-978BE66FE588}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "codec", "..\..\skia\out\gyp\codec.vcxproj", "{16F70B29-3F1A-5D36-8FD9-E069D7ED5320}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "codec_android", "..\..\skia\out\gyp\codec_android.vcxproj", "{33835BFB-8F8B-4120-2D5C-973A743F30A5}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "giflib", "..\..\skia\out\gyp\giflib.vcxproj", "{BA21E9D1-3D2F-7622-2E1F-FBF186FF5677}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "..\..\skia\out\gyp\libpng.vcxproj", "{244A967D-9EDE-F233-1CFA-A22A1B666A3E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng_static", "..\..\skia\out\gyp\libpng_static.vcxproj", "{35BBCD7A-909D-957F-ADA0-C09939E0916F}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\..\skia\out\gyp\zlib.vcxproj", "{4C5035C1-74BA-CF3D-79B1-471C205A490D}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib_x86_simd", "..\..\skia\out\gyp\zlib_x86_simd.vcxproj", "{4844151D-E943-C99D-D340-683A26E22FC7}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "skgpu", "..\..\skia\out\gyp\skgpu.vcxproj", "{13574ED5-427A-5FF2-E79D-092AB3AB24E2}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x64 = Debug|x64
@@ -155,6 +175,46 @@ Global
 		{4B9B6627-AAA4-9BEB-B6A3-3EDDD01788CB}.Debug|x64.Build.0 = Debug|x64
 		{4B9B6627-AAA4-9BEB-B6A3-3EDDD01788CB}.Release|x64.ActiveCfg = Release|x64
 		{4B9B6627-AAA4-9BEB-B6A3-3EDDD01788CB}.Release|x64.Build.0 = Release|x64
+		{B8AA38A8-C1F9-7C27-270F-199D0891282C}.Debug|x64.ActiveCfg = Debug|x64
+		{B8AA38A8-C1F9-7C27-270F-199D0891282C}.Debug|x64.Build.0 = Debug|x64
+		{B8AA38A8-C1F9-7C27-270F-199D0891282C}.Release|x64.ActiveCfg = Release|x64
+		{B8AA38A8-C1F9-7C27-270F-199D0891282C}.Release|x64.Build.0 = Release|x64
+		{70A43075-F008-E167-05C8-978BE66FE588}.Debug|x64.ActiveCfg = Debug|x64
+		{70A43075-F008-E167-05C8-978BE66FE588}.Debug|x64.Build.0 = Debug|x64
+		{70A43075-F008-E167-05C8-978BE66FE588}.Release|x64.ActiveCfg = Release|x64
+		{70A43075-F008-E167-05C8-978BE66FE588}.Release|x64.Build.0 = Release|x64
+		{16F70B29-3F1A-5D36-8FD9-E069D7ED5320}.Debug|x64.ActiveCfg = Debug|x64
+		{16F70B29-3F1A-5D36-8FD9-E069D7ED5320}.Debug|x64.Build.0 = Debug|x64
+		{16F70B29-3F1A-5D36-8FD9-E069D7ED5320}.Release|x64.ActiveCfg = Release|x64
+		{16F70B29-3F1A-5D36-8FD9-E069D7ED5320}.Release|x64.Build.0 = Release|x64
+		{33835BFB-8F8B-4120-2D5C-973A743F30A5}.Debug|x64.ActiveCfg = Debug|x64
+		{33835BFB-8F8B-4120-2D5C-973A743F30A5}.Debug|x64.Build.0 = Debug|x64
+		{33835BFB-8F8B-4120-2D5C-973A743F30A5}.Release|x64.ActiveCfg = Release|x64
+		{33835BFB-8F8B-4120-2D5C-973A743F30A5}.Release|x64.Build.0 = Release|x64
+		{BA21E9D1-3D2F-7622-2E1F-FBF186FF5677}.Debug|x64.ActiveCfg = Debug|x64
+		{BA21E9D1-3D2F-7622-2E1F-FBF186FF5677}.Debug|x64.Build.0 = Debug|x64
+		{BA21E9D1-3D2F-7622-2E1F-FBF186FF5677}.Release|x64.ActiveCfg = Release|x64
+		{BA21E9D1-3D2F-7622-2E1F-FBF186FF5677}.Release|x64.Build.0 = Release|x64
+		{244A967D-9EDE-F233-1CFA-A22A1B666A3E}.Debug|x64.ActiveCfg = Debug|x64
+		{244A967D-9EDE-F233-1CFA-A22A1B666A3E}.Debug|x64.Build.0 = Debug|x64
+		{244A967D-9EDE-F233-1CFA-A22A1B666A3E}.Release|x64.ActiveCfg = Release|x64
+		{244A967D-9EDE-F233-1CFA-A22A1B666A3E}.Release|x64.Build.0 = Release|x64
+		{35BBCD7A-909D-957F-ADA0-C09939E0916F}.Debug|x64.ActiveCfg = Debug|x64
+		{35BBCD7A-909D-957F-ADA0-C09939E0916F}.Debug|x64.Build.0 = Debug|x64
+		{35BBCD7A-909D-957F-ADA0-C09939E0916F}.Release|x64.ActiveCfg = Release|x64
+		{35BBCD7A-909D-957F-ADA0-C09939E0916F}.Release|x64.Build.0 = Release|x64
+		{4C5035C1-74BA-CF3D-79B1-471C205A490D}.Debug|x64.ActiveCfg = Debug|x64
+		{4C5035C1-74BA-CF3D-79B1-471C205A490D}.Debug|x64.Build.0 = Debug|x64
+		{4C5035C1-74BA-CF3D-79B1-471C205A490D}.Release|x64.ActiveCfg = Release|x64
+		{4C5035C1-74BA-CF3D-79B1-471C205A490D}.Release|x64.Build.0 = Release|x64
+		{4844151D-E943-C99D-D340-683A26E22FC7}.Debug|x64.ActiveCfg = Debug|x64
+		{4844151D-E943-C99D-D340-683A26E22FC7}.Debug|x64.Build.0 = Debug|x64
+		{4844151D-E943-C99D-D340-683A26E22FC7}.Release|x64.ActiveCfg = Release|x64
+		{4844151D-E943-C99D-D340-683A26E22FC7}.Release|x64.Build.0 = Release|x64
+		{13574ED5-427A-5FF2-E79D-092AB3AB24E2}.Debug|x64.ActiveCfg = Debug|x64
+		{13574ED5-427A-5FF2-E79D-092AB3AB24E2}.Debug|x64.Build.0 = Debug|x64
+		{13574ED5-427A-5FF2-E79D-092AB3AB24E2}.Release|x64.ActiveCfg = Release|x64
+		{13574ED5-427A-5FF2-E79D-092AB3AB24E2}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -183,5 +243,15 @@ Global
 		{4ACA2A52-6F01-9BA3-08B0-6B75FD198F9A} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
 		{B6991969-ED48-FD8C-9059-7EF50BD9ABB7} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
 		{4B9B6627-AAA4-9BEB-B6A3-3EDDD01788CB} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{B8AA38A8-C1F9-7C27-270F-199D0891282C} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{70A43075-F008-E167-05C8-978BE66FE588} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{16F70B29-3F1A-5D36-8FD9-E069D7ED5320} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{33835BFB-8F8B-4120-2D5C-973A743F30A5} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{BA21E9D1-3D2F-7622-2E1F-FBF186FF5677} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{244A967D-9EDE-F233-1CFA-A22A1B666A3E} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{35BBCD7A-909D-957F-ADA0-C09939E0916F} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{4C5035C1-74BA-CF3D-79B1-471C205A490D} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{4844151D-E943-C99D-D340-683A26E22FC7} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{13574ED5-427A-5FF2-E79D-092AB3AB24E2} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
 	EndGlobalSection
 EndGlobal

native-builds/libSkiaSharp_uwp/libSkiaSharp_x86.sln

@@ -53,6 +53,26 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_demux", "..\..\skia
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_dsp_enc", "..\..\skia\out\gyp\libwebp_dsp_enc.vcxproj", "{4B9B6627-AAA4-9BEB-B6A3-3EDDD01788CB}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pdf", "..\..\skia\out\gyp\pdf.vcxproj", "{B8AA38A8-C1F9-7C27-270F-199D0891282C}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "skia_lib", "..\..\skia\out\gyp\skia_lib.vcxproj", "{70A43075-F008-E167-05C8-978BE66FE588}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "codec", "..\..\skia\out\gyp\codec.vcxproj", "{16F70B29-3F1A-5D36-8FD9-E069D7ED5320}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "codec_android", "..\..\skia\out\gyp\codec_android.vcxproj", "{33835BFB-8F8B-4120-2D5C-973A743F30A5}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "giflib", "..\..\skia\out\gyp\giflib.vcxproj", "{BA21E9D1-3D2F-7622-2E1F-FBF186FF5677}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "..\..\skia\out\gyp\libpng.vcxproj", "{244A967D-9EDE-F233-1CFA-A22A1B666A3E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng_static", "..\..\skia\out\gyp\libpng_static.vcxproj", "{35BBCD7A-909D-957F-ADA0-C09939E0916F}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\..\skia\out\gyp\zlib.vcxproj", "{4C5035C1-74BA-CF3D-79B1-471C205A490D}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib_x86_simd", "..\..\skia\out\gyp\zlib_x86_simd.vcxproj", "{4844151D-E943-C99D-D340-683A26E22FC7}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "skgpu", "..\..\skia\out\gyp\skgpu.vcxproj", "{13574ED5-427A-5FF2-E79D-092AB3AB24E2}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -155,6 +175,46 @@ Global
 		{4B9B6627-AAA4-9BEB-B6A3-3EDDD01788CB}.Debug|Win32.Build.0 = Debug|Win32
 		{4B9B6627-AAA4-9BEB-B6A3-3EDDD01788CB}.Release|Win32.ActiveCfg = Release|Win32
 		{4B9B6627-AAA4-9BEB-B6A3-3EDDD01788CB}.Release|Win32.Build.0 = Release|Win32
+		{B8AA38A8-C1F9-7C27-270F-199D0891282C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B8AA38A8-C1F9-7C27-270F-199D0891282C}.Debug|Win32.Build.0 = Debug|Win32
+		{B8AA38A8-C1F9-7C27-270F-199D0891282C}.Release|Win32.ActiveCfg = Release|Win32
+		{B8AA38A8-C1F9-7C27-270F-199D0891282C}.Release|Win32.Build.0 = Release|Win32
+		{70A43075-F008-E167-05C8-978BE66FE588}.Debug|Win32.ActiveCfg = Debug|Win32
+		{70A43075-F008-E167-05C8-978BE66FE588}.Debug|Win32.Build.0 = Debug|Win32
+		{70A43075-F008-E167-05C8-978BE66FE588}.Release|Win32.ActiveCfg = Release|Win32
+		{70A43075-F008-E167-05C8-978BE66FE588}.Release|Win32.Build.0 = Release|Win32
+		{16F70B29-3F1A-5D36-8FD9-E069D7ED5320}.Debug|Win32.ActiveCfg = Debug|Win32
+		{16F70B29-3F1A-5D36-8FD9-E069D7ED5320}.Debug|Win32.Build.0 = Debug|Win32
+		{16F70B29-3F1A-5D36-8FD9-E069D7ED5320}.Release|Win32.ActiveCfg = Release|Win32
+		{16F70B29-3F1A-5D36-8FD9-E069D7ED5320}.Release|Win32.Build.0 = Release|Win32
+		{33835BFB-8F8B-4120-2D5C-973A743F30A5}.Debug|Win32.ActiveCfg = Debug|Win32
+		{33835BFB-8F8B-4120-2D5C-973A743F30A5}.Debug|Win32.Build.0 = Debug|Win32
+		{33835BFB-8F8B-4120-2D5C-973A743F30A5}.Release|Win32.ActiveCfg = Release|Win32
+		{33835BFB-8F8B-4120-2D5C-973A743F30A5}.Release|Win32.Build.0 = Release|Win32
+		{BA21E9D1-3D2F-7622-2E1F-FBF186FF5677}.Debug|Win32.ActiveCfg = Debug|Win32
+		{BA21E9D1-3D2F-7622-2E1F-FBF186FF5677}.Debug|Win32.Build.0 = Debug|Win32
+		{BA21E9D1-3D2F-7622-2E1F-FBF186FF5677}.Release|Win32.ActiveCfg = Release|Win32
+		{BA21E9D1-3D2F-7622-2E1F-FBF186FF5677}.Release|Win32.Build.0 = Release|Win32
+		{244A967D-9EDE-F233-1CFA-A22A1B666A3E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{244A967D-9EDE-F233-1CFA-A22A1B666A3E}.Debug|Win32.Build.0 = Debug|Win32
+		{244A967D-9EDE-F233-1CFA-A22A1B666A3E}.Release|Win32.ActiveCfg = Release|Win32
+		{244A967D-9EDE-F233-1CFA-A22A1B666A3E}.Release|Win32.Build.0 = Release|Win32
+		{35BBCD7A-909D-957F-ADA0-C09939E0916F}.Debug|Win32.ActiveCfg = Debug|Win32
+		{35BBCD7A-909D-957F-ADA0-C09939E0916F}.Debug|Win32.Build.0 = Debug|Win32
+		{35BBCD7A-909D-957F-ADA0-C09939E0916F}.Release|Win32.ActiveCfg = Release|Win32
+		{35BBCD7A-909D-957F-ADA0-C09939E0916F}.Release|Win32.Build.0 = Release|Win32
+		{4C5035C1-74BA-CF3D-79B1-471C205A490D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4C5035C1-74BA-CF3D-79B1-471C205A490D}.Debug|Win32.Build.0 = Debug|Win32
+		{4C5035C1-74BA-CF3D-79B1-471C205A490D}.Release|Win32.ActiveCfg = Release|Win32
+		{4C5035C1-74BA-CF3D-79B1-471C205A490D}.Release|Win32.Build.0 = Release|Win32
+		{4844151D-E943-C99D-D340-683A26E22FC7}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4844151D-E943-C99D-D340-683A26E22FC7}.Debug|Win32.Build.0 = Debug|Win32
+		{4844151D-E943-C99D-D340-683A26E22FC7}.Release|Win32.ActiveCfg = Release|Win32
+		{4844151D-E943-C99D-D340-683A26E22FC7}.Release|Win32.Build.0 = Release|Win32
+		{13574ED5-427A-5FF2-E79D-092AB3AB24E2}.Debug|Win32.ActiveCfg = Debug|Win32
+		{13574ED5-427A-5FF2-E79D-092AB3AB24E2}.Debug|Win32.Build.0 = Debug|Win32
+		{13574ED5-427A-5FF2-E79D-092AB3AB24E2}.Release|Win32.ActiveCfg = Release|Win32
+		{13574ED5-427A-5FF2-E79D-092AB3AB24E2}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -183,5 +243,15 @@ Global
 		{4ACA2A52-6F01-9BA3-08B0-6B75FD198F9A} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
 		{B6991969-ED48-FD8C-9059-7EF50BD9ABB7} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
 		{4B9B6627-AAA4-9BEB-B6A3-3EDDD01788CB} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{B8AA38A8-C1F9-7C27-270F-199D0891282C} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{70A43075-F008-E167-05C8-978BE66FE588} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{16F70B29-3F1A-5D36-8FD9-E069D7ED5320} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{33835BFB-8F8B-4120-2D5C-973A743F30A5} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{BA21E9D1-3D2F-7622-2E1F-FBF186FF5677} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{244A967D-9EDE-F233-1CFA-A22A1B666A3E} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{35BBCD7A-909D-957F-ADA0-C09939E0916F} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{4C5035C1-74BA-CF3D-79B1-471C205A490D} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{4844151D-E943-C99D-D340-683A26E22FC7} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{13574ED5-427A-5FF2-E79D-092AB3AB24E2} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
 	EndGlobalSection
 EndGlobal

native-builds/libSkiaSharp_windows/libSkiaSharp.vcxproj

@@ -169,12 +169,24 @@
     <ClInclude Include="..\src\sk_xamarin.h" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\skia\out\gyp\codec.vcxproj">
+      <Project>{16f70b29-3f1a-5d36-8fd9-e069d7ed5320}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\skia\out\gyp\codec_android.vcxproj">
+      <Project>{33835bfb-8f8b-4120-2d5c-973a743f30a5}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\..\skia\out\gyp\core.vcxproj">
       <Project>{b7760b5e-bfa8-486b-acfd-49e3a6de8e76}</Project>
     </ProjectReference>
     <ProjectReference Include="..\..\skia\out\gyp\effects.vcxproj">
       <Project>{200809b7-4c62-7592-f47e-bf262809fa50}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\..\skia\out\gyp\giflib.vcxproj">
+      <Project>{ba21e9d1-3d2f-7622-2e1f-fbf186ff5677}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\skia\out\gyp\icuuc.vcxproj">
+      <Project>{7f3f1a83-26a1-faf5-c6b1-977e328c1738}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\..\skia\out\gyp\images.vcxproj">
       <Project>{31057ac5-dc70-dea7-3e96-9c6fa063245e}</Project>
     </ProjectReference>
@@ -187,6 +199,15 @@
     <ProjectReference Include="..\..\skia\out\gyp\libjpeg-turbo.vcxproj">
       <Project>{bf42c422-f0ea-bd6c-5e01-abf4694803b5}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\..\skia\out\gyp\libpng.vcxproj">
+      <Project>{244a967d-9ede-f233-1cfa-a22a1b666a3e}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\skia\out\gyp\libpng_static.vcxproj">
+      <Project>{35bbcd7a-909d-957f-ada0-c09939e0916f}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\skia\out\gyp\libpng_static_neon.vcxproj">
+      <Project>{95e593ce-01f6-a02e-334e-1a6c34964fa6}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\..\skia\out\gyp\libSkKTX.vcxproj">
       <Project>{c984027d-7bfe-3d92-8d87-082486d7334e}</Project>
     </ProjectReference>
@@ -226,21 +247,36 @@
     <ProjectReference Include="..\..\skia\out\gyp\opts_ssse3.vcxproj">
       <Project>{5716a271-a36f-abb0-bdfd-776fd2fa1a41}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\..\skia\out\gyp\pdf.vcxproj">
+      <Project>{b8aa38a8-c1f9-7c27-270f-199d0891282c}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\..\skia\out\gyp\ports.vcxproj">
       <Project>{b15878d6-6997-adc9-ac65-516a7f578db2}</Project>
     </ProjectReference>
     <ProjectReference Include="..\..\skia\out\gyp\sfnt.vcxproj">
       <Project>{43c5db31-68d1-5452-4bf0-ad0ab84b2e52}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\..\skia\out\gyp\sfntly.vcxproj">
+      <Project>{c06fb60b-8a24-163d-da86-4fad07f1771f}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\..\skia\out\gyp\skgpu.vcxproj">
       <Project>{13574ed5-427a-5ff2-e79d-092ab3ab24e2}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\..\skia\out\gyp\skia_lib.vcxproj">
+      <Project>{70a43075-f008-e167-05c8-978be66fe588}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\..\skia\out\gyp\utils.vcxproj">
       <Project>{0f11cc16-0734-803c-1c14-7a44fb13c2da}</Project>
     </ProjectReference>
     <ProjectReference Include="..\..\skia\out\gyp\yasm-win.vcxproj">
       <Project>{79ae5c41-8c67-f7c0-8693-f259da7c914b}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\..\skia\out\gyp\zlib.vcxproj">
+      <Project>{4c5035c1-74ba-cf3d-79b1-471c205a490d}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\skia\out\gyp\zlib_x86_simd.vcxproj">
+      <Project>{4844151d-e943-c99d-d340-683a26e22fc7}</Project>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

native-builds/libSkiaSharp_windows/libSkiaSharp_x64.sln

@@ -54,6 +54,30 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_demux", "..\..\skia
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_dsp_enc", "..\..\skia\out\gyp\libwebp_dsp_enc.vcxproj", "{4B9B6627-AAA4-9BEB-B6A3-3EDDD01788CB}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pdf", "..\..\skia\out\gyp\pdf.vcxproj", "{B8AA38A8-C1F9-7C27-270F-199D0891282C}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sfntly", "..\..\skia\out\gyp\sfntly.vcxproj", "{C06FB60B-8A24-163D-DA86-4FAD07F1771F}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\..\skia\out\gyp\zlib.vcxproj", "{4C5035C1-74BA-CF3D-79B1-471C205A490D}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib_x86_simd", "..\..\skia\out\gyp\zlib_x86_simd.vcxproj", "{4844151D-E943-C99D-D340-683A26E22FC7}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icuuc", "..\..\skia\out\gyp\icuuc.vcxproj", "{7F3F1A83-26A1-FAF5-C6B1-977E328C1738}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "..\..\skia\out\gyp\libpng.vcxproj", "{244A967D-9EDE-F233-1CFA-A22A1B666A3E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng_static", "..\..\skia\out\gyp\libpng_static.vcxproj", "{35BBCD7A-909D-957F-ADA0-C09939E0916F}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng_static_neon", "..\..\skia\out\gyp\libpng_static_neon.vcxproj", "{95E593CE-01F6-A02E-334E-1A6C34964FA6}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "codec", "..\..\skia\out\gyp\codec.vcxproj", "{16F70B29-3F1A-5D36-8FD9-E069D7ED5320}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "codec_android", "..\..\skia\out\gyp\codec_android.vcxproj", "{33835BFB-8F8B-4120-2D5C-973A743F30A5}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "giflib", "..\..\skia\out\gyp\giflib.vcxproj", "{BA21E9D1-3D2F-7622-2E1F-FBF186FF5677}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "skia_lib", "..\..\skia\out\gyp\skia_lib.vcxproj", "{70A43075-F008-E167-05C8-978BE66FE588}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -68,12 +92,10 @@ Global
 		{B7760B5E-BFA8-486B-ACFD-49E3A6DE8E76}.Release|Win32.ActiveCfg = Release|x64
 		{B7760B5E-BFA8-486B-ACFD-49E3A6DE8E76}.Release|x64.ActiveCfg = Release|x64
 		{B7760B5E-BFA8-486B-ACFD-49E3A6DE8E76}.Release|x64.Build.0 = Release|x64
-		{22B9B540-CC67-43B3-9341-336DEA7FC0EB}.Debug|Win32.ActiveCfg = Debug|Win32
-		{22B9B540-CC67-43B3-9341-336DEA7FC0EB}.Debug|Win32.Build.0 = Debug|Win32
+		{22B9B540-CC67-43B3-9341-336DEA7FC0EB}.Debug|Win32.ActiveCfg = Debug|x64
 		{22B9B540-CC67-43B3-9341-336DEA7FC0EB}.Debug|x64.ActiveCfg = Debug|x64
 		{22B9B540-CC67-43B3-9341-336DEA7FC0EB}.Debug|x64.Build.0 = Debug|x64
-		{22B9B540-CC67-43B3-9341-336DEA7FC0EB}.Release|Win32.ActiveCfg = Release|Win32
-		{22B9B540-CC67-43B3-9341-336DEA7FC0EB}.Release|Win32.Build.0 = Release|Win32
+		{22B9B540-CC67-43B3-9341-336DEA7FC0EB}.Release|Win32.ActiveCfg = Release|x64
 		{22B9B540-CC67-43B3-9341-336DEA7FC0EB}.Release|x64.ActiveCfg = Release|x64
 		{22B9B540-CC67-43B3-9341-336DEA7FC0EB}.Release|x64.Build.0 = Release|x64
 		{B15878D6-6997-ADC9-AC65-516A7F578DB2}.Debug|Win32.ActiveCfg = Debug|x64
@@ -214,6 +236,78 @@ Global
 		{4B9B6627-AAA4-9BEB-B6A3-3EDDD01788CB}.Release|Win32.ActiveCfg = Release|x64
 		{4B9B6627-AAA4-9BEB-B6A3-3EDDD01788CB}.Release|x64.Build.0 = Release|x64
 		{4B9B6627-AAA4-9BEB-B6A3-3EDDD01788CB}.Release|x64.ActiveCfg = Release|x64
+		{B8AA38A8-C1F9-7C27-270F-199D0891282C}.Debug|Win32.ActiveCfg = Debug|x64
+		{B8AA38A8-C1F9-7C27-270F-199D0891282C}.Debug|x64.ActiveCfg = Debug|x64
+		{B8AA38A8-C1F9-7C27-270F-199D0891282C}.Debug|x64.Build.0 = Debug|x64
+		{B8AA38A8-C1F9-7C27-270F-199D0891282C}.Release|Win32.ActiveCfg = Release|x64
+		{B8AA38A8-C1F9-7C27-270F-199D0891282C}.Release|x64.ActiveCfg = Release|x64
+		{B8AA38A8-C1F9-7C27-270F-199D0891282C}.Release|x64.Build.0 = Release|x64
+		{C06FB60B-8A24-163D-DA86-4FAD07F1771F}.Debug|Win32.ActiveCfg = Debug|x64
+		{C06FB60B-8A24-163D-DA86-4FAD07F1771F}.Debug|x64.ActiveCfg = Debug|x64
+		{C06FB60B-8A24-163D-DA86-4FAD07F1771F}.Debug|x64.Build.0 = Debug|x64
+		{C06FB60B-8A24-163D-DA86-4FAD07F1771F}.Release|Win32.ActiveCfg = Release|x64
+		{C06FB60B-8A24-163D-DA86-4FAD07F1771F}.Release|x64.ActiveCfg = Release|x64
+		{C06FB60B-8A24-163D-DA86-4FAD07F1771F}.Release|x64.Build.0 = Release|x64
+		{4C5035C1-74BA-CF3D-79B1-471C205A490D}.Debug|Win32.ActiveCfg = Debug|x64
+		{4C5035C1-74BA-CF3D-79B1-471C205A490D}.Debug|x64.ActiveCfg = Debug|x64
+		{4C5035C1-74BA-CF3D-79B1-471C205A490D}.Debug|x64.Build.0 = Debug|x64
+		{4C5035C1-74BA-CF3D-79B1-471C205A490D}.Release|Win32.ActiveCfg = Release|x64
+		{4C5035C1-74BA-CF3D-79B1-471C205A490D}.Release|x64.ActiveCfg = Release|x64
+		{4C5035C1-74BA-CF3D-79B1-471C205A490D}.Release|x64.Build.0 = Release|x64
+		{4844151D-E943-C99D-D340-683A26E22FC7}.Debug|Win32.ActiveCfg = Debug|x64
+		{4844151D-E943-C99D-D340-683A26E22FC7}.Debug|x64.ActiveCfg = Debug|x64
+		{4844151D-E943-C99D-D340-683A26E22FC7}.Debug|x64.Build.0 = Debug|x64
+		{4844151D-E943-C99D-D340-683A26E22FC7}.Release|Win32.ActiveCfg = Release|x64
+		{4844151D-E943-C99D-D340-683A26E22FC7}.Release|x64.ActiveCfg = Release|x64
+		{4844151D-E943-C99D-D340-683A26E22FC7}.Release|x64.Build.0 = Release|x64
+		{7F3F1A83-26A1-FAF5-C6B1-977E328C1738}.Debug|Win32.ActiveCfg = Debug|x64
+		{7F3F1A83-26A1-FAF5-C6B1-977E328C1738}.Debug|x64.ActiveCfg = Debug|x64
+		{7F3F1A83-26A1-FAF5-C6B1-977E328C1738}.Debug|x64.Build.0 = Debug|x64
+		{7F3F1A83-26A1-FAF5-C6B1-977E328C1738}.Release|Win32.ActiveCfg = Release|x64
+		{7F3F1A83-26A1-FAF5-C6B1-977E328C1738}.Release|x64.ActiveCfg = Release|x64
+		{7F3F1A83-26A1-FAF5-C6B1-977E328C1738}.Release|x64.Build.0 = Release|x64
+		{244A967D-9EDE-F233-1CFA-A22A1B666A3E}.Debug|Win32.ActiveCfg = Debug|x64
+		{244A967D-9EDE-F233-1CFA-A22A1B666A3E}.Debug|x64.ActiveCfg = Debug|x64
+		{244A967D-9EDE-F233-1CFA-A22A1B666A3E}.Debug|x64.Build.0 = Debug|x64
+		{244A967D-9EDE-F233-1CFA-A22A1B666A3E}.Release|Win32.ActiveCfg = Release|x64
+		{244A967D-9EDE-F233-1CFA-A22A1B666A3E}.Release|x64.ActiveCfg = Release|x64
+		{244A967D-9EDE-F233-1CFA-A22A1B666A3E}.Release|x64.Build.0 = Release|x64
+		{35BBCD7A-909D-957F-ADA0-C09939E0916F}.Debug|Win32.ActiveCfg = Debug|x64
+		{35BBCD7A-909D-957F-ADA0-C09939E0916F}.Debug|x64.ActiveCfg = Debug|x64
+		{35BBCD7A-909D-957F-ADA0-C09939E0916F}.Debug|x64.Build.0 = Debug|x64
+		{35BBCD7A-909D-957F-ADA0-C09939E0916F}.Release|Win32.ActiveCfg = Release|x64
+		{35BBCD7A-909D-957F-ADA0-C09939E0916F}.Release|x64.ActiveCfg = Release|x64
+		{35BBCD7A-909D-957F-ADA0-C09939E0916F}.Release|x64.Build.0 = Release|x64
+		{95E593CE-01F6-A02E-334E-1A6C34964FA6}.Debug|Win32.ActiveCfg = Debug|x64
+		{95E593CE-01F6-A02E-334E-1A6C34964FA6}.Debug|x64.ActiveCfg = Debug|x64
+		{95E593CE-01F6-A02E-334E-1A6C34964FA6}.Debug|x64.Build.0 = Debug|x64
+		{95E593CE-01F6-A02E-334E-1A6C34964FA6}.Release|Win32.ActiveCfg = Release|x64
+		{95E593CE-01F6-A02E-334E-1A6C34964FA6}.Release|x64.ActiveCfg = Release|x64
+		{95E593CE-01F6-A02E-334E-1A6C34964FA6}.Release|x64.Build.0 = Release|x64
+		{16F70B29-3F1A-5D36-8FD9-E069D7ED5320}.Debug|Win32.ActiveCfg = Debug|x64
+		{16F70B29-3F1A-5D36-8FD9-E069D7ED5320}.Debug|x64.ActiveCfg = Debug|x64
+		{16F70B29-3F1A-5D36-8FD9-E069D7ED5320}.Debug|x64.Build.0 = Debug|x64
+		{16F70B29-3F1A-5D36-8FD9-E069D7ED5320}.Release|Win32.ActiveCfg = Release|x64
+		{16F70B29-3F1A-5D36-8FD9-E069D7ED5320}.Release|x64.ActiveCfg = Release|x64
+		{16F70B29-3F1A-5D36-8FD9-E069D7ED5320}.Release|x64.Build.0 = Release|x64
+		{33835BFB-8F8B-4120-2D5C-973A743F30A5}.Debug|Win32.ActiveCfg = Debug|x64
+		{33835BFB-8F8B-4120-2D5C-973A743F30A5}.Debug|x64.ActiveCfg = Debug|x64
+		{33835BFB-8F8B-4120-2D5C-973A743F30A5}.Debug|x64.Build.0 = Debug|x64
+		{33835BFB-8F8B-4120-2D5C-973A743F30A5}.Release|Win32.ActiveCfg = Release|x64
+		{33835BFB-8F8B-4120-2D5C-973A743F30A5}.Release|x64.ActiveCfg = Release|x64
+		{33835BFB-8F8B-4120-2D5C-973A743F30A5}.Release|x64.Build.0 = Release|x64
+		{BA21E9D1-3D2F-7622-2E1F-FBF186FF5677}.Debug|Win32.ActiveCfg = Debug|x64
+		{BA21E9D1-3D2F-7622-2E1F-FBF186FF5677}.Debug|x64.ActiveCfg = Debug|x64
+		{BA21E9D1-3D2F-7622-2E1F-FBF186FF5677}.Debug|x64.Build.0 = Debug|x64
+		{BA21E9D1-3D2F-7622-2E1F-FBF186FF5677}.Release|Win32.ActiveCfg = Release|x64
+		{BA21E9D1-3D2F-7622-2E1F-FBF186FF5677}.Release|x64.ActiveCfg = Release|x64
+		{BA21E9D1-3D2F-7622-2E1F-FBF186FF5677}.Release|x64.Build.0 = Release|x64
+		{70A43075-F008-E167-05C8-978BE66FE588}.Debug|Win32.ActiveCfg = Debug|x64
+		{70A43075-F008-E167-05C8-978BE66FE588}.Debug|x64.ActiveCfg = Debug|x64
+		{70A43075-F008-E167-05C8-978BE66FE588}.Debug|x64.Build.0 = Debug|x64
+		{70A43075-F008-E167-05C8-978BE66FE588}.Release|Win32.ActiveCfg = Release|x64
+		{70A43075-F008-E167-05C8-978BE66FE588}.Release|x64.ActiveCfg = Release|x64
+		{70A43075-F008-E167-05C8-978BE66FE588}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -243,5 +337,17 @@ Global
 		{4ACA2A52-6F01-9BA3-08B0-6B75FD198F9A} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
 		{B6991969-ED48-FD8C-9059-7EF50BD9ABB7} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
 		{4B9B6627-AAA4-9BEB-B6A3-3EDDD01788CB} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{B8AA38A8-C1F9-7C27-270F-199D0891282C} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{C06FB60B-8A24-163D-DA86-4FAD07F1771F} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{4C5035C1-74BA-CF3D-79B1-471C205A490D} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{4844151D-E943-C99D-D340-683A26E22FC7} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{7F3F1A83-26A1-FAF5-C6B1-977E328C1738} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{244A967D-9EDE-F233-1CFA-A22A1B666A3E} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{35BBCD7A-909D-957F-ADA0-C09939E0916F} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{95E593CE-01F6-A02E-334E-1A6C34964FA6} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{16F70B29-3F1A-5D36-8FD9-E069D7ED5320} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{33835BFB-8F8B-4120-2D5C-973A743F30A5} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{BA21E9D1-3D2F-7622-2E1F-FBF186FF5677} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{70A43075-F008-E167-05C8-978BE66FE588} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
 	EndGlobalSection
 EndGlobal

native-builds/libSkiaSharp_windows/libSkiaSharp_x86.sln

@@ -54,6 +54,30 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_demux", "..\..\skia
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_dsp_enc", "..\..\skia\out\gyp\libwebp_dsp_enc.vcxproj", "{4B9B6627-AAA4-9BEB-B6A3-3EDDD01788CB}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pdf", "..\..\skia\out\gyp\pdf.vcxproj", "{B8AA38A8-C1F9-7C27-270F-199D0891282C}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sfntly", "..\..\skia\out\gyp\sfntly.vcxproj", "{C06FB60B-8A24-163D-DA86-4FAD07F1771F}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\..\skia\out\gyp\zlib.vcxproj", "{4C5035C1-74BA-CF3D-79B1-471C205A490D}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib_x86_simd", "..\..\skia\out\gyp\zlib_x86_simd.vcxproj", "{4844151D-E943-C99D-D340-683A26E22FC7}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icuuc", "..\..\skia\out\gyp\icuuc.vcxproj", "{7F3F1A83-26A1-FAF5-C6B1-977E328C1738}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "..\..\skia\out\gyp\libpng.vcxproj", "{244A967D-9EDE-F233-1CFA-A22A1B666A3E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng_static", "..\..\skia\out\gyp\libpng_static.vcxproj", "{35BBCD7A-909D-957F-ADA0-C09939E0916F}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng_static_neon", "..\..\skia\out\gyp\libpng_static_neon.vcxproj", "{95E593CE-01F6-A02E-334E-1A6C34964FA6}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "codec", "..\..\skia\out\gyp\codec.vcxproj", "{16F70B29-3F1A-5D36-8FD9-E069D7ED5320}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "codec_android", "..\..\skia\out\gyp\codec_android.vcxproj", "{33835BFB-8F8B-4120-2D5C-973A743F30A5}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "giflib", "..\..\skia\out\gyp\giflib.vcxproj", "{BA21E9D1-3D2F-7622-2E1F-FBF186FF5677}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "skia_lib", "..\..\skia\out\gyp\skia_lib.vcxproj", "{70A43075-F008-E167-05C8-978BE66FE588}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -70,12 +94,10 @@ Global
 		{B7760B5E-BFA8-486B-ACFD-49E3A6DE8E76}.Release|x64.ActiveCfg = Release|Win32
 		{22B9B540-CC67-43B3-9341-336DEA7FC0EB}.Debug|Win32.ActiveCfg = Debug|Win32
 		{22B9B540-CC67-43B3-9341-336DEA7FC0EB}.Debug|Win32.Build.0 = Debug|Win32
-		{22B9B540-CC67-43B3-9341-336DEA7FC0EB}.Debug|x64.ActiveCfg = Debug|x64
-		{22B9B540-CC67-43B3-9341-336DEA7FC0EB}.Debug|x64.Build.0 = Debug|x64
+		{22B9B540-CC67-43B3-9341-336DEA7FC0EB}.Debug|x64.ActiveCfg = Debug|Win32
 		{22B9B540-CC67-43B3-9341-336DEA7FC0EB}.Release|Win32.ActiveCfg = Release|Win32
 		{22B9B540-CC67-43B3-9341-336DEA7FC0EB}.Release|Win32.Build.0 = Release|Win32
-		{22B9B540-CC67-43B3-9341-336DEA7FC0EB}.Release|x64.ActiveCfg = Release|x64
-		{22B9B540-CC67-43B3-9341-336DEA7FC0EB}.Release|x64.Build.0 = Release|x64
+		{22B9B540-CC67-43B3-9341-336DEA7FC0EB}.Release|x64.ActiveCfg = Release|Win32
 		{B15878D6-6997-ADC9-AC65-516A7F578DB2}.Debug|Win32.ActiveCfg = Debug|Win32
 		{B15878D6-6997-ADC9-AC65-516A7F578DB2}.Debug|Win32.Build.0 = Debug|Win32
 		{B15878D6-6997-ADC9-AC65-516A7F578DB2}.Debug|x64.ActiveCfg = Debug|Win32
@@ -214,6 +236,78 @@ Global
 		{4B9B6627-AAA4-9BEB-B6A3-3EDDD01788CB}.Release|Win32.ActiveCfg = Release|Win32
 		{4B9B6627-AAA4-9BEB-B6A3-3EDDD01788CB}.Release|Win32.Build.0 = Release|Win32
 		{4B9B6627-AAA4-9BEB-B6A3-3EDDD01788CB}.Release|x64.ActiveCfg = Release|Win32
+		{B8AA38A8-C1F9-7C27-270F-199D0891282C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B8AA38A8-C1F9-7C27-270F-199D0891282C}.Debug|Win32.Build.0 = Debug|Win32
+		{B8AA38A8-C1F9-7C27-270F-199D0891282C}.Debug|x64.ActiveCfg = Debug|Win32
+		{B8AA38A8-C1F9-7C27-270F-199D0891282C}.Release|Win32.ActiveCfg = Release|Win32
+		{B8AA38A8-C1F9-7C27-270F-199D0891282C}.Release|Win32.Build.0 = Release|Win32
+		{B8AA38A8-C1F9-7C27-270F-199D0891282C}.Release|x64.ActiveCfg = Release|Win32
+		{C06FB60B-8A24-163D-DA86-4FAD07F1771F}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C06FB60B-8A24-163D-DA86-4FAD07F1771F}.Debug|Win32.Build.0 = Debug|Win32
+		{C06FB60B-8A24-163D-DA86-4FAD07F1771F}.Debug|x64.ActiveCfg = Debug|Win32
+		{C06FB60B-8A24-163D-DA86-4FAD07F1771F}.Release|Win32.ActiveCfg = Release|Win32
+		{C06FB60B-8A24-163D-DA86-4FAD07F1771F}.Release|Win32.Build.0 = Release|Win32
+		{C06FB60B-8A24-163D-DA86-4FAD07F1771F}.Release|x64.ActiveCfg = Release|Win32
+		{4C5035C1-74BA-CF3D-79B1-471C205A490D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4C5035C1-74BA-CF3D-79B1-471C205A490D}.Debug|Win32.Build.0 = Debug|Win32
+		{4C5035C1-74BA-CF3D-79B1-471C205A490D}.Debug|x64.ActiveCfg = Debug|Win32
+		{4C5035C1-74BA-CF3D-79B1-471C205A490D}.Release|Win32.ActiveCfg = Release|Win32
+		{4C5035C1-74BA-CF3D-79B1-471C205A490D}.Release|Win32.Build.0 = Release|Win32
+		{4C5035C1-74BA-CF3D-79B1-471C205A490D}.Release|x64.ActiveCfg = Release|Win32
+		{4844151D-E943-C99D-D340-683A26E22FC7}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4844151D-E943-C99D-D340-683A26E22FC7}.Debug|Win32.Build.0 = Debug|Win32
+		{4844151D-E943-C99D-D340-683A26E22FC7}.Debug|x64.ActiveCfg = Debug|Win32
+		{4844151D-E943-C99D-D340-683A26E22FC7}.Release|Win32.ActiveCfg = Release|Win32
+		{4844151D-E943-C99D-D340-683A26E22FC7}.Release|Win32.Build.0 = Release|Win32
+		{4844151D-E943-C99D-D340-683A26E22FC7}.Release|x64.ActiveCfg = Release|Win32
+		{7F3F1A83-26A1-FAF5-C6B1-977E328C1738}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7F3F1A83-26A1-FAF5-C6B1-977E328C1738}.Debug|Win32.Build.0 = Debug|Win32
+		{7F3F1A83-26A1-FAF5-C6B1-977E328C1738}.Debug|x64.ActiveCfg = Debug|Win32
+		{7F3F1A83-26A1-FAF5-C6B1-977E328C1738}.Release|Win32.ActiveCfg = Release|Win32
+		{7F3F1A83-26A1-FAF5-C6B1-977E328C1738}.Release|Win32.Build.0 = Release|Win32
+		{7F3F1A83-26A1-FAF5-C6B1-977E328C1738}.Release|x64.ActiveCfg = Release|Win32
+		{244A967D-9EDE-F233-1CFA-A22A1B666A3E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{244A967D-9EDE-F233-1CFA-A22A1B666A3E}.Debug|x64.ActiveCfg = Debug|Win32
+		{244A967D-9EDE-F233-1CFA-A22A1B666A3E}.Debug|Win32.Build.0 = Debug|Win32
+		{244A967D-9EDE-F233-1CFA-A22A1B666A3E}.Release|Win32.ActiveCfg = Release|Win32
+		{244A967D-9EDE-F233-1CFA-A22A1B666A3E}.Release|x64.ActiveCfg = Release|Win32
+		{244A967D-9EDE-F233-1CFA-A22A1B666A3E}.Release|Win32.Build.0 = Release|Win32
+		{35BBCD7A-909D-957F-ADA0-C09939E0916F}.Debug|Win32.ActiveCfg = Debug|Win32
+		{35BBCD7A-909D-957F-ADA0-C09939E0916F}.Debug|x64.ActiveCfg = Debug|Win32
+		{35BBCD7A-909D-957F-ADA0-C09939E0916F}.Debug|Win32.Build.0 = Debug|Win32
+		{35BBCD7A-909D-957F-ADA0-C09939E0916F}.Release|Win32.ActiveCfg = Release|Win32
+		{35BBCD7A-909D-957F-ADA0-C09939E0916F}.Release|x64.ActiveCfg = Release|Win32
+		{35BBCD7A-909D-957F-ADA0-C09939E0916F}.Release|Win32.Build.0 = Release|Win32
+		{95E593CE-01F6-A02E-334E-1A6C34964FA6}.Debug|Win32.ActiveCfg = Debug|Win32
+		{95E593CE-01F6-A02E-334E-1A6C34964FA6}.Debug|x64.ActiveCfg = Debug|Win32
+		{95E593CE-01F6-A02E-334E-1A6C34964FA6}.Debug|Win32.Build.0 = Debug|Win32
+		{95E593CE-01F6-A02E-334E-1A6C34964FA6}.Release|Win32.ActiveCfg = Release|Win32
+		{95E593CE-01F6-A02E-334E-1A6C34964FA6}.Release|x64.ActiveCfg = Release|Win32
+		{95E593CE-01F6-A02E-334E-1A6C34964FA6}.Release|Win32.Build.0 = Release|Win32
+		{16F70B29-3F1A-5D36-8FD9-E069D7ED5320}.Debug|Win32.ActiveCfg = Debug|Win32
+		{16F70B29-3F1A-5D36-8FD9-E069D7ED5320}.Debug|Win32.Build.0 = Debug|Win32
+		{16F70B29-3F1A-5D36-8FD9-E069D7ED5320}.Debug|x64.ActiveCfg = Debug|Win32
+		{16F70B29-3F1A-5D36-8FD9-E069D7ED5320}.Release|Win32.ActiveCfg = Release|Win32
+		{16F70B29-3F1A-5D36-8FD9-E069D7ED5320}.Release|Win32.Build.0 = Release|Win32
+		{16F70B29-3F1A-5D36-8FD9-E069D7ED5320}.Release|x64.ActiveCfg = Release|Win32
+		{33835BFB-8F8B-4120-2D5C-973A743F30A5}.Debug|Win32.ActiveCfg = Debug|Win32
+		{33835BFB-8F8B-4120-2D5C-973A743F30A5}.Debug|Win32.Build.0 = Debug|Win32
+		{33835BFB-8F8B-4120-2D5C-973A743F30A5}.Debug|x64.ActiveCfg = Debug|Win32
+		{33835BFB-8F8B-4120-2D5C-973A743F30A5}.Release|Win32.ActiveCfg = Release|Win32
+		{33835BFB-8F8B-4120-2D5C-973A743F30A5}.Release|Win32.Build.0 = Release|Win32
+		{33835BFB-8F8B-4120-2D5C-973A743F30A5}.Release|x64.ActiveCfg = Release|Win32
+		{BA21E9D1-3D2F-7622-2E1F-FBF186FF5677}.Debug|Win32.ActiveCfg = Debug|Win32
+		{BA21E9D1-3D2F-7622-2E1F-FBF186FF5677}.Debug|Win32.Build.0 = Debug|Win32
+		{BA21E9D1-3D2F-7622-2E1F-FBF186FF5677}.Debug|x64.ActiveCfg = Debug|Win32
+		{BA21E9D1-3D2F-7622-2E1F-FBF186FF5677}.Release|Win32.ActiveCfg = Release|Win32
+		{BA21E9D1-3D2F-7622-2E1F-FBF186FF5677}.Release|Win32.Build.0 = Release|Win32
+		{BA21E9D1-3D2F-7622-2E1F-FBF186FF5677}.Release|x64.ActiveCfg = Release|Win32
+		{70A43075-F008-E167-05C8-978BE66FE588}.Debug|Win32.ActiveCfg = Debug|Win32
+		{70A43075-F008-E167-05C8-978BE66FE588}.Debug|Win32.Build.0 = Debug|Win32
+		{70A43075-F008-E167-05C8-978BE66FE588}.Debug|x64.ActiveCfg = Debug|Win32
+		{70A43075-F008-E167-05C8-978BE66FE588}.Release|Win32.ActiveCfg = Release|Win32
+		{70A43075-F008-E167-05C8-978BE66FE588}.Release|Win32.Build.0 = Release|Win32
+		{70A43075-F008-E167-05C8-978BE66FE588}.Release|x64.ActiveCfg = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -243,5 +337,17 @@ Global
 		{4ACA2A52-6F01-9BA3-08B0-6B75FD198F9A} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
 		{B6991969-ED48-FD8C-9059-7EF50BD9ABB7} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
 		{4B9B6627-AAA4-9BEB-B6A3-3EDDD01788CB} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{B8AA38A8-C1F9-7C27-270F-199D0891282C} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{C06FB60B-8A24-163D-DA86-4FAD07F1771F} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{4C5035C1-74BA-CF3D-79B1-471C205A490D} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{4844151D-E943-C99D-D340-683A26E22FC7} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{7F3F1A83-26A1-FAF5-C6B1-977E328C1738} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{244A967D-9EDE-F233-1CFA-A22A1B666A3E} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{35BBCD7A-909D-957F-ADA0-C09939E0916F} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{95E593CE-01F6-A02E-334E-1A6C34964FA6} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{16F70B29-3F1A-5D36-8FD9-E069D7ED5320} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{33835BFB-8F8B-4120-2D5C-973A743F30A5} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{BA21E9D1-3D2F-7622-2E1F-FBF186FF5677} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{70A43075-F008-E167-05C8-978BE66FE588} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
 	EndGlobalSection
 EndGlobal

native-builds/src/SkiaKeeper.c

@@ -24,6 +24,7 @@
 #include "xamarin/sk_x_canvas.h"
 #include "xamarin/sk_x_colorfilter.h"
 #include "xamarin/sk_x_data.h"
+#include "xamarin/sk_x_document.h"
 #include "xamarin/sk_x_image.h"
 #include "xamarin/sk_x_imagedecoder.h"
 #include "xamarin/sk_x_imagefilter.h"
@@ -40,6 +41,23 @@
 
 SK_X_API void** KeepSkiaCSymbols ();
 
+#if defined(SK_BUILD_FOR_WINRT)
+void ExitProcess(code)
+{
+    // we can't die in WinRT
+}
+#if defined(_M_ARM)
+// This should have been not used, but as the code is designed for x86
+// and there is a RUNTIME check for simd, this has to exist. As the
+// runtime check will fail, and revert to a C implementation, this is 
+// not a problem to have a stub.
+unsigned int _mm_crc32_u32(unsigned int crc, unsigned int v)
+{
+    return 0;
+}
+#endif
+#endif
+
 void** KeepSkiaCSymbols ()
 {
     static void* ret[] = {
@@ -72,6 +90,8 @@ void** KeepSkiaCSymbols ()
         (void*)sk_stream_read,
         (void*)sk_typeface_create_from_name,
         (void*)sk_string_new_empty,
+        (void*)sk_document_unref,
+        (void*)sk_wstream_write,
 
         // Xamarin
         (void*)sk_managedstream_new,

nuget/SkiaSharp.Mac.nuspec

@@ -3,7 +3,7 @@
   <metadata>
     <id>SkiaSharp.Mac</id>
     <title>SkiaSharp for OSX</title>
-    <version>1.49.3.0-beta</version>
+    <version>1.49.4.0-beta3</version>
     <authors>Xamarin Inc.</authors>
     <owners>Xamarin Inc.</owners>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
@@ -15,28 +15,28 @@
   </metadata>
   <files>
     <!-- the platform specific -->
-    <file src="output/mac/SkiaSharp.dll" target="lib\net45" />
-    <file src="output/mac/SkiaSharp.dll.config" target="lib\net45" />
-    <file src="output/docs/msxml/SkiaSharp.xml" target="lib\net45" />
-    <file src="output/android/SkiaSharp.dll" target="lib\MonoAndroid" />
-    <file src="output/docs/msxml/SkiaSharp.xml" target="lib\MonoAndroid" />
-    <file src="output/ios/SkiaSharp.dll" target="lib\XamariniOS" />
-    <file src="output/docs/msxml/SkiaSharp.xml" target="lib\XamariniOS" />
-    <file src="output/osx/SkiaSharp.dll" target="lib\XamarinMac" />
-    <file src="output/docs/msxml/SkiaSharp.xml" target="lib\XamarinMac" />
+    <file src="output/mac/SkiaSharp.dll" target="lib/net45" />
+    <file src="output/mac/SkiaSharp.dll.config" target="lib/net45" />
+    <file src="output/docs/msxml/SkiaSharp.xml" target="lib/net45" />
+    <file src="output/android/SkiaSharp.dll" target="lib/MonoAndroid" />
+    <file src="output/docs/msxml/SkiaSharp.xml" target="lib/MonoAndroid" />
+    <file src="output/ios/SkiaSharp.dll" target="lib/XamariniOS" />
+    <file src="output/docs/msxml/SkiaSharp.xml" target="lib/XamariniOS" />
+    <file src="output/osx/SkiaSharp.dll" target="lib/XamarinMac" />
+    <file src="output/docs/msxml/SkiaSharp.xml" target="lib/XamarinMac" />
     
     <!-- the PCL -->
-    <file src="output/portable/SkiaSharp.dll" target="lib\portable-net45+xamarinmac+xamarinios+monotouch+monoandroid+win8+wpa81+wp8+xamarin.watchos+xamarin.tvos" />
-    <file src="output/docs/msxml/SkiaSharp.xml" target="lib\portable-net45+xamarinmac+xamarinios+monotouch+monoandroid+win8+wpa81+wp8+xamarin.watchos+xamarin.tvos" />
+    <file src="output/portable/SkiaSharp.dll" target="lib/portable-net45+xamarinmac+xamarinios+monotouch+monoandroid+win8+wpa81+wp8+xamarin.watchos+xamarin.tvos" />
+    <file src="output/docs/msxml/SkiaSharp.xml" target="lib/portable-net45+xamarinmac+xamarinios+monotouch+monoandroid+win8+wpa81+wp8+xamarin.watchos+xamarin.tvos" />
     
     <!-- the build bits -->
     <!-- .NET 4.5 -->
-    <file src="output/mac/SkiaSharp.Desktop.targets" target="build\net45\SkiaSharp.Mac.targets" />
+    <file src="output/mac/SkiaSharp.Desktop.targets" target="build/net45/SkiaSharp.Mac.targets" />
     <!-- .NET 4.5 (OS X) -->
-    <file src="output/mac/libSkiaSharp.dylib" target="build\net45\mac\libSkiaSharp.dylib" />
-    <file src="output/mac/SkiaSharp.dll.config" target="build\net45\SkiaSharp.dll.config" />
+    <file src="output/mac/libSkiaSharp.dylib" target="build/net45/mac/libSkiaSharp.dylib" />
+    <file src="output/mac/SkiaSharp.dll.config" target="build/net45/SkiaSharp.dll.config" />
     <!-- OS X -->
-    <file src="output/osx/SkiaSharp.OSX.targets" target="build\XamarinMac\SkiaSharp.Mac.targets" />
-    <file src="output/osx/libSkiaSharp.dylib" target="build\XamarinMac\libSkiaSharp.dylib" />
+    <file src="output/osx/SkiaSharp.OSX.targets" target="build/XamarinMac/SkiaSharp.Mac.targets" />
+    <file src="output/osx/libSkiaSharp.dylib" target="build/XamarinMac/libSkiaSharp.dylib" />
   </files>
 </package>

nuget/SkiaSharp.Windows.nuspec

@@ -3,7 +3,7 @@
   <metadata>
     <id>SkiaSharp.Windows</id>
     <title>SkiaSharp for Windows</title>
-    <version>1.49.3.0-beta</version>
+    <version>1.49.4.0-beta3</version>
     <authors>Xamarin Inc.</authors>
     <owners>Xamarin Inc.</owners>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
@@ -15,26 +15,26 @@
   </metadata>
   <files>
     <!-- the platform specific -->
-    <file src="output/windows/SkiaSharp.dll" target="lib\net45" />
-    <file src="output/windows/SkiaSharp.dll.config" target="lib\net45" />
-    <file src="output/docs/msxml/SkiaSharp.xml" target="lib\net45" />
-    <file src="output/uwp/SkiaSharp.dll" target="lib\uap10.0" />
-    <file src="output/docs/msxml/SkiaSharp.xml" target="lib\uap10.0" />
+    <file src="output/windows/SkiaSharp.dll" target="lib/net45" />
+    <file src="output/windows/SkiaSharp.dll.config" target="lib/net45" />
+    <file src="output/docs/msxml/SkiaSharp.xml" target="lib/net45" />
+    <file src="output/uwp/SkiaSharp.dll" target="lib/uap10.0" />
+    <file src="output/docs/msxml/SkiaSharp.xml" target="lib/uap10.0" />
     
     <!-- the PCL -->
-    <file src="output/portable/SkiaSharp.dll" target="lib\portable-net45+xamarinmac+xamarinios+monotouch+monoandroid+win8+wpa81+wp8+xamarin.watchos+xamarin.tvos" />
-    <file src="output/docs/msxml/SkiaSharp.xml" target="lib\portable-net45+xamarinmac+xamarinios+monotouch+monoandroid+win8+wpa81+wp8+xamarin.watchos+xamarin.tvos" />
+    <file src="output/portable/SkiaSharp.dll" target="lib/portable-net45+xamarinmac+xamarinios+monotouch+monoandroid+win8+wpa81+wp8+xamarin.watchos+xamarin.tvos" />
+    <file src="output/docs/msxml/SkiaSharp.xml" target="lib/portable-net45+xamarinmac+xamarinios+monotouch+monoandroid+win8+wpa81+wp8+xamarin.watchos+xamarin.tvos" />
     
     <!-- the build bits -->
     <!-- .NET 4.5 -->
-    <file src="output/windows/SkiaSharp.Desktop.targets" target="build\net45\SkiaSharp.Windows.targets" />
+    <file src="output/windows/SkiaSharp.Desktop.targets" target="build/net45/SkiaSharp.Windows.targets" />
     <!-- .NET 4.5 (Windows) -->
-    <file src="output/windows/x64/libSkiaSharp.dll" target="build\net45\x64\libSkiaSharp.dll" />
-    <file src="output/windows/x86/libSkiaSharp.dll" target="build\net45\x86\libSkiaSharp.dll" />
+    <file src="output/windows/x64/libSkiaSharp.dll" target="build/net45/x64/libSkiaSharp.dll" />
+    <file src="output/windows/x86/libSkiaSharp.dll" target="build/net45/x86/libSkiaSharp.dll" />
     <!-- UWP -->
-    <file src="output/uwp/SkiaSharp.UWP.targets" target="build\uap10.0\SkiaSharp.Windows.targets" />
-    <file src="output/uwp/x64/libSkiaSharp.dll" target="build\uap10.0\x64\libSkiaSharp.dll" />
-    <file src="output/uwp/x86/libSkiaSharp.dll" target="build\uap10.0\x86\libSkiaSharp.dll" />
-    <file src="output/uwp/arm/libSkiaSharp.dll" target="build\uap10.0\arm\libSkiaSharp.dll" />
+    <file src="output/uwp/SkiaSharp.UWP.targets" target="build/uap10.0/SkiaSharp.Windows.targets" />
+    <file src="output/uwp/x64/libSkiaSharp.dll" target="build/uap10.0/x64/libSkiaSharp.dll" />
+    <file src="output/uwp/x86/libSkiaSharp.dll" target="build/uap10.0/x86/libSkiaSharp.dll" />
+    <file src="output/uwp/arm/libSkiaSharp.dll" target="build/uap10.0/arm/libSkiaSharp.dll" />
   </files>
 </package>

nuget/SkiaSharp.nuspec

@@ -3,7 +3,7 @@
   <metadata>
     <id>SkiaSharp</id>
     <title>SkiaSharp</title>
-    <version>1.49.3.0-beta</version>
+    <version>1.49.4.0-beta3</version>
     <authors>Xamarin Inc.</authors>
     <owners>Xamarin Inc.</owners>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
@@ -15,38 +15,38 @@
   </metadata>
   <files>
     <!-- the platform specific -->
-    <file src="output/mac/SkiaSharp.dll" target="lib\net45" />
-    <file src="output/mac/SkiaSharp.dll.config" target="lib\net45" />
-    <file src="output/docs/msxml/SkiaSharp.xml" target="lib\net45" />
-    <file src="output/android/SkiaSharp.dll" target="lib\MonoAndroid" />
-    <file src="output/docs/msxml/SkiaSharp.xml" target="lib\MonoAndroid" />
-    <file src="output/ios/SkiaSharp.dll" target="lib\XamariniOS" />
-    <file src="output/docs/msxml/SkiaSharp.xml" target="lib\XamariniOS" />
-    <file src="output/osx/SkiaSharp.dll" target="lib\XamarinMac" />
-    <file src="output/docs/msxml/SkiaSharp.xml" target="lib\XamarinMac" />
-    <file src="output/uwp/SkiaSharp.dll" target="lib\uap10.0" />
-    <file src="output/docs/msxml/SkiaSharp.xml" target="lib\uap10.0" />
+    <file src="output/mac/SkiaSharp.dll" target="lib/net45" />
+    <file src="output/mac/SkiaSharp.dll.config" target="lib/net45" />
+    <file src="output/docs/msxml/SkiaSharp.xml" target="lib/net45" />
+    <file src="output/android/SkiaSharp.dll" target="lib/MonoAndroid" />
+    <file src="output/docs/msxml/SkiaSharp.xml" target="lib/MonoAndroid" />
+    <file src="output/ios/SkiaSharp.dll" target="lib/XamariniOS" />
+    <file src="output/docs/msxml/SkiaSharp.xml" target="lib/XamariniOS" />
+    <file src="output/osx/SkiaSharp.dll" target="lib/XamarinMac" />
+    <file src="output/docs/msxml/SkiaSharp.xml" target="lib/XamarinMac" />
+    <file src="output/uwp/SkiaSharp.dll" target="lib/uap10.0" />
+    <file src="output/docs/msxml/SkiaSharp.xml" target="lib/uap10.0" />
     
     <!-- the PCL -->
-    <file src="output/portable/SkiaSharp.dll" target="lib\portable-net45+xamarinmac+xamarinios+monotouch+monoandroid+win8+wpa81+wp8+xamarin.watchos+xamarin.tvos" />
-    <file src="output/docs/msxml/SkiaSharp.xml" target="lib\portable-net45+xamarinmac+xamarinios+monotouch+monoandroid+win8+wpa81+wp8+xamarin.watchos+xamarin.tvos" />
+    <file src="output/portable/SkiaSharp.dll" target="lib/portable-net45+xamarinmac+xamarinios+monotouch+monoandroid+win8+wpa81+wp8+xamarin.watchos+xamarin.tvos" />
+    <file src="output/docs/msxml/SkiaSharp.xml" target="lib/portable-net45+xamarinmac+xamarinios+monotouch+monoandroid+win8+wpa81+wp8+xamarin.watchos+xamarin.tvos" />
     
     <!-- the build bits -->
     <!-- .NET 4.5 -->
-    <file src="output/mac/SkiaSharp.Desktop.targets" target="build\net45\SkiaSharp.targets" />
+    <file src="output/mac/SkiaSharp.Desktop.targets" target="build/net45/SkiaSharp.targets" />
     <!-- .NET 4.5 (Windows) -->
-    <file src="output/windows/x64/libSkiaSharp.dll" target="build\net45\x64\libSkiaSharp.dll" />
-    <file src="output/windows/x86/libSkiaSharp.dll" target="build\net45\x86\libSkiaSharp.dll" />
+    <file src="output/windows/x64/libSkiaSharp.dll" target="build/net45/x64/libSkiaSharp.dll" />
+    <file src="output/windows/x86/libSkiaSharp.dll" target="build/net45/x86/libSkiaSharp.dll" />
     <!-- .NET 4.5 (OS X) -->
-    <file src="output/mac/libSkiaSharp.dylib" target="build\net45\mac\libSkiaSharp.dylib" />
-    <file src="output/mac/SkiaSharp.dll.config" target="build\net45\SkiaSharp.dll.config" />
+    <file src="output/mac/libSkiaSharp.dylib" target="build/net45/mac/libSkiaSharp.dylib" />
+    <file src="output/mac/SkiaSharp.dll.config" target="build/net45/SkiaSharp.dll.config" />
     <!-- OS X -->
-    <file src="output/osx/SkiaSharp.OSX.targets" target="build\XamarinMac\SkiaSharp.targets" />
-    <file src="output/osx/libSkiaSharp.dylib" target="build\XamarinMac\libSkiaSharp.dylib" />
+    <file src="output/osx/SkiaSharp.OSX.targets" target="build/XamarinMac/SkiaSharp.targets" />
+    <file src="output/osx/libSkiaSharp.dylib" target="build/XamarinMac/libSkiaSharp.dylib" />
     <!-- UWP -->
-    <file src="output/uwp/SkiaSharp.UWP.targets" target="build\uap10.0\SkiaSharp.targets" />
-    <file src="output/uwp/x64/libSkiaSharp.dll" target="build\uap10.0\x64\libSkiaSharp.dll" />
-    <file src="output/uwp/x86/libSkiaSharp.dll" target="build\uap10.0\x86\libSkiaSharp.dll" />
-    <file src="output/uwp/arm/libSkiaSharp.dll" target="build\uap10.0\arm\libSkiaSharp.dll" />
+    <file src="output/uwp/SkiaSharp.UWP.targets" target="build/uap10.0/SkiaSharp.targets" />
+    <file src="output/uwp/x64/libSkiaSharp.dll" target="build/uap10.0/x64/libSkiaSharp.dll" />
+    <file src="output/uwp/x86/libSkiaSharp.dll" target="build/uap10.0/x86/libSkiaSharp.dll" />
+    <file src="output/uwp/arm/libSkiaSharp.dll" target="build/uap10.0/arm/libSkiaSharp.dll" />
   </files>
 </package>

samples/SharedDemo/SkiaSharp.Demos.cs

@@ -289,8 +289,8 @@ namespace SkiaSharp
 					canvas.DrawText (text, 50, 50, paint);
 				}
 
-				using (var stream = new SKFileStream (CustomFontPath))
-				using (var tf = SKTypeface.FromStream (stream)) {
+				var fileStream = new SKFileStream (CustomFontPath);
+				using (var tf = SKTypeface.FromStream (fileStream)) {
 					paint.Color = XamDkBlue;
 					paint.TextSize = 60;
 					paint.Typeface = tf;
@@ -305,7 +305,7 @@ namespace SkiaSharp
 				using (var memory = new MemoryStream ()) {
 					resource.CopyTo (memory);
 					var bytes = memory.ToArray ();
-					using (var stream = new SKMemoryStream (bytes))
+					var stream = new SKMemoryStream (bytes);
 					using (var tf = SKTypeface.FromStream (stream)) {
 						paint.Color = XamLtBlue;
 						paint.TextSize = 60;
@@ -315,9 +315,9 @@ namespace SkiaSharp
 					}
 				}
 
-				using (var resource = assembly.GetManifestResourceStream (fontName))
-				using (var stream = new SKManagedStream (resource))
-				using (var tf = SKTypeface.FromStream (stream)) {
+				var managedResource = assembly.GetManifestResourceStream (fontName);
+				var managedStream = new SKManagedStream (managedResource, true);
+				using (var tf = SKTypeface.FromStream (managedStream)) {
 					paint.Color = XamPurple;
 					paint.TextSize = 60;
 					paint.Typeface = tf;

samples/Skia.Forms.Demo/Skia.Forms.Demo.Mac.sln

@@ -0,0 +1,118 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.25123.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Skia.Forms.Demo", "Skia.Forms.Demo.csproj", "{F750563C-EF08-4BCB-AF58-C98C307B01B5}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Skia.Forms.Demo.iOS", "iOS\Skia.Forms.Demo.iOS.csproj", "{70C7A375-2DF5-4E33-9A92-149F46DBB944}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Skia.Forms.Demo.Droid", "Droid\Skia.Forms.Demo.Droid.csproj", "{E2A02581-8F55-400F-951C-691EADFD7D3A}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Debug|ARM = Debug|ARM
+		Debug|iPhone = Debug|iPhone
+		Debug|iPhoneSimulator = Debug|iPhoneSimulator
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
+		Release|ARM = Release|ARM
+		Release|iPhone = Release|iPhone
+		Release|iPhoneSimulator = Release|iPhoneSimulator
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{F750563C-EF08-4BCB-AF58-C98C307B01B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F750563C-EF08-4BCB-AF58-C98C307B01B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F750563C-EF08-4BCB-AF58-C98C307B01B5}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{F750563C-EF08-4BCB-AF58-C98C307B01B5}.Debug|ARM.Build.0 = Debug|Any CPU
+		{F750563C-EF08-4BCB-AF58-C98C307B01B5}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{F750563C-EF08-4BCB-AF58-C98C307B01B5}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{F750563C-EF08-4BCB-AF58-C98C307B01B5}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{F750563C-EF08-4BCB-AF58-C98C307B01B5}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{F750563C-EF08-4BCB-AF58-C98C307B01B5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F750563C-EF08-4BCB-AF58-C98C307B01B5}.Debug|x64.Build.0 = Debug|Any CPU
+		{F750563C-EF08-4BCB-AF58-C98C307B01B5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F750563C-EF08-4BCB-AF58-C98C307B01B5}.Debug|x86.Build.0 = Debug|Any CPU
+		{F750563C-EF08-4BCB-AF58-C98C307B01B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F750563C-EF08-4BCB-AF58-C98C307B01B5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F750563C-EF08-4BCB-AF58-C98C307B01B5}.Release|ARM.ActiveCfg = Release|Any CPU
+		{F750563C-EF08-4BCB-AF58-C98C307B01B5}.Release|ARM.Build.0 = Release|Any CPU
+		{F750563C-EF08-4BCB-AF58-C98C307B01B5}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{F750563C-EF08-4BCB-AF58-C98C307B01B5}.Release|iPhone.Build.0 = Release|Any CPU
+		{F750563C-EF08-4BCB-AF58-C98C307B01B5}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{F750563C-EF08-4BCB-AF58-C98C307B01B5}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{F750563C-EF08-4BCB-AF58-C98C307B01B5}.Release|iPhoneSimulator.Deploy.0 = Release|Any CPU
+		{F750563C-EF08-4BCB-AF58-C98C307B01B5}.Release|x64.ActiveCfg = Release|Any CPU
+		{F750563C-EF08-4BCB-AF58-C98C307B01B5}.Release|x64.Build.0 = Release|Any CPU
+		{F750563C-EF08-4BCB-AF58-C98C307B01B5}.Release|x86.ActiveCfg = Release|Any CPU
+		{F750563C-EF08-4BCB-AF58-C98C307B01B5}.Release|x86.Build.0 = Release|Any CPU
+		{70C7A375-2DF5-4E33-9A92-149F46DBB944}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator
+		{70C7A375-2DF5-4E33-9A92-149F46DBB944}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator
+		{70C7A375-2DF5-4E33-9A92-149F46DBB944}.Debug|ARM.ActiveCfg = Debug|iPhone
+		{70C7A375-2DF5-4E33-9A92-149F46DBB944}.Debug|ARM.Build.0 = Debug|iPhone
+		{70C7A375-2DF5-4E33-9A92-149F46DBB944}.Debug|iPhone.ActiveCfg = Debug|iPhone
+		{70C7A375-2DF5-4E33-9A92-149F46DBB944}.Debug|iPhone.Build.0 = Debug|iPhone
+		{70C7A375-2DF5-4E33-9A92-149F46DBB944}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
+		{70C7A375-2DF5-4E33-9A92-149F46DBB944}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
+		{70C7A375-2DF5-4E33-9A92-149F46DBB944}.Debug|x64.ActiveCfg = Debug|iPhoneSimulator
+		{70C7A375-2DF5-4E33-9A92-149F46DBB944}.Debug|x64.Build.0 = Debug|iPhoneSimulator
+		{70C7A375-2DF5-4E33-9A92-149F46DBB944}.Debug|x86.ActiveCfg = Debug|iPhoneSimulator
+		{70C7A375-2DF5-4E33-9A92-149F46DBB944}.Debug|x86.Build.0 = Debug|iPhoneSimulator
+		{70C7A375-2DF5-4E33-9A92-149F46DBB944}.Release|Any CPU.ActiveCfg = Release|iPhoneSimulator
+		{70C7A375-2DF5-4E33-9A92-149F46DBB944}.Release|Any CPU.Build.0 = Release|iPhoneSimulator
+		{70C7A375-2DF5-4E33-9A92-149F46DBB944}.Release|ARM.ActiveCfg = Release|iPhone
+		{70C7A375-2DF5-4E33-9A92-149F46DBB944}.Release|ARM.Build.0 = Release|iPhone
+		{70C7A375-2DF5-4E33-9A92-149F46DBB944}.Release|iPhone.ActiveCfg = Release|iPhone
+		{70C7A375-2DF5-4E33-9A92-149F46DBB944}.Release|iPhone.Build.0 = Release|iPhone
+		{70C7A375-2DF5-4E33-9A92-149F46DBB944}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
+		{70C7A375-2DF5-4E33-9A92-149F46DBB944}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
+		{70C7A375-2DF5-4E33-9A92-149F46DBB944}.Release|iPhoneSimulator.Deploy.0 = Release|iPhoneSimulator
+		{70C7A375-2DF5-4E33-9A92-149F46DBB944}.Release|x64.ActiveCfg = Release|iPhoneSimulator
+		{70C7A375-2DF5-4E33-9A92-149F46DBB944}.Release|x64.Build.0 = Release|iPhoneSimulator
+		{70C7A375-2DF5-4E33-9A92-149F46DBB944}.Release|x86.ActiveCfg = Release|iPhoneSimulator
+		{70C7A375-2DF5-4E33-9A92-149F46DBB944}.Release|x86.Build.0 = Release|iPhoneSimulator
+		{E2A02581-8F55-400F-951C-691EADFD7D3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E2A02581-8F55-400F-951C-691EADFD7D3A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E2A02581-8F55-400F-951C-691EADFD7D3A}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+		{E2A02581-8F55-400F-951C-691EADFD7D3A}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{E2A02581-8F55-400F-951C-691EADFD7D3A}.Debug|ARM.Build.0 = Debug|Any CPU
+		{E2A02581-8F55-400F-951C-691EADFD7D3A}.Debug|ARM.Deploy.0 = Debug|Any CPU
+		{E2A02581-8F55-400F-951C-691EADFD7D3A}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{E2A02581-8F55-400F-951C-691EADFD7D3A}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{E2A02581-8F55-400F-951C-691EADFD7D3A}.Debug|iPhone.Deploy.0 = Debug|Any CPU
+		{E2A02581-8F55-400F-951C-691EADFD7D3A}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{E2A02581-8F55-400F-951C-691EADFD7D3A}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{E2A02581-8F55-400F-951C-691EADFD7D3A}.Debug|iPhoneSimulator.Deploy.0 = Debug|Any CPU
+		{E2A02581-8F55-400F-951C-691EADFD7D3A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E2A02581-8F55-400F-951C-691EADFD7D3A}.Debug|x64.Build.0 = Debug|Any CPU
+		{E2A02581-8F55-400F-951C-691EADFD7D3A}.Debug|x64.Deploy.0 = Debug|Any CPU
+		{E2A02581-8F55-400F-951C-691EADFD7D3A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E2A02581-8F55-400F-951C-691EADFD7D3A}.Debug|x86.Build.0 = Debug|Any CPU
+		{E2A02581-8F55-400F-951C-691EADFD7D3A}.Debug|x86.Deploy.0 = Debug|Any CPU
+		{E2A02581-8F55-400F-951C-691EADFD7D3A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E2A02581-8F55-400F-951C-691EADFD7D3A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E2A02581-8F55-400F-951C-691EADFD7D3A}.Release|Any CPU.Deploy.0 = Release|Any CPU
+		{E2A02581-8F55-400F-951C-691EADFD7D3A}.Release|ARM.ActiveCfg = Release|Any CPU
+		{E2A02581-8F55-400F-951C-691EADFD7D3A}.Release|ARM.Build.0 = Release|Any CPU
+		{E2A02581-8F55-400F-951C-691EADFD7D3A}.Release|ARM.Deploy.0 = Release|Any CPU
+		{E2A02581-8F55-400F-951C-691EADFD7D3A}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{E2A02581-8F55-400F-951C-691EADFD7D3A}.Release|iPhone.Build.0 = Release|Any CPU
+		{E2A02581-8F55-400F-951C-691EADFD7D3A}.Release|iPhone.Deploy.0 = Release|Any CPU
+		{E2A02581-8F55-400F-951C-691EADFD7D3A}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{E2A02581-8F55-400F-951C-691EADFD7D3A}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{E2A02581-8F55-400F-951C-691EADFD7D3A}.Release|iPhoneSimulator.Deploy.0 = Release|Any CPU
+		{E2A02581-8F55-400F-951C-691EADFD7D3A}.Release|x64.ActiveCfg = Release|Any CPU
+		{E2A02581-8F55-400F-951C-691EADFD7D3A}.Release|x64.Build.0 = Release|Any CPU
+		{E2A02581-8F55-400F-951C-691EADFD7D3A}.Release|x64.Deploy.0 = Release|Any CPU
+		{E2A02581-8F55-400F-951C-691EADFD7D3A}.Release|x86.ActiveCfg = Release|Any CPU
+		{E2A02581-8F55-400F-951C-691EADFD7D3A}.Release|x86.Build.0 = Release|Any CPU
+		{E2A02581-8F55-400F-951C-691EADFD7D3A}.Release|x86.Deploy.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

samples/Skia.Forms.Demo/Skia.Forms.Demo.Windows.sln

@@ -0,0 +1,129 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.25123.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Skia.Forms.Demo", "Skia.Forms.Demo.csproj", "{F750563C-EF08-4BCB-AF58-C98C307B01B5}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Skia.Forms.Demo.Droid", "Droid\Skia.Forms.Demo.Droid.csproj", "{E2A02581-8F55-400F-951C-691EADFD7D3A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Skia.Forms.Demo.UWP", "UWP\Skia.Forms.Demo.UWP.csproj", "{73D4386D-3DF8-42A9-AA38-73ADF4A1E5BD}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Debug|ARM = Debug|ARM
+		Debug|iPhone = Debug|iPhone
+		Debug|iPhoneSimulator = Debug|iPhoneSimulator
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
+		Release|ARM = Release|ARM
+		Release|iPhone = Release|iPhone
+		Release|iPhoneSimulator = Release|iPhoneSimulator
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{F750563C-EF08-4BCB-AF58-C98C307B01B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F750563C-EF08-4BCB-AF58-C98C307B01B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F750563C-EF08-4BCB-AF58-C98C307B01B5}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{F750563C-EF08-4BCB-AF58-C98C307B01B5}.Debug|ARM.Build.0 = Debug|Any CPU
+		{F750563C-EF08-4BCB-AF58-C98C307B01B5}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{F750563C-EF08-4BCB-AF58-C98C307B01B5}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{F750563C-EF08-4BCB-AF58-C98C307B01B5}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{F750563C-EF08-4BCB-AF58-C98C307B01B5}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{F750563C-EF08-4BCB-AF58-C98C307B01B5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F750563C-EF08-4BCB-AF58-C98C307B01B5}.Debug|x64.Build.0 = Debug|Any CPU
+		{F750563C-EF08-4BCB-AF58-C98C307B01B5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F750563C-EF08-4BCB-AF58-C98C307B01B5}.Debug|x86.Build.0 = Debug|Any CPU
+		{F750563C-EF08-4BCB-AF58-C98C307B01B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F750563C-EF08-4BCB-AF58-C98C307B01B5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F750563C-EF08-4BCB-AF58-C98C307B01B5}.Release|ARM.ActiveCfg = Release|Any CPU
+		{F750563C-EF08-4BCB-AF58-C98C307B01B5}.Release|ARM.Build.0 = Release|Any CPU
+		{F750563C-EF08-4BCB-AF58-C98C307B01B5}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{F750563C-EF08-4BCB-AF58-C98C307B01B5}.Release|iPhone.Build.0 = Release|Any CPU
+		{F750563C-EF08-4BCB-AF58-C98C307B01B5}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{F750563C-EF08-4BCB-AF58-C98C307B01B5}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{F750563C-EF08-4BCB-AF58-C98C307B01B5}.Release|iPhoneSimulator.Deploy.0 = Release|Any CPU
+		{F750563C-EF08-4BCB-AF58-C98C307B01B5}.Release|x64.ActiveCfg = Release|Any CPU
+		{F750563C-EF08-4BCB-AF58-C98C307B01B5}.Release|x64.Build.0 = Release|Any CPU
+		{F750563C-EF08-4BCB-AF58-C98C307B01B5}.Release|x86.ActiveCfg = Release|Any CPU
+		{F750563C-EF08-4BCB-AF58-C98C307B01B5}.Release|x86.Build.0 = Release|Any CPU
+		{E2A02581-8F55-400F-951C-691EADFD7D3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E2A02581-8F55-400F-951C-691EADFD7D3A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E2A02581-8F55-400F-951C-691EADFD7D3A}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+		{E2A02581-8F55-400F-951C-691EADFD7D3A}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{E2A02581-8F55-400F-951C-691EADFD7D3A}.Debug|ARM.Build.0 = Debug|Any CPU
+		{E2A02581-8F55-400F-951C-691EADFD7D3A}.Debug|ARM.Deploy.0 = Debug|Any CPU
+		{E2A02581-8F55-400F-951C-691EADFD7D3A}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{E2A02581-8F55-400F-951C-691EADFD7D3A}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{E2A02581-8F55-400F-951C-691EADFD7D3A}.Debug|iPhone.Deploy.0 = Debug|Any CPU
+		{E2A02581-8F55-400F-951C-691EADFD7D3A}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{E2A02581-8F55-400F-951C-691EADFD7D3A}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{E2A02581-8F55-400F-951C-691EADFD7D3A}.Debug|iPhoneSimulator.Deploy.0 = Debug|Any CPU
+		{E2A02581-8F55-400F-951C-691EADFD7D3A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E2A02581-8F55-400F-951C-691EADFD7D3A}.Debug|x64.Build.0 = Debug|Any CPU
+		{E2A02581-8F55-400F-951C-691EADFD7D3A}.Debug|x64.Deploy.0 = Debug|Any CPU
+		{E2A02581-8F55-400F-951C-691EADFD7D3A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E2A02581-8F55-400F-951C-691EADFD7D3A}.Debug|x86.Build.0 = Debug|Any CPU
+		{E2A02581-8F55-400F-951C-691EADFD7D3A}.Debug|x86.Deploy.0 = Debug|Any CPU
+		{E2A02581-8F55-400F-951C-691EADFD7D3A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E2A02581-8F55-400F-951C-691EADFD7D3A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E2A02581-8F55-400F-951C-691EADFD7D3A}.Release|Any CPU.Deploy.0 = Release|Any CPU
+		{E2A02581-8F55-400F-951C-691EADFD7D3A}.Release|ARM.ActiveCfg = Release|Any CPU
+		{E2A02581-8F55-400F-951C-691EADFD7D3A}.Release|ARM.Build.0 = Release|Any CPU
+		{E2A02581-8F55-400F-951C-691EADFD7D3A}.Release|ARM.Deploy.0 = Release|Any CPU
+		{E2A02581-8F55-400F-951C-691EADFD7D3A}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{E2A02581-8F55-400F-951C-691EADFD7D3A}.Release|iPhone.Build.0 = Release|Any CPU
+		{E2A02581-8F55-400F-951C-691EADFD7D3A}.Release|iPhone.Deploy.0 = Release|Any CPU
+		{E2A02581-8F55-400F-951C-691EADFD7D3A}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{E2A02581-8F55-400F-951C-691EADFD7D3A}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{E2A02581-8F55-400F-951C-691EADFD7D3A}.Release|iPhoneSimulator.Deploy.0 = Release|Any CPU
+		{E2A02581-8F55-400F-951C-691EADFD7D3A}.Release|x64.ActiveCfg = Release|Any CPU
+		{E2A02581-8F55-400F-951C-691EADFD7D3A}.Release|x64.Build.0 = Release|Any CPU
+		{E2A02581-8F55-400F-951C-691EADFD7D3A}.Release|x64.Deploy.0 = Release|Any CPU
+		{E2A02581-8F55-400F-951C-691EADFD7D3A}.Release|x86.ActiveCfg = Release|Any CPU
+		{E2A02581-8F55-400F-951C-691EADFD7D3A}.Release|x86.Build.0 = Release|Any CPU
+		{E2A02581-8F55-400F-951C-691EADFD7D3A}.Release|x86.Deploy.0 = Release|Any CPU
+		{73D4386D-3DF8-42A9-AA38-73ADF4A1E5BD}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{73D4386D-3DF8-42A9-AA38-73ADF4A1E5BD}.Debug|Any CPU.Build.0 = Debug|x64
+		{73D4386D-3DF8-42A9-AA38-73ADF4A1E5BD}.Debug|Any CPU.Deploy.0 = Debug|x64
+		{73D4386D-3DF8-42A9-AA38-73ADF4A1E5BD}.Debug|ARM.ActiveCfg = Debug|ARM
+		{73D4386D-3DF8-42A9-AA38-73ADF4A1E5BD}.Debug|ARM.Build.0 = Debug|ARM
+		{73D4386D-3DF8-42A9-AA38-73ADF4A1E5BD}.Debug|ARM.Deploy.0 = Debug|ARM
+		{73D4386D-3DF8-42A9-AA38-73ADF4A1E5BD}.Debug|iPhone.ActiveCfg = Debug|ARM
+		{73D4386D-3DF8-42A9-AA38-73ADF4A1E5BD}.Debug|iPhone.Build.0 = Debug|ARM
+		{73D4386D-3DF8-42A9-AA38-73ADF4A1E5BD}.Debug|iPhone.Deploy.0 = Debug|ARM
+		{73D4386D-3DF8-42A9-AA38-73ADF4A1E5BD}.Debug|iPhoneSimulator.ActiveCfg = Debug|x64
+		{73D4386D-3DF8-42A9-AA38-73ADF4A1E5BD}.Debug|iPhoneSimulator.Build.0 = Debug|x64
+		{73D4386D-3DF8-42A9-AA38-73ADF4A1E5BD}.Debug|iPhoneSimulator.Deploy.0 = Debug|x64
+		{73D4386D-3DF8-42A9-AA38-73ADF4A1E5BD}.Debug|x64.ActiveCfg = Debug|x64
+		{73D4386D-3DF8-42A9-AA38-73ADF4A1E5BD}.Debug|x64.Build.0 = Debug|x64
+		{73D4386D-3DF8-42A9-AA38-73ADF4A1E5BD}.Debug|x64.Deploy.0 = Debug|x64
+		{73D4386D-3DF8-42A9-AA38-73ADF4A1E5BD}.Debug|x86.ActiveCfg = Debug|x86
+		{73D4386D-3DF8-42A9-AA38-73ADF4A1E5BD}.Debug|x86.Build.0 = Debug|x86
+		{73D4386D-3DF8-42A9-AA38-73ADF4A1E5BD}.Debug|x86.Deploy.0 = Debug|x86
+		{73D4386D-3DF8-42A9-AA38-73ADF4A1E5BD}.Release|Any CPU.ActiveCfg = Release|x64
+		{73D4386D-3DF8-42A9-AA38-73ADF4A1E5BD}.Release|Any CPU.Build.0 = Release|x64
+		{73D4386D-3DF8-42A9-AA38-73ADF4A1E5BD}.Release|Any CPU.Deploy.0 = Release|x64
+		{73D4386D-3DF8-42A9-AA38-73ADF4A1E5BD}.Release|ARM.ActiveCfg = Release|ARM
+		{73D4386D-3DF8-42A9-AA38-73ADF4A1E5BD}.Release|ARM.Build.0 = Release|ARM
+		{73D4386D-3DF8-42A9-AA38-73ADF4A1E5BD}.Release|ARM.Deploy.0 = Release|ARM
+		{73D4386D-3DF8-42A9-AA38-73ADF4A1E5BD}.Release|iPhone.ActiveCfg = Release|ARM
+		{73D4386D-3DF8-42A9-AA38-73ADF4A1E5BD}.Release|iPhone.Build.0 = Release|ARM
+		{73D4386D-3DF8-42A9-AA38-73ADF4A1E5BD}.Release|iPhone.Deploy.0 = Release|ARM
+		{73D4386D-3DF8-42A9-AA38-73ADF4A1E5BD}.Release|iPhoneSimulator.ActiveCfg = Release|x64
+		{73D4386D-3DF8-42A9-AA38-73ADF4A1E5BD}.Release|iPhoneSimulator.Build.0 = Release|x64
+		{73D4386D-3DF8-42A9-AA38-73ADF4A1E5BD}.Release|iPhoneSimulator.Deploy.0 = Release|x64
+		{73D4386D-3DF8-42A9-AA38-73ADF4A1E5BD}.Release|x64.ActiveCfg = Release|x64
+		{73D4386D-3DF8-42A9-AA38-73ADF4A1E5BD}.Release|x64.Build.0 = Release|x64
+		{73D4386D-3DF8-42A9-AA38-73ADF4A1E5BD}.Release|x64.Deploy.0 = Release|x64
+		{73D4386D-3DF8-42A9-AA38-73ADF4A1E5BD}.Release|x86.ActiveCfg = Release|x86
+		{73D4386D-3DF8-42A9-AA38-73ADF4A1E5BD}.Release|x86.Build.0 = Release|x86
+		{73D4386D-3DF8-42A9-AA38-73ADF4A1E5BD}.Release|x86.Deploy.0 = Release|x86
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

samples/Skia.Forms.Demo/UWP/Package.appxmanifest

@@ -1,48 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<Package
-  xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
-  xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
-  xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
-  IgnorableNamespaces="uap mp">
-
-  <Identity
-    Name="f736c883-f105-4d30-a719-4bf328872f5e"
-    Publisher="CN=joaqu"
-    Version="1.0.0.0" />
-
-  <mp:PhoneIdentity PhoneProductId="f736c883-f105-4d30-a719-4bf328872f5e" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
-
+<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
+  <Identity Name="f736c883-f105-4d30-a719-4bf328872f5e" Publisher="CN=Xamarin" Version="1.0.0.0" />
+  <mp:PhoneIdentity PhoneProductId="f736c883-f105-4d30-a719-4bf328872f5e" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
     <DisplayName>FPCL.WIndows</DisplayName>
     <PublisherDisplayName>joaqu</PublisherDisplayName>
     <Logo>Assets\StoreLogo.png</Logo>
   </Properties>
-
   <Dependencies>
     <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
   </Dependencies>
-
   <Resources>
-    <Resource Language="x-generate"/>
+    <Resource Language="x-generate" />
   </Resources>
-
   <Applications>
-    <Application Id="App"
-      Executable="$targetnametoken$.exe"
-      EntryPoint="FPCL.WIndows.App">
-      <uap:VisualElements
-        DisplayName="FPCL.WIndows"
-        Square150x150Logo="Assets\Square150x150Logo.png"
-        Square44x44Logo="Assets\Square44x44Logo.png"
-        Description="FPCL.WIndows"
-        BackgroundColor="transparent">
-        <uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png"/>
+    <Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="FPCL.WIndows.App">
+      <uap:VisualElements DisplayName="FPCL.WIndows" Square150x150Logo="Assets\Square150x150Logo.png" Square44x44Logo="Assets\Square44x44Logo.png" Description="FPCL.WIndows" BackgroundColor="transparent">
+        <uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png">
+        </uap:DefaultTile>
         <uap:SplashScreen Image="Assets\SplashScreen.png" />
       </uap:VisualElements>
     </Application>
   </Applications>
-
   <Capabilities>
     <Capability Name="internetClient" />
   </Capabilities>

samples/Skia.Forms.Demo/UWP/Skia.Forms.Demo.UWP.csproj

@@ -12,12 +12,13 @@
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
     <TargetPlatformVersion>10.0.10586.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.10586.0</TargetPlatformMinVersion>
+    <TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <EnableDotNetNativeCompatibleProfile>true</EnableDotNetNativeCompatibleProfile>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <PackageCertificateKeyFile>Windows_TemporaryKey.pfx</PackageCertificateKeyFile>
+    <PackageCertificateKeyFile>Skia.Forms.Demo.UWP_TemporaryKey.pfx</PackageCertificateKeyFile>
+    <PackageCertificateThumbprint>400D0C1C76165E9CB09A48D456440528FE6EB542</PackageCertificateThumbprint>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
     <DebugSymbols>true</DebugSymbols>
@@ -94,6 +95,7 @@
       <Link>Assets\content-font.ttf</Link>
     </Content>
     <None Include="project.json" />
+    <None Include="Skia.Forms.Demo.UWP_TemporaryKey.pfx" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="App.xaml.cs">
@@ -110,7 +112,6 @@
     <AppxManifest Include="Package.appxmanifest">
       <SubType>Designer</SubType>
     </AppxManifest>
-    <None Include="Windows_TemporaryKey.pfx" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Properties\Default.rd.xml" />

samples/Skia.UWP.Demo/Package.appxmanifest

@@ -1,48 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<Package
-  xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
-  xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
-  xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
-  IgnorableNamespaces="uap mp">
-
-  <Identity
-    Name="ba3af39c-4820-4731-a149-e78facd8bdff"
-    Publisher="CN=Matthew"
-    Version="1.0.0.0" />
-
-  <mp:PhoneIdentity PhoneProductId="ba3af39c-4820-4731-a149-e78facd8bdff" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
-
+<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
+  <Identity Name="ba3af39c-4820-4731-a149-e78facd8bdff" Publisher="CN=Xamarin" Version="1.0.0.0" />
+  <mp:PhoneIdentity PhoneProductId="ba3af39c-4820-4731-a149-e78facd8bdff" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
     <DisplayName>Skia.UWP.Demo</DisplayName>
     <PublisherDisplayName>Matthew</PublisherDisplayName>
     <Logo>Assets\StoreLogo.png</Logo>
   </Properties>
-
   <Dependencies>
     <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
   </Dependencies>
-
   <Resources>
-    <Resource Language="x-generate"/>
+    <Resource Language="x-generate" />
   </Resources>
-
   <Applications>
-    <Application Id="App"
-      Executable="$targetnametoken$.exe"
-      EntryPoint="Skia.UWP.Demo.App">
-      <uap:VisualElements
-        DisplayName="Skia.UWP.Demo"
-        Square150x150Logo="Assets\Square150x150Logo.png"
-        Square44x44Logo="Assets\Square44x44Logo.png"
-        Description="Skia.UWP.Demo"
-        BackgroundColor="transparent">
-        <uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png"/>
+    <Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="Skia.UWP.Demo.App">
+      <uap:VisualElements DisplayName="Skia.UWP.Demo" Square150x150Logo="Assets\Square150x150Logo.png" Square44x44Logo="Assets\Square44x44Logo.png" Description="Skia.UWP.Demo" BackgroundColor="transparent">
+        <uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png">
+        </uap:DefaultTile>
         <uap:SplashScreen Image="Assets\SplashScreen.png" />
       </uap:VisualElements>
     </Application>
   </Applications>
-
   <Capabilities>
     <Capability Name="internetClient" />
   </Capabilities>

samples/Skia.UWP.Demo/Skia.UWP.Demo.csproj

@@ -11,13 +11,13 @@
     <AssemblyName>Skia.UWP.Demo</AssemblyName>
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.10240.0</TargetPlatformVersion>
+    <TargetPlatformVersion>10.0.10586.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <PackageCertificateKeyFile>Skia.UWP.Demo_TemporaryKey.pfx</PackageCertificateKeyFile>
-    <PackageCertificateThumbprint>9B1FA5B13C53A89CC64E5350AA791CAAF06F1535</PackageCertificateThumbprint>
+    <PackageCertificateThumbprint>7679459654B72E51273C29F7CC1004A641B0304A</PackageCertificateThumbprint>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
@@ -103,6 +103,7 @@
       <Link>embedded-font.ttf</Link>
     </EmbeddedResource>
     <None Include="project.json" />
+    <None Include="Skia.UWP.Demo_TemporaryKey.pfx" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\SharedDemo\SkiaSharp.Demos.cs">
@@ -121,7 +122,6 @@
     <AppxManifest Include="Package.appxmanifest">
       <SubType>Designer</SubType>
     </AppxManifest>
-    <None Include="Skia.UWP.Demo_TemporaryKey.pfx" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Properties\Default.rd.xml" />

skia

@@ -1 +1 @@
-Subproject commit fbc0e18166b644c7eeee0cc7239be5999cdca58f
+Subproject commit deb4a7997785aa732d385d4dab2d799fb29033aa

tests/SkiaSharp.Desktop.Tests/SkiaSharp.Desktop.Tests.csproj

@@ -16,7 +16,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
+    <OutputPath>bin\AnyCPU\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -24,7 +24,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>bin\AnyCPU\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>