@microsoft/teamsfx-core 1.7.0 → 1.7.1-alpha.266fa3b9f.0

package/resource/package.nls.json

@@ -32,6 +32,10 @@
   "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.NotProvisionedNotice": "'%s' is not provisioned in the cloud yet. Please provision first.",
+  "core.NoPluginSelected": "No plugin selected",
+  "core.InvalidOption": "invalid options: [%s]",
+  "core.Notification.ReadMore": "Read more",
+  "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.",
@@ -40,9 +44,15 @@
   "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": "Teams Toolkit will upgrade your project's local config and manifest template 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.consolidateLocalRemote.SuccessMessage": "Upgrade succeeded. Your project is upgraded to new configuration files.",
-  "core.consolidateLocalRemote.outputMsg": "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.consolidateLocalRemote.Message": "Teams Toolkit will upgrade your project's local config and manifest template to support the latest features. The upgrade process will not change your custom code and create the backup files in case revert is needed. Notice 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 <= 3.7.0",
+  "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.deployArmTemplates.StartNotice": "[%s] Start deploying ARM templates.",
   "core.deployArmTemplates.CompileBicepSuccessNotice": "[%s] Successfully compile bicep files to JSON.",
   "core.deployArmTemplates.SuccessNotice": "[%s] Successfully deploy ARM templates. Resource group name: %s. Deployment name: %s",
@@ -176,17 +186,17 @@
   "plugins.bot.questionHostTypeTrigger.error.emptySelection": "You have to select at least one trigger.",
   "plugins.bot.questionHostTypeTrigger.error.hostTypeConflict": "Azure Functions and Azure App Service host types are in conflict.",
   "plugins.bot.triggers.http-functions.cliName": "http-functions",
-  "plugins.bot.triggers.http-functions.description": "A function that will be run whenever it receives an HTTP request.",
-  "plugins.bot.triggers.http-functions.detail": "A function hosted on Azure Functions that will be run whenever it receives an HTTP request.",
-  "plugins.bot.triggers.http-functions.label": "HTTP Trigger (Azure Functions)",
+  "plugins.bot.triggers.http-functions.description": "Azure Functions",
+  "plugins.bot.triggers.http-functions.detail": "A running function hosted on Azure Functions can listen to HTTP requests.",
+  "plugins.bot.triggers.http-functions.label": "HTTP Trigger",
   "plugins.bot.triggers.http-restify.cliName": "http-restify",
-  "plugins.bot.triggers.http-restify.description": "A restify server that will be run whenever it receives an HTTP request.",
-  "plugins.bot.triggers.http-restify.detail": "A restify server hosted on Azure App Service that will be run whenever it receives an HTTP request.",
-  "plugins.bot.triggers.http-restify.label": "HTTP Trigger (Restify)",
+  "plugins.bot.triggers.http-restify.description": "Restify Server",
+  "plugins.bot.triggers.http-restify.detail": "A running restify server hosted on Azure App Service can listen to HTTP requests.",
+  "plugins.bot.triggers.http-restify.label": "HTTP Trigger",
   "plugins.bot.triggers.timer-functions.cliName": "timer-functions",
-  "plugins.bot.triggers.timer-functions.description": "A function that will be run on a specific schedule.",
-  "plugins.bot.triggers.timer-functions.detail": "A function hosted on Azure Functions that will be run on a specific schedule.",
-  "plugins.bot.triggers.timer-functions.label": "Timer Trigger (Azure Functions)",
+  "plugins.bot.triggers.timer-functions.description": "Azure Functions",
+  "plugins.bot.triggers.timer-functions.detail": "A running function hosted on Azure Functions can respond based on a specific schedule.",
+  "plugins.bot.triggers.timer-functions.label": "Timer Trigger",
   "plugins.function.recoverTeamsFxConfigFilesTip": "If you manually updated configuration files (under directory .%s), recover them.",
   "plugins.function.recreateProject": "If you can not recover configuration files, create a new project.",
   "plugins.function.checkNetwork": "Check your network connection.",
