Resolve Merge conflicts (#8275)

Author: vincent1173

Tasks/AzureRmWebAppDeploymentV3/task.json

@@ -17,7 +17,7 @@
     "version": {
         "Major": 3,
         "Minor": 4,
-        "Patch": 6
+        "Patch": 7
     },
     "releaseNotes": "What's new in Version 3.0: <br/>&nbsp;&nbsp;Supports File Transformations (XDT) <br/>&nbsp;&nbsp;Supports Variable Substitutions(XML, JSON) <br/>Click [here](https://aka.ms/azurermwebdeployreadme) for more information.",
     "minimumAgentVersion": "2.104.1",
@@ -299,22 +299,8 @@
             "label": "Runtime Stack",
             "defaultValue": "",
             "required": true,
-            "options": {
-                "node|4.4": "Node.js 4.4",
-                "node|4.5": "Node.js 4.5",
-                "node|6.2": "Node.js 6.2",
-                "node|6.6": "Node.js 6.6",
-                "node|6.9": "Node.js 6.9",
-                "node|6.10": "Node.js 6.10",
-                "node|6.11": "Node.js 6.11",
-                "node|8.0": "Node.js 8.0",
-                "node|8.1": "Node.js 8.1",
-                "php|5.6": "PHP 5.6",
-                "php|7.0": "PHP 7.0",
-                "dotnetcore|1.0": ".NET Core 1.0",
-                "dotnetcore|1.1": ".NET Core 1.1",
-                "dotnetcore|2.0": ".NET Core 2.0",
-                "ruby|2.3": "Ruby 2.3"
+            "properties": {
+                "EditableOptions": "True"
             },
             "helpMarkDown": "Select the framework and version.",
             "visibleRule": "WebAppKind != app && WebAppKind != functionapp && WebAppKind != api && WebAppKind != mobileapp && ImageSource = Builtin"
@@ -610,6 +596,15 @@
             "endpointUrl": "{{endpoint.url}}v2/$(PrivateRegistryImage)/tags/list",
             "resultSelector": "jsonpath:$.tags[*]",
             "authorizationHeader": "Basic {{ #base64 endpoint.username \":\" endpoint.password }}"
+        },
+        {
+            "target": "RuntimeStack",
+            "endpointId": "$(ConnectedServiceName)",
+            "dataSourceName": "AzureRMWebAppRuntimeStacksByOsType",
+            "parameters": {
+                "osTypeSelected": "Linux"
+            },
+            "resultTemplate": "{\"Value\":\"{{{ runtimeVersion }}}\",\"DisplayValue\":\"{{{ displayVersion }}}\"}"
         }
     ],
     "instanceNameFormat": "Azure App Service Deploy: $(WebAppName)",

Tasks/AzureRmWebAppDeploymentV3/task.loc.json

@@ -17,7 +17,7 @@
   "version": {
     "Major": 3,
     "Minor": 4,
-    "Patch": 6
+    "Patch": 7
   },
   "releaseNotes": "ms-resource:loc.releaseNotes",
   "minimumAgentVersion": "2.104.1",
@@ -307,22 +307,8 @@
       "label": "ms-resource:loc.input.label.RuntimeStack",
       "defaultValue": "",
       "required": true,
-      "options": {
-        "node|4.4": "Node.js 4.4",
-        "node|4.5": "Node.js 4.5",
-        "node|6.2": "Node.js 6.2",
-        "node|6.6": "Node.js 6.6",
-        "node|6.9": "Node.js 6.9",
-        "node|6.10": "Node.js 6.10",
-        "node|6.11": "Node.js 6.11",
-        "node|8.0": "Node.js 8.0",
-        "node|8.1": "Node.js 8.1",
-        "php|5.6": "PHP 5.6",
-        "php|7.0": "PHP 7.0",
-        "dotnetcore|1.0": ".NET Core 1.0",
-        "dotnetcore|1.1": ".NET Core 1.1",
-        "dotnetcore|2.0": ".NET Core 2.0",
-        "ruby|2.3": "Ruby 2.3"
+      "properties": {
+        "EditableOptions": "True"
       },
       "helpMarkDown": "ms-resource:loc.input.help.RuntimeStack",
       "visibleRule": "WebAppKind != app && WebAppKind != functionapp && WebAppKind != api && WebAppKind != mobileapp && ImageSource = Builtin"
@@ -622,6 +608,15 @@
       "endpointUrl": "{{endpoint.url}}v2/$(PrivateRegistryImage)/tags/list",
       "resultSelector": "jsonpath:$.tags[*]",
       "authorizationHeader": "Basic {{ #base64 endpoint.username \":\" endpoint.password }}"
+    },
+    {
+      "target": "RuntimeStack",
+      "endpointId": "$(ConnectedServiceName)",
+      "dataSourceName": "AzureRMWebAppRuntimeStacksByOsType",
+      "parameters": {
+        "osTypeSelected": "Linux"
+      },
+      "resultTemplate": "{\"Value\":\"{{{ runtimeVersion }}}\",\"DisplayValue\":\"{{{ displayVersion }}}\"}"
     }
   ],
   "instanceNameFormat": "ms-resource:loc.instanceNameFormat",