build: merge main back to dev

.github/ISSUE_TEMPLATE/new-sample-onboard-request.md

@@ -22,7 +22,7 @@ One or two sentences to introduce this sample.
 **Tags:**
 You can give your samples a set of tags so that users can easily locate your sample from a group of samples. Those tags can be:
 - the programming languages you used, e.g. "JS", "TS", "C#" etc.
-- the Teams app type, e.g. "Tab", "Bot", "Message Extension" etc.
+- the app type, e.g. "Tab", "Bot", "Message Extension" etc.
 - the highlighted technics you used, e.g. "React", "Azure Function", "Graph Toolkit", "Teams AI SDK", "Live Share SDK" etc.
 - the business scenarios of your sample, e.g. "Team Dashboard", "Productivity", "Notification", "Q&A" etc.
 You can customize the tag you used for your sample, the recommended number of tags is less than 5.
@@ -49,8 +49,8 @@ The link to pull request that contains sample source codes.
 The URL if your sample code resides in another sample repo. It's better to use a tag instead of a branch for stablility.
 E.g., "https://github.com/xxx/xxx/tree/v1.0/xxx".
 
-**(Optional) Minimum Teams Toolkit Version:**
-Teams Toolkit version requirement to run the sample - minimum version
+**(Optional) Minimum Microsoft 365 Agents Toolkit Version:**
+Microsoft 365 Agents Toolkit version requirement to run the sample - minimum version
 
-**(Optional) Maximum Teams Toolkit Version:**
-Teams Toolkit version requirement to run the sample - maximum version
+**(Optional) Maximum Microsoft 365 Agents Toolkit Version:**
+Microsoft 365 Agents Toolkit version requirement to run the sample - maximum version

.github/policies/resourceManagement.yml

@@ -229,7 +229,7 @@ configuration:
           primary: True
           secondary: False
       - addReply:
-          reply: Sorry for the inconvenience! Based on the info provided, the issue is caused by the API failure from Teams Developer Portal. We will inform you once we get any updates.
+          reply: Sorry for the inconvenience! Based on the info provided, the issue is caused by the API failure from Developer Portal. We will inform you once we get any updates.
       description: 
     - if:
       - payloadType: Issues

CONTRIBUTING.md

@@ -18,7 +18,7 @@ To give you an overview of the process to contribute to our samples repo, you wi
 > The purple blocks are things you will need to do.
 > The green blocks are what we will take care of.
 
-Before your start, you might want to know whether you will need to commit your source code to our repo. In most of cases, your Teams sample source code will need to be commited to our repo, especially when you are an individual contributor. In some special cases if you are our partner team who maintains Teams samples repo as well, your source code can reside in your own open source repo. We will refer to your repo and expose your sample to Teams Toolkit sample gallery.
+Before your start, you might want to know whether you will need to commit your source code to our repo. In most of cases, your Teams sample source code will need to be commited to our repo, especially when you are an individual contributor. In some special cases if you are our partner team who maintains Teams samples repo as well, your source code can reside in your own open source repo. We will refer to your repo and expose your sample to Microsoft 365 Agents Toolkit sample gallery.
 
 Some explaination of how to perform each step in above process:
 1. Submit your source code by creating a pull request to our repo (target `dev` branch by default), a typical project is in below structure. Make sure you have the `thumbnail.png` and `README.md` files included in your source code. 
@@ -37,8 +37,8 @@ Some explaination of how to perform each step in above process:
       - thumbnail.png
       - sampleDemo.gif
   - README.md
