@microsoft/teamsfx-core 0.7.0 → 0.7.1-alpha.5e8f6dea.0

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

@@ -0,0 +1 @@
+{"version":3,"file":"provisionLocal.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/provisionLocal.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,EAAE,EACF,MAAM,EACN,OAAO,EAIP,aAAa,EAGb,IAAI,EACL,MAAM,wBAAwB,CAAC;AAchC,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,IAAI,EACnB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAsFrC"}

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

@@ -0,0 +1,73 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.provisionLocalResource = void 0;
+const tslib_1 = require("tslib");
+const teamsfx_api_1 = require("@microsoft/teamsfx-api");
+const executor_1 = require("./executor");
+const utils_1 = require("./utils");
+const constants_1 = require("../constants");
+const lodash_1 = require("lodash");
+const typedi_1 = tslib_1.__importDefault(require("typedi"));
+const ResourcePluginContainer_1 = require("../ResourcePluginContainer");
+const environment_1 = require("../../../../core/environment");
+async function provisionLocalResource(ctx, inputs, localSettings, tokenProvider) {
+    const azureSolutionSettings = utils_1.getAzureSolutionSettings(ctx);
+    const result = await utils_1.ensurePermissionRequest(azureSolutionSettings, ctx.permissionRequestProvider);
+    if (result.isErr()) {
+        return new teamsfx_api_1.v2.FxFailure(result.error);
+    }
+    // Just to trigger M365 login before the concurrent execution of localDebug.
+    // Because concurrent execution of localDebug may getAccessToken() concurrently, which
+    // causes 2 M365 logins before the token caching in common lib takes effect.
+    await tokenProvider.appStudioToken.getAccessToken();
+    const plugins = utils_1.getSelectedPlugins(azureSolutionSettings);
+    const provisionLocalResourceThunks = plugins
+        .filter((plugin) => !lodash_1.isUndefined(plugin.provisionLocalResource))
+        .map((plugin) => {
+        return {
+            pluginName: `${plugin.name}`,
+            taskName: "provisionLocalResource",
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            thunk: () => plugin.provisionLocalResource(ctx, inputs, localSettings, tokenProvider),
+        };
+    });
+    const provisionResult = await executor_1.executeConcurrently(provisionLocalResourceThunks, ctx.logProvider);
+    if (provisionResult.kind !== "success") {
+        return provisionResult;
+    }
+    const aadPlugin = typedi_1.default.get(ResourcePluginContainer_1.ResourcePluginsV2.AadPlugin);
+    if (plugins.some((plugin) => plugin.name === aadPlugin.name) && aadPlugin.executeUserTask) {
+        const result = await aadPlugin.executeUserTask(ctx, inputs, {
+            namespace: `${constants_1.PluginNames.SOLUTION}/${constants_1.PluginNames.AAD}`,
+            method: "setApplicationInContext",
+            params: { isLocal: true },
+        }, { envName: environment_1.environmentManager.getDefaultEnvName(), config: {}, profile: {} }, tokenProvider);
+        if (result.isErr()) {
+            return new teamsfx_api_1.v2.FxPartialSuccess(localSettings, result.error);
+        }
+    }
+    else {
+        return new teamsfx_api_1.v2.FxFailure(teamsfx_api_1.returnSystemError(new Error("AAD plugin not selected or executeUserTask is undefined"), "Solution", constants_1.SolutionError.InternelError));
+    }
+    const parseTenantIdresult = utils_1.loadTeamsAppTenantIdForLocal(localSettings, await tokenProvider.appStudioToken.getJsonObject());
+    if (parseTenantIdresult.isErr()) {
+        return new teamsfx_api_1.v2.FxFailure(parseTenantIdresult.error);
+    }
+    const configureLocalResourceThunks = plugins
+        .filter((plugin) => !lodash_1.isUndefined(plugin.configureLocalResource))
+        .map((plugin) => {
+        return {
+            pluginName: `${plugin.name}`,
+            taskName: "configureLocalResource",
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            thunk: () => plugin.configureLocalResource(ctx, inputs, localSettings, tokenProvider),
+        };
+    });
+    const configureResourceResult = await executor_1.executeConcurrently(configureLocalResourceThunks, ctx.logProvider);
+    if (configureResourceResult.kind !== "success") {
+        return configureResourceResult;
+    }
+    return new teamsfx_api_1.v2.FxSuccess(localSettings);
+}
+exports.provisionLocalResource = provisionLocalResource;
+//# sourceMappingURL=provisionLocal.js.map

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

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

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

@@ -1,3 +1,3 @@
-import { v2, Inputs, FxError, Result, AppStudioTokenProvider, Void } from "@microsoft/teamsfx-api";
-export declare function publishApplication(ctx: v2.Context, inputs: Inputs, provisionOutput: Readonly<Record<v2.PluginName, v2.ProvisionOutput>>, tokenProvider: AppStudioTokenProvider): Promise<Result<Void, FxError>>;
+import { AppStudioTokenProvider, FxError, Inputs, Result, v2, Void } from "@microsoft/teamsfx-api";
+export declare function publishApplication(ctx: v2.Context, inputs: Inputs, envInfo: v2.EnvInfoV2, tokenProvider: AppStudioTokenProvider): Promise<Result<Void, FxError>>;
 //# sourceMappingURL=publish.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"publish.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/publish.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,EAAE,EACF,MAAM,EACN,OAAO,EACP,MAAM,EAIN,sBAAsB,EACtB,IAAI,EACL,MAAM,wBAAwB,CAAC;AAShC,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,UAAU,EAAE,EAAE,CAAC,eAAe,CAAC,CAAC,EACpE,aAAa,EAAE,sBAAsB,GACpC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAwChC"}
