Update list of runtimes with new values (#20793)

* Add sources with modern list of runtimes * Bump version for AzureRMWebAppDeploymentV5 * Remove redundant source * Bump version of azure-arm-rest * Include AzureRmWebAppDeploymentV4 * Bump azure-arm-rest version to fix the tests * Revert "Bump azure-arm-rest version to fix the tests" This reverts commit 4369ea9. * Revert "Include AzureRmWebAppDeploymentV4" This reverts commit 91fa7ad.
microsoft · Jan 29, 2025 · 32b9a32 · 32b9a32
1 parent 79560da
commit 32b9a32
Show file tree

Hide file tree

Showing 19 changed files with 574 additions and 188 deletions.
diff --git a/Tasks/AzureRmWebAppDeploymentV5/package-lock.json b/Tasks/AzureRmWebAppDeploymentV5/package-lock.json
diff --git a/Tasks/AzureRmWebAppDeploymentV5/package.json b/Tasks/AzureRmWebAppDeploymentV5/package.json
@@ -22,7 +22,7 @@
     "@types/q": "1.0.7",
     "agent-base": "^6.0.2",
     "azure-pipelines-task-lib": "4.11.0",
-    "azure-pipelines-tasks-azure-arm-rest": "^3.251.0",
+    "azure-pipelines-tasks-azure-arm-rest": "^3.252.0",
     "azure-pipelines-tasks-webdeployment-common": "4.243.1",
     "moment": "^2.29.4",
     "q": "1.4.1",

diff --git a/Tasks/AzureRmWebAppDeploymentV5/task.json b/Tasks/AzureRmWebAppDeploymentV5/task.json
@@ -18,7 +18,7 @@
   "version": {
     "Major": 5,
     "Minor": 252,
-    "Patch": 0
+    "Patch": 4
   },
   "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",
@@ -227,6 +227,45 @@
       "properties": {
         "EditableOptions": "True"
       },
+      "options": {
+        "DOTNETCORE:9.0": ".NET 9.0",
+        "DOTNETCORE:8.0": ".NET 8.0",
+        "DOTNETCORE:7.0": ".NET 7.0",
+        "DOTNETCORE:6.0": ".NET 6.0",
+        "NODE:20-lts": "Node 20 LTS",
+        "NODE:18-lts": "Node 18 LTS",
+        "NODE:16-lts": "Node 16 LTS",
+        "PYTHON:3.12": "Python 3.12",
+        "PYTHON:3.11": "Python 3.11",
+        "PYTHON:3.10": "Python 3.10",
+        "PYTHON:3.9": "Python 3.9",
+        "PYTHON:3.8": "Python 3.8",
+        "PHP:8.3": "PHP 8.3",
+        "PHP:8.2": "PHP 8.2",
+        "PHP:8.1": "PHP 8.1",
+        "PHP:8.0": "PHP 8.0",
+        "JAVA:21-java21": "Java 21",
+        "JAVA:17-java17": "Java 17",
+        "JAVA:11-java11": "Java 11",
+        "JAVA:8-jre8": "Java 8",
+        "JBOSSEAP:8-java17": "JBoss EAP 8 (Java 17)",
+        "JBOSSEAP:8-java11": "JBoss EAP 8 (Java 11)",
+        "JBOSSEAP:7-java17": "JBoss EAP 7 (Java 17)",
+        "JBOSSEAP:7-java11": "JBoss EAP 7 (Java 11)",
+        "JBOSSEAP:7-java8": "JBoss EAP 7 (Java 8)",
+        "TOMCAT:10.1-java21": "Tomcat 10.1 (Java 21)",
+        "TOMCAT:10.1-java17": "Tomcat 10.1 (Java 17)",
+        "TOMCAT:10.1-java11": "Tomcat 10.1 (Java 11)",
+        "TOMCAT:10.0-java17": "Tomcat 10.0 (Java 17)",
+        "TOMCAT:10.0-java11": "Tomcat 10.0 (Java 11)",
+        "TOMCAT:10.0-jre8": "Tomcat 10.0 (Java 8)",
+        "TOMCAT:9.0-java21": "Tomcat 9.0 (Java 21)",
+        "TOMCAT:9.0-java17": "Tomcat 9.0 (Java 17)",
+        "TOMCAT:9.0-java11": "Tomcat 9.0 (Java 11)",
+        "TOMCAT:9.0-jre8": "Tomcat 9.0 (Java 8)",
+        "TOMCAT:8.5-java11": "Tomcat 8.5 (Java 11)",
+        "TOMCAT:8.5-jre8": "Tomcat 8.5 (Java 8)"
+      },
       "helpMarkDown": "Select the framework and version.",
       "visibleRule": "WebAppKind = webAppLinux"
     },
