From 0b924240fde745cdc777d0f77914433fc243889e Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Fri, 7 Sep 2018 17:03:52 +0200
Subject: [PATCH] Build the native into the native folder, and then link into
 the project

---
 cake/BuildExternals.cake                                    | 6 ------
 .../SkiaSharp.Views.UWP/SkiaSharp.Views.UWP.csproj          | 5 +++++
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/cake/BuildExternals.cake b/cake/BuildExternals.cake
index 19a85c4f..59ce616d 100644
--- a/cake/BuildExternals.cake
+++ b/cake/BuildExternals.cake
@@ -179,12 +179,6 @@ Task ("externals-uwp")
         EnsureDirectoryExists (outDir);
         CopyFileToDirectory ($"source/SkiaSharp.Views.Interop.UWP/bin/{arch}/Release/SkiaSharp.Views.Interop.UWP.dll", outDir);
         CopyFileToDirectory ($"source/SkiaSharp.Views.Interop.UWP/bin/{arch}/Release/SkiaSharp.Views.Interop.UWP.pdb", outDir);
-
-        // copy SkiaSharp.Views.Interop.UWP to output
-        outDir = $"output/SkiaSharp.Views/nuget/runtimes/win10-{dir}/nativeassets/uap10.0";
-        EnsureDirectoryExists (outDir);
-        CopyFileToDirectory ($"source/SkiaSharp.Views.Interop.UWP/bin/{arch}/Release/SkiaSharp.Views.Interop.UWP.dll", outDir);
-        CopyFileToDirectory ($"source/SkiaSharp.Views.Interop.UWP/bin/{arch}/Release/SkiaSharp.Views.Interop.UWP.pdb", outDir);
     });
 
     buildInteropArch ("Win32", "x86");
diff --git a/source/SkiaSharp.Views/SkiaSharp.Views.UWP/SkiaSharp.Views.UWP.csproj b/source/SkiaSharp.Views/SkiaSharp.Views.UWP/SkiaSharp.Views.UWP.csproj
index da502676..4844aba3 100644
--- a/source/SkiaSharp.Views/SkiaSharp.Views.UWP/SkiaSharp.Views.UWP.csproj
+++ b/source/SkiaSharp.Views/SkiaSharp.Views.UWP/SkiaSharp.Views.UWP.csproj
@@ -17,6 +17,11 @@
   <ItemGroup>
     <ProjectReference Include="..\..\..\binding\SkiaSharp.UWP\SkiaSharp.UWP.csproj" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\..\output\native\uwp\x64\SkiaSharp.Views.Interop.UWP.dll" Link="nuget\runtimes\win10-x64\nativeassets\uap10.0\SkiaSharp.Views.Interop.UWP.dll" />
+    <None Include="..\..\..\output\native\uwp\x86\SkiaSharp.Views.Interop.UWP.dll" Link="nuget\runtimes\win10-x86\nativeassets\uap10.0\SkiaSharp.Views.Interop.UWP.dll" />
+    <None Include="..\..\..\output\native\uwp\arm\SkiaSharp.Views.Interop.UWP.dll" Link="nuget\runtimes\win10-arm\nativeassets\uap10.0\SkiaSharp.Views.Interop.UWP.dll" />
+  </ItemGroup>
   <ItemGroup>
     <Compile Include="..\SkiaSharp.Views.Shared\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
   </ItemGroup>