-  - teamsapp.yml 
-  - teamsapp.local.yml
+  - m365agents.yml 
+  - m365agents.local.yml
 ```
 The thumbnail.png is a static screenshot of the sample illustrating what users will see after the app is running. The sampleDemo.gif is a dynamic and very short gif demonstrating major usage of the sample.
 > Suggested size of pic/gif is *1600x920/800x460* (If you have it with other sizes, please keep same image ratio for other sizes and don't forget to consider the resolution. Your gif or pics must fit the entire Teams client UI into the image.
@@ -51,9 +51,9 @@ The README.md file basically describe what's the sample, how to run it and so on
 
 ## Responsibility statement for contributors
 
- The sample contributors are responsible for maintaining and updating the samples so that ensure the smooth experience in Teams Toolkit. 
+ The sample contributors are responsible for maintaining and updating the samples so that ensure the smooth experience in Microsoft 365 Agents Toolkit. 
 
-- Upgrade the sample to new version when there's breaking change in new Teams Toolkit releases.
+- Upgrade the sample to new version when there's breaking change in new Microsoft 365 Agents Toolkit releases.
 - Fix bugs that are related to sample business logic.
 
 If the sample cannot pass our test or required to be upgraded, an email will be sent to sample contributor as maintainance notification. In case the sample is losing maintainance, there is a chance that we will remove the sample from our sample gallery.

NPM-search-connector-M365/.vscode/tasks.json

@@ -1,5 +1,5 @@
-// This file is automatically generated by Teams Toolkit.
-// The teamsfx tasks defined in this file require Teams Toolkit version >= 5.0.0.
+// This file is automatically generated by Microsoft 365 Agents Toolkit.
+// The teamsfx tasks defined in this file require Microsoft 365 Agents Toolkit version >= 5.0.0.
 // See https://aka.ms/teamsfx-tasks for details on how to customize each task.
 {
     "version": "2.0.0",

NPM-search-connector-M365/.webappignore

@@ -14,8 +14,8 @@ local.settings.json
 test
 tsconfig.json
 .DS_Store
-teamsapp.yml
-teamsapp.*.yml
+m365agents.yml
+m365agents.*.yml
 /env/
 /node_modules/.bin
 /node_modules/ts-node

NPM-search-connector-M365/README.md

@@ -18,25 +18,25 @@ NPM Search Connector is a Message Extension that allows you to perform a quick s
 
 ## This sample illustrates
 - How to build message extension bot on Azure for your app.
-- How to use Teams Toolkit to build a message extension app that runs across Microsoft 365 including Teams and Outlook (Web)
+- How to use Microsoft 365 Agents Toolkit to build a message extension app that runs across Microsoft 365 including Teams and Outlook (Web)
 
 ## Prerequisite to use this sample
 - [Node.js](https://nodejs.org/), supported versions: 18, 20, 22
 - An [Azure subscription](https://azure.microsoft.com/en-us/free/)
 - [Set up your dev environment for extending Teams apps across Microsoft 365](https://aka.ms/teamsfx-m365-apps-prerequisites)
-- [Teams Toolkit Visual Studio Code Extension](https://aka.ms/teams-toolkit) version 5.0.0 and higher or [Teams Toolkit CLI](https://aka.ms/teams-toolkit-cli)
+- [Microsoft 365 Agents Toolkit Visual Studio Code Extension](https://aka.ms/teams-toolkit) version 5.0.0 and higher or [Microsoft 365 Agents Toolkit CLI](https://aka.ms/teams-toolkit-cli)
 
 ## Minimal path to awesome
-> Here are the instructions to run the sample in **Visual Studio Code**. You can also try to run the app using Teams Toolkit CLI tool, refer to [Try the Sample with Teams Toolkit CLI](cli.md)
+> Here are the instructions to run the sample in **Visual Studio Code**. You can also try to run the app using Microsoft 365 Agents Toolkit CLI tool, refer to [Try the Sample with Microsoft 365 Agents Toolkit CLI](cli.md)
 
 ### Run the app locally
 1. Clone the repo to your local workspace or directly download the source code.
 1. Open the project in Visual Studio Code.
 1. Open the `Run and Debug` Activity Panel. Select a target Microsoft application where the app runs: `Debug in Teams` or `Debug in Outlook`.
 
 ### Deploy the app to Azure
-1. Open the command palette and select `Teams: Provision`.
-1. Once provision is completed, open the command palette and select `Teams: Deploy`.
+1. Open the command palette and select `Microsoft 365 Agents: Provision`.
+1. Once provision is completed, open the command palette and select `Microsoft 365 Agents: Deploy`.
 
 ### Preview the app
 1. Once deployment is completed, you can preview the app running in Azure. In Visual Studio Code, open the `Run and Debug` Activity Panel. Select a target Microsoft application where the app runs: `Launch Remote in Teams` or `Launch Remote in Outlook`.

NPM-search-connector-M365/assets/sample.json

@@ -12,7 +12,7 @@
     "updateDateTime": "2023-10-16",
     "products": [
       "Teams",
-      "TeamsToolkit"
+      "Microsoft 365 Agents Toolkit"
     ],
     "metadata": [
       {

NPM-search-connector-M365/cli.md

@@ -1,11 +1,11 @@
 ## Minimal path to awesome
-1. Install Teams Toolkit CLI using the npm package manager:
+1. Install Microsoft 365 Agents Toolkit CLI using the npm package manager:
     ```
