@microsoft/teamsfx-core 2.0.6-alpha.e73e76fb5.0 → 2.0.6-alpha.e92fb7848.0

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/apiKeyRegister"}
         ]
       }
     },
     "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", "symlinkDir"],
               "properties": {
                 "version": {
                   "oneOf": [
@@ -1436,12 +1434,11 @@
             },
             "workingDirectory": {
               "type": "string",
-              "description": "current working directory. Defaults to the directory of this file."
+              "description": "Current working directory. Defaults to the directory of this file."
             },
             "shell": {
               "type": "string",
-              "enum": ["bash", "sh", "powershell", "pwsh", "cmd"],
-              "description": "The shell type. Can be omitted. If omitted, it defaults to bash on Linux/MacOS, defaults to pwsh on windows."
+              "description": "Shell command. If not specified, use default shell for current platform. The rule is: 1) use the value of the 'SHELL' environment variable if it is set. Otherwise the shell depends on operation system: 2) on macOS, use '/bin/zsh' if it exists, otherwise use '/bin/bash'; 3) On Windows, use the value of the 'ComSpec' environment variable if it exists, otherwise use 'cmd.exe'; 4) On Linux or other OS, use '/bin/sh' if it extis."
             },
             "timeout": {
               "type": "number",
@@ -1495,6 +1492,55 @@
       "type": "string",
       "pattern": "^[A-Z][A-Z0-9_]*$",
       "maxLength": 256
+    },
+    "apiKeyRegister": {
+      "type": "object",
+      "additionalProperties": false,
+      "description": "Create an API key.",
+      "required": ["uses", "with", "writeToEnvironmentFile"],
+      "properties": {
+        "uses": {
+          "type": "string",
+          "description": "Register API key. Refer to https://aka.ms/teamsfx-actions/apiKey-register for more details.",
+          "const": "apiKey/register"
+        },
+        "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."
+            }
+          }
+        },
+        "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

package/templates/core/v3Migration/js.ts.app.local.yml

@@ -7,19 +7,19 @@ version: 1.0.0
 provision:
   {{#registerApp}}
   {{#if aad}}
-  # Creates a new Azure Active Directory (AAD) app to authenticate users if
+  # Creates a new Microsoft Entra app to authenticate users if
   # the environment variable that stores clientId is empty
   - uses: aadApp/create
     with:
-      # Note: when you run aadApp/update, the AAD app name will be updated
+      # 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 AAD manifest is the same with the name
+      # name, make sure the name in Microsoft Entra manifest is the same with the name
       # defined here.
       name: $\{{CONFIG__MANIFEST__APPNAME__SHORT}}-aad
       # If the value is false, the action will not generate client secret for you
       generateClientSecret: true
       # Authenticate users with a Microsoft work or school account in your
-      # organization's Azure AD tenant (for example, single tenant).
+      # organization's Microsoft Entra tenant (for example, single tenant).
       signInAudience: "AzureADMyOrg"
     # Write the information of created resources into environment file for the
     # specified environment variable(s).
@@ -48,15 +48,15 @@ provision:
 
   {{/registerApp}}
   {{#bot}}
-  # Create or reuse an existing Azure Active Directory application for bot.
+  # Create or reuse an existing Microsoft Entra application for bot.
   - uses: botAadApp/create
     with:
-      # The Azure Active Directory application's display name
+      # The Microsoft Entra application's display name
       name: $\{{CONFIG__MANIFEST__APPNAME__SHORT}}-bot
     writeToEnvironmentFile:
-      # The Azure Active Directory application's client id created for bot.
+      # The Microsoft Entra application's client id created for bot.
       botId: BOT_ID
-      # The Azure Active Directory application's client secret created for bot.
+      # The Microsoft Entra application's client secret created for bot.
       botPassword: SECRET_BOT_PASSWORD
 
   # Create or update the bot registration on dev.botframework.com
@@ -84,12 +84,12 @@ provision:
 
   {{/tab}}
   {{#if aad}}
-  # Apply the AAD manifest to an existing AAD app. Will use the object id in
-  # manifest file to determine which AAD app to 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.
   - uses: aadApp/update
     with:
       # Relative path to this file. Environment variables in manifest will
-      # be replaced before apply to AAD app
+      # be replaced before apply to Microsoft Entra app
       manifestPath: ./aad.manifest.json
       outputFilePath : ./build/aad.manifest.$\{{TEAMSFX_ENV}}.json
 

package/templates/core/v3Migration/js.ts.app.yml

@@ -10,19 +10,19 @@ environmentFolderPath: ./ {{~environmentFolder}}
 # Triggered when 'teamsfx provision' is executed
 provision:
 {{#if activePlugins.fx-resource-aad-app-for-teams}}
-  # Creates a new Azure Active Directory (AAD) app to authenticate users if
+  # Creates a new Microsoft Entra app to authenticate users if
   # the environment variable that stores clientId is empty
   - uses: aadApp/create
     with:
-      # Note: when you run aadApp/update, the AAD app name will be updated
+      # 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 AAD manifest is the same with the name
+      # name, make sure the name in Microsoft Entra manifest is the same with the name
       # defined here.
       name: {{aadAppName}}
       # If the value is false, the action will not generate client secret for you
       generateClientSecret: true
       # Authenticate users with a Microsoft work or school account in your
-      # organization's Azure AD tenant (for example, single tenant).
+      # organization's Microsoft Entra tenant (for example, single tenant).
       signInAudience: "AzureADMyOrg"
     # Write the information of created resources into environment file for the
     # specified environment variable(s).
@@ -46,15 +46,15 @@ provision:
     writeToEnvironmentFile:
       teamsAppId: TEAMS_APP_ID
 {{#if activePlugins.fx-resource-bot}}
-  # Create or reuse an existing Azure Active Directory application for bot.
+  # Create or reuse an existing Microsoft Entra application for bot.
   - uses: botAadApp/create
     with:
-      # The Azure Active Directory application's display name
+      # The Microsoft Entra application's display name
       name: {{appName}}bt$\{{RESOURCE_SUFFIX}}
     writeToEnvironmentFile:
-      # The Azure Active Directory application's client id created for bot.
+      # The Microsoft Entra application's client id created for bot.
       botId: BOT_ID
-      # The Azure Active Directory application's client secret created for bot.
+      # The Microsoft Entra application's client secret created for bot.
       botPassword: SECRET_BOT_PASSWORD
 {{/if}}
   - uses: arm/deploy  # Deploy given ARM templates parallelly.
@@ -89,12 +89,12 @@ provision:
       errorPage: error.html
 {{/if}}
 {{#if activePlugins.fx-resource-aad-app-for-teams}}
-  # Apply the AAD manifest to an existing AAD app. Will use the object id in
-  # manifest file to determine which AAD app to 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.
   - uses: aadApp/update
     with:
       # Relative path to this file. Environment variables in manifest will
-      # be replaced before apply to AAD app
+      # be replaced before apply to Microsoft Entra app
       manifestPath: ./aad.manifest.json
       outputFilePath : ./build/aad.manifest.$\{{TEAMSFX_ENV}}.json
 {{/if}}
@@ -163,7 +163,7 @@ deploy:
   - uses: azureStorage/deploy
     with:
       workingDirectory: tabs
-      # Deploy base folder. This folder includes manifest files for AAD app and Teams app that should be ignored using the ignoreFile.
+      # Deploy base folder. This folder includes manifest files for Microsoft Entra app and Teams app that should be ignored using the ignoreFile.
       artifactFolder: build
       # The resource id of the cloud resource to be deployed to. 
       # This key will be generated by arm/deploy action automatically. 

package/templates/plugins/resource/aad/auth/V3/Bot/Pages/BotAuthorizeEndPage.cshtml

@@ -1,61 +1,65 @@
 @page "/bot-auth-end.html"
 
 <html>
+
 <head>
-    <title>Login End Page</title>
-    <meta charset="utf-8" />
+  <title>Login End Page</title>
+  <meta charset="utf-8" />
 </head>
 
 <body>
-    <script src="https://res.cdn.office.net/teams-js/2.7.1/js/MicrosoftTeams.min.js" integrity="sha384-4Gy2G+qxzDVdrdemcVqKVQvaSK1Ghg3x6xcsaMLPc/pw7KPtiogHGM97LTWF2PWg" crossorigin="anonymous"></script>
-    <div id="divError"></div>
-    <script type="text/javascript">
-        microsoftTeams.app.initialize().then(()=>{
-          let hashParams = getHashParameters();
-          if (hashParams["error"]) {
-            // Authentication failed
-            handleAuthError(hashParams["error"], hashParams);
-          } else if (hashParams["code"]) {
-            // Get the stored state parameter and compare with incoming state
-            let expectedState = localStorage.getItem("state");
-            if (expectedState !== hashParams["state"]) {
-              // State does not match, report error
-              handleAuthError("StateDoesNotMatch", hashParams);
-            } else {
-              microsoftTeams.authentication.notifySuccess();
-            }
-          } else {
-            // Unexpected condition: hash does not contain error or access_token parameter
-            handleAuthError("UnexpectedFailure", hashParams);
-          }
-        });
-        
-        // Parse hash parameters into key-value pairs
-        function getHashParameters() {
-          let hashParams = {};
-          location.hash
-            .substr(1)
-            .split("&")
-            .forEach(function (item) {
-              let s = item.split("="),
-                k = s[0],
-                v = s[1] && decodeURIComponent(s[1]);
-              hashParams[k] = v;
-            });
-          return hashParams;
-        }
-        // Show error information
-        function handleAuthError(errorType, errorMessage) {
-          const err = JSON.stringify({
-            error: errorType,
-            message: JSON.stringify(errorMessage),
-          });
-          let para = document.createElement("p");
-          let node = document.createTextNode(err);
-          para.appendChild(node);
-          let element = document.getElementById("divError");
-          element.appendChild(para);
+  <script src="https://res.cdn.office.net/teams-js/2.17.0/js/MicrosoftTeams.min.js"
+    integrity="sha384-xp55t/129OsN192JZYLP0rGhzjCF9aYtjY0LVtXvolkDrBe4Jchylp56NrUYJ4S2"
+    crossorigin="anonymous"></script>
+  <div id="divError"></div>
+  <script type="text/javascript">
+    microsoftTeams.app.initialize().then(() => {
+      let hashParams = getHashParameters();
+      if (hashParams["error"]) {
+        // Authentication failed
+        handleAuthError(hashParams["error"], hashParams);
+      } else if (hashParams["code"]) {
+        // Get the stored state parameter and compare with incoming state
+        let expectedState = localStorage.getItem("state");
+        if (expectedState !== hashParams["state"]) {
+          // State does not match, report error
+          handleAuthError("StateDoesNotMatch", hashParams);
+        } else {
+          microsoftTeams.authentication.notifySuccess();
         }
-    </script>
+      } else {
+        // Unexpected condition: hash does not contain error or access_token parameter
+        handleAuthError("UnexpectedFailure", hashParams);
+      }
+    });
+
+    // Parse hash parameters into key-value pairs
+    function getHashParameters() {
+      let hashParams = {};
+      location.hash
+        .substr(1)
+        .split("&")
+        .forEach(function (item) {
+          let s = item.split("="),
+            k = s[0],
+            v = s[1] && decodeURIComponent(s[1]);
+          hashParams[k] = v;
+        });
+      return hashParams;
+    }
+    // Show error information
+    function handleAuthError(errorType, errorMessage) {
+      const err = JSON.stringify({
+        error: errorType,
+        message: JSON.stringify(errorMessage),
+      });
+      let para = document.createElement("p");
+      let node = document.createTextNode(err);
+      para.appendChild(node);
+      let element = document.getElementById("divError");
+      element.appendChild(para);
+    }
+  </script>
 </body>
+
 </html>

package/templates/plugins/resource/aad/auth/V3/Enable SSO.txt

@@ -1,13 +1,13 @@
 Enable Single Sign-on for Teams Applications
 -------------------------
 
-On click of Visual Studio menu Project -> Teams Toolkit -> Add Authentication Code, couple of files for Single Sign-on are generated in "TeamsFx-Auth" folder, including a manifest template file for Azure AD application and authentication redirect pages.  
+On click of Visual Studio menu Project -> Teams Toolkit -> Add Authentication Code, couple of files for Single Sign-on are generated in "TeamsFx-Auth" folder, including a manifest template file for Microsoft Entra application and authentication redirect pages.  
 
 Teams Toolkit helps you generate the authentication files, then you will need to link the files to your Teams application by updating authentication configurations to make sure the Single Sign-on works for your application. Please be noted that for different Teams application type like Tab or Bot, the detailed steps are slightly different.
 
 Basically you will need take care these configurations: 
 
-* In the Azure AD manifest file, you need to specify URIs such as the URI to identify the Azure AD authentication app and the redirect URI for returning token. 
+* In the Microsoft Entra manifest file, you need to specify URIs such as the URI to identify the Microsoft Entra authentication app and the redirect URI for returning token. 
 * In the Teams manifest file, add the SSO application to link it with Teams application. 
 * Add SSO application information in Teams Toolkit configuration files in order to make sure the authentication app can be registered on backend service and started by Teams Toolkit when you debugging or previewing Teams application.