Merge pull request #1698 from Microsoft/users/ersciple/m100shellscript

Shell Script specifyWorkingDirectory label and visibleRule.

Author: ericsciple

Tasks/ShellScript/Strings/resources.resjson/en-US/resources.resjson

@@ -8,10 +8,10 @@
   "loc.input.help.scriptPath": "Relative path from repo root of the shell script file to run.",
   "loc.input.label.args": "Arguments",
   "loc.input.help.args": "Arguments passed to the shell script",
-  "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.disableAutoCwd": "Disable Auto CWD",
+  "loc.input.label.disableAutoCwd": "Specify Working Directory",
   "loc.input.help.disableAutoCwd": "The default behavior is to set the working directory to the script location. This enables you to optionally specify a different working directory.",
+  "loc.input.label.cwd": "Working Directory",
+  "loc.input.help.cwd": "Current working directory when script is run. Defaults to the $(System.DefaultWorkingDirectory).",
   "loc.input.label.failOnStandardError": "Fail on Standard Error",
   "loc.input.help.failOnStandardError": "If this is true, this task will fail if any errors are written to the StandardError stream.",
   "loc.messages.BashReturnCode": "Bash exited with return code: %d",

Tasks/ShellScript/task.json

@@ -43,24 +43,25 @@
             "required": false,
             "helpMarkDown": "Arguments passed to the shell script"
         },
-        {
-            "name": "cwd",
-            "type": "filePath",
-            "label": "Working Directory",
-            "defaultValue": "",
-            "required": false,
-            "helpMarkDown": "Current working directory when script is run.  Defaults to the folder where the script is located.",
-            "groupName": "advanced"
-        },
         {
             "name": "disableAutoCwd",
             "type": "boolean",
-            "label": "Disable Auto CWD",
+            "label": "Specify Working Directory",
             "defaultValue": "false",
             "required": false,
             "helpMarkDown": "The default behavior is to set the working directory to the script location. This enables you to optionally specify a different working directory.",
             "groupName": "advanced"
         },
+        {
+            "name": "cwd",
+            "type": "filePath",
+            "label": "Working Directory",
+            "defaultValue": "",
+            "required": false,
+            "visibleRule": "disableAutoCwd = true",
+            "helpMarkDown": "Current working directory when script is run. Defaults to the $(System.DefaultWorkingDirectory).",
+            "groupName": "advanced"
+        },
         {
             "name": "failOnStandardError",
             "type": "boolean",

Tasks/ShellScript/task.loc.json

@@ -43,15 +43,6 @@
       "required": false,
       "helpMarkDown": "ms-resource:loc.input.help.args"
     },
-    {
-      "name": "cwd",
-      "type": "filePath",
-      "label": "ms-resource:loc.input.label.cwd",
-      "defaultValue": "",
-      "required": false,
-      "helpMarkDown": "ms-resource:loc.input.help.cwd",
-      "groupName": "advanced"
-    },
     {
       "name": "disableAutoCwd",
       "type": "boolean",
@@ -61,6 +52,16 @@
       "helpMarkDown": "ms-resource:loc.input.help.disableAutoCwd",
       "groupName": "advanced"
     },
+    {
+      "name": "cwd",
+      "type": "filePath",
+      "label": "ms-resource:loc.input.label.cwd",
+      "defaultValue": "",
+      "required": false,
+      "visibleRule": "disableAutoCwd = true",
+      "helpMarkDown": "ms-resource:loc.input.help.cwd",
+      "groupName": "advanced"
+    },
     {
       "name": "failOnStandardError",
       "type": "boolean",