Add Support for Windows Runtime

build.cake

@@ -77,6 +77,26 @@ buildSpec = new BuildSpec () {
 					FromFile = "./src/SignaturePad.Forms.UWP/bin/Release/SignaturePad.Forms.dll",
 					ToDirectory = "output/uwp",
 				},
+				new OutputFileCopy {
+					FromFile = "./src/SignaturePad.Windows81/bin/Release/SignaturePad.dll",
+					ToDirectory = "output/win",
+				},
+				new OutputFileCopy {
+					FromFile = "./src/SignaturePad.Forms.Windows81/bin/Release/SignaturePad.Forms.dll",
+					ToDirectory = "output/win",
+				},
+				new OutputFileCopy {
+					FromFile = "./src/SignaturePad.WindowsPhone81/bin/Release/SignaturePad.dll",
+					ToDirectory = "output/wpa",
+				},
+				new OutputFileCopy {
+					FromFile = "./src/SignaturePad.Forms.WindowsPhone81/bin/Release/SignaturePad.Forms.dll",
+					ToDirectory = "output/wpa",
+				},
+				new OutputFileCopy {
+					FromFile = "./src/SignaturePad.WindowsRuntime81/bin/Release/SignaturePad.dll",
+					ToDirectory = "output/winrt",
+				},
 			}
 		}
 	},
@@ -87,6 +107,9 @@ buildSpec = new BuildSpec () {
 		new IOSSolutionBuilder { SolutionPath = "./samples/Sample.Forms/Sample.Forms.Mac.sln", BuildsOn = BuildPlatforms.Mac },
 		new WpSolutionBuilder { SolutionPath = "./samples/Sample.WP8/Sample.WP8.sln", BuildsOn = BuildPlatforms.Windows }, 
 		new WpSolutionBuilder { SolutionPath = "./samples/Sample.UWP/Sample.UWP.sln", BuildsOn = BuildPlatforms.Windows }, 
+		new WpSolutionBuilder { SolutionPath = "./samples/Sample.Windows81/Sample.Windows81.sln", BuildsOn = BuildPlatforms.Windows }, 
+		new WpSolutionBuilder { SolutionPath = "./samples/Sample.WindowsPhone81/Sample.WindowsPhone81.sln", BuildsOn = BuildPlatforms.Windows }, 
+		new WpSolutionBuilder { SolutionPath = "./samples/Sample.WindowsRuntime81/Sample.WindowsRuntime81.sln", BuildsOn = BuildPlatforms.Windows }, 
 		new WpSolutionBuilder { SolutionPath = "./samples/Sample.Forms/Sample.Forms.Win.sln", BuildsOn = BuildPlatforms.Windows }, 
 	},
 

component/component.yaml

@@ -26,11 +26,17 @@ libraries:
   ios-unified: ../output/ios-unified/SignaturePad.dll
   wp8: ../output/wp8/SignaturePad.dll
   uwp: ../output/uwp/SignaturePad.dll
+  wpa81: ../output/wpa/SignaturePad.dll
+  winrt: ../output/winrt/SignaturePad.dll
+  win8: ../output/win/SignaturePad.dll
 packages:
   android: Xamarin.Controls.SignaturePad, Version=2.0.0
   ios-unified: Xamarin.Controls.SignaturePad, Version=2.0.0
   wp8: Xamarin.Controls.SignaturePad, Version=2.0.0
   uwp: Xamarin.Controls.SignaturePad, Version=2.0.0
+  wpa81: Xamarin.Controls.SignaturePad, Version=2.0.0
+  winrt: Xamarin.Controls.SignaturePad, Version=2.0.0
+  win8: Xamarin.Controls.SignaturePad, Version=2.0.0
 
 samples:
   - name: "Android Sample"
@@ -71,16 +77,58 @@ samples:
       - project: Sample.UWP
         packages:
           - Xamarin.Controls.SignaturePad