+{"version":3,"file":"publish.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/publish.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,sBAAsB,EAEtB,OAAO,EACP,MAAM,EAEN,MAAM,EAEN,EAAE,EACF,IAAI,EACL,MAAM,wBAAwB,CAAC;AAShC,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,aAAa,EAAE,sBAAsB,GACpC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAwChC"}

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

@@ -3,19 +3,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.publishApplication = void 0;
 const tslib_1 = require("tslib");
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
+const lodash_1 = require("lodash");
+const util = tslib_1.__importStar(require("util"));
+const constants_1 = require("../../../../common/constants");
 const tools_1 = require("../../../../common/tools");
+const constants_2 = require("../constants");
 const executor_1 = require("./executor");
 const utils_1 = require("./utils");
-const constants_1 = require("../constants");
-const util = tslib_1.__importStar(require("util"));
-const lodash_1 = require("lodash");
-const constants_2 = require("../../../../common/constants");
-async function publishApplication(ctx, inputs, provisionOutput, tokenProvider) {
+async function publishApplication(ctx, inputs, envInfo, tokenProvider) {
     var _a;
     const inAzureProject = utils_1.isAzureProject(utils_1.getAzureSolutionSettings(ctx));
-    const provisioned = provisionOutput[constants_1.GLOBAL_CONFIG].states[constants_1.SOLUTION_PROVISION_SUCCEEDED];
+    const provisioned = envInfo.profile[constants_2.GLOBAL_CONFIG][constants_2.SOLUTION_PROVISION_SUCCEEDED];
     if (inAzureProject && !provisioned) {
-        return teamsfx_api_1.err(teamsfx_api_1.returnUserError(new Error(util.format(tools_1.getStrings().solution.NotProvisionedNotice, ctx.projectSetting.appName)), "Solution", constants_1.SolutionError.CannotDeployBeforeProvision));
+        return teamsfx_api_1.err(teamsfx_api_1.returnUserError(new Error(util.format(tools_1.getStrings().solution.NotProvisionedNotice, ctx.projectSetting.appName)), "Solution", constants_2.SolutionError.CannotDeployBeforeProvision));
     }
     const plugins = utils_1.getSelectedPlugins(utils_1.getAzureSolutionSettings(ctx));
     const thunks = plugins
@@ -25,15 +25,15 @@ async function publishApplication(ctx, inputs, provisionOutput, tokenProvider) {
             pluginName: `${plugin.name}`,
             taskName: "publishApplication",
             // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-            thunk: () => plugin.publishApplication(ctx, inputs, provisionOutput, tokenProvider),
+            thunk: () => plugin.publishApplication(ctx, inputs, envInfo, tokenProvider),
         };
     });
-    ctx.logProvider.info(util.format(tools_1.getStrings().solution.PublishStartNotice, constants_2.PluginDisplayName.Solution));
+    ctx.logProvider.info(util.format(tools_1.getStrings().solution.PublishStartNotice, constants_1.PluginDisplayName.Solution));
     const result = await executor_1.executeConcurrently(thunks, ctx.logProvider);
-    if (result.isErr()) {
+    if (result.kind !== "success") {
         const msg = util.format(tools_1.getStrings().solution.PublishFailNotice, ctx.projectSetting.appName);
         (_a = ctx.logProvider) === null || _a === void 0 ? void 0 : _a.info(msg);
-        return result;
+        return teamsfx_api_1.err(result.error);
     }
     return teamsfx_api_1.ok(teamsfx_api_1.Void);
 }

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

