npm - @microsoft/teamsfx-core - Versions diffs - 1.6.1 → 1.7.0-rc.0 - Mend

@microsoft/teamsfx-core 1.6.1 → 1.7.0-rc.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (437) hide show

package/build/plugins/solution/fx-solution/v2/scaffolding.js CHANGED Viewed

@@ -15,8 +15,12 @@ const typedi_1 = require("typedi");
 const scaffolding_1 = require("../debug/scaffolding");
 const folder_1 = require("../../../../folder");
 const localizeUtils_1 = require("../../../../common/localizeUtils");
+const tools_1 = require("./../../../../common/tools");
 async function scaffoldSourceCode(ctx, inputs) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g, _h;
+    (_a = ctx.telemetryReporter) === null || _a === void 0 ? void 0 : _a.sendTelemetryEvent(constants_1.SolutionTelemetryEvent.CreateStart, {
+        [constants_1.SolutionTelemetryProperty.Component]: constants_1.SolutionTelemetryComponentName,
+    });
     if (inputs.projectPath === undefined) {
         return teamsfx_api_1.err(new teamsfx_api_1.SystemError("Solution", constants_1.SolutionError.InternelError, "projectPath is undefined"));
     }
@@ -48,7 +52,6 @@ async function scaffoldSourceCode(ctx, inputs) {
     if (result.kind === "success") {
         const capabilities = (solutionSettings === null || solutionSettings === void 0 ? void 0 : solutionSettings.capabilities) || [];
         const azureResources = (solutionSettings === null || solutionSettings === void 0 ? void 0 : solutionSettings.azureResources) || [];
-        // TODO: move this to if/else part when unify config job is completed
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         const scaffoldLocalDebugSettingsResult = await scaffolding_1.scaffoldLocalDebugSettings(ctx, inputs);
         if (scaffoldLocalDebugSettingsResult.isErr()) {
@@ -58,16 +61,18 @@ async function scaffoldSourceCode(ctx, inputs) {
             await scaffoldReadme(capabilities, azureResources, inputs.projectPath);
         }
         if (utils_1.isAzureProject(solutionSettings)) {
-            await fs_extra_1.default.writeJSON(`${inputs.projectPath}/permissions.json`, constants_1.DEFAULT_PERMISSION_REQUEST, {
-                spaces: 4,
-            });
-            (_a = ctx.telemetryReporter) === null || _a === void 0 ? void 0 : _a.sendTelemetryEvent(constants_1.SolutionTelemetryEvent.Create, {
+            if (!tools_1.isAadManifestEnabled()) {
+                await fs_extra_1.default.writeJSON(`${inputs.projectPath}/permissions.json`, constants_1.DEFAULT_PERMISSION_REQUEST, {
+                    spaces: 4,
+                });
+            }
+            (_b = ctx.telemetryReporter) === null || _b === void 0 ? void 0 : _b.sendTelemetryEvent(constants_1.SolutionTelemetryEvent.Create, {
                 [constants_1.SolutionTelemetryProperty.Component]: constants_1.SolutionTelemetryComponentName,
                 [constants_1.SolutionTelemetryProperty.Success]: constants_1.SolutionTelemetrySuccess.Yes,
                 [constants_1.SolutionTelemetryProperty.Resources]: ((solutionSettings === null || solutionSettings === void 0 ? void 0 : solutionSettings.azureResources) || []).join(";"),
                 [constants_1.SolutionTelemetryProperty.Capabilities]: ((solutionSettings === null || solutionSettings === void 0 ? void 0 : solutionSettings.capabilities) || []).join(";"),
-                [constants_1.SolutionTelemetryProperty.ProgrammingLanguage]: (_c = (_b = ctx.projectSetting) === null || _b === void 0 ? void 0 : _b.programmingLanguage) !== null && _c !== void 0 ? _c : "",
-                "host-type": "azure",
+                [constants_1.SolutionTelemetryProperty.ProgrammingLanguage]: (_d = (_c = ctx.projectSetting) === null || _c === void 0 ? void 0 : _c.programmingLanguage) !== null && _d !== void 0 ? _d : "",
+                [constants_1.SolutionTelemetryProperty.HostType]: "azure",
             });
         }
         else {
@@ -77,12 +82,12 @@ async function scaffoldSourceCode(ctx, inputs) {
                 if (spfxRes.isErr()) {
                     return teamsfx_api_1.err(spfxRes.error);
                 }
-                (_d = ctx.telemetryReporter) === null || _d === void 0 ? void 0 : _d.sendTelemetryEvent(constants_1.SolutionTelemetryEvent.Create, {
+                (_e = ctx.telemetryReporter) === null || _e === void 0 ? void 0 : _e.sendTelemetryEvent(constants_1.SolutionTelemetryEvent.Create, {
                     [constants_1.SolutionTelemetryProperty.Component]: constants_1.SolutionTelemetryComponentName,
                     [constants_1.SolutionTelemetryProperty.Success]: constants_1.SolutionTelemetrySuccess.Yes,
                     [constants_1.SolutionTelemetryProperty.Capabilities]: ((solutionSettings === null || solutionSettings === void 0 ? void 0 : solutionSettings.capabilities) || []).join(";"),
-                    [constants_1.SolutionTelemetryProperty.ProgrammingLanguage]: (_f = (_e = ctx.projectSetting) === null || _e === void 0 ? void 0 : _e.programmingLanguage) !== null && _f !== void 0 ? _f : "",
-                    "host-type": "spfx",
+                    [constants_1.SolutionTelemetryProperty.ProgrammingLanguage]: (_g = (_f = ctx.projectSetting) === null || _f === void 0 ? void 0 : _f.programmingLanguage) !== null && _g !== void 0 ? _g : "",
+                    [constants_1.SolutionTelemetryProperty.HostType]: "spfx",
                 });
             }
         }
@@ -90,11 +95,18 @@ async function scaffoldSourceCode(ctx, inputs) {
         return teamsfx_api_1.ok(teamsfx_api_1.Void);
     }
     else {
+        (_h = ctx.telemetryReporter) === null || _h === void 0 ? void 0 : _h.sendTelemetryErrorEvent(constants_1.SolutionTelemetryEvent.Create, {
+            [constants_1.SolutionTelemetryProperty.Component]: constants_1.SolutionTelemetryComponentName,
+            [constants_1.SolutionTelemetryProperty.Success]: constants_1.SolutionTelemetrySuccess.No,
+            [constants_1.SolutionTelemetryProperty.ErrorCode]: result.error.name,
+            [constants_1.SolutionTelemetryProperty.ErrorMessage]: result.error.message,
+            [constants_1.SolutionTelemetryProperty.HostType]: utils_1.isAzureProject(solutionSettings) ? "azure" : "spfx",
+        });
         return teamsfx_api_1.err(result.error);
     }
 }
 exports.scaffoldSourceCode = scaffoldSourceCode;
-async function scaffoldByPlugins(ctx, inputs, localSettings, plugins) {
+async function scaffoldByPlugins(ctx, inputs, localSettings, plugins, concurrent = true) {
     var _a, _b, _c;
     if (plugins.length === 0)
         return teamsfx_api_1.ok(teamsfx_api_1.Void);
@@ -109,7 +121,7 @@ async function scaffoldByPlugins(ctx, inputs, localSettings, plugins) {
             thunk: () => plugin.scaffoldSourceCode(ctx, inputs),
         };
     });
-    const result = await executor_1.executeConcurrently(thunks, ctx.logProvider);
+    const result = await executor_1.executeConcurrently(thunks, ctx.logProvider, concurrent);
     const solutionSettings = utils_1.getAzureSolutionSettings(ctx);
     if (result.kind === "success") {
         const capabilities = (solutionSettings === null || solutionSettings === void 0 ? void 0 : solutionSettings.capabilities) || [];

package/build/plugins/solution/fx-solution/v2/scaffolding.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"scaffolding.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/scaffolding.ts"],"names":[],"mappings":";;;;AAAA,~~wDAWgC~~;AAChC,0CAKqB;AACrB,yCAA6D;AAC7D,mCAKiB;AACjB,oFAAuE;AACvE,wDAAwB;AACxB,gEAA0B;AAC1B,4CAOsB;AACtB,wEAA+D;AAC/D,mCAAmC;AACnC,sDAAkE;AAClE,+CAAwD;AACxD,oEAAsE;~~AAE/D~~,KAAK,UAAU,kBAAkB,CACtC,GAAe,EACf,MAAc;;IAEd,IAAI,MAAM,CAAC,WAAW,KAAK,SAAS,EAAE;QACpC,OAAO,iBAAG,CACR,IAAI,yBAAW,CAAC,UAAU,EAAE,yBAAa,CAAC,aAAa,EAAE,0BAA0B,CAAC,CACrF,CAAC;KACH;IACD,MAAM,IAAI,GAAG,MAAM,CAAC,qCAA0B,CAAC,mBAAmB,CAAW,CAAC;IAC9E,IAAI,IAAI,EAAE;QACR,GAAG,CAAC,cAAc,CAAC,mBAAmB,GAAG,IAAI,CAAC;KAC/C;IACD,MAAM,gBAAgB,GAAG,gCAAwB,CAAC,GAAG,CAAC,CAAC;IACvD,MAAM,SAAS,GAAG,8BAAsB,CAAC,GAAG,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;IACrE,IAAI,SAAS,CAAC,KAAK,EAAE;QAAE,OAAO,iBAAG,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IACnD,MAAM,OAAO,GAAG,0BAAkB,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IAEvD,IAAI,MAAM,GAAuB,OAAO;SACrC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,kBAAkB,CAAC;SAC/C,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;QACd,OAAO;YACL,UAAU,EAAE,GAAG,MAAM,CAAC,IAAI,EAAE;YAC5B,QAAQ,EAAE,oBAAoB;YAC9B,oEAAoE;YACpE,KAAK,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,kBAAmB,CAAC,GAAG,EAAE,MAAM,CAAC;SACrD,CAAC;IACJ,CAAC,CAAC,CAAC;IAEL,mEAAmE;IACnE,MAAM,UAAU,GAAG,kBAAS,CAAC,GAAG,CAAoB,2CAAiB,CAAC,UAAU,CAAC,CAAC;IAClF,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,KAAK,UAAU,CAAC,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;QAClE,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,KAAK,UAAU,CAAC,IAAI,CAAC,CAAC;KACjE;IACD,MAAM,MAAM,GAAG,MAAM,8BAAmB,CAAC,MAAM,EAAE,GAAG,CAAC,WAAW,CAAC,CAAC;IAClE,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE;QAC7B,MAAM,YAAY,GAAG,CAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,YAAY,KAAI,EAAE,CAAC;QAC1D,MAAM,cAAc,GAAG,CAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,cAAc,KAAI,EAAE,CAAC;QAE9D,~~qEAAqE;QACrE,~~oEAAoE;QACpE,MAAM,gCAAgC,GAAG,MAAM,wCAA0B,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QACvF,IAAI,gCAAgC,CAAC,KAAK,EAAE,EAAE;YAC5C,OAAO,gCAAgC,CAAC;SACzC;QACD,IAAI,CAAC,mCAAW,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE;YACpC,MAAM,cAAc,CAAC,YAAY,EAAE,cAAc,EAAE,MAAM,CAAC,WAAY,CAAC,CAAC;SACzE;QACD,IAAI,sBAAc,CAAC,gBAAgB,CAAC,EAAE;YACpC,MAAM,kBAAE,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC,WAAW,mBAAmB,EAAE,sCAA0B,EAAE;~~gBACvF~~,MAAM,EAAE,CAAC;~~aACV~~,CAAC,CAAC;~~YACH~~,MAAA,GAAG,CAAC,iBAAiB,0CAAE,kBAAkB,CAAC,kCAAsB,CAAC,MAAM,EAAE;gBACvE,CAAC,qCAAyB,CAAC,SAAS,CAAC,EAAE,0CAA8B;gBACrE,CAAC,qCAAyB,CAAC,OAAO,CAAC,EAAE,oCAAwB,CAAC,GAAG;gBACjE,CAAC,qCAAyB,CAAC,SAAS,CAAC,EAAE,CAAC,CAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,cAAc,KAAI,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;gBACzF,CAAC,qCAAyB,CAAC,YAAY,CAAC,EAAE,CAAC,CAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,YAAY,KAAI,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;gBAC1F,CAAC,qCAAyB,CAAC,mBAAmB,CAAC,EAC7C,MAAA,MAAA,GAAG,CAAC,cAAc,0CAAE,mBAAmB,mCAAI,EAAE;gBAC/C,~~WAAW~~,EAAE,OAAO;~~aACrB~~,CAAC,CAAC;SACJ;aAAM;YACL,0CAA0C;YAC1C,IAAI,UAAU,CAAC,kBAAkB,EAAE;gBACjC,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,kBAAkB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;gBACjE,IAAI,OAAO,CAAC,KAAK,EAAE,EAAE;oBACnB,OAAO,iBAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;iBAC3B;gBACD,MAAA,GAAG,CAAC,iBAAiB,0CAAE,kBAAkB,CAAC,kCAAsB,CAAC,MAAM,EAAE;oBACvE,CAAC,qCAAyB,CAAC,SAAS,CAAC,EAAE,0CAA8B;oBACrE,CAAC,qCAAyB,CAAC,OAAO,CAAC,EAAE,oCAAwB,CAAC,GAAG;oBACjE,CAAC,qCAAyB,CAAC,YAAY,CAAC,EAAE,CAAC,CAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,YAAY,KAAI,EAAE,CAAC,CAAC,IAAI,CACnF,GAAG,CACJ;oBACD,CAAC,qCAAyB,CAAC,mBAAmB,CAAC,EAC7C,MAAA,MAAA,GAAG,CAAC,cAAc,0CAAE,mBAAmB,mCAAI,EAAE;oBAC/C,~~WAAW~~,EAAE,MAAM;~~iBACpB~~,CAAC,CAAC;aACJ;SACF;QACD,GAAG,CAAC,eAAe,CAAC,WAAW,CAC7B,MAAM,EACN,YAAY,kCAAkB,CAAC,2BAA2B,CAAC,EAAE,EAC7D,KAAK,CACN,CAAC;QACF,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;KACjB;SAAM;QACL,OAAO,iBAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;KAC1B;AACH,CAAC;~~AAzFD~~,~~gDAyFC~~;AAEM,KAAK,UAAU,iBAAiB,CACrC,GAAe,EACf,MAAc,EACd,aAAmB,EACnB,OAA4B;;~~IAE5B~~,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;IAC1C,MAAA,GAAG,CAAC,WAAW,0CAAE,IAAI,CAAC,qBAAqB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACxF,MAAM,MAAM,GAAuB,OAAO;SACvC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,kBAAkB,CAAC;SAC/C,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;QACd,OAAO;YACL,UAAU,EAAE,GAAG,MAAM,CAAC,IAAI,EAAE;YAC5B,QAAQ,EAAE,oBAAoB;YAC9B,oEAAoE;YACpE,KAAK,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,kBAAmB,CAAC,GAAG,EAAE,MAAM,CAAC;SACrD,CAAC;IACJ,CAAC,CAAC,CAAC;IAEL,MAAM,MAAM,GAAG,MAAM,8BAAmB,CAAC,MAAM,EAAE,GAAG,CAAC,WAAW,CAAC,CAAC;~~IAClE~~,MAAM,gBAAgB,GAAG,gCAAwB,CAAC,GAAG,CAAC,CAAC;IACvD,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE;QAC7B,MAAM,YAAY,GAAG,CAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,YAAY,KAAI,EAAE,CAAC;QAC1D,MAAM,cAAc,GAAG,CAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,cAAc,KAAI,EAAE,CAAC;QAE9D,oEAAoE;QACpE,MAAM,cAAc,CAAC,YAAY,EAAE,cAAc,EAAE,MAAM,CAAC,WAAY,CAAC,CAAC;QAExE,GAAG,CAAC,eAAe,CAAC,WAAW,CAC7B,MAAM,EACN,YAAY,kCAAkB,CAAC,2BAA2B,CAAC,EAAE,EAC7D,KAAK,CACN,CAAC;QACF,MAAA,GAAG,CAAC,WAAW,0CAAE,IAAI,CAAC,sBAAsB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACrF,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;KACjB;SAAM;QACL,MAAA,GAAG,CAAC,WAAW,0CAAE,IAAI,CAAC,sBAAsB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACrF,OAAO,iBAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;KAC1B;AACH,CAAC;~~AAvCD~~,~~8CAuCC~~;AAEM,KAAK,UAAU,cAAc,CAClC,YAAsB,EACtB,cAAwB,EACxB,WAAmB;IAEnB,YAAY,GAAG,YAAY,IAAI,EAAE,CAAC;IAClC,cAAc,GAAG,cAAc,IAAI,EAAE,CAAC;IACtC,MAAM,MAAM,GAAG,YAAY,CAAC,QAAQ,CAAC,wBAAa,CAAC,EAAE,CAAC,CAAC;IACvD,MAAM,SAAS,GAAG,YAAY,CAAC,QAAQ,CAAC,+BAAoB,CAAC,EAAE,CAAC,CAAC;IACjE,MAAM,MAAM,GAAG,YAAY,CAAC,QAAQ,CAAC,wBAAa,CAAC,EAAE,CAAC,CAAC;IACvD,IAAI,MAAM,IAAI,CAAC,MAAM,IAAI,SAAS,CAAC,EAAE;QACnC,MAAM,MAAM,GAAG,cAAI,CAAC,IAAI,CAAC,2BAAkB,EAAE,EAAE,SAAS,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC;QACnF,IAAI,MAAM,kBAAE,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;YAC/B,MAAM,kBAAE,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,WAAW,IAAI,iCAAmB,EAAE,CAAC,CAAC;SAChE;KACF;AACH,CAAC;AAhBD,wCAgBC"}
1	+ {"version":3,"file":"scaffolding.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/scaffolding.ts"],"names":[],"mappings":"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"}

package/build/plugins/solution/fx-solution/v2/utils.d.ts CHANGED Viewed

@@ -1,5 +1,4 @@
 import { v2, Inputs, FxError, Result, AzureSolutionSettings, Void, PermissionRequestProvider, Json, SolutionContext, Plugin, AppStudioTokenProvider, ProjectSettings } from "@microsoft/teamsfx-api";
-import { EnvInfoV2 } from "@microsoft/teamsfx-api/build/v2";
 import { PluginsWithContext } from "../types";
 export declare function getSelectedPlugins(projectSettings: ProjectSettings): v2.ResourcePlugin[];
 export declare function getAzureSolutionSettings(ctx: v2.Context): AzureSolutionSettings | undefined;
@@ -14,7 +13,7 @@ export declare function ensurePermissionRequest(solutionSettings: AzureSolutionS
 export declare function parseTeamsAppTenantId(appStudioToken?: Record<string, unknown>): Result<string, FxError>;
 export declare function parseUserName(appStudioToken?: Record<string, unknown>): Result<string, FxError>;
 export declare function checkWhetherLocalDebugM365TenantMatches(localDebugTenantId?: string, appStudioTokenProvider?: AppStudioTokenProvider): Promise<Result<Void, FxError>>;
-export declare function loadTeamsAppTenantIdForLocal(localSettings: v2.LocalSettings, appStudioToken?: Record<string, unknown>, envInfo?: EnvInfoV2): Result<Void, FxError>;
+export declare function loadTeamsAppTenantIdForLocal(localSettings: v2.LocalSettings, appStudioToken?: Record<string, unknown>, envInfo?: v2.EnvInfoV2): Result<Void, FxError>;
 export declare function fillInSolutionSettings(projectSettings: ProjectSettings, answers: Inputs): Result<Void, FxError>;
 export declare function checkWetherProvisionSucceeded(config: Json): boolean;
 export declare function getPluginAndContextArray(ctx: SolutionContext, selectedPlugins: Plugin[]): PluginsWithContext[];

package/build/plugins/solution/fx-solution/v2/utils.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,EAAE,EACF,MAAM,EACN,OAAO,EACP,MAAM,EAGN,qBAAqB,EACrB,IAAI,EACJ,yBAAyB,EACzB,IAAI,EACJ,eAAe,EACf,MAAM,EACN,sBAAsB,EACtB,eAAe,EAGhB,MAAM,wBAAwB,CAAC;~~AA0BhC~~,OAAO,EAAE,~~SAAS,EAAE,MAAM,iCAAiC,CAAC;AAC5D,OAAO,EAAE,~~kBAAkB,EAAE,MAAM,UAAU,CAAC;AAG9C,wBAAgB,kBAAkB,CAAC,eAAe,EAAE,eAAe,GAAG,EAAE,CAAC,cAAc,EAAE,CAExF;AAED,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,GAAG,qBAAqB,GAAG,SAAS,CAE3F;AAED,wBAAgB,cAAc,CAAC,aAAa,EAAE,qBAAqB,GAAG,SAAS,GAAG,OAAO,CAExF;AAED,wBAAgB,cAAc,CAAC,CAAC,EAAE,OAAO,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,CAAC,CAAA;CAAE,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAO3F;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,IAAI,GAAG,EAAE,CAAC,cAAc,CAWrE;AAED,wBAAgB,6BAA6B,CAAC,eAAe,EAAE,eAAe,GAAG,IAAI,CAKpF;AAED,wBAAsB,uBAAuB,CAC3C,gBAAgB,EAAE,qBAAqB,EACvC,yBAAyB,EAAE,yBAAyB,GACnD,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,~~CAiBhC~~;AAED,wBAAgB,qBAAqB,CACnC,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACvC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CA2BzB;AAED,wBAAgB,aAAa,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAkB/F;AAED,wBAAsB,uCAAuC,CAC3D,kBAAkB,CAAC,EAAE,MAAM,EAC3B,sBAAsB,CAAC,EAAE,sBAAsB,GAC9C,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CA0BhC;AAGD,wBAAgB,4BAA4B,CAC1C,aAAa,EAAE,EAAE,CAAC,aAAa,EAC/B,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACxC,OAAO,CAAC,EAAE,SAAS,~~GAClB~~,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAWvB;AAED,wBAAgB,sBAAsB,CACpC,eAAe,EAAE,eAAe,EAChC,OAAO,EAAE,MAAM,GACd,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,~~CAwDvB~~;AAED,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,IAAI,GAAG,OAAO,CAEnE;AAED,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,eAAe,EACpB,eAAe,EAAE,MAAM,EAAE,GACxB,kBAAkB,EAAE,CAEtB"}
1	+ {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,EAAE,EACF,MAAM,EACN,OAAO,EACP,MAAM,EAGN,qBAAqB,EACrB,IAAI,EACJ,yBAAyB,EACzB,IAAI,EACJ,eAAe,EACf,MAAM,EACN,sBAAsB,EACtB,eAAe,EAGhB,MAAM,wBAAwB,CAAC;AA4BhC,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAG9C,wBAAgB,kBAAkB,CAAC,eAAe,EAAE,eAAe,GAAG,EAAE,CAAC,cAAc,EAAE,CAExF;AAED,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,GAAG,qBAAqB,GAAG,SAAS,CAE3F;AAED,wBAAgB,cAAc,CAAC,aAAa,EAAE,qBAAqB,GAAG,SAAS,GAAG,OAAO,CAExF;AAED,wBAAgB,cAAc,CAAC,CAAC,EAAE,OAAO,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,CAAC,CAAA;CAAE,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAO3F;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,IAAI,GAAG,EAAE,CAAC,cAAc,CAWrE;AAED,wBAAgB,6BAA6B,CAAC,eAAe,EAAE,eAAe,GAAG,IAAI,CAKpF;AAED,wBAAsB,uBAAuB,CAC3C,gBAAgB,EAAE,qBAAqB,EACvC,yBAAyB,EAAE,yBAAyB,GACnD,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAmBhC;AAED,wBAAgB,qBAAqB,CACnC,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACvC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CA2BzB;AAED,wBAAgB,aAAa,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAkB/F;AAED,wBAAsB,uCAAuC,CAC3D,kBAAkB,CAAC,EAAE,MAAM,EAC3B,sBAAsB,CAAC,EAAE,sBAAsB,GAC9C,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CA0BhC;AAGD,wBAAgB,4BAA4B,CAC1C,aAAa,EAAE,EAAE,CAAC,aAAa,EAC/B,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACxC,OAAO,CAAC,EAAE,EAAE,CAAC,SAAS,GACrB,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAWvB;AAED,wBAAgB,sBAAsB,CACpC,eAAe,EAAE,eAAe,EAChC,OAAO,EAAE,MAAM,GACd,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CA2EvB;AAED,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,IAAI,GAAG,OAAO,CAEnE;AAED,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,eAAe,EACpB,eAAe,EAAE,MAAM,EAAE,GACxB,kBAAkB,EAAE,CAEtB"}

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

@@ -53,9 +53,11 @@ async function ensurePermissionRequest(solutionSettings, permissionRequestProvid
     if (!isAzureProject(solutionSettings)) {
         return teamsfx_api_1.err(new teamsfx_api_1.UserError(constants_1.SolutionSource, constants_1.SolutionError.CannotUpdatePermissionForSPFx, "Cannot update permission for SPFx project"));
     }
-    const result = await permissionRequestProvider.checkPermissionRequest();
-    if (result && result.isErr()) {
-        return result.map(teamsfx_api_1.err);
+    if (!tools_1.isAadManifestEnabled()) {
+        const result = await permissionRequestProvider.checkPermissionRequest();
+        if (result && result.isErr()) {
+            return result.map(teamsfx_api_1.err);
+        }
     }
     return teamsfx_api_1.ok(teamsfx_api_1.Void);
 }
@@ -118,19 +120,37 @@ exports.loadTeamsAppTenantIdForLocal = loadTeamsAppTenantIdForLocal;
 function fillInSolutionSettings(projectSettings, answers) {
     const solutionSettings = projectSettings.solutionSettings || {};
     let capabilities = answers[question_1.AzureSolutionQuestionNames.Capabilities] || [];
+    if (tools_1.isAadManifestEnabled()) {
+        if (capabilities.includes(question_1.TabOptionItem.id)) {
+            capabilities.push(question_1.SsoItem.id);
+        }
+        else if (capabilities.includes(question_1.TabNonSsoItem.id)) {
+            const index = capabilities.indexOf(question_1.TabNonSsoItem.id);
+            capabilities.splice(index, 1);
+            capabilities.push(question_1.TabOptionItem.id);
+        }
+    }
     if (!capabilities || capabilities.length === 0) {
         return teamsfx_api_1.err(new teamsfx_api_1.SystemError(constants_1.SolutionSource, constants_1.SolutionError.InternelError, "capabilities is empty"));
     }
     let hostType = answers[question_1.AzureSolutionQuestionNames.HostType];
-    if (capabilities.includes(question_1.NotificationOptionItem.id)) {
-        // find and replace "NotificationOptionItem" to "BotOptionItem", so it does not impact capabilities in projectSettings.json
+    if (capabilities.includes(question_1.NotificationOptionItem.id) ||
+        capabilities.includes(question_1.CommandAndResponseOptionItem.id)) {
+        // find and replace "NotificationOptionItem" and "CommandAndResponseOptionItem" to "BotOptionItem", so it does not impact capabilities in projectSettings.json
+        const scenarios = [];
         const notificationIndex = capabilities.indexOf(question_1.NotificationOptionItem.id);
         if (notificationIndex !== -1) {
             capabilities[notificationIndex] = question_1.BotOptionItem.id;
-            // dedup
-            capabilities = [...new Set(capabilities)];
-            answers[question_1.AzureSolutionQuestionNames.Scenario] = question_1.BotScenario.NotificationBot;
+            scenarios.push(question_1.BotScenario.NotificationBot);
+        }
+        const commandAndResponseIndex = capabilities.indexOf(question_1.CommandAndResponseOptionItem.id);
+        if (commandAndResponseIndex !== -1) {
+            capabilities[commandAndResponseIndex] = question_1.BotOptionItem.id;
+            scenarios.push(question_1.BotScenario.CommandAndResponseBot);
         }
+        answers[question_1.AzureSolutionQuestionNames.Scenarios] = scenarios;
+        // dedup
+        capabilities = [...new Set(capabilities)];
         hostType = question_1.HostTypeOptionAzure.id;
     }
     else if (capabilities.includes(question_1.BotOptionItem.id) ||

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

	@@ -1 +1 @@
1	- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/utils.ts"],"names":[],"mappings":";;;AAAA,wDAiBgC;AAChC,sFAAsF;AACtF,~~oDAAgE~~;~~AAChE~~,4CAKsB;AACtB,~~0CAcqB~~;AACrB,wEAAoG;AACpG,wCAAiD;~~AAGjD~~,oEAAwF;AAExF,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,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,MAAM,MAAM,GAAG,MAAM,yBAAyB,CAAC,sBAAsB,EAAE,CAAC;~~IACxE~~,IAAI,MAAM,IAAI,MAAM,CAAC,KAAK,EAAE,EAAE;~~QAC5B~~,OAAO,MAAM,CAAC,GAAG,CAAC,iBAAG,CAAC,CAAC;~~KACxB~~;IAED,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;AAClB,CAAC;~~AApBD~~,~~0DAoBC~~;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,kBAA2B,EAC3B,sBAA+C;IAE/C,IAAI,kBAAkB,EAAE;QACtB,MAAM,iBAAiB,GAAG,qBAAqB,CAAC,MAAM,CAAA,sBAAsB,aAAtB,sBAAsB,uBAAtB,sBAAsB,CAAE,aAAa,EAAE,CAAA,CAAC,CAAC;QAC/F,IAAI,iBAAiB,CAAC,KAAK,EAAE,EAAE;YAC7B,OAAO,iBAAiB,CAAC;SAC1B;QAED,MAAM,oBAAoB,GAAG,aAAa,CAAC,MAAM,CAAA,sBAAsB,aAAtB,sBAAsB,uBAAtB,sBAAsB,CAAE,aAAa,EAAE,CAAA,CAAC,CAAC;QAC1F,IAAI,oBAAoB,CAAC,KAAK,EAAE,EAAE;YAChC,OAAO,oBAAoB,CAAC;SAC7B;QAED,IAAI,iBAAiB,CAAC,KAAK,KAAK,kBAAkB,EAAE;YAClD,MAAM,YAAY,GAAG,kCAAkB,CACrC,qCAAqC,EACrC,kBAAkB,EAClB,oBAAoB,CAAC,KAAK,EAC1B,oBAAoB,CACrB,CAAC;YACF,OAAO,iBAAG,CACR,IAAI,uBAAS,CAAC,UAAU,EAAE,yBAAa,CAAC,iCAAiC,EAAE,YAAY,CAAC,CACzF,CAAC;SACH;KACF;IAED,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;AAClB,CAAC;AA7BD,0FA6BC;AAED,iDAAiD;AACjD,SAAgB,4BAA4B,CAC1C,aAA+B,EAC/B,cAAwC,EACxC,~~OAAmB~~;~~IAEnB~~,OAAO,qBAAqB,CAAC,cAAqD,CAAC,CAAC,OAAO,CACzF,CAAC,gBAAgB,EAAE,EAAE;QACnB,IAAI,4BAAoB,EAAE,EAAE;YAC1B,OAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;SAC7D;aAAM;YACL,aAAa,CAAC,QAAQ,CAAC,kDAAyB,CAAC,QAAQ,CAAC,GAAG,gBAAgB,CAAC;SAC/E;QACD,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;IAClB,CAAC,CACF,CAAC;AACJ,CAAC;AAfD,oEAeC;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,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,~~IAAI~~,YAAY,CAAC,QAAQ,CAAC,iCAAsB,CAAC,EAAE,CAAC,EAAE;~~QACpD~~,~~2HAA2H~~;~~QAC3H~~,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,~~QAAQ~~;~~YACR~~,~~YAAY~~,GAAG,CAAC,~~GAAG~~,IAAI,~~GAAG~~,CAAC,YAAY,CAAC,CAAC,CAAC;~~YAC1C~~,OAAO,CAAC,qCAA0B,CAAC,QAAQ,CAAC,GAAG,~~sBAAW~~,CAAC,~~eAAe~~,CAAC;~~SAC5E;QAED~~,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;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;~~AA3DD~~,~~wDA2DC~~;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"}
1	+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/utils.ts"],"names":[],"mappings":"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"}

package/build/plugins/solution/fx-solution/v3/provision.js CHANGED Viewed

@@ -261,7 +261,7 @@ async function fillInAzureConfigs(ctx, inputs, envInfo, tokenProvider) {
     const resourceGroupNameFromState = envInfo.state.solution.resourceGroupName;
     const resourceGroupLocationFromState = envInfo.state.solution.location;
     const appName = ctx.projectSetting.appName;
-    const defaultResourceGroupName = `${appName.replace(" ", "_")}${"-" + envInfo.envName}-rg`;
+    const defaultResourceGroupName = `${lodash_1.snakeCase(appName)}${"-" + envInfo.envName}-rg`;
     let resourceGroupInfo;
     const telemetryProperties = {};
     if (inputs.env) {

package/build/plugins/solution/fx-solution/v3/provision.js.map CHANGED Viewed

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

package/build/plugins/solution/fx-solution/v3/userTask.js CHANGED Viewed

@@ -19,7 +19,7 @@ const addFeature_1 = require("./addFeature");
 const constants_2 = require("./constants");
 async function getQuestionsForUserTask(ctx, inputs, func, envInfo, tokenProvider) {
     if (func.method === "addCapability") {
-        return await getQuestions_1.getQuestionsForAddCapability(ctx, inputs);
+        return await getQuestions_1.getQuestionsForAddCapability(ctx, inputs, func, envInfo, tokenProvider);
     }
     if (func.method === "addResource") {
         return await getQuestionsForAddResource(ctx, inputs);

package/build/plugins/solution/fx-solution/v3/userTask.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"userTask.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/userTask.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,wDAkBgC;AAChC,mCAAmC;AACnC,mDAA6B;AAC7B,oEAAsE;AACtE,oFAAuE;AACvE,2CAA8D;AAC9D,4CAAyD;AACzD,0CAUqB;AACrB,4EAAyE;AACzE,2DAAuD;AACvD,qDAAkE;AAClE,6CAA0C;AAC1C,2CAAwD;AAEjD,KAAK,UAAU,uBAAuB,CAC3C,GAAe,EACf,MAAc,EACd,IAAU,EACV,OAAsC,EACtC,aAA4B;IAE5B,IAAI,IAAI,CAAC,MAAM,KAAK,eAAe,EAAE;QACnC,OAAO,MAAM,2CAA4B,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;~~KACxD~~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"}
1	+ {"version":3,"file":"userTask.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/userTask.ts"],"names":[],"mappings":"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"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/teamsfx-core",
-  "version": "1.6.1",
+  "version": "1.7.0-rc.0",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "license": "MIT",
@@ -22,6 +22,7 @@
     "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/plugins/resource/apiconnector/**/*.test.ts\"",
     "test:unit": "nyc --no-clean mocha \"tests/**/*.test.ts\"",
     "test:common": "nyc --no-clean mocha \"tests/common/*.test.ts\"",
     "test:solution": "nyc mocha \"tests/plugins/solution/*.test.ts\"",
@@ -63,7 +64,7 @@
     "@azure/storage-blob": "^12.7.0",
     "@dbpiper/timer": "1.0.0-beta.2",
     "@feathersjs/hooks": "^0.6.5",
-    "@microsoft/teamsfx-api": "^0.17.1",
+    "@microsoft/teamsfx-api": "^0.17.2-rc.0",
     "@npmcli/arborist": "^4.2.0",
     "@types/jwt-decode": "3.1.0",
     "@types/proper-lockfile": "^4.1.1",
@@ -182,7 +183,7 @@
     "resource/**/*",
     "templates/**/*"
   ],
-  "gitHead": "bbfd778b8fc5c3086a5eb7f28c2028cd7b9b0e7a",
+  "gitHead": "ca9507af1ee6896176eab4958e7756eeeeec5f19",
   "publishConfig": {
     "access": "public"
   },