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

package/build/core/middleware/envInfoLoaderV3.js

@@ -0,0 +1,64 @@
+"use strict";
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EnvInfoLoaderMW_V3 = void 0;
+const teamsfx_api_1 = require("@microsoft/teamsfx-api");
+const __1 = require("..");
+const crypto_1 = require("../crypto");
+const environment_1 = require("../environment");
+const error_1 = require("../error");
+const envInfoLoader_1 = require("./envInfoLoader");
+const projectSettingsLoader_1 = require("./projectSettingsLoader");
+function EnvInfoLoaderMW_V3(skip) {
+    return async (ctx, next) => {
+        if (projectSettingsLoader_1.shouldIgnored(ctx)) {
+            await next();
+            return;
+        }
+        const inputs = ctx.arguments[ctx.arguments.length - 1];
+        if (!ctx.projectSettings) {
+            ctx.result = teamsfx_api_1.err(error_1.ProjectSettingsUndefinedError());
+            return;
+        }
+        if (!inputs.projectPath) {
+            ctx.result = teamsfx_api_1.err(error_1.NoProjectOpenedError());
+            return;
+        }
+        // make sure inputs.env always has value so telemetry can use it.
+        const envRes = await envInfoLoader_1.getTargetEnvName(skip, inputs, ctx);
+        if (envRes.isErr()) {
+            ctx.result = teamsfx_api_1.err(envRes.error);
+            return;
+        }
+        inputs.env = envRes.value;
+        const result = await loadEnvInfoV3(inputs, ctx.projectSettings, inputs.env, skip || inputs.ignoreEnvInfo);
+        if (result.isErr()) {
+            ctx.result = teamsfx_api_1.err(result.error);
+            return;
+        }
+        ctx.envInfoV3 = result.value;
+        await next();
+    };
+}
+exports.EnvInfoLoaderMW_V3 = EnvInfoLoaderMW_V3;
+async function loadEnvInfoV3(inputs, projectSettings, targetEnvName, ignoreEnvInfo = false) {
+    const cryptoProvider = new crypto_1.LocalCrypto(projectSettings.projectId);
+    let envInfo;
+    // in pre-multi-env case, envInfo is always loaded.
+    if (ignoreEnvInfo) {
+        envInfo = __1.newEnvInfoV3();
+    }
+    else {
+        // ensure backwards compatibility:
+        // project id will be generated for previous TeamsFx project.
+        // Decrypting the secrets in *.userdata with generated project id works because secrets doesn't have prefix.
+        const envDataResult = await environment_1.environmentManager.loadEnvInfo(inputs.projectPath, cryptoProvider, targetEnvName, true);
+        if (envDataResult.isErr()) {
+            return teamsfx_api_1.err(envDataResult.error);
+        }
+        envInfo = envDataResult.value;
+    }
+    return teamsfx_api_1.ok(envInfo);
+}
+//# sourceMappingURL=envInfoLoaderV3.js.map

package/build/core/middleware/envInfoLoaderV3.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"envInfoLoaderV3.js","sourceRoot":"","sources":["../../../src/core/middleware/envInfoLoaderV3.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAGlC,wDAAmG;AACnG,0BAAkC;AAElC,sCAAwC;AACxC,gDAAoD;AACpD,oCAA+E;AAC/E,mDAAmD;AACnD,mEAAwD;AAExD,SAAgB,kBAAkB,CAAC,IAAa;IAC9C,OAAO,KAAK,EAAE,GAAoB,EAAE,IAAkB,EAAE,EAAE;QACxD,IAAI,qCAAa,CAAC,GAAG,CAAC,EAAE;YACtB,MAAM,IAAI,EAAE,CAAC;YACb,OAAO;SACR;QAED,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAW,CAAC;QACjE,IAAI,CAAC,GAAG,CAAC,eAAe,EAAE;YACxB,GAAG,CAAC,MAAM,GAAG,iBAAG,CAAC,qCAA6B,EAAE,CAAC,CAAC;YAClD,OAAO;SACR;QAED,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE;YACvB,GAAG,CAAC,MAAM,GAAG,iBAAG,CAAC,4BAAoB,EAAE,CAAC,CAAC;YACzC,OAAO;SACR;QAED,iEAAiE;QACjE,MAAM,MAAM,GAAG,MAAM,gCAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;QACzD,IAAI,MAAM,CAAC,KAAK,EAAE,EAAE;YAClB,GAAG,CAAC,MAAM,GAAG,iBAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAC/B,OAAO;SACR;QACD,MAAM,CAAC,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC;QAE1B,MAAM,MAAM,GAAG,MAAM,aAAa,CAChC,MAAkC,EAClC,GAAG,CAAC,eAAe,EACnB,MAAM,CAAC,GAAG,EACV,IAAI,IAAI,MAAM,CAAC,aAAa,CAC7B,CAAC;QACF,IAAI,MAAM,CAAC,KAAK,EAAE,EAAE;YAClB,GAAG,CAAC,MAAM,GAAG,iBAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAC/B,OAAO;SACR;QAED,GAAG,CAAC,SAAS,GAAG,MAAM,CAAC,KAAK,CAAC;QAE7B,MAAM,IAAI,EAAE,CAAC;IACf,CAAC,CAAC;AACJ,CAAC;AAzCD,gDAyCC;AAED,KAAK,UAAU,aAAa,CAC1B,MAAgC,EAChC,eAAgC,EAChC,aAAsB,EACtB,aAAa,GAAG,KAAK;IAErB,MAAM,cAAc,GAAG,IAAI,oBAAW,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;IAElE,IAAI,OAAqB,CAAC;IAC1B,mDAAmD;IACnD,IAAI,aAAa,EAAE;QACjB,OAAO,GAAG,gBAAY,EAAE,CAAC;KAC1B;SAAM;QACL,kCAAkC;QAClC,6DAA6D;QAC7D,4GAA4G;QAC5G,MAAM,aAAa,GAAG,MAAM,gCAAkB,CAAC,WAAW,CACxD,MAAM,CAAC,WAAW,EAClB,cAAc,EACd,aAAa,EACb,IAAI,CACL,CAAC;QAEF,IAAI,aAAa,CAAC,KAAK,EAAE,EAAE;YACzB,OAAO,iBAAG,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;SACjC;QACD,OAAO,GAAG,aAAa,CAAC,KAAqB,CAAC;KAC/C;IACD,OAAO,gBAAE,CAAC,OAAO,CAAC,CAAC;AACrB,CAAC"}

package/build/core/middleware/envInfoWriter.js

