Skip to content

Commit

Permalink
Merge pull request #2682 from Microsoft/users/hiyada/portCliFix
Browse files Browse the repository at this point in the history
azurecli version, preview tag removed, helptext correction
  • Loading branch information
hiyadav authored Sep 27, 2016
2 parents b0fdfbc + 9e11c7d commit 08c4cbf
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 19 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"loc.friendlyName": "Azure CLI preview",
"loc.helpMarkDown": "http://go.microsoft.com/fwlink/?LinkID=827160",
"loc.friendlyName": "Azure CLI Preview",
"loc.helpMarkDown": "[More Information](http://go.microsoft.com/fwlink/?LinkID=827160)",
"loc.description": "Run a Shell or Batch script with Azure CLI commands against an azure subscription",
"loc.instanceNameFormat": "Azure CLI $(scriptPath)",
"loc.group.displayName.advanced": "Advanced",
Expand All @@ -24,5 +24,5 @@
"loc.input.help.failOnStandardError": "If this is true, this task will fail when any errors are written to the StandardError stream",
"loc.messages.ScriptReturnCode": "Script exited with return code: %d",
"loc.messages.ScriptFailed": "Script failed with error: %s",
"loc.messages.UnsupportedEndpointScheme": "Unsupported Endpoint Authorization Scheme: (certificate and usernamePassword for Azure Classic and ServicePrincipal for AzureRM "
}
"loc.messages.UnsupportedEndpointScheme": "Unsupported Endpoint Authorization Scheme: Certificate and Username Password for Azure Classic and Service Principal for AzureRM"
}
6 changes: 3 additions & 3 deletions Tasks/AzureCLI/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vsts-tasks-azurecli",
"version": "0.1.1",
"version": "0.2.1",
"description": "VSTS Azure CLI Task",
"main": "azureclitask.js",
"scripts": {
Expand All @@ -17,6 +17,6 @@
},
"homepage": "https://github.com/Microsoft/vsts-tasks#readme",
"dependencies": {
"vsts-task-lib": "^0.9.5"
"vsts-task-lib": "^0.9.20"
}
}
}
13 changes: 6 additions & 7 deletions Tasks/AzureCLI/task.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,20 @@
{
"id": "46E4BE58-730B-4389-8A2F-EA10B3E5E815",
"name": "AzureCLI",
"friendlyName": "Azure CLI preview",
"friendlyName": "Azure CLI Preview",
"description": "Run a Shell or Batch script with Azure CLI commands against an azure subscription",
"author": "Microsoft Corporation",
"helpMarkDown": "http://go.microsoft.com/fwlink/?LinkID=827160",
"helpMarkDown": "[More Information](http://go.microsoft.com/fwlink/?LinkID=827160)",
"category": "Deploy",
"visibility":["Preview","Build","Release"],
"visibility":["Build","Release"],
"runsOn": [
"Agent",
"MachineGroup"
"Agent"
],
"demands": [],
"version": {
"Major": "0",
"Minor": "2",
"Patch": "0"
"Patch": "1"
},
"minimumAgentVersion": "1.95.0",
"instanceNameFormat": "Azure CLI $(scriptPath)",
Expand Down Expand Up @@ -130,4 +129,4 @@
"ScriptFailed": "Script failed with error: %s",
"UnsupportedEndpointScheme": "Unsupported Endpoint Authorization Scheme: (certificate and usernamePassword for Azure Classic and ServicePrincipal for AzureRM "
}
}
}
8 changes: 3 additions & 5 deletions Tasks/AzureCLI/task.loc.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,17 @@
"helpMarkDown": "ms-resource:loc.helpMarkDown",
"category": "Deploy",
"visibility": [
"Preview",
"Build",
"Release"
],
"runsOn": [
"Agent",
"MachineGroup"
"Agent"
],
"demands": [],
"version": {
"Major": "0",
"Minor": "2",
"Patch": "0"
"Patch": "1"
},
"minimumAgentVersion": "1.95.0",
"instanceNameFormat": "ms-resource:loc.instanceNameFormat",
Expand Down Expand Up @@ -134,4 +132,4 @@
"ScriptFailed": "ms-resource:loc.messages.ScriptFailed",
"UnsupportedEndpointScheme": "ms-resource:loc.messages.UnsupportedEndpointScheme"
}
}
}

0 comments on commit 08c4cbf

Please sign in to comment.