Skip to content
This repository was archived by the owner on May 5, 2021. It is now read-only.

Commit 4108e4a

Browse files
mattleibowmattleibow
authored
Merge pull request #72 from xamarin/winrt-support
Add Support for Windows Runtime
2 parents 9f31554 + 7d1e022 commit 4108e4a

File tree

133 files changed

+5946
-298
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

133 files changed

+5946
-298
lines changed

‎build.cake‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,26 @@ buildSpec = new BuildSpec () {
7777
FromFile = "./src/SignaturePad.Forms.UWP/bin/Release/SignaturePad.Forms.dll",
7878
ToDirectory = "output/uwp",
7979
},
80+
new OutputFileCopy {
81+
FromFile = "./src/SignaturePad.Windows81/bin/Release/SignaturePad.dll",
82+
ToDirectory = "output/win",
83+
},
84+
new OutputFileCopy {
85+
FromFile = "./src/SignaturePad.Forms.Windows81/bin/Release/SignaturePad.Forms.dll",
86+
ToDirectory = "output/win",
87+
},
88+
new OutputFileCopy {
89+
FromFile = "./src/SignaturePad.WindowsPhone81/bin/Release/SignaturePad.dll",
90+
ToDirectory = "output/wpa",
91+
},
92+
new OutputFileCopy {
93+
FromFile = "./src/SignaturePad.Forms.WindowsPhone81/bin/Release/SignaturePad.Forms.dll",
94+
ToDirectory = "output/wpa",
95+
},
96+
new OutputFileCopy {
97+
FromFile = "./src/SignaturePad.WindowsRuntime81/bin/Release/SignaturePad.dll",
98+
ToDirectory = "output/winrt",
99+
},
80100
}
81101
}
82102
},
@@ -87,6 +107,9 @@ buildSpec = new BuildSpec () {
87107
new IOSSolutionBuilder { SolutionPath = "./samples/Sample.Forms/Sample.Forms.Mac.sln", BuildsOn = BuildPlatforms.Mac },
88108
new WpSolutionBuilder { SolutionPath = "./samples/Sample.WP8/Sample.WP8.sln", BuildsOn = BuildPlatforms.Windows },
89109
new WpSolutionBuilder { SolutionPath = "./samples/Sample.UWP/Sample.UWP.sln", BuildsOn = BuildPlatforms.Windows },
110+
new WpSolutionBuilder { SolutionPath = "./samples/Sample.Windows81/Sample.Windows81.sln", BuildsOn = BuildPlatforms.Windows },
111+
new WpSolutionBuilder { SolutionPath = "./samples/Sample.WindowsPhone81/Sample.WindowsPhone81.sln", BuildsOn = BuildPlatforms.Windows },
112+
new WpSolutionBuilder { SolutionPath = "./samples/Sample.WindowsRuntime81/Sample.WindowsRuntime81.sln", BuildsOn = BuildPlatforms.Windows },
90113
new WpSolutionBuilder { SolutionPath = "./samples/Sample.Forms/Sample.Forms.Win.sln", BuildsOn = BuildPlatforms.Windows },
91114
},
92115

‎component/component.yaml‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,17 @@ libraries:
2626
ios-unified: ../output/ios-unified/SignaturePad.dll
2727
wp8: ../output/wp8/SignaturePad.dll
2828
uwp: ../output/uwp/SignaturePad.dll
29+
wpa81: ../output/wpa/SignaturePad.dll
30+
winrt: ../output/winrt/SignaturePad.dll
31+
win8: ../output/win/SignaturePad.dll
2932
packages:
3033
android: Xamarin.Controls.SignaturePad, Version=2.0.0
3134
ios-unified: Xamarin.Controls.SignaturePad, Version=2.0.0
3235
wp8: Xamarin.Controls.SignaturePad, Version=2.0.0
3336
uwp: Xamarin.Controls.SignaturePad, Version=2.0.0
37+
wpa81: Xamarin.Controls.SignaturePad, Version=2.0.0
38+
winrt: Xamarin.Controls.SignaturePad, Version=2.0.0
39+
win8: Xamarin.Controls.SignaturePad, Version=2.0.0
3440

