@microsoft/teamsfx-core 1.1.1 → 1.1.2-alpha.30d0724a.0

package/build/core/index.js

@@ -2,14 +2,16 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getProjectSettingsVersion = exports.undefinedName = exports.createV2Context = exports.newProjectSettings = exports.downloadSample = exports.createBasicFolderStructure = exports.FxCore = exports.TOOLS = exports.currentStage = exports.telemetryReporter = exports.Logger = exports.isVsCallingCli = exports.isV2 = void 0;
+exports.getProjectSettingsVersion = exports.undefinedName = exports.createV2Context = exports.newProjectSettings = exports.downloadSample = exports.createBasicFolderStructure = exports.FxCore = exports.setTools = exports.TOOLS = exports.currentStage = exports.telemetryReporter = exports.Logger = exports.isVsCallingCli = exports.isV3 = void 0;
 const tslib_1 = require("tslib");
 const hooks_1 = require("@feathersjs/hooks");
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const adm_zip_1 = tslib_1.__importDefault(require("adm-zip"));
 const fs = tslib_1.__importStar(require("fs-extra"));
 const jsonschema = tslib_1.__importStar(require("jsonschema"));
+const lodash_1 = require("lodash");
 const path = tslib_1.__importStar(require("path"));
+const typedi_1 = require("typedi");
 const uuid = tslib_1.__importStar(require("uuid"));
 const __1 = require("..");
 const constants_1 = require("../common/constants");
@@ -18,13 +20,17 @@ const localSettingsProvider_1 = require("../common/localSettingsProvider");
 const telemetry_1 = require("../common/telemetry");
 const tools_1 = require("../common/tools");
 const plugins_1 = require("../plugins");
+const question_1 = require("../plugins/solution/fx-solution/question");
 const ResourcePluginContainer_1 = require("../plugins/solution/fx-solution/ResourcePluginContainer");
+const constants_2 = require("../plugins/solution/fx-solution/v3/constants");
 const callback_1 = require("./callback");
+const crypto_1 = require("./crypto");
 const error_1 = require("./error");
 const concurrentLocker_1 = require("./middleware/concurrentLocker");
 const contextInjector_1 = require("./middleware/contextInjector");
 const envInfoLoader_1 = require("./middleware/envInfoLoader");
 const envInfoWriter_1 = require("./middleware/envInfoWriter");
+const envInfoWriterV3_1 = require("./middleware/envInfoWriterV3");
 const errorHandler_1 = require("./middleware/errorHandler");
 const localSettingsLoader_1 = require("./middleware/localSettingsLoader");
 const localSettingsWriter_1 = require("./middleware/localSettingsWriter");
@@ -35,12 +41,13 @@ const projectSettingsWriter_1 = require("./middleware/projectSettingsWriter");
 const projectUpgrader_1 = require("./middleware/projectUpgrader");
 const questionModel_1 = require("./middleware/questionModel");
 const solutionLoader_1 = require("./middleware/solutionLoader");
-const question_1 = require("./question");
+const question_2 = require("./question");
 const SolutionPluginContainer_1 = require("./SolutionPluginContainer");
 const tools_2 = require("./tools");
-const crypto_1 = require("./crypto");
 const supportV1ConditionHandler_1 = require("./middleware/supportV1ConditionHandler");
-const lodash_1 = require("lodash");
+const projectSettingsLoaderV3_1 = require("./middleware/projectSettingsLoaderV3");
+const solutionLoaderV3_1 = require("./middleware/solutionLoaderV3");
+const envInfoLoaderV3_1 = require("./middleware/envInfoLoaderV3");
 // TODO: For package.json,
 // use require instead of import because of core building/packaging method.
 // Using import will cause the build folder structure to change.
@@ -54,18 +61,36 @@ function featureFlagEnabled(flagName) {
         return false;
     }
 }
