From 4c363f9e0a8828dfbfcc8581a092a3e889c0da20 Mon Sep 17 00:00:00 2001 From: Inga Lovinde <52715130+inga-lovinde@users.noreply.github.com> Date: Thu, 22 Oct 2015 13:55:21 +0300 Subject: [PATCH] Fixed dotnetnugetpushonly --- BuildServer/lib/tasks/dotnetnugetpush.js | 2 +- BuildServer/lib/tasks/dotnetnugetpushonly.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/BuildServer/lib/tasks/dotnetnugetpush.js b/BuildServer/lib/tasks/dotnetnugetpush.js index b93d5b8..2ac89f9 100644 --- a/BuildServer/lib/tasks/dotnetnugetpush.js +++ b/BuildServer/lib/tasks/dotnetnugetpush.js @@ -6,7 +6,7 @@ var settings = require("../../settings"); module.exports = function (params, processor) { var date = new Date(), version = (params.version || ((params.major || "0") + "." + (date.getFullYear() * 10000 + (date.getMonth() + 1) * 100 + date.getDate()) + "." + ((date.getHours() * 100 + date.getMinutes()) * 100 + date.getSeconds()))) + "-r" + processor.context.rev.substr(0, 16), - nupkg = processor.context.exported + "/" + params.name + "." + version + ".nupkg"; + nupkg = params.name + "." + version + ".nupkg"; return sequential({ tasks: [ diff --git a/BuildServer/lib/tasks/dotnetnugetpushonly.js b/BuildServer/lib/tasks/dotnetnugetpushonly.js index 84d9181..2723b3b 100644 --- a/BuildServer/lib/tasks/dotnetnugetpushonly.js +++ b/BuildServer/lib/tasks/dotnetnugetpushonly.js @@ -1,13 +1,13 @@ "use strict"; var sequential = require("./sequential"); -var dotnetbuilderwrapper = require('dotnetbuilderwrapper'); +var dotnetbuilderwrapper = require('./dotnetbuilderwrapper'); var settings = require("../../settings"); module.exports = function (params, processor) { return dotnetbuilderwrapper({ command: "nugetpush", - Package: params.Package, + Package: processor.context.exported + "/" + params.Package, NugetHost: settings.nugetHost, ApiKey: settings.nugetApiKey }, processor);