@microsoft/teamsfx-core 2.0.1-alpha.cb1f62669.0 → 2.0.1-alpha.d4f96cccc.0

package/build/core/error.d.ts

@@ -1,59 +1,26 @@
-import { FxError, Inputs, SystemError, UserError, Stage } from "@microsoft/teamsfx-api";
+import { FxError, Inputs, SystemError, UserError } from "@microsoft/teamsfx-api";
 export declare const CoreSource = "Core";
 export declare const UpgradeSource = "Upgrade";
-export declare class ProjectFolderExistError extends UserError {
-    constructor(path: string);
-}
-export declare class ProjectFolderInvalidError extends UserError {
-    constructor(path: string);
-}
 export declare function WriteFileError(e: Error): SystemError;
 export declare function ReadFileError(e: Error): SystemError;
 export declare function MigrationError(e: Error, name: string, helpLink?: string): UserError;
 export declare function CopyFileError(e: Error): SystemError;
-export declare class InitializedFileAlreadyExistError extends UserError {
-    constructor(filePath: string);
-}
 export declare class NoProjectOpenedError extends UserError {
     constructor();
 }
-export declare class InvalidProjectSettingsFileError extends UserError {
-    constructor(msg?: string);
-}
-export declare class FetchSampleError extends UserError {
-    constructor(sampleId: string);
-}
 export declare function InvalidInputError(reason: string, inputs?: Inputs): UserError;
-export declare function ProjectSettingsUndefinedError(): SystemError;
-export declare function MultipleEnvNotEnabledError(): SystemError;
 export declare function InvalidEnvNameError(): UserError;
 export declare function ProjectEnvAlreadyExistError(env: string): FxError;
 export declare function InvalidEnvConfigError(env: string, errorMsg: string): UserError;
-export declare class NotImplementedError extends SystemError {
-    constructor(method: string);
-}
 export declare class ObjectIsUndefinedError extends SystemError {
     constructor(name: string);
 }
-export declare function SolutionConfigError(): UserError;
-export declare function ProjectSettingError(): UserError;
-export declare function UpgradeCanceledError(): UserError;
 export declare function UpgradeV3CanceledError(): UserError;
 export declare function ToolkitNotSupportError(): UserError;
 export declare function IncompatibleProjectError(messageKey: string): UserError;
 export declare function AbandonedProjectError(): UserError;
-export declare function ConsolidateCanceledError(): UserError;
-export declare function NotJsonError(err: Error): UserError;
 export declare function FailedToParseResourceIdError(name: string, resourceId: string): UserError;
-export declare function SPFxConfigError(file: string): UserError;
 export declare function NpmInstallError(path: string, e: Error): SystemError;
-export declare function LoadPluginError(): SystemError;
-export declare class OperationNotPermittedError extends UserError {
-    constructor(operation: string);
-}
-export declare class NoCapabilityFoundError extends UserError {
-    constructor(operation: Stage);
-}
 export declare class VideoFilterAppRemoteNotSupportedError extends UserError {
     constructor();
 }

