@microsoft/teamsfx-core 1.16.1 → 1.16.3-alpha.311dfaffe.0

package/build/core/FxCore.js

@@ -11,7 +11,6 @@ const typedi_1 = require("typedi");
 const uuid = tslib_1.__importStar(require("uuid"));
 const hooks_1 = require("@feathersjs/hooks");
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
-const globalState_1 = require("../common/globalState");
 const localizeUtils_1 = require("../common/localizeUtils");
 const localSettingsProvider_1 = require("../common/localSettingsProvider");
 const projectSettingsHelper_1 = require("../common/projectSettingsHelper");
@@ -22,7 +21,6 @@ const question_1 = require("../plugins/solution/fx-solution/question");
 const callback_1 = require("./callback");
 const collaborator_1 = require("./collaborator");
 const crypto_1 = require("./crypto");
-const downloadSample_1 = require("./downloadSample");
 const environment_1 = require("./environment");
 const error_1 = require("./error");
 const globalVars_1 = require("./globalVars");
@@ -32,20 +30,16 @@ const consolidateLocalRemote_1 = require("./middleware/consolidateLocalRemote");
 const contextInjector_1 = require("./middleware/contextInjector");
 const envInfoLoader_1 = require("./middleware/envInfoLoader");
 const envInfoLoaderV3_1 = require("./middleware/envInfoLoaderV3");
-const envInfoWriter_1 = require("./middleware/envInfoWriter");
 const envInfoWriterV3_1 = require("./middleware/envInfoWriterV3");
 const errorHandler_1 = require("./middleware/errorHandler");
 const projectMigrator_1 = require("./middleware/projectMigrator");
 const projectSettingsLoader_1 = require("./middleware/projectSettingsLoader");
 const projectSettingsWriter_1 = require("./middleware/projectSettingsWriter");
 const questionModel_1 = require("./middleware/questionModel");
-const solutionLoader_1 = require("./middleware/solutionLoader");
 const question_2 = require("./question");
-const SolutionPluginContainer_1 = require("./SolutionPluginContainer");
 const telemetry_2 = require("./telemetry");
-const featureFlags_1 = require("../common/featureFlags");
 const utils_1 = require("../component/utils");
-require("../component/core");
+const core_1 = require("../component/core");
 const questionV3_1 = require("../component/questionV3");
 const projectVersionChecker_1 = require("./middleware/projectVersionChecker");
 const cicd_1 = require("../component/feature/cicd/cicd");