3541
samples:
3642
- name: "Android Sample"
@@ -71,16 +77,58 @@ samples:
7177
- project: Sample.UWP
7278
packages:
7379
- Xamarin.Controls.SignaturePad
80+
- name: "Windows Phone 8.1 Sample"
81+
path: ../samples/Sample.WindowsPhone81/Sample.WindowsPhone81.sln
82+
removeProjects:
83+
- SignaturePad.WindowsPhone81
84+
- SignaturePad.Shared
85+
- SignaturePad.InkPresenter.Shared
86+
installNuGets:
87+
- project: Sample.WindowsPhone81
88+
packages:
89+
- Xamarin.Controls.SignaturePad
90+
- name: "Windows 8.1 Sample"
91+
path: ../samples/Sample.Windows81/Sample.Windows81.sln
92+
removeProjects:
93+
- SignaturePad.Windows81
94+
- SignaturePad.Shared
95+
installNuGets:
96+
- project: Sample.Windows81
97+
packages:
98+
- Xamarin.Controls.SignaturePad
99+
- name: "Windows 8.1 Universal Sample"
100+
path: ../samples/Sample.WindowsRuntime81/Sample.WindowsRuntime81.sln
101+
removeProjects:
102+
- SignaturePad.WindowsRuntime81
103+
- SignaturePad.Windows81
104+
- SignaturePad.WindowsPhone81
105+
- SignaturePad.Shared
106+
- SignaturePad.InkPresenter.Shared
107+
installNuGets:
108+
- project: Sample.WindowsRuntime81
109+
packages:
110+
- Xamarin.Controls.SignaturePad
111+
- project: Sample.WindowsRuntime81.Windows
112+
packages:
113+
- Xamarin.Controls.SignaturePad
114+
- project: Sample.WindowsRuntime81.WindowsPhone
115+
packages:
116+
- Xamarin.Controls.SignaturePad
74117
- name: "Xamarin.Forms Sample"
75118
path: ../samples/Sample.Forms/Sample.Forms.sln
76119
removeProjects:
77120
- SignaturePad.WP8
78121
- SignaturePad.iOS
79122
- SignaturePad.Android
123+
- SignaturePad.Windows81
124+
- SignaturePad.WindowsPhone81
125+
- SignaturePad.WindowsRuntime81
80126
- SignaturePad.Forms
81127
- SignaturePad.Forms.Droid
82128
- SignaturePad.Forms.iOS
83129
- SignaturePad.Forms.WindowsPhone
130+
- SignaturePad.Forms.Windows81
131+
- SignaturePad.Forms.WindowsPhone81
84132
- SignaturePad.Forms.Platform.Shared
85133
- SignaturePad.Shared
86134
- SignaturePad.InkPresenter.Shared
@@ -104,5 +152,13 @@ samples:
104152
packages:
105153
- Xamarin.Controls.SignaturePad
106154
- Xamarin.Controls.SignaturePad.Forms
155+
- project: Samples.Windows81
156+
packages:
157+
- Xamarin.Controls.SignaturePad
158+
- Xamarin.Controls.SignaturePad.Forms
159+
- project: Samples.WindowsPhone81
160+
packages:
161+
- Xamarin.Controls.SignaturePad
162+
- Xamarin.Controls.SignaturePad.Forms
107163

108164
...

‎nuget/Xamarin.Controls.SignaturePad.Forms.nuspec‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<owners>Xamarin, Inc.</owners>
99
<licenseUrl>https://components.xamarin.com/license/signature-pad</licenseUrl>
1010
<projectUrl>https://components.xamarin.com/view/signature-pad</projectUrl>
11+
<iconUrl>https://cdn.rawgit.com/xamarin/SignaturePad/v2.0/component/icons/signature-pad_256x256.png</iconUrl>
1112
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1213
<description>Makes capturing, saving, and displaying signatures extremely simple.</description>
1314
<copyright>Copyright (c) Xamarin Inc. 2017</copyright>
@@ -29,6 +30,14 @@
2930
<dependency id="Xamarin.Forms" version="2.3.3" />
3031
<dependency id="Xamarin.Controls.SignaturePad" version="2.0.0" />
3132
</group>
33+
<group targetFramework="win">
34+
<dependency id="Xamarin.Forms" version="2.3.3" />
35+
<dependency id="Xamarin.Controls.SignaturePad" version="2.0.0" />
36+
</group>
37+
<group targetFramework="wpa">
38+
<dependency id="Xamarin.Forms" version="2.3.3" />
39+
<dependency id="Xamarin.Controls.SignaturePad" version="2.0.0" />
40+
</group>
3241
<group targetFramework="portable-net45+win8+wp8">
3342
<dependency id="Xamarin.Forms" version="2.3.3" />
3443
</group>
@@ -42,6 +51,8 @@
4251
<file src="output/ios-unified/SignaturePad.Forms.dll" target="lib/Xamarin.iOS/SignaturePad.Forms.dll" />
4352
<file src="output/wp8/SignaturePad.Forms.dll" target="lib/wp8/SignaturePad.Forms.dll" />
4453
<file src="output/uwp/SignaturePad.Forms.dll" target="lib/uap10.0/SignaturePad.Forms.dll" />
54+
<file src="output/win/SignaturePad.Forms.dll" target="lib/win/SignaturePad.Forms.dll" />
55+
<file src="output/wpa/SignaturePad.Forms.dll" target="lib/wpa/SignaturePad.Forms.dll" />
4556

