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

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

@@ -41,8 +41,7 @@ async function executeCheckPermissionV1(ctx, userInfo) {
     return [permissions, errors];
 }
 async function executeCheckPermissionV2(ctx, inputs, envInfo, tokenProvider, userInfo) {
-    var _a;
-    const plugins = ResourcePluginContainer_1.getActivatedV2ResourcePlugins((_a = ctx.projectSetting) === null || _a === void 0 ? void 0 : _a.solutionSettings);
+    const plugins = ResourcePluginContainer_1.getActivatedV2ResourcePlugins(ctx.projectSetting);
     const thunks = plugins
         .filter((plugin) => !!plugin.checkPermission)
         .map((plugin) => {

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"createEnv.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/createEnv.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,OAAO,EACP,MAAM,EAEN,MAAM,EAEN,EAAE,EACF,IAAI,EACL,MAAM,wBAAwB,CAAC;AAMhC,wBAAsB,SAAS,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAgC/F"}
+{"version":3,"file":"createEnv.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/createEnv.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,OAAO,EACP,MAAM,EAEN,MAAM,EAEN,EAAE,EACF,IAAI,EACL,MAAM,wBAAwB,CAAC;AAKhC,wBAAsB,SAAS,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CA6B/F"}

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

@@ -2,13 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createEnv = void 0;
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
-const tools_1 = require("../../../../common/tools");
 const core_1 = require("../../../../core");
 const arm_1 = require("../arm");
 const utils_1 = require("./utils");
 async function createEnv(ctx, inputs) {
-    if (tools_1.isArmSupportEnabled() &&
-        utils_1.isAzureProject(ctx.projectSetting.solutionSettings)) {
+    if (utils_1.isAzureProject(ctx.projectSetting.solutionSettings)) {
         const solutionContext = {
             root: inputs.projectPath || "",
             envInfo: core_1.newEnvInfo(inputs.targetEnvName),

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

@@ -1 +1 @@
-{"version":3,"file":"createEnv.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/createEnv.ts"],"names":[],"mappings":";;;AAAA,wDAUgC;AAChC,oDAA+D;AAC/D,2CAA6D;AAC7D,gCAA6D;AAC7D,mCAAyC;AAElC,KAAK,UAAU,SAAS,CAAC,GAAe,EAAE,MAAc;IAC7D,IACE,2BAAmB,EAAE;QACrB,sBAAc,CAAC,GAAG,CAAC,cAAc,CAAC,gBAAyC,CAAC,EAC5E;QACA,MAAM,eAAe,GAAoB;YACvC,IAAI,EAAE,MAAM,CAAC,WAAW,IAAI,EAAE;YAC9B,OAAO,EAAE,iBAAU,CAAC,MAAM,CAAC,aAAa,CAAC;YACzC,eAAe,EAAE,GAAG,CAAC,cAAc;YACnC,OAAO,EAAE,MAAM;YACf,WAAW,EAAE,GAAG,CAAC,WAAW;YAC5B,iBAAiB,EAAE,GAAG,CAAC,iBAAiB;YACxC,cAAc,EAAE,GAAG,CAAC,cAAc;YAClC,yBAAyB,EAAE,GAAG,CAAC,yBAAyB;YACxD,EAAE,EAAE,GAAG,CAAC,eAAe;SACxB,CAAC;QACF,IAAI;YACF,IAAI,MAAM,CAAC,IAAI,KAAK,IAAI,EAAE;gBACxB,MAAM,uBAAiB,CACrB,MAAM,CAAC,WAAY,EACnB,GAAG,CAAC,cAAc,CAAC,OAAO,EAC1B,MAAM,CAAC,aAAc,EACrB,MAAM,CAAC,aAAc,CACtB,CAAC;aACH;iBAAM;gBACL,MAAM,sBAAgB,CAAC,eAAe,CAAC,CAAC;aACzC;SACF;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,iBAAG,CAAC,oBAAa,CAAC,CAAC,CAAC,CAAC,CAAC;SAC9B;KACF;IACD,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;AAClB,CAAC;AAhCD,8BAgCC"}
+{"version":3,"file":"createEnv.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/createEnv.ts"],"names":[],"mappings":";;;AAAA,wDAUgC;AAChC,2CAA6D;AAC7D,gCAA6D;AAC7D,mCAAyC;AAElC,KAAK,UAAU,SAAS,CAAC,GAAe,EAAE,MAAc;IAC7D,IAAI,sBAAc,CAAC,GAAG,CAAC,cAAc,CAAC,gBAAyC,CAAC,EAAE;QAChF,MAAM,eAAe,GAAoB;YACvC,IAAI,EAAE,MAAM,CAAC,WAAW,IAAI,EAAE;YAC9B,OAAO,EAAE,iBAAU,CAAC,MAAM,CAAC,aAAa,CAAC;YACzC,eAAe,EAAE,GAAG,CAAC,cAAc;YACnC,OAAO,EAAE,MAAM;YACf,WAAW,EAAE,GAAG,CAAC,WAAW;YAC5B,iBAAiB,EAAE,GAAG,CAAC,iBAAiB;YACxC,cAAc,EAAE,GAAG,CAAC,cAAc;YAClC,yBAAyB,EAAE,GAAG,CAAC,yBAAyB;YACxD,EAAE,EAAE,GAAG,CAAC,eAAe;SACxB,CAAC;QACF,IAAI;YACF,IAAI,MAAM,CAAC,IAAI,KAAK,IAAI,EAAE;gBACxB,MAAM,uBAAiB,CACrB,MAAM,CAAC,WAAY,EACnB,GAAG,CAAC,cAAc,CAAC,OAAO,EAC1B,MAAM,CAAC,aAAc,EACrB,MAAM,CAAC,aAAc,CACtB,CAAC;aACH;iBAAM;gBACL,MAAM,sBAAgB,CAAC,eAAe,CAAC,CAAC;aACzC;SACF;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,iBAAG,CAAC,oBAAa,CAAC,CAAC,CAAC,CAAC,CAAC;SAC9B;KACF;IACD,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;AAClB,CAAC;AA7BD,8BA6BC"}

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

@@ -22,7 +22,7 @@ async function deploy(ctx, inputs, envInfo, tokenProvider) {
     if (optionsToDeploy === undefined || optionsToDeploy.length === 0) {
         return teamsfx_api_1.err(teamsfx_api_1.returnUserError(new Error(`No plugin selected`), constants_2.SolutionSource, constants_2.SolutionError.NoResourcePluginSelected));
     }
-    const plugins = utils_1.getSelectedPlugins(utils_1.getAzureSolutionSettings(ctx));
+    const plugins = utils_1.getSelectedPlugins(ctx.projectSetting);
     const thunks = plugins
         .filter((plugin) => !lodash_1.isUndefined(plugin.deploy) && optionsToDeploy.includes(plugin.name))
         .map((plugin) => {

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

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

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

@@ -1,7 +1,7 @@
-import { v2, Inputs, FxError, Result, Func, TelemetryReporter, AzureSolutionSettings, Void, UserInteraction, SolutionSettings, TokenProvider, Json } from "@microsoft/teamsfx-api";
+import { v2, Inputs, FxError, Result, Func, TelemetryReporter, AzureSolutionSettings, Void, UserInteraction, SolutionSettings, TokenProvider, Json, ProjectSettings } from "@microsoft/teamsfx-api";
 export declare function executeUserTask(ctx: v2.Context, inputs: Inputs, func: Func, localSettings: Json, envInfo: v2.EnvInfoV2, tokenProvider: TokenProvider): Promise<Result<unknown, FxError>>;
 export declare function canAddCapability(settings: AzureSolutionSettings, telemetryReporter: TelemetryReporter): Result<Void, FxError>;
-export declare function canAddResource(settings: AzureSolutionSettings, telemetryReporter: TelemetryReporter): Result<Void, FxError>;
+export declare function canAddResource(projectSetting: ProjectSettings, telemetryReporter: TelemetryReporter): Result<Void, FxError>;
 export declare function addCapability(ctx: v2.Context, inputs: Inputs, localSettings: Json): Promise<Result<{
     solutionSettings?: SolutionSettings;
     solutionConfig?: Record<string, unknown>;

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

@@ -1 +1 @@
-{"version":3,"file":"executeUserTask.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/executeUserTask.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,EAAE,EACF,MAAM,EACN,OAAO,EACP,MAAM,EAIN,IAAI,EAEJ,iBAAiB,EACjB,qBAAqB,EACrB,IAAI,EAEJ,eAAe,EACf,gBAAgB,EAChB,aAAa,EAEb,IAAI,EACL,MAAM,wBAAwB,CAAC;AAkChC,wBAAsB,eAAe,CACnC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,IAAI,EACV,aAAa,EAAE,IAAI,EACnB,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CA+FnC;AAED,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,qBAAqB,EAC/B,iBAAiB,EAAE,iBAAiB,GACnC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAYvB;AAED,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,qBAAqB,EAC/B,iBAAiB,EAAE,iBAAiB,GACnC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAmBvB;AAED,wBAAsB,aAAa,CACjC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,IAAI,GAClB,OAAO,CACR,MAAM,CAAC;IAAE,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IAAC,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,EAAE,OAAO,CAAC,CACnG,CA2HA;AAED,wBAAgB,2BAA2B,CAAC,EAAE,CAAC,EAAE,eAAe,QAG/D;AAkCD,wBAAsB,WAAW,CAC/B,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,IAAI,EACnB,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAmKnC;AAED,wBAAgB,qCAAqC,CACnD,OAAO,CAAC,EAAE,MAAM,GACf,MAAM,CAAC,8BAA8B,EAAE,OAAO,CAAC,CAgCjD;AAED,oBAAY,8BAA8B,GAAG;IAC3C,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,OAAO,GAAG,QAAQ,CAAC;IAChC,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC"}
+{"version":3,"file":"executeUserTask.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/executeUserTask.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,EAAE,EACF,MAAM,EACN,OAAO,EACP,MAAM,EAIN,IAAI,EAEJ,iBAAiB,EACjB,qBAAqB,EACrB,IAAI,EAEJ,eAAe,EACf,gBAAgB,EAChB,aAAa,EAEb,IAAI,EAMJ,eAAe,EAEhB,MAAM,wBAAwB,CAAC;AAiChC,wBAAsB,eAAe,CACnC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,IAAI,EACV,aAAa,EAAE,IAAI,EACnB,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CA+FnC;AAED,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,qBAAqB,EAC/B,iBAAiB,EAAE,iBAAiB,GACnC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAYvB;AAED,wBAAgB,cAAc,CAC5B,cAAc,EAAE,eAAe,EAC/B,iBAAiB,EAAE,iBAAiB,GACnC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAwBvB;AAED,wBAAsB,aAAa,CACjC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,IAAI,GAClB,OAAO,CACR,MAAM,CAAC;IAAE,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IAAC,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,EAAE,OAAO,CAAC,CACnG,CA2MA;AAED,wBAAgB,2BAA2B,CAAC,EAAE,CAAC,EAAE,eAAe,QAG/D;AA4BD,wBAAsB,WAAW,CAC/B,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,IAAI,EACnB,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CA+JnC;AAED,wBAAgB,qCAAqC,CACnD,OAAO,CAAC,EAAE,MAAM,GACf,MAAM,CAAC,8BAA8B,EAAE,OAAO,CAAC,CAgCjD;AAED,oBAAY,8BAA8B,GAAG;IAC3C,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,OAAO,GAAG,QAAQ,CAAC;IAChC,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC"}

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

@@ -15,6 +15,8 @@ const typedi_1 = require("typedi");
 const scaffolding_1 = require("./scaffolding");
 const generateResourceTemplate_1 = require("./generateResourceTemplate");
 const scaffolding_2 = require("../debug/scaffolding");
+const constants_2 = require("../v3/constants");
+const core_1 = require("../../../../core");
 async function executeUserTask(ctx, inputs, func, localSettings, envInfo, tokenProvider) {
     const namespace = func.namespace;
     const method = func.method;
@@ -74,33 +76,40 @@ async function executeUserTask(ctx, inputs, func, localSettings, envInfo, tokenP
 exports.executeUserTask = executeUserTask;
 function canAddCapability(settings, telemetryReporter) {
     if (!(settings.hostType === question_1.HostTypeOptionAzure.id)) {
-        const e = teamsfx_api_1.returnUserError(new Error("Add capability is not supported for SPFx project"), constants_1.SolutionSource, constants_1.SolutionError.FailedToAddCapability);
+        const e = new teamsfx_api_1.UserError(constants_1.SolutionError.AddCapabilityNotSupport, tools_1.getStrings().solution.addCapability.OnlySupportAzure, constants_1.SolutionSource);
         return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_1.SolutionTelemetryEvent.AddCapability, e, telemetryReporter));
     }
     return teamsfx_api_1.ok(teamsfx_api_1.Void);
 }
 exports.canAddCapability = canAddCapability;
-function canAddResource(settings, telemetryReporter) {
-    if (!(settings.hostType === question_1.HostTypeOptionAzure.id &&
-        settings.capabilities &&
-        settings.capabilities.includes(question_1.TabOptionItem.id))) {
-        const e = teamsfx_api_1.returnUserError(new Error("Add resource is only supported for Tab app hosted in Azure."), constants_1.SolutionSource, constants_1.SolutionError.AddResourceNotSupport);
+function canAddResource(projectSetting, telemetryReporter) {
+    const isVS = core_1.isVSProject(projectSetting);
+    if (isVS) {
+        const e = new teamsfx_api_1.UserError(constants_1.SolutionError.AddResourceNotSupport, tools_1.getStrings().solution.addResource.NotSupportForVSProject, constants_1.SolutionSource);
+        return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_1.SolutionTelemetryEvent.AddResource, e, telemetryReporter));
+    }
+    const solutionSettings = projectSetting.solutionSettings;
+    if (!(solutionSettings.hostType === question_1.HostTypeOptionAzure.id)) {
+        const e = new teamsfx_api_1.UserError(constants_1.SolutionError.AddResourceNotSupport, tools_1.getStrings().solution.addResource.OnlySupportAzure, constants_1.SolutionSource);
         return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_1.SolutionTelemetryEvent.AddResource, e, telemetryReporter));
     }
     return teamsfx_api_1.ok(teamsfx_api_1.Void);
 }
 exports.canAddResource = canAddResource;
 async function addCapability(ctx, inputs, localSettings) {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
+    var _a, _b;
     ctx.telemetryReporter.sendTelemetryEvent(constants_1.SolutionTelemetryEvent.AddCapabilityStart, {
         [constants_1.SolutionTelemetryProperty.Component]: constants_1.SolutionTelemetryComponentName,
     });
-    const settings = utils_1.getAzureSolutionSettings(ctx);
-    const originalSettings = lodash_1.cloneDeep(settings);
-    const canProceed = canAddCapability(settings, ctx.telemetryReporter);
+    // 1. checking addable
+    const solutionSettings = utils_1.getAzureSolutionSettings(ctx);
+    const originalSettings = lodash_1.cloneDeep(solutionSettings);
+    const inputsNew = Object.assign(Object.assign({}, inputs), { projectPath: inputs.projectPath, existingResources: originalSettings.activeResourcePlugins });
+    const canProceed = canAddCapability(solutionSettings, ctx.telemetryReporter);
     if (canProceed.isErr()) {
         return teamsfx_api_1.err(canProceed.error);
     }
+    // 2. check answer
     const capabilitiesAnswer = inputs[question_1.AzureSolutionQuestionNames.Capabilities];
     if (!capabilitiesAnswer || capabilitiesAnswer.length === 0) {
         (_a = ctx.telemetryReporter) === null || _a === void 0 ? void 0 : _a.sendTelemetryEvent(constants_1.SolutionTelemetryEvent.AddCapability, {
@@ -110,77 +119,132 @@ async function addCapability(ctx, inputs, localSettings) {
         });
         return teamsfx_api_1.ok({});
     }
-    const alreadyHaveBotAndAddBot = (((_b = settings.capabilities) === null || _b === void 0 ? void 0 : _b.includes(question_1.BotOptionItem.id)) ||
-        ((_c = settings.capabilities) === null || _c === void 0 ? void 0 : _c.includes(question_1.MessageExtensionItem.id))) &&
-        (capabilitiesAnswer.includes(question_1.BotOptionItem.id) ||
-            capabilitiesAnswer.includes(question_1.MessageExtensionItem.id));
-    const alreadyHaveTabAndAddTab = ((_d = settings.capabilities) === null || _d === void 0 ? void 0 : _d.includes(question_1.TabOptionItem.id)) &&
-        capabilitiesAnswer.includes(question_1.TabOptionItem.id);
-    if (alreadyHaveBotAndAddBot || alreadyHaveTabAndAddTab) {
-        const e = teamsfx_api_1.returnUserError(new Error("There are no additional capabilities you can add to your project."), constants_1.SolutionSource, constants_1.SolutionError.FailedToAddCapability);
-        return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_1.SolutionTelemetryEvent.AddCapability, e, ctx.telemetryReporter));
+    // 3. check capability limit
+    const alreadyHasTab = solutionSettings.capabilities.includes(question_1.TabOptionItem.id);
+    const alreadyHasBot = solutionSettings.capabilities.includes(question_1.BotOptionItem.id);
+    const alreadyHasME = solutionSettings.capabilities.includes(question_1.MessageExtensionItem.id);
+    const toAddTab = capabilitiesAnswer.includes(question_1.TabOptionItem.id);
+    const toAddBot = capabilitiesAnswer.includes(question_1.BotOptionItem.id);
+    const toAddME = capabilitiesAnswer.includes(question_1.MessageExtensionItem.id);
+    const appStudioPlugin = typedi_1.Container.get(constants_2.BuiltInResourcePluginNames.appStudio);
+    const inputsWithProjectPath = inputs;
+    const tabExceedRes = await appStudioPlugin.capabilityExceedLimit(ctx, inputs, "staticTab");
+    if (tabExceedRes.isErr()) {
+        return teamsfx_api_1.err(tabExceedRes.error);
+    }
+    const isTabAddable = !tabExceedRes.value;
+    const botExceedRes = await appStudioPlugin.capabilityExceedLimit(ctx, inputs, "Bot");
+    if (botExceedRes.isErr()) {
+        return teamsfx_api_1.err(botExceedRes.error);
+    }
+    const isBotAddable = !botExceedRes.value;
+    const meExceedRes = await appStudioPlugin.capabilityExceedLimit(ctx, inputs, "MessageExtension");
+    if (meExceedRes.isErr()) {
+        return teamsfx_api_1.err(meExceedRes.error);
+    }
+    const isMEAddable = !meExceedRes.value;
+    if ((toAddTab && !isTabAddable) || (toAddBot && !isBotAddable) || (toAddME && !isMEAddable)) {
+        const error = new teamsfx_api_1.UserError(constants_1.SolutionError.FailedToAddCapability, tools_1.getStrings().solution.addCapability.ExceedMaxLimit, constants_1.SolutionSource);
+        return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_1.SolutionTelemetryEvent.AddCapability, error, ctx.telemetryReporter));
+    }
+    const capabilitiesToAddManifest = [];
+    const pluginNamesToScaffold = new Set();
+    const pluginNamesToArm = new Set();
+    const newCapabilitySet = new Set();
+    solutionSettings.capabilities.forEach((c) => newCapabilitySet.add(c));
+    const vsProject = core_1.isVSProject(ctx.projectSetting);
+    // 4. check Tab
+    if (capabilitiesAnswer.includes(question_1.TabOptionItem.id)) {
+        if (vsProject) {
+            pluginNamesToScaffold.add(ResourcePluginContainer_1.ResourcePluginsV2.FrontendPlugin);
+            if (!alreadyHasTab) {
+                pluginNamesToArm.add(ResourcePluginContainer_1.ResourcePluginsV2.FrontendPlugin);
+                pluginNamesToArm.add(ResourcePluginContainer_1.ResourcePluginsV2.SimpleAuthPlugin);
+            }
+        }
+        else {
+            if (!alreadyHasTab) {
+                pluginNamesToScaffold.add(ResourcePluginContainer_1.ResourcePluginsV2.FrontendPlugin);
+                pluginNamesToArm.add(ResourcePluginContainer_1.ResourcePluginsV2.FrontendPlugin);
+                pluginNamesToArm.add(ResourcePluginContainer_1.ResourcePluginsV2.SimpleAuthPlugin);
+            }
+        }
+        capabilitiesToAddManifest.push({ name: "staticTab" });
+        newCapabilitySet.add(question_1.TabOptionItem.id);
     }
-    let change = false;
-    const appStudioPlugin = typedi_1.Container.get(ResourcePluginContainer_1.ResourcePluginsV2.AppStudioPlugin);
-    const frontendPlugin = typedi_1.Container.get(ResourcePluginContainer_1.ResourcePluginsV2.FrontendPlugin);
-    const botPlugin = typedi_1.Container.get(ResourcePluginContainer_1.ResourcePluginsV2.BotPlugin);
-    const pluginsToScaffold = [appStudioPlugin];
-    const capabilities = Array.from(settings.capabilities);
-    for (const cap of capabilitiesAnswer) {
-        if (!capabilities.includes(cap)) {
-            capabilities.push(cap);
-            change = true;
-            if (cap === question_1.TabOptionItem.id) {
-                pluginsToScaffold.push(frontendPlugin);
-                pluginsToScaffold.push(typedi_1.Container.get(ResourcePluginContainer_1.ResourcePluginsV2.SimpleAuthPlugin));
+    // 5. check Bot
+    if (capabilitiesAnswer.includes(question_1.BotOptionItem.id)) {
+        if (vsProject) {
+            pluginNamesToScaffold.add(ResourcePluginContainer_1.ResourcePluginsV2.FrontendPlugin);
+            if (!alreadyHasBot && !alreadyHasME) {
+                pluginNamesToArm.add(ResourcePluginContainer_1.ResourcePluginsV2.BotPlugin);
             }
-            else if ((cap === question_1.BotOptionItem.id || cap === question_1.MessageExtensionItem.id) &&
-                !pluginsToScaffold.includes(botPlugin)) {
-                pluginsToScaffold.push(botPlugin);
+        }
+        else {
+            if (!alreadyHasBot && !alreadyHasME) {
+                pluginNamesToScaffold.add(ResourcePluginContainer_1.ResourcePluginsV2.BotPlugin);
+                pluginNamesToArm.add(ResourcePluginContainer_1.ResourcePluginsV2.BotPlugin);
             }
         }
+        capabilitiesToAddManifest.push({ name: "Bot" });
+        newCapabilitySet.add(question_1.BotOptionItem.id);
     }
-    if (change) {
-        if (tools_1.isArmSupportEnabled()) {
-            showUpdateArmTemplateNotice(ctx.userInteraction);
+    // 6. check MessageExtension
+    if (capabilitiesAnswer.includes(question_1.MessageExtensionItem.id)) {
+        if (vsProject) {
+            pluginNamesToScaffold.add(ResourcePluginContainer_1.ResourcePluginsV2.FrontendPlugin);
+            if (!alreadyHasBot && !alreadyHasME) {
+                pluginNamesToArm.add(ResourcePluginContainer_1.ResourcePluginsV2.BotPlugin);
+            }
+        }
+        else {
+            if (!alreadyHasBot && !alreadyHasME) {
+                pluginNamesToScaffold.add(ResourcePluginContainer_1.ResourcePluginsV2.BotPlugin);
+                pluginNamesToArm.add(ResourcePluginContainer_1.ResourcePluginsV2.BotPlugin);
+            }
         }
-        settings.capabilities = capabilities;
-        utils_1.reloadV2Plugins(settings);
-        const pluginNames = pluginsToScaffold.map((p) => p.name).join(",");
-        (_e = ctx.logProvider) === null || _e === void 0 ? void 0 : _e.info(`start scaffolding ${pluginNames}.....`);
-        const scaffoldRes = await scaffoldCodeAndResourceTemplate(ctx, inputs, localSettings, pluginsToScaffold, true);
+        capabilitiesToAddManifest.push({ name: "MessageExtension" });
+        newCapabilitySet.add(question_1.MessageExtensionItem.id);
+    }
+    // 7. update solution settings
+    solutionSettings.capabilities = Array.from(newCapabilitySet);
+    utils_1.reloadV2Plugins(ctx.projectSetting);
+    // 8. scaffold and update arm
+    const pluginsToScaffold = Array.from(pluginNamesToScaffold).map((name) => typedi_1.Container.get(name));
+    const pluginsToArm = Array.from(pluginNamesToArm).map((name) => typedi_1.Container.get(name));
+    if (pluginsToScaffold.length > 0) {
+        const scaffoldRes = await scaffoldCodeAndResourceTemplate(Object.assign(Object.assign({}, ctx), { appManifest: { local: {}, remote: {} } }), inputsNew, localSettings, pluginsToScaffold, pluginsToArm);
         if (scaffoldRes.isErr()) {
-            (_f = ctx.logProvider) === null || _f === void 0 ? void 0 : _f.info(`failed to scaffold ${pluginNames}!`);
             ctx.projectSetting.solutionSettings = originalSettings;
             return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_1.SolutionTelemetryEvent.AddCapability, scaffoldRes.error, ctx.telemetryReporter));
         }
-        (_g = ctx.logProvider) === null || _g === void 0 ? void 0 : _g.info(`finish scaffolding ${pluginNames}!`);
+    }
+    // 4. update manifest
+    if (capabilitiesToAddManifest.length > 0 || pluginsToScaffold.length > 0) {
+        await appStudioPlugin.addCapabilities(ctx, inputsWithProjectPath, capabilitiesToAddManifest);
+    }
+    if (capabilitiesAnswer.length > 0) {
         const addNames = capabilitiesAnswer.map((c) => `'${c}'`).join(" and ");
         const single = capabilitiesAnswer.length === 1;
         const template = inputs.platform === teamsfx_api_1.Platform.CLI
             ? single
-                ? tools_1.getStrings().solution.AddCapabilityNoticeForCli
-                : tools_1.getStrings().solution.AddCapabilitiesNoticeForCli
+                ? tools_1.getStrings().solution.addCapability.AddCapabilityNoticeForCli
+                : tools_1.getStrings().solution.addCapability.AddCapabilitiesNoticeForCli
             : single
-                ? tools_1.getStrings().solution.AddCapabilityNotice
-                : tools_1.getStrings().solution.AddCapabilitiesNotice;
+                ? tools_1.getStrings().solution.addCapability.AddCapabilityNotice
+                : tools_1.getStrings().solution.addCapability.AddCapabilitiesNotice;
         const msg = util.format(template, addNames);
         ctx.userInteraction.showMessage("info", msg, false);
-        (_h = ctx.telemetryReporter) === null || _h === void 0 ? void 0 : _h.sendTelemetryEvent(constants_1.SolutionTelemetryEvent.AddCapability, {
+        (_b = ctx.telemetryReporter) === null || _b === void 0 ? void 0 : _b.sendTelemetryEvent(constants_1.SolutionTelemetryEvent.AddCapability, {
             [constants_1.SolutionTelemetryProperty.Component]: constants_1.SolutionTelemetryComponentName,
             [constants_1.SolutionTelemetryProperty.Success]: constants_1.SolutionTelemetrySuccess.Yes,
             [constants_1.SolutionTelemetryProperty.Capabilities]: capabilitiesAnswer.join(";"),
         });
-        return teamsfx_api_1.ok({ solutionSettings: settings, solutionConfig: { provisionSucceeded: false } });
     }
-    const cannotAddCapWarnMsg = "Add nothing";
-    ctx.userInteraction.showMessage("warn", cannotAddCapWarnMsg, false);
-    ctx.telemetryReporter.sendTelemetryEvent(constants_1.SolutionTelemetryEvent.AddCapability, {
-        [constants_1.SolutionTelemetryProperty.Component]: constants_1.SolutionTelemetryComponentName,
-        [constants_1.SolutionTelemetryProperty.Success]: constants_1.SolutionTelemetrySuccess.Yes,
-        [constants_1.SolutionTelemetryProperty.Capabilities]: [].join(";"),
+    return teamsfx_api_1.ok({
+        solutionSettings: solutionSettings,
+        solutionConfig: { provisionSucceeded: false },
     });
-    return teamsfx_api_1.ok({});
 }
 exports.addCapability = addCapability;
 function showUpdateArmTemplateNotice(ui) {
@@ -188,101 +252,105 @@ function showUpdateArmTemplateNotice(ui) {
     ui === null || ui === void 0 ? void 0 : ui.showMessage("info", msg, false);
 }
 exports.showUpdateArmTemplateNotice = showUpdateArmTemplateNotice;
-async function scaffoldCodeAndResourceTemplate(ctx, inputs, localSettings, pluginsToScaffold, generateTemplate, pluginsToDoArm) {
+async function scaffoldCodeAndResourceTemplate(ctx, inputs, localSettings, pluginsToScaffold, pluginsToDoArm) {
     const result = await scaffolding_1.scaffoldByPlugins(ctx, inputs, localSettings, pluginsToScaffold);
     if (result.isErr()) {
         return result;
     }
-    if (!generateTemplate || !tools_1.isArmSupportEnabled()) {
-        return result;
-    }
     const scaffoldLocalDebugSettingsResult = await scaffolding_2.scaffoldLocalDebugSettings(ctx, inputs, localSettings);
     if (scaffoldLocalDebugSettingsResult.isErr()) {
         return scaffoldLocalDebugSettingsResult;
     }
-    return generateResourceTemplate_1.generateResourceTemplateForPlugins(ctx, inputs, pluginsToDoArm ? pluginsToDoArm : pluginsToScaffold);
+    const pluginsToUpdateArm = pluginsToDoArm ? pluginsToDoArm : pluginsToScaffold;
+    if (pluginsToUpdateArm.length > 0) {
+        return generateResourceTemplate_1.generateResourceTemplateForPlugins(ctx, inputs, pluginsToUpdateArm);
+    }
+    return teamsfx_api_1.ok(undefined);
 }
 async function addResource(ctx, inputs, localSettings, func, envInfo, tokenProvider) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c;
     (_a = ctx.telemetryReporter) === null || _a === void 0 ? void 0 : _a.sendTelemetryEvent(constants_1.SolutionTelemetryEvent.AddResourceStart, {
         [constants_1.SolutionTelemetryProperty.Component]: constants_1.SolutionTelemetryComponentName,
     });
-    const settings = utils_1.getAzureSolutionSettings(ctx);
-    const canProceed = canAddResource(settings, ctx.telemetryReporter);
+    // 1. checking addable
+    const solutionSettings = utils_1.getAzureSolutionSettings(ctx);
+    const originalSettings = lodash_1.cloneDeep(solutionSettings);
+    const inputsNew = Object.assign(Object.assign({}, inputs), { projectPath: inputs.projectPath, existingResources: originalSettings.activeResourcePlugins });
+    const canProceed = canAddResource(ctx.projectSetting, ctx.telemetryReporter);
     if (canProceed.isErr()) {
-        return canProceed;
+        return teamsfx_api_1.err(canProceed.error);
     }
-    const selectedPlugins = settings.activeResourcePlugins;
-    const functionPlugin = typedi_1.Container.get(ResourcePluginContainer_1.ResourcePluginsV2.FunctionPlugin);
-    const sqlPlugin = typedi_1.Container.get(ResourcePluginContainer_1.ResourcePluginsV2.SqlPlugin);
-    const apimPlugin = typedi_1.Container.get(ResourcePluginContainer_1.ResourcePluginsV2.ApimPlugin);
-    const keyVaultPlugin = typedi_1.Container.get(ResourcePluginContainer_1.ResourcePluginsV2.KeyVaultPlugin);
-    const alreadyHaveFunction = selectedPlugins === null || selectedPlugins === void 0 ? void 0 : selectedPlugins.includes(functionPlugin.name);
-    const alreadyHaveSql = selectedPlugins === null || selectedPlugins === void 0 ? void 0 : selectedPlugins.includes(sqlPlugin.name);
-    const alreadyHaveApim = selectedPlugins === null || selectedPlugins === void 0 ? void 0 : selectedPlugins.includes(apimPlugin.name);
-    const alreadyHaveKeyVault = selectedPlugins === null || selectedPlugins === void 0 ? void 0 : selectedPlugins.includes(keyVaultPlugin.name);
+    // 2. check answer
     const addResourcesAnswer = inputs[question_1.AzureSolutionQuestionNames.AddResources];
-    if (!addResourcesAnswer) {
-        return teamsfx_api_1.err(teamsfx_api_1.returnUserError(new Error(`answer of ${question_1.AzureSolutionQuestionNames.AddResources} is empty!`), constants_1.SolutionSource, constants_1.SolutionError.InvalidInput));
+    if (!addResourcesAnswer || addResourcesAnswer.length === 0) {
+        (_b = ctx.telemetryReporter) === null || _b === void 0 ? void 0 : _b.sendTelemetryEvent(constants_1.SolutionTelemetryEvent.AddResource, {
+            [constants_1.SolutionTelemetryProperty.Component]: constants_1.SolutionTelemetryComponentName,
+            [constants_1.SolutionTelemetryProperty.Success]: constants_1.SolutionTelemetrySuccess.Yes,
+            [constants_1.SolutionTelemetryProperty.Resources]: [].join(";"),
+        });
+        return teamsfx_api_1.ok({});
     }
+    const alreadyHaveFunction = solutionSettings.azureResources.includes(question_1.AzureResourceFunction.id);
+    const alreadyHaveApim = solutionSettings.azureResources.includes(question_1.AzureResourceApim.id);
+    const alreadyHaveKeyVault = solutionSettings.azureResources.includes(question_1.AzureResourceKeyVault.id);
     const addSQL = addResourcesAnswer.includes(question_1.AzureResourceSQL.id);
-    const addFunc = addResourcesAnswer.includes(question_1.AzureResourceFunction.id);
     const addApim = addResourcesAnswer.includes(question_1.AzureResourceApim.id);
     const addKeyVault = addResourcesAnswer.includes(question_1.AzureResourceKeyVault.id);
-    if ((alreadyHaveSql && addSQL) ||
-        (alreadyHaveApim && addApim) ||
-        (alreadyHaveKeyVault && addKeyVault)) {
-        const e = teamsfx_api_1.returnUserError(new Error("SQL/APIM/KeyVault is already added."), constants_1.SolutionSource, constants_1.SolutionError.AddResourceNotSupport);
+    const addFunc = addResourcesAnswer.includes(question_1.AzureResourceFunction.id) || (addApim && !alreadyHaveFunction);
+    // 3. check APIM and KeyVault addable
+    if ((alreadyHaveApim && addApim) || (alreadyHaveKeyVault && addKeyVault)) {
+        const e = new teamsfx_api_1.UserError(new Error("APIM/KeyVault is already added."), constants_1.SolutionSource, constants_1.SolutionError.AddResourceNotSupport);
         return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_1.SolutionTelemetryEvent.AddResource, e, ctx.telemetryReporter));
     }
-    let addNewResourceToProvision = false;
-    const notifications = [];
+    const newResourceSet = new Set();
+    solutionSettings.azureResources.forEach((r) => newResourceSet.add(r));
+    const addedResources = [];
     const pluginsToScaffold = [];
     const pluginsToDoArm = [];
-    const azureResource = Array.from(settings.azureResources || []);
     let scaffoldApim = false;
-    if (addFunc || ((addSQL || addApim) && !alreadyHaveFunction)) {
+    // 4. check Function
+    if (addFunc) {
+        const functionPlugin = typedi_1.Container.get(ResourcePluginContainer_1.ResourcePluginsV2.FunctionPlugin);
         pluginsToScaffold.push(functionPlugin);
-        if (!azureResource.includes(question_1.AzureResourceFunction.id)) {
-            azureResource.push(question_1.AzureResourceFunction.id);
-            addNewResourceToProvision = true;
+        if (!alreadyHaveFunction) {
             pluginsToDoArm.push(functionPlugin);
         }
-        notifications.push(question_1.AzureResourceFunction.label);
+        addedResources.push(question_1.AzureResourceFunction.id);
     }
-    if (addSQL && !alreadyHaveSql) {
-        pluginsToScaffold.push(sqlPlugin);
+    // 5. check SQL
+    if (addSQL) {
+        const sqlPlugin = typedi_1.Container.get(ResourcePluginContainer_1.ResourcePluginsV2.SqlPlugin);
+        const identityPlugin = typedi_1.Container.get(ResourcePluginContainer_1.ResourcePluginsV2.IdentityPlugin);
         pluginsToDoArm.push(sqlPlugin);
-        azureResource.push(question_1.AzureResourceSQL.id);
-        notifications.push(question_1.AzureResourceSQL.label);
-        addNewResourceToProvision = true;
+        if (!solutionSettings.activeResourcePlugins.includes(identityPlugin.name)) {
+            // add identity for first time
+            pluginsToDoArm.push(identityPlugin);
+        }
+        addedResources.push(question_1.AzureResourceSQL.id);
     }
-    if (addApim && !alreadyHaveApim) {
+    // 6. check APIM
+    const apimPlugin = typedi_1.Container.get(ResourcePluginContainer_1.ResourcePluginsV2.ApimPlugin);
+    if (addApim) {
         // We don't add apimPlugin into pluginsToScaffold because
         // apim plugin needs to modify config output during scaffolding,
         // which is not supported by the scaffoldSourceCode API.
-        // The scaffolding will run later as a usertask as a work around.
-        azureResource.push(question_1.AzureResourceApim.id);
-        notifications.push(question_1.AzureResourceApim.label);
-        addNewResourceToProvision = true;
+        // The scaffolding will run later as a userTask as a work around.
+        addedResources.push(question_1.AzureResourceApim.id);
         pluginsToDoArm.push(apimPlugin);
         scaffoldApim = true;
     }
-    if (addKeyVault && !alreadyHaveKeyVault) {
-        pluginsToScaffold.push(keyVaultPlugin);
+    if (addKeyVault) {
+        const keyVaultPlugin = typedi_1.Container.get(ResourcePluginContainer_1.ResourcePluginsV2.KeyVaultPlugin);
         pluginsToDoArm.push(keyVaultPlugin);
-        azureResource.push(question_1.AzureResourceKeyVault.id);
-        notifications.push(question_1.AzureResourceKeyVault.label);
-        addNewResourceToProvision = true;
+        addedResources.push(question_1.AzureResourceKeyVault.id);
     }
-    if (notifications.length > 0) {
-        if (tools_1.isArmSupportEnabled() && addNewResourceToProvision) {
-            showUpdateArmTemplateNotice(ctx.userInteraction);
-        }
-        settings.azureResources = azureResource;
-        utils_1.reloadV2Plugins(settings);
-        (_b = ctx.logProvider) === null || _b === void 0 ? void 0 : _b.info(`start scaffolding ${notifications.join(",")}.....`);
-        let scaffoldRes = await scaffoldCodeAndResourceTemplate(ctx, inputs, localSettings, pluginsToScaffold, addNewResourceToProvision, pluginsToDoArm);
+    // 7. update solution settings
+    addedResources.forEach((r) => newResourceSet.add(r));
+    solutionSettings.azureResources = Array.from(newResourceSet);
+    utils_1.reloadV2Plugins(ctx.projectSetting);
+    // 8. scaffold and update arm
+    if (pluginsToScaffold.length > 0 || pluginsToDoArm.length > 0) {
+        let scaffoldRes = await scaffoldCodeAndResourceTemplate(Object.assign(Object.assign({}, ctx), { appManifest: { local: {}, remote: {} } }), inputsNew, localSettings, pluginsToScaffold, pluginsToDoArm);
         if (scaffoldApim) {
             if (apimPlugin && apimPlugin.executeUserTask) {
                 const result = await apimPlugin.executeUserTask(ctx, inputs, func, {}, envInfo, tokenProvider);
@@ -292,21 +360,27 @@ async function addResource(ctx, inputs, localSettings, func, envInfo, tokenProvi
             }
         }
         if (scaffoldRes.isErr()) {
-            (_c = ctx.logProvider) === null || _c === void 0 ? void 0 : _c.info(`failed to scaffold ${notifications.join(",")}!`);
+            ctx.projectSetting.solutionSettings = originalSettings;
             return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_1.SolutionTelemetryEvent.AddResource, scaffoldRes.error, ctx.telemetryReporter));
         }
-        (_d = ctx.logProvider) === null || _d === void 0 ? void 0 : _d.info(`finish scaffolding ${notifications.join(",")}!`);
-        ctx.userInteraction.showMessage("info", util.format(inputs.platform === teamsfx_api_1.Platform.CLI
-            ? tools_1.getStrings().solution.AddResourceNoticeForCli
-            : tools_1.getStrings().solution.AddResourceNotice, notifications.join(",")), false);
+        const addNames = addedResources.map((c) => `'${c}'`).join(" and ");
+        const single = addedResources.length === 1;
+        const template = inputs.platform === teamsfx_api_1.Platform.CLI
+            ? single
+                ? tools_1.getStrings().solution.addResource.AddResourceNoticeForCli
+                : tools_1.getStrings().solution.addResource.AddResourcesNoticeForCli
+            : single
+                ? tools_1.getStrings().solution.addResource.AddResourceNotice
+                : tools_1.getStrings().solution.addResource.AddResourcesNotice;
+        ctx.userInteraction.showMessage("info", util.format(template, addNames), false);
     }
-    (_e = ctx.telemetryReporter) === null || _e === void 0 ? void 0 : _e.sendTelemetryEvent(constants_1.SolutionTelemetryEvent.AddResource, {
+    (_c = ctx.telemetryReporter) === null || _c === void 0 ? void 0 : _c.sendTelemetryEvent(constants_1.SolutionTelemetryEvent.AddResource, {
         [constants_1.SolutionTelemetryProperty.Component]: constants_1.SolutionTelemetryComponentName,
         [constants_1.SolutionTelemetryProperty.Success]: constants_1.SolutionTelemetrySuccess.Yes,
         [constants_1.SolutionTelemetryProperty.Resources]: addResourcesAnswer.join(";"),
     });
-    return teamsfx_api_1.ok(addNewResourceToProvision
-        ? { solutionSettings: settings, solutionConfig: { provisionSucceeded: false } }
+    return teamsfx_api_1.ok(pluginsToDoArm.length > 0
+        ? { solutionSettings: solutionSettings, solutionConfig: { provisionSucceeded: false } }
         : teamsfx_api_1.Void);
 }
 exports.addResource = addResource;