@@ -224,24 +234,6 @@
   "plugins.sql.getQuestionAdminPassword.validation.sqlPasswordCannotContainUserName": "Your password cannot contain part or all of the user name",
   "plugins.sql.getQuestionConfirmPassword.title": "Confirm admin password of SQL",
   "plugins.sql.getQuestionConfirmPassword.validation.sqlPasswordMustMatch": "Password and password confirmation must match",
-  "plugins.sql.errorMessage.GetDetail": "Get the detailed error message in output.",
-  "plugins.sql.errorMessage.LinkHelpMessage": "You can follow %s to handle it.",
-  "plugins.sql.errorMessage.SqlInputError": "SQL admin name or password is empty",
-  "plugins.sql.errorMessage.SqlAskInputError": "Failed to get answer for SQL questions",
-  "plugins.sql.errorMessage.SqlEndpointError": "SQL Server %s is invalid.",
-  "plugins.sql.errorMessage.DatabaseUserCreateError": "Failed to create user '%s' in database %s",
-  "plugins.sql.errorMessage.SqlAddAdminError": "Failed to add AAD admin '%s'. %s",
-  "plugins.sql.errorMessage.SqlLocalFirwallError": "Failed to add local firewall for '%s'. %s",
-  "plugins.sql.errorMessage.SqlDeleteLocalFirwallError": "Failed to delete local firewall for '%s'. Delete '%s' manually. %s",
-  "plugins.sql.errorMessage.SqlUserInfoError": "Failed to get login user info.",
-  "plugins.sql.errorMessage.SqlGetConfigError": "Failed to get config value of '%s' from '%s'.",
-  "plugins.sql.errorMessage.SqlInvalidConfigError": "The config value of '%s' is invalid for %s.",
-  "plugins.sql.errorMessage.SqlCheckError": "Failed to check SQL Server '%s'. %s",
-  "plugins.sql.errorMessage.SqlCheckAdminError": "Failed to check AAD admin '%s'. %s",
-  "plugins.sql.errorMessage.IdentityCredentialUndefine": "Cannot access database to add managed identity user %s. Please add the user for database %s manually",
-  "plugins.sql.errorMessage.ServicePrincipalWarning": "service principal admin in azure sql can't add database user <%s>. You can add the user for %s manually",
-  "plugins.sql.errorMessage.DomainError": "Conditional Access policy requires a compliant device, and the device is not compliant. %s",
-  "plugins.sql.errorMessage.GuestAdminError": "SQL admin does not have enough permission to add database user. %s",
   "plugins.cicd.ciOption.detail": "Help checkout code, build and run test.",
   "plugins.cicd.cdOption.detail": "Help checkout code, build, test and deploy to cloud.",
   "plugins.cicd.provisionOption.detail": "Help create/update resources in cloud and Teams app registration.",
@@ -258,26 +250,58 @@
   "error.cicd.FailedToListMultiEnv": "Failed to list multi env.",
   "error.cicd.PreconditionNotMet": "Some preconditions of inputs are not met.",
   "error.cicd.NoProjectOpened.details": "No project opened.",
-  "plugins.apiConnector.getQuestionApiName.title": "Please input the API name",
-  "plugins.apiConnector.getQuestionEndpoint.title": "Please input the API endpoint",
+  "plugins.apiConnector.getQuestionApiName.title": "Please input an alias for this API",
+  "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": "Please input the API endpoint for local debugging",
+  "plugins.apiConnector.getQuestionEndpoint.placeholder": "We will add the endpoint to local app settings",
   "plugins.apiConnector.getQuestionApiType.title": "Please select the authentication type to connect API",
