@microsoft/teamsfx-core 2.0.6-alpha.07708d12e.0 → 2.0.6-alpha.136ac351d.0

package/resource/package.nls.json

@@ -7,14 +7,13 @@
   "core.provision.confirmEnvAndCostNotice": "Cost may incur according to the usage. Do you want to provision resources in %s environment using accounts listed above?",
   "core.deploy.confirmEnvNoticeV3": "Do you want to deploy resources in %s environment?",
   "core.provision.viewResources": "View provisioned resources",
-  "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.aadManifestOnCLISuccessNotice": "Your Azure Active Directory application has been successfully updated.",
+  "core.deploy.aadManifestSuccessNotice": "Your Microsoft Entra application has been successfully deployed. Click \"Learn more\" to check how to view your Microsoft Entra application.",
+  "core.deploy.aadManifestOnCLISuccessNotice": "Your Microsoft Entra application has been successfully updated.",
   "core.deploy.aadManifestLearnMore": "Learn more",
   "core.deploy.botTroubleShoot": "To troubleshoot bot application in azure, please click learn more for documentation.",
   "core.deploy.botTroubleShoot.learnMore": "Learn more",
   "core.option.deploy": "Deploy",
   "core.option.confirm": "Confirm",
-  "core.option.cancel": "Cancel",
   "core.option.learnMore": "Learn more",
   "core.option.upgrade": "Upgrade",
   "core.option.moreInfo": "More Info",
@@ -27,7 +26,6 @@
   "core.progress.configureAzureStorage": "Configuring Azure Storage, enable static website setting.",
   "core.progress.runCommand": "Run command %s at %s",
   "core.progress.deployToAzure": "Deploying %s to %s.",
-  "core.Notification.ReadMore": "Read more",
   "core.migrationV3.confirmOnly.Message": "Please confirm the upgrade",
   "core.migrationV3.Message": "Upgrade your Teams Toolkit project to stay compatible with the latest version. A backup directory will be created along with an Upgrade Summary.",
   "core.migrationV3.VS.Message": "Upgrade your solution to stay compatible with the latest Teams Toolkit version. A backup directory will be generated in which it contains an upgrade report.",
@@ -53,11 +51,11 @@
   "core.collaboration.ListingM365Permission": "Listing Microsoft 365 permissions\n",
   "core.collaboration.AccountUsedToCheck": "Account used to check: ",
   "core.collaboration.StartingListAllTeamsAppOwners": "\nStarting to list all teams app owners for environment: ",
-  "core.collaboration.StartingListAllAadAppOwners": "\nStarting to list all Azure Active Directory app owners for environment: ",
+  "core.collaboration.StartingListAllAadAppOwners": "\nStarting to list all Microsoft Entra app owners for environment: ",
   "core.collaboration.M365TeamsAppId": "Microsoft 365 Teams App (ID: ",
-  "core.collaboration.SsoAadAppId": "SSO AAD App (ID: ",
+  "core.collaboration.SsoAadAppId": "SSO Microsoft Entra App (ID: ",
   "core.collaboration.TeamsAppOwner": "Teams App Owner: ",
-  "core.collaboration.AadAppOwner": "Azure Active Directory App Owner: ",
+  "core.collaboration.AadAppOwner": "Microsoft Entra App Owner: ",
   "core.collaboration.StaringCheckPermission": "Starting to check permission for environment: ",
   "core.collaboration.CheckPermissionResourceId": "Resource ID: ",
   "core.collaboration.Undefined": "undefined",
@@ -275,7 +273,7 @@
   "core.createProjectQuestion.projectType.outlookAddin.detail": "Customize the ribbon and Task Pane with your web content",
   "core.createProjectQuestion.projectType.outlookAddin.label": "Outlook Add-in",
   "core.createProjectQuestion.projectType.outlookAddin.title": "App Features Using an Outlook Add-in",
-  "core.createProjectQuestion.projectType.tab.detail": "Embed your own web content in Teams, Outlook, and the Micosoft 365 app",
+  "core.createProjectQuestion.projectType.tab.detail": "Embed your own web content in Teams, Outlook, and the Microsoft 365 app",
   "core.createProjectQuestion.projectType.tab.title": "App Features Using a Tab",
   "core.createProjectQuestion.projectType.copilotPlugin.detail": "Create a plugin to extend Microsoft 365 Copilot using your APIs",
   "core.createProjectQuestion.projectType.copilotPlugin.label": "Plugin",
@@ -295,10 +293,12 @@
   "core.createProjectQuestion.apiSpecInputUrl.label": "Enter OpenAPI Description Document Location",
   "core.createProjectQuestion.OpenAIPluginDomain": "OpenAI Plugin Manifest",
   "core.createProjectQuestion.OpenAIPluginDomain.placeholder": "Enter your website domain or manifest URL",
-  "core.createProjectQuestion.invalidUrl.message": "Please enter a valid URL",
+  "core.createProjectQuestion.invalidUrl.message": "Enter a valid HTTP URL without authentication to access your OpenAPI description document.",
   "core.createProjectQuestion.apiSpec.operation.title": "Select Operation(s) Teams Can Interact with",
   "core.createProjectQuestion.apiSpec.operation.placeholder": "GET/POST methods with at most one required parameter and no auth are listed",
   "core.createProjectQuestion.apiSpec.operation.invalidMessage": "%s API(s) selected. You can select at least one and at most %s APIs.",