@@ -48,37 +48,20 @@ async function writeEnvInfo(ctx, skip) {
         inputs.ignoreEnvInfo === true ||
         teamsfx_api_1.StaticPlatforms.includes(inputs.platform))
         return;
-    if (__1.isV2()) {
-        const envInfoV2 = ctx.envInfoV2;
-        if (!envInfoV2)
-            return;
-        const provisionOutputs = envInfoV2.state;
-        if (provisionOutputs === undefined)
-            return;
-        // DO NOT persist local debug plugin config.
-        if (common_1.isMultiEnvEnabled() && provisionOutputs[constants_1.PluginNames.LDEBUG]) {
-            delete provisionOutputs[constants_1.PluginNames.LDEBUG];
-        }
-        const envState = __1.flattenConfigJson(provisionOutputs);
-        const envStatePath = await environment_1.environmentManager.writeEnvState(envState, inputs.projectPath, ctx.contextV2.cryptoProvider, envInfoV2.envName);
-        if (envStatePath.isOk()) {
-            const core = ctx.self;
-            core.tools.logProvider.debug(`[core] persist env state: ${envStatePath.value}`);
-        }
+    const envInfoV2 = ctx.envInfoV2;
+    if (!envInfoV2)
+        return;
+    const provisionOutputs = envInfoV2.state;
+    if (provisionOutputs === undefined)
+        return;
+    // DO NOT persist local debug plugin config.
+    if (common_1.isMultiEnvEnabled() && provisionOutputs[constants_1.PluginNames.LDEBUG]) {
+        delete provisionOutputs[constants_1.PluginNames.LDEBUG];
     }
-    else {
-        const solutionContext = ctx.solutionContext;
-        if (solutionContext === undefined)
-            return;
-        // DO NOT persist local debug plugin config.
-        if (common_1.isMultiEnvEnabled() && solutionContext.envInfo.state.has(constants_1.PluginNames.LDEBUG)) {
-            solutionContext.envInfo.state.delete(constants_1.PluginNames.LDEBUG);
-        }
-        const envStatePath = await environment_1.environmentManager.writeEnvState(solutionContext.envInfo.state, inputs.projectPath, solutionContext.cryptoProvider, solutionContext.envInfo.envName);
-        if (envStatePath.isOk()) {
-            const core = ctx.self;
-            core.tools.logProvider.debug(`[core] persist env state: ${envStatePath.value}`);
-        }
+    const envState = __1.flattenConfigJson(provisionOutputs);
+    const envStatePath = await environment_1.environmentManager.writeEnvState(envState, inputs.projectPath, ctx.contextV2.cryptoProvider, envInfoV2.envName);
+    if (envStatePath.isOk()) {
+        __1.TOOLS.logProvider.debug(`[core] persist env state: ${envStatePath.value}`);
     }
 }
 //# sourceMappingURL=envInfoWriter.js.map

package/build/core/middleware/envInfoWriter.js.map

@@ -1 +1 @@
-{"version":3,"file":"envInfoWriter.js","sourceRoot":"","sources":["../../../src/core/middleware/envInfoWriter.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;AAGb,wDAAiE;AACjE,0BAAsE;AACtE,yCAA6D;AAC7D,4EAA2E;AAC3E,gDAAoD;AACpD,mEAAwD;AAExD;;GAEG;AACH,SAAgB,eAAe,CAAC,IAAI,GAAG,KAAK;IAC1C,OAAO,KAAK,EAAE,GAAoB,EAAE,IAAkB,EAAE,EAAE;QACxD,IAAI,MAAM,GAAQ,SAAS,CAAC;QAC5B,IAAI;YACF,MAAM,IAAI,EAAE,CAAC;SACd;QAAC,OAAO,CAAC,EAAE;YACV,IAAK,CAAS,CAAC,MAAM,CAAC,KAAK,mBAAU,EAAE,CAAC,QAAQ,CAAC,eAAe;gBAAE,MAAM,CAAC,CAAC;YAC1E,MAAM,GAAG,CAAC,CAAC;SACZ;QACD,IAAI,MAAM,GAAQ,SAAS,CAAC;QAC5B,IAAI;YACF,MAAM,YAAY,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;SAC/B;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,GAAG,CAAC,CAAC;SACZ;QACD,IAAI,MAAM;YAAE,MAAM,MAAM,CAAC;QACzB,IAAI,MAAM;YAAE,MAAM,MAAM,CAAC;IAC3B,CAAC,CAAC;AACJ,CAAC;AAlBD,0CAkBC;AAED,KAAK,UAAU,YAAY,CAAC,GAAoB,EAAE,IAAa;IAC7D,IAAI,qCAAa,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,0BAAiB,EAAE,CAAC,EAAE;QACvD,OAAO;KACR;IAED,MAAM,OAAO,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACxD,MAAM,MAAM,GAAW,OAAO,KAAK,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;IAC3F,IACE,CAAC,MAAM,CAAC,WAAW;QACnB,MAAM,CAAC,mBAAmB,KAAK,IAAI;QACnC,MAAM,CAAC,aAAa,KAAK,IAAI;QAC7B,6BAAe,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC;QAEzC,OAAO;IAET,IAAI,QAAI,EAAE,EAAE;QACV,MAAM,SAAS,GAAG,GAAG,CAAC,SAAS,CAAC;QAChC,IAAI,CAAC,SAAS;YAAE,OAAO;QACvB,MAAM,gBAAgB,GAAG,SAAS,CAAC,KAAK,CAAC;QACzC,IAAI,gBAAgB,KAAK,SAAS;YAAE,OAAO;QAC3C,4CAA4C;QAC5C,IAAI,0BAAiB,EAAE,IAAI,gBAAgB,CAAC,uBAAW,CAAC,MAAM,CAAC,EAAE;YAC/D,OAAO,gBAAgB,CAAC,uBAAW,CAAC,MAAM,CAAC,CAAC;SAC7C;QACD,MAAM,QAAQ,GAAG,qBAAiB,CAAC,gBAAgB,CAAC,CAAC;QACrD,MAAM,YAAY,GAAG,MAAM,gCAAkB,CAAC,aAAa,CACzD,QAAQ,EACR,MAAM,CAAC,WAAW,EAClB,GAAG,CAAC,SAAU,CAAC,cAAc,EAC7B,SAAS,CAAC,OAAO,CAClB,CAAC;QAEF,IAAI,YAAY,CAAC,IAAI,EAAE,EAAE;YACvB,MAAM,IAAI,GAAG,GAAG,CAAC,IAAc,CAAC;YAChC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,6BAA6B,YAAY,CAAC,KAAK,EAAE,CAAC,CAAC;SACjF;KACF;SAAM;QACL,MAAM,eAAe,GAAG,GAAG,CAAC,eAAe,CAAC;QAC5C,IAAI,eAAe,KAAK,SAAS;YAAE,OAAO;QAE1C,4CAA4C;QAC5C,IAAI,0BAAiB,EAAE,IAAI,eAAe,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,uBAAW,CAAC,MAAM,CAAC,EAAE;YAChF,eAAe,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,uBAAW,CAAC,MAAM,CAAC,CAAC;SAC1D;QAED,MAAM,YAAY,GAAG,MAAM,gCAAkB,CAAC,aAAa,CACzD,eAAe,CAAC,OAAO,CAAC,KAAK,EAC7B,MAAM,CAAC,WAAW,EAClB,eAAe,CAAC,cAAc,EAC9B,eAAe,CAAC,OAAO,CAAC,OAAO,CAChC,CAAC;QAEF,IAAI,YAAY,CAAC,IAAI,EAAE,EAAE;YACvB,MAAM,IAAI,GAAG,GAAG,CAAC,IAAc,CAAC;YAChC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,6BAA6B,YAAY,CAAC,KAAK,EAAE,CAAC,CAAC;SACjF;KACF;AACH,CAAC"}
+{"version":3,"file":"envInfoWriter.js","sourceRoot":"","sources":["../../../src/core/middleware/envInfoWriter.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;AAGb,wDAAiE;AACjE,0BAA+D;AAC/D,yCAA6D;AAC7D,4EAA2E;AAC3E,gDAAoD;AACpD,mEAAwD;AAExD;;GAEG;AACH,SAAgB,eAAe,CAAC,IAAI,GAAG,KAAK;IAC1C,OAAO,KAAK,EAAE,GAAoB,EAAE,IAAkB,EAAE,EAAE;QACxD,IAAI,MAAM,GAAQ,SAAS,CAAC;QAC5B,IAAI;YACF,MAAM,IAAI,EAAE,CAAC;SACd;QAAC,OAAO,CAAC,EAAE;YACV,IAAK,CAAS,CAAC,MAAM,CAAC,KAAK,mBAAU,EAAE,CAAC,QAAQ,CAAC,eAAe;gBAAE,MAAM,CAAC,CAAC;YAC1E,MAAM,GAAG,CAAC,CAAC;SACZ;QACD,IAAI,MAAM,GAAQ,SAAS,CAAC;QAC5B,IAAI;YACF,MAAM,YAAY,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;SAC/B;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,GAAG,CAAC,CAAC;SACZ;QACD,IAAI,MAAM;YAAE,MAAM,MAAM,CAAC;QACzB,IAAI,MAAM;YAAE,MAAM,MAAM,CAAC;IAC3B,CAAC,CAAC;AACJ,CAAC;AAlBD,0CAkBC;AAED,KAAK,UAAU,YAAY,CAAC,GAAoB,EAAE,IAAa;IAC7D,IAAI,qCAAa,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,0BAAiB,EAAE,CAAC,EAAE;QACvD,OAAO;KACR;IAED,MAAM,OAAO,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACxD,MAAM,MAAM,GAAW,OAAO,KAAK,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;IAC3F,IACE,CAAC,MAAM,CAAC,WAAW;QACnB,MAAM,CAAC,mBAAmB,KAAK,IAAI;QACnC,MAAM,CAAC,aAAa,KAAK,IAAI;QAC7B,6BAAe,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC;QAEzC,OAAO;IAET,MAAM,SAAS,GAAG,GAAG,CAAC,SAAS,CAAC;IAChC,IAAI,CAAC,SAAS;QAAE,OAAO;IACvB,MAAM,gBAAgB,GAAG,SAAS,CAAC,KAAK,CAAC;IACzC,IAAI,gBAAgB,KAAK,SAAS;QAAE,OAAO;IAC3C,4CAA4C;IAC5C,IAAI,0BAAiB,EAAE,IAAI,gBAAgB,CAAC,uBAAW,CAAC,MAAM,CAAC,EAAE;QAC/D,OAAO,gBAAgB,CAAC,uBAAW,CAAC,MAAM,CAAC,CAAC;KAC7C;IACD,MAAM,QAAQ,GAAG,qBAAiB,CAAC,gBAAgB,CAAC,CAAC;IACrD,MAAM,YAAY,GAAG,MAAM,gCAAkB,CAAC,aAAa,CACzD,QAAQ,EACR,MAAM,CAAC,WAAW,EAClB,GAAG,CAAC,SAAU,CAAC,cAAc,EAC7B,SAAS,CAAC,OAAO,CAClB,CAAC;IAEF,IAAI,YAAY,CAAC,IAAI,EAAE,EAAE;QACvB,SAAK,CAAC,WAAW,CAAC,KAAK,CAAC,6BAA6B,YAAY,CAAC,KAAK,EAAE,CAAC,CAAC;KAC5E;AACH,CAAC"}

package/build/core/middleware/envInfoWriterV3.d.ts

@@ -0,0 +1,6 @@
+import { Middleware } from "@feathersjs/hooks";
+/**
+ * This middleware will help to persist environment state even if lifecycle task throws Error.
+ */
+export declare function EnvInfoWriterMW_V3(skip?: boolean): Middleware;
+//# sourceMappingURL=envInfoWriterV3.d.ts.map

package/build/core/middleware/envInfoWriterV3.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"envInfoWriterV3.d.ts","sourceRoot":"","sources":["../../../src/core/middleware/envInfoWriterV3.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAAgB,MAAM,mBAAmB,CAAC;AAO7D;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,UAAQ,GAAG,UAAU,CAkB3D"}

package/build/core/middleware/envInfoWriterV3.js

@@ -0,0 +1,63 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EnvInfoWriterMW_V3 = void 0;
+const teamsfx_api_1 = require("@microsoft/teamsfx-api");
+const __1 = require("..");
+const common_1 = require("../../common");
+const environment_1 = require("../environment");
+const projectSettingsLoader_1 = require("./projectSettingsLoader");
+/**
+ * This middleware will help to persist environment state even if lifecycle task throws Error.
+ */
+function EnvInfoWriterMW_V3(skip = false) {
+    return async (ctx, next) => {
+        let error1 = undefined;
+        try {
+            await next();
+        }
+        catch (e) {
+            if (e["name"] === common_1.getStrings().solution.CancelProvision)
+                throw e;
+            error1 = e;
+        }
+        let error2 = undefined;
+        try {
+            await writeEnvInfo(ctx, skip);
+        }
+        catch (e) {
+            error2 = e;
+        }
+        if (error1)
+            throw error1;
+        if (error2)
+            throw error2;
+    };
+}
+exports.EnvInfoWriterMW_V3 = EnvInfoWriterMW_V3;
+async function writeEnvInfo(ctx, skip) {
+    if (projectSettingsLoader_1.shouldIgnored(ctx) || skip) {
+        return;
+    }
+    const lastArg = ctx.arguments[ctx.arguments.length - 1];
+    const inputs = lastArg === ctx ? ctx.arguments[ctx.arguments.length - 2] : lastArg;
+    if (!inputs.projectPath ||
+        inputs.ignoreConfigPersist === true ||
+        inputs.ignoreEnvInfo === true ||
+        teamsfx_api_1.StaticPlatforms.includes(inputs.platform))
+        return;
+    if (ctx.contextV2 && ctx.envInfoV3) {
+        const envInfoV3 = ctx.envInfoV3;
+        if (!envInfoV3)
+            return;
+        const envState = envInfoV3.state;
+        if (envState === undefined)
+            return;
+        const envStatePath = await environment_1.environmentManager.writeEnvState(envState, inputs.projectPath, ctx.contextV2.cryptoProvider, envInfoV3.envName, true);
+        if (envStatePath.isOk()) {
+            __1.TOOLS === null || __1.TOOLS === void 0 ? void 0 : __1.TOOLS.logProvider.debug(`[core] persist env state: ${envStatePath.value}`);
+        }
+    }
+}
+//# sourceMappingURL=envInfoWriterV3.js.map

package/build/core/middleware/envInfoWriterV3.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"envInfoWriterV3.js","sourceRoot":"","sources":["../../../src/core/middleware/envInfoWriterV3.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;AAGb,wDAAiE;AACjE,0BAAoD;AACpD,yCAA0C;AAC1C,gDAAoD;AACpD,mEAAwD;AAExD;;GAEG;AACH,SAAgB,kBAAkB,CAAC,IAAI,GAAG,KAAK;IAC7C,OAAO,KAAK,EAAE,GAAoB,EAAE,IAAkB,EAAE,EAAE;QACxD,IAAI,MAAM,GAAQ,SAAS,CAAC;QAC5B,IAAI;YACF,MAAM,IAAI,EAAE,CAAC;SACd;QAAC,OAAO,CAAC,EAAE;YACV,IAAK,CAAS,CAAC,MAAM,CAAC,KAAK,mBAAU,EAAE,CAAC,QAAQ,CAAC,eAAe;gBAAE,MAAM,CAAC,CAAC;YAC1E,MAAM,GAAG,CAAC,CAAC;SACZ;QACD,IAAI,MAAM,GAAQ,SAAS,CAAC;QAC5B,IAAI;YACF,MAAM,YAAY,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;SAC/B;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,GAAG,CAAC,CAAC;SACZ;QACD,IAAI,MAAM;YAAE,MAAM,MAAM,CAAC;QACzB,IAAI,MAAM;YAAE,MAAM,MAAM,CAAC;IAC3B,CAAC,CAAC;AACJ,CAAC;AAlBD,gDAkBC;AAED,KAAK,UAAU,YAAY,CAAC,GAAoB,EAAE,IAAa;IAC7D,IAAI,qCAAa,CAAC,GAAG,CAAC,IAAI,IAAI,EAAE;QAC9B,OAAO;KACR;IAED,MAAM,OAAO,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACxD,MAAM,MAAM,GAAW,OAAO,KAAK,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;IAC3F,IACE,CAAC,MAAM,CAAC,WAAW;QACnB,MAAM,CAAC,mBAAmB,KAAK,IAAI;QACnC,MAAM,CAAC,aAAa,KAAK,IAAI;QAC7B,6BAAe,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC;QAEzC,OAAO;IAET,IAAI,GAAG,CAAC,SAAS,IAAI,GAAG,CAAC,SAAS,EAAE;QAClC,MAAM,SAAS,GAAG,GAAG,CAAC,SAAS,CAAC;QAChC,IAAI,CAAC,SAAS;YAAE,OAAO;QACvB,MAAM,QAAQ,GAAG,SAAS,CAAC,KAAK,CAAC;QACjC,IAAI,QAAQ,KAAK,SAAS;YAAE,OAAO;QACnC,MAAM,YAAY,GAAG,MAAM,gCAAkB,CAAC,aAAa,CACzD,QAAQ,EACR,MAAM,CAAC,WAAW,EAClB,GAAG,CAAC,SAAS,CAAC,cAAc,EAC5B,SAAS,CAAC,OAAO,EACjB,IAAI,CACL,CAAC;QACF,IAAI,YAAY,CAAC,IAAI,EAAE,EAAE;YACvB,SAAK,aAAL,SAAK,uBAAL,SAAK,CAAE,WAAW,CAAC,KAAK,CAAC,6BAA6B,YAAY,CAAC,KAAK,EAAE,CAAC,CAAC;SAC7E;KACF;AACH,CAAC"}

package/build/core/middleware/errorHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"errorHandler.d.ts","sourceRoot":"","sources":["../../../src/core/middleware/errorHandler.ts"],"names":[],"mappings":"AAIA,OAAO,EAA6B,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAI1E;;;GAGG;AACH,eAAO,MAAM,cAAc,EAAE,UAwB5B,CAAC"}
+{"version":3,"file":"errorHandler.d.ts","sourceRoot":"","sources":["../../../src/core/middleware/errorHandler.ts"],"names":[],"mappings":"AAIA,OAAO,EAA6B,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAI1E;;;GAGG;AACH,eAAO,MAAM,cAAc,EAAE,UAsB5B,CAAC"}

package/build/core/middleware/errorHandler.js

@@ -10,17 +10,15 @@ const __1 = require("..");
  * to catch exceptions and return specific error.
  */
 const ErrorHandlerMW = async (ctx, next) => {
+    var _a, _b;
     const core = ctx.self;
     const inputs = ctx.arguments[ctx.arguments.length - 1];
-    const logger = core !== undefined && core.tools !== undefined && core.tools.logProvider !== undefined
-        ? core.tools.logProvider
-        : undefined;
     const taskName = `${ctx.method} ${ctx.method === "executeUserTask" ? ctx.arguments[0].method : ""}`;
     try {
-        logger === null || logger === void 0 ? void 0 : logger.info(`[core] start task:${taskName}, inputs:${JSON.stringify(inputs)}, API v2: ${__1.isV2()}`);
+        (_a = __1.TOOLS === null || __1.TOOLS === void 0 ? void 0 : __1.TOOLS.logProvider) === null || _a === void 0 ? void 0 : _a.info(`[core] start task:${taskName}, inputs:${JSON.stringify(inputs)}, API v3: ${__1.isV3()}`);
         const time = new Date().getTime();
         await next();
-        logger === null || logger === void 0 ? void 0 : logger.info(`[core] finish task:${taskName}, time: ${new Date().getTime() - time} ms`);
+        (_b = __1.TOOLS === null || __1.TOOLS === void 0 ? void 0 : __1.TOOLS.logProvider) === null || _b === void 0 ? void 0 : _b.info(`[core] finish task:${taskName}, time: ${new Date().getTime() - time} ms`);
     }
     catch (e) {
         let fxError = teamsfx_api_1.assembleError(e);

package/build/core/middleware/errorHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"errorHandler.js","sourceRoot":"","sources":["../../../src/core/middleware/errorHandler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"errorHandler.js","sourceRoot":"","sources":["../../../src/core/middleware/errorHandler.ts"],"names":[],"mappings":"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"}

package/build/core/middleware/localSettingsLoader.js.map

@@ -1 +1 @@
-{"version":3,"file":"localSettingsLoader.js","sourceRoot":"","sources":["../../../src/core/middleware/localSettingsLoader.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"localSettingsLoader.js","sourceRoot":"","sources":["../../../src/core/middleware/localSettingsLoader.ts"],"names":[],"mappings":"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"}

package/build/core/middleware/localSettingsWriter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"localSettingsWriter.d.ts","sourceRoot":"","sources":["../../../src/core/middleware/localSettingsWriter.ts"],"names":[],"mappings":"AAIA,OAAO,EAAgB,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAO7D;;GAEG;AACH,eAAO,MAAM,qBAAqB,EAAE,UAoCnC,CAAC"}
+{"version":3,"file":"localSettingsWriter.d.ts","sourceRoot":"","sources":["../../../src/core/middleware/localSettingsWriter.ts"],"names":[],"mappings":"AAIA,OAAO,EAAgB,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAO7D;;GAEG;AACH,eAAO,MAAM,qBAAqB,EAAE,UAyBnC,CAAC"}

package/build/core/middleware/localSettingsWriter.js

@@ -12,7 +12,7 @@ const projectSettingsLoader_1 = require("./projectSettingsLoader");
  * This middleware will help to persist local settings if necessary.
  */
 const LocalSettingsWriterMW = async (ctx, next) => {
-    var _a, _b;
+    var _a;
     await next();
     if (!projectSettingsLoader_1.shouldIgnored(ctx) && common_1.isMultiEnvEnabled()) {
         const lastArg = ctx.arguments[ctx.arguments.length - 1];
@@ -22,21 +22,11 @@ const LocalSettingsWriterMW = async (ctx, next) => {
             teamsfx_api_1.StaticPlatforms.includes(inputs.platform))
             return;
         const localSettingsProvider = new localSettingsProvider_1.LocalSettingsProvider(inputs.projectPath);
-        if (__1.isV2()) {
-            if (ctx.localSettings === undefined)
-                return;
-            // persistent localSettings.json.
-            await localSettingsProvider.saveJson(ctx.localSettings, (_a = ctx.contextV2) === null || _a === void 0 ? void 0 : _a.cryptoProvider);
-        }
-        else {
-            const solutionContext = ctx.solutionContext;
-            if (solutionContext === undefined || solutionContext.localSettings === undefined)
-                return;
-            // persistent localSettings.json.
-            await localSettingsProvider.save(solutionContext.localSettings, (_b = ctx.solutionContext) === null || _b === void 0 ? void 0 : _b.cryptoProvider);
-        }
-        const core = ctx.self;
-        core.tools.logProvider.debug(`[core] persist local settings config file: ${localSettingsProvider.localSettingsFilePath}`);
+        if (ctx.localSettings === undefined)
+            return;
+        // persistent localSettings.json.
+        await localSettingsProvider.saveJson(ctx.localSettings, (_a = ctx.contextV2) === null || _a === void 0 ? void 0 : _a.cryptoProvider);
+        __1.TOOLS.logProvider.debug(`[core] persist local settings config file: ${localSettingsProvider.localSettingsFilePath}`);
     }
 };
 exports.LocalSettingsWriterMW = LocalSettingsWriterMW;

package/build/core/middleware/localSettingsWriter.js.map

@@ -1 +1 @@
-{"version":3,"file":"localSettingsWriter.js","sourceRoot":"","sources":["../../../src/core/middleware/localSettingsWriter.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;AAGb,wDAAiE;AACjE,0BAAmD;AACnD,yCAAiD;AACjD,8EAA2E;AAC3E,mEAAwD;AAExD;;GAEG;AACI,MAAM,qBAAqB,GAAe,KAAK,EACpD,GAAoB,EACpB,IAAkB,EAClB,EAAE;;IACF,MAAM,IAAI,EAAE,CAAC;IACb,IAAI,CAAC,qCAAa,CAAC,GAAG,CAAC,IAAI,0BAAiB,EAAE,EAAE;QAC9C,MAAM,OAAO,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QACxD,MAAM,MAAM,GAAW,OAAO,KAAK,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;QAC3F,IACE,CAAC,MAAM,CAAC,WAAW;YACnB,MAAM,CAAC,mBAAmB,KAAK,IAAI;YACnC,6BAAe,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC;YAEzC,OAAO;QAET,MAAM,qBAAqB,GAAG,IAAI,6CAAqB,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QAE5E,IAAI,QAAI,EAAE,EAAE;YACV,IAAI,GAAG,CAAC,aAAa,KAAK,SAAS;gBAAE,OAAO;YAC5C,iCAAiC;YACjC,MAAM,qBAAqB,CAAC,QAAQ,CAAC,GAAG,CAAC,aAAa,EAAE,MAAA,GAAG,CAAC,SAAS,0CAAE,cAAc,CAAC,CAAC;SACxF;aAAM;YACL,MAAM,eAAe,GAAG,GAAG,CAAC,eAAe,CAAC;YAC5C,IAAI,eAAe,KAAK,SAAS,IAAI,eAAe,CAAC,aAAa,KAAK,SAAS;gBAAE,OAAO;YACzF,iCAAiC;YACjC,MAAM,qBAAqB,CAAC,IAAI,CAC9B,eAAe,CAAC,aAAa,EAC7B,MAAA,GAAG,CAAC,eAAe,0CAAE,cAAc,CACpC,CAAC;SACH;QAED,MAAM,IAAI,GAAG,GAAG,CAAC,IAAc,CAAC;QAChC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,KAAK,CAC1B,8CAA8C,qBAAqB,CAAC,qBAAqB,EAAE,CAC5F,CAAC;KACH;AACH,CAAC,CAAC;AApCW,QAAA,qBAAqB,yBAoChC"}
+{"version":3,"file":"localSettingsWriter.js","sourceRoot":"","sources":["../../../src/core/middleware/localSettingsWriter.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;AAGb,wDAAiE;AACjE,0BAA4C;AAC5C,yCAAiD;AACjD,8EAA2E;AAC3E,mEAAwD;AAExD;;GAEG;AACI,MAAM,qBAAqB,GAAe,KAAK,EACpD,GAAoB,EACpB,IAAkB,EAClB,EAAE;;IACF,MAAM,IAAI,EAAE,CAAC;IACb,IAAI,CAAC,qCAAa,CAAC,GAAG,CAAC,IAAI,0BAAiB,EAAE,EAAE;QAC9C,MAAM,OAAO,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QACxD,MAAM,MAAM,GAAW,OAAO,KAAK,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;QAC3F,IACE,CAAC,MAAM,CAAC,WAAW;YACnB,MAAM,CAAC,mBAAmB,KAAK,IAAI;YACnC,6BAAe,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC;YAEzC,OAAO;QAET,MAAM,qBAAqB,GAAG,IAAI,6CAAqB,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QAE5E,IAAI,GAAG,CAAC,aAAa,KAAK,SAAS;YAAE,OAAO;QAC5C,iCAAiC;QACjC,MAAM,qBAAqB,CAAC,QAAQ,CAAC,GAAG,CAAC,aAAa,EAAE,MAAA,GAAG,CAAC,SAAS,0CAAE,cAAc,CAAC,CAAC;QAEvF,SAAK,CAAC,WAAW,CAAC,KAAK,CACrB,8CAA8C,qBAAqB,CAAC,qBAAqB,EAAE,CAC5F,CAAC;KACH;AACH,CAAC,CAAC;AAzBW,QAAA,qBAAqB,yBAyBhC"}

package/build/core/middleware/projectMigrator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"projectMigrator.d.ts","sourceRoot":"","sources":["../../../src/core/middleware/projectMigrator.ts"],"names":[],"mappings":"AAsBA,OAAO,EACL,eAAe,EAQhB,MAAM,OAAO,CAAC;AAIf,OAAO,EAAE,UAAU,EAAgB,MAAM,uBAAuB,CAAC;AAoGjE,qBAAa,aAAa;IACxB,MAAM,CAAC,QAAQ,CAAC,aAAa,gCAAgC;IAC7D,MAAM,CAAC,QAAQ,CAAC,YAAY,8BAA8B;IAC1D,MAAM,CAAC,QAAQ,CAAC,SAAS,mBAAmB;IAC5C,MAAM,CAAC,QAAQ,CAAC,WAAW,qBAAqB;IAChD,MAAM,CAAC,QAAQ,CAAC,aAAa,mBAAmB;IAChD,MAAM,CAAC,QAAQ,CAAC,kBAAkB,6BAA6B;IAC/D,MAAM,CAAC,QAAQ,CAAC,mBAAmB,yBAAyB;IAC5D,MAAM,CAAC,QAAQ,CAAC,eAAe,wBAAwB;IACvD,MAAM,CAAC,QAAQ,CAAC,YAAY,kBAAkB;IAC9C,MAAM,CAAC,QAAQ,CAAC,oBAAoB,0BAA0B;IAC9D,MAAM,CAAC,QAAQ,CAAC,oBAAoB,+BAA+B;IACnE,MAAM,CAAC,QAAQ,CAAC,eAAe,qBAAqB;IACpD,MAAM,CAAC,QAAQ,CAAC,eAAe,qBAAqB;IACpD,MAAM,CAAC,QAAQ,CAAC,mBAAmB,yBAAyB;CAC7D;AAED,eAAO,MAAM,iBAAiB,EAAE,UA4D/B,CAAC;AA2vBF,wBAAsB,UAAU,CAAC,GAAG,EAAE,eAAe,iBAGpD"}
+{"version":3,"file":"projectMigrator.d.ts","sourceRoot":"","sources":["../../../src/core/middleware/projectMigrator.ts"],"names":[],"mappings":"AAsBA,OAAO,EACL,eAAe,EAQhB,MAAM,OAAO,CAAC;AAIf,OAAO,EAAE,UAAU,EAAgB,MAAM,uBAAuB,CAAC;AAmGjE,qBAAa,aAAa;IACxB,MAAM,CAAC,QAAQ,CAAC,aAAa,gCAAgC;IAC7D,MAAM,CAAC,QAAQ,CAAC,YAAY,8BAA8B;IAC1D,MAAM,CAAC,QAAQ,CAAC,SAAS,mBAAmB;IAC5C,MAAM,CAAC,QAAQ,CAAC,WAAW,qBAAqB;IAChD,MAAM,CAAC,QAAQ,CAAC,aAAa,mBAAmB;IAChD,MAAM,CAAC,QAAQ,CAAC,kBAAkB,6BAA6B;IAC/D,MAAM,CAAC,QAAQ,CAAC,mBAAmB,yBAAyB;IAC5D,MAAM,CAAC,QAAQ,CAAC,eAAe,wBAAwB;IACvD,MAAM,CAAC,QAAQ,CAAC,YAAY,kBAAkB;IAC9C,MAAM,CAAC,QAAQ,CAAC,oBAAoB,0BAA0B;IAC9D,MAAM,CAAC,QAAQ,CAAC,oBAAoB,+BAA+B;IACnE,MAAM,CAAC,QAAQ,CAAC,eAAe,qBAAqB;IACpD,MAAM,CAAC,QAAQ,CAAC,eAAe,qBAAqB;IACpD,MAAM,CAAC,QAAQ,CAAC,mBAAmB,yBAAyB;CAC7D;AAED,eAAO,MAAM,iBAAiB,EAAE,UAiD/B,CAAC;AAouBF,wBAAsB,UAAU,CAAC,GAAG,EAAE,eAAe,iBAGpD"}

package/build/core/middleware/projectMigrator.js

@@ -47,7 +47,6 @@ const AadSecret = "{{ $env.AAD_APP_CLIENT_SECRET }}";
 const ChangeLogsFlag = "openUpgradeChangelogs";
 const AADClientSecretFlag = "NeedToSetAADClientSecretEnv";
 const gitignoreFileName = ".gitignore";
-let updateNotificationFlag = false;
 let fromReloadFlag = false;
 class EnvConfigName {
 }
@@ -104,7 +103,7 @@ const ProjectMigratorMW = async (ctx, next) => {
         }
         const core = ctx.self;
         telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectMigratorNotificationStart);
-        const res = await core.tools.ui.showMessage("warn", tools_1.getStrings().solution.MigrationToArmAndMultiEnvMessage, true, upgradeButton);
+        const res = await (__2.TOOLS === null || __2.TOOLS === void 0 ? void 0 : __2.TOOLS.ui.showMessage("warn", tools_1.getStrings().solution.MigrationToArmAndMultiEnvMessage, true, upgradeButton));
         const answer = (res === null || res === void 0 ? void 0 : res.isOk()) ? res.value : undefined;
         if (!answer || answer != upgradeButton) {
             telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectMigratorNotification, {
@@ -129,13 +128,6 @@ const ProjectMigratorMW = async (ctx, next) => {
             throw error;
         }
     }
-    else if ((await needUpdateTeamsToolkitVersion(ctx)) && !updateNotificationFlag) {
-        // TODO: delete before Arm && Multi-env version released
-        // only for arm && multi-env project with unreleased teams toolkit version
-        updateNotificationFlag = true;
-        const core = ctx.self;
-        core.tools.ui.showMessage("info", tools_1.getStrings().solution.NeedToUpdateTeamsToolkitVersionMessage, false, "OK");
-    }
     else {
         // continue next step only when:
         // 1. no need to upgrade the project;
@@ -146,15 +138,15 @@ const ProjectMigratorMW = async (ctx, next) => {
 exports.ProjectMigratorMW = ProjectMigratorMW;
 function outputCancelMessage(ctx) {
     const core = ctx.self;
-    core.tools.logProvider.warning(`[core] Upgrade cancelled.`);
+    __2.TOOLS === null || __2.TOOLS === void 0 ? void 0 : __2.TOOLS.logProvider.warning(`[core] Upgrade cancelled.`);
     const inputs = ctx.arguments[ctx.arguments.length - 1];
     if (inputs.platform === teamsfx_api_1.Platform.VSCode) {
-        core.tools.logProvider.warning(`[core] Notice upgrade to new configuration files is a must-have to continue to use current version Teams Toolkit. If you want to upgrade, please run command (Teams: Upgrade project) or click the “Upgrade project” button on tree view to trigger the upgrade.`);
-        core.tools.logProvider.warning(`[core]If you are not ready to upgrade and want to continue to use the old version Teams Toolkit, please find Teams Toolkit in Extension and install the version <= 2.10.0`);
+        __2.TOOLS === null || __2.TOOLS === void 0 ? void 0 : __2.TOOLS.logProvider.warning(`[core] Notice upgrade to new configuration files is a must-have to continue to use current version Teams Toolkit. If you want to upgrade, please run command (Teams: Upgrade project) or click the “Upgrade project” button on tree view to trigger the upgrade.`);
+        __2.TOOLS === null || __2.TOOLS === void 0 ? void 0 : __2.TOOLS.logProvider.warning(`[core]If you are not ready to upgrade and want to continue to use the old version Teams Toolkit, please find Teams Toolkit in Extension and install the version <= 2.10.0`);
     }
     else {
-        core.tools.logProvider.warning(`[core] Notice upgrade to new configuration files is a must-have to continue to use current version Teams Toolkit CLI. If you want to upgrade, please trigger this command again.`);
-        core.tools.logProvider.warning(`[core]If you are not ready to upgrade and want to continue to use the old version Teams Toolkit CLI, please install the version <= 2.10.0`);
+        __2.TOOLS === null || __2.TOOLS === void 0 ? void 0 : __2.TOOLS.logProvider.warning(`[core] Notice upgrade to new configuration files is a must-have to continue to use current version Teams Toolkit CLI. If you want to upgrade, please trigger this command again.`);
+        __2.TOOLS === null || __2.TOOLS === void 0 ? void 0 : __2.TOOLS.logProvider.warning(`[core]If you are not ready to upgrade and want to continue to use the old version Teams Toolkit CLI, please install the version <= 2.10.0`);
     }
 }
 function checkMethod(ctx) {
@@ -227,7 +219,7 @@ async function migrateToArmAndMultiEnv(ctx) {
         await backup(projectPath, backupFolder);
         await updateConfig(ctx);
         telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectMigratorMigrateMultiEnvStart);
-        await migrateMultiEnv(projectPath, core.tools.logProvider);
+        await migrateMultiEnv(projectPath, __2.TOOLS.logProvider);
         telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectMigratorMigrateMultiEnv);
         const loadRes = await projectSettingsLoader_1.loadProjectSettings(inputs);
         if (loadRes.isErr()) {
@@ -241,7 +233,7 @@ async function migrateToArmAndMultiEnv(ctx) {
         }
     }
     catch (err) {
-        core.tools.logProvider.error(`[core] Failed to upgrade project, error: '${err}'`);
+        __2.TOOLS === null || __2.TOOLS === void 0 ? void 0 : __2.TOOLS.logProvider.error(`[core] Failed to upgrade project, error: '${err}'`);
         await handleError(projectPath, ctx, backupFolder);
         throw err;
     }
@@ -271,14 +263,12 @@ async function preReadJsonFile(path, core) {
         await fs_extra_1.default.readJson(path);
     }
     catch (err) {
-        core.tools.logProvider.error(`'${path}' doesn't exist or is not in json format. Please fix it and try again by running command (Teams: Upgrade project).`);
-        core.tools.logProvider.warning(`Read this wiki(${learnMoreLink}) for the FAQ.`);
-        core.tools.ui
-            .showMessage("info", util_1.default.format(tools_1.getStrings().solution.MigrationToArmAndMultiEnvPreCheckErrorMessage, path), false, learnMoreText)
-            .then((result) => {
+        __2.TOOLS === null || __2.TOOLS === void 0 ? void 0 : __2.TOOLS.logProvider.error(`'${path}' doesn't exist or is not in json format. Please fix it and try again by running command (Teams: Upgrade project).`);
+        __2.TOOLS === null || __2.TOOLS === void 0 ? void 0 : __2.TOOLS.logProvider.warning(`Read this wiki(${learnMoreLink}) for the FAQ.`);
+        __2.TOOLS === null || __2.TOOLS === void 0 ? void 0 : __2.TOOLS.ui.showMessage("info", util_1.default.format(tools_1.getStrings().solution.MigrationToArmAndMultiEnvPreCheckErrorMessage, path), false, learnMoreText).then((result) => {
             const userSelected = result.isOk() ? result.value : undefined;
             if (userSelected === learnMoreText) {
-                core.tools.ui.openUrl(manualUpgradeLink);
+                __2.TOOLS === null || __2.TOOLS === void 0 ? void 0 : __2.TOOLS.ui.openUrl(manualUpgradeLink);
             }
         });
         throw __1.NotJsonError(err);
@@ -291,15 +281,12 @@ async function handleError(projectPath, ctx, backupFolder) {
     catch (e) {
         // try my best to cleanup
         const core = ctx.self;
-        core.tools.logProvider.error(`[core] Failed to cleanup the backup, error: '${e}'`);
+        __2.TOOLS === null || __2.TOOLS === void 0 ? void 0 : __2.TOOLS.logProvider.error(`[core] Failed to cleanup the backup, error: '${e}'`);
     }
-    const core = ctx.self;
-    core.tools.ui
-        .showMessage("info", tools_1.getStrings().solution.MigrationToArmAndMultiEnvErrorMessage, false, learnMoreText)
-        .then((result) => {
+    __2.TOOLS === null || __2.TOOLS === void 0 ? void 0 : __2.TOOLS.ui.showMessage("info", tools_1.getStrings().solution.MigrationToArmAndMultiEnvErrorMessage, false, learnMoreText).then((result) => {
         const userSelected = result.isOk() ? result.value : undefined;
         if (userSelected === learnMoreText) {
-            core.tools.ui.openUrl(manualUpgradeLink);
+            __2.TOOLS === null || __2.TOOLS === void 0 ? void 0 : __2.TOOLS.ui.openUrl(manualUpgradeLink);
         }
     });
 }
@@ -322,18 +309,18 @@ async function postMigration(projectPath, ctx, inputs, backupFolder) {
     telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectMigratorGuideStart);
     await generateUpgradeReport(backupFolder);
     const core = ctx.self;
-    await updateGitIgnore(projectPath, core.tools.logProvider, backupFolder);
-    core.tools.logProvider.warning(`[core] Upgrade success! All old files in .fx and appPackage folder have been backed up to the .backup folder and you can delete it. Read this wiki(${learnMoreLink}) if you want to restore your configuration files or learn more about this upgrade.`);
-    core.tools.logProvider.warning(`[core] Read upgrade-change-logs.md to learn about details for this upgrade.`);
+    await updateGitIgnore(projectPath, __2.TOOLS.logProvider, backupFolder);
+    __2.TOOLS === null || __2.TOOLS === void 0 ? void 0 : __2.TOOLS.logProvider.warning(`[core] Upgrade success! All old files in .fx and appPackage folder have been backed up to the .backup folder and you can delete it. Read this wiki(${learnMoreLink}) if you want to restore your configuration files or learn more about this upgrade.`);
+    __2.TOOLS === null || __2.TOOLS === void 0 ? void 0 : __2.TOOLS.logProvider.warning(`[core] Read upgrade-change-logs.md to learn about details for this upgrade.`);
     if (inputs.platform === teamsfx_api_1.Platform.VSCode) {
         await globalState_1.globalStateUpdate(ChangeLogsFlag, true);
         telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectMigratorGuide, {
             [telemetry_1.TelemetryProperty.Status]: telemetry_1.ProjectMigratorGuideStatus.Reload,
         });
-        await ((_b = (_a = core.tools.ui).reload) === null || _b === void 0 ? void 0 : _b.call(_a));
+        await ((_b = __2.TOOLS === null || __2.TOOLS === void 0 ? void 0 : (_a = __2.TOOLS.ui).reload) === null || _b === void 0 ? void 0 : _b.call(_a));
     }
     else {
-        core.tools.logProvider.info(tools_1.getStrings().solution.MigrationToArmAndMultiEnvSuccessMessage);
+        __2.TOOLS === null || __2.TOOLS === void 0 ? void 0 : __2.TOOLS.logProvider.info(tools_1.getStrings().solution.MigrationToArmAndMultiEnvSuccessMessage);
     }
 }
 async function updateGitIgnore(projectPath, log, backupFolder) {
@@ -712,23 +699,6 @@ async function needMigrateToArmAndMultiEnv(ctx) {
     }
     return false;
 }
-async function needUpdateTeamsToolkitVersion(ctx) {
-    if (preCheckEnvEnabled()) {
-        return false;
-    }
-    const inputs = ctx.arguments[ctx.arguments.length - 1];
-    if (!inputs.projectPath) {
-        return false;
-    }
-    const fx = path_1.default.join(inputs.projectPath, ".fx");
-    if (!(await fs_extra_1.default.pathExists(fx))) {
-        return false;
-    }
-    // only for arm && multi-env project
-    const armParameter = path_1.default.join(fx, "configs", parameterFileNameTemplate.replace("@envName", "dev"));
-    const defaultEnv = path_1.default.join(fx, "env.default.json");
-    return (await fs_extra_1.default.pathExists(armParameter)) && !(await fs_extra_1.default.pathExists(defaultEnv));
-}
 function preCheckEnvEnabled() {
     if (tools_1.isMultiEnvEnabled() && tools_1.isArmSupportEnabled()) {
         return true;
@@ -815,15 +785,13 @@ async function generateArmTemplatesFiles(ctx) {
     const projectSettings = loadRes.value;
     minorCtx.projectSettings = projectSettings;
     const targetEnvName = "dev";
-    const result = await envInfoLoader_1.loadSolutionContext(core.tools, inputs, minorCtx.projectSettings, targetEnvName, inputs.ignoreEnvInfo);
+    const result = await envInfoLoader_1.loadSolutionContext(inputs, minorCtx.projectSettings, targetEnvName, inputs.ignoreEnvInfo);
     if (result.isErr()) {
         throw __1.SolutionConfigError();
     }
     minorCtx.solutionContext = result.value;
     const settings = (_a = minorCtx.projectSettings) === null || _a === void 0 ? void 0 : _a.solutionSettings;
-    const activePlugins = __2.isV2()
-        ? ResourcePluginContainer_1.getActivatedV2ResourcePlugins(settings).map((p) => new adaptor_1.NamedArmResourcePluginAdaptor(p))
-        : ResourcePluginContainer_1.getActivatedResourcePlugins(settings);
+    const activePlugins = ResourcePluginContainer_1.getActivatedV2ResourcePlugins(settings).map((p) => new adaptor_1.NamedArmResourcePluginAdaptor(p));
     // generate bicep files.
     try {
         await arm_1.generateArmTemplate(minorCtx.solutionContext, activePlugins);