From c2b759b4b9f4bfa50146b86dea274375c9acbecd Mon Sep 17 00:00:00 2001
From: "Anatolii Bolshakov (Akvelon INC)" <v-anbols@microsoft.com>
Date: Wed, 16 Feb 2022 12:26:41 +0300
Subject: [PATCH] Disabled percent encoding

---
 .../Strings/resources.resjson/en-US/resources.resjson |  2 --
 Tasks/CmdLineV2/cmdline.ps1                           |  4 ----
 Tasks/CmdLineV2/task.json                             | 11 +----------
 Tasks/CmdLineV2/task.loc.json                         | 11 +----------
 4 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/Tasks/CmdLineV2/Strings/resources.resjson/en-US/resources.resjson b/Tasks/CmdLineV2/Strings/resources.resjson/en-US/resources.resjson
index 62f7a5cf51be..6b5bae8d3f78 100644
--- a/Tasks/CmdLineV2/Strings/resources.resjson/en-US/resources.resjson
+++ b/Tasks/CmdLineV2/Strings/resources.resjson/en-US/resources.resjson
@@ -9,8 +9,6 @@
   "loc.input.label.workingDirectory": "Working Directory",
   "loc.input.label.failOnStderr": "Fail on Standard Error",
   "loc.input.help.failOnStderr": "If this is true, this task will fail if any errors are written to the StandardError stream.",
-  "loc.input.label.disablePercentEscaping": "Disable percent escaping",
-  "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.",
   "loc.messages.GeneratingScript": "Generating script.",
   "loc.messages.JS_ExitCode": "Bash exited with code '%s'.",
   "loc.messages.JS_Stderr": "Bash wrote one or more lines to the standard error stream.",
diff --git a/Tasks/CmdLineV2/cmdline.ps1 b/Tasks/CmdLineV2/cmdline.ps1
index b061c0d70924..54ca2248379a 100644
--- a/Tasks/CmdLineV2/cmdline.ps1
+++ b/Tasks/CmdLineV2/cmdline.ps1
@@ -20,15 +20,11 @@ PROCESS {
         $input_failOnStderr = Get-VstsInput -Name 'failOnStderr' -AsBool
         $input_script = Get-VstsInput -Name 'script'
         $input_workingDirectory = Get-VstsInput -Name 'workingDirectory' -Require
-        $input_disablePercentEscaping = Get-VstsInput -Name 'disablePercentEscaping' -AsBool
         Assert-VstsPath -LiteralPath $input_workingDirectory -PathType 'Container'
 
         # Generate the script contents.
         Write-Host (Get-VstsLocString -Key 'GeneratingScript')
         $contents = "$input_script".Replace("`r`n", "`n").Replace("`n", "`r`n")
-        if (!$input_disablePercentEscaping) {
-            $contents = Mask-Percents -Contents $contents
-        }
 
         if ($contents.IndexOf("`n") -lt 0 -and $contents.IndexOf("##vso[", ([System.StringComparison]::OrdinalIgnoreCase)) -lt 0) {
             # Print one-liner scripts.
diff --git a/Tasks/CmdLineV2/task.json b/Tasks/CmdLineV2/task.json
index be4280e05aee..36d08ed15532 100644
--- a/Tasks/CmdLineV2/task.json
+++ b/Tasks/CmdLineV2/task.json
@@ -18,7 +18,7 @@
     "version": {
         "Major": 2,
         "Minor": 200,
-        "Patch": 1
+        "Patch": 2
     },
     "releaseNotes": "Script task consistency. Added support for multiple lines.",
     "showEnvironmentVariables": true,
@@ -59,15 +59,6 @@
             "required": false,
             "helpMarkDown": "If this is true, this task will fail if any errors are written to the StandardError stream.",
             "groupName": "advanced"
-        },
-        {
-            "name": "disablePercentEscaping",
-            "type": "boolean",
-            "label": "Disable percent escaping",
-            "defaultValue": "false",
-            "required": false,
-            "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.",
-            "groupName": "advanced"
         }
     ],
     "instanceNameFormat": "Command Line Script",
diff --git a/Tasks/CmdLineV2/task.loc.json b/Tasks/CmdLineV2/task.loc.json
index 31c58319413b..abbab635b037 100644
--- a/Tasks/CmdLineV2/task.loc.json
+++ b/Tasks/CmdLineV2/task.loc.json
@@ -18,7 +18,7 @@
   "version": {
     "Major": 2,
     "Minor": 200,
-    "Patch": 1
+    "Patch": 2
   },
   "releaseNotes": "ms-resource:loc.releaseNotes",
   "showEnvironmentVariables": true,
@@ -59,15 +59,6 @@
       "required": false,
       "helpMarkDown": "ms-resource:loc.input.help.failOnStderr",
       "groupName": "advanced"
-    },
-    {
-      "name": "disablePercentEscaping",
-      "type": "boolean",
-      "label": "ms-resource:loc.input.label.disablePercentEscaping",
-      "defaultValue": "false",
-      "required": false,
-      "helpMarkDown": "ms-resource:loc.input.help.disablePercentEscaping",
-      "groupName": "advanced"
     }
   ],
   "instanceNameFormat": "ms-resource:loc.instanceNameFormat",