+  "core.createProjectQuestion.apiSpec.operation.multipleAuth": "Your selected APIs have multiple authorizations %s which are not supported.",
+  "core.createProjectQuestion.apiSpec.operation.multipleServer": "Your selected APIs have multiple server URLs %s which are not supported.",
   "core.createProjectQuestion.apiSpec.operation.placeholder.skipExisting": "Methods defined in manifest.json are not listed",
   "core.createProjectQuestion.apiSpec.multipleValidationErrors.message": "Invalid OpenAPI description document. Check output panel for details.",
   "core.createProjectQuestion.apiSpec.multipleValidationErrors.vscode.message": "Invalid OpenAPI description document. Check [output panel](command:fx-extension.showOutputChannel) for details.",
@@ -323,6 +323,8 @@
   "core.QuestionNewResourceGroupName.title": "New resource group name",
   "core.QuestionNewResourceGroupName.validation": "The name can only contain alphanumeric characters or the symbols ._-()",
   "core.QuestionNewResourceGroupLocation.title": "Location for the new resource group",
+  "core.QuestionNewResourceGroupLocation.group.recommended": "Recommended",
+  "core.QuestionNewResourceGroupLocation.group.others": "Others",
   "core.question.workspaceFolder.title": "Workspace folder",
   "core.question.workspaceFolder.placeholder": "Select the folder that will contain your project root folder",
   "core.ScratchOptionYes.label": "Create a new app",
@@ -353,11 +355,11 @@
   "core.updateUrlQuestion.placeholder": "Unselect to keep with the original URL",
   "core.SingleSignOnOption.label": "Single Sign-On",
   "core.SingleSignOnOption.detail": "Develop a Single Sign-On feature for Teams Launch pages and Bot capability",
-  "core.getUserEmailQuestion.title": "Add owner to Teams/AAD app for the account under the same Microsoft 365 tenant (email)",
+  "core.getUserEmailQuestion.title": "Add owner to Teams/Microsoft Entra app for the account under the same Microsoft 365 tenant (email)",
   "core.getUserEmailQuestion.validation1": "Email address cannot be null or empty",
   "core.getUserEmailQuestion.validation2": "Please change [UserName] to the real user name",
   "core.collaboration.error.failedToLoadDotEnvFile": "Unable to load your .env File. Reason: %s",
-  "core.selectAadAppManifestQuestion.title": "Select Azure Active Directory manifest.json file",
+  "core.selectAadAppManifestQuestion.title": "Select Microsoft Entra manifest.json file",
   "core.selectTeamsAppManifestQuestion.title": "Select Teams manifest.json file",
   "core.selectTeamsAppPackageQuestion.title": "Select Teams app package file",
   "core.selectLocalTeamsAppManifestQuestion.title": "Select local Teams manifest.json file",
@@ -368,8 +370,8 @@
   "core.selectValidateMethodQuestion.validate.appPackageOption": "Validate app package using validation rules",
   "core.selectValidateMethodQuestion.validate.appPackageOptionDescription": "Validate app package using validation rules",
   "core.confirmManifestQuestion.placeholder": "Confirm manifest is correctly selected",
-  "core.aadAppQuestion.label": "Azure Active Directory app",
-  "core.aadAppQuestion.description": "Your Azure Active Directory app for Single Sign On",
+  "core.aadAppQuestion.label": "Microsoft Entra app",
+  "core.aadAppQuestion.description": "Your Microsoft Entra app for Single Sign On",
   "core.teamsAppQuestion.label": "Teams app",
   "core.teamsAppQuestion.description": "Your Teams app",
   "core.M365SsoLaunchPageOptionItem.label": "React with Fluent UI",
@@ -394,18 +396,14 @@
   "core.common.OutlookWebClientName1": "Outlook web access client id 1",
   "core.common.OutlookWebClientName2": "Outlook web access client id 2",
   "core.common.CancelledMessage": "Operation is cancelled.",
+  "core.common.SwaggerNotSupported": "Swagger 2.0 is not supported. Please convert it to OpenAPI 3.0 first.",
   "core.common.NoServerInformation":  "No server information is found in the OpenAPI description document.",
   "core.common.RemoteRefNotSupported": "Remote reference is not supported: %s.",
   "core.common.MissingOperationId": "Missing operationIds: %s.",
   "core.common.NoSupportedApi": "No supported API is found in the OpenAPI description document: only GET and POST methods are supported, additionally, there can be at most one required parameter, and no auth is allowed.",
-  "core.common.AdditionalPropertiesNotSupported": "'additionalProperties' is not supported, and will be ignored.",
-  "core.common.SchemaNotSupported": "'oneOf', 'anyOf', and 'not' schema are not supported: %s.",
-  "core.common.UnknownSchema": "Unknown schema: %s.",
   "core.common.UrlProtocolNotSupported": "Server url is not correct: protocol %s is not supported, you should use https protocol instead.",
   "core.common.RelativeServerUrlNotSupported": "Server url is not correct: relative server url is not supported.",
