Merge branch 'master' into tintse

microsoft · Aug 29, 2022 · 9289fc1 · 9289fc1
2 parents 651b415 + 6cc5852
commit 9289fc1
Show file tree

Hide file tree

Showing 88 changed files with 9,634 additions and 2,401 deletions.
diff --git a/Tasks/AzureAppServiceSettingsV1/azurewebappsettings.ts b/Tasks/AzureAppServiceSettingsV1/azurewebappsettings.ts
@@ -1,10 +1,10 @@
 import tl = require('azure-pipelines-task-lib/task');
 import path = require('path');
-import { AzureEndpoint } from 'azure-pipelines-tasks-azurermdeploycommon/azure-arm-rest/azureModels';
-import { AzureRMEndpoint, dispose } from 'azure-pipelines-tasks-azurermdeploycommon/azure-arm-rest/azure-arm-endpoint';
-import { AzureAppService } from 'azure-pipelines-tasks-azurermdeploycommon/azure-arm-rest/azure-arm-app-service';
-import { AzureAppServiceUtility } from 'azure-pipelines-tasks-azurermdeploycommon/operations/AzureAppServiceUtility';
-import { Resources } from 'azure-pipelines-tasks-azurermdeploycommon/azure-arm-rest/azure-arm-resource';
+import { AzureEndpoint } from 'azure-pipelines-tasks-azurermdeploycommon-v3/azure-arm-rest/azureModels';
+import { AzureRMEndpoint, dispose } from 'azure-pipelines-tasks-azurermdeploycommon-v3/azure-arm-rest/azure-arm-endpoint';
+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 { Resources } from 'azure-pipelines-tasks-azurermdeploycommon-v3/azure-arm-rest/azure-arm-resource';
 
 export class AzureResourceFilterUtils {
     public static async getResourceGroupName(endpoint: AzureEndpoint, resourceType: string, resourceName: string): Promise<string> {

diff --git a/Tasks/AzureAppServiceSettingsV1/package-lock.json b/Tasks/AzureAppServiceSettingsV1/package-lock.json
diff --git a/Tasks/AzureAppServiceSettingsV1/package.json b/Tasks/AzureAppServiceSettingsV1/package.json
@@ -21,7 +21,7 @@
     "@types/node": "^10.17.0",
     "@types/q": "1.0.7",
     "@types/uuid": "^8.3.0",
-    "azure-pipelines-tasks-azurermdeploycommon": "^2.1.1",
+    "azure-pipelines-tasks-azurermdeploycommon-v3": "^3.207.0",
     "moment": "^2.29.4",
     "q": "1.4.1",
     "xml2js": "0.4.13"

diff --git a/Tasks/AzureWebAppContainerV1/Tests/package-lock.json b/Tasks/AzureWebAppContainerV1/Tests/package-lock.json