@microsoft/teamsfx-core 1.9.0 → 1.9.1-alpha.300caa689.0

package/build/plugins/solution/fx-solution/v3/constants.js

@@ -13,7 +13,6 @@ exports.BuiltInFeaturePluginNames = {
     bot: "fx-resource-bot",
     function: "fx-resource-function",
     frontend: "fx-resource-frontend-hosting",
-    dotnet: "fx-resource-dotnet",
     spfx: "fx-resource-spfx",
     simpleAuth: "fx-resource-simple-auth",
     identity: "fx-resource-identity",

package/build/plugins/solution/fx-solution/v3/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/constants.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAErB,QAAA,oBAAoB,GAAG;IAClC,KAAK,EAAE,mBAAmB;IAC1B,IAAI,EAAE,kBAAkB;CACzB,CAAC;AACW,QAAA,yBAAyB,GAAG;IACvC,SAAS,EAAE,uBAAuB;IAClC,GAAG,EAAE,+BAA+B;IACpC,GAAG,EAAE,iBAAiB;IACtB,QAAQ,EAAE,sBAAsB;IAChC,QAAQ,EAAE,8BAA8B;IACxC,MAAM,EAAE,oBAAoB;IAC5B,IAAI,EAAE,kBAAkB;IACxB,UAAU,EAAE,yBAAyB;IACrC,QAAQ,EAAE,sBAAsB;IAChC,IAAI,EAAE,kBAAkB;IACxB,QAAQ,EAAE,uBAAuB;IACjC,GAAG,EAAE,uBAAuB;CAC7B,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/constants.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAErB,QAAA,oBAAoB,GAAG;IAClC,KAAK,EAAE,mBAAmB;IAC1B,IAAI,EAAE,kBAAkB;CACzB,CAAC;AACW,QAAA,yBAAyB,GAAG;IACvC,SAAS,EAAE,uBAAuB;IAClC,GAAG,EAAE,+BAA+B;IACpC,GAAG,EAAE,iBAAiB;IACtB,QAAQ,EAAE,sBAAsB;IAChC,QAAQ,EAAE,8BAA8B;IACxC,IAAI,EAAE,kBAAkB;IACxB,UAAU,EAAE,yBAAyB;IACrC,QAAQ,EAAE,sBAAsB;IAChC,IAAI,EAAE,kBAAkB;IACxB,QAAQ,EAAE,uBAAuB;IACjC,GAAG,EAAE,uBAAuB;CAC7B,CAAC"}

package/build/plugins/solution/fx-solution/v3/userTask.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"userTask.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/userTask.ts"],"names":[],"mappings":"AAGA,OAAO,EAIL,IAAI,EACJ,OAAO,EACP,MAAM,EAEN,IAAI,EAIJ,SAAS,EACT,MAAM,EACN,aAAa,EACb,EAAE,EACF,EAAE,EACF,IAAI,EACL,MAAM,wBAAwB,CAAC;AAwBhC,wBAAsB,uBAAuB,CAC3C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,EACtC,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAQjD;AAED,wBAAsB,0BAA0B,CAC9C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAoDjD;AAED,wBAAsB,aAAa,CACjC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,cAAc,CAAC,EAAE,GAAG,GACnB,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAsDhC;AAED,wBAAsB,WAAW,CAC/B,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,cAAc,CAAC,EAAE,IAAI,GACpB,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CA2ChC"}
+{"version":3,"file":"userTask.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/userTask.ts"],"names":[],"mappings":"AAGA,OAAO,EAIL,IAAI,EACJ,OAAO,EACP,MAAM,EAEN,IAAI,EAIJ,SAAS,EACT,MAAM,EACN,aAAa,EACb,EAAE,EACF,EAAE,EACF,IAAI,EACL,MAAM,wBAAwB,CAAC;AAuBhC,wBAAsB,uBAAuB,CAC3C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,EACtC,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAQjD;AAED,wBAAsB,0BAA0B,CAC9C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAoDjD;AAED,wBAAsB,aAAa,CACjC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,cAAc,CAAC,EAAE,GAAG,GACnB,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAiDhC;AAED,wBAAsB,WAAW,CAC/B,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,cAAc,CAAC,EAAE,IAAI,GACpB,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CA2ChC"}

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