-  "core.common.ResolveServerUrlFailed": "Unable to resolve the server URL: please make sure that the environment variable %s is defined.",
-  "core.common.OperationOnlyContainsOptionalParam": "Operation %s contains multiple optional parameters. The first optional parameter is used for this command.",
-  "core.common.ConvertSwaggerToOpenAPI": "The Swagger 2.0 file has been converted to OpenAPI 3.0.",
+  "core.common.ErrorFetchApiSpec": "Your OpenAPI description document should be accessible without authentication, otherwise download and start from a local copy.",
   "core.common.SendingApiRequest": "Sending API request: %s. Request body: %s",
   "core.common.ReceiveApiResponse": "Received API response: %s.",
   "core.importAddin.label": "Import an Existing Outlook Add-ins",
@@ -432,8 +430,8 @@
   "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.AADManifestIssues": "AAD manifest has following issues that may potentially break the Teams App:\n",
-  "error.aad.manifest.DeleteOrUpdatePermissionFailed": "Unable to update or delete an existing permission when it's enabled. One possible reason is that the ACCESS_AS_USER_PERMISSION_ID environment variable is changed for selected environment. Ensure your permission id(s) are identical with the actual AAD application and try again.\n",
+  "error.aad.manifest.AADManifestIssues": "Microsoft Entra manifest has following issues that may potentially break the Teams App:\n",
+  "error.aad.manifest.DeleteOrUpdatePermissionFailed": "Unable to update or delete an existing permission when it's enabled. One possible reason is that the ACCESS_AS_USER_PERMISSION_ID environment variable is changed for selected environment. Ensure your permission id(s) are identical with the actual Microsoft Entra application and try again.\n",
   "error.aad.manifest.UnknownResourceAppId": "Unknown resourceAppId %s",
   "error.aad.manifest.UnknownResourceAccessType": "Unknown resourceAccess: %s",
   "error.aad.manifest.UnknownResourceAccessId": "Unknown resourceAccess id: %s, if you're using permission as resourceAccess id, please try to use permission id instead.",
@@ -482,35 +480,35 @@
   "depChecker.testToolVersionNotMatch": "The version of Teams App Test Tool (%s) is not compatible with the specified version range (%s).",
   "depChecker.failedToValidateTestTool": "Unable to validate Teams App Test Tool after installation. %s",
   "error.driver.outputEnvironmentVariableUndefined": "The output environment variable name(s) are not defined.",
-  "driver.aadApp.description.create": "Create an Azure Active Directory app to authenticate users",
-  "driver.aadApp.description.update": "Apply Azure Active Directory app manifest to an existing app",
+  "driver.aadApp.description.create": "Create a Microsoft Entra app to authenticate users",
+  "driver.aadApp.description.update": "Apply Microsoft Entra app manifest to an existing app",
   "driver.aadApp.error.missingEnv": "Environment variable %s is not set.",
   "driver.aadApp.error.generateSecretFailed": "Cannot generate client secret.",
-  "driver.aadApp.error.invalidFieldInManifest": "Field %s is missing or invalid in Azure Active Directory app manifest.",
-  "driver.aadApp.error.appNameTooLong": "The name for this Azure Active Directory app is too long. The maximum length is 120.",
-  "driver.aadApp.progressBar.createAadAppTitle": "Creating Azure Active Directory application...",
-  "driver.aadApp.progressBar.updateAadAppTitle": "Updating Azure Active Directory application...",
+  "driver.aadApp.error.invalidFieldInManifest": "Field %s is missing or invalid in Microsoft Entra app manifest.",
+  "driver.aadApp.error.appNameTooLong": "The name for this Microsoft Entra app is too long. The maximum length is 120.",
+  "driver.aadApp.progressBar.createAadAppTitle": "Creating Microsoft Entra application...",
+  "driver.aadApp.progressBar.updateAadAppTitle": "Updating Microsoft Entra application...",
   "driver.aadApp.log.startExecuteDriver": "Executing action %s",
   "driver.aadApp.log.successExecuteDriver": "Action %s executed successfully",
   "driver.aadApp.log.failExecuteDriver": "Unable to execute action %s. Error message: %s",