-  "plugins.apiConnector.getQuestionApiUserName.title": "Please input the user name:",
-  "plugins.apiConnector.whichService.title": "Please select which component to connect existing API",
-  "plugins.apiConnector.botOption.title": "Select the bot component to connect the existing API",
-  "plugins.apiConnector.functionOption.title": "Select the function component to connect the existing API",
-  "plugins.apiConnector.BasicAuthOption.detail": "Take username and password to authentication",
-  "plugins.apiConnector.CertAuthOption.detail": "Take Certification as the way to authentication",
-  "plugins.apiConnector.AADAuthOption.detail": "Take Azure active directory as the way to authentication",
-  "plugins.apiConnector.APIKeyOption.detail": "Take API Key as the way to authentication",
-  "plugins.apiConnector.ImplementMyselfOption.detail": "Define the authentication by yourself",
-  "plugins.apiConnector.errorMessage.ApiConnectorInputError": "Api connector input empty",
+  "plugins.apiConnector.getQuestion.basicAuth.userName.title": "Please input the 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": "Which AAD app registration do you want to use?",
+  "plugins.apiConnector.getQuestion.apiKeyLocation.title": "Please select the API Key position in request",
+  "plugins.apiConnector.getQuestion.apiKeyName.title": "Please input the name of %s",
+  "plugins.apiConnector.getQuestion.apiKeyName.placeholder": "The content will be added to your project's local app setting",
+  "plugins.apiConnector.whichService.title": "Please select which component 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": "Please select how you want to authenticate the API requests",
+  "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.anotherAppOption.title": "Use another 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": "Please input AAD tenant id",
+  "plugins.apiConnector.appTenantId.placeholder": "AAD tenant id will be added to your project's local app setting",
+  "plugins.apiConnector.appId.title": "Please input 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.botOption.title": "Notification / Command & Response",
+  "plugins.apiConnector.functionOption.title": "Azure Function App",
+  "plugins.apiConnector.BasicAuthOption.detail": "Use username and password to authentication requests",
+  "plugins.apiConnector.CertAuthOption.detail": "Use certificate to authenticate requests",
+  "plugins.apiConnector.AADAuthOption.detail": "Use access token issued by Azure Active Directory to authenticate requests",
+  "plugins.apiConnector.APIKeyOption.detail": "Use API Key to authenticate requests",
+  "plugins.apiConnector.ImplementMyselfOption.detail": "Use customized logic to authenticate requests",
   "plugins.apiConnector.errorMessage.ApiConnectorPathNotExistError": "Path %s not exists. Select a valid folder.",
   "plugins.apiConnector.errorMessage.ApiConnectorCreateFileFail": "Failed to create %s",
-  "plugins.apiConnector.errorMessage.NoActivePluginsExistError": "Please create active resource first.",
+  "plugins.apiConnector.errorMessage.NoActivePluginsExistError": "Please create an active resource first.",
   "plugins.apiConnector.errorMessage.NoBotOrFunctionExistError": "Please create bot or function resource first.",
   "plugins.apiConnector.errorMessage.InvalidProjectError": "Please select a valid TeamsFx project",
   "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.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",
+  "plugins.apiConnector.Notification.GenerateFiles": "We have generated sample code to call your API at %s. ",
+  "plugins.apiConnector.Notification.NpmInstall": "If you did not install @microsoft/teamsfx npm package before, please execute 'npm install' for your project.",
+  "plugins.apiConnector.Notification.BasicAuth": "Please add your user password as %s to '.env.teamsfx.local' in %s before testing your code locally.",
+  "plugins.apiConnector.Notification.CertAuth": "Please add code to read your cert content and replace the value of %s.",
+  "plugins.apiConnector.Notification.ApiKeyAuth": "Please add your API Key as %s to .env.teamsfx.local in %s in before testing your code locally.",
+  "plugins.apiConnector.Notification.ReuseAADAuth": "Please replace %s with actual value in the generated file(s), gain consent for the scope and add the scope to 'templates/appPackage/aad.template.json' before testing your code locally.",
+  "plugins.apiConnector.Notification.GenAADAuth": "Please replace %s with actual value in the generated file(s) and add your client secret to %s in %s before testing your code locally.",
+  "plugins.apiConnector.Notification.CustomAuth": "We have generated sample code to help you create an API client with your own authentication implementation at %s in %s. Please refer the comments in sample code to add your implementation.",
+  "plugins.apiConnector.Notification.LinkNotification": "You can visit %s to understand how to call your API with TeamsFx SDK.",
   "error.ProjectFolderExistError": "Path %s already exists. Select a different folder.",
   "error.PathNotExistError": "Path does not exist: %s",
   "error.ProjectFolderInvalidError": "Path %s is invalid, please set valid root folder in user settings(Use absolute directory or relative directory start with \\${homeDir} ).",
