@microsoft/teamsfx-core 2.0.3 → 2.0.4-alpha.0237b70e3.0

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

@@ -1 +1 @@
-{"version":3,"file":"projectMigratorV3.d.ts","sourceRoot":"","sources":["../../../src/core/middleware/projectMigratorV3.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAE,UAAU,EAAgB,MAAM,uBAAuB,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAC3C,OAAO,EAAgB,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAmF1E,OAAO,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAM9C,eAAO,MAAM,SAAS;;;;;;;;;;CAWrB,CAAC;AAEF,eAAO,MAAM,UAAU;;;;CAItB,CAAC;AAEF,eAAO,MAAM,oBAAoB;;;;;CAKhC,CAAC;AAEF,eAAO,MAAM,sBAAsB;;;;;;;;;CASlC,CAAC;AAEF,eAAO,MAAM,aAAa,6CAA6C,CAAC;AAGxE,eAAO,MAAM,UAAU;;;;CAItB,CAAC;AACF,eAAO,MAAM,cAAc,QAA6C,CAAC;AAmBzE,eAAO,MAAM,mBAAmB,EAAE,UAuDjC,CAAC;AAEF,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,gBAAgB,EACzB,IAAI,EAAE,CAAC,OAAO,EAAE,gBAAgB,KAAK,IAAI,GACxC,OAAO,CAAC,IAAI,CAAC,CAsCf;AAiBD,wBAAsB,OAAO,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAItE;AAMD,wBAAsB,wBAAwB,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAWjG;AAED,wBAAsB,cAAc,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAiB7E;AAED,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAwD/E;AAWD,wBAAsB,kBAAkB,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CA2GjF;AAED,wBAAsB,uBAAuB,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CA2BtF;AAED,wBAAsB,gBAAgB,CACpC,GAAG,EAAE,eAAe,EACpB,mBAAmB,EAAE,mBAAmB,GACvC,OAAO,CAAC,OAAO,CAAC,CAmBlB;AAED,wBAAsB,cAAc,CAClC,GAAG,EAAE,eAAe,EACpB,mBAAmB,EAAE,mBAAmB,GACvC,OAAO,CAAC,OAAO,CAAC,CAgClB;AAED,wBAAsB,wBAAwB,CAC5C,GAAG,EAAE,eAAe,EACpB,mBAAmB,EAAE,mBAAmB,GACvC,OAAO,CAAC,OAAO,CAAC,CAsBlB;AAED,wBAAsB,2BAA2B,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC,CAyBxF;AAED,wBAAsB,iBAAiB,CACrC,mBAAmB,EAAE,mBAAmB,GACvC,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAE7B;AAED,wBAAsB,oBAAoB,CACxC,mBAAmB,EAAE,mBAAmB,GACvC,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAE7B;AAED,wBAAsB,YAAY,CAChC,mBAAmB,EAAE,mBAAmB,EACxC,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAQ7B;AAED,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAKlF;AAED,wBAAsB,wBAAwB,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAItF;AAED,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAmE/E;AAED,wBAAsB,eAAe,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAqD9E;AAED,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAyBhF;AAED,wBAAsB,cAAc,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAiE7E;AAED,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,GAAG,GAAG,OAAO,CAQ9D;AAED,wBAAsB,4BAA4B,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAyC3F;AAED,wBAAsB,0BAA0B,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAoBtF;AAED,wBAAsB,eAAe,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAiB9E"}
+{"version":3,"file":"projectMigratorV3.d.ts","sourceRoot":"","sources":["../../../src/core/middleware/projectMigratorV3.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,UAAU,EAAgB,MAAM,uBAAuB,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAC3C,OAAO,EAAgB,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAiF1E,OAAO,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AA2C9C,eAAO,MAAM,aAAa,6CAA6C,CAAC;AAGxE,eAAO,MAAM,UAAU;;;;CAItB,CAAC;AAEF,eAAO,MAAM,cAAc,QAA6C,CAAC;AAOzE,aAAK,SAAS,GAAG,CAAC,OAAO,EAAE,gBAAgB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAe9D,eAAO,MAAM,mBAAmB,EAAE,UA6CjC,CAAC;AAEF,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,gBAAgB,EAAE,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAoChG;AAiBD,wBAAsB,OAAO,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAItE;AAMD,wBAAsB,wBAAwB,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAWjG;AAED,wBAAsB,cAAc,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAiB7E;AAED,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAwD/E;AAWD,wBAAsB,kBAAkB,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CA8GjF;AAED,wBAAsB,uBAAuB,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CA2BtF;AAED,wBAAsB,gBAAgB,CACpC,GAAG,EAAE,eAAe,EACpB,mBAAmB,EAAE,mBAAmB,GACvC,OAAO,CAAC,OAAO,CAAC,CAkBlB;AAmHD,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAmE/E;AAED,wBAAsB,eAAe,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAqD9E;AAED,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAyBhF;AAED,wBAAsB,cAAc,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAiE7E;AAED,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,GAAG,GAAG,OAAO,CAQ9D;AAED,wBAAsB,4BAA4B,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAyC3F;AAED,wBAAsB,0BAA0B,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAkBtF;AAED,wBAAsB,eAAe,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAiB9E"}

package/build/core/middleware/projectMigratorV3.js

@@ -2,14 +2,13 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateGitignore = exports.checkActiveResourcePlugins = exports.generateApimPluginEnvContent = exports.checkapimPluginExists = exports.debugMigration = exports.userdataMigration = exports.statesMigration = exports.configsMigration = exports.ensureTrackingIdInGlobal = exports.generateLocalConfig = exports.popupMessage = exports.popupMessageNonmodal = exports.popupMessageModal = exports.showConfirmOnlyNotification = exports.showNonmodalNotification = exports.askUserConfirm = exports.showNotification = exports.azureParameterMigration = exports.manifestsMigration = exports.updateLaunchJson = exports.generateAppYml = exports.checkVersionForMigration = exports.migrate = exports.wrapRunMigration = exports.ProjectMigratorMWV3 = exports.moreInfoButton = exports.errorNames = exports.learnMoreLink = exports.TelemetryPropertyValue = exports.TelemetryPropertyKey = exports.Parameters = exports.Constants = void 0;
+exports.updateGitignore = exports.checkActiveResourcePlugins = exports.generateApimPluginEnvContent = exports.checkapimPluginExists = exports.debugMigration = exports.userdataMigration = exports.statesMigration = exports.configsMigration = exports.showNotification = exports.azureParameterMigration = exports.manifestsMigration = exports.updateLaunchJson = exports.generateAppYml = exports.checkVersionForMigration = exports.migrate = exports.wrapRunMigration = exports.ProjectMigratorMWV3 = exports.moreInfoButton = exports.errorNames = exports.learnMoreLink = void 0;
 const tslib_1 = require("tslib");
 /**
  * @author xzf0587 <zhaofengxu@microsoft.com>
  */
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const migrationContext_1 = require("./utils/migrationContext");
-const projectMigrator_1 = require("./projectMigrator");
 const path = tslib_1.__importStar(require("path"));
 const projectSettingsLoader_1 = require("./projectSettingsLoader");
 const telemetry_1 = require("../../common/telemetry");
@@ -18,7 +17,7 @@ const globalVars_1 = require("../globalVars");
 const error_1 = require("../error");
 const appYmlGenerator_1 = require("./utils/appYmlGenerator");
 const fs = tslib_1.__importStar(require("fs-extra"));
-const constants_2 = require("../../component/resource/appManifest/constants");
+const constants_2 = require("../../component/driver/teamsApp/constants");
 const MigrationUtils_1 = require("./utils/MigrationUtils");
 const v3MigrationUtils_1 = require("./utils/v3MigrationUtils");
 const commentJson = tslib_1.__importStar(require("comment-json"));
@@ -30,11 +29,10 @@ const os_1 = require("os");
 const folder_1 = require("../../folder");
 const versionMetadata_1 = require("../../common/versionMetadata");
 const tools_1 = require("../../common/tools");
-const environment_1 = require("../environment");
 const localizeUtils_1 = require("../../common/localizeUtils");
-const constants_3 = require("../../component/debug/constants");
-const ManifestUtils_1 = require("../../component/resource/appManifest/utils/ManifestUtils");
-exports.Constants = {
+const constants_3 = require("./utils/debug/constants");
+const ManifestUtils_1 = require("../../component/driver/teamsApp/utils/ManifestUtils");
+const Constants = {
     vscodeProvisionBicepPath: "./templates/azure/provision.bicep",
     launchJsonPath: ".vscode/launch.json",
     tasksJsonPath: ".vscode/tasks.json",
@@ -46,18 +44,19 @@ exports.Constants = {
     },
     envFilePrefix: ".env.",
 };
-exports.Parameters = {
+const Parameters = {
     skipUserConfirm: "skipUserConfirm",
     isNonmodalMessage: "isNonmodalMessage",
     confirmOnly: "confirmOnly",
 };
-exports.TelemetryPropertyKey = {
+const TelemetryPropertyKey = {
     button: "button",
     mode: "mode",
     upgradeVersion: "upgrade-version",
+    projectId: "project-id",
     reason: "reason",
 };
-exports.TelemetryPropertyValue = {
+const TelemetryPropertyValue = {
     ok: "ok",
     learnMore: "learn-more",
     cancel: "cancel",
@@ -74,13 +73,16 @@ exports.errorNames = {
     manifestTemplateInvalid: "ManifestTemplateInvalid",
     aadManifestTemplateNotExist: "AadManifestTemplateNotExist",
 };
+const upgradeButton = localizeUtils_1.getLocalizedString("core.option.upgrade");
 exports.moreInfoButton = localizeUtils_1.getLocalizedString("core.option.moreInfo");
-const migrationMessageButtons = [projectMigrator_1.upgradeButton, exports.moreInfoButton];
+const migrationMessageButtons = [upgradeButton, exports.moreInfoButton];
+const telemetryProperties = {
+    [TelemetryPropertyKey.upgradeVersion]: TelemetryPropertyValue.upgradeVersion,
+};
 const subMigrations = [
     preMigration,
     manifestsMigration,
     generateAppYml,
-    generateLocalConfig,
     configsMigration,
     statesMigration,
     userdataMigration,
@@ -91,7 +93,7 @@ const subMigrations = [
     updateGitignore,
 ];
 const ProjectMigratorMWV3 = async (ctx, next) => {
-    await ensureTrackingIdInGlobal(ctx);
+    await setTelemetryProjectId(ctx);
     const versionForMigration = await checkVersionForMigration(ctx);
     // abandoned v3 project which will not be supported. Show user the message to create new project.
     if (versionForMigration.source === versionMetadata_1.VersionSource.settings) {
@@ -103,11 +105,6 @@ const ProjectMigratorMWV3 = async (ctx, next) => {
     const isValid = await checkActiveResourcePlugins(projectPath);
     const isUpgradeable = isValid && versionForMigration.state === versionMetadata_1.VersionState.upgradeable;
     if (isUpgradeable) {
-        if (!tools_1.isV3Enabled()) {
-            await (globalVars_1.TOOLS === null || globalVars_1.TOOLS === void 0 ? void 0 : globalVars_1.TOOLS.ui.showMessage("warn", localizeUtils_1.getLocalizedString("core.migrationV3.CreateNewProject"), true));
-            ctx.result = teamsfx_api_1.err(error_1.ToolkitNotSupportError());
-            return false;
-        }
         // in cli non interactive scenario, migration will return an error instead of popup dialog.
         const nonInteractive = v3MigrationUtils_1.getParameterFromCxt(ctx, "nonInteractive");
         if (nonInteractive) {
@@ -116,7 +113,7 @@ const ProjectMigratorMWV3 = async (ctx, next) => {
         }
         const isRunMigration = await showNotification(ctx, versionForMigration);
         if (isRunMigration) {
-            const isNonmodalMessage = v3MigrationUtils_1.getParameterFromCxt(ctx, exports.Parameters.isNonmodalMessage);
+            const isNonmodalMessage = v3MigrationUtils_1.getParameterFromCxt(ctx, Parameters.isNonmodalMessage);
             if (isNonmodalMessage) {
                 const versionForMigration = await checkVersionForMigration(ctx);
                 if (versionForMigration.state !== versionMetadata_1.VersionState.upgradeable) {
@@ -140,12 +137,10 @@ const ProjectMigratorMWV3 = async (ctx, next) => {
 exports.ProjectMigratorMWV3 = ProjectMigratorMWV3;
 async function wrapRunMigration(context, exec) {
     try {
-        telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectMigratorMigrateStart, {
-            [exports.TelemetryPropertyKey.upgradeVersion]: exports.TelemetryPropertyValue.upgradeVersion,
-        });
+        sendTelemetryEventForUpgrade(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectMigratorMigrateStart);
         await exec(context);
         await showSummaryReport(context);
-        telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectMigratorMigrate, context.telemetryProperties);
+        sendTelemetryEventForUpgrade(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectMigratorMigrate, context.telemetryProperties);
     }
     catch (error) {
         let fxError;
@@ -164,7 +159,7 @@ async function wrapRunMigration(context, exec) {
                 displayMessage: error.message,
             });
         }
-        telemetry_1.sendTelemetryErrorEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectMigratorError, fxError, context.telemetryProperties);
+        sendTelemetryErrorEventForUpgrade(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectMigratorError, fxError, context.telemetryProperties);
         await rollbackMigration(context);
         throw error;
     }
@@ -178,8 +173,8 @@ async function rollbackMigration(context) {
 }
 async function showSummaryReport(context) {
     var _a, _b;
-    const summaryPath = path.join(context.backupPath, exports.Constants.reportName);
-    const templatePath = path.join(folder_1.getTemplatesFolder(), "core/v3Migration", exports.Constants.reportName);
+    const summaryPath = path.join(context.backupPath, Constants.reportName);
+    const templatePath = path.join(folder_1.getTemplatesFolder(), "core/v3Migration", Constants.reportName);
     const content = await fs.readFile(templatePath);
     await fs.writeFile(summaryPath, content);
     await ((_b = (_a = globalVars_1.TOOLS === null || globalVars_1.TOOLS === void 0 ? void 0 : globalVars_1.TOOLS.ui) === null || _a === void 0 ? void 0 : _a.openFile) === null || _b === void 0 ? void 0 : _b.call(_a, summaryPath));
@@ -220,9 +215,9 @@ async function generateAppYml(context) {
 }
 exports.generateAppYml = generateAppYml;
 async function updateLaunchJson(context) {
-    const launchJsonPath = path.join(context.projectPath, exports.Constants.launchJsonPath);
+    const launchJsonPath = path.join(context.projectPath, Constants.launchJsonPath);
     if (await fs.pathExists(launchJsonPath)) {
-        await context.backup(exports.Constants.launchJsonPath);
+        await context.backup(Constants.launchJsonPath);
         let launchJsonContent = await fs.readFile(launchJsonPath, "utf8");
         const oldProjectSettings = await loadProjectSettings(context.projectPath);
         if (oldProjectSettings.isM365) {
@@ -246,12 +241,12 @@ async function updateLaunchJson(context) {
             .replace(/\${teamsAppInternalId}/g, "${{M365_APP_ID}}") // For M365 apps
             .replace(/\${localTeamsAppId}/g, "${{local:TEAMS_APP_ID}}")
             .replace(/\${localTeamsAppInternalId}/g, "${{local:M365_APP_ID}}"); // For M365 apps
-        await context.fsWriteFile(exports.Constants.launchJsonPath, result);
+        await context.fsWriteFile(Constants.launchJsonPath, result);
     }
 }
 exports.updateLaunchJson = updateLaunchJson;
 async function loadProjectSettings(projectPath) {
-    const oldProjectSettings = await projectSettingsLoader_1.loadProjectSettingsByProjectPathV2(projectPath, true, true);
+    const oldProjectSettings = await projectSettingsLoader_1.loadProjectSettingsByProjectPathV2(projectPath);
     if (oldProjectSettings.isOk()) {
         return oldProjectSettings.value;
     }
@@ -269,8 +264,6 @@ async function manifestsMigration(context) {
         // templates/appPackage/manifest.template.json does not exist
         throw error_1.MigrationError(new Error(localizeUtils_1.getLocalizedString("core.migrationV3.manifestNotExist")), exports.errorNames.manifestTemplateNotExist, exports.learnMoreLink);
     }
-    // Backup templates/appPackage
-    await context.backup(oldAppPackageFolderPath);
     // Validate manifest template
     {
         const res = await ManifestUtils_1.manifestUtils._readAppManifest(path.join(context.projectPath, oldManifestPath));
@@ -278,6 +271,8 @@ async function manifestsMigration(context) {
             throw error_1.MigrationError(new Error(localizeUtils_1.getLocalizedString("core.migrationV3.manifestInvalid")), exports.errorNames.manifestTemplateInvalid);
         }
     }
+    // Backup templates/appPackage
+    await context.backup(oldAppPackageFolderPath);
     // Read Bicep
     const bicepContent = await v3MigrationUtils_1.readBicepContent(context);
     if (v3MigrationUtils_1.isValidDomainForBotOutputKey(bicepContent)) {
@@ -285,12 +280,12 @@ async function manifestsMigration(context) {
     }
     // Ensure appPackage
     await context.fsEnsureDir(teamsfx_api_1.AppPackageFolderName);
-    // Copy templates/appPackage/resources
-    const oldResourceFolderPath = path.join(oldAppPackageFolderPath, "resources");
-    const oldResourceFolderExists = await fs.pathExists(path.join(context.projectPath, oldResourceFolderPath));
-    if (oldResourceFolderExists) {
-        const resourceFolderPath = path.join(teamsfx_api_1.AppPackageFolderName, "resources");
-        await context.fsCopy(oldResourceFolderPath, resourceFolderPath);
+    // copy other files from old path to new except manifest.template.json and aad.template.json
+    const oldAppPackageFiles = await fs.readdir(path.join(context.projectPath, oldAppPackageFolderPath));
+    for (const file of oldAppPackageFiles) {
+        if (file !== constants_2.MANIFEST_TEMPLATE_CONSOLIDATE && file !== versionMetadata_1.MetadataV2.aadTemplateFileName) {
+            await context.fsCopy(path.join(oldAppPackageFolderPath, file), path.join(teamsfx_api_1.AppPackageFolderName, file));
+        }
     }
     // Read capability project settings
     const projectSettings = await loadProjectSettings(context.projectPath);
@@ -312,10 +307,9 @@ async function manifestsMigration(context) {
         await context.fsWriteFile(manifestPath, manifest);
     }
     // Read AAD app manifest and save to ./aad.manifest.json
-    const oldAadManifestPath = path.join(oldAppPackageFolderPath, "aad.template.json");
+    const oldAadManifestPath = path.join(oldAppPackageFolderPath, versionMetadata_1.MetadataV2.aadTemplateFileName);
     const oldAadManifestExists = await fs.pathExists(path.join(context.projectPath, oldAadManifestPath));
-    const activeResourcePlugins = projectSettings.solutionSettings
-        .activeResourcePlugins;
+    const activeResourcePlugins = projectSettings.solutionSettings.activeResourcePlugins;
     const component = projectSettings.components;
     const aadRequired = (activeResourcePlugins && activeResourcePlugins.includes("fx-resource-aad-app-for-teams")) ||
         (component &&
@@ -336,7 +330,7 @@ async function manifestsMigration(context) {
 exports.manifestsMigration = manifestsMigration;
 async function azureParameterMigration(context) {
     // Ensure `.fx/configs` exists
-    const configFolderPath = path.join(".fx", teamsfx_api_1.InputConfigsFolderName);
+    const configFolderPath = path.join(".fx", "configs");
     const configFolderPathExists = await context.fsPathExists(configFolderPath);
     if (!configFolderPathExists) {
         // Keep same practice now. Needs dicussion whether to throw error.
@@ -357,20 +351,19 @@ async function azureParameterMigration(context) {
 }
 exports.azureParameterMigration = azureParameterMigration;
 async function showNotification(ctx, versionForMigration) {
-    const isNonmodalMessage = v3MigrationUtils_1.getParameterFromCxt(ctx, exports.Parameters.isNonmodalMessage);
+    const isNonmodalMessage = v3MigrationUtils_1.getParameterFromCxt(ctx, Parameters.isNonmodalMessage);
     if (isNonmodalMessage) {
         return await showNonmodalNotification(ctx, versionForMigration);
     }
-    const confirmOnly = v3MigrationUtils_1.getParameterFromCxt(ctx, exports.Parameters.confirmOnly);
+    const confirmOnly = v3MigrationUtils_1.getParameterFromCxt(ctx, Parameters.confirmOnly);
     if (confirmOnly) {
         return await showConfirmOnlyNotification(ctx);
     }
-    const skipUserConfirm = v3MigrationUtils_1.getParameterFromCxt(ctx, exports.Parameters.skipUserConfirm);
+    const skipUserConfirm = v3MigrationUtils_1.getParameterFromCxt(ctx, Parameters.skipUserConfirm);
     if (skipUserConfirm) {
-        telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectMigratorNotification, {
-            [exports.TelemetryPropertyKey.button]: exports.TelemetryPropertyValue.ok,
-            [exports.TelemetryPropertyKey.upgradeVersion]: exports.TelemetryPropertyValue.upgradeVersion,
-            [exports.TelemetryPropertyKey.mode]: exports.TelemetryPropertyValue.skipUserConfirm,
+        sendTelemetryEventForUpgrade(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectMigratorNotification, {
+            [TelemetryPropertyKey.button]: TelemetryPropertyValue.ok,
+            [TelemetryPropertyKey.mode]: TelemetryPropertyValue.skipUserConfirm,
         });
         return true;
     }
@@ -378,113 +371,91 @@ async function showNotification(ctx, versionForMigration) {
 }
 exports.showNotification = showNotification;
 async function askUserConfirm(ctx, versionForMigration) {
-    telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectMigratorNotificationStart, {
-        [exports.TelemetryPropertyKey.upgradeVersion]: exports.TelemetryPropertyValue.upgradeVersion,
-    });
+    sendTelemetryEventForUpgrade(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectMigratorNotificationStart);
     let answer;
     do {
         answer = await popupMessageModal(versionForMigration);
         if (answer === exports.moreInfoButton) {
             globalVars_1.TOOLS === null || globalVars_1.TOOLS === void 0 ? void 0 : globalVars_1.TOOLS.ui.openUrl(exports.learnMoreLink);
-            telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectMigratorNotification, {
-                [exports.TelemetryPropertyKey.button]: exports.TelemetryPropertyValue.learnMore,
-                [exports.TelemetryPropertyKey.upgradeVersion]: exports.TelemetryPropertyValue.upgradeVersion,
-                [exports.TelemetryPropertyKey.mode]: exports.TelemetryPropertyValue.modal,
+            sendTelemetryEventForUpgrade(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectMigratorNotification, {
+                [TelemetryPropertyKey.button]: TelemetryPropertyValue.learnMore,
+                [TelemetryPropertyKey.mode]: TelemetryPropertyValue.modal,
             });
         }
     } while (answer === exports.moreInfoButton);
     if (!answer || !migrationMessageButtons.includes(answer)) {
-        telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectMigratorNotification, {
-            [exports.TelemetryPropertyKey.button]: exports.TelemetryPropertyValue.cancel,
-            [exports.TelemetryPropertyKey.upgradeVersion]: exports.TelemetryPropertyValue.upgradeVersion,
-            [exports.TelemetryPropertyKey.mode]: exports.TelemetryPropertyValue.modal,
+        sendTelemetryEventForUpgrade(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectMigratorNotification, {
+            [TelemetryPropertyKey.button]: TelemetryPropertyValue.cancel,
+            [TelemetryPropertyKey.mode]: TelemetryPropertyValue.modal,
         });
         ctx.result = teamsfx_api_1.err(error_1.UpgradeV3CanceledError());
         v3MigrationUtils_1.outputCancelMessage(versionForMigration.currentVersion, versionForMigration.platform);
         return false;
     }
-    telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectMigratorNotification, {
-        [exports.TelemetryPropertyKey.button]: exports.TelemetryPropertyValue.ok,
-        [exports.TelemetryPropertyKey.upgradeVersion]: exports.TelemetryPropertyValue.upgradeVersion,
-        [exports.TelemetryPropertyKey.mode]: exports.TelemetryPropertyValue.modal,
+    sendTelemetryEventForUpgrade(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectMigratorNotification, {
+        [TelemetryPropertyKey.button]: TelemetryPropertyValue.ok,
+        [TelemetryPropertyKey.mode]: TelemetryPropertyValue.modal,
     });
     return true;
 }
-exports.askUserConfirm = askUserConfirm;
 async function showNonmodalNotification(ctx, versionForMigration) {
-    telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectMigratorNotificationStart, {
-        [exports.TelemetryPropertyKey.upgradeVersion]: exports.TelemetryPropertyValue.upgradeVersion,
-    });
+    sendTelemetryEventForUpgrade(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectMigratorNotificationStart);
     const answer = await popupMessageNonmodal(versionForMigration);
     if (answer === exports.moreInfoButton) {
         globalVars_1.TOOLS === null || globalVars_1.TOOLS === void 0 ? void 0 : globalVars_1.TOOLS.ui.openUrl(exports.learnMoreLink);
-        telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectMigratorNotification, {
-            [exports.TelemetryPropertyKey.button]: exports.TelemetryPropertyValue.learnMore,
-            [exports.TelemetryPropertyKey.upgradeVersion]: exports.TelemetryPropertyValue.upgradeVersion,
-            [exports.TelemetryPropertyKey.mode]: exports.TelemetryPropertyValue.nonmodal,
+        sendTelemetryEventForUpgrade(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectMigratorNotification, {
+            [TelemetryPropertyKey.button]: TelemetryPropertyValue.learnMore,
+            [TelemetryPropertyKey.mode]: TelemetryPropertyValue.nonmodal,
         });
         return false;
     }
-    else if (answer === projectMigrator_1.upgradeButton) {
-        telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectMigratorNotification, {
-            [exports.TelemetryPropertyKey.button]: exports.TelemetryPropertyValue.ok,
-            [exports.TelemetryPropertyKey.upgradeVersion]: exports.TelemetryPropertyValue.upgradeVersion,
-            [exports.TelemetryPropertyKey.mode]: exports.TelemetryPropertyValue.nonmodal,
+    else if (answer === upgradeButton) {
+        sendTelemetryEventForUpgrade(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectMigratorNotification, {
+            [TelemetryPropertyKey.button]: TelemetryPropertyValue.ok,
+            [TelemetryPropertyKey.mode]: TelemetryPropertyValue.nonmodal,
         });
         return true;
     }
     return false;
 }
-exports.showNonmodalNotification = showNonmodalNotification;
 async function showConfirmOnlyNotification(ctx) {
-    telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectMigratorNotificationStart, {
-        [exports.TelemetryPropertyKey.upgradeVersion]: exports.TelemetryPropertyValue.upgradeVersion,
-    });
+    sendTelemetryEventForUpgrade(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectMigratorNotificationStart);
     const res = await (globalVars_1.TOOLS === null || globalVars_1.TOOLS === void 0 ? void 0 : globalVars_1.TOOLS.ui.showMessage("info", localizeUtils_1.getLocalizedString("core.migrationV3.confirmOnly.Message"), true, "OK"));
     if ((res === null || res === void 0 ? void 0 : res.isOk()) && res.value === "OK") {
-        telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectMigratorNotification, {
-            [exports.TelemetryPropertyKey.button]: exports.TelemetryPropertyValue.ok,
-            [exports.TelemetryPropertyKey.upgradeVersion]: exports.TelemetryPropertyValue.upgradeVersion,
-            [exports.TelemetryPropertyKey.mode]: exports.TelemetryPropertyValue.confirmOnly,
+        sendTelemetryEventForUpgrade(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectMigratorNotification, {
+            [TelemetryPropertyKey.button]: TelemetryPropertyValue.ok,
+            [TelemetryPropertyKey.mode]: TelemetryPropertyValue.confirmOnly,
         });
         return true;
     }
     else {
-        telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectMigratorNotification, {
-            [exports.TelemetryPropertyKey.button]: exports.TelemetryPropertyValue.cancel,
-            [exports.TelemetryPropertyKey.upgradeVersion]: exports.TelemetryPropertyValue.upgradeVersion,
-            [exports.TelemetryPropertyKey.mode]: exports.TelemetryPropertyValue.confirmOnly,
+        sendTelemetryEventForUpgrade(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectMigratorNotification, {
+            [TelemetryPropertyKey.button]: TelemetryPropertyValue.cancel,
+            [TelemetryPropertyKey.mode]: TelemetryPropertyValue.confirmOnly,
         });
         return false;
     }
 }
-exports.showConfirmOnlyNotification = showConfirmOnlyNotification;
 async function popupMessageModal(versionForMigration) {
     return await popupMessage(versionForMigration, true);
 }
-exports.popupMessageModal = popupMessageModal;
 async function popupMessageNonmodal(versionForMigration) {
     return await popupMessage(versionForMigration, false);
 }
-exports.popupMessageNonmodal = popupMessageNonmodal;
 async function popupMessage(versionForMigration, isModal) {
     const res = await (globalVars_1.TOOLS === null || globalVars_1.TOOLS === void 0 ? void 0 : globalVars_1.TOOLS.ui.showMessage("warn", v3MigrationUtils_1.migrationNotificationMessage(versionForMigration), isModal, ...migrationMessageButtons));
     return (res === null || res === void 0 ? void 0 : res.isOk()) ? res.value : undefined;
 }
-exports.popupMessage = popupMessage;
-async function generateLocalConfig(context) {
-    if (!(await context.fsPathExists(path.join(".fx", "configs", "config.local.json")))) {
-        const oldProjectSettings = await loadProjectSettings(context.projectPath);
-        await environment_1.environmentManager.createLocalEnv(context.projectPath, oldProjectSettings.appName);
-    }
-}
-exports.generateLocalConfig = generateLocalConfig;
-async function ensureTrackingIdInGlobal(context) {
+async function setTelemetryProjectId(context) {
     const projectPath = v3MigrationUtils_1.getParameterFromCxt(context, "projectPath", "");
-    const projectId = await v3MigrationUtils_1.getTrackingIdFromPath(projectPath);
-    globalVars_1.globalVars.trackingId = projectId; // set trackingId to globalVars
+    try {
+        const projectId = await v3MigrationUtils_1.getTrackingIdFromPath(projectPath);
+        telemetryProperties[TelemetryPropertyKey.projectId] = projectId;
+    }
+    catch (error) {
+        // do not set trackingId if error happens
+    }
 }
-exports.ensureTrackingIdInGlobal = ensureTrackingIdInGlobal;
 async function configsMigration(context) {
     // general
     if (await context.fsPathExists(path.join(".fx", "configs"))) {
@@ -492,24 +463,24 @@ async function configsMigration(context) {
         const fileNames = v3MigrationUtils_1.fsReadDirSync(context, path.join(".fx", "configs")); // search all files, get file names
         for (const fileName of fileNames)
             if (fileName.startsWith("config.")) {
-                const fileRegex = new RegExp("(config\\.)([a-zA-Z0-9_-]*)(\\.json)", "g"); // state.*.json
+                const fileRegex = new RegExp("(config\\.)([a-zA-Z0-9_-]*)(\\.json)$", "g"); // config.*.json
                 const fileNamesArray = fileRegex.exec(fileName);
                 if (fileNamesArray != null) {
                     // get envName
                     const envName = fileNamesArray[2];
                     // create .env.{env} file if not exist
                     await context.fsEnsureDir(versionMetadata_1.MetadataV3.defaultEnvironmentFolder);
-                    if (!(await context.fsPathExists(path.join(versionMetadata_1.MetadataV3.defaultEnvironmentFolder, exports.Constants.envFilePrefix + envName)))) {
+                    if (!(await context.fsPathExists(path.join(versionMetadata_1.MetadataV3.defaultEnvironmentFolder, Constants.envFilePrefix + envName)))) {
                         // create env file
-                        await context.fsCreateFile(path.join(versionMetadata_1.MetadataV3.defaultEnvironmentFolder, exports.Constants.envFilePrefix + envName));
+                        await context.fsCreateFile(path.join(versionMetadata_1.MetadataV3.defaultEnvironmentFolder, Constants.envFilePrefix + envName));
                         // add first line of comment
-                        await context.fsWriteFile(path.join(versionMetadata_1.MetadataV3.defaultEnvironmentFolder, exports.Constants.envFilePrefix + envName), envName === "local" ? versionMetadata_1.MetadataV3.envFileLocalComment : versionMetadata_1.MetadataV3.envFileDevComment, exports.Constants.envWriteOption);
+                        await context.fsWriteFile(path.join(versionMetadata_1.MetadataV3.defaultEnvironmentFolder, Constants.envFilePrefix + envName), envName === "local" ? versionMetadata_1.MetadataV3.envFileLocalComment : versionMetadata_1.MetadataV3.envFileDevComment, Constants.envWriteOption);
                     }
                     const obj = await v3MigrationUtils_1.readJsonFile(context, path.join(".fx", "configs", "config." + envName + ".json"));
                     if (obj["manifest"]) {
                         const bicepContent = await v3MigrationUtils_1.readBicepContent(context);
                         const teamsfx_env = fs
-                            .readFileSync(path.join(context.projectPath, versionMetadata_1.MetadataV3.defaultEnvironmentFolder, exports.Constants.envFilePrefix + envName))
+                            .readFileSync(path.join(context.projectPath, versionMetadata_1.MetadataV3.defaultEnvironmentFolder, Constants.envFilePrefix + envName))
                             .toString()
                             .includes("TEAMSFX_ENV=")
                             ? ""
@@ -517,7 +488,7 @@ async function configsMigration(context) {
                         // convert every name and add the env name at the first line
                         const envData = teamsfx_env +
                             v3MigrationUtils_1.jsonObjectNamesConvertV3(obj["manifest"], "manifest.", "", MigrationUtils_1.FileType.CONFIG, bicepContent);
-                        await context.fsWriteFile(path.join(versionMetadata_1.MetadataV3.defaultEnvironmentFolder, exports.Constants.envFilePrefix + envName), envData, exports.Constants.envWriteOption);
+                        await context.fsWriteFile(path.join(versionMetadata_1.MetadataV3.defaultEnvironmentFolder, Constants.envFilePrefix + envName), envData, Constants.envWriteOption);
                     }
                 }
             }
@@ -531,25 +502,25 @@ async function statesMigration(context) {
         const fileNames = v3MigrationUtils_1.fsReadDirSync(context, path.join(".fx", "states")); // search all files, get file names
         for (const fileName of fileNames)
             if (fileName.startsWith("state.")) {
-                const fileRegex = new RegExp("(state\\.)([a-zA-Z0-9_-]*)(\\.json)", "g"); // state.*.json
+                const fileRegex = new RegExp("(state\\.)([a-zA-Z0-9_-]*)(\\.json)$", "g"); // state.*.json
                 const fileNamesArray = fileRegex.exec(fileName);
                 if (fileNamesArray != null) {
                     // get envName
                     const envName = fileNamesArray[2];
                     // create .env.{env} file if not exist
                     await context.fsEnsureDir(versionMetadata_1.MetadataV3.defaultEnvironmentFolder);
-                    if (!(await context.fsPathExists(path.join(versionMetadata_1.MetadataV3.defaultEnvironmentFolder, exports.Constants.envFilePrefix + envName)))) {
+                    if (!(await context.fsPathExists(path.join(versionMetadata_1.MetadataV3.defaultEnvironmentFolder, Constants.envFilePrefix + envName)))) {
                         // create env file
-                        await context.fsCreateFile(path.join(versionMetadata_1.MetadataV3.defaultEnvironmentFolder, exports.Constants.envFilePrefix + envName));
+                        await context.fsCreateFile(path.join(versionMetadata_1.MetadataV3.defaultEnvironmentFolder, Constants.envFilePrefix + envName));
                         // add first line of comment
-                        await context.fsWriteFile(path.join(versionMetadata_1.MetadataV3.defaultEnvironmentFolder, exports.Constants.envFilePrefix + envName), envName === "local" ? versionMetadata_1.MetadataV3.envFileLocalComment : versionMetadata_1.MetadataV3.envFileDevComment, exports.Constants.envWriteOption);
+                        await context.fsWriteFile(path.join(versionMetadata_1.MetadataV3.defaultEnvironmentFolder, Constants.envFilePrefix + envName), envName === "local" ? versionMetadata_1.MetadataV3.envFileLocalComment : versionMetadata_1.MetadataV3.envFileDevComment, Constants.envWriteOption);
                     }
                     const obj = await v3MigrationUtils_1.readJsonFile(context, path.join(".fx", "states", "state." + envName + ".json"));
                     if (obj) {
                         const bicepContent = await v3MigrationUtils_1.readBicepContent(context);
                         // convert every name
                         const envData = v3MigrationUtils_1.jsonObjectNamesConvertV3(obj, "state.", "", MigrationUtils_1.FileType.STATE, bicepContent);
-                        await context.fsWriteFile(path.join(versionMetadata_1.MetadataV3.defaultEnvironmentFolder, exports.Constants.envFilePrefix + envName), envData, exports.Constants.envWriteOption);
+                        await context.fsWriteFile(path.join(versionMetadata_1.MetadataV3.defaultEnvironmentFolder, Constants.envFilePrefix + envName), envData, Constants.envWriteOption);
                     }
                 }
             }
@@ -573,16 +544,16 @@ async function userdataMigration(context) {
                 os_1.EOL +
                 versionMetadata_1.MetadataV3.secretComment +
                 (await v3MigrationUtils_1.readAndConvertUserdata(context, path.join(stateFolder, stateFile), bicepContent));
-            await context.fsWriteFile(path.join(versionMetadata_1.MetadataV3.defaultEnvironmentFolder, envFileName), envData, exports.Constants.envWriteOption);
+            await context.fsWriteFile(path.join(versionMetadata_1.MetadataV3.defaultEnvironmentFolder, envFileName), envData, Constants.envWriteOption);
         }
     }
 }
 exports.userdataMigration = userdataMigration;
 async function debugMigration(context) {
     // Backup vscode/tasks.json
-    await context.backup(exports.Constants.tasksJsonPath);
+    await context.backup(Constants.tasksJsonPath);
     // Read .vscode/tasks.json
-    const tasksJsonContent = await debugV3MigrationUtils_1.readJsonCommentFile(path.join(context.projectPath, exports.Constants.tasksJsonPath));
+    const tasksJsonContent = await debugV3MigrationUtils_1.readJsonCommentFile(path.join(context.projectPath, Constants.tasksJsonPath));
     if (!debugV3MigrationUtils_1.isCommentObject(tasksJsonContent) || !Array.isArray(tasksJsonContent["tasks"])) {
         // Invalid tasks.json content
         return;
@@ -617,7 +588,7 @@ async function debugMigration(context) {
         await func(debugContext);
     }
     // Write .vscode/tasks.json
-    await context.fsWriteFile(exports.Constants.tasksJsonPath, commentJson.stringify(tasksJsonContent, null, 4));
+    await context.fsWriteFile(Constants.tasksJsonPath, commentJson.stringify(tasksJsonContent, null, 4));
     // Generate app.local.yml
     const appYmlGenerator = new appLocalYmlGenerator_1.AppLocalYmlGenerator(oldProjectSettings, debugContext.appYmlConfig, placeholderMappings);
     const appYmlString = await appYmlGenerator.generateAppYml();
@@ -645,20 +616,20 @@ async function generateApimPluginEnvContent(context) {
             const fileNames = v3MigrationUtils_1.fsReadDirSync(context, path.join(".fx", "configs"));
             for (const fileName of fileNames)
                 if (fileName.startsWith("config.")) {
-                    const fileRegex = new RegExp("(config.)([a-zA-Z0-9_-]*)(.json)", "g"); // state.*.json
+                    const fileRegex = new RegExp("(config.)([a-zA-Z0-9_-]*)(.json)$", "g"); // config.*.json
                     const fileNamesArray = fileRegex.exec(fileName);
                     if (fileNamesArray != null) {
                         // get envName
                         const envName = fileNamesArray[2];
                         if (envName != "local") {
                             await context.fsEnsureDir(versionMetadata_1.MetadataV3.defaultEnvironmentFolder);
-                            if (!(await context.fsPathExists(path.join(versionMetadata_1.MetadataV3.defaultEnvironmentFolder, exports.Constants.envFilePrefix + envName))))
-                                await context.fsCreateFile(path.join(versionMetadata_1.MetadataV3.defaultEnvironmentFolder, exports.Constants.envFilePrefix + envName));
+                            if (!(await context.fsPathExists(path.join(versionMetadata_1.MetadataV3.defaultEnvironmentFolder, Constants.envFilePrefix + envName))))
+                                await context.fsCreateFile(path.join(versionMetadata_1.MetadataV3.defaultEnvironmentFolder, Constants.envFilePrefix + envName));
                             const apimPluginAppendContent = "APIM__PUBLISHEREMAIL= # Teams Toolkit does not record your mail to protect your privacy, please fill your mail address here before provision to avoid failures" +
                                 os_1.EOL +
                                 "APIM__PUBLISHERNAME= # Teams Toolkit does not record your name to protect your privacy, please fill your name here before provision to avoid failures" +
                                 os_1.EOL;
-                            await context.fsWriteFile(path.join(versionMetadata_1.MetadataV3.defaultEnvironmentFolder, exports.Constants.envFilePrefix + envName), apimPluginAppendContent, exports.Constants.envWriteOption);
+                            await context.fsWriteFile(path.join(versionMetadata_1.MetadataV3.defaultEnvironmentFolder, Constants.envFilePrefix + envName), apimPluginAppendContent, Constants.envWriteOption);
                         }
                     }
                 }
@@ -674,17 +645,15 @@ async function checkActiveResourcePlugins(projectPath) {
             return true;
         }
         else {
-            telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectMigratorPrecheckFailed, {
-                [exports.TelemetryPropertyKey.upgradeVersion]: exports.TelemetryPropertyValue.upgradeVersion,
-                [exports.TelemetryPropertyKey.reason]: "solutionSettings invalid",
+            sendTelemetryEventForUpgrade(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectMigratorPrecheckFailed, {
+                [TelemetryPropertyKey.reason]: "solutionSettings invalid",
             });
             return false;
         }
     }
     catch (error) {
-        telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectMigratorPrecheckFailed, {
-            [exports.TelemetryPropertyKey.upgradeVersion]: exports.TelemetryPropertyValue.upgradeVersion,
-            [exports.TelemetryPropertyKey.reason]: error.message,
+        sendTelemetryEventForUpgrade(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectMigratorPrecheckFailed, {
+            [TelemetryPropertyKey.reason]: error.message,
         });
         return false;
     }
@@ -704,4 +673,12 @@ async function updateGitignore(context) {
     await context.fsWriteFile(gitignoreFile, ignoreFileContent);
 }
 exports.updateGitignore = updateGitignore;
+function sendTelemetryEventForUpgrade(component, eventName, properties, measurements) {
+    const mergedProperties = Object.assign(Object.assign({}, properties), telemetryProperties);
+    telemetry_1.sendTelemetryEvent(component, eventName, mergedProperties, measurements);
+}
+function sendTelemetryErrorEventForUpgrade(component, eventName, fxError, properties) {
+    const mergedProperties = Object.assign(Object.assign({}, properties), telemetryProperties);
+    telemetry_1.sendTelemetryErrorEvent(component, eventName, fxError, mergedProperties);
+}
 //# sourceMappingURL=projectMigratorV3.js.map