@@ -55,22 +49,10 @@ const ApiConnectorImpl_1 = require("../component/feature/apiconnector/ApiConnect
 const envManager_1 = require("../component/envManager");
 const utils_2 = require("../common/utils");
 const utils_3 = require("../component/resource/appManifest/utils");
-const core_1 = require("../component/core");
+const arm_1 = require("../plugins/solution/fx-solution/arm");
 const migrate_1 = require("../component/migrate");
 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;
-        //v3 questions
-        this._getQuestionsForAddFeature = questionModel_1.getQuestionsForAddFeature;
-        this._getQuestionsForProvision = questionModel_1.getQuestionsForProvision;
-        this._getQuestionsForDeploy = questionModel_1.getQuestionsForDeploy;
-        this._getQuestionsForPublish = questionModel_1.getQuestionsForPublish;
-        this._getQuestionsForInit = questionModel_1.getQuestionsForInit;
-        this._getQuestionsForUserTaskV3 = questionModel_1.getQuestionsForUserTaskV3;
         this.tools = tools;
         globalVars_1.setTools(tools);
         telemetry_1.TelemetryReporterInstance.telemetryReporter = tools.telemetryReporter;
@@ -82,128 +64,6 @@ class FxCore {
     on(event, callback) {
         return callback_1.CallbackRegistry.set(event, callback);
     }
-    async createProject(inputs) {
-        if (globalVars_1.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"));
-        }
-        globalVars_1.setCurrentStage(teamsfx_api_1.Stage.create);
-        inputs.stage = teamsfx_api_1.Stage.create;
-        const folder = inputs[question_2.QuestionRootFolder.name];
-        try {
-            await fs.ensureDir(folder);
-        }
-        catch (e) {
-            throw new error_1.ProjectFolderInvalidError(folder);
-        }
-        if (featureFlags_1.isPreviewFeaturesEnabled()) {
-            const capability = inputs[question_2.CoreQuestionNames.Capabilities];
-            inputs[question_2.CoreQuestionNames.Capabilities] = [capability];
-        }
-        const capabilities = inputs[question_2.CoreQuestionNames.Capabilities];
-        if (capabilities && capabilities.includes(question_1.ExistingTabOptionItem.id)) {
-            return await this.createExistingTabApp(inputs, folder, ctx);
-        }
-        const scratch = inputs[question_2.CoreQuestionNames.CreateFromScratch];
-        let projectPath;
-        const automaticNpmInstall = "automaticNpmInstall";
-        if (scratch === question_2.ScratchOptionNo.id) {
-            // create from sample
-            const downloadRes = await downloadSample_1.downloadSample(inputs, ctx);
-            if (downloadRes.isErr()) {
-                return teamsfx_api_1.err(downloadRes.error);
-            }
-            projectPath = downloadRes.value;
-        }
-        else {
-            // create from new
-            const appName = inputs[question_2.CoreQuestionNames.AppName];
-            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(new error_1.ProjectFolderExistError(projectPath));
-            }
-            await fs.ensureDir(projectPath);
-            await fs.ensureDir(path.join(projectPath, `.${teamsfx_api_1.ConfigFolderName}`));
-            await fs.ensureDir(path.join(projectPath, path.join("templates", `${teamsfx_api_1.AppPackageFolderName}`)));
-            const basicFolderRes = await ensureBasicFolderStructure(inputs);
-            if (basicFolderRes.isErr()) {
-                return teamsfx_api_1.err(basicFolderRes.error);
-            }
-            const projectSettings = {
-                appName,
-                projectId: inputs.projectId ? inputs.projectId : uuid.v4(),
-                version: projectSettingsHelper_1.getProjectSettingsVersion(),
-                isFromSample: false,
-            };
-            if (inputs[question_2.CoreQuestionNames.Capabilities].includes(question_1.M365SsoLaunchPageOptionItem.id) ||
-                inputs[question_2.CoreQuestionNames.Capabilities].includes(question_1.M365SearchAppOptionItem.id)) {
-                projectSettings.isM365 = true;
-                inputs.isM365 = true;
-            }
-            projectSettings.solutionSettings = {
-                name: "",
-                version: "1.0.0",
-            };
-            projectSettings.programmingLanguage = inputs[question_2.CoreQuestionNames.ProgrammingLanguage];
-            globalVars_1.globalVars.isVS = projectSettingsHelper_1.isVSProject(projectSettings);
-            ctx.projectSettings = projectSettings;
-            const createEnvResult = await envManager_1.createEnvWithName(environment_1.environmentManager.getDefaultEnvName(), projectSettings.appName, inputs);
-            if (createEnvResult.isErr()) {
-                return teamsfx_api_1.err(createEnvResult.error);
-            }
-            const createLocalEnvResult = await envManager_1.createEnvWithName(environment_1.environmentManager.getLocalEnvName(), projectSettings.appName, inputs);
-            if (createLocalEnvResult.isErr()) {
-                return teamsfx_api_1.err(createLocalEnvResult.error);
-            }
-            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 = tools_1.createV2Context(projectSettings);
-            ctx.contextV2 = contextV2;
-            const scaffoldSourceCodeRes = await solution.scaffoldSourceCode(contextV2, inputs);
-            if (scaffoldSourceCodeRes.isErr()) {
-                return teamsfx_api_1.err(scaffoldSourceCodeRes.error);
-            }
-            if (capabilities && !capabilities.includes(question_1.TabSPFxItem.id)) {
-                const generateResourceTemplateRes = await solution.generateResourceTemplate(contextV2, inputs);
-                if (generateResourceTemplateRes.isErr()) {
-                    return teamsfx_api_1.err(generateResourceTemplateRes.error);
-                }
-            }
-            // ctx.provisionInputConfig = generateResourceTemplateRes.value;
-            if (solution.createEnv) {
-                inputs.copy = false;
-                const createEnvRes = await solution.createEnv(contextV2, inputs);
-                if (createEnvRes.isErr()) {
-                    return teamsfx_api_1.err(createEnvRes.error);
-                }
-            }
-        }
-        if (inputs.platform === teamsfx_api_1.Platform.VSCode) {
-            await globalState_1.globalStateUpdate(automaticNpmInstall, true);
-        }
-        return teamsfx_api_1.ok(projectPath);
-    }
     async createExistingTabApp(inputs, folder, ctx) {
         var _a, _b;
         (_a = globalVars_1.TOOLS.telemetryReporter) === null || _a === void 0 ? void 0 : _a.sendTelemetryEvent(telemetry_2.CoreTelemetryEvent.CreateStart, {
@@ -224,7 +84,7 @@ class FxCore {
         });
         return result;
     }
-    async createProjectV3(inputs, ctx) {
+    async createProject(inputs, ctx) {
         if (!ctx) {
             return teamsfx_api_1.err(new error_1.ObjectIsUndefinedError("ctx for createProject"));
         }
@@ -239,28 +99,7 @@ class FxCore {
         inputs.projectPath = context.projectPath;
         return teamsfx_api_1.ok(context.projectPath);
     }
-    /**
-     * switch to different versions of provisionResources
-     */
-    async provisionResources(inputs) {
-        if (globalVars_1.isV3()) {
-            return this.provisionResourcesV3(inputs);
-        }
-        else {
-            return this.provisionResourcesV2(inputs);
-        }
-    }
-    async provisionResourcesV2(inputs, ctx) {
-        globalVars_1.setCurrentStage(teamsfx_api_1.Stage.provision);
-        inputs.stage = teamsfx_api_1.Stage.provision;
-        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);
-        return result;
-    }
-    async provisionResourcesV3(inputs, ctx) {
+    async provisionResources(inputs, ctx) {
         globalVars_1.setCurrentStage(teamsfx_api_1.Stage.provision);
         inputs.stage = teamsfx_api_1.Stage.provision;
         const context = utils_1.createContextV3();
@@ -302,32 +141,7 @@ class FxCore {
         const appStudioV3 = typedi_1.Container.get(constants_1.ComponentNames.AppManifest);
         return appStudioV3.provisionForCLI(context, inputs, environment_1.newEnvInfoV3(), globalVars_1.TOOLS.tokenProvider);
     }
-    async deployArtifacts(inputs) {
-        if (globalVars_1.isV3())
-            return this.deployArtifactsV3(inputs);
-        else
-            return this.deployArtifactsV2(inputs);
-    }
-    async deployArtifactsV2(inputs, ctx) {
-        globalVars_1.setCurrentStage(teamsfx_api_1.Stage.deploy);
-        inputs.stage = teamsfx_api_1.Stage.deploy;
-        if (!(ctx === null || ctx === void 0 ? void 0 : ctx.projectSettings)) {
-            return teamsfx_api_1.err(new error_1.ObjectIsUndefinedError("deploy input stuff"));
-        }
-        if (projectSettingsHelper_1.isExistingTabApp(ctx.projectSettings)) {
-            // existing app scenario, deploy has no effect
-            return teamsfx_api_1.err(new error_1.OperationNotPermittedError("deploy"));
-        }
-        if (!ctx.solutionV2 || !ctx.contextV2 || !ctx.envInfoV2) {
-            const name = tools_1.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) {
+    async deployArtifacts(inputs, ctx) {
         globalVars_1.setCurrentStage(teamsfx_api_1.Stage.deploy);
         inputs.stage = teamsfx_api_1.Stage.deploy;
         const context = utils_1.createContextV3();
@@ -343,88 +157,9 @@ class FxCore {
     }
     async localDebug(inputs) {
         inputs.env = environment_1.environmentManager.getLocalEnvName();
-        if (globalVars_1.isV3())
-            return this.provisionResourcesV3(inputs);
-        else
-            return this.localDebugV2(inputs);
+        return this.provisionResources(inputs);
     }
-    async localDebugV2(inputs, ctx) {
-        var _a;
-        globalVars_1.setCurrentStage(teamsfx_api_1.Stage.debug);
-        inputs.stage = teamsfx_api_1.Stage.debug;
-        if (!(ctx === null || ctx === void 0 ? void 0 : ctx.projectSettings)) {
-            return teamsfx_api_1.err(new error_1.ObjectIsUndefinedError("local debug input stuff"));
-        }
-        if (!ctx.solutionV2 || !ctx.contextV2) {
-            const name = tools_1.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) {
-            if ((_a = ctx.envInfoV2) === null || _a === void 0 ? void 0 : _a.config) {
-                ctx.envInfoV2.config.isLocalDebug = true;
-            }
-            const res = await ctx.solutionV2.provisionLocalResource(ctx.contextV2, inputs, ctx.localSettings, this.tools.tokenProvider, ctx.envInfoV2);
-            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);
-        }
-    }
-    async localDebugV3(inputs, ctx) {
-        globalVars_1.setCurrentStage(teamsfx_api_1.Stage.debug);
-        inputs.stage = teamsfx_api_1.Stage.debug;
-        const context = utils_1.createContextV3();
-        context.envInfo = ctx.envInfoV3;
-        context.projectSetting = ctx.projectSettings;
-        context.tokenProvider = globalVars_1.TOOLS.tokenProvider;
-        const fx = typedi_1.Container.get("fx");
-        context.envInfo.config.isLocalDebug = true;
-        const res = await fx.provision(context, inputs);
-        if (res.isErr())
-            return teamsfx_api_1.err(res.error);
-        ctx.projectSettings = context.projectSetting;
-        ctx.envInfoV3 = context.envInfo;
-        return teamsfx_api_1.ok(teamsfx_api_1.Void);
-    }
-    _setEnvInfoV2(ctx) {
-        if (ctx && ctx.solutionContext) {
-            //workaround, compatible to api v2
-            ctx.envInfoV2 = {
-                envName: ctx.solutionContext.envInfo.envName,
-                config: ctx.solutionContext.envInfo.config,
-                state: {},
-            };
-            ctx.envInfoV2.state = tools_1.mapToJson(ctx.solutionContext.envInfo.state);
-        }
-    }
-    async publishApplication(inputs) {
-        if (globalVars_1.isV3())
-            return this.publishApplicationV3(inputs);
-        else
-            return this.publishApplicationV2(inputs);
-    }
-    async publishApplicationV2(inputs, ctx) {
-        globalVars_1.setCurrentStage(teamsfx_api_1.Stage.publish);
-        inputs.stage = teamsfx_api_1.Stage.publish;
-        if (!ctx || !ctx.solutionV2 || !ctx.contextV2 || !ctx.envInfoV2) {
-            const name = tools_1.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.m365TokenProvider);
-    }
-    async publishApplicationV3(inputs, ctx) {
+    async publishApplication(inputs, ctx) {
         globalVars_1.setCurrentStage(teamsfx_api_1.Stage.publish);
         inputs.stage = teamsfx_api_1.Stage.publish;
         const context = utils_1.createContextV3();
@@ -438,21 +173,6 @@ class FxCore {
         ctx.projectSettings = context.projectSetting;
         return teamsfx_api_1.ok(teamsfx_api_1.Void);
     }
-    async executeUserTask(func, inputs) {
-        if (globalVars_1.isV3()) {
-            if (func.method === "addCICDWorkflows" ||
-                func.method === "connectExistingApi" ||
-                func.method === "addSso" ||
-                func.method === "addFeature" ||
-                func.method === "addResource" ||
-                func.method === "getManifestTemplatePath" ||
-                func.method === "validateManifest" ||
-                func.method === "buildPackage" ||
-                func.method === "updateManifest")
-                return this.executeUserTaskV3(func, inputs);
-        }
-        return this.executeUserTaskV2(func, inputs);
-    }
     async addFeature(inputs, ctx) {
         inputs.stage = teamsfx_api_1.Stage.addFeature;
         const context = utils_1.createContextV3(ctx === null || ctx === void 0 ? void 0 : ctx.projectSettings);
@@ -463,54 +183,7 @@ class FxCore {
         ctx.projectSettings = context.projectSetting;
         return teamsfx_api_1.ok(res.value);
     }
-    async executeUserTaskV2(func, inputs, ctx) {
-        var _a, _b, _c, _d, _e, _f;
-        globalVars_1.setCurrentStage(teamsfx_api_1.Stage.userTask);
-        inputs.stage = teamsfx_api_1.Stage.userTask;
-        const namespace = func.namespace;
-        const array = namespace ? namespace.split("/") : [];
-        if (inputs.env === environment_1.environmentManager.getLocalEnvName() && (ctx === null || ctx === void 0 ? void 0 : ctx.envInfoV2)) {
-            ctx.envInfoV2.config.isLocalDebug = true;
-        }
-        if ("" !== namespace && array.length > 0) {
-            if (!ctx || !ctx.solutionV2 || !ctx.envInfoV2) {
-                const name = tools_1.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 = tools_1.createV2Context(projectSettingsHelper_1.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);
-                //for existing app
-                if (res.isOk() &&
-                    (func.method === "addCapability" || func.method === "addFeature") &&
-                    inputs.capabilities &&
-                    inputs.capabilities.length > 0) {
-                    await ensureBasicFolderStructure(inputs);
-                }
-                // reset provisionSucceeded state for all env
-                if (res.isOk() &&
-                    (func.method === "addCapability" ||
-                        func.method === "addResource" ||
-                        (func.method === "addFeature" &&
-                            inputs[question_1.AzureSolutionQuestionNames.Features] !== question_1.ApiConnectionOptionItem.id &&
-                            inputs[question_1.AzureSolutionQuestionNames.Features] !== question_1.CicdOptionItem.id))) {
-                    if (((_c = (_b = (_a = ctx.envInfoV2) === null || _a === void 0 ? void 0 : _a.state) === null || _b === void 0 ? void 0 : _b.solution) === null || _c === void 0 ? void 0 : _c.provisionSucceeded) === true ||
-                        ((_f = (_e = (_d = ctx.envInfoV2) === null || _d === void 0 ? void 0 : _d.state) === null || _e === void 0 ? void 0 : _e.solution) === null || _f === void 0 ? void 0 : _f.provisionSucceeded) === "true") {
-                        ctx.envInfoV2.state.solution.provisionSucceeded = false;
-                    }
-                    await environment_1.environmentManager.resetProvisionState(inputs, ctx.contextV2);
-                }
-                return res;
-            }
-            else
-                return teamsfx_api_1.err(error_1.FunctionRouterError(func));
-        }
-        return teamsfx_api_1.err(error_1.FunctionRouterError(func));
-    }
-    async executeUserTaskV3(func, inputs, ctx) {
+    async executeUserTask(func, inputs, ctx) {
         if (!ctx)
             return teamsfx_api_1.err(new error_1.ObjectIsUndefinedError("executeUserTask context"));
         let res = teamsfx_api_1.ok(undefined);
@@ -569,80 +242,46 @@ class FxCore {
         }
         return res;
     }
-    async getQuestions(stage, inputs, ctx) {
-        if (!ctx)
-            return teamsfx_api_1.err(new error_1.ObjectIsUndefinedError("getQuestions input stuff"));
+    async getQuestions(stage, inputs) {
         inputs.stage = teamsfx_api_1.Stage.getQuestions;
         globalVars_1.setCurrentStage(teamsfx_api_1.Stage.getQuestions);
-        if (globalVars_1.isV3()) {
-            const context = utils_1.createContextV3(ctx === null || ctx === void 0 ? void 0 : ctx.projectSettings);
-            context.envInfo = ctx.envInfoV2;
-            context.tokenProvider = globalVars_1.TOOLS.tokenProvider;
-            if (stage === teamsfx_api_1.Stage.publish) {
-                return await appManifest_1.publishQuestion(inputs);
-            }
-            else if (stage === teamsfx_api_1.Stage.create) {
-                return await questionModel_1.getQuestionsForCreateProjectV2(inputs);
-            }
-            else if (stage === teamsfx_api_1.Stage.deploy) {
-                return await questionV3_1.getQuestionsForDeployV3(context, inputs);
-            }
-            else if (stage === teamsfx_api_1.Stage.provision) {
-                return await questionV3_1.getQuestionsForProvisionV3(context, inputs);
-            }
-            return teamsfx_api_1.ok(undefined);
+        const context = utils_1.createContextV3();
+        if (stage === teamsfx_api_1.Stage.publish) {
+            return await appManifest_1.publishQuestion(inputs);
         }
-        switch (stage) {
-            case teamsfx_api_1.Stage.create:
-                delete inputs.projectPath;
-                return await this._getQuestionsForCreateProjectV2(inputs);
-            case teamsfx_api_1.Stage.init:
-                delete inputs.projectPath;
-                return await this._getQuestionsForInit(inputs);
-            default:
-                const contextV2 = ctx.contextV2 ? ctx.contextV2 : tools_1.createV2Context(projectSettingsHelper_1.newProjectSettings());
-                const solutionV2 = ctx.solutionV2 ? ctx.solutionV2 : await SolutionPluginContainer_1.getAllSolutionPluginsV2()[0];
-                const envInfoV2 = ctx.envInfoV2
-                    ? ctx.envInfoV2
-                    : { envName: environment_1.environmentManager.getDefaultEnvName(), config: {}, state: {} };
-                inputs.stage = stage;
-                return await this._getQuestions(contextV2, solutionV2, stage, inputs, envInfoV2);
+        else if (stage === teamsfx_api_1.Stage.create) {
+            return await questionModel_1.getQuestionsForCreateProjectV2(inputs);
         }
+        else if (stage === teamsfx_api_1.Stage.deploy) {
+            return await questionV3_1.getQuestionsForDeployV3(context, inputs);
+        }
+        else if (stage === teamsfx_api_1.Stage.provision) {
+            return await questionV3_1.getQuestionsForProvisionV3(context, inputs);
+        }
+        return teamsfx_api_1.ok(undefined);
     }
     async getQuestionsForAddFeature(featureId, inputs) {
         const res = await questionV3_1.getQuestionsForAddFeatureSubCommand(featureId, inputs);
         return res;
     }
-    async getQuestionsForUserTask(func, inputs, ctx) {
-        if (!ctx)
-            return teamsfx_api_1.err(new error_1.ObjectIsUndefinedError("getQuestionsForUserTask input stuff"));
+    async getQuestionsForUserTask(func, inputs) {
         inputs.stage = teamsfx_api_1.Stage.getQuestions;
         globalVars_1.setCurrentStage(teamsfx_api_1.Stage.getQuestions);
-        if (globalVars_1.isV3()) {
-            const context = utils_1.createContextV3(ctx === null || ctx === void 0 ? void 0 : ctx.projectSettings);
-            if (func.method === "addFeature") {
-                return await questionV3_1.getQuestionsForAddFeatureV3(context, inputs);
-            }
-            else if (func.method === "addResource") {
-                return await questionV3_1.getQuestionsForAddResourceV3(context, inputs);
-            }
-            else if (func.method === "addCICDWorkflows") {
-                return await cicd_1.addCicdQuestion(context, inputs);
-            }
-            else if (func.method === "connectExistingApi") {
-                const apiConnectorImpl = new ApiConnectorImpl_1.ApiConnectorImpl();
-                return await apiConnectorImpl.generateQuestion(context, inputs);
-            }
-            return teamsfx_api_1.ok(undefined);
+        const context = utils_1.createContextV3();
+        if (func.method === "addFeature") {
+            return await questionV3_1.getQuestionsForAddFeatureV3(context, inputs);
         }
-        else {
-            const contextV2 = ctx.contextV2 ? ctx.contextV2 : tools_1.createV2Context(projectSettingsHelper_1.newProjectSettings());
-            const solutionV2 = ctx.solutionV2 ? ctx.solutionV2 : await SolutionPluginContainer_1.getAllSolutionPluginsV2()[0];
-            const envInfoV2 = ctx.envInfoV2
-                ? ctx.envInfoV2
-                : { envName: environment_1.environmentManager.getDefaultEnvName(), config: {}, state: {} };
-            return await this._getQuestionsForUserTask(contextV2, solutionV2, func, inputs, envInfoV2);
+        else if (func.method === "addResource") {
+            return await questionV3_1.getQuestionsForAddResourceV3(context, inputs);
+        }
+        else if (func.method === "addCICDWorkflows") {
+            return await cicd_1.addCicdQuestion(context, inputs);
         }
+        else if (func.method === "connectExistingApi") {
+            const apiConnectorImpl = new ApiConnectorImpl_1.ApiConnectorImpl();
+            return await apiConnectorImpl.generateQuestion(context, inputs);
+        }
+        return teamsfx_api_1.ok(undefined);
     }
     async getProjectConfig(inputs, ctx) {
         var _a, _b;
@@ -683,22 +322,7 @@ class FxCore {
         }
         return teamsfx_api_1.ok(config);
     }
-    async grantPermission(inputs) {
-        if (globalVars_1.isV3())
-            return this.grantPermissionV3(inputs);
-        else
-            return this.grantPermissionV2(inputs);
-    }
-    async grantPermissionV2(inputs, ctx) {
-        globalVars_1.setCurrentStage(teamsfx_api_1.Stage.grantPermission);
-        inputs.stage = teamsfx_api_1.Stage.grantPermission;
-        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 grantPermissionV3(inputs, ctx) {
+    async grantPermission(inputs, ctx) {
         globalVars_1.setCurrentStage(teamsfx_api_1.Stage.grantPermission);
         inputs.stage = teamsfx_api_1.Stage.grantPermission;
         const projectPath = inputs.projectPath;
@@ -713,22 +337,7 @@ class FxCore {
         }
         return teamsfx_api_1.err(new error_1.ObjectIsUndefinedError("ctx, contextV2, envInfoV3"));
     }
-    async checkPermission(inputs) {
-        if (globalVars_1.isV3())
-            return this.checkPermissionV3(inputs);
-        else
-            return this.checkPermissionV2(inputs);
-    }
-    async checkPermissionV2(inputs, ctx) {
-        globalVars_1.setCurrentStage(teamsfx_api_1.Stage.checkPermission);
-        inputs.stage = teamsfx_api_1.Stage.checkPermission;
-        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 checkPermissionV3(inputs, ctx) {
+    async checkPermission(inputs, ctx) {
         globalVars_1.setCurrentStage(teamsfx_api_1.Stage.checkPermission);
         inputs.stage = teamsfx_api_1.Stage.checkPermission;
         const projectPath = inputs.projectPath;
@@ -743,22 +352,7 @@ class FxCore {
         }
         return teamsfx_api_1.err(new error_1.ObjectIsUndefinedError("ctx, contextV2, envInfoV3"));
     }
-    async listCollaborator(inputs) {
-        if (globalVars_1.isV3())
-            return this.listCollaboratorV3(inputs);
-        else
-            return this.listCollaboratorV2(inputs);
-    }
-    async listCollaboratorV2(inputs, ctx) {
-        globalVars_1.setCurrentStage(teamsfx_api_1.Stage.listCollaborator);
-        inputs.stage = teamsfx_api_1.Stage.listCollaborator;
-        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 listCollaboratorV3(inputs, ctx) {
+    async listCollaborator(inputs, ctx) {
         globalVars_1.setCurrentStage(teamsfx_api_1.Stage.listCollaborator);
         inputs.stage = teamsfx_api_1.Stage.listCollaborator;
         const projectPath = inputs.projectPath;
@@ -814,40 +408,9 @@ class FxCore {
         }
         inputs.sourceEnvName = createEnvCopyInput.sourceEnvName;
         inputs.targetEnvName = createEnvCopyInput.targetEnvName;
-        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);
-        }
+        await arm_1.copyParameterJson(inputs.projectPath, ctx.projectSettings.appName, inputs.targetEnvName, inputs.sourceEnvName);
         return teamsfx_api_1.ok(teamsfx_api_1.Void);
     }
-    // async createEnvWithName(
-    //   targetEnvName: string,
-    //   projectSettings: ProjectSettings,
-    //   inputs: Inputs,
-    //   existingTabEndpoint?: string
-    // ): Promise<Result<Void, FxError>> {
-    //   let appName = projectSettings.appName;
-    //   if (targetEnvName === environmentManager.getLocalEnvName()) {
-    //     appName = getLocalAppName(appName);
-    //   }
-    //   const newEnvConfig = environmentManager.newEnvConfigData(appName, existingTabEndpoint);
-    //   const writeEnvResult = await environmentManager.writeEnvConfig(
-    //     inputs.projectPath!,
-    //     newEnvConfig,
-    //     targetEnvName
-    //   );
-    //   if (writeEnvResult.isErr()) {
-    //     return err(writeEnvResult.error);
-    //   }
-    //   this.tools.logProvider.debug(
-    //     `[core] persist ${targetEnvName} env state to path ${writeEnvResult.value}: ${JSON.stringify(
-    //       newEnvConfig
-    //     )}`
-    //   );
-    //   return ok(Void);
-    // }
     async createEnvCopy(targetEnvName, sourceEnvName, inputs, core) {
         // copy env config file
         const targetEnvConfigFilePath = environment_1.environmentManager.getEnvConfigPath(targetEnvName, inputs.projectPath);
@@ -877,7 +440,6 @@ class FxCore {
         if (envConfigs.isErr() || envConfigs.value.indexOf(env) < 0) {
             return teamsfx_api_1.err(error_1.NonExistEnvNameError(env));
         }
-        const core = ctx.self;
         const solutionContext = await envInfoLoader_1.loadSolutionContext(inputs, ctx.projectSettings, env);
         if (!solutionContext.isErr()) {
             ctx.provisionInputConfig = solutionContext.value.envInfo.config;
@@ -920,9 +482,7 @@ class FxCore {
         // create ProjectSettings
         const projectSettings = projectSettingsHelper_1.newProjectSettings();
         projectSettings.appName = appName;
-        if (globalVars_1.isV3()) {
-            projectSettings.components = [];
-        }
+        projectSettings.components = [];
         ctx.projectSettings = projectSettings;
         // create folder structure
         await fs.ensureDir(path.join(projectPath, `.${teamsfx_api_1.ConfigFolderName}`));
@@ -972,82 +532,12 @@ class FxCore {
         return result;
     }
 }
-tslib_1.__decorate([
-    hooks_1.hooks([
-        errorHandler_1.ErrorHandlerMW,
-        questionModel_1.QuestionModelMW,
-        contextInjector_1.ContextInjectorMW,
-        projectSettingsWriter_1.ProjectSettingsWriterMW,
-        envInfoWriter_1.EnvInfoWriterMW(true),
-    ]),
-    tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Object, Object]),
-    tslib_1.__metadata("design:returntype", Promise)
-], FxCore.prototype, "createProjectV2", null);
 tslib_1.__decorate([
     hooks_1.hooks([errorHandler_1.ErrorHandlerMW, 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, "createProjectV3", null);
-tslib_1.__decorate([
-    hooks_1.hooks([
-        errorHandler_1.ErrorHandlerMW,
-        concurrentLocker_1.ConcurrentLockerMW,
-        projectMigrator_1.ProjectMigratorMW,
-        consolidateLocalRemote_1.ProjectConsolidateMW,
-        aadManifestMigration_1.AadManifestMigrationMW,
-        projectVersionChecker_1.ProjectVersionCheckerMW,
-        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, "provisionResourcesV2", null);
-tslib_1.__decorate([
-    hooks_1.hooks([
-        errorHandler_1.ErrorHandlerMW,
-        concurrentLocker_1.ConcurrentLockerMW,
-        projectMigrator_1.ProjectMigratorMW,
-        consolidateLocalRemote_1.ProjectConsolidateMW,
-        aadManifestMigration_1.AadManifestMigrationMW,
-        projectVersionChecker_1.ProjectVersionCheckerMW,
-        projectSettingsLoader_1.ProjectSettingsLoaderMW,
-        envInfoLoaderV3_1.EnvInfoLoaderMW_V3(false),
-        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,
-        concurrentLocker_1.ConcurrentLockerMW,
-        projectMigrator_1.ProjectMigratorMW,
-        consolidateLocalRemote_1.ProjectConsolidateMW,
-        aadManifestMigration_1.AadManifestMigrationMW,
-        projectVersionChecker_1.ProjectVersionCheckerMW,
-        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, "deployArtifactsV2", null);
+], FxCore.prototype, "createProject", null);
 tslib_1.__decorate([
     hooks_1.hooks([
         errorHandler_1.ErrorHandlerMW,
@@ -1065,27 +555,7 @@ tslib_1.__decorate([
     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,
-        concurrentLocker_1.ConcurrentLockerMW,
-        projectMigrator_1.ProjectMigratorMW,
-        consolidateLocalRemote_1.ProjectConsolidateMW,
-        aadManifestMigration_1.AadManifestMigrationMW,
-        projectVersionChecker_1.ProjectVersionCheckerMW,
-        projectSettingsLoader_1.ProjectSettingsLoaderMW,
-        envInfoLoader_1.EnvInfoLoaderMW(true),
-        solutionLoader_1.SolutionLoaderMW,
-        questionModel_1.QuestionModelMW,
-        contextInjector_1.ContextInjectorMW,
-        projectSettingsWriter_1.ProjectSettingsWriterMW,
-        envInfoWriter_1.EnvInfoWriterMW(true),
-    ]),
-    tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Object, Object]),
-    tslib_1.__metadata("design:returntype", Promise)
-], FxCore.prototype, "localDebugV2", null);
+], FxCore.prototype, "provisionResources", null);
 tslib_1.__decorate([
     hooks_1.hooks([
         errorHandler_1.ErrorHandlerMW,
@@ -1103,27 +573,7 @@ tslib_1.__decorate([
     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,
-        concurrentLocker_1.ConcurrentLockerMW,
-        projectMigrator_1.ProjectMigratorMW,
-        consolidateLocalRemote_1.ProjectConsolidateMW,
-        aadManifestMigration_1.AadManifestMigrationMW,
-        projectVersionChecker_1.ProjectVersionCheckerMW,
-        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, "publishApplicationV2", null);
+], FxCore.prototype, "deployArtifacts", null);
 tslib_1.__decorate([
     hooks_1.hooks([
         errorHandler_1.ErrorHandlerMW,
@@ -1141,7 +591,7 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:type", Function),
     tslib_1.__metadata("design:paramtypes", [Object, Object]),
     tslib_1.__metadata("design:returntype", Promise)
-], FxCore.prototype, "publishApplicationV3", null);
+], FxCore.prototype, "publishApplication", null);
 tslib_1.__decorate([
     hooks_1.hooks([
         errorHandler_1.ErrorHandlerMW,
@@ -1160,26 +610,6 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:paramtypes", [Object, Object]),
     tslib_1.__metadata("design:returntype", Promise)
 ], FxCore.prototype, "addFeature", null);
-tslib_1.__decorate([
-    hooks_1.hooks([
-        errorHandler_1.ErrorHandlerMW,
-        concurrentLocker_1.ConcurrentLockerMW,
-        projectMigrator_1.ProjectMigratorMW,
-        consolidateLocalRemote_1.ProjectConsolidateMW,
-        aadManifestMigration_1.AadManifestMigrationMW,
-        projectVersionChecker_1.ProjectVersionCheckerMW,
-        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, Object]),
-    tslib_1.__metadata("design:returntype", Promise)
-], FxCore.prototype, "executeUserTaskV2", null);
 tslib_1.__decorate([
     hooks_1.hooks([
         errorHandler_1.ErrorHandlerMW,
@@ -1197,33 +627,17 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:type", Function),
     tslib_1.__metadata("design:paramtypes", [Object, Object, Object]),
     tslib_1.__metadata("design:returntype", Promise)
-], FxCore.prototype, "executeUserTaskV3", null);
+], FxCore.prototype, "executeUserTask", null);
 tslib_1.__decorate([
-    hooks_1.hooks([
-        errorHandler_1.ErrorHandlerMW,
-        concurrentLocker_1.ConcurrentLockerMW,
-        projectSettingsLoader_1.ProjectSettingsLoaderMW,
-        envInfoLoader_1.EnvInfoLoaderMW(true),
-        solutionLoader_1.SolutionLoaderMW,
-        contextInjector_1.ContextInjectorMW,
-        envInfoWriter_1.EnvInfoWriterMW(),
-    ]),
+    hooks_1.hooks([errorHandler_1.ErrorHandlerMW]),
     tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [String, Object, Object]),
+    tslib_1.__metadata("design:paramtypes", [String, Object]),
     tslib_1.__metadata("design:returntype", Promise)
 ], FxCore.prototype, "getQuestions", null);
 tslib_1.__decorate([
-    hooks_1.hooks([
-        errorHandler_1.ErrorHandlerMW,
-        concurrentLocker_1.ConcurrentLockerMW,
-        projectSettingsLoader_1.ProjectSettingsLoaderMW,
-        envInfoLoader_1.EnvInfoLoaderMW(true),
-        solutionLoader_1.SolutionLoaderMW,
-        contextInjector_1.ContextInjectorMW,
-        envInfoWriter_1.EnvInfoWriterMW(),
-    ]),
+    hooks_1.hooks([errorHandler_1.ErrorHandlerMW]),
     tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Object, Object, Object]),
+    tslib_1.__metadata("design:paramtypes", [Object, Object]),
     tslib_1.__metadata("design:returntype", Promise)
 ], FxCore.prototype, "getQuestionsForUserTask", null);
 tslib_1.__decorate([
@@ -1257,24 +671,6 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:paramtypes", [Object, Object]),
     tslib_1.__metadata("design:returntype", Promise)
 ], FxCore.prototype, "getProjectConfigV3", null);
-tslib_1.__decorate([
-    hooks_1.hooks([
-        errorHandler_1.ErrorHandlerMW,
-        concurrentLocker_1.ConcurrentLockerMW,
-        projectMigrator_1.ProjectMigratorMW,
-        consolidateLocalRemote_1.ProjectConsolidateMW,
-        aadManifestMigration_1.AadManifestMigrationMW,
-        projectVersionChecker_1.ProjectVersionCheckerMW,
-        projectSettingsLoader_1.ProjectSettingsLoaderMW,
-        envInfoLoader_1.EnvInfoLoaderMW(false),
-        solutionLoader_1.SolutionLoaderMW,
-        questionModel_1.QuestionModelMW,
-        contextInjector_1.ContextInjectorMW,
-    ]),
-    tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Object, Object]),
-    tslib_1.__metadata("design:returntype", Promise)
-], FxCore.prototype, "grantPermissionV2", null);
 tslib_1.__decorate([
     hooks_1.hooks([
         errorHandler_1.ErrorHandlerMW,
@@ -1291,25 +687,7 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:type", Function),
     tslib_1.__metadata("design:paramtypes", [Object, Object]),
     tslib_1.__metadata("design:returntype", Promise)
-], FxCore.prototype, "grantPermissionV3", null);
-tslib_1.__decorate([
-    hooks_1.hooks([
-        errorHandler_1.ErrorHandlerMW,
-        concurrentLocker_1.ConcurrentLockerMW,
-        projectMigrator_1.ProjectMigratorMW,
-        consolidateLocalRemote_1.ProjectConsolidateMW,
-        aadManifestMigration_1.AadManifestMigrationMW,
-        projectVersionChecker_1.ProjectVersionCheckerMW,
-        projectSettingsLoader_1.ProjectSettingsLoaderMW,
-        envInfoLoader_1.EnvInfoLoaderMW(false),
-        solutionLoader_1.SolutionLoaderMW,
-        questionModel_1.QuestionModelMW,
-        contextInjector_1.ContextInjectorMW,
-    ]),
-    tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Object, Object]),
-    tslib_1.__metadata("design:returntype", Promise)
-], FxCore.prototype, "checkPermissionV2", null);
+], FxCore.prototype, "grantPermission", null);
 tslib_1.__decorate([
     hooks_1.hooks([
         errorHandler_1.ErrorHandlerMW,
@@ -1325,25 +703,7 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:type", Function),
     tslib_1.__metadata("design:paramtypes", [Object, Object]),
     tslib_1.__metadata("design:returntype", Promise)
-], FxCore.prototype, "checkPermissionV3", null);
-tslib_1.__decorate([
-    hooks_1.hooks([
-        errorHandler_1.ErrorHandlerMW,
-        concurrentLocker_1.ConcurrentLockerMW,
-        projectMigrator_1.ProjectMigratorMW,
-        consolidateLocalRemote_1.ProjectConsolidateMW,
-        aadManifestMigration_1.AadManifestMigrationMW,
-        projectVersionChecker_1.ProjectVersionCheckerMW,
-        projectSettingsLoader_1.ProjectSettingsLoaderMW,
-        envInfoLoader_1.EnvInfoLoaderMW(false),
-        solutionLoader_1.SolutionLoaderMW,
-        questionModel_1.QuestionModelMW,
-        contextInjector_1.ContextInjectorMW,
-    ]),
-    tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Object, Object]),
-    tslib_1.__metadata("design:returntype", Promise)
-], FxCore.prototype, "listCollaboratorV2", null);
+], FxCore.prototype, "checkPermission", null);
 tslib_1.__decorate([
     hooks_1.hooks([
         errorHandler_1.ErrorHandlerMW,
@@ -1359,7 +719,7 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:type", Function),
     tslib_1.__metadata("design:paramtypes", [Object, Object]),
     tslib_1.__metadata("design:returntype", Promise)
-], FxCore.prototype, "listCollaboratorV3", null);
+], FxCore.prototype, "listCollaborator", null);
 tslib_1.__decorate([
     hooks_1.hooks([
         errorHandler_1.ErrorHandlerMW,
@@ -1401,8 +761,7 @@ tslib_1.__decorate([
         errorHandler_1.ErrorHandlerMW,
         concurrentLocker_1.ConcurrentLockerMW,
         projectSettingsLoader_1.ProjectSettingsLoaderMW,
-        solutionLoader_1.SolutionLoaderMW,
-        envInfoLoader_1.EnvInfoLoaderMW(true),
+        envInfoLoaderV3_1.EnvInfoLoaderMW_V3(true),
         contextInjector_1.ContextInjectorMW,
     ]),
     tslib_1.__metadata("design:type", Function),
@@ -1418,7 +777,6 @@ tslib_1.__decorate([
         aadManifestMigration_1.AadManifestMigrationMW,
         projectVersionChecker_1.ProjectVersionCheckerMW,
         projectSettingsLoader_1.ProjectSettingsLoaderMW,
-        solutionLoader_1.SolutionLoaderMW,
         contextInjector_1.ContextInjectorMW,
         projectSettingsWriter_1.ProjectSettingsWriterMW,
     ]),
@@ -1427,7 +785,7 @@ tslib_1.__decorate([
     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]),
+    hooks_1.hooks([errorHandler_1.ErrorHandlerMW, 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)