@microsoft/teamsfx-core 1.21.1 → 1.22.0-rc.1
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.
- package/build/common/m365/packageService.d.ts +13 -0
- package/build/common/m365/packageService.d.ts.map +1 -0
- package/build/common/m365/packageService.js +209 -0
- package/build/common/m365/packageService.js.map +1 -0
- package/build/common/m365/serviceConstant.d.ts +3 -0
- package/build/common/m365/serviceConstant.d.ts.map +1 -0
- package/build/common/m365/serviceConstant.js +8 -0
- package/build/common/m365/serviceConstant.js.map +1 -0
- package/build/common/templates-config.json +4 -2
- package/build/common/versionMetadata.d.ts +12 -3
- package/build/common/versionMetadata.d.ts.map +1 -1
- package/build/common/versionMetadata.js +12 -5
- package/build/common/versionMetadata.js.map +1 -1
- package/build/component/constant/deployConstant.d.ts +7 -0
- package/build/component/constant/deployConstant.d.ts.map +1 -1
- package/build/component/constant/deployConstant.js +9 -1
- package/build/component/constant/deployConstant.js.map +1 -1
- package/build/component/coordinator/index.d.ts.map +1 -1
- package/build/component/coordinator/index.js +0 -16
- package/build/component/coordinator/index.js.map +1 -1
- package/build/component/core.js +1 -1
- package/build/component/core.js.map +1 -1
- package/build/component/driver/botFramework/createOrUpdateBot.d.ts.map +1 -1
- package/build/component/driver/botFramework/createOrUpdateBot.js +40 -1
- package/build/component/driver/botFramework/createOrUpdateBot.js.map +1 -1
- package/build/component/driver/botFramework/interface/createOrUpdateBotFrameworkBotArgs.d.ts +7 -0
- package/build/component/driver/botFramework/interface/createOrUpdateBotFrameworkBotArgs.d.ts.map +1 -1
- package/build/component/driver/deploy/azure/azureAppServiceDeployDriver.js +1 -1
- package/build/component/driver/deploy/azure/azureAppServiceDeployDriver.js.map +1 -1
- package/build/component/driver/deploy/azure/azureDeployDriver.d.ts +2 -2
- package/build/component/driver/deploy/azure/azureDeployDriver.d.ts.map +1 -1
- package/build/component/driver/deploy/azure/azureDeployDriver.js +26 -5
- package/build/component/driver/deploy/azure/azureDeployDriver.js.map +1 -1
- package/build/component/driver/interface/buildAndDeployArgs.d.ts +16 -0
- package/build/component/driver/interface/buildAndDeployArgs.d.ts.map +1 -1
- package/build/component/error/deployError.d.ts +1 -0
- package/build/component/error/deployError.d.ts.map +1 -1
- package/build/component/error/deployError.js +3 -0
- package/build/component/error/deployError.js.map +1 -1
- package/build/component/middleware/questionMW.d.ts +4 -0
- package/build/component/middleware/questionMW.d.ts.map +1 -0
- package/build/component/middleware/questionMW.js +26 -0
- package/build/component/middleware/questionMW.js.map +1 -0
- package/build/component/question.d.ts +1 -1
- package/build/component/question.d.ts.map +1 -1
- package/build/component/question.js +1 -1
- package/build/component/question.js.map +1 -1
- package/build/component/resource/appManifest/appStudio.d.ts.map +1 -1
- package/build/component/resource/appManifest/appStudio.js +16 -2
- package/build/component/resource/appManifest/appStudio.js.map +1 -1
- package/build/component/resource/appManifest/appStudioClient.d.ts.map +1 -1
- package/build/component/resource/appManifest/appStudioClient.js +1 -3
- package/build/component/resource/appManifest/appStudioClient.js.map +1 -1
- package/build/component/resource/appManifest/constants.d.ts +1 -1
- package/build/component/resource/appManifest/constants.d.ts.map +1 -1
- package/build/component/resource/appManifest/constants.js +1 -1
- package/build/component/resource/appManifest/constants.js.map +1 -1
- package/build/component/resource/botService/appStudio/interfaces/IBotRegistration.d.ts +5 -0
- package/build/component/resource/botService/appStudio/interfaces/IBotRegistration.d.ts.map +1 -1
- package/build/component/resource/botService/appStudio/interfaces/IBotRegistration.js +6 -0
- package/build/component/resource/botService/appStudio/interfaces/IBotRegistration.js.map +1 -1
- package/build/component/resource/botService/botRegistration/utils.d.ts.map +1 -1
- package/build/component/resource/botService/botRegistration/utils.js +1 -0
- package/build/component/resource/botService/botRegistration/utils.js.map +1 -1
- package/build/component/utils/envUtil.d.ts +1 -0
- package/build/component/utils/envUtil.d.ts.map +1 -1
- package/build/component/utils/envUtil.js +24 -13
- package/build/component/utils/envUtil.js.map +1 -1
- package/build/core/FxCore.d.ts.map +1 -1
- package/build/core/FxCore.js +3 -10
- package/build/core/FxCore.js.map +1 -1
- package/build/core/FxCoreImplementV3.d.ts.map +1 -1
- package/build/core/FxCoreImplementV3.js +24 -4
- package/build/core/FxCoreImplementV3.js.map +1 -1
- package/build/core/environment.d.ts +1 -1
- package/build/core/environment.d.ts.map +1 -1
- package/build/core/environment.js +2 -2
- package/build/core/environment.js.map +1 -1
- package/build/core/error.d.ts +2 -1
- package/build/core/error.d.ts.map +1 -1
- package/build/core/error.js +11 -3
- package/build/core/error.js.map +1 -1
- package/build/core/middleware/projectMigrator.d.ts +1 -2
- package/build/core/middleware/projectMigrator.d.ts.map +1 -1
- package/build/core/middleware/projectMigrator.js +4 -24
- package/build/core/middleware/projectMigrator.js.map +1 -1
- package/build/core/middleware/projectMigratorV3.d.ts +5 -3
- package/build/core/middleware/projectMigratorV3.d.ts.map +1 -1
- package/build/core/middleware/projectMigratorV3.js +67 -29
- package/build/core/middleware/projectMigratorV3.js.map +1 -1
- package/build/core/middleware/types.d.ts +8 -0
- package/build/core/middleware/types.d.ts.map +1 -0
- package/build/core/middleware/types.js +5 -0
- package/build/core/middleware/types.js.map +1 -0
- package/build/core/middleware/utils/MigrationUtils.d.ts.map +1 -1
- package/build/core/middleware/utils/MigrationUtils.js +18 -19
- package/build/core/middleware/utils/MigrationUtils.js.map +1 -1
- package/build/core/middleware/utils/appYmlGenerator.d.ts +4 -0
- package/build/core/middleware/utils/appYmlGenerator.d.ts.map +1 -1
- package/build/core/middleware/utils/appYmlGenerator.js +24 -0
- package/build/core/middleware/utils/appYmlGenerator.js.map +1 -1
- package/build/core/middleware/utils/debug/appLocalYmlGenerator.d.ts +3 -1
- package/build/core/middleware/utils/debug/appLocalYmlGenerator.d.ts.map +1 -1
- package/build/core/middleware/utils/debug/appLocalYmlGenerator.js +6 -5
- package/build/core/middleware/utils/debug/appLocalYmlGenerator.js.map +1 -1
- package/build/core/middleware/utils/debug/debugMigrationContext.d.ts +5 -1
- package/build/core/middleware/utils/debug/debugMigrationContext.d.ts.map +1 -1
- package/build/core/middleware/utils/debug/debugMigrationContext.js +3 -1
- package/build/core/middleware/utils/debug/debugMigrationContext.js.map +1 -1
- package/build/core/middleware/utils/debug/debugV3MigrationUtils.d.ts +17 -0
- package/build/core/middleware/utils/debug/debugV3MigrationUtils.d.ts.map +1 -1
- package/build/core/middleware/utils/debug/debugV3MigrationUtils.js +141 -1
- package/build/core/middleware/utils/debug/debugV3MigrationUtils.js.map +1 -1
- package/build/core/middleware/utils/debug/taskMigrator.d.ts +15 -7
- package/build/core/middleware/utils/debug/taskMigrator.d.ts.map +1 -1
- package/build/core/middleware/utils/debug/taskMigrator.js +561 -9
- package/build/core/middleware/utils/debug/taskMigrator.js.map +1 -1
- package/build/core/middleware/utils/v3MigrationUtils.d.ts +4 -0
- package/build/core/middleware/utils/v3MigrationUtils.d.ts.map +1 -1
- package/build/core/middleware/utils/v3MigrationUtils.js +40 -1
- package/build/core/middleware/utils/v3MigrationUtils.js.map +1 -1
- package/package.json +2 -2
- package/resource/package.nls.json +5 -3
- package/templates/core/v3Migration/csharp.app.local.yml +98 -0
- package/templates/core/v3Migration/csharp.app.yml +6 -0
- package/templates/core/v3Migration/js.ts.app.local.yml +13 -3
- package/templates/core/v3Migration/js.ts.app.yml +72 -4
- package/templates/core/v3Migration/migrationReport.md +37 -17
- package/templates/fallback/bot.csharp.command-and-response.zip +0 -0
- package/templates/fallback/bot.csharp.default.zip +0 -0
- package/templates/fallback/bot.csharp.notification-function-base.zip +0 -0
- package/templates/fallback/bot.csharp.notification-trigger-http.zip +0 -0
- package/templates/fallback/bot.csharp.notification-trigger-timer.zip +0 -0
- package/templates/fallback/bot.csharp.notification-webapi.zip +0 -0
- package/templates/fallback/bot.csharp.workflow.zip +0 -0
- package/templates/fallback/bot.js.command-and-response.zip +0 -0
- package/templates/fallback/bot.js.default.zip +0 -0
- package/templates/fallback/bot.js.m365.zip +0 -0
- package/templates/fallback/bot.js.notification-function-base.zip +0 -0
- package/templates/fallback/bot.js.notification-restify.zip +0 -0
- package/templates/fallback/bot.js.notification-trigger-http.zip +0 -0
- package/templates/fallback/bot.js.notification-trigger-timer.zip +0 -0
- package/templates/fallback/bot.js.workflow.zip +0 -0
- package/templates/fallback/bot.ts.command-and-response.zip +0 -0
- package/templates/fallback/bot.ts.default.zip +0 -0
- package/templates/fallback/bot.ts.m365.zip +0 -0
- package/templates/fallback/bot.ts.notification-function-base.zip +0 -0
- package/templates/fallback/bot.ts.notification-restify.zip +0 -0
- package/templates/fallback/bot.ts.notification-trigger-http.zip +0 -0
- package/templates/fallback/bot.ts.notification-trigger-timer.zip +0 -0
- package/templates/fallback/bot.ts.workflow.zip +0 -0
- package/templates/fallback/common.zip +0 -0
- package/templates/fallback/csharp.zip +0 -0
- package/templates/fallback/function-base.js.default.zip +0 -0
- package/templates/fallback/function-base.ts.default.zip +0 -0
- package/templates/fallback/function-triggers.js.HTTPTrigger.zip +0 -0
- package/templates/fallback/function-triggers.ts.HTTPTrigger.zip +0 -0
- package/templates/fallback/js.zip +0 -0
- package/templates/fallback/tab.csharp.default.zip +0 -0
- package/templates/fallback/tab.csharp.non-sso.zip +0 -0
- package/templates/fallback/tab.js.dashboard.zip +0 -0
- package/templates/fallback/tab.js.default.zip +0 -0
- package/templates/fallback/tab.js.m365.zip +0 -0
- package/templates/fallback/tab.js.non-sso.zip +0 -0
- package/templates/fallback/tab.ts.dashboard.zip +0 -0
- package/templates/fallback/tab.ts.default.zip +0 -0
- package/templates/fallback/tab.ts.m365.zip +0 -0
- package/templates/fallback/tab.ts.non-sso.zip +0 -0
- package/templates/fallback/ts.zip +0 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"taskMigrator.js","sourceRoot":"","sources":["../../../../../src/core/middleware/utils/debug/taskMigrator.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"taskMigrator.js","sourceRoot":"","sources":["../../../../../src/core/middleware/utils/debug/taskMigrator.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,12 +3,16 @@ import { FileType } from "./MigrationUtils";
|
|
|
3
3
|
import { Platform, ProjectSettings } from "@microsoft/teamsfx-api";
|
|
4
4
|
import { CoreHookContext } from "../../types";
|
|
5
5
|
import { VersionState } from "../../../common/versionMetadata";
|
|
6
|
+
import { VersionForMigration } from "../types";
|
|
6
7
|
export declare function readJsonFile(context: MigrationContext, filePath: string): Promise<any>;
|
|
7
8
|
export declare function readBicepContent(context: MigrationContext): Promise<any>;
|
|
8
9
|
export declare function getTemplateFolderPath(context: MigrationContext): string;
|
|
9
10
|
export declare function fsReadDirSync(context: MigrationContext, _path: string): string[];
|
|
10
11
|
export declare function jsonObjectNamesConvertV3(obj: any, prefix: string, parentKeyName: string, filetype: FileType, bicepContent: any): string;
|
|
11
12
|
export declare function getProjectVersion(ctx: CoreHookContext): Promise<string>;
|
|
13
|
+
export declare function migrationNotificationMessage(versionForMigration: VersionForMigration): string;
|
|
14
|
+
export declare function getDownloadLinkByVersionAndPlatform(version: string, platform: Platform): string;
|
|
15
|
+
export declare function outputCancelMessage(version: string, platform: Platform): void;
|
|
12
16
|
export declare function getProjectVersionFromPath(projectPath: string): Promise<string>;
|
|
13
17
|
export declare function getTrackingIdFromPath(projectPath: string): Promise<string>;
|
|
14
18
|
export declare function getVersionState(version: string): VersionState;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"v3MigrationUtils.d.ts","sourceRoot":"","sources":["../../../../src/core/middleware/utils/v3MigrationUtils.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,OAAO,EAAE,QAAQ,EAAqB,MAAM,kBAAkB,CAAC;AAE/D,OAAO,EAIL,QAAQ,EACR,eAAe,EAEhB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAG9C,OAAO,EAAoC,YAAY,EAAE,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"v3MigrationUtils.d.ts","sourceRoot":"","sources":["../../../../src/core/middleware/utils/v3MigrationUtils.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,OAAO,EAAE,QAAQ,EAAqB,MAAM,kBAAkB,CAAC;AAE/D,OAAO,EAIL,QAAQ,EACR,eAAe,EAEhB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAG9C,OAAO,EAAoC,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAEjG,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAK/C,wBAAsB,YAAY,CAAC,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAM5F;AAGD,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,GAAG,CAAC,CAM9E;AAGD,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,gBAAgB,GAAG,MAAM,CAGvE;AAGD,wBAAgB,aAAa,CAAC,OAAO,EAAE,gBAAgB,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,CAGhF;AAWD,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,MAAM,EACrB,QAAQ,EAAE,QAAQ,EAClB,YAAY,EAAE,GAAG,GAChB,MAAM,CAoBR;AAED,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,CAG7E;AAED,wBAAgB,4BAA4B,CAAC,mBAAmB,EAAE,mBAAmB,GAAG,MAAM,CAc7F;AAED,wBAAgB,mCAAmC,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,GAAG,MAAM,CAQ/F;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,GAAG,IAAI,CAyB7E;AAED,wBAAsB,yBAAyB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAYpF;AAED,wBAAsB,qBAAqB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAchF;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,YAAY,CAU7D;AAED,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,eAAe,EACpB,GAAG,EAAE,MAAM,EACX,YAAY,CAAC,EAAE,MAAM,GACpB,MAAM,CAIR;AAED,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,GAAG,MAAM,CAExF;AAED,wBAAgB,sBAAsB,CAAC,eAAe,EAAE,eAAe,GAAG;IACxE,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,EAAE,OAAO,CAAC;CACjB,CAoBA;AAED,wBAAgB,gBAAgB,CAAC,YAAY,EAAE;IAAE,MAAM,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,OAAO,CAAA;CAAE,GAAG,MAAM,CAU3F;AAED,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAO1E;AAED,wBAAsB,sBAAsB,CAC1C,OAAO,EAAE,gBAAgB,EACzB,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,GAAG,GAChB,OAAO,CAAC,MAAM,CAAC,CAejB;AAED,wBAAsB,4BAA4B,CAChD,OAAO,EAAE,gBAAgB,EACzB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,IAAI,CAAC,CAqCf"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
// Copyright (c) Microsoft Corporation.
|
|
3
3
|
// Licensed under the MIT license.
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
-
exports.updateAndSaveManifestForSpfx = exports.readAndConvertUserdata = exports.replaceAppIdUri = exports.generateAppIdUri = exports.getCapabilitySsoStatus = exports.getToolkitVersionLink = exports.getParameterFromCxt = exports.getVersionState = exports.getTrackingIdFromPath = exports.getProjectVersionFromPath = exports.getProjectVersion = exports.jsonObjectNamesConvertV3 = exports.fsReadDirSync = exports.getTemplateFolderPath = exports.readBicepContent = exports.readJsonFile = void 0;
|
|
5
|
+
exports.updateAndSaveManifestForSpfx = exports.readAndConvertUserdata = exports.replaceAppIdUri = exports.generateAppIdUri = exports.getCapabilitySsoStatus = exports.getToolkitVersionLink = exports.getParameterFromCxt = exports.getVersionState = exports.getTrackingIdFromPath = exports.getProjectVersionFromPath = exports.outputCancelMessage = exports.getDownloadLinkByVersionAndPlatform = exports.migrationNotificationMessage = exports.getProjectVersion = exports.jsonObjectNamesConvertV3 = exports.fsReadDirSync = exports.getTemplateFolderPath = exports.readBicepContent = exports.readJsonFile = void 0;
|
|
6
6
|
const tslib_1 = require("tslib");
|
|
7
7
|
const path_1 = tslib_1.__importDefault(require("path"));
|
|
8
8
|
const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
|
|
@@ -14,6 +14,8 @@ const semver_1 = tslib_1.__importDefault(require("semver"));
|
|
|
14
14
|
const projectSettingsLoader_1 = require("../projectSettingsLoader");
|
|
15
15
|
const versionMetadata_1 = require("../../../common/versionMetadata");
|
|
16
16
|
const constants_1 = require("../../../component/resource/appManifest/constants");
|
|
17
|
+
const localizeUtils_1 = require("../../../common/localizeUtils");
|
|
18
|
+
const globalVars_1 = require("../../globalVars");
|
|
17
19
|
// read json files in states/ folder
|
|
18
20
|
async function readJsonFile(context, filePath) {
|
|
19
21
|
const filepath = path_1.default.join(context.projectPath, filePath);
|
|
@@ -77,6 +79,43 @@ async function getProjectVersion(ctx) {
|
|
|
77
79
|
return await getProjectVersionFromPath(projectPath);
|
|
78
80
|
}
|
|
79
81
|
exports.getProjectVersion = getProjectVersion;
|
|
82
|
+
function migrationNotificationMessage(versionForMigration) {
|
|
83
|
+
if (versionForMigration.platform === teamsfx_api_1.Platform.VS) {
|
|
84
|
+
return localizeUtils_1.getLocalizedString("core.migrationV3.VS.Message", "Visual Studio 2022 17.5 Preview");
|
|
85
|
+
}
|
|
86
|
+
const link = getDownloadLinkByVersionAndPlatform(versionForMigration.currentVersion, versionForMigration.platform);
|
|
87
|
+
const res = localizeUtils_1.getLocalizedString("core.migrationV3.Message", versionMetadata_1.MetadataV2.platformVersion[versionForMigration.platform], link);
|
|
88
|
+
return res;
|
|
89
|
+
}
|
|
90
|
+
exports.migrationNotificationMessage = migrationNotificationMessage;
|
|
91
|
+
function getDownloadLinkByVersionAndPlatform(version, platform) {
|
|
92
|
+
let anchorInLink = "vscode";
|
|
93
|
+
if (platform === teamsfx_api_1.Platform.VS) {
|
|
94
|
+
anchorInLink = "visual-studio";
|
|
95
|
+
}
|
|
96
|
+
else if (platform === teamsfx_api_1.Platform.CLI) {
|
|
97
|
+
anchorInLink = "cli";
|
|
98
|
+
}
|
|
99
|
+
return `${versionMetadata_1.Metadata.versionMatchLink}#${anchorInLink}`;
|
|
100
|
+
}
|
|
101
|
+
exports.getDownloadLinkByVersionAndPlatform = getDownloadLinkByVersionAndPlatform;
|
|
102
|
+
function outputCancelMessage(version, platform) {
|
|
103
|
+
globalVars_1.TOOLS === null || globalVars_1.TOOLS === void 0 ? void 0 : globalVars_1.TOOLS.logProvider.warning(`[core] Upgrade cancelled.`);
|
|
104
|
+
const link = getDownloadLinkByVersionAndPlatform(version, platform);
|
|
105
|
+
if (platform === teamsfx_api_1.Platform.VSCode) {
|
|
106
|
+
globalVars_1.TOOLS === null || globalVars_1.TOOLS === void 0 ? void 0 : globalVars_1.TOOLS.logProvider.warning(`[core] Notice upgrade to new configuration files is a must-have to continue to use current version Teams Toolkit. If you want to upgrade, please run command (Teams: Upgrade project) or click the “Upgrade project” button on tree view to trigger the upgrade.`);
|
|
107
|
+
globalVars_1.TOOLS === null || globalVars_1.TOOLS === void 0 ? void 0 : globalVars_1.TOOLS.logProvider.warning(`[core]If you are not ready to upgrade and want to continue to use the old version Teams Toolkit ${versionMetadata_1.MetadataV2.platformVersion[platform]}, please find it in ${link} and install it.`);
|
|
108
|
+
}
|
|
109
|
+
else if (platform === teamsfx_api_1.Platform.VS) {
|
|
110
|
+
globalVars_1.TOOLS === null || globalVars_1.TOOLS === void 0 ? void 0 : globalVars_1.TOOLS.logProvider.warning(`[core] Notice upgrade to new configuration files is a must-have to continue to use current version Teams Toolkit. If you want to upgrade, please trigger this command again.`);
|
|
111
|
+
globalVars_1.TOOLS === null || globalVars_1.TOOLS === void 0 ? void 0 : globalVars_1.TOOLS.logProvider.warning(`[core]If you are not ready to upgrade and want to continue to use the old version Teams Toolkit ${versionMetadata_1.MetadataV2.platformVersion[platform]}, please find it in ${link} and install it.`);
|
|
112
|
+
}
|
|
113
|
+
else {
|
|
114
|
+
globalVars_1.TOOLS === null || globalVars_1.TOOLS === void 0 ? void 0 : globalVars_1.TOOLS.logProvider.warning(`[core] Notice upgrade to new configuration files is a must-have to continue to use current version Teams Toolkit CLI. If you want to upgrade, please trigger this command again.`);
|
|
115
|
+
globalVars_1.TOOLS === null || globalVars_1.TOOLS === void 0 ? void 0 : globalVars_1.TOOLS.logProvider.warning(`[core]If you are not ready to upgrade and want to continue to use the old version Teams Toolkit CLI ${versionMetadata_1.MetadataV2.platformVersion[platform]}, please find it in ${link} and install it.`);
|
|
116
|
+
}
|
|
117
|
+
}
|
|
118
|
+
exports.outputCancelMessage = outputCancelMessage;
|
|
80
119
|
async function getProjectVersionFromPath(projectPath) {
|
|
81
120
|
const v3path = projectSettingsLoader_1.getProjectSettingPathV3(projectPath);
|
|
82
121
|
if (await fs_extra_1.default.pathExists(v3path)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"v3MigrationUtils.js","sourceRoot":"","sources":["../../../../src/core/middleware/utils/v3MigrationUtils.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"v3MigrationUtils.js","sourceRoot":"","sources":["../../../../src/core/middleware/utils/v3MigrationUtils.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@microsoft/teamsfx-core",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.22.0-rc.1",
|
|
4
4
|
"main": "build/index.js",
|
|
5
5
|
"types": "build/index.d.ts",
|
|
6
6
|
"license": "MIT",
|
|
@@ -192,7 +192,7 @@
|
|
|
192
192
|
"resource/**/*",
|
|
193
193
|
"templates/**/*"
|
|
194
194
|
],
|
|
195
|
-
"gitHead": "
|
|
195
|
+
"gitHead": "56436746c86b4c51a8ba5fb36d569a64b1c2d5d2",
|
|
196
196
|
"publishConfig": {
|
|
197
197
|
"access": "public"
|
|
198
198
|
},
|
|
@@ -39,7 +39,7 @@
|
|
|
39
39
|
"core.deploy.successNotice": "'%s' successfully deployed.",
|
|
40
40
|
"core.deploy.aadManifestSuccessNotice": "Your Azure Active Directory application has been successfully deployed. Click \"Learn more\" to check how to view your Azure Active Directory application.",
|
|
41
41
|
"core.deploy.aadManifestLearnMore": "Learn more",
|
|
42
|
-
"core.deploy.failNotice": "fail to deploy '%s'
|
|
42
|
+
"core.deploy.failNotice": "fail to deploy '%s'!",
|
|
43
43
|
"core.deploy.botTroubleShoot": "To troubleshoot bot application in azure, please click learn more for documentation.",
|
|
44
44
|
"core.deploy.botTroubleShoot.learnMore": "Learn more",
|
|
45
45
|
"core.deploy.startNotice": "[%s] Deployment start.",
|
|
@@ -129,7 +129,8 @@
|
|
|
129
129
|
"core.localDebug.tenantConfirmNotice": "You already run debug for the Teams app in another tenant '%s'. You can sign out %s and sign in with the matched Mirosoft 365 account to re-use the previous debug resource. If you really want to switch tenant for debug, you can delete the local file(s) (%s) and re-run debug.",
|
|
130
130
|
"core.localDebug.tenantConfirmNoticeWhenAllowSwitchAccount": "You already run debug for the Teams app in another tenant '%s'. If you really want to switch tenant for debug, you can delete the local file(s) (%s) and re-run debug.",
|
|
131
131
|
"core.migrationToArmAndMultiEnv.Message": "Teams Toolkit will upgrade your project configuration files to support the latest features. The upgrade process will not change your custom code and create the backup files in case revert is needed.\nNotice this upgrade is a must-have to continue to use current version Teams Toolkit. If you are not ready to upgrade and want to continue to use the old version, please find Teams Toolkit in Extension and install the version <= 2.10.0",
|
|
132
|
-
"core.migrationV3.Message": "Teams Toolkit
|
|
132
|
+
"core.migrationV3.Message": "The Teams Toolkit related configurations are older version. Upgrading project is required to continue. Please confirm you are agree to upgrade the TeamsFx configurations.\nThe upgrading will not impact your business source code, but just the configuration used by Teams Toolkit, and backups will be generated for reverting. If you don't agree to upgrade, you can download previouse version %s of Teams Toolkit to continue working with current config. You can also download from this link %s.",
|
|
133
|
+
"core.migrationV3.VS.Message": "The installed version of Teams Toolkit (%s) requires configuration changes to this project that can be done automatically. Before upgrading, select Learn more to read about the required changes or select Upgrade to perform the changes automatically.",
|
|
133
134
|
"core.migrationToArmAndMultiEnv.SuccessMessage": "Upgrade succeeded. Your project is upgraded to new configuration files.",
|
|
134
135
|
"core.migrationToArmAndMultiEnv.ErrorMessage": "Upgrade Failed. Please check the error message in Output window to troubleshoot and fix. You can also click Learn More for the FAQ and how to upgrade manually.",
|
|
135
136
|
"core.migrationToArmAndMultiEnv.PreCheckErrorMessage": "Upgrade Failed. '%s' doesn't exist or is not in json format. Please fix it and try again by running command (Teams: Upgrade project).\nYou can also click Learn More for the FAQ.",
|
|
@@ -440,7 +441,7 @@
|
|
|
440
441
|
"error.DotEnvFileNotExistError": "Environment %s not found. Make sure the .env.%s file exist.",
|
|
441
442
|
"error.InvalidEnvNameError": "Environment name can only contain letters, digits, _ and -.",
|
|
442
443
|
"error.UpgradeCanceledError": "If you don't want to upgrade your project, please install another version of Teams Toolkit (version <= 2.10.0).",
|
|
443
|
-
"error.UpgradeV3CanceledError": "If you don't want to upgrade your project, please install another version of Teams Toolkit
|
|
444
|
+
"error.UpgradeV3CanceledError": "If you don't want to upgrade your project, please install another version of Teams Toolkit in %s based on the project version %s.",
|
|
444
445
|
"error.ConsolidateCanceledError": "If you don't want to upgrade your project, please install another version of Teams Toolkit (version <= 3.7.0).",
|
|
445
446
|
"error.OperationNotSupportedForExistingAppError": "Operation is not supported for existing app: %s.",
|
|
446
447
|
"error.OperationNotPermittedError": "Operation is not permitted: %s",
|
|
@@ -1158,6 +1159,7 @@
|
|
|
1158
1159
|
"driver.deploy.deployToAzureFunctionsDescription": "deploy the project to the Azure Functions.",
|
|
1159
1160
|
"driver.deploy.deployToAzureStorageDescription": "deploy the project to the Azure Storages.",
|
|
1160
1161
|
"driver.deploy.enableStaticWebsiteInAzureStorageDescription": "enable static website setting in Azure Storage.",
|
|
1162
|
+
"driver.deploy.zipDeploymentRemoteStartError": "Zip Deploy success but remote start failed.",
|
|
1161
1163
|
"driver.script.buildSummary": "Running command `%s` at `%s` successfully.",
|
|
1162
1164
|
"driver.script.dotnetDescription": "running dotnet command.",
|
|
1163
1165
|
"driver.script.npmDescription": "running npm command.",
|
|
@@ -0,0 +1,98 @@
|
|
|
1
|
+
version: 1.0.0
|
|
2
|
+
|
|
3
|
+
registerApp:
|
|
4
|
+
{{#if activePlugins.fx-resource-aad-app-for-teams}}
|
|
5
|
+
- uses: aadApp/create # Creates a new AAD app to authenticate users if AAD_APP_CLIENT_ID environment variable is empty
|
|
6
|
+
with:
|
|
7
|
+
name: {{aadAppName}} # Note: when you run configure/aadApp, the AAD app name will be updated based on the definition of manifest. If you don't want to change the name, ensure the name in AAD manifest is same with the name defined here.
|
|
8
|
+
generateClientSecret: true # If the value is false, the action will not generate client secret for you
|
|
9
|
+
# Output: following environment variable will be persisted in current environment's .env file.
|
|
10
|
+
# AAD_APP_CLIENT_ID: the client id of AAD app
|
|
11
|
+
# AAD_APP_CLIENT_SECRET: the client secret of AAD app
|
|
12
|
+
# AAD_APP_OBJECT_ID: the object id of AAD app
|
|
13
|
+
# AAD_APP_TENANT_ID: the tenant id of AAD app
|
|
14
|
+
# AAD_APP_OAUTH_AUTHORITY_HOST: the host of OAUTH authority of AAD app
|
|
15
|
+
# AAD_APP_OAUTH_AUTHORITY: the OAUTH authority of AAD app
|
|
16
|
+
{{/if}}
|
|
17
|
+
- uses: teamsApp/create # Creates a Teams app
|
|
18
|
+
with:
|
|
19
|
+
name: {{teamsAppName}} # Teams app name
|
|
20
|
+
# Output: following environment variable will be persisted in current environment's .env file.
|
|
21
|
+
# TEAMS_APP_ID: the id of Teams app
|
|
22
|
+
|
|
23
|
+
{{#if activePlugins.fx-resource-bot}}
|
|
24
|
+
provision:
|
|
25
|
+
- uses: botAadApp/create # Creates a new AAD app for Bot Registration.
|
|
26
|
+
with:
|
|
27
|
+
name: {{appName}}
|
|
28
|
+
# Output: following environment variable will be persisted in current environment's .env file.
|
|
29
|
+
# BOT_ID: the AAD app client id created for Bot Registration.
|
|
30
|
+
# SECRET_BOT_PASSWORD: the AAD app client secret created for Bot Registration.
|
|
31
|
+
- uses: botFramework/create # Create or update the bot registration on dev.botframework.com
|
|
32
|
+
with:
|
|
33
|
+
botId: $\{{BOT_ID}}
|
|
34
|
+
name: {{appName}}
|
|
35
|
+
messagingEndpoint: $\{{BOT_ENDPOINT}}/api/messages
|
|
36
|
+
description: ""
|
|
37
|
+
- uses: file/updateAppSettings
|
|
38
|
+
with:
|
|
39
|
+
target: ./appsettings.Development.json
|
|
40
|
+
appsettings:
|
|
41
|
+
BOT_ID: $\{{BOT_ID}}
|
|
42
|
+
BOT_PASSWORD: $\{{SECRET_BOT_PASSWORD}}
|
|
43
|
+
{{#if activePlugins.fx-resource-aad-app-for-teams}}
|
|
44
|
+
TeamsFx:
|
|
45
|
+
Authentication:
|
|
46
|
+
ClientId: $\{{AAD_APP_CLIENT_ID}}
|
|
47
|
+
ClientSecret: $\{{SECRET_AAD_APP_CLIENT_SECRET}}
|
|
48
|
+
OAuthAuthority: $\{{AAD_APP_OAUTH_AUTHORITY}}
|
|
49
|
+
{{/if}}
|
|
50
|
+
{{/if}}
|
|
51
|
+
|
|
52
|
+
configureApp:
|
|
53
|
+
{{#if activePlugins.fx-resource-frontend-hosting}}
|
|
54
|
+
- uses: file/updateEnv # Generate env to .env file
|
|
55
|
+
with:
|
|
56
|
+
envs:
|
|
57
|
+
{{placeholderMappings.tabDomain}}: localhost:44302
|
|
58
|
+
{{placeholderMappings.tabEndpoint}}: https://localhost:44302
|
|
59
|
+
{{placeholderMappings.tabIndexPath}}: '#'
|
|
60
|
+
{{#if activePlugins.fx-resource-aad-app-for-teams}}
|
|
61
|
+
- uses: file/updateAppSettings
|
|
62
|
+
with:
|
|
63
|
+
target: ./appsettings.Development.json
|
|
64
|
+
appsettings:
|
|
65
|
+
TeamsFx:
|
|
66
|
+
Authentication:
|
|
67
|
+
ClientId: $\{{AAD_APP_CLIENT_ID}}
|
|
68
|
+
ClientSecret: $\{{SECRET_AAD_APP_CLIENT_SECRET}}
|
|
69
|
+
OAuthAuthority: $\{{AAD_APP_OAUTH_AUTHORITY}}
|
|
70
|
+
{{/if}}
|
|
71
|
+
{{/if}}
|
|
72
|
+
{{#if activePlugins.fx-resource-bot}}
|
|
73
|
+
- uses: file/updateEnv # Generate env to .env file
|
|
74
|
+
with:
|
|
75
|
+
envs:
|
|
76
|
+
{{placeholderMappings.botDomain}}: $\{{BOT_DOMAIN}}
|
|
77
|
+
{{/if}}
|
|
78
|
+
{{#if activePlugins.fx-resource-aad-app-for-teams}}
|
|
79
|
+
- uses: aadApp/update # Apply the AAD manifest to an existing AAD app. Will use the object id in manifest file to determine which AAD app to update.
|
|
80
|
+
with:
|
|
81
|
+
manifestTemplatePath: ./aad.manifest.template.json # Relative path to teamsfx folder. Environment variables in manifest will be replaced before apply to AAD app
|
|
82
|
+
outputFilePath : ./build/aad.manifest.$\{{TEAMSFX_ENV}}.json
|
|
83
|
+
# Output: following environment variable will be persisted in current environment's .env file.
|
|
84
|
+
# AAD_APP_ACCESS_AS_USER_PERMISSION_ID: the id of access_as_user permission which is used to enable SSO
|
|
85
|
+
{{/if}}
|
|
86
|
+
- uses: teamsApp/validate
|
|
87
|
+
with:
|
|
88
|
+
manifestTemplatePath: ./appPackage/manifest.template.json # Path to manifest template
|
|
89
|
+
- uses: teamsApp/zipAppPackage # Build Teams app package with latest env value
|
|
90
|
+
with:
|
|
91
|
+
manifestTemplatePath: ./appPackage/manifest.template.json # Path to manifest template
|
|
92
|
+
outputZipPath: ./build/appPackage/appPackage.$\{{TEAMSFX_ENV}}.zip
|
|
93
|
+
outputJsonPath: ./build/appPackage/manifest.$\{{TEAMSFX_ENV}}.json
|
|
94
|
+
- uses: teamsApp/update # Apply the Teams app manifest to an existing Teams app. Will use the app id in manifest file to determine which Teams app to update.
|
|
95
|
+
with:
|
|
96
|
+
appPackagePath: ./build/appPackage/appPackage.$\{{TEAMSFX_ENV}}.zip # Relative path to teamsfx folder. This is the path for built zip file.
|
|
97
|
+
# Output: following environment variable will be persisted in current environment's .env file.
|
|
98
|
+
# TEAMS_APP_ID: the id of Teams app
|
|
@@ -19,6 +19,12 @@ provision:
|
|
|
19
19
|
deploymentName: teams_toolkit_deployment # Required when deploy ARM template
|
|
20
20
|
bicepCliVersion: v0.4.613 # Teams Toolkit will download this bicep CLI version from github for you, will use bicep CLI in PATH if you remove this config.
|
|
21
21
|
# Output: every bicep output will be persisted in current environment's .env file with certain naming conversion. Refer https://aka.ms/teamsfx-actions/arm-deploy for more details on the naming conversion rule.
|
|
22
|
+
{{#if activePlugins.fx-resource-frontend-hosting}}
|
|
23
|
+
- uses: file/updateEnv # Add additional item to .env file
|
|
24
|
+
with:
|
|
25
|
+
envs:
|
|
26
|
+
{{placeholderMappings.[state.fx-resource-frontend-hosting.indexPath]}}: '/' # Used in appPackage/manifest.template.json file.
|
|
27
|
+
{{/if}}
|
|
22
28
|
|
|
23
29
|
deploy:
|
|
24
30
|
- uses: cli/runDotnetCommand
|
|
@@ -18,7 +18,7 @@ registerApp:
|
|
|
18
18
|
{{/config.registerApp}}
|
|
19
19
|
{{#config.provision}}
|
|
20
20
|
provision:
|
|
21
|
-
{{#
|
|
21
|
+
{{#bot}}
|
|
22
22
|
- uses: botAadApp/create
|
|
23
23
|
with:
|
|
24
24
|
name: $\{{CONFIG__MANIFEST__APPNAME__SHORT}}-bot
|
|
@@ -27,9 +27,9 @@ provision:
|
|
|
27
27
|
with:
|
|
28
28
|
botId: $\{{BOT_ID}}
|
|
29
29
|
name: $\{{CONFIG__MANIFEST__APPNAME__SHORT}}-bot
|
|
30
|
-
messagingEndpoint:
|
|
30
|
+
messagingEndpoint: {{messagingEndpoint}}
|
|
31
31
|
description: ""
|
|
32
|
-
{{/
|
|
32
|
+
{{/bot}}
|
|
33
33
|
|
|
34
34
|
{{/config.provision}}
|
|
35
35
|
{{#config.configureApp}}
|
|
@@ -90,6 +90,16 @@ deploy:
|
|
|
90
90
|
{{/dotnet}}
|
|
91
91
|
|
|
92
92
|
{{/tools}}
|
|
93
|
+
{{#dotnetCommand}}
|
|
94
|
+
- uses: cli/runDotnetCommand
|
|
95
|
+
with:
|
|
96
|
+
args: {{args}}
|
|
97
|
+
workingDirectory: {{workingDirectory}}
|
|
98
|
+
{{#if execPath}}
|
|
99
|
+
execPath: {{execPath}}
|
|
100
|
+
{{/if}}
|
|
101
|
+
|
|
102
|
+
{{/dotnetCommand}}
|
|
93
103
|
{{#tab}}
|
|
94
104
|
- uses: file/updateEnv
|
|
95
105
|
with:
|
|
@@ -1,6 +1,14 @@
|
|
|
1
1
|
version: 1.0.0
|
|
2
2
|
|
|
3
3
|
provision:
|
|
4
|
+
{{#if activePlugins.fx-resource-bot}}
|
|
5
|
+
- uses: botAadApp/create # Creates a new AAD app for Bot Registration.
|
|
6
|
+
with:
|
|
7
|
+
name: {{appName}}bt$\{{RESOURCE_SUFFIX}}
|
|
8
|
+
# Output: following environment variable will be persisted in current environment's .env file.
|
|
9
|
+
# BOT_ID: the AAD app client id created for Bot Registration.
|
|
10
|
+
# SECRET_BOT_PASSWORD: the AAD app client secret created for Bot Registration.
|
|
11
|
+
{{/if}}
|
|
4
12
|
- uses: arm/deploy # Deploy given ARM templates parallelly.
|
|
5
13
|
with:
|
|
6
14
|
subscriptionId: $\{{AZURE_SUBSCRIPTION_ID}} # The AZURE_SUBSCRIPTION_ID is a built-in environment variable. TeamsFx will ask you select one subscription if its value is empty. You're free to reference other environment varialbe here, but TeamsFx will not ask you to select subscription if it's empty in this case.
|
|
@@ -11,7 +19,6 @@ provision:
|
|
|
11
19
|
deploymentName: teams_toolkit_deployment # Required when deploy ARM template
|
|
12
20
|
bicepCliVersion: v0.4.613 # Teams Toolkit will download this bicep CLI version from github for you, will use bicep CLI in PATH if you remove this config.
|
|
13
21
|
# Output: every bicep output will be persisted in current environment's .env file with certain naming conversion. Refer https://aka.ms/teamsfx-provision-arm#output for more details on the naming conversion rule.
|
|
14
|
-
|
|
15
22
|
{{#if activePlugins.fx-resource-frontend-hosting}}
|
|
16
23
|
- uses: azureStorage/enableStaticWebsite
|
|
17
24
|
with:
|
|
@@ -28,12 +35,18 @@ deploy:
|
|
|
28
35
|
workingDirectory: tabs
|
|
29
36
|
args: install
|
|
30
37
|
- uses: cli/runNpmCommand # Run npm command
|
|
38
|
+
{{#if activePlugins.fx-resource-aad-app-for-teams}}
|
|
31
39
|
env:
|
|
32
40
|
REACT_APP_CLIENT_ID: $\{{AAD_APP_CLIENT_ID}}
|
|
33
41
|
REACT_APP_START_LOGIN_PAGE_URL: $\{{ {{~placeholderMappings.[state.fx-resource-frontend-hosting.endpoint]~}} }}/auth-start.html
|
|
42
|
+
{{#if activePlugins.fx-resource-function}}
|
|
43
|
+
REACT_APP_FUNC_ENDPOINT: $\{{ {{~placeholderMappings.[state.fx-resource-function.functionEndpoint]~}} }}
|
|
44
|
+
REACT_APP_FUNC_NAME: {{defaultFunctionName}}
|
|
45
|
+
{{/if}}
|
|
46
|
+
{{/if}}
|
|
34
47
|
with:
|
|
35
48
|
workingDirectory: tabs
|
|
36
|
-
args: run build
|
|
49
|
+
args: run build --if-present
|
|
37
50
|
- uses: azureStorage/deploy # Deploy bits to Azure Storage Static Website
|
|
38
51
|
with:
|
|
39
52
|
workingDirectory: tabs
|
|
@@ -41,6 +54,63 @@ deploy:
|
|
|
41
54
|
ignoreFile: # Can be changed to any ignore file location, leave blank will ignore nothing
|
|
42
55
|
resourceId: $\{{ {{~placeholderMappings.[state.fx-resource-frontend-hosting.storageResourceId]~}} }} # The resource id of the cloud resource to be deployed to
|
|
43
56
|
{{/if}}
|
|
57
|
+
{{#if activePlugins.fx-resource-bot}}
|
|
58
|
+
{{#if isFunctionBot}}
|
|
59
|
+
- uses: cli/runNpmCommand
|
|
60
|
+
with:
|
|
61
|
+
args: install
|
|
62
|
+
{{#if isTypescript}}
|
|
63
|
+
- uses: cli/runNpmCommand
|
|
64
|
+
with:
|
|
65
|
+
args: run build --if-present
|
|
66
|
+
{{/if}}
|
|
67
|
+
- uses: azureFunctions/deploy
|
|
68
|
+
with:
|
|
69
|
+
distributionPath: . # Deploy base folder
|
|
70
|
+
ignoreFile: .funcignore # Can be changed to any ignore file location, leave blank will ignore nothing
|
|
71
|
+
# the resource id of the cloud resource to be deployed to
|
|
72
|
+
resourceId: $\{{ {{~placeholderMappings.[state.fx-resource-bot.functionAppResourceId]~}} }}
|
|
73
|
+
{{else}}
|
|
74
|
+
- uses: cli/runNpmCommand # Run npm command
|
|
75
|
+
with:
|
|
76
|
+
workingDirectory: bot
|
|
77
|
+
args: install
|
|
78
|
+
{{#if isTypescript}}
|
|
79
|
+
- uses: cli/runNpmCommand # Run npm command
|
|
80
|
+
with:
|
|
81
|
+
workingDirectory: bot
|
|
82
|
+
args: run build --if-present
|
|
83
|
+
{{/if}}
|
|
84
|
+
- uses: azureAppService/deploy # Deploy bits to Azure App Service
|
|
85
|
+
with:
|
|
86
|
+
workingDirectory: bot
|
|
87
|
+
distributionPath: . # Deploy base folder.
|
|
88
|
+
ignoreFile: # Can be changed to any ignore file location, leave blank will ignore nothing
|
|
89
|
+
resourceId: $\{{ {{~placeholderMappings.[state.fx-resource-bot.resourceId]~}} }} # The resource id of the cloud resource to be deployed to
|
|
90
|
+
{{/if}}
|
|
91
|
+
{{/if}}
|
|
92
|
+
{{#if activePlugins.fx-resource-function}}
|
|
93
|
+
- uses: cli/runNpmCommand
|
|
94
|
+
with:
|
|
95
|
+
workingDirectory: api
|
|
96
|
+
args: install
|
|
97
|
+
- uses: cli/runDotnetCommand
|
|
98
|
+
with:
|
|
99
|
+
workingDirectory: api
|
|
100
|
+
args: build extensions.csproj -o bin --ignore-failed-sources
|
|
101
|
+
{{#if isTypescript}}
|
|
102
|
+
- uses: cli/runNpmCommand
|
|
103
|
+
with:
|
|
104
|
+
workingDirectory: api
|
|
105
|
+
args: run build --if-present
|
|
106
|
+
{{/if}}
|
|
107
|
+
- uses: azureFunctions/deploy
|
|
108
|
+
with:
|
|
109
|
+
workingDirectory: api
|
|
110
|
+
distributionPath: . # Deploy base folder
|
|
111
|
+
ignoreFile: .funcignore # Can be changed to any ignore file location, leave blank will ignore nothing
|
|
112
|
+
resourceId: $\{{ {{~placeholderMappings.[state.fx-resource-function.functionAppResourceId]~}} }} # The resource id of the cloud resource to be deployed to
|
|
113
|
+
{{/if}}
|
|
44
114
|
|
|
45
115
|
registerApp:
|
|
46
116
|
{{#if activePlugins.fx-resource-aad-app-for-teams}}
|
|
@@ -56,7 +126,6 @@ registerApp:
|
|
|
56
126
|
# AAD_APP_OAUTH_AUTHORITY_HOST: the host of OAUTH authority of AAD app
|
|
57
127
|
# AAD_APP_OAUTH_AUTHORITY: the OAUTH authority of AAD app
|
|
58
128
|
{{/if}}
|
|
59
|
-
|
|
60
129
|
- uses: teamsApp/create # Creates a Teams app
|
|
61
130
|
with:
|
|
62
131
|
name: {{teamsAppName}} # Teams app name
|
|
@@ -72,7 +141,6 @@ configureApp:
|
|
|
72
141
|
# Output: following environment variable will be persisted in current environment's .env file.
|
|
73
142
|
# AAD_APP_ACCESS_AS_USER_PERMISSION_ID: the id of access_as_user permission which is used to enable SSO
|
|
74
143
|
{{/if}}
|
|
75
|
-
|
|
76
144
|
- uses: teamsApp/validate
|
|
77
145
|
with:
|
|
78
146
|
manifestTemplatePath: ./appPackage/manifest.template.json # Path to manifest template
|
|
@@ -1,17 +1,37 @@
|
|
|
1
|
-
#
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
1.
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
1
|
+
# Upgrade Summary
|
|
2
|
+
|
|
3
|
+
Congratulations! Your project has been upgraded to work with latest Teams Toolkit. You can visit https://aka.ms/teamsfx-v5.0-guide to learn new features in Teams Toolkit.
|
|
4
|
+
|
|
5
|
+
## Changes to your project
|
|
6
|
+
|
|
7
|
+
1. Moved everything in `.fx` to `teamsfx` folder with new file format.
|
|
8
|
+
* Created new `app.yml` and `app.local.yml` files in `teamsfx` folder
|
|
9
|
+
* Moved contents in `state.{env}.json`, `config.{env}.json` and `{env}.userdata` to `.env.{env}` in `teamsfx` folder
|
|
10
|
+
2. Moved `templates/appPackage` to `appPackage` and update placeholders in it per latest tooling's requirement.
|
|
11
|
+
3. Moved `templates/appPackage/aad.template.json` to `aad.manifest.template.json` and update placeholders in it per latest tooling's requirement.
|
|
12
|
+
4. Updated `.vscode/tasks.json` and `.vscode/launch.json`.
|
|
13
|
+
5. Updated `.gitignore` to ignore new environment files in `teamsfx` folder.
|
|
14
|
+
|
|
15
|
+
For more detail changes, please refer to [this wiki](https://aka.ms/teams-toolkit-5.0-upgrade).
|
|
16
|
+
|
|
17
|
+
## Changes to existing features in VS Code Teams Toolkit
|
|
18
|
+
|
|
19
|
+
If you're using VS Code Teams Toolkit, there're some changes to existing features you should be aware of:
|
|
20
|
+
|
|
21
|
+
### Environment management
|
|
22
|
+
1. All the environment files will be gitignored by default.
|
|
23
|
+
2. When creating new environments, you need to fill customized fields in the new `.env.{env_name}` file. Usually you need to provide values for all environment values with `CONFIG__` prefix.
|
|
24
|
+
3. When creating new environments, you need to manually create `templates/azure/azure.parameters.{env_name}.json` as Azure provision parameters and fill the parameter values accordingly.
|
|
25
|
+
|
|
26
|
+
### Launch your app
|
|
27
|
+
1. When launching your app for a remote environment, Teams Toolkit will no longer ask you to select an environment. You need to manually change environment name for `${dev:teamsAppId}` in `.vscode/launch.json` to launch your app for a certain environment.
|
|
28
|
+
|
|
29
|
+
### Provision SQL databases
|
|
30
|
+
1. When you provision a new environment, you need to provide values for `STATE__FX_RESOURCE_AZURE_SQL__ADMIN` and `SECRET_FX_RESOURCE_AZURE_SQL__ADMINPASSWORD` in `.env.{env_name}` which are required inputs for creating SQL databases.
|
|
31
|
+
> If you're provisioning an existing environment, you don't need this step.
|
|
32
|
+
2. You need to grant permission to user assigned identity manually after provisioning a new environment. This [document](https://aka.ms/teamsfx-add-azure-sql) includes tutorials about how to access SQL databases using user assigned identity.
|
|
33
|
+
|
|
34
|
+
### Provision APIM service
|
|
35
|
+
1. When you provision an environment, you need to provide values for `APIM__PUBLISHEREMAIL` and `APIM__PUBLISHERNAME` in `.env.{env_name}` which are required inputs for creating or updating APIM services.
|
|
36
|
+
2. You need to manually create an Azure Active Directory app for APIM service when provisioning a new environment. This [document](https://aka.ms/teamsfx-add-azure-apim) includes tutorials about how to create an Azure Active Directory app for APIM service.
|
|
37
|
+
3. Teams Toolkit no longer support deploy API spec to APIM any more.
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|