@@ -290,6 +314,7 @@
   "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 <= ????).",
+  "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",
@@ -397,6 +422,24 @@
   "error.function.FindAppError": "Failed to find the function app.",
   "error.function.UploadZipError": "Failed to upload zip package.",
   "error.function.UnknownFallbackError": "Trigger fallback caused by unknown reason.",
+  "error.sql.GetDetail": "Get the detailed error message in output.",
+  "error.sql.LinkHelpMessage": "You can follow %s to handle it.",
+  "error.sql.SqlInputError": "SQL admin name or password is empty",
+  "error.sql.SqlAskInputError": "Failed to get answer for SQL questions",
+  "error.sql.SqlEndpointError": "SQL Server %s is invalid.",
+  "error.sql.DatabaseUserCreateError": "Failed to create user '%s' in database %s",
+  "error.sql.SqlAddAdminError": "Failed to add AAD admin '%s'. %s",
+  "error.sql.SqlLocalFirwallError": "Failed to add local firewall for '%s'. %s",
+  "error.sql.SqlDeleteLocalFirwallError": "Failed to delete local firewall for '%s'. Delete '%s' manually. %s",
+  "error.sql.SqlUserInfoError": "Failed to get login user info.",
+  "error.sql.SqlGetConfigError": "Failed to get config value of '%s' from '%s'.",
+  "error.sql.SqlInvalidConfigError": "The config value of '%s' is invalid for %s.",
+  "error.sql.SqlCheckError": "Failed to check SQL Server '%s'. %s",
+  "error.sql.SqlCheckAdminError": "Failed to check AAD admin '%s'. %s",
+  "error.sql.IdentityCredentialUndefine": "Cannot access database to add managed identity user %s. Please add the user for database %s manually",
+  "error.sql.ServicePrincipalWarning": "service principal admin in azure sql can't add database user <%s>. You can add the user for %s manually",
+  "error.sql.DomainError": "Conditional Access policy requires a compliant device, and the device is not compliant. %s",
+  "error.sql.GuestAdminError": "SQL admin does not have enough permission to add database user. %s",
   "error.dotnet.FileIOError": "Failed to read/write %s.",
   "error.dotnet.UploadZipError": "Failed to upload zip package.",
   "error.dotnet.PublishCredentialError": "Failed to retrieve publish credential.",
@@ -406,7 +449,17 @@
   "error.dotnet.FetchConfigError": "Failed to find %s from configuration",
   "error.dotnet.NoProjectSettingError": "Failed to load project setting",
   "error.dotnet.UnhandledError": "Unhandled error.",
-  "error.apiConnector.SampleCodeCreateFailError": "Failed to generate sample code file %s. Reason: %s",
+  "error.apiConnector.SampleCodeCreateFailError": "Failed to scaffold API connection samples. Reason: %s",
+  "error.apiConnector.ScaffoldApiFilesError": "Failed to scaffold connect API files %s, Reason: %s",
+  "error.apiConnector.ApiConnectorInputError": "Api connector input %s is invalid",
+  "error.apiConnector.ApiConnectorPathNotExistError": "Path %s not exists. Select a valid folder.",
+  "error.apiConnector.ApiConnectorCreateFileFail": "Failed to create %s",
+  "error.apiConnector.NoActivePluginsExistError": "Please create active resource first.",
+  "error.apiConnector.NoBotOrFunctionExistError": "Please create bot or function resource first.",
+  "error.apiConnector.InvalidProjectError": "Please select a valid TeamsFx project",
+  "error.apiConnector.ApiConnectorFunctionRouteError": "Failed to route function call: %s",
+  "error.apiConnector.SDKVersionImcompatibleError":"In %s project, @microsoft/teamsfx version %s is not compatible with the version %s we support",
+  "error.apiConnector.pkgFileNotExistError": "In %s project, there is no package.json exist",
   "core.QuestionAppName.validation.pattern": "Application name must start with a letter and can only contain letters and digits.",
   "core.QuestionAppName.validation.pathExist": "Path exists: %s. Select a different application name.",
   "core.ProgrammingLanguageQuestion.title": "Programming Language",
