Skip to content
This repository was archived by the owner on Mar 19, 2025. It is now read-only.

Commit 83b7247

Browse files
CustomProjectFolder attr for NuSpecs
1 parent cd9b052 commit 83b7247

File tree

1 file changed

+19
-4
lines changed

1 file changed

+19
-4
lines changed

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

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// common tooling
1+
// common tooling
22
// always version to avoid breaking change with new releases
33
#addin nuget:https://www.nuget.org/api/v2/?package=Cake.Powershell&Version=0.2.9
44
#addin nuget:https://www.nuget.org/api/v2/?package=newtonsoft.json&Version=9.0.1
@@ -371,8 +371,13 @@ NuGetPackSettings[] ResolveNuGetPackSettings() {
371371
if(packageFiles.Count() == 0)
372372
{
373373
Verbose("Adding default files - *.dll/*.xml from bin/debug");
374-
374+
375375
var projectPath = System.IO.Path.Combine(defaultSolutionDirectory, packSettings.Id);
376+
377+
var customProjectFolder = (string)spec["CustomProjectFolder"];
378+
if(!String.IsNullOrEmpty(customProjectFolder))
379+
projectPath = System.IO.Path.Combine(defaultSolutionDirectory, customProjectFolder);
380+
376381
var projectBinPath = System.IO.Path.Combine(projectPath, "bin/debug");
377382

378383
packSettings.BasePath = projectBinPath;
@@ -393,7 +398,17 @@ NuGetPackSettings[] ResolveNuGetPackSettings() {
393398

394399
var nuSpecContentFiles = new List<NuSpecContent>();
395400

396-
var projectPath = System.IO.Path.Combine(defaultSolutionDirectory, packSettings.Id);
401+
var projectPath = System.IO.Path.Combine(defaultSolutionDirectory, packSettings.Id);
402+
403+
var customProjectFolder = (string)spec["CustomProjectFolder"];
404+
405+
if(!String.IsNullOrEmpty(customProjectFolder))
406+
projectPath = System.IO.Path.Combine(defaultSolutionDirectory, customProjectFolder);
407+
408+
Verbose("Project path: " + projectPath);
409+
410+
var projectBinPath = System.IO.Path.Combine(projectPath, "bin/debug");
411+
397412
packSettings.BasePath = projectPath;
398413

399414
foreach(var packageFile in packageFiles){
@@ -1005,4 +1020,4 @@ var taskDefaultCI = Task("Default-CI")
10051020
// the action checks if the current branch has to be published (dev always, the rest goes via 'ci.nuget.shouldpublish')
10061021
.IsDependentOn("Action-API-NuGet-Publishing")
10071022

1008-
.IsDependentOn("Action-Docs-Merge");
1023+
.IsDependentOn("Action-Docs-Merge");

0 commit comments

Comments
 (0)