@microsoft/teamsfx-core 1.3.0 → 1.3.1-alpha.70b3a70e.0

package/build/common/localSettingsConstants.d.ts

@@ -10,6 +10,8 @@ export declare const LocalSettingsAuthKeys: Readonly<{
     OauthAuthority: string;
     OauthHost: string;
     ApplicationIdUris: string;
+}>;
+export declare const LocalSettingsSimpleAuthKeys: Readonly<{
     SimpleAuthFilePath: string;
     SimpleAuthEnvironmentVariableParams: string;
     SimpleAuthServiceEndpoint: string;
@@ -20,20 +22,14 @@ export declare const LocalSettingsFrontendKeys: Readonly<{
     TabIndexPath: string;
     Browser: string;
     Https: string;
-    TrustDevCert: string;
     SslCertFile: string;
     SslKeyFile: string;
 }>;
 export declare const LocalSettingsBackendKeys: Readonly<{
     FunctionEndpoint: string;
     FunctionName: string;
-    SqlEndpoint: string;
-    SqlDatabaseName: string;
-    SqlUserName: string;
-    SqlPassword: string;
 }>;
 export declare const LocalSettingsBotKeys: Readonly<{
-    SkipNgrok: string;
     BotId: string;
     BotPassword: string;
     BotAadObjectId: string;

package/build/common/localSettingsConstants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"localSettingsConstants.d.ts","sourceRoot":"","sources":["../../src/common/localSettingsConstants.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,yBAAyB;;;EAGpC,CAAC;AAEH,eAAO,MAAM,qBAAqB;;;;;;;;;;;EAWhC,CAAC;AAEH,eAAO,MAAM,yBAAyB;;;;;;;;;EASpC,CAAC;AAEH,eAAO,MAAM,wBAAwB;;;;;;;EAOnC,CAAC;AAEH,eAAO,MAAM,oBAAoB;;;;;;;;EAQ/B,CAAC;AAEH,eAAO,MAAM,wBAAwB;;;;EAInC,CAAC"}
+{"version":3,"file":"localSettingsConstants.d.ts","sourceRoot":"","sources":["../../src/common/localSettingsConstants.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,yBAAyB;;;EAGpC,CAAC;AAEH,eAAO,MAAM,qBAAqB;;;;;;;;EAQhC,CAAC;AAEH,eAAO,MAAM,2BAA2B;;;;EAItC,CAAC;AAEH,eAAO,MAAM,yBAAyB;;;;;;;;EAQpC,CAAC;AAEH,eAAO,MAAM,wBAAwB;;;EAGnC,CAAC;AAEH,eAAO,MAAM,oBAAoB;;;;;;;EAO/B,CAAC;AAEH,eAAO,MAAM,wBAAwB;;;;EAInC,CAAC"}

package/build/common/localSettingsConstants.js

@@ -2,7 +2,7 @@
 // Licensed under the MIT license.
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LocalSettingsEncryptKeys = exports.LocalSettingsBotKeys = exports.LocalSettingsBackendKeys = exports.LocalSettingsFrontendKeys = exports.LocalSettingsAuthKeys = exports.LocalSettingsTeamsAppKeys = void 0;
+exports.LocalSettingsEncryptKeys = exports.LocalSettingsBotKeys = exports.LocalSettingsBackendKeys = exports.LocalSettingsFrontendKeys = exports.LocalSettingsSimpleAuthKeys = exports.LocalSettingsAuthKeys = exports.LocalSettingsTeamsAppKeys = void 0;
 exports.LocalSettingsTeamsAppKeys = Object.freeze({
     TenantId: "tenantId",
     TeamsAppId: "teamsAppId",
@@ -15,6 +15,8 @@ exports.LocalSettingsAuthKeys = Object.freeze({
     OauthAuthority: "oauthAuthority",
     OauthHost: "oauthHost",
     ApplicationIdUris: "applicationIdUris",
+});
+exports.LocalSettingsSimpleAuthKeys = Object.freeze({
     SimpleAuthFilePath: "simpleAuthFilePath",
     SimpleAuthEnvironmentVariableParams: "SimpleAuthEnvironmentVariableParams",
     SimpleAuthServiceEndpoint: "AuthServiceEndpoint",
@@ -25,20 +27,14 @@ exports.LocalSettingsFrontendKeys = Object.freeze({
     TabIndexPath: "tabIndexPath",
     Browser: "browser",
     Https: "https",
-    TrustDevCert: "trustDevCert",
     SslCertFile: "sslCertFile",
     SslKeyFile: "sslKeyFile",
 });
 exports.LocalSettingsBackendKeys = Object.freeze({
     FunctionEndpoint: "functionEndpoint",
     FunctionName: "functionName",
-    SqlEndpoint: "sqlEndpoint",
-    SqlDatabaseName: "sqlDatabaseName",
-    SqlUserName: "sqlUserName",
-    SqlPassword: "sqlPassword",
 });
 exports.LocalSettingsBotKeys = Object.freeze({
-    SkipNgrok: "skipNgrok",
     BotId: "botId",
     BotPassword: "botPassword",
     BotAadObjectId: "botAadObjectId",

package/build/common/localSettingsConstants.js.map

@@ -1 +1 @@
-{"version":3,"file":"localSettingsConstants.js","sourceRoot":"","sources":["../../src/common/localSettingsConstants.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;AAEA,QAAA,yBAAyB,GAAG,MAAM,CAAC,MAAM,CAAC;IACrD,QAAQ,EAAE,UAAU;IACpB,UAAU,EAAE,YAAY;CACzB,CAAC,CAAC;AAEU,QAAA,qBAAqB,GAAG,MAAM,CAAC,MAAM,CAAC;IACjD,QAAQ,EAAE,UAAU;IACpB,YAAY,EAAE,cAAc;IAC5B,QAAQ,EAAE,UAAU;IACpB,uBAAuB,EAAE,yBAAyB;IAClD,cAAc,EAAE,gBAAgB;IAChC,SAAS,EAAE,WAAW;IACtB,iBAAiB,EAAE,mBAAmB;IACtC,kBAAkB,EAAE,oBAAoB;IACxC,mCAAmC,EAAE,qCAAqC;IAC1E,yBAAyB,EAAE,qBAAqB;CACjD,CAAC,CAAC;AAEU,QAAA,yBAAyB,GAAG,MAAM,CAAC,MAAM,CAAC;IACrD,SAAS,EAAE,WAAW;IACtB,WAAW,EAAE,aAAa;IAC1B,YAAY,EAAE,cAAc;IAC5B,OAAO,EAAE,SAAS;IAClB,KAAK,EAAE,OAAO;IACd,YAAY,EAAE,cAAc;IAC5B,WAAW,EAAE,aAAa;IAC1B,UAAU,EAAE,YAAY;CACzB,CAAC,CAAC;AAEU,QAAA,wBAAwB,GAAG,MAAM,CAAC,MAAM,CAAC;IACpD,gBAAgB,EAAE,kBAAkB;IACpC,YAAY,EAAE,cAAc;IAC5B,WAAW,EAAE,aAAa;IAC1B,eAAe,EAAE,iBAAiB;IAClC,WAAW,EAAE,aAAa;IAC1B,WAAW,EAAE,aAAa;CAC3B,CAAC,CAAC;AAEU,QAAA,oBAAoB,GAAG,MAAM,CAAC,MAAM,CAAC;IAChD,SAAS,EAAE,WAAW;IACtB,KAAK,EAAE,OAAO;IACd,WAAW,EAAE,aAAa;IAC1B,cAAc,EAAE,gBAAgB;IAChC,cAAc,EAAE,gBAAgB;IAChC,SAAS,EAAE,WAAW;IACtB,WAAW,EAAE,aAAa;CAC3B,CAAC,CAAC;AAEU,QAAA,wBAAwB,GAAG,MAAM,CAAC,MAAM,CAAC;IACpD,YAAY,EAAE,cAAc;IAC5B,mCAAmC,EAAE,qCAAqC;IAC1E,WAAW,EAAE,aAAa;CAC3B,CAAC,CAAC"}
+{"version":3,"file":"localSettingsConstants.js","sourceRoot":"","sources":["../../src/common/localSettingsConstants.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;AAEA,QAAA,yBAAyB,GAAG,MAAM,CAAC,MAAM,CAAC;IACrD,QAAQ,EAAE,UAAU;IACpB,UAAU,EAAE,YAAY;CACzB,CAAC,CAAC;AAEU,QAAA,qBAAqB,GAAG,MAAM,CAAC,MAAM,CAAC;IACjD,QAAQ,EAAE,UAAU;IACpB,YAAY,EAAE,cAAc;IAC5B,QAAQ,EAAE,UAAU;IACpB,uBAAuB,EAAE,yBAAyB;IAClD,cAAc,EAAE,gBAAgB;IAChC,SAAS,EAAE,WAAW;IACtB,iBAAiB,EAAE,mBAAmB;CACvC,CAAC,CAAC;AAEU,QAAA,2BAA2B,GAAG,MAAM,CAAC,MAAM,CAAC;IACvD,kBAAkB,EAAE,oBAAoB;IACxC,mCAAmC,EAAE,qCAAqC;IAC1E,yBAAyB,EAAE,qBAAqB;CACjD,CAAC,CAAC;AAEU,QAAA,yBAAyB,GAAG,MAAM,CAAC,MAAM,CAAC;IACrD,SAAS,EAAE,WAAW;IACtB,WAAW,EAAE,aAAa;IAC1B,YAAY,EAAE,cAAc;IAC5B,OAAO,EAAE,SAAS;IAClB,KAAK,EAAE,OAAO;IACd,WAAW,EAAE,aAAa;IAC1B,UAAU,EAAE,YAAY;CACzB,CAAC,CAAC;AAEU,QAAA,wBAAwB,GAAG,MAAM,CAAC,MAAM,CAAC;IACpD,gBAAgB,EAAE,kBAAkB;IACpC,YAAY,EAAE,cAAc;CAC7B,CAAC,CAAC;AAEU,QAAA,oBAAoB,GAAG,MAAM,CAAC,MAAM,CAAC;IAChD,KAAK,EAAE,OAAO;IACd,WAAW,EAAE,aAAa;IAC1B,cAAc,EAAE,gBAAgB;IAChC,cAAc,EAAE,gBAAgB;IAChC,SAAS,EAAE,WAAW;IACtB,WAAW,EAAE,aAAa;CAC3B,CAAC,CAAC;AAEU,QAAA,wBAAwB,GAAG,MAAM,CAAC,MAAM,CAAC;IACpD,YAAY,EAAE,cAAc;IAC5B,mCAAmC,EAAE,qCAAqC;IAC1E,WAAW,EAAE,aAAa;CAC3B,CAAC,CAAC"}

package/build/common/localSettingsProvider.d.ts

@@ -3,8 +3,8 @@ export declare const localSettingsFileName = "localSettings.json";
 export declare class LocalSettingsProvider {
     readonly localSettingsFilePath: string;
     constructor(workspaceFolder: string);
-    init(includeFrontend: boolean, includeBackend: boolean, includeBotOrMessageExtension: boolean, migrateFromV1?: boolean): LocalSettings;
-    initV2(includeFrontend: boolean, includeBackend: boolean, includeBotOrMessageExtension: boolean, migrateFromV1?: boolean): Json;
+    init(includeFrontend: boolean, includeBackend: boolean, includeBotOrMessageExtension: boolean, migrateFromV1?: boolean, includeSimpleAuth?: boolean, includeAAD?: boolean): LocalSettings;
+    initV2(includeFrontend: boolean, includeBackend: boolean, includeBotOrMessageExtension: boolean, migrateFromV1?: boolean, includeSimpleAuth?: boolean, includeAAD?: boolean): Json;
     incrementalInitV2(localSettingsJson: Json, addBackaned: boolean, addBot: boolean, addFrontend: boolean): Json;
     load(cryptoProvider?: CryptoProvider): Promise<LocalSettings | undefined>;
     loadV2(cryptoProvider?: CryptoProvider): Promise<Json | undefined>;
@@ -13,7 +13,7 @@ export declare class LocalSettingsProvider {
     saveJson(localSettingsJson: Json, cryptoProvider?: CryptoProvider): Promise<Json>;
     private convertToLocalSettings;
     convertToLocalSettingsJson(localSettings: LocalSettings): Json;
-    initSimpleAuth(): ConfigMap;
+    initAuth(includeSimpleAuth?: boolean): ConfigMap;
     initFrontend(): ConfigMap;
     initBackend(): ConfigMap;
     initBot(): ConfigMap;

package/build/common/localSettingsProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"localSettingsProvider.d.ts","sourceRoot":"","sources":["../../src/common/localSettingsProvider.ts"],"names":[],"mappings":"AAKA,OAAO,EAEL,SAAS,EACT,cAAc,EAEd,IAAI,EACJ,aAAa,EACd,MAAM,wBAAwB,CAAC;AAUhC,eAAO,MAAM,qBAAqB,uBAAuB,CAAC;AAG1D,qBAAa,qBAAqB;IAChC,SAAgB,qBAAqB,EAAE,MAAM,CAAC;gBAClC,eAAe,EAAE,MAAM;IAI5B,IAAI,CACT,eAAe,EAAE,OAAO,EACxB,cAAc,EAAE,OAAO,EACvB,4BAA4B,EAAE,OAAO,EACrC,aAAa,UAAQ,GACpB,aAAa;IAgCT,MAAM,CACX,eAAe,EAAE,OAAO,EACxB,cAAc,EAAE,OAAO,EACvB,4BAA4B,EAAE,OAAO,EACrC,aAAa,UAAQ,GACpB,IAAI;IA8BA,iBAAiB,CACtB,iBAAiB,EAAE,IAAI,EACvB,WAAW,EAAE,OAAO,EACpB,MAAM,EAAE,OAAO,EACf,WAAW,EAAE,OAAO,GACnB,IAAI;IAiBM,IAAI,CAAC,cAAc,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;IAoBzE,MAAM,CAAC,cAAc,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC;IAc/E,OAAO,CAAC,oBAAoB;IA6Cf,IAAI,CAAC,aAAa,EAAE,aAAa,EAAE,cAAc,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAoClF,QAAQ,CAAC,iBAAiB,EAAE,IAAI,EAAE,cAAc,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAM9F,OAAO,CAAC,sBAAsB;IAW9B,0BAA0B,CAAC,aAAa,EAAE,aAAa,GAAG,IAAI;IAsB9D,cAAc,IAAI,SAAS;IAW3B,YAAY,IAAI,SAAS;IAczB,WAAW,IAAI,SAAS;IAUxB,OAAO,IAAI,SAAS;CAarB"}
+{"version":3,"file":"localSettingsProvider.d.ts","sourceRoot":"","sources":["../../src/common/localSettingsProvider.ts"],"names":[],"mappings":"AAKA,OAAO,EAEL,SAAS,EACT,cAAc,EAEd,IAAI,EACJ,aAAa,EACd,MAAM,wBAAwB,CAAC;AAWhC,eAAO,MAAM,qBAAqB,uBAAuB,CAAC;AAG1D,qBAAa,qBAAqB;IAChC,SAAgB,qBAAqB,EAAE,MAAM,CAAC;gBAClC,eAAe,EAAE,MAAM;IAI5B,IAAI,CACT,eAAe,EAAE,OAAO,EACxB,cAAc,EAAE,OAAO,EACvB,4BAA4B,EAAE,OAAO,EACrC,aAAa,UAAQ,EACrB,iBAAiB,UAAQ,EACzB,UAAU,UAAO,GAChB,aAAa;IAgCT,MAAM,CACX,eAAe,EAAE,OAAO,EACxB,cAAc,EAAE,OAAO,EACvB,4BAA4B,EAAE,OAAO,EACrC,aAAa,UAAQ,EACrB,iBAAiB,UAAQ,EACzB,UAAU,UAAO,GAChB,IAAI;IA8BA,iBAAiB,CACtB,iBAAiB,EAAE,IAAI,EACvB,WAAW,EAAE,OAAO,EACpB,MAAM,EAAE,OAAO,EACf,WAAW,EAAE,OAAO,GACnB,IAAI;IAiBM,IAAI,CAAC,cAAc,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;IAoBzE,MAAM,CAAC,cAAc,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC;IAc/E,OAAO,CAAC,oBAAoB;IA6Cf,IAAI,CAAC,aAAa,EAAE,aAAa,EAAE,cAAc,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAoClF,QAAQ,CAAC,iBAAiB,EAAE,IAAI,EAAE,cAAc,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAM9F,OAAO,CAAC,sBAAsB;IAW9B,0BAA0B,CAAC,aAAa,EAAE,aAAa,GAAG,IAAI;IAsB9D,QAAQ,CAAC,iBAAiB,UAAQ,GAAG,SAAS;IAmB9C,YAAY,IAAI,SAAS;IAazB,WAAW,IAAI,SAAS;IAUxB,OAAO,IAAI,SAAS;CASrB"}

package/build/common/localSettingsProvider.js

@@ -13,7 +13,7 @@ class LocalSettingsProvider {
     constructor(workspaceFolder) {
         this.localSettingsFilePath = `${workspaceFolder}/.${teamsfx_api_1.ConfigFolderName}/${teamsfx_api_1.InputConfigsFolderName}/${exports.localSettingsFileName}`;
     }
-    init(includeFrontend, includeBackend, includeBotOrMessageExtension, migrateFromV1 = false) {
+    init(includeFrontend, includeBackend, includeBotOrMessageExtension, migrateFromV1 = false, includeSimpleAuth = false, includeAAD = true) {
         // initialize Teams app related config for local debug.
         const teamsAppLocalConfig = new teamsfx_api_1.ConfigMap();
         teamsAppLocalConfig.set(localSettingsConstants_1.LocalSettingsTeamsAppKeys.TenantId, "");
@@ -21,8 +21,8 @@ class LocalSettingsProvider {
         const localSettings = {
             teamsApp: teamsAppLocalConfig,
         };
-        if (!migrateFromV1) {
-            localSettings.auth = this.initSimpleAuth();
+        if (!migrateFromV1 && includeAAD) {
+            localSettings.auth = this.initAuth(includeSimpleAuth);
         }
         // initialize frontend and simple auth local settings.
         if (includeFrontend) {
@@ -38,15 +38,15 @@ class LocalSettingsProvider {
         }
         return localSettings;
     }
-    initV2(includeFrontend, includeBackend, includeBotOrMessageExtension, migrateFromV1 = false) {
+    initV2(includeFrontend, includeBackend, includeBotOrMessageExtension, migrateFromV1 = false, includeSimpleAuth = false, includeAAD = true) {
         const localSettings = {
             teamsApp: {
                 [localSettingsConstants_1.LocalSettingsTeamsAppKeys.TenantId]: "",
                 [localSettingsConstants_1.LocalSettingsTeamsAppKeys.TeamsAppId]: "",
             },
         };
-        if (!migrateFromV1) {
-            localSettings.auth = this.initSimpleAuth().toJSON();
+        if (!migrateFromV1 && includeAAD) {
+            localSettings.auth = this.initAuth(includeSimpleAuth).toJSON();
         }
         // initialize frontend and simple auth local settings.
         if (includeFrontend) {
@@ -197,20 +197,26 @@ class LocalSettingsProvider {
         }
         return localSettingsJson;
     }
-    initSimpleAuth() {
+    initAuth(includeSimpleAuth = false) {
         // simple auth is only required by frontend
         const authLocalConfig = new teamsfx_api_1.ConfigMap();
         const keys = Object.values(localSettingsConstants_1.LocalSettingsAuthKeys);
         for (const key of keys) {
             authLocalConfig.set(key, "");
         }
+        // If simple auth is activated, add simple auth related configs.
+        if (includeSimpleAuth) {
+            const simpleAuthKeys = Object.values(localSettingsConstants_1.LocalSettingsSimpleAuthKeys);
+            for (const key of simpleAuthKeys) {
+                authLocalConfig.set(key, "");
+            }
+        }
         return authLocalConfig;
     }
     initFrontend() {
         const frontendLocalConfig = new teamsfx_api_1.ConfigMap();
         frontendLocalConfig.set(localSettingsConstants_1.LocalSettingsFrontendKeys.Browser, "none");
         frontendLocalConfig.set(localSettingsConstants_1.LocalSettingsFrontendKeys.Https, true);
-        frontendLocalConfig.set(localSettingsConstants_1.LocalSettingsFrontendKeys.TrustDevCert, true);
         frontendLocalConfig.set(localSettingsConstants_1.LocalSettingsFrontendKeys.SslCertFile, "");
         frontendLocalConfig.set(localSettingsConstants_1.LocalSettingsFrontendKeys.SslKeyFile, "");
         frontendLocalConfig.set(localSettingsConstants_1.LocalSettingsFrontendKeys.TabDomain, "");
@@ -230,12 +236,7 @@ class LocalSettingsProvider {
         const botLocalConfig = new teamsfx_api_1.ConfigMap();
         const keys = Object.values(localSettingsConstants_1.LocalSettingsBotKeys);
         for (const key of keys) {
-            if (key === localSettingsConstants_1.LocalSettingsBotKeys.SkipNgrok) {
-                botLocalConfig.set(key, false);
-            }
-            else {
-                botLocalConfig.set(key, "");
-            }
+            botLocalConfig.set(key, "");
         }
         return botLocalConfig;
     }

package/build/common/localSettingsProvider.js.map

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

package/build/common/permissionInterface.d.ts

@@ -9,9 +9,7 @@ export declare enum CollaborationState {
     NotProvisioned = "NotProvisioned",
     M365TenantNotMatch = "M365TenantNotMatch",
     EmptyM365Tenant = "EmptyM365Tenant",
-    SolutionIsNotIdle = "SolutionIsNotIdle",
-    m365AccountNotSignedIn = "M365AccountNotSignedIn",
-    ERROR = "ERROR"
+    m365AccountNotSignedIn = "M365AccountNotSignedIn"
 }
 export interface CollaborationStateResult {
     state: CollaborationState;

package/build/common/permissionInterface.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"permissionInterface.d.ts","sourceRoot":"","sources":["../../src/common/permissionInterface.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,KAAK,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;CAC7B;AAED,oBAAY,kBAAkB;IAC5B,EAAE,OAAO;IACT,cAAc,mBAAmB;IACjC,kBAAkB,uBAAuB;IACzC,eAAe,oBAAoB;IACnC,iBAAiB,sBAAsB;IACvC,sBAAsB,2BAA2B;IACjD,KAAK,UAAU;CAChB;AAED,MAAM,WAAW,wBAAwB;IACvC,KAAK,EAAE,kBAAkB,CAAC;IAC1B,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,sBAAsB;IACrC,KAAK,EAAE,kBAAkB,CAAC;IAC1B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,aAAa,CAAC,EAAE,YAAY,EAAE,CAAC;IAC/B,KAAK,CAAC,EAAE,GAAG,CAAC;CACb;AAED,MAAM,WAAW,iBAAiB;IAChC,KAAK,EAAE,kBAAkB,CAAC;IAC1B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC/B,WAAW,CAAC,EAAE,kBAAkB,EAAE,CAAC;CACpC;AAED,MAAM,WAAW,YAAY;IAC3B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,OAAO,CAAC;IACpB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,QAAQ;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,iBAAiB,EAAE,MAAM,CAAC;CAC3B;AAED,MAAM,WAAW,aAAa;IAC5B,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,iBAAiB,EAAE,MAAM,CAAC;CAC3B"}
+{"version":3,"file":"permissionInterface.d.ts","sourceRoot":"","sources":["../../src/common/permissionInterface.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,KAAK,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;CAC7B;AAED,oBAAY,kBAAkB;IAC5B,EAAE,OAAO;IACT,cAAc,mBAAmB;IACjC,kBAAkB,uBAAuB;IACzC,eAAe,oBAAoB;IACnC,sBAAsB,2BAA2B;CAClD;AAED,MAAM,WAAW,wBAAwB;IACvC,KAAK,EAAE,kBAAkB,CAAC;IAC1B,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,sBAAsB;IACrC,KAAK,EAAE,kBAAkB,CAAC;IAC1B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,aAAa,CAAC,EAAE,YAAY,EAAE,CAAC;IAC/B,KAAK,CAAC,EAAE,GAAG,CAAC;CACb;AAED,MAAM,WAAW,iBAAiB;IAChC,KAAK,EAAE,kBAAkB,CAAC;IAC1B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC/B,WAAW,CAAC,EAAE,kBAAkB,EAAE,CAAC;CACpC;AAED,MAAM,WAAW,YAAY;IAC3B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,OAAO,CAAC;IACpB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,QAAQ;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,iBAAiB,EAAE,MAAM,CAAC;CAC3B;AAED,MAAM,WAAW,aAAa;IAC5B,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,iBAAiB,EAAE,MAAM,CAAC;CAC3B"}

package/build/common/permissionInterface.js

@@ -9,8 +9,6 @@ var CollaborationState;
     CollaborationState["NotProvisioned"] = "NotProvisioned";
     CollaborationState["M365TenantNotMatch"] = "M365TenantNotMatch";
     CollaborationState["EmptyM365Tenant"] = "EmptyM365Tenant";
-    CollaborationState["SolutionIsNotIdle"] = "SolutionIsNotIdle";
     CollaborationState["m365AccountNotSignedIn"] = "M365AccountNotSignedIn";
-    CollaborationState["ERROR"] = "ERROR";
 })(CollaborationState = exports.CollaborationState || (exports.CollaborationState = {}));
 //# sourceMappingURL=permissionInterface.js.map

package/build/common/permissionInterface.js.map

@@ -1 +1 @@
-{"version":3,"file":"permissionInterface.js","sourceRoot":"","sources":["../../src/common/permissionInterface.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AASlC,IAAY,kBAQX;AARD,WAAY,kBAAkB;IAC5B,+BAAS,CAAA;IACT,uDAAiC,CAAA;IACjC,+DAAyC,CAAA;IACzC,yDAAmC,CAAA;IACnC,6DAAuC,CAAA;IACvC,uEAAiD,CAAA;IACjD,qCAAe,CAAA;AACjB,CAAC,EARW,kBAAkB,GAAlB,0BAAkB,KAAlB,0BAAkB,QAQ7B"}
+{"version":3,"file":"permissionInterface.js","sourceRoot":"","sources":["../../src/common/permissionInterface.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AASlC,IAAY,kBAMX;AAND,WAAY,kBAAkB;IAC5B,+BAAS,CAAA;IACT,uDAAiC,CAAA;IACjC,+DAAyC,CAAA;IACzC,yDAAmC,CAAA;IACnC,uEAAiD,CAAA;AACnD,CAAC,EANW,kBAAkB,GAAlB,0BAAkB,KAAlB,0BAAkB,QAM7B"}

package/build/common/projectSettingsValidator.d.ts

@@ -1,4 +1,3 @@
 import { ProjectSettings } from "@microsoft/teamsfx-api";
 export declare function validateProjectSettings(projectSettings: ProjectSettings): string | undefined;
-export declare function validateProjectSettingsV3(projectSettings: ProjectSettings): string | undefined;
 //# sourceMappingURL=projectSettingsValidator.d.ts.map

package/build/common/projectSettingsValidator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"projectSettingsValidator.d.ts","sourceRoot":"","sources":["../../src/common/projectSettingsValidator.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAM,MAAM,wBAAwB,CAAC;AAO7D,wBAAgB,uBAAuB,CAAC,eAAe,EAAE,eAAe,GAAG,MAAM,GAAG,SAAS,CAsB5F;AAED,wBAAgB,yBAAyB,CAAC,eAAe,EAAE,eAAe,GAAG,MAAM,GAAG,SAAS,CAW9F"}
+{"version":3,"file":"projectSettingsValidator.d.ts","sourceRoot":"","sources":["../../src/common/projectSettingsValidator.ts"],"names":[],"mappings":"AAGA,OAAO,EAAyB,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAOhF,wBAAgB,uBAAuB,CAAC,eAAe,EAAE,eAAe,GAAG,MAAM,GAAG,SAAS,CAsB5F"}

package/build/common/projectSettingsValidator.js

@@ -2,13 +2,13 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateProjectSettingsV3 = exports.validateProjectSettings = void 0;
+exports.validateProjectSettings = void 0;
 const question_1 = require("../plugins/solution/fx-solution/question");
 function validateProjectSettings(projectSettings) {
     if (!projectSettings)
         return "empty projectSettings";
     if (!projectSettings.solutionSettings)
-        return "empty solutionSettings";
+        return undefined;
     const solutionSettings = projectSettings.solutionSettings;
     if (solutionSettings.hostType === undefined)
         return "empty solutionSettings.hostType";
@@ -31,20 +31,6 @@ function validateProjectSettings(projectSettings) {
     return undefined;
 }
 exports.validateProjectSettings = validateProjectSettings;
-function validateProjectSettingsV3(projectSettings) {
-    const res = validateProjectSettings(projectSettings);
-    if (res)
-        return res;
-    const solutionSettings = projectSettings.solutionSettings;
-    if (!solutionSettings.modules) {
-        return "solutionSettings.modules is undefined";
-    }
-    if (!Array.isArray(solutionSettings.modules)) {
-        return "solutionSettings.modules is not array";
-    }
-    return undefined;
-}
-exports.validateProjectSettingsV3 = validateProjectSettingsV3;
 function validateStringArray(arr, enums) {
     if (!arr) {
         return "is undefined";

package/build/common/projectSettingsValidator.js.map

@@ -1 +1 @@
-{"version":3,"file":"projectSettingsValidator.js","sourceRoot":"","sources":["../../src/common/projectSettingsValidator.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAGlC,uEAIkD;AAElD,SAAgB,uBAAuB,CAAC,eAAgC;IACtE,IAAI,CAAC,eAAe;QAAE,OAAO,uBAAuB,CAAC;IACrD,IAAI,CAAC,eAAe,CAAC,gBAAgB;QAAE,OAAO,wBAAwB,CAAC;IACvE,MAAM,gBAAgB,GAAG,eAAe,CAAC,gBAA8C,CAAC;IACxF,IAAI,gBAAgB,CAAC,QAAQ,KAAK,SAAS;QAAE,OAAO,iCAAiC,CAAC;IACtF,IAAI,WAAW,GAAG,mBAAmB,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC;IACvE,IAAI,WAAW,EAAE;QACf,OAAO,sDAAsD,WAAW,EAAE,CAAC;KAC5E;IACD,WAAW,GAAG,mBAAmB,CAAC,gBAAgB,CAAC,YAAY,EAAE;QAC/D,wBAAa,CAAC,EAAE;QAChB,wBAAa,CAAC,EAAE;QAChB,+BAAoB,CAAC,EAAE;KACxB,CAAC,CAAC;IACH,IAAI,WAAW,EAAE;QACf,OAAO,oDAAoD,WAAW,EAAE,CAAC;KAC1E;IACD,WAAW,GAAG,mBAAmB,CAAC,gBAAgB,CAAC,qBAAqB,CAAC,CAAC;IAC1E,IAAI,WAAW,EAAE;QACf,OAAO,6DAA6D,WAAW,EAAE,CAAC;KACnF;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAtBD,0DAsBC;AAED,SAAgB,yBAAyB,CAAC,eAAgC;IACxE,MAAM,GAAG,GAAG,uBAAuB,CAAC,eAAe,CAAC,CAAC;IACrD,IAAI,GAAG;QAAE,OAAO,GAAG,CAAC;IACpB,MAAM,gBAAgB,GAAG,eAAe,CAAC,gBAA8C,CAAC;IACxF,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE;QAC7B,OAAO,uCAAuC,CAAC;KAChD;IACD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE;QAC5C,OAAO,uCAAuC,CAAC;KAChD;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAXD,8DAWC;AAED,SAAS,mBAAmB,CAAC,GAAS,EAAE,KAAgB;IACtD,IAAI,CAAC,GAAG,EAAE;QACR,OAAO,cAAc,CAAC;KACvB;IACD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QACvB,OAAO,cAAc,CAAC;KACvB;IACD,KAAK,MAAM,OAAO,IAAI,GAAY,EAAE;QAClC,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;YAC/B,OAAO,mCAAmC,CAAC;SAC5C;QACD,IAAI,KAAK,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;YACrC,OAAO,mCAAmC,KAAK,EAAE,CAAC;SACnD;KACF;IACD,OAAO,SAAS,CAAC;AACnB,CAAC"}
+{"version":3,"file":"projectSettingsValidator.js","sourceRoot":"","sources":["../../src/common/projectSettingsValidator.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAGlC,uEAIkD;AAElD,SAAgB,uBAAuB,CAAC,eAAgC;IACtE,IAAI,CAAC,eAAe;QAAE,OAAO,uBAAuB,CAAC;IACrD,IAAI,CAAC,eAAe,CAAC,gBAAgB;QAAE,OAAO,SAAS,CAAC;IACxD,MAAM,gBAAgB,GAAG,eAAe,CAAC,gBAAyC,CAAC;IACnF,IAAI,gBAAgB,CAAC,QAAQ,KAAK,SAAS;QAAE,OAAO,iCAAiC,CAAC;IACtF,IAAI,WAAW,GAAG,mBAAmB,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC;IACvE,IAAI,WAAW,EAAE;QACf,OAAO,sDAAsD,WAAW,EAAE,CAAC;KAC5E;IACD,WAAW,GAAG,mBAAmB,CAAC,gBAAgB,CAAC,YAAY,EAAE;QAC/D,wBAAa,CAAC,EAAE;QAChB,wBAAa,CAAC,EAAE;QAChB,+BAAoB,CAAC,EAAE;KACxB,CAAC,CAAC;IACH,IAAI,WAAW,EAAE;QACf,OAAO,oDAAoD,WAAW,EAAE,CAAC;KAC1E;IACD,WAAW,GAAG,mBAAmB,CAAC,gBAAgB,CAAC,qBAAqB,CAAC,CAAC;IAC1E,IAAI,WAAW,EAAE;QACf,OAAO,6DAA6D,WAAW,EAAE,CAAC;KACnF;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAtBD,0DAsBC;AAED,SAAS,mBAAmB,CAAC,GAAS,EAAE,KAAgB;IACtD,IAAI,CAAC,GAAG,EAAE;QACR,OAAO,cAAc,CAAC;KACvB;IACD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QACvB,OAAO,cAAc,CAAC;KACvB;IACD,KAAK,MAAM,OAAO,IAAI,GAAY,EAAE;QAClC,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;YAC/B,OAAO,mCAAmC,CAAC;SAC5C;QACD,IAAI,KAAK,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;YACrC,OAAO,mCAAmC,KAAK,EAAE,CAAC;SACnD;KACF;IACD,OAAO,SAAS,CAAC;AACnB,CAAC"}

package/build/common/telemetry.d.ts

@@ -45,7 +45,9 @@ export declare enum TelemetryEvent {
     ProjectMigratorGuideStart = "project-migrator-guide-start",
     ProjectMigratorGuide = "project-migrator-guide",
     ProjectMigratorPrecheckFailed = "project-migrator-pre-check-failed",
-    ProjectMigratorError = "project-migrator-error"
+    ProjectMigratorError = "project-migrator-error",
+    DetectPortStart = "detect-port-start",
+    DetectPort = "detect-port"
 }
 export declare enum TelemetrySuccess {
     Yes = "yes",

package/build/common/telemetry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"telemetry.d.ts","sourceRoot":"","sources":["../../src/common/telemetry.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAa,MAAM,wBAAwB,CAAC;AAE/E,qBAAa,yBAAyB;IACpC,OAAc,iBAAiB,EAAE,iBAAiB,GAAG,SAAS,CAAC;CAChE;AAED,oBAAY,iBAAiB;IAC3B,WAAW,iBAAiB;IAC5B,SAAS,cAAc;IACvB,KAAK,UAAU;IACf,OAAO,YAAY;IACnB,SAAS,eAAe;IACxB,SAAS,eAAe;IACxB,YAAY,kBAAkB;IAC9B,aAAa,oBAAoB;IACjC,SAAS,eAAe;IACxB,aAAa,mBAAmB;IAChC,GAAG,QAAQ;IACX,0BAA0B,kCAAkC;IAC5D,SAAS,eAAe;IACxB,MAAM,WAAW;IACjB,QAAQ,aAAa;IACrB,cAAc,oBAAoB;IAClC,YAAY,iBAAiB;IAC7B,aAAa,mBAAmB;IAChC,oBAAoB,2BAA2B;CAChD;AAED,oBAAY,cAAc;IACxB,mBAAmB,0BAA0B;IAC7C,cAAc,oBAAoB;IAClC,cAAc,oBAAoB;IAClC,mBAAmB,0BAA0B;IAC7C,QAAQ,cAAc;IACtB,eAAe,qBAAqB;IACpC,uBAAuB,+BAA+B;IACtD,kBAAkB,yBAAyB;IAC3C,gBAAgB,sBAAsB;IACtC,SAAS,eAAe;IACxB,gCAAgC,wCAAwC;IACxE,2BAA2B,kCAAkC;IAC7D,2BAA2B,mCAAmC;IAC9D,sBAAsB,6BAA6B;IACnD,8BAA8B,uCAAuC;IACrE,yBAAyB,iCAAiC;IAC1D,mCAAmC,6CAA6C;IAChF,8BAA8B,uCAAuC;IACrE,yBAAyB,iCAAiC;IAC1D,oBAAoB,2BAA2B;IAC/C,6BAA6B,sCAAsC;IACnE,oBAAoB,2BAA2B;CAChD;AAED,oBAAY,gBAAgB;IAC1B,GAAG,QAAQ;IACX,EAAE,OAAO;CACV;AAED,oBAAY,kBAAkB;IAC5B,SAAS,SAAS;IAClB,WAAW,WAAW;CACvB;AAED,oBAAY,SAAS;IACnB,GAAG,cAAc;IACjB,GAAG,QAAQ;IACX,EAAE,OAAO;IACT,IAAI,SAAS;IACb,QAAQ,aAAa;CACtB;AAED,oBAAY,0BAA0B;IACpC,WAAW,iBAAiB;IAC5B,SAAS,eAAe;IACxB,QAAQ,cAAc;IACtB,wBAAwB,+BAA+B;IACvD,2BAA2B,kCAAkC;IAC7D,sBAAsB,6BAA6B;IACnD,eAAe,qBAAqB;CACrC;AAED,oBAAY,qBAAqB;IAC/B,EAAE,OAAO;IACT,MAAM,WAAW;CAClB;AAED,oBAAY,0BAA0B;IACpC,MAAM,WAAW;IACjB,SAAS,eAAe;IACxB,MAAM,WAAW;CAClB;AAED,wBAAgB,kBAAkB,CAChC,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,UAAU,CAAC,EAAE;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EACpC,YAAY,CAAC,EAAE;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,GACrC,IAAI,CAUN;AAED,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,OAAO,EAChB,UAAU,CAAC,EAAE;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,GACnC,IAAI,CAkBN"}
+{"version":3,"file":"telemetry.d.ts","sourceRoot":"","sources":["../../src/common/telemetry.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAa,MAAM,wBAAwB,CAAC;AAE/E,qBAAa,yBAAyB;IACpC,OAAc,iBAAiB,EAAE,iBAAiB,GAAG,SAAS,CAAC;CAChE;AAED,oBAAY,iBAAiB;IAC3B,WAAW,iBAAiB;IAC5B,SAAS,cAAc;IACvB,KAAK,UAAU;IACf,OAAO,YAAY;IACnB,SAAS,eAAe;IACxB,SAAS,eAAe;IACxB,YAAY,kBAAkB;IAC9B,aAAa,oBAAoB;IACjC,SAAS,eAAe;IACxB,aAAa,mBAAmB;IAChC,GAAG,QAAQ;IACX,0BAA0B,kCAAkC;IAC5D,SAAS,eAAe;IACxB,MAAM,WAAW;IACjB,QAAQ,aAAa;IACrB,cAAc,oBAAoB;IAClC,YAAY,iBAAiB;IAC7B,aAAa,mBAAmB;IAChC,oBAAoB,2BAA2B;CAChD;AAED,oBAAY,cAAc;IACxB,mBAAmB,0BAA0B;IAC7C,cAAc,oBAAoB;IAClC,cAAc,oBAAoB;IAClC,mBAAmB,0BAA0B;IAC7C,QAAQ,cAAc;IACtB,eAAe,qBAAqB;IACpC,uBAAuB,+BAA+B;IACtD,kBAAkB,yBAAyB;IAC3C,gBAAgB,sBAAsB;IACtC,SAAS,eAAe;IACxB,gCAAgC,wCAAwC;IACxE,2BAA2B,kCAAkC;IAC7D,2BAA2B,mCAAmC;IAC9D,sBAAsB,6BAA6B;IACnD,8BAA8B,uCAAuC;IACrE,yBAAyB,iCAAiC;IAC1D,mCAAmC,6CAA6C;IAChF,8BAA8B,uCAAuC;IACrE,yBAAyB,iCAAiC;IAC1D,oBAAoB,2BAA2B;IAC/C,6BAA6B,sCAAsC;IACnE,oBAAoB,2BAA2B;IAC/C,eAAe,sBAAsB;IACrC,UAAU,gBAAgB;CAC3B;AAED,oBAAY,gBAAgB;IAC1B,GAAG,QAAQ;IACX,EAAE,OAAO;CACV;AAED,oBAAY,kBAAkB;IAC5B,SAAS,SAAS;IAClB,WAAW,WAAW;CACvB;AAED,oBAAY,SAAS;IACnB,GAAG,cAAc;IACjB,GAAG,QAAQ;IACX,EAAE,OAAO;IACT,IAAI,SAAS;IACb,QAAQ,aAAa;CACtB;AAED,oBAAY,0BAA0B;IACpC,WAAW,iBAAiB;IAC5B,SAAS,eAAe;IACxB,QAAQ,cAAc;IACtB,wBAAwB,+BAA+B;IACvD,2BAA2B,kCAAkC;IAC7D,sBAAsB,6BAA6B;IACnD,eAAe,qBAAqB;CACrC;AAED,oBAAY,qBAAqB;IAC/B,EAAE,OAAO;IACT,MAAM,WAAW;CAClB;AAED,oBAAY,0BAA0B;IACpC,MAAM,WAAW;IACjB,SAAS,eAAe;IACxB,MAAM,WAAW;CAClB;AAED,wBAAgB,kBAAkB,CAChC,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,UAAU,CAAC,EAAE;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EACpC,YAAY,CAAC,EAAE;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,GACrC,IAAI,CAUN;AAED,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,OAAO,EAChB,UAAU,CAAC,EAAE;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,GACnC,IAAI,CAkBN"}

package/build/common/telemetry.js

@@ -53,6 +53,8 @@ var TelemetryEvent;
     TelemetryEvent["ProjectMigratorGuide"] = "project-migrator-guide";
     TelemetryEvent["ProjectMigratorPrecheckFailed"] = "project-migrator-pre-check-failed";
     TelemetryEvent["ProjectMigratorError"] = "project-migrator-error";
+    TelemetryEvent["DetectPortStart"] = "detect-port-start";
+    TelemetryEvent["DetectPort"] = "detect-port";
 })(TelemetryEvent = exports.TelemetryEvent || (exports.TelemetryEvent = {}));
 var TelemetrySuccess;
 (function (TelemetrySuccess) {

package/build/common/telemetry.js.map

@@ -1 +1 @@
-{"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../src/common/telemetry.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAA+E;AAE/E,MAAa,yBAAyB;CAErC;AAFD,8DAEC;AAED,IAAY,iBAoBX;AApBD,WAAY,iBAAiB;IAC3B,iDAA4B,CAAA;IAC5B,4CAAuB,CAAA;IACvB,oCAAe,CAAA;IACf,wCAAmB,CAAA;IACnB,6CAAwB,CAAA;IACxB,6CAAwB,CAAA;IACxB,mDAA8B,CAAA;IAC9B,sDAAiC,CAAA;IACjC,6CAAwB,CAAA;IACxB,qDAAgC,CAAA;IAChC,gCAAW,CAAA;IACX,iFAA4D,CAAA;IAC5D,6CAAwB,CAAA;IACxB,sCAAiB,CAAA;IACjB,0CAAqB,CAAA;IACrB,uDAAkC,CAAA;IAClC,kDAA6B,CAAA;IAC7B,qDAAgC,CAAA;IAChC,oEAA+C,CAAA;AACjD,CAAC,EApBW,iBAAiB,GAAjB,yBAAiB,KAAjB,yBAAiB,QAoB5B;AAED,IAAY,cAuBX;AAvBD,WAAY,cAAc;IACxB,+DAA6C,CAAA;IAC7C,oDAAkC,CAAA;IAClC,oDAAkC,CAAA;IAClC,+DAA6C,CAAA;IAC7C,wCAAsB,CAAA;IACtB,sDAAoC,CAAA;IACpC,wEAAsD,CAAA;IACtD,6DAA2C,CAAA;IAC3C,wDAAsC,CAAA;IACtC,0CAAwB,CAAA;IACxB,0FAAwE,CAAA;IACxE,+EAA6D,CAAA;IAC7D,gFAA8D,CAAA;IAC9D,qEAAmD,CAAA;IACnD,uFAAqE,CAAA;IACrE,4EAA0D,CAAA;IAC1D,kGAAgF,CAAA;IAChF,uFAAqE,CAAA;IACrE,4EAA0D,CAAA;IAC1D,iEAA+C,CAAA;IAC/C,qFAAmE,CAAA;IACnE,iEAA+C,CAAA;AACjD,CAAC,EAvBW,cAAc,GAAd,sBAAc,KAAd,sBAAc,QAuBzB;AAED,IAAY,gBAGX;AAHD,WAAY,gBAAgB;IAC1B,+BAAW,CAAA;IACX,6BAAS,CAAA;AACX,CAAC,EAHW,gBAAgB,GAAhB,wBAAgB,KAAhB,wBAAgB,QAG3B;AAED,IAAY,kBAGX;AAHD,WAAY,kBAAkB;IAC5B,wCAAkB,CAAA;IAClB,4CAAsB,CAAA;AACxB,CAAC,EAHW,kBAAkB,GAAlB,0BAAkB,KAAlB,0BAAkB,QAG7B;AAED,IAAY,SAMX;AAND,WAAY,SAAS;IACnB,8BAAiB,CAAA;IACjB,wBAAW,CAAA;IACX,sBAAS,CAAA;IACT,0BAAa,CAAA;IACb,kCAAqB,CAAA;AACvB,CAAC,EANW,SAAS,GAAT,iBAAS,KAAT,iBAAS,QAMpB;AAED,IAAY,0BAQX;AARD,WAAY,0BAA0B;IACpC,0DAA4B,CAAA;IAC5B,sDAAwB,CAAA;IACxB,oDAAsB,CAAA;IACtB,qFAAuD,CAAA;IACvD,2FAA6D,CAAA;IAC7D,iFAAmD,CAAA;IACnD,kEAAoC,CAAA;AACtC,CAAC,EARW,0BAA0B,GAA1B,kCAA0B,KAA1B,kCAA0B,QAQrC;AAED,IAAY,qBAGX;AAHD,WAAY,qBAAqB;IAC/B,kCAAS,CAAA;IACT,0CAAiB,CAAA;AACnB,CAAC,EAHW,qBAAqB,GAArB,6BAAqB,KAArB,6BAAqB,QAGhC;AAED,IAAY,0BAIX;AAJD,WAAY,0BAA0B;IACpC,+CAAiB,CAAA;IACjB,sDAAwB,CAAA;IACxB,+CAAiB,CAAA;AACnB,CAAC,EAJW,0BAA0B,GAA1B,kCAA0B,KAA1B,kCAA0B,QAIrC;AAED,SAAgB,kBAAkB,CAChC,SAAiB,EACjB,SAAiB,EACjB,UAAoC,EACpC,YAAsC;;IAEtC,IAAI,CAAC,UAAU,EAAE;QACf,UAAU,GAAG,EAAE,CAAC;KACjB;IACD,UAAU,CAAC,iBAAiB,CAAC,SAAS,CAAC,GAAG,SAAS,CAAC;IACpD,MAAA,yBAAyB,CAAC,iBAAiB,0CAAE,kBAAkB,CAC7D,SAAS,EACT,UAAU,EACV,YAAY,CACb,CAAC;AACJ,CAAC;AAfD,gDAeC;AAED,SAAgB,uBAAuB,CACrC,SAAiB,EACjB,SAAiB,EACjB,OAAgB,EAChB,UAAoC;;IAEpC,IAAI,CAAC,UAAU,EAAE;QACf,UAAU,GAAG,EAAE,CAAC;KACjB;IACD,UAAU,CAAC,iBAAiB,CAAC,SAAS,CAAC,GAAG,SAAS,CAAC;IACpD,UAAU,CAAC,iBAAiB,CAAC,OAAO,CAAC,GAAG,gBAAgB,CAAC,EAAE,CAAC;IAC5D,IAAI,OAAO,YAAY,uBAAS,EAAE;QAChC,UAAU,CAAC,iBAAiB,CAAC,SAAS,CAAC,GAAG,kBAAkB,CAAC,SAAS,CAAC;KACxE;SAAM;QACL,UAAU,CAAC,iBAAiB,CAAC,SAAS,CAAC,GAAG,kBAAkB,CAAC,WAAW,CAAC;KAC1E;IAED,UAAU,CAAC,iBAAiB,CAAC,SAAS,CAAC,GAAG,GAAG,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;IAC9E,UAAU,CAAC,iBAAiB,CAAC,YAAY,CAAC,GAAG,GAAG,OAAO,CAAC,OAAO,GAC7D,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,YAAY,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EACjD,EAAE,CAAC;IAEH,MAAA,yBAAyB,CAAC,iBAAiB,0CAAE,uBAAuB,CAAC,SAAS,EAAE,UAAU,EAAE,EAAE,CAAC,CAAC;AAClG,CAAC;AAvBD,0DAuBC"}
+{"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../src/common/telemetry.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAA+E;AAE/E,MAAa,yBAAyB;CAErC;AAFD,8DAEC;AAED,IAAY,iBAoBX;AApBD,WAAY,iBAAiB;IAC3B,iDAA4B,CAAA;IAC5B,4CAAuB,CAAA;IACvB,oCAAe,CAAA;IACf,wCAAmB,CAAA;IACnB,6CAAwB,CAAA;IACxB,6CAAwB,CAAA;IACxB,mDAA8B,CAAA;IAC9B,sDAAiC,CAAA;IACjC,6CAAwB,CAAA;IACxB,qDAAgC,CAAA;IAChC,gCAAW,CAAA;IACX,iFAA4D,CAAA;IAC5D,6CAAwB,CAAA;IACxB,sCAAiB,CAAA;IACjB,0CAAqB,CAAA;IACrB,uDAAkC,CAAA;IAClC,kDAA6B,CAAA;IAC7B,qDAAgC,CAAA;IAChC,oEAA+C,CAAA;AACjD,CAAC,EApBW,iBAAiB,GAAjB,yBAAiB,KAAjB,yBAAiB,QAoB5B;AAED,IAAY,cAyBX;AAzBD,WAAY,cAAc;IACxB,+DAA6C,CAAA;IAC7C,oDAAkC,CAAA;IAClC,oDAAkC,CAAA;IAClC,+DAA6C,CAAA;IAC7C,wCAAsB,CAAA;IACtB,sDAAoC,CAAA;IACpC,wEAAsD,CAAA;IACtD,6DAA2C,CAAA;IAC3C,wDAAsC,CAAA;IACtC,0CAAwB,CAAA;IACxB,0FAAwE,CAAA;IACxE,+EAA6D,CAAA;IAC7D,gFAA8D,CAAA;IAC9D,qEAAmD,CAAA;IACnD,uFAAqE,CAAA;IACrE,4EAA0D,CAAA;IAC1D,kGAAgF,CAAA;IAChF,uFAAqE,CAAA;IACrE,4EAA0D,CAAA;IAC1D,iEAA+C,CAAA;IAC/C,qFAAmE,CAAA;IACnE,iEAA+C,CAAA;IAC/C,uDAAqC,CAAA;IACrC,4CAA0B,CAAA;AAC5B,CAAC,EAzBW,cAAc,GAAd,sBAAc,KAAd,sBAAc,QAyBzB;AAED,IAAY,gBAGX;AAHD,WAAY,gBAAgB;IAC1B,+BAAW,CAAA;IACX,6BAAS,CAAA;AACX,CAAC,EAHW,gBAAgB,GAAhB,wBAAgB,KAAhB,wBAAgB,QAG3B;AAED,IAAY,kBAGX;AAHD,WAAY,kBAAkB;IAC5B,wCAAkB,CAAA;IAClB,4CAAsB,CAAA;AACxB,CAAC,EAHW,kBAAkB,GAAlB,0BAAkB,KAAlB,0BAAkB,QAG7B;AAED,IAAY,SAMX;AAND,WAAY,SAAS;IACnB,8BAAiB,CAAA;IACjB,wBAAW,CAAA;IACX,sBAAS,CAAA;IACT,0BAAa,CAAA;IACb,kCAAqB,CAAA;AACvB,CAAC,EANW,SAAS,GAAT,iBAAS,KAAT,iBAAS,QAMpB;AAED,IAAY,0BAQX;AARD,WAAY,0BAA0B;IACpC,0DAA4B,CAAA;IAC5B,sDAAwB,CAAA;IACxB,oDAAsB,CAAA;IACtB,qFAAuD,CAAA;IACvD,2FAA6D,CAAA;IAC7D,iFAAmD,CAAA;IACnD,kEAAoC,CAAA;AACtC,CAAC,EARW,0BAA0B,GAA1B,kCAA0B,KAA1B,kCAA0B,QAQrC;AAED,IAAY,qBAGX;AAHD,WAAY,qBAAqB;IAC/B,kCAAS,CAAA;IACT,0CAAiB,CAAA;AACnB,CAAC,EAHW,qBAAqB,GAArB,6BAAqB,KAArB,6BAAqB,QAGhC;AAED,IAAY,0BAIX;AAJD,WAAY,0BAA0B;IACpC,+CAAiB,CAAA;IACjB,sDAAwB,CAAA;IACxB,+CAAiB,CAAA;AACnB,CAAC,EAJW,0BAA0B,GAA1B,kCAA0B,KAA1B,kCAA0B,QAIrC;AAED,SAAgB,kBAAkB,CAChC,SAAiB,EACjB,SAAiB,EACjB,UAAoC,EACpC,YAAsC;;IAEtC,IAAI,CAAC,UAAU,EAAE;QACf,UAAU,GAAG,EAAE,CAAC;KACjB;IACD,UAAU,CAAC,iBAAiB,CAAC,SAAS,CAAC,GAAG,SAAS,CAAC;IACpD,MAAA,yBAAyB,CAAC,iBAAiB,0CAAE,kBAAkB,CAC7D,SAAS,EACT,UAAU,EACV,YAAY,CACb,CAAC;AACJ,CAAC;AAfD,gDAeC;AAED,SAAgB,uBAAuB,CACrC,SAAiB,EACjB,SAAiB,EACjB,OAAgB,EAChB,UAAoC;;IAEpC,IAAI,CAAC,UAAU,EAAE;QACf,UAAU,GAAG,EAAE,CAAC;KACjB;IACD,UAAU,CAAC,iBAAiB,CAAC,SAAS,CAAC,GAAG,SAAS,CAAC;IACpD,UAAU,CAAC,iBAAiB,CAAC,OAAO,CAAC,GAAG,gBAAgB,CAAC,EAAE,CAAC;IAC5D,IAAI,OAAO,YAAY,uBAAS,EAAE;QAChC,UAAU,CAAC,iBAAiB,CAAC,SAAS,CAAC,GAAG,kBAAkB,CAAC,SAAS,CAAC;KACxE;SAAM;QACL,UAAU,CAAC,iBAAiB,CAAC,SAAS,CAAC,GAAG,kBAAkB,CAAC,WAAW,CAAC;KAC1E;IAED,UAAU,CAAC,iBAAiB,CAAC,SAAS,CAAC,GAAG,GAAG,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;IAC9E,UAAU,CAAC,iBAAiB,CAAC,YAAY,CAAC,GAAG,GAAG,OAAO,CAAC,OAAO,GAC7D,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,YAAY,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EACjD,EAAE,CAAC;IAEH,MAAA,yBAAyB,CAAC,iBAAiB,0CAAE,uBAAuB,CAAC,SAAS,EAAE,UAAU,EAAE,EAAE,CAAC,CAAC;AAClG,CAAC;AAvBD,0DAuBC"}

package/build/common/template-utils/templatesActions.js

@@ -7,8 +7,8 @@ const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const path_1 = tslib_1.__importDefault(require("path"));
 const folder_1 = require("../../folder");
 const templatesUtils_1 = require("./templatesUtils");
-const defaultTryLimits = 3;
-const defaultTimeoutInMs = 10000;
+const defaultTryLimits = 1;
+const defaultTimeoutInMs = 30000;
 const missKeyErrorInfo = (key) => `Missing ${key} in template action.`;
 var ScaffoldActionName;
 (function (ScaffoldActionName) {

package/build/common/template-utils/templatesUtils.d.ts

@@ -1,9 +1,10 @@
 /// <reference types="node" />
 import AdmZip from "adm-zip";
-import { AxiosResponse } from "axios";
+import { AxiosResponse, CancelToken } from "axios";
 export declare const tagListUrl: string;
 export declare const templateFileExt = ".tpl";
 export declare function sendRequestWithRetry<T>(requestFn: () => Promise<AxiosResponse<T>>, tryLimits: number): Promise<AxiosResponse<T>>;
+export declare function sendRequestWithTimeout<T>(requestFn: (cancelToken: CancelToken) => Promise<AxiosResponse<T>>, timeoutInMs: number, tryLimits?: number): Promise<AxiosResponse<T>>;
 export declare function fetchTemplateTagList(url: string, tryLimits: number, timeoutInMs: number): Promise<string>;
 export declare function fetchTemplateUrl(group: string, language: string, scenario: string, tryLimits: number, timeoutInMs: number): Promise<string>;
 export declare function fetchZipFromUrl(url: string, tryLimits: number, timeoutInMs: number): Promise<AdmZip>;

package/build/common/template-utils/templatesUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"templatesUtils.d.ts","sourceRoot":"","sources":["../../../src/common/template-utils/templatesUtils.ts"],"names":[],"mappings":";AAGA,OAAO,MAAM,MAAM,SAAS,CAAC;AAC7B,OAAc,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAQ7C,eAAO,MAAM,UAAU,QAAoB,CAAC;AAC5C,eAAO,MAAM,eAAe,SAAS,CAAC;AAEtC,wBAAsB,oBAAoB,CAAC,CAAC,EAC1C,SAAS,EAAE,MAAM,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,EAC1C,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAwB3B;AAED,wBAAsB,oBAAoB,CACxC,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,MAAM,CAAC,CAOjB;AAED,wBAAsB,gBAAgB,CACpC,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,MAAM,CAAC,CAOjB;AAED,wBAAsB,eAAe,CACnC,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,MAAM,CAAC,CAUjB;AAGD,wBAAsB,KAAK,CACzB,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,MAAM,EACf,aAAa,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,MAAM,EAC1D,aAAa,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,MAAM,GAAG,MAAM,GAClE,OAAO,CAAC,IAAI,CAAC,CAiBf;AAED,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,GACnC,MAAM,GAAG,MAAM,CAMjB"}
+{"version":3,"file":"templatesUtils.d.ts","sourceRoot":"","sources":["../../../src/common/template-utils/templatesUtils.ts"],"names":[],"mappings":";AAGA,OAAO,MAAM,MAAM,SAAS,CAAC;AAC7B,OAAc,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AAQ1D,eAAO,MAAM,UAAU,QAAoB,CAAC;AAC5C,eAAO,MAAM,eAAe,SAAS,CAAC;AAEtC,wBAAsB,oBAAoB,CAAC,CAAC,EAC1C,SAAS,EAAE,MAAM,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,EAC1C,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAwB3B;AAED,wBAAsB,sBAAsB,CAAC,CAAC,EAC5C,SAAS,EAAE,CAAC,WAAW,EAAE,WAAW,KAAK,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,EAClE,WAAW,EAAE,MAAM,EACnB,SAAS,SAAI,GACZ,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAe3B;AAED,wBAAsB,oBAAoB,CACxC,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,MAAM,CAAC,CAWjB;AAED,wBAAsB,gBAAgB,CACpC,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,MAAM,CAAC,CAOjB;AAED,wBAAsB,eAAe,CACnC,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,MAAM,CAAC,CAcjB;AAGD,wBAAsB,KAAK,CACzB,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,MAAM,EACf,aAAa,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,MAAM,EAC1D,aAAa,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,MAAM,GAAG,MAAM,GAClE,OAAO,CAAC,IAAI,CAAC,CAiBf;AAED,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,GACnC,MAAM,GAAG,MAAM,CAMjB"}

package/build/common/template-utils/templatesUtils.js

@@ -2,7 +2,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.renderTemplateContent = exports.unzip = exports.fetchZipFromUrl = exports.fetchTemplateUrl = exports.fetchTemplateTagList = exports.sendRequestWithRetry = exports.templateFileExt = exports.tagListUrl = void 0;
+exports.renderTemplateContent = exports.unzip = exports.fetchZipFromUrl = exports.fetchTemplateUrl = exports.fetchTemplateTagList = exports.sendRequestWithTimeout = exports.sendRequestWithRetry = exports.templateFileExt = exports.tagListUrl = void 0;
 const tslib_1 = require("tslib");
 const adm_zip_1 = tslib_1.__importDefault(require("adm-zip"));
 const axios_1 = tslib_1.__importDefault(require("axios"));
@@ -37,12 +37,30 @@ async function sendRequestWithRetry(requestFn, tryLimits) {
     throw error;
 }
 exports.sendRequestWithRetry = sendRequestWithRetry;
+async function sendRequestWithTimeout(requestFn, timeoutInMs, tryLimits = 1) {
+    const source = axios_1.default.CancelToken.source();
+    const timeout = setTimeout(() => {
+        source.cancel();
+    }, timeoutInMs);
+    try {
+        const res = await sendRequestWithRetry(() => requestFn(source.token), tryLimits);
+        clearTimeout(timeout);
+        return res;
+    }
+    catch (err) {
+        if (axios_1.default.isCancel(err)) {
+            throw new Error("Request timeout");
+        }
+        throw err;
+    }
+}
+exports.sendRequestWithTimeout = sendRequestWithTimeout;
 async function fetchTemplateTagList(url, tryLimits, timeoutInMs) {
-    const res = await sendRequestWithRetry(async () => {
+    const res = await sendRequestWithTimeout(async (cancelToken) => {
         return await axios_1.default.get(url, {
-            timeout: timeoutInMs,
+            cancelToken: cancelToken,
         });
-    }, tryLimits);
+    }, timeoutInMs, tryLimits);
     return res.data;
 }
 exports.fetchTemplateTagList = fetchTemplateTagList;
@@ -56,12 +74,12 @@ async function fetchTemplateUrl(group, language, scenario, tryLimits, timeoutInM
 }
 exports.fetchTemplateUrl = fetchTemplateUrl;
 async function fetchZipFromUrl(url, tryLimits, timeoutInMs) {
-    const res = await sendRequestWithRetry(async () => {
+    const res = await sendRequestWithTimeout(async (cancelToken) => {
         return await axios_1.default.get(url, {
             responseType: "arraybuffer",
-            timeout: timeoutInMs,
+            cancelToken: cancelToken,
         });
-    }, tryLimits);
+    }, timeoutInMs, tryLimits);
     const zip = new adm_zip_1.default(res.data);
     return zip;
 }

package/build/common/template-utils/templatesUtils.js.map

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

package/build/common/templates-config.json

@@ -1,6 +1,6 @@
 {
-    "version": "^0.2.0",
-    "tagPrefix": "templates@",
+    "version": "0.0.0-alpha",
+    "tagPrefix": "templates-",
     "tagListURL": "https://github.com/OfficeDev/TeamsFx/releases/download/template-tag-list/template-tags.txt",
     "templateDownloadBaseURL": "https://github.com/OfficeDev/TeamsFx/releases/download"
 }

package/build/common/tools.d.ts

@@ -50,10 +50,6 @@ export declare function isFeatureFlagEnabled(featureFlagName: string, defaultVal
  */
 export declare function isMultiEnvEnabled(): boolean;
 export declare function isBicepEnvCheckerEnabled(): boolean;
-/**
- * @deprecated Please DO NOT use this method any more, it will be removed in near future.
- */
-export declare function isRemoteCollaborateEnabled(): boolean;
 export declare function getRootDirectory(): string;
 export declare function generateBicepFromFile(templateFilePath: string, context: any): Promise<string>;
 export declare function compileHandlebarsTemplateString(templateString: string, context: any): string;

package/build/common/tools.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../../src/common/tools.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../../src/common/tools.ts"],"names":[],"mappings":";AAEA,OAAO,EAEL,oBAAoB,EAEpB,SAAS,EAET,OAAO,EACP,IAAI,EAGJ,MAAM,EAGN,gBAAgB,EAEhB,eAAe,EACf,eAAe,EAKhB,MAAM,wBAAwB,CAAC;AAGhC,OAAO,EAAQ,WAAW,EAAE,MAAM,eAAe,CAAC;AAsClD,eAAO,MAAM,QAAQ;8BACa,MAAM;;;;CAIvC,CAAC;AAEF,wBAAsB,UAAU,CAAC,IAAI,EAAE,MAAM,iBAI5C;AAED,wBAAsB,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAa5E;AAED;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,IAAI,CAWnD;AAED;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,CAAC,EAAE,IAAI,GAAG,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,CAYlD;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,CAAC,CAAC,EAAE,IAAI,GAAG,SAAS,CAUrD;AAYD,eAAO,MAAM,kBAAkB,aAQ7B,CAAC;AAEH,eAAO,MAAM,cAAc,6BAA6B,CAAC;AAEzD;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAEvD;AAED,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CA2B3E;AAED,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CAiB9E;AAED,wBAAgB,2BAA2B,CACzC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC/B,MAAM,CAYR;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAOlE;AAED,eAAO,MAAM,QAAQ,qBAwBpB,CAAC;AAEF,wBAAgB,UAAU,IAAI,GAAG,CAGhC;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAOvD;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAMzD;AAED,wBAAsB,eAAe,CACnC,oBAAoB,EAAE,oBAAoB,EAC1C,EAAE,EAAE,eAAe,EACnB,oBAAoB,CAAC,EAAE,MAAM,GAC5B,OAAO,CAAC,MAAM,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC,CA2C5C;AAED,wBAAgB,wBAAwB,CACtC,cAAc,CAAC,EAAE,MAAM,EACvB,QAAQ,CAAC,EAAE,MAAM,EACjB,iBAAiB,CAAC,EAAE,MAAM,GACzB,MAAM,GAAG,SAAS,CAMpB;AAGD,wBAAgB,oBAAoB,CAAC,eAAe,EAAE,MAAM,EAAE,YAAY,UAAQ,GAAG,OAAO,CAO3F;AAED;;GAEG;AACH,wBAAgB,iBAAiB,IAAI,OAAO,CAE3C;AAED,wBAAgB,wBAAwB,IAAI,OAAO,CAElD;AAED,wBAAgB,gBAAgB,IAAI,MAAM,CAOzC;AAED,wBAAsB,qBAAqB,CACzC,gBAAgB,EAAE,MAAM,EACxB,OAAO,EAAE,GAAG,GACX,OAAO,CAAC,MAAM,CAAC,CAYjB;AAED,wBAAgB,+BAA+B,CAAC,cAAc,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,MAAM,CAG5F;AAED,wBAAsB,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAa1E;AAED;;GAEG;AACH,wBAAgB,oBAAoB,IAAI,MAAM,CAM7C;AAED,wBAAsB,SAAS,CAC7B,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,EAChB,eAAe,GAAE;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,OAAO,CAAA;CAAE,EAAO,GAC/D,OAAO,CAAC,IAAI,CAAC,CAoBf;AAED,wBAAgB,mCAAmC,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAS9E;AAED,wBAAgB,yBAAyB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAMpE;AAED,wBAAgB,kCAAkC,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAM7E;AAED,wBAAgB,+BAA+B,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAM1E;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAG/E;AAED,wBAAsB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE/D;AAED,wBAAgB,OAAO,IAAI,MAAM,CAEhC;AAED,wBAAgB,aAAa,CAAC,eAAe,CAAC,EAAE,eAAe,GAAG,OAAO,CAOxE;AAED,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAEpD;AAED,wBAAgB,mBAAmB,CAAC,eAAe,EAAE,eAAe,GAAG,SAAS,GAAG,OAAO,CAGzF;AAwDD;;;;;;;;;;;;;;;;;;;;;;;;;;IA0BI;AACJ,wBAAgB,YAAY,CAAC,GAAG,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,iBAAiB,SAAI,GAAG,OAAO,CAE9F;AAED,wBAAgB,gBAAgB,IAAI,MAAM,EAAE,CAW3C;AAED,wBAAsB,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,CA+CtF"}

package/build/common/tools.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSideloadingStatus = exports.getAllowedAppIds = exports.redactObject = exports.IsSimpleAuthEnabled = exports.getHashedEnv = exports.isSPFxProject = exports.getUuid = exports.waitSeconds = exports.parseFromResourceId = exports.getSubscriptionIdFromResourceId = exports.getResourceGroupNameFromResourceId = exports.getSiteNameFromResourceId = exports.getStorageAccountNameFromResourceId = exports.copyFiles = exports.getAppStudioEndpoint = exports.getAppDirectory = exports.compileHandlebarsTemplateString = exports.generateBicepFromFile = exports.getRootDirectory = exports.isRemoteCollaborateEnabled = exports.isBicepEnvCheckerEnabled = exports.isMultiEnvEnabled = exports.isFeatureFlagEnabled = exports.getResourceGroupInPortal = exports.askSubscription = exports.isCheckAccountError = exports.isUserCancelError = exports.getStrings = exports.deepCopy = exports.serializeDict = exports.replaceTemplateWithUserData = exports.convertDotenvToEmbeddedJson = exports.separateSecretData = exports.dataNeedEncryption = exports.AzurePortalUrl = exports.CryptoDataMatchers = exports.objectToConfigMap = exports.objectToMap = exports.mapToJson = exports.ensureUniqueFolder = exports.npmInstall = exports.Executor = void 0;
+exports.getSideloadingStatus = exports.getAllowedAppIds = exports.redactObject = exports.IsSimpleAuthEnabled = exports.getHashedEnv = exports.isSPFxProject = exports.getUuid = exports.waitSeconds = exports.parseFromResourceId = exports.getSubscriptionIdFromResourceId = exports.getResourceGroupNameFromResourceId = exports.getSiteNameFromResourceId = exports.getStorageAccountNameFromResourceId = exports.copyFiles = exports.getAppStudioEndpoint = exports.getAppDirectory = exports.compileHandlebarsTemplateString = exports.generateBicepFromFile = exports.getRootDirectory = exports.isBicepEnvCheckerEnabled = exports.isMultiEnvEnabled = exports.isFeatureFlagEnabled = exports.getResourceGroupInPortal = exports.askSubscription = exports.isCheckAccountError = exports.isUserCancelError = exports.getStrings = exports.deepCopy = exports.serializeDict = exports.replaceTemplateWithUserData = exports.convertDotenvToEmbeddedJson = exports.separateSecretData = exports.dataNeedEncryption = exports.AzurePortalUrl = exports.CryptoDataMatchers = exports.objectToConfigMap = exports.objectToMap = exports.mapToJson = exports.ensureUniqueFolder = exports.npmInstall = exports.Executor = void 0;
 const tslib_1 = require("tslib");
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
@@ -325,13 +325,6 @@ function isBicepEnvCheckerEnabled() {
     return isFeatureFlagEnabled(constants_1.FeatureFlagName.BicepEnvCheckerEnable, true);
 }
 exports.isBicepEnvCheckerEnabled = isBicepEnvCheckerEnabled;
-/**
- * @deprecated Please DO NOT use this method any more, it will be removed in near future.
- */
-function isRemoteCollaborateEnabled() {
-    return isFeatureFlagEnabled(constants_1.FeatureFlagName.InsiderPreview, true);
-}
-exports.isRemoteCollaborateEnabled = isRemoteCollaborateEnabled;
 function getRootDirectory() {
     const root = process.env[constants_1.FeatureFlagName.rootDirectory];
     if (root === undefined || root === "") {
@@ -534,10 +527,12 @@ function getAllowedAppIds() {
     return [
         constants_1.TeamsClientId.MobileDesktop,
         constants_1.TeamsClientId.Web,
+        constants_1.OfficeClientId.Desktop,
         constants_1.OfficeClientId.Web1,
         constants_1.OfficeClientId.Web2,
         constants_1.OutlookClientId.Desktop,
-        constants_1.OutlookClientId.Web,
+        constants_1.OutlookClientId.Web1,
+        constants_1.OutlookClientId.Web2,
     ];
 }
 exports.getAllowedAppIds = getAllowedAppIds;