@@ -414,23 +467,41 @@
   "core.ProgrammingLanguageQuestion.placeholder.spfx": "SPFx is currently supporting TypeScript only.",
   "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.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.NotificationOption.description": "Notification",
-  "core.NotificationOption.detail": "Sending a message in response to stimulus not originating from the user",
-  "core.CommandAndResponseOption.description": "Conversational Agent",
-  "core.CommandAndResponseOption.detail": "Running simple and repetitive automated tasks through conversations",
+  "core.NotificationOption.label": "Notification bot",
+  "core.NotificationOption.detail": "Send notification to Teams via various triggers",
+  "core.CommandAndResponseOption.label": "Command bot",
+  "core.CommandAndResponseOption.detail": "Respond to simple commands in Teams chat",
+  "core.ExistingTabOption.label": "Embed existing web app",
+  "core.ExistingTabOption.detail": "Bring your own static webpages and embed in Microsoft Teams",
+  "core.ExistingTabEndpointQuestion.placeholder": "Input your existing tab endpoint",
+  "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.description": "Client-side app with Sharepoint Framework",
   "core.TabSPFxOption.detail": "Auto-hosted SPFx web part tightly integrated with Microsoft Teams",
-  "core.Sso.description": "Single Sign On",
-  "core.Sso.detail": "Enable Single Sign On in your Teams app",
-  "core.TabNonSso.description": "UI-based app without SSO",
-  "core.TabNonSso.detail": "Teams-aware webpages embedded in Microsoft Teams without Single Sign On",
+  "core.TabSPFxOption.detailNew": "Teams-aware webpages with SharePoint Framework embeded 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.addCapabilityQuestion.title": "Choose Capabilities",
+  "core.addCapabilityQuestion.titleNew": "Capabilities",
   "core.addCapabilityQuestion.notificationCommandAndResponseConflict": "Notification and Command and Response capabilities are in conflict",
   "core.createCapabilityQuestion.title": "Select capabilities",
+  "core.createCapabilityQuestion.titleNew": "Capabilities",
   "core.createCapabilityQuestion.placeholder": "Select at least 1 capability",
+  "core.createCapabilityQuestion.single.title": "Capability",
+  "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",
@@ -455,12 +526,8 @@
   "core.QuestionNewResourceGroupLocation.title": "Location for the new resource group",
   "core.ScratchOptionYesVSC.label": "Create a new Teams app",
   "core.ScratchOptionYesVSC.detail": "Use the Teams Toolkit to create a new Teams application.",
-  "core.ScratchOptionYesM365VSC.label": "Create a new Microsoft 365 app",
-  "core.ScratchOptionYesM365VSC.detail": "Use the Teams Toolkit to create a new Microsoft 365 application.",
   "core.ScratchOptionYes.label": "Create a new Teams app",
   "core.ScratchOptionYes.detail": "Use the Teams Toolkit to create a new Teams application.",
-  "core.ScratchOptionYesM365.label": "Create a new Microsoft 365 app",
-  "core.ScratchOptionYesM365.detail": "Use the Teams Toolkit to create a new Microsoft 365 application.",
   "core.ScratchOptionNoVSC.label": "Start from a sample",
   "core.ScratchOptionNoVSC.detail": "Use an existing sample as a starting point for your new application.",
   "core.ScratchOptionNo.label": "Start from a sample",
