diff --git a/Tasks/AzureMysqlDeploymentV1/Strings/resources.resjson/en-US/resources.resjson b/Tasks/AzureMysqlDeploymentV1/Strings/resources.resjson/en-US/resources.resjson index f7bf6c2201d6..39cd4f73a43d 100644 --- a/Tasks/AzureMysqlDeploymentV1/Strings/resources.resjson/en-US/resources.resjson +++ b/Tasks/AzureMysqlDeploymentV1/Strings/resources.resjson/en-US/resources.resjson @@ -1,6 +1,6 @@ { "loc.friendlyName": "Azure Database for MySQL deployment", - "loc.helpMarkDown": "[More Information](https://aka.ms/mysqlazuredeployreadme)", + "loc.helpMarkDown": "[Learn more about this task](https://aka.ms/mysqlazuredeployreadme)", "loc.description": "Run your scripts and make changes to your Azure Database for MySQL", "loc.instanceNameFormat": "Execute Azure MySQL : $(TaskNameSelector)", "loc.group.displayName.target": "DB Details", diff --git a/Tasks/AzureMysqlDeploymentV1/task.json b/Tasks/AzureMysqlDeploymentV1/task.json index af0e060245fd..6712d0643c89 100644 --- a/Tasks/AzureMysqlDeploymentV1/task.json +++ b/Tasks/AzureMysqlDeploymentV1/task.json @@ -16,8 +16,8 @@ "author": "Microsoft Corporation", "version": { "Major": 1, - "Minor": 0, - "Patch": 30 + "Minor": 156, + "Patch": 1 }, "demands": [], "minimumAgentVersion": "1.100.0", diff --git a/Tasks/AzureMysqlDeploymentV1/task.loc.json b/Tasks/AzureMysqlDeploymentV1/task.loc.json index 1df61775affa..28b204fc6772 100644 --- a/Tasks/AzureMysqlDeploymentV1/task.loc.json +++ b/Tasks/AzureMysqlDeploymentV1/task.loc.json @@ -16,8 +16,8 @@ "author": "Microsoft Corporation", "version": { "Major": 1, - "Minor": 0, - "Patch": 30 + "Minor": 156, + "Patch": 1 }, "demands": [], "minimumAgentVersion": "1.100.0", diff --git a/Tasks/Common/docker-common-v2/containerconnection.ts b/Tasks/Common/docker-common-v2/containerconnection.ts index accb4eab9f13..bbf00c51aaa6 100644 --- a/Tasks/Common/docker-common-v2/containerconnection.ts +++ b/Tasks/Common/docker-common-v2/containerconnection.ts @@ -117,7 +117,7 @@ export default class ContainerConnection { public setDockerConfigEnvVariable() { if (this.configurationDirPath && fs.existsSync(this.configurationDirPath)) { - tl.setVariable("DOCKER_CONFIG", this.configurationDirPath, true); + tl.setVariable("DOCKER_CONFIG", this.configurationDirPath); } else { tl.error(tl.loc('DockerRegistryNotFound')); diff --git a/Tasks/Common/docker-common/containerconnection.ts b/Tasks/Common/docker-common/containerconnection.ts index 8314b92d19f7..7ce12c798b16 100644 --- a/Tasks/Common/docker-common/containerconnection.ts +++ b/Tasks/Common/docker-common/containerconnection.ts @@ -117,7 +117,7 @@ export default class ContainerConnection { public setDockerConfigEnvVariable() { if (this.configurationDirPath && fs.existsSync(this.configurationDirPath)) { - tl.setVariable("DOCKER_CONFIG", this.configurationDirPath, true); + tl.setVariable("DOCKER_CONFIG", this.configurationDirPath); } else { tl.error(tl.loc('DockerRegistryNotFound')); diff --git a/Tasks/Common/webdeployment-common-v2/Tests/L1JsonVarSub.ts b/Tasks/Common/webdeployment-common-v2/Tests/L1JsonVarSub.ts index 95bfe759c51d..fed0ea6141a8 100644 --- a/Tasks/Common/webdeployment-common-v2/Tests/L1JsonVarSub.ts +++ b/Tasks/Common/webdeployment-common-v2/Tests/L1JsonVarSub.ts @@ -11,7 +11,8 @@ var envVarObject = jsonSubUtil.createEnvTree([ { name: 'user.profile.name.first', value: 'firstName', secret: false}, { name: 'user.profile', value: 'replace_all', secret: false}, { name: 'constructor.name', value: 'newConstructorName', secret: false}, - { name: 'constructor.valueOf', value: 'constructorNewValue', secret: false} + { name: 'constructor.valueOf', value: 'constructorNewValue', secret: false}, + { name: 'systemsettings.appurl', value: 'https://dev.azure.com/helloworld', secret: false} ]); var jsonObject = { @@ -34,6 +35,9 @@ var jsonObject = { 'constructor': { 'name': 'myconstructorname', 'valueOf': 'myconstructorvalue' + }, + 'systemsettings': { + 'appurl': 'https://helloworld.visualstudio.com' } } // Method to be checked for JSON variable substitution @@ -42,7 +46,9 @@ jsonSubUtil.substituteJsonVariable(jsonObject, envVarObject); if(typeof jsonObject['user.profile'] === 'object') { console.log('JSON - eliminating object variables validated'); } -if(jsonObject['data']['ConnectionString'] === 'database_connection' && jsonObject['data']['userName'] === 'db_admin') { +if(jsonObject['data']['ConnectionString'] === 'database_connection' + && jsonObject['data']['userName'] === 'db_admin' + && jsonObject['systemsettings']['appurl'] == 'https://dev.azure.com/helloworld') { console.log('JSON - simple string change validated'); } if(jsonObject['system']['debug'] === 'no_change') { diff --git a/Tasks/Common/webdeployment-common-v2/Tests/L1JsonVarSubV2.ts b/Tasks/Common/webdeployment-common-v2/Tests/L1JsonVarSubV2.ts index 22c6e3bcab12..33210f3e44f2 100644 --- a/Tasks/Common/webdeployment-common-v2/Tests/L1JsonVarSubV2.ts +++ b/Tasks/Common/webdeployment-common-v2/Tests/L1JsonVarSubV2.ts @@ -16,7 +16,8 @@ var envVarObject = jsonSubUtil.createEnvTree([ { name: 'profile.enabled', value: 'false', secret: false}, { name: 'profile.version', value: '1173', secret: false}, { name: 'profile.somefloat', value: '97.75', secret: false}, - { name: 'profile.preimum_level', value: '{"suaggar": "V4", "rok": "V5", "asranja": { "type" : "V6"}}', secret: false} + { name: 'profile.preimum_level', value: '{"suaggar": "V4", "rok": "V5", "asranja": { "type" : "V6"}}', secret: false}, + { name: 'systemsettings.appurl', value: 'https://dev.azure.com/helloworld', secret: false} ]); var jsonObject = { @@ -52,13 +53,18 @@ var jsonObject = { "enabled": true, "version": 2, "somefloat": 2.3456 + }, + 'systemsettings': { + 'appurl': 'https://helloworld.visualstudio.com' } } // Method to be checked for JSON variable substitution jsonSubUtil.substituteJsonVariableV2(jsonObject, envVarObject); -if(jsonObject['data']['ConnectionString'] === 'database_connection' && jsonObject['data']['userName'] === 'db_admin') { +if(jsonObject['data']['ConnectionString'] === 'database_connection' + && jsonObject['data']['userName'] === 'db_admin' + && jsonObject['systemsettings']['appurl'] == 'https://dev.azure.com/helloworld') { console.log('JSON - simple string change validated'); } if(jsonObject['system']['debug'] === 'no_change') { diff --git a/Tasks/Common/webdeployment-common-v2/variableutility.ts b/Tasks/Common/webdeployment-common-v2/variableutility.ts index 47095e663c6f..cfbf989df143 100644 --- a/Tasks/Common/webdeployment-common-v2/variableutility.ts +++ b/Tasks/Common/webdeployment-common-v2/variableutility.ts @@ -1,7 +1,7 @@ import tl = require('azure-pipelines-task-lib'); export function isPredefinedVariable(variable: string): boolean { - var predefinedVarPrefix = ['agent.', 'azure_http_user_agent', 'build.', 'common.', 'release.', 'system', 'tf_']; + var predefinedVarPrefix = ['agent.', 'azure_http_user_agent', 'build.', 'common.', 'release.', 'system.', 'tf_']; for(let varPrefix of predefinedVarPrefix) { if(variable.toLowerCase().startsWith(varPrefix)) { return true; diff --git a/Tasks/DockerComposeV0/task.json b/Tasks/DockerComposeV0/task.json index 99c21ff96ee1..d4d8d43ce923 100644 --- a/Tasks/DockerComposeV0/task.json +++ b/Tasks/DockerComposeV0/task.json @@ -14,7 +14,7 @@ "version": { "Major": 0, "Minor": 155, - "Patch": 0 + "Patch": 1 }, "demands": [], "preview": "false", diff --git a/Tasks/DockerComposeV0/task.loc.json b/Tasks/DockerComposeV0/task.loc.json index dc4be5fedb1e..bbdd408c74cb 100644 --- a/Tasks/DockerComposeV0/task.loc.json +++ b/Tasks/DockerComposeV0/task.loc.json @@ -14,7 +14,7 @@ "version": { "Major": 0, "Minor": 155, - "Patch": 0 + "Patch": 1 }, "demands": [], "preview": "false", diff --git a/Tasks/DockerV0/task.json b/Tasks/DockerV0/task.json index e8a673b95d2b..73dc4a6fb4c6 100644 --- a/Tasks/DockerV0/task.json +++ b/Tasks/DockerV0/task.json @@ -14,7 +14,7 @@ "version": { "Major": 0, "Minor": 154, - "Patch": 1 + "Patch": 2 }, "demands": [], "preview": "false", diff --git a/Tasks/DockerV0/task.loc.json b/Tasks/DockerV0/task.loc.json index 4b1eb9c71fb7..096152c44a99 100644 --- a/Tasks/DockerV0/task.loc.json +++ b/Tasks/DockerV0/task.loc.json @@ -14,7 +14,7 @@ "version": { "Major": 0, "Minor": 154, - "Patch": 1 + "Patch": 2 }, "demands": [], "preview": "false", diff --git a/Tasks/DockerV1/task.json b/Tasks/DockerV1/task.json index 00cfdb5a0502..bbce7f65b284 100644 --- a/Tasks/DockerV1/task.json +++ b/Tasks/DockerV1/task.json @@ -14,7 +14,7 @@ "version": { "Major": 1, "Minor": 154, - "Patch": 2 + "Patch": 3 }, "demands": [], "releaseNotes": "Simplified the task by:
 - Providing an option to simply select or type a command.
 - Retaining the useful input fields and providing an option to pass the rest as an argument to the command.", diff --git a/Tasks/DockerV1/task.loc.json b/Tasks/DockerV1/task.loc.json index c5a03b594818..0755423cfc3d 100644 --- a/Tasks/DockerV1/task.loc.json +++ b/Tasks/DockerV1/task.loc.json @@ -14,7 +14,7 @@ "version": { "Major": 1, "Minor": 154, - "Patch": 2 + "Patch": 3 }, "demands": [], "releaseNotes": "ms-resource:loc.releaseNotes", diff --git a/Tasks/DockerV2/task.json b/Tasks/DockerV2/task.json index 5fa6acd55d18..9433fbd343a4 100644 --- a/Tasks/DockerV2/task.json +++ b/Tasks/DockerV2/task.json @@ -14,7 +14,7 @@ "version": { "Major": 2, "Minor": 154, - "Patch": 3 + "Patch": 4 }, "demands": [], "releaseNotes": "Simplified the task YAML by:
 - Removing the Container registry type input
 - Removing complex inputs as they can be passed as arguments to the command.", diff --git a/Tasks/DockerV2/task.loc.json b/Tasks/DockerV2/task.loc.json index 6c6296296985..0fdf6a2faf2c 100644 --- a/Tasks/DockerV2/task.loc.json +++ b/Tasks/DockerV2/task.loc.json @@ -14,7 +14,7 @@ "version": { "Major": 2, "Minor": 154, - "Patch": 3 + "Patch": 4 }, "demands": [], "releaseNotes": "ms-resource:loc.releaseNotes", diff --git a/Tasks/DownloadGitHubReleaseV0/Strings/resources.resjson/en-US/resources.resjson b/Tasks/DownloadGitHubReleaseV0/Strings/resources.resjson/en-US/resources.resjson index 1124ccb0334d..0857b89c9fea 100644 --- a/Tasks/DownloadGitHubReleaseV0/Strings/resources.resjson/en-US/resources.resjson +++ b/Tasks/DownloadGitHubReleaseV0/Strings/resources.resjson/en-US/resources.resjson @@ -1,6 +1,6 @@ { "loc.friendlyName": "Download GitHub Release", - "loc.helpMarkDown": "[More Information](https://aka.ms/AA3x715)", + "loc.helpMarkDown": "[Learn more about this task](https://aka.ms/AA3x715)", "loc.description": "Downloads a GitHub Release from a repository", "loc.instanceNameFormat": "Download GitHub Release", "loc.input.label.connection": "GitHub Connection", diff --git a/Tasks/DownloadGitHubReleaseV0/task.json b/Tasks/DownloadGitHubReleaseV0/task.json index 4b2e35336324..05b073ce96fa 100644 --- a/Tasks/DownloadGitHubReleaseV0/task.json +++ b/Tasks/DownloadGitHubReleaseV0/task.json @@ -10,7 +10,7 @@ "demands": [], "version": { "Major": 0, - "Minor": 154, + "Minor": 156, "Patch": 0 }, "minimumAgentVersion": "1.99.0", @@ -27,7 +27,7 @@ }, { "name": "userRepository", - "type": "pickList", + "type": "githubRepositoryPicker", "label": "Repository", "defaultValue": "", "required": true, diff --git a/Tasks/DownloadGitHubReleaseV0/task.loc.json b/Tasks/DownloadGitHubReleaseV0/task.loc.json index fa0709cf5a8b..47829d4124bd 100644 --- a/Tasks/DownloadGitHubReleaseV0/task.loc.json +++ b/Tasks/DownloadGitHubReleaseV0/task.loc.json @@ -10,7 +10,7 @@ "demands": [], "version": { "Major": 0, - "Minor": 154, + "Minor": 156, "Patch": 0 }, "minimumAgentVersion": "1.99.0", @@ -27,7 +27,7 @@ }, { "name": "userRepository", - "type": "pickList", + "type": "githubRepositoryPicker", "label": "ms-resource:loc.input.label.userRepository", "defaultValue": "", "required": true, diff --git a/Tasks/FileTransformV1/task.json b/Tasks/FileTransformV1/task.json index a3d80f951877..bba5e7bc13f4 100644 --- a/Tasks/FileTransformV1/task.json +++ b/Tasks/FileTransformV1/task.json @@ -17,8 +17,8 @@ ], "version": { "Major": 1, - "Minor": 153, - "Patch": 2 + "Minor": 156, + "Patch": 0 }, "instanceNameFormat": "File Transform: $(Package)", "groups": [ diff --git a/Tasks/FileTransformV1/task.loc.json b/Tasks/FileTransformV1/task.loc.json index 967e7be4c262..3f4f59ee7366 100644 --- a/Tasks/FileTransformV1/task.loc.json +++ b/Tasks/FileTransformV1/task.loc.json @@ -17,8 +17,8 @@ ], "version": { "Major": 1, - "Minor": 153, - "Patch": 2 + "Minor": 156, + "Patch": 0 }, "instanceNameFormat": "ms-resource:loc.instanceNameFormat", "groups": [ diff --git a/Tasks/GitHubReleaseV0/task.json b/Tasks/GitHubReleaseV0/task.json index 63459c81e33d..2e89554b2be6 100644 --- a/Tasks/GitHubReleaseV0/task.json +++ b/Tasks/GitHubReleaseV0/task.json @@ -14,7 +14,7 @@ "preview": true, "version": { "Major": 0, - "Minor": 155, + "Minor": 156, "Patch": 0 }, "demands": [], @@ -30,7 +30,7 @@ }, { "name": "repositoryName", - "type": "pickList", + "type": "githubRepositoryPicker", "label": "Repository", "defaultValue": "$(Build.Repository.Name)", "required": true, diff --git a/Tasks/GitHubReleaseV0/task.loc.json b/Tasks/GitHubReleaseV0/task.loc.json index bfc5d9736d83..d421e12813c1 100644 --- a/Tasks/GitHubReleaseV0/task.loc.json +++ b/Tasks/GitHubReleaseV0/task.loc.json @@ -14,7 +14,7 @@ "preview": true, "version": { "Major": 0, - "Minor": 155, + "Minor": 156, "Patch": 0 }, "demands": [], @@ -30,7 +30,7 @@ }, { "name": "repositoryName", - "type": "pickList", + "type": "githubRepositoryPicker", "label": "ms-resource:loc.input.label.repositoryName", "defaultValue": "$(Build.Repository.Name)", "required": true, diff --git a/Tasks/IISWebAppDeploymentOnMachineGroupV0/Strings/resources.resjson/en-US/resources.resjson b/Tasks/IISWebAppDeploymentOnMachineGroupV0/Strings/resources.resjson/en-US/resources.resjson index 857286e9c982..2d8932fd3689 100644 --- a/Tasks/IISWebAppDeploymentOnMachineGroupV0/Strings/resources.resjson/en-US/resources.resjson +++ b/Tasks/IISWebAppDeploymentOnMachineGroupV0/Strings/resources.resjson/en-US/resources.resjson @@ -1,6 +1,6 @@ { "loc.friendlyName": "IIS web app deploy", - "loc.helpMarkDown": "[More information](https://go.microsoft.com/fwlink/?linkid=866789)", + "loc.helpMarkDown": "[Learn more about this task](https://go.microsoft.com/fwlink/?linkid=866789)", "loc.description": "Deploy a website or web application using Web Deploy", "loc.instanceNameFormat": "Deploy IIS Website/App: $(WebDeployPackage)", "loc.group.displayName.FileTransformsAndVariableSubstitution": "File Transforms & Variable Substitution Options", diff --git a/Tasks/IISWebAppDeploymentOnMachineGroupV0/task.json b/Tasks/IISWebAppDeploymentOnMachineGroupV0/task.json index b322885b81e7..976d46cf01f9 100644 --- a/Tasks/IISWebAppDeploymentOnMachineGroupV0/task.json +++ b/Tasks/IISWebAppDeploymentOnMachineGroupV0/task.json @@ -16,8 +16,8 @@ "author": "Microsoft Corporation", "version": { "Major": 0, - "Minor": 0, - "Patch": 59 + "Minor": 156, + "Patch": 0 }, "demands": [], "minimumAgentVersion": "2.104.1", diff --git a/Tasks/IISWebAppDeploymentOnMachineGroupV0/task.loc.json b/Tasks/IISWebAppDeploymentOnMachineGroupV0/task.loc.json index 8ca9bfb4d779..08f01fdfb6b4 100644 --- a/Tasks/IISWebAppDeploymentOnMachineGroupV0/task.loc.json +++ b/Tasks/IISWebAppDeploymentOnMachineGroupV0/task.loc.json @@ -16,8 +16,8 @@ "author": "Microsoft Corporation", "version": { "Major": 0, - "Minor": 0, - "Patch": 59 + "Minor": 156, + "Patch": 0 }, "demands": [], "minimumAgentVersion": "2.104.1", diff --git a/Tasks/KubernetesManifestV0/task.json b/Tasks/KubernetesManifestV0/task.json index 2369a8e42ccd..6b2d7abdd422 100644 --- a/Tasks/KubernetesManifestV0/task.json +++ b/Tasks/KubernetesManifestV0/task.json @@ -14,7 +14,7 @@ "version": { "Major": 0, "Minor": 155, - "Patch": 4 + "Patch": 5 }, "demands": [], "groups": [], diff --git a/Tasks/KubernetesManifestV0/task.loc.json b/Tasks/KubernetesManifestV0/task.loc.json index da3f10e9709c..df6ad2eb361e 100644 --- a/Tasks/KubernetesManifestV0/task.loc.json +++ b/Tasks/KubernetesManifestV0/task.loc.json @@ -14,7 +14,7 @@ "version": { "Major": 0, "Minor": 155, - "Patch": 4 + "Patch": 5 }, "demands": [], "groups": [], diff --git a/Tasks/KubernetesV0/task.json b/Tasks/KubernetesV0/task.json index 712fa965ceae..4db38bfa08e2 100644 --- a/Tasks/KubernetesV0/task.json +++ b/Tasks/KubernetesV0/task.json @@ -14,7 +14,7 @@ "version": { "Major": 0, "Minor": 154, - "Patch": 5 + "Patch": 6 }, "demands": [], "preview": "false", diff --git a/Tasks/KubernetesV0/task.loc.json b/Tasks/KubernetesV0/task.loc.json index 0580b1c78d0a..d70ee04e359b 100644 --- a/Tasks/KubernetesV0/task.loc.json +++ b/Tasks/KubernetesV0/task.loc.json @@ -14,7 +14,7 @@ "version": { "Major": 0, "Minor": 154, - "Patch": 5 + "Patch": 6 }, "demands": [], "preview": "false", diff --git a/Tasks/KubernetesV1/task.json b/Tasks/KubernetesV1/task.json index 7cb517b6a3f8..1623286dcda1 100644 --- a/Tasks/KubernetesV1/task.json +++ b/Tasks/KubernetesV1/task.json @@ -14,7 +14,7 @@ "version": { "Major": 1, "Minor": 155, - "Patch": 2 + "Patch": 3 }, "demands": [], "releaseNotes": "What's new in Version 1.0:
 Added new service connection type input for easy selection of Azure AKS cluster.
 Replaced output variable input with output variables section that we had added in all tasks.", diff --git a/Tasks/KubernetesV1/task.loc.json b/Tasks/KubernetesV1/task.loc.json index a7dfd38f2010..a64c5b8256fe 100644 --- a/Tasks/KubernetesV1/task.loc.json +++ b/Tasks/KubernetesV1/task.loc.json @@ -14,7 +14,7 @@ "version": { "Major": 1, "Minor": 155, - "Patch": 2 + "Patch": 3 }, "demands": [], "releaseNotes": "ms-resource:loc.releaseNotes", diff --git a/Tasks/MysqlDeploymentOnMachineGroupV1/Strings/resources.resjson/en-US/resources.resjson b/Tasks/MysqlDeploymentOnMachineGroupV1/Strings/resources.resjson/en-US/resources.resjson index fab9a387c7ee..3f1a0d995411 100644 --- a/Tasks/MysqlDeploymentOnMachineGroupV1/Strings/resources.resjson/en-US/resources.resjson +++ b/Tasks/MysqlDeploymentOnMachineGroupV1/Strings/resources.resjson/en-US/resources.resjson @@ -1,6 +1,6 @@ { "loc.friendlyName": "MySQL database deploy", - "loc.helpMarkDown": "[More Information](https://aka.ms/mysql-deployment-on-machine-group)", + "loc.helpMarkDown": "[Learn more about this task](https://aka.ms/mysql-deployment-on-machine-group)", "loc.description": "Run scripts and make changes to a MySQL Database", "loc.instanceNameFormat": "Deploy Using : $(TaskNameSelector)", "loc.input.label.TaskNameSelector": "Deploy MySql Using", diff --git a/Tasks/MysqlDeploymentOnMachineGroupV1/task.json b/Tasks/MysqlDeploymentOnMachineGroupV1/task.json index 0ba3e313aa50..315c74cb9fe1 100644 --- a/Tasks/MysqlDeploymentOnMachineGroupV1/task.json +++ b/Tasks/MysqlDeploymentOnMachineGroupV1/task.json @@ -16,8 +16,8 @@ "author": "Microsoft Corporation", "version": { "Major": 1, - "Minor": 1, - "Patch": 4 + "Minor": 156, + "Patch": 1 }, "demands": [], "minimumAgentVersion": "1.100.0", diff --git a/Tasks/MysqlDeploymentOnMachineGroupV1/task.loc.json b/Tasks/MysqlDeploymentOnMachineGroupV1/task.loc.json index 588a258d32ab..e6bcadef4591 100644 --- a/Tasks/MysqlDeploymentOnMachineGroupV1/task.loc.json +++ b/Tasks/MysqlDeploymentOnMachineGroupV1/task.loc.json @@ -16,8 +16,8 @@ "author": "Microsoft Corporation", "version": { "Major": 1, - "Minor": 1, - "Patch": 4 + "Minor": 156, + "Patch": 1 }, "demands": [], "minimumAgentVersion": "1.100.0",