@@ -511,15 +550,6 @@
         "ResourceGroupName": "$(ResourceGroupName)"
       },
       "resultTemplate": "{\"Value\":\"{{{ #extractResource slots}}}\",\"DisplayValue\":\"{{{ #extractResource slots}}}\"}"
-    },
-    {
-      "target": "RuntimeStack",
-      "endpointId": "$(ConnectedServiceName)",
-      "dataSourceName": "AzureRMWebAppRuntimeStacksByOsType",
-      "parameters": {
-        "osTypeSelected": "Linux"
-      },
-      "resultTemplate": "{\"Value\":\"{{{ runtimeVersion }}}\",\"DisplayValue\":\"{{{ displayVersion }}} ({{{ runtimeVersion }}})\"}"
     }
   ],
   "instanceNameFormat": "Azure App Service Deploy: $(WebAppName)",

diff --git a/Tasks/AzureRmWebAppDeploymentV5/task.loc.json b/Tasks/AzureRmWebAppDeploymentV5/task.loc.json
@@ -18,7 +18,7 @@
   "version": {
     "Major": 5,
     "Minor": 252,
-    "Patch": 0
+    "Patch": 4
   },
   "releaseNotes": "ms-resource:loc.releaseNotes",
   "minimumAgentVersion": "2.104.1",
@@ -227,6 +227,45 @@
       "properties": {
         "EditableOptions": "True"
       },
+      "options": {
+        "DOTNETCORE:9.0": ".NET 9.0",
+        "DOTNETCORE:8.0": ".NET 8.0",
+        "DOTNETCORE:7.0": ".NET 7.0",
+        "DOTNETCORE:6.0": ".NET 6.0",
+        "NODE:20-lts": "Node 20 LTS",
+        "NODE:18-lts": "Node 18 LTS",
+        "NODE:16-lts": "Node 16 LTS",
+        "PYTHON:3.12": "Python 3.12",
+        "PYTHON:3.11": "Python 3.11",
+        "PYTHON:3.10": "Python 3.10",
+        "PYTHON:3.9": "Python 3.9",
+        "PYTHON:3.8": "Python 3.8",
+        "PHP:8.3": "PHP 8.3",
+        "PHP:8.2": "PHP 8.2",
+        "PHP:8.1": "PHP 8.1",
+        "PHP:8.0": "PHP 8.0",
+        "JAVA:21-java21": "Java 21",
+        "JAVA:17-java17": "Java 17",
+        "JAVA:11-java11": "Java 11",
+        "JAVA:8-jre8": "Java 8",
+        "JBOSSEAP:8-java17": "JBoss EAP 8 (Java 17)",
+        "JBOSSEAP:8-java11": "JBoss EAP 8 (Java 11)",
+        "JBOSSEAP:7-java17": "JBoss EAP 7 (Java 17)",
+        "JBOSSEAP:7-java11": "JBoss EAP 7 (Java 11)",
+        "JBOSSEAP:7-java8": "JBoss EAP 7 (Java 8)",
+        "TOMCAT:10.1-java21": "Tomcat 10.1 (Java 21)",
+        "TOMCAT:10.1-java17": "Tomcat 10.1 (Java 17)",
+        "TOMCAT:10.1-java11": "Tomcat 10.1 (Java 11)",
+        "TOMCAT:10.0-java17": "Tomcat 10.0 (Java 17)",
+        "TOMCAT:10.0-java11": "Tomcat 10.0 (Java 11)",
+        "TOMCAT:10.0-jre8": "Tomcat 10.0 (Java 8)",
+        "TOMCAT:9.0-java21": "Tomcat 9.0 (Java 21)",
+        "TOMCAT:9.0-java17": "Tomcat 9.0 (Java 17)",
+        "TOMCAT:9.0-java11": "Tomcat 9.0 (Java 11)",
+        "TOMCAT:9.0-jre8": "Tomcat 9.0 (Java 8)",
+        "TOMCAT:8.5-java11": "Tomcat 8.5 (Java 11)",
+        "TOMCAT:8.5-jre8": "Tomcat 8.5 (Java 8)"
+      },
       "helpMarkDown": "ms-resource:loc.input.help.RuntimeStack",
       "visibleRule": "WebAppKind = webAppLinux"
     },
@@ -511,15 +550,6 @@
         "ResourceGroupName": "$(ResourceGroupName)"
       },
       "resultTemplate": "{\"Value\":\"{{{ #extractResource slots}}}\",\"DisplayValue\":\"{{{ #extractResource slots}}}\"}"
