@microsoft/teamsfx-core 1.2.0-rc.1 → 1.2.2-alpha.01e159e5.0

package/build/plugins/solution/fx-solution/v2/scaffolding.js.map

@@ -1 +1 @@
-{"version":3,"file":"scaffolding.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/scaffolding.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"scaffolding.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/scaffolding.ts"],"names":[],"mappings":"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"}

package/build/plugins/solution/fx-solution/v2/solution.d.ts

@@ -1,11 +1,12 @@
 import { AppStudioTokenProvider, Func, FxError, Inputs, Json, QTreeNode, Result, TokenProvider, v2, Void } from "@microsoft/teamsfx-api";
 import { DeepReadonly, EnvInfoV2 } from "@microsoft/teamsfx-api/build/v2";
+import { provisionResource } from "./provision";
 export declare class TeamsAppSolutionV2 implements v2.SolutionPlugin {
     name: string;
     displayName: string;
     scaffoldSourceCode: (ctx: v2.Context, inputs: Inputs) => Promise<Result<Void, FxError>>;
     generateResourceTemplate: (ctx: v2.Context, inputs: Inputs) => Promise<Result<Json, FxError>>;
-    provisionResources: (ctx: v2.Context, inputs: Inputs, envInfo: EnvInfoV2, tokenProvider: TokenProvider) => Promise<v2.FxResult<v2.SolutionProvisionOutput, FxError>>;
+    provisionResources: typeof provisionResource;
     deploy?: (ctx: v2.Context, inputs: Inputs, envInfo: EnvInfoV2, tokenProvider: TokenProvider) => Promise<Result<Void, FxError>>;
     publishApplication: (ctx: v2.Context, inputs: Inputs, envInfo: v2.EnvInfoV2, tokenProvider: AppStudioTokenProvider) => Promise<Result<Void, FxError>>;
     provisionLocalResource?: (ctx: v2.Context, inputs: Inputs, localSettings: Json, tokenProvider: TokenProvider) => Promise<v2.FxResult<Json, FxError>>;
@@ -17,6 +18,5 @@ export declare class TeamsAppSolutionV2 implements v2.SolutionPlugin {
     grantPermission?: (ctx: v2.Context, inputs: v2.InputsWithProjectPath, envInfo: DeepReadonly<EnvInfoV2>, tokenProvider: TokenProvider) => Promise<Result<Json, FxError>>;
     checkPermission?: (ctx: v2.Context, inputs: v2.InputsWithProjectPath, envInfo: DeepReadonly<EnvInfoV2>, tokenProvider: TokenProvider) => Promise<Result<Json, FxError>>;
     listCollaborator?: (ctx: v2.Context, inputs: v2.InputsWithProjectPath, envInfo: DeepReadonly<EnvInfoV2>, tokenProvider: TokenProvider) => Promise<Result<Json, FxError>>;
-    listAllCollaborators?: (ctx: v2.Context, inputs: v2.InputsWithProjectPath, envInfo: DeepReadonly<EnvInfoV2>, tokenProvider: TokenProvider) => Promise<Result<Json, FxError>>;
 }
 //# sourceMappingURL=solution.d.ts.map

package/build/plugins/solution/fx-solution/v2/solution.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"solution.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/solution.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"solution.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/solution.ts"],"names":[],"mappings":"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"}

package/build/plugins/solution/fx-solution/v2/solution.js

@@ -13,7 +13,6 @@ const executeUserTask_1 = require("./executeUserTask");
 const generateResourceTemplate_1 = require("./generateResourceTemplate");
 const getQuestions_1 = require("./getQuestions");
 const grantPermission_1 = require("./grantPermission");
-const listAllCollaborators_1 = require("./listAllCollaborators");
 const listCollaborator_1 = require("./listCollaborator");
 const provision_1 = require("./provision");
 const provisionLocal_1 = require("./provisionLocal");
@@ -37,7 +36,6 @@ let TeamsAppSolutionV2 = class TeamsAppSolutionV2 {
         this.grantPermission = (ctx, inputs, envInfo, tokenProvider) => grantPermission_1.grantPermission({ apiVersion: 2, ctx, inputs, envInfo, tokenProvider });
         this.checkPermission = (ctx, inputs, envInfo, tokenProvider) => checkPermission_1.checkPermission({ apiVersion: 2, ctx, inputs, envInfo, tokenProvider });
         this.listCollaborator = (ctx, inputs, envInfo, tokenProvider) => listCollaborator_1.listCollaborator({ apiVersion: 2, ctx, inputs, envInfo, tokenProvider });
-        this.listAllCollaborators = (ctx, inputs, envInfo, tokenProvider) => listAllCollaborators_1.listAllCollaborators({ apiVersion: 2, ctx, inputs, envInfo, tokenProvider });
     }
 };
 TeamsAppSolutionV2 = tslib_1.__decorate([

package/build/plugins/solution/fx-solution/v2/solution.js.map

@@ -1 +1 @@
-{"version":3,"file":"solution.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/solution.ts"],"names":[],"mappings":";;;;AAcA,mCAAiC;AACjC,4DAAiE;AACjE,sFAA6E;AAC7E,uDAAoD;AACpD,2CAAqD;AACrD,2CAAwC;AACxC,qCAAkC;AAClC,uDAAoD;AACpD,yEAAsE;AACtE,iDAAmG;AACnG,uDAAoD;AACpD,iEAA8D;AAC9D,yDAAsD;AACtD,2CAAgD;AAChD,qDAA0D;AAC1D,uCAA+C;AAC/C,+CAAmD;AAGnD,IAAa,kBAAkB,GAA/B,MAAa,kBAAkB;IAA/B;QACE,SAAI,GAAG,kCAAsB,CAAC;QAC9B,gBAAW,GAAW,6BAAiB,CAAC,QAAQ,CAAC;QAEjD,uBAAkB,GAChB,gCAAkB,CAAC;QACrB,6BAAwB,GACtB,mDAAwB,CAAC;QAE3B,uBAAkB,GAK+C,6BAAiB,CAAC;QAEnF,WAAM,GAKgC,eAAM,CAAC;QAE7C,uBAAkB,GAKoB,4BAAkB,CAAC;QACzD,2BAAsB,GAKqB,uCAAsB,CAAC;QAElE,+BAA0B,GAG6B,yCAA0B,CAAC;QAElF,oBAAe,GAO0B,iCAAe,CAAC;QAEzD,cAAS,GAAyE,qBAAS,CAAC;QAE5F,iBAAY,GAK2C,2BAAY,CAAC;QAEpE,4BAAuB,GAMgC,sCAAuB,CAAC;QAE/E,oBAAe,GAKuB,CACpC,GAAe,EACf,MAAgC,EAChC,OAAgC,EAChC,aAA4B,EAC5B,EAAE,CAAC,iCAAe,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC,CAAC;QAE7E,oBAAe,GAKuB,CACpC,GAAe,EACf,MAAgC,EAChC,OAAgC,EAChC,aAA4B,EAC5B,EAAE,CAAC,iCAAe,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC,CAAC;QAE7E,qBAAgB,GAKsB,CACpC,GAAe,EACf,MAAgC,EAChC,OAAgC,EAChC,aAA4B,EAC5B,EAAE,CAAC,mCAAgB,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC,CAAC;QAE9E,yBAAoB,GAKkB,CACpC,GAAe,EACf,MAAgC,EAChC,OAAgC,EAChC,aAA4B,EAC5B,EAAE,CAAC,2CAAoB,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC,CAAC;IACpF,CAAC;CAAA,CAAA;AAlHY,kBAAkB;IAD9B,gBAAO,CAAC,2CAAiB,CAAC,oBAAoB,CAAC;GACnC,kBAAkB,CAkH9B;AAlHY,gDAAkB"}
+{"version":3,"file":"solution.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/solution.ts"],"names":[],"mappings":";;;;AAaA,mCAAiC;AACjC,4DAAiE;AACjE,sFAA6E;AAC7E,uDAAoD;AACpD,2CAAqD;AACrD,2CAAwC;AACxC,qCAAkC;AAClC,uDAAoD;AACpD,yEAAsE;AACtE,iDAAmG;AACnG,uDAAoD;AACpD,yDAAsD;AACtD,2CAAgD;AAChD,qDAA0D;AAC1D,uCAA+C;AAC/C,+CAAmD;AAGnD,IAAa,kBAAkB,GAA/B,MAAa,kBAAkB;IAA/B;QACE,SAAI,GAAG,kCAAsB,CAAC;QAC9B,gBAAW,GAAW,6BAAiB,CAAC,QAAQ,CAAC;QAEjD,uBAAkB,GAChB,gCAAkB,CAAC;QACrB,6BAAwB,GACtB,mDAAwB,CAAC;QAE3B,uBAAkB,GAAG,6BAAiB,CAAC;QAEvC,WAAM,GAKgC,eAAM,CAAC;QAE7C,uBAAkB,GAKoB,4BAAkB,CAAC;QACzD,2BAAsB,GAKqB,uCAAsB,CAAC;QAElE,+BAA0B,GAG6B,yCAA0B,CAAC;QAElF,oBAAe,GAO0B,iCAAe,CAAC;QAEzD,cAAS,GAAyE,qBAAS,CAAC;QAE5F,iBAAY,GAK2C,2BAAY,CAAC;QAEpE,4BAAuB,GAMgC,sCAAuB,CAAC;QAE/E,oBAAe,GAKuB,CACpC,GAAe,EACf,MAAgC,EAChC,OAAgC,EAChC,aAA4B,EAC5B,EAAE,CAAC,iCAAe,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC,CAAC;QAE7E,oBAAe,GAKuB,CACpC,GAAe,EACf,MAAgC,EAChC,OAAgC,EAChC,aAA4B,EAC5B,EAAE,CAAC,iCAAe,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC,CAAC;QAE7E,qBAAgB,GAKsB,CACpC,GAAe,EACf,MAAgC,EAChC,OAAgC,EAChC,aAA4B,EAC5B,EAAE,CAAC,mCAAgB,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC,CAAC;IAChF,CAAC;CAAA,CAAA;AAjGY,kBAAkB;IAD9B,gBAAO,CAAC,2CAAiB,CAAC,oBAAoB,CAAC;GACnC,kBAAkB,CAiG9B;AAjGY,gDAAkB"}

package/build/plugins/solution/fx-solution/v2/utils.d.ts

@@ -1,20 +1,20 @@
-import { v2, Inputs, FxError, Result, AzureSolutionSettings, Void, PermissionRequestProvider, Json, SolutionContext, Plugin, AppStudioTokenProvider } from "@microsoft/teamsfx-api";
+import { v2, Inputs, FxError, Result, AzureSolutionSettings, Void, PermissionRequestProvider, Json, SolutionContext, Plugin, AppStudioTokenProvider, ProjectSettings } from "@microsoft/teamsfx-api";
 import { PluginsWithContext } from "../solution";
-export declare function getSelectedPlugins(azureSettings: AzureSolutionSettings): v2.ResourcePlugin[];
-export declare function getAzureSolutionSettings(ctx: v2.Context): AzureSolutionSettings;
-export declare function isAzureProject(azureSettings: AzureSolutionSettings): boolean;
+export declare function getSelectedPlugins(projectSettings: ProjectSettings): v2.ResourcePlugin[];
+export declare function getAzureSolutionSettings(ctx: v2.Context): AzureSolutionSettings | undefined;
+export declare function isAzureProject(azureSettings: AzureSolutionSettings | undefined): boolean;
 export declare function combineRecords<T>(records: {
     name: string;
     result: T;
 }[]): Record<string, T>;
 export declare function extractSolutionInputs(record: Json): v2.SolutionInputs;
-export declare function reloadV2Plugins(solutionSettings: AzureSolutionSettings): v2.ResourcePlugin[];
+export declare function setActivatedResourcePluginsV2(projectSettings: ProjectSettings): void;
 export declare function ensurePermissionRequest(solutionSettings: AzureSolutionSettings, permissionRequestProvider: PermissionRequestProvider): Promise<Result<Void, FxError>>;
 export declare function parseTeamsAppTenantId(appStudioToken?: Record<string, unknown>): Result<string, FxError>;
 export declare function parseUserName(appStudioToken?: Record<string, unknown>): Result<string, FxError>;
 export declare function checkWhetherLocalDebugM365TenantMatches(localDebugTenantId?: string, appStudioTokenProvider?: AppStudioTokenProvider): Promise<Result<Void, FxError>>;
 export declare function loadTeamsAppTenantIdForLocal(localSettings: v2.LocalSettings, appStudioToken?: Record<string, unknown>): Result<Void, FxError>;
-export declare function fillInSolutionSettings(solutionSettings: AzureSolutionSettings, answers: Inputs): Result<Void, FxError>;
+export declare function fillInSolutionSettings(projectSettings: ProjectSettings, answers: Inputs): Result<Void, FxError>;
 export declare function checkWetherProvisionSucceeded(config: Json): boolean;
 export declare function getPluginAndContextArray(ctx: SolutionContext, selectedPlugins: Plugin[]): PluginsWithContext[];
 //# sourceMappingURL=utils.d.ts.map

package/build/plugins/solution/fx-solution/v2/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,EAAE,EACF,MAAM,EACN,OAAO,EACP,MAAM,EAGN,qBAAqB,EACrB,IAAI,EAEJ,yBAAyB,EAEzB,IAAI,EACJ,eAAe,EACf,MAAM,EACN,sBAAsB,EACvB,MAAM,wBAAwB,CAAC;AAsBhC,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAIjD,wBAAgB,kBAAkB,CAAC,aAAa,EAAE,qBAAqB,GAAG,EAAE,CAAC,cAAc,EAAE,CAI5F;AAED,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,GAAG,qBAAqB,CAE/E;AAED,wBAAgB,cAAc,CAAC,aAAa,EAAE,qBAAqB,GAAG,OAAO,CAE5E;AAED,wBAAgB,cAAc,CAAC,CAAC,EAAE,OAAO,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,CAAC,CAAA;CAAE,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAO3F;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,IAAI,GAAG,EAAE,CAAC,cAAc,CAWrE;AAED,wBAAgB,eAAe,CAAC,gBAAgB,EAAE,qBAAqB,GAAG,EAAE,CAAC,cAAc,EAAE,CAI5F;AAED,wBAAsB,uBAAuB,CAC3C,gBAAgB,EAAE,qBAAqB,EACvC,yBAAyB,EAAE,yBAAyB,GACnD,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAqBhC;AAED,wBAAgB,qBAAqB,CACnC,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACvC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CA0BzB;AAED,wBAAgB,aAAa,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAsB/F;AAED,wBAAsB,uCAAuC,CAC3D,kBAAkB,CAAC,EAAE,MAAM,EAC3B,sBAAsB,CAAC,EAAE,sBAAsB,GAC9C,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CA+BhC;AAGD,wBAAgB,4BAA4B,CAC1C,aAAa,EAAE,EAAE,CAAC,aAAa,EAC/B,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACvC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAOvB;AAED,wBAAgB,sBAAsB,CACpC,gBAAgB,EAAE,qBAAqB,EACvC,OAAO,EAAE,MAAM,GACd,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAiDvB;AAED,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,IAAI,GAAG,OAAO,CAMnE;AAED,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,eAAe,EACpB,eAAe,EAAE,MAAM,EAAE,GACxB,kBAAkB,EAAE,CAEtB"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,EAAE,EACF,MAAM,EACN,OAAO,EACP,MAAM,EAGN,qBAAqB,EACrB,IAAI,EAEJ,yBAAyB,EAEzB,IAAI,EACJ,eAAe,EACf,MAAM,EACN,sBAAsB,EACtB,eAAe,EAChB,MAAM,wBAAwB,CAAC;AAsBhC,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAIjD,wBAAgB,kBAAkB,CAAC,eAAe,EAAE,eAAe,GAAG,EAAE,CAAC,cAAc,EAAE,CAExF;AAED,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,GAAG,qBAAqB,GAAG,SAAS,CAE3F;AAED,wBAAgB,cAAc,CAAC,aAAa,EAAE,qBAAqB,GAAG,SAAS,GAAG,OAAO,CAExF;AAED,wBAAgB,cAAc,CAAC,CAAC,EAAE,OAAO,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,CAAC,CAAA;CAAE,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAO3F;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,IAAI,GAAG,EAAE,CAAC,cAAc,CAWrE;AAED,wBAAgB,6BAA6B,CAAC,eAAe,EAAE,eAAe,GAAG,IAAI,CAKpF;AAED,wBAAsB,uBAAuB,CAC3C,gBAAgB,EAAE,qBAAqB,EACvC,yBAAyB,EAAE,yBAAyB,GACnD,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAqBhC;AAED,wBAAgB,qBAAqB,CACnC,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACvC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CA0BzB;AAED,wBAAgB,aAAa,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAsB/F;AAED,wBAAsB,uCAAuC,CAC3D,kBAAkB,CAAC,EAAE,MAAM,EAC3B,sBAAsB,CAAC,EAAE,sBAAsB,GAC9C,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CA+BhC;AAGD,wBAAgB,4BAA4B,CAC1C,aAAa,EAAE,EAAE,CAAC,aAAa,EAC/B,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACvC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAOvB;AAED,wBAAgB,sBAAsB,CACpC,eAAe,EAAE,eAAe,EAChC,OAAO,EAAE,MAAM,GACd,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAqDvB;AAED,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,IAAI,GAAG,OAAO,CAEnE;AAED,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,eAAe,EACpB,eAAe,EAAE,MAAM,EAAE,GACxB,kBAAkB,EAAE,CAEtB"}