-    npm install -g @microsoft/teamsapp-cli
+    npm install -g @microsoft/m365agentstoolkit-cli
     ```
 1. Create npm-search-connector-m365 project.
     ```
-    teamsapp new sample npm-search-connector-m365 --interactive false
+    atk new sample npm-search-connector-m365 --interactive false
     ```
 1. For local env, start your local tunnel service.
     1. Install [dev tunnel cli](https://aka.ms/teamsfx-install-dev-tunnel).
@@ -18,10 +18,10 @@
        ```
 1. Provision.
     ```
-    teamsapp provision --env <env>
+    atk provision --env <env>
     ```
 1. Deploy.
     ```
-    teamsapp deploy --env <env>
+    atk deploy --env <env>
     ```
-1. Execute `teamsapp preview --env <env> --m365-host <m365-host>` in your project directory to launch your application, where `m365-host` is `teams` or `outlook`.
+1. Execute `atk preview --env <env> --m365-host <m365-host>` in your project directory to launch your application, where `m365-host` is `teams` or `outlook`.

NPM-search-connector-M365/teamsapp.local.yml → NPM-search-connector-M365/m365agents.local.yml

@@ -57,7 +57,7 @@ provision:
       appPackagePath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip
 
   # Apply the Teams app manifest to an existing Teams app in
-  # Teams Developer Portal.
+  # Developer Portal.
   # Will use the app id in manifest file to determine which Teams app to update.
   - uses: teamsApp/update
     with:

NPM-search-connector-M365/teamsapp.yml → NPM-search-connector-M365/m365agents.yml

@@ -25,7 +25,7 @@ provision:
         - path: ./infra/azure.bicep
           parameters: ./infra/azure.parameters.json
           deploymentName: Create-resources-for-bot
-      bicepCliVersion: v0.9.1 # Teams Toolkit will download this bicep CLI version from github for you, will use bicep CLI in PATH if you remove this config.
+      bicepCliVersion: v0.9.1 # Microsoft 365 Agents Toolkit will download this bicep CLI version from github for you, will use bicep CLI in PATH if you remove this config.
 
   # Validate using manifest schema
   - uses: teamsApp/validateManifest
@@ -47,7 +47,7 @@ provision:
       appPackagePath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip
 
   # Apply the Teams app manifest to an existing Teams app in
-  # Teams Developer Portal.
+  # Developer Portal.
   # Will use the app id in manifest file to determine which Teams app to update.
   - uses: teamsApp/update
     with:
@@ -102,7 +102,7 @@ publish:
       appPackagePath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip
 
   # Apply the Teams app manifest to an existing Teams app in
-  # Teams Developer Portal.
+  # Developer Portal.
   # Will use the app id in manifest file to determine which Teams app to update.
   - uses: teamsApp/update
     with:

NPM-search-message-extension-codespaces/.vscode/tasks.json

