Wpf and macOS

.github/dependabot.yml

@@ -0,0 +1,21 @@
+version: 2
+updates:
+- package-ecosystem: nuget
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "03:00"
+  open-pull-requests-limit: 10
+  ignore:
+  - dependency-name: Microsoft.NETCore.UniversalWindowsPlatform
+    versions:
+    - 6.2.11
+  - dependency-name: Xamarin.Forms
+    versions:
+    - 4.3.0.991211
+  - dependency-name: Win2D.uwp
+    versions:
+    - 1.25.0
+  - dependency-name: MSBuild.Sdk.Extras
+    versions:
+    - 3.0.22

.github/workflows/main.yml

@@ -0,0 +1,34 @@
+name: XamarinSignaturePad
+
+# Controls when the action will run. Triggers the workflow on push or pull request
+# events but only for the WPF branch
+on:
+  push:
+    branches: [ WPF ]
+  pull_request:
+    branches: [ WPF ]
+
+jobs:
+  buildOnWindows:
+    runs-on: windows-latest
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Install tools
+      shell: cmd
+      run: choco install mono -x86
+
+    - name: Run build
+      shell: pwsh
+      run: ./build.ps1
+
+  buildOnMac:
+    runs-on: macos-latest
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Run build
+      shell: bash
+      run: ./build.sh

ISSUE_TEMPLATE.md

@@ -20,10 +20,10 @@
 - Last known good version:  <!-- the version of SkiaSharp that still working -->
 - IDE:  <!-- Visual Studio / Visual Studio for Mac / MonoDevelop / Visual Studio Code -->
 - Platform Target Frameworks: <!-- all that apply, remove the platforms that aren't broken or haven't had any testing -->
-  - Android: <!-- the version of the Android SDK you are compiling against, e.g. 7.1 --> 
+  - Android: <!-- the version of the Android SDK you are compiling against, e.g. 8.1 --> 
   - iOS:  <!-- the version of the iOS SDK you are compiling against, e.g. 11.1 -->
   - UWP:  <!-- the version of the UWP SDK you are compiling against, e.g. 16299 --> 
-  - Xamarin.Forms:  <!-- the version of Xamarin.Forms you are building for, e.g. 2.5.0.280555 -->
+  - Xamarin.Forms:  <!-- the version of Xamarin.Forms you are building for, e.g. 4.0.0.169046-pre5 -->
 - Target Devices:
   -   <!-- the devices that you noticed this on, e.g. iPhone X -->
 

README.md

@@ -1,7 +1,13 @@
-# Signature Pad
 