+  - name: "Windows Phone 8.1 Sample"
+    path: ../samples/Sample.WindowsPhone81/Sample.WindowsPhone81.sln
+    removeProjects:
+      - SignaturePad.WindowsPhone81
+      - SignaturePad.Shared
+      - SignaturePad.InkPresenter.Shared
+    installNuGets:
+      - project: Sample.WindowsPhone81
+        packages:
+          - Xamarin.Controls.SignaturePad
+  - name: "Windows 8.1 Sample"
+    path: ../samples/Sample.Windows81/Sample.Windows81.sln
+    removeProjects:
+      - SignaturePad.Windows81
+      - SignaturePad.Shared
+    installNuGets:
+      - project: Sample.Windows81
+        packages:
+          - Xamarin.Controls.SignaturePad
+  - name: "Windows 8.1 Universal Sample"
+    path: ../samples/Sample.WindowsRuntime81/Sample.WindowsRuntime81.sln
+    removeProjects:
+      - SignaturePad.WindowsRuntime81
+      - SignaturePad.Windows81
+      - SignaturePad.WindowsPhone81
+      - SignaturePad.Shared
+      - SignaturePad.InkPresenter.Shared
+    installNuGets:
+      - project: Sample.WindowsRuntime81
+        packages:
+          - Xamarin.Controls.SignaturePad
+      - project: Sample.WindowsRuntime81.Windows
+        packages:
+          - Xamarin.Controls.SignaturePad
+      - project: Sample.WindowsRuntime81.WindowsPhone
+        packages:
+          - Xamarin.Controls.SignaturePad
   - name: "Xamarin.Forms Sample"
     path: ../samples/Sample.Forms/Sample.Forms.sln
     removeProjects:
       - SignaturePad.WP8
       - SignaturePad.iOS
       - SignaturePad.Android
+      - SignaturePad.Windows81
+      - SignaturePad.WindowsPhone81
+      - SignaturePad.WindowsRuntime81
       - SignaturePad.Forms
       - SignaturePad.Forms.Droid
       - SignaturePad.Forms.iOS
       - SignaturePad.Forms.WindowsPhone
+      - SignaturePad.Forms.Windows81
+      - SignaturePad.Forms.WindowsPhone81
       - SignaturePad.Forms.Platform.Shared
       - SignaturePad.Shared
       - SignaturePad.InkPresenter.Shared
@@ -104,5 +152,13 @@ samples:
         packages:
           - Xamarin.Controls.SignaturePad
           - Xamarin.Controls.SignaturePad.Forms
+      - project: Samples.Windows81
+        packages:
+          - Xamarin.Controls.SignaturePad
+          - Xamarin.Controls.SignaturePad.Forms
+      - project: Samples.WindowsPhone81
+        packages:
+          - Xamarin.Controls.SignaturePad
+          - Xamarin.Controls.SignaturePad.Forms
 
 ...

nuget/Xamarin.Controls.SignaturePad.Forms.nuspec

@@ -8,6 +8,7 @@
     <owners>Xamarin, Inc.</owners>
     <licenseUrl>https://components.xamarin.com/license/signature-pad</licenseUrl>
     <projectUrl>https://components.xamarin.com/view/signature-pad</projectUrl>
+    <iconUrl>https://cdn.rawgit.com/xamarin/SignaturePad/v2.0/component/icons/signature-pad_256x256.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Makes capturing, saving, and displaying signatures extremely simple.</description>
     <copyright>Copyright (c) Xamarin Inc. 2017</copyright>
@@ -29,6 +30,14 @@
         <dependency id="Xamarin.Forms" version="2.3.3" />
         <dependency id="Xamarin.Controls.SignaturePad" version="2.0.0" />
       </group>
+      <group targetFramework="win">
+        <dependency id="Xamarin.Forms" version="2.3.3" />
+        <dependency id="Xamarin.Controls.SignaturePad" version="2.0.0" />
+      </group>
+      <group targetFramework="wpa">
+        <dependency id="Xamarin.Forms" version="2.3.3" />
+        <dependency id="Xamarin.Controls.SignaturePad" version="2.0.0" />
+      </group>
       <group targetFramework="portable-net45+win8+wp8">
         <dependency id="Xamarin.Forms" version="2.3.3" />
       </group>
@@ -42,6 +51,8 @@
     <file src="output/ios-unified/SignaturePad.Forms.dll" target="lib/Xamarin.iOS/SignaturePad.Forms.dll" />
     <file src="output/wp8/SignaturePad.Forms.dll" target="lib/wp8/SignaturePad.Forms.dll" />
     <file src="output/uwp/SignaturePad.Forms.dll" target="lib/uap10.0/SignaturePad.Forms.dll" />
