Merge branch 'dev' into fix/autorestgeneration

Author: timayabi2020

.azure-pipelines/ci-build.yml

@@ -3,7 +3,7 @@
 name: $(BuildDefinitionName)_$(SourceBranchName)_$(Date:yyyyMMdd)$(Rev:.r)
 parameters:
 - name: BuildAgent
-  default: 1es-windows-ps-compute
+  default: 1es-windows-ps-compute-m
   displayName: Build Agent
 - name: Test
   type: boolean

.azure-pipelines/generation-templates/generate-helpdocs-template.yml

@@ -9,7 +9,7 @@ parameters:
     type: string
     default: ""
   - name: BUILDAGENT
-    default: 1es-windows-ps-compute
+    default: 1es-windows-ps-compute-m
     displayName: Build Agent
 
 steps:

.azure-pipelines/weekly-generation.yml

@@ -10,7 +10,7 @@ name: $(BuildDefinitionName)_$(SourceBranchName)_$(Date:yyyyMMdd)$(Rev:.r)
 parameters:
 - name: BuildAgent
   displayName: Build Agent
-  default: 1es-windows-ps-compute
+  default: 1es-windows-ps-compute-m
 - name: BaseBranch
   displayName: Base Branch
   default: dev

tools/Custom/PSCmdletExtensions.cs

@@ -29,7 +29,7 @@ internal static string UnescapeString(this PSCmdlet cmdlet, string value)
             try
             {
                 var unescapedString = Uri.UnescapeDataString(value);
-                return value.EndsWith("'") ? unescapedString: unescapedString.Replace('+', ' ');
+                return (value.EndsWith("'") || value.EndsWith("')")) ? unescapedString: unescapedString.Replace('+', ' ');
             }
             catch (UriFormatException ex)
             {