+# Important
+
+The packages which are published in nuget support Android, iOS and UWP. If you develop for another platforms (macOS, WPF, GTK), follow the [link](https://ci.appveyor.com/project/VladislavAntonyuk/signaturepad/build/artifacts) and download artifacts.
+
+## If you find any defects, feel free to create a pull request.
+
+# Signature Pad
 
-[![Build Status](https://jenkins.mono-project.com/buildStatus/icon?job=Components-SignaturePad-Windows)](https://jenkins.mono-project.com/view/Components/job/Components-SignaturePad-Windows/)  [![Build Status](https://jenkins.mono-project.com/buildStatus/icon?job=Components-SignaturePad)](https://jenkins.mono-project.com/view/Components/job/Components-SignaturePad/)
+[![Build status](https://ci.appveyor.com/api/projects/status/qy7aaendnt5n2g3w?svg=true)](https://ci.appveyor.com/project/VladislavAntonyuk/signaturepad) ![XamarinSignaturePad](https://github.com/VladislavAntonyuk/SignaturePad/workflows/XamarinSignaturePad/badge.svg)
 
 [![SignaturePad NuGet](https://img.shields.io/nuget/v/Xamarin.Controls.SignaturePad.svg?label=SignaturePad%20NuGet)](https://www.nuget.org/packages/Xamarin.Controls.SignaturePad)  [![SignaturePad Xamairn.Forms NuGet](https://img.shields.io/nuget/v/Xamarin.Controls.SignaturePad.Forms.svg?label=SignaturePad.Forms%20NuGet)](https://www.nuget.org/packages/Xamarin.Controls.SignaturePad.Forms)
 

appveyor.yml

@@ -0,0 +1,33 @@
+version: 1.0.{build}
+
+pull_requests:
+  do_not_increment_build_number: true
+
+image:
+  - Visual Studio 2019 Preview
+
+environment:
+  DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
+  DOTNET_CLI_TELEMETRY_OPTOUT: 1
+
+nuget:
+  disable_publish_on_pr: true
+
+install:
+  - ps: >-
+      echo "Install software";
+      choco install mono -x86;
+
+build_script:
+  - pwsh: >-
+      echo "Run build";
+      ./build.ps1;
+      $host.SetShouldExit($LastExitCode);
+
+artifacts:
+  - path: output
+    name: output
+
+test: off
+
+deploy: off

build.cake

@@ -1,18 +1,56 @@
+#tool nuget:?package=vswhere
+
 ///////////////////////////////////////////////////////////////////////////////
 // ARGUMENTS
 ///////////////////////////////////////////////////////////////////////////////
 
-var CURRENT_PACKAGE_VERSION = "3.0.0";
+var CURRENT_PACKAGE_VERSION = "3.2.0";
 
 var target = Argument("target", "Default");
 var configuration = Argument("configuration", "Release");
 var packageVersion = Argument("packageVersion", CURRENT_PACKAGE_VERSION);
 var majorVersion = $"{packageVersion.Substring(0, packageVersion.IndexOf("."))}.0.0.0";
-var buildVersion = Argument("buildVersion", EnvironmentVariable("BUILD_NUMBER") ?? "");
+var buildVersion = Argument("buildVersion", EnvironmentVariable("APPVEYOR_BUILD_NUMBER") ?? "");
 if (!string.IsNullOrEmpty(buildVersion)) {
     buildVersion = $"-{buildVersion}";
 }
 
+MSBuildSettings CreateSettings()
+{
+    var settings = new MSBuildSettings 
+    {
+        Configuration = configuration,
+        MSBuildPlatform = MSBuildPlatform.x86,
+        Properties = {
+            { "AssemblyVersion", new [] { majorVersion } },
+            { "Version", new [] { packageVersion } },
+        },
+        ArgumentCustomization = args => {
+            return args.Append("/restore");
+        }
+    };
+
+    if (IsRunningOnWindows())
+    {
+        DirectoryPath vsLatest = VSWhereLatest(new VSWhereLatestSettings{IncludePrerelease = true});
+        FilePath msBuildPath = vsLatest?.CombineWithFilePath("./MSBuild/Current/Bin/MSBuild.exe");       
+
+        if (!FileExists(msBuildPath))
+        {
+            throw new Exception($"Failed to find MSBuild: {msBuildPath}");
+        }
+
+        Information("Building using MSBuild at " + msBuildPath);
+        settings.ToolPath = msBuildPath;
+    }
+    else
+    {
+        settings.ToolPath = Context.Tools.Resolve("msbuild");
+    }
+
+    return settings;
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // TASKS
 ///////////////////////////////////////////////////////////////////////////////
@@ -21,34 +59,33 @@ Task("libs")
     .Does(() =>
 {
     var sln = IsRunningOnWindows() ? "./src/SignaturePad.sln" : "./src/SignaturePad.Mac.sln";
-
-    MSBuild(sln, new MSBuildSettings {
-        Verbosity = Verbosity.Minimal,
-        Configuration = configuration,
-        PlatformTarget = PlatformTarget.MSIL,
-        MSBuildPlatform = MSBuildPlatform.x86,
-        ArgumentCustomization = args => args.Append("/restore"),
-        Properties = {
-            { "AssemblyVersion", new [] { majorVersion } },
-            { "Version", new [] { packageVersion } },
-        },
-    });
+    MSBuild(sln, CreateSettings());
 
     EnsureDirectoryExists("./output/android/");
+    EnsureDirectoryExists("./output/wpf/");
+    EnsureDirectoryExists("./output/gtk/");
+    EnsureDirectoryExists("./output/mac/");
     EnsureDirectoryExists("./output/ios/");
-    EnsureDirectoryExists("./output/uwp/");
-    EnsureDirectoryExists("./output/uwp/Themes");
+    EnsureDirectoryExists("./output/uwp/SignaturePad/Themes");    
     EnsureDirectoryExists("./output/netstandard/");
 
     CopyFiles($"./src/SignaturePad.Android/bin/{configuration}/SignaturePad.*", "./output/android/");
     CopyFiles($"./src/SignaturePad.iOS/bin/{configuration}/SignaturePad.*", "./output/ios/");
+    CopyFiles($"./src/SignaturePad.MacOS/bin/{configuration}/SignaturePad.*", "./output/mac/");
+    CopyFiles($"./src/SignaturePad.WPF/bin/{configuration}/SignaturePad.*", "./output/wpf/");
+    CopyFiles($"./src/SignaturePad.GTK/bin/{configuration}/SignaturePad.*", "./output/gtk/");
     CopyFiles($"./src/SignaturePad.UWP/bin/{configuration}/SignaturePad.*", "./output/uwp/");
-    CopyFiles($"./src/SignaturePad.UWP/bin/{configuration}/Themes/*", "./output/uwp/Themes");
+    CopyFiles($"./src/SignaturePad.UWP/bin/{configuration}/SignaturePad/*", "./output/uwp/SignaturePad");
+    CopyFiles($"./src/SignaturePad.UWP/bin/{configuration}/SignaturePad/Themes/*", "./output/uwp/SignaturePad/Themes");
 
     CopyFiles($"./src/SignaturePad.Forms.Droid/bin/{configuration}/SignaturePad.Forms.*", "./output/android/");
     CopyFiles($"./src/SignaturePad.Forms.iOS/bin/{configuration}/SignaturePad.Forms.*", "./output/ios/");
+    CopyFiles($"./src/SignaturePad.Forms.MacOS/bin/{configuration}/SignaturePad.Forms.*", "./output/mac/");
+    CopyFiles($"./src/SignaturePad.Forms.WPF/bin/{configuration}/SignaturePad.Forms.*", "./output/wpf/");
+    CopyFiles($"./src/SignaturePad.Forms.GTK/bin/{configuration}/SignaturePad.Forms.*", "./output/gtk/");
     CopyFiles($"./src/SignaturePad.Forms.UWP/bin/{configuration}/SignaturePad.Forms.*", "./output/uwp/");
-    CopyFiles($"./src/SignaturePad.Forms.UWP/bin/{configuration}/Themes/*", "./output/uwp/Themes");
+    CopyFiles($"./src/SignaturePad.Forms.UWP/bin/{configuration}/SignaturePad/*", "./output/uwp/SignaturePad/");
+    CopyFiles($"./src/SignaturePad.Forms.UWP/bin/{configuration}/SignaturePad/Themes/*", "./output/uwp/SignaturePad/Themes");
     CopyFiles($"./src/SignaturePad.Forms/bin/{configuration}/SignaturePad.Forms.*", "./output/netstandard/");
 });
 
@@ -57,7 +94,6 @@ Task("nuget")
     .WithCriteria(IsRunningOnWindows())
     .Does(() =>
 {
-    var nuget = Context.Tools.Resolve("nuget.exe");
     var nuspecs = GetFiles("./nuget/*.nuspec");
     var settings = new NuGetPackSettings {
         BasePath = ".",
@@ -80,23 +116,33 @@ Task("samples")
     .IsDependentOn("libs")
     .Does(() =>
 {
-    var settings = new MSBuildSettings {
-        Verbosity = Verbosity.Minimal,
-        Configuration = configuration,
-        PlatformTarget = PlatformTarget.MSIL,
-        MSBuildPlatform = MSBuildPlatform.x86,
-        ArgumentCustomization = args => args.Append("/restore"),
+    var settings = CreateSettings();
+    var settingsIos = CreateSettings();
+    settingsIos.ArgumentCustomization = args => {
+            return args.Append($"/p:Platform=\"iPhoneSimulator\"");
     };
 
     if (IsRunningOnWindows()) {
+        NuGetRestore("./samples/Sample.Android/Sample.Android.sln");
         MSBuild("./samples/Sample.Android/Sample.Android.sln", settings);
-        MSBuild("./samples/Sample.iOS/Sample.iOS.sln", settings);
+
+        NuGetRestore("./samples/Sample.iOS/Sample.iOS.sln");
+        MSBuild("./samples/Sample.iOS/Sample.iOS.sln", settingsIos);
+
+        NuGetRestore("./samples/Sample.UWP/Sample.UWP.sln");
         MSBuild("./samples/Sample.UWP/Sample.UWP.sln", settings);
-        MSBuild("./samples/Sample.Forms/Sample.Forms.sln", settings);
+
+        NuGetRestore("./samples/Sample.Forms/Sample.Forms.sln");
+        MSBuild("./samples/Sample.Forms/Sample.Forms.sln", settingsIos);
     } else {
+        NuGetRestore("./samples/Sample.Android/Sample.Android.sln");
         MSBuild("./samples/Sample.Android/Sample.Android.sln", settings);
-        MSBuild("./samples/Sample.iOS/Sample.iOS.sln", settings);
-        MSBuild("./samples/Sample.Forms/Sample.Forms.Mac.sln", settings);
+
+        NuGetRestore("./samples/Sample.iOS/Sample.iOS.sln");
+        MSBuild("./samples/Sample.iOS/Sample.iOS.sln", settingsIos);
+
+        NuGetRestore("./samples/Sample.Forms/Sample.Forms.Mac.sln");
+        MSBuild("./samples/Sample.Forms/Sample.Forms.Mac.sln", settingsIos);
     }
 
 });
@@ -106,7 +152,4 @@ Task("Default")
     .IsDependentOn("nuget")
     .IsDependentOn("samples");
 
-Task("CI")
-    .IsDependentOn("Default");
-
 RunTarget(target);

nuget/Xamarin.Controls.SignaturePad.Forms.nuspec

@@ -20,35 +20,60 @@
     <dependencies>
       <group targetFramework="MonoAndroid">
         <dependency id="Xamarin.Controls.SignaturePad" version="$version$" exclude="Build,Analyzers" />
-        <dependency id="Xamarin.Forms" version="2.5.0.280555" exclude="Build,Analyzers" />
+        <dependency id="Xamarin.Forms" version="4.0.0.169046-pre5" exclude="Build,Analyzers" />
       </group>
       <group targetFramework="Xamarin.iOS">
         <dependency id="Xamarin.Controls.SignaturePad" version="$version$" exclude="Build,Analyzers" />
-        <dependency id="Xamarin.Forms" version="2.5.0.280555" exclude="Build,Analyzers" />
+        <dependency id="Xamarin.Forms" version="4.0.0.169046-pre5" exclude="Build,Analyzers" />
+      </group>
+	    <group targetFramework="Xamarin.Mac">
+        <dependency id="Xamarin.Controls.SignaturePad" version="$version$" exclude="Build,Analyzers" />
+        <dependency id="Xamarin.Forms" version="4.0.0.169046-pre5" exclude="Build,Analyzers" />
+      </group>
+      <group targetFramework="net472">
+        <dependency id="Xamarin.Controls.SignaturePad" version="$version$" exclude="Build,Analyzers" />
+        <dependency id="Xamarin.Forms" version="4.0.0.169046-pre5" exclude="Build,Analyzers" />
+        <dependency id="Xamarin.Forms.Platform.WPF" version="4.0.0.169046-pre5" exclude="Build,Analyzers" />
+      </group>
+      <group targetFramework="net471">
+        <dependency id="Xamarin.Controls.SignaturePad" version="$version$" exclude="Build,Analyzers" />
+        <dependency id="Xamarin.Forms" version="4.0.0.169046-pre5" exclude="Build,Analyzers" />
+        <dependency id="Xamarin.Forms.Platform.GTK" version="4.0.0.169046-pre5" exclude="Build,Analyzers" />
       </group>
       <group targetFramework="uap10.0">
         <dependency id="Xamarin.Controls.SignaturePad" version="$version$" exclude="Build,Analyzers" />
-        <dependency id="Xamarin.Forms" version="2.5.0.280555" exclude="Build,Analyzers" />
+        <dependency id="Xamarin.Forms" version="4.0.0.169046-pre5" exclude="Build,Analyzers" />
       </group>
-      <group targetFramework="netstandard1.0">
-        <dependency id="Xamarin.Forms" version="2.5.0.280555" exclude="Build,Analyzers" />
+      <group targetFramework="netstandard2.0">
+        <dependency id="Xamarin.Forms" version="4.0.0.169046-pre5" exclude="Build,Analyzers" />
       </group>
     </dependencies>
   </metadata>
 
   <files>
     <file src="output/android/SignaturePad.Forms.dll" target="lib/MonoAndroid/SignaturePad.Forms.dll" />
     <file src="output/android/SignaturePad.Forms.xml" target="lib/MonoAndroid/SignaturePad.Forms.xml" />
+
+    <file src="output/gtk/SignaturePad.Forms.dll" target="lib/net471/SignaturePad.Forms.dll" />
+    <file src="output/gtk/SignaturePad.Forms.xml" target="lib/net471/SignaturePad.Forms.xml" />
+
+    <file src="output/wpf/SignaturePad.Forms.dll" target="lib/net472/SignaturePad.Forms.dll" />
+    <file src="output/wpf/SignaturePad.Forms.xml" target="lib/net472/SignaturePad.Forms.xml" />
+
+	  <file src="output/mac/SignaturePad.Forms.dll" target="lib/Xamarin.Mac/SignaturePad.Forms.dll" />
+    <file src="output/mac/SignaturePad.Forms.xml" target="lib/Xamarin.Mac/SignaturePad.Forms.xml" />
 
     <file src="output/ios/SignaturePad.Forms.dll" target="lib/Xamarin.iOS/SignaturePad.Forms.dll" />
     <file src="output/ios/SignaturePad.Forms.xml" target="lib/Xamarin.iOS/SignaturePad.Forms.xml" />
 
     <file src="output/uwp/SignaturePad.Forms.dll" target="lib/uap10.0/SignaturePad.Forms.dll" />
     <file src="output/uwp/SignaturePad.Forms.xml" target="lib/uap10.0/SignaturePad.Forms.xml" />
     <file src="output/uwp/SignaturePad.Forms.pri" target="lib/uap10.0/SignaturePad.Forms.pri" />
-
-    <file src="output/netstandard/SignaturePad.Forms.dll" target="lib/netstandard1.0/SignaturePad.Forms.dll" />
-    <file src="output/netstandard/SignaturePad.Forms.xml" target="lib/netstandard1.0/SignaturePad.Forms.xml" />
+    <file src="output/uwp/SignaturePad/Themes/Generic.xaml" target="lib/uap10.0/SignaturePad/Themes/Generic.xaml" />
+    <file src="output/uwp/SignaturePad/SignaturePad.xr.xml" target="lib/uap10.0/SignaturePad/SignaturePad.xr.xml" />
+
+    <file src="output/netstandard/SignaturePad.Forms.dll" target="lib/netstandard2.0/SignaturePad.Forms.dll" />
+    <file src="output/netstandard/SignaturePad.Forms.xml" target="lib/netstandard2.0/SignaturePad.Forms.xml" />
   </files>
 
 </package>