4657
<file src="output/pcl/SignaturePad.Forms.dll" target="lib/portable-net45+win8+wp8/SignaturePad.Forms.dll" />
4758
<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‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<owners>Xamarin, Inc.</owners>
99
<licenseUrl>https://components.xamarin.com/license/signature-pad</licenseUrl>
1010
<projectUrl>https://components.xamarin.com/view/signature-pad</projectUrl>
11+
<iconUrl>https://cdn.rawgit.com/xamarin/SignaturePad/v2.0/component/icons/signature-pad_256x256.png</iconUrl>
1112
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1213
<description>Makes capturing, saving, and displaying signatures extremely simple.</description>
1314
<copyright>Copyright (c) Xamarin Inc. 2017</copyright>
@@ -19,12 +20,21 @@
1920
<group targetFramework="uap10.0">
2021
<dependency id="Win2D.uwp" version="1.20.0" />
2122
</group>
23+
<group targetFramework="win">
24+
<dependency id="Win2D.win81" version="1.20.0" />
25+
</group>
26+
<group targetFramework="wpa">
27+
<dependency id="Win2D.win81" version="1.20.0" />
28+
</group>
2229
</dependencies>
2330
</metadata>
2431
<files>
2532
<file src="output/android/SignaturePad.dll" target="lib/MonoAndroid/SignaturePad.dll" />
2633
<file src="output/ios-unified/SignaturePad.dll" target="lib/Xamarin.iOS/SignaturePad.dll" />
2734
<file src="output/wp8/SignaturePad.dll" target="lib/wp8/SignaturePad.dll" />
2835
<file src="output/uwp/SignaturePad.dll" target="lib/uap10.0/SignaturePad.dll" />
36+
<file src="output/win/SignaturePad.dll" target="lib/win/SignaturePad.dll" />
37+
<file src="output/wpa/SignaturePad.dll" target="lib/wpa/SignaturePad.dll" />
38+
<file src="output/winrt/SignaturePad.dll" target="lib/portable-win81+wpa81/SignaturePad.dll" />
2939
</files>
3040
</package>

‎samples/Sample.Android/Sample.Android.csproj‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
1919
<TargetFrameworkVersion>v7.1</TargetFrameworkVersion>
2020
<AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
21-
<NuGetPackageImportStamp>
22-
</NuGetPackageImportStamp>
2321
</PropertyGroup>
2422
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2523
<DebugSymbols>True</DebugSymbols>
@@ -33,13 +31,7 @@
3331
<AndroidLinkMode>None</AndroidLinkMode>
3432
<EmbedAssembliesIntoApk>False</EmbedAssembliesIntoApk>
3533
<AndroidUseSharedRuntime>True</AndroidUseSharedRuntime>
36-
<BundleAssemblies>False</BundleAssemblies>
37-
<AndroidCreatePackagePerAbi>False</AndroidCreatePackagePerAbi>
3834
<Debugger>.Net (Xamarin)</Debugger>
39-
<AotAssemblies>False</AotAssemblies>
40-
<EnableLLVM>False</EnableLLVM>
41-
<AndroidEnableMultiDex>False</AndroidEnableMultiDex>
42-
<EnableProguard>False</EnableProguard>
4335
</PropertyGroup>
4436
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
4537
<DebugType>none</DebugType>
@@ -52,13 +44,7 @@
5244
<AndroidSupportedAbis>armeabi,armeabi-v7a,x86,x86_64,arm64-v8a</AndroidSupportedAbis>
5345
<AndroidLinkMode>Full</AndroidLinkMode>
5446
<EmbedAssembliesIntoApk>True</EmbedAssembliesIntoApk>
55-
<BundleAssemblies>False</BundleAssemblies>
56-
<AndroidCreatePackagePerAbi>False</AndroidCreatePackagePerAbi>
5747
<Debugger>Xamarin</Debugger>
58-
<AotAssemblies>False</AotAssemblies>
59-
<EnableLLVM>False</EnableLLVM>
60-
<AndroidEnableMultiDex>False</AndroidEnableMultiDex>
61-
<EnableProguard>False</EnableProguard>
6248
<DebugSymbols>False</DebugSymbols>
6349
</PropertyGroup>
6450
<ItemGroup>
@@ -108,7 +94,7 @@
10894
<Name>SignaturePad.Android</Name>
10995
</ProjectReference>
11096
</ItemGroup>
111-
<Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
97+
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
11298
<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')" />
11399
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
114100
<PropertyGroup>

0 commit comments

Comments
 (0)