@microsoft/teamsfx-core 1.8.0 → 1.8.1-alpha.324752dff.0

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

@@ -18,7 +18,7 @@ async function publishApplication(ctx, inputs, envInfo, tokenProvider) {
     if (inAzureProject && !provisioned) {
         return teamsfx_api_1.err(new teamsfx_api_1.UserError(constants_2.SolutionSource, constants_2.SolutionError.CannotDeployBeforeProvision, localizeUtils_1.getDefaultString("core.NotProvisionedNotice", ctx.projectSetting.appName), localizeUtils_1.getLocalizedString("core.NotProvisionedNotice", ctx.projectSetting.appName)));
     }
-    const pureExistingApp = projectSettingsHelper_1.isPureExistingApp(ctx.projectSetting);
+    const pureExistingApp = projectSettingsHelper_1.isExistingTabApp(ctx.projectSetting);
     // for minimized teamsfx project, there is only one plugin (app studio)
     const plugins = pureExistingApp
         ? [typedi_1.Container.get(ResourcePluginContainer_1.ResourcePluginsV2.AppStudioPlugin)]

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

@@ -1 +1 @@
-{"version":3,"file":"publish.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/publish.ts"],"names":[],"mappings":";;;AAAA,wDAUgC;AAChC,mCAAqC;AACrC,mCAAmC;AACnC,4DAAiE;AACjE,oEAAwF;AACxF,oFAA6E;AAC7E,4CAKsB;AACtB,wEAA+D;AAC/D,yCAAiD;AACjD,mCAAuF;AAEhF,KAAK,UAAU,kBAAkB,CACtC,GAAe,EACf,MAAc,EACd,OAAqB,EACrB,aAAqC;;IAErC,MAAM,cAAc,GAAG,sBAAc,CAAC,gCAAwB,CAAC,GAAG,CAAC,CAAC,CAAC;IACrE,MAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,yBAAa,CAAC,CAAC,wCAA4B,CAAC,CAAC;IAE/E,IAAI,cAAc,IAAI,CAAC,WAAW,EAAE;QAClC,OAAO,iBAAG,CACR,IAAI,uBAAS,CACX,0BAAc,EACd,yBAAa,CAAC,2BAA2B,EACzC,gCAAgB,CAAC,2BAA2B,EAAE,GAAG,CAAC,cAAc,CAAC,OAAO,CAAC,EACzE,kCAAkB,CAAC,2BAA2B,EAAE,GAAG,CAAC,cAAc,CAAC,OAAO,CAAC,CAC5E,CACF,CAAC;KACH;IAED,MAAM,eAAe,GAAG,yCAAiB,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IAC9D,uEAAuE;IACvE,MAAM,OAAO,GAAG,eAAe;QAC7B,CAAC,CAAC,CAAC,kBAAS,CAAC,GAAG,CAAoB,2CAAiB,CAAC,eAAe,CAAC,CAAC;QACvE,CAAC,CAAC,0BAAkB,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IAC3C,MAAM,MAAM,GAAG,OAAO;SACnB,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,oBAAW,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;SAC3D,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,EAAE,OAAO,EAAE,aAAa,CAAC;SAC7E,CAAC;IACJ,CAAC,CAAC,CAAC;IAEL,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,kCAAkB,CAAC,0BAA0B,EAAE,6BAAiB,CAAC,QAAQ,CAAC,CAAC,CAAC;IAEjG,MAAM,MAAM,GAAG,MAAM,8BAAmB,CAAC,MAAM,EAAE,GAAG,CAAC,WAAW,CAAC,CAAC;IAElE,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE;QAC7B,MAAM,GAAG,GAAG,kCAAkB,CAAC,yBAAyB,EAAE,GAAG,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QACtF,MAAA,GAAG,CAAC,WAAW,0CAAE,IAAI,CAAC,GAAG,CAAC,CAAC;QAC3B,OAAO,iBAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;KAC1B;IACD,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;AAClB,CAAC;AA9CD,gDA8CC"}
+{"version":3,"file":"publish.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/publish.ts"],"names":[],"mappings":";;;AAAA,wDAUgC;AAChC,mCAAqC;AACrC,mCAAmC;AACnC,4DAAiE;AACjE,oEAAwF;AACxF,oFAA4E;AAC5E,4CAKsB;AACtB,wEAA+D;AAC/D,yCAAiD;AACjD,mCAAuF;AAEhF,KAAK,UAAU,kBAAkB,CACtC,GAAe,EACf,MAAc,EACd,OAAqB,EACrB,aAAqC;;IAErC,MAAM,cAAc,GAAG,sBAAc,CAAC,gCAAwB,CAAC,GAAG,CAAC,CAAC,CAAC;IACrE,MAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,yBAAa,CAAC,CAAC,wCAA4B,CAAC,CAAC;IAE/E,IAAI,cAAc,IAAI,CAAC,WAAW,EAAE;QAClC,OAAO,iBAAG,CACR,IAAI,uBAAS,CACX,0BAAc,EACd,yBAAa,CAAC,2BAA2B,EACzC,gCAAgB,CAAC,2BAA2B,EAAE,GAAG,CAAC,cAAc,CAAC,OAAO,CAAC,EACzE,kCAAkB,CAAC,2BAA2B,EAAE,GAAG,CAAC,cAAc,CAAC,OAAO,CAAC,CAC5E,CACF,CAAC;KACH;IAED,MAAM,eAAe,GAAG,wCAAgB,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IAC7D,uEAAuE;IACvE,MAAM,OAAO,GAAG,eAAe;QAC7B,CAAC,CAAC,CAAC,kBAAS,CAAC,GAAG,CAAoB,2CAAiB,CAAC,eAAe,CAAC,CAAC;QACvE,CAAC,CAAC,0BAAkB,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IAC3C,MAAM,MAAM,GAAG,OAAO;SACnB,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,oBAAW,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;SAC3D,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,EAAE,OAAO,EAAE,aAAa,CAAC;SAC7E,CAAC;IACJ,CAAC,CAAC,CAAC;IAEL,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,kCAAkB,CAAC,0BAA0B,EAAE,6BAAiB,CAAC,QAAQ,CAAC,CAAC,CAAC;IAEjG,MAAM,MAAM,GAAG,MAAM,8BAAmB,CAAC,MAAM,EAAE,GAAG,CAAC,WAAW,CAAC,CAAC;IAElE,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE;QAC7B,MAAM,GAAG,GAAG,kCAAkB,CAAC,yBAAyB,EAAE,GAAG,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QACtF,MAAA,GAAG,CAAC,WAAW,0CAAE,IAAI,CAAC,GAAG,CAAC,CAAC;QAC3B,OAAO,iBAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;KAC1B;IACD,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;AAClB,CAAC;AA9CD,gDA8CC"}

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

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

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TeamsAppSolutionV2 = void 0;
 const tslib_1 = require("tslib");
 const typedi_1 = require("typedi");
