From 940f704768ada9fda567aab4576f9d099e5d74be Mon Sep 17 00:00:00 2001 From: William Reznak <44002111+wireznak@users.noreply.github.com> Date: Tue, 10 Dec 2019 15:25:12 -0500 Subject: [PATCH] Corrects missing parentheses in MSBuild parameter validation (#11946) * The "isMatch" expression for the newly-added platform and configuration validation was missing a close-parenthesis. * Mirrored changes to task.json, and bumped task patch version. * The same issue also applied to VSBuildV1. * Remove validation in the UI entirely to unblock. Parameters to MSBuild will still be validated at run-time. * Smoothing out patch version number. --- Tasks/MSBuildV1/task.json | 14 +++----------- Tasks/MSBuildV1/task.loc.json | 14 +++----------- Tasks/VSBuildV1/task.json | 14 +++----------- Tasks/VSBuildV1/task.loc.json | 4 ++-- 4 files changed, 11 insertions(+), 35 deletions(-) diff --git a/Tasks/MSBuildV1/task.json b/Tasks/MSBuildV1/task.json index 942891da66e6..01623a47b3e9 100644 --- a/Tasks/MSBuildV1/task.json +++ b/Tasks/MSBuildV1/task.json @@ -13,7 +13,7 @@ "version": { "Major": 1, "Minor": 161, - "Patch": 0 + "Patch": 1 }, "demands": [ "msbuild" @@ -90,22 +90,14 @@ "type": "string", "label": "Platform", "defaultValue": "", - "required": false, - "validation": { - "expression": "isMatch(value, '[<>*|:\\/&%\".#?]'", - "message": "The following characters are forbidden in Platform: < > * | : \\ / & % \" . # ?" - } + "required": false }, { "name": "configuration", "type": "string", "label": "Configuration", "defaultValue": "", - "required": false, - "validation": { - "expression": "isMatch(value, '[<>*|:\\/&%\".#?]'", - "message": "The following characters are forbidden in Configuration: < > * | : \\ / & % \" . # ?" - } + "required": false }, { "name": "msbuildArguments", diff --git a/Tasks/MSBuildV1/task.loc.json b/Tasks/MSBuildV1/task.loc.json index 3d3c5b986f3c..81a58b64a418 100644 --- a/Tasks/MSBuildV1/task.loc.json +++ b/Tasks/MSBuildV1/task.loc.json @@ -13,7 +13,7 @@ "version": { "Major": 1, "Minor": 161, - "Patch": 0 + "Patch": 1 }, "demands": [ "msbuild" @@ -90,22 +90,14 @@ "type": "string", "label": "ms-resource:loc.input.label.platform", "defaultValue": "", - "required": false, - "validation": { - "expression": "isMatch(value, '[<>*|:\\/&%\".#?]'", - "message": "The following characters are forbidden in Platform: < > * | : \\ / & % \" . # ?" - } + "required": false }, { "name": "configuration", "type": "string", "label": "ms-resource:loc.input.label.configuration", "defaultValue": "", - "required": false, - "validation": { - "expression": "isMatch(value, '[<>*|:\\/&%\".#?]'", - "message": "The following characters are forbidden in Configuration: < > * | : \\ / & % \" . # ?" - } + "required": false }, { "name": "msbuildArguments", diff --git a/Tasks/VSBuildV1/task.json b/Tasks/VSBuildV1/task.json index 113ef32ef971..d0dcf7e8c96a 100644 --- a/Tasks/VSBuildV1/task.json +++ b/Tasks/VSBuildV1/task.json @@ -13,7 +13,7 @@ "version": { "Major": 1, "Minor": 161, - "Patch": 0 + "Patch": 1 }, "demands": [ "msbuild", @@ -66,11 +66,7 @@ "label": "Platform", "helpMarkDown": "Specify the platform you want to build such as Win32, x86, x64 or any cpu.", "defaultValue": "", - "required": false, - "validation": { - "expression": "isMatch(value, '[<>*|:\\/&%\".#?]'", - "message": "The following characters are forbidden in Platform: < > * | : \\ / & % \" . # ?" - } + "required": false }, { "name": "configuration", @@ -78,11 +74,7 @@ "label": "Configuration", "helpMarkDown": "Specify the configuration you want to build such as debug or release.", "defaultValue": "", - "required": false, - "validation": { - "expression": "isMatch(value, '[<>*|:\\/&%\".#?]'", - "message": "The following characters are forbidden in Configuration: < > * | : \\ / & % \" . # ?" - } + "required": false }, { "name": "clean", diff --git a/Tasks/VSBuildV1/task.loc.json b/Tasks/VSBuildV1/task.loc.json index 2e0488b312ac..a1704f5c0650 100644 --- a/Tasks/VSBuildV1/task.loc.json +++ b/Tasks/VSBuildV1/task.loc.json @@ -12,8 +12,8 @@ "author": "Microsoft Corporation", "version": { "Major": 1, - "Minor": 160, - "Patch": 0 + "Minor": 161, + "Patch": 1 }, "demands": [ "msbuild",