Skip to content

Commit

Permalink
Merge pull request #4546 from emanuelquintero/users/jahquin/deprecation
Browse files Browse the repository at this point in the history
Deprecating NuGet tasks and enabling VSTS NuGet Push
  • Loading branch information
emanuelquintero authored Jun 14, 2017
2 parents e0e1ab7 + d2bf261 commit 402d743
Show file tree
Hide file tree
Showing 13 changed files with 22 additions and 18 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"loc.friendlyName": "NuGet Command",
"loc.description": "Runs a NuGet command",
"loc.description": "Deprecated: use the “NuGet” task instead. It works with the new Tool Installer framework so you can easily use new versions of NuGet without waiting for a task update, provides better support for authenticated feeds outside this account/collection, and uses NuGet 4 by default.",
"loc.instanceNameFormat": "NuGet $(command)",
"loc.input.label.command": "Command",
"loc.input.help.command": "The NuGet command to run.\n\nExamples: restore, pack",
Expand Down
5 changes: 3 additions & 2 deletions Tasks/NuGet/task.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,21 @@
"id": "2661B7E5-00F9-4DE1-BA41-04E68D70B528",
"name": "NuGet",
"friendlyName": "NuGet Command",
"description": "Runs a NuGet command",
"description": "Deprecated: use the “NuGet” task instead. It works with the new Tool Installer framework so you can easily use new versions of NuGet without waiting for a task update, provides better support for authenticated feeds outside this account/collection, and uses NuGet 4 by default.",
"category": "Package",
"author": "Microsoft Corporation",
"preview": "true",
"version": {
"Major": 0,
"Minor": 1,
"Patch": 1
"Patch": 2
},
"runsOn": [
"Agent",
"DeploymentGroup"
],
"minimumAgentVersion": "2.115.0",
"deprecated": true,
"groups": [],
"instanceNameFormat": "NuGet $(command)",
"inputs": [
Expand Down
5 changes: 3 additions & 2 deletions Tasks/NuGet/task.loc.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,14 @@
"version": {
"Major": 0,
"Minor": 1,
"Patch": 1
"Patch": 2
},
"runsOn": [
"Agent",
"DeploymentGroup"
],
"minimumAgentVersion": "2.115.0",
"deprecated": true,
"groups": [],
"instanceNameFormat": "ms-resource:loc.instanceNameFormat",
"inputs": [
Expand Down Expand Up @@ -57,4 +58,4 @@
"Warning_UpdatingNuGetVersion": "ms-resource:loc.messages.Warning_UpdatingNuGetVersion"
},
"helpMarkDown": "ms-resource:loc.helpMarkDown"
}
}
3 changes: 1 addition & 2 deletions Tasks/NuGetCommand/nugetpublisher.ts
Original file line number Diff line number Diff line change
Expand Up @@ -327,6 +327,5 @@ function shouldUseVstsNuGetPush(isInternalFeed: boolean, conflictsAllowed: boole
return false;
}