package/build/core/error.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"error.d.ts","sourceRoot":"","sources":["../../src/core/error.ts"],"names":[],"mappings":"AAIA,OAAO,EAEL,OAAO,EACP,MAAM,EACN,WAAW,EACX,SAAS,EAIT,KAAK,EACN,MAAM,wBAAwB,CAAC;AAIhC,eAAO,MAAM,UAAU,SAAS,CAAC;AACjC,eAAO,MAAM,aAAa,YAAY,CAAC;AAEvC,qBAAa,uBAAwB,SAAQ,SAAS;gBACxC,IAAI,EAAE,MAAM;CAOzB;AAED,qBAAa,yBAA0B,SAAQ,SAAS;gBAC1C,IAAI,EAAE,MAAM;CAOzB;AAED,wBAAgB,cAAc,CAAC,CAAC,EAAE,KAAK,GAAG,WAAW,CAMpD;AAED,wBAAgB,aAAa,CAAC,CAAC,EAAE,KAAK,GAAG,WAAW,CAMnD;AAED,wBAAgB,cAAc,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAQnF;AAED,wBAAgB,aAAa,CAAC,CAAC,EAAE,KAAK,GAAG,WAAW,CAMnD;AAED,qBAAa,gCAAiC,SAAQ,SAAS;gBACjD,QAAQ,EAAE,MAAM;CAO7B;AAED,qBAAa,oBAAqB,SAAQ,SAAS;;CAQlD;AAED,qBAAa,+BAAgC,SAAQ,SAAS;gBAChD,GAAG,CAAC,EAAE,MAAM;CAOzB;AAED,qBAAa,gBAAiB,SAAQ,SAAS;gBACjC,QAAQ,EAAE,MAAM;CAO7B;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAQ5E;AAED,wBAAgB,6BAA6B,IAAI,WAAW,CAO3D;AAED,wBAAgB,0BAA0B,IAAI,WAAW,CAOxD;AAED,wBAAgB,mBAAmB,IAAI,SAAS,CAO/C;AAED,wBAAgB,2BAA2B,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAOhE;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,SAAS,CAS9E;AAED,qBAAa,mBAAoB,SAAQ,WAAW;gBACtC,MAAM,EAAE,MAAM;CAQ3B;AAED,qBAAa,sBAAuB,SAAQ,WAAW;gBACzC,IAAI,EAAE,MAAM;CAQzB;AAED,wBAAgB,mBAAmB,IAAI,SAAS,CAO/C;AAED,wBAAgB,mBAAmB,IAAI,SAAS,CAO/C;AAED,wBAAgB,oBAAoB,IAAI,SAAS,CAOhD;AAED,wBAAgB,sBAAsB,IAAI,SAAS,CAOlD;AAED,wBAAgB,sBAAsB,IAAI,SAAS,CAOlD;AAED,wBAAgB,wBAAwB,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,CAOtE;AAED,wBAAgB,qBAAqB,IAAI,SAAS,CAOjD;AAED,wBAAgB,wBAAwB,IAAI,SAAS,CAQpD;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,KAAK,GAAG,SAAS,CAElD;AAED,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,SAAS,CAOxF;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,CAOvD;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,KAAK,GAAG,WAAW,CAEnE;AAED,wBAAgB,eAAe,IAAI,WAAW,CAO7C;AAED,qBAAa,0BAA2B,SAAQ,SAAS;gBAC3C,SAAS,EAAE,MAAM;CAQ9B;AAED,qBAAa,sBAAuB,SAAQ,SAAS;gBACvC,SAAS,EAAE,KAAK;CAO7B;AAED,qBAAa,qCAAsC,SAAQ,SAAS;;CASnE;AAED,qBAAa,wBAAyB,SAAQ,SAAS;;CAStD"}
+{"version":3,"file":"error.d.ts","sourceRoot":"","sources":["../../src/core/error.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,OAAO,EACP,MAAM,EACN,WAAW,EACX,SAAS,EAGV,MAAM,wBAAwB,CAAC;AAGhC,eAAO,MAAM,UAAU,SAAS,CAAC;AACjC,eAAO,MAAM,aAAa,YAAY,CAAC;AAEvC,wBAAgB,cAAc,CAAC,CAAC,EAAE,KAAK,GAAG,WAAW,CAMpD;AAED,wBAAgB,aAAa,CAAC,CAAC,EAAE,KAAK,GAAG,WAAW,CAMnD;AAED,wBAAgB,cAAc,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAQnF;AAED,wBAAgB,aAAa,CAAC,CAAC,EAAE,KAAK,GAAG,WAAW,CAMnD;AAED,qBAAa,oBAAqB,SAAQ,SAAS;;CAQlD;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAQ5E;AAED,wBAAgB,mBAAmB,IAAI,SAAS,CAO/C;AAED,wBAAgB,2BAA2B,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAOhE;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,SAAS,CAS9E;AAED,qBAAa,sBAAuB,SAAQ,WAAW;gBACzC,IAAI,EAAE,MAAM;CAQzB;AAED,wBAAgB,sBAAsB,IAAI,SAAS,CAOlD;AAED,wBAAgB,sBAAsB,IAAI,SAAS,CAOlD;AAED,wBAAgB,wBAAwB,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,CAOtE;AAED,wBAAgB,qBAAqB,IAAI,SAAS,CAOjD;AAED,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,SAAS,CAOxF;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,KAAK,GAAG,WAAW,CAEnE;AAED,qBAAa,qCAAsC,SAAQ,SAAS;;CASnE;AAED,qBAAa,wBAAyB,SAAQ,SAAS;;CAStD"}

package/build/core/error.js

@@ -2,31 +2,11 @@
 // Licensed under the MIT license.
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NotAllowedMigrationError = exports.VideoFilterAppRemoteNotSupportedError = exports.NoCapabilityFoundError = exports.OperationNotPermittedError = exports.LoadPluginError = exports.NpmInstallError = exports.SPFxConfigError = exports.FailedToParseResourceIdError = exports.NotJsonError = exports.ConsolidateCanceledError = exports.AbandonedProjectError = exports.IncompatibleProjectError = exports.ToolkitNotSupportError = exports.UpgradeV3CanceledError = exports.UpgradeCanceledError = exports.ProjectSettingError = exports.SolutionConfigError = exports.ObjectIsUndefinedError = exports.NotImplementedError = exports.InvalidEnvConfigError = exports.ProjectEnvAlreadyExistError = exports.InvalidEnvNameError = exports.MultipleEnvNotEnabledError = exports.ProjectSettingsUndefinedError = exports.InvalidInputError = exports.FetchSampleError = exports.InvalidProjectSettingsFileError = exports.NoProjectOpenedError = exports.InitializedFileAlreadyExistError = exports.CopyFileError = exports.MigrationError = exports.ReadFileError = exports.WriteFileError = exports.ProjectFolderInvalidError = exports.ProjectFolderExistError = exports.UpgradeSource = exports.CoreSource = void 0;
+exports.NotAllowedMigrationError = exports.VideoFilterAppRemoteNotSupportedError = exports.NpmInstallError = exports.FailedToParseResourceIdError = exports.AbandonedProjectError = exports.IncompatibleProjectError = exports.ToolkitNotSupportError = exports.UpgradeV3CanceledError = exports.ObjectIsUndefinedError = exports.InvalidEnvConfigError = exports.ProjectEnvAlreadyExistError = exports.InvalidEnvNameError = exports.InvalidInputError = exports.NoProjectOpenedError = exports.CopyFileError = exports.MigrationError = exports.ReadFileError = exports.WriteFileError = exports.UpgradeSource = exports.CoreSource = void 0;
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const localizeUtils_1 = require("../common/localizeUtils");
 exports.CoreSource = "Core";
 exports.UpgradeSource = "Upgrade";
-class ProjectFolderExistError extends teamsfx_api_1.UserError {
-    constructor(path) {
-        super({
-            message: localizeUtils_1.getDefaultString("error.ProjectFolderExistError", path),
-            displayMessage: localizeUtils_1.getLocalizedString("error.ProjectFolderExistError", path),
-            source: exports.CoreSource,
-        });
-    }
-}
-exports.ProjectFolderExistError = ProjectFolderExistError;
-class ProjectFolderInvalidError extends teamsfx_api_1.UserError {
-    constructor(path) {
-        super({
-            message: localizeUtils_1.getDefaultString("error.ProjectFolderInvalidError", path),
-            displayMessage: localizeUtils_1.getLocalizedString("error.ProjectFolderInvalidError", path),
-            source: exports.CoreSource,
-        });
-    }
-}
-exports.ProjectFolderInvalidError = ProjectFolderInvalidError;
 function WriteFileError(e) {
     return new teamsfx_api_1.SystemError({
         name: "WriteFileError",
@@ -61,16 +41,6 @@ function CopyFileError(e) {
     });
 }
 exports.CopyFileError = CopyFileError;
-class InitializedFileAlreadyExistError extends teamsfx_api_1.UserError {
-    constructor(filePath) {
-        super({
-            message: localizeUtils_1.getDefaultString("error.InitializedFileExistError", filePath),
-            displayMessage: localizeUtils_1.getLocalizedString("error.InitializedFileExistError", filePath),
-            source: exports.CoreSource,
-        });
-    }
-}
-exports.InitializedFileAlreadyExistError = InitializedFileAlreadyExistError;
 class NoProjectOpenedError extends teamsfx_api_1.UserError {
     constructor() {
         super({
@@ -81,39 +51,11 @@ class NoProjectOpenedError extends teamsfx_api_1.UserError {
     }
 }
 exports.NoProjectOpenedError = NoProjectOpenedError;
-class InvalidProjectSettingsFileError extends teamsfx_api_1.UserError {
-    constructor(msg) {
-        super({
-            message: localizeUtils_1.getDefaultString("error.InvalidProjectSettingsFileError", msg || ""),
-            displayMessage: localizeUtils_1.getLocalizedString("error.InvalidProjectSettingsFileError", msg || ""),
-            source: exports.CoreSource,
-        });
-    }
-}
-exports.InvalidProjectSettingsFileError = InvalidProjectSettingsFileError;
-class FetchSampleError extends teamsfx_api_1.UserError {
-    constructor(sampleId) {
-        super({
-            message: localizeUtils_1.getDefaultString("error.FetchSampleError", sampleId),
-            displayMessage: localizeUtils_1.getLocalizedString("error.FetchSampleError", sampleId),
-            source: exports.CoreSource,
-        });
-    }
-}
-exports.FetchSampleError = FetchSampleError;
 function InvalidInputError(reason, inputs) {
     const txt = inputs ? `${reason}, inputs: ${JSON.stringify(inputs)}` : reason;
     return new teamsfx_api_1.UserError(exports.CoreSource, "InvalidInput", localizeUtils_1.getDefaultString("error.InvalidInputError", txt), localizeUtils_1.getLocalizedString("error.InvalidInputError", txt));
 }
 exports.InvalidInputError = InvalidInputError;
-function ProjectSettingsUndefinedError() {
-    return new teamsfx_api_1.SystemError(exports.CoreSource, "ProjectSettingsUndefinedError", localizeUtils_1.getDefaultString("error.ProjectSettingsUndefinedError"), localizeUtils_1.getLocalizedString("error.ProjectSettingsUndefinedError"));
-}
-exports.ProjectSettingsUndefinedError = ProjectSettingsUndefinedError;
-function MultipleEnvNotEnabledError() {
-    return new teamsfx_api_1.SystemError(exports.CoreSource, "MultipleEnvNotEnabledError", localizeUtils_1.getDefaultString("error.MultipleEnvNotEnabledError"), localizeUtils_1.getLocalizedString("error.MultipleEnvNotEnabledError"));
-}
-exports.MultipleEnvNotEnabledError = MultipleEnvNotEnabledError;
 function InvalidEnvNameError() {
     return new teamsfx_api_1.UserError(exports.CoreSource, "InvalidEnvNameError", localizeUtils_1.getDefaultString("error.InvalidEnvNameError"), localizeUtils_1.getLocalizedString("error.InvalidEnvNameError"));
 }
@@ -128,31 +70,12 @@ function InvalidEnvConfigError(env, errorMsg) {
     return new teamsfx_api_1.UserError(exports.CoreSource, "InvalidEnvConfigError", localizeUtils_1.getDefaultString("error.InvalidEnvConfigError", param1, param2), localizeUtils_1.getLocalizedString("error.InvalidEnvConfigError", param1, param2));
 }
 exports.InvalidEnvConfigError = InvalidEnvConfigError;
-class NotImplementedError extends teamsfx_api_1.SystemError {
-    constructor(method) {
-        super(exports.CoreSource, new.target.name, localizeUtils_1.getDefaultString("error.NotImplementedError", method), localizeUtils_1.getLocalizedString("error.NotImplementedError", method));
-    }
-}
-exports.NotImplementedError = NotImplementedError;
 class ObjectIsUndefinedError extends teamsfx_api_1.SystemError {
     constructor(name) {
         super(exports.CoreSource, new.target.name, localizeUtils_1.getDefaultString("error.NotImplementedError", name), localizeUtils_1.getLocalizedString("error.NotImplementedError", name));
     }
 }
 exports.ObjectIsUndefinedError = ObjectIsUndefinedError;
-function SolutionConfigError() {
-    return new teamsfx_api_1.UserError(exports.CoreSource, "SolutionConfigError", localizeUtils_1.getDefaultString("error.SolutionConfigError"), localizeUtils_1.getLocalizedString("error.SolutionConfigError"));
-}
-exports.SolutionConfigError = SolutionConfigError;
-function ProjectSettingError() {
-    return new teamsfx_api_1.UserError(exports.CoreSource, "ProjectSettingError", localizeUtils_1.getDefaultString("error.ProjectSettingError"), localizeUtils_1.getLocalizedString("error.ProjectSettingError"));
-}
-exports.ProjectSettingError = ProjectSettingError;
-function UpgradeCanceledError() {
-    return new teamsfx_api_1.UserError(exports.CoreSource, "UserCancel", // @see tools.isUserCancelError()
-    localizeUtils_1.getDefaultString("error.UpgradeCanceledError"), localizeUtils_1.getLocalizedString("error.UpgradeCanceledError"));
-}
-exports.UpgradeCanceledError = UpgradeCanceledError;
 function UpgradeV3CanceledError() {
     return new teamsfx_api_1.UserError(exports.CoreSource, "UserCancel", // @see tools.isUserCancelError()
     localizeUtils_1.getDefaultString("error.UpgradeV3CanceledError"), localizeUtils_1.getLocalizedString("error.UpgradeV3CanceledError"));
@@ -170,48 +93,14 @@ function AbandonedProjectError() {
     return new teamsfx_api_1.UserError(exports.CoreSource, "AbandonedProject", localizeUtils_1.getDefaultString("core.migrationV3.abandonedProject"), localizeUtils_1.getLocalizedString("core.migrationV3.abandonedProject"));
 }
 exports.AbandonedProjectError = AbandonedProjectError;
-function ConsolidateCanceledError() {
-    return new teamsfx_api_1.UserError(exports.CoreSource, 
-    // @see tools.isUserCancelError()
-    "UserCancel", localizeUtils_1.getDefaultString("error.ConsolidateCanceledError"), localizeUtils_1.getLocalizedString("error.ConsolidateCanceledError"));
-}
-exports.ConsolidateCanceledError = ConsolidateCanceledError;
-function NotJsonError(err) {
-    return new teamsfx_api_1.UserError({ error: err, source: exports.CoreSource });
-}
-exports.NotJsonError = NotJsonError;
 function FailedToParseResourceIdError(name, resourceId) {
     return new teamsfx_api_1.UserError(exports.CoreSource, "FailedToParseResourceIdError", localizeUtils_1.getDefaultString("error.FailedToParseResourceIdError", name, resourceId), localizeUtils_1.getLocalizedString("error.FailedToParseResourceIdError", name, resourceId));
 }
 exports.FailedToParseResourceIdError = FailedToParseResourceIdError;
-function SPFxConfigError(file) {
-    return new teamsfx_api_1.UserError(exports.CoreSource, "SPFxConfigError", localizeUtils_1.getDefaultString("error.SPFxConfigError", file), localizeUtils_1.getLocalizedString("error.SPFxConfigError", file));
-}
-exports.SPFxConfigError = SPFxConfigError;
 function NpmInstallError(path, e) {
     return new teamsfx_api_1.SystemError({ error: e, source: exports.CoreSource });
 }
 exports.NpmInstallError = NpmInstallError;
-function LoadPluginError() {
-    return new teamsfx_api_1.SystemError(exports.CoreSource, "LoadPluginError", localizeUtils_1.getDefaultString("error.LoadPluginError"), localizeUtils_1.getLocalizedString("error.LoadPluginError"));
-}
-exports.LoadPluginError = LoadPluginError;
-class OperationNotPermittedError extends teamsfx_api_1.UserError {
-    constructor(operation) {
-        super(exports.CoreSource, new.target.name, localizeUtils_1.getDefaultString("error.OperationNotPermittedError", operation), localizeUtils_1.getLocalizedString("error.OperationNotPermittedError", operation));
-    }
-}
-exports.OperationNotPermittedError = OperationNotPermittedError;
-class NoCapabilityFoundError extends teamsfx_api_1.UserError {
-    constructor(operation) {
-        super({
-            source: exports.CoreSource,
-            message: localizeUtils_1.getDefaultString("core.deploy.noCapabilityFound", operation),
-            displayMessage: localizeUtils_1.getLocalizedString("core.deploy.noCapabilityFound", operation),
-        });
-    }
-}
-exports.NoCapabilityFoundError = NoCapabilityFoundError;
 class VideoFilterAppRemoteNotSupportedError extends teamsfx_api_1.UserError {
     constructor() {
         super({

package/build/core/error.js.map

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

package/build/core/globalVars.d.ts

@@ -1,5 +1,4 @@
 import { LogProvider, Stage, Tools } from "@microsoft/teamsfx-api";
-export declare function isVsCallingCli(): boolean;
 export declare let Logger: LogProvider;
 export declare let currentStage: Stage;
 export declare let TOOLS: Tools;

package/build/core/globalVars.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"globalVars.d.ts","sourceRoot":"","sources":["../../src/core/globalVars.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAYnE,wBAAgB,cAAc,IAAI,OAAO,CAExC;AAED,eAAO,IAAI,MAAM,EAAE,WAAW,CAAC;AAC/B,eAAO,IAAI,YAAY,EAAE,KAAK,CAAC;AAC/B,eAAO,IAAI,KAAK,EAAE,KAAK,CAAC;AACxB,eAAO,IAAI,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;AACtC,eAAO,MAAM,IAAI,QAAQ,CAAC;AAC1B,wBAAgB,QAAQ,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI,CAG3C;AACD,wBAAgB,SAAS,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAE/C;AACD,wBAAgB,eAAe,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI,CAElD;AACD,qBAAa,UAAU;IACrB,IAAI,CAAC,EAAE,OAAO,CAAS;IACvB,UAAU,SAAM;IAChB,YAAY,SAAM;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AACD,eAAO,MAAM,UAAU,YAAmB,CAAC"}
+{"version":3,"file":"globalVars.d.ts","sourceRoot":"","sources":["../../src/core/globalVars.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAEnE,eAAO,IAAI,MAAM,EAAE,WAAW,CAAC;AAC/B,eAAO,IAAI,YAAY,EAAE,KAAK,CAAC;AAC/B,eAAO,IAAI,KAAK,EAAE,KAAK,CAAC;AACxB,eAAO,IAAI,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;AACtC,eAAO,MAAM,IAAI,QAAQ,CAAC;AAC1B,wBAAgB,QAAQ,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI,CAG3C;AACD,wBAAgB,SAAS,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAE/C;AACD,wBAAgB,eAAe,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI,CAElD;AACD,qBAAa,UAAU;IACrB,IAAI,CAAC,EAAE,OAAO,CAAS;IACvB,UAAU,SAAM;IAChB,YAAY,SAAM;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AACD,eAAO,MAAM,UAAU,YAAmB,CAAC"}

package/build/core/globalVars.js

@@ -2,21 +2,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.globalVars = exports.GlobalVars = exports.setCurrentStage = exports.setLocale = exports.setTools = exports.isVS = exports.Locale = exports.TOOLS = exports.currentStage = exports.Logger = exports.isVsCallingCli = void 0;
-const constants_1 = require("../common/constants");
-function featureFlagEnabled(flagName) {
-    const flag = process.env[flagName];
-    if (flag !== undefined && flag.toLowerCase() === "true") {
-        return true;
-    }
-    else {
-        return false;
-    }
-}
-function isVsCallingCli() {
-    return featureFlagEnabled(constants_1.FeatureFlagName.VSCallingCLI);
-}
-exports.isVsCallingCli = isVsCallingCli;
+exports.globalVars = exports.GlobalVars = exports.setCurrentStage = exports.setLocale = exports.setTools = exports.isVS = exports.Locale = exports.TOOLS = exports.currentStage = exports.Logger = void 0;
 exports.isVS = false;
 function setTools(tools) {
     exports.TOOLS = tools;

package/build/core/globalVars.js.map

@@ -1 +1 @@
-{"version":3,"file":"globalVars.js","sourceRoot":"","sources":["../../src/core/globalVars.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAGlC,mDAAsD;AAEtD,SAAS,kBAAkB,CAAC,QAAgB;IAC1C,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IACnC,IAAI,IAAI,KAAK,SAAS,IAAI,IAAI,CAAC,WAAW,EAAE,KAAK,MAAM,EAAE;QACvD,OAAO,IAAI,CAAC;KACb;SAAM;QACL,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AAED,SAAgB,cAAc;IAC5B,OAAO,kBAAkB,CAAC,2BAAe,CAAC,YAAY,CAAC,CAAC;AAC1D,CAAC;AAFD,wCAEC;AAMY,QAAA,IAAI,GAAG,KAAK,CAAC;AAC1B,SAAgB,QAAQ,CAAC,KAAY;IACnC,aAAK,GAAG,KAAK,CAAC;IACd,cAAM,GAAG,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,WAAW,CAAC;AAC9B,CAAC;AAHD,4BAGC;AACD,SAAgB,SAAS,CAAC,MAAe;IACvC,cAAM,GAAG,MAAM,CAAC;AAClB,CAAC;AAFD,8BAEC;AACD,SAAgB,eAAe,CAAC,KAAY;IAC1C,oBAAY,GAAG,KAAK,CAAC;AACvB,CAAC;AAFD,0CAEC;AACD,MAAa,UAAU;IAAvB;QACE,SAAI,GAAa,KAAK,CAAC;QACvB,eAAU,GAAG,EAAE,CAAC;QAChB,iBAAY,GAAG,EAAE,CAAC;IAIpB,CAAC;CAAA;AAPD,gCAOC;AACY,QAAA,UAAU,GAAG,IAAI,UAAU,EAAE,CAAC"}
+{"version":3,"file":"globalVars.js","sourceRoot":"","sources":["../../src/core/globalVars.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAQrB,QAAA,IAAI,GAAG,KAAK,CAAC;AAC1B,SAAgB,QAAQ,CAAC,KAAY;IACnC,aAAK,GAAG,KAAK,CAAC;IACd,cAAM,GAAG,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,WAAW,CAAC;AAC9B,CAAC;AAHD,4BAGC;AACD,SAAgB,SAAS,CAAC,MAAe;IACvC,cAAM,GAAG,MAAM,CAAC;AAClB,CAAC;AAFD,8BAEC;AACD,SAAgB,eAAe,CAAC,KAAY;IAC1C,oBAAY,GAAG,KAAK,CAAC;AACvB,CAAC;AAFD,0CAEC;AACD,MAAa,UAAU;IAAvB;QACE,SAAI,GAAa,KAAK,CAAC;QACvB,eAAU,GAAG,EAAE,CAAC;QAChB,iBAAY,GAAG,EAAE,CAAC;IAIpB,CAAC;CAAA;AAPD,gCAOC;AACY,QAAA,UAAU,GAAG,IAAI,UAAU,EAAE,CAAC"}

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

@@ -22,6 +22,7 @@ export declare const TelemetryPropertyKey: {
     button: string;
     mode: string;
     upgradeVersion: string;
+    projectId: string;
     reason: string;
 };
 export declare const TelemetryPropertyValue: {
@@ -40,6 +41,7 @@ export declare const errorNames: {
     manifestTemplateInvalid: string;
     aadManifestTemplateNotExist: string;
 };
+export declare const upgradeButton: string;
 export declare const moreInfoButton: string;
 export declare const ProjectMigratorMWV3: Middleware;
 export declare function wrapRunMigration(context: MigrationContext, exec: (context: MigrationContext) => void): Promise<void>;
@@ -57,7 +59,7 @@ export declare function popupMessageModal(versionForMigration: VersionForMigrati
 export declare function popupMessageNonmodal(versionForMigration: VersionForMigration): Promise<string | undefined>;
 export declare function popupMessage(versionForMigration: VersionForMigration, isModal: boolean): Promise<string | undefined>;
 export declare function generateLocalConfig(context: MigrationContext): Promise<void>;
-export declare function ensureTrackingIdInGlobal(context: CoreHookContext): Promise<void>;
+export declare function setTelemetryProjectId(context: CoreHookContext): Promise<void>;
 export declare function configsMigration(context: MigrationContext): Promise<void>;
 export declare function statesMigration(context: MigrationContext): Promise<void>;
 export declare function userdataMigration(context: MigrationContext): Promise<void>;

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

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.setTelemetryProjectId = 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.upgradeButton = exports.errorNames = exports.learnMoreLink = exports.TelemetryPropertyValue = exports.TelemetryPropertyKey = exports.Parameters = exports.Constants = 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");
@@ -55,6 +54,7 @@ exports.TelemetryPropertyKey = {
     button: "button",
     mode: "mode",
     upgradeVersion: "upgrade-version",
+    projectId: "project-id",
     reason: "reason",
 };
 exports.TelemetryPropertyValue = {
@@ -74,8 +74,12 @@ exports.errorNames = {
     manifestTemplateInvalid: "ManifestTemplateInvalid",
     aadManifestTemplateNotExist: "AadManifestTemplateNotExist",
 };
+exports.upgradeButton = localizeUtils_1.getLocalizedString("core.option.upgrade");
 exports.moreInfoButton = localizeUtils_1.getLocalizedString("core.option.moreInfo");
-const migrationMessageButtons = [projectMigrator_1.upgradeButton, exports.moreInfoButton];
+const migrationMessageButtons = [exports.upgradeButton, exports.moreInfoButton];
+const telemetryProperties = {
+    [exports.TelemetryPropertyKey.upgradeVersion]: exports.TelemetryPropertyValue.upgradeVersion,
+};
 const subMigrations = [
     preMigration,
     manifestsMigration,
@@ -91,7 +95,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 +107,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) {
@@ -140,12 +139,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 +161,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;
     }
@@ -367,9 +364,8 @@ async function showNotification(ctx, versionForMigration) {
     }
     const skipUserConfirm = v3MigrationUtils_1.getParameterFromCxt(ctx, exports.Parameters.skipUserConfirm);
     if (skipUserConfirm) {
-        telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectMigratorNotification, {
+        sendTelemetryEventForUpgrade(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,
         });
         return true;
@@ -378,57 +374,48 @@ 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, {
+            sendTelemetryEventForUpgrade(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,
             });
         }
     } while (answer === exports.moreInfoButton);
     if (!answer || !migrationMessageButtons.includes(answer)) {
-        telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectMigratorNotification, {
+        sendTelemetryEventForUpgrade(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,
         });
         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, {
+    sendTelemetryEventForUpgrade(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,
     });
     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, {
+        sendTelemetryEventForUpgrade(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,
         });
         return false;
     }
-    else if (answer === projectMigrator_1.upgradeButton) {
-        telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectMigratorNotification, {
+    else if (answer === exports.upgradeButton) {
+        sendTelemetryEventForUpgrade(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,
         });
         return true;
@@ -437,22 +424,18 @@ async function showNonmodalNotification(ctx, versionForMigration) {
 }
 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, {
+        sendTelemetryEventForUpgrade(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,
         });
         return true;
     }
     else {
-        telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectMigratorNotification, {
+        sendTelemetryEventForUpgrade(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,
         });
         return false;
@@ -479,12 +462,17 @@ async function generateLocalConfig(context) {
     }
 }
 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[exports.TelemetryPropertyKey.projectId] = projectId;
+    }
+    catch (error) {
+        // do not set trackingId if error happens
+    }
 }
-exports.ensureTrackingIdInGlobal = ensureTrackingIdInGlobal;
+exports.setTelemetryProjectId = setTelemetryProjectId;
 async function configsMigration(context) {
     // general
     if (await context.fsPathExists(path.join(".fx", "configs"))) {
@@ -674,16 +662,14 @@ async function checkActiveResourcePlugins(projectPath) {
             return true;
         }
         else {
-            telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectMigratorPrecheckFailed, {
-                [exports.TelemetryPropertyKey.upgradeVersion]: exports.TelemetryPropertyValue.upgradeVersion,
+            sendTelemetryEventForUpgrade(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectMigratorPrecheckFailed, {
                 [exports.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,
+        sendTelemetryEventForUpgrade(telemetry_1.Component.core, telemetry_1.TelemetryEvent.ProjectMigratorPrecheckFailed, {
             [exports.TelemetryPropertyKey.reason]: error.message,
         });
         return false;
@@ -694,7 +680,7 @@ async function updateGitignore(context) {
     const gitignoreFile = ".gitignore";
     const ignoreFileExist = await context.backup(gitignoreFile);
     if (!ignoreFileExist) {
-        context.fsCreateFile(gitignoreFile);
+        await context.fsCreateFile(gitignoreFile);
     }
     let ignoreFileContent = await fs.readFile(path.join(context.projectPath, gitignoreFile), "utf8");
     ignoreFileContent += os_1.EOL + `${versionMetadata_1.MetadataV3.defaultEnvironmentFolder}/${v3MigrationUtils_1.buildEnvUserFileName("*")}`;
@@ -704,4 +690,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