-    },
-    {
-      "target": "RuntimeStack",
-      "endpointId": "$(ConnectedServiceName)",
-      "dataSourceName": "AzureRMWebAppRuntimeStacksByOsType",
-      "parameters": {
-        "osTypeSelected": "Linux"
-      },
-      "resultTemplate": "{\"Value\":\"{{{ runtimeVersion }}}\",\"DisplayValue\":\"{{{ displayVersion }}} ({{{ runtimeVersion }}})\"}"
     }
   ],
   "instanceNameFormat": "ms-resource:loc.instanceNameFormat",

diff --git a/Tasks/AzureWebAppV1/task.json b/Tasks/AzureWebAppV1/task.json
@@ -17,7 +17,7 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 1,
-    "Minor": 247,
+    "Minor": 252,
     "Patch": 0
   },
   "minimumAgentVersion": "2.209.0",
@@ -123,6 +123,45 @@
       "properties": {
         "EditableOptions": "True"
       },
+      "options": {
+        "DOTNETCORE:9.0": ".NET 9.0",
+        "DOTNETCORE:8.0": ".NET 8.0",
+        "DOTNETCORE:7.0": ".NET 7.0",
+        "DOTNETCORE:6.0": ".NET 6.0",
+        "NODE:20-lts": "Node 20 LTS",
+        "NODE:18-lts": "Node 18 LTS",
+        "NODE:16-lts": "Node 16 LTS",
+        "PYTHON:3.12": "Python 3.12",
+        "PYTHON:3.11": "Python 3.11",
+        "PYTHON:3.10": "Python 3.10",
+        "PYTHON:3.9": "Python 3.9",
+        "PYTHON:3.8": "Python 3.8",
+        "PHP:8.3": "PHP 8.3",
+        "PHP:8.2": "PHP 8.2",
+        "PHP:8.1": "PHP 8.1",
+        "PHP:8.0": "PHP 8.0",
+        "JAVA:21-java21": "Java 21",
+        "JAVA:17-java17": "Java 17",
+        "JAVA:11-java11": "Java 11",
+        "JAVA:8-jre8": "Java 8",
+        "JBOSSEAP:8-java17": "JBoss EAP 8 (Java 17)",
+        "JBOSSEAP:8-java11": "JBoss EAP 8 (Java 11)",
+        "JBOSSEAP:7-java17": "JBoss EAP 7 (Java 17)",
+        "JBOSSEAP:7-java11": "JBoss EAP 7 (Java 11)",
+        "JBOSSEAP:7-java8": "JBoss EAP 7 (Java 8)",
+        "TOMCAT:10.1-java21": "Tomcat 10.1 (Java 21)",
+        "TOMCAT:10.1-java17": "Tomcat 10.1 (Java 17)",
+        "TOMCAT:10.1-java11": "Tomcat 10.1 (Java 11)",
+        "TOMCAT:10.0-java17": "Tomcat 10.0 (Java 17)",
+        "TOMCAT:10.0-java11": "Tomcat 10.0 (Java 11)",
+        "TOMCAT:10.0-jre8": "Tomcat 10.0 (Java 8)",
+        "TOMCAT:9.0-java21": "Tomcat 9.0 (Java 21)",
+        "TOMCAT:9.0-java17": "Tomcat 9.0 (Java 17)",
+        "TOMCAT:9.0-java11": "Tomcat 9.0 (Java 11)",
+        "TOMCAT:9.0-jre8": "Tomcat 9.0 (Java 8)",
+        "TOMCAT:8.5-java11": "Tomcat 8.5 (Java 11)",
+        "TOMCAT:8.5-jre8": "Tomcat 8.5 (Java 8)"
+      },
       "visibleRule": "appType = webAppLinux"
     },
     {
@@ -218,15 +257,6 @@
         "ResourceGroupName": "$(resourceGroupName)"
       },
       "resultTemplate": "{\"Value\":\"{{{ #extractResource slots}}}\",\"DisplayValue\":\"{{{ #extractResource slots}}}\"}"
-    },
-    {
-      "target": "runtimeStack",
-      "endpointId": "$(azureSubscription)",
-      "dataSourceName": "AzureRMWebAppRuntimeStacksByOsType",
-      "parameters": {
-        "osTypeSelected": "Linux"
-      },
-      "resultTemplate": "{\"Value\":\"{{{ runtimeVersion }}}\",\"DisplayValue\":\"{{{ displayVersion }}} ({{{ runtimeVersion }}})\"}"
     }
   ],
   "instanceNameFormat": "Azure Web App Deploy: $(appName)",