-// API V2 feature flag
-function isV2() {
-    return tools_1.isMultiEnvEnabled();
+function isV3() {
+    return featureFlagEnabled(constants_1.FeatureFlagName.APIV3);
 }
-exports.isV2 = isV2;
+exports.isV3 = isV3;
 // On VS calling CLI, interactive questions need to be skipped.
 function isVsCallingCli() {
     return featureFlagEnabled(constants_1.FeatureFlagName.VSCallingCLI);
 }
 exports.isVsCallingCli = isVsCallingCli;
+function setTools(tools) {
+    exports.TOOLS = tools;
+}
+exports.setTools = setTools;
 class FxCore {
     constructor(tools) {
+        //V1,V2 questions
+        this._getQuestionsForCreateProjectV2 = questionModel_1.getQuestionsForCreateProjectV2;
+        this._getQuestionsForCreateProjectV3 = questionModel_1.getQuestionsForCreateProjectV3;
+        this._getQuestionsForUserTask = questionModel_1.getQuestionsForUserTaskV2;
+        this._getQuestions = questionModel_1.getQuestionsV2;
+        this._getQuestionsForMigrateV1Project = questionModel_1.getQuestionsForMigrateV1Project;
+        //v3 questions
+        this._getQuestionsForScaffold = questionModel_1.getQuestionsForScaffold;
+        this._getQuestionsForAddModule = questionModel_1.getQuestionsForAddModule;
+        this._getQuestionsForAddResource = questionModel_1.getQuestionsForAddResource;
+        this._getQuestionsForProvision = questionModel_1.getQuestionsForProvision;
+        this._getQuestionsForDeploy = questionModel_1.getQuestionsForDeploy;
+        this._getQuestionsForLocalProvision = questionModel_1.getQuestionsForLocalProvision;
+        this._getQuestionsForPublish = questionModel_1.getQuestionsForPublish;
+        this._getQuestionsForInit = questionModel_1.getQuestionsForInit;
         this.tools = tools;
         exports.TOOLS = tools;
         exports.Logger = tools.logProvider;
@@ -78,24 +103,37 @@ class FxCore {
     on(event, callback) {
         return callback_1.CallbackRegistry.set(event, callback);
     }
-    async createProject(inputs, ctx) {
+    async createProject(inputs) {
+        if (isV3()) {
+            return this.createProjectV3(inputs);
+        }
+        else {
+            return this.createProjectV2(inputs);
+        }
+    }
+    async createProjectV2(inputs, ctx) {
         if (!ctx) {
             return teamsfx_api_1.err(new error_1.ObjectIsUndefinedError("ctx for createProject"));
         }
         exports.currentStage = teamsfx_api_1.Stage.create;
         inputs.stage = teamsfx_api_1.Stage.create;
-        let folder = inputs[question_1.QuestionRootFolder.name];
+        let folder = inputs[question_2.QuestionRootFolder.name];
         if (inputs.platform === teamsfx_api_1.Platform.VSCode) {
             folder = tools_1.getRootDirectory();
-            await fs.ensureDir(folder);
+            try {
+                await fs.ensureDir(folder);
+            }
+            catch (e) {
+                throw error_1.ProjectFolderInvalidError(folder);
+            }
         }
-        const scratch = inputs[question_1.CoreQuestionNames.CreateFromScratch];
+        const scratch = inputs[question_2.CoreQuestionNames.CreateFromScratch];
         let projectPath;
         let globalStateDescription = "openReadme";
         const multiEnv = tools_1.isMultiEnvEnabled();
-        if (scratch === question_1.ScratchOptionNo.id) {
+        if (scratch === question_2.ScratchOptionNo.id) {
             // create from sample
-            const downloadRes = await downloadSample(this, inputs, ctx);
+            const downloadRes = await downloadSample(inputs, ctx);
             if (downloadRes.isErr()) {
                 return teamsfx_api_1.err(downloadRes.error);
             }
@@ -104,11 +142,11 @@ class FxCore {
         }
         else {
             // create from new
-            const appName = inputs[question_1.QuestionAppName.name];
+            const appName = inputs[question_2.QuestionAppName.name];
             if (undefined === appName)
                 return teamsfx_api_1.err(error_1.InvalidInputError(`App Name is empty`, inputs));
             const validateResult = jsonschema.validate(appName, {
-                pattern: question_1.ProjectNamePattern,
+                pattern: question_2.ProjectNamePattern,
             });
             if (validateResult.errors && validateResult.errors.length > 0) {
                 return teamsfx_api_1.err(error_1.InvalidInputError(`${validateResult.errors[0].message}`, inputs));
@@ -143,71 +181,222 @@ class FxCore {
                     return teamsfx_api_1.err(createEnvResult.error);
                 }
             }
-            if (isV2()) {
-                const solution = await SolutionPluginContainer_1.getSolutionPluginV2ByName(inputs[question_1.CoreQuestionNames.Solution]);
-                if (!solution) {
-                    return teamsfx_api_1.err(new error_1.LoadSolutionError());
-                }
-                ctx.solutionV2 = solution;
-                projectSettings.solutionSettings.name = solution.name;
-                const contextV2 = createV2Context(this, projectSettings);
-                ctx.contextV2 = contextV2;
-                const scaffoldSourceCodeRes = await solution.scaffoldSourceCode(contextV2, inputs);
-                if (scaffoldSourceCodeRes.isErr()) {
-                    return teamsfx_api_1.err(scaffoldSourceCodeRes.error);
-                }
-                const generateResourceTemplateRes = await solution.generateResourceTemplate(contextV2, inputs);
-                if (generateResourceTemplateRes.isErr()) {
-                    return teamsfx_api_1.err(generateResourceTemplateRes.error);
-                }
-                // ctx.provisionInputConfig = generateResourceTemplateRes.value;
-                if (multiEnv) {
-                    if (solution.createEnv) {
-                        inputs.copy = false;
-                        const createEnvRes = await solution.createEnv(contextV2, inputs);
-                        if (createEnvRes.isErr()) {
-                            return teamsfx_api_1.err(createEnvRes.error);
-                        }
-                    }
-                }
-                else {
-                    //TODO lagacy env.default.json
-                    const state = { solution: {} };
-                    for (const plugin of ResourcePluginContainer_1.getAllV2ResourcePlugins()) {
-                        state[plugin.name] = {};
+            const solution = await SolutionPluginContainer_1.getSolutionPluginV2ByName(inputs[question_2.CoreQuestionNames.Solution]);
+            if (!solution) {
+                return teamsfx_api_1.err(new error_1.LoadSolutionError());
+            }
+            ctx.solutionV2 = solution;
+            projectSettings.solutionSettings.name = solution.name;
+            const contextV2 = createV2Context(projectSettings);
+            ctx.contextV2 = contextV2;
+            const scaffoldSourceCodeRes = await solution.scaffoldSourceCode(contextV2, inputs);
+            if (scaffoldSourceCodeRes.isErr()) {
+                return teamsfx_api_1.err(scaffoldSourceCodeRes.error);
+            }
+            const generateResourceTemplateRes = await solution.generateResourceTemplate(contextV2, inputs);
+            if (generateResourceTemplateRes.isErr()) {
+                return teamsfx_api_1.err(generateResourceTemplateRes.error);
+            }
+            // ctx.provisionInputConfig = generateResourceTemplateRes.value;
+            if (multiEnv) {
+                if (solution.createEnv) {
+                    inputs.copy = false;
+                    const createEnvRes = await solution.createEnv(contextV2, inputs);
+                    if (createEnvRes.isErr()) {
+                        return teamsfx_api_1.err(createEnvRes.error);
                     }
-                    state[plugins_1.PluginNames.LDEBUG]["trustDevCert"] = "true";
-                    ctx.envInfoV2 = {
-                        envName: __1.environmentManager.getDefaultEnvName(),
-                        config: {},
-                        state: state,
-                    };
                 }
             }
             else {
-                const solution = await SolutionPluginContainer_1.getSolutionPluginByName(inputs[question_1.CoreQuestionNames.Solution]);
-                if (!solution) {
-                    return teamsfx_api_1.err(new error_1.LoadSolutionError());
+                //TODO lagacy env.default.json
+                const state = { solution: {} };
+                for (const plugin of ResourcePluginContainer_1.getAllV2ResourcePlugins()) {
+                    state[plugin.name] = {};
                 }
-                ctx.solution = solution;
-                projectSettings.solutionSettings.name = solution.name;
-                const solutionContext = Object.assign(Object.assign(Object.assign({ projectSettings: projectSettings, envInfo: tools_2.newEnvInfo(), root: projectPath }, this.tools), this.tools.tokenProvider), { answers: inputs, cryptoProvider: new crypto_1.LocalCrypto(projectSettings.projectId) });
-                ctx.solutionContext = solutionContext;
-                const createRes = await solution.create(solutionContext);
-                if (createRes.isErr()) {
-                    return createRes;
+                state[plugins_1.PluginNames.LDEBUG]["trustDevCert"] = "true";
+                ctx.envInfoV2 = {
+                    envName: __1.environmentManager.getDefaultEnvName(),
+                    config: {},
+                    state: state,
+                };
+            }
+        }
+        if (inputs.platform === teamsfx_api_1.Platform.VSCode) {
+            await globalState_1.globalStateUpdate(globalStateDescription, true);
+        }
+        return teamsfx_api_1.ok(projectPath);
+    }
+    async createProjectV3(inputs, ctx) {
+        if (!ctx) {
+            return teamsfx_api_1.err(new error_1.ObjectIsUndefinedError("ctx for createProject"));
+        }
+        exports.currentStage = teamsfx_api_1.Stage.create;
+        inputs.stage = teamsfx_api_1.Stage.create;
+        let folder = inputs[question_2.QuestionRootFolder.name];
+        if (inputs.platform === teamsfx_api_1.Platform.VSCode || inputs.platform === teamsfx_api_1.Platform.VS) {
+            folder = tools_1.getRootDirectory();
+            try {
+                await fs.ensureDir(folder);
+            }
+            catch (e) {
+                throw error_1.ProjectFolderInvalidError(folder);
+            }
+        }
+        const scratch = inputs[question_2.CoreQuestionNames.CreateFromScratch];
+        let projectPath;
+        let globalStateDescription = "openReadme";
+        if (scratch === question_2.ScratchOptionNo.id) {
+            // create from sample
+            const downloadRes = await downloadSample(inputs, ctx);
+            if (downloadRes.isErr()) {
+                return teamsfx_api_1.err(downloadRes.error);
+            }
+            projectPath = downloadRes.value;
+            globalStateDescription = "openSampleReadme";
+        }
+        else {
+            // create from new
+            const appName = inputs[question_2.QuestionAppName.name];
+            if (undefined === appName)
+                return teamsfx_api_1.err(error_1.InvalidInputError(`App Name is empty`, inputs));
+            const validateResult = jsonschema.validate(appName, {
+                pattern: question_2.ProjectNamePattern,
+            });
+            if (validateResult.errors && validateResult.errors.length > 0) {
+                return teamsfx_api_1.err(error_1.InvalidInputError(`${validateResult.errors[0].message}`, inputs));
+            }
+            projectPath = path.join(folder, appName);
+            inputs.projectPath = projectPath;
+            const folderExist = await fs.pathExists(projectPath);
+            if (folderExist) {
+                return teamsfx_api_1.err(error_1.ProjectFolderExistError(projectPath));
+            }
+            await fs.ensureDir(projectPath);
+            await fs.ensureDir(path.join(projectPath, `.${teamsfx_api_1.ConfigFolderName}`));
+            let capabilities = inputs[question_2.CoreQuestionNames.Capabilities];
+            let projectType = "";
+            if (capabilities.includes(question_2.TabSPFxItem.id))
+                projectType = "spfx";
+            else if (capabilities.includes(question_2.TabOptionItem.id) && capabilities.length === 1)
+                projectType = "tab";
+            else if ((capabilities.includes(question_2.BotOptionItem.id) ||
+                capabilities.includes(question_1.MessageExtensionItem.id)) &&
+                !capabilities.includes(question_2.TabOptionItem.id))
+                projectType = "bot";
+            else if ((capabilities.includes(question_2.BotOptionItem.id) ||
+                capabilities.includes(question_1.MessageExtensionItem.id)) &&
+                capabilities.includes(question_2.TabOptionItem.id))
+                projectType = "tab+bot";
+            const programmingLanguage = inputs[question_2.CoreQuestionNames.ProgrammingLanguage];
+            // const solution = capabilities.includes(TabSPFxItem.id)
+            //   ? BuiltInSolutionNames.spfx
+            //   : BuiltInSolutionNames.azure;
+            // init
+            const initInputs = Object.assign(Object.assign({}, inputs), { projectPath: projectPath });
+            const initRes = await this._init(initInputs, ctx);
+            if (initRes.isErr()) {
+                return teamsfx_api_1.err(initRes.error);
+            }
+            // addModule, scaffold and addResource
+            if (inputs.platform === teamsfx_api_1.Platform.VS) {
+                // addModule
+                const addModuleInputs = Object.assign(Object.assign({}, inputs), { projectPath: projectPath, capabilities: capabilities });
+                const addModuleRes = await this._addModule(addModuleInputs, ctx);
+                if (addModuleRes.isErr()) {
+                    return teamsfx_api_1.err(addModuleRes.error);
                 }
-                const scaffoldRes = await solution.scaffold(solutionContext);
+                // addResource
+                const addResourceInputs = Object.assign(Object.assign({}, inputs), { projectPath: projectPath, module: "0", resource: constants_2.BuiltInResourcePluginNames.webApp });
+                const addResourceRes = await this._addResource(addResourceInputs, ctx);
+                if (addResourceRes.isErr()) {
+                    return teamsfx_api_1.err(addResourceRes.error);
+                }
+                // scaffold
+                let templateName = "";
+                if (projectType === "tab")
+                    templateName = "BlazorTab";
+                else if (projectType === "bot")
+                    templateName = "BlazorBot";
+                else if (projectType === "tabbot")
+                    templateName = "BlazorTabBot";
+                const scaffoldInputs = Object.assign(Object.assign({}, inputs), { projectPath: projectPath, module: "0", template: {
+                        id: `${constants_2.BuiltInScaffoldPluginNames.blazor}/${templateName}`,
+                        label: `${constants_2.BuiltInScaffoldPluginNames.blazor}/${templateName}`,
+                        data: {
+                            pluginName: constants_2.BuiltInScaffoldPluginNames.blazor,
+                            templateName: templateName,
+                        },
+                    } });
+                const scaffoldRes = await this._scaffold(scaffoldInputs, ctx);
                 if (scaffoldRes.isErr()) {
-                    return scaffoldRes;
+                    return teamsfx_api_1.err(scaffoldRes.error);
                 }
-                if (multiEnv) {
-                    if (solution.createEnv) {
-                        solutionContext.answers.copy = false;
-                        const createEnvRes = await solution.createEnv(solutionContext);
-                        if (createEnvRes.isErr()) {
-                            return teamsfx_api_1.err(createEnvRes.error);
-                        }
+            }
+            else {
+                if (capabilities.includes(question_2.TabOptionItem.id) || capabilities.includes(question_2.TabSPFxItem.id)) {
+                    const addModuleInputs = Object.assign(Object.assign({}, inputs), { projectPath: projectPath, capabilities: capabilities.includes(question_2.TabOptionItem.id)
+                            ? [question_2.TabOptionItem.id]
+                            : [question_2.TabSPFxItem.id] });
+                    const addModuleRes = await this._addModule(addModuleInputs, ctx);
+                    if (addModuleRes.isErr()) {
+                        return teamsfx_api_1.err(addModuleRes.error);
+                    }
+                    // addResource
+                    const addResourceInputs = Object.assign(Object.assign({}, inputs), { projectPath: projectPath, module: "0", resource: capabilities.includes(question_2.TabOptionItem.id)
+                            ? constants_2.BuiltInResourcePluginNames.storage
+                            : constants_2.BuiltInResourcePluginNames.spfx });
+                    const addResourceRes = await this._addResource(addResourceInputs, ctx);
+                    if (addResourceRes.isErr()) {
+                        return teamsfx_api_1.err(addResourceRes.error);
+                    }
+                    // scaffold
+                    const pluginName = capabilities.includes(question_2.TabOptionItem.id)
+                        ? constants_2.BuiltInScaffoldPluginNames.tab
+                        : constants_2.BuiltInScaffoldPluginNames.spfx;
+                    const templateName = capabilities.includes(question_2.TabOptionItem.id)
+                        ? programmingLanguage === "javascript"
+                            ? "ReactTab_JS"
+                            : "ReactTab_TS"
+                        : "SPFxTab";
+                    const scaffoldInputs = Object.assign(Object.assign({}, inputs), { projectPath: projectPath, module: "0", template: {
+                            id: `${pluginName}/${templateName}`,
+                            label: `${pluginName}/${templateName}`,
+                            data: {
+                                pluginName: pluginName,
+                                templateName: templateName, //TODO
+                            },
+                        } });
+                    const scaffoldRes = await this._scaffold(scaffoldInputs, ctx);
+                    if (scaffoldRes.isErr()) {
+                        return teamsfx_api_1.err(scaffoldRes.error);
+                    }
+                }
+                capabilities = capabilities.filter((c) => c !== question_2.TabOptionItem.id && c !== question_2.TabSPFxItem.id);
+                if (capabilities.length > 0) {
+                    const addModuleInputs = Object.assign(Object.assign({}, inputs), { projectPath: projectPath, capabilities: capabilities });
+                    const addModuleRes = await this._addModule(addModuleInputs, ctx);
+                    if (addModuleRes.isErr()) {
+                        return teamsfx_api_1.err(addModuleRes.error);
+                    }
+                    // addResource
+                    const addResourceInputs = Object.assign(Object.assign({}, inputs), { projectPath: projectPath, module: "1", resource: constants_2.BuiltInResourcePluginNames.bot });
+                    const addResourceRes = await this._addResource(addResourceInputs, ctx);
+                    if (addResourceRes.isErr()) {
+                        return teamsfx_api_1.err(addResourceRes.error);
+                    }
+                    // scaffold
+                    const templateName = programmingLanguage === "javascript" ? "NodejsBot_JS" : "NodejsBot_TS";
+                    const scaffoldInputs = Object.assign(Object.assign({}, inputs), { projectPath: projectPath, module: "1", resource: constants_2.BuiltInScaffoldPluginNames.bot, template: {
+                            id: `${constants_2.BuiltInScaffoldPluginNames.bot}/${templateName}`,
+                            label: `${constants_2.BuiltInScaffoldPluginNames.bot}/${templateName}`,
+                            data: {
+                                pluginName: constants_2.BuiltInScaffoldPluginNames.bot,
+                                templateName: templateName, //TODO
+                            },
+                        } });
+                    const scaffoldRes = await this._scaffold(scaffoldInputs, ctx);
+                    if (scaffoldRes.isErr()) {
+                        return teamsfx_api_1.err(scaffoldRes.error);
                     }
                 }
             }
@@ -222,11 +411,11 @@ class FxCore {
         exports.currentStage = teamsfx_api_1.Stage.migrateV1;
         inputs.stage = teamsfx_api_1.Stage.migrateV1;
         const globalStateDescription = "openReadme";
-        const appName = ((_a = inputs[question_1.DefaultAppNameFunc.name]) !== null && _a !== void 0 ? _a : inputs[question_1.QuestionV1AppName.name]);
+        const appName = ((_a = inputs[question_2.DefaultAppNameFunc.name]) !== null && _a !== void 0 ? _a : inputs[question_2.QuestionV1AppName.name]);
         if (undefined === appName)
             return teamsfx_api_1.err(error_1.InvalidInputError(`App Name is empty`, inputs));
         const validateResult = jsonschema.validate(appName, {
-            pattern: question_1.ProjectNamePattern,
+            pattern: question_2.ProjectNamePattern,
         });
         if (validateResult.errors && validateResult.errors.length > 0) {
             return teamsfx_api_1.err(error_1.InvalidInputError(`${validateResult.errors[0].message}`, inputs));
@@ -302,104 +491,131 @@ class FxCore {
             return teamsfx_api_1.err(error_1.ArchiveProjectError(e.message));
         }
     }
-    async provisionResources(inputs, ctx) {
+    /**
+     * switch to different versions of provisionResources
+     */
+    async provisionResources(inputs) {
+        if (isV3()) {
+            return this.provisionResourcesV3(inputs);
+        }
+        else {
+            return this.provisionResourcesV2(inputs);
+        }
+    }
+    async provisionResourcesV2(inputs, ctx) {
         exports.currentStage = teamsfx_api_1.Stage.provision;
         inputs.stage = teamsfx_api_1.Stage.provision;
-        // provision is not ready yet, so use API v1
-        if (isV2()) {
-            if (!ctx || !ctx.solutionV2 || !ctx.contextV2 || !ctx.envInfoV2) {
-                return teamsfx_api_1.err(new error_1.ObjectIsUndefinedError("Provision input stuff"));
-            }
-            const envInfo = ctx.envInfoV2;
-            const result = await ctx.solutionV2.provisionResources(ctx.contextV2, inputs, envInfo, this.tools.tokenProvider);
-            if (result.kind === "success") {
-                ctx.envInfoV2.state = lodash_1.assign(ctx.envInfoV2.state, result.output);
-                return teamsfx_api_1.ok(teamsfx_api_1.Void);
-            }
-            else if (result.kind === "partialSuccess") {
-                ctx.envInfoV2.state = lodash_1.assign(ctx.envInfoV2.state, result.output);
-                return teamsfx_api_1.err(result.error);
-            }
-            else {
-                return teamsfx_api_1.err(result.error);
-            }
+        if (!ctx || !ctx.solutionV2 || !ctx.contextV2 || !ctx.envInfoV2) {
+            return teamsfx_api_1.err(new error_1.ObjectIsUndefinedError("Provision input stuff"));
+        }
+        const envInfo = ctx.envInfoV2;
+        const result = await ctx.solutionV2.provisionResources(ctx.contextV2, inputs, envInfo, this.tools.tokenProvider);
+        if (result.kind === "success") {
+            ctx.envInfoV2.state = lodash_1.assign(ctx.envInfoV2.state, result.output);
+            return teamsfx_api_1.ok(teamsfx_api_1.Void);
+        }
+        else if (result.kind === "partialSuccess") {
+            ctx.envInfoV2.state = lodash_1.assign(ctx.envInfoV2.state, result.output);
+            return teamsfx_api_1.err(result.error);
         }
         else {
-            if (!ctx || !ctx.solution || !ctx.solutionContext) {
-                const name = undefinedName([ctx, ctx === null || ctx === void 0 ? void 0 : ctx.solution, ctx === null || ctx === void 0 ? void 0 : ctx.solutionContext], ["ctx", "ctx.solution", "ctx.solutionContext"]);
-                return teamsfx_api_1.err(new error_1.ObjectIsUndefinedError(`Provision input stuff: ${name}`));
-            }
-            const provisionRes = await ctx.solution.provision(ctx.solutionContext);
-            if (provisionRes.isErr()) {
-                return provisionRes;
+            return teamsfx_api_1.err(result.error);
+        }
+    }
+    async provisionResourcesV3(inputs, ctx) {
+        exports.currentStage = teamsfx_api_1.Stage.provision;
+        inputs.stage = teamsfx_api_1.Stage.provision;
+        if (ctx &&
+            ctx.solutionV3 &&
+            ctx.contextV2 &&
+            ctx.envInfoV3 &&
+            ctx.solutionV3.provisionResources) {
+            const res = await ctx.solutionV3.provisionResources(ctx.contextV2, inputs, ctx.envInfoV3, exports.TOOLS.tokenProvider);
+            if (res.isOk()) {
+                ctx.envInfoV3 = res.value;
             }
-            this._setEnvInfoV2(ctx);
-            return provisionRes;
+            return res;
         }
+        return teamsfx_api_1.ok(teamsfx_api_1.Void);
+    }
+    async deployArtifacts(inputs) {
+        if (isV3())
+            return this.deployArtifactsV3(inputs);
+        else
+            return this.deployArtifactsV2(inputs);
     }
-    async deployArtifacts(inputs, ctx) {
+    async deployArtifactsV2(inputs, ctx) {
         exports.currentStage = teamsfx_api_1.Stage.deploy;
         inputs.stage = teamsfx_api_1.Stage.deploy;
-        if (isV2()) {
-            if (!ctx || !ctx.solutionV2 || !ctx.contextV2 || !ctx.envInfoV2) {
-                const name = undefinedName([ctx, ctx === null || ctx === void 0 ? void 0 : ctx.solutionV2, ctx === null || ctx === void 0 ? void 0 : ctx.contextV2, ctx === null || ctx === void 0 ? void 0 : ctx.envInfoV2], ["ctx", "ctx.solutionV2", "ctx.contextV2", "ctx.envInfoV2"]);
-                return teamsfx_api_1.err(new error_1.ObjectIsUndefinedError(`Deploy input stuff: ${name}`));
-            }
-            if (ctx.solutionV2.deploy)
-                return await ctx.solutionV2.deploy(ctx.contextV2, inputs, ctx.envInfoV2, this.tools.tokenProvider);
-            else
+        if (!ctx || !ctx.solutionV2 || !ctx.contextV2 || !ctx.envInfoV2) {
+            const name = undefinedName([ctx, ctx === null || ctx === void 0 ? void 0 : ctx.solutionV2, ctx === null || ctx === void 0 ? void 0 : ctx.contextV2, ctx === null || ctx === void 0 ? void 0 : ctx.envInfoV2], ["ctx", "ctx.solutionV2", "ctx.contextV2", "ctx.envInfoV2"]);
+            return teamsfx_api_1.err(new error_1.ObjectIsUndefinedError(`Deploy input stuff: ${name}`));
+        }
+        if (ctx.solutionV2.deploy)
+            return await ctx.solutionV2.deploy(ctx.contextV2, inputs, ctx.envInfoV2, this.tools.tokenProvider);
+        else
+            return teamsfx_api_1.ok(teamsfx_api_1.Void);
+    }
+    async deployArtifactsV3(inputs, ctx) {
+        exports.currentStage = teamsfx_api_1.Stage.deploy;
+        inputs.stage = teamsfx_api_1.Stage.deploy;
+        if (ctx && ctx.solutionV3 && ctx.contextV2 && ctx.envInfoV3 && ctx.solutionV3.deploy) {
+            const res = await ctx.solutionV3.deploy(ctx.contextV2, inputs, ctx.envInfoV3, exports.TOOLS.tokenProvider);
+            return res;
+        }
+        return teamsfx_api_1.ok(teamsfx_api_1.Void);
+    }
+    async localDebug(inputs) {
+        if (isV3())
+            return this.localDebugV3(inputs);
+        else
+            return this.localDebugV2(inputs);
+    }
+    async localDebugV2(inputs, ctx) {
+        exports.currentStage = teamsfx_api_1.Stage.debug;
+        inputs.stage = teamsfx_api_1.Stage.debug;
+        if (!ctx || !ctx.solutionV2 || !ctx.contextV2) {
+            const name = undefinedName([ctx, ctx === null || ctx === void 0 ? void 0 : ctx.solutionV2, ctx === null || ctx === void 0 ? void 0 : ctx.contextV2], ["ctx", "ctx.solutionV2", "ctx.contextV2"]);
+            return teamsfx_api_1.err(new error_1.ObjectIsUndefinedError(`localDebug input stuff (${name})`));
+        }
+        if (!ctx.localSettings)
+            ctx.localSettings = {};
+        if (ctx.solutionV2.provisionLocalResource) {
+            const res = await ctx.solutionV2.provisionLocalResource(ctx.contextV2, inputs, ctx.localSettings, this.tools.tokenProvider);
+            if (res.kind === "success") {
+                ctx.localSettings = res.output;
                 return teamsfx_api_1.ok(teamsfx_api_1.Void);
+            }
+            else if (res.kind === "partialSuccess") {
+                ctx.localSettings = res.output;
+                return teamsfx_api_1.err(res.error);
+            }
+            else {
+                return teamsfx_api_1.err(res.error);
+            }
         }
         else {
-            if (!ctx || !ctx.solution || !ctx.solutionContext) {
-                const name = undefinedName([ctx, ctx === null || ctx === void 0 ? void 0 : ctx.solution, ctx === null || ctx === void 0 ? void 0 : ctx.solutionContext], ["ctx", "ctx.solution", "ctx.solutionContext"]);
-                return teamsfx_api_1.err(new error_1.ObjectIsUndefinedError(`Deploy input stuff: ${name}`));
-            }
-            return await ctx.solution.deploy(ctx.solutionContext);
+            return teamsfx_api_1.ok(teamsfx_api_1.Void);
         }
     }
-    async localDebug(inputs, ctx) {
+    async localDebugV3(inputs, ctx) {
         exports.currentStage = teamsfx_api_1.Stage.debug;
         inputs.stage = teamsfx_api_1.Stage.debug;
-        if (isV2()) {
-            if (tools_1.isMultiEnvEnabled()) {
-                if (!ctx || !ctx.solutionV2 || !ctx.contextV2) {
-                    const name = undefinedName([ctx, ctx === null || ctx === void 0 ? void 0 : ctx.solutionV2, ctx === null || ctx === void 0 ? void 0 : ctx.contextV2], ["ctx", "ctx.solutionV2", "ctx.contextV2"]);
-                    return teamsfx_api_1.err(new error_1.ObjectIsUndefinedError(`localDebug input stuff (${name})`));
-                }
-                if (!ctx.localSettings)
-                    ctx.localSettings = {};
-                if (ctx.solutionV2.provisionLocalResource) {
-                    const res = await ctx.solutionV2.provisionLocalResource(ctx.contextV2, inputs, ctx.localSettings, this.tools.tokenProvider);
-                    if (res.kind === "success") {
-                        ctx.localSettings = res.output;
-                        return teamsfx_api_1.ok(teamsfx_api_1.Void);
-                    }
-                    else if (res.kind === "partialSuccess") {
-                        ctx.localSettings = res.output;
-                        return teamsfx_api_1.err(res.error);
-                    }
-                    else {
-                        return teamsfx_api_1.err(res.error);
-                    }
-                }
-                else {
-                    return teamsfx_api_1.ok(teamsfx_api_1.Void);
-                }
+        if (ctx &&
+            ctx.solutionV3 &&
+            ctx.contextV2 &&
+            ctx.localSettings &&
+            ctx.solutionV3.provisionLocalResources) {
+            const res = await ctx.solutionV3.provisionLocalResources(ctx.contextV2, inputs, ctx.localSettings, exports.TOOLS.tokenProvider);
+            if (res.isOk()) {
+                ctx.localSettings = res.value;
             }
+            return res;
         }
-        if (!ctx || !ctx.solution || !ctx.solutionContext || !ctx.projectSettings) {
-            const name = undefinedName([ctx, ctx === null || ctx === void 0 ? void 0 : ctx.solution, ctx === null || ctx === void 0 ? void 0 : ctx.solutionContext, ctx === null || ctx === void 0 ? void 0 : ctx.projectSettings], ["ctx", "ctx.solution", "ctx.solutionContext", "ctx.projectSettings"]);
-            return teamsfx_api_1.err(new error_1.ObjectIsUndefinedError(`localDebug input stuff (${name})`));
-        }
-        envInfoLoader_1.upgradeProgrammingLanguage(ctx.solutionContext.envInfo.state, ctx.projectSettings);
-        envInfoLoader_1.upgradeDefaultFunctionName(ctx.solutionContext.envInfo.state, ctx.projectSettings);
-        const res = await ctx.solution.localDebug(ctx.solutionContext);
-        this._setEnvInfoV2(ctx);
-        return res;
+        return teamsfx_api_1.ok(teamsfx_api_1.Void);
     }
     _setEnvInfoV2(ctx) {
-        if (isV2() && ctx && ctx.solutionContext) {
+        if (ctx && ctx.solutionContext) {
             //workaround, compatible to api v2
             ctx.envInfoV2 = {
                 envName: ctx.solutionContext.envInfo.envName,
@@ -409,23 +625,33 @@ class FxCore {
             ctx.envInfoV2.state = tools_1.mapToJson(ctx.solutionContext.envInfo.state);
         }
     }
-    async publishApplication(inputs, ctx) {
+    async publishApplication(inputs) {
+        if (isV3())
+            return this.publishApplicationV3(inputs);
+        else
+            return this.publishApplicationV2(inputs);
+    }
+    async publishApplicationV2(inputs, ctx) {
         exports.currentStage = teamsfx_api_1.Stage.publish;
         inputs.stage = teamsfx_api_1.Stage.publish;
-        if (isV2()) {
-            if (!ctx || !ctx.solutionV2 || !ctx.contextV2 || !ctx.envInfoV2) {
-                const name = undefinedName([ctx, ctx === null || ctx === void 0 ? void 0 : ctx.solutionV2, ctx === null || ctx === void 0 ? void 0 : ctx.contextV2, ctx === null || ctx === void 0 ? void 0 : ctx.envInfoV2], ["ctx", "ctx.solutionV2", "ctx.contextV2", "ctx.envInfoV2"]);
-                return teamsfx_api_1.err(new error_1.ObjectIsUndefinedError(`publish input stuff: ${name}`));
-            }
-            return await ctx.solutionV2.publishApplication(ctx.contextV2, inputs, ctx.envInfoV2, this.tools.tokenProvider.appStudioToken);
+        if (!ctx || !ctx.solutionV2 || !ctx.contextV2 || !ctx.envInfoV2) {
+            const name = undefinedName([ctx, ctx === null || ctx === void 0 ? void 0 : ctx.solutionV2, ctx === null || ctx === void 0 ? void 0 : ctx.contextV2, ctx === null || ctx === void 0 ? void 0 : ctx.envInfoV2], ["ctx", "ctx.solutionV2", "ctx.contextV2", "ctx.envInfoV2"]);
+            return teamsfx_api_1.err(new error_1.ObjectIsUndefinedError(`publish input stuff: ${name}`));
         }
-        else {
-            if (!ctx || !ctx.solution || !ctx.solutionContext) {
-                const name = undefinedName([ctx, ctx === null || ctx === void 0 ? void 0 : ctx.solution, ctx === null || ctx === void 0 ? void 0 : ctx.solutionContext], ["ctx", "ctx.solution", "ctx.solutionContext"]);
-                return teamsfx_api_1.err(new error_1.ObjectIsUndefinedError(`publish input stuff: ${name}`));
-            }
-            return await ctx.solution.publish(ctx.solutionContext);
+        return await ctx.solutionV2.publishApplication(ctx.contextV2, inputs, ctx.envInfoV2, this.tools.tokenProvider.appStudioToken);
+    }
+    async publishApplicationV3(inputs, ctx) {
+        exports.currentStage = teamsfx_api_1.Stage.publish;
+        inputs.stage = teamsfx_api_1.Stage.publish;
+        if (ctx &&
+            ctx.solutionV3 &&
+            ctx.contextV2 &&
+            ctx.envInfoV3 &&
+            ctx.solutionV3.publishApplication) {
+            const res = await ctx.solutionV3.publishApplication(ctx.contextV2, inputs, ctx.envInfoV3, exports.TOOLS.tokenProvider.appStudioToken);
+            return res;
         }
+        return teamsfx_api_1.ok(teamsfx_api_1.Void);
     }
     async executeUserTask(func, inputs, ctx) {
         exports.currentStage = teamsfx_api_1.Stage.userTask;
@@ -433,32 +659,20 @@ class FxCore {
         const namespace = func.namespace;
         const array = namespace ? namespace.split("/") : [];
         if ("" !== namespace && array.length > 0) {
-            if (isV2()) {
-                if (!ctx || !ctx.solutionV2 || !ctx.envInfoV2) {
-                    const name = undefinedName([ctx, ctx === null || ctx === void 0 ? void 0 : ctx.solutionV2, ctx === null || ctx === void 0 ? void 0 : ctx.envInfoV2], ["ctx", "ctx.solutionV2", "ctx.envInfoV2"]);
-                    return teamsfx_api_1.err(new error_1.ObjectIsUndefinedError(`executeUserTask input stuff: ${name}`));
-                }
-                if (!ctx.contextV2)
-                    ctx.contextV2 = createV2Context(this, newProjectSettings());
-                if (ctx.solutionV2.executeUserTask) {
-                    if (!ctx.localSettings)
-                        ctx.localSettings = {};
-                    const res = await ctx.solutionV2.executeUserTask(ctx.contextV2, inputs, func, ctx.localSettings, ctx.envInfoV2, this.tools.tokenProvider);
-                    return res;
-                }
-                else
-                    return teamsfx_api_1.err(error_1.FunctionRouterError(func));
+            if (!ctx || !ctx.solutionV2 || !ctx.envInfoV2) {
+                const name = undefinedName([ctx, ctx === null || ctx === void 0 ? void 0 : ctx.solutionV2, ctx === null || ctx === void 0 ? void 0 : ctx.envInfoV2], ["ctx", "ctx.solutionV2", "ctx.envInfoV2"]);
+                return teamsfx_api_1.err(new error_1.ObjectIsUndefinedError(`executeUserTask input stuff: ${name}`));
             }
-            else {
-                if (!ctx || !ctx.solution)
-                    return teamsfx_api_1.err(new error_1.ObjectIsUndefinedError("executeUserTask input stuff"));
-                if (!ctx.solutionContext)
-                    ctx.solutionContext = await projectSettingsLoader_1.newSolutionContext(this.tools, inputs);
-                if (ctx.solution.executeUserTask)
-                    return await ctx.solution.executeUserTask(func, ctx.solutionContext);
-                else
-                    return teamsfx_api_1.err(error_1.FunctionRouterError(func));
+            if (!ctx.contextV2)
+                ctx.contextV2 = createV2Context(newProjectSettings());
+            if (ctx.solutionV2.executeUserTask) {
+                if (!ctx.localSettings)
+                    ctx.localSettings = {};
+                const res = await ctx.solutionV2.executeUserTask(ctx.contextV2, inputs, func, ctx.localSettings, ctx.envInfoV2, this.tools.tokenProvider);
+                return res;
             }
+            else
+                return teamsfx_api_1.err(error_1.FunctionRouterError(func));
         }
         return teamsfx_api_1.err(error_1.FunctionRouterError(func));
     }
@@ -469,27 +683,16 @@ class FxCore {
         exports.currentStage = teamsfx_api_1.Stage.getQuestions;
         if (stage === teamsfx_api_1.Stage.create) {
             delete inputs.projectPath;
-            return await this._getQuestionsForCreateProject(inputs);
+            return await this._getQuestionsForCreateProjectV2(inputs);
         }
         else {
-            if (isV2()) {
-                const contextV2 = ctx.contextV2
-                    ? ctx.contextV2
-                    : createV2Context(this, newProjectSettings());
-                const solutionV2 = ctx.solutionV2 ? ctx.solutionV2 : await SolutionPluginContainer_1.getAllSolutionPluginsV2()[0];
-                const envInfoV2 = ctx.envInfoV2
-                    ? ctx.envInfoV2
-                    : { envName: __1.environmentManager.getDefaultEnvName(), config: {}, state: {} };
-                inputs.stage = stage;
-                return await this._getQuestions(contextV2, solutionV2, stage, inputs, envInfoV2);
-            }
-            else {
-                const solutionContext = ctx.solutionContext
-                    ? ctx.solutionContext
-                    : await projectSettingsLoader_1.newSolutionContext(this.tools, inputs);
-                const solution = ctx.solution ? ctx.solution : SolutionPluginContainer_1.getAllSolutionPlugins()[0];
-                return await this._getQuestions(solutionContext, solution, stage, inputs);
-            }
+            const contextV2 = ctx.contextV2 ? ctx.contextV2 : createV2Context(newProjectSettings());
+            const solutionV2 = ctx.solutionV2 ? ctx.solutionV2 : await SolutionPluginContainer_1.getAllSolutionPluginsV2()[0];
+            const envInfoV2 = ctx.envInfoV2
+                ? ctx.envInfoV2
+                : { envName: __1.environmentManager.getDefaultEnvName(), config: {}, state: {} };
+            inputs.stage = stage;
+            return await this._getQuestions(contextV2, solutionV2, stage, inputs, envInfoV2);
         }
     }
     async getQuestionsForUserTask(func, inputs, ctx) {
@@ -497,21 +700,12 @@ class FxCore {
             return teamsfx_api_1.err(new error_1.ObjectIsUndefinedError("getQuestionsForUserTask input stuff"));
         inputs.stage = teamsfx_api_1.Stage.getQuestions;
         exports.currentStage = teamsfx_api_1.Stage.getQuestions;
-        if (isV2()) {
-            const contextV2 = ctx.contextV2 ? ctx.contextV2 : createV2Context(this, newProjectSettings());
-            const solutionV2 = ctx.solutionV2 ? ctx.solutionV2 : await SolutionPluginContainer_1.getAllSolutionPluginsV2()[0];
-            const envInfoV2 = ctx.envInfoV2
-                ? ctx.envInfoV2
-                : { envName: __1.environmentManager.getDefaultEnvName(), config: {}, state: {} };
-            return await this._getQuestionsForUserTask(contextV2, solutionV2, func, inputs, envInfoV2);
-        }
-        else {
-            const solutionContext = ctx.solutionContext
-                ? ctx.solutionContext
-                : await projectSettingsLoader_1.newSolutionContext(this.tools, inputs);
-            const solution = ctx.solution ? ctx.solution : SolutionPluginContainer_1.getAllSolutionPlugins()[0];
-            return await this._getQuestionsForUserTask(solutionContext, solution, func, inputs);
-        }
+        const contextV2 = ctx.contextV2 ? ctx.contextV2 : createV2Context(newProjectSettings());
+        const solutionV2 = ctx.solutionV2 ? ctx.solutionV2 : await SolutionPluginContainer_1.getAllSolutionPluginsV2()[0];
+        const envInfoV2 = ctx.envInfoV2
+            ? ctx.envInfoV2
+            : { envName: __1.environmentManager.getDefaultEnvName(), config: {}, state: {} };
+        return await this._getQuestionsForUserTask(contextV2, solutionV2, func, inputs, envInfoV2);
     }
     async getProjectConfig(inputs, ctx) {
         var _a, _b;
@@ -528,175 +722,59 @@ class FxCore {
     async grantPermission(inputs, ctx) {
         exports.currentStage = teamsfx_api_1.Stage.grantPermission;
         inputs.stage = teamsfx_api_1.Stage.grantPermission;
-        if (!isV2()) {
-            return ctx.solution.grantPermission(ctx.solutionContext);
-        }
-        else {
-            const projectPath = inputs.projectPath;
-            if (!projectPath) {
-                return teamsfx_api_1.err(new error_1.ObjectIsUndefinedError("projectPath"));
-            }
-            return ctx.solutionV2.grantPermission(ctx.contextV2, Object.assign(Object.assign({}, inputs), { projectPath: projectPath }), ctx.envInfoV2, this.tools.tokenProvider);
+        const projectPath = inputs.projectPath;
+        if (!projectPath) {
+            return teamsfx_api_1.err(new error_1.ObjectIsUndefinedError("projectPath"));
         }
+        return ctx.solutionV2.grantPermission(ctx.contextV2, Object.assign(Object.assign({}, inputs), { projectPath: projectPath }), ctx.envInfoV2, this.tools.tokenProvider);
     }
     async checkPermission(inputs, ctx) {
         exports.currentStage = teamsfx_api_1.Stage.checkPermission;
         inputs.stage = teamsfx_api_1.Stage.checkPermission;
-        if (!isV2()) {
-            return ctx.solution.checkPermission(ctx.solutionContext);
-        }
-        else {
-            const projectPath = inputs.projectPath;
-            if (!projectPath) {
-                return teamsfx_api_1.err(new error_1.ObjectIsUndefinedError("projectPath"));
-            }
-            return ctx.solutionV2.checkPermission(ctx.contextV2, Object.assign(Object.assign({}, inputs), { projectPath: projectPath }), ctx.envInfoV2, this.tools.tokenProvider);
+        const projectPath = inputs.projectPath;
+        if (!projectPath) {
+            return teamsfx_api_1.err(new error_1.ObjectIsUndefinedError("projectPath"));
         }
+        return ctx.solutionV2.checkPermission(ctx.contextV2, Object.assign(Object.assign({}, inputs), { projectPath: projectPath }), ctx.envInfoV2, this.tools.tokenProvider);
     }
     async listCollaborator(inputs, ctx) {
         exports.currentStage = teamsfx_api_1.Stage.listCollaborator;
         inputs.stage = teamsfx_api_1.Stage.listCollaborator;
-        if (!isV2()) {
-            return ctx.solution.listCollaborator(ctx.solutionContext);
-        }
-        else {
-            const projectPath = inputs.projectPath;
-            if (!projectPath) {
-                return teamsfx_api_1.err(new error_1.ObjectIsUndefinedError("projectPath"));
-            }
-            return ctx.solutionV2.listCollaborator(ctx.contextV2, Object.assign(Object.assign({}, inputs), { projectPath: projectPath }), ctx.envInfoV2, this.tools.tokenProvider);
+        const projectPath = inputs.projectPath;
+        if (!projectPath) {
+            return teamsfx_api_1.err(new error_1.ObjectIsUndefinedError("projectPath"));
         }
+        return ctx.solutionV2.listCollaborator(ctx.contextV2, Object.assign(Object.assign({}, inputs), { projectPath: projectPath }), ctx.envInfoV2, this.tools.tokenProvider);
     }
     async listAllCollaborators(inputs, ctx) {
         exports.currentStage = teamsfx_api_1.Stage.listAllCollaborators;
         inputs.stage = teamsfx_api_1.Stage.listAllCollaborators;
-        if (!isV2()) {
-            return ctx.solution.listAllCollaborators(ctx.solutionContext);
-        }
-        else {
-            const projectPath = inputs.projectPath;
-            if (!projectPath) {
-                return teamsfx_api_1.err(new error_1.ObjectIsUndefinedError("projectPath"));
-            }
-            return ctx.solutionV2.listAllCollaborators(ctx.contextV2, Object.assign(Object.assign({}, inputs), { projectPath: projectPath }), ctx.envInfoV2, this.tools.tokenProvider);
+        const projectPath = inputs.projectPath;
+        if (!projectPath) {
+            return teamsfx_api_1.err(new error_1.ObjectIsUndefinedError("projectPath"));
         }
+        return ctx.solutionV2.listAllCollaborators(ctx.contextV2, Object.assign(Object.assign({}, inputs), { projectPath: projectPath }), ctx.envInfoV2, this.tools.tokenProvider);
     }
     async getSelectedEnv(inputs, ctx) {
-        var _a, _b;
+        var _a;
         if (!tools_1.isMultiEnvEnabled()) {
             return teamsfx_api_1.err(new error_1.TaskNotSupportError("getSelectedEnv"));
         }
-        if (isV2()) {
-            return teamsfx_api_1.ok((_a = ctx === null || ctx === void 0 ? void 0 : ctx.envInfoV2) === null || _a === void 0 ? void 0 : _a.envName);
-        }
-        else {
-            return teamsfx_api_1.ok((_b = ctx === null || ctx === void 0 ? void 0 : ctx.solutionContext) === null || _b === void 0 ? void 0 : _b.envInfo.envName);
-        }
-    }
-    async _getQuestionsForUserTask(ctx, solution, func, inputs, envInfo) {
-        const namespace = func.namespace;
-        const array = namespace ? namespace.split("/") : [];
-        if (namespace && "" !== namespace && array.length > 0) {
-            let res = teamsfx_api_1.ok(undefined);
-            if (isV2()) {
-                const solutionV2 = solution;
-                if (solutionV2.getQuestionsForUserTask) {
-                    res = await solutionV2.getQuestionsForUserTask(ctx, inputs, func, envInfo, this.tools.tokenProvider);
-                }
-            }
-            else {
-                const solutionv1 = solution;
-                if (solutionv1.getQuestionsForUserTask) {
-                    res = await solutionv1.getQuestionsForUserTask(func, ctx);
-                }
-            }
-            if (res.isOk()) {
-                if (res.value) {
-                    const node = res.value.trim();
-                    return teamsfx_api_1.ok(node);
-                }
-            }
-            return res;
-        }
-        return teamsfx_api_1.err(error_1.FunctionRouterError(func));
-    }
-    async _getQuestionsForMigrateV1Project(inputs) {
-        const node = new teamsfx_api_1.QTreeNode({ type: "group" });
-        const globalSolutions = await SolutionPluginContainer_1.getAllSolutionPlugins();
-        const solutionContext = await projectSettingsLoader_1.newSolutionContext(this.tools, inputs);
-        for (const v of globalSolutions) {
-            if (v.getQuestions) {
-                const res = await v.getQuestions(teamsfx_api_1.Stage.migrateV1, solutionContext);
-                if (res.isErr())
-                    return res;
-                if (res.value) {
-                    const solutionNode = res.value;
-                    solutionNode.condition = { equals: v.name };
-                    if (solutionNode.data)
-                        node.addChild(solutionNode);
-                }
-            }
-        }
-        const defaultAppNameFunc = new teamsfx_api_1.QTreeNode(question_1.DefaultAppNameFunc);
-        node.addChild(defaultAppNameFunc);
-        const appNameQuestion = new teamsfx_api_1.QTreeNode(question_1.QuestionV1AppName);
-        appNameQuestion.condition = {
-            validFunc: (input) => (!input ? undefined : "App name is auto generated."),
-        };
-        defaultAppNameFunc.addChild(appNameQuestion);
-        return teamsfx_api_1.ok(node.trim());
-    }
-    async _getQuestions(ctx, solution, stage, inputs, envInfo) {
-        if (stage !== teamsfx_api_1.Stage.create) {
-            let res = teamsfx_api_1.ok(undefined);
-            if (isV2()) {
-                const solutionV2 = solution;
-                if (solutionV2.getQuestions) {
-                    inputs.stage = stage;
-                    res = await solutionV2.getQuestions(ctx, inputs, envInfo, this.tools.tokenProvider);
-                }
-            }
-            else {
-                res = await solution.getQuestions(stage, ctx);
-            }
-            if (res.isErr())
-                return res;
-            if (res.value) {
-                const node = res.value;
-                if (node.data) {
-                    return teamsfx_api_1.ok(node.trim());
-                }
-            }
-        }
-        return teamsfx_api_1.ok(undefined);
+        return teamsfx_api_1.ok((_a = ctx === null || ctx === void 0 ? void 0 : ctx.envInfoV2) === null || _a === void 0 ? void 0 : _a.envName);
     }
     async encrypt(plaintext, inputs, ctx) {
         if (!ctx)
             return teamsfx_api_1.err(new error_1.ObjectIsUndefinedError("ctx"));
-        if (isV2()) {
-            if (!ctx.contextV2)
-                return teamsfx_api_1.err(new error_1.ObjectIsUndefinedError("ctx.contextV2"));
-            return ctx.contextV2.cryptoProvider.encrypt(plaintext);
-        }
-        else {
-            if (!ctx.solutionContext)
-                return teamsfx_api_1.err(new error_1.ObjectIsUndefinedError("ctx.solutionContext"));
-            return ctx.solutionContext.cryptoProvider.encrypt(plaintext);
-        }
+        if (!ctx.contextV2)
+            return teamsfx_api_1.err(new error_1.ObjectIsUndefinedError("ctx.contextV2"));
+        return ctx.contextV2.cryptoProvider.encrypt(plaintext);
     }
     async decrypt(ciphertext, inputs, ctx) {
         if (!ctx)
             return teamsfx_api_1.err(new error_1.ObjectIsUndefinedError("ctx"));
-        if (isV2()) {
-            if (!ctx.contextV2)
-                return teamsfx_api_1.err(new error_1.ObjectIsUndefinedError("ctx.contextV2"));
-            return ctx.contextV2.cryptoProvider.decrypt(ciphertext);
-        }
-        else {
-            if (!ctx.solutionContext)
-                return teamsfx_api_1.err(new error_1.ObjectIsUndefinedError("ctx.solutionContext"));
-            return ctx.solutionContext.cryptoProvider.decrypt(ciphertext);
-        }
+        if (!ctx.contextV2)
+            return teamsfx_api_1.err(new error_1.ObjectIsUndefinedError("ctx.contextV2"));
+        return ctx.contextV2.cryptoProvider.decrypt(ciphertext);
     }
     async buildArtifacts(inputs) {
         throw new error_1.TaskNotSupportError(teamsfx_api_1.Stage.build);
@@ -721,21 +799,11 @@ class FxCore {
         }
         inputs.sourceEnvName = createEnvCopyInput.sourceEnvName;
         inputs.targetEnvName = createEnvCopyInput.targetEnvName;
-        if (isV2()) {
-            if (!ctx.solutionV2 || !ctx.contextV2)
-                return teamsfx_api_1.err(new error_1.ObjectIsUndefinedError("ctx.solutionV2, ctx.contextV2"));
-            if (ctx.solutionV2.createEnv) {
-                inputs.copy = true;
-                return await ctx.solutionV2.createEnv(ctx.contextV2, inputs);
-            }
-        }
-        else {
-            if (!ctx.solution || !ctx.solutionContext)
-                return teamsfx_api_1.err(new error_1.ObjectIsUndefinedError("ctx.solution, ctx.solutionContext"));
-            if (ctx.solution.createEnv) {
-                ctx.solutionContext.answers.copy = true;
-                return await ctx.solution.createEnv(ctx.solutionContext);
-            }
+        if (!ctx.solutionV2 || !ctx.contextV2)
+            return teamsfx_api_1.err(new error_1.ObjectIsUndefinedError("ctx.solutionV2, ctx.contextV2"));
+        if (ctx.solutionV2.createEnv) {
+            inputs.copy = true;
+            return await ctx.solutionV2.createEnv(ctx.contextV2, inputs);
         }
         return teamsfx_api_1.ok(teamsfx_api_1.Void);
     }
@@ -759,7 +827,7 @@ class FxCore {
         catch (e) {
             return teamsfx_api_1.err(error_1.CopyFileError(e));
         }
-        core.tools.logProvider.debug(`[core] copy env config file for ${targetEnvName} environment to path ${targetEnvConfigFilePath}`);
+        exports.TOOLS.logProvider.debug(`[core] copy env config file for ${targetEnvName} environment to path ${targetEnvConfigFilePath}`);
         return teamsfx_api_1.ok(teamsfx_api_1.Void);
     }
     // deprecated
@@ -779,73 +847,78 @@ class FxCore {
             return teamsfx_api_1.err(error_1.NonExistEnvNameError(env));
         }
         const core = ctx.self;
-        const solutionContext = await envInfoLoader_1.loadSolutionContext(core.tools, inputs, ctx.projectSettings, env);
+        const solutionContext = await envInfoLoader_1.loadSolutionContext(inputs, ctx.projectSettings, env);
         if (!solutionContext.isErr()) {
-            if (isV2()) {
-                //TODO core should not know the details of envInfo
-                ctx.provisionInputConfig = solutionContext.value.envInfo.config;
-                ctx.provisionOutputs = solutionContext.value.envInfo.state;
-                ctx.envName = solutionContext.value.envInfo.envName;
-            }
-            else {
-                ctx.solutionContext = solutionContext.value;
-            }
+            ctx.provisionInputConfig = solutionContext.value.envInfo.config;
+            ctx.provisionOutputs = solutionContext.value.envInfo.state;
+            ctx.envName = solutionContext.value.envInfo.envName;
         }
         this.tools.ui.showMessage("info", `[${env}] is activated.`, false);
         return teamsfx_api_1.ok(teamsfx_api_1.Void);
     }
-    async _getQuestionsForCreateProject(inputs) {
-        const node = new teamsfx_api_1.QTreeNode(question_1.getCreateNewOrFromSampleQuestion(inputs.platform));
-        // create new
-        const createNew = new teamsfx_api_1.QTreeNode({ type: "group" });
-        node.addChild(createNew);
-        createNew.condition = { equals: question_1.ScratchOptionYes.id };
-        const globalSolutions = isV2()
-            ? await SolutionPluginContainer_1.getAllSolutionPluginsV2()
-            : await SolutionPluginContainer_1.getAllSolutionPlugins();
-        const solutionNames = globalSolutions.map((s) => s.name);
-        const selectSolution = question_1.QuestionSelectSolution;
-        selectSolution.staticOptions = solutionNames;
-        const solutionSelectNode = new teamsfx_api_1.QTreeNode(selectSolution);
-        createNew.addChild(solutionSelectNode);
-        const context = isV2()
-            ? createV2Context(this, newProjectSettings())
-            : await projectSettingsLoader_1.newSolutionContext(this.tools, inputs);
-        for (const solutionPlugin of globalSolutions) {
-            let res = teamsfx_api_1.ok(undefined);
-            if (isV2()) {
-                const v2plugin = solutionPlugin;
-                res = v2plugin.getQuestionsForScaffolding
-                    ? await v2plugin.getQuestionsForScaffolding(context, inputs)
-                    : teamsfx_api_1.ok(undefined);
-            }
-            else {
-                const v1plugin = solutionPlugin;
-                res = v1plugin.getQuestions
-                    ? await v1plugin.getQuestions(teamsfx_api_1.Stage.create, context)
-                    : teamsfx_api_1.ok(undefined);
-            }
-            if (res.isErr())
-                return res;
-            if (res.value) {
-                const solutionNode = res.value;
-                solutionNode.condition = { equals: solutionPlugin.name };
-                if (solutionNode.data)
-                    solutionSelectNode.addChild(solutionNode);
-            }
+    async _init(inputs, ctx) {
+        if (!ctx) {
+            return teamsfx_api_1.err(new error_1.ObjectIsUndefinedError("ctx for createProject"));
         }
-        if (inputs.platform !== teamsfx_api_1.Platform.VSCode) {
-            createNew.addChild(new teamsfx_api_1.QTreeNode(question_1.QuestionRootFolder));
+        const appName = inputs[question_2.QuestionAppName.name];
+        const validateResult = jsonschema.validate(appName, {
+            pattern: question_2.ProjectNamePattern,
+        });
+        if (validateResult.errors && validateResult.errors.length > 0) {
+            return teamsfx_api_1.err(error_1.InvalidInputError("invalid app-name", inputs));
         }
-        createNew.addChild(new teamsfx_api_1.QTreeNode(question_1.QuestionAppName));
-        // create from sample
-        const sampleNode = new teamsfx_api_1.QTreeNode(question_1.SampleSelect);
-        node.addChild(sampleNode);
-        sampleNode.condition = { equals: question_1.ScratchOptionNo.id };
-        if (inputs.platform !== teamsfx_api_1.Platform.VSCode) {
-            sampleNode.addChild(new teamsfx_api_1.QTreeNode(question_1.QuestionRootFolder));
+        const projectSettings = newProjectSettings();
+        projectSettings.appName = appName;
+        ctx.projectSettings = projectSettings;
+        if (!inputs.solution) {
+            return teamsfx_api_1.err(error_1.InvalidInputError("solution is undefined", inputs));
         }
-        return teamsfx_api_1.ok(node.trim());
+        const createEnvResult = await this.createEnvWithName(__1.environmentManager.getDefaultEnvName(), projectSettings, inputs);
+        if (createEnvResult.isErr()) {
+            return teamsfx_api_1.err(createEnvResult.error);
+        }
+        await fs.ensureDir(path.join(inputs.projectPath, `.${teamsfx_api_1.ConfigFolderName}`));
+        await fs.ensureDir(path.join(inputs.projectPath, "templates", `${teamsfx_api_1.AppPackageFolderName}`));
+        const basicFolderRes = await createBasicFolderStructure(inputs);
+        if (basicFolderRes.isErr()) {
+            return teamsfx_api_1.err(basicFolderRes.error);
+        }
+        const solution = typedi_1.Container.get(inputs.solution);
+        projectSettings.solutionSettings.name = inputs.solution;
+        const context = createV2Context(projectSettings);
+        ctx.contextV2 = context;
+        ctx.solutionV3 = solution;
+        return await solution.init(context, inputs);
+    }
+    async init(inputs, ctx) {
+        return this._init(inputs, ctx);
+    }
+    async _addModule(inputs, ctx) {
+        if (ctx && ctx.solutionV3 && ctx.contextV2) {
+            return await ctx.solutionV3.addModule(ctx.contextV2, {}, inputs);
+        }
+        return teamsfx_api_1.ok(teamsfx_api_1.Void);
+    }
+    async addModule(inputs, ctx) {
+        return this._addModule(inputs, ctx);
+    }
+    async scaffold(inputs, ctx) {
+        return this._scaffold(inputs, ctx);
+    }
+    async _scaffold(inputs, ctx) {
+        if (ctx && ctx.solutionV3 && ctx.contextV2) {
+            return await ctx.solutionV3.scaffold(ctx.contextV2, inputs);
+        }
+        return teamsfx_api_1.ok(teamsfx_api_1.Void);
+    }
+    async addResource(inputs, ctx) {
+        return this._addResource(inputs, ctx);
+    }
+    async _addResource(inputs, ctx) {
+        if (ctx && ctx.solutionV3 && ctx.contextV2) {
+            return await ctx.solutionV3.addResource(ctx.contextV2, inputs);
+        }
+        return teamsfx_api_1.ok(teamsfx_api_1.Void);
     }
 }
 tslib_1.__decorate([
@@ -860,7 +933,20 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:type", Function),
     tslib_1.__metadata("design:paramtypes", [Object, Object]),
     tslib_1.__metadata("design:returntype", Promise)
-], FxCore.prototype, "createProject", null);
+], FxCore.prototype, "createProjectV2", null);
+tslib_1.__decorate([
+    hooks_1.hooks([
+        errorHandler_1.ErrorHandlerMW,
+        supportV1ConditionHandler_1.SupportV1ConditionMW(true),
+        questionModel_1.QuestionModelMW,
+        contextInjector_1.ContextInjectorMW,
+        projectSettingsWriter_1.ProjectSettingsWriterMW,
+        envInfoWriterV3_1.EnvInfoWriterMW_V3(true),
+    ]),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [Object, Object]),
+    tslib_1.__metadata("design:returntype", Promise)
+], FxCore.prototype, "createProjectV3", null);
 tslib_1.__decorate([
     hooks_1.hooks([
         errorHandler_1.ErrorHandlerMW,
@@ -883,7 +969,7 @@ tslib_1.__decorate([
         projectMigrator_1.ProjectMigratorMW,
         projectSettingsLoader_1.ProjectSettingsLoaderMW,
         envInfoLoader_1.EnvInfoLoaderMW(false),
-        solutionLoader_1.SolutionLoaderMW(),
+        solutionLoader_1.SolutionLoaderMW,
         questionModel_1.QuestionModelMW,
         contextInjector_1.ContextInjectorMW,
         projectSettingsWriter_1.ProjectSettingsWriterMW,
@@ -892,7 +978,25 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:type", Function),
     tslib_1.__metadata("design:paramtypes", [Object, Object]),
     tslib_1.__metadata("design:returntype", Promise)
-], FxCore.prototype, "provisionResources", null);
+], FxCore.prototype, "provisionResourcesV2", null);
+tslib_1.__decorate([
+    hooks_1.hooks([
+        errorHandler_1.ErrorHandlerMW,
+        concurrentLocker_1.ConcurrentLockerMW,
+        supportV1ConditionHandler_1.SupportV1ConditionMW(false),
+        projectMigrator_1.ProjectMigratorMW,
+        projectSettingsLoaderV3_1.ProjectSettingsLoaderMW_V3,
+        envInfoLoaderV3_1.EnvInfoLoaderMW_V3(false),
+        solutionLoaderV3_1.SolutionLoaderMW_V3,
+        questionModel_1.QuestionModelMW,
+        contextInjector_1.ContextInjectorMW,
+        projectSettingsWriter_1.ProjectSettingsWriterMW,
+        envInfoWriterV3_1.EnvInfoWriterMW_V3(),
+    ]),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [Object, Object]),
+    tslib_1.__metadata("design:returntype", Promise)
+], FxCore.prototype, "provisionResourcesV3", null);
 tslib_1.__decorate([
     hooks_1.hooks([
         errorHandler_1.ErrorHandlerMW,
@@ -901,7 +1005,7 @@ tslib_1.__decorate([
         projectMigrator_1.ProjectMigratorMW,
         projectSettingsLoader_1.ProjectSettingsLoaderMW,
         envInfoLoader_1.EnvInfoLoaderMW(false),
-        solutionLoader_1.SolutionLoaderMW(),
+        solutionLoader_1.SolutionLoaderMW,
         questionModel_1.QuestionModelMW,
         contextInjector_1.ContextInjectorMW,
         projectSettingsWriter_1.ProjectSettingsWriterMW,
@@ -910,7 +1014,25 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:type", Function),
     tslib_1.__metadata("design:paramtypes", [Object, Object]),
     tslib_1.__metadata("design:returntype", Promise)
-], FxCore.prototype, "deployArtifacts", null);
+], FxCore.prototype, "deployArtifactsV2", null);
+tslib_1.__decorate([
+    hooks_1.hooks([
+        errorHandler_1.ErrorHandlerMW,
+        concurrentLocker_1.ConcurrentLockerMW,
+        supportV1ConditionHandler_1.SupportV1ConditionMW(false),
+        projectMigrator_1.ProjectMigratorMW,
+        projectSettingsLoaderV3_1.ProjectSettingsLoaderMW_V3,
+        envInfoLoaderV3_1.EnvInfoLoaderMW_V3(false),
+        solutionLoaderV3_1.SolutionLoaderMW_V3,
+        questionModel_1.QuestionModelMW,
+        contextInjector_1.ContextInjectorMW,
+        projectSettingsWriter_1.ProjectSettingsWriterMW,
+        envInfoWriterV3_1.EnvInfoWriterMW_V3(),
+    ]),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [Object, Object]),
+    tslib_1.__metadata("design:returntype", Promise)
+], FxCore.prototype, "deployArtifactsV3", null);
 tslib_1.__decorate([
     hooks_1.hooks([
         errorHandler_1.ErrorHandlerMW,
@@ -921,7 +1043,7 @@ tslib_1.__decorate([
         projectSettingsLoader_1.ProjectSettingsLoaderMW,
         envInfoLoader_1.EnvInfoLoaderMW(true),
         localSettingsLoader_1.LocalSettingsLoaderMW,
-        solutionLoader_1.SolutionLoaderMW(),
+        solutionLoader_1.SolutionLoaderMW,
         questionModel_1.QuestionModelMW,
         contextInjector_1.ContextInjectorMW,
         projectSettingsWriter_1.ProjectSettingsWriterMW,
@@ -931,7 +1053,26 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:type", Function),
     tslib_1.__metadata("design:paramtypes", [Object, Object]),
     tslib_1.__metadata("design:returntype", Promise)
-], FxCore.prototype, "localDebug", null);
+], FxCore.prototype, "localDebugV2", null);
+tslib_1.__decorate([
+    hooks_1.hooks([
+        errorHandler_1.ErrorHandlerMW,
+        concurrentLocker_1.ConcurrentLockerMW,
+        supportV1ConditionHandler_1.SupportV1ConditionMW(true),
+        projectMigrator_1.ProjectMigratorMW,
+        projectUpgrader_1.ProjectUpgraderMW,
+        projectSettingsLoaderV3_1.ProjectSettingsLoaderMW_V3,
+        localSettingsLoader_1.LocalSettingsLoaderMW,
+        solutionLoaderV3_1.SolutionLoaderMW_V3,
+        questionModel_1.QuestionModelMW,
+        contextInjector_1.ContextInjectorMW,
+        projectSettingsWriter_1.ProjectSettingsWriterMW,
+        localSettingsWriter_1.LocalSettingsWriterMW,
+    ]),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [Object, Object]),
+    tslib_1.__metadata("design:returntype", Promise)
+], FxCore.prototype, "localDebugV3", null);
 tslib_1.__decorate([
     hooks_1.hooks([
         errorHandler_1.ErrorHandlerMW,
@@ -940,7 +1081,7 @@ tslib_1.__decorate([
         projectMigrator_1.ProjectMigratorMW,
         projectSettingsLoader_1.ProjectSettingsLoaderMW,
         envInfoLoader_1.EnvInfoLoaderMW(false),
-        solutionLoader_1.SolutionLoaderMW(),
+        solutionLoader_1.SolutionLoaderMW,
         questionModel_1.QuestionModelMW,
         contextInjector_1.ContextInjectorMW,
         projectSettingsWriter_1.ProjectSettingsWriterMW,
@@ -949,7 +1090,25 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:type", Function),
     tslib_1.__metadata("design:paramtypes", [Object, Object]),
     tslib_1.__metadata("design:returntype", Promise)
-], FxCore.prototype, "publishApplication", null);
+], FxCore.prototype, "publishApplicationV2", null);
+tslib_1.__decorate([
+    hooks_1.hooks([
+        errorHandler_1.ErrorHandlerMW,
+        concurrentLocker_1.ConcurrentLockerMW,
+        supportV1ConditionHandler_1.SupportV1ConditionMW(false),
+        projectMigrator_1.ProjectMigratorMW,
+        projectSettingsLoader_1.ProjectSettingsLoaderMW,
+        envInfoLoader_1.EnvInfoLoaderMW(false),
+        solutionLoader_1.SolutionLoaderMW,
+        questionModel_1.QuestionModelMW,
+        contextInjector_1.ContextInjectorMW,
+        projectSettingsWriter_1.ProjectSettingsWriterMW,
+        envInfoWriter_1.EnvInfoWriterMW(),
+    ]),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [Object, Object]),
+    tslib_1.__metadata("design:returntype", Promise)
+], FxCore.prototype, "publishApplicationV3", null);
 tslib_1.__decorate([
     hooks_1.hooks([
         errorHandler_1.ErrorHandlerMW,
@@ -959,7 +1118,7 @@ tslib_1.__decorate([
         projectSettingsLoader_1.ProjectSettingsLoaderMW,
         envInfoLoader_1.EnvInfoLoaderMW(false),
         localSettingsLoader_1.LocalSettingsLoaderMW,
-        solutionLoader_1.SolutionLoaderMW(),
+        solutionLoader_1.SolutionLoaderMW,
         questionModel_1.QuestionModelMW,
         contextInjector_1.ContextInjectorMW,
         projectSettingsWriter_1.ProjectSettingsWriterMW,
@@ -976,7 +1135,7 @@ tslib_1.__decorate([
         supportV1ConditionHandler_1.SupportV1ConditionMW(true),
         projectSettingsLoader_1.ProjectSettingsLoaderMW,
         envInfoLoader_1.EnvInfoLoaderMW(true),
-        solutionLoader_1.SolutionLoaderMW(),
+        solutionLoader_1.SolutionLoaderMW,
         contextInjector_1.ContextInjectorMW,
         envInfoWriter_1.EnvInfoWriterMW(),
     ]),
@@ -991,7 +1150,7 @@ tslib_1.__decorate([
         supportV1ConditionHandler_1.SupportV1ConditionMW(true),
         projectSettingsLoader_1.ProjectSettingsLoaderMW,
         envInfoLoader_1.EnvInfoLoaderMW(true),
-        solutionLoader_1.SolutionLoaderMW(),
+        solutionLoader_1.SolutionLoaderMW,
         contextInjector_1.ContextInjectorMW,
         envInfoWriter_1.EnvInfoWriterMW(),
     ]),
@@ -1022,7 +1181,7 @@ tslib_1.__decorate([
         projectMigrator_1.ProjectMigratorMW,
         projectSettingsLoader_1.ProjectSettingsLoaderMW,
         envInfoLoader_1.EnvInfoLoaderMW(false),
-        solutionLoader_1.SolutionLoaderMW(),
+        solutionLoader_1.SolutionLoaderMW,
         questionModel_1.QuestionModelMW,
         contextInjector_1.ContextInjectorMW,
     ]),
@@ -1038,7 +1197,7 @@ tslib_1.__decorate([
         projectMigrator_1.ProjectMigratorMW,
         projectSettingsLoader_1.ProjectSettingsLoaderMW,
         envInfoLoader_1.EnvInfoLoaderMW(false),
-        solutionLoader_1.SolutionLoaderMW(),
+        solutionLoader_1.SolutionLoaderMW,
         questionModel_1.QuestionModelMW,
         contextInjector_1.ContextInjectorMW,
     ]),
@@ -1054,7 +1213,7 @@ tslib_1.__decorate([
         projectMigrator_1.ProjectMigratorMW,
         projectSettingsLoader_1.ProjectSettingsLoaderMW,
         envInfoLoader_1.EnvInfoLoaderMW(false),
-        solutionLoader_1.SolutionLoaderMW(),
+        solutionLoader_1.SolutionLoaderMW,
         questionModel_1.QuestionModelMW,
         contextInjector_1.ContextInjectorMW,
     ]),
@@ -1069,7 +1228,7 @@ tslib_1.__decorate([
         supportV1ConditionHandler_1.SupportV1ConditionMW(true),
         projectSettingsLoader_1.ProjectSettingsLoaderMW,
         envInfoLoader_1.EnvInfoLoaderMW(true),
-        solutionLoader_1.SolutionLoaderMW(),
+        solutionLoader_1.SolutionLoaderMW,
         questionModel_1.QuestionModelMW,
         contextInjector_1.ContextInjectorMW,
     ]),
@@ -1121,7 +1280,7 @@ tslib_1.__decorate([
         concurrentLocker_1.ConcurrentLockerMW,
         supportV1ConditionHandler_1.SupportV1ConditionMW(false),
         projectSettingsLoader_1.ProjectSettingsLoaderMW,
-        solutionLoader_1.SolutionLoaderMW(),
+        solutionLoader_1.SolutionLoaderMW,
         envInfoLoader_1.EnvInfoLoaderMW(true),
         contextInjector_1.ContextInjectorMW,
     ]),
@@ -1136,7 +1295,7 @@ tslib_1.__decorate([
         supportV1ConditionHandler_1.SupportV1ConditionMW(true),
         projectMigrator_1.ProjectMigratorMW,
         projectSettingsLoader_1.ProjectSettingsLoaderMW,
-        solutionLoader_1.SolutionLoaderMW(),
+        solutionLoader_1.SolutionLoaderMW,
         contextInjector_1.ContextInjectorMW,
         projectSettingsWriter_1.ProjectSettingsWriterMW,
     ]),
@@ -1144,26 +1303,73 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:paramtypes", [Object, Object]),
     tslib_1.__metadata("design:returntype", Promise)
 ], FxCore.prototype, "activateEnv", null);
+tslib_1.__decorate([
+    hooks_1.hooks([errorHandler_1.ErrorHandlerMW, questionModel_1.QuestionModelMW, contextInjector_1.ContextInjectorMW, projectSettingsWriter_1.ProjectSettingsWriterMW]),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [Object, Object]),
+    tslib_1.__metadata("design:returntype", Promise)
+], FxCore.prototype, "init", null);
+tslib_1.__decorate([
+    hooks_1.hooks([
+        errorHandler_1.ErrorHandlerMW,
+        projectSettingsLoaderV3_1.ProjectSettingsLoaderMW_V3,
+        solutionLoaderV3_1.SolutionLoaderMW_V3,
+        questionModel_1.QuestionModelMW,
+        contextInjector_1.ContextInjectorMW,
+        projectSettingsWriter_1.ProjectSettingsWriterMW,
+    ]),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [Object, Object]),
+    tslib_1.__metadata("design:returntype", Promise)
+], FxCore.prototype, "addModule", null);
+tslib_1.__decorate([
+    hooks_1.hooks([
+        errorHandler_1.ErrorHandlerMW,
+        projectSettingsLoaderV3_1.ProjectSettingsLoaderMW_V3,
+        solutionLoaderV3_1.SolutionLoaderMW_V3,
+        questionModel_1.QuestionModelMW,
+        contextInjector_1.ContextInjectorMW,
+        projectSettingsWriter_1.ProjectSettingsWriterMW,
+    ]),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [Object, Object]),
+    tslib_1.__metadata("design:returntype", Promise)
+], FxCore.prototype, "scaffold", null);
+tslib_1.__decorate([
+    hooks_1.hooks([
+        errorHandler_1.ErrorHandlerMW,
+        projectSettingsLoaderV3_1.ProjectSettingsLoaderMW_V3,
+        solutionLoaderV3_1.SolutionLoaderMW_V3,
+        questionModel_1.QuestionModelMW,
+        contextInjector_1.ContextInjectorMW,
+        projectSettingsWriter_1.ProjectSettingsWriterMW,
+    ]),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [Object, Object]),
+    tslib_1.__metadata("design:returntype", Promise)
+], FxCore.prototype, "addResource", null);
 exports.FxCore = FxCore;
 async function createBasicFolderStructure(inputs) {
     if (!inputs.projectPath) {
         return teamsfx_api_1.err(new error_1.ObjectIsUndefinedError("projectPath"));
     }
     try {
-        const appName = inputs[question_1.QuestionAppName.name];
-        await fs.writeFile(path.join(inputs.projectPath, `package.json`), JSON.stringify({
-            name: appName,
-            version: "0.0.1",
-            description: "",
-            author: "",
-            scripts: {
-                test: 'echo "Error: no test specified" && exit 1',
-            },
-            devDependencies: {
-                "@microsoft/teamsfx-cli": "0.*",
-            },
-            license: "MIT",
-        }, null, 4));
+        const appName = inputs[question_2.QuestionAppName.name];
+        if (inputs.platform !== teamsfx_api_1.Platform.VS) {
+            await fs.writeFile(path.join(inputs.projectPath, `package.json`), JSON.stringify({
+                name: appName,
+                version: "0.0.1",
+                description: "",
+                author: "",
+                scripts: {
+                    test: 'echo "Error: no test specified" && exit 1',
+                },
+                devDependencies: {
+                    "@microsoft/teamsfx-cli": "0.*",
+                },
+                license: "MIT",
+            }, null, 4));
+        }
         await fs.writeFile(path.join(inputs.projectPath, `.gitignore`), tools_1.isMultiEnvEnabled()
             ? [
                 "node_modules",
@@ -1184,23 +1390,23 @@ async function createBasicFolderStructure(inputs) {
     return teamsfx_api_1.ok(null);
 }
 exports.createBasicFolderStructure = createBasicFolderStructure;
-async function downloadSample(fxCore, inputs, ctx) {
+async function downloadSample(inputs, ctx) {
     let fxError;
-    const progress = fxCore.tools.ui.createProgressBar("Fetch sample app", 3);
+    const progress = exports.TOOLS.ui.createProgressBar("Fetch sample app", 3);
     progress.start();
     const telemetryProperties = {
         [telemetry_1.TelemetryProperty.Success]: telemetry_1.TelemetrySuccess.Yes,
         module: "fx-core",
     };
     try {
-        let folder = inputs[question_1.QuestionRootFolder.name];
+        let folder = inputs[question_2.QuestionRootFolder.name];
         if (inputs.platform === teamsfx_api_1.Platform.VSCode) {
             folder = tools_1.getRootDirectory();
             await fs.ensureDir(folder);
         }
-        const sampleId = inputs[question_1.CoreQuestionNames.Samples];
+        const sampleId = inputs[question_2.CoreQuestionNames.Samples];
         if (!(sampleId && folder)) {
-            throw error_1.InvalidInputError(`invalid answer for '${question_1.CoreQuestionNames.Samples}'`, inputs);
+            throw error_1.InvalidInputError(`invalid answer for '${question_2.CoreQuestionNames.Samples}'`, inputs);
         }
         telemetryProperties[telemetry_1.TelemetryProperty.SampleAppName] = sampleId;
         const samples = __1.sampleProvider.SampleCollection.samples.filter((sample) => sample.id.toLowerCase() === sampleId.toLowerCase());
@@ -1217,12 +1423,15 @@ async function downloadSample(fxCore, inputs, ctx) {
             }
         }
         progress.next(`Downloading from ${url}`);
-        const fetchRes = await tools_1.fetchCodeZip(url);
-        if (fetchRes === undefined) {
-            throw new teamsfx_api_1.SystemError("FetchSampleError", "Fetch sample app error: empty zip file", error_1.CoreSource);
+        const fetchRes = await tools_1.fetchCodeZip(url, sample.id);
+        if (fetchRes.isErr()) {
+            throw fetchRes.error;
+        }
+        else if (!fetchRes.value) {
+            throw error_1.FetchSampleError(sample.id);
         }
         progress.next("Unzipping the sample package");
-        await tools_1.saveFilesRecursively(new adm_zip_1.default(fetchRes.data), sampleId, sampleAppPath);
+        await tools_1.saveFilesRecursively(new adm_zip_1.default(fetchRes.value.data), sampleId, sampleAppPath);
         await tools_1.downloadSampleHook(sampleId, sampleAppPath);
         progress.next("Update project settings");
         const loadInputs = Object.assign(Object.assign({}, inputs), { projectPath: sampleAppPath });
@@ -1230,11 +1439,16 @@ async function downloadSample(fxCore, inputs, ctx) {
         if (projectSettingsRes.isOk()) {
             const projectSettings = projectSettingsRes.value;
             projectSettings.projectId = inputs.projectId ? inputs.projectId : uuid.v4();
+            projectSettings.isFromSample = true;
             inputs.projectId = projectSettings.projectId;
             telemetryProperties[telemetry_1.TelemetryProperty.ProjectId] = projectSettings.projectId;
             ctx.projectSettings = projectSettings;
             inputs.projectPath = sampleAppPath;
         }
+        else {
+            telemetryProperties[telemetry_1.TelemetryProperty.ProjectId] =
+                "unknown, failed to set projectId in projectSettings.json";
+        }
         progress.end(true);
         telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.DownloadSample, telemetryProperties);
         return teamsfx_api_1.ok(sampleAppPath);
@@ -1260,13 +1474,13 @@ function newProjectSettings() {
     return projectSettings;
 }
 exports.newProjectSettings = newProjectSettings;
-function createV2Context(core, projectSettings) {
+function createV2Context(projectSettings) {
     const context = {
-        userInteraction: core.tools.ui,
-        logProvider: core.tools.logProvider,
-        telemetryReporter: core.tools.telemetryReporter,
+        userInteraction: exports.TOOLS.ui,
+        logProvider: exports.TOOLS.logProvider,
+        telemetryReporter: exports.TOOLS.telemetryReporter,
         cryptoProvider: new crypto_1.LocalCrypto(projectSettings.projectId),
-        permissionRequestProvider: core.tools.permissionRequest,
+        permissionRequestProvider: exports.TOOLS.permissionRequest,
         projectSetting: projectSettings,
     };
     return context;