Merge pull request #4600 from emanuelquintero/users/jahquin/cp

emanuelquintero · web-flow · commit 3ea0b84653e3 · 2017-06-20T11:35:21.000-07:00
Fixing NuGet push if using NuGet &lt; 3.3
diff --git a/Tasks/NuGetCommand/nugetpublisher.ts b/Tasks/NuGetCommand/nugetpublisher.ts
@@ -117,6 +117,8 @@ export async function run(nuGetPath: string): Promise<void> {
         if (isInternalFeed) 
         {
             let internalFeedId = tl.getInput("feedPublish");
+            const nuGetVersion: VersionInfo = await peParser.getFileVersionInfoAsync(nuGetPath);
+            feedUri = await nutil.getNuGetFeedRegistryUrl(accessToken, internalFeedId, nuGetVersion);
             if (useCredConfig) {
                 
                 nuGetConfigHelper.addSourcesToTempNuGetConfig([<IPackageSource>{ feedName: internalFeedId, feedUri: feedUri, isInternal: true }]);
@@ -125,8 +127,6 @@ export async function run(nuGetPath: string): Promise<void> {
             }
 
             apiKey = "VSTS";
-            const nuGetVersion: VersionInfo = await peParser.getFileVersionInfoAsync(nuGetPath);
-            feedUri = await nutil.getNuGetFeedRegistryUrl(accessToken, internalFeedId, nuGetVersion);
         }
         else {
             let externalAuth = externalAuthArr[0];
diff --git a/Tasks/NuGetCommand/package.json b/Tasks/NuGetCommand/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nugetcommand",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "description": "Restore, pack, or push NuGet packages, or run a NuGet command.",
   "main": "nugetcommandmain.js",
   "scripts": {
diff --git a/Tasks/NuGetCommand/task.json b/Tasks/NuGetCommand/task.json
@@ -9,7 +9,7 @@
     "version": {
         "Major": 2,
         "Minor": 0,
-        "Patch": 2
+        "Patch": 3
     },
     "runsOn": [
         "Agent",
diff --git a/Tasks/NuGetCommand/task.loc.json b/Tasks/NuGetCommand/task.loc.json
@@ -9,7 +9,7 @@
   "version": {
     "Major": 2,
     "Minor": 0,
-    "Patch": 2
+    "Patch": 3
   },
   "runsOn": [
     "Agent",

Original file line number	Diff line number	Diff line change
`@@ -117,6 +117,8 @@ export async function run(nuGetPath: string): Promise<void> {`
`117`	`117`	`if (isInternalFeed)`
`118`	`118`	`{`
`119`	`119`	`let internalFeedId = tl.getInput("feedPublish");`
	`120`	`+ const nuGetVersion: VersionInfo = await peParser.getFileVersionInfoAsync(nuGetPath);`
	`121`	`+ feedUri = await nutil.getNuGetFeedRegistryUrl(accessToken, internalFeedId, nuGetVersion);`
`120`	`122`	`if (useCredConfig) {`
`121`	`123`
`122`	`124`	`nuGetConfigHelper.addSourcesToTempNuGetConfig([<IPackageSource>{ feedName: internalFeedId, feedUri: feedUri, isInternal: true }]);`
`@@ -125,8 +127,6 @@ export async function run(nuGetPath: string): Promise<void> {`
`125`	`127`	`}`
`126`	`128`
`127`	`129`	`apiKey = "VSTS";`
`128`		`- const nuGetVersion: VersionInfo = await peParser.getFileVersionInfoAsync(nuGetPath);`
`129`		`- feedUri = await nutil.getNuGetFeedRegistryUrl(accessToken, internalFeedId, nuGetVersion);`
`130`	`130`	`}`
`131`	`131`	`else {`
`132`	`132`	`let externalAuth = externalAuthArr[0];`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "nugetcommand",`
`3`		`- "version": "2.0.2",`
	`3`	`+ "version": "2.0.3",`
`4`	`4`	`"description": "Restore, pack, or push NuGet packages, or run a NuGet command.",`
`5`	`5`	`"main": "nugetcommandmain.js",`
`6`	`6`	`"scripts": {`