From 80c1b3d57cba769140ea886cf86525d369d5f7d7 Mon Sep 17 00:00:00 2001
From: Inga Lovinde <52715130+inga-lovinde@users.noreply.github.com>
Date: Wed, 24 Sep 2014 16:26:43 +0400
Subject: [PATCH] Nuget commands now are creating packages in code dir (instead
 of release)

---
 BuildServer/lib/tasks/dotnetnugetpack.js | 26 ++++++++++++++++--------
 BuildServer/lib/tasks/dotnetnugetpush.js |  7 ++++---
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/BuildServer/lib/tasks/dotnetnugetpack.js b/BuildServer/lib/tasks/dotnetnugetpack.js
index 6cab2c6..6de0fcd 100644
--- a/BuildServer/lib/tasks/dotnetnugetpack.js
+++ b/BuildServer/lib/tasks/dotnetnugetpack.js
@@ -1,14 +1,24 @@
 "use strict";
 
-var dotNetBuilderWrapper = require('./dotnetbuilderwrapper');
+var sequential = require('./sequential');
 
 module.exports = function (params, processor) {
-	var date = new Date();
-	return dotNetBuilderWrapper({
-		command: "nugetpack",
-		BaseDirectory: processor.context.exported,
-		SpecPath: processor.context.exported + "/" + params.nuspec,
-		OutputDirectory: processor.context.release,
-		Version: (params.major || "0") + "." + date.getFullYear() + "." + ((date.getMonth() + 1) * 100 + date.getDate()) + "." + ((date.getHours() * 100 + date.getMinutes()) * 100 + date.getSeconds())
+	var date = new Date(),
+		version = (params.major || "0") + "." + date.getFullYear() + "." + ((date.getMonth() + 1) * 100 + date.getDate()) + "." + ((date.getHours() * 100 + date.getMinutes()) * 100 + date.getSeconds()),
+		nupkg = processor.context.exported + "/" + params.name + "." + version + ".nupkg";
+
+	return sequential({
+		tasks: [
+			{
+				type: "dotnetbuilderwrapper",
+				params: {
+					command: "nugetpack",
+					BaseDirectory: processor.context.exported,
+					SpecPath: processor.context.exported + "/" + params.nuspec,
+					OutputDirectory: processor.context.exported,
+					Version: version
+				}
+			}
+		]
 	}, processor);
 };
diff --git a/BuildServer/lib/tasks/dotnetnugetpush.js b/BuildServer/lib/tasks/dotnetnugetpush.js
index 3c8d217..5d8728a 100644
--- a/BuildServer/lib/tasks/dotnetnugetpush.js
+++ b/BuildServer/lib/tasks/dotnetnugetpush.js
@@ -5,7 +5,8 @@ var settings = require("../../settings");
 
 module.exports = function (params, processor) {
 	var date = new Date(),
-		version = (params.major || "0") + "." + date.getFullYear() + "." + ((date.getMonth() + 1) * 100 + date.getDate()) + "." + ((date.getHours() * 100 + date.getMinutes()) * 100 + date.getSeconds());
+		version = (params.major || "0") + "." + date.getFullYear() + "." + ((date.getMonth() + 1) * 100 + date.getDate()) + "." + ((date.getHours() * 100 + date.getMinutes()) * 100 + date.getSeconds()),
+		nupkg = processor.context.exported + "/" + params.name + "." + version + ".nupkg";
 
 	return sequential({
 		tasks: [
@@ -15,7 +16,7 @@ module.exports = function (params, processor) {
 					command: "nugetpack",
 					BaseDirectory: processor.context.exported,
 					SpecPath: processor.context.exported + "/" + params.nuspec,
-					OutputDirectory: processor.context.release,
+					OutputDirectory: processor.context.exported,
 					Version: version
 				}
 			},
@@ -23,7 +24,7 @@ module.exports = function (params, processor) {
 				type: "dotnetbuilderwrapper",
 				params: {
 					command: "nugetpush",
-					Package: processor.context.release + "/" + params.name + "." + version + ".nupkg",
+					Package: nupkg,
 					NugetHost: settings.nugetHost,
 					ApiKey: settings.nugetApiKey
 				}