+const common_1 = require("../../../../common");
 const constants_1 = require("../../../../common/constants");
 const SolutionPluginContainer_1 = require("../../../../core/SolutionPluginContainer");
 const checkPermission_1 = require("./checkPermission");
@@ -28,7 +29,9 @@ let TeamsAppSolutionV2 = class TeamsAppSolutionV2 {
         this.deploy = deploy_1.deploy;
         this.publishApplication = publish_1.publishApplication;
         this.provisionLocalResource = provisionLocal_1.provisionLocalResource;
-        this.getQuestionsForScaffolding = getQuestions_1.getQuestionsForScaffolding;
+        this.getQuestionsForScaffolding = common_1.isPreviewFeaturesEnabled()
+            ? getQuestions_1.getQuestionsForScaffoldingPreview
+            : getQuestions_1.getQuestionsForScaffolding;
         this.executeUserTask = executeUserTask_1.executeUserTask;
         this.createEnv = createEnv_1.createEnv;
         this.getQuestions = getQuestions_1.getQuestions;

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

@@ -1 +1 @@
-{"version":3,"file":"solution.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/solution.ts"],"names":[],"mappings":";;;;AAaA,mCAAiC;AACjC,4DAAiE;AACjE,sFAA6E;AAC7E,uDAAoD;AACpD,2CAAqD;AACrD,2CAAwC;AACxC,qCAAkC;AAClC,uDAAoD;AACpD,yEAAsE;AACtE,iDAAmG;AACnG,uDAAoD;AACpD,yDAAsD;AACtD,2CAAgD;AAChD,qDAA0D;AAC1D,uCAA+C;AAC/C,+CAAmD;AAGnD,IAAa,kBAAkB,GAA/B,MAAa,kBAAkB;IAA/B;QACE,SAAI,GAAG,kCAAsB,CAAC;QAC9B,gBAAW,GAAW,6BAAiB,CAAC,QAAQ,CAAC;QAEjD,uBAAkB,GAChB,gCAAkB,CAAC;QACrB,6BAAwB,GACtB,mDAAwB,CAAC;QAE3B,uBAAkB,GAAG,6BAAiB,CAAC;QAEvC,WAAM,GAKgC,eAAM,CAAC;QAE7C,uBAAkB,GAKoB,4BAAkB,CAAC;QACzD,2BAAsB,GAMqB,uCAAsB,CAAC;QAElE,+BAA0B,GAG6B,yCAA0B,CAAC;QAElF,oBAAe,GAO0B,iCAAe,CAAC;QAEzD,cAAS,GAAyE,qBAAS,CAAC;QAE5F,iBAAY,GAK2C,2BAAY,CAAC;QAEpE,4BAAuB,GAMgC,sCAAuB,CAAC;QAE/E,oBAAe,GAKuB,CACpC,GAAe,EACf,MAAgC,EAChC,OAAgC,EAChC,aAA4B,EAC5B,EAAE,CAAC,iCAAe,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC,CAAC;QAE7E,oBAAe,GAKuB,CACpC,GAAe,EACf,MAAgC,EAChC,OAAgC,EAChC,aAA4B,EAC5B,EAAE,CAAC,iCAAe,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC,CAAC;QAE7E,qBAAgB,GAKsB,CACpC,GAAe,EACf,MAAgC,EAChC,OAAgC,EAChC,aAA4B,EAC5B,EAAE,CAAC,mCAAgB,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC,CAAC;IAChF,CAAC;CAAA,CAAA;AAlGY,kBAAkB;IAD9B,gBAAO,CAAC,2CAAiB,CAAC,oBAAoB,CAAC;GACnC,kBAAkB,CAkG9B;AAlGY,gDAAkB"}
+{"version":3,"file":"solution.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/solution.ts"],"names":[],"mappings":";;;;AAaA,mCAAiC;AACjC,+CAA8D;AAC9D,4DAAiE;AACjE,sFAA6E;AAC7E,uDAAoD;AACpD,2CAAqD;AACrD,2CAAwC;AACxC,qCAAkC;AAClC,uDAAoD;AACpD,yEAAsE;AACtE,iDAKwB;AACxB,uDAAoD;AACpD,yDAAsD;AACtD,2CAAgD;AAChD,qDAA0D;AAC1D,uCAA+C;AAC/C,+CAAmD;AAGnD,IAAa,kBAAkB,GAA/B,MAAa,kBAAkB;IAA/B;QACE,SAAI,GAAG,kCAAsB,CAAC;QAC9B,gBAAW,GAAW,6BAAiB,CAAC,QAAQ,CAAC;QAEjD,uBAAkB,GAChB,gCAAkB,CAAC;QACrB,6BAAwB,GACtB,mDAAwB,CAAC;QAE3B,uBAAkB,GAAG,6BAAiB,CAAC;QAEvC,WAAM,GAKgC,eAAM,CAAC;QAE7C,uBAAkB,GAKoB,4BAAkB,CAAC;QACzD,2BAAsB,GAMqB,uCAAsB,CAAC;QAElE,+BAA0B,GAG6B,iCAAwB,EAAE;YAC/E,CAAC,CAAC,gDAAiC;YACnC,CAAC,CAAC,yCAA0B,CAAC;QAE/B,oBAAe,GAO0B,iCAAe,CAAC;QAEzD,cAAS,GAAyE,qBAAS,CAAC;QAE5F,iBAAY,GAK2C,2BAAY,CAAC;QAEpE,4BAAuB,GAMgC,sCAAuB,CAAC;QAE/E,oBAAe,GAKuB,CACpC,GAAe,EACf,MAAgC,EAChC,OAAgC,EAChC,aAA4B,EAC5B,EAAE,CAAC,iCAAe,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC,CAAC;QAE7E,oBAAe,GAKuB,CACpC,GAAe,EACf,MAAgC,EAChC,OAAgC,EAChC,aAA4B,EAC5B,EAAE,CAAC,iCAAe,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC,CAAC;QAE7E,qBAAgB,GAKsB,CACpC,GAAe,EACf,MAAgC,EAChC,OAAgC,EAChC,aAA4B,EAC5B,EAAE,CAAC,mCAAgB,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC,CAAC;IAChF,CAAC;CAAA,CAAA;AApGY,kBAAkB;IAD9B,gBAAO,CAAC,2CAAiB,CAAC,oBAAoB,CAAC;GACnC,kBAAkB,CAoG9B;AApGY,gDAAkB"}

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