@@ -469,6 +536,7 @@
   "core.getCreateNewOrFromSampleQuestion.placeholder": "Select an option",
   "core.SampleSelect.title": "Start from a sample",
   "core.SampleSelect.placeholder": "Select a sample",
+  "core.SampleSelect.buttons.viewSamples": "View samples",
   "core.HostTypeOptionAzure.label": "Azure",
   "core.HostTypeOptionSPFx.label": "SharePoint Framework (SPFx)",
   "core.AzureResourceSQL.label": "Azure SQL Database",
@@ -481,11 +549,8 @@
   "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.M365AppTypeSelectQuestion.title": "Select an app type",
-  "core.M365AppTypeSelectQuestion.placeholder": "Select a type of application to jumpstart your project.",
-  "core.M365LaunchPageOptionItem.description": "Web pages embedded in Teams, Outlook and Office.com",
-  "core.M365MessagingExtensionOptionItem.description": "Custom UI when user composes messages in Teams or emails in Outlook",
-  "core.M365MessagingExtensionOptionItem.detail": "Insert app content in conversations or emails.",
+  "core.M365SsoLaunchPageOptionItem.detail": "Microsoft 365 identity aware webpages embedded in Microsoft Teams, Outlook and Office.com",
+  "core.M365SearchAppOptionItem.detail": "Insert search result when user composes messages in Teams or emails in Outlook",
   "core.common.TeamsMobileDesktopClientName": "Teams desktop, mobile client id",
   "core.common.TeamsWebClientName": "Teams web client id",
   "core.common.OfficeDesktopClientName": "Office desktop client id",
@@ -503,6 +568,7 @@
   "error.aad.UpdateAppIdUriError": "Failed to update Application ID URI in Azure Active Directory. %s",
   "error.aad.UpdatePermissionError": "Failed to update application permission in Azure Active Directory.",
   "error.aad.AppIdUriInvalidError": "Invalid Application ID URI. Provision your application before continuing.",
+  "error.aad.CannotGenerateIdentifierUris": "Cannot generate identifierUris because no botId or frontend domain found, you need to specified at least one of them in config file",
   "error.aad.InvalidSelectedPlugins": "Invalid selected plugins. %s",
   "error.aad.ParsePermissionError": "Failed to parse permission request.",
   "error.aad.UnhandledError": "Unhandled Error. ",
@@ -520,6 +586,7 @@
   "error.aad.AadManifestMissingObjectId": "id property is missing or invalid in AAD manifest file, please re-provision and try again",
   "error.aad.AadManifestMissingReplyUrlsWithType": "replyUrlsWithType property is missing or invalid in AAD manifest file, please re-provision and try again",
   "error.aad.AadManifestMissingIdentifierUris": "identifierUris property is missing or invalid in AAD manifest file, please re-provision and try again",
+  "error.aad.AadManifestNotProvisioned": "Failed to generate AAD manifest because the resources have not been provisioned yet. You need to run provision or local debug first.",
   "error.aad.UpdateAadAppError": "Failed to update application in Azure Active Directory: %s",
   "error.aad.AadManifestNotFoundError": "Aad manifest file not found",
   "error.aad.GetDisplayNameError": "Failed to get display name.",
@@ -542,9 +609,9 @@
   "error.aad.manifest.PreAuthorizedApplicationsIsMissing": "preAuthorizedApplications is missing\n",
   "error.aad.manifest.AccessTokenAcceptedVersionIs1": "accessTokenAcceptedVersion is 1\n",
   "error.aad.manifest.OptionalClaimsIsMissing": "optionalClaims is missing\n",
-  "error.aad.manifest.OptionalClaimsMissingIdtypClaim":"optionalClaims access token doesn't contain idtyp claim\n",
+  "error.aad.manifest.OptionalClaimsMissingIdtypClaim": "optionalClaims access token doesn't contain idtyp claim\n",
   "error.aad.manifest.AADManifestIssues": "AAD manifest has following issues that may potentially break the Teams App:\n",