package/build/plugins/solution/fx-solution/v2/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPluginAndContextArray = exports.checkWetherProvisionSucceeded = exports.fillInSolutionSettings = exports.loadTeamsAppTenantIdForLocal = exports.checkWhetherLocalDebugM365TenantMatches = exports.parseUserName = exports.parseTeamsAppTenantId = exports.ensurePermissionRequest = exports.reloadV2Plugins = exports.extractSolutionInputs = exports.combineRecords = exports.isAzureProject = exports.getAzureSolutionSettings = exports.getSelectedPlugins = void 0;
+exports.getPluginAndContextArray = exports.checkWetherProvisionSucceeded = exports.fillInSolutionSettings = exports.loadTeamsAppTenantIdForLocal = exports.checkWhetherLocalDebugM365TenantMatches = exports.parseUserName = exports.parseTeamsAppTenantId = exports.ensurePermissionRequest = exports.setActivatedResourcePluginsV2 = exports.extractSolutionInputs = exports.combineRecords = exports.isAzureProject = exports.getAzureSolutionSettings = exports.getSelectedPlugins = void 0;
 const tslib_1 = require("tslib");
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const localSettingsConstants_1 = require("../../../../common/localSettingsConstants");
@@ -10,10 +10,8 @@ const question_1 = require("../question");
 const ResourcePluginContainer_1 = require("../ResourcePluginContainer");
 const util_1 = require("../utils/util");
 const util = tslib_1.__importStar(require("util"));
