Strip quotes from nuget.exe path

Tasks/Common/nuget-task-common/NuGetToolRunner.ts

@@ -8,6 +8,8 @@ import * as os from 'os';
 import * as path from 'path';
 import * as url from 'url';
 
+import * as ngutil from "./Utility";
+
 interface EnvironmentDictionary { [key: string]: string }
 
 export interface NuGetEnvironmentSettings {
@@ -139,7 +141,11 @@ function locateTool(tool: string, opts?: LocateOptions) {
 
 export function locateNuGetExe(userNuGetExePath: string): string {
     if (userNuGetExePath) {
-        tl.debug(`using user-supplied NuGet path ${userNuGetExePath}`)
+        if (os.platform() === "win32") {
+            userNuGetExePath = ngutil.stripLeadingAndTrailingQuotes(userNuGetExePath);
+        }
+
+        tl.debug(`using user-supplied NuGet path ${userNuGetExePath}`);
         tl.checkPath(userNuGetExePath, 'NuGet');
         return userNuGetExePath;
     }

Tasks/Common/nuget-task-common/Utility.ts

@@ -118,4 +118,23 @@ export function resolveWildcardPath(pattern: string, allowEmptyWildcardMatch?: b
     {
         return filesList.map(file => file.split("/").join("\\"));
     }
-}
+}
+
+export function stripLeadingAndTrailingQuotes(path: string): string {
+    if (path.length == 0) {
+        return path;
+    }
+
+    let left = 0;
+    if (path.charAt(left) == '"') {
+        ++left;
+    }
+
+    let right = path.length - 1;
+    if (path.charAt(right) == '"') {
+        --right;
+    }
+
+    // substring returns a value *not* including the character at right
+    return path.substring(left, right + 1);
+}

Tasks/Common/nuget-task-common/tsconfig.json

@@ -1,7 +1,7 @@
 {
     "compilerOptions": {
         "module": "commonjs",
-        "target": "es5",
+        "target": "es6",
         "noImplicitAny": false,
         "sourceMap": false
     },

Tasks/NuGetInstaller/nugetinstaller.ts

@@ -58,7 +58,9 @@ if (!tl.filePathSupplied('nugetConfigPath')) {
     nugetConfigPath = null;
 }
 
-var userNuGetPath = tl.getPathInput('nuGetPath', false, true);
+// due to a bug where we accidentally allowed nuGetPath to be surrounded by quotes before,
+// locateNuGetExe() will strip them and check for existence there.
+var userNuGetPath = tl.getPathInput('nuGetPath', false, false);
 if (!tl.filePathSupplied('nuGetPath')) {
     userNuGetPath = null;
 }

Tasks/NuGetInstaller/task.json

@@ -9,7 +9,7 @@
     "version": {
         "Major": 0,
         "Minor": 2,
-        "Patch": 7
+        "Patch": 10
     },
     "minimumAgentVersion": "1.83.0",
     "groups": [

Tasks/NuGetInstaller/task.loc.json

@@ -9,7 +9,7 @@
   "version": {
     "Major": 0,
     "Minor": 2,
-    "Patch": 7
+    "Patch": 10
   },
   "minimumAgentVersion": "1.83.0",
   "groups": [

Tasks/NugetPublisher/nugetpublisher.ts

@@ -55,7 +55,9 @@ if (!normalizedNuGetFeedType) {
 
 nuGetFeedType = normalizedNuGetFeedType;
 
-var userNuGetPath = tl.getPathInput('nuGetPath', false, true);
+// due to a bug where we accidentally allowed nuGetPath to be surrounded by quotes before,
+// locateNuGetExe() will strip them and check for existence there.
+var userNuGetPath = tl.getPathInput('nuGetPath', false, false);
 if (!tl.filePathSupplied('nuGetPath')) {
     userNuGetPath = null;
 }

Tasks/NugetPublisher/task.json

@@ -9,7 +9,7 @@
     "version": {
         "Major": 0,
         "Minor": 2,
-        "Patch": 9
+        "Patch": 10
     },
     "demands": [
         "Cmd"

Tasks/NugetPublisher/task.loc.json

@@ -9,7 +9,7 @@
   "version": {
     "Major": 0,
     "Minor": 2,
-    "Patch": 9
+    "Patch": 10
   },
   "demands": [
     "Cmd"

definitions/nuget-task-common.d.ts

@@ -143,5 +143,6 @@ declare module 'nuget-task-common/Utility' {
 	/// <reference path="../../../definitions/Q.d.ts" />
 	export function resolveFilterSpec(filterSpec: string, basePath?: string, allowEmptyMatch?: boolean): string[];
 	export function resolveWildcardPath(pattern: string, allowEmptyWildcardMatch?: boolean): string[];
+	export function stripLeadingAndTrailingQuotes(path: string): string;
 
 }