-  "driver.aadApp.log.startCreateAadApp": "Environment variable %s does not exist, creating a new Azure Active Directory app...",
-  "driver.aadApp.log.successCreateAadApp": "Created Azure Active Directory application with object id %s",
-  "driver.aadApp.log.skipCreateAadApp": "Environment variable %s already exist, skipping new Azure Active Directory app creation step.",
-  "driver.aadApp.log.startGenerateClientSecret": "Environment variable %s does not exist, generating client secret for Azure Active Directory app...",
-  "driver.aadApp.log.successGenerateClientSecret": "Generated client secret for Azure Active Directory application with object id %s",
-  "driver.aadApp.log.skipGenerateClientSecret": "Environment variable %s already exist, skipping Azure Active Directory app client secret generation step.",
-  "driver.aadApp.log.outputAadAppManifest": "Build Azure Active Directory app manifest completed, and app manifest content is written to %s",
-  "driver.aadApp.log.successUpdateAadAppManifest": "Applied manifest %s to Azure Active Directory application with object id %s",
-  "botRegistration.ProgressBar.creatingBotAadApp": "Creating bot AAD app...",
-  "botRegistration.log.startCreateBotAadApp": "Creating bot Azure Active Directory app.",
-  "botRegistration.log.successCreateBotAadApp": "Bot Azure Active Directory app created successfully.",
-  "botRegistration.log.skipCreateBotAadApp": "Bot Azure Active Directory app creation skipped.",
-  "driver.botAadApp.create.description": "create a new or reuse an existing bot Azure Active Directory app.",
+  "driver.aadApp.log.startCreateAadApp": "Environment variable %s does not exist, creating a new Microsoft Entra app...",
+  "driver.aadApp.log.successCreateAadApp": "Created Microsoft Entra application with object id %s",
+  "driver.aadApp.log.skipCreateAadApp": "Environment variable %s already exist, skipping new Microsoft Entra app creation step.",
+  "driver.aadApp.log.startGenerateClientSecret": "Environment variable %s does not exist, generating client secret for Microsoft Entra app...",
+  "driver.aadApp.log.successGenerateClientSecret": "Generated client secret for Microsoft Entra application with object id %s",
+  "driver.aadApp.log.skipGenerateClientSecret": "Environment variable %s already exist, skipping Microsoft Entra app client secret generation step.",
+  "driver.aadApp.log.outputAadAppManifest": "Build Microsoft Entra app manifest completed, and app manifest content is written to %s",
+  "driver.aadApp.log.successUpdateAadAppManifest": "Applied manifest %s to Microsoft Entra application with object id %s",
+  "botRegistration.ProgressBar.creatingBotAadApp": "Creating bot Microsoft Entra app...",
+  "botRegistration.log.startCreateBotAadApp": "Creating bot Microsoft Entra app.",
+  "botRegistration.log.successCreateBotAadApp": "Bot Microsoft Entra app created successfully.",
+  "botRegistration.log.skipCreateBotAadApp": "Bot Microsoft Entra app creation skipped.",
+  "driver.botAadApp.create.description": "create a new or reuse an existing bot Microsoft Entra app.",
   "driver.botAadApp.log.startExecuteDriver": "Executing action %s",
   "driver.botAadApp.log.successExecuteDriver": "Action %s executed successfully",
   "driver.botAadApp.log.failExecuteDriver": "Unable to execute action %s. Error message: %s",
-  "driver.botAadApp.log.successCreateBotAad": "Created Azure Active Directory application with client id %s.",
-  "driver.botAadApp.log.useExistingBotAad": "Used existing Azure Active Directory application with client id %s.",
+  "driver.botAadApp.log.successCreateBotAad": "Created Microsoft Entra application with client id %s.",
+  "driver.botAadApp.log.useExistingBotAad": "Used existing Microsoft Entra application with client id %s.",
   "driver.botAadApp.error.unexpectedEmptyBotPassword": "Bot password is empty. Add it in env file or clear bot id to have bot id/password pair regenerated. action: %s.",
   "driver.arm.description.deploy": "Deploy the given ARM templates to Azure.",
   "driver.arm.deploy.progressBar.message": "Deploying the ARM templates to Azure...",
@@ -599,6 +597,7 @@
   "driver.teamsApp.validate.result.display": "Teams Toolkit has completed checking your app package against validation rules. %s. Check [Output panel](command:fx-extension.showOutputChannel) for details.",
   "error.teamsApp.validate.apiFailed": "Teams app package validation failed due to  %s",
   "error.teamsApp.validate.apiFailed.display": "Teams app pacakge validation failed. Check [Output panel](command:fx-extension.showOutputChannel) for details.",
+  "error.teamsApp.validate.details": "File path: %s, title: %s",
   "error.teamsApp.AppIdNotExistError": "Teams app with ID %s does not exist in Teams Developer Portal.",
   "error.teamsApp.InvalidAppIdError": "Teams app ID %s is invalid, must be a GUID.",
   "driver.botFramework.description": "creates or updates the bot registration on dev.botframework.com",
@@ -674,5 +673,15 @@
   "error.deploy.AzureStorageSetContainerPropertiesError.Notification": "Unable to set properties of container '%s' in Azure Storage Account '%s' due to error: %s. Refer to the [Output panel](command:fx-extension.showOutputChannel) for more details.",
   "error.deploy.AzureStorageSetContainerPropertiesError": "Unable to set properties of container '%s' in Azure Storage Account '%s' due to error: %s. The error responses from Azure are:\n %s. \nIf the error message specifies the reason, fix the error and try again.",
   "error.core.failedToLoadManifestId": "Unable to load manifest id from path: %s. You must run provision first.",
