@microsoft/teamsfx-core 1.16.4 → 1.17.0-rc.0

package/build/plugins/solution/fx-solution/v2/utils.js

@@ -110,11 +110,13 @@ function parseUserName(appStudioToken) {
     return teamsfx_api_1.ok(userName);
 }
 exports.parseUserName = parseUserName;
-async function checkWhetherLocalDebugM365TenantMatches(envInfo, telemetryReporter, isCSharpProject, localDebugTenantId, m365TokenProvider, projectPath, isLegacyEnv) {
+async function checkWhetherLocalDebugM365TenantMatches(envInfo, ctx, isCSharpProject, localDebugTenantId, m365TokenProvider, inputs) {
+    var _a, _b;
     if (localDebugTenantId) {
-        const appStudioTokenJsonRes = await (m365TokenProvider === null || m365TokenProvider === void 0 ? void 0 : m365TokenProvider.getJsonObject({
+        const projectPath = inputs.projectPath;
+        const appStudioTokenJsonRes = await m365TokenProvider.getJsonObject({
             scopes: tools_1.AppStudioScopes,
-        }));
+        });
         const appStudioTokenJson = (appStudioTokenJsonRes === null || appStudioTokenJsonRes === void 0 ? void 0 : appStudioTokenJsonRes.isOk())
             ? appStudioTokenJsonRes.value
             : undefined;
@@ -133,27 +135,19 @@ async function checkWhetherLocalDebugM365TenantMatches(envInfo, telemetryReporte
                 return teamsfx_api_1.err(new teamsfx_api_1.UserError("Solution", constants_1.SolutionError.CannotLocalDebugInDifferentTenant, errorMessage));
             }
             else if (envInfo) {
-                telemetryReporter === null || telemetryReporter === void 0 ? void 0 : telemetryReporter.sendTelemetryEvent(telemetry_1.TelemetryEvent.CheckLocalDebugTenant, {
+                (_a = ctx.telemetryReporter) === null || _a === void 0 ? void 0 : _a.sendTelemetryEvent(telemetry_1.TelemetryEvent.CheckLocalDebugTenant, {
                     [telemetry_1.TelemetryProperty.HasSwitchedM365Tenant]: "true",
                     [constants_1.SolutionTelemetryProperty.M365TenantId]: maybeM365TenantId.value,
                     [constants_1.SolutionTelemetryProperty.PreviousM365TenantId]: localDebugTenantId,
                 });
-                if (!isLegacyEnv) {
-                    const keys = Object.keys(envInfo.state);
-                    for (const key of keys) {
-                        if (key !== "solution") {
-                            delete envInfo.state[key];
-                        }
-                    }
-                }
-                else {
-                    const keys = envInfo.state.keys();
-                    for (const key of keys) {
-                        envInfo.state.delete(key);
+                const keys = Object.keys(envInfo.state);
+                for (const key of keys) {
+                    if (key !== "solution") {
+                        delete envInfo.state[key];
                     }
                 }
                 if (projectPath !== undefined) {
-                    const backupFilesRes = await backupFiles_1.backupFiles(envInfo.envName, projectPath, isCSharpProject);
+                    const backupFilesRes = await backupFiles_1.backupFiles(envInfo.envName, projectPath, isCSharpProject, (inputs === null || inputs === void 0 ? void 0 : inputs.platform) === teamsfx_api_1.Platform.VS, ctx);
                     if (backupFilesRes.isErr()) {
                         return teamsfx_api_1.err(backupFilesRes.error);
                     }
@@ -164,7 +158,7 @@ async function checkWhetherLocalDebugM365TenantMatches(envInfo, telemetryReporte
             }
         }
         else {
-            telemetryReporter === null || telemetryReporter === void 0 ? void 0 : telemetryReporter.sendTelemetryEvent(telemetry_1.TelemetryEvent.CheckLocalDebugTenant, {
+            (_b = ctx.telemetryReporter) === null || _b === void 0 ? void 0 : _b.sendTelemetryEvent(telemetry_1.TelemetryEvent.CheckLocalDebugTenant, {
                 [telemetry_1.TelemetryProperty.HasSwitchedM365Tenant]: "false",
                 [constants_1.SolutionTelemetryProperty.M365TenantId]: maybeM365TenantId.value,
                 [constants_1.SolutionTelemetryProperty.PreviousM365TenantId]: localDebugTenantId,

package/build/plugins/solution/fx-solution/v2/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/utils.ts"],"names":[],"mappings":";;;;AAAA,wDAoBgC;AAChC,gEAA0B;AAE1B,oDAAiF;AACjF,4CAMsB;AACtB,0CAmBqB;AACrB,wEAAoG;AACpG,wCAAiD;AAEjD,oEAAwF;AACxF,sDAAmD;AACnD,4DAAiF;AACjF,gFAAyF;AAEzF,SAAgB,kBAAkB,CAAC,eAAgC;IACjE,OAAO,uDAA6B,CAAC,eAAe,CAAC,CAAC;AACxD,CAAC;AAFD,gDAEC;AAED,SAAgB,wBAAwB,CAAC,GAAe;IACtD,OAAO,GAAG,CAAC,cAAc,CAAC,gBAAqD,CAAC;AAClF,CAAC;AAFD,4DAEC;AAED,SAAgB,cAAc,CAAC,aAAgD;IAC7E,OAAO,aAAa,KAAK,SAAS,IAAI,8BAAmB,CAAC,EAAE,KAAK,aAAa,CAAC,QAAQ,CAAC;AAC1F,CAAC;AAFD,wCAEC;AAED,SAAgB,YAAY,CAAC,aAAgD;;IAC3E,OAAO,CACL,aAAa,KAAK,SAAS;QAC3B,CAAC,CAAA,MAAA,aAAa,CAAC,YAAY,0CAAE,QAAQ,CAAC,wBAAa,CAAC,EAAE,CAAC;aACrD,MAAA,aAAa,CAAC,YAAY,0CAAE,QAAQ,CAAC,+BAAoB,CAAC,EAAE,CAAC,CAAA,CAAC,CACjE,CAAC;AACJ,CAAC;AAND,oCAMC;AASD,SAAgB,yBAAyB,CAAC,KAAc;IACtD,MAAM,mBAAmB,GACvB,uGAAuG,CAAC;IAC1G,MAAM,mBAAmB,GAAG,kCAAkB,CAAC,6BAA6B,CAAC,CAAC;IAC9E,MAAM,wBAAwB,GAAG,kCAAkB,CAAC,uCAAuC,CAAC,CAAC;IAC7F,MAAM,kBAAkB,GAAG,GAAG,mBAAmB,IAAI,wBAAwB,KAAK,mBAAmB,GAAG,CAAC;IAEzG,OAAO;QACL,gBAAgB,EAAE,mBAAmB;QACrC,cAAc,EAAE,KAAK,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,EAAE;QAC/C,aAAa,EAAE,mBAAmB;QAClC,mBAAmB,EAAE,wBAAwB;KACpB,CAAC;AAC9B,CAAC;AAbD,8DAaC;AAED,SAAgB,cAAc,CAAI,OAAsC;IACtE,MAAM,GAAG,GAA6B,EAAE,CAAC;IACzC,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;QAC5B,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC;KAClC;IAED,OAAO,GAAG,CAAC;AACb,CAAC;AAPD,wCAOC;AAED,SAAgB,qBAAqB,CAAC,MAAY;IAChD,OAAO;QACL,kBAAkB,EAAE,MAAM,CAAC,oBAAoB,CAAC;QAChD,iBAAiB,EAAE,MAAM,CAAC,mBAAmB,CAAC;QAC9C,QAAQ,EAAE,MAAM,CAAC,UAAU,CAAC;QAC5B,gBAAgB,EAAE,MAAM,CAAC,kBAAkB,CAAC;QAC5C,gBAAgB,EAAE,SAAS;QAC3B,cAAc,EAAE,MAAM,CAAC,gBAAgB,CAAC;QACxC,kBAAkB,EAAE,MAAM,CAAC,wCAA4B,CAAC;QACxD,QAAQ,EAAE,MAAM,CAAC,UAAU,CAAC;KAC7B,CAAC;AACJ,CAAC;AAXD,sDAWC;AAED,SAAgB,6BAA6B,CAAC,eAAgC;IAC5E,MAAM,oBAAoB,GAAG,iDAAuB,EAAE;SACnD,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC,QAAQ,CAAC,eAAe,CAAC,KAAK,IAAI,CAAC;SACjE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IACtB,eAAe,CAAC,gBAAiB,CAAC,qBAAqB,GAAG,oBAAoB,CAAC;AACjF,CAAC;AALD,sEAKC;AAEM,KAAK,UAAU,uBAAuB,CAC3C,gBAAuC,EACvC,yBAAoD;IAEpD,IAAI,CAAC,cAAc,CAAC,gBAAgB,CAAC,EAAE;QACrC,OAAO,iBAAG,CACR,IAAI,uBAAS,CACX,0BAAc,EACd,yBAAa,CAAC,6BAA6B,EAC3C,2CAA2C,CAC5C,CACF,CAAC;KACH;IAED,IAAI,CAAC,4BAAoB,EAAE,EAAE;QAC3B,MAAM,MAAM,GAAG,MAAM,yBAAyB,CAAC,sBAAsB,EAAE,CAAC;QACxE,IAAI,MAAM,IAAI,MAAM,CAAC,KAAK,EAAE,EAAE;YAC5B,OAAO,MAAM,CAAC,GAAG,CAAC,iBAAG,CAAC,CAAC;SACxB;KACF;IAED,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;AAClB,CAAC;AAtBD,0DAsBC;AAED,SAAgB,qBAAqB,CACnC,cAAwC;IAExC,IAAI,cAAc,KAAK,SAAS,EAAE;QAChC,OAAO,iBAAG,CACR,IAAI,yBAAW,CACb,0BAAc,EACd,yBAAa,CAAC,gBAAgB,EAC9B,+BAA+B,CAChC,CACF,CAAC;KACH;IAED,MAAM,gBAAgB,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;IAC/C,IACE,gBAAgB,KAAK,SAAS;QAC9B,CAAC,CAAC,OAAO,gBAAgB,KAAK,QAAQ,CAAC;QACvC,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAC7B;QACA,OAAO,iBAAG,CACR,IAAI,yBAAW,CACb,0BAAc,EACd,yBAAa,CAAC,kBAAkB,EAChC,gCAAgB,CAAC,0BAA0B,CAAC,EAC5C,kCAAkB,CAAC,0BAA0B,CAAC,CAC/C,CACF,CAAC;KACH;IACD,OAAO,gBAAE,CAAC,gBAAgB,CAAC,CAAC;AAC9B,CAAC;AA7BD,sDA6BC;AAED,SAAgB,aAAa,CAAC,cAAwC;IACpE,IAAI,cAAc,KAAK,SAAS,EAAE;QAChC,OAAO,iBAAG,CACR,IAAI,yBAAW,CAAC,UAAU,EAAE,yBAAa,CAAC,gBAAgB,EAAE,+BAA+B,CAAC,CAC7F,CAAC;KACH;IAED,MAAM,QAAQ,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;IACvC,IAAI,QAAQ,KAAK,SAAS,IAAI,CAAC,CAAC,OAAO,QAAQ,KAAK,QAAQ,CAAC,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;QACtF,OAAO,iBAAG,CACR,IAAI,yBAAW,CACb,UAAU,EACV,yBAAa,CAAC,UAAU,EACxB,8CAA8C,CAC/C,CACF,CAAC;KACH;IACD,OAAO,gBAAE,CAAC,QAAQ,CAAC,CAAC;AACtB,CAAC;AAlBD,sCAkBC;AAEM,KAAK,UAAU,uCAAuC,CAC3D,OAA2C,EAC3C,iBAAgD,EAChD,eAAwB,EACxB,kBAA2B,EAC3B,iBAAqC,EACrC,WAAoB,EACpB,WAAqB;IAErB,IAAI,kBAAkB,EAAE;QACtB,MAAM,qBAAqB,GAAG,MAAM,CAAA,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,aAAa,CAAC;YACnE,MAAM,EAAE,uBAAe;SACxB,CAAC,CAAA,CAAC;QACH,MAAM,kBAAkB,GAAG,CAAA,qBAAqB,aAArB,qBAAqB,uBAArB,qBAAqB,CAAE,IAAI,EAAE;YACtD,CAAC,CAAC,qBAAqB,CAAC,KAAK;YAC7B,CAAC,CAAC,SAAS,CAAC;QACd,MAAM,iBAAiB,GAAG,qBAAqB,CAAC,kBAAkB,CAAC,CAAC;QACpE,IAAI,iBAAiB,CAAC,KAAK,EAAE,EAAE;YAC7B,OAAO,iBAAiB,CAAC;SAC1B;QAED,MAAM,oBAAoB,GAAG,aAAa,CAAC,kBAAkB,CAAC,CAAC;QAC/D,IAAI,oBAAoB,CAAC,KAAK,EAAE,EAAE;YAChC,OAAO,oBAAoB,CAAC;SAC7B;QAED,IAAI,iBAAiB,CAAC,KAAK,KAAK,kBAAkB,EAAE;YAClD,IACE,WAAW,KAAK,SAAS;gBACzB,CAAC,MAAM,kBAAE,CAAC,UAAU,CAAC,GAAG,WAAW,oCAAoC,CAAC,CAAC,EACzE;gBACA,MAAM,YAAY,GAAG,kCAAkB,CACrC,2DAA2D,EAC3D,kBAAkB,EAClB,oBAAoB,CAAC,KAAK,EAC1B,mCAAmC,CACpC,CAAC;gBACF,OAAO,iBAAG,CACR,IAAI,uBAAS,CAAC,UAAU,EAAE,yBAAa,CAAC,iCAAiC,EAAE,YAAY,CAAC,CACzF,CAAC;aACH;iBAAM,IAAI,OAAO,EAAE;gBAClB,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,kBAAkB,CAAC,0BAAc,CAAC,qBAAqB,EAAE;oBAC1E,CAAC,6BAAiB,CAAC,qBAAqB,CAAC,EAAE,MAAM;oBACjD,CAAC,qCAAyB,CAAC,YAAY,CAAC,EAAE,iBAAiB,CAAC,KAAK;oBACjE,CAAC,qCAAyB,CAAC,oBAAoB,CAAC,EAAE,kBAAkB;iBACrE,CAAC,CAAC;gBACH,IAAI,CAAC,WAAW,EAAE;oBAChB,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;oBACxC,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;wBACtB,IAAI,GAAG,KAAK,UAAU,EAAE;4BACtB,OAAQ,OAAwB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;yBAC7C;qBACF;iBACF;qBAAM;oBACL,MAAM,IAAI,GAAI,OAAmB,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;oBAC/C,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;wBACrB,OAAmB,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;qBACxC;iBACF;gBAED,IAAI,WAAW,KAAK,SAAS,EAAE;oBAC7B,MAAM,cAAc,GAAG,MAAM,yBAAW,CAAC,OAAO,CAAC,OAAO,EAAE,WAAY,EAAE,eAAe,CAAC,CAAC;oBACzF,IAAI,cAAc,CAAC,KAAK,EAAE,EAAE;wBAC1B,OAAO,iBAAG,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;qBAClC;oBAED,IAAI,eAAe,EAAE;wBACnB,MAAM,6CAA2B,CAAC,WAAW,CAAC,CAAC;qBAChD;iBACF;aACF;SACF;aAAM;YACL,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,kBAAkB,CAAC,0BAAc,CAAC,qBAAqB,EAAE;gBAC1E,CAAC,6BAAiB,CAAC,qBAAqB,CAAC,EAAE,OAAO;gBAClD,CAAC,qCAAyB,CAAC,YAAY,CAAC,EAAE,iBAAiB,CAAC,KAAK;gBACjE,CAAC,qCAAyB,CAAC,oBAAoB,CAAC,EAAE,kBAAkB;aACrE,CAAC,CAAC;SACJ;KACF;IAED,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;AAClB,CAAC;AAjFD,0FAiFC;AAED,iDAAiD;AACjD,SAAgB,4BAA4B,CAC1C,aAA+B,EAC/B,cAAwC,EACxC,OAAsB;IAEtB,OAAO,qBAAqB,CAAC,cAAqD,CAAC,CAAC,OAAO,CACzF,CAAC,gBAAgB,EAAE,EAAE;QACnB,OAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;QAC5D,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;IAClB,CAAC,CACF,CAAC;AACJ,CAAC;AAXD,oEAWC;AAED,SAAgB,sBAAsB,CACpC,eAAgC,EAChC,OAAe;IAEf,MAAM,gBAAgB,GAAI,eAAe,CAAC,gBAA0C,IAAI,EAAE,CAAC;IAC3F,IAAI,YAAY,GAAI,OAAO,CAAC,qCAA0B,CAAC,YAAY,CAAc,IAAI,EAAE,CAAC;IACxF,IAAI,4BAAoB,EAAE,EAAE;QAC1B,IAAI,YAAY,CAAC,QAAQ,CAAC,wBAAa,CAAC,EAAE,CAAC,EAAE;YAC3C,YAAY,CAAC,IAAI,CAAC,qBAAU,CAAC,EAAE,CAAC,CAAC;SAClC;aAAM,IAAI,YAAY,CAAC,QAAQ,CAAC,wBAAa,CAAC,EAAE,CAAC,EAAE;YAClD,MAAM,KAAK,GAAG,YAAY,CAAC,OAAO,CAAC,wBAAa,CAAC,EAAE,CAAC,CAAC;YACrD,YAAY,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;YAC9B,YAAY,CAAC,IAAI,CAAC,wBAAa,CAAC,EAAE,CAAC,CAAC;SACrC;KACF;IACD,IAAI,CAAC,YAAY,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE;QAC9C,OAAO,iBAAG,CACR,IAAI,yBAAW,CAAC,0BAAc,EAAE,yBAAa,CAAC,aAAa,EAAE,uBAAuB,CAAC,CACtF,CAAC;KACH;IACD,IAAI,QAAQ,GAAG,OAAO,CAAC,qCAA0B,CAAC,QAAQ,CAAW,CAAC;IACtE,IACE,YAAY,CAAC,QAAQ,CAAC,iCAAsB,CAAC,EAAE,CAAC;QAChD,YAAY,CAAC,QAAQ,CAAC,uCAA4B,CAAC,EAAE,CAAC;QACtD,YAAY,CAAC,QAAQ,CAAC,6BAAkB,CAAC,EAAE,CAAC,EAC5C;QACA,8JAA8J;QAC9J,MAAM,SAAS,GAAkB,EAAE,CAAC;QACpC,MAAM,iBAAiB,GAAG,YAAY,CAAC,OAAO,CAAC,iCAAsB,CAAC,EAAE,CAAC,CAAC;QAC1E,IAAI,iBAAiB,KAAK,CAAC,CAAC,EAAE;YAC5B,YAAY,CAAC,iBAAiB,CAAC,GAAG,wBAAa,CAAC,EAAE,CAAC;YACnD,SAAS,CAAC,IAAI,CAAC,sBAAW,CAAC,eAAe,CAAC,CAAC;SAC7C;QAED,MAAM,uBAAuB,GAAG,YAAY,CAAC,OAAO,CAAC,uCAA4B,CAAC,EAAE,CAAC,CAAC;QACtF,IAAI,uBAAuB,KAAK,CAAC,CAAC,EAAE;YAClC,YAAY,CAAC,uBAAuB,CAAC,GAAG,wBAAa,CAAC,EAAE,CAAC;YACzD,SAAS,CAAC,IAAI,CAAC,sBAAW,CAAC,qBAAqB,CAAC,CAAC;SACnD;QAED,MAAM,aAAa,GAAG,YAAY,CAAC,OAAO,CAAC,6BAAkB,CAAC,EAAE,CAAC,CAAC;QAClE,IAAI,aAAa,KAAK,CAAC,CAAC,EAAE;YACxB,YAAY,CAAC,aAAa,CAAC,GAAG,wBAAa,CAAC,EAAE,CAAC;YAC/C,SAAS,CAAC,IAAI,CAAC,sBAAW,CAAC,WAAW,CAAC,CAAC;SACzC;QAED,OAAO,CAAC,qCAA0B,CAAC,SAAS,CAAC,GAAG,SAAS,CAAC;QAC1D,QAAQ;QACR,YAAY,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC;QAE1C,QAAQ,GAAG,8BAAmB,CAAC,EAAE,CAAC;KACnC;SAAM,IACL,YAAY,CAAC,QAAQ,CAAC,wBAAa,CAAC,EAAE,CAAC;QACvC,YAAY,CAAC,QAAQ,CAAC,+BAAoB,CAAC,EAAE,CAAC;QAC9C,YAAY,CAAC,QAAQ,CAAC,wBAAa,CAAC,EAAE,CAAC,EACvC;QACA,QAAQ,GAAG,8BAAmB,CAAC,EAAE,CAAC;KACnC;SAAM,IAAI,YAAY,CAAC,QAAQ,CAAC,sBAAW,CAAC,EAAE,CAAC,EAAE;QAChD,mHAAmH;QACnH,YAAY,GAAG,CAAC,wBAAa,CAAC,EAAE,CAAC,CAAC;QAClC,QAAQ,GAAG,6BAAkB,CAAC,EAAE,CAAC;KAClC;SAAM,IAAI,YAAY,CAAC,QAAQ,CAAC,sCAA2B,CAAC,EAAE,CAAC,EAAE;QAChE,YAAY,GAAG,CAAC,wBAAa,CAAC,EAAE,CAAC,CAAC;QAClC,IAAI,4BAAoB,EAAE,EAAE;YAC1B,YAAY,CAAC,IAAI,CAAC,qBAAU,CAAC,EAAE,CAAC,CAAC;SAClC;QACD,QAAQ,GAAG,8BAAmB,CAAC,EAAE,CAAC;KACnC;SAAM,IAAI,YAAY,CAAC,QAAQ,CAAC,kCAAuB,CAAC,EAAE,CAAC,EAAE;QAC5D,YAAY,GAAG,CAAC,+BAAoB,CAAC,EAAE,CAAC,CAAC;QACzC,MAAM,SAAS,GAAG,CAAC,kCAAuB,CAAC,EAAE,CAAC,CAAC;QAC/C,OAAO,CAAC,qCAA0B,CAAC,SAAS,CAAC,GAAG,SAAS,CAAC;QAC1D,QAAQ,GAAG,8BAAmB,CAAC,EAAE,CAAC;KACnC;IACD,IAAI,CAAC,QAAQ,EAAE;QACb,OAAO,iBAAG,CACR,IAAI,yBAAW,CAAC,0BAAc,EAAE,yBAAa,CAAC,aAAa,EAAE,uBAAuB,CAAC,CACtF,CAAC;KACH;IACD,gBAAgB,CAAC,QAAQ,GAAG,QAAQ,CAAC;IACrC,IAAI,cAAoC,CAAC;IACzC,IAAI,QAAQ,KAAK,8BAAmB,CAAC,EAAE,IAAI,YAAY,CAAC,QAAQ,CAAC,wBAAa,CAAC,EAAE,CAAC,EAAE;QAClF,cAAc,GAAG,OAAO,CAAC,qCAA0B,CAAC,cAAc,CAAa,CAAC;QAChF,IAAI,cAAc,EAAE;YAClB,IACE,CAAC,cAAc,CAAC,QAAQ,CAAC,2BAAgB,CAAC,EAAE,CAAC;gBAC3C,cAAc,CAAC,QAAQ,CAAC,4BAAiB,CAAC,EAAE,CAAC,CAAC;gBAChD,CAAC,cAAc,CAAC,QAAQ,CAAC,gCAAqB,CAAC,EAAE,CAAC,EAClD;gBACA,cAAc,CAAC,IAAI,CAAC,gCAAqB,CAAC,EAAE,CAAC,CAAC;aAC/C;SACF;;YAAM,cAAc,GAAG,EAAE,CAAC;KAC5B;IACD,gBAAgB,CAAC,cAAc,GAAG,cAAc,IAAI,EAAE,CAAC;IACvD,gBAAgB,CAAC,YAAY,GAAG,YAAY,IAAI,EAAE,CAAC;IAEnD,gCAAgC;IAChC,6BAA6B,CAAC,eAAe,CAAC,CAAC;IAC/C,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;AAClB,CAAC;AAlGD,wDAkGC;AAED,SAAgB,6BAA6B,CAAC,MAAY;IACxD,OAAO,MAAM,CAAC,yBAAa,CAAC,IAAI,MAAM,CAAC,yBAAa,CAAC,CAAC,wCAA4B,CAAC,CAAC;AACtF,CAAC;AAFD,sEAEC;AAED,SAAgB,wBAAwB,CACtC,GAAoB,EACpB,eAAyB;IAEzB,OAAO,eAAe,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,uBAAgB,CAAC,GAAG,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AACvF,CAAC;AALD,4DAKC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/utils.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,49 +1,35 @@
 {
   "name": "@microsoft/teamsfx-core",
-  "version": "1.16.4",
+  "version": "1.17.0-rc.0",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "license": "MIT",
   "scripts": {
     "lint:staged": "lint-staged",
     "lint": "eslint \"src/**/*.ts\" \"tests/**/*.ts\"",
+    "test:core": "nyc mocha \"tests/core/**/*.test.ts\"",
+    "test:common": "nyc mocha \"tests/common/**/*.test.ts\"",
+    "test:solution": "nyc mocha \"tests/plugins/solution/*.test.ts\"",
     "test:bot": "nyc mocha \"tests/plugins/resource/bot/**/*.test.ts\"",
-    "test:botv2": "nyc mocha \"tests/plugins/resource/bot/unit/v2/**/*.test.ts\"",
     "test:cicd": "nyc mocha \"tests/component/feature/cicd/**/*.test.ts\"",
     "test:dotnet": "nyc mocha \"tests/plugins/resource/dotnet/**/*.test.ts\"",
     "test:function": "nyc mocha \"tests/plugins/resource/function/**/*.test.ts\"",
     "test:localdebug": "nyc mocha \"tests/plugins/resource/localdebug/**/*.test.ts\"",
     "test:frontend": "nyc mocha \"tests/plugins/resource/frontend/**/*.test.ts\"",
-    "test:aad": "nyc mocha \"tests/plugins/resource/aad/**/*.test.ts\"",
-    "test:aadv3": "nyc mocha \"tests/plugins/resource/aad/v3/*.test.ts\"",
+    "test:aad": "nyc mocha \"tests/component/resource/aadApp/**/*.test.ts\"",
     "test:simpleauth": "nyc mocha \"tests/plugins/resource/simpleauth/**/*.test.ts\"",
-    "test:sql": "nyc mocha \"tests/plugins/resource/sql/**/*.test.ts\"",
+    "test:azuresql": "nyc mocha \"tests/component/resource/azuresql/**/*.test.ts\"",
     "test:identity": "nyc mocha \"tests/plugins/resource/identity/**/*.test.ts\"",
-    "test:appstudio": "nyc mocha \"tests/plugins/resource/appstudio/**/*.test.ts\"",
+    "test:appmanifest": "nyc mocha \"tests/component/resource/appmanifest/**/*.test.ts\"",
     "test:spfx": "nyc mocha \"tests/plugins/resource/spfx/**/*.test.ts\"",
     "test:apim": "nyc mocha \"tests/plugins/resource/apim/**/*.test.ts\"",
     "test:keyvault": "nyc mocha \"tests/plugins/resource/keyvault/**/*.test.ts\"",
     "test:apiconnector": "nyc mocha \"tests/component/feature/apiconnector/**/*.test.ts\"",
     "test:unit": "nyc mocha \"tests/**/*.test.ts\" ",
-    "test:common": "nyc mocha \"tests/common/**/*.test.ts\"",
-    "test:solution": "nyc mocha \"tests/plugins/solution/*.test.ts\"",
-    "test:solution:deploy": "nyc mocha \"tests/plugins/solution/solution.deploy.test.ts\"",
-    "test:solution:debug": "nyc mocha \"tests/plugins/solution/debug/**/*.test.ts\"",
-    "test:solution:q": "nyc mocha \"tests/plugins/solution/solution.getQuestions.test.ts\"",
-    "test:core": "nyc mocha \"tests/core/**/*.test.ts\"",
-    "test:core:sample": "nyc mocha \"tests/core/sample.test.ts\"",
-    "test:core:coll": "nyc mocha \"tests/core/collaborator.test.ts\"",
-    "test:coll": "nyc mocha \"tests/core/collaborator.test.ts\"",
-    "test:corev3": "nyc mocha \"tests/core/corev3.test.ts\"",
-    "test:core-mw": "nyc mocha \"tests/core/middleware/*.test.ts\"",
-    "test:core-tools": "nyc mocha \"tests/core/tools.test.ts\"",
-    "test:apiv2": "nyc mocha \"tests/plugins/resource/apiv2/*.test.ts\"",
     "test:env-checker": "npx mocha \"tests/common/deps-checker/**/*.it.ts\"",
-    "test:core:miniapp": "nyc mocha \"tests/core/core.miniapp.test.ts\"",
-    "test:core:env": "nyc mocha \"tests/core/environment.test.ts\"",
-    "test:core:other": "nyc mocha \"tests/core/other.test.ts\"",
     "test:component": "nyc mocha \"tests/component/**/*.test.ts\"",
     "test:hosting": "nyc mocha \"tests/common/hosting/**/*.test.ts\"",
+    "test:aadDriver": "nyc mocha \"tests/component/drivers/aad/*.test.ts\"",
     "clean": "rm -rf build",
     "build": "rimraf build && npx tsc -p ./",
     "lint:fix": "eslint --fix \"src/**/*.ts\" \"tests/**/*.ts\"",
@@ -58,19 +44,19 @@
   },
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.2",
-    "@azure/arm-apimanagement": "^6.0.0",
-    "@azure/arm-appservice": "^7.0.0",
+    "@azure/arm-apimanagement": "^8.0.0",
+    "@azure/arm-appservice": "^13.0.0",
     "@azure/arm-botservice": "^2.0.0",
-    "@azure/arm-resources": "^4.0.0",
-    "@azure/arm-sql": "^7.0.2",
-    "@azure/arm-storage": "^15.2.0",
-    "@azure/arm-subscriptions": "^3.0.0",
-    "@azure/ms-rest-nodeauth": "^3.1.1",
+    "@azure/arm-resources": "^5.0.1",
+    "@azure/arm-sql": "^9.0.0",
+    "@azure/arm-storage": "^17.2.1",
+    "@azure/arm-subscriptions": "^5.0.0",
+    "@azure/identity": "^1.3.0",
     "@azure/msal-node": "^1.0.0",
     "@azure/storage-blob": "^12.7.0",
     "@dbpiper/timer": "1.0.0-beta.2",
     "@feathersjs/hooks": "^0.6.5",
-    "@microsoft/teamsfx-api": "^0.20.6",
+    "@microsoft/teamsfx-api": "^0.20.7-rc.0",
     "@npmcli/arborist": "^4.2.0",
     "@types/jwt-decode": "3.1.0",
     "@types/proper-lockfile": "^4.1.1",
@@ -78,6 +64,8 @@
     "ajv": "^8.5.0",
     "ajv-draft-04": "^1.0.0",
     "axios": "^0.21.2",
+    "axios-retry": "^3.3.1",
+    "comment-json": "^4.2.3",
     "cryptr": "^6.0.2",
     "dateformat": "^4.5.1",
     "detect-port": "^1.3.0",
@@ -116,8 +104,6 @@
     "zip-a-folder": "0.0.12"
   },
   "devDependencies": {
-    "@azure/arm-appservice": "^7.0.0",
-    "@azure/arm-resources": "^4.0.0",
     "@azure/storage-blob": "^12.5.0",
     "@istanbuljs/nyc-config-typescript": "^1.0.1",
     "@types/adm-zip": "^0.4.33",
@@ -171,6 +157,7 @@
     "mocha-junit-reporter": "^2.0.2",
     "mock-fs": "^4.13.0",
     "mocked-env": "^1.3.5",
+    "nock": "^13.2.9",
     "nyc": "^15.1.0",
     "prettier": "^2.4.1",
     "proxyquire": "^2.1.3",
@@ -191,7 +178,7 @@
     "resource/**/*",
     "templates/**/*"
   ],
-  "gitHead": "d8ab917dd8bcaf459eda5c52231d6252402d943a",
+  "gitHead": "e74291d967f60910cb52278dfdd38d26d2414b57",
   "publishConfig": {
     "access": "public"
   },

package/resource/package.nls.json

@@ -39,10 +39,10 @@
   "core.addCapability.onlySupportAzure": "Add capability is only supported for project hosted in Azure",
   "core.addCapability.notSupportedForM365Project": "Add capability is not supported for Microsoft 365 project",
   "core.addCapability.exceedMaxLimit": "Your App reaches maximal limit for Tabs, Bot and Message Extension.",
-  "core.addCapability.addCapabilityNotice": "Capability %s has been successfully added to your project. F5 to local debug the application or trigger 'Teams: Provision in the cloud' to create resources in your Azure subscription for hosting.",
-  "core.addCapability.addCapabilitiesNotice": "Capabilities %s have been successfully added to your project. F5 to local debug the application or trigger 'Teams: Provision in the cloud' to create resources in your Azure subscription for hosting.",
-  "core.addCapability.addCapabilityNoticeForCli": "Capability %s has been successfully added to your project. Run 'teamsfx provision' to create resources in your Azure subscription for hosting.",
-  "core.addCapability.addCapabilitiesNoticeForCli": "Capabilities %s have been successfully added to your project. Run 'teamsfx provision' to create resources in your Azure subscription for hosting.",
+  "core.addCapability.addCapabilityNotice": "Capability %s has been successfully added to your project. F5 to debug the application or trigger 'Teams: Provision in the cloud' to create resources.",
+  "core.addCapability.addCapabilitiesNotice": "Capabilities %s have been successfully added to your project. F5 to debug the application or trigger 'Teams: Provision in the cloud' to create resources.",
+  "core.addCapability.addCapabilityNoticeForCli": "Capability %s has been successfully added to your project. Run 'teamsfx provision' to create resources.",
+  "core.addCapability.addCapabilitiesNoticeForCli": "Capabilities %s have been successfully added to your project. Run 'teamsfx provision' to create resources.",
   "core.addResource.onlySupportAzure": "Add resource is only supported for project hosted in Azure",
   "core.addResource.notSupportForVSProject": "Add resource is not supported for csharp project",
   "core.addResource.addResourceNotice": "Resource %s has been successfully configured for your project, trigger 'Teams: Provision in the cloud' will create the resource in your Azure subscription.",
@@ -57,8 +57,8 @@
   "core.generateArmTemplate.failNotice": "'%s' Failed to create ARM template for required Azure services.",
   "core.updateArmTemplate.failNotice": "'%s' Failed to update ARM template for required Azure services.",
   "core.updateArmTemplate.successNotice": "The Azure resource template is updated based on your resource and capability selection.",
-  "core.localDebug.tenantConfirmNotice": "You already run local debug for the Teams app in another tenant '%s'. You can sign out %s and sign in with the matched Mirosoft 365 account to re-use the previous local debug resource. If you really want to switch tenant for local debug, you can delete the local file(s) (%s) and re-run local debug.",
-  "core.localDebug.tenantConfirmNoticeWhenAllowSwitchAccount": "You already run local debug for the Teams app in another tenant '%s'. If you really want to switch tenant for local debug, you can delete the local file(s) (%s) and re-run local debug.",
+  "core.localDebug.tenantConfirmNotice": "You already run debug for the Teams app in another tenant '%s'. You can sign out %s and sign in with the matched Mirosoft 365 account to re-use the previous debug resource. If you really want to switch tenant for debug, you can delete the local file(s) (%s) and re-run debug.",
+  "core.localDebug.tenantConfirmNoticeWhenAllowSwitchAccount": "You already run debug for the Teams app in another tenant '%s'. If you really want to switch tenant for debug, you can delete the local file(s) (%s) and re-run debug.",
   "core.migrationToArmAndMultiEnv.Message": "Teams Toolkit will upgrade your project configuration files to support the latest features. The upgrade process will not change your custom code and create the backup files in case revert is needed.\nNotice this upgrade is a must-have to continue to use current version Teams Toolkit. If you are not ready to upgrade and want to continue to use the old version, please find Teams Toolkit in Extension and install the version <= 2.10.0",
   "core.migrationToArmAndMultiEnv.SuccessMessage": "Upgrade succeeded. Your project is upgraded to new configuration files.",
   "core.migrationToArmAndMultiEnv.ErrorMessage": "Upgrade Failed. Please check the error message in Output window to troubleshoot and fix. You can also click Learn More for the FAQ and how to upgrade manually.",
@@ -66,8 +66,8 @@
   "core.consolidateLocalRemote.Message": "Your project will be upgraded to work with the latest version of Teams Toolkit. The upgrade will only add config.local.json, manifest.template.json files and backup manifest.remote.template.json, manifest.local.template.json files without changing your custom code. If you want to skip auto-upgrade, please install older version of Teams Toolkit (<=3.7.0)",
   "core.consolidateLocalRemoteWithAadManifest.Message": "Your project will be upgraded to work with the latest version of Teams Toolkit. The upgrade will only add config.local.json, manifest.template.json, aad.template.json files, update projectSettings.json file and backup manifest.remote.template.json, manifest.local.template.json, projectSettings.json files without changing your custom code. If you want to skip auto-upgrade, please install older version of Teams Toolkit (<=3.7.0)",
   "core.consolidateLocalRemote.DifferentManifest": "Since Teams Toolkit will use manifest.remote.template.json as a single manifest template file after the upgrade, if you have customized the manifest.local.template.json, you will need to update the manifest.template.json to include your change.",
-  "core.consolidateLocalRemote.SuccessMessage": "Congratulations! You have successfully upgraded your Teams App project structure. We have added config.local.json for local debug and manifest.template.json for both Teams app running locally and remotely. And we have backed up localSettings.json, manifest.local.template.json and manifest.remote.template.json to .backup folder.",
-  "core.consolidateLocalRemoteWithAadManifest.SuccessMessage": "Congratulations! You have successfully upgraded your Teams App project structure. We have added config.local.json for local debug, manifest.template.json for both Teams app running locally and remotely and aad.template.json for AAD manifest template. And we have backed up localSettings.json, manifest.local.template.json, manifest.remote.template.json, projectSettings.json to .backup folder.",
+  "core.consolidateLocalRemote.SuccessMessage": "Congratulations! You have successfully upgraded your Teams App project structure. We have added config.local.json for debug and manifest.template.json for both Teams app running locally and remotely. And we have backed up localSettings.json, manifest.local.template.json and manifest.remote.template.json to .backup folder.",
+  "core.consolidateLocalRemoteWithAadManifest.SuccessMessage": "Congratulations! You have successfully upgraded your Teams App project structure. We have added config.local.json for debug, manifest.template.json for both Teams app running locally and remotely and aad.template.json for AAD manifest template. And we have backed up localSettings.json, manifest.local.template.json, manifest.remote.template.json, projectSettings.json to .backup folder.",
   "core.aadManifestMigration.outputMsg": "Congratulations! AAD manifest has been added, and please start to use this file to customize your AAD App registration. We have added aad.template.json, updated your projectSettings.json file and backed up projectSettings.json to .backup folder.",
   "core.aadManifestMigration.SuccessMessage": "Detect that your project is a previous version and auto update your project for new Teams Toolkit version. The following changes have been made:\n1. 'aad.template.json' is created under 'templates/appPackage'. For more information about AAD manifest, please refer %s\n2. '.fx/configs/projectSettings.json' is updated to include authentication related configuration. You can find a backup of old version in .backup folder.\nCongratulations! Your project now is updated and ready to run in latest version of Teams Toolkit.",
   "core.aadManifestMigration.ParsePermissionsFailedWarning": "Cannot parse permissions.json file when migration, and please follow this link to update permissions in aad.template.json file if necessary: https://aka.ms/teamsfx-aad-manifest#customize-requiredresourceaccess",
@@ -158,6 +158,7 @@
   "plugins.spfx.error.npmInstallFailed": "Failed to run 'npm install' due to %s",
   "plugins.spfx.error.invalidDependency": "Failed to validate package %s",
   "plugins.spfx.error.installDependency": "Failed to install package %s. Learn how to remediate in the [output](command:fx-extension.showOutputChannel).",
+  "plugins.spfx.error.noConfiguration": "There's no .yo-rc.json file in your SPFx project, please add the configuration file and try again.",
   "plugins.spfx.scaffold.dependencyCheck": "Checking dependencies...",
   "plugins.spfx.scaffold.dependencyInstall": "Installing dependencies. This may take more than 5 minutes to finish.",
   "plugins.spfx.scaffold.scaffoldProject": "Generate SPFx project using Yeoman CLI",
@@ -265,18 +266,18 @@
   "plugins.dotnet.reProvision": "Run 'Provision' command again.",
   "plugins.dotnet.doProvision": "Run 'Provision Resource' before this command.",
   "plugins.dotnet.checkLog": "Check log for more information.",
-  "plugins.sql.getQuestionAdminName.title": "Admin name of SQL",
-  "plugins.sql.getQuestionAdminName.validation.sqlUserNameEmpty": "SQL admin user name cannot be empty",
-  "plugins.sql.getQuestionAdminName.validation.sqlUserNameContainsSqlIdentifier": "SQL admin user name cannot be empty",
-  "plugins.sql.getQuestionAdminName.validation.sqlUserNameContainsNonAlphanumeric": "SQL admin user name cannot include non-alphanumeric characters",
-  "plugins.sql.getQuestionAdminName.validation.sqlUserNameStartWithNumber": "SQL admin user name cannot start with a number",
-  "plugins.sql.getQuestionAdminPassword.title": "Admin password of SQL",
-  "plugins.sql.getQuestionAdminPassword.validation.sqlPasswordEmpty": "SQL admin password cannot be empty",
-  "plugins.sql.getQuestionAdminPassword.validation.sqlPasswordLengthLessThan8": "SQL admin password must be at least 8 characters in length",
-  "plugins.sql.getQuestionAdminPassword.validation.sqlPasswordLengthGreatThan128": "SQL admin password must be no more than 128 characters in length",
+  "plugins.sql.getQuestionAdminName.title": "Azure SQL server admin username",
+  "plugins.sql.getQuestionAdminName.validation.sqlUserNameEmpty": "Azure SQL server admin username cannot be empty",
+  "plugins.sql.getQuestionAdminName.validation.sqlUserNameContainsSqlIdentifier": "Azure SQL server admin username cannot be empty",
+  "plugins.sql.getQuestionAdminName.validation.sqlUserNameContainsNonAlphanumeric": "Azure SQL server admin username cannot include non-alphanumeric characters",
+  "plugins.sql.getQuestionAdminName.validation.sqlUserNameStartWithNumber": "Azure SQL server admin username cannot start with a number",
+  "plugins.sql.getQuestionAdminPassword.title": "Azure SQL server admin password",
+  "plugins.sql.getQuestionAdminPassword.validation.sqlPasswordEmpty": "Azure SQL server admin password cannot be empty",
+  "plugins.sql.getQuestionAdminPassword.validation.sqlPasswordLengthLessThan8": "Azure SQL server admin password must be at least 8 characters in length",
+  "plugins.sql.getQuestionAdminPassword.validation.sqlPasswordLengthGreatThan128": "Azure SQL server admin password must be no more than 128 characters in length",
   "plugins.sql.getQuestionAdminPassword.validation.sqlPasswordMustContain3Categories": "Your password must contain characters from three of the following categories – English uppercase letters, English lowercase letters, numbers (0-9), and non-alphanumeric characters (!, $, #, %, etc.)",
   "plugins.sql.getQuestionAdminPassword.validation.sqlPasswordCannotContainUserName": "Your password cannot contain part or all of the user name",
-  "plugins.sql.getQuestionConfirmPassword.title": "Confirm admin password of SQL",
+  "plugins.sql.getQuestionConfirmPassword.title": "Confirm Azure SQL server admin password",
   "plugins.sql.getQuestionConfirmPassword.validation.sqlPasswordMustMatch": "Password and password confirmation must match",
   "plugins.cicd.ciOption.detail": "Help checkout code, build and run test.",
   "plugins.cicd.cdOption.detail": "Help checkout code, build, test and deploy to cloud.",
@@ -297,7 +298,7 @@
   "error.cicd.NoProjectOpened.details": "No project opened.",
   "plugins.apiConnector.getQuestionApiName.title": "Enter a friendly name for your API.",
   "plugins.apiConnector.getQuestionApiName.placeholder": "API alias will be used to generate app setting names.",
-  "plugins.apiConnector.getQuestionEndpoint.title": "Enter an API endpoint for local debugging.",
+  "plugins.apiConnector.getQuestionEndpoint.title": "Enter an API endpoint for debugging.",
   "plugins.apiConnector.getQuestionEndpoint.placeholder": "API endpoint will be added to local app setting.",
   "plugins.apiConnector.getQuestion.basicAuth.userName.title": "Enter the username for Basic Auth.",
   "plugins.apiConnector.getQuestion.basicAuth.userName.placeholder": "Username will be added to local app setting.",
@@ -378,7 +379,7 @@
   "error.FailedToParseResourceIdError": "Failed to get '%s' from resource id: '%s'",
   "error.M365AccountNotMatch": "The signed in Microsoft 365 account does not match the Microsoft 365 tenant in config file for '%s' environment. Please sign out and sign in with the correct Microsoft 365 account.",
   "error.MissingStep": "Step \"%s\" is required before %s. Run the required step first.",
-  "error.MissingSubscriptionInConfig": "Please provide the subscrpition id of the resource group (%s) in (%s)",
+  "error.MissingSubscriptionInConfig": "Please provide the subscription id of the resource group (%s) in (%s)",
   "error.NoSubscriptionFound": "User canceled. For Teams to trust the self-signed SSL certificate used by the toolkit, a self-signed certificate must be added to your certificate store.",
   "error.TrustCertificateCancelError": "Failed to find a subscription.",
   "error.ResourceGroupNotFound1": "Resource group '%s' does not exist, please specify an existing resource group.",
@@ -420,8 +421,8 @@
   "error.appstudio.notADirectoryError": "%s is not a directory.",
   "error.appstudio.remoteTeamsAppCreateFailed": "Failed to create remote Teams app in Developer Portal, due to %s",
   "error.appstudio.remoteTeamsAppUpdateFailed": "Failed to update remote Teams app in Developer Portal, due to %s",
-  "error.appstudio.localTeamsAppCreateFailed": "Failed to create local debug Teams app in Developer Portal, due to %s",
-  "error.appstudio.localTeamsAppUpdateFailed": "Failed to update local debug Teams app in Developer Portal, due to %s",
+  "error.appstudio.localTeamsAppCreateFailed": "Failed to create debug Teams app in Developer Portal, due to %s",
+  "error.appstudio.localTeamsAppUpdateFailed": "Failed to update debug Teams app in Developer Portal, due to %s",
   "error.appstudio.teamsAppCreateFailed": "Failed to create Teams app in Developer Portal, due to %s",
   "error.appstudio.teamsAppUpdateFailed": "Failed to update Teams app with ID %s.",
   "error.appstudio.apiFailed": "API call to Developer Portal failed: %s, %s, Request path: %s, X-Correlation-ID: %s. This may come from some intermittent service error. Please wait for a few minutes and retry the current step.",
@@ -432,7 +433,8 @@
   "error.appstudio.noAppStudioToken": "Failed to get app studio token.",
   "error.appstudio.invalidManifest": "Failed to parse manifest string, dut to error: %s. This might be caused by invalid configurations. %s",
   "error.appstudio.loadManifest": "Failed to read manifest file. Error: %s.",
-  "error.appstudio.getLocalConfigFailed": "Missing configuration data for manifest. You may need to run 'Local debug' first. %s",
+  "error.appstudio.getLocalConfigFailed": "Missing configuration data for manifest. You may need to run 'debug' first. %s",
+  "error.appstudio.incorrectLocalConfig": "Missing configuration data for manifest.  %s Please remove the state.local.json file and try again.",
   "error.appstudio.getRemoteConfigFailed": "Missing configuration data for manifest. %s",
   "error.appstudio.publishFailed": "Failed to publish Teams app with ID %s.",
   "error.appstudio.publishCancelled": "Publish Teams app with name %s has been cancelled.",
@@ -442,7 +444,7 @@
   "error.appstudio.grantPermissionFailed": "Grant permission failed. Reason: %s",
   "error.appstudio.listCollaboratorFailed": "List collaborator failed. Reason: %s",
   "error.appstudio.updateManifestCancelled": "Update manifest with app %s has been cancelled.",
-  "error.appstudio.updateManifestInvalidApp": "Cannot find teams app with id %s. You must run local debug or provision first before updating manifest to Teams platform.",
+  "error.appstudio.updateManifestInvalidApp": "Cannot find teams app with id %s. You must run debug or provision first before updating manifest to Teams platform.",
   "error.appstudio.updateManifestFailed": "Update manifest failed. ",
   "error.appstudio.invalidCapability": "Invalid capability: %s",
   "error.appstudio.capabilityExceedLimit": "Cannot add capability %s, it reaches the limit.",
@@ -452,6 +454,7 @@
   "error.appstudio.validateFetchSchemaFailed": "Failed to get schema from %s, message: %s",
   "error.appstudio.validateSchemaNotDefined": "Manifest schema is not defined",
   "error.appstudio.teamsAppCreateConflict": "Failed to create Teams app with 409 Conflict error. That may come from your app id is conflicting with another app in your tenant. Click Get Help to learn more.",
+  "error.appstudio.teamsAppCreateConflictWithPublishedApp": "A Teams app with that id already exists in your organization's app store. Please manually update the app id and try again.",
   "error.function.FunctionNameConflictError": "Function already exists, please choose another name.",
   "error.function.FetchConfigError": "Failed to find %s from configuration.",
   "error.function.ValidationError": "Invalid %s.",
@@ -461,7 +464,7 @@
   "error.function.ConfigFunctionAppError": "Failed to retrieve or update function app settings.",
   "error.function.FunctionAppOpError": "Failed to execute '%s' on the function app.",
   "error.function.InstallTeamsFxBindingError": "Failed to install Azure Functions bindings.",
-  "error.function.InstallNpmPackageError": "Failed to install NPM packages.",
+  "error.function.InstallNpmPackageError": "Failed to install npm packages.",
   "error.function.InitAzureSDKError": "Failed to initialize Azure SDK Client.",
   "error.function.ZipError": "Failed to generate zip package.",
   "error.function.PublishCredentialError": "Failed to retrieve publish credential.",
@@ -510,10 +513,10 @@
   "error.apiConnector.envVarExistError": "Please provide a different API name to avoid conflicts with existing env variables %s in .env.teamsfx.local",
   "error.debugHandler.AppManifestPackageNotExistError": "manifestPackagePath %s does not exist.",
   "error.debugHandler.InvalidAppManifestPackageFileFormatError": "manifestPackagePath must be .zip file path.",
-  "error.debugHandler.InvalidSSODebugArgsError": "objectId, clientId and clientSecret are all required if you use existing AAD app for SSO.",
+  "error.debugHandler.InvalidExistingAADArgsError": "objectId, clientId and clientSecret are all required if you use existing AAD app for SSO.",
   "error.debugHandler.InvalidExistingBotArgsError": "botId and botPassword need to be set together if you use existing bot.",
-  "error.debugHandler.BotMessagingEndpointMissingError": "botMessagingEndpoint is required.",
-  "error.debugHandler.InvalidTabDebugArgsError": "baseUrl is required and must be in the format of 'https://localhost:{port}'.",
+  "error.debugHandler.DebugArgumentEmptyError": "Debug argument '%s' is empty.",
+  "error.debugHandler.InvalidTabBaseUrlError": "baseUrl must be a valid https url.",
   "core.QuestionAppName.validation.pattern": "Application name must start with letters and contain at least two letters or digits. It can not contain some special characters.",
   "core.QuestionAppName.validation.maxlength": "Application name is longer than the maximum length of 30.",
   "core.QuestionAppName.validation.pathExist": "Path exists: %s. Select a different application name.",
@@ -676,10 +679,10 @@
   "error.aad.AadManifestLoadError": "Failed to load manifest file from %s, due to %s",
   "error.aad.AadManifestMissingName": "name property is empty or invalid in AAD manifest file",
   "error.aad.AadManifestMissingScopeIdForTeamsApp": "oauth2Permissions property missing item which value should be access_as_user",
-  "error.aad.AadManifestMissingObjectId": "id property is missing or invalid in AAD manifest file, you need to run provision or local debug first",
-  "error.aad.AadManifestMissingReplyUrlsWithType": "replyUrlsWithType property is missing or invalid in AAD manifest file, you need to run provision or local debug first",
-  "error.aad.AadManifestMissingIdentifierUris": "identifierUris property is missing or invalid in AAD manifest file, you need to run provision or local debug first",
-  "error.aad.AadManifestNotProvisioned": "Failed to generate AAD manifest because the resources have not been provisioned yet. You need to run provision or local debug first. Click Get Help to learn more about why you need to provision or local debug.",
+  "error.aad.AadManifestMissingObjectId": "id property is missing or invalid in AAD manifest file, you need to run provision or debug first",
+  "error.aad.AadManifestMissingReplyUrlsWithType": "replyUrlsWithType property is missing or invalid in AAD manifest file, you need to run provision or debug first",
+  "error.aad.AadManifestMissingIdentifierUris": "identifierUris property is missing or invalid in AAD manifest file, you need to run provision or debug first",
+  "error.aad.AadManifestNotProvisioned": "Failed to generate AAD manifest because the resources have not been provisioned yet. You need to run provision or debug first. Click Get Help to learn more about why you need to provision or debug.",
   "error.aad.UpdateAadAppError": "Failed to update application in Azure Active Directory: %s",
   "error.aad.UpdateAadAppUsingManifestError": "Failed to update application in Azure Active Directory. Please make sure 'templates/appPackage/aad.template.json' is valid: %s",
   "error.aad.AadManifestNotFoundError": "Aad manifest file not found",
@@ -708,7 +711,7 @@
   "error.aad.manifest.UnknownResourceAppId": "Unknown resourceAppId %s",
   "error.aad.manifest.UnknownResourceAccessType": "Unknown resourceAccess: %s",
   "error.aad.manifest.UnknownResourceAccessId": "Unknown resourceAccess id: %s, if you're using permission as resourceAccess id, please try to use permission id instead.",
-  "plugins.aad.NoSelection": "No Azure AD app found. Will not update permissions. You need to run provision or local debug first.",
+  "plugins.aad.NoSelection": "No Azure AD app found. Will not update permissions. You need to run provision or debug first.",
   "plugins.aad.UserCancelled": "Selection is cancelled by user.",
   "plugins.aad.UpdatePermissionSuccessMessage": "Successfully updated permission for Azure AD app. You can go to Azure Portal to check the permission or grant admin consent.",
   "plugins.aad.SkipProvision": "Azure AD app provision skipped. You need to manually provision and config Azure AD app.",
@@ -904,7 +907,8 @@
   "depChecker.needInstallFuncCoreTool": "You must have @NameVersion installed to debug your local functions.",
   "depChecker.failToInstallFuncCoreTool": "Failed to install @NameVersion. Install @NameVersion manually.",
   "depChecker.failToValidateFuncCoreTool": "Failed to validate @NameVersion after installation.",
-  "depChecker.funcNodeNotMatched": "Your own Node.js(@NodeVersion) is incompatible with your own Azure Functions Core Tools(@FuncVersion).",
+  "depChecker.globalFuncNodeNotMatched": "Your own Node.js(@NodeVersion) is incompatible with your own Azure Functions Core Tools(@FuncVersion). Please make sure your own Azure Functions Core Tools works with your Node.js version. See (@link) to Azure Functions supported Node.js versions.",
+  "depChecker.portableFuncNodeNotMatched": "Your own Node.js(@NodeVersion) is incompatible with Teams Toolkit Azure Functions Core Tools(@FuncVersion). Please install the supported Node.js version(@SupportedVersions).",
   "depChecker.startInstallNgrok": "Downloading and installing @NameVersion.",
   "depChecker.finishInstallNgrok": "Successfully installed @NameVersion.",
   "depChecker.needInstallNgrok": "You must have @NameVersion installed to debug your local bot.",
@@ -918,6 +922,7 @@
   "depChecker.failToInstallDotnet": "Failed to install @NameVersion. Install @NameVersion manually and restart Visual Studio Code.",
   "depChecker.NodeNotFound": "Cannot find Node.js.\n\nTeams Toolkit requires Node.js; the recommended version is @NodeVersion.\n\nClick \"Learn more\" to learn how to install the Node.js.\n\n(If you just installed Node.js, restart Visual Studio Code for the change to take effect.)",
   "depChecker.NodeNotSupported": "Node.js (@CurrentVersion) is not in the supported version list (@SupportedVersions).\n\nClick \"Learn more\" to learn more about the supported Node.js versions.\n\n(If you just installed Node.js (@SupportedVersions), restart Visual Studio Code for the change to take effect.)",
+  "depChecker.NodeNotRecommended": "Node.js (@CurrentVersion) is not in the supported version list (@SupportedVersions). Continue operation may cause problems.\n\nClick \"Learn more\" to learn more about the supported Node.js versions.\n\n(If you just installed Node.js (@SupportedVersions), restart Visual Studio Code for the change to take effect.)",
   "depChecker.dotnetNotFound": "Cannot find @NameVersion. For the details why .NET SDK is needed, refer to @HelpLink",
   "depChecker.depsNotFound": "Cannot find @SupportedPackages.\n\nTeams Toolkit requires these dependencies.\n\nClick \"Install\" to install @InstallPackages.",
   "depChecker.linuxDepsNotFound": "Cannot find @SupportedPackages. Install @SupportedPackages manually and restart Visual Studio Code.",
@@ -925,5 +930,9 @@
   "error.ActionNotExist": "Action not found: %s.",
   "error.ComponentNotExist": "Component not found: %s.",
   "error.BadComponent": "Component '%s' lacks of property: %s.",
-  "error.NgrokConfigError": "Load ngrok config %s failed. %s"
+  "error.InvalidFeature": "This feature is not applicable for your project.",
+  "driver.aadApp.error.invalidParameter": "Following parameter is missing or invalid for %s action: %s.",
+  "driver.aadApp.error.missingEnv": "%s Environment variable %s is not set.",
+  "driver.aadApp.error.generateSecretFailed": "Cannot generate client secret.",
+  "driver.aadApp.error.unhandledError": "Unhandled error happened in %s action: %s"
 }