// NOTE: This should return true once VstsNuGetPush is packaged within the task
return false;
return true;
}
2 changes: 1 addition & 1 deletion Tasks/NuGetCommand/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "nugetcommand",
"version": "2.0.1",
"version": "2.0.2",
"description": "Restore, pack, or push NuGet packages, or run a NuGet command.",
"main": "nugetcommandmain.js",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion Tasks/NuGetCommand/task.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"version": {
"Major": 2,
"Minor": 0,
"Patch": 1
"Patch": 2
},
"runsOn": [
"Agent",
Expand Down
2 changes: 1 addition & 1 deletion Tasks/NuGetCommand/task.loc.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"version": {
"Major": 2,
"Minor": 0,
"Patch": 1
"Patch": 2
},
"runsOn": [
"Agent",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"loc.friendlyName": "NuGet Publisher",
"loc.helpMarkDown": "[More Information](https://go.microsoft.com/fwlink/?LinkID=627417)",
"loc.description": "Uploads nupkg files to a NuGet server",
"loc.description": "Deprecated: use the “NuGet” task instead. It works with the new Tool Installer framework so you can easily use new versions of NuGet without waiting for a task update, provides better support for authenticated feeds outside this account/collection, and uses NuGet 4 by default.",
"loc.instanceNameFormat": "NuGet Publisher $(solution)",
"loc.group.displayName.advanced": "Advanced",
"loc.input.label.searchPattern": "Path/Pattern to nupkg",
Expand Down
5 changes: 3 additions & 2 deletions Tasks/NuGetPublisher/task.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
"id": "333b11bd-d341-40d9-afcf-b32d5ce6f25b",
"name": "NuGetPublisher",
"friendlyName": "NuGet Publisher",
"description": "Uploads nupkg files to a NuGet server",
"description": "Deprecated: use the “NuGet” task instead. It works with the new Tool Installer framework so you can easily use new versions of NuGet without waiting for a task update, provides better support for authenticated feeds outside this account/collection, and uses NuGet 4 by default.",
"helpMarkDown": "[More Information](https://go.microsoft.com/fwlink/?LinkID=627417)",
"category": "Package",
"author": "Lawrence Gripper",
"version": {
"Major": 0,
"Minor": 2,
"Patch": 34
"Patch": 35
},
"runsOn": [
"Agent",
Expand All @@ -19,6 +19,7 @@
"Cmd"
],
"minimumAgentVersion": "1.83.0",
"deprecated": true,
"groups": [
{
"name": "advanced",
Expand Down
2 changes: 1 addition & 1 deletion Tasks/NuGetPublisher/task.loc.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"version": {
"Major": 0,
"Minor": 2,
"Patch": 34
"Patch": 35
},
"runsOn": [
"Agent",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"loc.friendlyName": "NuGet Packager",
"loc.helpMarkDown": "[More Information](https://go.microsoft.com/fwlink/?LinkID=627416)",
"loc.description": "Creates nupkg outputs from csproj or nuspec files",
"loc.description": "Deprecated: use the “NuGet” task instead. It works with the new Tool Installer framework so you can easily use new versions of NuGet without waiting for a task update, provides better support for authenticated feeds outside this account/collection, and uses NuGet 4 by default.",
"loc.instanceNameFormat": "NuGet Packager $(solution)",
"loc.group.displayName.versioning": "Pack options",
"loc.group.displayName.advanced": "Advanced",
Expand Down
5 changes: 3 additions & 2 deletions Tasks/NugetPackager/task.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,20 @@
"id": "333b11bd-d341-40d9-afcf-b32d5ce6f24b",
"name": "NuGetPackager",
"friendlyName": "NuGet Packager",
"description": "Creates nupkg outputs from csproj or nuspec files",
"description": "Deprecated: use the “NuGet” task instead. It works with the new Tool Installer framework so you can easily use new versions of NuGet without waiting for a task update, provides better support for authenticated feeds outside this account/collection, and uses NuGet 4 by default.",
"helpMarkDown": "[More Information](https://go.microsoft.com/fwlink/?LinkID=627416)",
"category": "Package",
"author": "Lawrence Gripper",
"version": {
"Major": 0,
"Minor": 1,
"Patch": 72
"Patch": 73
},
"demands": [
"Cmd"
],
"minimumAgentVersion": "1.83.0",
"deprecated": true,
"groups": [
{
"name": "versioning",
Expand Down
3 changes: 2 additions & 1 deletion Tasks/NugetPackager/task.loc.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,13 @@
"version": {
"Major": 0,
"Minor": 1,
"Patch": 72
"Patch": 73
},
"demands": [
"Cmd"
],
"minimumAgentVersion": "1.83.0",
"deprecated": true,
"groups": [
{
"name": "versioning",
Expand Down

0 comments on commit 402d743

Please sign in to comment.