-  "error.core.appIdNotExist": "Cannot find app id: %s. Maybe your current M365 account does not have permission, or the app has alredy been deleted."
+  "error.core.appIdNotExist": "Cannot find app id: %s. Either your current M365 account does not have permission, or the app has alredy been deleted.",
+  "driver.apiKey.description.create": "Create an API key on Developer Portal for authentication in Open API spec.",
+  "driver.aadApp.apiKey.title.create": "Creating API key...",
+  "driver.apiKey.log.startExecuteDriver": "Executing action %s",
+  "driver.apiKey.log.skipCreateApiKey": "Environment variable %s exists. Skip creating API key.",
+  "driver.apiKey.log.apiKeyNotFound": "Environment variable %s exists but failed to retrieve API key from Developer Portal. Check manually if API key exists.",
+  "driver.apiKey.error.nameTooLong": "The name for API key is too long. The maximum length is 128.",
+  "driver.apiKey.error.clientSecretInvalid": "Client secret is invalid. Client secret should follow: 1. Max %d secrets per API key. 2. Use comma to separate secrets. 3. Length of every secret >= 10 and <= 128",
+  "driver.apiKey.error.domainInvalid": "Domain is invalid. Domain for API key should follow: 1. Max %d domain per API key. 2. Use comma to separate domains",
+  "driver.apiKey.log.successCreateApiKey": "Created API key with id %s",
+  "driver.apiKey.log.failedExecuteDriver": "Unable to execute action %s. Error message: %s"
 }

package/resource/yaml-schema/v1.3/yaml.schema.json

@@ -70,13 +70,14 @@
           { "$ref": "#/definitions/teamsAppExtendToM365" },
           { "$ref": "#/definitions/spfxDeploy" },
           { "$ref": "#/definitions/teamsAppCopyAppPackageToSPFx" },
