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

package/resource/package.nls.json

@@ -1,9 +1,9 @@
 {
   "core.create.successNotice": "[Teams Toolkit] 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 %s (Azure account) with %s (subscription). Costs may incur according to the pricing calculator.",
-  "core.provision.confirmEnvNotice": "Do you want to provision resources in %s environment?\n%s (Azure account) with %s (subscription) will be used to provision. the resources. Cost may incur according to the usage.",
-  "core.deploy.confirmEnvNotice": "Do you want to deploy resources in %s environment?\n%s (Azure account) with %s (subscription) will be used for deployment.",
+  "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.",
+  "core.deploy.confirmEnvNotice": "Do you want to deploy resources in %s environment?\nAzure account (%s) with subscription (%s) will be used for deployment.",
   "core.provision.successAzure": "Azure resources successfully provisioned in the cloud.",
   "core.provision.successNotice": "'%s' successfully provisioned in the cloud.",
   "core.provision.failNotice": "fail to provision '%s' in the cloud!",
@@ -13,7 +13,11 @@
   "core.deploy.FailedToDeployBeforeProvision": "Failed to deploy because the resources have not been provisioned yet. Make sure you do the provision first. Click Get Help to learn more about why you need to provision.",
   "core.deploy.noCapabilityFound": "No capability found to %s. Click Get Help to learn more about how to add capabilities.",
   "core.deploy.successNotice": "'%s' successfully deployed to the cloud.",
+  "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.",
+  "core.deploy.aadManifestLearnMore": "Learn more",
   "core.deploy.failNotice": "fail to deploy '%s' to the cloud!",
+  "core.deploy.botTroubleShoot": "To troubleshoot bot application in azure, please click learn more for documentation.",
+  "core.deploy.botTroubleShoot.learnMore": "Learn more",
   "core.deploy.startNotice": "[%s] Deployment start.",
   "core.deploy.selectedPluginsToDeployNotice": "[%s] Selected plugins to deploy: %s",
   "core.publish.startNotice": "[%s] Publish start.",
@@ -40,22 +44,21 @@
   "core.AppStudioJsonUndefined": "App Studio json is undefined",
   "core.generateArmTemplate.failNotice": "'%s' Failed to create ARM template for required Azure services.",
   "core.updateArmTemplate.failNotice": "'%s' Failed to update ARM template for required Azure services.",
-  "core.updateArmTemplate.successNotice": "The Azure resource template is updated based on your resource and capability selection. We recommend to initialize your project workspace with git init to track all changes.",
+  "core.updateArmTemplate.successNotice": "The Azure resource template is updated based on your resource and capability selection.",
   "core.localDebug.tenantConfirmNotice": "You already run local debug for the Teams app in another tenant '%s'. You can sign out %s and sign in with the matched M365 account to re-use the previous local debug resource. If you really want to switch tenant for local debug, you can delete the %s file and re-run local debug.",
   "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",
   "core.migrationToArmAndMultiEnv.SuccessMessage": "Upgrade succeeded. Your project is upgraded to new configuration files.",
   "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.",
   "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.",
-  "core.consolidateLocalRemote.Message": "Your project will be upgraded to work with the latest version of Teams Toolkit. The upgrade will only backup and change the local config and manifest template file without changing your custom code. If you want to skip auto-upgrade, please install older version of Teams Toolkit (<=3.7.0)",
-  "core.consolidateLocalRemote.DifferentManifest": "Since Teams Toolkit will use manifest.remote.template.json as a single manifest template file after the upgrade and we detected you may have customized the manifest.local.template.json, you may need to update the manifest.template.json to include your change. See Learn More for details.",
+  "core.consolidateLocalRemote.Message": "Your project will be upgraded to work with the latest version of Teams Toolkit. The upgrade will only add config.local.json, manifest.template.json files and backup manifest.remote.template.json, manifest.local.template.json files without changing your custom code. If you want to skip auto-upgrade, please install older version of Teams Toolkit (<=3.7.0)",
+  "core.consolidateLocalRemoteWithAadManifest.Message": "Your project will be upgraded to work with the latest version of Teams Toolkit. The upgrade will only add config.local.json, manifest.template.json, aad.template.json files, update projectSettings.json file and backup manifest.remote.template.json, manifest.local.template.json, projectSettings.json files without changing your custom code. If you want to skip auto-upgrade, please install older version of Teams Toolkit (<=3.7.0)",
+  "core.consolidateLocalRemote.DifferentManifest": "Since Teams Toolkit will use manifest.remote.template.json as a single manifest template file after the upgrade, if you have customized the manifest.local.template.json, you will need to update the manifest.template.json to include your change.",
   "core.consolidateLocalRemote.SuccessMessage": "Congratulations! You have successfully upgraded your Teams App project structure. We have added config.local.json for local debug and manifest.template.json for both Teams app running locally and remotely. And we have backed up localSettings.json, manifest.local.template.json and manifest.remote.template.json to .backup folder.",
-  "core.aadManifestMigration.Canceled": "[core] Upgrade cancelled.",
-  "core.aadManifestMigration.VSCodeCanceledNotice": "[core] Notice upgrade to new configuration files 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 Teams Toolkit, please find Teams Toolkit in Extension and install the version <= ????",
-  "core.aadManifestMigration.CLICanceledNotice": "[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.",
-  "core.aadManifestMigration.CLINotReadyInstallLatestVersionNotice": "[core] If you are not ready to upgrade and want to continue to use the old version Teams Toolkit CLI, please install the version <= ????",
-  "core.aadManifestMigration.Message": "Teams Toolkit will upgrade your project's 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 <= ????",
-  "core.aadManifestMigration.outputMsg": "Congratulations! You have successfully upgraded your Teams App project structure. We have added aad.template.json for AAD app configuration. And we have backed up projectSettings.json, permissions.json to .backup folder.",
-  "core.aadManifestMigration.SuccessMessage": "Upgrade succeeded. Your project is upgraded to new configuration files.",
+  "core.consolidateLocalRemoteWithAadManifest.SuccessMessage": "Congratulations! You have successfully upgraded your Teams App project structure. We have added config.local.json for local debug, manifest.template.json for both Teams app running locally and remotely and aad.template.json for AAD manifest template. And we have backed up localSettings.json, manifest.local.template.json, manifest.remote.template.json, projectSettings.json to .backup folder.",
+  "core.aadManifestMigration.outputMsg": "Congratulations! AAD manifest has been added, and please start to use this file to customize your AAD App registration. We have added aad.template.json, updated your projectSettings.json file and backed up projectSettings.json to .backup folder.",
+  "core.aadManifestMigration.SuccessMessage": "Congratulations! AAD manifest has been added, and please start to use this file to customize your AAD App registration. We have added aad.template.json, updated your projectSettings.json and backed up projectSettings.json to .backup folder. For more information about AAD manifest, please refer %s",
+  "core.projectVersionChecker.vscodeUseNewVersion":"Your Teams Toolkit extension is too old to support current project, please update the extension to latest version and try to open this project again",
+  "core.projectVersionChecker.cliUseNewVersion": "[core] Your TeamsFx CLI is too old to support current project, please update to latest version using command below:\nnpm install -g @microsoft/teamsfx-cli@latest",
   "core.aad.includeAadQuestionTitle": "Whether to deploy aad manifest",
   "core.deployArmTemplates.StartNotice": "[%s] Start deploying ARM templates.",
   "core.deployArmTemplates.CompileBicepSuccessNotice": "[%s] Successfully compile bicep files to JSON.",
@@ -169,7 +172,8 @@
   "plugins.appstudio.lastModifiedTip": "Last Modified: %s\n",
   "plugins.appstudio.updatePublihsedAppConfirm": "Do you want to submit a new update?",
   "plugins.appstudio.teamsAppCreatedNotice": "Teams app created %s",
-  "plugins.appstudio.teamsAppUpdatedNotice": "Teams app updated %s",
+  "plugins.appstudio.teamsAppUpdatedLog": "Teams app updated %s",
+  "plugins.appstudio.teamsAppUpdatedNotice": "Your Teams application manifest has been successfully deployed. Click \"View in Developer Portal\" to view your application in Teams Developer Portal.",
   "plugins.appstudio.relativePathTip": "%s should be a relative path, URL is not supported",
   "plugins.appstudio.updateManifestTip": "The manifest file configurations has been modified already. Do you want to continue to regenerate the manifest file and update to Teams platform?",
   "plugins.appstudio.updateOverwriteTip": "The manifest file on Teams platform has been changed since your last update. Do you want to continue to update and overwrite the manifest file on Teams platform?",
@@ -252,33 +256,33 @@
   "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.",
-  "error.cicd.FailedToListMultiEnv": "Failed to list multi env.",
+  "error.cicd.FailedToListMultiEnv": "Failed to list multi env: %s.",
   "error.cicd.PreconditionNotMet": "Some preconditions of inputs are not met.",
   "error.cicd.NoProjectOpened.details": "No project opened.",
-  "plugins.apiConnector.getQuestionApiName.title": "API alias",
-  "plugins.apiConnector.getQuestionApiName.placeholder": "The alias will be used to generate related app setting names for your API. The names can be changed later",
-  "plugins.apiConnector.getQuestionEndpoint.title": "API endpoint for local debugging",
-  "plugins.apiConnector.getQuestionEndpoint.placeholder": "We will add the endpoint to local app settings",
-  "plugins.apiConnector.getQuestion.basicAuth.userName.title": "User name",
-  "plugins.apiConnector.getQuestion.basicAuth.userName.placeholder": "The content will be added to your project's local app setting",
-  "plugins.apiConnector.getQuestion.appType.title": "AAD app registration you want to use",
-  "plugins.apiConnector.getQuestion.apiKeyLocation.title": "API Key position in request",
-  "plugins.apiConnector.getQuestion.apiKeyName.title": "API Key name",
-  "plugins.apiConnector.getQuestion.apiKeyName.placeholder": "The content will be added to your project's local app setting",
-  "plugins.apiConnector.whichService.title": "Component that needs to invoke this API",
-  "plugins.apiConnector.whichService.placeholder": "We will add necessary packages and app settings for the selected project",
-  "plugins.apiConnector.whichAuthType.title": "API authentication type",
-  "plugins.apiConnector.whichAuthType.placeholder": "We will generate sample code based on your selection",
+  "plugins.apiConnector.getQuestionApiName.title": "Enter a friendly name for your API.",
+  "plugins.apiConnector.getQuestionApiName.placeholder": "API alias will be used to generate app setting names.",
+  "plugins.apiConnector.getQuestionEndpoint.title": "Enter an API endpoint for local debugging.",
+  "plugins.apiConnector.getQuestionEndpoint.placeholder": "API endpoint will be added to local app setting.",
+  "plugins.apiConnector.getQuestion.basicAuth.userName.title": "Enter the username for Basic Auth.",
+  "plugins.apiConnector.getQuestion.basicAuth.userName.placeholder": "Username will be added to local app setting.",
+  "plugins.apiConnector.getQuestion.appType.title": "Select an AAD app registration you want to use.",
+  "plugins.apiConnector.getQuestion.apiKeyLocation.title": "Select the API Key position in request.",
+  "plugins.apiConnector.getQuestion.apiKeyName.title": "Enter an API Key name.",
+  "plugins.apiConnector.getQuestion.apiKeyName.placeholder": "We will add the key name to generated file.",
+  "plugins.apiConnector.whichService.title": "Select component(s) to invoke the API.",
+  "plugins.apiConnector.whichService.placeholder": "We will import packages and add app settings.",
+  "plugins.apiConnector.whichAuthType.title": "Select an API authentication type.",
+  "plugins.apiConnector.whichAuthType.placeholder": "We will generate sample code based on your selection.",
   "plugins.apiConnector.reuseAppOption.title": "Reuse app registration in current Teams app",
-  "plugins.apiConnector.reuseAppOption.placeholder": "Use the AAD app registration created for current Teams app",
+  "plugins.apiConnector.reuseAppOption.placeholder": "Use the AAD app registration created for current Teams app.",
   "plugins.apiConnector.anotherAppOption.title": "Use another app registration",
-  "plugins.apiConnector.anotherAppOption.placeholder": "Provide information for your AAD app registration",
+  "plugins.apiConnector.anotherAppOption.placeholder": "Provide information for your AAD app registration.",
   "plugins.apiConnector.requestHeaderOption.title": "Request header",
   "plugins.apiConnector.queryParamsOption.title": "Query parameter",
-  "plugins.apiConnector.appTenantId.title": "AAD tenant id",
-  "plugins.apiConnector.appTenantId.placeholder": "AAD tenant id will be added to your project's local app setting",
-  "plugins.apiConnector.appId.title": "AAD application id (client id)",
-  "plugins.apiConnector.appId.placeholder": "AAD application id (client id) will be added to your project's local app setting",
+  "plugins.apiConnector.appTenantId.title": "Enter an AAD tenant id.",
+  "plugins.apiConnector.appTenantId.placeholder": "AAD tenant id will be added to local app setting.",
+  "plugins.apiConnector.appId.title": "Enter an AAD application id (client id).",
+  "plugins.apiConnector.appId.placeholder": "AAD application id (client id) will be added to local app setting.",
   "plugins.apiConnector.botOption.title": "Notification / Command & Response",
   "plugins.apiConnector.functionOption.title": "Azure Function App",
   "plugins.apiConnector.BasicAuthOption.detail": "Use username and password to authentication requests",
@@ -294,6 +298,8 @@
   "plugins.apiConnector.errorMessage.ApiConnectorFunctionRouteError": "Failed to route function call: %s",
   "plugins.apiConnector.questionComponentSelect.emptySelection": "You have to select at least one component.",
   "plugins.apiConnector.QuestionAppName.validation.ApiNameExist": "Please provide a different API name to avoid conflicts with existing file %s",
+  "plugins.apiConnector.QuestionAppName.validation.ApiNameAlphanumeric": "Please provide a different API name contains alphanumeric only",
+  "plugins.apiConnector.QuestionAppName.validation.ApiNameNumberPrefix": "Please provide a different API name without number beginning",
   "plugins.apiConnector.Question.validation.EmptyValue": "The value should not be empty",
   "plugins.apiConnector.Question.validation.NotGuid": "The value should be guid",
   "plugins.apiConnector.QuestionApiEndpoint.validation.NotHttp": "The API endpoint should be a valid http(s) url",
@@ -312,7 +318,6 @@
   "error.InvalidEnvNameError": "Environment name can only contain letters, digits, _ and -.",
   "error.UpgradeCanceledError": "If you don't want to upgrade your project, please install another version of Teams Toolkit (version <= 2.10.0).",
   "error.ConsolidateCanceledError": "If you don't want to upgrade your project, please install another version of Teams Toolkit (version <= 3.7.0).",
-  "error.AadManifestMigrationCanceledError": "If you don't want to upgrade your project, please install another version of Teams Toolkit (version <= ????).",
   "error.OperationNotSupportedForExistingAppError": "Operation is not supported for existing app: %s.",
   "error.OperationNotPermittedError": "Operation is not permitted: %s",
   "error.InvalidInputError": "Failed to update context: %s",
@@ -348,7 +353,7 @@
   "error.FailedToListResourceGroupLocation": "Failed to list resource group locations",
   "error.UnsupportedPlatformVS": "VS publish is not supposed to run on platform %s",
   "error.BicepGenerationError": "Failed to generate bicep file %s. Reason: %s",
-  "error.LocalBotEndpointNotConfigured": "Local bot endpoint is not configured. Set \"fx-resource-local-debug.localBotEndpoint\" in \".fx/default.user.data\" and try again.",
+  "error.LocalBotEndpointNotConfigured": "Local bot endpoint is not configured. Set \"bot.siteEndpoint\" in \".fx/configs/config.local.json\" and try again.",
   "error.InvalidLocalBotEndpointFormat": "Local bot endpoint format is invalid: %s.",
   "error.NgrokTunnelNotConnected": "Ngrok tunnel is not connected. Check your network settings and try again.",
   "error.frontend.UnauthenticatedError": "Failed to get user login information.",
@@ -460,24 +465,30 @@
   "error.apiConnector.SDKVersionImcompatibleError": "In %s project, @microsoft/teamsfx version %s is not compatible. Please upgrade your package version to %s",
   "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",
   "core.QuestionAppName.validation.pattern": "Application name must start with a letter and can only contain letters and digits.",
+  "core.QuestionAppName.validation.maxlength": "Application name is longer than the maximum length of 30.",
   "core.QuestionAppName.validation.pathExist": "Path exists: %s. Select a different application name.",
   "core.ProgrammingLanguageQuestion.title": "Programming Language",
   "core.ProgrammingLanguageQuestion.placeholder": "Select a programming language.",
   "core.ProgrammingLanguageQuestion.placeholder.spfx": "SPFx is currently supporting TypeScript only.",
+  "core.option.tutorial": "Open tutorial",
   "core.TabOption.label": "Tab",
-  "core.TabOption.labelNew": "SSO enabled launch page",
+  "core.TabOption.labelNew": "SSO-enabled tab",
   "core.TabOption.description": "UI-based app",
   "core.TabOption.detail": "Teams-aware webpages embedded in Microsoft Teams",
   "core.TabOption.detailNew": "Teams identity aware webpages embedded in Microsoft Teams",
   "core.BotOption.description": "Conversational Agent",
   "core.BotOption.detail": "Running simple and repetitive automated tasks through conversations",
-  "core.MessageExtensionOption.labelNew": "Search, action and link unfurling app",
-  "core.MessageExtensionOption.label": "Messaging Extension",
+  "core.BotNewUIOption.label": "Bot",
+  "core.BotNewUIOption.detail": "Hello world chatbot to run simple and repetitive tasks by user",
+  "core.MessageExtensionOption.labelNew": "Message extension",
+  "core.MessageExtensionOption.label": "Message Extension",
   "core.MessageExtensionOption.description": "Custom UI when users compose messages in Teams",
-  "core.MessageExtensionOption.detail": "Inserting app content or acting on a message without leaving the conversation",
+  "core.MessageExtensionOption.detail": "Hello world message extension allowing interactions via buttons and forms",
   "core.NotificationOption.label": "Notification bot",
   "core.NotificationOption.detail": "Send notification to Microsoft Teams via various triggers",
+  "core.Option.recommend": "Recommended",
   "core.CommandAndResponseOption.label": "Command bot",
   "core.CommandAndResponseOption.detail": "Respond to simple commands in Microsoft Teams chat",
   "core.ExistingTabOption.label": "Embed existing web app",
@@ -486,19 +497,20 @@
   "core.ExistingTabEndpointQuestion.title": "Enter your web app's local endpoint",
   "core.ExistingTabEndpointQuestion.validation": "Please enter a valid URL started with https://",
   "core.TabSPFxOption.label": "Tab (SPFx)",
-  "core.TabSPFxOption.labelNew": "SPFx launch page",
+  "core.TabSPFxOption.labelNew": "SPFx tab",
   "core.TabSPFxOption.description": "Client-side app with SharePoint Framework",
   "core.TabSPFxOption.detail": "Auto-hosted SPFx web part tightly integrated with Microsoft Teams",
-  "core.TabSPFxOption.detailNew": "Teams-aware webpages with SharePoint Framework embeded in Microsoft Teams",
+  "core.TabSPFxOption.detailNew": "Teams-aware webpages with SharePoint Framework embedded in Microsoft Teams",
   "core.TabSso.description": "Single Sign On for Tab",
   "core.TabSso.detail": "Enable Single Sign On in your Teams Tab app",
   "core.BotSso.description": "Single Sign On for Bot",
   "core.BotSso.detail": "Enable Single Sign On in your Teams Bot app",
-  "core.TabNonSso.label": "Static launch Page",
-  "core.TabNonSso.detail": "Static webpages embeded in Microsoft Teams",
+  "core.TabNonSso.label": "Tab",
+  "core.TabNonSso.detail": "Hello world webpages embedded in Microsoft Teams",
   "core.addCapabilityQuestion.title": "Choose Capabilities",
   "core.addCapabilityQuestion.titleNew": "Capabilities",
   "core.addCapabilityQuestion.notificationCommandAndResponseConflict": "Notification and Command and Response capabilities are in conflict",
+  "core.addFeatureQuestion.title": "Add features",
   "core.createCapabilityQuestion.title": "Select capabilities",
   "core.createCapabilityQuestion.titleNew": "Capabilities",
   "core.createCapabilityQuestion.placeholder": "Select at least 1 capability",
@@ -506,12 +518,12 @@
   "core.createCapabilityQuestion.single.placeholder": "Select an option",
   "core.capability.validation": "Invalid capability combinations: %s, option sets: %s are mutually exclusive",
   "core.capability.validation.spfx": "Add SPFx Tab is only permitted for minimal app",
-  "core.createCapabilityQuestion.validation1": "Teams Toolkit offers only the Tab capability in a Teams app with Visual Studio Code and SharePoint Framework. The Bot and Messaging extension capabilities are not available",
+  "core.createCapabilityQuestion.validation1": "Teams Toolkit offers only the Tab capability in a Teams app with Visual Studio Code and SharePoint Framework. The Bot and Message extension capabilities are not available",
   "core.createCapabilityQuestion.botNotificationConflict": "Bot and Notification capabilities are in conflict",
   "core.createCapabilityQuestion.botCommandAndResponseConflict": "Bot and Command and Response capabilities are in conflict",
   "core.createCapabilityQuestion.notificationCommandAndResponseConflict": "Notification and Command and Response capabilities are in conflict",
-  "core.createCapabilityQuestion.meNotificationConflict": "Messaging Extension and Notification capabilities are in conflict",
-  "core.createCapabilityQuestion.meCommandAndResponseConflict": "Messaging Extension and Command and Response capabilities are in conflict",
+  "core.createCapabilityQuestion.meNotificationConflict": "Message Extension and Notification capabilities are in conflict",
+  "core.createCapabilityQuestion.meCommandAndResponseConflict": "Message Extension and Command and Response capabilities are in conflict",
   "core.QuestionSelectTargetEnvironment.title": "Select an environment",
   "core.getQuestionNewTargetEnvironmentName.title": "New environment name",
   "core.getQuestionNewTargetEnvironmentName.placeholder": "New environment name",
@@ -534,8 +546,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",
@@ -543,18 +559,37 @@
   "core.HostTypeOptionSPFx.label": "SharePoint Framework (SPFx)",
   "core.AzureResourceSQL.label": "Azure SQL Database",
   "core.AzureResourceSQL.description": "Azure Function App will be also selected to access Azure SQL Database",
+  "core.AzureResourceSQLNewUI.label": "Azure SQL Database",
+  "core.AzureResourceSQLNewUI.detail": "An always-up-to-date relational database service built for the cloud",
   "core.AzureResourceFunction.label": "Azure Function App",
+  "core.AzureResourceFunctionNewUI.label": "Azure Functions",
+  "core.AzureResourceFunctionNewUI.detail": "A serverless, event-driven compute solution that allows you to write less code",
   "core.AzureResourceApim.label": "Register APIs in Azure API Management",
   "core.AzureResourceApim.description": "Azure Function App will be also selected to be published as an API",
+  "core.AzureResourceApimNewUI.label": "Azure API Management",
+  "core.AzureResourceApimNewUI.detail": "A hybrid, multicloud management platform for APIs across all environments",
   "core.AzureResourceKeyVault.label": "Azure Key Vault",
   "core.AzureResourceKeyVault.description": "Secure runtime application secrets with Azure Key Vault",
+  "core.AzureResourceKeyVaultNewUI.label": "Azure Key Vault",
+  "core.AzureResourceKeyVaultNewUI.detail": "A cloud service for securely storing and accessing secrets",
+  "core.SingleSignOnOption.label": "Single Sign-On",
+  "core.SingleSignOnOption.detail": "Develop a Single Sign-On feature for Teams Launch pages and Bot capability",
+  "core.ApiConnectionOption.label": "API Connection",
+  "core.ApiConnectionOption.detail": "Connect to an API with authentication support using TeamsFx SDK",
+  "core.cicdWorkflowOption.label": "CI/CD workflows",
+  "core.cicdWorkflowOption.detail": "Add CI/CD Workflows for GitHub, Azure DevOps or Jenkins",
   "core.getUserEmailQuestion.title": "Add owner to Teams/AAD app for the account under the same M365 tenant (email)",
   "core.getUserEmailQuestion.validation1": "Email address cannot be null or empty",
   "core.getUserEmailQuestion.validation2": "Please change [UserName] to the real user name",
-  "core.M365SsoLaunchPageOptionItem.detail": "Microsoft 365 identity aware webpages embedded in Microsoft Teams, Outlook and Office.com",
+  "core.M365SsoLaunchPageOptionItem.label": "SSO enabled personal tab",
+  "core.M365SsoLaunchPageOptionItem.detail": "Identity aware webpages embedded in Microsoft Teams, Outlook and Office.com",
+  "core.M365SearchAppOptionItem.label": "Search-based message extension",
   "core.M365SearchAppOptionItem.detail": "Insert search result when user composes messages in Microsoft Teams or emails in Outlook",
-  "core.TeamsAppSeparatorOptionItem.label": "Teams apps",
-  "core.TeamsM365AppSeparatorOptionItem.label": "Teams/M365 apps",
+  "core.options.separator.scenario": "Scenario-based Teams apps",
+  "core.options.separator.basic": "Basic Teams apps",
+  "core.options.separator.resource": "Cloud resources",
+  "core.options.separator.additional": "Additional features",
+  "core.options.separator.m365": "Extended Teams apps across Microsoft 365",
   "core.common.TeamsMobileDesktopClientName": "Teams desktop, mobile client id",
   "core.common.TeamsWebClientName": "Teams web client id",
   "core.common.OfficeDesktopClientName": "Office desktop client id",
@@ -587,6 +622,7 @@
   "error.aad.ListCollaboratorError": "Failed to list collaborator.",
   "error.aad.AadManifestLoadError": "Failed to load manifest file from %s, due to %s",
   "error.aad.AadManifestMissingName": "name property is empty or invalid in AAD manifest file",
+  "error.aad.AadManifestMissingScopeIdForTeamsApp": "oauth2Permissions property missing item which value should be access_as_user",
   "error.aad.AadManifestMissingObjectId": "id property is missing or invalid in AAD manifest file, you need to run provision or local debug first",
   "error.aad.AadManifestMissingReplyUrlsWithType": "replyUrlsWithType property is missing or invalid in AAD manifest file, you need to run provision or local debug first",
   "error.aad.AadManifestMissingIdentifierUris": "identifierUris property is missing or invalid in AAD manifest file, you need to run provision or local debug first",
@@ -688,11 +724,13 @@
   "plugins.sa.RegisterRersourceProviderFailed": "Failed to register required resource provider for Simple Auth. Reason: %s. Register required resource provider %s manually.",
   "plugins.sa.FreeServerFarmsQuotaErrorToUser": "The maximum number of Free App Service Plan allowed in a Subscription is 10. Delete a free App Service plan and try again.",
   "core.addSso.onlySupportAzure": "Add SSO is only supported for project hosted in Azure",
-  "core.addSso.needCapability": "Add SSO is only supported for project with Tab, Bot and/or Messaging Extension. You need to run 'add component' first",
+  "core.addSso.onlyMeNotSupport": "Add SSO is not supported on Message Extension only projects",
+  "core.addSso.needCapability": "Add SSO is only supported for project with Tab, Bot and/or Message Extension. You need to run 'add component' first",
   "core.addSso.functionNotSupport": "Add SSO is not supported for Bot hosted on Azure Function",
   "core.addSso.needEnableFeatureFlag": "Need to set 'TEAMSFX_AAD_MANIFEST' in env to use add SSO feature",
   "core.addSso.ssoEnabled": "SSO is already enabled",
   "core.addSso.invalidSsoProject": "Invalid project. You may have modified '.fx/projectSettings.json' file.",
+  "core.addSso.learnMore": "SSO is successfully added in your project. We have generated sample code and README in 'auth/'. Click on '%s' for more detail.",
   "core.addSsoFiles.emptyProjectPath": "Project path is empty",
   "core.addSsoFiles.projectPathNotExists": "Project path does not exist",
   "core.addSsoFiles.canNotAddNonSsoTabWhenSsoEnabled": "Failed to add non SSO Tab. SSO is enabled in this project",
@@ -821,10 +859,11 @@
   "depChecker.dotnetInstallStderr": "dotnet-install command failed without error exit code but with non-empty standard error.",
   "depChecker.dotnetInstallErrorCode": "dotnet-install command failed.",
   "depChecker.failToInstallDotnet": "Failed to install @NameVersion. Install @NameVersion manually and restart Visual Studio Code.",
-  "depChecker.NodeNotFound": "Cannot find Node.js.\n\nTeams Toolkit requires Node.js; the recommended version is v14.\n\nClick \"Learn more\" to learn how to install the Node.js.\n\n(If you just installed Node.js, restart Visual Studio Code for the change to take effect.)",
+  "depChecker.NodeNotFound": "Cannot find Node.js.\n\nTeams Toolkit requires Node.js; the recommended version is @NodeVersion.\n\nClick \"Learn more\" to learn how to install the Node.js.\n\n(If you just installed Node.js, restart Visual Studio Code for the change to take effect.)",
   "depChecker.NodeNotSupported": "Node.js (@CurrentVersion) is not in the supported version list (@SupportedVersions).\n\nClick \"Learn more\" to learn more about the supported Node.js versions.\n\n(If you just installed Node.js (@SupportedVersions), restart Visual Studio Code for the change to take effect.)",
   "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/resource/{unify-config-change-logs.md → unify-config-and-aad-manifest-change-logs.md}

@@ -1,6 +1,6 @@
 # Congratulations! You have successfully upgraded your Teams App project structure.
 
-We have updated the configuration files so that your project is compatible with the latest Teams Toolkit features, including a consistent configuration file schema and a single Teams app manifest template across local and remote environments.
+We have updated the configuration files so that your project is compatible with the latest Teams Toolkit features, including a consistent configuration file schema and a single Teams app manifest template across local and remote environments. If your project contains single sign-on (SSO) feature, then it will also aad an AAD manifest template file.
 
 > Important Notes: If you collaborate on this project with your co-workers, please ensure your team members update the Teams Toolkit extension to the latest version after committing the changes with this upgrade.
 
@@ -8,13 +8,20 @@ We have updated the configuration files so that your project is compatible with
 Teams Toolkit continues to improve your Teams application development experience. We are upgrading the Teams app project structure so that you can:
 1. Use a consistent schema to manage configuration settings for local and remote environments.
 1. Use a single Teams application manifest template across local and remote environments.
+1. Use AAD manifest template to customize your AAD app (for project contains SSO feature).
+1. Allow to add SSO for these scenarios and capabilities: Notification bot (with restify server), Command bot, Bot, Tab and Embed existing web app.
 
 ## Know about the changes we made
 After the project upgrade, the new file structure will consist:
 * `localSettings.json` will be updated to `config.local.json` to ensure consistency between local and remote environment configuration settings.
 * `manifest.local.template.json` and `manifest.remote.template.json` will be merged into a single manifest template file named `manifest.template.json` to make managing manifest template files easy.
 
-Your existing `localSettings.json`, `manifest.local.template.json`, and `manifest.remote.template.json` files will be backed up in `.backup` folder.
+- For project contains SSO feature, also include these changes:
+  * Update `.fx\configs\projectSettings.json` capabilities to include TabSSO and/or BotSSO based on original project capabilities.
+  * AAD manifest template file will be added to `templates\appPackage\aad.template.json`.
+  * The required resource access information in `permissions.json` file will be merged into `aad.template.json` file and `permissions.json` file will be deprecated.
+
+Your existing `localSettings.json`, `manifest.local.template.json`, `manifest.remote.template.json` and `projectSettings.json` (for project contains SSO feature) files will be backed up in `.backup` folder.
 
 ## Know what you need to do
 Since Teams Toolkit will use `manifest.remote.template.json` as a single manifest template file after the upgrade, if you have customized the `manifest.local.template.json`, you will need to update the `manifest.template.json` to include your change.
@@ -25,4 +32,4 @@ For how to update the `manifest.template.json`, you can check this [Wiki Page](h
 If anything went wrong after the upgrade process, you could restore your old project configuration files by:
 * Copy the .backup/.fx folder to your project root path.
 * Copy the .backup/templates folder to your project root path.
-* Delete `config.local.json` and `manifest.template.json` if needed.
+* Delete `config.local.json`, `manifest.template.json` and `aad.template.json` (for project contains SSO feature) if needed.

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}'