-  "error.aad.manifest.UnknownResourceAppId":"Unknown resourceAppId %s",
+  "error.aad.manifest.UnknownResourceAppId": "Unknown resourceAppId %s",
   "error.aad.manifest.UnknownResourceAccessType": "Unknown resourceAccess: %s",
   "error.aad.manifest.UnknownResourceAccessId": "Unknown resourceAccess id: %s",
   "plugins.aad.NoSelection": "No Azure AD app found. Will not update permissions. You need to run provision or local debug first.",
@@ -626,6 +693,8 @@
   "core.addSsoFiles.projectPathNotExists": "Project path does not exist",
   "core.addSsoFiles.canNotAddNonSsoTabWhenSsoEnabled": "Failed to add non SSO Tab. SSO is enabled in this project",
   "core.addSsoFiles.canNotAddTabWhenSsoNotEnabled": "Failed to add Tab. You need to run 'add SSO' first",
+  "core.addSsoFiles.FailedToCreateAuthFiles": "Failed to create files for add sso. Detail error: %s.",
+  "core.addSsoFiles.invalidLanguage": "Invalid language. Please make sure '.fx/projectSettings.json' is not modified and try again.",
   "core.getUserEmailQuestion.validation3": "Email address is not valid",
   "plugins.bot.DetailedError": "Detailed error: %s.",
   "plugins.bot.DetailedErrorReason": "Reason: %s",
@@ -752,4 +821,4 @@
   "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."
-}
+}

package/resource/unify-config-change-logs.md

@@ -0,0 +1,19 @@
+# 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.
+
+## 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.
+
+## 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 place your changes in `config.local.json` and pass it to the template.
+
+## Know about how to restore your project
+If anything went wrong after the upgrade process, you could restore your old project configuration files by:
+* Copy the .backup/.fx folder to your project root path.
+* Copy the .backup/templates folder to your project root path.
+* Delete `config.local.json` and `manifest.template.json` if needed.

package/templates/core/README.md

