Skip to content

Commit

Permalink
Fixing the casing issue with WebAppKind for deployment to app service…
Browse files Browse the repository at this point in the history
… windows container via YAML devops workflow (#19070)

* Fixing the casing issue with WebAppKind for deployment to app service windows container via YAML devops workflow

* Update Version to the current sprint

Updating Version to the current sprint 232

* Update Version to the current sprint 232

Update Version to the current sprint 232

* Fixing the casing issue with WebAppKind for deployment to app service windows container via YAML devops workflow windows container via YAML devops workflow

* Fixing the casing issue with WebAppKind for deployment to app service windows container via YAML devops workflow windows container via YAML devops workflow

---------

Co-authored-by: Kirill Ivlev <[email protected]>
Co-authored-by: Dmitrii Bobreshev (Akvelon INC) <[email protected]>
Co-authored-by: Dmitrii Bobreshev <[email protected]>
  • Loading branch information
4 people authored Dec 5, 2023
1 parent 198b7f1 commit ce16712
Show file tree
Hide file tree
Showing 7 changed files with 89 additions and 89 deletions.
66 changes: 33 additions & 33 deletions Tasks/AzureRmWebAppDeploymentV4/task.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,30 +17,30 @@
"author": "Microsoft Corporation",
"version": {
"Major": 4,
"Minor": 231,
"Minor": 232,
"Patch": 0
},
"releaseNotes": "What's new in version 4.*<br />Supports Zip Deploy, Run From Package, War Deploy [Details here](https://aka.ms/appServiceDeploymentMethods)<br />Supports App Service Environments<br />Improved UI for discovering different App service types supported by the task<br/>Run From Package is the preferred deployment method, which makes files in wwwroot folder read-only<br/>Click [here](https://aka.ms/azurermwebdeployreadme) for more information.",
"minimumAgentVersion": "2.104.1",
"groups": [
{
"name": "FileTransformsAndVariableSubstitution",
"displayName": "File Transforms & Variable Substitution Options",
"isExpanded": false,
"visibleRule": "WebAppKind != webAppContainer && WebAppkind != functionAppContainer && WebAppKind != webAppLinux && webAppKind != functionAppLinux && Package NotEndsWith .war"
},
{
"name": "AdditionalDeploymentOptions",
"displayName": "Additional Deployment Options",
"isExpanded": false,
"visibleRule": "ConnectionType = AzureRM && WebAppKind != webAppLinux && WebAppKind != webAppContainer && WebAppkind != functionAppContainer && webAppKind != functionAppLinux && WebAppKind != \"\" && Package NotEndsWith .war && Package NotEndsWith .jar"
},
{
"name": "PostDeploymentAction",
"displayName": "Post Deployment Action",
"isExpanded": false,
"visibleRule": "ConnectionType = AzureRM && WebAppKind != \"\" && WebAppKind != webAppContainer && WebAppkind != functionAppContainer"
},
{
"name": "FileTransformsAndVariableSubstitution",
"displayName": "File Transforms & Variable Substitution Options",
"isExpanded": false,
"visibleRule": "WebAppKind != webAppContainer && WebAppKind != webAppHyperVContainer && WebAppkind != functionAppContainer && WebAppKind != webAppLinux && webAppKind != functionAppLinux && Package NotEndsWith .war"
},
{
"name": "AdditionalDeploymentOptions",
"displayName": "Additional Deployment Options",
"isExpanded": false,
"visibleRule": "ConnectionType = AzureRM && WebAppKind != webAppLinux && WebAppKind != webAppContainer && WebAppKind != webAppHyperVContainer && WebAppkind != functionAppContainer && webAppKind != functionAppLinux && WebAppKind != \"\" && Package NotEndsWith .war && Package NotEndsWith .jar"
},
{
"name": "PostDeploymentAction",
"displayName": "Post Deployment Action",
"isExpanded": false,
"visibleRule": "ConnectionType = AzureRM && WebAppKind != \"\" && WebAppKind != webAppContainer && WebAppKind != webAppHyperVContainer && WebAppkind != functionAppContainer"
},
{
"name": "ApplicationAndConfigurationSettings",
"displayName": "Application and Configuration Settings",
Expand Down Expand Up @@ -170,7 +170,7 @@
"label": "Registry or Namespace",
"defaultValue": "",
"required": true,
"visibleRule": "WebAppKind = webAppContainer || WebAppkind = functionAppContainer || WebAppkind = webAppHyperVContainer",
"visibleRule": "WebAppKind = webAppContainer || WebAppkind = functionAppContainer || WebAppKind = webAppHyperVContainer",
"helpMarkDown": "A globally unique top-level domain name for your specific registry or namespace.<br/> Note: Fully qualified image name will be of the format: '<b>`<registry or namespace`></b>/`<repository`>:`<tag`>'. For example, '<b>myregistry.azurecr.io</b>/nginx:latest'."
},
{
Expand All @@ -179,7 +179,7 @@
"label": "Image",
"defaultValue": "",
"required": true,
"visibleRule": "WebAppKind = webAppContainer || WebAppkind = functionAppContainer || WebAppkind = webAppHyperVContainer",
"visibleRule": "WebAppKind = webAppContainer || WebAppkind = functionAppContainer || WebAppKind = webAppHyperVContainer",
"helpMarkDown": "Name of the repository where the container images are stored.<br/> Note: Fully qualified image name will be of the format: '`<registry or namespace`>/<b>`<repository`></b>:`<tag`>'. For example, 'myregistry.azurecr.io/<b>nginx</b>:latest'."
},
{
Expand All @@ -188,18 +188,18 @@
"label": "Tag",
"defaultValue": "",
"required": false,
"visibleRule": "WebAppKind = webAppContainer || WebAppkind = functionAppContainer || WebAppkind = webAppHyperVContainer",
"visibleRule": "WebAppKind = webAppContainer || WebAppkind = functionAppContainer || WebAppKind = webAppHyperVContainer",
"helpMarkDown": "Tags are optional, it is the mechanism that registries use to give Docker images a version.<br/> Note: Fully qualified image name will be of the format: '`<registry or namespace`>/`<repository`>:<b>`<tag`></b>'. For example, 'myregistry.azurecr.io/nginx:<b>latest</b>'."
},
{
"name": "VirtualApplication",
"type": "string",
"label": "Virtual application",
"defaultValue": "",
"required": false,
"visibleRule": "WebAppKind != webAppLinux && WebAppKind != webAppContainer && WebAppkind != functionAppContainer && WebAppKind != functionApp && webAppKind != functionAppLinux && 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."
},
{
"name": "VirtualApplication",
"type": "string",
"label": "Virtual application",
"defaultValue": "",
"required": false,
"visibleRule": "WebAppKind != webAppLinux && WebAppKind != webAppContainer && WebAppKind != webAppHyperVContainer && WebAppkind != functionAppContainer && WebAppKind != functionApp && webAppKind != functionAppLinux && 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."
},
{
"name": "Package",
"aliases": [
Expand Down Expand Up @@ -255,7 +255,7 @@
"label": "Startup command ",
"defaultValue": "",
"required": false,
"visibleRule": "WebAppKind = webAppLinux || WebAppKind = webAppContainer || WebAppkind = functionAppContainer || WebAppKind = functionAppLinux || WebAppkind = webAppHyperVContainer",
"visibleRule": "WebAppKind = webAppLinux || WebAppKind = webAppContainer || WebAppkind = functionAppContainer || WebAppKind = functionAppLinux || WebAppKind = webAppHyperVContainer",
"helpMarkDown": "Enter the start up command. For ex.<br/>dotnet exec filename.dll<br/>dotnet filename.dll"
},
{
Expand Down Expand Up @@ -654,4 +654,4 @@
"RunFromZipPreventsFileInUseError": "Move from Web Deploy to RunFrom Package, which helps in avoiding FILE_IN_USE error. Note that Run From Package does not support msBuild package type. Please change your package format to use this deployment method.",
"MSDeployNotSupportTokenAuth": "App Service is configured to not use basic authentication. This requires Web Deploy msdeploy.exe version 7.1.7225 or higher. You need a version of Visual Studio that includes an updated version of msdeploy.exe. For more information, visit https://aka.ms/azdo-webapp-msdeploy ."
}
}
}
20 changes: 10 additions & 10 deletions Tasks/AzureRmWebAppDeploymentV4/task.loc.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"author": "Microsoft Corporation",
"version": {
"Major": 4,
"Minor": 231,
"Minor": 232,
"Patch": 0
},
"releaseNotes": "ms-resource:loc.releaseNotes",
Expand All @@ -27,19 +27,19 @@
"name": "FileTransformsAndVariableSubstitution",
"displayName": "ms-resource:loc.group.displayName.FileTransformsAndVariableSubstitution",
"isExpanded": false,
"visibleRule": "WebAppKind != webAppContainer && WebAppkind != functionAppContainer && WebAppKind != webAppLinux && webAppKind != functionAppLinux && Package NotEndsWith .war"
"visibleRule": "WebAppKind != webAppContainer && WebAppKind != webAppHyperVContainer && WebAppkind != functionAppContainer && WebAppKind != webAppLinux && webAppKind != functionAppLinux && Package NotEndsWith .war"
},
{
"name": "AdditionalDeploymentOptions",
"displayName": "ms-resource:loc.group.displayName.AdditionalDeploymentOptions",
"isExpanded": false,
"visibleRule": "ConnectionType = AzureRM && WebAppKind != webAppLinux && WebAppKind != webAppContainer && WebAppkind != functionAppContainer && webAppKind != functionAppLinux && WebAppKind != \"\" && Package NotEndsWith .war && Package NotEndsWith .jar"
"visibleRule": "ConnectionType = AzureRM && WebAppKind != webAppLinux && WebAppKind != webAppContainer && WebAppKind != webAppHyperVContainer && WebAppkind != functionAppContainer && webAppKind != functionAppLinux && WebAppKind != \"\" && Package NotEndsWith .war && Package NotEndsWith .jar"
},
{
"name": "PostDeploymentAction",
"displayName": "ms-resource:loc.group.displayName.PostDeploymentAction",
"isExpanded": false,
"visibleRule": "ConnectionType = AzureRM && WebAppKind != \"\" && WebAppKind != webAppContainer && WebAppkind != functionAppContainer"
"visibleRule": "ConnectionType = AzureRM && WebAppKind != \"\" && WebAppKind != webAppContainer && WebAppKind != webAppHyperVContainer && WebAppkind != functionAppContainer"
},
{
"name": "ApplicationAndConfigurationSettings",
Expand Down Expand Up @@ -170,7 +170,7 @@
"label": "ms-resource:loc.input.label.DockerNamespace",
"defaultValue": "",
"required": true,
"visibleRule": "WebAppKind = webAppContainer || WebAppkind = functionAppContainer || WebAppkind = webAppHyperVContainer",
"visibleRule": "WebAppKind = webAppContainer || WebAppkind = functionAppContainer || WebAppKind = webAppHyperVContainer",
"helpMarkDown": "ms-resource:loc.input.help.DockerNamespace"
},
{
Expand All @@ -179,7 +179,7 @@
"label": "ms-resource:loc.input.label.DockerRepository",
"defaultValue": "",
"required": true,
"visibleRule": "WebAppKind = webAppContainer || WebAppkind = functionAppContainer || WebAppkind = webAppHyperVContainer",
"visibleRule": "WebAppKind = webAppContainer || WebAppkind = functionAppContainer || WebAppKind = webAppHyperVContainer",
"helpMarkDown": "ms-resource:loc.input.help.DockerRepository"
},
{
Expand All @@ -188,7 +188,7 @@
"label": "ms-resource:loc.input.label.DockerImageTag",
"defaultValue": "",
"required": false,
"visibleRule": "WebAppKind = webAppContainer || WebAppkind = functionAppContainer || WebAppkind = webAppHyperVContainer",
"visibleRule": "WebAppKind = webAppContainer || WebAppkind = functionAppContainer || WebAppKind = webAppHyperVContainer",
"helpMarkDown": "ms-resource:loc.input.help.DockerImageTag"
},
{
Expand All @@ -197,7 +197,7 @@
"label": "ms-resource:loc.input.label.VirtualApplication",
"defaultValue": "",
"required": false,
"visibleRule": "WebAppKind != webAppLinux && WebAppKind != webAppContainer && WebAppkind != functionAppContainer && WebAppKind != functionApp && webAppKind != functionAppLinux && WebAppKind != \"\"",
"visibleRule": "WebAppKind != webAppLinux && WebAppKind != webAppContainer && WebAppKind != webAppHyperVContainer && WebAppkind != functionAppContainer && WebAppKind != functionApp && webAppKind != functionAppLinux && WebAppKind != \"\"",
"helpMarkDown": "ms-resource:loc.input.help.VirtualApplication"
},
{
Expand Down Expand Up @@ -255,7 +255,7 @@
"label": "ms-resource:loc.input.label.StartupCommand",
"defaultValue": "",
"required": false,
"visibleRule": "WebAppKind = webAppLinux || WebAppKind = webAppContainer || WebAppkind = functionAppContainer || WebAppKind = functionAppLinux || WebAppkind = webAppHyperVContainer",
"visibleRule": "WebAppKind = webAppLinux || WebAppKind = webAppContainer || WebAppkind = functionAppContainer || WebAppKind = functionAppLinux || WebAppKind = webAppHyperVContainer",
"helpMarkDown": "ms-resource:loc.input.help.StartupCommand"
},
{
Expand Down Expand Up @@ -654,4 +654,4 @@
"RunFromZipPreventsFileInUseError": "ms-resource:loc.messages.RunFromZipPreventsFileInUseError",
"MSDeployNotSupportTokenAuth": "ms-resource:loc.messages.MSDeployNotSupportTokenAuth"
}
}
}
4 changes: 2 additions & 2 deletions _generated/AzureRmWebAppDeploymentV4.versionmap.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Default|4.231.0
Node16-225|4.231.1
Default|4.232.0
Node16-225|4.232.1
22 changes: 11 additions & 11 deletions _generated/AzureRmWebAppDeploymentV4/task.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"author": "Microsoft Corporation",
"version": {
"Major": 4,
"Minor": 231,
"Minor": 232,
"Patch": 0
},
"releaseNotes": "What's new in version 4.*<br />Supports Zip Deploy, Run From Package, War Deploy [Details here](https://aka.ms/appServiceDeploymentMethods)<br />Supports App Service Environments<br />Improved UI for discovering different App service types supported by the task<br/>Run From Package is the preferred deployment method, which makes files in wwwroot folder read-only<br/>Click [here](https://aka.ms/azurermwebdeployreadme) for more information.",
Expand All @@ -27,19 +27,19 @@
"name": "FileTransformsAndVariableSubstitution",
"displayName": "File Transforms & Variable Substitution Options",
"isExpanded": false,
"visibleRule": "WebAppKind != webAppContainer && WebAppkind != functionAppContainer && WebAppKind != webAppLinux && webAppKind != functionAppLinux && Package NotEndsWith .war"
"visibleRule": "WebAppKind != webAppContainer && WebAppKind != webAppHyperVContainer && WebAppkind != functionAppContainer && WebAppKind != webAppLinux && webAppKind != functionAppLinux && Package NotEndsWith .war"
},
{
"name": "AdditionalDeploymentOptions",
"displayName": "Additional Deployment Options",
"isExpanded": false,
"visibleRule": "ConnectionType = AzureRM && WebAppKind != webAppLinux && WebAppKind != webAppContainer && WebAppkind != functionAppContainer && webAppKind != functionAppLinux && WebAppKind != \"\" && Package NotEndsWith .war && Package NotEndsWith .jar"
"visibleRule": "ConnectionType = AzureRM && WebAppKind != webAppLinux && WebAppKind != webAppContainer && WebAppKind != webAppHyperVContainer && WebAppkind != functionAppContainer && webAppKind != functionAppLinux && WebAppKind != \"\" && Package NotEndsWith .war && Package NotEndsWith .jar"
},
{
"name": "PostDeploymentAction",
"displayName": "Post Deployment Action",
"isExpanded": false,
"visibleRule": "ConnectionType = AzureRM && WebAppKind != \"\" && WebAppKind != webAppContainer && WebAppkind != functionAppContainer"
"visibleRule": "ConnectionType = AzureRM && WebAppKind != \"\" && WebAppKind != webAppContainer && WebAppKind != webAppHyperVContainer && WebAppkind != functionAppContainer"
},
{
"name": "ApplicationAndConfigurationSettings",
Expand Down Expand Up @@ -170,7 +170,7 @@
"label": "Registry or Namespace",
"defaultValue": "",
"required": true,
"visibleRule": "WebAppKind = webAppContainer || WebAppkind = functionAppContainer || WebAppkind = webAppHyperVContainer",
"visibleRule": "WebAppKind = webAppContainer || WebAppkind = functionAppContainer || WebAppKind = webAppHyperVContainer",
"helpMarkDown": "A globally unique top-level domain name for your specific registry or namespace.<br/> Note: Fully qualified image name will be of the format: '<b>`<registry or namespace`></b>/`<repository`>:`<tag`>'. For example, '<b>myregistry.azurecr.io</b>/nginx:latest'."
},
{
Expand All @@ -179,7 +179,7 @@
"label": "Image",
"defaultValue": "",
"required": true,
"visibleRule": "WebAppKind = webAppContainer || WebAppkind = functionAppContainer || WebAppkind = webAppHyperVContainer",
"visibleRule": "WebAppKind = webAppContainer || WebAppkind = functionAppContainer || WebAppKind = webAppHyperVContainer",
"helpMarkDown": "Name of the repository where the container images are stored.<br/> Note: Fully qualified image name will be of the format: '`<registry or namespace`>/<b>`<repository`></b>:`<tag`>'. For example, 'myregistry.azurecr.io/<b>nginx</b>:latest'."
},
{
Expand All @@ -188,7 +188,7 @@
"label": "Tag",
"defaultValue": "",
"required": false,
"visibleRule": "WebAppKind = webAppContainer || WebAppkind = functionAppContainer || WebAppkind = webAppHyperVContainer",
"visibleRule": "WebAppKind = webAppContainer || WebAppkind = functionAppContainer || WebAppKind = webAppHyperVContainer",
"helpMarkDown": "Tags are optional, it is the mechanism that registries use to give Docker images a version.<br/> Note: Fully qualified image name will be of the format: '`<registry or namespace`>/`<repository`>:<b>`<tag`></b>'. For example, 'myregistry.azurecr.io/nginx:<b>latest</b>'."
},
{
Expand All @@ -197,7 +197,7 @@
"label": "Virtual application",
"defaultValue": "",
"required": false,
"visibleRule": "WebAppKind != webAppLinux && WebAppKind != webAppContainer && WebAppkind != functionAppContainer && WebAppKind != functionApp && webAppKind != functionAppLinux && WebAppKind != \"\"",
"visibleRule": "WebAppKind != webAppLinux && WebAppKind != webAppContainer && WebAppKind != webAppHyperVContainer && WebAppkind != functionAppContainer && WebAppKind != functionApp && webAppKind != functionAppLinux && 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."
},
{
Expand Down Expand Up @@ -255,7 +255,7 @@
"label": "Startup command ",
"defaultValue": "",
"required": false,
"visibleRule": "WebAppKind = webAppLinux || WebAppKind = webAppContainer || WebAppkind = functionAppContainer || WebAppKind = functionAppLinux || WebAppkind = webAppHyperVContainer",
"visibleRule": "WebAppKind = webAppLinux || WebAppKind = webAppContainer || WebAppkind = functionAppContainer || WebAppKind = functionAppLinux || WebAppKind = webAppHyperVContainer",
"helpMarkDown": "Enter the start up command. For ex.<br/>dotnet exec filename.dll<br/>dotnet filename.dll"
},
{
Expand Down Expand Up @@ -655,7 +655,7 @@
"MSDeployNotSupportTokenAuth": "App Service is configured to not use basic authentication. This requires Web Deploy msdeploy.exe version 7.1.7225 or higher. You need a version of Visual Studio that includes an updated version of msdeploy.exe. For more information, visit https://aka.ms/azdo-webapp-msdeploy ."
},
"_buildConfigMapping": {
"Default": "4.231.0",
"Node16-225": "4.231.1"
"Default": "4.232.0",
"Node16-225": "4.232.1"
}
}
Loading

0 comments on commit ce16712

Please sign in to comment.