From fee8fdb2d942be6fd982ec61a32b3b7dc85ead4d Mon Sep 17 00:00:00 2001 From: Philipson Joseph V Date: Wed, 2 Feb 2022 17:18:23 +0530 Subject: [PATCH] 1889379 DTS [Pipelines]: Possible bug in Task needs expert review. - TrackingID#2110270040005670 --- .../AzureAppServiceManageV0/package-lock.json | 6 +- Tasks/AzureAppServiceManageV0/package.json | 4 +- Tasks/AzureAppServiceManageV0/task.json | 2 +- Tasks/AzureAppServiceManageV0/task.loc.json | 2 +- .../azurermwebappdeployment.ts | 4 +- .../AzureRmWebAppDeploymentProvider.ts | 16 ++--- .../BuiltInLinuxWebAppDeploymentProvider.ts | 8 +-- .../ConsumptionWebAppDeploymentProvider.ts | 14 ++-- .../deploymentProvider/DeploymentFactory.ts | 2 +- .../WindowsWebAppRunFromZipProvider.ts | 12 ++-- .../WindowsWebAppWarDeployProvider.ts | 2 +- .../WindowsWebAppZipDeployProvider.ts | 10 +-- Tasks/AzureFunctionAppV1/package-lock.json | 72 ++++++++++--------- Tasks/AzureFunctionAppV1/package.json | 2 +- Tasks/AzureFunctionAppV1/task.json | 2 +- Tasks/AzureFunctionAppV1/task.loc.json | 2 +- Tasks/AzureFunctionAppV1/taskparameters.ts | 12 ++-- .../AzureWebAppV1/azurermwebappdeployment.ts | 4 +- .../AzureRmWebAppDeploymentProvider.ts | 20 +++--- .../BuiltInLinuxWebAppDeploymentProvider.ts | 10 +-- .../deploymentProvider/DeploymentFactory.ts | 4 +- .../WindowsWebAppRunFromZipProvider.ts | 12 ++-- .../WindowsWebAppWarDeployProvider.ts | 2 +- .../WindowsWebAppZipDeployProvider.ts | 10 +-- Tasks/AzureWebAppV1/package-lock.json | 20 +++--- Tasks/AzureWebAppV1/package.json | 2 +- Tasks/AzureWebAppV1/task.json | 2 +- Tasks/AzureWebAppV1/task.loc.json | 2 +- Tasks/AzureWebAppV1/taskparameters.ts | 14 ++-- 29 files changed, 140 insertions(+), 134 deletions(-) diff --git a/Tasks/AzureAppServiceManageV0/package-lock.json b/Tasks/AzureAppServiceManageV0/package-lock.json index 80f8b4327058..0c795e980f60 100644 --- a/Tasks/AzureAppServiceManageV0/package-lock.json +++ b/Tasks/AzureAppServiceManageV0/package-lock.json @@ -90,9 +90,9 @@ } }, "azure-pipelines-tasks-azure-arm-rest-v2": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-azure-arm-rest-v2/-/azure-pipelines-tasks-azure-arm-rest-v2-2.0.5.tgz", - "integrity": "sha512-XoYxfZH70PgvomnIUmnyvTReVWyne3wncMqG5Xv8XTDBZBwhpEXT2bJly4Q3zpQLDHib+cxQ61yXQ9d5/PyhNg==", + "version": "2.198.2", + "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-azure-arm-rest-v2/-/azure-pipelines-tasks-azure-arm-rest-v2-2.198.2.tgz", + "integrity": "sha512-MVdYYVzVhB7k6mv7PNxE81fhqDBMMrJ6ILZahyqUdRmQ7N4xHsooBSid/YqG9ir6j8ghsN5LB8blBwtaQtspCw==", "requires": { "@types/mocha": "^5.2.7", "@types/node": "^10.17.0", diff --git a/Tasks/AzureAppServiceManageV0/package.json b/Tasks/AzureAppServiceManageV0/package.json index 6e07ac765631..83af5aee95bc 100644 --- a/Tasks/AzureAppServiceManageV0/package.json +++ b/Tasks/AzureAppServiceManageV0/package.json @@ -20,9 +20,9 @@ "@types/mocha": "^5.2.7", "@types/node": "^10.17.0", "@types/q": "1.0.7", - "azure-pipelines-tasks-azure-arm-rest-v2": "^2.0.4", - "q": "1.4.1", + "azure-pipelines-tasks-azure-arm-rest-v2": "^2.198.2", "azure-pipelines-tasks-utility-common": "^3.0.3", + "q": "1.4.1", "xml2js": "0.4.13" }, "devDependencies": { diff --git a/Tasks/AzureAppServiceManageV0/task.json b/Tasks/AzureAppServiceManageV0/task.json index fb2a578ec3df..1898885b0676 100644 --- a/Tasks/AzureAppServiceManageV0/task.json +++ b/Tasks/AzureAppServiceManageV0/task.json @@ -18,7 +18,7 @@ "demands": [], "version": { "Major": 0, - "Minor": 198, + "Minor": 200, "Patch": 0 }, "minimumAgentVersion": "1.102.0", diff --git a/Tasks/AzureAppServiceManageV0/task.loc.json b/Tasks/AzureAppServiceManageV0/task.loc.json index a791c6cca673..84e1e0c404b3 100644 --- a/Tasks/AzureAppServiceManageV0/task.loc.json +++ b/Tasks/AzureAppServiceManageV0/task.loc.json @@ -18,7 +18,7 @@ "demands": [], "version": { "Major": 0, - "Minor": 198, + "Minor": 200, "Patch": 0 }, "minimumAgentVersion": "1.102.0", diff --git a/Tasks/AzureFunctionAppV1/azurermwebappdeployment.ts b/Tasks/AzureFunctionAppV1/azurermwebappdeployment.ts index 767c93e8c89d..4cab695ac4c0 100644 --- a/Tasks/AzureFunctionAppV1/azurermwebappdeployment.ts +++ b/Tasks/AzureFunctionAppV1/azurermwebappdeployment.ts @@ -2,14 +2,14 @@ import tl = require('azure-pipelines-task-lib/task'); import path = require('path'); import { TaskParameters, TaskParametersUtility } from './taskparameters'; import { DeploymentFactory } from './deploymentProvider/DeploymentFactory'; -import * as Endpoint from 'azure-pipelines-tasks-azurermdeploycommon/azure-arm-rest/azure-arm-endpoint'; +import * as Endpoint from 'azure-pipelines-tasks-azurermdeploycommon-v3/azure-arm-rest/azure-arm-endpoint'; async function main() { let isDeploymentSuccess: boolean = true; try { tl.setResourcePath(path.join( __dirname, 'task.json')); - tl.setResourcePath(path.join( __dirname, 'node_modules/azure-pipelines-tasks-azurermdeploycommon/module.json')); + tl.setResourcePath(path.join( __dirname, 'node_modules/azure-pipelines-tasks-azurermdeploycommon-v3/module.json')); var taskParams: TaskParameters = await TaskParametersUtility.getParameters(); var deploymentFactory: DeploymentFactory = new DeploymentFactory(taskParams); var deploymentProvider = await deploymentFactory.GetDeploymentProvider(); diff --git a/Tasks/AzureFunctionAppV1/deploymentProvider/AzureRmWebAppDeploymentProvider.ts b/Tasks/AzureFunctionAppV1/deploymentProvider/AzureRmWebAppDeploymentProvider.ts index ab9b6481863e..78bb7b364cda 100644 --- a/Tasks/AzureFunctionAppV1/deploymentProvider/AzureRmWebAppDeploymentProvider.ts +++ b/Tasks/AzureFunctionAppV1/deploymentProvider/AzureRmWebAppDeploymentProvider.ts @@ -1,14 +1,14 @@ import { IWebAppDeploymentProvider } from './IWebAppDeploymentProvider'; import { TaskParameters } from '../taskparameters'; -import { KuduServiceUtility } from 'azure-pipelines-tasks-azurermdeploycommon/operations/KuduServiceUtility'; -import { AzureAppService } from 'azure-pipelines-tasks-azurermdeploycommon/azure-arm-rest/azure-arm-app-service'; -import { Kudu } from 'azure-pipelines-tasks-azurermdeploycommon/azure-arm-rest/azure-arm-app-service-kudu'; -import { AzureAppServiceUtility } from 'azure-pipelines-tasks-azurermdeploycommon/operations/AzureAppServiceUtility'; +import { KuduServiceUtility } from 'azure-pipelines-tasks-azurermdeploycommon-v3/operations/KuduServiceUtility'; +import { AzureAppService } from 'azure-pipelines-tasks-azurermdeploycommon-v3/azure-arm-rest/azure-arm-app-service'; +import { Kudu } from 'azure-pipelines-tasks-azurermdeploycommon-v3/azure-arm-rest/azure-arm-app-service-kudu'; +import { AzureAppServiceUtility } from 'azure-pipelines-tasks-azurermdeploycommon-v3/operations/AzureAppServiceUtility'; import tl = require('azure-pipelines-task-lib/task'); -import * as ParameterParser from 'azure-pipelines-tasks-azurermdeploycommon/operations/ParameterParserUtility' -import { addReleaseAnnotation } from 'azure-pipelines-tasks-azurermdeploycommon/operations/ReleaseAnnotationUtility'; -import { PackageUtility } from 'azure-pipelines-tasks-azurermdeploycommon/webdeployment-common/packageUtility'; -import { AzureDeployPackageArtifactAlias } from 'azure-pipelines-tasks-azurermdeploycommon/Constants'; +import * as ParameterParser from 'azure-pipelines-tasks-azurermdeploycommon-v3/operations/ParameterParserUtility' +import { addReleaseAnnotation } from 'azure-pipelines-tasks-azurermdeploycommon-v3/operations/ReleaseAnnotationUtility'; +import { PackageUtility } from 'azure-pipelines-tasks-azurermdeploycommon-v3/webdeployment-common/packageUtility'; +import { AzureDeployPackageArtifactAlias } from 'azure-pipelines-tasks-azurermdeploycommon-v3/Constants'; export class AzureRmWebAppDeploymentProvider implements IWebAppDeploymentProvider { protected taskParams:TaskParameters; diff --git a/Tasks/AzureFunctionAppV1/deploymentProvider/BuiltInLinuxWebAppDeploymentProvider.ts b/Tasks/AzureFunctionAppV1/deploymentProvider/BuiltInLinuxWebAppDeploymentProvider.ts index 7058a4864af1..2b1da90b77ee 100644 --- a/Tasks/AzureFunctionAppV1/deploymentProvider/BuiltInLinuxWebAppDeploymentProvider.ts +++ b/Tasks/AzureFunctionAppV1/deploymentProvider/BuiltInLinuxWebAppDeploymentProvider.ts @@ -1,11 +1,11 @@ import { AzureRmWebAppDeploymentProvider } from './AzureRmWebAppDeploymentProvider'; import tl = require('azure-pipelines-task-lib/task'); -import { PackageType } from 'azure-pipelines-tasks-azurermdeploycommon/webdeployment-common/packageUtility'; +import { PackageType } from 'azure-pipelines-tasks-azurermdeploycommon-v3/webdeployment-common/packageUtility'; import path = require('path'); -import * as ParameterParser from 'azure-pipelines-tasks-azurermdeploycommon/operations/ParameterParserUtility' +import * as ParameterParser from 'azure-pipelines-tasks-azurermdeploycommon-v3/operations/ParameterParserUtility' -var webCommonUtility = require('azure-pipelines-tasks-azurermdeploycommon/webdeployment-common/utility.js'); -var zipUtility = require('azure-pipelines-tasks-azurermdeploycommon/webdeployment-common/ziputility.js'); +var webCommonUtility = require('azure-pipelines-tasks-azurermdeploycommon-v3/webdeployment-common/utility.js'); +var zipUtility = require('azure-pipelines-tasks-azurermdeploycommon-v3/webdeployment-common/ziputility.js'); const linuxFunctionStorageSetting: string = '-WEBSITES_ENABLE_APP_SERVICE_STORAGE true'; const linuxFunctionRuntimeSettingName: string = '-FUNCTIONS_WORKER_RUNTIME '; diff --git a/Tasks/AzureFunctionAppV1/deploymentProvider/ConsumptionWebAppDeploymentProvider.ts b/Tasks/AzureFunctionAppV1/deploymentProvider/ConsumptionWebAppDeploymentProvider.ts index 323cbefb17a3..8d9220d32816 100644 --- a/Tasks/AzureFunctionAppV1/deploymentProvider/ConsumptionWebAppDeploymentProvider.ts +++ b/Tasks/AzureFunctionAppV1/deploymentProvider/ConsumptionWebAppDeploymentProvider.ts @@ -1,14 +1,14 @@ import { AzureRmWebAppDeploymentProvider } from './AzureRmWebAppDeploymentProvider'; import tl = require('azure-pipelines-task-lib/task'); -import { AzureAppService } from 'azure-pipelines-tasks-azurermdeploycommon/azure-arm-rest/azure-arm-app-service'; -import { AzureAppServiceUtility } from 'azure-pipelines-tasks-azurermdeploycommon/operations/AzureAppServiceUtility'; -import { PackageType } from 'azure-pipelines-tasks-azurermdeploycommon/webdeployment-common/packageUtility'; -import { sleepFor } from 'azure-pipelines-tasks-azurermdeploycommon/azure-arm-rest/webClient'; +import { AzureAppService } from 'azure-pipelines-tasks-azurermdeploycommon-v3/azure-arm-rest/azure-arm-app-service'; +import { AzureAppServiceUtility } from 'azure-pipelines-tasks-azurermdeploycommon-v3/operations/AzureAppServiceUtility'; +import { PackageType } from 'azure-pipelines-tasks-azurermdeploycommon-v3/webdeployment-common/packageUtility'; +import { sleepFor } from 'azure-pipelines-tasks-azurermdeploycommon-v3/azure-arm-rest/webClient'; import Q = require('q'); -var webCommonUtility = require('azure-pipelines-tasks-azurermdeploycommon/webdeployment-common/utility.js'); -var zipUtility = require('azure-pipelines-tasks-azurermdeploycommon/webdeployment-common/ziputility.js'); +var webCommonUtility = require('azure-pipelines-tasks-azurermdeploycommon-v3/webdeployment-common/utility.js'); +var zipUtility = require('azure-pipelines-tasks-azurermdeploycommon-v3/webdeployment-common/ziputility.js'); var azureStorage = require('azure-storage'); -import * as ParameterParser from 'azure-pipelines-tasks-azurermdeploycommon/operations/ParameterParserUtility'; +import * as ParameterParser from 'azure-pipelines-tasks-azurermdeploycommon-v3/operations/ParameterParserUtility'; export class ConsumptionWebAppDeploymentProvider extends AzureRmWebAppDeploymentProvider { diff --git a/Tasks/AzureFunctionAppV1/deploymentProvider/DeploymentFactory.ts b/Tasks/AzureFunctionAppV1/deploymentProvider/DeploymentFactory.ts index 493a4503835a..2a86ce2f2073 100644 --- a/Tasks/AzureFunctionAppV1/deploymentProvider/DeploymentFactory.ts +++ b/Tasks/AzureFunctionAppV1/deploymentProvider/DeploymentFactory.ts @@ -5,7 +5,7 @@ import { WindowsWebAppZipDeployProvider } from './WindowsWebAppZipDeployProvider import { WindowsWebAppRunFromZipProvider } from './WindowsWebAppRunFromZipProvider'; import { ConsumptionWebAppDeploymentProvider } from './ConsumptionWebAppDeploymentProvider'; import tl = require('azure-pipelines-task-lib/task'); -import { PackageType } from 'azure-pipelines-tasks-azurermdeploycommon/webdeployment-common/packageUtility'; +import { PackageType } from 'azure-pipelines-tasks-azurermdeploycommon-v3/webdeployment-common/packageUtility'; import { WindowsWebAppWarDeployProvider } from './WindowsWebAppWarDeployProvider'; export class DeploymentFactory { diff --git a/Tasks/AzureFunctionAppV1/deploymentProvider/WindowsWebAppRunFromZipProvider.ts b/Tasks/AzureFunctionAppV1/deploymentProvider/WindowsWebAppRunFromZipProvider.ts index 787b97723f95..f45afd2c9757 100644 --- a/Tasks/AzureFunctionAppV1/deploymentProvider/WindowsWebAppRunFromZipProvider.ts +++ b/Tasks/AzureFunctionAppV1/deploymentProvider/WindowsWebAppRunFromZipProvider.ts @@ -1,14 +1,14 @@ import { AzureRmWebAppDeploymentProvider } from './AzureRmWebAppDeploymentProvider'; import tl = require('azure-pipelines-task-lib/task'); -import * as ParameterParser from 'azure-pipelines-tasks-azurermdeploycommon/operations/ParameterParserUtility' +import * as ParameterParser from 'azure-pipelines-tasks-azurermdeploycommon-v3/operations/ParameterParserUtility' import { DeploymentType } from '../taskparameters'; -import { PackageType } from 'azure-pipelines-tasks-azurermdeploycommon/webdeployment-common/packageUtility'; -import { addReleaseAnnotation } from 'azure-pipelines-tasks-azurermdeploycommon/operations/ReleaseAnnotationUtility'; -import { FileTransformsUtility } from 'azure-pipelines-tasks-azurermdeploycommon/operations/FileTransformsUtility.js'; +import { PackageType } from 'azure-pipelines-tasks-azurermdeploycommon-v3/webdeployment-common/packageUtility'; +import { addReleaseAnnotation } from 'azure-pipelines-tasks-azurermdeploycommon-v3/operations/ReleaseAnnotationUtility'; +import { FileTransformsUtility } from 'azure-pipelines-tasks-azurermdeploycommon-v3/operations/FileTransformsUtility.js'; const oldRunFromZipAppSetting: string = '-WEBSITE_RUN_FROM_ZIP'; const runFromZipAppSetting: string = '-WEBSITE_RUN_FROM_PACKAGE 1'; -var deployUtility = require('azure-pipelines-tasks-azurermdeploycommon/webdeployment-common/utility.js'); -var zipUtility = require('azure-pipelines-tasks-azurermdeploycommon/webdeployment-common/ziputility.js'); +var deployUtility = require('azure-pipelines-tasks-azurermdeploycommon-v3/webdeployment-common/utility.js'); +var zipUtility = require('azure-pipelines-tasks-azurermdeploycommon-v3/webdeployment-common/ziputility.js'); export class WindowsWebAppRunFromZipProvider extends AzureRmWebAppDeploymentProvider { diff --git a/Tasks/AzureFunctionAppV1/deploymentProvider/WindowsWebAppWarDeployProvider.ts b/Tasks/AzureFunctionAppV1/deploymentProvider/WindowsWebAppWarDeployProvider.ts index 875df08dc2b2..eb02aaf65550 100644 --- a/Tasks/AzureFunctionAppV1/deploymentProvider/WindowsWebAppWarDeployProvider.ts +++ b/Tasks/AzureFunctionAppV1/deploymentProvider/WindowsWebAppWarDeployProvider.ts @@ -1,6 +1,6 @@ import { AzureRmWebAppDeploymentProvider } from './AzureRmWebAppDeploymentProvider'; import tl = require('azure-pipelines-task-lib/task'); -var webCommonUtility = require('azure-pipelines-tasks-azurermdeploycommon/webdeployment-common/utility.js'); +var webCommonUtility = require('azure-pipelines-tasks-azurermdeploycommon-v3/webdeployment-common/utility.js'); export class WindowsWebAppWarDeployProvider extends AzureRmWebAppDeploymentProvider { diff --git a/Tasks/AzureFunctionAppV1/deploymentProvider/WindowsWebAppZipDeployProvider.ts b/Tasks/AzureFunctionAppV1/deploymentProvider/WindowsWebAppZipDeployProvider.ts index f505ecc6233b..ec2f44cca3b0 100644 --- a/Tasks/AzureFunctionAppV1/deploymentProvider/WindowsWebAppZipDeployProvider.ts +++ b/Tasks/AzureFunctionAppV1/deploymentProvider/WindowsWebAppZipDeployProvider.ts @@ -1,12 +1,12 @@ import { AzureRmWebAppDeploymentProvider } from './AzureRmWebAppDeploymentProvider'; import tl = require('azure-pipelines-task-lib/task'); -import * as ParameterParser from 'azure-pipelines-tasks-azurermdeploycommon/operations/ParameterParserUtility' +import * as ParameterParser from 'azure-pipelines-tasks-azurermdeploycommon-v3/operations/ParameterParserUtility' import { DeploymentType } from '../taskparameters'; -import { PackageType } from 'azure-pipelines-tasks-azurermdeploycommon/webdeployment-common/packageUtility'; -import { FileTransformsUtility } from 'azure-pipelines-tasks-azurermdeploycommon/operations/FileTransformsUtility.js'; +import { PackageType } from 'azure-pipelines-tasks-azurermdeploycommon-v3/webdeployment-common/packageUtility'; +import { FileTransformsUtility } from 'azure-pipelines-tasks-azurermdeploycommon-v3/operations/FileTransformsUtility.js'; const removeRunFromZipAppSetting: string = '-WEBSITE_RUN_FROM_ZIP -WEBSITE_RUN_FROM_PACKAGE'; -var deployUtility = require('azure-pipelines-tasks-azurermdeploycommon/webdeployment-common/utility.js'); -var zipUtility = require('azure-pipelines-tasks-azurermdeploycommon/webdeployment-common/ziputility.js'); +var deployUtility = require('azure-pipelines-tasks-azurermdeploycommon-v3/webdeployment-common/utility.js'); +var zipUtility = require('azure-pipelines-tasks-azurermdeploycommon-v3/webdeployment-common/ziputility.js'); export class WindowsWebAppZipDeployProvider extends AzureRmWebAppDeploymentProvider { diff --git a/Tasks/AzureFunctionAppV1/package-lock.json b/Tasks/AzureFunctionAppV1/package-lock.json index e03e8841f9f1..38667345e466 100644 --- a/Tasks/AzureFunctionAppV1/package-lock.json +++ b/Tasks/AzureFunctionAppV1/package-lock.json @@ -145,10 +145,10 @@ } } }, - "azure-pipelines-tasks-azurermdeploycommon": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-azurermdeploycommon/-/azure-pipelines-tasks-azurermdeploycommon-2.1.1.tgz", - "integrity": "sha512-VgKS7t+SvopoU+/vLbq8isxZfD9HHVvh4Os3BOpPoYzc5SCXgO77wb3sPiAGw7HMhe66oxiR9IVH8+E3cVoQUA==", + "azure-pipelines-tasks-azurermdeploycommon-v3": { + "version": "3.198.0", + "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-azurermdeploycommon-v3/-/azure-pipelines-tasks-azurermdeploycommon-v3-3.198.0.tgz", + "integrity": "sha512-9FmKVz3OaTRP6rXJdzz5C02TjAwLVH+KluR2xp6p6IeC3v/hsQZfIlMrgXhAqztpSGsNkI389GVmDBNutKt2bA==", "requires": { "@types/mocha": "^5.2.7", "@types/node": "^10.17.0", @@ -634,9 +634,9 @@ } }, "graceful-fs": { - "version": "4.2.8", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz", - "integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==" + "version": "4.2.9", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz", + "integrity": "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==" }, "har-validator": { "version": "2.0.6", @@ -756,9 +756,9 @@ "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==" }, "is-core-module": { - "version": "2.8.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.0.tgz", - "integrity": "sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw==", + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.1.tgz", + "integrity": "sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==", "requires": { "has": "^1.0.3" } @@ -899,9 +899,9 @@ } }, "lazystream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz", - "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.1.tgz", + "integrity": "sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw==", "requires": { "readable-stream": "^2.0.5" } @@ -1001,9 +1001,9 @@ "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=" }, "object-inspect": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz", - "integrity": "sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==" + "version": "1.12.0", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz", + "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==" }, "once": { "version": "1.4.0", @@ -1152,12 +1152,13 @@ } }, "resolve": { - "version": "1.20.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz", - "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==", + "version": "1.22.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz", + "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==", "requires": { - "is-core-module": "^2.2.0", - "path-parse": "^1.0.6" + "is-core-module": "^2.8.1", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" } }, "safe-buffer": { @@ -1181,9 +1182,9 @@ "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" }, "shelljs": { - "version": "0.8.4", - "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.4.tgz", - "integrity": "sha512-7gk3UZ9kOfPLIAbslLzyWeGiEqx9e3rxwZM0KE6EL8GlGwjym9Mrlx5/p33bWTu9YG6vcS4MBxYZDHYr5lr8BQ==", + "version": "0.8.5", + "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.5.tgz", + "integrity": "sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow==", "requires": { "glob": "^7.0.0", "interpret": "^1.0.0", @@ -1254,6 +1255,11 @@ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=" }, + "supports-preserve-symlinks-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", + "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==" + }, "sync-request": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/sync-request/-/sync-request-6.1.0.tgz", @@ -1325,9 +1331,9 @@ } }, "qs": { - "version": "6.10.1", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.1.tgz", - "integrity": "sha512-M528Hph6wsSVOBiYUnGf+K/7w0hNshs/duGsNXPUCLH5XAqjEtiPGwNONLV0tBH8NoGb0mvD5JubnUTrujKDTg==", + "version": "6.10.3", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz", + "integrity": "sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==", "requires": { "side-channel": "^1.0.4" } @@ -1404,17 +1410,17 @@ }, "dependencies": { "qs": { - "version": "6.10.1", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.1.tgz", - "integrity": "sha512-M528Hph6wsSVOBiYUnGf+K/7w0hNshs/duGsNXPUCLH5XAqjEtiPGwNONLV0tBH8NoGb0mvD5JubnUTrujKDTg==", + "version": "6.10.3", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz", + "integrity": "sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==", "requires": { "side-channel": "^1.0.4" } }, "underscore": { - "version": "1.13.1", - "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.1.tgz", - "integrity": "sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g==" + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.2.tgz", + "integrity": "sha512-ekY1NhRzq0B08g4bGuX4wd2jZx5GnKz6mKSqFL4nqBlfyMGiG10gDFhDTMEfYmDL6Jy0FUIZp7wiRB+0BP7J2g==" } } }, diff --git a/Tasks/AzureFunctionAppV1/package.json b/Tasks/AzureFunctionAppV1/package.json index 74a2ebd452c4..35144c3c14e2 100644 --- a/Tasks/AzureFunctionAppV1/package.json +++ b/Tasks/AzureFunctionAppV1/package.json @@ -20,7 +20,7 @@ "@types/mocha": "^5.2.7", "@types/node": "^10.17.0", "@types/q": "1.0.7", - "azure-pipelines-tasks-azurermdeploycommon": "^2.1.0", + "azure-pipelines-tasks-azurermdeploycommon-v3": "^3.198.0", "azure-storage": "2.2.1", "moment": "2.21.0", "q": "1.4.1", diff --git a/Tasks/AzureFunctionAppV1/task.json b/Tasks/AzureFunctionAppV1/task.json index b98fdc172452..df215a20ed88 100644 --- a/Tasks/AzureFunctionAppV1/task.json +++ b/Tasks/AzureFunctionAppV1/task.json @@ -17,7 +17,7 @@ "author": "Microsoft Corporation", "version": { "Major": 1, - "Minor": 198, + "Minor": 200, "Patch": 1 }, "minimumAgentVersion": "2.104.1", diff --git a/Tasks/AzureFunctionAppV1/task.loc.json b/Tasks/AzureFunctionAppV1/task.loc.json index ff42a6fad103..5e6816d6a4fe 100644 --- a/Tasks/AzureFunctionAppV1/task.loc.json +++ b/Tasks/AzureFunctionAppV1/task.loc.json @@ -17,7 +17,7 @@ "author": "Microsoft Corporation", "version": { "Major": 1, - "Minor": 198, + "Minor": 200, "Patch": 1 }, "minimumAgentVersion": "2.104.1", diff --git a/Tasks/AzureFunctionAppV1/taskparameters.ts b/Tasks/AzureFunctionAppV1/taskparameters.ts index 86b64dc594e7..4d52945613d9 100644 --- a/Tasks/AzureFunctionAppV1/taskparameters.ts +++ b/Tasks/AzureFunctionAppV1/taskparameters.ts @@ -1,10 +1,10 @@ -import { AzureEndpoint } from 'azure-pipelines-tasks-azurermdeploycommon/azure-arm-rest/azureModels'; +import { AzureEndpoint } from 'azure-pipelines-tasks-azurermdeploycommon-v3/azure-arm-rest/azureModels'; import tl = require('azure-pipelines-task-lib/task'); -import { Package, PackageType } from 'azure-pipelines-tasks-azurermdeploycommon/webdeployment-common/packageUtility'; -var webCommonUtility = require('azure-pipelines-tasks-azurermdeploycommon/webdeployment-common/utility.js'); -import { AzureRMEndpoint } from 'azure-pipelines-tasks-azurermdeploycommon/azure-arm-rest/azure-arm-endpoint'; -import { AzureResourceFilterUtility } from 'azure-pipelines-tasks-azurermdeploycommon/operations/AzureResourceFilterUtility'; -import { AzureAppService } from 'azure-pipelines-tasks-azurermdeploycommon/azure-arm-rest/azure-arm-app-service'; +import { Package, PackageType } from 'azure-pipelines-tasks-azurermdeploycommon-v3/webdeployment-common/packageUtility'; +var webCommonUtility = require('azure-pipelines-tasks-azurermdeploycommon-v3/webdeployment-common/utility.js'); +import { AzureRMEndpoint } from 'azure-pipelines-tasks-azurermdeploycommon-v3/azure-arm-rest/azure-arm-endpoint'; +import { AzureResourceFilterUtility } from 'azure-pipelines-tasks-azurermdeploycommon-v3/operations/AzureResourceFilterUtility'; +import { AzureAppService } from 'azure-pipelines-tasks-azurermdeploycommon-v3/azure-arm-rest/azure-arm-app-service'; const skuDynamicValue: string = 'dynamic'; const skuElasticPremiumValue: string = 'elasticpremium'; diff --git a/Tasks/AzureWebAppV1/azurermwebappdeployment.ts b/Tasks/AzureWebAppV1/azurermwebappdeployment.ts index 3994da6e824f..76b43ea5c402 100644 --- a/Tasks/AzureWebAppV1/azurermwebappdeployment.ts +++ b/Tasks/AzureWebAppV1/azurermwebappdeployment.ts @@ -2,14 +2,14 @@ import tl = require('azure-pipelines-task-lib/task'); import path = require('path'); import { TaskParameters, TaskParametersUtility } from './taskparameters'; import { DeploymentFactory } from './deploymentProvider/DeploymentFactory'; -import * as Endpoint from 'azure-pipelines-tasks-azurermdeploycommon/azure-arm-rest/azure-arm-endpoint'; +import * as Endpoint from 'azure-pipelines-tasks-azurermdeploycommon-v3/azure-arm-rest/azure-arm-endpoint'; async function main() { let isDeploymentSuccess: boolean = true; try { tl.setResourcePath(path.join( __dirname, 'task.json')); - tl.setResourcePath(path.join( __dirname, 'node_modules/azure-pipelines-tasks-azurermdeploycommon/module.json')); + tl.setResourcePath(path.join( __dirname, 'node_modules/azure-pipelines-tasks-azurermdeploycommon-v3/module.json')); var taskParams: TaskParameters = await TaskParametersUtility.getParameters(); var deploymentFactory: DeploymentFactory = new DeploymentFactory(taskParams); var deploymentProvider = await deploymentFactory.GetDeploymentProvider(); diff --git a/Tasks/AzureWebAppV1/deploymentProvider/AzureRmWebAppDeploymentProvider.ts b/Tasks/AzureWebAppV1/deploymentProvider/AzureRmWebAppDeploymentProvider.ts index f0f7361faa81..7386e3df1422 100644 --- a/Tasks/AzureWebAppV1/deploymentProvider/AzureRmWebAppDeploymentProvider.ts +++ b/Tasks/AzureWebAppV1/deploymentProvider/AzureRmWebAppDeploymentProvider.ts @@ -1,16 +1,16 @@ -import * as ParameterParser from 'azure-pipelines-tasks-azurermdeploycommon/operations/ParameterParserUtility' +import * as ParameterParser from 'azure-pipelines-tasks-azurermdeploycommon-v3/operations/ParameterParserUtility' -import { AzureAppService } from 'azure-pipelines-tasks-azurermdeploycommon/azure-arm-rest/azure-arm-app-service'; -import { AzureAppServiceUtility } from 'azure-pipelines-tasks-azurermdeploycommon/operations/AzureAppServiceUtility'; -import { AzureDeployPackageArtifactAlias } from 'azure-pipelines-tasks-azurermdeploycommon/Constants'; -import { AzureEndpoint } from 'azure-pipelines-tasks-azurermdeploycommon/azure-arm-rest/azureModels'; -import { AzureRmEndpointAuthenticationScheme } from 'azure-pipelines-tasks-azurermdeploycommon/azure-arm-rest/constants'; +import { AzureAppService } from 'azure-pipelines-tasks-azurermdeploycommon-v3/azure-arm-rest/azure-arm-app-service'; +import { AzureAppServiceUtility } from 'azure-pipelines-tasks-azurermdeploycommon-v3/operations/AzureAppServiceUtility'; +import { AzureDeployPackageArtifactAlias } from 'azure-pipelines-tasks-azurermdeploycommon-v3/Constants'; +import { AzureEndpoint } from 'azure-pipelines-tasks-azurermdeploycommon-v3/azure-arm-rest/azureModels'; +import { AzureRmEndpointAuthenticationScheme } from 'azure-pipelines-tasks-azurermdeploycommon-v3/azure-arm-rest/constants'; import { IWebAppDeploymentProvider } from './IWebAppDeploymentProvider'; -import { Kudu } from 'azure-pipelines-tasks-azurermdeploycommon/azure-arm-rest/azure-arm-app-service-kudu'; -import { KuduServiceUtility } from 'azure-pipelines-tasks-azurermdeploycommon/operations/KuduServiceUtility'; -import { PackageUtility } from 'azure-pipelines-tasks-azurermdeploycommon/webdeployment-common/packageUtility'; +import { Kudu } from 'azure-pipelines-tasks-azurermdeploycommon-v3/azure-arm-rest/azure-arm-app-service-kudu'; +import { KuduServiceUtility } from 'azure-pipelines-tasks-azurermdeploycommon-v3/operations/KuduServiceUtility'; +import { PackageUtility } from 'azure-pipelines-tasks-azurermdeploycommon-v3/webdeployment-common/packageUtility'; import { TaskParameters } from '../taskparameters'; -import { addReleaseAnnotation } from 'azure-pipelines-tasks-azurermdeploycommon/operations/ReleaseAnnotationUtility'; +import { addReleaseAnnotation } from 'azure-pipelines-tasks-azurermdeploycommon-v3/operations/ReleaseAnnotationUtility'; import tl = require('azure-pipelines-task-lib/task'); diff --git a/Tasks/AzureWebAppV1/deploymentProvider/BuiltInLinuxWebAppDeploymentProvider.ts b/Tasks/AzureWebAppV1/deploymentProvider/BuiltInLinuxWebAppDeploymentProvider.ts index f9a348ad9d46..5a75fc19424b 100644 --- a/Tasks/AzureWebAppV1/deploymentProvider/BuiltInLinuxWebAppDeploymentProvider.ts +++ b/Tasks/AzureWebAppV1/deploymentProvider/BuiltInLinuxWebAppDeploymentProvider.ts @@ -1,13 +1,13 @@ -import * as ParameterParser from 'azure-pipelines-tasks-azurermdeploycommon/operations/ParameterParserUtility' +import * as ParameterParser from 'azure-pipelines-tasks-azurermdeploycommon-v3/operations/ParameterParserUtility' import { AzureRmWebAppDeploymentProvider } from './AzureRmWebAppDeploymentProvider'; -import { PackageType } from 'azure-pipelines-tasks-azurermdeploycommon/webdeployment-common/packageUtility'; +import { PackageType } from 'azure-pipelines-tasks-azurermdeploycommon-v3/webdeployment-common/packageUtility'; import tl = require('azure-pipelines-task-lib/task'); -var webCommonUtility = require('azure-pipelines-tasks-azurermdeploycommon/webdeployment-common/utility.js'); -var deployUtility = require('azure-pipelines-tasks-azurermdeploycommon/webdeployment-common/utility.js'); -var zipUtility = require('azure-pipelines-tasks-azurermdeploycommon/webdeployment-common/ziputility.js'); +var webCommonUtility = require('azure-pipelines-tasks-azurermdeploycommon-v3/webdeployment-common/utility.js'); +var deployUtility = require('azure-pipelines-tasks-azurermdeploycommon-v3/webdeployment-common/utility.js'); +var zipUtility = require('azure-pipelines-tasks-azurermdeploycommon-v3/webdeployment-common/ziputility.js'); const initScriptAppSetting: string = "-INIT_SCRIPT"; diff --git a/Tasks/AzureWebAppV1/deploymentProvider/DeploymentFactory.ts b/Tasks/AzureWebAppV1/deploymentProvider/DeploymentFactory.ts index c1a27e13a052..bdff5334d02f 100644 --- a/Tasks/AzureWebAppV1/deploymentProvider/DeploymentFactory.ts +++ b/Tasks/AzureWebAppV1/deploymentProvider/DeploymentFactory.ts @@ -4,9 +4,9 @@ import { IWebAppDeploymentProvider } from './IWebAppDeploymentProvider'; import { WindowsWebAppZipDeployProvider } from './WindowsWebAppZipDeployProvider'; import { WindowsWebAppRunFromZipProvider } from './WindowsWebAppRunFromZipProvider'; import tl = require('azure-pipelines-task-lib/task'); -import { PackageType } from 'azure-pipelines-tasks-azurermdeploycommon/webdeployment-common/packageUtility'; +import { PackageType } from 'azure-pipelines-tasks-azurermdeploycommon-v3/webdeployment-common/packageUtility'; import { WindowsWebAppWarDeployProvider } from './WindowsWebAppWarDeployProvider'; -import { AzureRmEndpointAuthenticationScheme } from 'azure-pipelines-tasks-azurermdeploycommon/azure-arm-rest/constants'; +import { AzureRmEndpointAuthenticationScheme } from 'azure-pipelines-tasks-azurermdeploycommon-v3/azure-arm-rest/constants'; export class DeploymentFactory { diff --git a/Tasks/AzureWebAppV1/deploymentProvider/WindowsWebAppRunFromZipProvider.ts b/Tasks/AzureWebAppV1/deploymentProvider/WindowsWebAppRunFromZipProvider.ts index 4fc297ec8da4..fb09226b6fdc 100644 --- a/Tasks/AzureWebAppV1/deploymentProvider/WindowsWebAppRunFromZipProvider.ts +++ b/Tasks/AzureWebAppV1/deploymentProvider/WindowsWebAppRunFromZipProvider.ts @@ -1,15 +1,15 @@ -import * as ParameterParser from 'azure-pipelines-tasks-azurermdeploycommon/operations/ParameterParserUtility' +import * as ParameterParser from 'azure-pipelines-tasks-azurermdeploycommon-v3/operations/ParameterParserUtility' import { AzureRmWebAppDeploymentProvider } from './AzureRmWebAppDeploymentProvider'; import { DeploymentType } from '../taskparameters'; -import { FileTransformsUtility } from 'azure-pipelines-tasks-azurermdeploycommon/operations/FileTransformsUtility.js'; -import { PackageType } from 'azure-pipelines-tasks-azurermdeploycommon/webdeployment-common/packageUtility'; -import { addReleaseAnnotation } from 'azure-pipelines-tasks-azurermdeploycommon/operations/ReleaseAnnotationUtility'; +import { FileTransformsUtility } from 'azure-pipelines-tasks-azurermdeploycommon-v3/operations/FileTransformsUtility.js'; +import { PackageType } from 'azure-pipelines-tasks-azurermdeploycommon-v3/webdeployment-common/packageUtility'; +import { addReleaseAnnotation } from 'azure-pipelines-tasks-azurermdeploycommon-v3/operations/ReleaseAnnotationUtility'; import tl = require('azure-pipelines-task-lib/task'); -var deployUtility = require('azure-pipelines-tasks-azurermdeploycommon/webdeployment-common/utility.js'); -var zipUtility = require('azure-pipelines-tasks-azurermdeploycommon/webdeployment-common/ziputility.js'); +var deployUtility = require('azure-pipelines-tasks-azurermdeploycommon-v3/webdeployment-common/utility.js'); +var zipUtility = require('azure-pipelines-tasks-azurermdeploycommon-v3/webdeployment-common/ziputility.js'); const oldRunFromZipAppSetting: string = '-WEBSITE_RUN_FROM_ZIP'; const runFromZipAppSetting: string = '-WEBSITE_RUN_FROM_PACKAGE 1'; diff --git a/Tasks/AzureWebAppV1/deploymentProvider/WindowsWebAppWarDeployProvider.ts b/Tasks/AzureWebAppV1/deploymentProvider/WindowsWebAppWarDeployProvider.ts index f84a467089cf..d7145124f624 100644 --- a/Tasks/AzureWebAppV1/deploymentProvider/WindowsWebAppWarDeployProvider.ts +++ b/Tasks/AzureWebAppV1/deploymentProvider/WindowsWebAppWarDeployProvider.ts @@ -1,7 +1,7 @@ import { AzureRmWebAppDeploymentProvider } from './AzureRmWebAppDeploymentProvider'; import tl = require('azure-pipelines-task-lib/task'); -var webCommonUtility = require('azure-pipelines-tasks-azurermdeploycommon/webdeployment-common/utility.js'); +var webCommonUtility = require('azure-pipelines-tasks-azurermdeploycommon-v3/webdeployment-common/utility.js'); export class WindowsWebAppWarDeployProvider extends AzureRmWebAppDeploymentProvider { diff --git a/Tasks/AzureWebAppV1/deploymentProvider/WindowsWebAppZipDeployProvider.ts b/Tasks/AzureWebAppV1/deploymentProvider/WindowsWebAppZipDeployProvider.ts index ddf4fa72d105..aac5d6242ce4 100644 --- a/Tasks/AzureWebAppV1/deploymentProvider/WindowsWebAppZipDeployProvider.ts +++ b/Tasks/AzureWebAppV1/deploymentProvider/WindowsWebAppZipDeployProvider.ts @@ -1,15 +1,15 @@ -import * as ParameterParser from 'azure-pipelines-tasks-azurermdeploycommon/operations/ParameterParserUtility' +import * as ParameterParser from 'azure-pipelines-tasks-azurermdeploycommon-v3/operations/ParameterParserUtility' import { AzureRmWebAppDeploymentProvider } from './AzureRmWebAppDeploymentProvider'; import { DeploymentType } from '../taskparameters'; -import { FileTransformsUtility } from 'azure-pipelines-tasks-azurermdeploycommon/operations/FileTransformsUtility.js'; -import { PackageType } from 'azure-pipelines-tasks-azurermdeploycommon/webdeployment-common/packageUtility'; +import { FileTransformsUtility } from 'azure-pipelines-tasks-azurermdeploycommon-v3/operations/FileTransformsUtility.js'; +import { PackageType } from 'azure-pipelines-tasks-azurermdeploycommon-v3/webdeployment-common/packageUtility'; import tl = require('azure-pipelines-task-lib/task'); const removeRunFromZipAppSetting: string = '-WEBSITE_RUN_FROM_PACKAGE -WEBSITE_RUN_FROM_ZIP'; -var deployUtility = require('azure-pipelines-tasks-azurermdeploycommon/webdeployment-common/utility.js'); -var zipUtility = require('azure-pipelines-tasks-azurermdeploycommon/webdeployment-common/ziputility.js'); +var deployUtility = require('azure-pipelines-tasks-azurermdeploycommon-v3/webdeployment-common/utility.js'); +var zipUtility = require('azure-pipelines-tasks-azurermdeploycommon-v3/webdeployment-common/ziputility.js'); export class WindowsWebAppZipDeployProvider extends AzureRmWebAppDeploymentProvider { diff --git a/Tasks/AzureWebAppV1/package-lock.json b/Tasks/AzureWebAppV1/package-lock.json index f28264086034..1aa5febfbbd7 100644 --- a/Tasks/AzureWebAppV1/package-lock.json +++ b/Tasks/AzureWebAppV1/package-lock.json @@ -130,10 +130,10 @@ } } }, - "azure-pipelines-tasks-azurermdeploycommon": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-azurermdeploycommon/-/azure-pipelines-tasks-azurermdeploycommon-2.1.1.tgz", - "integrity": "sha512-VgKS7t+SvopoU+/vLbq8isxZfD9HHVvh4Os3BOpPoYzc5SCXgO77wb3sPiAGw7HMhe66oxiR9IVH8+E3cVoQUA==", + "azure-pipelines-tasks-azurermdeploycommon-v3": { + "version": "3.198.0", + "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-azurermdeploycommon-v3/-/azure-pipelines-tasks-azurermdeploycommon-v3-3.198.0.tgz", + "integrity": "sha512-9FmKVz3OaTRP6rXJdzz5C02TjAwLVH+KluR2xp6p6IeC3v/hsQZfIlMrgXhAqztpSGsNkI389GVmDBNutKt2bA==", "requires": { "@types/mocha": "^5.2.7", "@types/node": "^10.17.0", @@ -471,9 +471,9 @@ } }, "graceful-fs": { - "version": "4.2.8", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz", - "integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==" + "version": "4.2.9", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz", + "integrity": "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==" }, "has": { "version": "1.0.3", @@ -606,9 +606,9 @@ } }, "lazystream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz", - "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.1.tgz", + "integrity": "sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw==", "requires": { "readable-stream": "^2.0.5" } diff --git a/Tasks/AzureWebAppV1/package.json b/Tasks/AzureWebAppV1/package.json index 81c5745d289c..37eb452538e8 100644 --- a/Tasks/AzureWebAppV1/package.json +++ b/Tasks/AzureWebAppV1/package.json @@ -20,7 +20,7 @@ "@types/mocha": "^5.2.7", "@types/node": "^10.17.0", "@types/q": "1.0.7", - "azure-pipelines-tasks-azurermdeploycommon": "^2.1.0", + "azure-pipelines-tasks-azurermdeploycommon-v3": "^3.198.0", "azure-pipelines-tasks-utility-common": "^3.0.3", "moment": "2.21.0", "q": "1.4.1", diff --git a/Tasks/AzureWebAppV1/task.json b/Tasks/AzureWebAppV1/task.json index 7f958734a6af..97ba78de2a83 100644 --- a/Tasks/AzureWebAppV1/task.json +++ b/Tasks/AzureWebAppV1/task.json @@ -17,7 +17,7 @@ "author": "Microsoft Corporation", "version": { "Major": 1, - "Minor": 198, + "Minor": 200, "Patch": 0 }, "minimumAgentVersion": "2.104.1", diff --git a/Tasks/AzureWebAppV1/task.loc.json b/Tasks/AzureWebAppV1/task.loc.json index e2578b15fe0d..9951c8229da5 100644 --- a/Tasks/AzureWebAppV1/task.loc.json +++ b/Tasks/AzureWebAppV1/task.loc.json @@ -17,7 +17,7 @@ "author": "Microsoft Corporation", "version": { "Major": 1, - "Minor": 198, + "Minor": 200, "Patch": 0 }, "minimumAgentVersion": "2.104.1", diff --git a/Tasks/AzureWebAppV1/taskparameters.ts b/Tasks/AzureWebAppV1/taskparameters.ts index 65e73e888f4f..6eb6b60526d6 100644 --- a/Tasks/AzureWebAppV1/taskparameters.ts +++ b/Tasks/AzureWebAppV1/taskparameters.ts @@ -1,11 +1,11 @@ -import { AzureEndpoint } from 'azure-pipelines-tasks-azurermdeploycommon/azure-arm-rest/azureModels'; +import { AzureEndpoint } from 'azure-pipelines-tasks-azurermdeploycommon-v3/azure-arm-rest/azureModels'; import tl = require('azure-pipelines-task-lib/task'); -import { Package, PackageType } from 'azure-pipelines-tasks-azurermdeploycommon/webdeployment-common/packageUtility'; -var webCommonUtility = require('azure-pipelines-tasks-azurermdeploycommon/webdeployment-common/utility.js'); -import { AzureRMEndpoint } from 'azure-pipelines-tasks-azurermdeploycommon/azure-arm-rest/azure-arm-endpoint'; -import { AzureResourceFilterUtility } from 'azure-pipelines-tasks-azurermdeploycommon/operations/AzureResourceFilterUtility'; -import { AzureAppService } from 'azure-pipelines-tasks-azurermdeploycommon/azure-arm-rest/azure-arm-app-service'; -import { AzureRmEndpointAuthenticationScheme } from 'azure-pipelines-tasks-azurermdeploycommon/azure-arm-rest/constants'; +import { Package, PackageType } from 'azure-pipelines-tasks-azurermdeploycommon-v3/webdeployment-common/packageUtility'; +var webCommonUtility = require('azure-pipelines-tasks-azurermdeploycommon-v3/webdeployment-common/utility.js'); +import { AzureRMEndpoint } from 'azure-pipelines-tasks-azurermdeploycommon-v3/azure-arm-rest/azure-arm-endpoint'; +import { AzureResourceFilterUtility } from 'azure-pipelines-tasks-azurermdeploycommon-v3/operations/AzureResourceFilterUtility'; +import { AzureAppService } from 'azure-pipelines-tasks-azurermdeploycommon-v3/azure-arm-rest/azure-arm-app-service'; +import { AzureRmEndpointAuthenticationScheme } from 'azure-pipelines-tasks-azurermdeploycommon-v3/azure-arm-rest/constants'; const webAppKindMap = new Map([ [ 'app', 'webApp' ],