Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

For YAML, standardize on "workingDirectory" instead of "cwd" across all tasks #6229

Merged
merged 2 commits into from
Jan 17, 2018
Merged

For YAML, standardize on "workingDirectory" instead of "cwd" across all tasks #6229

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc4388d
Use "workingDirectory" instead of "cwd" for all tasks' YAML
davidstaheli Jan 15, 2018
fecb7be
Revert change to old task
davidstaheli Jan 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions Tasks/CMake/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,15 @@
],
"version": {
"Major": 1,
"Minor": 0,
"Patch": 25
"Minor": 130,
"Patch": 0
},
"minimumAgentVersion": "1.91.0",
"instanceNameFormat": "CMake $(cmakeArgs)",
"inputs": [
{
"name": "cwd",
"aliases": ["workingDirectory"],
"type": "filePath",
"label": "Working Directory",
"defaultValue": "build",
Expand Down
7 changes: 5 additions & 2 deletions Tasks/CMake/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,17 @@
],
"version": {
"Major": 1,
"Minor": 0,
"Patch": 25
"Minor": 130,
"Patch": 0
},
"minimumAgentVersion": "1.91.0",
"instanceNameFormat": "ms-resource:loc.instanceNameFormat",
"inputs": [
{
"name": "cwd",
"aliases": [
"workingDirectory"
],
"type": "filePath",
"label": "ms-resource:loc.input.label.cwd",
"defaultValue": "build",
Expand Down
5 changes: 3 additions & 2 deletions Tasks/DecryptFile/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
"author": "Microsoft Corporation",
"version": {
"Major": 1,
"Minor": 112,
"Patch": 2
"Minor": 130,
"Patch": 0
},
"groups": [
{
Expand Down Expand Up @@ -58,6 +58,7 @@
},
{
"name": "cwd",
"aliases": ["workingDirectory"],
"type": "filePath",
"label": "Working Directory",
"defaultValue": "",
Expand Down
7 changes: 5 additions & 2 deletions Tasks/DecryptFile/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
"author": "Microsoft Corporation",
"version": {
"Major": 1,
"Minor": 112,
"Patch": 2
"Minor": 130,
"Patch": 0
},
"groups": [
{
Expand Down Expand Up @@ -58,6 +58,9 @@
},
{
"name": "cwd",
"aliases": [
"workingDirectory"
],
"type": "filePath",
"label": "ms-resource:loc.input.label.cwd",
"defaultValue": "",
Expand Down
3 changes: 2 additions & 1 deletion Tasks/Docker/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"version": {
"Major": 0,
"Minor": 3,
"Patch": 4
"Patch": 5
},
"demands": [],
"preview": "false",
Expand Down Expand Up @@ -279,6 +279,7 @@
},
{
"name": "cwd",
"aliases": ["workingDirectory"],
"type": "filePath",
"label": "Working Directory",
"defaultValue": "$(System.DefaultWorkingDirectory)",
Expand Down
5 changes: 4 additions & 1 deletion Tasks/Docker/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"version": {
"Major": 0,
"Minor": 3,
"Patch": 4
"Patch": 5
},
"demands": [],
"preview": "false",
Expand Down Expand Up @@ -283,6 +283,9 @@
},
{
"name": "cwd",
"aliases": [
"workingDirectory"
],
"type": "filePath",
"label": "ms-resource:loc.input.label.cwd",
"defaultValue": "$(System.DefaultWorkingDirectory)",
Expand Down
4 changes: 2 additions & 2 deletions Tasks/DockerCompose/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"version": {
"Major": 0,
"Minor": 4,
"Patch": 10
"Patch": 11
},
"demands": [],
"preview": "false",
Expand Down Expand Up @@ -285,7 +285,7 @@
},
{
"name": "cwd",
"aliases": ["currentWorkingDirectory"],
"aliases": ["workingDirectory"],
"type": "filePath",
"label": "Working Directory",
"defaultValue": "$(System.DefaultWorkingDirectory)",
Expand Down
4 changes: 2 additions & 2 deletions Tasks/DockerCompose/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"version": {
"Major": 0,
"Minor": 4,
"Patch": 10
"Patch": 11
},
"demands": [],
"preview": "false",
Expand Down Expand Up @@ -290,7 +290,7 @@
{
"name": "cwd",
"aliases": [
"currentWorkingDirectory"
"workingDirectory"
],
"type": "filePath",
"label": "ms-resource:loc.input.label.cwd",
Expand Down
2 changes: 1 addition & 1 deletion Tasks/Grunt/Strings/resources.resjson/en-US/resources.resjson
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"loc.input.label.cwd": "Working Directory",
"loc.input.help.cwd": "Current working directory when script is run. Defaults to the folder where the script is located.",
"loc.input.label.gruntCli": "grunt-cli location",
"loc.input.help.gruntCli": "grunt-cli to run when agent can't find global installed grunt-cli Defaults to the grunt-cli under node_modules folder of cwd.",
"loc.input.help.gruntCli": "grunt-cli to run when agent can't find global installed grunt-cli Defaults to the grunt-cli under node_modules folder of the working directory.",
"loc.input.label.publishJUnitResults": "Publish to TFS/Team Services",
"loc.input.help.publishJUnitResults": "Select this option to publish JUnit test results produced by the Grunt build to TFS/Team Services.",
"loc.input.label.testResultsFiles": "Test Results Files",
Expand Down
7 changes: 4 additions & 3 deletions Tasks/Grunt/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
"author": "Microsoft Corporation",
"version": {
"Major": 0,
"Minor": 5,
"Patch": 27
"Minor": 130,
"Patch": 0
},
"demands": [
"node.js"
Expand Down Expand Up @@ -67,6 +67,7 @@
},
{
"name": "cwd",
"aliases": ["workingDirectory"],
"type": "filePath",
"label": "Working Directory",
"defaultValue": "",
Expand All @@ -80,7 +81,7 @@
"label": "grunt-cli location",
"defaultValue": "node_modules/grunt-cli/bin/grunt",
"required": true,
"helpMarkDown": "grunt-cli to run when agent can't find global installed grunt-cli Defaults to the grunt-cli under node_modules folder of cwd.",
"helpMarkDown": "grunt-cli to run when agent can't find global installed grunt-cli Defaults to the grunt-cli under node_modules folder of the working directory.",
"groupName": "advanced"
},
{
Expand Down
7 changes: 5 additions & 2 deletions Tasks/Grunt/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
"author": "Microsoft Corporation",
"version": {
"Major": 0,
"Minor": 5,
"Patch": 27
"Minor": 130,
"Patch": 0
},
"demands": [
"node.js"
Expand Down Expand Up @@ -67,6 +67,9 @@
},
{
"name": "cwd",
"aliases": [
"workingDirectory"
],
"type": "filePath",
"label": "ms-resource:loc.input.label.cwd",
"defaultValue": "",
Expand Down
2 changes: 1 addition & 1 deletion Tasks/Gulp/Strings/resources.resjson/en-US/resources.resjson
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"loc.input.label.cwd": "Working Directory",
"loc.input.help.cwd": "Current working directory when script is run. Defaults to the folder where the script is located.",
"loc.input.label.gulpjs": "gulp.js location",
"loc.input.help.gulpjs": "gulp.js to run when agent can't find global installed gulp. Defaults to the gulp.js under node_modules folder of cwd.",
"loc.input.help.gulpjs": "gulp.js to run when agent can't find global installed gulp. Defaults to the gulp.js under node_modules folder of the working directory.",
"loc.input.label.publishJUnitResults": "Publish to TFS/Team Services",
"loc.input.help.publishJUnitResults": "Select this option to publish JUnit test results produced by the Gulp build to TFS/Team Services.",
"loc.input.label.testResultsFiles": "Test Results Files",
Expand Down
7 changes: 4 additions & 3 deletions Tasks/Gulp/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
"author": "Microsoft Corporation",
"version": {
"Major": 0,
"Minor": 5,
"Patch": 31
"Minor": 130,
"Patch": 0
},
"demands": [
"node.js"
Expand Down Expand Up @@ -67,6 +67,7 @@
},
{
"name": "cwd",
"aliases": ["workingDirectory"],
"type": "filePath",
"label": "Working Directory",
"defaultValue": "",
Expand All @@ -80,7 +81,7 @@
"label": "gulp.js location",
"defaultValue": "node_modules/gulp/bin/gulp.js",
"required": true,
"helpMarkDown": "gulp.js to run when agent can't find global installed gulp. Defaults to the gulp.js under node_modules folder of cwd.",
"helpMarkDown": "gulp.js to run when agent can't find global installed gulp. Defaults to the gulp.js under node_modules folder of the working directory.",
"groupName": "advanced"
},
{
Expand Down
7 changes: 5 additions & 2 deletions Tasks/Gulp/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
"author": "Microsoft Corporation",
"version": {
"Major": 0,
"Minor": 5,
"Patch": 31
"Minor": 130,
"Patch": 0
},
"demands": [
"node.js"
Expand Down Expand Up @@ -67,6 +67,9 @@
},
{
"name": "cwd",
"aliases": [
"workingDirectory"
],
"type": "filePath",
"label": "ms-resource:loc.input.label.cwd",
"defaultValue": "",
Expand Down
3 changes: 2 additions & 1 deletion Tasks/Kubernetes/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"version": {
"Major": 0,
"Minor": 1,
"Patch": 9
"Patch": 10
},
"demands": [],
"preview": "false",
Expand Down Expand Up @@ -211,6 +211,7 @@
},
{
"name": "cwd",
"aliases": ["workingDirectory"],
"type": "filePath",
"label": "Working directory",
"defaultValue": "$(System.DefaultWorkingDirectory)",
Expand Down
5 changes: 4 additions & 1 deletion Tasks/Kubernetes/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"version": {
"Major": 0,
"Minor": 1,
"Patch": 9
"Patch": 10
},
"demands": [],
"preview": "false",
Expand Down Expand Up @@ -217,6 +217,9 @@
},
{
"name": "cwd",
"aliases": [
"workingDirectory"
],
"type": "filePath",
"label": "ms-resource:loc.input.label.cwd",
"defaultValue": "$(System.DefaultWorkingDirectory)",
Expand Down
4 changes: 3 additions & 1 deletion Tasks/ShellScript/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"version": {
"Major": 2,
"Minor": 1,
"Patch": 3
"Patch": 4
},
"demands": [
"sh"
Expand Down Expand Up @@ -49,6 +49,7 @@
},
{
"name": "disableAutoCwd",
"aliases": ["disableAutoWorkingDirectory"],
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is the old major verison (not deleted from master because reference docs still point to it), I would just revert this file.

"type": "boolean",
"label": "Specify Working Directory",
"defaultValue": "false",
Expand All @@ -58,6 +59,7 @@
},
{
"name": "cwd",
"aliases": ["workingDirectory"],
"type": "filePath",
"label": "Working Directory",
"defaultValue": "",
Expand Down
8 changes: 7 additions & 1 deletion Tasks/ShellScript/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"version": {
"Major": 2,
"Minor": 1,
"Patch": 3
"Patch": 4
},
"demands": [
"sh"
Expand Down Expand Up @@ -49,6 +49,9 @@
},
{
"name": "disableAutoCwd",
"aliases": [
"disableAutoWorkingDirectory"
],
"type": "boolean",
"label": "ms-resource:loc.input.label.disableAutoCwd",
"defaultValue": "false",
Expand All @@ -58,6 +61,9 @@
},
{
"name": "cwd",
"aliases": [
"workingDirectory"
],
"type": "filePath",
"label": "ms-resource:loc.input.label.cwd",
"defaultValue": "",
Expand Down
2 changes: 1 addition & 1 deletion Tasks/Xcode/Strings/resources.resjson/en-US/resources.resjson
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"loc.input.help.outputPattern": "(Optional) Enter a path relative to the working directory where build output (binaries) will be placed. Examples: `output/$(SDK)/$(Configuration)` or `output/$(TestSDK)/$(TestConfiguration)`. Archive and export paths are configured separately.",
"loc.input.label.useXcpretty": "Use xcpretty",
"loc.input.help.useXcpretty": "Specify whether to use xcpretty to format xcodebuild output and generate JUnit test results. Enabling this requires xcpretty to be installed on the agent machine. It is preinstalled on VSTS hosted build agents. See [xcpretty](https://github.com/supermarin/xcpretty) on GitHub.",
"loc.input.label.publishJUnitResults": "Publish to VSTS/TFS",
"loc.input.label.publishJUnitResults": "Publish test results to VSTS/TFS",
"loc.input.help.publishJUnitResults": "If xcpretty is enabled above, specify whether to publish JUnit test results to VSTS/TFS.",
"loc.messages.SignIdNotFound": "Failed to find the iOS signing identity. Verify that signing and provisioning information is provided.",
"loc.messages.TempKeychainSetupFailed": "Failed to add the temporary keychain to the keychains search path.",
Expand Down
5 changes: 3 additions & 2 deletions Tasks/Xcode/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"author": "Microsoft Corporation",
"version": {
"Major": 4,
"Minor": 129,
"Minor": 130,
"Patch": 0
},
"demands": [
Expand Down Expand Up @@ -299,6 +299,7 @@
},
{
"name": "cwd",
"aliases": ["workingDirectory"],
"type": "filePath",
"label": "Working directory",
"defaultValue": "",
Expand Down Expand Up @@ -326,7 +327,7 @@
{
"name": "publishJUnitResults",
"type": "boolean",
"label": "Publish to VSTS/TFS",
"label": "Publish test results to VSTS/TFS",
"required": false,
"defaultValue": false,
"groupName": "advanced",
Expand Down
Loading