Skip to content

Commit f8f9ea5

Browse files
author
Anatoly Bolshakov
authored
Reverted cmdline percent encoding changes (#15932)
* Disabled percent encoding * Set up image for single task build * Removed image set up
1 parent a8c8616 commit f8f9ea5

File tree

4 files changed

+2
-26
lines changed

4 files changed

+2
-26
lines changed

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
"loc.input.label.workingDirectory": "Working Directory",
1010
"loc.input.label.failOnStderr": "Fail on Standard Error",
1111
"loc.input.help.failOnStderr": "If this is true, this task will fail if any errors are written to the StandardError stream.",
12-
"loc.input.label.disablePercentEscaping": "Disable percent escaping",
13-
"loc.input.help.disablePercentEscaping": "By default percent is being escaped in script output - since task always executes script as batch file. Set this to true if you want to disable this behavior.",
1412
"loc.messages.GeneratingScript": "Generating script.",
1513
"loc.messages.JS_ExitCode": "Bash exited with code '%s'.",
1614
"loc.messages.JS_Stderr": "Bash wrote one or more lines to the standard error stream.",

Tasks/CmdLineV2/cmdline.ps1

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,11 @@ PROCESS {
2020
$input_failOnStderr = Get-VstsInput -Name 'failOnStderr' -AsBool
2121
$input_script = Get-VstsInput -Name 'script'
2222
$input_workingDirectory = Get-VstsInput -Name 'workingDirectory' -Require
23-
$input_disablePercentEscaping = Get-VstsInput -Name 'disablePercentEscaping' -AsBool
2423
Assert-VstsPath -LiteralPath $input_workingDirectory -PathType 'Container'
2524

2625
# Generate the script contents.
2726
Write-Host (Get-VstsLocString -Key 'GeneratingScript')
2827
$contents = "$input_script".Replace("`r`n", "`n").Replace("`n", "`r`n")
29-
if (!$input_disablePercentEscaping) {
30-
$contents = Mask-Percents -Contents $contents
31-
}
3228

3329
if ($contents.IndexOf("`n") -lt 0 -and $contents.IndexOf("##vso[", ([System.StringComparison]::OrdinalIgnoreCase)) -lt 0) {
3430
# Print one-liner scripts.

Tasks/CmdLineV2/task.json

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"version": {
1919
"Major": 2,
2020
"Minor": 200,
21-
"Patch": 1
21+
"Patch": 2
2222
},
2323
"releaseNotes": "Script task consistency. Added support for multiple lines.",
2424
"showEnvironmentVariables": true,
@@ -59,15 +59,6 @@
5959
"required": false,
6060
"helpMarkDown": "If this is true, this task will fail if any errors are written to the StandardError stream.",
6161
"groupName": "advanced"
62-
},
63-
{
64-
"name": "disablePercentEscaping",
65-
"type": "boolean",
66-
"label": "Disable percent escaping",
67-
"defaultValue": "false",
68-
"required": false,
69-
"helpMarkDown": "By default percent is being escaped in script output - since task always executes script as batch file. Set this to true if you want to disable this behavior.",
70-
"groupName": "advanced"
7162
}
7263
],
7364
"instanceNameFormat": "Command Line Script",

Tasks/CmdLineV2/task.loc.json

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"version": {
1919
"Major": 2,
2020
"Minor": 200,
21-
"Patch": 1
21+
"Patch": 2
2222
},
2323
"releaseNotes": "ms-resource:loc.releaseNotes",
2424
"showEnvironmentVariables": true,
@@ -59,15 +59,6 @@
5959
"required": false,
6060
"helpMarkDown": "ms-resource:loc.input.help.failOnStderr",
6161
"groupName": "advanced"
62-
},
63-
{
64-
"name": "disablePercentEscaping",
65-
"type": "boolean",
66-
"label": "ms-resource:loc.input.label.disablePercentEscaping",
67-
"defaultValue": "false",
68-
"required": false,
69-
"helpMarkDown": "ms-resource:loc.input.help.disablePercentEscaping",
70-
"groupName": "advanced"
7162
}
7263
],
7364
"instanceNameFormat": "ms-resource:loc.instanceNameFormat",

0 commit comments

Comments
 (0)