@@ -1,5 +1,5 @@
-// This file is automatically generated by Teams Toolkit.
-// The teamsfx tasks defined in this file require Teams Toolkit version >= 5.0.0.
+// This file is automatically generated by Microsoft 365 Agents Toolkit.
+// The teamsfx tasks defined in this file require Microsoft 365 Agents Toolkit version >= 5.0.0.
 // See https://aka.ms/teamsfx-tasks for details on how to customize each task.
 {
     "version": "2.0.0",

NPM-search-message-extension-codespaces/.webappignore

@@ -14,8 +14,8 @@ local.settings.json
 test
 tsconfig.json
 .DS_Store
-teamsapp.yml
-teamsapp.*.yml
+m365agents.yml
+m365agents.*.yml
 /env/
 /node_modules/.bin
 /node_modules/ts-node

NPM-search-message-extension-codespaces/README.md

@@ -7,7 +7,7 @@ Search based message extensions allow you to query your service and post that in
 ![npm-search-msgext](https://user-images.githubusercontent.com/10163840/229014306-bfed97bf-dc99-4be1-8523-2c09eed70cc1.gif)
 
 ## This sample illustrates
-- How to use Teams Toolkit build a search based message extension.
+- How to use Microsoft 365 Agents Toolkit build a search based message extension.
 - How to use [Codespaces](https://github.com/features/codespaces) to run and preview a message extension.
 
 ## Prerequisite to use this sample
@@ -21,7 +21,7 @@ Search based message extensions allow you to query your service and post that in
 
     > Note: you can customize the creation options (e.g. region, machine type) according to your needs.
 
-1. Once your codespace is created, Select the Teams Toolkit icon on the left in the VS Code toolbar. And then select `Preview your Teams app (F5)` from Teams Toolkit or simply press `F5` to run and preview your application.
+1. Once your codespace is created, Select the Microsoft 365 Agents Toolkit icon on the left in the VS Code toolbar. And then select `Preview your Teams app (F5)` from Microsoft 365 Agents Toolkit or simply press `F5` to run and preview your application.
 
 1. When Teams Web Client is launched in the browser, select the `Add` button in the dialog to install your app to Teams.
 
@@ -32,18 +32,18 @@ Search based message extensions allow you to query your service and post that in
 ### Deploy the app to Azure
 - From VS Code: 
     1. Sign into Azure by clicking the `Sign in to Azure` under the `ACCOUNTS` section from sidebar.
-    1. Click `Provision` from `LIFECYCLE` section or open the command palette and select: `Teams: Provision`.
-    1. Click `Deploy` or open the command palette and select: `Teams: Deploy`.
-- From Teams Toolkit CLI:
-    1. Run command: `teamsapp auth login azure`.
-    1. Run command: `teamsapp provision --env dev`.
-    1. Run command: `teamsapp deploy --env dev`.
+    1. Click `Provision` from `LIFECYCLE` section or open the command palette and select: `Microsoft 365 Agents: Provision`.
+    1. Click `Deploy` or open the command palette and select: `Microsoft 365 Agents: Deploy`.
+- From Microsoft 365 Agents Toolkit CLI:
+    1. Run command: `atk auth login azure`.
+    1. Run command: `atk provision --env dev`.
+    1. Run command: `atk deploy --env dev`.
 
 ### Preview the app in Teams
 - From VS Code: 
     1. Open the `Run and Debug Activity` Panel. Select `Launch Remote (Codespaces)` from the launch configuration drop-down.
-- From Teams Toolkit CLI:
-    1. Run command: `teamsapp preview --env dev`.
+- From Microsoft 365 Agents Toolkit CLI:
+    1. Run command: `atk preview --env dev`.
 
 ## Version History
 |Date| Author| Comments|

NPM-search-message-extension-codespaces/teamsapp.local.yml → NPM-search-message-extension-codespaces/m365agents.local.yml

@@ -58,7 +58,7 @@ provision:
       appPackagePath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip
 
   # Apply the Teams app manifest to an existing Teams app in
-  # Teams Developer Portal.
+  # Developer Portal.
   # Will use the app id in manifest file to determine which Teams app to update.
   - uses: teamsApp/update
     with:

NPM-search-message-extension-codespaces/teamsapp.yml → NPM-search-message-extension-codespaces/m365agents.yml

@@ -27,7 +27,7 @@ provision:
         - path: ./infra/azure.bicep
           parameters: ./infra/azure.parameters.json
           deploymentName: Create-resources-for-bot
-      bicepCliVersion: v0.9.1 # Teams Toolkit will download this bicep CLI version from github for you, will use bicep CLI in PATH if you remove this config.
+      bicepCliVersion: v0.9.1 # Microsoft 365 Agents Toolkit will download this bicep CLI version from github for you, will use bicep CLI in PATH if you remove this config.
 
   # Validate using manifest schema
   - uses: teamsApp/validateManifest
@@ -47,7 +47,7 @@ provision:
       # Relative path to this file. This is the path for built zip file.
       appPackagePath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip
   # Apply the Teams app manifest to an existing Teams app in
-  # Teams Developer Portal.
+  # Developer Portal.
   # Will use the app id in manifest file to determine which Teams app to update.
   - uses: teamsApp/update
     with:
@@ -93,7 +93,7 @@ publish:
       # Relative path to this file. This is the path for built zip file.
       appPackagePath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip
   # Apply the Teams app manifest to an existing Teams app in
-  # Teams Developer Portal.
+  # Developer Portal.
   # Will use the app id in manifest file to determine which Teams app to update.
   - uses: teamsApp/update
     with:

NPM-search-message-extension-codespaces/package.json

@@ -4,7 +4,7 @@
   "msteams": {
     "teamsAppId": null
   },
-  "description": "Microsoft Teams Toolkit message extension Bot sample",
+  "description": "Microsoft 365 Agents Toolkit message extension Bot sample",
   "engines": {
     "node": "18 || 20 || 22"
   },

README.md

@@ -4,7 +4,7 @@
 >  
 > This warning will be removed when the samples are ready for production.
 > 
-This repository contains the sample applications for Microsoft Teams that appear in the Visual Studio Code and Visual Studio sample galleries within the Teams Toolkit extension.
+This repository contains the sample applications for Microsoft Teams that appear in the Visual Studio Code and Visual Studio sample galleries within the Microsoft 365 Agents Toolkit extension.
 
 ## Contributing
 

README_template.md

@@ -11,15 +11,15 @@ the gif contains only major steps of using the app, keep the gif short.
 ## This sample illustrates
 [list what users can learn from this sample here]
 [examples:]
-- Use Teams Toolkit to create a Teams meeting app.
+- Use Microsoft 365 Agents Toolkit to create a Teams meeting app.
 - Use Microsoft Graph to get Microsoft 365 data in Teams app.
-- Use Teams Toolkit and Azure frontend hosting for Teams tab app.
+- Use Microsoft 365 Agents Toolkit and Azure frontend hosting for Teams tab app.
 - Use ...
 
 ## Prerequisite to use this sample
 - NodeJS version XX
 - A Microsoft 365 tenant in which you have permission to upload Teams apps. You can get a free Microsoft 365 developer tenant by joining the [Microsoft 365 developer program](https://developer.microsoft.com/en-us/microsoft-365/dev-program).
-- [Teams Toolkit for VS Code](https://aka.ms/teams-toolkit) or [Teams Toolkit CLI](https://aka.ms/teams-toolkit-cli)
+- [Microsoft 365 Agents Toolkit for VS Code](https://aka.ms/teams-toolkit) or [Microsoft 365 Agents Toolkit CLI](https://aka.ms/teams-toolkit-cli)
 
 ## Minimal path to awesome
 
@@ -50,7 +50,7 @@ You can use this section to describe the known issues of this sample.
 ## Version History
 |Date| Author| Comments|
 |---|---|---|
-|Dec 15, 2022| zhany | update to support Teams Toolkit V4.2.0|
+|Dec 15, 2022| zhany | update to support Microsoft 365 Agents Toolkit V4.2.0|
 |Jan 30, 2023| Zhany | update to support NodeJS 18|
 
 ## Feedback

adaptive-card-notification/.funcignore

@@ -16,7 +16,7 @@ README.md
 tsconfig.json
 /appPackage/
 /infra/
-teamsapp.yml
-teamsapp.*.yml
+m365agents.yml
+m365agents.*.yml
 /env/
 /devTools/

adaptive-card-notification/.vscode/tasks.json

@@ -1,5 +1,5 @@
-// This file is automatically generated by Teams Toolkit.
-// The teamsfx tasks defined in this file require Teams Toolkit version >= 5.0.0.
+// This file is automatically generated by Microsoft 365 Agents Toolkit.
+// The teamsfx tasks defined in this file require Microsoft 365 Agents Toolkit version >= 5.0.0.
 // See https://aka.ms/teamsfx-tasks for details on how to customize each task.
 {
     "version": "2.0.0",