From 001347ad18d97a1e6dc49df9832304197090450c Mon Sep 17 00:00:00 2001
From: v-nagarajku <96724708+v-nagarajku@users.noreply.github.com>
Date: Mon, 26 Jun 2023 14:16:10 +0530
Subject: [PATCH] Clone to PR18229 - AzureFunctionApp@2: Better alias for
 Service Connection (#18522)

* Clone toAzureFunctionApp@2: Better alias for Service Connection

* Make.json changes
---
 .../Strings/resources.resjson/en-US/resources.resjson |  2 +-
 Tasks/AzureFunctionAppV2/make.json                    |  3 ++-
 Tasks/AzureFunctionAppV2/task.json                    | 11 +++++++----
 Tasks/AzureFunctionAppV2/task.loc.json                |  7 +++++--
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/Tasks/AzureFunctionAppV2/Strings/resources.resjson/en-US/resources.resjson b/Tasks/AzureFunctionAppV2/Strings/resources.resjson/en-US/resources.resjson
index f3c5aff8fbaa..29974d00a5a1 100644
--- a/Tasks/AzureFunctionAppV2/Strings/resources.resjson/en-US/resources.resjson
+++ b/Tasks/AzureFunctionAppV2/Strings/resources.resjson/en-US/resources.resjson
@@ -6,7 +6,7 @@
   "loc.releaseNotes": "What's new in version 2.* <br /> Removed WAR Deploy Support, setting Web.Config options, and the option for the Startup command for Linux Azure Function Apps.",
   "loc.group.displayName.AdditionalDeploymentOptions": "Additional Deployment Options",
   "loc.group.displayName.ApplicationAndConfigurationSettings": "Application and Configuration Settings",
-  "loc.input.label.azureSubscription": "Azure subscription",
+  "loc.input.label.azureSubscription": "Azure Resource Manager connection",
   "loc.input.help.azureSubscription": "Select the Azure Resource Manager subscription for the deployment.",
   "loc.input.label.appType": "App type",
   "loc.input.help.appType": "Select the Azure Function App type for the deployment.",
diff --git a/Tasks/AzureFunctionAppV2/make.json b/Tasks/AzureFunctionAppV2/make.json
index 8733fe153102..96b4d3cd2b84 100644
--- a/Tasks/AzureFunctionAppV2/make.json
+++ b/Tasks/AzureFunctionAppV2/make.json
@@ -2,7 +2,8 @@
     "rm": [
         {
             "items": [
-                "node_modules/azure-pipelines-tasks-azure-arm-rest-v2/node_modules/azure-pipelines-task-lib"
+                "node_modules/azure-pipelines-tasks-azure-arm-rest-v2/node_modules/azure-pipelines-task-lib",
+                "node_modules/azure-pipelines-tasks-webdeployment-common/node_modules/azure-pipelines-task-lib"
             ],
             "options": "-Rf"
         }
diff --git a/Tasks/AzureFunctionAppV2/task.json b/Tasks/AzureFunctionAppV2/task.json
index 57ea9ba114e7..afa64dcc4c11 100644
--- a/Tasks/AzureFunctionAppV2/task.json
+++ b/Tasks/AzureFunctionAppV2/task.json
@@ -17,8 +17,8 @@
     "author": "Microsoft Corporation",
     "version": {
         "Major": 2,
-        "Minor": 223,
-        "Patch": 1
+        "Minor": 224,
+        "Patch": 0
     },
     "releaseNotes": "What's new in version 2.* <br /> Removed WAR Deploy Support, setting Web.Config options, and the option for the Startup command for Linux Azure Function Apps.",
     "minimumAgentVersion": "2.104.1",
@@ -38,8 +38,11 @@
     "inputs": [
         {
             "name": "azureSubscription",
+            "aliases": [
+                "connectedServiceNameARM"
+            ],
             "type": "connectedService:AzureRM",
-            "label": "Azure subscription",
+            "label": "Azure Resource Manager connection",
             "defaultValue": "",
             "required": true,
             "helpMarkDown": "Select the Azure Resource Manager subscription for the deployment."
@@ -359,4 +362,4 @@
         "UpdatedRunFromPackageSettings": "Updated WEBSITE_RUN_FROM_PACKAGE Application setting to %s",
         "DeploymentTypeNotSupportedForLinuxConsumption": "The Deployment Type option does not apply for Linux Consumption."
     }
-}
+}
\ No newline at end of file
diff --git a/Tasks/AzureFunctionAppV2/task.loc.json b/Tasks/AzureFunctionAppV2/task.loc.json
index 9cca893b619d..3e5f00d972de 100644
--- a/Tasks/AzureFunctionAppV2/task.loc.json
+++ b/Tasks/AzureFunctionAppV2/task.loc.json
@@ -17,8 +17,8 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 2,
-    "Minor": 223,
-    "Patch": 1
+    "Minor": 224,
+    "Patch": 0
   },
   "releaseNotes": "ms-resource:loc.releaseNotes",
   "minimumAgentVersion": "2.104.1",
@@ -38,6 +38,9 @@
   "inputs": [
     {
       "name": "azureSubscription",
+      "aliases": [
+        "connectedServiceNameARM"
+      ],
       "type": "connectedService:AzureRM",
       "label": "ms-resource:loc.input.label.azureSubscription",
       "defaultValue": "",