Merge pull request #2807 from Microsoft/users/zackrun/nugetrtm

zjrunner · web-flow · commit 9a82dd1bddef · 2016-10-14T10:17:43.000-07:00
Nuget 3.5 for TFS RTM
diff --git a/Tasks/Common/nuget-task-common/Utility.ts b/Tasks/Common/nuget-task-common/Utility.ts
@@ -139,11 +139,11 @@ export function stripLeadingAndTrailingQuotes(path: string): string {
     return path.substring(left, right + 1);
 }
 
-export function getBundledNuGetLocation(version: string): string {
-    if (version === "3.5.0.1829"){
-        return path.join(__dirname, 'NuGet/3.5.0.1829/NuGet.exe')
+export function getBundledNuGetLocation(uxOption: string): string {
+    if (uxOption === "3.5.0.1829"){
+        return path.join(__dirname, 'NuGet/3.5.0/NuGet.exe')
     }
-    else if (version === "3.3.0"){
+    else if (uxOption === "3.3.0"){
         return path.join(__dirname, 'NuGet/3.3.0/NuGet.exe');
     }
     throw new Error(tl.loc("NGCommon_UnabletoDetectNuGetVersion"));
diff --git a/Tasks/Common/nuget-task-common/externals.json b/Tasks/Common/nuget-task-common/externals.json
@@ -7,8 +7,8 @@
         },
         {
             "archiveName": "NuGet.exe",
-            "url": "https://vstsagenttools.blob.core.windows.net/tools/NuGet/3.5.0-1829/NuGet.zip",
-            "dest": "./NuGet/3.5.0.1829/"
+            "url": "https://vstsagenttools.blob.core.windows.net/tools/NuGet/3.5.0.1938-rtm/NuGet.zip",
+            "dest": "./NuGet/3.5.0/"
         },
         {
             "archiveName": "CredentialProvider.TeamBuild.exe",
diff --git a/Tasks/NuGetInstaller/nugetinstaller.ts b/Tasks/NuGetInstaller/nugetinstaller.ts
@@ -67,7 +67,7 @@ async function main(): Promise<void> {
             nugetConfigPath = null;
         }
 
-        let nugetVersion = tl.getInput('nuGetVersion');
+        let nugetUxOption = tl.getInput('nuGetVersion');
 
         // due to a bug where we accidentally allowed nuGetPath to be surrounded by quotes before,
         // locateNuGetExe() will strip them and check for existence there.
@@ -77,19 +77,19 @@ async function main(): Promise<void> {
             nuGetPath = nutil.stripLeadingAndTrailingQuotes(nuGetPath);
             // True if the user provided their own version of NuGet
             userNuGetProvided = true;
-            if (nugetVersion !== "custom"){
+            if (nugetUxOption !== "custom"){
                 // For back compat, if a path has already been specificed then use it.
                 // However warn the user in the build of this behavior
                 tl.warning(tl.loc("Warning_ConflictingNuGetPreference"));
             }
         }
         else {
-            if (nugetVersion === "custom")
+            if (nugetUxOption === "custom")
             {
                 throw new Error(tl.loc("NoNuGetSpecified"))
             }
             // Pull the pre-installed path for NuGet.
-            nuGetPath = nutil.getBundledNuGetLocation(nugetVersion);
+            nuGetPath = nutil.getBundledNuGetLocation(nugetUxOption);
         }
 
         let serviceUri = tl.getEndpointUrl("SYSTEMVSSCONNECTION", false);
diff --git a/Tasks/NuGetInstaller/task.json b/Tasks/NuGetInstaller/task.json
@@ -9,7 +9,7 @@
     "version": {
         "Major": 0,
         "Minor": 2,
-        "Patch": 18
+        "Patch": 20
     },
     "minimumAgentVersion": "1.83.0",
     "groups": [
@@ -90,8 +90,8 @@
             "groupName": "advanced",
             "options": {
                 "3.3.0": "3.3.0",
-                "3.5.0.1829": "3.5.0 – build 1829 (rc2)",
-                "custom" : "Custom"
+                "3.5.0.1829": "3.5.0",
+                "custom": "Custom"
             }
         },
         {
diff --git a/Tasks/NuGetInstaller/task.loc.json b/Tasks/NuGetInstaller/task.loc.json
@@ -9,7 +9,7 @@
   "version": {
     "Major": 0,
     "Minor": 2,
-    "Patch": 18
+    "Patch": 20
   },
   "minimumAgentVersion": "1.83.0",
   "groups": [
@@ -90,7 +90,7 @@
       "groupName": "advanced",
       "options": {
         "3.3.0": "3.3.0",
-        "3.5.0.1829": "3.5.0 – build 1829 (rc2)",
+        "3.5.0.1829": "3.5.0",
         "custom": "Custom"
       }
     },
diff --git a/Tasks/NugetPublisher/nugetpublisher.ts b/Tasks/NugetPublisher/nugetpublisher.ts
@@ -66,24 +66,24 @@ async function main(): Promise<void> {
         // due to a bug where we accidentally allowed nuGetPath to be surrounded by quotes before,
         // locateNuGetExe() will strip them and check for existence there.
         let nuGetPath = tl.getPathInput("nuGetPath", false, false);
-        let nugetVersion = tl.getInput("nuGetversion");
+        let nugetUxOption = tl.getInput("nuGetversion");
         let userNuGetProvided = false;
         if (nuGetPath !== null && tl.filePathSupplied("nuGetPath")) {
             nuGetPath = nutil.stripLeadingAndTrailingQuotes(nuGetPath);
             userNuGetProvided = true;
-            if (nugetVersion !== "custom")
+            if (nugetUxOption !== "custom")
             {
                 // For back compat, if a path has already been specified then use it.
                 // However, warn the user in the build of this behavior.
                 tl.warning(tl.loc("Warning_ConflictingNuGetPreference"));
             }
         }
         else {
-            if (nugetVersion === "custom")
+            if (nugetUxOption === "custom")
             {
                 throw new Error(tl.loc("NoNuGetSpecified"))
             }
-            nuGetPath = nutil.getBundledNuGetLocation(nugetVersion);
+            nuGetPath = nutil.getBundledNuGetLocation(nugetUxOption);
         }
 
         let serviceUri = tl.getEndpointUrl("SYSTEMVSSCONNECTION", false);
diff --git a/Tasks/NugetPublisher/task.json b/Tasks/NugetPublisher/task.json
@@ -9,7 +9,7 @@
     "version": {
         "Major": 0,
         "Minor": 2,
-        "Patch": 18
+        "Patch": 20
     },
     "demands": [
         "Cmd"
@@ -94,8 +94,8 @@
             "groupName": "advanced",
             "options": {
                 "3.3.0": "3.3.0",
-                "3.5.0.1829": "3.5.0 – build 1829 (rc2)",
-                "custom" : "Custom"
+                "3.5.0.1829": "3.5.0",
+                "custom": "Custom"
             }
         },
         {
diff --git a/Tasks/NugetPublisher/task.loc.json b/Tasks/NugetPublisher/task.loc.json
@@ -9,7 +9,7 @@
   "version": {
     "Major": 0,
     "Minor": 2,
-    "Patch": 18
+    "Patch": 20
   },
   "demands": [
     "Cmd"
@@ -94,7 +94,7 @@
       "groupName": "advanced",
       "options": {
         "3.3.0": "3.3.0",
-        "3.5.0.1829": "3.5.0 – build 1829 (rc2)",
+        "3.5.0.1829": "3.5.0",
         "custom": "Custom"
       }
     },

Original file line number	Diff line number	Diff line change
`@@ -139,11 +139,11 @@ export function stripLeadingAndTrailingQuotes(path: string): string {`
`139`	`139`	`return path.substring(left, right + 1);`
`140`	`140`	`}`
`141`	`141`
`142`		`-export function getBundledNuGetLocation(version: string): string {`
`143`		`- if (version === "3.5.0.1829"){`
`144`		`- return path.join(__dirname, 'NuGet/3.5.0.1829/NuGet.exe')`
	`142`	`+export function getBundledNuGetLocation(uxOption: string): string {`
	`143`	`+ if (uxOption === "3.5.0.1829"){`
	`144`	`+ return path.join(__dirname, 'NuGet/3.5.0/NuGet.exe')`
`145`	`145`	`}`
`146`		`- else if (version === "3.3.0"){`
	`146`	`+ else if (uxOption === "3.3.0"){`
`147`	`147`	`return path.join(__dirname, 'NuGet/3.3.0/NuGet.exe');`
`148`	`148`	`}`
`149`	`149`	`throw new Error(tl.loc("NGCommon_UnabletoDetectNuGetVersion"));`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,8 @@`
`7`	`7`	`},`
`8`	`8`	`{`
`9`	`9`	`"archiveName": "NuGet.exe",`
`10`		`- "url": "https://vstsagenttools.blob.core.windows.net/tools/NuGet/3.5.0-1829/NuGet.zip",`
`11`		`- "dest": "./NuGet/3.5.0.1829/"`
	`10`	`+ "url": "https://vstsagenttools.blob.core.windows.net/tools/NuGet/3.5.0.1938-rtm/NuGet.zip",`
	`11`	`+ "dest": "./NuGet/3.5.0/"`
`12`	`12`	`},`
`13`	`13`	`{`
`14`	`14`	`"archiveName": "CredentialProvider.TeamBuild.exe",`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ async function main(): Promise<void> {`
`67`	`67`	`nugetConfigPath = null;`
`68`	`68`	`}`
`69`	`69`
`70`		`- let nugetVersion = tl.getInput('nuGetVersion');`
	`70`	`+ let nugetUxOption = tl.getInput('nuGetVersion');`
`71`	`71`
`72`	`72`	`// due to a bug where we accidentally allowed nuGetPath to be surrounded by quotes before,`
`73`	`73`	`// locateNuGetExe() will strip them and check for existence there.`
`@@ -77,19 +77,19 @@ async function main(): Promise<void> {`
`77`	`77`	`nuGetPath = nutil.stripLeadingAndTrailingQuotes(nuGetPath);`
`78`	`78`	`// True if the user provided their own version of NuGet`
`79`	`79`	`userNuGetProvided = true;`
`80`		`- if (nugetVersion !== "custom"){`
	`80`	`+ if (nugetUxOption !== "custom"){`
`81`	`81`	`// For back compat, if a path has already been specificed then use it.`
`82`	`82`	`// However warn the user in the build of this behavior`
`83`	`83`	`tl.warning(tl.loc("Warning_ConflictingNuGetPreference"));`
`84`	`84`	`}`
`85`	`85`	`}`
`86`	`86`	`else {`
`87`		`- if (nugetVersion === "custom")`
	`87`	`+ if (nugetUxOption === "custom")`
`88`	`88`	`{`
`89`	`89`	`throw new Error(tl.loc("NoNuGetSpecified"))`
`90`	`90`	`}`
`91`	`91`	`// Pull the pre-installed path for NuGet.`
`92`		`- nuGetPath = nutil.getBundledNuGetLocation(nugetVersion);`
	`92`	`+ nuGetPath = nutil.getBundledNuGetLocation(nugetUxOption);`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`let serviceUri = tl.getEndpointUrl("SYSTEMVSSCONNECTION", false);`
Original file line number	Diff line number	Diff line change
`@@ -66,24 +66,24 @@ async function main(): Promise<void> {`
`66`	`66`	`// due to a bug where we accidentally allowed nuGetPath to be surrounded by quotes before,`
`67`	`67`	`// locateNuGetExe() will strip them and check for existence there.`
`68`	`68`	`let nuGetPath = tl.getPathInput("nuGetPath", false, false);`
`69`		`- let nugetVersion = tl.getInput("nuGetversion");`
	`69`	`+ let nugetUxOption = tl.getInput("nuGetversion");`
`70`	`70`	`let userNuGetProvided = false;`
`71`	`71`	`if (nuGetPath !== null && tl.filePathSupplied("nuGetPath")) {`
`72`	`72`	`nuGetPath = nutil.stripLeadingAndTrailingQuotes(nuGetPath);`
`73`	`73`	`userNuGetProvided = true;`
`74`		`- if (nugetVersion !== "custom")`
	`74`	`+ if (nugetUxOption !== "custom")`
`75`	`75`	`{`
`76`	`76`	`// For back compat, if a path has already been specified then use it.`
`77`	`77`	`// However, warn the user in the build of this behavior.`
`78`	`78`	`tl.warning(tl.loc("Warning_ConflictingNuGetPreference"));`
`79`	`79`	`}`
`80`	`80`	`}`
`81`	`81`	`else {`
`82`		`- if (nugetVersion === "custom")`
	`82`	`+ if (nugetUxOption === "custom")`
`83`	`83`	`{`
`84`	`84`	`throw new Error(tl.loc("NoNuGetSpecified"))`
`85`	`85`	`}`
`86`		`- nuGetPath = nutil.getBundledNuGetLocation(nugetVersion);`
	`86`	`+ nuGetPath = nutil.getBundledNuGetLocation(nugetUxOption);`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`let serviceUri = tl.getEndpointUrl("SYSTEMVSSCONNECTION", false);`