From 9a9a45293f82166efb08a4a798eda2cee87e7dae Mon Sep 17 00:00:00 2001 From: vinca Date: Mon, 23 Apr 2018 14:14:12 +0530 Subject: [PATCH 1/6] resolved merge conflicts --- Tasks/AzureAppServiceManage/operations/KuduServiceUtils.ts | 6 +++--- Tasks/AzureAppServiceManage/task.json | 2 +- Tasks/AzureAppServiceManage/task.loc.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Tasks/AzureAppServiceManage/operations/KuduServiceUtils.ts b/Tasks/AzureAppServiceManage/operations/KuduServiceUtils.ts index fa8e41cd57aa..0e6f7170f555 100644 --- a/Tasks/AzureAppServiceManage/operations/KuduServiceUtils.ts +++ b/Tasks/AzureAppServiceManage/operations/KuduServiceUtils.ts @@ -52,8 +52,8 @@ export class KuduServiceUtils { for(var extensionID of extensionList) { var siteExtensionDetails = null; - if(siteExtensionMap[extensionID]) { - siteExtensionDetails = siteExtensionMap[extensionID]; + if(siteExtensionMap[extensionID] || (extensionID.startsWith('python') && siteExtensionMap["azureappservice-" + extensionID])) { + siteExtensionDetails = siteExtensionMap[extensionID] || siteExtensionMap["azureappservice-" + extensionID]; console.log(tl.loc('ExtensionAlreadyInstalled', extensionID)); } else { @@ -123,7 +123,7 @@ export class KuduServiceUtils { } private _getExtensionLocalPath(extensionInfo: JSON): string { - var extensionId: string = extensionInfo['id']; + var extensionId: string = extensionInfo['id'].replace("azureappservice-", ""); var homeDir = "D:\\home\\"; if(extensionId.startsWith('python2')) { diff --git a/Tasks/AzureAppServiceManage/task.json b/Tasks/AzureAppServiceManage/task.json index 59bc10c2e047..c9adec7eeb90 100644 --- a/Tasks/AzureAppServiceManage/task.json +++ b/Tasks/AzureAppServiceManage/task.json @@ -17,7 +17,7 @@ "version": { "Major": 0, "Minor": 2, - "Patch": 25 + "Patch": 28 }, "minimumAgentVersion": "1.102.0", "instanceNameFormat": "$(Action): $(WebAppName)", diff --git a/Tasks/AzureAppServiceManage/task.loc.json b/Tasks/AzureAppServiceManage/task.loc.json index 3190fec9970b..6f7e7b47c649 100644 --- a/Tasks/AzureAppServiceManage/task.loc.json +++ b/Tasks/AzureAppServiceManage/task.loc.json @@ -17,7 +17,7 @@ "version": { "Major": 0, "Minor": 2, - "Patch": 25 + "Patch": 28 }, "minimumAgentVersion": "1.102.0", "instanceNameFormat": "ms-resource:loc.instanceNameFormat", From 78065478eb072ebdae23f51b5d851edd151f08bb Mon Sep 17 00:00:00 2001 From: vinca Date: Mon, 23 Apr 2018 14:17:56 +0530 Subject: [PATCH 2/6] make string const --- .../AzureAppServiceManage/operations/KuduServiceUtils.ts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Tasks/AzureAppServiceManage/operations/KuduServiceUtils.ts b/Tasks/AzureAppServiceManage/operations/KuduServiceUtils.ts index 0e6f7170f555..a97e51d6449f 100644 --- a/Tasks/AzureAppServiceManage/operations/KuduServiceUtils.ts +++ b/Tasks/AzureAppServiceManage/operations/KuduServiceUtils.ts @@ -2,10 +2,11 @@ import tl = require('vsts-task-lib/task'); import Q = require('q'); import { Kudu } from 'azure-arm-rest/azure-arm-app-service-kudu'; import webClient = require('azure-arm-rest/webClient'); +const pythonExtensionPrefix: string = "azureappservice-"; export class KuduServiceUtils { private _appServiceKuduService: Kudu; - + constructor(kuduService: Kudu) { this._appServiceKuduService = kuduService; } @@ -52,8 +53,8 @@ export class KuduServiceUtils { for(var extensionID of extensionList) { var siteExtensionDetails = null; - if(siteExtensionMap[extensionID] || (extensionID.startsWith('python') && siteExtensionMap["azureappservice-" + extensionID])) { - siteExtensionDetails = siteExtensionMap[extensionID] || siteExtensionMap["azureappservice-" + extensionID]; + if(siteExtensionMap[extensionID] || (extensionID.startsWith('python') && siteExtensionMap[pythonExtensionPrefix + extensionID])) { + siteExtensionDetails = siteExtensionMap[extensionID] || siteExtensionMap[pythonExtensionPrefix + extensionID]; console.log(tl.loc('ExtensionAlreadyInstalled', extensionID)); } else { @@ -123,7 +124,7 @@ export class KuduServiceUtils { } private _getExtensionLocalPath(extensionInfo: JSON): string { - var extensionId: string = extensionInfo['id'].replace("azureappservice-", ""); + var extensionId: string = extensionInfo['id'].replace(pythonExtensionPrefix, ""); var homeDir = "D:\\home\\"; if(extensionId.startsWith('python2')) { From 1225b00565f182194e10276e8a616530184b8d8a Mon Sep 17 00:00:00 2001 From: vinca Date: Mon, 23 Apr 2018 14:18:40 +0530 Subject: [PATCH 3/6] removed space --- Tasks/AzureAppServiceManage/operations/KuduServiceUtils.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/Tasks/AzureAppServiceManage/operations/KuduServiceUtils.ts b/Tasks/AzureAppServiceManage/operations/KuduServiceUtils.ts index a97e51d6449f..ae8d190d4d2e 100644 --- a/Tasks/AzureAppServiceManage/operations/KuduServiceUtils.ts +++ b/Tasks/AzureAppServiceManage/operations/KuduServiceUtils.ts @@ -6,7 +6,6 @@ const pythonExtensionPrefix: string = "azureappservice-"; export class KuduServiceUtils { private _appServiceKuduService: Kudu; - constructor(kuduService: Kudu) { this._appServiceKuduService = kuduService; } From 262ad6061a488594be40cb66b5037ec0c87f1d1a Mon Sep 17 00:00:00 2001 From: vinca Date: Mon, 23 Apr 2018 14:19:32 +0530 Subject: [PATCH 4/6] removed space --- Tasks/AzureAppServiceManage/operations/KuduServiceUtils.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/Tasks/AzureAppServiceManage/operations/KuduServiceUtils.ts b/Tasks/AzureAppServiceManage/operations/KuduServiceUtils.ts index ae8d190d4d2e..dda6d178cf52 100644 --- a/Tasks/AzureAppServiceManage/operations/KuduServiceUtils.ts +++ b/Tasks/AzureAppServiceManage/operations/KuduServiceUtils.ts @@ -6,6 +6,7 @@ const pythonExtensionPrefix: string = "azureappservice-"; export class KuduServiceUtils { private _appServiceKuduService: Kudu; + constructor(kuduService: Kudu) { this._appServiceKuduService = kuduService; } From 32ed012983e3d2efb65514ac489f3cb5d7fabaee Mon Sep 17 00:00:00 2001 From: vinca Date: Mon, 23 Apr 2018 14:33:10 +0530 Subject: [PATCH 5/6] added comment to track --- Tasks/AzureAppServiceManage/operations/KuduServiceUtils.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Tasks/AzureAppServiceManage/operations/KuduServiceUtils.ts b/Tasks/AzureAppServiceManage/operations/KuduServiceUtils.ts index dda6d178cf52..3889b8ad4816 100644 --- a/Tasks/AzureAppServiceManage/operations/KuduServiceUtils.ts +++ b/Tasks/AzureAppServiceManage/operations/KuduServiceUtils.ts @@ -53,6 +53,8 @@ export class KuduServiceUtils { for(var extensionID of extensionList) { var siteExtensionDetails = null; + + // Python extensions are moved to Nuget and the extensions IDs are changed. The belo check ensures that old extensions are mapped to new extension ID. if(siteExtensionMap[extensionID] || (extensionID.startsWith('python') && siteExtensionMap[pythonExtensionPrefix + extensionID])) { siteExtensionDetails = siteExtensionMap[extensionID] || siteExtensionMap[pythonExtensionPrefix + extensionID]; console.log(tl.loc('ExtensionAlreadyInstalled', extensionID)); From 6cff5c5aea8606fefea614ccbedd78b0a4936bb9 Mon Sep 17 00:00:00 2001 From: vinca Date: Mon, 23 Apr 2018 15:47:35 +0530 Subject: [PATCH 6/6] changed task version --- Tasks/AzureAppServiceManage/task.json | 2 +- Tasks/AzureAppServiceManage/task.loc.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Tasks/AzureAppServiceManage/task.json b/Tasks/AzureAppServiceManage/task.json index c9adec7eeb90..f8290b3ceaa2 100644 --- a/Tasks/AzureAppServiceManage/task.json +++ b/Tasks/AzureAppServiceManage/task.json @@ -17,7 +17,7 @@ "version": { "Major": 0, "Minor": 2, - "Patch": 28 + "Patch": 27 }, "minimumAgentVersion": "1.102.0", "instanceNameFormat": "$(Action): $(WebAppName)", diff --git a/Tasks/AzureAppServiceManage/task.loc.json b/Tasks/AzureAppServiceManage/task.loc.json index 6f7e7b47c649..5ec798d5d030 100644 --- a/Tasks/AzureAppServiceManage/task.loc.json +++ b/Tasks/AzureAppServiceManage/task.loc.json @@ -17,7 +17,7 @@ "version": { "Major": 0, "Minor": 2, - "Patch": 28 + "Patch": 27 }, "minimumAgentVersion": "1.102.0", "instanceNameFormat": "ms-resource:loc.instanceNameFormat",