@@ -0,0 +1,46 @@
+# Embed Existing Web App
+
+Embed existing web app is to bring your own static webpages and embed in Microsoft Teams.
+
+## Get Started
+
+Before run this app locally, make sure you have prepared the following prerequisites:
+* An [M365 account for development](https://docs.microsoft.com/microsoftteams/platform/toolkit/accounts).
+* Ensure your own static webpages meet all the [prerequisites](https://aka.ms/teamsfx-existing-tab#prerequisites).
+* Launch your own static webpages with local endpoint, and update the field in local config file (`.fx/configs/config.local.json`) accordingly.
+
+Then, you can quickly start local preview via the environment tree view in Teams Toolkit, refer [Preview your Teams app](https://aka.ms/teamsfx-existing-tab#preview-your-teams-app) for more information.
+
+## Develop
+
+The following table lists all the scaffolded folder and files by Teams Toolkit:
+
+| File name | Contents |
+|- | -|
+|`.fx/configs/config.local.json`| Configuration file for local environment |
+|`.fx/configs/config.dev.json`| Configuration file for dev environment |
+|`.fx/configs/projectSettings.json`| Global project settings, which apply to all environments |
+|`templates/appPackage/manifest.template.json`|Teams app manifest template|
+|`templates/appPackage/resources`|Teams app's icon referenced by manifest template|
+|`.gitignore` | The git ignore file to exclude local files from TeamsFx project |
+
+### Edit Teams App manifest
+
+You can find the Teams app manifest in `templates/appPackage/manifest.template.json`.
+
+The file contains template arguments with `{...}` statements which will be replaced at build time. You may add any extra properties or permissions you require to this file. See the [schema reference](https://docs.microsoft.com/microsoftteams/platform/resources/schema/manifest-schema) for more information.
+
+## Deployment
+
+Teams Toolkit can help provision new Teams app per different environments.
+
+After provisioned, you can preview your app via the environment tree view in Teams Toolkit, refer [Preview your Teams app](https://aka.ms/teamsfx-existing-tab#preview-your-teams-app) for more information.
+
+After finish development and to distribute your app to others, you can [Publish Teams apps using Teams Toolkit](https://docs.microsoft.com/microsoftteams/platform/toolkit/publish).
+
+## Reference
+
+* [Embed Existing Web App with Teams Toolkit](https://aka.ms/teamsfx-existing-tab)
+* [Teams Toolkit and Step-by-step Documentations](https://docs.microsoft.com/microsoftteams/platform/toolkit/teams-toolkit-fundamentals)
+* [Teams Toolkit CLI](https://docs.microsoft.com/microsoftteams/platform/toolkit/teamsfx-cli)
+* [Teams Toolkit Samples](https://github.com/OfficeDev/TeamsFx-Samples)

package/templates/plugins/resource/aad/auth/bot/README.md

@@ -0,0 +1,63 @@
+## How to enable SSO in TeamsFx Bot projects
+
+This doc will show you how to add Single Sign On feature to TeamsFx Bot projects. Note that this article is only for Teams Toolkit Visual Studio Code Extension version after x.x.x or TeamsFx CLI version after x.x.x.
+
+*Note: This article is only for bot hosted on Azure App Service. Bot that hosted on Azure Function is not supported now.*
+
+*Note: This article is only for TeamsFx projects by Javascript and Typescript. For Dotnet, please refer to ${help link}.*
+
+### Step 1: Enable Single Sign On with TeamsFx commands
+
+You can follow the following steps to add SSO feature to your TeamsFx projects.
+- From Visual Studio Code: open the command palette and select: `Teams: Add SSO`.
+- From TeamsFx CLI: run command `teamsfx add sso` in your project directory.
+
+What TeamsFx will do when trigger this command:
+
+1. Create Azure AD app template under `template\appPackage\aad.template.json`
+
+1. Add `webApplicationInfo` object in Teams App manifest
+
+1. Create `README.md` and sample code under `auth/bot/`
+
+### Step 2: Update your source code
+
+There are two folders under `auth/bot`: `public` and `sso`.
+
+1. In `public`, there are two html files which is used for authentication. You can simply copy the folder and place it under `bot/src`. Note that you need to modify `bot/src/index` file to add routing to these pages.
+
+1. In `sso`, there are three files. You can simply copy the folder and place it under `bot/src`.
+    - `showUserInfo`: This file implement a function to get user info with SSO token. You can follow this method and create your own method that requires SSO token.
+    - `ssoDialog`: Create a [ComponentDialog](https://docs.microsoft.com/en-us/javascript/api/botbuilder-dialogs/componentdialog?view=botbuilder-ts-latest) that used for Single Sign On.
+    - `teamsSsoBot`: Create a [TeamsActivityHandler](https://docs.microsoft.com/en-us/dotnet/api/microsoft.bot.builder.teams.teamsactivityhandler?view=botbuilder-dotnet-stable) with `ssoDialog` and add `showUserInfo` as a command that can be triggered. You need to register your own command with `addCommand` in this file.
+
+1. After adding the following files, you need to new a `teamsSsoBot` instance in `bot/src/index` file with:
+
+    ```
+    const handler = new TeamsSsoBot();
+    server.post("/api/messages", async (req, res) => {
+        await adapter.processActivity(req, res, async (context) => {
+            await handler.run(context);
+        }).catch((err) => {
+            // Error message including "412" means it is waiting for user's consent, which is a normal process of SSO, sholdn't throw this error.
+            if (!err.message.includes("412")) {
+                throw err;
+            }
+        });
+    });
+    ```
+
+1. As mentioned above, you also need to add routing in `bot/src/index` file as below:
+
+    ```
+    server.get(
+        "/auth-*.html",
+        restify.plugins.serveStatic({
+            directory: path.join(__dirname, "public"),
+        })
+    );
+    ```
+
+### Step 3: Provision Azure AD app and deploy latest code
+
+After running `add sso` command and updating source code, you need to run `Provision` + `Deploy` or `Local Debug` again to provision an Azure AD app for Single Sign On. After the above steps, Single Sign On is successfully added in your Teams App.