-function getSelectedPlugins(azureSettings) {
-    const plugins = ResourcePluginContainer_1.getActivatedV2ResourcePlugins(azureSettings);
-    azureSettings.activeResourcePlugins = plugins.map((p) => p.name);
-    return plugins;
+function getSelectedPlugins(projectSettings) {
+    return ResourcePluginContainer_1.getActivatedV2ResourcePlugins(projectSettings);
 }
 exports.getSelectedPlugins = getSelectedPlugins;
 function getAzureSolutionSettings(ctx) {
@@ -21,7 +19,7 @@ function getAzureSolutionSettings(ctx) {
 }
 exports.getAzureSolutionSettings = getAzureSolutionSettings;
 function isAzureProject(azureSettings) {
-    return question_1.HostTypeOptionAzure.id === azureSettings.hostType;
+    return azureSettings !== undefined && question_1.HostTypeOptionAzure.id === azureSettings.hostType;
 }
 exports.isAzureProject = isAzureProject;
 function combineRecords(records) {
@@ -45,12 +43,13 @@ function extractSolutionInputs(record) {
     };
 }
 exports.extractSolutionInputs = extractSolutionInputs;
-function reloadV2Plugins(solutionSettings) {
-    const res = ResourcePluginContainer_1.getActivatedV2ResourcePlugins(solutionSettings);
-    solutionSettings.activeResourcePlugins = res.map((p) => p.name);
-    return res;
+function setActivatedResourcePluginsV2(projectSettings) {
+    const activatedPluginNames = ResourcePluginContainer_1.getAllV2ResourcePlugins()
+        .filter((p) => p.activate && p.activate(projectSettings) === true)
+        .map((p) => p.name);
+    projectSettings.solutionSettings.activeResourcePlugins = activatedPluginNames;
 }
-exports.reloadV2Plugins = reloadV2Plugins;
+exports.setActivatedResourcePluginsV2 = setActivatedResourcePluginsV2;
 async function ensurePermissionRequest(solutionSettings, permissionRequestProvider) {
     if (solutionSettings.migrateFromV1) {
         return teamsfx_api_1.ok(teamsfx_api_1.Void);
@@ -100,7 +99,7 @@ async function checkWhetherLocalDebugM365TenantMatches(localDebugTenantId, appSt
             throw teamsfx_api_1.err(m365UserAccount.error);
         }
         if (m365TenantId.value !== localDebugTenantId) {
-            const errorMessage = util.format(tools_1.getStrings().solution.LocalDebugTenantConfirmNotice, localDebugTenantId, m365UserAccount.value, tools_1.isMultiEnvEnabled() ? "localSettings.json" : "default.userdata");
+            const errorMessage = util.format(tools_1.getStrings().solution.LocalDebugTenantConfirmNotice, localDebugTenantId, m365UserAccount.value, "localSettings.json");
             return teamsfx_api_1.err(teamsfx_api_1.returnUserError(new Error(errorMessage), "Solution", constants_1.SolutionError.CannotLocalDebugInDifferentTenant));
         }
     }
@@ -115,7 +114,8 @@ function loadTeamsAppTenantIdForLocal(localSettings, appStudioToken) {
     });
 }
 exports.loadTeamsAppTenantIdForLocal = loadTeamsAppTenantIdForLocal;
-function fillInSolutionSettings(solutionSettings, answers) {
+function fillInSolutionSettings(projectSettings, answers) {
+    const solutionSettings = projectSettings.solutionSettings || {};
     let capabilities = answers[question_1.AzureSolutionQuestionNames.Capabilities] || [];
     if (!capabilities || capabilities.length === 0) {
         return teamsfx_api_1.err(teamsfx_api_1.returnSystemError(new Error("capabilities is empty"), constants_1.SolutionSource, constants_1.SolutionError.InternelError));
@@ -150,13 +150,13 @@ function fillInSolutionSettings(solutionSettings, answers) {
     }
     solutionSettings.azureResources = azureResources || [];
     solutionSettings.capabilities = capabilities || [];
+    // fill in activeResourcePlugins
+    setActivatedResourcePluginsV2(projectSettings);
     return teamsfx_api_1.ok(teamsfx_api_1.Void);
 }
 exports.fillInSolutionSettings = fillInSolutionSettings;
 function checkWetherProvisionSucceeded(config) {
-    return (config[constants_1.GLOBAL_CONFIG] &&
-        config[constants_1.GLOBAL_CONFIG]["output"] &&
-        config[constants_1.GLOBAL_CONFIG]["output"][constants_1.SOLUTION_PROVISION_SUCCEEDED]);
+    return config[constants_1.GLOBAL_CONFIG] && config[constants_1.GLOBAL_CONFIG][constants_1.SOLUTION_PROVISION_SUCCEEDED];
 }
 exports.checkWetherProvisionSucceeded = checkWetherProvisionSucceeded;
 function getPluginAndContextArray(ctx, selectedPlugins) {

package/build/plugins/solution/fx-solution/v2/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/utils.ts"],"names":[],"mappings":"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"}

package/build/plugins/solution/fx-solution/v3/addModule.d.ts

@@ -1,6 +1,4 @@
-import { FxError, Json, QTreeNode, Result, v2, Void } from "@microsoft/teamsfx-api";
+import { FxError, Json, QTreeNode, Result, v2, v3 } from "@microsoft/teamsfx-api";
 export declare function getQuestionsForAddModule(ctx: v2.Context, inputs: v2.InputsWithProjectPath): Promise<Result<QTreeNode | undefined, FxError>>;
-export declare function addModule(ctx: v2.Context, localSettings: Json, inputs: v2.InputsWithProjectPath & {
-    capabilities?: string[];
-}): Promise<Result<Void, FxError>>;
+export declare function addModule(ctx: v2.Context, inputs: v3.SolutionAddModuleInputs, localSettings?: Json): Promise<Result<Json, FxError>>;
 //# sourceMappingURL=addModule.d.ts.map

package/build/plugins/solution/fx-solution/v3/addModule.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"addModule.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/addModule.ts"],"names":[],"mappings":"AAGA,OAAO,EAAO,OAAO,EAAE,IAAI,EAAM,SAAS,EAAE,MAAM,EAAE,EAAE,EAAM,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAIjG,wBAAsB,wBAAwB,CAC5C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,GAC/B,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAEjD;AACD,wBAAsB,SAAS,CAC7B,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,aAAa,EAAE,IAAI,EACnB,MAAM,EAAE,EAAE,CAAC,qBAAqB,GAAG;IAAE,YAAY,CAAC,EAAE,MAAM,EAAE,CAAA;CAAE,GAC7D,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAmBhC"}
+{"version":3,"file":"addModule.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/addModule.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,OAAO,EAKP,IAAI,EAEJ,SAAS,EACT,MAAM,EACN,EAAE,EACF,EAAE,EACH,MAAM,wBAAwB,CAAC;AAShC,wBAAsB,wBAAwB,CAC5C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,GAC/B,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAEjD;AACD,wBAAsB,SAAS,CAC7B,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,uBAAuB,EAClC,aAAa,CAAC,EAAE,IAAI,GACnB,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAiDhC"}

package/build/plugins/solution/fx-solution/v3/addModule.js

@@ -4,20 +4,26 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addModule = exports.getQuestionsForAddModule = void 0;
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
+const typedi_1 = require("typedi");
+const scaffolding_1 = require("../debug/scaffolding");
+const question_1 = require("../question");
+const constants_1 = require("./constants");
 const error_1 = require("./error");
 const questions_1 = require("../../utils/questions");
 async function getQuestionsForAddModule(ctx, inputs) {
     return teamsfx_api_1.ok(new teamsfx_api_1.QTreeNode(questions_1.selectCapabilitiesQuestion));
 }
 exports.getQuestionsForAddModule = getQuestionsForAddModule;
-async function addModule(ctx, localSettings, inputs) {
+async function addModule(ctx, inputs, localSettings) {
     const solutionSettings = ctx.projectSetting.solutionSettings;
+    const inputCapabilities = inputs.capabilities;
+    // 1. update solution settings
     const module = {
-        capabilities: inputs.capabilities || [],
+        capabilities: inputCapabilities,
     };
     const capSet = new Set();
     solutionSettings.modules.forEach((m) => m.capabilities.forEach((c) => capSet.add(c)));
-    for (const cap of inputs.capabilities || []) {
+    for (const cap of inputCapabilities) {
         if (capSet.has(cap)) {
             return teamsfx_api_1.err(new error_1.CapabilityAlreadyAddedError(cap));
         }
@@ -27,9 +33,26 @@ async function addModule(ctx, localSettings, inputs) {
     }
     solutionSettings.capabilities = Array.from(capSet);
     solutionSettings.modules.push(module);
-    //TODO
-    //call localDebug plugin's scaffold API
-    return teamsfx_api_1.ok(teamsfx_api_1.Void);
+    // 2. scaffold local debug settings
+    const scaffoldLocalDebugSettingsResult = await scaffolding_1.scaffoldLocalDebugSettings(ctx, inputs, localSettings);
+    if (scaffoldLocalDebugSettingsResult.isErr()) {
+        return scaffoldLocalDebugSettingsResult;
+    }
+    // 3. call appStudio.addCapabilities() to update manifest templates
+    if (inputCapabilities.length > 0) {
+        const appStudio = typedi_1.Container.get(constants_1.BuiltInResourcePluginNames.appStudio);
+        const manifestInputs = [];
+        if (inputCapabilities.includes(question_1.TabOptionItem.id))
+            manifestInputs.push({ name: "staticTab" });
+        if (inputCapabilities.includes(question_1.BotOptionItem.id))
+            manifestInputs.push({ name: "Bot" });
+        if (inputCapabilities.includes(question_1.MessageExtensionItem.id))
+            manifestInputs.push({ name: "MessageExtension" });
+        const addRes = await appStudio.addCapabilities(ctx, inputs, manifestInputs);
+        if (addRes.isErr())
+            return teamsfx_api_1.err(addRes.error);
+    }
+    return teamsfx_api_1.ok(scaffoldLocalDebugSettingsResult.value);
 }
 exports.addModule = addModule;
 //# sourceMappingURL=addModule.js.map

package/build/plugins/solution/fx-solution/v3/addModule.js.map

@@ -1 +1 @@
-{"version":3,"file":"addModule.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/addModule.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAAiG;AACjG,mCAAsD;AACtD,qDAAmE;AAE5D,KAAK,UAAU,wBAAwB,CAC5C,GAAe,EACf,MAAgC;IAEhC,OAAO,gBAAE,CAAC,IAAI,uBAAS,CAAC,sCAA0B,CAAC,CAAC,CAAC;AACvD,CAAC;AALD,4DAKC;AACM,KAAK,UAAU,SAAS,CAC7B,GAAe,EACf,aAAmB,EACnB,MAA8D;IAE9D,MAAM,gBAAgB,GAAG,GAAG,CAAC,cAAc,CAAC,gBAA8C,CAAC;IAC3F,MAAM,MAAM,GAAc;QACxB,YAAY,EAAE,MAAM,CAAC,YAAY,IAAI,EAAE;KACxC,CAAC;IACF,MAAM,MAAM,GAAG,IAAI,GAAG,EAAU,CAAC;IACjC,gBAAgB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACtF,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,YAAY,IAAI,EAAE,EAAE;QAC3C,IAAI,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;YACnB,OAAO,iBAAG,CAAC,IAAI,mCAA2B,CAAC,GAAG,CAAC,CAAC,CAAC;SAClD;aAAM;YACL,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;SACjB;KACF;IACD,gBAAgB,CAAC,YAAY,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACnD,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACtC,MAAM;IACN,uCAAuC;IACvC,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;AAClB,CAAC;AAvBD,8BAuBC"}
+{"version":3,"file":"addModule.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/addModule.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAagC;AAChC,mCAAmC;AAEnC,sDAAkE;AAClE,0CAAiF;AACjF,2CAAyD;AACzD,mCAAsD;AACtD,qDAAmE;AAE5D,KAAK,UAAU,wBAAwB,CAC5C,GAAe,EACf,MAAgC;IAEhC,OAAO,gBAAE,CAAC,IAAI,uBAAS,CAAC,sCAA0B,CAAC,CAAC,CAAC;AACvD,CAAC;AALD,4DAKC;AACM,KAAK,UAAU,SAAS,CAC7B,GAAe,EACf,MAAkC,EAClC,aAAoB;IAEpB,MAAM,gBAAgB,GAAG,GAAG,CAAC,cAAc,CAAC,gBAA8C,CAAC;IAC3F,MAAM,iBAAiB,GAAG,MAAM,CAAC,YAAY,CAAC;IAC9C,8BAA8B;IAC9B,MAAM,MAAM,GAAc;QACxB,YAAY,EAAE,iBAAiB;KAChC,CAAC;IACF,MAAM,MAAM,GAAG,IAAI,GAAG,EAAU,CAAC;IACjC,gBAAgB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACtF,KAAK,MAAM,GAAG,IAAI,iBAAiB,EAAE;QACnC,IAAI,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;YACnB,OAAO,iBAAG,CAAC,IAAI,mCAA2B,CAAC,GAAG,CAAC,CAAC,CAAC;SAClD;aAAM;YACL,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;SACjB;KACF;IACD,gBAAgB,CAAC,YAAY,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACnD,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAEtC,mCAAmC;IACnC,MAAM,gCAAgC,GAAG,MAAM,wCAA0B,CACvE,GAAG,EACH,MAAM,EACN,aAAa,CACd,CAAC;IACF,IAAI,gCAAgC,CAAC,KAAK,EAAE,EAAE;QAC5C,OAAO,gCAAgC,CAAC;KACzC;IAED,mEAAmE;IACnE,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE;QAChC,MAAM,SAAS,GAAG,kBAAS,CAAC,GAAG,CAAoB,sCAA0B,CAAC,SAAS,CAAC,CAAC;QACzF,MAAM,cAAc,GAQd,EAAE,CAAC;QACT,IAAI,iBAAiB,CAAC,QAAQ,CAAC,wBAAa,CAAC,EAAE,CAAC;YAAE,cAAc,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC;QAC7F,IAAI,iBAAiB,CAAC,QAAQ,CAAC,wBAAa,CAAC,EAAE,CAAC;YAAE,cAAc,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;QACvF,IAAI,iBAAiB,CAAC,QAAQ,CAAC,+BAAoB,CAAC,EAAE,CAAC;YACrD,cAAc,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,kBAAkB,EAAE,CAAC,CAAC;QACpD,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC;QAC5E,IAAI,MAAM,CAAC,KAAK,EAAE;YAAE,OAAO,iBAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;KAC9C;IACD,OAAO,gBAAE,CAAC,gCAAgC,CAAC,KAAK,CAAC,CAAC;AACpD,CAAC;AArDD,8BAqDC"}

package/build/plugins/solution/fx-solution/v3/addResource.d.ts

@@ -1,37 +1,29 @@
 import { AzureAccountProvider, FxError, QTreeNode, Result, TokenProvider, v2, v3, Void } from "@microsoft/teamsfx-api";
-export declare class AzureStoragePlugin implements v3.ResourcePlugin {
-    resourceType: string;
-    description: string;
-    name: string;
-    generateResourceTemplate(ctx: v2.Context, inputs: v2.InputsWithProjectPath): Promise<Result<v2.ResourceTemplate, FxError>>;
-    provisionResource(ctx: v2.Context, inputs: v2.InputsWithProjectPath, envInfo: v2.DeepReadonly<v3.EnvInfoV3>, tokenProvider: TokenProvider): Promise<Result<v3.CloudResource, FxError>>;
-    deploy(ctx: v2.Context, inputs: v3.PluginDeployInputs, envInfo: v2.DeepReadonly<v3.EnvInfoV3>, tokenProvider: AzureAccountProvider): Promise<Result<Void, FxError>>;
-}
 export declare class AzureBotPlugin implements v3.ResourcePlugin {
+    type: "resource";
     resourceType: string;
     description: string;
     name: string;
-    generateResourceTemplate(ctx: v2.Context, inputs: v2.InputsWithProjectPath): Promise<Result<v2.ResourceTemplate, FxError>>;
+    generateResourceTemplate(ctx: v2.Context, inputs: v3.PluginAddResourceInputs): Promise<Result<v2.ResourceTemplate, FxError>>;
     provisionResource(ctx: v2.Context, inputs: v2.InputsWithProjectPath, envInfo: v2.DeepReadonly<v3.EnvInfoV3>, tokenProvider: TokenProvider): Promise<Result<v3.CloudResource, FxError>>;
     deploy(ctx: v2.Context, inputs: v3.PluginDeployInputs, envInfo: v2.DeepReadonly<v3.EnvInfoV3>, tokenProvider: AzureAccountProvider): Promise<Result<Void, FxError>>;
 }
 export declare class AzureWebAppPlugin implements v3.ResourcePlugin {
+    type: "resource";
     resourceType: string;
     description: string;
     name: string;
-    generateResourceTemplate(ctx: v2.Context, inputs: v2.InputsWithProjectPath): Promise<Result<v2.ResourceTemplate, FxError>>;
+    generateResourceTemplate(ctx: v2.Context, inputs: v3.PluginAddResourceInputs): Promise<Result<v2.ResourceTemplate, FxError>>;
     provisionResource(ctx: v2.Context, inputs: v2.InputsWithProjectPath, envInfo: v2.DeepReadonly<v3.EnvInfoV3>, tokenProvider: TokenProvider): Promise<Result<v3.CloudResource, FxError>>;
     deploy(ctx: v2.Context, inputs: v3.PluginDeployInputs, envInfo: v2.DeepReadonly<v3.EnvInfoV3>, tokenProvider: AzureAccountProvider): Promise<Result<Void, FxError>>;
 }
 export declare class SPFxResourcePlugin implements v3.ResourcePlugin {
+    type: "resource";
     resourceType: string;
     description: string;
     name: string;
     deploy(ctx: v2.Context, inputs: v3.PluginDeployInputs, envInfo: v2.DeepReadonly<v3.EnvInfoV3>, tokenProvider: AzureAccountProvider): Promise<Result<Void, FxError>>;
 }
 export declare function getQuestionsForAddResource(ctx: v2.Context, inputs: v2.InputsWithProjectPath): Promise<Result<QTreeNode | undefined, FxError>>;
-export declare function addResource(ctx: v2.Context, inputs: v2.InputsWithProjectPath & {
-    module?: string;
-    resource?: string;
-}): Promise<Result<Void, FxError>>;
+export declare function addResource(ctx: v2.Context, inputs: v3.SolutionAddResourceInputs): Promise<Result<Void, FxError>>;
 //# sourceMappingURL=addResource.d.ts.map

package/build/plugins/solution/fx-solution/v3/addResource.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"addResource.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/addResource.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"addResource.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/addResource.ts"],"names":[],"mappings":"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"}

package/build/plugins/solution/fx-solution/v3/addResource.js

@@ -2,9 +2,10 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addResource = exports.getQuestionsForAddResource = exports.SPFxResourcePlugin = exports.AzureWebAppPlugin = exports.AzureBotPlugin = exports.AzureStoragePlugin = void 0;
+exports.addResource = exports.getQuestionsForAddResource = exports.SPFxResourcePlugin = exports.AzureWebAppPlugin = exports.AzureBotPlugin = void 0;
 const tslib_1 = require("tslib");
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
+const lodash_1 = require("lodash");
 const typedi_1 = require("typedi");
 const arm_1 = tslib_1.__importDefault(require("../arm"));
 const constants_1 = require("./constants");
@@ -12,51 +13,9 @@ const error_1 = require("./error");
 const questions_1 = require("../../utils/questions");
 const utils_1 = require("./utils");
 const error_2 = require("../../utils/error");
-let AzureStoragePlugin = class AzureStoragePlugin {
-    constructor() {
-        this.resourceType = "Azure Storage";
-        this.description = "Azure Storage";
-        this.name = constants_1.BuiltInResourcePluginNames.storage;
-    }
-    async generateResourceTemplate(ctx, inputs) {
-        return teamsfx_api_1.ok({
-            kind: "bicep",
-            template: {
-                Provision: {
-                    Orchestration: "Orchestration",
-                    Reference: {
-                        endpoint: "provisionOutputs.azureStorageOutput.value.endpoint",
-                        domain: "provisionOutputs.azureStorageOutput.value.domain",
-                    },
-                    Modules: {
-                        azureStorage: "",
-                    },
-                },
-                Parameters: {
-                    azureStorageK1: "v1",
-                },
-            },
-        });
-    }
-    async provisionResource(ctx, inputs, envInfo, tokenProvider) {
-        const config = {
-            domain: "huajie1214dev35e42dtab.z19.web.core.windows.net",
-            endpoint: "https://huajie1214dev35e42dtab.z19.web.core.windows.net",
-            storageResourceId: "/subscriptions/63f43cd3-ab63-429d-80ad-950ec8359724/resourceGroups/fullcap-dev-rg/providers/Microsoft.Storage/storageAccounts/huajie1214dev35e42dtab",
-        };
-        return teamsfx_api_1.ok(config);
-    }
-    async deploy(ctx, inputs, envInfo, tokenProvider) {
-        ctx.logProvider.info(`fx-resource-azure-storage deploy success!`);
-        return teamsfx_api_1.ok(teamsfx_api_1.Void);
-    }
-};
-AzureStoragePlugin = tslib_1.__decorate([
-    typedi_1.Service(constants_1.BuiltInResourcePluginNames.storage)
-], AzureStoragePlugin);
-exports.AzureStoragePlugin = AzureStoragePlugin;
 let AzureBotPlugin = class AzureBotPlugin {
     constructor() {
+        this.type = "resource";
         this.resourceType = "Azure Bot";
         this.description = "Azure Bot";
         this.name = constants_1.BuiltInResourcePluginNames.bot;
@@ -83,14 +42,14 @@ let AzureBotPlugin = class AzureBotPlugin {
     }
     async provisionResource(ctx, inputs, envInfo, tokenProvider) {
         const config = {
-            botId: "e01c3709-3700-45dd-9f23-bdbedc78392e",
-            objectId: "ea553a03-0322-4c9a-8bd5-8d56d1d2b534",
+            botId: "mockBotId",
+            objectId: "testObjectId",
             skuName: "F1",
-            siteName: "huajie1214dev35e42dbot",
-            validDomain: "huajie1214dev35e42dbot.azurewebsites.net",
-            appServicePlanName: "huajie1214dev35e42dbot",
-            botWebAppResourceId: "/subscriptions/63f43cd3-ab63-429d-80ad-950ec8359724/resourceGroups/fullcap-dev-rg/providers/Microsoft.Web/sites/huajie1214dev35e42dbot",
-            siteEndpoint: "https://huajie1214dev35e42dbot.azurewebsites.net",
+            siteName: "mockSiteName",
+            validDomain: "abc.com",
+            appServicePlanName: "mockPlan",
+            botWebAppResourceId: "/subscriptions/xxxxx-yyy-zzzz/resourceGroups/rprprprp/providers/Microsoft.Web/sites/mockId",
+            siteEndpoint: "https://abc.azurewebsites.net",
             botPassword: "{{fx-resource-bot.botPassword}}",
             secretFields: ["botPassword"],
         };
@@ -107,6 +66,7 @@ AzureBotPlugin = tslib_1.__decorate([
 exports.AzureBotPlugin = AzureBotPlugin;
 let AzureWebAppPlugin = class AzureWebAppPlugin {
     constructor() {
+        this.type = "resource";
         this.resourceType = "Azure Web App";
         this.description = "Azure Web App";
         this.name = constants_1.BuiltInResourcePluginNames.webApp;
@@ -133,8 +93,8 @@ let AzureWebAppPlugin = class AzureWebAppPlugin {
     }
     async provisionResource(ctx, inputs, envInfo, tokenProvider) {
         const config = {
-            resourceId: "/subscriptions/63f43cd3-ab63-429d-80ad-950ec8359724/resourceGroups/fullcap-dev-rg/providers/Microsoft.Web/sites/huajie1214dev35e42dbot",
-            endpoint: "https://huajie1214dev35e42dbot.azurewebsites.net",
+            resourceId: "/subscriptions/aaaa-bbbb-cccc/resourceGroups/rgrgrg/providers/Microsoft.Web/sites/mockId",
+            endpoint: "https://abc.azurewebsites.net",
         };
         return teamsfx_api_1.ok(config);
     }
@@ -149,6 +109,7 @@ AzureWebAppPlugin = tslib_1.__decorate([
 exports.AzureWebAppPlugin = AzureWebAppPlugin;
 let SPFxResourcePlugin = class SPFxResourcePlugin {
     constructor() {
+        this.type = "resource";
         this.resourceType = "SPFx resource";
         this.description = "SPFx resource";
         this.name = constants_1.BuiltInResourcePluginNames.spfx;
@@ -164,9 +125,8 @@ SPFxResourcePlugin = tslib_1.__decorate([
 exports.SPFxResourcePlugin = SPFxResourcePlugin;
 function getAllResourcePlugins() {
     return [
-        typedi_1.Container.get(constants_1.BuiltInResourcePluginNames.webApp),
-        typedi_1.Container.get(constants_1.BuiltInResourcePluginNames.bot),
-        typedi_1.Container.get(constants_1.BuiltInResourcePluginNames.webApp),
+        typedi_1.Container.get(constants_1.BuiltInResourcePluginNames.storage),
+        typedi_1.Container.get(constants_1.BuiltInResourcePluginNames.aad),
     ];
 }
 async function getQuestionsForAddResource(ctx, inputs) {
@@ -194,6 +154,8 @@ async function addResource(ctx, inputs) {
         return teamsfx_api_1.err(new error_2.InvalidInputError(inputs, "inputs.resource undefined"));
     }
     const solutionSettings = ctx.projectSetting.solutionSettings;
+    const originalSettings = lodash_1.cloneDeep(solutionSettings);
+    const inputsNew = Object.assign(Object.assign({}, inputs), { existingResources: originalSettings.activeResourcePlugins });
     if (inputs.module !== undefined) {
         const module = utils_1.getModule(solutionSettings, inputs.module);
         if (module) {
@@ -215,10 +177,18 @@ async function addResource(ctx, inputs) {
     addedResourceNames.forEach((s) => allResourceNames.add(s));
     existingResourceNames.forEach((s) => allResourceNames.add(s));
     solutionSettings.activeResourcePlugins = Array.from(allResourceNames);
+    // read manifest
+    const appStudio = typedi_1.Container.get(constants_1.BuiltInResourcePluginNames.appStudio);
+    const manifestRes = await appStudio.loadManifest(ctx, inputs);
+    if (manifestRes.isErr()) {
+        return teamsfx_api_1.err(manifestRes.error);
+    }
+    const manifest = manifestRes.value;
+    const contextWithManifest = Object.assign(Object.assign({}, ctx), { appManifest: manifest });
     //call arm module to generate arm templates
     const activatedPlugins = solutionSettings.activeResourcePlugins.map((n) => typedi_1.Container.get(n));
     const addedPlugins = Array.from(addedResourceNames).map((n) => typedi_1.Container.get(n));
-    const armRes = await arm_1.default.generateArmTemplate(ctx, inputs, activatedPlugins, addedPlugins);
+    const armRes = await arm_1.default.generateArmTemplate(contextWithManifest, inputsNew, activatedPlugins, addedPlugins);
     if (armRes.isErr()) {
         return teamsfx_api_1.err(armRes.error);
     }
@@ -227,13 +197,18 @@ async function addResource(ctx, inputs) {
         const plugin = typedi_1.Container.get(pluginName);
         if (addedResourceNames.has(pluginName) && !existingResourceNames.has(pluginName)) {
             if (plugin.addResource) {
-                const res = await plugin.addResource(ctx, inputs);
+                const res = await plugin.addResource(contextWithManifest, inputsNew);
                 if (res.isErr()) {
                     return teamsfx_api_1.err(res.error);
                 }
             }
         }
     }
+    // write manifest
+    const writeRes = await appStudio.saveManifest(ctx, inputs, manifest);
+    if (writeRes.isErr()) {
+        return teamsfx_api_1.err(writeRes.error);
+    }
     return teamsfx_api_1.ok(teamsfx_api_1.Void);
 }
 exports.addResource = addResource;