@microsoft/teamsfx-core 1.12.0 → 1.12.1-rc.0

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

@@ -6,7 +6,6 @@ const lodash_1 = require("lodash");
 const typedi_1 = require("typedi");
 const projectSettingsHelper_1 = require("../../../../common/projectSettingsHelper");
 const tools_1 = require("../../../../common/tools");
-const environment_1 = require("../../../../core/environment");
 const permissionRequest_1 = require("../../../../core/permissionRequest");
 const constants_1 = require("../constants");
 const provisionLocal_1 = require("../debug/provisionLocal");
@@ -14,7 +13,6 @@ const ResourcePluginContainer_1 = require("../ResourcePluginContainer");
 const executor_1 = require("./executor");
 const utils_1 = require("./utils");
 async function provisionLocalResource(ctx, inputs, localSettings, tokenProvider, envInfo) {
-    var _a;
     if (inputs.projectPath === undefined) {
         return new teamsfx_api_1.v2.FxFailure(new teamsfx_api_1.SystemError("Solution", constants_1.SolutionError.InternelError, "projectPath is undefined"));
     }
@@ -39,14 +37,7 @@ async function provisionLocalResource(ctx, inputs, localSettings, tokenProvider,
     }
     // Pop-up window to confirm if local debug in another tenant
     let localDebugTenantId = "";
-    if (tools_1.isConfigUnifyEnabled()) {
-        localDebugTenantId = envInfo === null || envInfo === void 0 ? void 0 : envInfo.state.solution.teamsAppTenantId;
-    }
-    else {
-        if (!localSettings.teamsApp)
-            localSettings.teamsApp = {};
-        localDebugTenantId = (_a = localSettings.teamsApp) === null || _a === void 0 ? void 0 : _a.tenantId;
-    }
+    localDebugTenantId = envInfo === null || envInfo === void 0 ? void 0 : envInfo.state.solution.teamsAppTenantId;
     const m365TenantMatches = await utils_1.checkWhetherLocalDebugM365TenantMatches(localDebugTenantId, tokenProvider.m365TokenProvider, inputs.projectPath);
     if (m365TenantMatches.isErr()) {
         return new teamsfx_api_1.v2.FxFailure(m365TenantMatches.error);
@@ -73,17 +64,9 @@ async function provisionLocalResource(ctx, inputs, localSettings, tokenProvider,
     if (provisionResult.kind !== "success") {
         return provisionResult;
     }
-    if (tools_1.isConfigUnifyEnabled()) {
-        const localEnvSetupResult = await provisionLocal_1.setupLocalEnvironment(ctx, inputs, envInfo);
-        if (localEnvSetupResult.isErr()) {
-            return new teamsfx_api_1.v2.FxPartialSuccess(envInfo, localEnvSetupResult.error);
-        }
-    }
-    else {
-        const debugProvisionResult = await provisionLocal_1.setupLocalDebugSettings(ctx, inputs, localSettings);
-        if (debugProvisionResult.isErr()) {
-            return new teamsfx_api_1.v2.FxPartialSuccess(localSettings, debugProvisionResult.error);
-        }
+    const localEnvSetupResult = await provisionLocal_1.setupLocalEnvironment(ctx, inputs, envInfo);
+    if (localEnvSetupResult.isErr()) {
+        return new teamsfx_api_1.v2.FxPartialSuccess(envInfo, localEnvSetupResult.error);
     }
     const aadPlugin = typedi_1.Container.get(ResourcePluginContainer_1.ResourcePluginsV2.AadPlugin);
     if (utils_1.isAzureProject(azureSolutionSettings)) {
@@ -91,10 +74,8 @@ async function provisionLocalResource(ctx, inputs, localSettings, tokenProvider,
             const result = await aadPlugin.executeUserTask(ctx, inputs, {
                 namespace: `${constants_1.PluginNames.SOLUTION}/${constants_1.PluginNames.AAD}`,
                 method: "setApplicationInContext",
-                params: { isLocal: tools_1.isConfigUnifyEnabled() ? false : true },
-            }, localSettings, tools_1.isConfigUnifyEnabled()
-                ? envInfo
-                : { envName: environment_1.environmentManager.getDefaultEnvName(), config: {}, state: {} }, tokenProvider);
+                params: { isLocal: false },
+            }, localSettings, envInfo, tokenProvider);
             if (result.isErr()) {
                 return new teamsfx_api_1.v2.FxPartialSuccess(localSettings, result.error);
             }
@@ -125,17 +106,9 @@ async function provisionLocalResource(ctx, inputs, localSettings, tokenProvider,
         }
         return new teamsfx_api_1.v2.FxFailure(configureResourceResult.error);
     }
-    if (tools_1.isConfigUnifyEnabled()) {
-        const localConfigResult = await provisionLocal_1.configLocalEnvironment(ctx, inputs, envInfo);
-        if (localConfigResult.isErr()) {
-            return new teamsfx_api_1.v2.FxPartialSuccess(envInfo, localConfigResult.error);
-        }
-    }
-    else {
-        const debugConfigResult = await provisionLocal_1.configLocalDebugSettings(ctx, inputs, localSettings);
-        if (debugConfigResult.isErr()) {
-            return new teamsfx_api_1.v2.FxPartialSuccess(localSettings, debugConfigResult.error);
-        }
+    const localConfigResult = await provisionLocal_1.configLocalEnvironment(ctx, inputs, envInfo);
+    if (localConfigResult.isErr()) {
+        return new teamsfx_api_1.v2.FxPartialSuccess(envInfo, localConfigResult.error);
     }
     return new teamsfx_api_1.v2.FxSuccess(localSettings);
 }

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

@@ -1 +1 @@
-{"version":3,"file":"provisionLocal.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/provisionLocal.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"provisionLocal.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/provisionLocal.ts"],"names":[],"mappings":";;;AAAA,wDAA+F;AAC/F,mCAAqC;AACrC,mCAAmC;AACnC,oFAA4E;AAC5E,oDAA2D;AAE3D,0EAAmF;AACnF,4CAA0D;AAC1D,4DAKiC;AACjC,wEAA+D;AAC/D,yCAAiD;AACjD,mCAOiB;AAEV,KAAK,UAAU,sBAAsB,CAC1C,GAAe,EACf,MAAc,EACd,aAAmB,EACnB,aAA4B,EAC5B,OAAsB;IAEtB,IAAI,MAAM,CAAC,WAAW,KAAK,SAAS,EAAE;QACpC,OAAO,IAAI,gBAAE,CAAC,SAAS,CACrB,IAAI,yBAAW,CAAC,UAAU,EAAE,yBAAa,CAAC,aAAa,EAAE,0BAA0B,CAAC,CACrF,CAAC;KACH;IACD,MAAM,qBAAqB,GAAG,gCAAwB,CAAC,GAAG,CAAC,CAAC;IAC5D,IAAI,sBAAc,CAAC,qBAAqB,CAAC,EAAE;QACzC,IAAI,GAAG,CAAC,yBAAyB,KAAK,SAAS,EAAE;YAC/C,GAAG,CAAC,yBAAyB,GAAG,IAAI,iDAA6B,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;SACvF;QACD,MAAM,MAAM,GAAG,MAAM,+BAAuB,CAC1C,qBAAsB,EACtB,GAAG,CAAC,yBAAyB,CAC9B,CAAC;QACF,IAAI,MAAM,CAAC,KAAK,EAAE,EAAE;YAClB,OAAO,IAAI,gBAAE,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;SACvC;KACF;IAED,4EAA4E;IAC5E,sFAAsF;IACtF,4EAA4E;IAC5E,MAAM,iBAAiB,GAAG,MAAM,aAAa,CAAC,iBAAiB,CAAC,cAAc,CAAC;QAC7E,MAAM,EAAE,uBAAe;KACxB,CAAC,CAAC;IACH,IAAI,iBAAiB,CAAC,KAAK,EAAE,EAAE;QAC7B,OAAO,IAAI,gBAAE,CAAC,SAAS,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;KAClD;IACD,4DAA4D;IAC5D,IAAI,kBAAkB,GAAG,EAAE,CAAC;IAC5B,kBAAkB,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,CAAC,QAAQ,CAAC,gBAAgB,CAAC;IAE9D,MAAM,iBAAiB,GAAG,MAAM,+CAAuC,CACrE,kBAAkB,EAClB,aAAa,CAAC,iBAAiB,EAC/B,MAAM,CAAC,WAAW,CACnB,CAAC;IACF,IAAI,iBAAiB,CAAC,KAAK,EAAE,EAAE;QAC7B,OAAO,IAAI,gBAAE,CAAC,SAAS,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;KAClD;IAED,MAAM,OAAO,GAAG,0BAAkB,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IACvD,IAAI,wCAAgB,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE;QACxC,kFAAkF;QAClF,MAAM,eAAe,GAAG,kBAAS,CAAC,GAAG,CAAoB,2CAAiB,CAAC,eAAe,CAAC,CAAC;QAC5F,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,eAAe,CAAC,IAAI,CAAC,EAAE;YACzD,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;SAC/B;KACF;IAED,MAAM,4BAA4B,GAAG,OAAO;SACzC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,oBAAW,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAC;SAC/D,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;QACd,OAAO;YACL,UAAU,EAAE,GAAG,MAAM,CAAC,IAAI,EAAE;YAC5B,QAAQ,EAAE,wBAAwB;YAClC,oEAAoE;YACpE,KAAK,EAAE,GAAG,EAAE,CACV,MAAM,CAAC,sBAAuB,CAAC,GAAG,EAAE,MAAM,EAAE,aAAa,EAAE,aAAa,EAAE,OAAO,CAAC;SACrF,CAAC;IACJ,CAAC,CAAC,CAAC;IAEL,MAAM,eAAe,GAAG,MAAM,8BAAmB,CAAC,4BAA4B,EAAE,GAAG,CAAC,WAAW,CAAC,CAAC;IACjG,IAAI,eAAe,CAAC,IAAI,KAAK,SAAS,EAAE;QACtC,OAAO,eAAe,CAAC;KACxB;IAED,MAAM,mBAAmB,GAAG,MAAM,sCAAqB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAQ,CAAC,CAAC;IAE/E,IAAI,mBAAmB,CAAC,KAAK,EAAE,EAAE;QAC/B,OAAO,IAAI,gBAAE,CAAC,gBAAgB,CAAC,OAAQ,EAAE,mBAAmB,CAAC,KAAK,CAAC,CAAC;KACrE;IAED,MAAM,SAAS,GAAG,kBAAS,CAAC,GAAG,CAAoB,2CAAiB,CAAC,SAAS,CAAC,CAAC;IAChF,IAAI,sBAAc,CAAC,qBAAqB,CAAC,EAAE;QACzC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,SAAS,CAAC,IAAI,CAAC,IAAI,SAAS,CAAC,eAAe,EAAE;YACzF,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,eAAe,CAC5C,GAAG,EACH,MAAM,EACN;gBACE,SAAS,EAAE,GAAG,uBAAW,CAAC,QAAQ,IAAI,uBAAW,CAAC,GAAG,EAAE;gBACvD,MAAM,EAAE,yBAAyB;gBACjC,MAAM,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE;aAC3B,EACD,aAAa,EACb,OAAQ,EACR,aAAa,CACd,CAAC;YACF,IAAI,MAAM,CAAC,KAAK,EAAE,EAAE;gBAClB,OAAO,IAAI,gBAAE,CAAC,gBAAgB,CAAC,aAAa,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;aAC7D;SACF;KACF;IAED,MAAM,qBAAqB,GAAG,MAAM,aAAa,CAAC,iBAAiB,CAAC,aAAa,CAAC;QAChF,MAAM,EAAE,uBAAe;KACxB,CAAC,CAAC;IACH,MAAM,kBAAkB,GAAG,qBAAqB,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;IAElG,MAAM,mBAAmB,GAAG,oCAA4B,CACtD,aAAiC,EACjC,kBAAkB,EAClB,OAAO,CACR,CAAC;IACF,IAAI,mBAAmB,CAAC,KAAK,EAAE,EAAE;QAC/B,OAAO,IAAI,gBAAE,CAAC,SAAS,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC;KACpD;IAED,MAAM,4BAA4B,GAAG,OAAO;SACzC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,oBAAW,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAC;SAC/D,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;QACd,OAAO;YACL,UAAU,EAAE,GAAG,MAAM,CAAC,IAAI,EAAE;YAC5B,QAAQ,EAAE,wBAAwB;YAClC,oEAAoE;YACpE,KAAK,EAAE,GAAG,EAAE,CACV,MAAM,CAAC,sBAAuB,CAAC,GAAG,EAAE,MAAM,EAAE,aAAa,EAAE,aAAa,EAAE,OAAO,CAAC;SACrF,CAAC;IACJ,CAAC,CAAC,CAAC;IAEL,MAAM,uBAAuB,GAAG,MAAM,8BAAmB,CACvD,4BAA4B,EAC5B,GAAG,CAAC,WAAW,CAChB,CAAC;IAEF,IAAI,uBAAuB,CAAC,IAAI,KAAK,SAAS,EAAE;QAC9C,IAAI,uBAAuB,CAAC,IAAI,KAAK,gBAAgB,EAAE;YACrD,OAAO,IAAI,gBAAE,CAAC,gBAAgB,CAAC,aAAa,EAAE,uBAAuB,CAAC,KAAK,CAAC,CAAC;SAC9E;QACD,OAAO,IAAI,gBAAE,CAAC,SAAS,CAAC,uBAAuB,CAAC,KAAK,CAAC,CAAC;KACxD;IAED,MAAM,iBAAiB,GAAG,MAAM,uCAAsB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAQ,CAAC,CAAC;IAE9E,IAAI,iBAAiB,CAAC,KAAK,EAAE,EAAE;QAC7B,OAAO,IAAI,gBAAE,CAAC,gBAAgB,CAAC,OAAQ,EAAE,iBAAiB,CAAC,KAAK,CAAC,CAAC;KACnE;IAED,OAAO,IAAI,gBAAE,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;AACzC,CAAC;AAlJD,wDAkJC"}

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,eAAe,EAGf,iBAAiB,EAClB,MAAM,wBAAwB,CAAC;AAoChC,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,iBAAiB,CAAC,EAAE,iBAAiB,EACrC,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CA0ChC;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"}
+{"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,eAAe,EAGf,iBAAiB,EAClB,MAAM,wBAAwB,CAAC;AAgChC,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,iBAAiB,CAAC,EAAE,iBAAiB,EACrC,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CA0ChC;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,CAOvB;AAED,wBAAgB,sBAAsB,CACpC,eAAe,EAAE,eAAe,EAChC,OAAO,EAAE,MAAM,GACd,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAsFvB;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

@@ -4,7 +4,6 @@ exports.getPluginAndContextArray = exports.checkWetherProvisionSucceeded = expor
 const tslib_1 = require("tslib");
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
-const localSettingsConstants_1 = require("../../../../common/localSettingsConstants");
 const tools_1 = require("../../../../common/tools");
 const constants_1 = require("../constants");
 const question_1 = require("../question");
@@ -140,12 +139,7 @@ exports.checkWhetherLocalDebugM365TenantMatches = checkWhetherLocalDebugM365Tena
 // Loads teams app tenant id into local settings.
 function loadTeamsAppTenantIdForLocal(localSettings, appStudioToken, envInfo) {
     return parseTeamsAppTenantId(appStudioToken).andThen((teamsAppTenantId) => {
-        if (tools_1.isConfigUnifyEnabled()) {
-            envInfo.state.solution.teamsAppTenantId = teamsAppTenantId;
-        }
-        else {
-            localSettings.teamsApp[localSettingsConstants_1.LocalSettingsTeamsAppKeys.TenantId] = teamsAppTenantId;
-        }
+        envInfo.state.solution.teamsAppTenantId = teamsAppTenantId;
         return teamsfx_api_1.ok(teamsfx_api_1.Void);
     });
 }
@@ -205,6 +199,8 @@ function fillInSolutionSettings(projectSettings, answers) {
     }
     else if (capabilities.includes(question_1.M365SearchAppOptionItem.id)) {
         capabilities = [question_1.MessageExtensionItem.id];
+        const scenarios = [question_1.M365SearchAppOptionItem.id];
+        answers[question_1.AzureSolutionQuestionNames.Scenarios] = scenarios;
         hostType = question_1.HostTypeOptionAzure.id;
     }
     if (!hostType) {

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.12.0",
+  "version": "1.12.1-rc.0",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "license": "MIT",
@@ -38,7 +38,7 @@
     "test:apiv2": "nyc mocha \"tests/plugins/resource/apiv2/*.test.ts\"",
     "test:solutionv3": "nyc mocha \"tests/plugins/solutionv3/*.test.ts\"",
     "test:env-checker": "npx mocha \"tests/common/deps-checker/**/*.it.ts\"",
-    "test:core:miniapp": "nyc mocha \"tests/core/miniapp.test.ts\"",
+    "test:core:miniapp": "nyc mocha \"tests/core/core.miniapp.test.ts\"",
     "test:core:other": "nyc mocha \"tests/core/other.test.ts\"",
     "test:component": "nyc mocha \"tests/component/**/*.test.ts\"",
     "test:hosting": "nyc mocha \"tests/common/hosting/**/*.test.ts\"",
@@ -189,7 +189,7 @@
     "resource/**/*",
     "templates/**/*"
   ],
-  "gitHead": "6fd3cd0604b2d42dc317ebb0bc4f42ffc15361fe",
+  "gitHead": "16bd1538ec429aed8dce572e0bc3ff962051fc47",
   "publishConfig": {
     "access": "public"
   },

package/resource/package.nls.json

@@ -191,7 +191,7 @@
   "plugins.appstudio.provisionProgress": "Registering Teams app %s...",
   "plugins.appstudio.postProvisionProgress": "Updating Teams app %s...",
   "plugins.appstudio.publishProgressValidate": "Validating manifest file",
-  "plugins.appstudio.publishProgressUpdate": "Updating app definition for app %s in app studio",
+  "plugins.appstudio.publishProgressUpdate": "Updating app definition for app %s in Developer Portal",
   "plugins.appstudio.publishProgressBuild": "Building Teams app package in %s.",
   "plugins.appstudio.publishProgressPublish": "Publishing %s",
   "plugins.appstudio.dataRequired": "Data required: %s",
@@ -395,12 +395,14 @@
   "error.appstudio.executeUserTaskRouteFailed": "Failed to route function call: %s}",
   "error.appstudio.fileNotFoundError": "File %s not found.",
   "error.appstudio.notADirectoryError": "%s is not a directory.",
-  "error.appstudio.remoteTeamsAppCreateFailed": "Failed to create remote teams app in app studio, due to %s, %s",
-  "error.appstudio.remoteTeamsAppUpdateFailed": "Failed to update remote teams app in app studio, due to %s, %s",
-  "error.appstudio.localTeamsAppCreateFailed": "Failed to create local debug teams app in app studio, due to %s, %s",
-  "error.appstudio.localTeamsAppUpdateFailed": "Failed to update local debug teams app in app studio, due to %s, %s",
-  "error.appstudio.teamsAppCreateFailed": "Failed to create teams app in app studio, due to %s, %s",
+  "error.appstudio.remoteTeamsAppCreateFailed": "Failed to create remote Teams app in Developer Portal, due to %s",
+  "error.appstudio.remoteTeamsAppUpdateFailed": "Failed to update remote Teams app in Developer Portal, due to %s",
+  "error.appstudio.localTeamsAppCreateFailed": "Failed to create local debug Teams app in Developer Portal, due to %s",
+  "error.appstudio.localTeamsAppUpdateFailed": "Failed to update local debug Teams app in Developer Portal, due to %s",
+  "error.appstudio.teamsAppCreateFailed": "Failed to create Teams app in Developer Portal, due to %s",
   "error.appstudio.teamsAppUpdateFailed": "Failed to update Teams app with ID %s.",
+  "error.appstudio.apiFailed": "API call to Developer Portal failed: %s, %s, Request path: %s, X-Correlation-ID: %s. This may come from some intermittent service error. Please wait for a few minutes and retry the current step.",
+  "error.appstudio.apiFailed.telemetry": "API call to Developer Portal failed: %s, %s, API name: %s, X-Correlation-ID: %s. This may come from some intermittent service error. Please wait for a few minutes and retry the current step.",
   "error.appstudio.teamsAppNotFound": "Cannot found teams app with id %s",
   "error.appstudio.noAppStudioToken": "Failed to get app studio token.",
   "error.appstudio.invalidManifest": "Failed to parse manifest string, dut to error: %s. This might be caused by invalid configurations. %s",
@@ -476,7 +478,7 @@
   "error.apiConnector.NoBotOrFunctionExistError": "Please create bot or function resource first.",
   "error.apiConnector.InvalidProjectError": "Please select a valid TeamsFx project",
   "error.apiConnector.ApiConnectorFunctionRouteError": "Failed to route function call: %s",
-  "error.apiConnector.SDKVersionImcompatibleError": "In %s project, @microsoft/teamsfx version %s is not compatible. Please upgrade your package version to %s",
+  "error.apiConnector.SDKVersionImcompatibleError": "In %s project, @microsoft/teamsfx version %s is not compatible. Please upgrade the @microsoft/teamsfx version to %s and retry this feature.",
   "error.apiConnector.pkgFileNotExistError": "In %s project, there is no package.json exist",
   "error.apiConnector.componentNotExistError": "Component %s not exist, please add first",
   "error.apiConnector.envVarExistError": "Please provide a different API name to avoid conflicts with existing env variables %s in .env.teamsfx.local",
@@ -777,7 +779,7 @@
   "plugins.bot.ClickGetHelp": "Please click 'Get Help' button for more details.",
   "plugins.bot.FailToRun": "Failed to run %s.",
   "plugins.bot.PerformCommand": "Perform command %s before %s.",
-  "plugins.bot.FailToCallAppStudioApi": "Failed to call App Studio's api to check AAD application's existence.",
+  "plugins.bot.FailToCallAppStudioApi": "Failed to call Developer Portal's api to check AAD application's existence.",
   "plugins.bot.SuccessfullyRetrievedZip": "Successfully retrieved zip package from %s",
   "plugins.bot.FallingUseLocalTemplate": "Falling back to use local template zip.",
   "plugins.bot.ResourceProvider": "Resource Provider %s already exists, do not need to register.",
@@ -819,7 +821,7 @@
   "plugins.bot.TeamsChannel": "Teams channel",
   "plugins.bot.AadApp": "AAD app",
   "plugins.bot.AadClientSecret": "AAD client secret",
-  "plugins.bot.AppStudioBotRegistration": "App Studio bot registration",
+  "plugins.bot.AppStudioBotRegistration": "Developer Portal bot registration",
   "plugins.function.askNodeVersion": "Select Node version for the function app.",
   "plugins.function.askFunctionName": "Provide a function name.",
   "plugins.function.checkDotNetVersion": "Check your .NET Core version.",

package/templates/bicep/azureFunction.config.orchestration.bicep

@@ -1,9 +1,9 @@
 // Get existing app settings for merge
-var currentAppSettings = list('${provisionOutputs.azureFunctionOutput.value.resourceId}/config/appsettings', '2021-02-01').properties
+var currentAppSettings = list('${ {{azure-function.outputs.resourceId}} }/config/appsettings', '2021-02-01').properties
 
 // Merge TeamsFx configurations to Azure Function App
-module teamsFxAzureFunctionConfig './teamsFx/azureFunctionConfig.bicep' = {
-  name: 'teamsFxAzureFunctionConfig'
+module teamsFxAzureFunction{{componentName}}Config './teamsFx/azureFunction{{componentName}}Config.bicep' = {
+  name: 'teamsFxAzureFunction{{componentName}}Config'
   params: {
     provisionParameters: provisionParameters
     provisionOutputs: provisionOutputs

package/templates/bicep/azureFunction.provision.orchestration.bicep

@@ -1,17 +1,17 @@
 // Resources Azure Function App
-module azureFunctionProvision './provision/azureFunction.bicep' = {
-  name: 'azureFunctionProvision'
+module azureFunction{{componentName}}Provision './provision/azureFunction{{componentName}}.bicep' = {
+  name: 'azureFunction{{componentName}}Provision'
   params: {
     provisionParameters: provisionParameters
   }
 }
 
-output azureFunctionOutput object = {
-  teamsFxPluginId: 'azure-function'
-  sku: azureFunctionProvision.outputs.sku
-  appName: azureFunctionProvision.outputs.appName
-  domain: azureFunctionProvision.outputs.domain
-  appServicePlanName: azureFunctionProvision.outputs.appServicePlanName
-  resourceId: azureFunctionProvision.outputs.resourceId
-  endpoint: azureFunctionProvision.outputs.endpoint
+output azureFunction{{componentName}}Output object = {
+  teamsFxPluginId: '{{componentId}}'
+  sku: azureFunction{{componentName}}Provision.outputs.sku
+  appName: azureFunction{{componentName}}Provision.outputs.appName
+  domain: azureFunction{{componentName}}Provision.outputs.domain
+  appServicePlanName: azureFunction{{componentName}}Provision.outputs.appServicePlanName
+  functionAppResourceId: azureFunction{{componentName}}Provision.outputs.resourceId
+  functionEndpoint: azureFunction{{componentName}}Provision.outputs.endpoint
 }

package/templates/bicep/azureStorage.provision.orchestration.bicep

@@ -1,15 +1,15 @@
 // Resources for frontend hosting
-module azureStorageProvision './provision/azureStorage.bicep' = {
-  name: 'azureStorageProvision'
+module azureStorage{{componentName}}Provision './provision/azureStorage{{componentName}}.bicep' = {
+  name: 'azureStorage{{componentName}}Provision'
   params: {
     provisionParameters: provisionParameters
   }
 }
 
-output azureStorageOutput object = {
-  teamsFxPluginId: 'azure-storage'
-  domain: azureStorageProvision.outputs.domain
-  endpoint: azureStorageProvision.outputs.endpoint
-  indexPath: azureStorageProvision.outputs.indexPath
-  resourceId: azureStorageProvision.outputs.resourceId
+output azureStorage{{componentName}}Output object = {
+  teamsFxPluginId: '{{componentId}}'
+  domain: azureStorage{{componentName}}Provision.outputs.domain
+  endpoint: azureStorage{{componentName}}Provision.outputs.endpoint
+  indexPath: azureStorage{{componentName}}Provision.outputs.indexPath
+  resourceId: azureStorage{{componentName}}Provision.outputs.resourceId
 }

package/templates/bicep/azureWebApp.config.orchestration.bicep

@@ -1,9 +1,9 @@
 // Get existing app settings for merge
-var currentAppSettings = list('${provisionOutputs.azureWebAppOutput.value.resourceId}/config/appsettings', '2021-02-01').properties
+var currentAppSettings = list('${ {{azure-web-app.outputs.resourceId}} }/config/appsettings', '2021-02-01').properties
 
 // Merge TeamsFx configurations to Bot resources
-module teamsFxAzureWebAppConfig './teamsFx/azureWebAppConfig.bicep' = {
-  name: 'teamsFxAzureWebAppConfig'
+module teamsFxAzureWebApp{{componentName}}Config './teamsFx/azureWebApp{{componentName}}Config.bicep' = {
+  name: 'teamsFxAzureWebApp{{componentName}}Config'
   params: {
     provisionParameters: provisionParameters
     provisionOutputs: provisionOutputs

package/templates/bicep/azureWebApp.provision.module.bicep

@@ -16,7 +16,7 @@ resource serverfarm 'Microsoft.Web/serverfarms@2021-02-01' = {
   }
 }
 
-// Web App that hosts your bot
+// Web App that hosts your app
 resource webApp 'Microsoft.Web/sites@2021-02-01' = {
   kind: 'app'
   location: resourceGroup().location
@@ -34,16 +34,16 @@ resource webApp 'Microsoft.Web/sites@2021-02-01' = {
           name: 'SCM_SCRIPT_GENERATOR_ARGS'
           value: '--node' // Register as node server
         }
-        {{else}}
         {
-          name: 'SCM_DO_BUILD_DURING_DEPLOYMENT'
-          value: 'true' // Execute build steps on your site during deployment
+          name: 'RUNNING_ON_AZURE'
+          value: '1'
         }
-        {{/if}}
+        {{else}}
         {
-          name: 'RUNNING_ON_AZURE'
+          name: 'WEBSITE_RUN_FROM_PACKAGE'
           value: '1'
         }
+        {{/if}}
       ]
     }
   }

package/templates/bicep/azureWebApp.provision.orchestration.bicep

@@ -1,18 +1,18 @@
 // Resources web app
-module azureWebAppProvision './provision/azureWebApp.bicep' = {
-  name: 'azureWebAppProvision'
+module azureWebApp{{componentName}}Provision './provision/azureWebApp{{componentName}}.bicep' = {
+  name: 'azureWebApp{{componentName}}Provision'
   params: {
     provisionParameters: provisionParameters
   }
 }
 
 
-output azureWebAppOutput object = {
-  teamsFxPluginId: 'azure-web-app'
-  sku: azureWebAppProvision.outputs.sku
-  appName: azureWebAppProvision.outputs.appName
-  domain: azureWebAppProvision.outputs.domain
-  appServicePlanName: azureWebAppProvision.outputs.appServicePlanName
-  resourceId: azureWebAppProvision.outputs.resourceId
-  endpoint: azureWebAppProvision.outputs.endpoint
+output azureWebApp{{componentName}}Output object = {
+  teamsFxPluginId: '{{componentId}}'
+  sku: azureWebApp{{componentName}}Provision.outputs.sku
+  appName: azureWebApp{{componentName}}Provision.outputs.appName
+  domain: azureWebApp{{componentName}}Provision.outputs.domain
+  appServicePlanName: azureWebApp{{componentName}}Provision.outputs.appServicePlanName
+  resourceId: azureWebApp{{componentName}}Provision.outputs.resourceId
+  endpoint: azureWebApp{{componentName}}Provision.outputs.endpoint
 }

package/templates/bicep/botService.parameters.json

@@ -0,0 +1,4 @@
+{
+  "botAadAppClientId": "{{state.teams-bot.botId}}",
+  "botAadAppClientSecret": "{{state.teams-bot.botPassword}}"
+}

package/templates/bicep/{botService.config.module.bicep → botService.provision.module.bicep}

@@ -1,6 +1,6 @@
 @secure()
 param provisionParameters object
-param provisionOutputs object
+param botEndpoint string
 var resourceBaseName = provisionParameters.resourceBaseName
 var botAadAppClientId = provisionParameters['botAadAppClientId'] // Read AAD app client id for Azure Bot Service from parameters
 var botServiceName = contains(provisionParameters, 'botServiceName') ? provisionParameters['botServiceName'] : '${resourceBaseName}' // Try to read name for Azure Bot Service from parameters
@@ -14,7 +14,7 @@ resource azureBot 'Microsoft.BotService/botServices@2021-03-01' = {
   name: botServiceName
   properties: {
     displayName: botDisplayName
-    endpoint: uri({{endpointVarName}} , '/api/messages')
+    endpoint: uri(botEndpoint, '/api/messages')
     msaAppId: botAadAppClientId
   }
   sku: {

package/templates/bicep/botService.provision.orchestration.bicep

@@ -0,0 +1,8 @@
+// Merge TeamsFx configurations to Bot service
+module botProvision './provision/botService.bicep' = {
+  name: 'botProvision'
+  params: {
+    provisionParameters: provisionParameters
+    botEndpoint: {{endpointVarName}}
+  }
+}

package/templates/plugins/resource/spfx/solution/README.md

@@ -71,7 +71,7 @@ Version|Date|Comments
 Start debugging the project by hitting the `F5` key in Visual Studio Code. Alternatively use the `Run and Debug Activity Panel` in Visual Studio Code and click the `Start Debugging` green arrow button.
 
 - `Teams workbench` is the default debug configuration. Using this configuration, you can install the SPFx app within Teams context as a Teams app.
-- `Hosted workbench`. You need to navigate to [launch.json](.vscode/launch.json), replace `enter-your-SharePoint-site` with your SharePoint site, eg. `https://{your-tenant-name}.sharepoint.com/sites/{your-team-name}/_layouts/workbench.aspx`.
+- `Hosted workbench`. You need to navigate to [launch.json](.vscode/launch.json), replace `enter-your-SharePoint-site` with your SharePoint site, eg. `https://{your-tenant-name}.sharepoint.com/sites/{your-team-name}/_layouts/workbench.aspx`. You can also use root site if you haven't created one, eg. `https://{your-tenant-name}.sharepoint.com/_layouts/workbench.aspx`.
 
 ## References
 

package/build/component/resource/azureFunction.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"azureFunction.d.ts","sourceRoot":"","sources":["../../../src/component/resource/azureFunction.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,OAAO,EAEP,MAAM,EACN,MAAM,EACN,SAAS,EACT,YAAY,EACZ,qBAAqB,EAItB,MAAM,wBAAwB,CAAC;AAahC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,qBACa,qBAAsB,SAAQ,aAAa;IACtD,QAAQ,CAAC,IAAI,oBAAoB;IACjC,QAAQ,CAAC,eAAe,mBAAmB;IAC3C,OAAO;;;;;;;;;MASL;IACF,eAAe,WAA8B;IAC7C,aAAa,CACX,OAAO,EAAE,SAAS,EAClB,MAAM,EAAE,qBAAqB,GAC5B,YAAY,CAAC,MAAM,CAAC,MAAM,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;IASpD,SAAS,CACP,OAAO,EAAE,SAAS,EAClB,MAAM,EAAE,qBAAqB,GAC5B,YAAY,CAAC,MAAM,CAAC,MAAM,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;IA6BpD,MAAM,CACJ,OAAO,EAAE,SAAS,EAClB,MAAM,EAAE,qBAAqB,GAC5B,YAAY,CAAC,MAAM,CAAC,MAAM,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;CAiDrD"}