@@ -1 +1 @@
-{"version":3,"file":"publish.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/publish.ts"],"names":[],"mappings":";;;;AAAA,wDAUgC;AAChC,oDAAsD;AACtD,yCAAiD;AACjD,mCAAuF;AACvF,4CAA0F;AAC1F,mDAA6B;AAC7B,mCAAqC;AACrC,4DAAiE;AAE1D,KAAK,UAAU,kBAAkB,CACtC,GAAe,EACf,MAAc,EACd,eAAoE,EACpE,aAAqC;;IAErC,MAAM,cAAc,GAAG,sBAAc,CAAC,gCAAwB,CAAC,GAAG,CAAC,CAAC,CAAC;IACrE,MAAM,WAAW,GAAG,eAAe,CAAC,yBAAa,CAAC,CAAC,MAAM,CAAC,wCAA4B,CAAC,CAAC;IAExF,IAAI,cAAc,IAAI,CAAC,WAAW,EAAE;QAClC,OAAO,iBAAG,CACR,6BAAe,CACb,IAAI,KAAK,CACP,IAAI,CAAC,MAAM,CAAC,kBAAU,EAAE,CAAC,QAAQ,CAAC,oBAAoB,EAAE,GAAG,CAAC,cAAc,CAAC,OAAO,CAAC,CACpF,EACD,UAAU,EACV,yBAAa,CAAC,2BAA2B,CAC1C,CACF,CAAC;KACH;IAED,MAAM,OAAO,GAAG,0BAAkB,CAAC,gCAAwB,CAAC,GAAG,CAAC,CAAC,CAAC;IAClE,MAAM,MAAM,GAAG,OAAO;SACnB,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,oBAAW,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;SAC3D,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;QACd,OAAO;YACL,UAAU,EAAE,GAAG,MAAM,CAAC,IAAI,EAAE;YAC5B,QAAQ,EAAE,oBAAoB;YAC9B,oEAAoE;YACpE,KAAK,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,kBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,eAAe,EAAE,aAAa,CAAC;SACrF,CAAC;IACJ,CAAC,CAAC,CAAC;IAEL,GAAG,CAAC,WAAW,CAAC,IAAI,CAClB,IAAI,CAAC,MAAM,CAAC,kBAAU,EAAE,CAAC,QAAQ,CAAC,kBAAkB,EAAE,6BAAiB,CAAC,QAAQ,CAAC,CAClF,CAAC;IAEF,MAAM,MAAM,GAAG,MAAM,8BAAmB,CAAC,MAAM,EAAE,GAAG,CAAC,WAAW,CAAC,CAAC;IAElE,IAAI,MAAM,CAAC,KAAK,EAAE,EAAE;QAClB,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,kBAAU,EAAE,CAAC,QAAQ,CAAC,iBAAiB,EAAE,GAAG,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QAC7F,MAAA,GAAG,CAAC,WAAW,0CAAE,IAAI,CAAC,GAAG,CAAC,CAAC;QAC3B,OAAO,MAAM,CAAC;KACf;IACD,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;AAClB,CAAC;AA7CD,gDA6CC"}
+{"version":3,"file":"publish.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/publish.ts"],"names":[],"mappings":";;;;AAAA,wDAUgC;AAChC,mCAAqC;AACrC,mDAA6B;AAC7B,4DAAiE;AACjE,oDAAsD;AACtD,4CAA0F;AAC1F,yCAAiD;AACjD,mCAAuF;AAEhF,KAAK,UAAU,kBAAkB,CACtC,GAAe,EACf,MAAc,EACd,OAAqB,EACrB,aAAqC;;IAErC,MAAM,cAAc,GAAG,sBAAc,CAAC,gCAAwB,CAAC,GAAG,CAAC,CAAC,CAAC;IACrE,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,yBAAa,CAAC,CAAC,wCAA4B,CAAC,CAAC;IAEjF,IAAI,cAAc,IAAI,CAAC,WAAW,EAAE;QAClC,OAAO,iBAAG,CACR,6BAAe,CACb,IAAI,KAAK,CACP,IAAI,CAAC,MAAM,CAAC,kBAAU,EAAE,CAAC,QAAQ,CAAC,oBAAoB,EAAE,GAAG,CAAC,cAAc,CAAC,OAAO,CAAC,CACpF,EACD,UAAU,EACV,yBAAa,CAAC,2BAA2B,CAC1C,CACF,CAAC;KACH;IAED,MAAM,OAAO,GAAG,0BAAkB,CAAC,gCAAwB,CAAC,GAAG,CAAC,CAAC,CAAC;IAClE,MAAM,MAAM,GAAG,OAAO;SACnB,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,oBAAW,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;SAC3D,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;QACd,OAAO;YACL,UAAU,EAAE,GAAG,MAAM,CAAC,IAAI,EAAE;YAC5B,QAAQ,EAAE,oBAAoB;YAC9B,oEAAoE;YACpE,KAAK,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,kBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,CAAC;SAC7E,CAAC;IACJ,CAAC,CAAC,CAAC;IAEL,GAAG,CAAC,WAAW,CAAC,IAAI,CAClB,IAAI,CAAC,MAAM,CAAC,kBAAU,EAAE,CAAC,QAAQ,CAAC,kBAAkB,EAAE,6BAAiB,CAAC,QAAQ,CAAC,CAClF,CAAC;IAEF,MAAM,MAAM,GAAG,MAAM,8BAAmB,CAAC,MAAM,EAAE,GAAG,CAAC,WAAW,CAAC,CAAC;IAElE,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE;QAC7B,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,kBAAU,EAAE,CAAC,QAAQ,CAAC,iBAAiB,EAAE,GAAG,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QAC7F,MAAA,GAAG,CAAC,WAAW,0CAAE,IAAI,CAAC,GAAG,CAAC,CAAC;QAC3B,OAAO,iBAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;KAC1B;IACD,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;AAClB,CAAC;AA7CD,gDA6CC"}

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

@@ -1,9 +1,5 @@
-import { v2, Inputs, FxError, Result } from "@microsoft/teamsfx-api";
-export declare function scaffoldSourceCode(ctx: v2.Context, inputs: Inputs): Promise<Result<Record<v2.PluginName, {
-    output: Record<string, string>;
-}>, FxError>>;
-export declare function scaffoldByPlugins(ctx: v2.Context, inputs: Inputs, plugins: v2.ResourcePlugin[]): Promise<Result<Record<v2.PluginName, {
-    output: Record<string, string>;
-}>, FxError>>;
+import { v2, Inputs, FxError, Result, Void } from "@microsoft/teamsfx-api";
+export declare function scaffoldSourceCode(ctx: v2.Context, inputs: Inputs): Promise<Result<Void, FxError>>;
+export declare function scaffoldByPlugins(ctx: v2.Context, inputs: Inputs, plugins: v2.ResourcePlugin[]): Promise<Result<Void, FxError>>;
 export declare function scaffoldReadmeAndLocalSettings(capabilities: string[], azureResources: string[], projectPath: string, migrateFromV1?: boolean): Promise<void>;
 //# sourceMappingURL=scaffolding.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"scaffolding.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/scaffolding.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAW,MAAM,wBAAwB,CAAC;AAe9E,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,UAAU,EAAE;IAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,CAAC,EAAE,OAAO,CAAC,CAAC,CAgCrF;AAED,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,EAAE,CAAC,cAAc,EAAE,GAC3B,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,UAAU,EAAE;IAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,CAAC,EAAE,OAAO,CAAC,CAAC,CA8BrF;AAED,wBAAsB,8BAA8B,CAClD,YAAY,EAAE,MAAM,EAAE,EACtB,cAAc,EAAE,MAAM,EAAE,EACxB,WAAW,EAAE,MAAM,EACnB,aAAa,CAAC,EAAE,OAAO,GACtB,OAAO,CAAC,IAAI,CAAC,CAmCf"}
