@microsoft/teamsfx-core 1.22.1-alpha.d2fbcaf19.0 → 1.22.1-alpha.ecf7bf89a.0

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

@@ -3,27 +3,39 @@ version: 1.0.0
 {{#config.registerApp}}
 registerApp:
   {{#if aad}}
-  - uses: aadApp/create
+  - uses: aadApp/create # Creates a new AAD app to authenticate users if AAD_APP_CLIENT_ID environment variable is empty
     with:
-      name: $\{{CONFIG__MANIFEST__APPNAME__SHORT}}-aad
-      generateClientSecret: true
+      name: $\{{CONFIG__MANIFEST__APPNAME__SHORT}}-aad # Note: when you run configure/aadApp, the AAD app name will be updated based on the definition of manifest. If you don't want to change the name, ensure the name in AAD manifest is same with the name defined here.
+      generateClientSecret: true # If the value is false, the action will not generate client secret for you
+    # Output: following environment variable will be persisted in current environment's .env file.
+    # AAD_APP_CLIENT_ID: the client id of AAD app
+    # AAD_APP_CLIENT_SECRET: the client secret of AAD app
+    # AAD_APP_OBJECT_ID: the object id of AAD app
+    # AAD_APP_TENANT_ID: the tenant id of AAD app
+    # AAD_APP_OAUTH_AUTHORITY_HOST: the host of OAUTH authority of AAD app
+    # AAD_APP_OAUTH_AUTHORITY: the OAUTH authority of AAD app
 
   {{/if}}
   {{#if teamsApp}}
-  - uses: teamsApp/create
+  - uses: teamsApp/create # Creates a Teams app
     with:
-      name: $\{{CONFIG__MANIFEST__APPNAME__SHORT}}
+      name: $\{{CONFIG__MANIFEST__APPNAME__SHORT}} # Teams app name
+    # Output: following environment variable will be persisted in current environment's .env file.
+    # TEAMS_APP_ID: the id of Teams app
   {{/if}}
 
 {{/config.registerApp}}
 {{#config.provision}}
 provision:
   {{#bot}}
-  - uses: botAadApp/create
+  - uses: botAadApp/create # Creates a new AAD app for bot if BOT_ID environment variable is empty
     with:
       name: $\{{CONFIG__MANIFEST__APPNAME__SHORT}}-bot
+    # Output: following environment variable will be persisted in current environment's .env file.
+    # BOT_ID: the AAD app client id created for bot
+    # SECRET_BOT_PASSWORD: the AAD app client secret created for bot
 
-  - uses: botFramework/create
+  - uses: botFramework/create # Create or update the bot registration on dev.botframework.com
     with:
       botId: $\{{BOT_ID}}
       name: $\{{CONFIG__MANIFEST__APPNAME__SHORT}}-bot
@@ -40,7 +52,7 @@ provision:
 {{#config.configureApp}}
 configureApp:
   {{#tab}}
-  - uses: file/updateEnv
+  - uses: file/updateEnv # Generate env to .env file
     with:
       envs:
         {{../../placeholderMappings.tabDomain}}: {{domain}}
@@ -49,31 +61,37 @@ configureApp:
 
   {{/tab}}
   {{#if aad}}
-  - uses: aadApp/update
+  - 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.
     with:
-      manifestTemplatePath: ./aad.manifest.template.json
+      manifestPath: ./aad.manifest.json # Relative path to this file. Environment variables in manifest will be replaced before apply to AAD app
       outputFilePath : ./build/aad.manifest.$\{{TEAMSFX_ENV}}.json
+  # Output: following environment variable will be persisted in current environment's .env file.
+  # AAD_APP_ACCESS_AS_USER_PERMISSION_ID: the id of access_as_user permission which is used to enable SSO
 
   {{/if}}
   {{#teamsApp}}
   {{#if appPackagePath}}
-  - uses: teamsApp/update
+  - uses: teamsApp/update # # Apply the Teams app manifest to an existing Teams app. Will use the app id in manifest file to determine which Teams app to update.
     with:
-      appPackagePath: {{appPackagePath}}
+      appPackagePath: {{appPackagePath}} # Relative path to this file. This is the path for built zip file.
+    # Output: following environment variable will be persisted in current environment's .env file.
+    # TEAMS_APP_ID: the id of Teams app
   {{else}}
   - uses: teamsApp/validate
     with:
-      manifestPath: ./appPackage/manifest.template.json
+      manifestPath: ./appPackage/manifest.json # Path to manifest template
 
-  - uses: teamsApp/zipAppPackage
+  - uses: teamsApp/zipAppPackage # Build Teams app package with latest env value
     with:
-      manifestPath: ./appPackage/manifest.template.json
+      manifestPath: ./appPackage/manifest.json # Path to manifest template
       outputZipPath: ./build/appPackage/appPackage.$\{{TEAMSFX_ENV}}.zip
       outputJsonPath: ./build/appPackage/manifest.$\{{TEAMSFX_ENV}}.json
 
-  - uses: teamsApp/update
+  - uses: teamsApp/update # Apply the Teams app manifest to an existing Teams app. Will use the app id in manifest file to determine which Teams app to update.
     with:
-      appPackagePath: ./build/appPackage/appPackage.$\{{TEAMSFX_ENV}}.zip
+      appPackagePath: ./build/appPackage/appPackage.$\{{TEAMSFX_ENV}}.zip # Relative path to this file. This is the path for built zip file.
+    # Output: following environment variable will be persisted in current environment's .env file.
+    # TEAMS_APP_ID: the id of Teams app
   {{/if}}
   {{/teamsApp}}
 
@@ -81,7 +99,7 @@ configureApp:
 {{#config.deploy}}
 deploy:
   {{#tools}}
-  - uses: prerequisite/install 
+  - uses: prerequisite/install # Install dependencies
     with:
       {{#devCert}}
       devCert:
@@ -93,6 +111,11 @@ deploy:
       {{#dotnet}}
       dotnet: true
       {{/dotnet}}
+    {{#if devCert}}
+    # Output: following environment variable will be persisted in current environment's .env file.
+    # SSL_CRT_FILE: certificate file
+    # SSL_KEY_FILE: certificate key
+    {{/if}}
 
   {{/tools}}
   {{#dotnetCommand}}
@@ -106,7 +129,7 @@ deploy:
 
   {{/dotnetCommand}}
   {{#tab}}
-  - uses: file/updateEnv
+  - uses: file/updateEnv # Generate runtime environment variables
     with:
       target: ./tabs/.env.teamsfx.local
       envs:
@@ -118,7 +141,7 @@ deploy:
 
   {{/tab}}
   {{#if bot}}
-  - uses: file/updateEnv
+  - uses: file/updateEnv # Generate runtime environment variables
     with:
       target: ./bot/.env.teamsfx.local
       envs:
@@ -127,7 +150,7 @@ deploy:
 
   {{/if}}
   {{#ssoTab}}
-  - uses: file/updateEnv
+  - uses: file/updateEnv # Generate runtime environment variables
     with:
       target: ./tabs/.env.teamsfx.local
       envs:
@@ -140,7 +163,7 @@ deploy:
 
   {{/ssoTab}}
   {{#if ssoBot}}
-  - uses: file/updateEnv
+  - uses: file/updateEnv # Generate runtime environment variables
     with:
       target: ./bot/.env.teamsfx.local
       envs:
@@ -160,7 +183,7 @@ deploy:
 
   {{/if}}
   {{#if ssoFunction}}
-  - uses: file/updateEnv
+  - uses: file/updateEnv # Generate runtime environment variables
     with:
       target: ./api/.env.teamsfx.local
       envs:
@@ -172,7 +195,7 @@ deploy:
 
   {{/if}}
   {{#npmCommands}}
-  - uses: cli/runNpmCommand
+  - uses: cli/runNpmCommand # Run npm command
     with:
       args: {{args}}
       {{#if workingDirectory}}
@@ -180,4 +203,77 @@ deploy:
       {{/if}}
 
   {{/npmCommands}}
+  {{#frontendStart}}
+  - uses: file/updateEnv # Generate runtime environment variables
+    with:
+      target: ./tabs/.localSettings
+      envs:
+        BROWSER: none
+        HTTPS: true
+        PORT: 53000
+        SSL_CRT_FILE: $\{{SSL_CRT_FILE}}
+        SSL_KEY_FILE: $\{{SSL_KEY_FILE}}
+        {{#if sso}}
+        REACT_APP_CLIENT_ID: $\{{AAD_APP_CLIENT_ID}}
+        REACT_APP_START_LOGIN_PAGE_URL: $\{{ {{~../../placeholderMappings.tabEndpoint~}} }}/auth-start.html
+        REACT_APP_TEAMSFX_ENDPOINT: http://localhost:55000
+        {{/if}}
+        {{#if functionName}}
+        REACT_APP_FUNC_ENDPOINT: http://localhost:7071
+        REACT_APP_FUNC_NAME: {{functionName}}
+        {{/if}}
+
+  {{/frontendStart}}
+  {{#authStart}}
+  - uses: file/updateJson # Generate runtime environment variables
+    with:
+      target: {{appsettingsPath}}
+      appsettings:
+        CLIENT_ID: $\{{AAD_APP_CLIENT_ID}}
+        CLIENT_SECRET: $\{{SECRET_AAD_APP_CLIENT_SECRET}}
+        IDENTIFIER_URI: api://$\{{ {{~../../placeholderMappings.tabDomain~}} }}/$\{{AAD_APP_CLIENT_ID}}
+        AAD_METADATA_ADDRESS: $\{{AAD_APP_OAUTH_AUTHORITY}}/v2.0/.well-known/openid-configuration
+        OAUTH_AUTHORITY: $\{{AAD_APP_OAUTH_AUTHORITY}}
+        TAB_APP_ENDPOINT: $\{{ {{~../../placeholderMappings.tabEndpoint~}} }}
+        ALLOWED_APP_IDS: 1fec8e78-bce4-4aaf-ab1b-5451cc387264;5e3ce6c0-2b1f-4285-8d4b-75ee78787346;0ec893e0-5785-4de6-99da-4ed124e5296c;4345a7b9-9a63-4910-a426-35363201d503;4765445b-32c6-49b0-83e6-1d93765276ca;d3590ed6-52b3-4102-aeff-aad2292ab01c;00000002-0000-0ff1-ce00-000000000000;bc59ab01-8403-45c6-8796-ac3ef710b3e3
+        URLS: http://localhost:55000
+
+  {{/authStart}}
+  {{#botStart}}
+  - uses: file/updateEnv # Generate runtime environment variables
+    with:
+      target: ./bot/.localSettings
+      envs:
+        BOT_ID: $\{{BOT_ID}}
+        BOT_PASSWORD: $\{{SECRET_BOT_PASSWORD}}
+        {{#if sso}}
+        M365_CLIENT_ID: $\{{AAD_APP_CLIENT_ID}}
+        M365_CLIENT_SECRET: $\{{SECRET_AAD_APP_CLIENT_SECRET}}
+        M365_TENANT_ID: $\{{AAD_APP_TENANT_ID}}
+        M365_AUTHORITY_HOST: $\{{AAD_APP_OAUTH_AUTHORITY_HOST}}
+        INITIATE_LOGIN_ENDPOINT: $\{{ {{~../../placeholderMappings.botEndpoint~}} }}/auth-start.html
+        {{#if tab}}
+        M365_APPLICATION_ID_URI: api://$\{{ {{~../../placeholderMappings.tabDomain~}} }}/botid-$\{{BOT_ID}}
+        {{else}}
+        M365_APPLICATION_ID_URI: api://botid-$\{{BOT_ID}}
+        {{/if}}
+        {{/if}}
+        {{#if function}}
+        API_ENDPOINT: http://localhost:7071
+        {{/if}}
+
+  {{/botStart}}
+  {{#if backendStart}}
+  - uses: file/updateEnv # Generate runtime environment variables
+    with:
+      target: ./api/.localSettings
+      envs:
+        FUNCTIONS_WORKER_RUNTIME: node
+        M365_CLIENT_ID: $\{{AAD_APP_CLIENT_ID}}
+        M365_CLIENT_SECRET: $\{{SECRET_AAD_APP_CLIENT_SECRET}}
+        M365_TENANT_ID: $\{{AAD_APP_TENANT_ID}}
+        M365_AUTHORITY_HOST: $\{{AAD_APP_OAUTH_AUTHORITY_HOST}}
+        ALLOWED_APP_IDS: 1fec8e78-bce4-4aaf-ab1b-5451cc387264;5e3ce6c0-2b1f-4285-8d4b-75ee78787346;0ec893e0-5785-4de6-99da-4ed124e5296c;4345a7b9-9a63-4910-a426-35363201d503;4765445b-32c6-49b0-83e6-1d93765276ca;d3590ed6-52b3-4102-aeff-aad2292ab01c;00000002-0000-0ff1-ce00-000000000000;bc59ab01-8403-45c6-8796-ac3ef710b3e3
+
+  {{/if}}
 {{/config.deploy}}

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

@@ -1,5 +1,9 @@
 version: 1.0.0
 
+projectId: {{projectId}}
+
+environmentFolderPath: ./ {{~environmentFolder}}
+
 provision:
 {{#if activePlugins.fx-resource-bot}}
   - uses: botAadApp/create # Creates a new AAD app for Bot Registration.
@@ -18,7 +22,7 @@ provision:
          parameters: ./templates/azure/azure.parameters.$\{{TEAMSFX_ENV}}.json # Relative path to this file. Placeholders will be replaced with corresponding environment variable before ARM deployment.
          deploymentName: teams_toolkit_deployment # Required when deploy ARM template
       bicepCliVersion: v0.4.613 # Teams Toolkit will download this bicep CLI version from github for you, will use bicep CLI in PATH if you remove this config.
-    # Output: every bicep output will be persisted in current environment's .env file with certain naming conversion. Refer https://aka.ms/teamsfx-provision-arm#output for more details on the naming conversion rule.
+    # Output: every bicep output will be persisted in current environment's .env file with certain naming conversion. Refer https://aka.ms/teamsfx-actions/arm-deploy for more details on the naming conversion rule.
 {{#if activePlugins.fx-resource-frontend-hosting}}
   - uses: azureStorage/enableStaticWebsite
     with:
@@ -158,17 +162,17 @@ configureApp:
 {{#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.
     with:
-      manifestTemplatePath: ./aad.manifest.template.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 AAD app
       outputFilePath : ./build/aad.manifest.$\{{TEAMSFX_ENV}}.json
   # Output: following environment variable will be persisted in current environment's .env file.
   # AAD_APP_ACCESS_AS_USER_PERMISSION_ID: the id of access_as_user permission which is used to enable SSO
 {{/if}}
   - uses: teamsApp/validate
     with:
-      manifestPath: ./appPackage/manifest.template.json # Path to manifest template
+      manifestPath: ./appPackage/manifest.json # Path to manifest template
   - uses: teamsApp/zipAppPackage # Build Teams app package with latest env value
     with:
-      manifestPath: ./appPackage/manifest.template.json # Path to manifest template
+      manifestPath: ./appPackage/manifest.json # Path to manifest template
       outputZipPath: ./build/appPackage/appPackage.$\{{TEAMSFX_ENV}}.zip
       outputJsonPath: ./build/appPackage/manifest.$\{{TEAMSFX_ENV}}.json
   - uses: teamsApp/update # Apply the Teams app manifest to an existing Teams app. Will use the app id in manifest file to determine which Teams app to update.
@@ -180,10 +184,10 @@ configureApp:
 publish:
   - uses: teamsApp/validate
     with:
-      manifestPath: ./appPackage/manifest.template.json # Path to manifest template
+      manifestPath: ./appPackage/manifest.json # Path to manifest template
   - uses: teamsApp/zipAppPackage
     with:
-      manifestPath: ./appPackage/manifest.template.json # Path to manifest template
+      manifestPath: ./appPackage/manifest.json # Path to manifest template
       outputZipPath: ./build/appPackage/appPackage.$\{{TEAMSFX_ENV}}.zip
       outputJsonPath: ./build/appPackage/manifest.$\{{TEAMSFX_ENV}}.json
   - uses: teamsApp/publishAppPackage # Publish the app to Teams app catalog

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

@@ -1,5 +1,7 @@
 version: 1.0.0
 
+environmentFolderPath: ./ {{~environmentFolder}}
+
 deploy:
   - uses: cli/runNpmCommand
     with:
@@ -28,25 +30,25 @@ registerApp:
 configureApp:
   - uses: teamsApp/validate
     with:
-      manifestPath: ./appPackage/manifest.template.json # Path to manifest template
+      manifestPath: ./appPackage/manifest.json # Path to manifest template
   - uses: teamsApp/zipAppPackage # Build Teams app package with latest env value
     with:
-      manifestPath: ./appPackage/manifest.template.json # Path to manifest template
+      manifestPath: ./appPackage/manifest.json # Path to manifest template
       outputZipPath: ./build/appPackage/appPackage.$\{{TEAMSFX_ENV}}.zip
       outputJsonPath: ./build/appPackage/manifest.$\{{TEAMSFX_ENV}}.json
   - uses: teamsApp/update # Apply the Teams app manifest to an existing Teams app. Will use the app id in manifest file to determine which Teams app to update.
     with:
-      appPackagePath: ./build/appPackage/appPackage.$\{{TEAMSFX_ENV}}.zip # Relative path to teamsfx folder. This is the path for built zip file.
+      appPackagePath: ./build/appPackage/appPackage.$\{{TEAMSFX_ENV}}.zip # Relative path to this file. This is the path for built zip file.
     # Output: following environment variable will be persisted in current environment's .env file.
     # TEAMS_APP_ID: the id of Teams app
 
 publish:
   - uses: teamsApp/validate
     with:
-      manifestPath: ./appPackage/manifest.template.json # Path to manifest template
+      manifestPath: ./appPackage/manifest.json # Path to manifest template
   - uses: teamsApp/zipAppPackage
     with:
-      manifestPath: ./appPackage/manifest.template.json # Path to manifest template
+      manifestPath: ./appPackage/manifest.json # Path to manifest template
       outputZipPath: ./build/appPackage/appPackage.$\{{TEAMSFX_ENV}}.zip
       outputJsonPath: ./build/appPackage/manifest.$\{{TEAMSFX_ENV}}.json
   - uses: teamsApp/copyAppPackageForSPFx

package/templates/core/v3Migration/upgradeReport.md

@@ -0,0 +1,36 @@
+# Upgrade Summary
+
+Congratulations! Your project has been upgraded to work with latest Teams Toolkit. You can visit https://aka.ms/teamsfx-v5.0-guide to learn new features in Teams Toolkit. And visit https://aka.ms/teams-toolkit-5.0-upgrade to learn more about the upgrade.
+
+## Changes to your project
+
+1. Created `teamsapp.yml` and `teamsapp.local.yml` in your project root folder.
+2. Moved environment files in `.fx` to `.env.{env}` in `env` folder.
+3. Moved `templates/appPackage` to `appPackage` and updated placeholders in it per latest tooling's requirement, and rename `manifest.template.json` to `manifest.json`.
+4. Moved `templates/appPackage/aad.template.json` to `aad.manifest.json` and updated placeholders in it per latest tooling's requirement.
+5. Updated `.vscode/tasks.json` and `.vscode/launch.json`.
+6. Updated `.gitignore` to ignore new environment files.
+7. Removed `.fx` folder.
+
+For more detailed changes, please refer to this [wiki](https://aka.ms/teams-toolkit-5.0-upgrade#file-changes).
+
+## Important changes to your development flow
+
+1. All the environment files will be gitignored by default, you need to sync their content manually. [Learn More](https://aka.ms/teams-toolkit-5.0-upgrade#environment-management)
+2. You need to take some manual steps when creating new environments for your old project. [Learn More](https://aka.ms/teams-toolkit-5.0-upgrade#environment-management)
+3. You need to manually update `.vscode/launch.json` when launch your app for a certain environment. [Learn More](https://aka.ms/teams-toolkit-5.0-upgrade#launch-your-app)
+4. You need to provide values to `APIM__PUBLISHEREMAIL` and `APIM__PUBLISHERNAME` environment variable if your current project uses APIM. [Learn More](https://aka.ms/teams-toolkit-5.0-upgrade#provision-apim-service)
+
+You can visit this [wiki](https://aka.ms/teams-toolkit-5.0-upgrade#feature-changes-that-impact-your-development-flow) to learn more  changes to Teams Toolkit.
+
+## Known issues
+
+1. If your project only contains a bot, you may meet error that complains `STATE__FX_RESOURCE_FRONTEND_HOSTING__ENDPOINT` is missing when executing commands. Replace this placeholder with a valid URL in `appPackage/manifest.template.json` to fix it. [Learn More](https://aka.ms/teams-toolkit-5.0-upgrade#state__fx_resource_frontend_hosting__endpoint-missing-error-in-some-projects)
+
+## Restore your project configuration
+
+If you want to restore your project configuration after the upgrade is successful and continue to use old version Teams Toolkit, you can follow these steps:
+1. Copy everything in `.backup` folder to your project root folder
+2. Delete the new files mentioned in [Changes to your project](#changes-to-your-project) section
+
+You can learn more details in this [wiki](https://aka.ms/teams-toolkit-5.0-upgrade#restore-your-project-configuration).

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

@@ -63,7 +63,7 @@ To make this work in your application:
 
 1. Move `profileSsoCommandHandler` file under `auth/bot/sso` folder to `bot/src`. ProfileSsoCommandHandler class is a sso command handler to get user info with SSO token. You can follow this method and create your own sso command handler.
 
-1. Open `package.json` file, make sure that teamfx SDK version >= 1.2.0
+1. Open `package.json` file, make sure that teamsfx SDK version >= 2.2.0
 1. Execute the following commands under `bot` folder: `npm install isomorphic-fetch --save`
 1. (For ts only) Execute the following commands under `bot` folder: `npm install copyfiles --save-dev` and replace following line in package.json:
 
@@ -318,7 +318,7 @@ After successfully add SSO in your project, you can also add a new sso command.
 <h2 id='3'>Update your business logic for Message Extension</h2>
 
 The sample business logic provides a handler `TeamsBot` extends TeamsActivityHandler and override `handleTeamsMessagingExtensionQuery`. 
-You can update the query logic in the `handleMessageExtensionQueryWithToken` with token which is obtained by using the logged-in Teams user token.
+You can update the query logic in the `handleMessageExtensionQueryWithSSO` with token which is obtained by using the logged-in Teams user token.
 
 To make this work in your application:
 1. Move the `auth/bot/public` folder to `bot`. This folder contains HTML pages that the bot application hosts. When single sign-on flows are initiated with AAD, AAD will redirect the user to these pages.
@@ -329,7 +329,7 @@ To make this work in your application:
 
     // Listen for incoming requests.
     server.post("/api/messages", async (req, res) => {
-      await adapter.processActivity(req, res, async (context) => {
+      await adapter.process(req, res, async (context) => {
         await bot.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.
@@ -346,8 +346,8 @@ To make this work in your application:
       })
     );
     ```
-1. Override `handleTeamsMessagingExtensionQuery` interface under `bot/teamsBot`. You can follow the sample code in the `handleMessageExtensionQueryWithToken` to do your own query logic.
-1. Open `bot/package.json`, ensure that `@microsoft/teamsfx` version >= 1.2.0
+1. Override `handleTeamsMessagingExtensionQuery` interface under `bot/teamsBot`. You can follow the sample code in the `handleMessageExtensionQueryWithSSO` to do your own query logic.
+1. Open `bot/package.json`, ensure that `@microsoft/teamsfx` version >= 2.2.0
 1. Install `isomorphic-fetch` npm packages in your bot project.
 1. (For ts only) Install `copyfiles` npm packages in your bot project, add or update the `build` script in `bot/package.json` as following
 
@@ -356,7 +356,7 @@ To make this work in your application:
     ```
     By doing this, the HTML pages used for auth redirect will be copied when building this bot project.
 
-1. Update `templates/appPackage/aad.template.json` your scopes which used in `handleMessageExtensionQueryWithToken`.
+1. Update `templates/appPackage/aad.template.json` your scopes which used in `handleMessageExtensionQueryWithSSO`.
     ```json
     "requiredResourceAccess": [
         {

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

@@ -20,7 +20,7 @@ Actions required - update your code to add SSO authentication
 Note: This part is for `command and response bot`.
 
 1. Please upgrade your SDK and make sure your SDK version:
-   TeamsFx: >= 1.1.0
+   TeamsFx: >= 2.2.0
    Microsoft.Bot.Builder >= 4.17.1
 
 2. Create "Pages" folder and move files in `Auth/bot/Pages` folder to `Pages`
@@ -62,12 +62,45 @@ Note: This part is for `command and response bot`.
             botAuthOption.InitiateLoginEndpoint = authOptionsValue.Bot.InitiateLoginEndpoint;
         }).ValidateDataAnnotations();
         '''
-    4.2 Find and delete the following code:
+    4.2 Find the following lines:
+        '''
+        builder.Services.AddSingleton<HelloWorldCommandHandler>();
+        builder.Services.AddSingleton(sp =>
+        {
+          var options = new ConversationOptions()
+          {
+            Adapter = sp.GetService<CloudAdapter>(),
+            Command = new CommandOptions()
+            {
+              Commands = new List<ITeamsCommandHandler> { sp.GetService<HelloWorldCommandHandler>() }
+            }
+          };
+
+          return new ConversationBot(options);
+        });
+        '''
+        and replace with:
+        '''
+        builder.Services.AddSingleton(sp =>
+        {
+          var options = new ConversationOptions()
+          {
+            Adapter = sp.GetService<CloudAdapter>(),
+            Command = new CommandOptions()
+            {
+              Commands = new List<ITeamsCommandHandler> { }
+            }
+          };
+
+          return new ConversationBot(options);
+        });
+        '''
+    4.3 Find and delete the following code:
         '''
         // Create the bot as a transient. In this case the ASP Controller is expecting an IBot.
         builder.Services.AddTransient<IBot, TeamsBot>();
         '''
-    4.3 Find the following code:
+    4.4 Find the following code:
         '''
         app.UseEndpoints(endpoints =>
         {

package/templates/plugins/resource/apim/README.md

@@ -4,7 +4,7 @@ Azure API Management (APIM) is used to create consistent and modern API gateways
 
 ## Prerequisite
 
-- [Node.js](https://nodejs.org/en/)
+- [Node.js](https://nodejs.org/en/), supported versions: 14, 16, 18 (preview)
 - An Microsoft 365 account. If you do not have an Microsoft 365 account, apply for one from [Microsoft 365 developer program](https://developer.microsoft.com/en-us/microsoft-365/dev-program)
 - An Azure account with an active subscription. [Create an account for free](https://azure.microsoft.com/en-us/free/)
   - Ensure the resource provider 'Microsoft.ApiManagement' is registered for the subscription by following [document](https://docs.microsoft.com/en-us/azure/azure-resource-manager/templates/error-register-resource-provider#solution-3---azure-portal)

package/templates/plugins/resource/bot/bicep/botProvision.template.bicep

@@ -70,7 +70,7 @@ resource webApp 'Microsoft.Web/sites@2021-02-01' = {
         }
         {
           name: 'WEBSITE_NODE_DEFAULT_VERSION'
-          value: '~16' // Set NodeJS version to 16.x for your site
+          value: '~18' // Set NodeJS version to 18.x for your site
         }
         {
           name: 'RUNNING_ON_AZURE'

package/templates/plugins/resource/hosting/bicep/webapp/webappProvision.template.bicep

@@ -33,7 +33,7 @@ resource webApp 'Microsoft.Web/sites@2021-02-01' = {
         {{#if (contains "node" configs)}}
         {
           name: 'WEBSITE_NODE_DEFAULT_VERSION'
-          value: '~16' // Set NodeJS version to 16.x for your site
+          value: '~18' // Set NodeJS version to 18.x for your site
         }
         {
           name: 'SCM_SCRIPT_GENERATOR_ARGS'

package/templates/plugins/resource/spfx/solution/README.md

@@ -15,7 +15,7 @@ The SharePoint Framework (SPFx) is a page and web part model that provides full
 
 ## Prerequisites
 
-> - Node.js v16
+> - [Node.js](https://nodejs.org/en/), supported versions: 16
 > - An Microsoft 365 account. Get your own free Microsoft 365 tenant from [Microsoft 365 developer program](https://developer.microsoft.com/en-us/microsoft-365/dev-program)
 
 ## Solution

package/build/component/driver/deploy/azure/azureDeployDriver.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"azureDeployDriver.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/deploy/azure/azureDeployDriver.ts"],"names":[],"mappings":";AAGA,OAAO,EACL,cAAc,EACd,iBAAiB,EAEjB,UAAU,EAEV,YAAY,EACb,MAAM,oCAAoC,CAAC;AAG5C,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,OAAO,KAAK,UAAU,MAAM,uBAAuB,CAAC;AASpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAMlD,8BAAsB,iBAAkB,SAAQ,gBAAgB;IAC9D,SAAS,CAAC,gBAAgB,EAAE,UAAU,CAAC,uBAAuB,GAAG,SAAS,CAAC;IAE3E,gBAAuB,cAAc,gCAAkB;IAEvD;;OAEG;IACH,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAEnB,MAAM,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAwB7C;;;;;OAKG;IACH,QAAQ,CAAC,WAAW,CAClB,IAAI,EAAE,cAAc,EACpB,aAAa,EAAE,iBAAiB,EAChC,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC,IAAI,CAAC;IAEhB;;;;OAIG;IACH,SAAS,CAAC,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,iBAAiB;IAIhE;;;;;;;OAOG;IACU,SAAS,CACpB,IAAI,EAAE,cAAc,EACpB,aAAa,EAAE,iBAAiB,EAChC,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC,MAAM,CAAC;IA6ClB;;;;;;;OAOG;cACa,gBAAgB,CAC9B,iBAAiB,EAAE,MAAM,EACzB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,iBAAiB,EACzB,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,MAAM,CAAC;IA8DlB;;;;;;;OAOG;cACa,iBAAiB,CAC/B,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,iBAAiB,EACzB,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC;IAuCpC;;;;OAIG;IACH,SAAS,CAAC,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM;IAIxD;;;;;OAKG;cACa,uBAAuB,CACrC,aAAa,EAAE,iBAAiB,EAChC,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC,iBAAiB,CAAC;cAiCb,kBAAkB,CAAC,aAAa,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;CAWpF"}