Merge pull request #76 from mono/windows-uwp-merge

Windows UWP Merge
2016-05-12 02:17:01 +02:00 · 2016-05-12 02:17:01 +02:00 · 53d5436f36
--- a/.gitignore
+++ b/.gitignore
@ -7,6 +7,7 @@ output/
 binding/SkiaSharp.Portable/SkiaPortable.cs
 docs/SkiaSharp.tree
 docs/SkiaSharp.zip
+*.VC.db

 # User-specific files
 *.suo
--- a/binding/Binding/Definitions.cs
+++ b/binding/Binding/Definitions.cs
@ -353,7 +353,7 @@ namespace SkiaSharp

 	[StructLayout(LayoutKind.Sequential)]
 	public struct SKSurfaceProps {
-		public SKPixelGeometry PixelGeometry { get; set; }
+		public SKPixelGeometry PixelGeometry;
 	}

 	[StructLayout(LayoutKind.Sequential)]
--- a/binding/Binding/SKObject.cs
+++ b/binding/Binding/SKObject.cs
@ -10,6 +10,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Linq;
 using System.Reflection;

 namespace SkiaSharp
@ -89,8 +90,9 @@ namespace SkiaSharp
 			// create a new wrapper 
 			// TODO: we could probably cache this
 			var type = typeof(TSkiaObject);
