Merge pull request #6229 from Microsoft/users/davidstaheli/cwd

For YAML, standardize on "workingDirectory" instead of "cwd" across all tasks
microsoft · Jan 17, 2018 · 593b73a · 593b73a
2 parents 9577aa0 + fecb7be
commit 593b73a
Show file tree

Hide file tree

Showing 19 changed files with 60 additions and 32 deletions.
diff --git a/Tasks/CMake/task.json b/Tasks/CMake/task.json
@@ -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",

diff --git a/Tasks/CMake/task.loc.json b/Tasks/CMake/task.loc.json
@@ -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",

diff --git a/Tasks/DecryptFile/task.json b/Tasks/DecryptFile/task.json
@@ -15,8 +15,8 @@
     "author": "Microsoft Corporation",
     "version": {
         "Major": 1,
-        "Minor": 112,
-        "Patch": 2
+        "Minor": 130,
+        "Patch": 0
     },
     "groups": [
         {
@@ -58,6 +58,7 @@
         },
         {
             "name": "cwd",
+            "aliases": ["workingDirectory"],
             "type": "filePath",
             "label": "Working Directory",
             "defaultValue": "",

diff --git a/Tasks/DecryptFile/task.loc.json b/Tasks/DecryptFile/task.loc.json
@@ -15,8 +15,8 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 1,
-    "Minor": 112,
-    "Patch": 2
+    "Minor": 130,
+    "Patch": 0
   },
   "groups": [
     {
@@ -58,6 +58,9 @@
     },
     {
       "name": "cwd",
+      "aliases": [
+        "workingDirectory"
+      ],
       "type": "filePath",
       "label": "ms-resource:loc.input.label.cwd",
       "defaultValue": "",

diff --git a/Tasks/Docker/task.json b/Tasks/Docker/task.json
@@ -13,7 +13,7 @@
     "version": {
         "Major": 0,
         "Minor": 3,
-        "Patch": 4
+        "Patch": 5
     },
     "demands": [],
     "preview": "false",
@@ -279,6 +279,7 @@
         },
         {
             "name": "cwd",
+            "aliases": ["workingDirectory"],
             "type": "filePath",
             "label": "Working Directory",
             "defaultValue": "$(System.DefaultWorkingDirectory)",

diff --git a/Tasks/Docker/task.loc.json b/Tasks/Docker/task.loc.json
@@ -13,7 +13,7 @@
   "version": {
     "Major": 0,
     "Minor": 3,
-    "Patch": 4
+    "Patch": 5
   },
   "demands": [],
   "preview": "false",
@@ -283,6 +283,9 @@
     },
     {
       "name": "cwd",
+      "aliases": [
+        "workingDirectory"
+      ],
       "type": "filePath",
       "label": "ms-resource:loc.input.label.cwd",
       "defaultValue": "$(System.DefaultWorkingDirectory)",

diff --git a/Tasks/DockerCompose/task.json b/Tasks/DockerCompose/task.json
@@ -13,7 +13,7 @@
     "version": {
         "Major": 0,
         "Minor": 4,
-        "Patch": 10
+        "Patch": 11
     },
     "demands": [],
     "preview": "false",
@@ -285,7 +285,7 @@
         },
         {
             "name": "cwd",
-            "aliases": ["currentWorkingDirectory"],
+            "aliases": ["workingDirectory"],
             "type": "filePath",
             "label": "Working Directory",
             "defaultValue": "$(System.DefaultWorkingDirectory)",

diff --git a/Tasks/DockerCompose/task.loc.json b/Tasks/DockerCompose/task.loc.json
@@ -13,7 +13,7 @@
   "version": {
     "Major": 0,
     "Minor": 4,
-    "Patch": 10
+    "Patch": 11
   },
   "demands": [],
   "preview": "false",
@@ -290,7 +290,7 @@
     {
       "name": "cwd",
       "aliases": [
-        "currentWorkingDirectory"
+        "workingDirectory"
       ],
       "type": "filePath",
       "label": "ms-resource:loc.input.label.cwd",

diff --git a/Tasks/Grunt/Strings/resources.resjson/en-US/resources.resjson b/Tasks/Grunt/Strings/resources.resjson/en-US/resources.resjson
@@ -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",

diff --git a/Tasks/Grunt/task.json b/Tasks/Grunt/task.json
@@ -15,8 +15,8 @@
     "author": "Microsoft Corporation",
     "version": {
         "Major": 0,
-        "Minor": 5,
-        "Patch": 27
+        "Minor": 130,
+        "Patch": 0
     },
     "demands": [
         "node.js"
@@ -67,6 +67,7 @@
         },
         {
             "name": "cwd",
+            "aliases": ["workingDirectory"],
             "type": "filePath",
             "label": "Working Directory",
             "defaultValue": "",
@@ -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"
         },
         {

diff --git a/Tasks/Grunt/task.loc.json b/Tasks/Grunt/task.loc.json
@@ -15,8 +15,8 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 0,
-    "Minor": 5,
-    "Patch": 27
+    "Minor": 130,
+    "Patch": 0
   },
   "demands": [
     "node.js"
@@ -67,6 +67,9 @@
     },
     {
       "name": "cwd",
+      "aliases": [
+        "workingDirectory"
+      ],
       "type": "filePath",
       "label": "ms-resource:loc.input.label.cwd",
       "defaultValue": "",

diff --git a/Tasks/Gulp/Strings/resources.resjson/en-US/resources.resjson b/Tasks/Gulp/Strings/resources.resjson/en-US/resources.resjson
@@ -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",

diff --git a/Tasks/Gulp/task.json b/Tasks/Gulp/task.json
@@ -15,8 +15,8 @@
     "author": "Microsoft Corporation",
     "version": {
         "Major": 0,
-        "Minor": 5,
-        "Patch": 31
+        "Minor": 130,
+        "Patch": 0
     },
     "demands": [
         "node.js"
@@ -67,6 +67,7 @@
         },
         {
             "name": "cwd",
+            "aliases": ["workingDirectory"],
             "type": "filePath",
             "label": "Working Directory",
             "defaultValue": "",
@@ -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"
         },
         {

diff --git a/Tasks/Gulp/task.loc.json b/Tasks/Gulp/task.loc.json
@@ -15,8 +15,8 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 0,
-    "Minor": 5,
-    "Patch": 31
+    "Minor": 130,
+    "Patch": 0
   },
   "demands": [
     "node.js"
@@ -67,6 +67,9 @@
     },
     {
       "name": "cwd",
+      "aliases": [
+        "workingDirectory"
+      ],
       "type": "filePath",
       "label": "ms-resource:loc.input.label.cwd",
       "defaultValue": "",

diff --git a/Tasks/Kubernetes/task.json b/Tasks/Kubernetes/task.json
@@ -13,7 +13,7 @@
     "version": {
         "Major": 0,
         "Minor": 1,
-        "Patch": 9
+        "Patch": 10
     },
     "demands": [],
     "preview": "false",
@@ -211,6 +211,7 @@
         },
         {
             "name": "cwd",
+            "aliases": ["workingDirectory"],
             "type": "filePath",
             "label": "Working directory",
             "defaultValue": "$(System.DefaultWorkingDirectory)",

diff --git a/Tasks/Kubernetes/task.loc.json b/Tasks/Kubernetes/task.loc.json
@@ -13,7 +13,7 @@
   "version": {
     "Major": 0,
     "Minor": 1,
-    "Patch": 9
+    "Patch": 10
   },
   "demands": [],
   "preview": "false",
@@ -217,6 +217,9 @@
     },
     {
       "name": "cwd",
+      "aliases": [
+        "workingDirectory"
+      ],
       "type": "filePath",
       "label": "ms-resource:loc.input.label.cwd",
       "defaultValue": "$(System.DefaultWorkingDirectory)",

diff --git a/Tasks/Xcode/Strings/resources.resjson/en-US/resources.resjson b/Tasks/Xcode/Strings/resources.resjson/en-US/resources.resjson
@@ -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.",

diff --git a/Tasks/Xcode/task.json b/Tasks/Xcode/task.json
@@ -11,7 +11,7 @@
     "author": "Microsoft Corporation",
     "version": {
         "Major": 4,
-        "Minor": 129,
+        "Minor": 130,
         "Patch": 0
     },
     "demands": [
@@ -299,6 +299,7 @@
         },
         {
             "name": "cwd",
+            "aliases": ["workingDirectory"],
             "type": "filePath",
             "label": "Working directory",
             "defaultValue": "",
@@ -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",

diff --git a/Tasks/Xcode/task.loc.json b/Tasks/Xcode/task.loc.json
@@ -11,7 +11,7 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 4,
-    "Minor": 129,
+    "Minor": 130,
     "Patch": 0
   },
   "demands": [
@@ -299,6 +299,9 @@
     },
     {
       "name": "cwd",
+      "aliases": [
+        "workingDirectory"
+      ],
       "type": "filePath",
       "label": "ms-resource:loc.input.label.cwd",
       "defaultValue": "",