@@ -3,6 +3,13 @@ import { PluginsWithContext } from "../types";
 export declare function getSelectedPlugins(projectSettings: ProjectSettings): v2.ResourcePlugin[];
 export declare function getAzureSolutionSettings(ctx: v2.Context): AzureSolutionSettings | undefined;
 export declare function isAzureProject(azureSettings: AzureSolutionSettings | undefined): boolean;
+export interface BotTroubleShootMessage {
+    troubleShootLink: string;
+    textForLogging: string;
+    textForMsgBox: string;
+    textForActionButton: string;
+}
+export declare function getBotTroubleShootMessage(azureSettings: AzureSolutionSettings | undefined): BotTroubleShootMessage;
 export declare function combineRecords<T>(records: {
     name: string;
     result: T;

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

@@ -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;AA+BhC,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,CAiFvB;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"}
+{"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;AA+BhC,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;AAUD,MAAM,WAAW,sBAAsB;IACrC,gBAAgB,EAAE,MAAM,CAAC;IACzB,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,mBAAmB,EAAE,MAAM,CAAC;CAC7B;AAED,wBAAgB,yBAAyB,CACvC,aAAa,EAAE,qBAAqB,GAAG,SAAS,GAC/C,sBAAsB,CAaxB;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,CAoFvB;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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPluginAndContextArray = exports.checkWetherProvisionSucceeded = exports.fillInSolutionSettings = exports.loadTeamsAppTenantIdForLocal = exports.checkWhetherLocalDebugM365TenantMatches = exports.parseUserName = exports.parseTeamsAppTenantId = exports.ensurePermissionRequest = exports.setActivatedResourcePluginsV2 = exports.extractSolutionInputs = exports.combineRecords = exports.isAzureProject = exports.getAzureSolutionSettings = exports.getSelectedPlugins = void 0;
+exports.getPluginAndContextArray = exports.checkWetherProvisionSucceeded = exports.fillInSolutionSettings = exports.loadTeamsAppTenantIdForLocal = exports.checkWhetherLocalDebugM365TenantMatches = exports.parseUserName = exports.parseTeamsAppTenantId = exports.ensurePermissionRequest = exports.setActivatedResourcePluginsV2 = exports.extractSolutionInputs = exports.combineRecords = exports.getBotTroubleShootMessage = exports.isAzureProject = exports.getAzureSolutionSettings = exports.getSelectedPlugins = void 0;
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const localSettingsConstants_1 = require("../../../../common/localSettingsConstants");
 const tools_1 = require("../../../../common/tools");
@@ -21,6 +21,25 @@ function isAzureProject(azureSettings) {
     return azureSettings !== undefined && question_1.HostTypeOptionAzure.id === azureSettings.hostType;
 }
 exports.isAzureProject = isAzureProject;
+function isBotProject(azureSettings) {
+    var _a, _b;
+    return (azureSettings !== undefined &&
+        (((_a = azureSettings.capabilities) === null || _a === void 0 ? void 0 : _a.includes(question_1.BotOptionItem.id)) ||
+            ((_b = azureSettings.capabilities) === null || _b === void 0 ? void 0 : _b.includes(question_1.MessageExtensionItem.id))));
+}
+function getBotTroubleShootMessage(azureSettings) {
+    const botTroubleShootLink = "https://aka.ms/teamsfx-bot-help#how-can-i-troubleshoot-issues-when-teams-bot-isnt-responding-on-azure";
+    const botTroubleShootDesc = localizeUtils_1.getLocalizedString("core.deploy.botTroubleShoot");
+    const botTroubleShootLearnMore = localizeUtils_1.getLocalizedString("core.deploy.botTroubleShoot.learnMore");
+    const botTroubleShootMsg = `${botTroubleShootDesc} ${botTroubleShootLearnMore}: ${botTroubleShootLink}.`;
+    return {
+        troubleShootLink: botTroubleShootLink,
+        textForLogging: isBotProject(azureSettings) ? botTroubleShootMsg : "",
+        textForMsgBox: botTroubleShootDesc,
+        textForActionButton: botTroubleShootLearnMore,
+    };
+}
+exports.getBotTroubleShootMessage = getBotTroubleShootMessage;
 function combineRecords(records) {
     const ret = {};
     for (const record of records) {
@@ -165,6 +184,9 @@ function fillInSolutionSettings(projectSettings, answers) {
     }
     else if (capabilities.includes(question_1.M365SsoLaunchPageOptionItem.id)) {
         capabilities = [question_1.TabOptionItem.id];
+        if (tools_1.isAadManifestEnabled()) {
+            capabilities.push(question_1.TabSsoItem.id);
+        }
         hostType = question_1.HostTypeOptionAzure.id;
     }
     else if (capabilities.includes(question_1.M365SearchAppOptionItem.id)) {

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":"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"}
+{"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,6 +1,6 @@
 {
   "name": "@microsoft/teamsfx-core",
-  "version": "1.8.0",
+  "version": "1.8.1-alpha.324752dff.0",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "license": "MIT",
@@ -8,6 +8,7 @@
     "lint:staged": "lint-staged",
     "lint": "eslint \"src/**/*.ts\" \"tests/**/*.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/plugins/resource/cicd/**/*.test.ts\"",
     "test:dotnet": "nyc mocha \"tests/plugins/resource/dotnet/**/*.test.ts\"",
     "test:function": "nyc mocha \"tests/plugins/resource/function/**/*.test.ts\"",
@@ -39,6 +40,8 @@
     "test:env-checker": "npx mocha \"tests/common/deps-checker/**/*.it.ts\"",
     "test:core:miniapp": "nyc mocha \"tests/core/miniapp.test.ts\"",
     "test:core:other": "nyc mocha \"tests/core/other.test.ts\"",
+    "test:workflow": "nyc mocha \"tests/core/workflow.test.ts\"",
+    "test:hosting": "nyc mocha \"tests/common/hosting/**/*.test.ts\"",
     "clean": "rm -rf build",
     "build": "rimraf build && npx tsc -p ./",
     "lint:fix": "eslint --fix \"src/**/*.ts\" \"tests/**/*.ts\"",
@@ -65,7 +68,7 @@
     "@azure/storage-blob": "^12.7.0",
     "@dbpiper/timer": "1.0.0-beta.2",
     "@feathersjs/hooks": "^0.6.5",
-    "@microsoft/teamsfx-api": "^0.18.0",
+    "@microsoft/teamsfx-api": "0.18.1-alpha.324752dff.0",
     "@npmcli/arborist": "^4.2.0",
     "@types/jwt-decode": "3.1.0",
     "@types/proper-lockfile": "^4.1.1",
@@ -102,6 +105,7 @@
     "reflect-metadata": "^0.1.13",
     "semver": "^7.3.4",
     "tedious": "^14.3.0",
+    "toposort": "^2.0.2",
     "tslib": "^2.1.0",
     "typedi": "^0.10.0",
     "url-parse": "^1.5.9",
@@ -143,6 +147,7 @@
     "@types/sinon": "^9.0.10",
     "@types/tedious": "^4.0.3",
     "@types/tmp": "^0.2.0",
+    "@types/toposort": "^2.0.3",
     "@types/url-parse": "^1.4.3",
     "@types/uuid": "^8.3.0",
     "@types/validator": "^13.1.1",
@@ -184,7 +189,7 @@
     "resource/**/*",
     "templates/**/*"
   ],
-  "gitHead": "56ae503e2f0d6c13a62f991b6a3deb38d1183aed",
+  "gitHead": "d78a04166fb1383c7e07e529116aa3d82f4199b9",
   "publishConfig": {
     "access": "public"
   },

package/resource/aad-manifest-change-logs.md

@@ -0,0 +1,27 @@
+# Congratulations! You have successfully upgraded your Teams App project structure.
+
+We have updated the configuration files so that your project is compatible with the latest Teams Toolkit features, including add a AAD manifest template file.
+
+> Import Notes: If you collaborate on this project with your co-workers, and his teams toolkit extension version <= 3.7.0, please ensure your team members update the Teams Toolkit extension to the latest version after committing the changes with this upgrade.
+
+## Why upgrade
+Teams Toolkit continues to improve your Teams application development experience. We are upgrading the Teams app project structure so that you can:
+
+1. Use AAD manifest template to customize your AAD app.
+1. Allow to add single sign-on (SSO) feature for Bot (hosting on Azure App Service), Messaging Extension, Static Launch Page, and Embed existing web App
+
+## Know about the changes we made
+After the project upgrade, there are following changes we made:
+1. Update `.fx\configs\projectSettings.json` capabilities to include TabSSO and/or BotSSO based on original project capabilities.
+1. AAD manifest template file will be added to `templates\appPackage\aad.template.json`
+1. The required resource access information in `permissions.json` file will be merged into `aad.template.json` file and `permissions.json` file will be deprecated, please customize `requiredResourceAccess` property in `aad.template.json` file.
+
+## Know about how to restore your project
+If anything went wrong after the upgrade process, you could restore your old project configuration files by:
+* Copy the .backup/.fx folder to your project root path.
+* Delete `templates\appPackage\aad.template.json` file if needed
+
+
+
+
+