-			var binding = BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic;
-			var constructor = type.GetTypeInfo().GetConstructor(binding, null, new[] { typeof(IntPtr) }, null);
+			var constructor = type.GetTypeInfo().DeclaredConstructors.FirstOrDefault(c => 
+				c.GetParameters().Length == 1 && 
+				c.GetParameters()[0].ParameterType == typeof(IntPtr));
 			if (constructor == null)
 			{
 				throw new MissingMethodException("No constructor found for " + type.FullName + ".ctor(System.IntPtr)");
--- a/binding/Binding/SkiaApi.cs
+++ b/binding/Binding/SkiaApi.cs
@ -44,6 +44,8 @@ namespace SkiaSharp
 		const string SKIA = "libskia_osx.dylib";
 #elif DESKTOP
 		const string SKIA = "libskia_windows.dll"; // redirected using .dll.config to 'libskia_osx.dylib' on OS X
+#elif WINDOWS_UWP
+		const string SKIA = "libskia_uwp.dll";
 #else
 		const string SKIA = "path_to_native.library";
 #endif
--- a/binding/SkiaSharp.UWP/Properties/AssemblyInfo.cs
+++ b/binding/SkiaSharp.UWP/Properties/AssemblyInfo.cs
@ -0,0 +1 @@
+
--- a/binding/SkiaSharp.UWP/Properties/SkiaSharp.UWP.rd.xml
+++ b/binding/SkiaSharp.UWP/Properties/SkiaSharp.UWP.rd.xml
@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    This file contains Runtime Directives, specifications about types your application accesses
+    through reflection and other dynamic code patterns. Runtime Directives are used to control the
+    .NET Native optimizer and ensure that it does not remove code accessed by your library. If your
+    library does not do any reflection, then you generally do not need to edit this file. However,
+    if your library reflects over types, especially types passed to it or derived from its types,
+    then you should write Runtime Directives.
+
+    The most common use of reflection in libraries is to discover information about types passed
+    to the library. Runtime Directives have three ways to express requirements on types passed to
+    your library.
+
+    1.  Parameter, GenericParameter, TypeParameter, TypeEnumerableParameter
+        Use these directives to reflect over types passed as a parameter.
+
+    2.  SubTypes
+        Use a SubTypes directive to reflect over types derived from another type.
+
+    3.  AttributeImplies
+        Use an AttributeImplies directive to indicate that your library needs to reflect over
+        types or methods decorated with an attribute.
+
+    For more information on writing Runtime Directives for libraries, please visit
+    http://go.microsoft.com/fwlink/?LinkID=391919
+-->
+<Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">
+  <Library Name="SkiaSharp.UWP">
+
+  	<!-- add directives for your library here -->
+
+  </Library>
+</Directives>
--- a/binding/SkiaSharp.UWP/SkiaSharp.UWP.csproj
+++ b/binding/SkiaSharp.UWP/SkiaSharp.UWP.csproj
@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{BAB615AA-956E-4079-B260-DD7B1F52EC7D}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>SkiaSharp</RootNamespace>
+    <AssemblyName>SkiaSharp</AssemblyName>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
+    <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>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+  <ItemGroup>
+    <!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->
+    <None Include="..\..\native-builds\lib\uwp\arm\libskia_uwp.dll">
+      <Link>arm\libskia_uwp.dll</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\native-builds\lib\uwp\arm\libskia_uwp.lib">
+      <Link>arm\libskia_uwp.lib</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\native-builds\lib\uwp\arm\libskia_uwp.pdb">
+      <Link>arm\libskia_uwp.pdb</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\native-builds\lib\uwp\x64\libskia_uwp.dll">
+      <Link>x64\libskia_uwp.dll</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\native-builds\lib\uwp\x64\libskia_uwp.lib">
+      <Link>x64\libskia_uwp.lib</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\native-builds\lib\uwp\x64\libskia_uwp.pdb">
+      <Link>x64\libskia_uwp.pdb</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\native-builds\lib\uwp\x86\libskia_uwp.dll">
+      <Link>x86\libskia_uwp.dll</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\native-builds\lib\uwp\x86\libskia_uwp.lib">
+      <Link>x86\libskia_uwp.lib</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\native-builds\lib\uwp\x86\libskia_uwp.pdb">
+      <Link>x86\libskia_uwp.pdb</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="project.json" />
+    <None Include="SkiaSharp.UWP.targets">
+      <SubType>Designer</SubType>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <EmbeddedResource Include="Properties\SkiaSharp.UWP.rd.xml" />
+  </ItemGroup>
+  <Import Project="..\Binding\Binding.projitems" Label="Shared" />
+  <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
+    <VisualStudioVersion>14.0</VisualStudioVersion>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
--- a/binding/SkiaSharp.UWP/SkiaSharp.UWP.targets
+++ b/binding/SkiaSharp.UWP/SkiaSharp.UWP.targets
@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+    <ItemGroup Condition=" '$(Platform)' == 'x86' ">
+        <Content Include="$(MSBuildThisFileDirectory)x86\libskia_uwp.dll">
+            <Link>libskia_uwp.dll</Link>
+            <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+        </Content>
+    </ItemGroup>
+
+    <ItemGroup Condition=" '$(Platform)' == 'x64' ">
+        <Content Include="$(MSBuildThisFileDirectory)x64\libskia_uwp.dll">
+            <Link>libskia_uwp.dll</Link>
+            <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+        </Content>
+    </ItemGroup>
+
+    <ItemGroup Condition=" '$(Platform)' == 'ARM' ">
+        <Content Include="$(MSBuildThisFileDirectory)arm\libskia_uwp.dll">
+            <Link>libskia_uwp.dll</Link>
+            <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+        </Content>
+    </ItemGroup>
+    
+    <ItemGroup>
+        <SDKReference Include="Microsoft.VCLibs, Version=14.0">
+            <Name>Visual C++ 2015 Runtime for Universal Windows Platform Apps</Name>
+        </SDKReference>
+    </ItemGroup>
+    
+
+    <Target Condition=" '$(Platform)' != 'x64' and '$(Platform)' != 'x86' and '$(Platform)' != 'ARM' " 
+            Name="CheckSkiaPlatforms" 
+            BeforeTargets="Build">
+        <Error Text="The Platform needs to be either x64, x86 or ARM to support Skia in Windows." />
+    </Target>
+
+</Project>
--- a/binding/SkiaSharp.UWP/project.json
+++ b/binding/SkiaSharp.UWP/project.json
@ -0,0 +1,16 @@
+{
+  "dependencies": {
+    "Microsoft.NETCore.UniversalWindowsPlatform": "5.0.0"
+  },
+  "frameworks": {
+    "uap10.0": {}
+  },
+  "runtimes": {
+    "win10-arm": {},
+    "win10-arm-aot": {},
+    "win10-x86": {},
+    "win10-x86-aot": {},
+    "win10-x64": {},
+    "win10-x64-aot": {}
+  }
+}
--- a/binding/SkiaSharp.Windows.sln
+++ b/binding/SkiaSharp.Windows.sln
@ -1,7 +1,7 @@

 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.24720.0
+VisualStudioVersion = 14.0.25123.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Binding", "Binding\Binding.shproj", "{9C502B9A-25D4-473F-89BD-5A13DDE16354}"
 EndProject
@ -9,44 +9,31 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Portable", "SkiaS
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Desktop", "SkiaSharp.Desktop\SkiaSharp.Desktop.csproj", "{EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.UWP", "SkiaSharp.UWP\SkiaSharp.UWP.csproj", "{BAB615AA-956E-4079-B260-DD7B1F52EC7D}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		Binding\Binding.projitems*{9c502b9a-25d4-473f-89bd-5a13dde16354}*SharedItemsImports = 13
+		Binding\Binding.projitems*{bab615aa-956e-4079-b260-dd7b1f52ec7d}*SharedItemsImports = 4
 		Binding\Binding.projitems*{eb1bbdcc-fb07-40d5-8b9e-0079e2c2f2df}*SharedItemsImports = 4
 	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{7AA90628-2FDD-4585-AF2F-CC51CFA8B52A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7AA90628-2FDD-4585-AF2F-CC51CFA8B52A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7AA90628-2FDD-4585-AF2F-CC51CFA8B52A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7AA90628-2FDD-4585-AF2F-CC51CFA8B52A}.Debug|x64.Build.0 = Debug|Any CPU
-		{7AA90628-2FDD-4585-AF2F-CC51CFA8B52A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{7AA90628-2FDD-4585-AF2F-CC51CFA8B52A}.Debug|x86.Build.0 = Debug|Any CPU
 		{7AA90628-2FDD-4585-AF2F-CC51CFA8B52A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7AA90628-2FDD-4585-AF2F-CC51CFA8B52A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7AA90628-2FDD-4585-AF2F-CC51CFA8B52A}.Release|x64.ActiveCfg = Release|Any CPU
-		{7AA90628-2FDD-4585-AF2F-CC51CFA8B52A}.Release|x64.Build.0 = Release|Any CPU
-		{7AA90628-2FDD-4585-AF2F-CC51CFA8B52A}.Release|x86.ActiveCfg = Release|Any CPU
-		{7AA90628-2FDD-4585-AF2F-CC51CFA8B52A}.Release|x86.Build.0 = Release|Any CPU
 		{EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|x64.Build.0 = Debug|Any CPU
-		{EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|x86.Build.0 = Debug|Any CPU
 		{EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|x64.ActiveCfg = Release|Any CPU
-		{EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|x64.Build.0 = Release|Any CPU
-		{EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|x86.ActiveCfg = Release|Any CPU
-		{EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|x86.Build.0 = Release|Any CPU
+		{BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/bootstrapper.ps1
+++ b/bootstrapper.ps1
@ -35,15 +35,9 @@ if (!(Test-Path $TOOLS_DIR)) {
    New-Item -ItemType directory -Path $TOOLS_DIR | Out-Null
 }

-# Make sure packages.config exists where we expect it.
-if (!(Test-Path $PACKAGES_CONFIG)) {
-    #Invoke-WebRequest -Uri http://cakebuild.net/bootstrapper/packages -OutFile $PACKAGES_CONFIG
-    Copy-Item -Path cake.packages.config -Destination $PACKAGES_CONFIG
-}
-
 # Make sure NuGet exists where we expect it.
 if (!(Test-Path $NUGET_EXE)) {
-    Invoke-WebRequest -Uri http://nuget.org/nuget.exe -OutFile $NUGET_EXE
+    Invoke-WebRequest -Uri https://dist.nuget.org/win-x86-commandline/latest/nuget.exe -OutFile $NUGET_EXE
 }

 # Make sure NuGet exists where we expect it.
--- a/bootstrapper.sh
+++ b/bootstrapper.sh
@ -39,21 +39,10 @@ if [ ! -d $TOOLS_DIR ]; then
  mkdir $TOOLS_DIR
 fi

-# Make sure that packages.config exist.
-if [ ! -f $TOOLS_DIR/packages.config ]; then
-    #echo "Downloading packages.config..."
-    #curl -Lsfo $TOOLS_DIR/packages.config http://cakebuild.net/bootstrapper/packages
-    #if [ $? -ne 0 ]; then
-    #    echo "An error occured while downloading packages.config."
-    #    exit 1
-    #fi
-    cp cake.packages.config $TOOLS_DIR/packages.config
-fi
-
 # Download NuGet if it does not exist.
 if [ ! -f $NUGET_EXE ]; then
    echo "Downloading NuGet..."
-    curl -Lsfo $NUGET_EXE https://www.nuget.org/nuget.exe
+    curl -Lsfo $NUGET_EXE https://dist.nuget.org/win-x86-commandline/v2.8.6/nuget.exe
    if [ $? -ne 0 ]; then
        echo "An error occured while downloading nuget.exe."
        exit 1
--- a/build.cake
+++ b/build.cake
@ -16,7 +16,7 @@ var NUnitConsoleToolPath = GetToolPath ("../NUnit.Console/tools/nunit3-console.e
 var GenApiToolPath = GetToolPath ("../genapi.exe");
 var MDocPath = GetMDocPath ();

-DirectoryPath ROOT_PATH = MakeAbsolute(File(".")).GetDirectory();
+DirectoryPath ROOT_PATH = MakeAbsolute(Directory("."));
 DirectoryPath DEPOT_PATH = MakeAbsolute(ROOT_PATH.Combine("depot_tools"));
 DirectoryPath SKIA_PATH = MakeAbsolute(ROOT_PATH.Combine("skia"));

@ -25,12 +25,18 @@ DirectoryPath SKIA_PATH = MakeAbsolute(ROOT_PATH.Combine("skia"));
 ////////////////////////////////////////////////////////////////////////////////////////////////////

 var SetEnvironmentVariable = new Action<string, string> ((name, value) => {
+    Information ("Setting Environment Variable {0} to {1}", name, value);
    Environment.SetEnvironmentVariable (name, value, EnvironmentVariableTarget.Process);
 });
 var AppendEnvironmentVariable = new Action<string, string> ((name, value) => {
    var old = EnvironmentVariable (name);
-    value += (IsRunningOnWindows () ? ";" : ":") + old;
-    SetEnvironmentVariable (name, value);
+    var sep = IsRunningOnWindows () ? ';' : ':';
+    
+    if (!old.ToUpper ().Split (sep).Contains (value.ToUpper ())) {
+        Information ("Adding {0} to Environment Variable {1}", value, name);
+        value += sep + old;
+        SetEnvironmentVariable (name, value);
+    }
 });
 void ListEnvironmentVariables ()
 {
@ -71,16 +77,22 @@ var RunNuGetRestore = new Action<FilePath> ((solution) =>
    });
 });

-var RunGyp = new Action (() =>
+var RunGyp = new Action<string, string> ((defines, generators) =>
 {
+    SetEnvironmentVariable ("GYP_GENERATORS", generators);
+    SetEnvironmentVariable ("GYP_DEFINES", defines);
+    
    Information ("Running 'sync-and-gyp'...");
    Information ("\tGYP_GENERATORS = " + EnvironmentVariable ("GYP_GENERATORS"));
    Information ("\tGYP_DEFINES = " + EnvironmentVariable ("GYP_DEFINES"));
    
-    StartProcess ("python", new ProcessSettings {
+    var result = StartProcess ("python", new ProcessSettings {
        Arguments = SKIA_PATH.CombineWithFilePath("bin/sync-and-gyp").FullPath,
        WorkingDirectory = SKIA_PATH.FullPath,
    });
+    if (result != 0) {
+        throw new Exception ("sync-and-gyp failed with error: " + result);
+    }
 });

 var RunInstallNameTool = new Action<DirectoryPath, string, string, FilePath> ((directory, oldName, newName, library) =>
@ -115,9 +127,6 @@ var RunLipo = new Action<DirectoryPath, FilePath, FilePath[]> ((directory, outpu

 var PackageNuGet = new Action<FilePath, DirectoryPath> ((nuspecPath, outputPath) =>
 {
-	// NuGet messes up path on mac, so let's add ./ in front twice
-	var basePath = IsRunningOnUnix () ? "././" : "./";
-
 	if (!DirectoryExists (outputPath)) {
 		CreateDirectory (outputPath);
 	}
@ -125,7 +134,7 @@ var PackageNuGet = new Action<FilePath, DirectoryPath> ((nuspecPath, outputPath)
    NuGetPack (nuspecPath, new NuGetPackSettings { 
        Verbosity = NuGetVerbosity.Detailed,
        OutputDirectory = outputPath,		
-        BasePath = basePath,
+        BasePath = "./",
        ToolPath = NugetToolPath
    });				
 });
@ -176,6 +185,57 @@ var ProcessSolutionProjects = new Action<FilePath, Action<string, FilePath>> ((s
    }
 });

+var MSBuildNS = (XNamespace) "http://schemas.microsoft.com/developer/msbuild/2003";
+
+var SetXValue = 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
+        node.Value = value;
+});
+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
+        node.Value += value;
+});
+var SetXValues = 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) {
+        SetXValue (n, element, value);
+    }
+});
+var AddXValues = 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) {
+        AddXValue (n, element, value);
+    }
+});
+
+// find a better place for this / or fix the path issue
+var VisualStudioPathFixup = new Action (() => {
+    var props = SKIA_PATH.CombineWithFilePath ("out/gyp/libjpeg-turbo.props").FullPath;
+    var xdoc = XDocument.Load (props);
+    var temp = xdoc.Root
+        .Elements (MSBuildNS + "ItemDefinitionGroup")
+        .Elements (MSBuildNS + "assemble")
+        .Elements (MSBuildNS + "CommandLineTemplate")
+        .Single ();
+    var newInclude = SKIA_PATH.Combine ("third_party/externals/libjpeg-turbo/win/").FullPath;
+    if (!temp.Value.Contains (newInclude)) {
+        temp.Value += " \"-I" + newInclude + "\"";
+        xdoc.Save (props);
+    }
+});
+
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // EXTERNALS - the native C and C++ libraries
 ////////////////////////////////////////////////////////////////////////////////////////////////////
@ -189,6 +249,7 @@ Task ("externals")
 });
 // this builds the native C and C++ externals 
 Task ("externals-native")
+    .IsDependentOn ("externals-uwp")
    .IsDependentOn ("externals-windows")
    .IsDependentOn ("externals-osx")
    .IsDependentOn ("externals-ios")
@ -206,6 +267,15 @@ Task ("externals-native")
        CopyFileToDirectory ("./native-builds/lib/windows/x86/libskia_windows.pdb", "./output/windows/x86/");
        CopyFileToDirectory ("./native-builds/lib/windows/x64/libskia_windows.dll", "./output/windows/x64/");
        CopyFileToDirectory ("./native-builds/lib/windows/x64/libskia_windows.pdb", "./output/windows/x64/");
+        if (!DirectoryExists ("./output/uwp/x86")) CreateDirectory ("./output/uwp/x86");
+        if (!DirectoryExists ("./output/uwp/x64")) CreateDirectory ("./output/uwp/x64");
+        if (!DirectoryExists ("./output/uwp/arm")) CreateDirectory ("./output/uwp/arm");
+        CopyFileToDirectory ("./native-builds/lib/uwp/x86/libskia_uwp.dll", "./output/uwp/x86/");
+        CopyFileToDirectory ("./native-builds/lib/uwp/x86/libskia_uwp.pdb", "./output/uwp/x86/");
+        CopyFileToDirectory ("./native-builds/lib/uwp/x64/libskia_uwp.dll", "./output/uwp/x64/");
+        CopyFileToDirectory ("./native-builds/lib/uwp/x64/libskia_uwp.pdb", "./output/uwp/x64/");
+        CopyFileToDirectory ("./native-builds/lib/uwp/arm/libskia_uwp.dll", "./output/uwp/arm/");
+        CopyFileToDirectory ("./native-builds/lib/uwp/arm/libskia_uwp.pdb", "./output/uwp/arm/");
    }
    if (IsRunningOnUnix ()) {
        if (!DirectoryExists ("./output/osx")) CreateDirectory ("./output/osx");
@ -241,26 +311,9 @@ Task ("externals-windows")
        !FileExists ("native-builds/lib/windows/x64/libskia_windows.dll"))
    .Does (() =>  
 {
-    var fixup = new Action (() => {
-        var props = SKIA_PATH.CombineWithFilePath ("out/gyp/libjpeg-turbo.props").FullPath;
-        var xdoc = XDocument.Load (props);
-        var ns = (XNamespace) "http://schemas.microsoft.com/developer/msbuild/2003";
-        var temp = xdoc.Root
-            .Elements (ns + "ItemDefinitionGroup")
-            .Elements (ns + "assemble")
-            .Elements (ns + "CommandLineTemplate")
-            .Single ();
-        var newInclude = SKIA_PATH.Combine ("third_party/externals/libjpeg-turbo/win/").FullPath;
-        if (!temp.Value.Contains (newInclude)) {
-            temp.Value += " \"-I" + newInclude + "\"";
-            xdoc.Save (props);
-        }
-    });
-    
    var buildArch = new Action<string, string, string> ((platform, skiaArch, dir) => {
-        SetEnvironmentVariable ("GYP_DEFINES", "skia_arch_type='" + skiaArch + "'");
-        RunGyp ();
-        fixup ();
+        RunGyp ("skia_arch_type='" + skiaArch + "'", "ninja,msvs");
+        VisualStudioPathFixup ();
        DotNetBuild ("native-builds/libskia_windows/libskia_windows_" + dir + ".sln", c => { 
            c.Configuration = "Release"; 
            c.Properties ["Platform"] = new [] { platform };
@ -273,11 +326,117 @@ Task ("externals-windows")

    // set up the gyp environment variables
    AppendEnvironmentVariable ("PATH", DEPOT_PATH.FullPath);
-    SetEnvironmentVariable ("GYP_GENERATORS", "ninja,msvs");
-        
+    
    buildArch ("Win32", "x86", "x86");
    buildArch ("x64", "x86_64", "x64");
 });
+// this builds the native C and C++ externals for Windows UWP
+Task ("externals-uwp")
+    .WithCriteria (IsRunningOnWindows ())
+    .WithCriteria (
+        !FileExists ("native-builds/lib/uwp/ARM/libskia_uwp.dll") ||
+        !FileExists ("native-builds/lib/uwp/x86/libskia_uwp.dll") ||
+        !FileExists ("native-builds/lib/uwp/x64/libskia_uwp.dll"))
+    .Does (() =>  
+{
+    var convertDesktopToUWP = new Action<FilePath, string> ((projectFilePath, platform) => {
+        //
+        // TODO: the stuff in this block must be moved into the gyp files !!
+        //
+        
+        var projectFile = MakeAbsolute (projectFilePath).FullPath;
+        var xdoc = XDocument.Load (projectFile);
+        
+        var configType = xdoc.Root
+            .Elements (MSBuildNS + "PropertyGroup")
+            .Elements (MSBuildNS + "ConfigurationType")
+            .Select (e => e.Value)
+            .FirstOrDefault ();
+        if (configType != "StaticLibrary") {
+            // skip over "Utility" projects as they aren't actually 
+            // library projects, but intermediate build steps.
+            return;
+        } else {
+            // special case for ARM, gyp does not yet have ARM, 
+            // so it defaults to Win32
+            // update and reload
+            if (platform.ToUpper () == "ARM") {
+                ReplaceTextInFiles (projectFile, "Win32", "ARM");
+                ReplaceTextInFiles (projectFile, "SkTLS_win.cpp", "SkTLS_none.cpp");
+                xdoc = XDocument.Load (projectFile);
+            }
+        }
+        
+        var globals = xdoc.Root
+            .Elements (MSBuildNS + "PropertyGroup")
+            .Where (e => e.Attribute ("Label") != null && e.Attribute ("Label").Value == "Globals")
+            .Single ();
+            
+        globals.Elements (MSBuildNS + "WindowsTargetPlatformVersion").Remove ();
+        SetXValue (globals, "Keyword", "StaticLibrary");
+        SetXValue (globals, "AppContainerApplication", "true");
+        SetXValue (globals, "ApplicationType", "Windows Store");
+        SetXValue (globals, "WindowsTargetPlatformVersion", "10.0.10586.0");
+        SetXValue (globals, "WindowsTargetPlatformMinVersion", "10.0.10240.0");
+        SetXValue (globals, "ApplicationTypeRevision", "10.0");
+        SetXValue (globals, "DefaultLanguage", "en-US");
+
+        var properties = xdoc.Root
+            .Elements (MSBuildNS + "PropertyGroup")
+            .Elements (MSBuildNS + "LinkIncremental")
+            .First ()
+            .Parent;
+        SetXValue (properties, "GenerateManifest","false");
+        SetXValue (properties, "IgnoreImportLibrary","false");
+        
+        SetXValues (xdoc.Root, new [] { "ItemDefinitionGroup", "ClCompile" }, "CompileAsWinRT", "false");
+        //AddXValues (xdoc.Root, new [] { "ItemDefinitionGroup", "ClCompile" }, "AdditionalOptions", " /sdl ");
+        AddXValues (xdoc.Root, new [] { "ItemDefinitionGroup", "ClCompile" }, "PreprocessorDefinitions", ";SK_BUILD_FOR_WINRT;WINAPI_FAMILY=WINAPI_FAMILY_APP;");
+        AddXValues (xdoc.Root, new [] { "ItemDefinitionGroup", "ClCompile" }, "DisableSpecificWarnings", ";4146;4703;");
+        SetXValues (xdoc.Root, new [] { "ItemDefinitionGroup", "Link" }, "SubSystem", "Console");
+        SetXValues (xdoc.Root, new [] { "ItemDefinitionGroup", "Link" }, "IgnoreAllDefaultLibraries", "false");
+        SetXValues (xdoc.Root, new [] { "ItemDefinitionGroup", "Link" }, "GenerateWindowsMetadata", "false");
+
+        xdoc.Root
+            .Elements (MSBuildNS + "ItemDefinitionGroup")
+            .Elements (MSBuildNS + "Link")
+            .Elements (MSBuildNS + "AdditionalDependencies")
+            .Remove ();
+            
+        xdoc.Save (projectFile);
+    });
+
+    var buildArch = new Action<string, string> ((platform, arch) => {
+        CleanDirectories ("native-builds/libskia_uwp/" + arch);
+        CleanDirectories ("native-builds/libskia_uwp/Release");
+        CleanDirectories ("native-builds/libskia_uwp/Generated Files");
+        ProcessSolutionProjects ("native-builds/libskia_uwp/libskia_uwp_" + arch + ".sln", (projectName, projectPath) => {
+            if (projectName != "libskia_uwp")
+                convertDesktopToUWP (projectPath, platform);
+        });
+        VisualStudioPathFixup ();
+        DotNetBuild ("native-builds/libskia_uwp/libskia_uwp_" + arch + ".sln", c => { 
+            c.Configuration = "Release"; 
+            c.Properties ["Platform"] = new [] { platform };
+        });
+        if (!DirectoryExists ("native-builds/lib/uwp/" + arch)) CreateDirectory ("native-builds/lib/uwp/" + arch);
+        CopyFileToDirectory ("native-builds/libskia_uwp/Release/libskia_uwp.lib", "native-builds/lib/uwp/" + arch);
+        CopyFileToDirectory ("native-builds/libskia_uwp/Release/libskia_uwp.dll", "native-builds/lib/uwp/" + arch);
+        CopyFileToDirectory ("native-builds/libskia_uwp/Release/libskia_uwp.pdb", "native-builds/lib/uwp/" + arch);
+    });
+
+    // set up the gyp environment variables
+    AppendEnvironmentVariable ("PATH", DEPOT_PATH.FullPath);
+
+    RunGyp ("skia_arch_type='x86_64' skia_gpu=0", "ninja,msvs");
+    buildArch ("x64", "x64");
+    
+    RunGyp ("skia_arch_type='x86' skia_gpu=0", "ninja,msvs");
+    buildArch ("Win32", "x86");
+    
+    RunGyp ("skia_arch_type='arm' arm_version=7 arm_neon=0 skia_gpu=0", "ninja,msvs");
+    buildArch ("ARM", "arm");
+});
 // this builds the native C and C++ externals for Mac OS X
 Task ("externals-osx")
    .WithCriteria (IsRunningOnUnix ())
@ -286,8 +445,7 @@ Task ("externals-osx")
    .Does (() =>  
 {
    var buildArch = new Action<string, string> ((arch, skiaArch) => {
-        SetEnvironmentVariable ("GYP_DEFINES", "skia_arch_type='" + skiaArch + "'");
-        RunGyp ();
+        RunGyp ("skia_arch_type='" + skiaArch + "'", "ninja,xcode");
        
        XCodeBuild (new XCodeBuildSettings {
            Project = "native-builds/libskia_osx/libskia_osx.xcodeproj",
@ -305,7 +463,6 @@ Task ("externals-osx")
    
    // set up the gyp environment variables
    AppendEnvironmentVariable ("PATH", DEPOT_PATH.FullPath);
-    SetEnvironmentVariable ("GYP_GENERATORS", "ninja,xcode");
    
    buildArch ("i386", "x86");
    buildArch ("x86_64", "x86_64");
@ -339,10 +496,8 @@ Task ("externals-ios")
    
    // set up the gyp environment variables
    AppendEnvironmentVariable ("PATH", DEPOT_PATH.FullPath);
-    SetEnvironmentVariable ("GYP_DEFINES", "skia_os='ios' skia_arch_type='arm' armv7=1 arm_neon=0");
-    SetEnvironmentVariable ("GYP_GENERATORS", "ninja,xcode");
-        
-    RunGyp ();
+    
+    RunGyp ("skia_os='ios' skia_arch_type='arm' armv7=1 arm_neon=0", "ninja,xcode");
    
    buildArch ("iphonesimulator", "i386");
    buildArch ("iphonesimulator", "x86_64");
@ -448,6 +603,7 @@ Task ("libs-windows")
    
    if (!DirectoryExists ("./output/portable/")) CreateDirectory ("./output/portable/");
    if (!DirectoryExists ("./output/windows/")) CreateDirectory ("./output/windows/");
+    if (!DirectoryExists ("./output/uwp/")) CreateDirectory ("./output/uwp/");
    
    // copy build output
    CopyFileToDirectory ("./binding/SkiaSharp.Portable/bin/Release/SkiaSharp.dll", "./output/portable/");
@ -455,6 +611,10 @@ Task ("libs-windows")
    CopyFileToDirectory ("./binding/SkiaSharp.Desktop/bin/Release/SkiaSharp.pdb", "./output/windows/");
    CopyFileToDirectory ("./binding/SkiaSharp.Desktop/bin/Release/SkiaSharp.dll.config", "./output/windows/");
    CopyFileToDirectory ("./binding/SkiaSharp.Desktop/bin/Release/SkiaSharp.Desktop.targets", "./output/windows/");
+    CopyFileToDirectory ("./binding/SkiaSharp.UWP/bin/Release/SkiaSharp.dll", "./output/uwp/");
+    CopyFileToDirectory ("./binding/SkiaSharp.UWP/bin/Release/SkiaSharp.pdb", "./output/uwp/");
+    CopyFileToDirectory ("./binding/SkiaSharp.UWP/bin/Release/SkiaSharp.pri", "./output/uwp/");
+    CopyFileToDirectory ("./binding/SkiaSharp.UWP/bin/Release/SkiaSharp.UWP.targets", "./output/uwp/");
 });
 Task ("libs-osx")
    .WithCriteria (IsRunningOnUnix ())
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 2825353c97acf778ef249a10dae1aababf8921a1
+Subproject commit 3d3a2f6aa198c1e627704ca240967dc4ea3db617
--- a/native-builds/libskia_uwp/libskia_uwp.vcxproj
+++ b/native-builds/libskia_uwp/libskia_uwp.vcxproj
@ -0,0 +1,343 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|ARM">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM">
+      <Configuration>Release</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{93d08eb4-1cbc-4268-9394-795012182731}</ProjectGuid>
+    <Keyword>DynamicLibrary</Keyword>
+    <RootNamespace>libskia_uwp</RootNamespace>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <AppContainerApplication>true</AppContainerApplication>
+    <ApplicationType>Windows Store</ApplicationType>
+    <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
+    <ApplicationTypeRevision>10.0</ApplicationTypeRevision>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
+    <LinkIncremental>true</LinkIncremental>
+    <GenerateManifest>false</GenerateManifest>
+    <IgnoreImportLibrary>false</IgnoreImportLibrary>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
+    <LinkIncremental>false</LinkIncremental>
+    <GenerateManifest>false</GenerateManifest>
+    <IgnoreImportLibrary>false</IgnoreImportLibrary>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+    <GenerateManifest>false</GenerateManifest>
+    <IgnoreImportLibrary>false</IgnoreImportLibrary>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+    <GenerateManifest>false</GenerateManifest>
+    <IgnoreImportLibrary>false</IgnoreImportLibrary>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <GenerateManifest>false</GenerateManifest>
+    <IgnoreImportLibrary>false</IgnoreImportLibrary>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <GenerateManifest>false</GenerateManifest>
+    <IgnoreImportLibrary>false</IgnoreImportLibrary>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <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>
+      <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>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <CompileAsWinRT>false</CompileAsWinRT>
+      <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>
+      <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>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <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>
+      <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>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>Kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <CompileAsWinRT>false</CompileAsWinRT>
+      <WarningLevel>Level3</WarningLevel>
+      <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>
+      <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>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>Kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <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>
+      <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>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>Kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <CompileAsWinRT>false</CompileAsWinRT>
+      <WarningLevel>Level3</WarningLevel>
+      <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>
+      <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>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>Kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\src\SkiaKeeper.c" />
+    <ClCompile Include="..\src\SkManagedStream.cpp" />
+    <ClCompile Include="..\src\sk_managedstream.cpp" />
+    <ClCompile Include="..\src\sk_xamarin.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\src\SkManagedStream.h" />
+    <ClInclude Include="..\src\sk_managedstream.h" />
+    <ClInclude Include="..\src\sk_xamarin.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <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\images.vcxproj">
+      <Project>{31057ac5-dc70-dea7-3e96-9c6fa063245e}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\skia\out\gyp\libetc1.vcxproj">
+      <Project>{a3bcdeca-94f5-1729-484e-180b50c89ad6}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\skia\out\gyp\libjpeg-turbo-selector.vcxproj">
+      <Project>{6137ced9-8009-c4c3-7a63-4a524a1cdbc8}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\skia\out\gyp\libjpeg-turbo.vcxproj">
+      <Project>{bf42c422-f0ea-bd6c-5e01-abf4694803b5}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\skia\out\gyp\libSkKTX.vcxproj">
+      <Project>{c984027d-7bfe-3d92-8d87-082486d7334e}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\skia\out\gyp\libwebp.vcxproj">
+      <Project>{f928143d-140d-ed62-0598-451d0e6cca74}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\skia\out\gyp\libwebp_dec.vcxproj">
+      <Project>{96b0bb48-4ede-1509-254e-8f8261eade2c}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\skia\out\gyp\libwebp_demux.vcxproj">
+      <Project>{b6991969-ed48-fd8c-9059-7ef50bd9abb7}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\skia\out\gyp\libwebp_dsp.vcxproj">
+      <Project>{4aca2a52-6f01-9ba3-08b0-6b75fd198f9a}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\skia\out\gyp\libwebp_dsp_enc.vcxproj">
+      <Project>{4b9b6627-aaa4-9beb-b6a3-3eddd01788cb}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\skia\out\gyp\libwebp_dsp_neon.vcxproj">
+      <Project>{8c37558a-961a-474f-b86a-7709d84b20af}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\skia\out\gyp\libwebp_enc.vcxproj">
+      <Project>{99ce0b68-8bc4-6a39-ff20-d9cbb771516e}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\skia\out\gyp\libwebp_utils.vcxproj">
+      <Project>{017d7dc8-bf13-32e1-ff5a-8f2124b7226d}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\skia\out\gyp\opts.vcxproj">
+      <Project>{babd1bbf-1c5a-9f6c-f3ee-1db4b6e5b1f6}</Project>
+    </ProjectReference>
+    <ProjectReference Condition="'$(Platform)'!='ARM'" Include="..\..\skia\out\gyp\opts_avx.vcxproj">
+      <Project>{f85415a0-97b2-6b19-4e61-e4d5b0813084}</Project>
+    </ProjectReference>
+    <ProjectReference Condition="'$(Platform)'!='ARM'" Include="..\..\skia\out\gyp\opts_sse41.vcxproj">
+      <Project>{f5fbfd59-3c8f-a017-be56-5b698c55e8f8}</Project>
+    </ProjectReference>
+    <ProjectReference Condition="'$(Platform)'!='ARM'" Include="..\..\skia\out\gyp\opts_ssse3.vcxproj">
+      <Project>{5716a271-a36f-abb0-bdfd-776fd2fa1a41}</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\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>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
--- a/native-builds/libskia_uwp/libskia_uwp_ARM.sln
+++ b/native-builds/libskia_uwp/libskia_uwp_ARM.sln
@ -0,0 +1,166 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.24720.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "..\..\skia\out\gyp\core.vcxproj", "{B7760B5E-BFA8-486B-ACFD-49E3A6DE8E76}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libskia_uwp", "libskia_uwp.vcxproj", "{93D08EB4-1CBC-4268-9394-795012182731}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "skia", "skia", "{38E1A434-8032-4721-8B8A-F4283BB56DAB}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ports", "..\..\skia\out\gyp\ports.vcxproj", "{B15878D6-6997-ADC9-AC65-516A7F578DB2}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "effects", "..\..\skia\out\gyp\effects.vcxproj", "{200809B7-4C62-7592-F47E-BF262809FA50}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "utils", "..\..\skia\out\gyp\utils.vcxproj", "{0F11CC16-0734-803C-1C14-7A44FB13C2DA}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opts", "..\..\skia\out\gyp\opts.vcxproj", "{BABD1BBF-1C5A-9F6C-F3EE-1DB4B6E5B1F6}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "images", "..\..\skia\out\gyp\images.vcxproj", "{31057AC5-DC70-DEA7-3E96-9C6FA063245E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sfnt", "..\..\skia\out\gyp\sfnt.vcxproj", "{43C5DB31-68D1-5452-4BF0-AD0AB84B2E52}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSkKTX", "..\..\skia\out\gyp\libSkKTX.vcxproj", "{C984027D-7BFE-3D92-8D87-082486D7334E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libetc1", "..\..\skia\out\gyp\libetc1.vcxproj", "{A3BCDECA-94F5-1729-484E-180B50C89AD6}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjpeg-turbo-selector", "..\..\skia\out\gyp\libjpeg-turbo-selector.vcxproj", "{6137CED9-8009-C4C3-7A63-4A524A1CDBC8}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjpeg-turbo", "..\..\skia\out\gyp\libjpeg-turbo.vcxproj", "{BF42C422-F0EA-BD6C-5E01-ABF4694803B5}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "yasm-win", "..\..\skia\out\gyp\yasm-win.vcxproj", "{79AE5C41-8C67-F7C0-8693-F259DA7C914B}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_dec", "..\..\skia\out\gyp\libwebp_dec.vcxproj", "{96B0BB48-4EDE-1509-254E-8F8261EADE2C}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp", "..\..\skia\out\gyp\libwebp.vcxproj", "{F928143D-140D-ED62-0598-451D0E6CCA74}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_dsp_neon", "..\..\skia\out\gyp\libwebp_dsp_neon.vcxproj", "{8C37558A-961A-474F-B86A-7709D84B20AF}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_enc", "..\..\skia\out\gyp\libwebp_enc.vcxproj", "{99CE0B68-8BC4-6A39-FF20-D9CBB771516E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_utils", "..\..\skia\out\gyp\libwebp_utils.vcxproj", "{017D7DC8-BF13-32E1-FF5A-8F2124B7226D}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_dsp", "..\..\skia\out\gyp\libwebp_dsp.vcxproj", "{4ACA2A52-6F01-9BA3-08B0-6B75FD198F9A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_demux", "..\..\skia\out\gyp\libwebp_demux.vcxproj", "{B6991969-ED48-FD8C-9059-7EF50BD9ABB7}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_dsp_enc", "..\..\skia\out\gyp\libwebp_dsp_enc.vcxproj", "{4B9B6627-AAA4-9BEB-B6A3-3EDDD01788CB}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|ARM = Debug|ARM
+		Release|ARM = Release|ARM
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{B7760B5E-BFA8-486B-ACFD-49E3A6DE8E76}.Debug|ARM.ActiveCfg = Debug|ARM
+		{B7760B5E-BFA8-486B-ACFD-49E3A6DE8E76}.Debug|ARM.Build.0 = Debug|ARM
+		{B7760B5E-BFA8-486B-ACFD-49E3A6DE8E76}.Release|ARM.ActiveCfg = Release|ARM
+		{B7760B5E-BFA8-486B-ACFD-49E3A6DE8E76}.Release|ARM.Build.0 = Release|ARM
+		{93D08EB4-1CBC-4268-9394-795012182731}.Debug|ARM.ActiveCfg = Debug|ARM
+		{93D08EB4-1CBC-4268-9394-795012182731}.Debug|ARM.Build.0 = Debug|ARM
+		{93D08EB4-1CBC-4268-9394-795012182731}.Release|ARM.ActiveCfg = Release|ARM
+		{93D08EB4-1CBC-4268-9394-795012182731}.Release|ARM.Build.0 = Release|ARM
+		{B15878D6-6997-ADC9-AC65-516A7F578DB2}.Debug|ARM.ActiveCfg = Debug|ARM
+		{B15878D6-6997-ADC9-AC65-516A7F578DB2}.Debug|ARM.Build.0 = Debug|ARM
+		{B15878D6-6997-ADC9-AC65-516A7F578DB2}.Release|ARM.ActiveCfg = Release|ARM
+		{B15878D6-6997-ADC9-AC65-516A7F578DB2}.Release|ARM.Build.0 = Release|ARM
+		{200809B7-4C62-7592-F47E-BF262809FA50}.Debug|ARM.ActiveCfg = Debug|ARM
+		{200809B7-4C62-7592-F47E-BF262809FA50}.Debug|ARM.Build.0 = Debug|ARM
+		{200809B7-4C62-7592-F47E-BF262809FA50}.Release|ARM.ActiveCfg = Release|ARM
+		{200809B7-4C62-7592-F47E-BF262809FA50}.Release|ARM.Build.0 = Release|ARM
+		{0F11CC16-0734-803C-1C14-7A44FB13C2DA}.Debug|ARM.ActiveCfg = Debug|ARM
+		{0F11CC16-0734-803C-1C14-7A44FB13C2DA}.Debug|ARM.Build.0 = Debug|ARM
+		{0F11CC16-0734-803C-1C14-7A44FB13C2DA}.Release|ARM.ActiveCfg = Release|ARM
+		{0F11CC16-0734-803C-1C14-7A44FB13C2DA}.Release|ARM.Build.0 = Release|ARM
+		{BABD1BBF-1C5A-9F6C-F3EE-1DB4B6E5B1F6}.Debug|ARM.ActiveCfg = Debug|ARM
+		{BABD1BBF-1C5A-9F6C-F3EE-1DB4B6E5B1F6}.Debug|ARM.Build.0 = Debug|ARM
+		{BABD1BBF-1C5A-9F6C-F3EE-1DB4B6E5B1F6}.Release|ARM.ActiveCfg = Release|ARM
+		{BABD1BBF-1C5A-9F6C-F3EE-1DB4B6E5B1F6}.Release|ARM.Build.0 = Release|ARM
+		{31057AC5-DC70-DEA7-3E96-9C6FA063245E}.Debug|ARM.ActiveCfg = Debug|ARM
+		{31057AC5-DC70-DEA7-3E96-9C6FA063245E}.Debug|ARM.Build.0 = Debug|ARM
+		{31057AC5-DC70-DEA7-3E96-9C6FA063245E}.Release|ARM.ActiveCfg = Release|ARM
+		{31057AC5-DC70-DEA7-3E96-9C6FA063245E}.Release|ARM.Build.0 = Release|ARM
+		{43C5DB31-68D1-5452-4BF0-AD0AB84B2E52}.Debug|ARM.ActiveCfg = Debug|ARM
+		{43C5DB31-68D1-5452-4BF0-AD0AB84B2E52}.Debug|ARM.Build.0 = Debug|ARM
+		{43C5DB31-68D1-5452-4BF0-AD0AB84B2E52}.Release|ARM.ActiveCfg = Release|ARM
+		{43C5DB31-68D1-5452-4BF0-AD0AB84B2E52}.Release|ARM.Build.0 = Release|ARM
+		{C984027D-7BFE-3D92-8D87-082486D7334E}.Debug|ARM.ActiveCfg = Debug|ARM
+		{C984027D-7BFE-3D92-8D87-082486D7334E}.Debug|ARM.Build.0 = Debug|ARM
+		{C984027D-7BFE-3D92-8D87-082486D7334E}.Release|ARM.ActiveCfg = Release|ARM
+		{C984027D-7BFE-3D92-8D87-082486D7334E}.Release|ARM.Build.0 = Release|ARM
+		{A3BCDECA-94F5-1729-484E-180B50C89AD6}.Debug|ARM.ActiveCfg = Debug|ARM
+		{A3BCDECA-94F5-1729-484E-180B50C89AD6}.Debug|ARM.Build.0 = Debug|ARM
+		{A3BCDECA-94F5-1729-484E-180B50C89AD6}.Release|ARM.ActiveCfg = Release|ARM
+		{A3BCDECA-94F5-1729-484E-180B50C89AD6}.Release|ARM.Build.0 = Release|ARM
+		{6137CED9-8009-C4C3-7A63-4A524A1CDBC8}.Debug|ARM.ActiveCfg = Debug|Win32
+		{6137CED9-8009-C4C3-7A63-4A524A1CDBC8}.Debug|ARM.Build.0 = Debug|Win32
+		{6137CED9-8009-C4C3-7A63-4A524A1CDBC8}.Release|ARM.ActiveCfg = Release|Win32
+		{6137CED9-8009-C4C3-7A63-4A524A1CDBC8}.Release|ARM.Build.0 = Release|Win32
+		{BF42C422-F0EA-BD6C-5E01-ABF4694803B5}.Debug|ARM.ActiveCfg = Debug|ARM
+		{BF42C422-F0EA-BD6C-5E01-ABF4694803B5}.Debug|ARM.Build.0 = Debug|ARM
+		{BF42C422-F0EA-BD6C-5E01-ABF4694803B5}.Release|ARM.ActiveCfg = Release|ARM
+		{BF42C422-F0EA-BD6C-5E01-ABF4694803B5}.Release|ARM.Build.0 = Release|ARM
+		{79AE5C41-8C67-F7C0-8693-F259DA7C914B}.Debug|ARM.ActiveCfg = Debug|Win32
+		{79AE5C41-8C67-F7C0-8693-F259DA7C914B}.Debug|ARM.Build.0 = Debug|Win32
+		{79AE5C41-8C67-F7C0-8693-F259DA7C914B}.Release|ARM.ActiveCfg = Release|Win32
+		{79AE5C41-8C67-F7C0-8693-F259DA7C914B}.Release|ARM.Build.0 = Release|Win32
+		{96B0BB48-4EDE-1509-254E-8F8261EADE2C}.Debug|ARM.ActiveCfg = Debug|ARM
+		{96B0BB48-4EDE-1509-254E-8F8261EADE2C}.Debug|ARM.Build.0 = Debug|ARM
+		{96B0BB48-4EDE-1509-254E-8F8261EADE2C}.Release|ARM.ActiveCfg = Release|ARM
+		{96B0BB48-4EDE-1509-254E-8F8261EADE2C}.Release|ARM.Build.0 = Release|ARM
+		{F928143D-140D-ED62-0598-451D0E6CCA74}.Debug|ARM.ActiveCfg = Debug|Win32
+		{F928143D-140D-ED62-0598-451D0E6CCA74}.Debug|ARM.Build.0 = Debug|Win32
+		{F928143D-140D-ED62-0598-451D0E6CCA74}.Release|ARM.ActiveCfg = Release|Win32
+		{F928143D-140D-ED62-0598-451D0E6CCA74}.Release|ARM.Build.0 = Release|Win32
+		{8C37558A-961A-474F-B86A-7709D84B20AF}.Debug|ARM.ActiveCfg = Debug|ARM
+		{8C37558A-961A-474F-B86A-7709D84B20AF}.Debug|ARM.Build.0 = Debug|ARM
+		{8C37558A-961A-474F-B86A-7709D84B20AF}.Release|ARM.ActiveCfg = Release|ARM
+		{8C37558A-961A-474F-B86A-7709D84B20AF}.Release|ARM.Build.0 = Release|ARM
+		{99CE0B68-8BC4-6A39-FF20-D9CBB771516E}.Debug|ARM.ActiveCfg = Debug|ARM
+		{99CE0B68-8BC4-6A39-FF20-D9CBB771516E}.Debug|ARM.Build.0 = Debug|ARM
+		{99CE0B68-8BC4-6A39-FF20-D9CBB771516E}.Release|ARM.ActiveCfg = Release|ARM
+		{99CE0B68-8BC4-6A39-FF20-D9CBB771516E}.Release|ARM.Build.0 = Release|ARM
+		{017D7DC8-BF13-32E1-FF5A-8F2124B7226D}.Debug|ARM.ActiveCfg = Debug|ARM
+		{017D7DC8-BF13-32E1-FF5A-8F2124B7226D}.Debug|ARM.Build.0 = Debug|ARM
+		{017D7DC8-BF13-32E1-FF5A-8F2124B7226D}.Release|ARM.ActiveCfg = Release|ARM
+		{017D7DC8-BF13-32E1-FF5A-8F2124B7226D}.Release|ARM.Build.0 = Release|ARM
+		{4ACA2A52-6F01-9BA3-08B0-6B75FD198F9A}.Debug|ARM.ActiveCfg = Debug|ARM
+		{4ACA2A52-6F01-9BA3-08B0-6B75FD198F9A}.Debug|ARM.Build.0 = Debug|ARM
+		{4ACA2A52-6F01-9BA3-08B0-6B75FD198F9A}.Release|ARM.ActiveCfg = Release|ARM
+		{4ACA2A52-6F01-9BA3-08B0-6B75FD198F9A}.Release|ARM.Build.0 = Release|ARM
+		{B6991969-ED48-FD8C-9059-7EF50BD9ABB7}.Debug|ARM.ActiveCfg = Debug|ARM
+		{B6991969-ED48-FD8C-9059-7EF50BD9ABB7}.Debug|ARM.Build.0 = Debug|ARM
+		{B6991969-ED48-FD8C-9059-7EF50BD9ABB7}.Release|ARM.ActiveCfg = Release|ARM
+		{B6991969-ED48-FD8C-9059-7EF50BD9ABB7}.Release|ARM.Build.0 = Release|ARM
+		{4B9B6627-AAA4-9BEB-B6A3-3EDDD01788CB}.Debug|ARM.ActiveCfg = Debug|ARM
+		{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
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{B7760B5E-BFA8-486B-ACFD-49E3A6DE8E76} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{B15878D6-6997-ADC9-AC65-516A7F578DB2} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{200809B7-4C62-7592-F47E-BF262809FA50} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{0F11CC16-0734-803C-1C14-7A44FB13C2DA} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{BABD1BBF-1C5A-9F6C-F3EE-1DB4B6E5B1F6} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{31057AC5-DC70-DEA7-3E96-9C6FA063245E} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{43C5DB31-68D1-5452-4BF0-AD0AB84B2E52} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{C984027D-7BFE-3D92-8D87-082486D7334E} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{A3BCDECA-94F5-1729-484E-180B50C89AD6} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{6137CED9-8009-C4C3-7A63-4A524A1CDBC8} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{BF42C422-F0EA-BD6C-5E01-ABF4694803B5} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{79AE5C41-8C67-F7C0-8693-F259DA7C914B} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{96B0BB48-4EDE-1509-254E-8F8261EADE2C} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{F928143D-140D-ED62-0598-451D0E6CCA74} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{8C37558A-961A-474F-B86A-7709D84B20AF} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{99CE0B68-8BC4-6A39-FF20-D9CBB771516E} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{017D7DC8-BF13-32E1-FF5A-8F2124B7226D} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{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}
+	EndGlobalSection
+EndGlobal
--- a/native-builds/libskia_uwp/libskia_uwp_x64.sln
+++ b/native-builds/libskia_uwp/libskia_uwp_x64.sln
@ -0,0 +1,187 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.24720.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "..\..\skia\out\gyp\core.vcxproj", "{B7760B5E-BFA8-486B-ACFD-49E3A6DE8E76}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libskia_uwp", "libskia_uwp.vcxproj", "{93D08EB4-1CBC-4268-9394-795012182731}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "skia", "skia", "{38E1A434-8032-4721-8B8A-F4283BB56DAB}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ports", "..\..\skia\out\gyp\ports.vcxproj", "{B15878D6-6997-ADC9-AC65-516A7F578DB2}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "effects", "..\..\skia\out\gyp\effects.vcxproj", "{200809B7-4C62-7592-F47E-BF262809FA50}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "utils", "..\..\skia\out\gyp\utils.vcxproj", "{0F11CC16-0734-803C-1C14-7A44FB13C2DA}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opts", "..\..\skia\out\gyp\opts.vcxproj", "{BABD1BBF-1C5A-9F6C-F3EE-1DB4B6E5B1F6}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opts_avx", "..\..\skia\out\gyp\opts_avx.vcxproj", "{F85415A0-97B2-6B19-4E61-E4D5B0813084}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opts_sse41", "..\..\skia\out\gyp\opts_sse41.vcxproj", "{F5FBFD59-3C8F-A017-BE56-5B698C55E8F8}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opts_ssse3", "..\..\skia\out\gyp\opts_ssse3.vcxproj", "{5716A271-A36F-ABB0-BDFD-776FD2FA1A41}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "images", "..\..\skia\out\gyp\images.vcxproj", "{31057AC5-DC70-DEA7-3E96-9C6FA063245E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sfnt", "..\..\skia\out\gyp\sfnt.vcxproj", "{43C5DB31-68D1-5452-4BF0-AD0AB84B2E52}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSkKTX", "..\..\skia\out\gyp\libSkKTX.vcxproj", "{C984027D-7BFE-3D92-8D87-082486D7334E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libetc1", "..\..\skia\out\gyp\libetc1.vcxproj", "{A3BCDECA-94F5-1729-484E-180B50C89AD6}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjpeg-turbo-selector", "..\..\skia\out\gyp\libjpeg-turbo-selector.vcxproj", "{6137CED9-8009-C4C3-7A63-4A524A1CDBC8}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjpeg-turbo", "..\..\skia\out\gyp\libjpeg-turbo.vcxproj", "{BF42C422-F0EA-BD6C-5E01-ABF4694803B5}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "yasm-win", "..\..\skia\out\gyp\yasm-win.vcxproj", "{79AE5C41-8C67-F7C0-8693-F259DA7C914B}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_dec", "..\..\skia\out\gyp\libwebp_dec.vcxproj", "{96B0BB48-4EDE-1509-254E-8F8261EADE2C}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp", "..\..\skia\out\gyp\libwebp.vcxproj", "{F928143D-140D-ED62-0598-451D0E6CCA74}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_dsp_neon", "..\..\skia\out\gyp\libwebp_dsp_neon.vcxproj", "{8C37558A-961A-474F-B86A-7709D84B20AF}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_enc", "..\..\skia\out\gyp\libwebp_enc.vcxproj", "{99CE0B68-8BC4-6A39-FF20-D9CBB771516E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_utils", "..\..\skia\out\gyp\libwebp_utils.vcxproj", "{017D7DC8-BF13-32E1-FF5A-8F2124B7226D}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_dsp", "..\..\skia\out\gyp\libwebp_dsp.vcxproj", "{4ACA2A52-6F01-9BA3-08B0-6B75FD198F9A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_demux", "..\..\skia\out\gyp\libwebp_demux.vcxproj", "{B6991969-ED48-FD8C-9059-7EF50BD9ABB7}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_dsp_enc", "..\..\skia\out\gyp\libwebp_dsp_enc.vcxproj", "{4B9B6627-AAA4-9BEB-B6A3-3EDDD01788CB}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x64 = Debug|x64
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{B7760B5E-BFA8-486B-ACFD-49E3A6DE8E76}.Debug|x64.ActiveCfg = Debug|x64
+		{B7760B5E-BFA8-486B-ACFD-49E3A6DE8E76}.Debug|x64.Build.0 = Debug|x64
+		{B7760B5E-BFA8-486B-ACFD-49E3A6DE8E76}.Release|x64.ActiveCfg = Release|x64
+		{B7760B5E-BFA8-486B-ACFD-49E3A6DE8E76}.Release|x64.Build.0 = Release|x64
+		{93D08EB4-1CBC-4268-9394-795012182731}.Debug|x64.ActiveCfg = Debug|x64
+		{93D08EB4-1CBC-4268-9394-795012182731}.Debug|x64.Build.0 = Debug|x64
+		{93D08EB4-1CBC-4268-9394-795012182731}.Release|x64.ActiveCfg = Release|x64
+		{93D08EB4-1CBC-4268-9394-795012182731}.Release|x64.Build.0 = Release|x64
+		{B15878D6-6997-ADC9-AC65-516A7F578DB2}.Debug|x64.ActiveCfg = Debug|x64
+		{B15878D6-6997-ADC9-AC65-516A7F578DB2}.Debug|x64.Build.0 = Debug|x64
+		{B15878D6-6997-ADC9-AC65-516A7F578DB2}.Release|x64.ActiveCfg = Release|x64
+		{B15878D6-6997-ADC9-AC65-516A7F578DB2}.Release|x64.Build.0 = Release|x64
+		{200809B7-4C62-7592-F47E-BF262809FA50}.Debug|x64.ActiveCfg = Debug|x64
+		{200809B7-4C62-7592-F47E-BF262809FA50}.Debug|x64.Build.0 = Debug|x64
+		{200809B7-4C62-7592-F47E-BF262809FA50}.Release|x64.ActiveCfg = Release|x64
+		{200809B7-4C62-7592-F47E-BF262809FA50}.Release|x64.Build.0 = Release|x64
+		{0F11CC16-0734-803C-1C14-7A44FB13C2DA}.Debug|x64.ActiveCfg = Debug|x64
+		{0F11CC16-0734-803C-1C14-7A44FB13C2DA}.Debug|x64.Build.0 = Debug|x64
+		{0F11CC16-0734-803C-1C14-7A44FB13C2DA}.Release|x64.ActiveCfg = Release|x64
+		{0F11CC16-0734-803C-1C14-7A44FB13C2DA}.Release|x64.Build.0 = Release|x64
+		{BABD1BBF-1C5A-9F6C-F3EE-1DB4B6E5B1F6}.Debug|x64.ActiveCfg = Debug|x64
+		{BABD1BBF-1C5A-9F6C-F3EE-1DB4B6E5B1F6}.Debug|x64.Build.0 = Debug|x64
+		{BABD1BBF-1C5A-9F6C-F3EE-1DB4B6E5B1F6}.Release|x64.ActiveCfg = Release|x64
+		{BABD1BBF-1C5A-9F6C-F3EE-1DB4B6E5B1F6}.Release|x64.Build.0 = Release|x64
+		{F85415A0-97B2-6B19-4E61-E4D5B0813084}.Debug|x64.ActiveCfg = Debug|x64
+		{F85415A0-97B2-6B19-4E61-E4D5B0813084}.Debug|x64.Build.0 = Debug|x64
+		{F85415A0-97B2-6B19-4E61-E4D5B0813084}.Release|x64.ActiveCfg = Release|x64
+		{F85415A0-97B2-6B19-4E61-E4D5B0813084}.Release|x64.Build.0 = Release|x64
+		{F5FBFD59-3C8F-A017-BE56-5B698C55E8F8}.Debug|x64.ActiveCfg = Debug|x64
+		{F5FBFD59-3C8F-A017-BE56-5B698C55E8F8}.Debug|x64.Build.0 = Debug|x64
+		{F5FBFD59-3C8F-A017-BE56-5B698C55E8F8}.Release|x64.ActiveCfg = Release|x64
+		{F5FBFD59-3C8F-A017-BE56-5B698C55E8F8}.Release|x64.Build.0 = Release|x64
+		{5716A271-A36F-ABB0-BDFD-776FD2FA1A41}.Debug|x64.ActiveCfg = Debug|x64
+		{5716A271-A36F-ABB0-BDFD-776FD2FA1A41}.Debug|x64.Build.0 = Debug|x64
+		{5716A271-A36F-ABB0-BDFD-776FD2FA1A41}.Release|x64.ActiveCfg = Release|x64
+		{5716A271-A36F-ABB0-BDFD-776FD2FA1A41}.Release|x64.Build.0 = Release|x64
+		{31057AC5-DC70-DEA7-3E96-9C6FA063245E}.Debug|x64.ActiveCfg = Debug|x64
+		{31057AC5-DC70-DEA7-3E96-9C6FA063245E}.Debug|x64.Build.0 = Debug|x64
+		{31057AC5-DC70-DEA7-3E96-9C6FA063245E}.Release|x64.ActiveCfg = Release|x64
+		{31057AC5-DC70-DEA7-3E96-9C6FA063245E}.Release|x64.Build.0 = Release|x64
+		{43C5DB31-68D1-5452-4BF0-AD0AB84B2E52}.Debug|x64.ActiveCfg = Debug|x64
+		{43C5DB31-68D1-5452-4BF0-AD0AB84B2E52}.Debug|x64.Build.0 = Debug|x64
+		{43C5DB31-68D1-5452-4BF0-AD0AB84B2E52}.Release|x64.ActiveCfg = Release|x64
+		{43C5DB31-68D1-5452-4BF0-AD0AB84B2E52}.Release|x64.Build.0 = Release|x64
+		{C984027D-7BFE-3D92-8D87-082486D7334E}.Debug|x64.ActiveCfg = Debug|x64
+		{C984027D-7BFE-3D92-8D87-082486D7334E}.Debug|x64.Build.0 = Debug|x64
+		{C984027D-7BFE-3D92-8D87-082486D7334E}.Release|x64.ActiveCfg = Release|x64
+		{C984027D-7BFE-3D92-8D87-082486D7334E}.Release|x64.Build.0 = Release|x64
+		{A3BCDECA-94F5-1729-484E-180B50C89AD6}.Debug|x64.ActiveCfg = Debug|x64
+		{A3BCDECA-94F5-1729-484E-180B50C89AD6}.Debug|x64.Build.0 = Debug|x64
+		{A3BCDECA-94F5-1729-484E-180B50C89AD6}.Release|x64.ActiveCfg = Release|x64
+		{A3BCDECA-94F5-1729-484E-180B50C89AD6}.Release|x64.Build.0 = Release|x64
+		{6137CED9-8009-C4C3-7A63-4A524A1CDBC8}.Debug|x64.ActiveCfg = Debug|x64
+		{6137CED9-8009-C4C3-7A63-4A524A1CDBC8}.Debug|x64.Build.0 = Debug|x64
+		{6137CED9-8009-C4C3-7A63-4A524A1CDBC8}.Release|x64.ActiveCfg = Release|x64
+		{6137CED9-8009-C4C3-7A63-4A524A1CDBC8}.Release|x64.Build.0 = Release|x64
+		{BF42C422-F0EA-BD6C-5E01-ABF4694803B5}.Debug|x64.ActiveCfg = Debug|x64
+		{BF42C422-F0EA-BD6C-5E01-ABF4694803B5}.Debug|x64.Build.0 = Debug|x64
+		{BF42C422-F0EA-BD6C-5E01-ABF4694803B5}.Release|x64.ActiveCfg = Release|x64
+		{BF42C422-F0EA-BD6C-5E01-ABF4694803B5}.Release|x64.Build.0 = Release|x64
+		{79AE5C41-8C67-F7C0-8693-F259DA7C914B}.Debug|x64.ActiveCfg = Debug|x64
+		{79AE5C41-8C67-F7C0-8693-F259DA7C914B}.Debug|x64.Build.0 = Debug|x64
+		{79AE5C41-8C67-F7C0-8693-F259DA7C914B}.Release|x64.ActiveCfg = Release|x64
+		{79AE5C41-8C67-F7C0-8693-F259DA7C914B}.Release|x64.Build.0 = Release|x64
+		{96B0BB48-4EDE-1509-254E-8F8261EADE2C}.Debug|x64.ActiveCfg = Debug|x64
+		{96B0BB48-4EDE-1509-254E-8F8261EADE2C}.Debug|x64.Build.0 = Debug|x64
+		{96B0BB48-4EDE-1509-254E-8F8261EADE2C}.Release|x64.ActiveCfg = Release|x64
+		{96B0BB48-4EDE-1509-254E-8F8261EADE2C}.Release|x64.Build.0 = Release|x64
+		{F928143D-140D-ED62-0598-451D0E6CCA74}.Debug|x64.ActiveCfg = Debug|x64
+		{F928143D-140D-ED62-0598-451D0E6CCA74}.Debug|x64.Build.0 = Debug|x64
+		{F928143D-140D-ED62-0598-451D0E6CCA74}.Release|x64.ActiveCfg = Release|x64
+		{F928143D-140D-ED62-0598-451D0E6CCA74}.Release|x64.Build.0 = Release|x64
+		{8C37558A-961A-474F-B86A-7709D84B20AF}.Debug|x64.ActiveCfg = Debug|x64
+		{8C37558A-961A-474F-B86A-7709D84B20AF}.Debug|x64.Build.0 = Debug|x64
+		{8C37558A-961A-474F-B86A-7709D84B20AF}.Release|x64.ActiveCfg = Release|x64
+		{8C37558A-961A-474F-B86A-7709D84B20AF}.Release|x64.Build.0 = Release|x64
+		{99CE0B68-8BC4-6A39-FF20-D9CBB771516E}.Debug|x64.ActiveCfg = Debug|x64
+		{99CE0B68-8BC4-6A39-FF20-D9CBB771516E}.Debug|x64.Build.0 = Debug|x64
+		{99CE0B68-8BC4-6A39-FF20-D9CBB771516E}.Release|x64.ActiveCfg = Release|x64
+		{99CE0B68-8BC4-6A39-FF20-D9CBB771516E}.Release|x64.Build.0 = Release|x64
+		{017D7DC8-BF13-32E1-FF5A-8F2124B7226D}.Debug|x64.ActiveCfg = Debug|x64
+		{017D7DC8-BF13-32E1-FF5A-8F2124B7226D}.Debug|x64.Build.0 = Debug|x64
+		{017D7DC8-BF13-32E1-FF5A-8F2124B7226D}.Release|x64.ActiveCfg = Release|x64
+		{017D7DC8-BF13-32E1-FF5A-8F2124B7226D}.Release|x64.Build.0 = Release|x64
+		{4ACA2A52-6F01-9BA3-08B0-6B75FD198F9A}.Debug|x64.ActiveCfg = Debug|x64
+		{4ACA2A52-6F01-9BA3-08B0-6B75FD198F9A}.Debug|x64.Build.0 = Debug|x64
+		{4ACA2A52-6F01-9BA3-08B0-6B75FD198F9A}.Release|x64.ActiveCfg = Release|x64
+		{4ACA2A52-6F01-9BA3-08B0-6B75FD198F9A}.Release|x64.Build.0 = Release|x64
+		{B6991969-ED48-FD8C-9059-7EF50BD9ABB7}.Debug|x64.ActiveCfg = Debug|x64
+		{B6991969-ED48-FD8C-9059-7EF50BD9ABB7}.Debug|x64.Build.0 = Debug|x64
+		{B6991969-ED48-FD8C-9059-7EF50BD9ABB7}.Release|x64.ActiveCfg = Release|x64
+		{B6991969-ED48-FD8C-9059-7EF50BD9ABB7}.Release|x64.Build.0 = Release|x64
+		{4B9B6627-AAA4-9BEB-B6A3-3EDDD01788CB}.Debug|x64.ActiveCfg = Debug|x64
+		{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
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{B7760B5E-BFA8-486B-ACFD-49E3A6DE8E76} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{B15878D6-6997-ADC9-AC65-516A7F578DB2} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{200809B7-4C62-7592-F47E-BF262809FA50} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{0F11CC16-0734-803C-1C14-7A44FB13C2DA} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{BABD1BBF-1C5A-9F6C-F3EE-1DB4B6E5B1F6} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{F85415A0-97B2-6B19-4E61-E4D5B0813084} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{F5FBFD59-3C8F-A017-BE56-5B698C55E8F8} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{5716A271-A36F-ABB0-BDFD-776FD2FA1A41} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{31057AC5-DC70-DEA7-3E96-9C6FA063245E} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{43C5DB31-68D1-5452-4BF0-AD0AB84B2E52} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{C984027D-7BFE-3D92-8D87-082486D7334E} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{A3BCDECA-94F5-1729-484E-180B50C89AD6} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{6137CED9-8009-C4C3-7A63-4A524A1CDBC8} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{BF42C422-F0EA-BD6C-5E01-ABF4694803B5} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{79AE5C41-8C67-F7C0-8693-F259DA7C914B} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{96B0BB48-4EDE-1509-254E-8F8261EADE2C} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{F928143D-140D-ED62-0598-451D0E6CCA74} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{8C37558A-961A-474F-B86A-7709D84B20AF} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{99CE0B68-8BC4-6A39-FF20-D9CBB771516E} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{017D7DC8-BF13-32E1-FF5A-8F2124B7226D} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{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}
+	EndGlobalSection
+EndGlobal
--- a/native-builds/libskia_uwp/libskia_uwp_x86.sln
+++ b/native-builds/libskia_uwp/libskia_uwp_x86.sln
@ -0,0 +1,187 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.24720.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "..\..\skia\out\gyp\core.vcxproj", "{B7760B5E-BFA8-486B-ACFD-49E3A6DE8E76}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libskia_uwp", "libskia_uwp.vcxproj", "{93D08EB4-1CBC-4268-9394-795012182731}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "skia", "skia", "{38E1A434-8032-4721-8B8A-F4283BB56DAB}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ports", "..\..\skia\out\gyp\ports.vcxproj", "{B15878D6-6997-ADC9-AC65-516A7F578DB2}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "effects", "..\..\skia\out\gyp\effects.vcxproj", "{200809B7-4C62-7592-F47E-BF262809FA50}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "utils", "..\..\skia\out\gyp\utils.vcxproj", "{0F11CC16-0734-803C-1C14-7A44FB13C2DA}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opts", "..\..\skia\out\gyp\opts.vcxproj", "{BABD1BBF-1C5A-9F6C-F3EE-1DB4B6E5B1F6}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opts_avx", "..\..\skia\out\gyp\opts_avx.vcxproj", "{F85415A0-97B2-6B19-4E61-E4D5B0813084}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opts_sse41", "..\..\skia\out\gyp\opts_sse41.vcxproj", "{F5FBFD59-3C8F-A017-BE56-5B698C55E8F8}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opts_ssse3", "..\..\skia\out\gyp\opts_ssse3.vcxproj", "{5716A271-A36F-ABB0-BDFD-776FD2FA1A41}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "images", "..\..\skia\out\gyp\images.vcxproj", "{31057AC5-DC70-DEA7-3E96-9C6FA063245E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sfnt", "..\..\skia\out\gyp\sfnt.vcxproj", "{43C5DB31-68D1-5452-4BF0-AD0AB84B2E52}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSkKTX", "..\..\skia\out\gyp\libSkKTX.vcxproj", "{C984027D-7BFE-3D92-8D87-082486D7334E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libetc1", "..\..\skia\out\gyp\libetc1.vcxproj", "{A3BCDECA-94F5-1729-484E-180B50C89AD6}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjpeg-turbo-selector", "..\..\skia\out\gyp\libjpeg-turbo-selector.vcxproj", "{6137CED9-8009-C4C3-7A63-4A524A1CDBC8}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjpeg-turbo", "..\..\skia\out\gyp\libjpeg-turbo.vcxproj", "{BF42C422-F0EA-BD6C-5E01-ABF4694803B5}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "yasm-win", "..\..\skia\out\gyp\yasm-win.vcxproj", "{79AE5C41-8C67-F7C0-8693-F259DA7C914B}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_dec", "..\..\skia\out\gyp\libwebp_dec.vcxproj", "{96B0BB48-4EDE-1509-254E-8F8261EADE2C}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp", "..\..\skia\out\gyp\libwebp.vcxproj", "{F928143D-140D-ED62-0598-451D0E6CCA74}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_dsp_neon", "..\..\skia\out\gyp\libwebp_dsp_neon.vcxproj", "{8C37558A-961A-474F-B86A-7709D84B20AF}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_enc", "..\..\skia\out\gyp\libwebp_enc.vcxproj", "{99CE0B68-8BC4-6A39-FF20-D9CBB771516E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_utils", "..\..\skia\out\gyp\libwebp_utils.vcxproj", "{017D7DC8-BF13-32E1-FF5A-8F2124B7226D}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_dsp", "..\..\skia\out\gyp\libwebp_dsp.vcxproj", "{4ACA2A52-6F01-9BA3-08B0-6B75FD198F9A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_demux", "..\..\skia\out\gyp\libwebp_demux.vcxproj", "{B6991969-ED48-FD8C-9059-7EF50BD9ABB7}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebp_dsp_enc", "..\..\skia\out\gyp\libwebp_dsp_enc.vcxproj", "{4B9B6627-AAA4-9BEB-B6A3-3EDDD01788CB}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{B7760B5E-BFA8-486B-ACFD-49E3A6DE8E76}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B7760B5E-BFA8-486B-ACFD-49E3A6DE8E76}.Debug|Win32.Build.0 = Debug|Win32
+		{B7760B5E-BFA8-486B-ACFD-49E3A6DE8E76}.Release|Win32.ActiveCfg = Release|Win32
+		{B7760B5E-BFA8-486B-ACFD-49E3A6DE8E76}.Release|Win32.Build.0 = Release|Win32
+		{93D08EB4-1CBC-4268-9394-795012182731}.Debug|Win32.ActiveCfg = Debug|Win32
+		{93D08EB4-1CBC-4268-9394-795012182731}.Debug|Win32.Build.0 = Debug|Win32
+		{93D08EB4-1CBC-4268-9394-795012182731}.Release|Win32.ActiveCfg = Release|Win32
+		{93D08EB4-1CBC-4268-9394-795012182731}.Release|Win32.Build.0 = 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}.Release|Win32.ActiveCfg = Release|Win32
+		{B15878D6-6997-ADC9-AC65-516A7F578DB2}.Release|Win32.Build.0 = Release|Win32
+		{200809B7-4C62-7592-F47E-BF262809FA50}.Debug|Win32.ActiveCfg = Debug|Win32
+		{200809B7-4C62-7592-F47E-BF262809FA50}.Debug|Win32.Build.0 = Debug|Win32
+		{200809B7-4C62-7592-F47E-BF262809FA50}.Release|Win32.ActiveCfg = Release|Win32
+		{200809B7-4C62-7592-F47E-BF262809FA50}.Release|Win32.Build.0 = Release|Win32
+		{0F11CC16-0734-803C-1C14-7A44FB13C2DA}.Debug|Win32.ActiveCfg = Debug|Win32
+		{0F11CC16-0734-803C-1C14-7A44FB13C2DA}.Debug|Win32.Build.0 = Debug|Win32
+		{0F11CC16-0734-803C-1C14-7A44FB13C2DA}.Release|Win32.ActiveCfg = Release|Win32
+		{0F11CC16-0734-803C-1C14-7A44FB13C2DA}.Release|Win32.Build.0 = Release|Win32
+		{BABD1BBF-1C5A-9F6C-F3EE-1DB4B6E5B1F6}.Debug|Win32.ActiveCfg = Debug|Win32
+		{BABD1BBF-1C5A-9F6C-F3EE-1DB4B6E5B1F6}.Debug|Win32.Build.0 = Debug|Win32
+		{BABD1BBF-1C5A-9F6C-F3EE-1DB4B6E5B1F6}.Release|Win32.ActiveCfg = Release|Win32
+		{BABD1BBF-1C5A-9F6C-F3EE-1DB4B6E5B1F6}.Release|Win32.Build.0 = Release|Win32
+		{F85415A0-97B2-6B19-4E61-E4D5B0813084}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F85415A0-97B2-6B19-4E61-E4D5B0813084}.Debug|Win32.Build.0 = Debug|Win32
+		{F85415A0-97B2-6B19-4E61-E4D5B0813084}.Release|Win32.ActiveCfg = Release|Win32
+		{F85415A0-97B2-6B19-4E61-E4D5B0813084}.Release|Win32.Build.0 = Release|Win32
+		{F5FBFD59-3C8F-A017-BE56-5B698C55E8F8}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F5FBFD59-3C8F-A017-BE56-5B698C55E8F8}.Debug|Win32.Build.0 = Debug|Win32
+		{F5FBFD59-3C8F-A017-BE56-5B698C55E8F8}.Release|Win32.ActiveCfg = Release|Win32
+		{F5FBFD59-3C8F-A017-BE56-5B698C55E8F8}.Release|Win32.Build.0 = Release|Win32
+		{5716A271-A36F-ABB0-BDFD-776FD2FA1A41}.Debug|Win32.ActiveCfg = Debug|Win32
+		{5716A271-A36F-ABB0-BDFD-776FD2FA1A41}.Debug|Win32.Build.0 = Debug|Win32
+		{5716A271-A36F-ABB0-BDFD-776FD2FA1A41}.Release|Win32.ActiveCfg = Release|Win32
+		{5716A271-A36F-ABB0-BDFD-776FD2FA1A41}.Release|Win32.Build.0 = Release|Win32
+		{31057AC5-DC70-DEA7-3E96-9C6FA063245E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{31057AC5-DC70-DEA7-3E96-9C6FA063245E}.Debug|Win32.Build.0 = Debug|Win32
+		{31057AC5-DC70-DEA7-3E96-9C6FA063245E}.Release|Win32.ActiveCfg = Release|Win32
+		{31057AC5-DC70-DEA7-3E96-9C6FA063245E}.Release|Win32.Build.0 = Release|Win32
+		{43C5DB31-68D1-5452-4BF0-AD0AB84B2E52}.Debug|Win32.ActiveCfg = Debug|Win32
+		{43C5DB31-68D1-5452-4BF0-AD0AB84B2E52}.Debug|Win32.Build.0 = Debug|Win32
+		{43C5DB31-68D1-5452-4BF0-AD0AB84B2E52}.Release|Win32.ActiveCfg = Release|Win32
+		{43C5DB31-68D1-5452-4BF0-AD0AB84B2E52}.Release|Win32.Build.0 = Release|Win32
+		{C984027D-7BFE-3D92-8D87-082486D7334E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C984027D-7BFE-3D92-8D87-082486D7334E}.Debug|Win32.Build.0 = Debug|Win32
+		{C984027D-7BFE-3D92-8D87-082486D7334E}.Release|Win32.ActiveCfg = Release|Win32
+		{C984027D-7BFE-3D92-8D87-082486D7334E}.Release|Win32.Build.0 = Release|Win32
+		{A3BCDECA-94F5-1729-484E-180B50C89AD6}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A3BCDECA-94F5-1729-484E-180B50C89AD6}.Debug|Win32.Build.0 = Debug|Win32
+		{A3BCDECA-94F5-1729-484E-180B50C89AD6}.Release|Win32.ActiveCfg = Release|Win32
+		{A3BCDECA-94F5-1729-484E-180B50C89AD6}.Release|Win32.Build.0 = Release|Win32
+		{6137CED9-8009-C4C3-7A63-4A524A1CDBC8}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6137CED9-8009-C4C3-7A63-4A524A1CDBC8}.Debug|Win32.Build.0 = Debug|Win32
+		{6137CED9-8009-C4C3-7A63-4A524A1CDBC8}.Release|Win32.ActiveCfg = Release|Win32
+		{6137CED9-8009-C4C3-7A63-4A524A1CDBC8}.Release|Win32.Build.0 = Release|Win32
+		{BF42C422-F0EA-BD6C-5E01-ABF4694803B5}.Debug|Win32.ActiveCfg = Debug|Win32
+		{BF42C422-F0EA-BD6C-5E01-ABF4694803B5}.Debug|Win32.Build.0 = Debug|Win32
+		{BF42C422-F0EA-BD6C-5E01-ABF4694803B5}.Release|Win32.ActiveCfg = Release|Win32
+		{BF42C422-F0EA-BD6C-5E01-ABF4694803B5}.Release|Win32.Build.0 = Release|Win32
+		{79AE5C41-8C67-F7C0-8693-F259DA7C914B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{79AE5C41-8C67-F7C0-8693-F259DA7C914B}.Debug|Win32.Build.0 = Debug|Win32
+		{79AE5C41-8C67-F7C0-8693-F259DA7C914B}.Release|Win32.ActiveCfg = Release|Win32
+		{79AE5C41-8C67-F7C0-8693-F259DA7C914B}.Release|Win32.Build.0 = Release|Win32
+		{96B0BB48-4EDE-1509-254E-8F8261EADE2C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{96B0BB48-4EDE-1509-254E-8F8261EADE2C}.Debug|Win32.Build.0 = Debug|Win32
+		{96B0BB48-4EDE-1509-254E-8F8261EADE2C}.Release|Win32.ActiveCfg = Release|Win32
+		{96B0BB48-4EDE-1509-254E-8F8261EADE2C}.Release|Win32.Build.0 = Release|Win32
+		{F928143D-140D-ED62-0598-451D0E6CCA74}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F928143D-140D-ED62-0598-451D0E6CCA74}.Debug|Win32.Build.0 = Debug|Win32
+		{F928143D-140D-ED62-0598-451D0E6CCA74}.Release|Win32.ActiveCfg = Release|Win32
+		{F928143D-140D-ED62-0598-451D0E6CCA74}.Release|Win32.Build.0 = Release|Win32
+		{8C37558A-961A-474F-B86A-7709D84B20AF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8C37558A-961A-474F-B86A-7709D84B20AF}.Debug|Win32.Build.0 = Debug|Win32
+		{8C37558A-961A-474F-B86A-7709D84B20AF}.Release|Win32.ActiveCfg = Release|Win32
+		{8C37558A-961A-474F-B86A-7709D84B20AF}.Release|Win32.Build.0 = Release|Win32
+		{99CE0B68-8BC4-6A39-FF20-D9CBB771516E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{99CE0B68-8BC4-6A39-FF20-D9CBB771516E}.Debug|Win32.Build.0 = Debug|Win32
+		{99CE0B68-8BC4-6A39-FF20-D9CBB771516E}.Release|Win32.ActiveCfg = Release|Win32
+		{99CE0B68-8BC4-6A39-FF20-D9CBB771516E}.Release|Win32.Build.0 = Release|Win32
+		{017D7DC8-BF13-32E1-FF5A-8F2124B7226D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{017D7DC8-BF13-32E1-FF5A-8F2124B7226D}.Debug|Win32.Build.0 = Debug|Win32
+		{017D7DC8-BF13-32E1-FF5A-8F2124B7226D}.Release|Win32.ActiveCfg = Release|Win32
+		{017D7DC8-BF13-32E1-FF5A-8F2124B7226D}.Release|Win32.Build.0 = Release|Win32
+		{4ACA2A52-6F01-9BA3-08B0-6B75FD198F9A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4ACA2A52-6F01-9BA3-08B0-6B75FD198F9A}.Debug|Win32.Build.0 = Debug|Win32
+		{4ACA2A52-6F01-9BA3-08B0-6B75FD198F9A}.Release|Win32.ActiveCfg = Release|Win32
+		{4ACA2A52-6F01-9BA3-08B0-6B75FD198F9A}.Release|Win32.Build.0 = Release|Win32
+		{B6991969-ED48-FD8C-9059-7EF50BD9ABB7}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B6991969-ED48-FD8C-9059-7EF50BD9ABB7}.Debug|Win32.Build.0 = Debug|Win32
+		{B6991969-ED48-FD8C-9059-7EF50BD9ABB7}.Release|Win32.ActiveCfg = Release|Win32
+		{B6991969-ED48-FD8C-9059-7EF50BD9ABB7}.Release|Win32.Build.0 = Release|Win32
+		{4B9B6627-AAA4-9BEB-B6A3-3EDDD01788CB}.Debug|Win32.ActiveCfg = Debug|Win32
+		{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
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{B7760B5E-BFA8-486B-ACFD-49E3A6DE8E76} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{B15878D6-6997-ADC9-AC65-516A7F578DB2} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{200809B7-4C62-7592-F47E-BF262809FA50} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{0F11CC16-0734-803C-1C14-7A44FB13C2DA} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{BABD1BBF-1C5A-9F6C-F3EE-1DB4B6E5B1F6} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{F85415A0-97B2-6B19-4E61-E4D5B0813084} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{F5FBFD59-3C8F-A017-BE56-5B698C55E8F8} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{5716A271-A36F-ABB0-BDFD-776FD2FA1A41} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{31057AC5-DC70-DEA7-3E96-9C6FA063245E} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{43C5DB31-68D1-5452-4BF0-AD0AB84B2E52} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{C984027D-7BFE-3D92-8D87-082486D7334E} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{A3BCDECA-94F5-1729-484E-180B50C89AD6} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{6137CED9-8009-C4C3-7A63-4A524A1CDBC8} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{BF42C422-F0EA-BD6C-5E01-ABF4694803B5} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{79AE5C41-8C67-F7C0-8693-F259DA7C914B} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{96B0BB48-4EDE-1509-254E-8F8261EADE2C} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{F928143D-140D-ED62-0598-451D0E6CCA74} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{8C37558A-961A-474F-B86A-7709D84B20AF} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{99CE0B68-8BC4-6A39-FF20-D9CBB771516E} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{017D7DC8-BF13-32E1-FF5A-8F2124B7226D} = {38E1A434-8032-4721-8B8A-F4283BB56DAB}
+		{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}
+	EndGlobalSection
+EndGlobal
--- a/nuget/SkiaSharp.Mac.nuspec
+++ b/nuget/SkiaSharp.Mac.nuspec
@ -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\Xamarin.SkiaSharp.Mac.targets" />
+    <file src="output/mac/SkiaSharp.Desktop.targets" target="build\net45\Xamarin.SkiaSharp.Mac.targets" />
    <!-- .NET 4.5 (OS X) -->
-    <file src="./output/mac/libskia_osx.dylib" target="build\net45\mac\libskia_osx.dylib" />
-    <file src="./output/mac/SkiaSharp.dll.config" target="build\net45\SkiaSharp.dll.config" />
+    <file src="output/mac/libskia_osx.dylib" target="build\net45\mac\libskia_osx.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\Xamarin.SkiaSharp.Mac.targets" />
-    <file src="./output/osx/libskia_osx.dylib" target="build\XamarinMac\libskia_osx.dylib" />
+    <file src="output/osx/SkiaSharp.OSX.targets" target="build\XamarinMac\Xamarin.SkiaSharp.Mac.targets" />
+    <file src="output/osx/libskia_osx.dylib" target="build\XamarinMac\libskia_osx.dylib" />
  </files>
 </package>
--- a/nuget/SkiaSharp.Windows.nuspec
+++ b/nuget/SkiaSharp.Windows.nuspec
@ -18,6 +18,8 @@
    <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" />
@ -25,9 +27,14 @@
    
    <!-- the build bits -->
    <!-- .NET 4.5 -->
-    <file src="output/windows/SkiaSharp.Desktop.targets" target="build\net45\Xamarin.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/libskia_windows.dll" target="build\net45\x64\libskia_windows.dll" />
    <file src="output/windows/x86/libskia_windows.dll" target="build\net45\x86\libskia_windows.dll" />
+    <!-- UWP -->
+    <file src="output/uwp/SkiaSharp.UWP.targets" target="build\uap10.0\SkiaSharp.Windows.targets" />
+    <file src="output/uwp/x64/libskia_uwp.dll" target="build\uap10.0\x64\libskia_uwp.dll" />
+    <file src="output/uwp/x86/libskia_uwp.dll" target="build\uap10.0\x86\libskia_uwp.dll" />
+    <file src="output/uwp/arm/libskia_uwp.dll" target="build\uap10.0\arm\libskia_uwp.dll" />
  </files>
 </package>
--- a/nuget/SkiaSharp.nuspec
+++ b/nuget/SkiaSharp.nuspec
@ -15,31 +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/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/libskia_windows.dll" target="build\net45\x64\libskia_windows.dll" />
-    <file src="./output/windows/x86/libskia_windows.dll" target="build\net45\x86\libskia_windows.dll" />
+    <file src="output/windows/x64/libskia_windows.dll" target="build\net45\x64\libskia_windows.dll" />
+    <file src="output/windows/x86/libskia_windows.dll" target="build\net45\x86\libskia_windows.dll" />
    <!-- .NET 4.5 (OS X) -->
-    <file src="./output/mac/libskia_osx.dylib" target="build\net45\mac\libskia_osx.dylib" />
-    <file src="./output/mac/SkiaSharp.dll.config" target="build\net45\SkiaSharp.dll.config" />
+    <file src="output/mac/libskia_osx.dylib" target="build\net45\mac\libskia_osx.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/libskia_osx.dylib" target="build\XamarinMac\libskia_osx.dylib" />
+    <file src="output/osx/SkiaSharp.OSX.targets" target="build\XamarinMac\SkiaSharp.targets" />
+    <file src="output/osx/libskia_osx.dylib" target="build\XamarinMac\libskia_osx.dylib" />
+    <!-- UWP -->
+    <file src="output/uwp/SkiaSharp.UWP.targets" target="build\uap10.0\SkiaSharp.Windows.targets" />
+    <file src="output/uwp/x64/libskia_uwp.dll" target="build\uap10.0\x64\libskia_uwp.dll" />
+    <file src="output/uwp/x86/libskia_uwp.dll" target="build\uap10.0\x86\libskia_uwp.dll" />
+    <file src="output/uwp/arm/libskia_uwp.dll" target="build\uap10.0\arm\libskia_uwp.dll" />
  </files>
 </package>
--- a/samples/SharedDemo/SkiaSharp.Demos.cs
+++ b/samples/SharedDemo/SkiaSharp.Demos.cs
@ -858,6 +858,7 @@ namespace SkiaSharp
 			Android = 2,
 			OSX = 4,
 			WindowsDesktop = 8,
+			UWP = 16,
 			All = 0xFFFF,
 		}

--- a/samples/Skia.UWP.Demo/App.xaml
+++ b/samples/Skia.UWP.Demo/App.xaml
@ -0,0 +1,8 @@
+<Application
+    x:Class="Skia.UWP.Demo.App"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:Skia.UWP.Demo"
+    RequestedTheme="Light">
+
+</Application>
--- a/samples/Skia.UWP.Demo/App.xaml.cs
+++ b/samples/Skia.UWP.Demo/App.xaml.cs
@ -0,0 +1,108 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.ApplicationModel;
+using Windows.ApplicationModel.Activation;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
+using Windows.UI.Xaml.Data;
+using Windows.UI.Xaml.Input;
+using Windows.UI.Xaml.Media;
+using Windows.UI.Xaml.Navigation;
+
+namespace Skia.UWP.Demo
+{
+    /// <summary>
+    /// Provides application-specific behavior to supplement the default Application class.
+    /// </summary>
+    sealed partial class App : Application
+    {
+        /// <summary>
+        /// Initializes the singleton application object.  This is the first line of authored code
+        /// executed, and as such is the logical equivalent of main() or WinMain().
+        /// </summary>
+        public App()
+        {
+			Microsoft.ApplicationInsights.WindowsAppInitializer.InitializeAsync(
+				Microsoft.ApplicationInsights.WindowsCollectors.Metadata |
+				Microsoft.ApplicationInsights.WindowsCollectors.Session);
+			this.InitializeComponent();
+            this.Suspending += OnSuspending;
+        }
+
+        /// <summary>
+        /// Invoked when the application is launched normally by the end user.  Other entry points
+        /// will be used such as when the application is launched to open a specific file.
+        /// </summary>
+        /// <param name="e">Details about the launch request and process.</param>
+        protected override void OnLaunched(LaunchActivatedEventArgs e)
+        {
+
+#if DEBUG
+            if (System.Diagnostics.Debugger.IsAttached)
+            {
+                this.DebugSettings.EnableFrameRateCounter = true;
+            }
+#endif
+
+            Frame rootFrame = Window.Current.Content as Frame;
+
+            // Do not repeat app initialization when the Window already has content,
+            // just ensure that the window is active
+            if (rootFrame == null)
+            {
+                // Create a Frame to act as the navigation context and navigate to the first page
+                rootFrame = new Frame();
+
+                rootFrame.NavigationFailed += OnNavigationFailed;
+
+                if (e.PreviousExecutionState == ApplicationExecutionState.Terminated)
+                {
+                    //TODO: Load state from previously suspended application
+                }
+
+                // Place the frame in the current Window
+                Window.Current.Content = rootFrame;
+            }
+
+            if (rootFrame.Content == null)
+            {
+                // When the navigation stack isn't restored navigate to the first page,
+                // configuring the new page by passing required information as a navigation
+                // parameter
+                rootFrame.Navigate(typeof(MainPage), e.Arguments);
+            }
+            // Ensure the current window is active
+            Window.Current.Activate();
+        }
+
+        /// <summary>
+        /// Invoked when Navigation to a certain page fails
+        /// </summary>
+        /// <param name="sender">The Frame which failed navigation</param>
+        /// <param name="e">Details about the navigation failure</param>
+        void OnNavigationFailed(object sender, NavigationFailedEventArgs e)
+        {
+            throw new Exception("Failed to load Page " + e.SourcePageType.FullName);
+        }
+
+        /// <summary>
+        /// Invoked when application execution is being suspended.  Application state is saved
+        /// without knowing whether the application will be terminated or resumed with the contents
+        /// of memory still intact.
+        /// </summary>
+        /// <param name="sender">The source of the suspend request.</param>
+        /// <param name="e">Details about the suspend request.</param>
+        private void OnSuspending(object sender, SuspendingEventArgs e)
+        {
+            var deferral = e.SuspendingOperation.GetDeferral();
+            //TODO: Save application state and stop any background activity
+            deferral.Complete();
+        }
+    }
+}
--- a/samples/Skia.UWP.Demo/Assets/LockScreenLogo.scale-200.png
+++ b/samples/Skia.UWP.Demo/Assets/LockScreenLogo.scale-200.png
--- a/samples/Skia.UWP.Demo/Assets/SplashScreen.scale-200.png
+++ b/samples/Skia.UWP.Demo/Assets/SplashScreen.scale-200.png
--- a/samples/Skia.UWP.Demo/Assets/Square150x150Logo.scale-200.png
+++ b/samples/Skia.UWP.Demo/Assets/Square150x150Logo.scale-200.png
--- a/samples/Skia.UWP.Demo/Assets/Square44x44Logo.scale-200.png
+++ b/samples/Skia.UWP.Demo/Assets/Square44x44Logo.scale-200.png
--- a/samples/Skia.UWP.Demo/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
+++ b/samples/Skia.UWP.Demo/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
--- a/samples/Skia.UWP.Demo/Assets/StoreLogo.png
+++ b/samples/Skia.UWP.Demo/Assets/StoreLogo.png
--- a/samples/Skia.UWP.Demo/Assets/Wide310x150Logo.scale-200.png
+++ b/samples/Skia.UWP.Demo/Assets/Wide310x150Logo.scale-200.png
--- a/samples/Skia.UWP.Demo/MainPage.xaml
+++ b/samples/Skia.UWP.Demo/MainPage.xaml
@ -0,0 +1,25 @@
+<Page
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:Skia.UWP.Demo"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:Demo="using:Skia.WindowsDesktop.Demo"
+    x:Class="Skia.UWP.Demo.MainPage"
+    mc:Ignorable="d">
+
+    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition/>
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition/>
+        </Grid.ColumnDefinitions>
+
+        <ComboBox x:Name="comboBox" HorizontalAlignment="Stretch" Grid.Row="0" Grid.Column="0" />
+
+        <Demo:SkiaView x:Name="skiaView" Grid.Row="1" Grid.Column="0" />
+
+    </Grid>
+</Page>
--- a/samples/Skia.UWP.Demo/MainPage.xaml.cs
+++ b/samples/Skia.UWP.Demo/MainPage.xaml.cs
@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
+using Windows.UI.Xaml.Data;
+using Windows.UI.Xaml.Input;
+using Windows.UI.Xaml.Media;
+using Windows.UI.Xaml.Navigation;
+
+// The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=402352&clcid=0x409
+
+namespace Skia.UWP.Demo
+{
+	/// <summary>
+	/// An empty page that can be used on its own or navigated to within a Frame.
+	/// </summary>
+	public sealed partial class MainPage : Page
+	{
+		public MainPage()
+		{
+			this.InitializeComponent();
+
+			string fontName = "content-font.ttf";
+			var install = Windows.ApplicationModel.Package.Current.InstalledLocation;
+			SkiaSharp.Demos.CustomFontPath = Path.Combine(install.Path, fontName);
+
+			var items = SkiaSharp.Demos.SamplesForPlatform(SkiaSharp.Demos.Platform.UWP);
+			foreach (var item in items)
+			{
+				comboBox.Items.Add(item);
+			}
+
+			comboBox.SelectionChanged += (sender, e) =>
+			{
+				skiaView.OnDrawCallback = SkiaSharp.Demos.MethodForSample((string)comboBox.SelectedItem);
+			};
+
+			comboBox.SelectedIndex = 0;
+		}
+	}
+}
--- a/samples/Skia.UWP.Demo/Package.appxmanifest
+++ b/samples/Skia.UWP.Demo/Package.appxmanifest
@ -0,0 +1,49 @@
+<?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"/>
+
+  <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"/>
+  </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"/>
+        <uap:SplashScreen Image="Assets\SplashScreen.png" />
+      </uap:VisualElements>
+    </Application>
+  </Applications>
+
+  <Capabilities>
+    <Capability Name="internetClient" />
+  </Capabilities>
+</Package>
--- a/samples/Skia.UWP.Demo/Properties/AssemblyInfo.cs
+++ b/samples/Skia.UWP.Demo/Properties/AssemblyInfo.cs
@ -0,0 +1,29 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Skia.UWP.Demo")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Skia.UWP.Demo")]
+[assembly: AssemblyCopyright("Copyright ©  2016")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: ComVisible(false)]
--- a/samples/Skia.UWP.Demo/Properties/Default.rd.xml
+++ b/samples/Skia.UWP.Demo/Properties/Default.rd.xml
@ -0,0 +1,31 @@
+<!--
+    This file contains Runtime Directives used by .NET Native. The defaults here are suitable for most
+    developers. However, you can modify these parameters to modify the behavior of the .NET Native
+    optimizer.
+
+    Runtime Directives are documented at http://go.microsoft.com/fwlink/?LinkID=391919
+
+    To fully enable reflection for App1.MyClass and all of its public/private members
+    <Type Name="App1.MyClass" Dynamic="Required All"/>
+
+    To enable dynamic creation of the specific instantiation of AppClass<T> over System.Int32
+    <TypeInstantiation Name="App1.AppClass" Arguments="System.Int32" Activate="Required Public" />
+
+    Using the Namespace directive to apply reflection policy to all the types in a particular namespace
+    <Namespace Name="DataClasses.ViewModels" Seralize="All" />
+-->
+
+<Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">
+  <Application>
+    <!--
+      An Assembly element with Name="*Application*" applies to all assemblies in
+      the application package. The asterisks are not wildcards.
+    -->
+    <Assembly Name="*Application*" Dynamic="Required All" />
+    
+    
+    <!-- Add your application specific runtime directives here. -->
+
+
+  </Application>
+</Directives>
--- a/samples/Skia.UWP.Demo/Skia.UWP.Demo.csproj
+++ b/samples/Skia.UWP.Demo/Skia.UWP.Demo.csproj
@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x64</Platform>
+    <ProjectGuid>{18C7BCB4-4762-4A99-91BE-E6431C3E561E}</ProjectGuid>
+    <OutputType>AppContainerExe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Skia.UWP.Demo</RootNamespace>
+    <AssemblyName>Skia.UWP.Demo</AssemblyName>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
+    <TargetPlatformVersion>10.0.10240.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>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\x86\Release\</OutputPath>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <Optimize>true</Optimize>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\ARM\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>full</DebugType>
+    <PlatformTarget>ARM</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
+    <OutputPath>bin\ARM\Release\</OutputPath>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <Optimize>true</Optimize>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>ARM</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <Optimize>true</Optimize>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
+  </PropertyGroup>
+  <ItemGroup>
+    <!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->
+    <EmbeddedResource Include="..\SharedDemo\baboon.png">
+      <Link>baboon.png</Link>
+    </EmbeddedResource>
+    <EmbeddedResource Include="..\SharedDemo\color-wheel.png">
+      <Link>color-wheel.png</Link>
+    </EmbeddedResource>
+    <Content Include="..\SharedDemo\content-font.ttf">
+      <Link>content-font.ttf</Link>
+    </Content>
+    <EmbeddedResource Include="..\SharedDemo\embedded-font.ttf">
+      <Link>embedded-font.ttf</Link>
+    </EmbeddedResource>
+    <None Include="project.json" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\SharedDemo\SkiaSharp.Demos.cs">
+      <Link>SkiaSharp.Demos.cs</Link>
+    </Compile>
+    <Compile Include="App.xaml.cs">
+      <DependentUpon>App.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="MainPage.xaml.cs">
+      <DependentUpon>MainPage.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="SkiaView.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <AppxManifest Include="Package.appxmanifest">
+      <SubType>Designer</SubType>
+    </AppxManifest>
+    <None Include="Skia.UWP.Demo_TemporaryKey.pfx" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Properties\Default.rd.xml" />
+    <Content Include="Assets\LockScreenLogo.scale-200.png" />
+    <Content Include="Assets\SplashScreen.scale-200.png" />
+    <Content Include="Assets\Square150x150Logo.scale-200.png" />
+    <Content Include="Assets\Square44x44Logo.scale-200.png" />
+    <Content Include="Assets\Square44x44Logo.targetsize-24_altform-unplated.png" />
+    <Content Include="Assets\StoreLogo.png" />
+    <Content Include="Assets\Wide310x150Logo.scale-200.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <ApplicationDefinition Include="App.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </ApplicationDefinition>
+    <Page Include="MainPage.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+  </ItemGroup>
+  <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
+    <VisualStudioVersion>14.0</VisualStudioVersion>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
--- a/samples/Skia.UWP.Demo/Skia.UWP.Demo.nuget.targets
+++ b/samples/Skia.UWP.Demo/Skia.UWP.Demo.nuget.targets
@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Condition="'$(NuGetPackageRoot)' == ''">
+    <NuGetPackageRoot>$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
+  </PropertyGroup>
+  <ImportGroup>
+    <Import Project="$(NuGetPackageRoot)\SkiaSharp.Windows\1.49.2.1-beta\build\uap10.0\SkiaSharp.Windows.targets" Condition="Exists('$(NuGetPackageRoot)\SkiaSharp.Windows\1.49.2.1-beta\build\uap10.0\SkiaSharp.Windows.targets')" />
+  </ImportGroup>
+</Project>
--- a/samples/Skia.UWP.Demo/Skia.UWP.Demo.sln
+++ b/samples/Skia.UWP.Demo/Skia.UWP.Demo.sln
@ -0,0 +1,40 @@
+
+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.UWP.Demo", "Skia.UWP.Demo.csproj", "{18C7BCB4-4762-4A99-91BE-E6431C3E561E}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|ARM = Debug|ARM
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|ARM = Release|ARM
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{18C7BCB4-4762-4A99-91BE-E6431C3E561E}.Debug|ARM.ActiveCfg = Debug|ARM
+		{18C7BCB4-4762-4A99-91BE-E6431C3E561E}.Debug|ARM.Build.0 = Debug|ARM
+		{18C7BCB4-4762-4A99-91BE-E6431C3E561E}.Debug|ARM.Deploy.0 = Debug|ARM
+		{18C7BCB4-4762-4A99-91BE-E6431C3E561E}.Debug|x64.ActiveCfg = Debug|x64
+		{18C7BCB4-4762-4A99-91BE-E6431C3E561E}.Debug|x64.Build.0 = Debug|x64
+		{18C7BCB4-4762-4A99-91BE-E6431C3E561E}.Debug|x64.Deploy.0 = Debug|x64
+		{18C7BCB4-4762-4A99-91BE-E6431C3E561E}.Debug|x86.ActiveCfg = Debug|x86
+		{18C7BCB4-4762-4A99-91BE-E6431C3E561E}.Debug|x86.Build.0 = Debug|x86
+		{18C7BCB4-4762-4A99-91BE-E6431C3E561E}.Debug|x86.Deploy.0 = Debug|x86
+		{18C7BCB4-4762-4A99-91BE-E6431C3E561E}.Release|ARM.ActiveCfg = Release|ARM
+		{18C7BCB4-4762-4A99-91BE-E6431C3E561E}.Release|ARM.Build.0 = Release|ARM
+		{18C7BCB4-4762-4A99-91BE-E6431C3E561E}.Release|ARM.Deploy.0 = Release|ARM
+		{18C7BCB4-4762-4A99-91BE-E6431C3E561E}.Release|x64.ActiveCfg = Release|x64
+		{18C7BCB4-4762-4A99-91BE-E6431C3E561E}.Release|x64.Build.0 = Release|x64
+		{18C7BCB4-4762-4A99-91BE-E6431C3E561E}.Release|x64.Deploy.0 = Release|x64
+		{18C7BCB4-4762-4A99-91BE-E6431C3E561E}.Release|x86.ActiveCfg = Release|x86
+		{18C7BCB4-4762-4A99-91BE-E6431C3E561E}.Release|x86.Build.0 = Release|x86
+		{18C7BCB4-4762-4A99-91BE-E6431C3E561E}.Release|x86.Deploy.0 = Release|x86
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
--- a/samples/Skia.UWP.Demo/SkiaView.cs
+++ b/samples/Skia.UWP.Demo/SkiaView.cs
@ -0,0 +1,94 @@
+using System;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Media;
+using Windows.UI.Xaml.Media.Imaging;
+
+using SkiaSharp;
+using Windows.UI.Xaml;
+using Windows.Graphics.Display;
+using System.IO;
+using System.Runtime.InteropServices;
+
+namespace Skia.WindowsDesktop.Demo
+{
+	public partial class SkiaView : Canvas
+	{
+		private Action<SKCanvas, int, int> onDrawCallback;
+
+		public SkiaView()
+		{
+			SizeChanged += OnSizeChanged;
+		}
+
+		private void UpdateBitmap()
+		{
+			if (onDrawCallback == null)
+				return;
+
+			var resolutionScale = DisplayInformation.GetForCurrentView().ResolutionScale;
+			var screenScale = (float)resolutionScale / 100.0f;
+			var width = (int)(ActualWidth * screenScale);
+			var height = (int)(ActualHeight * screenScale);
+
+			if (width == 0 || height == 0)
+				return;
+
+			IntPtr buff = Marshal.AllocCoTaskMem(width * height * 4);
+
+			try
+			{
+				using (var surface = SKSurface.Create(width, height, SKColorType.N_32, SKAlphaType.Premul, buff, width * 4))
+				{
+					var skcanvas = surface.Canvas;
+
+					skcanvas.Scale(screenScale, screenScale);
+
+					onDrawCallback(skcanvas, (int)ActualWidth, (int)ActualHeight);
+				}
+
+				var pixels = new byte[width * height * 4];
+				Marshal.Copy(buff, pixels, 0, pixels.Length);
+
+				var bitmap = new WriteableBitmap(width, height);
+
+				var stream = bitmap.PixelBuffer.AsStream();
+				stream.Seek(0, SeekOrigin.Begin);
+				stream.Write(pixels, 0, pixels.Length);
+
+				bitmap.Invalidate();
+
+				var b = bitmap;
+				Background = new ImageBrush
+				{
+					ImageSource = b,
+					AlignmentX = AlignmentX.Center,
+					AlignmentY = AlignmentY.Center,
+					Stretch = Stretch.Fill
+				};
+			}
+			finally
+			{
+				if (buff != IntPtr.Zero)
+				{
+					Marshal.FreeCoTaskMem(buff);
+				}
+			}
+		}
+
+		private void OnSizeChanged(object sender, SizeChangedEventArgs e)
+		{
+			UpdateBitmap();
+		}
+
+		public Action<SKCanvas, int, int> OnDrawCallback
+		{
+			get { return onDrawCallback; }
+			set
+			{
+				onDrawCallback = value;
+				UpdateBitmap();
+			}
+		}
+	}
+}
--- a/samples/Skia.UWP.Demo/project.json
+++ b/samples/Skia.UWP.Demo/project.json
@ -0,0 +1,20 @@
+{
+  "dependencies": {
+    "Microsoft.ApplicationInsights": "1.0.0",
+    "Microsoft.ApplicationInsights.PersistenceChannel": "1.0.0",
+    "Microsoft.ApplicationInsights.WindowsApps": "1.0.0",
+    "Microsoft.NETCore.UniversalWindowsPlatform": "5.0.0",
+    "SkiaSharp.Windows": "1.49.2.1-beta"
+  },
+  "frameworks": {
+    "uap10.0": {}
+  },
+  "runtimes": {
+    "win10-arm": {},
+    "win10-arm-aot": {},
+    "win10-x86": {},
+    "win10-x86-aot": {},
+    "win10-x64": {},
+    "win10-x64-aot": {}
+  }
+}
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 44f28d5b1c12e311735ba1283bbe28cff351ebbc
+Subproject commit 949bff014decdff250ac6545b761889705142c6c
--- a/tools/packages.config
+++ b/tools/packages.config
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-	<package id="Cake" version="0.6.0" />
+	<package id="Cake" version="0.11.0" />
    <package id="NUnit.Console" version="3.0.1" />
 </packages>