+{"version":3,"file":"scaffolding.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/scaffolding.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,EAAE,EACF,MAAM,EACN,OAAO,EACP,MAAM,EAGN,IAAI,EAEL,MAAM,wBAAwB,CAAC;AAsBhC,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CA0ChC;AAED,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,EAAE,CAAC,cAAc,EAAE,GAC3B,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAkChC;AAED,wBAAsB,8BAA8B,CAClD,YAAY,EAAE,MAAM,EAAE,EACtB,cAAc,EAAE,MAAM,EAAE,EACxB,WAAW,EAAE,MAAM,EACnB,aAAa,CAAC,EAAE,OAAO,GACtB,OAAO,CAAC,IAAI,CAAC,CAmCf"}

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

@@ -12,7 +12,19 @@ const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const __1 = require("../../../..");
 const localSettingsProvider_1 = require("../../../../common/localSettingsProvider");
 async function scaffoldSourceCode(ctx, inputs) {
-    const plugins = utils_1.getSelectedPlugins(utils_1.getAzureSolutionSettings(ctx));
+    const blockResult = utils_1.blockV1Project(ctx.projectSetting.solutionSettings);
+    if (blockResult.isErr()) {
+        return teamsfx_api_1.err(blockResult.error);
+    }
+    const lang = inputs[question_1.AzureSolutionQuestionNames.ProgrammingLanguage];
+    if (lang) {
+        ctx.projectSetting.programmingLanguage = lang;
+    }
+    const solutionSettings = utils_1.getAzureSolutionSettings(ctx);
+    const fillinRes = utils_1.fillInSolutionSettings(solutionSettings, inputs);
+    if (fillinRes.isErr())
+        return teamsfx_api_1.err(fillinRes.error);
+    const plugins = utils_1.getSelectedPlugins(solutionSettings);
     const thunks = plugins
         .filter((plugin) => !!plugin.scaffoldSourceCode)
         .map((plugin) => {
@@ -24,14 +36,13 @@ async function scaffoldSourceCode(ctx, inputs) {
         };
     });
     const result = await executor_1.executeConcurrently(thunks, ctx.logProvider);
-    const solutionSettings = utils_1.getAzureSolutionSettings(ctx);
-    if (result.isOk()) {
+    if (result.kind === "success") {
         const capabilities = solutionSettings.capabilities;
         const azureResources = solutionSettings.azureResources;
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         await scaffoldReadmeAndLocalSettings(capabilities, azureResources, inputs.projectPath);
         ctx.userInteraction.showMessage("info", `Success: ${tools_1.getStrings().solution.ScaffoldSuccessNotice}`, false);
-        return teamsfx_api_1.ok(utils_1.combineRecords(result.value));
+        return teamsfx_api_1.ok(teamsfx_api_1.Void);
     }
     else {
         return teamsfx_api_1.err(result.error);
@@ -39,6 +50,10 @@ async function scaffoldSourceCode(ctx, inputs) {
 }
 exports.scaffoldSourceCode = scaffoldSourceCode;
 async function scaffoldByPlugins(ctx, inputs, plugins) {
+    const blockResult = utils_1.blockV1Project(ctx.projectSetting.solutionSettings);
+    if (blockResult.isErr()) {
+        return teamsfx_api_1.err(blockResult.error);
+    }
     const thunks = plugins
         .filter((plugin) => !!plugin.scaffoldSourceCode)
         .map((plugin) => {
@@ -51,13 +66,13 @@ async function scaffoldByPlugins(ctx, inputs, plugins) {
     });
     const result = await executor_1.executeConcurrently(thunks, ctx.logProvider);
     const solutionSettings = utils_1.getAzureSolutionSettings(ctx);
-    if (result.isOk()) {
+    if (result.kind === "success") {
         const capabilities = solutionSettings.capabilities;
         const azureResources = solutionSettings.azureResources;
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         await scaffoldReadmeAndLocalSettings(capabilities, azureResources, inputs.projectPath);
         ctx.userInteraction.showMessage("info", `Success: ${tools_1.getStrings().solution.ScaffoldSuccessNotice}`, false);
-        return teamsfx_api_1.ok(utils_1.combineRecords(result.value));
+        return teamsfx_api_1.ok(teamsfx_api_1.Void);
     }
     else {
         return teamsfx_api_1.err(result.error);

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

@@ -0,0 +1,18 @@
+import { AppStudioTokenProvider, AzureAccountProvider, Func, FxError, Inputs, Json, QTreeNode, Result, TokenProvider, v2, Void } from "@microsoft/teamsfx-api";
+import { DeepReadonly, EnvInfoV2 } from "@microsoft/teamsfx-api/build/v2";
+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>>;
+    deploy?: (ctx: v2.Context, inputs: Inputs, provisionOutputs: Json, tokenProvider: AzureAccountProvider) => 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>>;
+    getQuestionsForScaffolding?: (ctx: v2.Context, inputs: Inputs) => Promise<Result<QTreeNode | undefined, FxError>>;
+    executeUserTask?: (ctx: v2.Context, inputs: Inputs, func: Func, envInfo: EnvInfoV2, tokenProvider: TokenProvider) => Promise<Result<unknown, FxError>>;
+    createEnv?: (ctx: v2.Context, inputs: Inputs) => Promise<Result<Void, FxError>>;
+    getQuestions?: (ctx: v2.Context, inputs: Inputs, envInfo: DeepReadonly<EnvInfoV2>, tokenProvider: TokenProvider) => Promise<Result<QTreeNode | undefined, FxError>>;
+    getQuestionsForUserTask?: (ctx: v2.Context, inputs: Inputs, func: Func, envInfo: DeepReadonly<EnvInfoV2>, tokenProvider: TokenProvider) => Promise<Result<QTreeNode | undefined, FxError>>;
+}
+//# sourceMappingURL=solution.d.ts.map

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

@@ -0,0 +1 @@
+{"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

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TeamsAppSolutionV2 = void 0;
+const tslib_1 = require("tslib");
+const typedi_1 = require("typedi");
+const constants_1 = require("../../../../common/constants");
+const SolutionPluginContainer_1 = require("../../../../core/SolutionPluginContainer");
+const createEnv_1 = require("./createEnv");
+const deploy_1 = require("./deploy");
+const executeUserTask_1 = require("./executeUserTask");
+const generateResourceTemplate_1 = require("./generateResourceTemplate");
+const getQuestions_1 = require("./getQuestions");
+const provision_1 = require("./provision");
+const provisionLocal_1 = require("./provisionLocal");
+const publish_1 = require("./publish");
+const scaffolding_1 = require("./scaffolding");
+let TeamsAppSolutionV2 = class TeamsAppSolutionV2 {
+    constructor() {
+        this.name = "fx-solution-azure";
+        this.displayName = constants_1.PluginDisplayName.Solution;
+        this.scaffoldSourceCode = scaffolding_1.scaffoldSourceCode;
+        this.generateResourceTemplate = generateResourceTemplate_1.generateResourceTemplate;
+        this.provisionResources = provision_1.provisionResource;
+        this.deploy = deploy_1.deploy;
+        this.publishApplication = publish_1.publishApplication;
+        this.provisionLocalResource = provisionLocal_1.provisionLocalResource;
+        this.getQuestionsForScaffolding = getQuestions_1.getQuestionsForScaffolding;
+        this.executeUserTask = executeUserTask_1.executeUserTask;
+        this.createEnv = createEnv_1.createEnv;
+        this.getQuestions = getQuestions_1.getQuestions;
+        this.getQuestionsForUserTask = getQuestions_1.getQuestionsForUserTask;
+    }
+};
+TeamsAppSolutionV2 = tslib_1.__decorate([
+    typedi_1.Service(SolutionPluginContainer_1.SolutionPluginsV2.AzureTeamsSolutionV2)
+], TeamsAppSolutionV2);
+exports.TeamsAppSolutionV2 = TeamsAppSolutionV2;
+//# sourceMappingURL=solution.js.map

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

@@ -0,0 +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,2CAAwC;AACxC,qCAAkC;AAClC,uDAAoD;AACpD,yEAAsE;AACtE,iDAAmG;AACnG,2CAAgD;AAChD,qDAA0D;AAC1D,uCAA+C;AAC/C,+CAAmD;AAGnD,IAAa,kBAAkB,GAA/B,MAAa,kBAAkB;IAA/B;QACE,SAAI,GAAG,mBAAmB,CAAC;QAC3B,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,GAM0B,iCAAe,CAAC;QAEzD,cAAS,GAAyE,qBAAS,CAAC;QAE5F,iBAAY,GAK2C,2BAAY,CAAC;QAEpE,4BAAuB,GAMgC,sCAAuB,CAAC;IACjF,CAAC;CAAA,CAAA;AAjEY,kBAAkB;IAD9B,gBAAO,CAAC,2CAAiB,CAAC,oBAAoB,CAAC;GACnC,kBAAkB,CAiE9B;AAjEY,gDAAkB"}

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

@@ -1,15 +1,17 @@
-import { v2, AzureSolutionSettings } from "@microsoft/teamsfx-api";
+import { v2, Inputs, FxError, Result, AzureSolutionSettings, Void, PermissionRequestProvider, SolutionSettings, Json } from "@microsoft/teamsfx-api";
 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 combineRecords(records: {
+export declare function combineRecords<T>(records: {
     name: string;
-    result: {
-        output: Record<string, string>;
-    };
-}[]): Record<string, {
-    output: Record<string, string>;
-}>;
-export declare function extractSolutionInputs(record: Record<string, string>): v2.SolutionInputs;
+    result: T;
+}[]): Record<string, T>;
+export declare function extractSolutionInputs(record: Json): v2.SolutionInputs;
 export declare function reloadV2Plugins(solutionSettings: AzureSolutionSettings): v2.ResourcePlugin[];
+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 loadTeamsAppTenantIdForLocal(localSettings: v2.LocalSettings, appStudioToken?: Record<string, unknown>): Result<Void, FxError>;
+export declare function blockV1Project(solutionSettings?: SolutionSettings): Result<Void, FxError>;
+export declare function fillInSolutionSettings(solutionSettings: AzureSolutionSettings, answers: Inputs): Result<Void, FxError>;
+export declare function checkWetherProvisionSucceeded(config: Json): boolean;
 //# 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,EAOF,qBAAqB,EAEtB,MAAM,wBAAwB,CAAC;AAIhC,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,CAC5B,OAAO,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;KAAE,CAAA;CAAE,EAAE,GACtE,MAAM,CAAC,MAAM,EAAE;IAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,CAAC,CAOpD;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,EAAE,CAAC,cAAc,CAQvF;AAED,wBAAgB,eAAe,CAAC,gBAAgB,EAAE,qBAAqB,GAAG,EAAE,CAAC,cAAc,EAAE,CAI5F"}
+{"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,gBAAgB,EAChB,IAAI,EACL,MAAM,wBAAwB,CAAC;AAehC,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,CAQrE;AAED,wBAAgB,eAAe,CAAC,gBAAgB,EAAE,qBAAqB,GAAG,EAAE,CAAC,cAAc,EAAE,CAI5F;AAED,wBAAsB,uBAAuB,CAC3C,gBAAgB,EAAE,qBAAqB,EACvC,yBAAyB,CAAC,EAAE,yBAAyB,GACpD,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;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;AAGD,wBAAgB,cAAc,CAAC,gBAAgB,CAAC,EAAE,gBAAgB,GAAG,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAWzF;AAED,wBAAgB,sBAAsB,CACpC,gBAAgB,EAAE,qBAAqB,EACvC,OAAO,EAAE,MAAM,GACd,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAgCvB;AAED,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,IAAI,GAAG,OAAO,CAEnE"}

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

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.reloadV2Plugins = exports.extractSolutionInputs = exports.combineRecords = exports.isAzureProject = exports.getAzureSolutionSettings = exports.getSelectedPlugins = void 0;
+exports.checkWetherProvisionSucceeded = exports.fillInSolutionSettings = exports.blockV1Project = exports.loadTeamsAppTenantIdForLocal = exports.parseTeamsAppTenantId = exports.ensurePermissionRequest = exports.reloadV2Plugins = exports.extractSolutionInputs = exports.combineRecords = exports.isAzureProject = exports.getAzureSolutionSettings = exports.getSelectedPlugins = void 0;
+const teamsfx_api_1 = require("@microsoft/teamsfx-api");
+const localSettingsConstants_1 = require("../../../../common/localSettingsConstants");
+const constants_1 = require("../constants");
 const question_1 = require("../question");
 const ResourcePluginContainer_1 = require("../ResourcePluginContainer");
 function getSelectedPlugins(azureSettings) {
@@ -41,4 +44,81 @@ function reloadV2Plugins(solutionSettings) {
     return res;
 }
 exports.reloadV2Plugins = reloadV2Plugins;
+async function ensurePermissionRequest(solutionSettings, permissionRequestProvider) {
+    if (solutionSettings.migrateFromV1) {
+        return teamsfx_api_1.ok(teamsfx_api_1.Void);
+    }
+    if (!isAzureProject(solutionSettings)) {
+        return teamsfx_api_1.err(teamsfx_api_1.returnUserError(new Error("Cannot update permission for SPFx project"), "Solution", constants_1.SolutionError.CannotUpdatePermissionForSPFx));
+    }
+    const result = await (permissionRequestProvider === null || permissionRequestProvider === void 0 ? void 0 : permissionRequestProvider.checkPermissionRequest());
+    if (result && result.isErr()) {
+        return result.map(teamsfx_api_1.err);
+    }
+    return teamsfx_api_1.ok(teamsfx_api_1.Void);
+}
+exports.ensurePermissionRequest = ensurePermissionRequest;
+function parseTeamsAppTenantId(appStudioToken) {
+    if (appStudioToken === undefined) {
+        return teamsfx_api_1.err(teamsfx_api_1.returnSystemError(new Error("Graph token json is undefined"), "Solution", constants_1.SolutionError.NoAppStudioToken));
+    }
+    const teamsAppTenantId = appStudioToken["tid"];
+    if (teamsAppTenantId === undefined ||
+        !(typeof teamsAppTenantId === "string") ||
+        teamsAppTenantId.length === 0) {
+        return teamsfx_api_1.err(teamsfx_api_1.returnSystemError(new Error("Cannot find teams app tenant id"), "Solution", constants_1.SolutionError.NoTeamsAppTenantId));
+    }
+    return teamsfx_api_1.ok(teamsAppTenantId);
+}
+exports.parseTeamsAppTenantId = parseTeamsAppTenantId;
+// Loads teams app tenant id into local settings.
+function loadTeamsAppTenantIdForLocal(localSettings, appStudioToken) {
+    return parseTeamsAppTenantId(appStudioToken).andThen((teamsAppTenantId) => {
+        localSettings.teamsApp[localSettingsConstants_1.LocalSettingsTeamsAppKeys.TenantId] = teamsAppTenantId;
+        return teamsfx_api_1.ok(teamsfx_api_1.Void);
+    });
+}
+exports.loadTeamsAppTenantIdForLocal = loadTeamsAppTenantIdForLocal;
+// Returns error if current project is generated by Toolkit V1 extension.
+function blockV1Project(solutionSettings) {
+    if (solutionSettings === null || solutionSettings === void 0 ? void 0 : solutionSettings.migrateFromV1) {
+        return teamsfx_api_1.err(teamsfx_api_1.returnUserError(new Error("Command is not supported in Teams Toolkit V1 Project"), "Solution", constants_1.SolutionError.V1ProjectNotSupported));
+    }
+    return teamsfx_api_1.ok(teamsfx_api_1.Void);
+}
+exports.blockV1Project = blockV1Project;
+function fillInSolutionSettings(solutionSettings, answers) {
+    const 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"), "Solution", constants_1.SolutionError.InternelError));
+    }
+    let hostType = answers[question_1.AzureSolutionQuestionNames.HostType];
+    if (capabilities.includes(question_1.BotOptionItem.id) || capabilities.includes(question_1.MessageExtensionItem.id))
+        hostType = question_1.HostTypeOptionAzure.id;
+    if (!hostType) {
+        return teamsfx_api_1.err(teamsfx_api_1.returnSystemError(new Error("hostType is undefined"), "Solution", constants_1.SolutionError.InternelError));
+    }
+    solutionSettings.hostType = hostType;
+    let azureResources;
+    if (hostType === question_1.HostTypeOptionAzure.id && capabilities.includes(question_1.TabOptionItem.id)) {
+        azureResources = answers[question_1.AzureSolutionQuestionNames.AzureResources];
+        if (azureResources) {
+            if ((azureResources.includes(question_1.AzureResourceSQL.id) ||
+                azureResources.includes(question_1.AzureResourceApim.id)) &&
+                !azureResources.includes(question_1.AzureResourceFunction.id)) {
+                azureResources.push(question_1.AzureResourceFunction.id);
+            }
+        }
+        else
+            azureResources = [];
+    }
+    solutionSettings.azureResources = azureResources || [];
+    solutionSettings.capabilities = capabilities || [];
+    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][constants_1.SOLUTION_PROVISION_SUCCEEDED];
+}
+exports.checkWetherProvisionSucceeded = checkWetherProvisionSucceeded;
 //# sourceMappingURL=utils.js.map

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":";;;AAWA,0CAAkD;AAClD,wEAAwG;AAExG,SAAgB,kBAAkB,CAAC,aAAoC;IACrE,MAAM,OAAO,GAAG,uDAA6B,CAAC,aAAa,CAAC,CAAC;IAC7D,aAAa,CAAC,qBAAqB,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IACjE,OAAO,OAAO,CAAC;AACjB,CAAC;AAJD,gDAIC;AAED,SAAgB,wBAAwB,CAAC,GAAe;IACtD,OAAO,GAAG,CAAC,cAAc,CAAC,gBAAyC,CAAC;AACtE,CAAC;AAFD,4DAEC;AAED,SAAgB,cAAc,CAAC,aAAoC;IACjE,OAAO,8BAAmB,CAAC,EAAE,KAAK,aAAa,CAAC,QAAQ,CAAC;AAC3D,CAAC;AAFD,wCAEC;AAED,SAAgB,cAAc,CAC5B,OAAuE;IAEvE,MAAM,GAAG,GAA8D,EAAE,CAAC;IAC1E,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;QAC5B,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC;KAClC;IAED,OAAO,GAAG,CAAC;AACb,CAAC;AATD,wCASC;AAED,SAAgB,qBAAqB,CAAC,MAA8B;IAClE,OAAO;QACL,kBAAkB,EAAE,MAAM,CAAC,oBAAoB,CAAC;QAChD,iBAAiB,EAAE,MAAM,CAAC,mBAAmB,CAAC;QAC9C,QAAQ,EAAE,MAAM,CAAC,UAAU,CAAC;QAC5B,gBAAgB,EAAE,MAAM,CAAC,kBAAkB,CAAC;QAC5C,gBAAgB,EAAE,SAAS;KAC5B,CAAC;AACJ,CAAC;AARD,sDAQC;AAED,SAAgB,eAAe,CAAC,gBAAuC;IACrE,MAAM,GAAG,GAAG,uDAA6B,CAAC,gBAAgB,CAAC,CAAC;IAC5D,gBAAgB,CAAC,qBAAqB,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAChE,OAAO,GAAG,CAAC;AACb,CAAC;AAJD,0CAIC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/utils.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/teamsfx-core",
-  "version": "0.7.0",
+  "version": "0.7.1-alpha.5e8f6dea.0",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "license": "MIT",
@@ -21,9 +21,10 @@
     "test:unit": "nyc mocha \"tests/**/*.test.ts\"",
     "test:solution": "nyc mocha \"tests/plugins/solution/*.test.ts\"",
     "test:core": "nyc mocha \"tests/core/*.test.ts\"",
+    "test:apiv2": "nyc mocha \"tests/plugins/resource/apiv2/*.test.ts\"",
     "clean": "rm -rf build",
     "build": "rimraf build && npx tsc -p ./",
-    "eslint:fix": "eslint package.json tsconfig.json src test --ext .ts --fix",
+    "lint:fix": "eslint --fix \"src/**/*.ts\" \"tests/**/*.ts\"",
     "prepare": "npm run build && node ./scripts/download-templates-zip.js",
     "prepublishOnly": "npm run test:unit && npm run build",
     "package": "rimraf build && webpack --mode production --config ./webpack.config.js",
@@ -43,12 +44,12 @@
     "@azure/storage-blob": "^12.7.0",
     "@dbpiper/timer": "1.0.0-beta.2",
     "@feathersjs/hooks": "^0.6.5",
-    "@microsoft/teamsfx-api": "^0.7.0",
+    "@microsoft/teamsfx-api": "0.7.1-alpha.5e8f6dea.0",
     "@types/jwt-decode": "3.1.0",
     "@types/proper-lockfile": "^4.1.1",
     "adm-zip": "^0.5.5",
     "ajv": "^7.2.4",
-    "axios": "^0.21.1",
+    "axios": "^0.21.2",
     "cryptr": "^6.0.2",
     "dateformat": "^4.5.1",
     "dotenv": "^8.2.0",
@@ -62,6 +63,7 @@
     "js-base64": "^3.6.0",
     "js-yaml": "^4.0.0",
     "jsonschema": "^1.4.0",
+    "jsum": "^2.0.0-alpha.3",
     "jwt-decode": "3.1.2",
     "klaw": "^3.0.0",
     "md5": "^2.3.0",
@@ -98,6 +100,7 @@
     "@types/fs-extra": "^9.0.9",
     "@types/glob": "^7.1.3",
     "@types/js-yaml": "^4.0.0",
+    "@types/jsum": "^0.1.0",
     "@types/jwt-decode": "^3.1.0",
     "@types/klaw": "^3.0.1",
     "@types/lodash": "4.14.117",
@@ -144,7 +147,7 @@
     "resource/**/*",
     "templates/**/*"
   ],
-  "gitHead": "c2162a74a82daa557590c66afe68a58883a32780",
+  "gitHead": "ff74c110f816c220376069d00c49ac0540373e9c",
   "publishConfig": {
     "access": "public"
   },

package/resource/strings.json

@@ -23,7 +23,8 @@
     "GenerateArmTemplateFailNotice": "'%s' Failed to create ARM template for required Azure services.",
     "RegenerateArmTemplateConfirmNotice": "We will update your Azure resource template based on your resource and capability selection. The existing template file will be moved to backup folder under Azure resource template folder for your reference. We recommend to initialize your project workspace with git init to track all changes.",
     "MigrateSuccessNotice": "Your project is now initialized with Teams Toolkit! You can debug your application by pressing F5. If you wish to host your application in Azure, we recommend you to re-create your project directly using the latest Teams Toolkit.",
-
+    "MigrationToArmAndMultiEnvMessage": "We will update your project in order to continue using the latest Teams Toolkit. We recommend to initialize your workspace with git for better tracking file changes.",
+    "MigrationToArmAndMultiEnvSuccessMessage": "Migration Success! please run provision command before executing other commands, otherwise the commands may fail. Provision may create new resource, click the link for more information",
     "DeployArmTemplates": {
       "StartNotice": "[%s] Start deploying ARM templates.",
       "CompileBicepSuccessNotice": "[%s] Successfully compile bicep files to JSON.",

package/templates/plugins/resource/bot/bicep/botConfiguration.template.bicep

@@ -1,6 +1,4 @@
-{{#if createNewBotService}}
 param botServiceName string
-{{/if}}
 param botWebAppName string
 param botAadClientId string
 @secure()
@@ -26,7 +24,6 @@ param identityId string
 
 var initiateLoginEndpoint = uri(botEndpoint, authLoginUriSuffix)
 
-{{#if createNewBotService}}
 resource botServicesMsTeamsChannel 'Microsoft.BotService/botServices/channels@2021-03-01' = {
   location: 'global'
   name: '${botServiceName}/MsTeamsChannel'
@@ -35,7 +32,6 @@ resource botServicesMsTeamsChannel 'Microsoft.BotService/botServices/channels@20
   }
 }
 
-{{/if}}
 resource botWebAppSettings 'Microsoft.Web/sites/config@2021-01-01' = {
     name: '${botWebAppName}/appsettings'
      properties: {

package/templates/plugins/resource/bot/bicep/botProvision.template.bicep

@@ -1,8 +1,6 @@
-{{#if createNewBotService}}
 param botServiceName string
 param botAadClientId string
 param botDisplayName string
-{{/if}}
 param botServerfarmsName string
 param botWebAppSKU string = 'F1'
 param botServiceSKU string = 'F1'
@@ -14,7 +12,6 @@ param identityName string
 var botWebAppHostname = botWebApp.properties.hostNames[0]
 var botEndpoint = 'https://${botWebAppHostname}'
 
-{{#if createNewBotService}}
 resource botServices 'Microsoft.BotService/botServices@2021-03-01' = {
   kind: 'azurebot'
   location: 'global'
@@ -29,7 +26,6 @@ resource botServices 'Microsoft.BotService/botServices@2021-03-01' = {
   }
 }
 
-{{/if}}
 resource botServerfarm 'Microsoft.Web/serverfarms@2021-01-01' = {
   kind: 'app'
   location: resourceGroup().location
@@ -70,7 +66,5 @@ output botServiceSKU string = botServiceSKU
 output botWebAppName string = botWebAppName
 output botDomain string = botWebAppHostname
 output appServicePlanName string = botServerfarmsName
-{{#if createNewBotService}}
 output botServiceName string = botServiceName
-{{/if}}
 output botWebAppEndpoint string = botEndpoint