Lots of moving to get going for Windows' path-too-long issues

build.cake

@@ -184,38 +184,38 @@ Task ("samples")
     ClearSkiaSharpNuGetCache ();
 
     if (IsRunningOnUnix ()) {
-        RunNuGetRestore ("./samples/SkiaSharpSample.MacSample/SkiaSharpSample.MacSample.sln");
-        DotNetBuild ("./samples/SkiaSharpSample.MacSample/SkiaSharpSample.MacSample.sln", c => { 
+        RunNuGetRestore ("./samples/MacSample/MacSample.sln");
+        DotNetBuild ("./samples/MacSample/MacSample.sln", c => { 
             c.Configuration = "Release"; 
         });
-        RunNuGetRestore ("./samples/SkiaSharpSample.FormsSample/SkiaSharpSample.FormsSample.Mac.sln");
-        DotNetBuild ("./samples/SkiaSharpSample.FormsSample/SkiaSharpSample.FormsSample.Mac.sln", c => { 
+        RunNuGetRestore ("./samples/FormsSample/FormsSample.Mac.sln");
+        DotNetBuild ("./samples/FormsSample/FormsSample.Mac.sln", c => { 
             c.Configuration = "Release"; 
             c.Properties ["Platform"] = new [] { "iPhone" };
         });
-        RunNuGetRestore ("./samples/SkiaSharpSample.TvSample/SkiaSharpSample.TvSample.sln");
-        DotNetBuild ("./samples/SkiaSharpSample.TvSample/SkiaSharpSample.TvSample.sln", c => { 
+        RunNuGetRestore ("./samples/TvSample/TvSample.sln");
+        DotNetBuild ("./samples/TvSample/TvSample.sln", c => { 
             c.Configuration = "Release"; 
             c.Properties ["Platform"] = new [] { "iPhoneSimulator" };
         });
     }
     
     if (IsRunningOnWindows ()) {
-        RunNuGetRestore ("./samples/SkiaSharpSample.WPFSample/SkiaSharpSample.WPFSample.sln");
-        DotNetBuild ("./samples/SkiaSharpSample.WPFSample/SkiaSharpSample.WPFSample.sln", c => { 
+        RunNuGetRestore ("./samples/WPFSample/WPFSample.sln");
+        DotNetBuild ("./samples/WPFSample/WPFSample.sln", c => { 
             c.Configuration = "Release";
             c.Properties ["Platform"] = new [] { "x86" };
         });
-        RunNuGetRestore ("./samples/SkiaSharpSample.UWPSample/SkiaSharpSample.UWPSample.sln");
-        DotNetBuild ("./samples/SkiaSharpSample.UWPSample/SkiaSharpSample.UWPSample.sln", c => { 
+        RunNuGetRestore ("./samples/UWPSample/UWPSample.sln");
+        DotNetBuild ("./samples/UWPSample/UWPSample.sln", c => { 
             c.Configuration = "Release"; 
         });
-        RunNuGetRestore ("./samples/SkiaSharpSample.FormsSample/SkiaSharpSample.FormsSample.Windows.sln");
-        DotNetBuild ("./samples/SkiaSharpSample.FormsSample/SkiaSharpSample.FormsSample.Windows.sln", c => { 
+        RunNuGetRestore ("./samples/FormsSample/FormsSample.Windows.sln");
+        DotNetBuild ("./samples/FormsSample/FormsSample.Windows.sln", c => { 
             c.Configuration = "Release"; 
         });
-        RunNuGetRestore ("./samples/SkiaSharpSample.WindowsSample/SkiaSharpSample.WindowsSample.sln");
-        DotNetBuild ("./samples/SkiaSharpSample.WindowsSample/SkiaSharpSample.WindowsSample.sln", c => { 
+        RunNuGetRestore ("./samples/WindowsSample/WindowsSample.sln");
+        DotNetBuild ("./samples/WindowsSample/WindowsSample.sln", c => { 
             c.Configuration = "Release"; 
             c.Properties ["Platform"] = new [] { "x86" };
         });
@@ -328,11 +328,11 @@ Task ("set-versions")
     add ("./source/*/*/*.nuget.targets");
     add ("./source/*/*/*.csproj");
     // sample packages files
-    add ("./samples/**/packages.config");
-    add ("./samples/**/project.json");
+    add ("./samples/*/*/packages.config");
+    add ("./samples/*/*/project.json");
     // sample project files
-    add ("./samples/**/*.nuget.targets");
-    add ("./samples/**/*.csproj");
+    add ("./samples/*/*/*.nuget.targets");
+    add ("./samples/*/*/*.csproj");
     // update
     foreach (var file in files) {
         UpdateSkiaSharpVersion (file, versions);
@@ -381,10 +381,6 @@ Task ("clean-managed").Does (() =>
     CleanDirectories ("./source/*/*/Generated Files");
     CleanDirectories ("./source/packages");
 
-    CleanDirectories ("./samples/BasicSamples/*/bin");
-    CleanDirectories ("./samples/BasicSamples/*/obj");
-    CleanDirectories ("./samples/BasicSamples/*/packages");
-
     if (DirectoryExists ("./output"))
         DeleteDirectory ("./output", true);
 });

nuget/SkiaSharp.Mac.nuspec

@@ -27,8 +27,8 @@
     <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+win8+wpa81+wp8" />
+    <file src="output/docs/msxml/SkiaSharp.xml" target="lib/portable-net45+win8+wpa81+wp8" />
     <!-- the build bits -->
     <!-- .NET 4.5 -->
     <file src="output/mac/SkiaSharp.Desktop.targets" target="build/net45/SkiaSharp.targets" />

nuget/SkiaSharp.Views.Forms.Mac.nuspec

@@ -30,7 +30,7 @@
     </dependencies>
   </metadata>
   <files>
-    <file src="output/portable/SkiaSharp.Views.Forms.dll" target="lib/portable-net45+xamarinmac+xamarinios+monotouch+monoandroid+win8+wpa81+wp8+xamarin.watchos+xamarin.tvos" />
+    <file src="output/portable/SkiaSharp.Views.Forms.dll" target="lib/portable-net45+win8+wpa81+wp8" />
     <file src="output/android/SkiaSharp.Views.Forms.dll" target="lib/MonoAndroid" />
     <file src="output/ios/SkiaSharp.Views.Forms.dll" target="lib/XamariniOS" />
   </files>

nuget/SkiaSharp.Views.Forms.Windows.nuspec

@@ -25,7 +25,7 @@
     </dependencies>
   </metadata>
   <files>
-    <file src="output/portable/SkiaSharp.Views.Forms.dll" target="lib/portable-net45+xamarinmac+xamarinios+monotouch+monoandroid+win8+wpa81+wp8+xamarin.watchos+xamarin.tvos" />
+    <file src="output/portable/SkiaSharp.Views.Forms.dll" target="lib/portable-net45+win8+wpa81+wp8" />
     <file src="output/uwp/SkiaSharp.Views.Forms.dll" target="lib/uap10.0" />
   </files>
 </package>

nuget/SkiaSharp.Views.Forms.nuspec

@@ -35,7 +35,7 @@
     </dependencies>
   </metadata>
   <files>
-    <file src="output/portable/SkiaSharp.Views.Forms.dll" target="lib/portable-net45+xamarinmac+xamarinios+monotouch+monoandroid+win8+wpa81+wp8+xamarin.watchos+xamarin.tvos" />
+    <file src="output/portable/SkiaSharp.Views.Forms.dll" target="lib/portable-net45+win8+wpa81+wp8" />
     <file src="output/android/SkiaSharp.Views.Forms.dll" target="lib/MonoAndroid" />
     <file src="output/ios/SkiaSharp.Views.Forms.dll" target="lib/XamariniOS" />
     <file src="output/uwp/SkiaSharp.Views.Forms.dll" target="lib/uap10.0" />

nuget/SkiaSharp.Windows.nuspec

@@ -21,8 +21,8 @@
     <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+win8+wpa81+wp8" />
+    <file src="output/docs/msxml/SkiaSharp.xml" target="lib/portable-net45+win8+wpa81+wp8" />
     <!-- the build bits -->
     <!-- .NET 4.5 -->
     <file src="output/windows/SkiaSharp.Desktop.targets" target="build/net45/SkiaSharp.targets" />

nuget/SkiaSharp.nuspec

@@ -29,8 +29,8 @@
     <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+win8+wpa81+wp8" />
+    <file src="output/docs/msxml/SkiaSharp.xml" target="lib/portable-net45+win8+wpa81+wp8" />
     <!-- the build bits -->
     <!-- .NET 4.5 -->
     <file src="output/mac/SkiaSharp.Desktop.targets" target="build/net45/SkiaSharp.targets" />

samples/FormsSample/Android/Android.csproj

@@ -50,29 +50,29 @@
     <EnableProguard>true</EnableProguard>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="FormsViewGroup, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="FormsViewGroup">
       <HintPath>..\packages\Xamarin.Forms.2.3.0.49\lib\MonoAndroid10\FormsViewGroup.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mono.Android" />
     <Reference Include="mscorlib" />
-    <Reference Include="PCLStorage, Version=1.0.2.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="PCLStorage">
       <HintPath>..\packages\PCLStorage.1.0.2\lib\monoandroid\PCLStorage.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="PCLStorage.Abstractions, Version=1.0.2.0, Culture=neutral, PublicKeyToken=286fe515a2c35b64, processorArchitecture=MSIL">
+    <Reference Include="PCLStorage.Abstractions">
       <HintPath>..\packages\PCLStorage.1.0.2\lib\monoandroid\PCLStorage.Abstractions.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="SkiaSharp, Version=1.54.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
+    <Reference Include="SkiaSharp">
       <HintPath>..\packages\SkiaSharp.1.54.1\lib\MonoAndroid\SkiaSharp.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="SkiaSharp.Views.Android, Version=1.54.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
+    <Reference Include="SkiaSharp.Views.Android">
       <HintPath>..\packages\SkiaSharp.Views.1.54.1-beta1\lib\MonoAndroid\SkiaSharp.Views.Android.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="SkiaSharp.Views.Forms, Version=1.54.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="SkiaSharp.Views.Forms">
       <HintPath>..\packages\SkiaSharp.Views.Forms.1.54.1-beta1\lib\MonoAndroid\SkiaSharp.Views.Forms.dll</HintPath>
       <Private>True</Private>
     </Reference>
@@ -80,51 +80,51 @@
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Xml" />
-    <Reference Include="Xamarin.Android.Support.Animated.Vector.Drawable, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Xamarin.Android.Support.Animated.Vector.Drawable">
       <HintPath>..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.Animated.Vector.Drawable.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Design, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Xamarin.Android.Support.Design">
       <HintPath>..\packages\Xamarin.Android.Support.Design.23.3.0\lib\MonoAndroid43\Xamarin.Android.Support.Design.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.v4, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Xamarin.Android.Support.v4">
       <HintPath>..\packages\Xamarin.Android.Support.v4.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.v7.AppCompat, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Xamarin.Android.Support.v7.AppCompat">
       <HintPath>..\packages\Xamarin.Android.Support.v7.AppCompat.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.v7.CardView, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Xamarin.Android.Support.v7.CardView">
       <HintPath>..\packages\Xamarin.Android.Support.v7.CardView.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.CardView.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.v7.MediaRouter, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Xamarin.Android.Support.v7.MediaRouter">
       <HintPath>..\packages\Xamarin.Android.Support.v7.MediaRouter.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.MediaRouter.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.v7.RecyclerView, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Xamarin.Android.Support.v7.RecyclerView">
       <HintPath>..\packages\Xamarin.Android.Support.v7.RecyclerView.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.RecyclerView.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Vector.Drawable, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Xamarin.Android.Support.Vector.Drawable">
       <HintPath>..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.Vector.Drawable.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Xamarin.Forms.Core">
       <HintPath>..\packages\Xamarin.Forms.2.3.0.49\lib\MonoAndroid10\Xamarin.Forms.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Xamarin.Forms.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Xamarin.Forms.Platform">
       <HintPath>..\packages\Xamarin.Forms.2.3.0.49\lib\MonoAndroid10\Xamarin.Forms.Platform.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Xamarin.Forms.Platform.Android, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Xamarin.Forms.Platform.Android">
       <HintPath>..\packages\Xamarin.Forms.2.3.0.49\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Xamarin.Forms.Xaml">
       <HintPath>..\packages\Xamarin.Forms.2.3.0.49\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath>
       <Private>True</Private>
     </Reference>
@@ -161,9 +161,9 @@
     <AndroidResource Include="Resources\drawable\skia.png" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\SkiaSharpSample.FormsSample\SkiaSharpSample.FormsSample.csproj">
+    <ProjectReference Include="..\Core\Core.csproj">
       <Project>{E01FBABA-8DA1-432B-9253-F4ABE13A3A6A}</Project>
-      <Name>SkiaSharpSample.FormsSample</Name>
+      <Name>Core</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>

samples/FormsSample/Core/Core.csproj

@@ -66,31 +66,31 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="PCLStorage, Version=1.0.2.0, Culture=neutral, PublicKeyToken=286fe515a2c35b64, processorArchitecture=MSIL">
+    <Reference Include="PCLStorage">
       <HintPath>..\packages\PCLStorage.1.0.2\lib\portable-net45+wp8+wpa81+win8+monoandroid+monotouch+Xamarin.iOS+Xamarin.Mac\PCLStorage.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="PCLStorage.Abstractions, Version=1.0.2.0, Culture=neutral, PublicKeyToken=286fe515a2c35b64, processorArchitecture=MSIL">
+    <Reference Include="PCLStorage.Abstractions">
       <HintPath>..\packages\PCLStorage.1.0.2\lib\portable-net45+wp8+wpa81+win8+monoandroid+monotouch+Xamarin.iOS+Xamarin.Mac\PCLStorage.Abstractions.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="SkiaSharp, Version=1.54.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
-      <HintPath>..\packages\SkiaSharp.1.54.1\lib\portable-net45+xamarinmac+xamarinios+monotouch+monoandroid+win8+wpa81+wp8+xamarin.watchos+xamarin.tvos\SkiaSharp.dll</HintPath>
+    <Reference Include="SkiaSharp">
+      <HintPath>..\packages\SkiaSharp.1.54.1\lib\portable-net45+win8+wpa81+wp8\SkiaSharp.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="SkiaSharp.Views.Forms, Version=1.54.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\SkiaSharp.Views.Forms.1.54.1-beta1\lib\portable-net45+xamarinmac+xamarinios+monotouch+monoandroid+win8+wpa81+wp8+xamarin.watchos+xamarin.tvos\SkiaSharp.Views.Forms.dll</HintPath>
+    <Reference Include="SkiaSharp.Views.Forms">
+      <HintPath>..\packages\SkiaSharp.Views.Forms.1.54.1-beta1\lib\portable-net45+win8+wpa81+wp8\SkiaSharp.Views.Forms.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Xamarin.Forms.Core">
       <HintPath>..\packages\Xamarin.Forms.2.3.0.49\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Xamarin.Forms.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Xamarin.Forms.Platform">
       <HintPath>..\packages\Xamarin.Forms.2.3.0.49\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Xamarin.Forms.Xaml">
       <HintPath>..\packages\Xamarin.Forms.2.3.0.49\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
       <Private>True</Private>
     </Reference>

samples/FormsSample/FormsSample.Mac.sln

@@ -5,11 +5,11 @@ VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SkiaSharpSample.Shared", "..\SkiaSharpSample.Shared\SkiaSharpSample.Shared.shproj", "{509B233A-35A0-41CA-A585-0B1A9F79D470}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpSample.FormsSample", "SkiaSharpSample.FormsSample\SkiaSharpSample.FormsSample.csproj", "{E01FBABA-8DA1-432B-9253-F4ABE13A3A6A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core", "Core\Core.csproj", "{E01FBABA-8DA1-432B-9253-F4ABE13A3A6A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpSample.FormsSample.Android", "SkiaSharpSample.FormsSample.Android\SkiaSharpSample.FormsSample.Android.csproj", "{B8A92B38-B7DB-450B-8D16-301404E9EADC}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Android", "Android\Android.csproj", "{B8A92B38-B7DB-450B-8D16-301404E9EADC}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpSample.FormsSample.iOS", "SkiaSharpSample.FormsSample.iOS\SkiaSharpSample.FormsSample.iOS.csproj", "{05A70F82-973A-4402-ADB9-2684D5E9F0C8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "iOS", "iOS\iOS.csproj", "{05A70F82-973A-4402-ADB9-2684D5E9F0C8}"
 EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SkiaSharpSample.Platform.Shared", "..\SkiaSharpSample.Platform.Shared\SkiaSharpSample.Platform.Shared.shproj", "{0CC41AB0-0C4C-4DAA-8F10-A249725EBF5D}"
 EndProject

samples/FormsSample/FormsSample.Windows.sln

@@ -5,9 +5,9 @@ VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SkiaSharpSample.Shared", "..\SkiaSharpSample.Shared\SkiaSharpSample.Shared.shproj", "{509B233A-35A0-41CA-A585-0B1A9F79D470}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpSample.FormsSample", "SkiaSharpSample.FormsSample\SkiaSharpSample.FormsSample.csproj", "{E01FBABA-8DA1-432B-9253-F4ABE13A3A6A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core", "Core\Core.csproj", "{E01FBABA-8DA1-432B-9253-F4ABE13A3A6A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpSample.FormsSample.UWP", "SkiaSharpSample.FormsSample.UWP\SkiaSharpSample.FormsSample.UWP.csproj", "{99F08DB7-A06E-4814-BDD6-BB87DBE278AF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UWP", "UWP\UWP.csproj", "{99F08DB7-A06E-4814-BDD6-BB87DBE278AF}"
 EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SkiaSharpSample.Platform.Shared", "..\SkiaSharpSample.Platform.Shared\SkiaSharpSample.Platform.Shared.shproj", "{0CC41AB0-0C4C-4DAA-8F10-A249725EBF5D}"
 EndProject

samples/FormsSample/FormsSample.sln

@@ -5,13 +5,13 @@ VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SkiaSharpSample.Shared", "..\SkiaSharpSample.Shared\SkiaSharpSample.Shared.shproj", "{509B233A-35A0-41CA-A585-0B1A9F79D470}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpSample.FormsSample", "SkiaSharpSample.FormsSample\SkiaSharpSample.FormsSample.csproj", "{E01FBABA-8DA1-432B-9253-F4ABE13A3A6A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core", "Core\Core.csproj", "{E01FBABA-8DA1-432B-9253-F4ABE13A3A6A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpSample.FormsSample.Android", "SkiaSharpSample.FormsSample.Android\SkiaSharpSample.FormsSample.Android.csproj", "{B8A92B38-B7DB-450B-8D16-301404E9EADC}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Android", "Android\Android.csproj", "{B8A92B38-B7DB-450B-8D16-301404E9EADC}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpSample.FormsSample.UWP", "SkiaSharpSample.FormsSample.UWP\SkiaSharpSample.FormsSample.UWP.csproj", "{99F08DB7-A06E-4814-BDD6-BB87DBE278AF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UWP", "UWP\UWP.csproj", "{99F08DB7-A06E-4814-BDD6-BB87DBE278AF}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpSample.FormsSample.iOS", "SkiaSharpSample.FormsSample.iOS\SkiaSharpSample.FormsSample.iOS.csproj", "{05A70F82-973A-4402-ADB9-2684D5E9F0C8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "iOS", "iOS\iOS.csproj", "{05A70F82-973A-4402-ADB9-2684D5E9F0C8}"
 EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SkiaSharpSample.Platform.Shared", "..\SkiaSharpSample.Platform.Shared\SkiaSharpSample.Platform.Shared.shproj", "{0CC41AB0-0C4C-4DAA-8F10-A249725EBF5D}"
 EndProject

samples/FormsSample/UWP/UWP.csproj

@@ -135,9 +135,9 @@
     </Page>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\SkiaSharpSample.FormsSample\SkiaSharpSample.FormsSample.csproj">
+    <ProjectReference Include="..\Core\Core.csproj">
       <Project>{e3d24d5e-80b0-45e1-ad55-d69d00bfa5f8}</Project>
-      <Name>SkiaSharpSample.FormsSample</Name>
+      <Name>Core</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>