Merge branch 'develop'

XamFormsExtended · Dec 11, 2017 · 4c804c4 · 4c804c4
2 parents 6344541 + aadce86
commit 4c804c4
Show file tree

Hide file tree

Showing 45 changed files with 5,210 additions and 3,379 deletions.
diff --git a/.gitignore b/.gitignore
@@ -27,6 +27,7 @@ bld/
 data/
 .nuget/
 .vs/
+.droidres/
 *.csproj.bak
 build-artifacts/
 
@@ -184,4 +185,4 @@ FakesAssemblies/
 # project.json
 *.lock.json
 *.nuget.props
-*.nuget.targets
+*.nuget.targets
diff --git a/Xfx.Controls.sln b/Xfx.Controls.sln
@@ -21,6 +21,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sln", "sln", "{435387BA-775
 		.gitignore = .gitignore
 		build.cake = build.cake
 		build.ps1 = build.ps1
+		CONTRIBUTING.md = CONTRIBUTING.md
 		LICENSE = LICENSE
 		readme.md = readme.md
 	EndProjectSection

diff --git a/build.cake b/build.cake
@@ -34,7 +34,10 @@ Task("Build Droid")
   .IsDependentOn("Patch Assembly Info")
   .Does(() =>
 {
-  MSBuild("./src/Xfx.Controls.Droid/Xfx.Controls.Droid.csproj", new MSBuildSettings()
+  MSBuild("./src/Xfx.Controls.Droid/Xfx.Controls.Droid.csproj", new MSBuildSettings
+      {
+	      ToolVersion = MSBuildToolVersion.VS2017
+	  }
       .WithProperty("OutDir", droidDir.ToString())
       .SetConfiguration(configuration));
 });
@@ -43,7 +46,11 @@ Task("Build Touch")
   .IsDependentOn("Patch Assembly Info")
   .Does(() =>
 {
-  MSBuild("./src/Xfx.Controls.iOS/Xfx.Controls.iOS.csproj", new MSBuildSettings()
+  MSBuild("./src/Xfx.Controls.iOS/Xfx.Controls.iOS.csproj", new MSBuildSettings
+      {
+	      ToolVersion = MSBuildToolVersion.VS2017,
+		  MSBuildPlatform = (Cake.Common.Tools.MSBuild.MSBuildPlatform)1
+	  }
       .WithProperty("OutDir", touchDir.ToString())
       .SetConfiguration(configuration));
 });
@@ -52,7 +59,10 @@ Task("Build Core")
   .IsDependentOn("Patch Assembly Info")
   .Does(() =>
 {
-  MSBuild("./src/Xfx.Controls/Xfx.Controls.csproj", new MSBuildSettings()
+  MSBuild("./src/Xfx.Controls/Xfx.Controls.csproj", new MSBuildSettings
+      {
+	      ToolVersion = MSBuildToolVersion.VS2017
+	  }
       .WithProperty("OutDir", coreDir.ToString())
       .SetConfiguration(configuration));
 });
@@ -85,9 +95,9 @@ Task("Package Library")
                                     Description             = "Xamarin Forms Extended Controls",
                                     ProjectUrl              = new Uri("https://github.com/XamFormsExtended/Xfx.Controls"),
                                     Files                   = new [] {
-                                                                        new NuSpecContent {Source = coreDir.ToString() + "/Xfx.Controls/Xfx.Controls.dll", Target = "lib/netcore45"},
-                                                                        new NuSpecContent {Source = coreDir.ToString() + "/Xfx.Controls/Xfx.Controls.dll", Target = "lib/netstandard1.3"},
-                                                                        new NuSpecContent {Source = coreDir.ToString() + "/Xfx.Controls/Xfx.Controls.dll", Target = "lib/portable-net45+win8+wpa81+wp8"},
+                                                                        new NuSpecContent {Source = coreDir.ToString() + "/Xfx.Controls.dll", Target = "lib/netcore45"},
+                                                                        new NuSpecContent {Source = coreDir.ToString() + "/Xfx.Controls.dll", Target = "lib/netstandard1.3"},
+                                                                        new NuSpecContent {Source = coreDir.ToString() + "/Xfx.Controls.dll", Target = "lib/portable-net45+win8+wpa81+wp8"},
 
                                                                         new NuSpecContent {Source = droidDir.ToString() + "/Xfx.Controls.Droid.dll", Target = "lib/MonoAndroid"},
                                                                         new NuSpecContent {Source = droidDir.ToString() + "/Xfx.Controls.dll", Target = "lib/MonoAndroid"},