From 5f49878a9d52056d7d6be42a81a147fa42a8a285 Mon Sep 17 00:00:00 2001 From: vinca Date: Tue, 30 Jan 2018 16:42:40 +0530 Subject: [PATCH] Added check for Linux App Type --- Tasks/AzureRmWebAppDeployment/task.json | 26 ++++++++++----------- Tasks/AzureRmWebAppDeployment/task.loc.json | 26 ++++++++++----------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/Tasks/AzureRmWebAppDeployment/task.json b/Tasks/AzureRmWebAppDeployment/task.json index 1985ec827aba..b7759180eec2 100644 --- a/Tasks/AzureRmWebAppDeployment/task.json +++ b/Tasks/AzureRmWebAppDeployment/task.json @@ -16,7 +16,7 @@ "version": { "Major": 3, "Minor": 3, - "Patch": 37 + "Patch": 38 }, "releaseNotes": "What's new in Version 3.0:
  Supports File Transformations (XDT)
  Supports Variable Substitutions(XML, JSON)
Click [here](https://aka.ms/azurermwebdeployreadme) for more Information.", "minimumAgentVersion": "2.104.1", @@ -25,13 +25,13 @@ "name": "FileTransformsAndVariableSubstitution", "displayName": "File Transforms & Variable Substitution Options", "isExpanded": false, - "visibleRule": "WebAppKind != applinux && WebAppKind != \"\"" + "visibleRule": "WebAppKind != linux && WebAppKind != applinux && WebAppKind != \"\"" }, { "name": "AdditionalDeploymentOptions", "displayName": "Additional Deployment Options", "isExpanded": false, - "visibleRule": "WebAppKind != applinux && WebAppKind != \"\"" + "visibleRule": "WebAppKind != linux && WebAppKind != applinux && WebAppKind != \"\"" }, { "name": "PostDeploymentAction", @@ -76,7 +76,7 @@ "mobileapp": "Mobile App" }, "properties": { - "EditableOptions": "false" + "EditableOptions": "true" }, "helpMarkDown": "Select type of web app to deploy.
Note: Select Linux Web App for built-in platform images or custom container image deployments." }, @@ -139,7 +139,7 @@ "PopulateDefaultValue": "true" }, "helpMarkDown": "App Service on Linux offers two different options to publish your application
Custom image deployment or App deployment with a built-in platform image. [Learn More](https://go.microsoft.com/fwlink/?linkid=862490)", - "visibleRule": "WebAppKind = applinux" + "visibleRule": "WebAppKind = applinux || WebAppKind = linux" }, { "name": "AzureContainerRegistry", @@ -243,7 +243,7 @@ "label": "Registry or Namespace", "defaultValue": "", "required": true, - "visibleRule": "WebAppKind = applinux && ImageSource = Registry", + "visibleRule": "WebAppKind != app && WebAppKind != functionapp && WebAppKind != api && WebAppKind != mobileapp && ImageSource = Registry", "helpMarkDown": "A globally unique top-level domain name for your specific registry or namespace.
Note: Fully qualified image name will be of the format: '`/`:`'. For example, 'myregistry.azurecr.io/nginx:latest'." }, { @@ -252,7 +252,7 @@ "label": "Image", "defaultValue": "", "required": true, - "visibleRule": "WebAppKind = applinux && ImageSource = Registry", + "visibleRule": "WebAppKind != app && WebAppKind != functionapp && WebAppKind != api && WebAppKind != mobileapp && ImageSource = Registry", "helpMarkDown": "Name of the repository where the container images are stored.
Note: Fully qualified image name will be of the format: '`/`:`'. For example, 'myregistry.azurecr.io/nginx:latest'." }, { @@ -261,7 +261,7 @@ "label": "Tag", "defaultValue": "", "required": false, - "visibleRule": "WebAppKind = applinux && ImageSource = Registry", + "visibleRule": "WebAppKind != app && WebAppKind != functionapp && WebAppKind != api && WebAppKind != mobileapp && ImageSource = Registry", "helpMarkDown": "Tags are optional, it is the mechanism that registries use to give Docker images a version.
Note: Fully qualified image name will be of the format: '`/`:`'. For example, 'myregistry.azurecr.io/nginx:latest'." }, { @@ -270,7 +270,7 @@ "label": "Virtual application", "defaultValue": "", "required": false, - "visibleRule": "WebAppKind != applinux && WebAppKind != \"\"", + "visibleRule": "WebAppKind != linux && WebAppKind != applinux && WebAppKind != \"\"", "helpMarkDown": "Specify the name of the Virtual application that has been configured in the Azure portal. The option is not required for deployments to the App Service root." }, { @@ -279,7 +279,7 @@ "label": "Package or folder", "defaultValue": "$(System.DefaultWorkingDirectory)/**/*.zip", "required": true, - "visibleRule": "WebAppKind != applinux && WebAppKind != \"\"", + "visibleRule": "WebAppKind != linux && WebAppKind != applinux && WebAppKind != \"\"", "helpMarkDown": "File path to the package or a folder containing app service contents generated by MSBuild or a compressed zip or war file.
Variables ( [Build](https://www.visualstudio.com/docs/build/define/variables) | [Release](https://www.visualstudio.com/docs/release/author-release-definition/understanding-tasks#predefvariables)), wild cards are supported.
For example, $(System.DefaultWorkingDirectory)/\\*\\*/\\*.zip or $(System.DefaultWorkingDirectory)/\\*\\*/\\*.war." }, { @@ -289,7 +289,7 @@ "label": "Package or folder", "defaultValue": "$(System.DefaultWorkingDirectory)/**/*.zip", "required": true, - "visibleRule": "WebAppKind = applinux && ImageSource = Builtin", + "visibleRule": "WebAppKind != app && WebAppKind != functionapp && WebAppKind != api && WebAppKind != mobileapp && ImageSource = Builtin", "helpMarkDown": "File path to the package or a folder containing app service contents generated by MSBuild or a compressed zip or war file.
Variables ( [Build](https://www.visualstudio.com/docs/build/define/variables) | [Release](https://www.visualstudio.com/docs/release/author-release-definition/understanding-tasks#predefvariables)), wild cards are supported.
For example, $(System.DefaultWorkingDirectory)/\\*\\*/\\*.zip or $(System.DefaultWorkingDirectory)/\\*\\*/\\*.war." }, { @@ -315,7 +315,7 @@ "ruby|2.3": "Ruby 2.3" }, "helpMarkDown": "Select the framework and version.", - "visibleRule": "WebAppKind = applinux && ImageSource = Builtin" + "visibleRule": "WebAppKind != app && WebAppKind != functionapp && WebAppKind != api && WebAppKind != mobileapp && ImageSource = Builtin" }, { "name": "StartupCommand", @@ -323,7 +323,7 @@ "label": "Startup command ", "defaultValue": "", "required": false, - "visibleRule": "WebAppKind = applinux", + "visibleRule": "WebAppKind = applinux || WebAppKind = linux", "helpMarkDown": "Enter the start up command." }, { diff --git a/Tasks/AzureRmWebAppDeployment/task.loc.json b/Tasks/AzureRmWebAppDeployment/task.loc.json index 6dcabb15bb87..82cf7a3b5c5c 100644 --- a/Tasks/AzureRmWebAppDeployment/task.loc.json +++ b/Tasks/AzureRmWebAppDeployment/task.loc.json @@ -16,7 +16,7 @@ "version": { "Major": 3, "Minor": 3, - "Patch": 37 + "Patch": 38 }, "releaseNotes": "ms-resource:loc.releaseNotes", "minimumAgentVersion": "2.104.1", @@ -25,13 +25,13 @@ "name": "FileTransformsAndVariableSubstitution", "displayName": "ms-resource:loc.group.displayName.FileTransformsAndVariableSubstitution", "isExpanded": false, - "visibleRule": "WebAppKind != applinux && WebAppKind != \"\"" + "visibleRule": "WebAppKind != linux && WebAppKind != applinux && WebAppKind != \"\"" }, { "name": "AdditionalDeploymentOptions", "displayName": "ms-resource:loc.group.displayName.AdditionalDeploymentOptions", "isExpanded": false, - "visibleRule": "WebAppKind != applinux && WebAppKind != \"\"" + "visibleRule": "WebAppKind != linux && WebAppKind != applinux && WebAppKind != \"\"" }, { "name": "PostDeploymentAction", @@ -80,7 +80,7 @@ "mobileapp": "Mobile App" }, "properties": { - "EditableOptions": "false" + "EditableOptions": "true" }, "helpMarkDown": "ms-resource:loc.input.help.WebAppKind" }, @@ -143,7 +143,7 @@ "PopulateDefaultValue": "true" }, "helpMarkDown": "ms-resource:loc.input.help.ImageSource", - "visibleRule": "WebAppKind = applinux" + "visibleRule": "WebAppKind = applinux || WebAppKind = linux" }, { "name": "AzureContainerRegistry", @@ -249,7 +249,7 @@ "label": "ms-resource:loc.input.label.DockerNamespace", "defaultValue": "", "required": true, - "visibleRule": "WebAppKind = applinux && ImageSource = Registry", + "visibleRule": "WebAppKind != app && WebAppKind != functionapp && WebAppKind != api && WebAppKind != mobileapp && ImageSource = Registry", "helpMarkDown": "ms-resource:loc.input.help.DockerNamespace" }, { @@ -258,7 +258,7 @@ "label": "ms-resource:loc.input.label.DockerRepository", "defaultValue": "", "required": true, - "visibleRule": "WebAppKind = applinux && ImageSource = Registry", + "visibleRule": "WebAppKind != app && WebAppKind != functionapp && WebAppKind != api && WebAppKind != mobileapp && ImageSource = Registry", "helpMarkDown": "ms-resource:loc.input.help.DockerRepository" }, { @@ -267,7 +267,7 @@ "label": "ms-resource:loc.input.label.DockerImageTag", "defaultValue": "", "required": false, - "visibleRule": "WebAppKind = applinux && ImageSource = Registry", + "visibleRule": "WebAppKind != app && WebAppKind != functionapp && WebAppKind != api && WebAppKind != mobileapp && ImageSource = Registry", "helpMarkDown": "ms-resource:loc.input.help.DockerImageTag" }, { @@ -276,7 +276,7 @@ "label": "ms-resource:loc.input.label.VirtualApplication", "defaultValue": "", "required": false, - "visibleRule": "WebAppKind != applinux && WebAppKind != \"\"", + "visibleRule": "WebAppKind != linux && WebAppKind != applinux && WebAppKind != \"\"", "helpMarkDown": "ms-resource:loc.input.help.VirtualApplication" }, { @@ -285,7 +285,7 @@ "label": "ms-resource:loc.input.label.Package", "defaultValue": "$(System.DefaultWorkingDirectory)/**/*.zip", "required": true, - "visibleRule": "WebAppKind != applinux && WebAppKind != \"\"", + "visibleRule": "WebAppKind != linux && WebAppKind != applinux && WebAppKind != \"\"", "helpMarkDown": "ms-resource:loc.input.help.Package" }, { @@ -297,7 +297,7 @@ "label": "ms-resource:loc.input.label.BuiltinLinuxPackage", "defaultValue": "$(System.DefaultWorkingDirectory)/**/*.zip", "required": true, - "visibleRule": "WebAppKind = applinux && ImageSource = Builtin", + "visibleRule": "WebAppKind != app && WebAppKind != functionapp && WebAppKind != api && WebAppKind != mobileapp && ImageSource = Builtin", "helpMarkDown": "ms-resource:loc.input.help.BuiltinLinuxPackage" }, { @@ -323,7 +323,7 @@ "ruby|2.3": "Ruby 2.3" }, "helpMarkDown": "ms-resource:loc.input.help.RuntimeStack", - "visibleRule": "WebAppKind = applinux && ImageSource = Builtin" + "visibleRule": "WebAppKind != app && WebAppKind != functionapp && WebAppKind != api && WebAppKind != mobileapp && ImageSource = Builtin" }, { "name": "StartupCommand", @@ -331,7 +331,7 @@ "label": "ms-resource:loc.input.label.StartupCommand", "defaultValue": "", "required": false, - "visibleRule": "WebAppKind = applinux", + "visibleRule": "WebAppKind = applinux || WebAppKind = linux", "helpMarkDown": "ms-resource:loc.input.help.StartupCommand" }, {