+    <file src="output/win/SignaturePad.Forms.dll" target="lib/win/SignaturePad.Forms.dll" />
+    <file src="output/wpa/SignaturePad.Forms.dll" target="lib/wpa/SignaturePad.Forms.dll" />
 
     <file src="output/pcl/SignaturePad.Forms.dll" target="lib/portable-net45+win8+wp8/SignaturePad.Forms.dll" />
     <file src="output/pcl/SignaturePad.Forms.dll" target="lib/portable-net45+win+wp8+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10/SignaturePad.Forms.dll" />

nuget/Xamarin.Controls.SignaturePad.nuspec

@@ -8,6 +8,7 @@
     <owners>Xamarin, Inc.</owners>
     <licenseUrl>https://components.xamarin.com/license/signature-pad</licenseUrl>
     <projectUrl>https://components.xamarin.com/view/signature-pad</projectUrl>
+    <iconUrl>https://cdn.rawgit.com/xamarin/SignaturePad/v2.0/component/icons/signature-pad_256x256.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Makes capturing, saving, and displaying signatures extremely simple.</description>
     <copyright>Copyright (c) Xamarin Inc. 2017</copyright>
@@ -19,12 +20,21 @@
       <group targetFramework="uap10.0">
         <dependency id="Win2D.uwp" version="1.20.0" />
       </group>
+      <group targetFramework="win">
+        <dependency id="Win2D.win81" version="1.20.0" />
+      </group>
+      <group targetFramework="wpa">
+        <dependency id="Win2D.win81" version="1.20.0" />
+      </group>
     </dependencies>
   </metadata>
   <files>
     <file src="output/android/SignaturePad.dll" target="lib/MonoAndroid/SignaturePad.dll" />
     <file src="output/ios-unified/SignaturePad.dll" target="lib/Xamarin.iOS/SignaturePad.dll" />
     <file src="output/wp8/SignaturePad.dll" target="lib/wp8/SignaturePad.dll" />
     <file src="output/uwp/SignaturePad.dll" target="lib/uap10.0/SignaturePad.dll" />
+    <file src="output/win/SignaturePad.dll" target="lib/win/SignaturePad.dll" />
+    <file src="output/wpa/SignaturePad.dll" target="lib/wpa/SignaturePad.dll" />
+    <file src="output/winrt/SignaturePad.dll" target="lib/portable-win81+wpa81/SignaturePad.dll" />
   </files>
 </package>

samples/Sample.Android/Sample.Android.csproj

@@ -18,8 +18,6 @@
     <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
     <TargetFrameworkVersion>v7.1</TargetFrameworkVersion>
     <AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>True</DebugSymbols>
@@ -33,13 +31,7 @@
     <AndroidLinkMode>None</AndroidLinkMode>
     <EmbedAssembliesIntoApk>False</EmbedAssembliesIntoApk>
     <AndroidUseSharedRuntime>True</AndroidUseSharedRuntime>
-    <BundleAssemblies>False</BundleAssemblies>
-    <AndroidCreatePackagePerAbi>False</AndroidCreatePackagePerAbi>
     <Debugger>.Net (Xamarin)</Debugger>
-    <AotAssemblies>False</AotAssemblies>
-    <EnableLLVM>False</EnableLLVM>
-    <AndroidEnableMultiDex>False</AndroidEnableMultiDex>
-    <EnableProguard>False</EnableProguard>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>none</DebugType>
@@ -52,13 +44,7 @@
     <AndroidSupportedAbis>armeabi,armeabi-v7a,x86,x86_64,arm64-v8a</AndroidSupportedAbis>
     <AndroidLinkMode>Full</AndroidLinkMode>
     <EmbedAssembliesIntoApk>True</EmbedAssembliesIntoApk>
-    <BundleAssemblies>False</BundleAssemblies>
-    <AndroidCreatePackagePerAbi>False</AndroidCreatePackagePerAbi>
     <Debugger>Xamarin</Debugger>
-    <AotAssemblies>False</AotAssemblies>
-    <EnableLLVM>False</EnableLLVM>
-    <AndroidEnableMultiDex>False</AndroidEnableMultiDex>
-    <EnableProguard>False</EnableProguard>
     <DebugSymbols>False</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
@@ -108,7 +94,7 @@
       <Name>SignaturePad.Android</Name>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
+  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
   <Import Project="packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets" Condition="Exists('packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>