-          { "$ref": "#/definitions/script" }
+          { "$ref": "#/definitions/script" },
+          { "$ref": "#/definitions/apiKeyCreate"}
         ]
       }
     },
     "aadAppCreateBase": {
       "type": "object",
-      "description": "Create Azure Active Directory application and client secret (optional). Refer to https://aka.ms/teamsfx-actions/aadapp-create for more details.",
+      "description": "Create Microsoft Entra application and client secret (optional). Refer to https://aka.ms/teamsfx-actions/aadapp-create for more details.",
       "required": ["uses", "writeToEnvironmentFile"],
       "properties": {
         "name": {
@@ -92,7 +93,7 @@
         },
         "uses": {
           "type": "string",
-          "description": "Create Azure Active Directory application when the environment variable that stores clientId is empty. Also create client secret for the application when generateClientSecret parameter is true and the environment variable that stores clientSecret is empty. When creating new Azure Active Directory application, this action generates clientId, objectId, tenantId, authority and authorityHost. When creating new client secret, this action generates clientSecret. Refer to https://aka.ms/teamsfx-actions/aadapp-create for more details.",
+          "description": "Create Microsoft Entra application when the environment variable that stores clientId is empty. Also create client secret for the application when generateClientSecret parameter is true and the environment variable that stores clientSecret is empty. When creating new Microsoft Entra application, this action generates clientId, objectId, tenantId, authority and authorityHost. When creating new client secret, this action generates clientSecret. Refer to https://aka.ms/teamsfx-actions/aadapp-create for more details.",
           "const": "aadApp/create"
         }
       }
@@ -114,11 +115,11 @@
           "properties": {
             "name": {
               "type": "string",
-              "description": "The name of Azure Active Directory application. Note: when you run aadApp/update, the Azure Active Directory application name will be updated based on the definition in manifest. If you don't want to change the name, ensure the name in Azure Active Directory application manifest is the same with the name defined here."
+              "description": "The name of Microsoft Entra application. Note: when you run aadApp/update, the Microsoft Entra application name will be updated based on the definition in manifest. If you don't want to change the name, ensure the name in Microsoft Entra application manifest is the same with the name defined here."
             },
             "generateClientSecret": {
               "type": "boolean",
-              "description": "Whether to generate client secret for the Azure Active Directory application. When the value is true, you need to specify the name of environment variable that stores the value of client secret in writeToEnvironmentVariable. For example: `clientSecret: SECRET_MY_AAD_APP_CLIENT_SECRET`.",
+              "description": "Whether to generate client secret for the Microsoft Entra application. When the value is true, you need to specify the name of environment variable that stores the value of client secret in writeToEnvironmentVariable. For example: `clientSecret: SECRET_MY_AAD_APP_CLIENT_SECRET`.",
               "const": true
             },
             "signInAudience": {
@@ -135,27 +136,27 @@
           "required": ["clientId", "objectId", "clientSecret"],
           "properties": {
             "clientId": {
-              "description": "Required. The client (application) id of created Azure Active Directory application.",
+              "description": "Required. The client (application) id of created Microsoft Entra application.",
               "$ref": "#/definitions/envVarName"
             },
             "objectId": {
-              "description": "Required. The object id of created Azure Active Directory application.",
+              "description": "Required. The object id of created Microsoft Entra application.",
               "$ref": "#/definitions/envVarName"
             },
             "clientSecret": {
-              "description": "Required when generateClientSecret is true. The generated client secret of the Azure Active Directory application.",
+              "description": "Required when generateClientSecret is true. The generated client secret of the Microsoft Entra application.",
               "$ref": "#/definitions/secretEnvVarName"
             },
             "tenantId": {
-              "description": "The tenant id of created Azure Active Directory application.",
+              "description": "The tenant id of created Microsoft Entra application.",
               "$ref": "#/definitions/envVarName"
             },
             "authority": {
-              "description": "The authority of created Azure Active Directory application.",
+              "description": "The authority of created Microsoft Entra application.",
               "$ref": "#/definitions/envVarName"
             },
             "authorityHost": {
-              "description": "The authority host name of created Azure Active Directory application.",
+              "description": "The authority host name of created Microsoft Entra application.",
               "$ref": "#/definitions/envVarName"
             }
           }
@@ -179,11 +180,11 @@
           "properties": {
             "name": {
               "type": "string",
-              "description": "The name of Azure Active Directory application. Note: when you run aadApp/update, the Azure Active Directory application name will be updated based on the definition in manifest. If you don't want to change the name, ensure the name in Azure Active Directory application manifest is the same with the name defined here."
+              "description": "The name of Microsoft Entra application. Note: when you run aadApp/update, the Microsoft Entra application name will be updated based on the definition in manifest. If you don't want to change the name, ensure the name in Microsoft Entra application manifest is the same with the name defined here."
             },
             "generateClientSecret": {
               "type": "boolean",
-              "description": "Whether to generate client secret for the Azure Active Directory application. When the value is true, you need to specify the name of environment variable that stores the value of client secret in writeToEnvironmentVariable. For example: `clientSecret: SECRET_MY_AAD_APP_CLIENT_SECRET`.",
+              "description": "Whether to generate client secret for the Microsoft Entra application. When the value is true, you need to specify the name of environment variable that stores the value of client secret in writeToEnvironmentVariable. For example: `clientSecret: SECRET_MY_AAD_APP_CLIENT_SECRET`.",
               "const": false
             },
             "signInAudience": {
@@ -200,23 +201,23 @@
           "required": ["clientId", "objectId"],
           "properties": {
             "clientId": {
-              "description": "Required. The client (application) id of created Azure Active Directory application.",
+              "description": "Required. The client (application) id of created Microsoft Entra application.",
               "$ref": "#/definitions/envVarName"
             },
             "objectId": {
-              "description": "Required. The object id of created Azure Active Directory application.",
+              "description": "Required. The object id of created Microsoft Entra application.",
               "$ref": "#/definitions/envVarName"
             },
             "tenantId": {
-              "description": "The tenant id of created Azure Active Directory application.",
+              "description": "The tenant id of created Microsoft Entra application.",
               "$ref": "#/definitions/envVarName"
             },
             "authority": {
-              "description": "The authority of created Azure Active Directory application.",
+              "description": "The authority of created Microsoft Entra application.",
               "$ref": "#/definitions/envVarName"
             },
             "authorityHost": {
-              "description": "The authority host name of created Azure Active Directory application.",
+              "description": "The authority host name of created Microsoft Entra application.",
               "$ref": "#/definitions/envVarName"
             }
           }
@@ -233,7 +234,7 @@
     "aadAppUpdate": {
       "type": "object",
       "additionalProperties": false,
-      "description": "Update Azure Active Directory application. Refer to https://aka.ms/teamsfx-actions/aadapp-update for more details.",
+      "description": "Update Microsoft Entra application. Refer to https://aka.ms/teamsfx-actions/aadapp-update for more details.",
       "required": ["uses", "with"],
       "properties": {
         "name": {
@@ -249,7 +250,7 @@
         },
         "uses": {
           "type": "string",
-          "description": "Update Azure Active Directory application based on the given Azure Active Directory application manifest. If the manifest uses AAD_APP_ACCESS_AS_USER_PERMISSION_ID and the environment variable is empty, this action will generate a random id and output it. Refer to https://aka.ms/teamsfx-actions/aadapp-update for more details.",
+          "description": "Update Microsoft Entra application based on the given Microsoft Entra application manifest. If the manifest uses AAD_APP_ACCESS_AS_USER_PERMISSION_ID and the environment variable is empty, this action will generate a random id and output it. Refer to https://aka.ms/teamsfx-actions/aadapp-update for more details.",
           "const": "aadApp/update"
         },
         "with": {
@@ -260,11 +261,11 @@
           "properties": {
             "manifestPath": {
               "type": "string",
-              "description": "Path of Azure Active Directory application manifest. Environment variables in the manifest will be replaced before applying the manifest to Azure Active Directory application."
+              "description": "Path of Microsoft Entra application manifest. Environment variables in the manifest will be replaced before applying the manifest to Microsoft Entra application."
             },
             "outputFilePath": {
               "type": "string",
-              "description": "Generate the final Azure Active Directory application manifest used to update Azure Active Directory application to this path."
+              "description": "Generate the final Microsoft Entra application manifest used to update Microsoft Entra application to this path."
             }
           }
         }
@@ -914,7 +915,7 @@
     "botAadAppCreate": {
       "type": "object",
       "additionalProperties": false,
-      "description": "Create a new or reuse an existing Azure Active Directory application for bot. Refer to https://aka.ms/teamsfx-actions/botaadapp-create for more details.",
+      "description": "Create a new or reuse an existing Microsoft Entra application for bot. Refer to https://aka.ms/teamsfx-actions/botaadapp-create for more details.",
       "required": ["uses", "with", "writeToEnvironmentFile"],
       "properties": {
         "name": {
@@ -930,7 +931,7 @@
         },
         "uses": {
           "type": "string",
-          "description": "Create a new or reuse an existing Azure Active Directory application for bot. Refer to https://aka.ms/teamsfx-actions/botaadapp-create for more details.",
+          "description": "Create a new or reuse an existing Microsoft Entra application for bot. Refer to https://aka.ms/teamsfx-actions/botaadapp-create for more details.",
           "const": "botAadApp/create"
         },
         "with": {
@@ -941,7 +942,7 @@
           "properties": {
             "name": {
               "type": "string",
-              "description": "The user-facing display name for this Azure Active Directory application"
+              "description": "The user-facing display name for this Microsoft Entra application"
             }
           }
         },
@@ -952,11 +953,11 @@
           "required": ["botId", "botPassword"],
           "properties": {
             "botId": {
-              "description": "Required. Client (application) id of the Azure Active Directory application created for bot.",
+              "description": "Required. Client (application) id of the Microsoft Entra application created for bot.",
               "$ref": "#/definitions/envVarName"
             },
             "botPassword": {
-              "description": "Required. Client secret of the Azure Active Directory application created for bot.",
+              "description": "Required. Client secret of the Microsoft Entra application created for bot.",
               "$ref": "#/definitions/secretEnvVarName"
             }
           }
@@ -993,7 +994,7 @@
           "properties": {
             "botId": {
               "type": "string",
-              "description": "the AAD app client id of the bot"
+              "description": "the Microsoft Entra app client id of the bot"
             },
             "name": {
               "type": "string",
@@ -1221,10 +1222,7 @@
               "type": "object",
               "description": "Install Teams App Test Tool. This will output environment variables specified by `testToolPath` to current environment's .env file.",
               "additionalProperties": false,
-              "required": [
-                "version",
-                "symlinkDir"
-              ],
+              "required": ["version"],
               "properties": {
                 "version": {
                   "oneOf": [
@@ -1495,6 +1493,59 @@
       "type": "string",
       "pattern": "^[A-Z][A-Z0-9_]*$",
       "maxLength": 256
+    },
+    "apiKeyCreate": {
+      "type": "object",
+      "additionalProperties": false,
+      "description": "Create an API key.",
+      "required": ["uses", "with", "writeToEnvironmentFile"],
+      "properties": {
+        "uses": {
+          "type": "string",
+          "description": "Create API key. Refer to https://aka.ms/teamsfx-actions/apiKey-create for more details.",
+          "const": "apiKey/create"
+        },
+        "with": {
+          "type": "object",
+          "additionalProperties": false,
+          "description": "Parameters for this action",
+          "required": ["name", "appId", "apiSpecPath"],
+          "properties": {
+            "name": {
+              "type": "string",
+              "description": "The name of API key."
+            },
+            "appId": {
+              "type": "string",
+              "description": "The app ID of Teams app."
+            },
+            "clientSecret": {
+              "type": "string",
+              "description": "Client secret of API key. Client secret should follow: 1. Max %d secrets per API key. 2. Use comma to separate secrets. 3. Length of every secret >= 10 and <= 128"
+            },
+            "apiSpecPath": {
+              "type": "string",
+              "description": "The path of API specification file."
+            },
+            "domain": {
+              "type": "string",
+              "description": "The domain of API key. Domain for API key should follow: 1. Max %d domain per API key. 2. Use comma to separate domains."
+            }
+          }
+        },
+        "writeToEnvironmentFile": {
+          "type": "object",
+          "additionalProperties": false,
+          "description": "Write environment variables to environment file",
+          "required": ["registrationId"],
+          "properties": {
+            "registrationId": {
+              "description": "Required. The registration id of created API key.",
+              "$ref": "#/definitions/envVarName"
+            }
+          }
+        }
+      }
     }
   }
 }

package/templates/core/v3Migration/csharp.app.local.yml

@@ -5,11 +5,11 @@ version: 1.1.0
 
 provision:
 {{#if activePlugins.fx-resource-aad-app-for-teams}}
-  - uses: aadApp/create # Creates a new Azure Active Directory (AAD) app to authenticate users if the environment variable that stores clientId is empty
+  - uses: aadApp/create # Creates a new Microsoft Entra app to authenticate users if the environment variable that stores clientId is empty
     with:
-      name: {{aadAppName}} # Note: when you run aadApp/update, the AAD app name will be updated based on the definition in manifest. If you don't want to change the name, make sure the name in AAD manifest is the same with the name defined here.
+      name: {{aadAppName}} # Note: when you run aadApp/update, the Microsoft Entra app name will be updated based on the definition in manifest. If you don't want to change the name, make sure the name in Microsoft Entra manifest is the same with the name defined here.
       generateClientSecret: true # If the value is false, the action will not generate client secret for you
-      signInAudience: "AzureADMyOrg" # Authenticate users with a Microsoft work or school account in your organization's Azure AD tenant (for example, single tenant).
+      signInAudience: "AzureADMyOrg" # Authenticate users with a Microsoft work or school account in your organization's Microsoft Entra tenant (for example, single tenant).
     writeToEnvironmentFile: # Write the information of created resources into environment file for the specified environment variable(s).
       clientId: AAD_APP_CLIENT_ID
       clientSecret: SECRET_AAD_APP_CLIENT_SECRET # Environment variable that starts with `SECRET_` will be stored to the .env.{envName}.user environment file
@@ -25,7 +25,7 @@ provision:
       # Write the information of created resources into environment file for the specified environment variable(s).
       teamsAppId: TEAMS_APP_ID
 {{#if activePlugins.fx-resource-bot}}
-  - uses: botAadApp/create # Creates a new AAD app for Bot Registration.
+  - uses: botAadApp/create # Creates a new Microsoft Entra app for Bot Registration.
     with:
       name: {{appName}}
     writeToEnvironmentFile:
@@ -78,9 +78,9 @@ provision:
       run: echo "::set-teamsfx-env {{placeholderMappings.botDomain}}=$\{{BOT_DOMAIN}}"
 {{/if}}
 {{#if activePlugins.fx-resource-aad-app-for-teams}}
-  - uses: aadApp/update # Apply the AAD manifest to an existing AAD app. Will use the object id in manifest file to determine which AAD app to update.
+  - uses: aadApp/update # Apply the Microsoft Entra manifest to an existing Microsoft Entra app. Will use the object id in manifest file to determine which Microsoft Entra app to update.
     with:
-      manifestPath: ./aad.manifest.json # Relative path to this file. Environment variables in manifest will be replaced before apply to AAD app
+      manifestPath: ./aad.manifest.json # Relative path to this file. Environment variables in manifest will be replaced before apply to Microsoft Entra app
       outputFilePath : ./build/aad.manifest.$\{{TEAMSFX_ENV}}.json
 {{/if}}
   - uses: teamsApp/validateManifest # Validate using manifest schema

package/templates/core/v3Migration/csharp.app.yml

@@ -9,11 +9,11 @@ environmentFolderPath: ./ {{~environmentFolder}}
 
 provision:
 {{#if activePlugins.fx-resource-aad-app-for-teams}}
-  - uses: aadApp/create # Creates a new Azure Active Directory (AAD) app to authenticate users if the environment variable that stores clientId is empty
+  - uses: aadApp/create # Creates a new Microsoft Entra app to authenticate users if the environment variable that stores clientId is empty
     with:
-      name: {{aadAppName}} # Note: when you run aadApp/update, the AAD app name will be updated based on the definition in manifest. If you don't want to change the name, make sure the name in AAD manifest is the same with the name defined here.
+      name: {{aadAppName}} # Note: when you run aadApp/update, the Microsoft Entra app name will be updated based on the definition in manifest. If you don't want to change the name, make sure the name in Microsoft Entra manifest is the same with the name defined here.
       generateClientSecret: true # If the value is false, the action will not generate client secret for you
-      signInAudience: "AzureADMyOrg" # Authenticate users with a Microsoft work or school account in your organization's Azure AD tenant (for example, single tenant).
+      signInAudience: "AzureADMyOrg" # Authenticate users with a Microsoft work or school account in your organization's Microsoft Entra tenant (for example, single tenant).
     writeToEnvironmentFile: # Write the information of created resources into environment file for the specified environment variable(s).
       clientId: AAD_APP_CLIENT_ID
       clientSecret: SECRET_AAD_APP_CLIENT_SECRET # Environment variable that starts with `SECRET_` will be stored to the .env.{envName}.user environment file
@@ -29,7 +29,7 @@ provision:
       # Write the information of created resources into environment file for the specified environment variable(s).
       teamsAppId: TEAMS_APP_ID
 {{#if activePlugins.fx-resource-bot}}
-  - uses: botAadApp/create # Creates a new AAD app for Bot Registration.
+  - uses: botAadApp/create # Creates a new Microsoft Entra app for Bot Registration.
     with:
       name: {{appName}}bt$\{{RESOURCE_SUFFIX}}
     writeToEnvironmentFile:
@@ -51,9 +51,9 @@ provision:
       run: echo "::set-teamsfx-env {{placeholderMappings.[state.fx-resource-frontend-hosting.indexPath]}}=/" # Used in appPackage/manifest.json file.
 {{/if}}
 {{#if activePlugins.fx-resource-aad-app-for-teams}}
-  - uses: aadApp/update # Apply the AAD manifest to an existing AAD app. Will use the object id in manifest file to determine which AAD app to update.
+  - uses: aadApp/update # Apply the Microsoft Entra manifest to an existing Microsoft Entra app. Will use the object id in manifest file to determine which Microsoft Entra app to update.
     with:
-      manifestPath: ./aad.manifest.json # Relative path to this file. Environment variables in manifest will be replaced before apply to AAD app
+      manifestPath: ./aad.manifest.json # Relative path to this file. Environment variables in manifest will be replaced before apply to Microsoft Entra app
       outputFilePath : ./build/aad.manifest.$\{{TEAMSFX_ENV}}.json
 {{/if}}
   - uses: teamsApp/validateManifest # Validate using manifest schema