Merge branch 'dev' of https://github.com/SubPointSolutions/CakeBuildTools.git

Author: SubPointSupport

SubPointSolutions.CakeBuildTools/Scripts/SubPointSolutions.CakeBuild.Core.cake

@@ -1,4 +1,4 @@
-// common tooling
+// common tooling
 // always version to avoid breaking change with new releases
 #addin nuget:https://www.nuget.org/api/v2/?package=Cake.Powershell&Version=0.2.9
 #addin nuget:https://www.nuget.org/api/v2/?package=newtonsoft.json&Version=9.0.1
@@ -189,13 +189,16 @@ string ResolveVersionForPackage(string id) {
     // is it choco spec?
     specs = jsonConfig["customChocolateySpecs"];
 
-    foreach(var spec in specs) {
-        var specId = (string)spec["Id"];
+	if(specs != null)
+	{
+		foreach(var spec in specs) {
+			var specId = (string)spec["Id"];
 
-        if(specId == id) {
-            return (string)spec["Version"];
-        }
-    }
+			if(specId == id) {
+				return (string)spec["Version"];
+			}
+		}
+	}
 
     throw new Exception(String.Format("Cannot resolve version for package:[{0}]. Neither customNuspecs nor customChocolateySpecs has it", id));
 }
@@ -341,6 +344,7 @@ NuGetPackSettings[] ResolveNuGetPackSettings() {
 
         packSettings.Dependencies = ResolveDependenciesForPackage(packSettings.Id);
 
+		Verbose("Adding Authors/Owners...");
         if(spec["Authors"] == null)
             packSettings.Authors =  new [] { "SubPoint Solutions" };
         else
@@ -351,28 +355,40 @@ NuGetPackSettings[] ResolveNuGetPackSettings() {
         else
             packSettings.Owners = spec["Owners"].Select(t => (string)t).ToArray();
 
+		Verbose("Adding License/ProjectUrl/IconUrl...");
         packSettings.LicenseUrl = new System.Uri((string)spec["LicenseUrl"]);
         packSettings.ProjectUrl = new System.Uri((string)spec["ProjectUrl"]);
         packSettings.IconUrl = new System.Uri((string)spec["IconUrl"]);
 
+		Verbose("Adding Description/Copyright...");
         packSettings.Description = (string)spec["Description"];
         packSettings.Copyright = (string)spec["Copyright"];
 
+		Verbose("Adding tags...");
         packSettings.Tags = spec["Tags"].Select(t => (string)t).ToArray();
 
         packSettings.RequireLicenseAcceptance = false;
         packSettings.Symbols = false;
         packSettings.NoPackageAnalysis = false;
 
         // files
-        var packageFiles =  spec["Files"].ToArray();
+        var packageFilesObject =  spec["Files"];
+
+		Verbose("Adding files...");
 
         // default files
-        if(packageFiles.Count() == 0)
+        if(packageFilesObject == null || packageFilesObject.Select(t => t).Count() == 0)
         {
-            Verbose("Adding default files - *.dll/*.xml from bin/debug");
+			var packageFiles = packageFilesObject;
 
+            Verbose("Adding default files - *.dll/*.xml from bin/debug");
+			
             var projectPath = System.IO.Path.Combine(defaultSolutionDirectory, packSettings.Id);
+
+			var customProjectFolder = (string)spec["CustomProjectFolder"];
+			if(!String.IsNullOrEmpty(customProjectFolder))
+				projectPath = System.IO.Path.Combine(defaultSolutionDirectory, customProjectFolder);
+
             var projectBinPath = System.IO.Path.Combine(projectPath, "bin/debug");
 
             packSettings.BasePath = projectBinPath;
@@ -389,11 +405,24 @@ NuGetPackSettings[] ResolveNuGetPackSettings() {
             };
         }
         else{
+			
+			var packageFiles = packageFilesObject;
+
             Verbose("Adding custom files...");
 
             var nuSpecContentFiles = new List<NuSpecContent>();
 
-            var projectPath = System.IO.Path.Combine(defaultSolutionDirectory, packSettings.Id);
+		    var projectPath = System.IO.Path.Combine(defaultSolutionDirectory, packSettings.Id);
+
+            var customProjectFolder = (string)spec["CustomProjectFolder"];
+
+			if(!String.IsNullOrEmpty(customProjectFolder))
+				projectPath = System.IO.Path.Combine(defaultSolutionDirectory, customProjectFolder);
+
+			Verbose("Project path: " + projectPath);
+
+            var projectBinPath = System.IO.Path.Combine(projectPath, "bin/debug");
+
             packSettings.BasePath = projectPath;
 
             foreach(var packageFile in packageFiles){
@@ -1005,4 +1034,4 @@ var taskDefaultCI = Task("Default-CI")
     // the action checks if the current branch has to be published (dev always, the rest goes via 'ci.nuget.shouldpublish')
     .IsDependentOn("Action-API-NuGet-Publishing")
 
-	.IsDependentOn("Action-Docs-Merge");
+	.IsDependentOn("Action-Docs-Merge");