@@ -8,7 +8,6 @@ const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const typedi_1 = require("typedi");
 const util = tslib_1.__importStar(require("util"));
 const localizeUtils_1 = require("../../../../common/localizeUtils");
-const projectSettingsHelper_1 = require("../../../../common/projectSettingsHelper");
 const core_1 = require("../../../../core");
 const constants_1 = require("../constants");
 const question_1 = require("../question");
@@ -84,23 +83,17 @@ async function addCapability(ctx, inputs, telemetryProps) {
     if (telemetryProps) {
         telemetryProps[constants_1.SolutionTelemetryProperty.Capabilities] = capabilitiesAnswer.join(";");
     }
-    const vsProject = projectSettingsHelper_1.isVSProject(ctx.projectSetting);
     const solutionSettings = ctx.projectSetting.solutionSettings;
     const features = [];
     if (!solutionSettings.activeResourcePlugins.includes(constants_2.BuiltInFeaturePluginNames.aad)) {
         features.push(constants_2.BuiltInFeaturePluginNames.aad);
     }
-    if (vsProject) {
-        features.push(constants_2.BuiltInFeaturePluginNames.dotnet);
+    if (capabilitiesAnswer.includes(question_1.TabOptionItem.id)) {
+        features.push(constants_2.BuiltInFeaturePluginNames.frontend);
     }
-    else {
-        if (capabilitiesAnswer.includes(question_1.TabOptionItem.id)) {
-            features.push(constants_2.BuiltInFeaturePluginNames.frontend);
-        }
-        if (capabilitiesAnswer.includes(question_1.BotOptionItem.id) ||
-            capabilitiesAnswer.includes(question_1.MessageExtensionItem.id)) {
-            features.push(constants_2.BuiltInFeaturePluginNames.bot);
-        }
+    if (capabilitiesAnswer.includes(question_1.BotOptionItem.id) ||
+        capabilitiesAnswer.includes(question_1.MessageExtensionItem.id)) {
+        features.push(constants_2.BuiltInFeaturePluginNames.bot);
     }
     if (features.length > 0) {
         const addFeatureInputs = Object.assign(Object.assign({}, inputs), { projectPath: inputs.projectPath, features: features });

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/teamsfx-core",
-  "version": "1.9.0",
+  "version": "1.9.1-alpha.300caa689.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.19.0",
+    "@microsoft/teamsfx-api": "0.19.1-alpha.300caa689.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": "1c8b0a779584dc2858ddb3d9938b24c6f6087ac4",
+  "gitHead": "50a304fcded9324bc1b95f72ed580c671a3c537d",
   "publishConfig": {
     "access": "public"
   },

package/resource/package.nls.json

@@ -1,5 +1,5 @@
 {
-  "core.create.successNotice": "[Teams Toolkit] Scaffold successfully.",
+  "core.create.successNotice": "Scaffold successfully.",
   "core.init.successNotice": "Your project has been successfully initialized to operate with TeamsFx.\n\nSome next steps:\nteamsfx add <feature> will allow you to add features like single sign on or Teams notification integration.\n\nPro tip:\nRead on aka.ms/teams-manifest to learn more about updating manifest file to connect with your existing launch page experience.",
   "core.provision.confirmNotice": "The Teams Toolkit will provision resources and register corresponding resource providers under Azure account (%s) with subscription (%s). Costs may incur according to the pricing calculator.",
   "core.provision.confirmEnvNotice": "Do you want to provision resources in %s environment?\nAzure account (%s) with subscription (%s) will be used to provision the resources. Cost may incur according to the usage.",
@@ -27,16 +27,16 @@
   "core.addCapability.onlySupportAzure": "Add capability is only supported for project hosted in Azure",
   "core.addCapability.notSupportedForM365Project": "Add capability is not supported for Microsoft 365 project",
   "core.addCapability.exceedMaxLimit": "Your App reaches maximal limit for Tabs, Bot and Message Extension.",
-  "core.addCapability.addCapabilityNotice": "[Teams Toolkit] Capability %s has been successfully added to your project. F5 to local debug the application or trigger 'Teams: Provision in the cloud' to create resources in your Azure subscription for hosting.",
-  "core.addCapability.addCapabilitiesNotice": "[Teams Toolkit] Capabilities %s have been successfully added to your project. F5 to local debug the application or trigger 'Teams: Provision in the cloud' to create resources in your Azure subscription for hosting.",
-  "core.addCapability.addCapabilityNoticeForCli": "[Teams Toolkit] Capability %s has been successfully added to your project. Run 'teamsfx provision' to create resources in your Azure subscription for hosting.",
-  "core.addCapability.addCapabilitiesNoticeForCli": "[Teams Toolkit] Capabilities %s have been successfully added to your project. Run 'teamsfx provision' to create resources in your Azure subscription for hosting.",
+  "core.addCapability.addCapabilityNotice": "Capability %s has been successfully added to your project. F5 to local debug the application or trigger 'Teams: Provision in the cloud' to create resources in your Azure subscription for hosting.",
+  "core.addCapability.addCapabilitiesNotice": "Capabilities %s have been successfully added to your project. F5 to local debug the application or trigger 'Teams: Provision in the cloud' to create resources in your Azure subscription for hosting.",
+  "core.addCapability.addCapabilityNoticeForCli": "Capability %s has been successfully added to your project. Run 'teamsfx provision' to create resources in your Azure subscription for hosting.",
+  "core.addCapability.addCapabilitiesNoticeForCli": "Capabilities %s have been successfully added to your project. Run 'teamsfx provision' to create resources in your Azure subscription for hosting.",
   "core.addResource.onlySupportAzure": "Add resource is only supported for project hosted in Azure",
   "core.addResource.notSupportForVSProject": "Add resource is not supported for csharp project",
-  "core.addResource.addResourceNotice": "[Teams Toolkit] Resource \"%s\" has been successfully configured for your project, trigger 'Teams: Provision in the cloud' will create the resource in your Azure subscription.",
-  "core.addResource.addResourceNoticeForCli": "[Teams Toolkit] Resource \"%s\" has been successfully configured for your project, run 'teamsfx provision' will create the resource in your Azure subscription.",
-  "core.addResource.addResourcesNotice": "[Teams Toolkit] Resources \"%s\" have been successfully configured for your project, trigger 'Teams: Provision in the cloud' will create the resources in your Azure subscription.",
-  "core.addResource.addResourcesNoticeForCli": "[Teams Toolkit] Resources \"%s\" have been successfully configured for your project, run 'teamsfx provision' will create the resources in your Azure subscription.",
+  "core.addResource.addResourceNotice": "Resource \"%s\" has been successfully configured for your project, trigger 'Teams: Provision in the cloud' will create the resource in your Azure subscription.",
+  "core.addResource.addResourceNoticeForCli": "Resource \"%s\" has been successfully configured for your project, run 'teamsfx provision' will create the resource in your Azure subscription.",
+  "core.addResource.addResourcesNotice": "Resources \"%s\" have been successfully configured for your project, trigger 'Teams: Provision in the cloud' will create the resources in your Azure subscription.",
+  "core.addResource.addResourcesNoticeForCli": "Resources \"%s\" have been successfully configured for your project, run 'teamsfx provision' will create the resources in your Azure subscription.",
   "core.NotProvisionedNotice": "'%s' is not provisioned in the cloud yet. Please provision first.",
   "core.NoPluginSelected": "No plugin selected",
   "core.InvalidOption": "invalid options: [%s]",
@@ -68,24 +68,24 @@
   "core.deployArmTemplates.Progress.Title": "Deploying ARM Templates",
   "core.deployArmTemplates.Progress.Start": "Preparing.",
   "core.deployArmTemplates.Progress.ExecuteDeployment": "Deploying solution ARM templates to Azure. This could take several minutes.",
-  "core.deployArmTemplates.RetryGetDeploymentStatus": "[Teams Toolkit] %s -> waiting to get deployment status [Retry time: %s]",
+  "core.deployArmTemplates.RetryGetDeploymentStatus": "%s -> waiting to get deployment status [Retry time: %s]",
   "core.deployArmTemplates.FailedToReadResourceGroup": "Failed to get resource group from project solution settings.",
   "core.deployArmTemplates.DeploymentErrorWithHelplink": "\nError message: %s\nDetailed message: \n%s\nGet toolkit help from %s.",
   "core.deployArmTemplates.FailedToGetEnvironmentName": "Failed to get target environment name from solution context.",
-  "core.deployArmTemplates.ParameterNotExist": "[Teams Toolkit] %s does not exist.",
+  "core.deployArmTemplates.ParameterNotExist": "%s does not exist.",
   "core.deployArmTemplates.PluginOperationSuccess": "%s: %s success!",
   "core.deployArmTemplates.PluginOperationFail": "%s: %s failed!",
-  "core.deployArmTemplates.FailedToExpandParameter": "[Teams Toolkit] Failed to get expanded parameter from %s",
+  "core.deployArmTemplates.FailedToExpandParameter": "Failed to get expanded parameter from %s",
   "core.deployArmTemplates.InvalidAzureCredential": "Azure Credential is invalid.",
   "core.deployArmTemplates.FailedToGetSubsId": "Failed to get subscription id.",
   "core.deployArmTemplates.CompileBicepFailed": "Failed to compile bicep files to Json arm templates file: %s",
-  "core.deployArmTemplates.FailedToGetDeploymentError": "[Teams Toolkit] Failed to get deployment error for %s",
+  "core.deployArmTemplates.FailedToGetDeploymentError": "Failed to get deployment error for %s",
   "core.deployArmTemplates.FailedToGetDeploymentErrorNotification": "resource deployments (%s module) for your project failed and get the error message failed. Please refer to the resource group %s in portal for deployment error.",
   "core.deployArmTemplates.DeploymentFailedNotification": "resource deployments (%s) for your project failed. Please refer to output channel for more error details.",
   "core.generateArmTemplates.DuplicateParameter": "There are some duplicate parameters in %s, to avoid the conflict, please modify these parameter names: %s",
   "core.generateArmTemplates.InvalidParameterFile": "There are some errors in %s, please make sure this file is valid. The error message is %s",
-  "core.collaboration.ListCollaboratorsSuccess": "List M365 Teams App%s owners success, you can view it in Teams Toolkit output window",
-  "core.collaboration.WithAadApp": "(With AAD App)",
+  "core.collaboration.ListCollaboratorsSuccess": "List M365 Teams App%s owners success, you can view it in [output channel](%s).",
+  "core.collaboration.WithAadApp": "(with AAD App)",
   "core.collaboration.FailedToListCollaborators": "Failed to list Teams App owners for the project.\nError details: \n",
   "core.collaboration.GrantingPermission": "Granting permission",
   "core.collaboration.EmailCannotBeEmptyOrSame": "Collaborator's email cannot be null or same as current user",
@@ -161,13 +161,16 @@
   "plugins.frontend.restoreEnvironmentTip": "If you manually updated configuration files (under directory .%s), recover them.",
   "plugins.baseErrorMessage": "%s Suggestions: %s",
   "suggestions.retryTheCurrentStep": "Please retry the current step.",
+  "plugins.appstudio.buildSucceedNotice": "Teams package is successfully built at [local address](%s).",
   "plugins.appstudio.publishTip": "Teams: Publish to Teams",
   "plugins.appstudio.whetherToDeployManifest": "Whether to deploy app manifest to Teams platform",
   "plugins.appstudio.validationFailedNotice": "Manifest Validation failed!",
   "plugins.appstudio.validationSucceedNotice": "Manifest Validation succeed!",
   "plugins.appstudio.buildFailedNotice": "Teams Package build failed!",
   "plugins.appstudio.adminApprovalTip": "Successfully created %s app package file at %s. Send this to your administrator for approval.",
-  "plugins.appstudio.publishSucceedNotice": "Success: %s successfully published to the [admin portal](%s). Once approved, your app will be available for your organization.",
+  "plugins.appstudio.adminPortal": "Go to admin portal",
+  "plugins.appstudio.publishSucceedNotice": "[%s] successfully published to the admin portal. Once approved, your app will be available for your organization. [Learn more](%s)",
+  "plugins.appstudio.publishSucceedNotice.cli": "[%s] successfully published to the admin portal(%s). Once approved, your app will be available for your organization. Learn more from %s.",
   "plugins.appstudio.updatePublishedAppNotice": "The app %s has already been submitted to tenant App Catalog.\nStatus: %s\n",
   "plugins.appstudio.lastModifiedTip": "Last Modified: %s\n",
   "plugins.appstudio.updatePublihsedAppConfirm": "Do you want to submit a new update?",
@@ -252,7 +255,8 @@
   "plugins.cicd.whichEnvironment.title": "Select an environment",
   "plugins.cicd.ProgressBar.scaffold.title": "Scaffolding workflow automation files",
   "plugins.cicd.ProgressBar.scaffold.detail": "Scaffolding workflow file for %s.",
-  "plugins.cicd.result.scaffold.created": "Workflow automation - including %s using %s for %s environment - has been successfully added to your project. Follow the instructions in README file to configure your workflow(s).",
+  "plugins.cicd.result.scaffold.created": "Workflow automation - including %s using %s for %s environment - has been successfully added to your project. Follow the instructions in [README](%s) to configure your workflow(s).",
+  "plugins.cicd.result.scaffold.created.cli": "Workflow automation - including %s using %s for %s environment - has been successfully added to your project. Follow the instructions in README file to configure your workflow(s).",
   "plugins.cicd.result.scaffold.skipped": "You have already created template(s) of %s using %s for %s environment, please customize it or remove it to create a new one.",
   "plugins.cicd.suggestions.checkPermission": "Please check if you got sufficient permission.",
   "plugins.cicd.suggestions.createProjectOrOpenExisting": "You can create a new project or open an existing one.",
@@ -546,8 +550,12 @@
   "core.ScratchOptionNoVSC.detail": "Use an existing sample as a starting point for your new application.",
   "core.ScratchOptionNo.label": "Start from a sample",
   "core.ScratchOptionNo.detail": "Use an existing sample as a starting point for your new application.",
+  "core.RuntimeOptionNodeJS.detail": "A fast JavaScript server runtime",
+  "core.RuntimeOptionDotNet.detail": "Free. Cross-platform. Open Source.",
   "core.getCreateNewOrFromSampleQuestion.title": "Teams Toolkit: Create a new Teams app",
+  "core.getRuntimeQuestion.title": "Teams Toolkit: select runtime for your app",
   "core.getCreateNewOrFromSampleQuestion.placeholder": "Select an option",
+  "core.getRuntimeQuestion.placeholder": "Select a runtime",
   "core.SampleSelect.title": "Start from a sample",
   "core.SampleSelect.placeholder": "Select a sample",
   "core.SampleSelect.buttons.viewSamples": "View samples",
@@ -861,5 +869,6 @@
   "depChecker.dotnetNotFound": "Cannot find @NameVersion. For the details why .NET SDK is needed, refer to @HelpLink",
   "depChecker.depsNotFound": "Cannot find @SupportedPackages.\n\nTeams Toolkit requires these dependencies.\n\nClick \"Install\" to install @InstallPackages.",
   "depChecker.linuxDepsNotFound": "Cannot find @SupportedPackages.\n\nTeams Toolkit requires these dependencies. \n\n(If you just installed @SupportedPackages, restart Visual Studio Code for the change to take effect.)",
-  "depChecker.linuxDepsNotFoundHelpLinkMessage": "Cannot find @SupportedPackages.\n\nTeams Toolkit requires these dependencies."
+  "depChecker.linuxDepsNotFoundHelpLinkMessage": "Cannot find @SupportedPackages.\n\nTeams Toolkit requires these dependencies.",
+  "error.ActionNotExist": "Action not exist: %s"
 }

package/templates/bicep/azureSql.parameters.json

@@ -0,0 +1,4 @@
+{
+  "azureSqlAdmin": "{{state.azure-sql.admin}}",
+  "azureSqlAdminPassword": "{{state.azure-sql.adminPassword}}"
+}

package/templates/bicep/azureSql.provisionDatabase.module.bicep

@@ -0,0 +1,15 @@
+// database added with name suffix [{{suffix}}]
+var sqlDatabaseName_{{suffix}} = contains(provisionParameters, 'sqlDatabaseName_{{suffix}}') ? provisionParameters['sqlDatabaseName_{{suffix}}'] : '${resourceBaseName}_{{suffix}}'
+var sqlDatabaseSku_{{suffix}} = contains(provisionParameters, 'sqlDatabaseSku_{{suffix}}') ? provisionParameters['sqlDatabaseSku_{{suffix}}'] : 'Basic'
+
+resource sqlDatabase_{{suffix}} 'Microsoft.Sql/servers/databases@2021-05-01-preview' = {
+  // parent should refer to resource symbolic name of SQL server
+  parent: sqlServer
+  location: resourceGroup().location
+  name: sqlDatabaseName_{{suffix}}
+  sku: {
+    name: sqlDatabaseSku_{{suffix}} 
+  }
+}
+
+output databaseName_{{suffix}} string = sqlDatabaseName_{{suffix}}

package/templates/bicep/azureSql.provisionDatabase.orchestration.bicep

@@ -0,0 +1,5 @@
+// output for database with name suffix [{{suffix}}]
+output azureSqlOutput_{{suffix}} object = {
+  teamsFxPluginId: 'fx-resource-azure-sql'
+  databaseName_{{suffix}}: azureSqlProvision.outputs.databaseName_{{suffix}}
+}

package/templates/bicep/azureSql.provisionServer.module.bicep

@@ -0,0 +1,44 @@
+@secure()
+param provisionParameters object
+var resourceBaseName = provisionParameters.resourceBaseName
+var sqlServerName = contains(provisionParameters, 'sqlServerName') ? provisionParameters['sqlServerName'] : '${resourceBaseName}' // Try to read name for SQL Server from parameters
+var sqlDatabaseName = contains(provisionParameters, 'sqlDatabaseName') ? provisionParameters['sqlDatabaseName'] : '${resourceBaseName}' // Try to read name for SQL Database from parameters
+var sqlDatabaseSku = contains(provisionParameters, 'sqlDatabaseSku') ? provisionParameters['sqlDatabaseSku'] : 'Basic' // Try to read SKU for SQL Database from parameters
+var administratorLogin = contains(provisionParameters, 'azureSqlAdmin') ? provisionParameters['azureSqlAdmin'] : '' // Try to read admin name for SQL Server from parameters, the value must be empty or same with the admin name used to create SQL Server
+var administratorLoginPassword = contains(provisionParameters, 'azureSqlAdminPassword') ? provisionParameters['azureSqlAdminPassword'] : '' // Try to read admin password for SQL Server from parameters, empty means do not update admin password
+
+// SQL Server that hosts the databases
+// The symbolic name of SQL Server will be referenced as parent when adding nmultiple databases
+resource sqlServer 'Microsoft.Sql/servers@2021-05-01-preview' = {
+  location: resourceGroup().location
+  name: sqlServerName
+  properties: {
+    minimalTlsVersion:'1.2'
+    administratorLogin: empty(administratorLogin) ? null : administratorLogin
+    administratorLoginPassword: administratorLoginPassword
+  }
+}
+
+// SQL Database
+resource sqlDatabase 'Microsoft.Sql/servers/databases@2021-05-01-preview' = {
+  parent: sqlServer
+  location: resourceGroup().location
+  name: sqlDatabaseName
+  sku: {
+    name: sqlDatabaseSku // You can follow https://aka.ms/teamsfx-bicep-add-param-tutorial to add sqlDatabaseSku property to provisionParameters to override the default value "Basic".
+  }
+}
+
+// Allow Azure services connect to the SQL Server
+resource sqlFirewallRules 'Microsoft.Sql/servers/firewallRules@2021-05-01-preview' = {
+  parent: sqlServer
+  name: 'AllowAzure'
+  properties: {
+    endIpAddress: '0.0.0.0'
+    startIpAddress: '0.0.0.0'
+  }
+}
+
+output resourceId string = sqlServer.id
+output sqlEndpoint string = sqlServer.properties.fullyQualifiedDomainName
+output sqlDatabaseName string = sqlDatabaseName

package/templates/bicep/azureSql.provisionServer.orchestration.bicep

@@ -0,0 +1,14 @@
+// Resources for Azure SQL
+module azureSqlProvision './provision/azureSql.bicep' = {
+  name: 'azureSqlProvision'
+  params: {
+    provisionParameters: provisionParameters
+  }
+}
+
+output azureSqlOutput object = {
+  teamsFxPluginId: 'azure-sql'
+  sqlResourceId: azureSqlProvision.outputs.resourceId
+  sqlEndpoint: azureSqlProvision.outputs.sqlEndpoint
+  sqlDatabaseName: azureSqlProvision.outputs.sqlDatabaseName
+}

package/templates/bicep/azureWebApp.config.module.bicep

@@ -0,0 +1,63 @@
+// Auto generated content, please customize files under provision folder
+
+@secure()
+param provisionParameters object
+param provisionOutputs object
+@secure()
+param currentAppSettings object
+
+var webAppName = split({{azure-web-app.outputs.resourceId}} , '/')[8]
+{{#if (contains "aad" connections)}}
+var m365ClientId = provisionParameters['m365ClientId']
+  {{#if (contains "key-vault" connections) }}
+var m365ClientSecret = {{key-vault.outputs.m365ClientSecretReference}} 
+  {{else}}
+var m365ClientSecret = provisionParameters['m365ClientSecret']
+  {{/if}}
+var m365TenantId = provisionParameters['m365TenantId']
+var m365OauthAuthorityHost = provisionParameters['m365OauthAuthorityHost']
+var botId = provisionParameters['botAadAppClientId']
+  {{#if (contains "teams-tab" connections)}}
+    {{#if (contains "bot-service" connections) }}
+var m365ApplicationIdUri = 'api://${ {{tabDomainVarName}} }/botid-${botId}'
+    {{/if}}
+  {{else}}
+var m365ApplicationIdUri = 'api://botid-${botId}'
+  {{/if}}
+{{/if}}
+{{#if (contains "teams-bot" connections)}}
+var botAadAppClientId = provisionParameters['botAadAppClientId']
+  {{#if (contains "key-vault" connections) }}
+var botAadAppClientSecret = {{key-vault.outputs.botClientSecretReference}}
+  {{else}}
+var botAadAppClientSecret = provisionParameters['botAadAppClientSecret']
+  {{/if}}
+{{/if}}
+
+resource webAppSettings 'Microsoft.Web/sites/config@2021-02-01' = {
+  name: '${webAppName}/appsettings'
+  properties: union({
+    {{#if (contains "aad" connections)}}
+    INITIATE_LOGIN_ENDPOINT: uri({{azure-web-app.outputs.endpoint}}, 'auth-start.html') // The page is used to let users consent required OAuth permissions during bot SSO process
+    M365_AUTHORITY_HOST: m365OauthAuthorityHost // AAD authority host
+    M365_CLIENT_ID: m365ClientId // Client id of AAD application
+    M365_CLIENT_SECRET: m365ClientSecret // Client secret of AAD application
+    M365_TENANT_ID: m365TenantId // Tenant id of AAD application
+    M365_APPLICATION_ID_URI: m365ApplicationIdUri // Application ID URI of AAD application
+    {{/if}}
+    {{#if (contains "teams-bot" connections)}}
+    BOT_ID: botAadAppClientId // ID of your bot
+    BOT_PASSWORD: botAadAppClientSecret // Secret of your bot
+    {{/if}}
+    {{#if (contains "azure-function" connections) }}
+    API_ENDPOINT: {{azure-function.outputs.functionEndpoint}} // Azure Function endpoint
+    {{/if}}
+    {{#if (contains "azure-sql" connections)}}
+    SQL_DATABASE_NAME: {{azure-sql.outputs.sqlDatabaseName}} // SQL database name
+    SQL_ENDPOINT: {{azure-sql.outputs.sqlEndpoint}} // SQL server endpoint
+    {{/if}}
+    {{#if (contains "identity" connections)}}
+    IDENTITY_ID: {{identity.outputs.identityClientId}} // User assigned identity id, the identity is used to access other Azure resources
+    {{/if}}
+  }, currentAppSettings)
+}

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

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

package/templates/bicep/azureWebApp.parameters.json

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

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

@@ -0,0 +1,50 @@
+@secure()
+param provisionParameters object
+
+var resourceBaseName = provisionParameters.resourceBaseName
+var serverfarmsName = contains(provisionParameters, 'webAppServerfarmsName') ? provisionParameters['webAppServerfarmsName'] : '${resourceBaseName}webApp' // Try to read name for App Service Plan from parameters
+var webAppSKU = contains(provisionParameters, 'webAppSKU') ? provisionParameters['webAppSKU'] : 'F1' // Try to read SKU for Azure Web App from parameters
+var webAppName = contains(provisionParameters, 'webAppSitesName') ? provisionParameters['webAppSitesName'] : '${resourceBaseName}webApp' // Try to read name for Azure Web App from parameters
+ 
+// Compute resources for your Web App
+resource serverfarm 'Microsoft.Web/serverfarms@2021-02-01' = {
+  kind: 'app'
+  location: resourceGroup().location
+  name: serverfarmsName
+  sku: {
+    name: webAppSKU
+  }
+}
+
+// Web App that hosts your bot
+resource webApp 'Microsoft.Web/sites@2021-02-01' = {
+  kind: 'app'
+  location: resourceGroup().location
+  name: webAppName
+  properties: {
+    serverFarmId: serverfarm.id
+    siteConfig: {
+      appSettings: [
+        {
+          name: 'SCM_DO_BUILD_DURING_DEPLOYMENT'
+          value: 'true' // Execute build steps on your site during deployment
+        }
+        {
+          name: 'WEBSITE_NODE_DEFAULT_VERSION'
+          value: '~14' // Set NodeJS version to 14.x for your site
+        }
+        {
+          name: 'RUNNING_ON_AZURE'
+          value: '1'
+        }
+      ]
+    }
+  }
+}
+
+output sku string = webAppSKU
+output appName string = webAppName
+output domain string = webApp.properties.defaultHostName
+output appServicePlanName string = serverfarmsName
+output resourceId string = webApp.id
+output endpoint string = 'https://${webApp.properties.defaultHostName}'

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

@@ -0,0 +1,18 @@
+// Resources web app
+module azureWebAppProvision './provision/azureWebApp.bicep' = {
+  name: 'azureWebAppProvision'
+  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
+}

package/templates/bicep/botService.config.module.bicep

@@ -0,0 +1,33 @@
+@secure()
+param provisionParameters object
+param provisionOutputs object
+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
+var botServiceSku = contains(provisionParameters, 'botServiceSku') ? provisionParameters['botServiceSku'] : 'F0' // Try to read SKU for Azure Bot Service from parameters
+var botDisplayName = contains(provisionParameters, 'botDisplayName') ? provisionParameters['botDisplayName'] : '${resourceBaseName}' // Try to read display name for Azure Bot Service from parameters
+
+// Register your web service as a bot with the Bot Framework
+resource azureBot 'Microsoft.BotService/botServices@2021-03-01' = {
+  kind: 'azurebot'
+  location: 'global'
+  name: botServiceName
+  properties: {
+    displayName: botDisplayName
+    endpoint: uri({{endpointVarName}} , '/api/messages')
+    msaAppId: botAadAppClientId
+  }
+  sku: {
+    name: botServiceSku // You can follow https://aka.ms/teamsfx-bicep-add-param-tutorial to add botServiceSku property to provisionParameters to override the default value "F0".
+  }
+}
+
+// Connect the bot service to Microsoft Teams
+resource botServiceMsTeamsChannel 'Microsoft.BotService/botServices/channels@2021-03-01' = {
+  parent: azureBot
+  location: 'global'
+  name: 'MsTeamsChannel'
+  properties: {
+    channelName: 'MsTeamsChannel'
+  }
+}

package/templates/bicep/botService.config.orchestration.bicep

@@ -0,0 +1,8 @@
+// Merge TeamsFx configurations to Bot service
+module teamsFxBotServiceConfig './teamsFx/botService.bicep' = {
+  name: 'teamsFxBotServiceConfig'
+  params: {
+    provisionParameters: provisionParameters
+    provisionOutputs: provisionOutputs
+  }
+}

package/templates/bicep/config.bicep

@@ -0,0 +1,3 @@
+@secure()
+param provisionParameters object
+param provisionOutputs object

package/templates/bicep/main.bicep

@@ -0,0 +1,18 @@
+@secure()
+param provisionParameters object
+
+module provision './provision.bicep' = {
+  name: 'provisionResources'
+  params: {
+    provisionParameters: provisionParameters
+  }
+}
+output provisionOutput object = provision
+module config './config.bicep' = {
+  name: 'config'
+  params: {
+    provisionParameters: provisionParameters
+    provisionOutputs: provision
+  }
+}
+output configOutput object = contains(reference(resourceId('Microsoft.Resources/deployments', config.name), '2020-06-01'), 'outputs') ? config : {}

package/templates/bicep/provision.bicep

@@ -0,0 +1,2 @@
+@secure()
+param provisionParameters object