diff --git a/.config/samples-config-v3.json b/.config/samples-config-v3.json index 87035946f..95651b4d9 100644 --- a/.config/samples-config-v3.json +++ b/.config/samples-config-v3.json @@ -171,32 +171,6 @@ "gifPath": "assets/sampleDemo.gif", "suggested": false }, - { - "id": "bot-proactive-messaging-teamsfx", - "shortId": "proactive-messaging", - "onboardDate": "2022-08-01", - "title": "Proactive Messaging", - "shortDescription": "Demonstrates how to send proactive messages to users.", - "fullDescription": "This Teams application is a proactive messaging bot that enables users to receive notifications and messages proactively. The bot can send messages to all users who have previously interacted with it, and it can be triggered via a dedicated endpoint. The bot is built using the Bot Framework SDK and is written in JavaScript. The bot is hosted on Azure and uses Azure Active Directory for identity management.", - "types": [ - "Bot" - ], - "tags": [ - "Bot", - "JS" - ], - "time": "5min to run", - "configuration": "Ready for debug", - "thumbnailPath": "images/thumbnail.png", - "gifPath": "images/send-proactive-messages.gif", - "suggested": false, - "downloadUrlInfo": { - "owner": "OfficeDev", - "repository": "Microsoft-Teams-Samples", - "ref": "main", - "dir": "samples/bot-proactive-messaging-teamsfx" - } - }, { "id": "adaptive-card-notification", "shortId": "ac-notification", @@ -411,31 +385,6 @@ "gifPath": "assets/thumbnail.png", "suggested": false }, - { - "id": "outlook-add-in-set-signature", - "shortId": "signature-outlook", - "onboardDate": "2023-05-04", - "title": "Set signature using Outlook add-in", - "shortDescription": "An Outlook add-in that sets signature for the user", - "fullDescription": "An Outlook add-in that sets signature for the user", - "types": [ - "Tab" - ], - "tags": [ - "Outlook Add-in" - ], - "time": "5min to run", - "configuration": "Ready for debug", - "thumbnailPath": "assets/outlook-set-signature-overview.png", - "gifPath": "assets/outlook-set-signature-overview.png", - "suggested": false, - "downloadUrlInfo": { - "owner": "OfficeDev", - "repository": "Office-Add-in-samples", - "ref": "main", - "dir": "Samples/outlook-set-signature" - } - }, { "id": "developer-assist-dashboard", "shortId": "dev-assist-dashboard", @@ -479,33 +428,6 @@ "gifPath": "assets/sampleDemo.gif", "suggested": false }, - { - "id": "teams-chef-bot", - "shortId": "chef-bot", - "onboardDate": "2023-06-25", - "title": "Teams Chef Bot", - "shortDescription": "Demonstrates how to build bot with Microsoft Teams AI Library.", - "fullDescription": "This project, Teams Chef, is a conversational bot designed to guide junior developers in Microsoft Teams app development. It uses the Teams AI Library and the gpt-3.5-turbo model to facilitate interactions. The bot leverages Retrieval Augmented Generation (RAG) and a local Vector Database, Vectra, for contextual information retrieval. Semantic Search is employed to find relevant information from its index, which includes Getting Started docs and the source code for the Teams AI Library. The bot is configured for Azure deployment, with infrastructure defined using Bicep.", - "types": [ - "Bot" - ], - "tags": [ - "Bot", - "TS", - "Teams AI Library" - ], - "time": "5min to run", - "configuration": "Ready for debug", - "thumbnailPath": "assets/TeamsChef003.png", - "gifPath": "assets/TeamsChef003.png", - "suggested": true, - "downloadUrlInfo": { - "owner": "microsoft", - "repository": "teams-ai", - "ref": "main", - "dir": "js/samples/04.ai-apps/a.teamsChefBot" - } - }, { "id": "spfx-productivity-dashboard", "shortId": "spfx-dashboard", @@ -576,7 +498,7 @@ "shortId": "large-notification", "onboardDate": "2023-10-17", "title": "Large Scale Notification Bot", - "shortDescription": "This sample demonstrates the architecture of a Teams notification bot app created by Teams Toolkit to send individual chat messages to a large number of users in a tenant.", + "shortDescription": "This sample demonstrates the architecture of a Teams notification bot app created by Microsoft 365 Agents Toolkit to send individual chat messages to a large number of users in a tenant.", "fullDescription": "This project is a large-scale notification system for Microsoft Teams. It uses Azure Functions for serverless computing and Azure Service Bus for message handling. The system leverages Azure Table Storage for data persistence and Azure Bot Service for interaction with Teams. It also uses Bicep for infrastructure management. The project is structured to handle environment-specific configurations and includes scripts for various tasks like data mocking and app installation. The system is designed to handle large volumes of notifications efficiently and reliably.", "types": [ "Bot" @@ -615,114 +537,6 @@ "gifPath": "assets/sampleDemo.gif", "suggested": false }, - { - "id": "bot-conversation-python", - "shortId": "bot-conversation-py", - "onboardDate": "2023-11-08", - "title": "Teams Conversation Bot using Python", - "shortDescription": "This sample shows how to incorporate basic conversational flow into a Teams application.", - "fullDescription": "This bot has been created using Bot Framework. This sample shows how to incorporate basic conversational flow into a Teams application. It also illustrates a few of the Teams specific calls you can make from your bot.", - "types": [ - "Bot" - ], - "tags": [ - "Python", - "Bot", - "Bot Framework" - ], - "time": "5min to run", - "configuration": "Manual configurations required", - "thumbnailPath": "Images/2.welcome.png", - "gifPath": "Images/BotConversation.gif", - "suggested": false, - "downloadUrlInfo": { - "owner": "OfficeDev", - "repository": "Microsoft-Teams-Samples", - "ref": "main", - "dir": "samples/bot-conversation/python" - } - }, - { - "id": "msgext-search-python", - "shortId": "msgext-search-py", - "onboardDate": "2023-11-08", - "title": "Teams Messaging Extensions Search using Python", - "shortDescription": "This sample illustrates how to build a Search-based Messaging Extension.", - "fullDescription": "There are two basic types of Messaging Extension in Teams: Search-based and Action-based. This sample illustrates how to build a Search-based Messaging Extension.", - "types": [ - "Bot" - ], - "tags": [ - "Python", - "Message extension", - "Bot Framework" - ], - "time": "5min to run", - "configuration": "Manual configurations required", - "thumbnailPath": "Images/5.Select_result.png", - "gifPath": "Images/msgext-search.gif", - "suggested": false, - "downloadUrlInfo": { - "owner": "OfficeDev", - "repository": "Microsoft-Teams-Samples", - "ref": "main", - "dir": "samples/msgext-search/python" - } - }, - { - "id": "gc-nodejs-typescript-food-catalog", - "shortId": "gc-food-catalog", - "onboardDate": "2023-11-15", - "title": "Ingest Custom API Data into Microsoft 365 with a Microsoft Copilot connector", - "shortDescription": "This sample project uses Teams Toolkit for Visual Studio Code to simplify the process of creating a Microsoft Copilot connector that ingests data from a custom API to Microsoft Graph.", - "fullDescription": "This sample project uses Teams Toolkit for Visual Studio Code to simplify the process of creating a Microsoft Copilot connector that ingests data from a custom API to Microsoft Graph. It provides an end to end example of creating the connector, ingesting content and refreshing the ingested content on a schedule. It also includes the simplified admin experience which means that admins can toggle the connector on and off from the Microsoft Teams admin center.", - "types": [ - "Tab" - ], - "tags": [ - "TS", - "Copilot connector", - "Azure Functions" - ], - "time": "5min to run", - "configuration": "Manual configurations required", - "thumbnailPath": "assets/ttk_thumb.png", - "gifPath": "assets/ttk.gif", - "suggested": false, - "downloadUrlInfo": { - "owner": "pnp", - "repository": "graph-connectors-samples", - "ref": "main", - "dir": "samples/nodejs-typescript-food-catalog" - } - }, - { - "id": "reddit-link-unfurling", - "shortId": "reddit-link-unfurling", - "onboardDate": "2023-12-12", - "title": "Format Reddit Link into Adaptive Card", - "shortDescription": "This sample application showcases how to build a Teams application (Link Unfurling, a type of Message Extension) that can format the Reddit link into an Adaptive Card when a user pastes a Reddit link into the compose message area.", - "fullDescription": "This sample application showcases how to build a Teams application (Link Unfurling, a type of Message Extension) that can format the Reddit link into an Adaptive Card when a user pastes a Reddit link into the compose message area.", - "types": [ - "Message Extension" - ], - "tags": [ - "Message Extension", - "JS", - "Link Unfurling" - ], - "time": "10 mins to run", - "configuration": "Manual configurations required", - "thumbnailPath": "doc/image/link.png", - "gifPath": "doc/image/link.png", - "suggested": false, - "downloadUrlInfo": { - "owner": "OfficeDev", - "repository": "Microsoft-Teams-Samples", - "ref": "main", - "dir": "samples/msgext-link-unfurling-reddit/nodejs" - } - }, { "id": "intelligent-data-chart-generator", "shortId": "data-chart-generator", @@ -790,34 +604,6 @@ "gifPath": "assets/sampleDemo.gif", "suggested": false }, - { - "id": "graph-rsc-helper", - "shortId": "graph-rsc-helper", - "onboardDate": "2024-04-02", - "title": "Graph RSC Helper", - "shortDescription": "This sample demonstrates how to use Resource Specific Consent to call Graph API in Microsoft teams channel and group chat. You can observe the real API response with the scope installed.", - "fullDescription": "This sample demonstrates how to use Resource Specific Consent (RSC) to call Graph API in Microsoft Teams channel and group chat. It shows how to configure RSC permissions in the manifest and use them to call Microsoft Graph, allowing you to observe the real API response with the scope installed. The sample includes features such as RSC permissions, Graph, and Tab App in team channel and group chat. Prerequisites include NodeJS and a M365 developer account.", - "types": [ - "Tab" - ], - "tags": [ - "TS", - "Tab", - "RSC Permissions", - "Graph" - ], - "time": "5 mins to run", - "configuration": "Ready for local debug", - "thumbnailPath": "Images/Overview.png", - "gifPath": "Images/graphrschelper.gif", - "suggested": false, - "downloadUrlInfo": { - "owner": "OfficeDev", - "repository": "Microsoft-Teams-Samples", - "ref": "main", - "dir": "samples/graph-rsc-helper/nodeJs" - } - }, { "id": "hello-world-office-addin", "shortId": "helloworld-office-wxpo", @@ -836,62 +622,6 @@ "thumbnailPath": "assets/thumbnail.png", "gifPath": "assets/thumbnail.png", "suggested": false - }, - { - "id": "nodejs-typescript-policies", - "shortId": "nodejs-ts-policies", - "onboardDate": "2024-09-24", - "title": "Policies Copilot connector", - "shortDescription": "This sample project uses Teams Toolkit for Visual Studio Code to simplify the process of creating a Microsoft Copilot connector that ingests data from a custom API to Microsoft Graph.", - "fullDescription": "This sample project uses Teams Toolkit for Visual Studio Code to simplify the process of creating a Microsoft Copilot connector that ingests data from a custom API to Microsoft Graph. It provides an end to end example of creating the connector, ingesting content and refreshing the ingested content.", - "types": [ - "Copilot connector" - ], - "tags": [ - "TS", - "Copilot connector", - "Azure Function", - "Copilot for Microsoft 365" - ], - "time": "10 mins to run", - "configuration": "Ready for local debug", - "thumbnailPath": "assets/search-results.png", - "gifPath": "assets/search-results.png", - "suggested": false, - "downloadUrlInfo": { - "owner": "pnp", - "repository": "graph-connectors-samples", - "ref": "main", - "dir": "samples/nodejs-typescript-policies" - } - }, - { - "id": "da-ristorante-api", - "shortId": "da-ristorante-api", - "onboardDate": "2025-01-22", - "title": "Browse the menu and place an order at a local Italian restaurant using Microsoft 365 Copilot", - "shortDescription": "This sample demonstrates how to build a declarative agent for Microsoft 365 Copilot that allows you to browse a menu of a local Italian restaurant and place an order.", - "fullDescription": "This sample demonstrates how to build a declarative agent for Microsoft 365 Copilot that allows you to browse a menu of a local Italian restaurant and place an order. The agent uses an API plugin to connect to an anonymous API. The project contains an Azure Function that serves as the API.", - "types": [ - "Declarative Agent" - ], - "tags": [ - "TS", - "Declarative Agent", - "Azure Function", - "Copilot for Microsoft 365" - ], - "time": "2 mins to run", - "configuration": "Ready for local debug", - "thumbnailPath": "assets/screenshot-menu.png", - "gifPath": "assets/screenshot-menu.png", - "suggested": false, - "downloadUrlInfo": { - "owner": "pnp", - "repository": "copilot-pro-dev-samples", - "ref": "main", - "dir": "samples/da-ristorante-api" - } } ] } \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/new-sample-onboard-request.md b/.github/ISSUE_TEMPLATE/new-sample-onboard-request.md index 10b1dc61e..0d4ebc169 100644 --- a/.github/ISSUE_TEMPLATE/new-sample-onboard-request.md +++ b/.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 \ No newline at end of file +**(Optional) Maximum Microsoft 365 Agents Toolkit Version:** +Microsoft 365 Agents Toolkit version requirement to run the sample - maximum version \ No newline at end of file diff --git a/.github/policies/resourceManagement.yml b/.github/policies/resourceManagement.yml index 368afe05e..e574008a0 100644 --- a/.github/policies/resourceManagement.yml +++ b/.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 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0a5704585..781aa69c0 100644 --- a/CONTRIBUTING.md +++ b/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. diff --git a/NPM-search-connector-M365/.vscode/tasks.json b/NPM-search-connector-M365/.vscode/tasks.json index 5cef41ef3..48fcf77ce 100644 --- a/NPM-search-connector-M365/.vscode/tasks.json +++ b/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", diff --git a/NPM-search-connector-M365/.webappignore b/NPM-search-connector-M365/.webappignore index c28f5b931..2464d8969 100644 --- a/NPM-search-connector-M365/.webappignore +++ b/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 diff --git a/NPM-search-connector-M365/README.md b/NPM-search-connector-M365/README.md index 31c9fb812..a929a4c19 100644 --- a/NPM-search-connector-M365/README.md +++ b/NPM-search-connector-M365/README.md @@ -18,16 +18,16 @@ 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. @@ -35,8 +35,8 @@ NPM Search Connector is a Message Extension that allows you to perform a quick s 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`. diff --git a/NPM-search-connector-M365/assets/sample.json b/NPM-search-connector-M365/assets/sample.json index 319f96226..8c480b9f2 100644 --- a/NPM-search-connector-M365/assets/sample.json +++ b/NPM-search-connector-M365/assets/sample.json @@ -12,7 +12,7 @@ "updateDateTime": "2023-10-16", "products": [ "Teams", - "TeamsToolkit" + "Microsoft 365 Agents Toolkit" ], "metadata": [ { diff --git a/NPM-search-connector-M365/cli.md b/NPM-search-connector-M365/cli.md index 1242bec63..ca62b666d 100644 --- a/NPM-search-connector-M365/cli.md +++ b/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 + atk provision --env ``` 1. Deploy. ``` - teamsapp deploy --env + atk deploy --env ``` -1. Execute `teamsapp preview --env --m365-host ` in your project directory to launch your application, where `m365-host` is `teams` or `outlook`. \ No newline at end of file +1. Execute `atk preview --env --m365-host ` in your project directory to launch your application, where `m365-host` is `teams` or `outlook`. \ No newline at end of file diff --git a/NPM-search-connector-M365/teamsapp.local.yml b/NPM-search-connector-M365/m365agents.local.yml similarity index 99% rename from NPM-search-connector-M365/teamsapp.local.yml rename to NPM-search-connector-M365/m365agents.local.yml index b26b0661c..344dd36ba 100644 --- a/NPM-search-connector-M365/teamsapp.local.yml +++ b/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: diff --git a/NPM-search-connector-M365/teamsapp.yml b/NPM-search-connector-M365/m365agents.yml similarity index 95% rename from NPM-search-connector-M365/teamsapp.yml rename to NPM-search-connector-M365/m365agents.yml index 191a6e5aa..d30a6c973 100644 --- a/NPM-search-connector-M365/teamsapp.yml +++ b/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: diff --git a/NPM-search-message-extension-codespaces/.vscode/tasks.json b/NPM-search-message-extension-codespaces/.vscode/tasks.json index d0847aeec..79f63e397 100644 --- a/NPM-search-message-extension-codespaces/.vscode/tasks.json +++ b/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", diff --git a/NPM-search-message-extension-codespaces/.webappignore b/NPM-search-message-extension-codespaces/.webappignore index 598c568c3..1559cabdc 100644 --- a/NPM-search-message-extension-codespaces/.webappignore +++ b/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 diff --git a/NPM-search-message-extension-codespaces/README.md b/NPM-search-message-extension-codespaces/README.md index d3f10320d..08ec029b3 100644 --- a/NPM-search-message-extension-codespaces/README.md +++ b/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| diff --git a/NPM-search-message-extension-codespaces/teamsapp.local.yml b/NPM-search-message-extension-codespaces/m365agents.local.yml similarity index 99% rename from NPM-search-message-extension-codespaces/teamsapp.local.yml rename to NPM-search-message-extension-codespaces/m365agents.local.yml index 0957899d7..e8e8c2063 100644 --- a/NPM-search-message-extension-codespaces/teamsapp.local.yml +++ b/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: diff --git a/NPM-search-message-extension-codespaces/teamsapp.yml b/NPM-search-message-extension-codespaces/m365agents.yml similarity index 95% rename from NPM-search-message-extension-codespaces/teamsapp.yml rename to NPM-search-message-extension-codespaces/m365agents.yml index de6773135..48290dcdd 100644 --- a/NPM-search-message-extension-codespaces/teamsapp.yml +++ b/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: diff --git a/NPM-search-message-extension-codespaces/package.json b/NPM-search-message-extension-codespaces/package.json index 8c0782fa1..aa409fdd4 100644 --- a/NPM-search-message-extension-codespaces/package.json +++ b/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" }, diff --git a/README.md b/README.md index 67d3f3c8a..798c89877 100644 --- a/README.md +++ b/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 diff --git a/README_template.md b/README_template.md index c0005bb8f..0dbf1a76c 100644 --- a/README_template.md +++ b/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 diff --git a/adaptive-card-notification/.funcignore b/adaptive-card-notification/.funcignore index 59af46d2b..797c9baf5 100644 --- a/adaptive-card-notification/.funcignore +++ b/adaptive-card-notification/.funcignore @@ -16,7 +16,7 @@ README.md tsconfig.json /appPackage/ /infra/ -teamsapp.yml -teamsapp.*.yml +m365agents.yml +m365agents.*.yml /env/ /devTools/ diff --git a/adaptive-card-notification/.vscode/tasks.json b/adaptive-card-notification/.vscode/tasks.json index d07dfdcd8..6d454c0f7 100644 --- a/adaptive-card-notification/.vscode/tasks.json +++ b/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", diff --git a/adaptive-card-notification/README.md b/adaptive-card-notification/README.md index 3f0b7a588..eba465e05 100644 --- a/adaptive-card-notification/README.md +++ b/adaptive-card-notification/README.md @@ -27,12 +27,12 @@ Adaptive Card Notification provides an easy way to send notification in Teams. T - [Node.js](https://nodejs.org/), supported versions: 18, 20, 22 - 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 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) - An [Azure subscription](https://azure.microsoft.com/en-us/free/) ## 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 @@ -50,9 +50,9 @@ Adaptive Card Notification provides an easy way to send notification in Teams. T ### Deploy the app to Azure -1. Open Teams Toolkit, and sign into Azure by clicking the `Sign in to Azure` under the `ACCOUNTS` section from sidebar. -1. Open the command palette and select `Teams: Provision`. -1. Once provision is completed, open the command palette and select `Teams: Deploy`. +1. Open Microsoft 365 Agents Toolkit, and sign into Azure by clicking the `Sign in to Azure` under the `ACCOUNTS` section from sidebar. +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 in Teams diff --git a/adaptive-card-notification/assets/sample.json b/adaptive-card-notification/assets/sample.json index 728f951f6..24b0cf5de 100644 --- a/adaptive-card-notification/assets/sample.json +++ b/adaptive-card-notification/assets/sample.json @@ -12,7 +12,7 @@ "updateDateTime": "2023-10-24", "products": [ "Teams", - "TeamsToolkit" + "Microsoft 365 Agents Toolkit" ], "metadata": [ { diff --git a/adaptive-card-notification/cli.md b/adaptive-card-notification/cli.md index 9fad94e0f..66991eaf9 100644 --- a/adaptive-card-notification/cli.md +++ b/adaptive-card-notification/cli.md @@ -1,19 +1,19 @@ -## Try sample with Teams Toolkit CLI +## Try sample with Microsoft 365 Agents Toolkit CLI 1. Install [Node.js](https://nodejs.org/en/download/) (Recommend LTS 16.x) -1. To install the Teams Toolkit CLI, use the npm package manager: +1. To install the Microsoft 365 Agents Toolkit CLI, use the npm package manager: ``` - npm install -g @microsoft/teamsapp-cli + npm install -g @microsoft/m365agentstoolkit-cli ``` 1. Create adaptive-card-notification project. ``` - teamsapp new sample adaptive-card-notification --interactive false + atk new sample adaptive-card-notification --interactive false ``` 1. Provision the project to Azure. ``` - teamsapp provision + atk provision ``` 1. Deploy. ``` - teamsapp deploy + atk deploy ``` \ No newline at end of file diff --git a/adaptive-card-notification/teamsapp.local.yml b/adaptive-card-notification/m365agents.local.yml similarity index 99% rename from adaptive-card-notification/teamsapp.local.yml rename to adaptive-card-notification/m365agents.local.yml index 97dbd4e60..5e31a2cce 100644 --- a/adaptive-card-notification/teamsapp.local.yml +++ b/adaptive-card-notification/m365agents.local.yml @@ -57,7 +57,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: diff --git a/adaptive-card-notification/teamsapp.yml b/adaptive-card-notification/m365agents.yml similarity index 95% rename from adaptive-card-notification/teamsapp.yml rename to adaptive-card-notification/m365agents.yml index 30801d2fb..37ef929ac 100644 --- a/adaptive-card-notification/teamsapp.yml +++ b/adaptive-card-notification/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 @@ -45,7 +45,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: @@ -87,7 +87,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: diff --git a/adaptive-card-notification/package.json b/adaptive-card-notification/package.json index 40c36f0b6..6d1b51fe3 100644 --- a/adaptive-card-notification/package.json +++ b/adaptive-card-notification/package.json @@ -1,7 +1,7 @@ { "name": "adaptive-card-notifi", "version": "1.0.0", - "description": "Microsoft Teams Toolkit Adaptive Card Notification Bot Sample", + "description": "Microsoft 365 Agents Toolkit Adaptive Card Notification Bot Sample", "engines": { "node": "18 || 20 || 22" }, diff --git a/basic-blazor-tab-app/BasicBlazorTabApp/Components/AddSSO.razor b/basic-blazor-tab-app/BasicBlazorTabApp/Components/AddSSO.razor index 25febf6e1..124ad8ee3 100644 --- a/basic-blazor-tab-app/BasicBlazorTabApp/Components/AddSSO.razor +++ b/basic-blazor-tab-app/BasicBlazorTabApp/Components/AddSSO.razor @@ -7,7 +7,7 @@ SSO support ) and interact with Microsoft Graph for - building rich and seamless user experience. With Teams Toolkit, authentication is further + building rich and seamless user experience. With Microsoft 365 Agents Toolkit, authentication is further simplified by automatic AAD app registration and configuration.

@@ -19,7 +19,7 @@ here - ) to learn how to enable Authentication component with Teams Toolkit + ) to learn how to enable Authentication component with Microsoft 365 Agents Toolkit and code snippets.

diff --git a/basic-blazor-tab-app/BasicBlazorTabApp/Components/Deploy.razor b/basic-blazor-tab-app/BasicBlazorTabApp/Components/Deploy.razor index 66d145faf..5facbb9d4 100644 --- a/basic-blazor-tab-app/BasicBlazorTabApp/Components/Deploy.razor +++ b/basic-blazor-tab-app/BasicBlazorTabApp/Components/Deploy.razor @@ -5,8 +5,8 @@ app's resources to the cloud to make sure your app will be running smoothly!

- Select the Project > Teams Toolkit > Provision in the Cloud menu item to provision your app's resources. - Next, select the Project > Teams Toolkit > Deploy to the Cloud menu item to deploy your app to Azure. + Select the Project > Microsoft 365 Agents Toolkit > Provision in the Cloud menu item to provision your app's resources. + Next, select the Project > Microsoft 365 Agents Toolkit > Deploy to the Cloud menu item to deploy your app to Azure.

diff --git a/basic-blazor-tab-app/BasicBlazorTabApp/GettingStarted.txt b/basic-blazor-tab-app/BasicBlazorTabApp/GettingStarted.txt index adae395da..67c5839f2 100644 --- a/basic-blazor-tab-app/BasicBlazorTabApp/GettingStarted.txt +++ b/basic-blazor-tab-app/BasicBlazorTabApp/GettingStarted.txt @@ -1,8 +1,8 @@ -Welcome to Teams Toolkit! +Welcome to Microsoft 365 Agents Toolkit! Quick Start ------------------------- -1. Right-click your project and select Teams Toolkit > Prepare Teams App Dependencies +1. Right-click your project and select Microsoft 365 Agents Toolkit > Select Microsoft 365 Account 2. If prompted, sign in with a Microsoft 365 account for the Teams organization you want to install the app to 3. Press F5, or select the Debug > Start Debugging menu in Visual Studio @@ -10,7 +10,7 @@ to install the app to Learn more ------------------------- -New to Teams app development or Teams Toolkit? Learn more about +New to Teams app development or Microsoft 365 Agents Toolkit? Learn more about Teams app manifests, deploying to the cloud, and more in the documentation at https://aka.ms/teams-toolkit-vs-docs diff --git a/basic-blazor-tab-app/BasicBlazorTabApp/teamsapp.local.yml b/basic-blazor-tab-app/BasicBlazorTabApp/m365agents.local.yml similarity index 93% rename from basic-blazor-tab-app/BasicBlazorTabApp/teamsapp.local.yml rename to basic-blazor-tab-app/BasicBlazorTabApp/m365agents.local.yml index e60fce49f..74dc48524 100644 --- a/basic-blazor-tab-app/BasicBlazorTabApp/teamsapp.local.yml +++ b/basic-blazor-tab-app/BasicBlazorTabApp/m365agents.local.yml @@ -30,6 +30,6 @@ provision: - uses: teamsApp/validateAppPackage # Validate app package using validation rules with: appPackagePath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip # Relative path to this file. This is the path for built zip file. - - uses: teamsApp/update # Apply the Teams app manifest to an existing Teams app in Teams Developer Portal. Will use the app id in manifest file to determine which Teams app to update. + - uses: teamsApp/update # Apply the Teams app manifest to an existing Teams app in Developer Portal. Will use the app id in manifest file to determine which Teams app to update. with: appPackagePath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip # Relative path to this file. This is the path for built zip file. diff --git a/basic-blazor-tab-app/BasicBlazorTabApp/teamsapp.yml b/basic-blazor-tab-app/BasicBlazorTabApp/m365agents.yml similarity index 92% rename from basic-blazor-tab-app/BasicBlazorTabApp/teamsapp.yml rename to basic-blazor-tab-app/BasicBlazorTabApp/m365agents.yml index 1e30092c3..fec3d76fb 100644 --- a/basic-blazor-tab-app/BasicBlazorTabApp/teamsapp.yml +++ b/basic-blazor-tab-app/BasicBlazorTabApp/m365agents.yml @@ -25,7 +25,7 @@ provision: - path: ./infra/azure.bicep # Relative path to this file parameters: ./infra/azure.parameters.json # Relative path to this file. Placeholders will be replaced with corresponding environment variable before ARM deployment. deploymentName: Create-resources-for-tab # Required when deploy ARM template - 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. - uses: teamsApp/validateManifest # Validate using manifest schema with: @@ -38,7 +38,7 @@ provision: - uses: teamsApp/validateAppPackage # Validate app package using validation rules with: appPackagePath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip # Relative path to this file. This is the path for built zip file. - - uses: teamsApp/update # Apply the Teams app manifest to an existing Teams app in Teams Developer Portal. Will use the app id in manifest file to determine which Teams app to update. + - uses: teamsApp/update # Apply the Teams app manifest to an existing Teams app in Developer Portal. Will use the app id in manifest file to determine which Teams app to update. with: appPackagePath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip # Relative path to this file. This is the path for built zip file. diff --git a/basic-blazor-tab-app/README.md b/basic-blazor-tab-app/README.md index eeca0ba43..dc470afb9 100644 --- a/basic-blazor-tab-app/README.md +++ b/basic-blazor-tab-app/README.md @@ -20,7 +20,7 @@ Blazor is a feature of ASP.NET for building interactive web UIs. The Basic Blazo ## Prerequisite to use this sample - [Visual Studio 2022](https://visualstudio.microsoft.com/), version 17.7 or higher. -- Latest [Teams Toolkit for Visual Studio](https://docs.microsoft.com/en-us/microsoftteams/platform/toolkit/teams-toolkit-overview-visual-studio). +- Latest [Microsoft 365 Agents Toolkit for Visual Studio](https://docs.microsoft.com/en-us/microsoftteams/platform/toolkit/teams-toolkit-overview-visual-studio). - A Microsoft 365 account. If you do not have Microsoft 365 account, apply one from [Microsoft 365 developer program](https://developer.microsoft.com/en-us/microsoft-365/dev-program). @@ -28,15 +28,15 @@ Blazor is a feature of ASP.NET for building interactive web UIs. The Basic Blazo ### 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. -1. Right click to the project, select **Teams Toolkit > Prepare Teams App Dependencies**. +1. Right click to the project, select **Microsoft 365 Agents Toolkit > Select Microsoft 365 Account**. 1. Press "F5" to launch the bot 1. Sideloading your app to view into Microsoft Teams to view the Basic Blazor Tab App. ### Deploy the app to Azure -You can create and automatically configure cloud resources for hosting your app in Azure using Teams Toolkit. +You can create and automatically configure cloud resources for hosting your app in Azure using Microsoft 365 Agents Toolkit. 1. If you don't have an Azure subscription, create [a free account](https://azure.microsoft.com/en-us/free/) before you begin -1. Select the **BasicBlazorTabApp > Teams Toolkit > Provision** menu. In the Select your subscription window, choose the Azure subscription you want to use to create resources with. Teams Toolkit will create Azure resources in this subscription but no code is deployed during this step. -1. Select the **BasicBlazorTabApp > Teams Toolkit > Deploy in the Cloud** menu to deploy your project to these new resources. +1. Select the **BasicBlazorTabApp > Microsoft 365 Agents Toolkit > Provision** menu. In the Select your subscription window, choose the Azure subscription you want to use to create resources with. Microsoft 365 Agents Toolkit will create Azure resources in this subscription but no code is deployed during this step. +1. Select the **BasicBlazorTabApp > Microsoft 365 Agents Toolkit > Deploy in the Cloud** menu to deploy your project to these new resources. ### Preview the app in Teams 1. When you install the app into Microsoft Teams, it will immediately begin to send messages every thirty seconds into the location where you have installed it. There is no additional configuration required. diff --git a/basic-blazor-tab-app/assets/sample.json b/basic-blazor-tab-app/assets/sample.json index b46b3cb12..72487d023 100644 --- a/basic-blazor-tab-app/assets/sample.json +++ b/basic-blazor-tab-app/assets/sample.json @@ -12,7 +12,7 @@ "updateDateTime": "2023-11-15", "products": [ "Teams", - "TeamsToolkit" + "Microsoft 365 Agents Toolkit" ], "metadata": [ { @@ -45,7 +45,7 @@ ], "references": [ { - "name": "Teams Toolkit Visual Studio Overview", + "name": "Microsoft 365 Agents Toolkit Visual Studio Overview", "url": "https://aka.ms/teams-toolkit-vs-docs" }, { diff --git a/bot-sso-docker/.dockerignore b/bot-sso-docker/.dockerignore index 5d4a65a94..6dcd827c2 100644 --- a/bot-sso-docker/.dockerignore +++ b/bot-sso-docker/.dockerignore @@ -28,6 +28,6 @@ env infra aad.manifest.json cli.md -teamsapp*.yaml +m365agents*.yaml LICENSE README.md diff --git a/bot-sso-docker/.vscode/tasks.json b/bot-sso-docker/.vscode/tasks.json index 75983fa5d..d9f4fad5f 100644 --- a/bot-sso-docker/.vscode/tasks.json +++ b/bot-sso-docker/.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", diff --git a/bot-sso-docker/README.md b/bot-sso-docker/README.md index 4a81f9d62..d1b90978d 100644 --- a/bot-sso-docker/README.md +++ b/bot-sso-docker/README.md @@ -21,7 +21,7 @@ This is a sample chatbot application running in Docker container. It demonstrate ## This sample illustrates -- Use Teams Toolkit to create a Teams bot app. +- Use Microsoft 365 Agents Toolkit to create a Teams bot app. - Use Microsoft Graph to get User info and picture in Teams app. - Use TeamsFx SDK to implementing SSO for Teams bot. - Use Docker to containerize a Teams bot. @@ -30,7 +30,7 @@ This is a sample chatbot application running in Docker container. It demonstrate - [Docker Engine](https://docs.docker.com/engine/install/) - 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 Visual Studio Code Extension](https://aka.ms/teams-toolkit) version 5.0.0 and higher or [Teams Toolkit CLI](https://aka.ms/teamsfx-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/teamsfx-toolkit-cli) - [Azure CLI](https://learn.microsoft.com/cli/azure/install-azure-cli) for Azure Container Apps deployment ## Containerization of Teams App @@ -39,7 +39,7 @@ Teams applications can be developed and run locally using containerization, whic ### How to containerize -This sample demonstrate how to containerize a Teams App and integrate the Docker container into Teams Toolkit development lifecycle, which can serve as reference for your containerization process. +This sample demonstrate how to containerize a Teams App and integrate the Docker container into Microsoft 365 Agents Toolkit development lifecycle, which can serve as reference for your containerization process. - **Write a Dockerfile**: Create a Dockerfile that specifies the build instructions for your container image. Refer to this [Dockerfile example](./Dockerfile) @@ -47,7 +47,7 @@ This sample demonstrate how to containerize a Teams App and integrate the Docker - **Provision Infrastructure**: Automate the provisioning of Azure Container Apps and Azure Container Registry using Bicep templates. Refer to this [Azure Bicep example](./infra/azure.bicep). -- **Build and Deploy to ACA**: Using Azure CLI, build and push the Docker image to Azure Container Registry, then deploy it to Azure Container Apps. Refer to the deployment scripts in this [teamsapp.yml example](./teamsapp.yml). +- **Build and Deploy to ACA**: Using Azure CLI, build and push the Docker image to Azure Container Registry, then deploy it to Azure Container Apps. Refer to the deployment scripts in this [m365agents.yml example](./m365agents.yml). ## Minimal path to awesome @@ -55,7 +55,7 @@ This sample demonstrate how to containerize a Teams App and integrate the Docker - From VS Code: 1. hit `F5` to start debugging. Alternatively open the `Run and Debug Activity` Panel and select `Debug (Edge)` or `Debug (Chrome)`. -- From Teams Toolkit CLI: +- From Microsoft 365 Agents Toolkit CLI: 1. Install [dev tunnel cli](https://aka.ms/teamsfx-install-dev-tunnel). 1. Login with your M365 Account using the command `devtunnel user login` . 1. Start your local tunnel service by running the command `devtunnel host -p 3978 --protocol http --allow-anonymous` . @@ -64,30 +64,30 @@ This sample demonstrate how to containerize a Teams App and integrate the Docker BOT_DOMAIN=sample-id-3978.devtunnels.ms BOT_ENDPOINT=https://sample-id-3978.devtunnels.ms ``` - 1. Run command: `teamsapp provision --env local` . + 1. Run command: `atk provision --env local` . 1. Run command: `docker build -t sso-bot ./` . 1. Run command: `docker run -p 3978:80 --env-file .localConfigs sso-bot` . - 1. Run command: `teamsapp preview --open-only` . + 1. Run command: `atk preview --open-only` . ### 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 `Provision` from `LIFECYCLE` section or open the command palette and select: `Microsoft 365 Agents: Provision`. 1. Login Azure CLI with commands: `az login` and `az account set -s `. - 1. Click `Deploy` or open the command palette and select: `Teams: Deploy`. -- From Teams Toolkit CLI: - 1. Run command: `teamsapp account login azure` . - 1. Run command: `teamsapp provision --env dev` . + 1. Click `Deploy` or open the command palette and select: `Microsoft 365 Agents: Deploy`. +- From Microsoft 365 Agents Toolkit CLI: + 1. Run command: `atk account login azure` . + 1. Run command: `atk provision --env dev` . 1. Run command: `az login` . - 1. Run command: `teamsapp deploy --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 (Edge)` or `Launch Remote (Chrome)` 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`. ## Further reading diff --git a/bot-sso-docker/assets/sample.json b/bot-sso-docker/assets/sample.json index fbc4df709..63896ec01 100644 --- a/bot-sso-docker/assets/sample.json +++ b/bot-sso-docker/assets/sample.json @@ -12,7 +12,7 @@ "updateDateTime": "2024-01-17", "products": [ "Teams", - "TeamsToolkit" + "Microsoft 365 Agents Toolkit" ], "metadata": [ { diff --git a/bot-sso-docker/cli.md b/bot-sso-docker/cli.md index ecc7c7065..fa85966cd 100644 --- a/bot-sso-docker/cli.md +++ b/bot-sso-docker/cli.md @@ -1,17 +1,17 @@ -## Try sample with Teams Toolkit CLI +## Try sample with Microsoft 365 Agents Toolkit CLI 1. Install [Node.js](https://nodejs.org/download/) -1. To install the Teams Toolkit CLI, use the npm package manager: +1. To install the Microsoft 365 Agents Toolkit CLI, use the npm package manager: ``` - npm install -g @microsoft/teamsapp-cli + npm install -g @microsoft/m365agentstoolkit-cli ``` 1. Create bot-sso-docker project. ``` - teamsapp new sample bot-sso-docker --interactive false + atk new sample bot-sso-docker --interactive false ``` 1. Provision the project to Azure. ``` - teamsapp provision + atk provision ``` 1. Install [Azure CLI](https://learn.microsoft.com/cli/azure/install-azure-cli) 1. Login to Azure CLI. @@ -20,5 +20,5 @@ ``` 1. Deploy. ``` - teamsapp deploy + atk deploy ``` \ No newline at end of file diff --git a/bot-sso-docker/env/.env.dev b/bot-sso-docker/env/.env.dev index c07392300..10e389b44 100644 --- a/bot-sso-docker/env/.env.dev +++ b/bot-sso-docker/env/.env.dev @@ -4,7 +4,7 @@ TEAMSFX_ENV=dev APP_NAME_SUFFIX=dev -# Generated during provision, you can also add your own variables. If you're adding a secret value, add SECRET_ prefix to the name so Teams Toolkit can handle them properly +# Generated during provision, you can also add your own variables. If you're adding a secret value, add SECRET_ prefix to the name so Microsoft 365 Agents Toolkit can handle them properly RESOURCE_SUFFIX= AZURE_SUBSCRIPTION_ID= AZURE_RESOURCE_GROUP_NAME= diff --git a/bot-sso-docker/teamsapp.local.yml b/bot-sso-docker/m365agents.local.yml similarity index 99% rename from bot-sso-docker/teamsapp.local.yml rename to bot-sso-docker/m365agents.local.yml index 0339e793d..b31a4d1a1 100644 --- a/bot-sso-docker/teamsapp.local.yml +++ b/bot-sso-docker/m365agents.local.yml @@ -76,7 +76,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: diff --git a/bot-sso-docker/teamsapp.yml b/bot-sso-docker/m365agents.yml similarity index 96% rename from bot-sso-docker/teamsapp.yml rename to bot-sso-docker/m365agents.yml index 804b9338b..f2307d70d 100644 --- a/bot-sso-docker/teamsapp.yml +++ b/bot-sso-docker/m365agents.yml @@ -40,7 +40,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. - 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: @@ -65,7 +65,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: @@ -119,7 +119,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: diff --git a/bot-sso-docker/package.json b/bot-sso-docker/package.json index df9f224ef..b714b8a23 100644 --- a/bot-sso-docker/package.json +++ b/bot-sso-docker/package.json @@ -1,7 +1,7 @@ { "name": "sso-bot-sample", "version": "1.0.0", - "description": "Microsoft Teams Toolkit sso bot sample", + "description": "Microsoft 365 Agents Toolkit sso bot sample", "engines": { "node": "18 || 20 || 22" }, diff --git a/bot-sso/.vscode/tasks.json b/bot-sso/.vscode/tasks.json index 5cef41ef3..48fcf77ce 100644 --- a/bot-sso/.vscode/tasks.json +++ b/bot-sso/.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", diff --git a/bot-sso/README.md b/bot-sso/README.md index 0db9b4eb8..075d9295c 100644 --- a/bot-sso/README.md +++ b/bot-sso/README.md @@ -22,7 +22,7 @@ This is a sample chatbot application demonstrating Single Sign-on using `botbuil ## This sample illustrates -- Use Teams Toolkit to create a Teams bot app. +- Use Microsoft 365 Agents Toolkit to create a Teams bot app. - Use Microsoft Graph to get User info and picture in Teams app. - Use TeamsFx SDK to implementing SSO for Teams bot. @@ -30,7 +30,7 @@ This is a sample chatbot application demonstrating Single Sign-on using `botbuil - [Node.js](https://nodejs.org/), supported versions: 18, 20, 22 - 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 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) > Note: If you are using node 20, you can add following snippet in package.json to remove the warning of incompatibility. (Related discussion: https://github.com/microsoft/botbuilder-js/issues/4550) @@ -46,7 +46,7 @@ This is a sample chatbot application demonstrating Single Sign-on using `botbuil - From VS Code: 1. hit `F5` to start debugging. Alternatively open the `Run and Debug Activity` Panel and select `Debug in Teams (Edge)` or `Debug in Teams (Chrome)`. -- From Teams Toolkit CLI: +- From Microsoft 365 Agents Toolkit CLI: 1. Install [dev tunnel cli](https://aka.ms/teamsfx-install-dev-tunnel). 1. Login with your M365 Account using the command `devtunnel user login`. 1. Start your local tunnel service by running the command `devtunnel host -p 3978 --protocol http --allow-anonymous`. @@ -55,27 +55,27 @@ This is a sample chatbot application demonstrating Single Sign-on using `botbuil BOT_DOMAIN=sample-id-3978.devtunnels.ms BOT_ENDPOINT=https://sample-id-3978.devtunnels.ms ``` - 1. Run command: `teamsapp provision --env local` . - 1. Run command: `teamsapp deploy --env local` . - 1. Run command: `teamsapp preview --env local` . + 1. Run command: `atk provision --env local` . + 1. Run command: `atk deploy --env local` . + 1. Run command: `atk preview --env local` . ### 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 (Edge)` or `Launch Remote (Chrome)` 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 diff --git a/bot-sso/assets/sample.json b/bot-sso/assets/sample.json index ee81a14fc..14f206fcb 100644 --- a/bot-sso/assets/sample.json +++ b/bot-sso/assets/sample.json @@ -12,7 +12,7 @@ "updateDateTime": "2023-10-13", "products": [ "Teams", - "TeamsToolkit" + "Microsoft 365 Agents Toolkit" ], "metadata": [ { diff --git a/bot-sso/env/.env.dev b/bot-sso/env/.env.dev index 8e1d2a2f0..47158384c 100644 --- a/bot-sso/env/.env.dev +++ b/bot-sso/env/.env.dev @@ -4,7 +4,7 @@ TEAMSFX_ENV=dev APP_NAME_SUFFIX=dev -# Generated during provision, you can also add your own variables. If you're adding a secret value, add SECRET_ prefix to the name so Teams Toolkit can handle them properly +# Generated during provision, you can also add your own variables. If you're adding a secret value, add SECRET_ prefix to the name so Microsoft 365 Agents Toolkit can handle them properly BOT_ID= BOT_DOMAIN= AAD_APP_CLIENT_ID= diff --git a/bot-sso/teamsapp.local.yml b/bot-sso/m365agents.local.yml similarity index 99% rename from bot-sso/teamsapp.local.yml rename to bot-sso/m365agents.local.yml index 65f62884a..0e13f6b85 100644 --- a/bot-sso/teamsapp.local.yml +++ b/bot-sso/m365agents.local.yml @@ -76,7 +76,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: diff --git a/bot-sso/teamsapp.yml b/bot-sso/m365agents.yml similarity index 96% rename from bot-sso/teamsapp.yml rename to bot-sso/m365agents.yml index ae035caa4..186cb9a22 100644 --- a/bot-sso/teamsapp.yml +++ b/bot-sso/m365agents.yml @@ -39,7 +39,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. - 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: @@ -64,7 +64,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: @@ -108,7 +108,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: diff --git a/bot-sso/package.json b/bot-sso/package.json index 5d045d942..ef97aec45 100644 --- a/bot-sso/package.json +++ b/bot-sso/package.json @@ -1,7 +1,7 @@ { "name": "sso-bot-sample", "version": "1.0.0", - "description": "Microsoft Teams Toolkit sso bot sample", + "description": "Microsoft 365 Agents Toolkit sso bot sample", "engines": { "node": "18 || 20 || 22" }, diff --git a/command-bot-with-sso/.vscode/tasks.json b/command-bot-with-sso/.vscode/tasks.json index 5cef41ef3..48fcf77ce 100644 --- a/command-bot-with-sso/.vscode/tasks.json +++ b/command-bot-with-sso/.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", diff --git a/command-bot-with-sso/README.md b/command-bot-with-sso/README.md index 3130bcecc..f8e592517 100644 --- a/command-bot-with-sso/README.md +++ b/command-bot-with-sso/README.md @@ -14,7 +14,7 @@ This is a simple command bot that implements single sign-on feature to retrieve ## This sample illustrates -- How to use Teams Toolkit to create a Teams bot app. +- How to use Microsoft 365 Agents Toolkit to create a Teams bot app. - How to use Microsoft Graph to get User info and picture in Teams app. - How to use TeamsFx SDK to implementing SSO for Teams bot. @@ -22,7 +22,7 @@ This is a simple command bot that implements single sign-on feature to retrieve - [Node.js](https://nodejs.org/), supported versions: 18, 20, 22 - 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 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 @@ -35,7 +35,7 @@ This is a simple command bot that implements single sign-on feature to retrieve 1. Open Debug View (`Ctrl+Shift+D`) and select "Debug in Teams (Edge)" or "Debug in Teams (Chrome)" in dropdown list. 1. Press "F5" to open a browser window and then select your package to view contact exporter sample app. -- From Teams Toolkit CLI +- From Microsoft 365 Agents Toolkit CLI 1. Install [dev tunnel cli](https://aka.ms/teamsfx-install-dev-tunnel). 1. Login with your M365 Account using the command `devtunnel user login`. 1. Start your local tunnel service by running the command `devtunnel host -p 3978 --protocol http --allow-anonymous`. @@ -44,9 +44,9 @@ This is a simple command bot that implements single sign-on feature to retrieve BOT_DOMAIN=sample-id-3978.devtunnels.ms BOT_ENDPOINT=https://sample-id-3978.devtunnels.ms ``` - 1. Run command: `teamsapp provision --env local` . - 1. Run command: `teamsapp deploy --env local` . - 1. Run command: `teamsapp preview --env local` . + 1. Run command: `atk provision --env local` . + 1. Run command: `atk deploy --env local` . + 1. Run command: `atk preview --env local` . ### Deploy the app to Azure @@ -55,20 +55,20 @@ This is a simple command bot that implements single sign-on feature to retrieve - From VSCode 1. Sign in to Azure by clicking `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`. + 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 Teams Toolkit CLI - 1. Run command: `teamsapp auth login azure`. - 1. Run command: `teamsapp provision --env dev`. - 1. Run command: `teamsapp deploy --env dev`. +- 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 VSCode: 1. Once deployment is completed, you can preview the APP running in Azure. In Visual Studio Code, open `Run and Debug` and select `Launch Remote (Edge)` or `Launch Remote (Chrome)` in the dropdown list and Press `F5` or green arrow button to open a browser. -- 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 diff --git a/command-bot-with-sso/env/.env.dev b/command-bot-with-sso/env/.env.dev index 14847157a..693f2f6e7 100644 --- a/command-bot-with-sso/env/.env.dev +++ b/command-bot-with-sso/env/.env.dev @@ -4,7 +4,7 @@ TEAMSFX_ENV=dev APP_NAME_SUFFIX=dev -# Generated during provision, you can also add your own variables. If you're adding a secret value, add SECRET_ prefix to the name so Teams Toolkit can handle them properly +# Generated during provision, you can also add your own variables. If you're adding a secret value, add SECRET_ prefix to the name so Microsoft 365 Agents Toolkit can handle them properly BOT_ID= BOT_DOMAIN= AAD_APP_CLIENT_ID= diff --git a/command-bot-with-sso/teamsapp.local.yml b/command-bot-with-sso/m365agents.local.yml similarity index 99% rename from command-bot-with-sso/teamsapp.local.yml rename to command-bot-with-sso/m365agents.local.yml index 8f57c30bf..61838f016 100644 --- a/command-bot-with-sso/teamsapp.local.yml +++ b/command-bot-with-sso/m365agents.local.yml @@ -76,7 +76,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: diff --git a/command-bot-with-sso/teamsapp.yml b/command-bot-with-sso/m365agents.yml similarity index 97% rename from command-bot-with-sso/teamsapp.yml rename to command-bot-with-sso/m365agents.yml index 6af0272df..e2e1aea05 100644 --- a/command-bot-with-sso/teamsapp.yml +++ b/command-bot-with-sso/m365agents.yml @@ -50,7 +50,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. - 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: @@ -75,7 +75,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: diff --git a/command-bot-with-sso/package.json b/command-bot-with-sso/package.json index 0009bbff5..37d87201a 100644 --- a/command-bot-with-sso/package.json +++ b/command-bot-with-sso/package.json @@ -1,7 +1,7 @@ { "name": "sso-command-bot", "version": "1.0.0", - "description": "Microsoft Teams Toolkit Command and Response Bot Sample", + "description": "Microsoft 365 Agents Toolkit Command and Response Bot Sample", "author": "Microsoft", "license": "MIT", "engines": { diff --git a/command-bot-with-sso/src/adaptiveCards/helloworldCommand.json b/command-bot-with-sso/src/adaptiveCards/helloworldCommand.json index 98701c1d0..d07074608 100644 --- a/command-bot-with-sso/src/adaptiveCards/helloworldCommand.json +++ b/command-bot-with-sso/src/adaptiveCards/helloworldCommand.json @@ -21,7 +21,7 @@ }, { "type": "Action.OpenUrl", - "title": "Teams Toolkit Docs", + "title": "Microsoft 365 Agents Toolkit Docs", "url": "https://aka.ms/teamsfx-docs" } ], diff --git a/command-bot-with-sso/src/helloworldCommandHandler.ts b/command-bot-with-sso/src/helloworldCommandHandler.ts index c12021838..18c94b59f 100644 --- a/command-bot-with-sso/src/helloworldCommandHandler.ts +++ b/command-bot-with-sso/src/helloworldCommandHandler.ts @@ -23,7 +23,7 @@ export class HelloWorldCommandHandler implements TeamsFxBotCommandHandler { const cardJson = new ACData.Template(helloWorldCard).expand({ $root: { title: "Your Hello World App is Running", - body: "Congratulations! Your Hello World App is running. Open the documentation below to learn more about how to build applications with the Teams Toolkit.", + body: "Congratulations! Your Hello World App is running. Open the documentation below to learn more about how to build applications with the Microsoft 365 Agents Toolkit.", }, }); diff --git a/command-bot-with-sso/src/index.ts b/command-bot-with-sso/src/index.ts index 154cacc3e..e0d63833f 100644 --- a/command-bot-with-sso/src/index.ts +++ b/command-bot-with-sso/src/index.ts @@ -22,7 +22,7 @@ const server = expressApp.listen( // Register an API endpoint with `express`. Teams sends messages to your application // through this endpoint. // -// The Teams Toolkit bot registration configures the bot with `/api/messages` as the +// The Microsoft 365 Agents Toolkit bot registration configures the bot with `/api/messages` as the // Bot Framework endpoint. If you customize this route, update the Bot registration // in `templates/azure/provision/botservice.bicep`. // Process Teams activity with Bot Framework. diff --git a/command-bot-with-sso/src/public/auth-end.html b/command-bot-with-sso/src/public/auth-end.html index 7c8002c4a..1a6ba9d37 100644 --- a/command-bot-with-sso/src/public/auth-end.html +++ b/command-bot-with-sso/src/public/auth-end.html @@ -1,4 +1,4 @@ - + diff --git a/command-bot-with-sso/src/public/auth-start.html b/command-bot-with-sso/src/public/auth-start.html index 11f311854..938280a61 100644 --- a/command-bot-with-sso/src/public/auth-start.html +++ b/command-bot-with-sso/src/public/auth-start.html @@ -1,4 +1,4 @@ - + diff --git a/copilot-connector-app/.vscode/tasks.json b/copilot-connector-app/.vscode/tasks.json index 459604db0..1fa9a970c 100644 --- a/copilot-connector-app/.vscode/tasks.json +++ b/copilot-connector-app/.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", diff --git a/copilot-connector-app/README.md b/copilot-connector-app/README.md index 6002b0a63..e554f40a7 100644 --- a/copilot-connector-app/README.md +++ b/copilot-connector-app/README.md @@ -28,7 +28,7 @@ This sample app showcases how to build custom Copilot connector with Azure Funct - [Node.js](https://nodejs.org/), supported versions: 18, 20, 22 - An [Azure subscription](https://azure.microsoft.com/en-us/free/) - A Microsoft 365 account. If you do not have Microsoft 365 account, apply one from [Microsoft 365 developer program](https://developer.microsoft.com/en-us/microsoft-365/dev-program) -- [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 @@ -40,8 +40,8 @@ This sample app showcases how to build custom Copilot connector with Azure Funct ### Deploy the app to Azure > If you don't have an Azure subscription, create [a free account](https://azure.microsoft.com/en-us/free/) before you begin -1. Open the command palette and select `Teams: Provision`. You will be asked to select Azure resource group to provision the sample. -1. Once provision is completed, open the command palette and select `Teams: Deploy`. +1. Open the command palette and select `Microsoft 365 Agents: Provision`. You will be asked to select Azure resource group to provision the sample. +1. Once provision is completed, open the command palette and select `Microsoft 365 Agents: Deploy`. ### Launch the app in Teams 1. Once deployment is completed, you can preview the APP running in Azure. In Visual Studio Code, open `Run and Debug` and select `Launch Remote (Edge)` or `Launch Remote (Chrome)` in the dropdown list and Press `F5` or green arrow button to open a browser. diff --git a/copilot-connector-app/assets/sample.json b/copilot-connector-app/assets/sample.json index d4290c308..b2b3ddac3 100644 --- a/copilot-connector-app/assets/sample.json +++ b/copilot-connector-app/assets/sample.json @@ -12,7 +12,7 @@ "updateDateTime": "2023-10-24", "products": [ "Teams", - "TeamsToolkit" + "Microsoft 365 Agents Toolkit" ], "metadata": [ { diff --git a/copilot-connector-app/env/.env.dev b/copilot-connector-app/env/.env.dev index eebc3f37e..4236268b1 100644 --- a/copilot-connector-app/env/.env.dev +++ b/copilot-connector-app/env/.env.dev @@ -8,7 +8,7 @@ AZURE_SUBSCRIPTION_ID= AZURE_RESOURCE_GROUP_NAME= RESOURCE_SUFFIX= -# Generated during provision, you can also add your own variables. If you're adding a secret value, add SECRET_ prefix to the name so Teams Toolkit can handle them properly +# Generated during provision, you can also add your own variables. If you're adding a secret value, add SECRET_ prefix to the name so Microsoft 365 Agents Toolkit can handle them properly TEAMS_APP_ID= TEAMS_APP_TENANT_ID= AAD_APP_CLIENT_ID= diff --git a/copilot-connector-app/teamsapp.local.yml b/copilot-connector-app/m365agents.local.yml similarity index 99% rename from copilot-connector-app/teamsapp.local.yml rename to copilot-connector-app/m365agents.local.yml index c1ebc3a91..bcaa70b19 100644 --- a/copilot-connector-app/teamsapp.local.yml +++ b/copilot-connector-app/m365agents.local.yml @@ -55,7 +55,7 @@ provision: outputZipPath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip outputFolder: ./appPackage/build # 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: diff --git a/copilot-connector-app/teamsapp.yml b/copilot-connector-app/m365agents.yml similarity index 97% rename from copilot-connector-app/teamsapp.yml rename to copilot-connector-app/m365agents.yml index 0095668c9..fee005f13 100644 --- a/copilot-connector-app/teamsapp.yml +++ b/copilot-connector-app/m365agents.yml @@ -40,7 +40,7 @@ provision: - path: infra/azure.bicep # Relative path to teamsfx folder parameters: infra/azure.parameters.json # Relative path to teamsfx folder. Placeholders will be replaced with corresponding environment variable before ARM deployment. deploymentName: Create-resources-for-tab # Required when deploy ARM template - 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. # Get the deployment token from Azure Static Web Apps - uses: azureStaticWebApps/getDeploymentToken @@ -68,7 +68,7 @@ provision: outputZipPath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip outputFolder: ./appPackage/build # 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: diff --git a/copilot-connector-bot/.vscode/tasks.json b/copilot-connector-bot/.vscode/tasks.json index 8021ed8b3..3daf76b43 100644 --- a/copilot-connector-bot/.vscode/tasks.json +++ b/copilot-connector-bot/.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", diff --git a/copilot-connector-bot/README.md b/copilot-connector-bot/README.md index 67a658828..2b7d84eaa 100644 --- a/copilot-connector-bot/README.md +++ b/copilot-connector-bot/README.md @@ -29,7 +29,7 @@ This sample app showcases how to build a Teams command bot that queries custom d - [Node.js](https://nodejs.org/), supported versions: 18, 20, 22 - An [Azure subscription](https://azure.microsoft.com/en-us/free/) - An Microsoft 365 account with admin permission. If you do not have M365 account, apply one from [M365 developer program](https://developer.microsoft.com/en-us/microsoft-365/dev-program) -- [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 @@ -41,23 +41,23 @@ This sample app showcases how to build a Teams command bot that queries custom d 1. Press "F5" to open a browser window and then select your package to view sample app. 1. Find the Teams package in `build\appPackage\appPackage.local.zip`. 1. Navigate to [Teams Admin Center](https://admin.teams.microsoft.com/policies/manage-apps), and upload the Teams package. - > **Note**: If you are testing in a new debug session again, you need to delete the existing Teams app in Teams Admin Center and upload a new one, since the tunnel endpoint will change when you start a new debug session. + > **Note**: If you are testing in a new debug session again, you need to delete the existing app in Teams Admin Center and upload a new one, since the tunnel endpoint will change when you start a new debug session. ### Deploy the app to Azure > If you don't have an Azure subscription, create [a free account](https://azure.microsoft.com/en-us/free/) before you begin -1. Open the command palette and select `Teams: Provision`. You will be asked to select Azure resource group to provision the sample. -1. Once provision is completed, open the command palette and select `Teams: Deploy`. +1. Open the command palette and select `Microsoft 365 Agents: Provision`. You will be asked to select Azure resource group to provision the sample. +1. Once provision is completed, open the command palette and select `Microsoft 365 Agents: Deploy`. ### Preview the app in Teams 1. Once deployment is completed, you can preview the APP running in Azure. In Visual Studio Code, open `Run and Debug` and select `Launch Remote (Edge)` or `Launch Remote (Chrome)` in the dropdown list and Press `F5` or green arrow button to open a browser. -1. Use Teams Toolkit to [publish your Teams app to your organization](https://docs.microsoft.com/en-us/microsoftteams/platform/toolkit/publish#publish-to-your-organization). +1. Use Microsoft 365 Agents Toolkit to [publish your app to your organization](https://docs.microsoft.com/en-us/microsoftteams/platform/toolkit/publish#publish-to-your-organization). #### Usage of this sample -1. Navigate to 'Copilot connector' section of the Teams app in [Teams Admin Center](https://admin.teams.microsoft.com/policies/manage-apps), and click 'Grant permissions'. +1. Navigate to 'Copilot connector' section of the app in [Teams Admin Center](https://admin.teams.microsoft.com/policies/manage-apps), and click 'Grant permissions'. ![Grant permissions](images/grant-permission.png) diff --git a/copilot-connector-bot/adaptiveCards/welcome.json b/copilot-connector-bot/adaptiveCards/welcome.json index 59633c301..ca795332d 100644 --- a/copilot-connector-bot/adaptiveCards/welcome.json +++ b/copilot-connector-bot/adaptiveCards/welcome.json @@ -9,7 +9,7 @@ }, { "type": "TextBlock", - "text": "Congratulations! Your Copilot connector Bot is running. Click the documentation below to learn more about Microsoft Copilot connectors and the Teams Toolkit.", + "text": "Congratulations! Your Copilot connector Bot is running. Click the documentation below to learn more about Microsoft Copilot connectors and the Microsoft 365 Agents Toolkit.", "wrap": true } ], @@ -21,7 +21,7 @@ }, { "type": "Action.OpenUrl", - "title": "Teams Toolkit Docs", + "title": "Microsoft 365 Agents Toolkit Docs", "url": "https://aka.ms/teamsfx-docs" } ], diff --git a/copilot-connector-bot/assets/sample.json b/copilot-connector-bot/assets/sample.json index a41562089..d8952b52b 100644 --- a/copilot-connector-bot/assets/sample.json +++ b/copilot-connector-bot/assets/sample.json @@ -12,7 +12,7 @@ "updateDateTime": "2023-10-26", "products": [ "Teams", - "TeamsToolkit" + "Microsoft 365 Agents Toolkit" ], "metadata": [ { diff --git a/copilot-connector-bot/teamsapp.local.yml b/copilot-connector-bot/m365agents.local.yml similarity index 99% rename from copilot-connector-bot/teamsapp.local.yml rename to copilot-connector-bot/m365agents.local.yml index 727682968..ee9501134 100644 --- a/copilot-connector-bot/teamsapp.local.yml +++ b/copilot-connector-bot/m365agents.local.yml @@ -75,7 +75,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: diff --git a/copilot-connector-bot/teamsapp.yml b/copilot-connector-bot/m365agents.yml similarity index 96% rename from copilot-connector-bot/teamsapp.yml rename to copilot-connector-bot/m365agents.yml index 4edbc94c0..abf7c4227 100644 --- a/copilot-connector-bot/teamsapp.yml +++ b/copilot-connector-bot/m365agents.yml @@ -39,7 +39,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. - 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: @@ -64,7 +64,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: @@ -109,7 +109,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: diff --git a/copilot-connector-bot/package.json b/copilot-connector-bot/package.json index bad12cbe7..c08c6a079 100644 --- a/copilot-connector-bot/package.json +++ b/copilot-connector-bot/package.json @@ -1,7 +1,7 @@ { "name": "graph-connector-bot", "version": "1.0.0", - "description": "Microsoft Teams Toolkit graph-connector-bot sample", + "description": "Microsoft 365 Agents Toolkit graph-connector-bot sample", "author": "Microsoft", "license": "MIT", "engines": { diff --git a/developer-assist-dashboard/.vscode/tasks.json b/developer-assist-dashboard/.vscode/tasks.json index cf8361e02..9d7b5cf9b 100644 --- a/developer-assist-dashboard/.vscode/tasks.json +++ b/developer-assist-dashboard/.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", diff --git a/developer-assist-dashboard/README.md b/developer-assist-dashboard/README.md index 3de885989..6149062a2 100644 --- a/developer-assist-dashboard/README.md +++ b/developer-assist-dashboard/README.md @@ -32,11 +32,11 @@ Developer Assist Dashboard shows you how to build a tab with Azure DevOps work i - [Node.js](https://nodejs.org/), supported versions: 18, 20, 22 - 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 [M365 developer program](https://developer.microsoft.com/en-us/microsoft-365/dev-program) -- [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 @@ -52,10 +52,10 @@ Developer Assist Dashboard shows you how to build a tab with Azure DevOps work i Deploy your project to Azure by following these steps: -1. Open Teams Toolkit in Visual Studio Code, and sign in your Azure account by clicking the `Sign in to Azure` in the `ACCOUNTS` section from sidebar. -1. After you signed in, select a subscription under your account. The Teams Toolkit will use this subscription to provision Azure resources to host you app. -1. Open the Teams Toolkit and click `Provision` in the `LIFECYCLE` section. Alternatively open the command palette(Ctrl+Shift+P) and type: `Teams: Provision` command. -1. Open the Teams Toolkit and click `Deploy` in the `LIFECYCLE` section. Alternatively open the command palette(Ctrl+Shift+P) and type: `Teams: Deploy` command. +1. Open Microsoft 365 Agents Toolkit in Visual Studio Code, and sign in your Azure account by clicking the `Sign in to Azure` in the `ACCOUNTS` section from sidebar. +1. After you signed in, select a subscription under your account. The Microsoft 365 Agents Toolkit will use this subscription to provision Azure resources to host you app. +1. Open the Microsoft 365 Agents Toolkit and click `Provision` in the `LIFECYCLE` section. Alternatively open the command palette(Ctrl+Shift+P) and type: `Microsoft 365 Agents: Provision` command. +1. Open the Microsoft 365 Agents Toolkit and click `Deploy` in the `LIFECYCLE` section. Alternatively open the command palette(Ctrl+Shift+P) and type: `Microsoft 365 Agents: Deploy` command. > Note: Provision Azure cloud resources and deploy to Azure may cause charges to your Azure Subscription. diff --git a/developer-assist-dashboard/cli.md b/developer-assist-dashboard/cli.md index c82a56901..d410abfd3 100644 --- a/developer-assist-dashboard/cli.md +++ b/developer-assist-dashboard/cli.md @@ -1,19 +1,19 @@ -## Try sample with Teams Toolkit CLI +## Try sample with Microsoft 365 Agents Toolkit CLI 1. Install [Node.js](https://nodejs.org/en/download/) (Recommend LTS 16.x) -1. To install the Teams Toolkit CLI, use the npm package manager: +1. To install the Microsoft 365 Agents Toolkit CLI, use the npm package manager: ``` - npm install -g @microsoft/teamsapp-cli + npm install -g @microsoft/m365agentstoolkit-cli ``` 1. Create dev-assist-dashboard project. ``` - teamsapp new sample dev-assist-dashboard --interactive false + atk new sample dev-assist-dashboard --interactive false ``` 1. Provision the project to Azure. ``` - teamsapp provision + atk provision ``` 1. Deploy. ``` - teamsapp deploy + atk deploy ``` \ No newline at end of file diff --git a/developer-assist-dashboard/teamsapp.local.yml b/developer-assist-dashboard/m365agents.local.yml similarity index 99% rename from developer-assist-dashboard/teamsapp.local.yml rename to developer-assist-dashboard/m365agents.local.yml index 568103679..1740daaa7 100644 --- a/developer-assist-dashboard/teamsapp.local.yml +++ b/developer-assist-dashboard/m365agents.local.yml @@ -64,7 +64,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: diff --git a/developer-assist-dashboard/teamsapp.yml b/developer-assist-dashboard/m365agents.yml similarity index 97% rename from developer-assist-dashboard/teamsapp.yml rename to developer-assist-dashboard/m365agents.yml index ca61e8922..00a547cac 100644 --- a/developer-assist-dashboard/teamsapp.yml +++ b/developer-assist-dashboard/m365agents.yml @@ -41,7 +41,7 @@ provision: - path: ./infra/azure.bicep # Relative path to this file parameters: ./infra/azure.parameters.json # Relative path to this file. Placeholders will be replaced with corresponding environment variable before ARM deployment. deploymentName: Create-resources-for-tab # Required when deploy ARM template - 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. # Get the deployment token from Azure Static Web Apps - uses: azureStaticWebApps/getDeploymentToken @@ -74,7 +74,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: @@ -155,7 +155,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: diff --git a/graph-toolkit-contact-exporter/.vscode/tasks.json b/graph-toolkit-contact-exporter/.vscode/tasks.json index 47b045992..bad98c1dd 100644 --- a/graph-toolkit-contact-exporter/.vscode/tasks.json +++ b/graph-toolkit-contact-exporter/.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", diff --git a/graph-toolkit-contact-exporter/README.md b/graph-toolkit-contact-exporter/README.md index 8b8568df4..70147b3ef 100644 --- a/graph-toolkit-contact-exporter/README.md +++ b/graph-toolkit-contact-exporter/README.md @@ -28,7 +28,7 @@ Graph Toolkit Contact Exporter sample APP provides an easy way to export your te - [Node.js](https://nodejs.org/) version 16, 18 - 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 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 @@ -41,10 +41,10 @@ Graph Toolkit Contact Exporter sample APP provides an easy way to export your te 1. Open Debug View (`Ctrl+Shift+D`) and select "Debug in Teams (Edge)" or "Debug in Teams (Chrome)" in dropdown list. 1. Press "F5" to open a browser window and then select your package to view contact exporter sample app. -- From Teams Toolkit CLI - 1. Run command: `teamsapp provision --env local` . - 1. Run command: `teamsapp deploy --env local` . - 1. Run command: `teamsapp preview --env local` . +- From Microsoft 365 Agents Toolkit CLI + 1. Run command: `atk provision --env local` . + 1. Run command: `atk deploy --env local` . + 1. Run command: `atk preview --env local` . ### Deploy the app to Azure @@ -53,20 +53,20 @@ Graph Toolkit Contact Exporter sample APP provides an easy way to export your te - From VSCode 1. Sign in to Azure by clicking `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`. + 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 Teams Toolkit CLI - 1. Run command: `teamsapp auth login azure`. - 1. Run command: `teamsapp provision --env dev`. - 1. Run command: `teamsapp deploy --env dev`. +- 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 VSCode: 1. Once deployment is completed, you can preview the APP running in Azure. In Visual Studio Code, open `Run and Debug` and select `Launch Remote (Edge)` or `Launch Remote (Chrome)` in the dropdown list and Press `F5` or green arrow button to open a browser. -- From Teams Toolkit CLI: - 1. Run command: `teamsapp preview --env dev`. +- From Microsoft 365 Agents Toolkit CLI: + 1. Run command: `atk preview --env dev`. ### Run the app locally with proxy In some scenarios, it is helpful to skip the login and authentication flow and then provide mocked Graph API responses for development and test purpose. This sample provides a new way to debug it with proxy for mocking Graph API responses. You can customize the desired Graph API responses. diff --git a/graph-toolkit-contact-exporter/assets/sample.json b/graph-toolkit-contact-exporter/assets/sample.json index 85857c5ab..971f86606 100644 --- a/graph-toolkit-contact-exporter/assets/sample.json +++ b/graph-toolkit-contact-exporter/assets/sample.json @@ -12,7 +12,7 @@ "updateDateTime": "2023-10-13", "products": [ "Teams", - "TeamsToolkit" + "Microsoft 365 Agents Toolkit" ], "metadata": [ { diff --git a/graph-toolkit-contact-exporter/teamsapp.local.yml b/graph-toolkit-contact-exporter/m365agents.local.yml similarity index 99% rename from graph-toolkit-contact-exporter/teamsapp.local.yml rename to graph-toolkit-contact-exporter/m365agents.local.yml index 520773956..c37225a25 100644 --- a/graph-toolkit-contact-exporter/teamsapp.local.yml +++ b/graph-toolkit-contact-exporter/m365agents.local.yml @@ -59,7 +59,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: diff --git a/graph-toolkit-contact-exporter/teamsapp.yml b/graph-toolkit-contact-exporter/m365agents.yml similarity index 96% rename from graph-toolkit-contact-exporter/teamsapp.yml rename to graph-toolkit-contact-exporter/m365agents.yml index 16237f252..680998c71 100644 --- a/graph-toolkit-contact-exporter/teamsapp.yml +++ b/graph-toolkit-contact-exporter/m365agents.yml @@ -41,7 +41,7 @@ provision: - path: ./infra/azure.bicep # Relative path to this file parameters: ./infra/azure.parameters.json # Relative path to this file. Placeholders will be replaced with corresponding environment variable before ARM deployment. deploymentName: Create-resources-for-tab # Required when deploy ARM template - 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. # Get the deployment token from Azure Static Web Apps - uses: azureStaticWebApps/getDeploymentToken @@ -74,7 +74,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: @@ -120,7 +120,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: diff --git a/graph-toolkit-contact-exporter/src/components/Tab.js b/graph-toolkit-contact-exporter/src/components/Tab.js index 945adb87f..a4f5bed75 100644 --- a/graph-toolkit-contact-exporter/src/components/Tab.js +++ b/graph-toolkit-contact-exporter/src/components/Tab.js @@ -78,7 +78,7 @@ class Tab extends React.Component { const helpLink = "https://aka.ms/teamsfx-auth-code-flow"; err.message += '\nIf you see "AADSTS50011: The reply URL specified in the request does not match the reply URLs configured for the application" ' + - "in the popup window, you may be using unmatched version for TeamsFx SDK (version >= 0.5.0) and Teams Toolkit (version < 3.3.0) or " + + "in the popup window, you may be using unmatched version for TeamsFx SDK (version >= 0.5.0) and Microsoft 365 Agents Toolkit (version < 3.3.0) or " + `cli (version < 0.11.0). Please refer to the help link for how to fix the issue: ${helpLink}`; } diff --git a/graph-toolkit-one-productivity-hub/.vscode/tasks.json b/graph-toolkit-one-productivity-hub/.vscode/tasks.json index bd45ff7a9..f24cacad4 100644 --- a/graph-toolkit-one-productivity-hub/.vscode/tasks.json +++ b/graph-toolkit-one-productivity-hub/.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", diff --git a/graph-toolkit-one-productivity-hub/README.md b/graph-toolkit-one-productivity-hub/README.md index 49ec8f7d7..514e98aa0 100644 --- a/graph-toolkit-one-productivity-hub/README.md +++ b/graph-toolkit-one-productivity-hub/README.md @@ -28,7 +28,7 @@ One Productivity Hub sample shows you how to build a tab for viewing your calend - [Node.js](https://nodejs.org/) version 16, 18 - 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 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 @@ -41,10 +41,10 @@ One Productivity Hub sample shows you how to build a tab for viewing your calend 1. Open Debug View (`Ctrl+Shift+D`) and select "Debug in Teams (Edge)" or "Debug in Teams (Chrome)" in dropdown list. 1. Press "F5" to open a browser window and then select your package to view contact exporter sample app. -- From Teams Toolkit CLI - 1. Run command: `teamsapp provision --env local` . - 1. Run command: `teamsapp deploy --env local` . - 1. Run command: `teamsapp preview --env local` . +- From Microsoft 365 Agents Toolkit CLI + 1. Run command: `atk provision --env local` . + 1. Run command: `atk deploy --env local` . + 1. Run command: `atk preview --env local` . ### Deploy the app to Azure @@ -53,20 +53,20 @@ One Productivity Hub sample shows you how to build a tab for viewing your calend - From VSCode 1. Sign in to Azure by clicking `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`. + 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 Teams Toolkit CLI - 1. Run command: `teamsapp auth login azure`. - 1. Run command: `teamsapp provision --env dev`. - 1. Run command: `teamsapp deploy --env dev`. +- 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 VSCode: 1. Once deployment is completed, you can preview the APP running in Azure. In Visual Studio Code, open `Run and Debug` and select `Launch Remote (Edge)` or `Launch Remote (Chrome)` in the dropdown list and Press `F5` or green arrow button to open a browser. -- From Teams Toolkit CLI: - 1. Run command: `teamsapp preview --env dev`. +- From Microsoft 365 Agents Toolkit CLI: + 1. Run command: `atk preview --env dev`. ## Advanced usage of this sample diff --git a/graph-toolkit-one-productivity-hub/assets/sample.json b/graph-toolkit-one-productivity-hub/assets/sample.json index de60cc17f..d00848bc1 100644 --- a/graph-toolkit-one-productivity-hub/assets/sample.json +++ b/graph-toolkit-one-productivity-hub/assets/sample.json @@ -12,7 +12,7 @@ "updateDateTime": "2023-10-18", "products": [ "Teams", - "TeamsToolkit" + "Microsoft 365 Agents Toolkit" ], "metadata": [ { diff --git a/graph-toolkit-one-productivity-hub/teamsapp.local.yml b/graph-toolkit-one-productivity-hub/m365agents.local.yml similarity index 99% rename from graph-toolkit-one-productivity-hub/teamsapp.local.yml rename to graph-toolkit-one-productivity-hub/m365agents.local.yml index c0f0684e3..aa450b4ac 100644 --- a/graph-toolkit-one-productivity-hub/teamsapp.local.yml +++ b/graph-toolkit-one-productivity-hub/m365agents.local.yml @@ -59,7 +59,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: diff --git a/graph-toolkit-one-productivity-hub/teamsapp.yml b/graph-toolkit-one-productivity-hub/m365agents.yml similarity index 96% rename from graph-toolkit-one-productivity-hub/teamsapp.yml rename to graph-toolkit-one-productivity-hub/m365agents.yml index f6890542a..a4e8aa896 100644 --- a/graph-toolkit-one-productivity-hub/teamsapp.yml +++ b/graph-toolkit-one-productivity-hub/m365agents.yml @@ -41,7 +41,7 @@ provision: - path: ./infra/azure.bicep # Relative path to this file parameters: ./infra/azure.parameters.json # Relative path to this file. Placeholders will be replaced with corresponding environment variable before ARM deployment. deploymentName: Create-resources-for-tab # Required when deploy ARM template - 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. # Get the deployment token from Azure Static Web Apps - uses: azureStaticWebApps/getDeploymentToken @@ -74,7 +74,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: @@ -120,7 +120,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: diff --git a/graph-toolkit-one-productivity-hub/public/auth-end.html b/graph-toolkit-one-productivity-hub/public/auth-end.html index b876c41bc..eff555bce 100644 --- a/graph-toolkit-one-productivity-hub/public/auth-end.html +++ b/graph-toolkit-one-productivity-hub/public/auth-end.html @@ -1,4 +1,4 @@ - + diff --git a/graph-toolkit-one-productivity-hub/public/auth-start.html b/graph-toolkit-one-productivity-hub/public/auth-start.html index fdb3c3240..d3662ba30 100644 --- a/graph-toolkit-one-productivity-hub/public/auth-start.html +++ b/graph-toolkit-one-productivity-hub/public/auth-start.html @@ -1,4 +1,4 @@ - + diff --git a/graph-toolkit-one-productivity-hub/src/components/Tab.jsx b/graph-toolkit-one-productivity-hub/src/components/Tab.jsx index 016423ba5..f44d1fff0 100644 --- a/graph-toolkit-one-productivity-hub/src/components/Tab.jsx +++ b/graph-toolkit-one-productivity-hub/src/components/Tab.jsx @@ -74,7 +74,7 @@ class Tab extends React.Component { const helpLink = "https://aka.ms/teamsfx-auth-code-flow"; err.message += '\nIf you see "AADSTS50011: The reply URL specified in the request does not match the reply URLs configured for the application" ' + - "in the popup window, you may be using unmatched version for TeamsFx SDK (version >= 0.5.0) and Teams Toolkit (version < 3.3.0) or " + + "in the popup window, you may be using unmatched version for TeamsFx SDK (version >= 0.5.0) and Microsoft 365 Agents Toolkit (version < 3.3.0) or " + `cli (version < 0.11.0). Please refer to the help link for how to fix the issue: ${helpLink}`; } alert("Login failed: " + err); diff --git a/hello-world-bot-with-tab/.vscode/tasks.json b/hello-world-bot-with-tab/.vscode/tasks.json index 209f1aa1c..349182107 100644 --- a/hello-world-bot-with-tab/.vscode/tasks.json +++ b/hello-world-bot-with-tab/.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", diff --git a/hello-world-bot-with-tab/README.md b/hello-world-bot-with-tab/README.md index a520558dc..a54f51b83 100644 --- a/hello-world-bot-with-tab/README.md +++ b/hello-world-bot-with-tab/README.md @@ -6,13 +6,13 @@ This is a simple "Hello World" application that has both Bot and Tab capabilitie ## This sample illustrates -- How to use Teams Toolkit to create a Teams app with both Bot and Tab capabilities. +- How to use Microsoft 365 Agents Toolkit to create a Teams app with both Bot and Tab capabilities. ## Prerequisites - [Node.js](https://nodejs.org/), supported versions: 18, 20, 22 - An M365 account. If you do not have M365 account, apply one from [M365 developer program](https://developer.microsoft.com/en-us/microsoft-365/dev-program) -- [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 @@ -21,7 +21,7 @@ This is a simple "Hello World" application that has both Bot and Tab capabilitie - From VS Code: 1. hit `F5` to start debugging. Alternatively open the `Run and Debug Activity` Panel and select `Debug in Teams (Edge)` or `Debug in Teams (Chrome)`. -- From Teams Toolkit CLI: +- From Microsoft 365 Agents Toolkit CLI: 1. Install [dev tunnel cli](https://aka.ms/teamsfx-install-dev-tunnel). 1. Login with your M365 Account using the command `devtunnel user login`. 1. Start your local tunnel service by running the command `devtunnel host -p 3978 --protocol http --allow-anonymous`. @@ -30,35 +30,35 @@ This is a simple "Hello World" application that has both Bot and Tab capabilitie BOT_DOMAIN=sample-id-3978.devtunnels.ms BOT_ENDPOINT=https://sample-id-3978.devtunnels.ms ``` - 1. Run command: `teamsapp provision --env local` . - 1. Run command: `teamsapp deploy --env local` . - 1. Run command: `teamsapp preview --env local` . + 1. Run command: `atk provision --env local` . + 1. Run command: `atk deploy --env local` . + 1. Run command: `atk preview --env local` . ### 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`. + 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 Teams Toolkit CLI: - 1. Run command: `teamsapp auth login azure`. - 1. Run command: `teamsapp provision --env dev`. - 1. Run command: `teamsapp deploy --env dev`. +- 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 (Edge)` or `Launch Remote (Chrome)` 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`. ## Advanced usage of this sample ### Add Single Sign On feature -Microsoft Teams provides a mechanism by which an application can obtain the signed-in Teams user token to access Microsoft Graph (and other APIs). Teams Toolkit facilitates this interaction by abstracting some of the Azure Active Directory (AAD) flows and integrations behind some simple, high-level APIs. This enables you to add single sign-on (SSO) features easily to your Teams application. +Microsoft Teams provides a mechanism by which an application can obtain the signed-in Teams user token to access Microsoft Graph (and other APIs). Microsoft 365 Agents Toolkit facilitates this interaction by abstracting some of the Azure Active Directory (AAD) flows and integrations behind some simple, high-level APIs. This enables you to add single sign-on (SSO) features easily to your Teams application. Please follow this [document](https://aka.ms/teamsfx-add-sso) to add single sign on for your project. diff --git a/hello-world-bot-with-tab/bot/adaptiveCards/welcome.json b/hello-world-bot-with-tab/bot/adaptiveCards/welcome.json index f59bb0d2a..e59c511f2 100644 --- a/hello-world-bot-with-tab/bot/adaptiveCards/welcome.json +++ b/hello-world-bot-with-tab/bot/adaptiveCards/welcome.json @@ -9,7 +9,7 @@ }, { "type": "TextBlock", - "text": "Congratulations! Your hello world bot is running. Click the documentation below to learn more about Bots and the Teams Toolkit.", + "text": "Congratulations! Your hello world bot is running. Click the documentation below to learn more about Bots and the Microsoft 365 Agents Toolkit.", "wrap": true } ], @@ -21,7 +21,7 @@ }, { "type": "Action.OpenUrl", - "title": "Teams Toolkit Docs", + "title": "Microsoft 365 Agents Toolkit Docs", "url": "https://aka.ms/teamsfx-docs" } ], diff --git a/hello-world-bot-with-tab/bot/package.json b/hello-world-bot-with-tab/bot/package.json index 25c64562b..d0f1ad465 100644 --- a/hello-world-bot-with-tab/bot/package.json +++ b/hello-world-bot-with-tab/bot/package.json @@ -1,7 +1,7 @@ { "name": "hello-world-bot", "version": "1.0.0", - "description": "Microsoft Teams Toolkit hello world Bot sample", + "description": "Microsoft 365 Agents Toolkit hello world Bot sample", "engines": { "node": "18 || 20 || 22" }, diff --git a/hello-world-bot-with-tab/teamsapp.local.yml b/hello-world-bot-with-tab/m365agents.local.yml similarity index 99% rename from hello-world-bot-with-tab/teamsapp.local.yml rename to hello-world-bot-with-tab/m365agents.local.yml index 1c2659955..b23dfa24d 100644 --- a/hello-world-bot-with-tab/teamsapp.local.yml +++ b/hello-world-bot-with-tab/m365agents.local.yml @@ -62,7 +62,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: diff --git a/hello-world-bot-with-tab/teamsapp.yml b/hello-world-bot-with-tab/m365agents.yml similarity index 96% rename from hello-world-bot-with-tab/teamsapp.yml rename to hello-world-bot-with-tab/m365agents.yml index 863f4a124..4432f82b2 100644 --- a/hello-world-bot-with-tab/teamsapp.yml +++ b/hello-world-bot-with-tab/m365agents.yml @@ -39,7 +39,7 @@ provision: - path: ./infra/azure.bicep # Relative path to this file parameters: ./infra/azure.parameters.json # Relative path to this file. Placeholders will be replaced with corresponding environment variable before ARM deployment. deploymentName: Create-resources # Required when deploy ARM template - 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. - uses: teamsApp/validateManifest # Validate using manifest schema with: @@ -58,7 +58,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: @@ -123,7 +123,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: diff --git a/hello-world-bot-with-tab/tab/src/components/sample/AddSSO.tsx b/hello-world-bot-with-tab/tab/src/components/sample/AddSSO.tsx index 3fbcde1f9..5f4938d2a 100644 --- a/hello-world-bot-with-tab/tab/src/components/sample/AddSSO.tsx +++ b/hello-world-bot-with-tab/tab/src/components/sample/AddSSO.tsx @@ -18,7 +18,7 @@ export function AddSSO(props: Record) { SSO support ) and interact with Microsoft Graph for building rich and seamless user experience. With - Teams Toolkit, authentication is further simplified by automatic AAD app registration and + Microsoft 365 Agents Toolkit, authentication is further simplified by automatic AAD app registration and configuration.

@@ -34,7 +34,7 @@ export function AddSSO(props: Record) { here - ) to learn how to enable Authentication component with Teams Toolkit and code snippets. + ) to learn how to enable Authentication component with Microsoft 365 Agents Toolkit and code snippets.

); diff --git a/hello-world-in-meeting/.vscode/tasks.json b/hello-world-in-meeting/.vscode/tasks.json index f36a4ff7a..218f6380f 100644 --- a/hello-world-in-meeting/.vscode/tasks.json +++ b/hello-world-in-meeting/.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", diff --git a/hello-world-in-meeting/README.md b/hello-world-in-meeting/README.md index 5661a5cf5..074aa60db 100644 --- a/hello-world-in-meeting/README.md +++ b/hello-world-in-meeting/README.md @@ -21,14 +21,14 @@ This App helps to enable your apps for Teams meetings and configure the apps to ## This sample illustrates -- How to use Teams Toolkit to create a Teams meeting app. +- How to use Microsoft 365 Agents Toolkit to create a Teams meeting app. - How to use Teams Client Library to get context data in Teams app. ## Prerequisite to use this sample - [Node.js](https://nodejs.org/), supported versions: 18, 20, 22 - 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 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) - Follow the instruction to [create a meeting in Teams](https://support.microsoft.com/en-us/office/create-a-meeting-in-teams-for-personal-and-small-business-use-eb571219-517b-49bf-afe1-4fff091efa85). Then in the Calendar you can find the meeting you just created. Double click the meeting will open the meeting details, and will enable the meeting app to be added in this meeting in later steps. ## Minimal path to awesome @@ -46,10 +46,10 @@ This App helps to enable your apps for Teams meetings and configure the apps to Deploy your project to Azure by following these steps: -1. Open Teams Toolkit in Visual Studio Code, and sign in your Azure account by clicking the `Sign in to Azure` in the `ACCOUNTS` section from sidebar. -1. After you signed in, select a subscription under your account. The Teams Toolkit will use this subscription to provision Azure resources to host you app. -1. Open the Teams Toolkit and click `Provision` in the `LIFECYCLE` section. Alternatively open the command palette(Ctrl+Shift+P) and type: `Teams: Provision` command. -1. Open the Teams Toolkit and click `Deploy` in the `LIFECYCLE` section. Alternatively open the command palette(Ctrl+Shift+P) and type: `Teams: Deploy` command. +1. Open Microsoft 365 Agents Toolkit in Visual Studio Code, and sign in your Azure account by clicking the `Sign in to Azure` in the `ACCOUNTS` section from sidebar. +1. After you signed in, select a subscription under your account. The Microsoft 365 Agents Toolkit will use this subscription to provision Azure resources to host you app. +1. Open the Microsoft 365 Agents Toolkit and click `Provision` in the `LIFECYCLE` section. Alternatively open the command palette(Ctrl+Shift+P) and type: `Microsoft 365 Agents: Provision` command. +1. Open the Microsoft 365 Agents Toolkit and click `Deploy` in the `LIFECYCLE` section. Alternatively open the command palette(Ctrl+Shift+P) and type: `Microsoft 365 Agents: Deploy` command. > Note: Provision Azure cloud resources and deploy to Azure may cause charges to your Azure Subscription. diff --git a/hello-world-in-meeting/assets/sample.json b/hello-world-in-meeting/assets/sample.json index f8cf60f22..ae97cb997 100644 --- a/hello-world-in-meeting/assets/sample.json +++ b/hello-world-in-meeting/assets/sample.json @@ -12,7 +12,7 @@ "updateDateTime": "2023-10-13", "products": [ "Teams", - "TeamsToolkit" + "Microsoft 365 Agents Toolkit" ], "metadata": [ { diff --git a/hello-world-in-meeting/env/.env.dev b/hello-world-in-meeting/env/.env.dev index e64c9a366..396450629 100644 --- a/hello-world-in-meeting/env/.env.dev +++ b/hello-world-in-meeting/env/.env.dev @@ -9,7 +9,7 @@ AZURE_SUBSCRIPTION_ID= AZURE_RESOURCE_GROUP_NAME= RESOURCE_SUFFIX= -# Generated during provision, you can also add your own variables. If you're adding a secret value, add SECRET_ prefix to the name so Teams Toolkit can handle them properly +# Generated during provision, you can also add your own variables. If you're adding a secret value, add SECRET_ prefix to the name so Microsoft 365 Agents Toolkit can handle them properly TEAMS_APP_ID= AZURE_STATIC_WEB_APPS_RESOURCE_ID= TAB_ENDPOINT= \ No newline at end of file diff --git a/hello-world-in-meeting/teamsapp.local.yml b/hello-world-in-meeting/m365agents.local.yml similarity index 98% rename from hello-world-in-meeting/teamsapp.local.yml rename to hello-world-in-meeting/m365agents.local.yml index d0a6f0642..c91751a15 100644 --- a/hello-world-in-meeting/teamsapp.local.yml +++ b/hello-world-in-meeting/m365agents.local.yml @@ -41,7 +41,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: diff --git a/hello-world-in-meeting/teamsapp.yml b/hello-world-in-meeting/m365agents.yml similarity index 95% rename from hello-world-in-meeting/teamsapp.yml rename to hello-world-in-meeting/m365agents.yml index 2ffe9767e..4befdfec0 100644 --- a/hello-world-in-meeting/teamsapp.yml +++ b/hello-world-in-meeting/m365agents.yml @@ -24,7 +24,7 @@ provision: - path: ./infra/azure.bicep # Relative path to teamsfx folder parameters: ./infra/azure.parameters.json # Relative path to teamsfx folder. Placeholders will be replaced with corresponding environment variable before ARM deployment. deploymentName: Create-resources-for-tab # Required when deploy ARM template - 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. # Get the deployment token from Azure Static Web Apps - uses: azureStaticWebApps/getDeploymentToken @@ -52,7 +52,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: diff --git a/hello-world-office-addin/README.md b/hello-world-office-addin/README.md index 0a9ace25c..bc574fc52 100644 --- a/hello-world-office-addin/README.md +++ b/hello-world-office-addin/README.md @@ -21,12 +21,12 @@ Now you have the ability to create a single unit of distribution for all your Of - How to create an Office add-in with a unified manifest that works on Word, Excel, Powerpoint, and Outlook. > [!NOTE] -> The unified app manifest for Word, Excel, and PowerPoint is in preview. Visit [this link](aka.ms/officeversions) to check the required Office Versions. Also, publishing a unified add-in for Word, Excel, PowerPoint is not supported currently. +> The unified app manifest for Word, Excel, and PowerPoint is in preview. Visit [this link](https://aka.ms/officeversions) to check the required Office Versions. Also, publishing a unified add-in for Word, Excel, PowerPoint is not supported currently. ## Prerequisites to use this sample * Download and install [Visual Studio Code](https://visualstudio.microsoft.com/downloads/). -* [Teams Toolkit Visual Studio Code Extension version](https://aka.ms/teams-toolkit) 5.0.0 and higher or [Teams Toolkit CLI](https://aka.ms/teams-toolkit-cli) +* [Microsoft 365 Agents Toolkit Visual Studio Code Extension version](https://aka.ms/teams-toolkit) 5.0.0 and higher or [Microsoft 365 Agents Toolkit CLI](https://aka.ms/teams-toolkit-cli) * Node.js (the latest LTS version). Visit the [Node.js site](https://nodejs.org/) to download and install the right version for your operating system. To verify if you've already installed these tools, run the commands node -v and npm -v in your terminal. * Microsoft Office connected to a Microsoft 365 subscription. You might qualify for a Microsoft 365 E5 developer subscription through the [Microsoft 365 Developer Program](https://developer.microsoft.com/microsoft-365/dev-program), see [FAQ](https://learn.microsoft.com/office/developer-program/microsoft-365-developer-program-faq#who-qualifies-for-a-microsoft-365-e5-developer-subscription-) for details. Alternatively, you can [sign up for a 1-month free trial](https://www.microsoft.com/microsoft-365/try?rtc=1) or [purchase a Microsoft 365 plan](https://www.microsoft.com/microsoft-365/buy/compare-all-microsoft-365-products). @@ -34,7 +34,7 @@ Now you have the ability to create a single unit of distribution for all your Of ### Debug Office add-in -Please note that the same M365 account should be used both in Teams Toolkit and Office Applications (Word, Excel, Powerpoint, Outlook). +Please note that the same M365 account should be used both in Microsoft 365 Agents Toolkit and Office Applications (Word, Excel, Powerpoint, Outlook). The following steps show Excel as an example, and the other Office applications share the same behavior. - From Visual Studio Code only: use the `Run and Debug Activity Panel` in Visual Studio Code, select `Debug in Excel Desktop (Edge Chromium)`, and click the `Run and Debug` green arrow button. Please run VSCode as administrator if localhost loopback for Microsoft Edge Webview hasn't been enabled. Once enbaled, administrator priviledge is no longer required. @@ -56,8 +56,8 @@ You may add any extra properties or permissions you require to this file. See th To check that your manifest file is valid: -- From Visual Studio Code: open the command palette and select: `Teams: Validate Application` and select `Validate using manifest schema`. -- From Teams Toolkit CLI: run command `teamsapp validate` in your project directory. +- From Visual Studio Code: open the command palette and select: `Microsoft 365 Agents: Validate Application` and select `Validate using manifest schema`. +- From Microsoft 365 Agents Toolkit CLI: run command `atk validate` in your project directory. ## Version History diff --git a/hello-world-office-addin/teamsapp.yml b/hello-world-office-addin/m365agents.yml similarity index 96% rename from hello-world-office-addin/teamsapp.yml rename to hello-world-office-addin/m365agents.yml index f78bbf090..dbe4cb62a 100644 --- a/hello-world-office-addin/teamsapp.yml +++ b/hello-world-office-addin/m365agents.yml @@ -28,7 +28,7 @@ provision: parameters: ./infra/azure.parameters.json # Required when deploying ARM template deploymentName: Create-resources-for-tab - # Teams Toolkit will download this bicep CLI version from github for you, + # 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. bicepCliVersion: v0.9.1 diff --git a/hello-world-tab-codespaces/.vscode/tasks.json b/hello-world-tab-codespaces/.vscode/tasks.json index ae7c3a60e..c3841dca8 100644 --- a/hello-world-tab-codespaces/.vscode/tasks.json +++ b/hello-world-tab-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", diff --git a/hello-world-tab-codespaces/README.md b/hello-world-tab-codespaces/README.md index c4d530373..dcf321a27 100644 --- a/hello-world-tab-codespaces/README.md +++ b/hello-world-tab-codespaces/README.md @@ -9,7 +9,7 @@ Hello World Tab shows you how to build a tab app without single sign on. ![Hello world Tab in Teams](https://learn.microsoft.com/en-us/microsoftteams/platform/assets/images/teams-toolkit-v2/first-tab/tab-app-localdebug.png) ## This sample illustrates -- How to use Teams Toolkit build a Teams tab app. +- How to use Microsoft 365 Agents Toolkit build a Teams tab app. - How to use [Codespaces](https://github.com/features/codespaces) to run and preview a Tab app in Teams. ## Prerequisite to use this sample @@ -23,7 +23,7 @@ Hello World Tab shows you how to build a tab app without single sign on. > 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. @@ -34,18 +34,18 @@ Hello World Tab shows you how to build a tab app without single sign on. ### 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| diff --git a/hello-world-tab-codespaces/teamsapp.local.yml b/hello-world-tab-codespaces/m365agents.local.yml similarity index 98% rename from hello-world-tab-codespaces/teamsapp.local.yml rename to hello-world-tab-codespaces/m365agents.local.yml index 3785ff6e6..7bd2ce5ad 100644 --- a/hello-world-tab-codespaces/teamsapp.local.yml +++ b/hello-world-tab-codespaces/m365agents.local.yml @@ -40,7 +40,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: diff --git a/hello-world-tab-codespaces/teamsapp.yml b/hello-world-tab-codespaces/m365agents.yml similarity index 95% rename from hello-world-tab-codespaces/teamsapp.yml rename to hello-world-tab-codespaces/m365agents.yml index f04fad7f3..54a632bac 100644 --- a/hello-world-tab-codespaces/teamsapp.yml +++ b/hello-world-tab-codespaces/m365agents.yml @@ -26,7 +26,7 @@ provision: - path: ./infra/azure.bicep # Relative path to this file parameters: ./infra/azure.parameters.json # Relative path to this file. Placeholders will be replaced with corresponding environment variable before ARM deployment. deploymentName: Create-resources-for-tab # Required when deploy ARM template - 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. # Get the deployment token from Azure Static Web Apps - uses: azureStaticWebApps/getDeploymentToken @@ -54,7 +54,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: @@ -99,7 +99,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: diff --git a/hello-world-tab-codespaces/src/components/sample/AddSSO.jsx b/hello-world-tab-codespaces/src/components/sample/AddSSO.jsx index 565ec7974..300998562 100644 --- a/hello-world-tab-codespaces/src/components/sample/AddSSO.jsx +++ b/hello-world-tab-codespaces/src/components/sample/AddSSO.jsx @@ -18,7 +18,7 @@ export function AddSSO(props) { SSO support ) and interact with Microsoft Graph for building rich and seamless user - experience. With Teams Toolkit, authentication is further simplified by + experience. With Microsoft 365 Agents Toolkit, authentication is further simplified by automatic AAD app registration and configuration.

@@ -35,7 +35,7 @@ export function AddSSO(props) { here - ) to learn how to enable Authentication component with Teams Toolkit and + ) to learn how to enable Authentication component with Microsoft 365 Agents Toolkit and code snippets.

diff --git a/hello-world-tab-docker/.dockerignore b/hello-world-tab-docker/.dockerignore index 53cef1673..aa97379ae 100644 --- a/hello-world-tab-docker/.dockerignore +++ b/hello-world-tab-docker/.dockerignore @@ -10,4 +10,4 @@ aad.manifest.json *.md compose*.yaml Dockerfile -teamsapp*.yml +m365agents*.yml diff --git a/hello-world-tab-docker/.vscode/tasks.json b/hello-world-tab-docker/.vscode/tasks.json index e2684e0de..68de5d0e4 100644 --- a/hello-world-tab-docker/.vscode/tasks.json +++ b/hello-world-tab-docker/.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", diff --git a/hello-world-tab-docker/README.md b/hello-world-tab-docker/README.md index dfa7ac9ff..2ed8354b5 100644 --- a/hello-world-tab-docker/README.md +++ b/hello-world-tab-docker/README.md @@ -22,7 +22,7 @@ Hello World Tab with Backend shows you how to build a tab app with an Azure Func ## This sample illustrates -- How to use Teams Toolkit to create a Teams tab app. +- How to use Microsoft 365 Agents Toolkit to create a Teams tab app. - How to use TeamsFx SDK to call Azure Functions. - How to use TeamsFx SDK in Azure Function to call Graph to get user info. - How to develop Teams tab app in Docker. @@ -31,7 +31,7 @@ Hello World Tab with Backend shows you how to build a tab app with an Azure Func - [Docker Engine](https://docs.docker.com/engine/install/) - A Microsoft 365 account. If you do not have Microsoft 365 account, apply one from [Microsoft 365 developer program](https://developer.microsoft.com/en-us/microsoft-365/dev-program) -- [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) - [Azure Cli](https://learn.microsoft.com/cli/azure/install-azure-cli) for Azure Container Apps deployment # Note @@ -47,7 +47,7 @@ Teams applications can be developed and run locally using containerization, whic ### How to containerize -This sample demonstrate how to containerize a Teams App and integrate the Docker container into Teams Toolkit development lifecycle, which can serve as reference for your containerization process. +This sample demonstrate how to containerize a Teams App and integrate the Docker container into Microsoft 365 Agents Toolkit development lifecycle, which can serve as reference for your containerization process. - **Write a Dockerfile**: Create a Dockerfile that specifies the build instructions for your container image. Refer to this [Dockerfile example](./Dockerfile) @@ -57,7 +57,7 @@ This sample demonstrate how to containerize a Teams App and integrate the Docker - **Provision Infrastructure**: Automate the provisioning of Azure Container Apps and Azure Container Registry using Bicep templates. Refer to this [Azure Bicep example](./infra/azure.bicep). -- **Build and Deploy to ACA**: Using Azure CLI, build and push the Docker image to Azure Container Registry, then deploy it to Azure Container Apps. Refer to the deployment scripts in this [teamsapp.yml example](./teamsapp.yml). +- **Build and Deploy to ACA**: Using Azure CLI, build and push the Docker image to Azure Container Registry, then deploy it to Azure Container Apps. Refer to the deployment scripts in this [m365agents.yml example](./m365agents.yml). ## Minimal path to awesome @@ -66,32 +66,32 @@ This sample demonstrate how to containerize a Teams App and integrate the Docker - From VS Code: 1. hit `F5` to start debugging. Alternatively open the `Run and Debug Activity` Panel and select `Debug in Teams (Edge)` or `Debug in Teams (Chrome)`. -- From Teams Toolkit CLI: - 1. Run command: `teamsapp provision --env local` . +- From Microsoft 365 Agents Toolkit CLI: + 1. Run command: `atk provision --env local` . 1. Run command: `docker compose -f ./docker-compose.yml up -d` . - 1. Run command: `teamsapp preview --open-only` . + 1. Run command: `atk preview --open-only` . ### 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 `Provision` from `LIFECYCLE` section or open the command palette and select: `Microsoft 365 Agents: Provision` . 1. Login Azure CLI with commands: `az login` and `az account set -s ` . - 1. Click `Deploy` or open the command palette and select: `Teams: Deploy` . + 1. Click `Deploy` or open the command palette and select: `Microsoft 365 Agents: Deploy` . -- From Teams Toolkit CLI: - 1. Run command: `teamsapp auth login azure` . - 1. Run command: `teamsapp provision --env dev` . +- From Microsoft 365 Agents Toolkit CLI: + 1. Run command: `atk auth login azure` . + 1. Run command: `atk provision --env dev` . 1. Run command: `az login` . - 1. Run command: `teamsapp deploy --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 (Edge)` or `Launch Remote (Chrome)` 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`. ## Further reading diff --git a/hello-world-tab-docker/api/README.md b/hello-world-tab-docker/api/README.md index b374a73de..f757f0634 100644 --- a/hello-world-tab-docker/api/README.md +++ b/hello-world-tab-docker/api/README.md @@ -6,11 +6,11 @@ Azure Functions are a great way to add server-side behaviors to any Teams applic - [Docker Engine](https://docs.docker.com/engine/install/) - A Microsoft 365 account. If you do not have Microsoft 365 account, apply one from [Microsoft 365 developer program](https://developer.microsoft.com/en-us/microsoft-365/dev-program) -- [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) ## Develop -The Teams Toolkit IDE Extension and Teams Toolkit CLI provide template code for you to get started with Azure Functions for your Teams application. Microsoft Teams Framework simplifies the task of establishing the user's identity within the Azure Function. +The Microsoft 365 Agents Toolkit IDE Extension and Microsoft 365 Agents Toolkit CLI provide template code for you to get started with Azure Functions for your Teams application. Microsoft Teams Framework simplifies the task of establishing the user's identity within the Azure Function. The template handles calls from your Teams "custom tab" (client-side of your app), initializes the TeamsFx SDK to access the current user context, and demonstrates how to obtain a pre-authenticated Microsoft Graph Client. Microsoft Graph is the "data plane" of Microsoft 365 - you can use it to access content within Microsoft 365 in your company. With it you can read and write documents, SharePoint collections, Teams channels, and many other entities within Microsoft 365. Read more about [Microsoft Graph](https://docs.microsoft.com/en-us/graph/overview). @@ -35,13 +35,13 @@ const response = await fetch(`${functionEndpoint}/api/${functionName}`, { ### Add More Functions -- From Visual Studio Code, open the command palette, select `Teams: Add Resources` and select `Azure Function App`. -- From Teams Toolkit CLI: run command `teamsapp resource add azure-function --function-name ` in your project directory. +- From Visual Studio Code, open the command palette, select `Microsoft 365 Agents: Add Resources` and select `Azure Function App`. +- From Microsoft 365 Agents Toolkit CLI: run command `atk resource add azure-function --function-name ` in your project directory. ## Debug - From Visual Studio Code: Start debugging the project by hitting the `F5` key in Visual Studio Code. Alternatively use the `Run and Debug Activity Panel` in Visual Studio Code and click the `Start Debugging` green arrow button. -- From Teams Toolkit CLI: Start debugging the project by executing the command `teamsapp preview --local` in your project directory. +- From Microsoft 365 Agents Toolkit CLI: Start debugging the project by executing the command `atk preview --local` in your project directory. ## Edit the manifest @@ -54,9 +54,9 @@ This file contains template arguments with `${{...}}` statements which will be r Deploy your project to Azure by following these steps: -| From Visual Studio Code | From Teams Toolkit CLI | +| From Visual Studio Code | From Microsoft 365 Agents Toolkit CLI | | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -|
  • Open Teams Toolkit, and sign into Azure by clicking the `Sign in to Azure` under the `ACCOUNTS` section from sidebar.
  • After you signed in, select a subscription under your account.
  • Open the command palette and select: `Teams: Provision`.
  • Open the command palette and select: `Teams: Deploy`.
|
  • Run command `teamsapp auth login azure`.
  • Run command `teamsapp auth set --subscription `.
  • Run command `teamsapp provision`.
  • Run command `teamsapp deploy`.
| +|
  • Open Microsoft 365 Agents Toolkit, and sign into Azure by clicking the `Sign in to Azure` under the `ACCOUNTS` section from sidebar.
  • After you signed in, select a subscription under your account.
  • Open the command palette and select: `Microsoft 365 Agents: Provision`.
  • Open the command palette and select: `Microsoft 365 Agents: Deploy`.
|
  • Run command `atk auth login azure`.
  • Run command `atk auth set --subscription `.
  • Run command `atk provision`.
  • Run command `atk deploy`.
| > Note: Provisioning and deployment may incur charges to your Azure Subscription. @@ -70,23 +70,23 @@ Once the provisioning and deployment steps are finished, you can preview your ap 1. Select `Launch Remote (Edge)` or `Launch Remote (Chrome)` from the launch configuration drop-down. 1. Press the Play (green arrow) button to launch your app - now running remotely from Azure. -- From Teams Toolkit CLI: execute `teamsapp preview --remote` in your project directory to launch your application. +- From Microsoft 365 Agents Toolkit CLI: execute `atk preview --remote` in your project directory to launch your application. ## Validate manifest file To check that your manifest file is valid: -- From Visual Studio Code: open the command palette and select: `Teams: Validate manifest file`. -- From Teams Toolkit CLI: run command `teamsapp validate` in your project directory. +- From Visual Studio Code: open the command palette and select: `Microsoft 365 Agents: Validate manifest file`. +- From Microsoft 365 Agents Toolkit CLI: run command `atk validate` in your project directory. ## Package -- From Visual Studio Code: open the command palette and select `Teams: Zip Teams metadata package`. -- Alternatively, from the command line run `teamsapp package` in the project directory. +- From Visual Studio Code: open the command palette and select `Microsoft 365 Agents: Zip Teams metadata package`. +- Alternatively, from the command line run `atk package` in the project directory. ## Publish to Teams Once deployed, you may want to distribute your application to your organization's internal app store in Teams. Your app will be submitted for admin approval. -- From Visual Studio Code: open the command palette and select: `Teams: Publish to Teams`. -- From Teams Toolkit CLI: run command `teamsapp publish` in your project directory. +- From Visual Studio Code: open the command palette and select: `Microsoft 365 Agents: Publish to Teams`. +- From Microsoft 365 Agents Toolkit CLI: run command `atk publish` in your project directory. diff --git a/hello-world-tab-docker/assets/sample.json b/hello-world-tab-docker/assets/sample.json index 9f18435d4..ba04de952 100644 --- a/hello-world-tab-docker/assets/sample.json +++ b/hello-world-tab-docker/assets/sample.json @@ -12,7 +12,7 @@ "updateDateTime": "2024-02-27", "products": [ "Teams", - "TeamsToolkit" + "Microsoft 365 Agents Toolkit" ], "metadata": [ { diff --git a/hello-world-tab-docker/cli.md b/hello-world-tab-docker/cli.md index 48deffc28..24077a89c 100644 --- a/hello-world-tab-docker/cli.md +++ b/hello-world-tab-docker/cli.md @@ -1,17 +1,17 @@ -## Try sample with Teams Toolkit CLI +## Try sample with Microsoft 365 Agents Toolkit CLI 1. Install [Node.js](https://nodejs.org/download/) -1. To install the Teams Toolkit CLI, use the npm package manager: +1. To install the Microsoft 365 Agents Toolkit CLI, use the npm package manager: ``` - npm install -g @microsoft/teamsapp-cli + npm install -g @microsoft/m365agentstoolkit-cli ``` 1. Create hello-world-tab project. ``` - teamsapp new sample hello-world-tab-docker --interactive false + atk new sample hello-world-tab-docker --interactive false ``` 1. Provision the project to Azure. ``` - teamsapp provision + atk provision ``` 1. Install [Azure CLI](https://learn.microsoft.com/cli/azure/install-azure-cli) 1. Login to Azure CLI. @@ -20,5 +20,5 @@ ``` 1. Deploy. ``` - teamsapp deploy + atk deploy ``` \ No newline at end of file diff --git a/hello-world-tab-docker/env/.env.dev b/hello-world-tab-docker/env/.env.dev index 44b3d685e..611a5918c 100644 --- a/hello-world-tab-docker/env/.env.dev +++ b/hello-world-tab-docker/env/.env.dev @@ -9,7 +9,7 @@ AZURE_SUBSCRIPTION_ID= AZURE_RESOURCE_GROUP_NAME= RESOURCE_SUFFIX= -# Generated during provision, you can also add your own variables. If you're adding a secret value, add SECRET_ prefix to the name so Teams Toolkit can handle them properly +# Generated during provision, you can also add your own variables. If you're adding a secret value, add SECRET_ prefix to the name so Microsoft 365 Agents Toolkit can handle them properly TEAMS_APP_ID= TEAMS_APP_TENANT_ID= AAD_APP_CLIENT_ID= diff --git a/hello-world-tab-docker/teamsapp.local.yml b/hello-world-tab-docker/m365agents.local.yml similarity index 99% rename from hello-world-tab-docker/teamsapp.local.yml rename to hello-world-tab-docker/m365agents.local.yml index 2d357ac19..006dc6859 100644 --- a/hello-world-tab-docker/teamsapp.local.yml +++ b/hello-world-tab-docker/m365agents.local.yml @@ -58,7 +58,7 @@ provision: outputZipPath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip outputFolder: ./appPackage/build # 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: diff --git a/hello-world-tab-docker/teamsapp.yml b/hello-world-tab-docker/m365agents.yml similarity index 97% rename from hello-world-tab-docker/teamsapp.yml rename to hello-world-tab-docker/m365agents.yml index 7779410f6..33210fd0e 100644 --- a/hello-world-tab-docker/teamsapp.yml +++ b/hello-world-tab-docker/m365agents.yml @@ -41,7 +41,7 @@ provision: - path: infra/azure.bicep # Relative path to teamsfx folder parameters: infra/azure.parameters.json # Relative path to teamsfx folder. Placeholders will be replaced with corresponding environment variable before ARM deployment. deploymentName: Create-resources-for-tab # Required when deploy ARM template - 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. - 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: @@ -61,7 +61,7 @@ provision: outputZipPath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip outputFolder: ./appPackage/build # 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: @@ -129,7 +129,7 @@ publish: outputZipPath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip outputFolder: ./appPackage/build # 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: diff --git a/hello-world-tab-with-backend/.vscode/tasks.json b/hello-world-tab-with-backend/.vscode/tasks.json index a94b029ad..eece81c0e 100644 --- a/hello-world-tab-with-backend/.vscode/tasks.json +++ b/hello-world-tab-with-backend/.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", diff --git a/hello-world-tab-with-backend/README.md b/hello-world-tab-with-backend/README.md index 5f850c87e..a641e7a1b 100644 --- a/hello-world-tab-with-backend/README.md +++ b/hello-world-tab-with-backend/README.md @@ -23,7 +23,7 @@ Hello World Tab with Backend shows you how to build a tab app with an Azure Func ## This sample illustrates -- How to use Teams Toolkit to create a Teams tab app. +- How to use Microsoft 365 Agents Toolkit to create a Teams tab app. - How to use TeamsFx SDK to call Azure Functions. - How to use TeamsFx SDK in Azure Function to call Graph to get user info. @@ -31,7 +31,7 @@ Hello World Tab with Backend shows you how to build a tab app with an Azure Func - [Node.js](https://nodejs.org/), supported versions: 18, 20, 22 - A Microsoft 365 account. If you do not have Microsoft 365 account, apply one from [Microsoft 365 developer program](https://developer.microsoft.com/en-us/microsoft-365/dev-program) -- [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) # Note - This sample has adopted [On-Behalf-Of Flow](https://learn.microsoft.com/en-us/azure/active-directory/develop/v2-oauth2-on-behalf-of-flow) to implement SSO. @@ -47,30 +47,30 @@ Hello World Tab with Backend shows you how to build a tab app with an Azure Func - From VS Code: 1. hit `F5` to start debugging. Alternatively open the `Run and Debug Activity` Panel and select `Debug in Teams (Edge)` or `Debug in Teams (Chrome)`. -- From Teams Toolkit CLI: - 1. Run command: `teamsapp provision --env local` . - 1. Run command: `teamsapp deploy --env local` . - 1. Run command: `teamsapp preview --env local` . +- From Microsoft 365 Agents Toolkit CLI: + 1. Run command: `atk provision --env local` . + 1. Run command: `atk deploy --env local` . + 1. Run command: `atk preview --env local` . ### 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`. + 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 Teams Toolkit CLI: - 1. Run command: `teamsapp auth login azure`. - 1. Run command: `teamsapp provision --env dev`. - 1. Run command: `teamsapp deploy --env dev`. +- 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 (Edge)` or `Launch Remote (Chrome)` 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`. ### Run the app locally with proxy In some scenarios, it is helpful to skip the login and authentication flow and then provide mocked Graph API responses for development and test purpose. This sample provides a new way to debug it with proxy for mocking Graph API responses. You can customize the desired Graph API responses. diff --git a/hello-world-tab-with-backend/api/README.md b/hello-world-tab-with-backend/api/README.md index a9f3dec09..05eb71f8e 100644 --- a/hello-world-tab-with-backend/api/README.md +++ b/hello-world-tab-with-backend/api/README.md @@ -6,11 +6,11 @@ Azure Functions are a great way to add server-side behaviors to any Teams applic - [Node.js](https://nodejs.org/), supported versions: 18, 20, 22 - A Microsoft 365 account. If you do not have Microsoft 365 account, apply one from [Microsoft 365 developer program](https://developer.microsoft.com/en-us/microsoft-365/dev-program) -- [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) ## Develop -The Teams Toolkit IDE Extension and Teams Toolkit CLI provide template code for you to get started with Azure Functions for your Teams application. Microsoft Teams Framework simplifies the task of establishing the user's identity within the Azure Function. +The Microsoft 365 Agents Toolkit IDE Extension and Microsoft 365 Agents Toolkit CLI provide template code for you to get started with Azure Functions for your Teams application. Microsoft Teams Framework simplifies the task of establishing the user's identity within the Azure Function. The template handles calls from your Teams "custom tab" (client-side of your app), initializes the TeamsFx SDK to access the current user context, and demonstrates how to obtain a pre-authenticated Microsoft Graph Client. Microsoft Graph is the "data plane" of Microsoft 365 - you can use it to access content within Microsoft 365 in your company. With it you can read and write documents, SharePoint collections, Teams channels, and many other entities within Microsoft 365. Read more about [Microsoft Graph](https://docs.microsoft.com/en-us/graph/overview). @@ -35,12 +35,12 @@ const response = await fetch(`${functionEndpoint}/api/${functionName}`, { ### Add More Functions -- From Visual Studio Code, open the command palette, select `Teams: Add Resources` and select `Azure Function App`. -- From Teams Toolkit CLI: run command `teamsapp resource add azure-function --function-name ` in your project directory. +- From Visual Studio Code, open the command palette, select `Microsoft 365 Agents: Add Resources` and select `Azure Function App`. +- From Microsoft 365 Agents Toolkit CLI: run command `atk resource add azure-function --function-name ` in your project directory. ## Change Node.js runtime version -By default, Teams Toolkit and Teams Toolkit CLI will provision an Azure function app with function runtime version 3, and node runtime version 12. You can change the node version through Azure Portal. +By default, Microsoft 365 Agents Toolkit and Microsoft 365 Agents Toolkit CLI will provision an Azure function app with function runtime version 3, and node runtime version 12. You can change the node version through Azure Portal. - Sign in to [Azure Portal](https://azure.microsoft.com/). - Find your application's resource group and Azure Function app resource. The resource group name and the Azure function app name are stored in your project configuration file `.fx/env.*.json`. You can find them by searching the key `resourceGroupName` and `functionAppName` in that file. @@ -53,7 +53,7 @@ Then following requests sent to the Azure function app will be handled by new no ## Debug - From Visual Studio Code: Start debugging the project by hitting the `F5` key in Visual Studio Code. Alternatively use the `Run and Debug Activity Panel` in Visual Studio Code and click the `Start Debugging` green arrow button. -- From Teams Toolkit CLI: Start debugging the project by executing the command `teamsapp preview --local` in your project directory. +- From Microsoft 365 Agents Toolkit CLI: Start debugging the project by executing the command `atk preview --local` in your project directory. ## Edit the manifest @@ -66,9 +66,9 @@ This file contains template arguments with `${{...}}` statements which will be r Deploy your project to Azure by following these steps: -| From Visual Studio Code | From Teams Toolkit CLI | +| From Visual Studio Code | From Microsoft 365 Agents Toolkit CLI | | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -|
  • Open Teams Toolkit, and sign into Azure by clicking the `Sign in to Azure` under the `ACCOUNTS` section from sidebar.
  • After you signed in, select a subscription under your account.
  • Open the command palette and select: `Teams: Provision`.
  • Open the command palette and select: `Teams: Deploy`.
|
  • Run command `teamsapp auth login azure`.
  • Run command `teamsapp auth set --subscription `.
  • Run command `teamsapp provision`.
  • Run command `teamsapp deploy`.
| +|
  • Open Microsoft 365 Agents Toolkit, and sign into Azure by clicking the `Sign in to Azure` under the `ACCOUNTS` section from sidebar.
  • After you signed in, select a subscription under your account.
  • Open the command palette and select: `Microsoft 365 Agents: Provision`.
  • Open the command palette and select: `Microsoft 365 Agents: Deploy`.
|
  • Run command `atk auth login azure`.
  • Run command `atk auth set --subscription `.
  • Run command `atk provision`.
  • Run command `atk deploy`.
| > Note: Provisioning and deployment may incur charges to your Azure Subscription. @@ -82,23 +82,23 @@ Once the provisioning and deployment steps are finished, you can preview your ap 1. Select `Launch Remote (Edge)` or `Launch Remote (Chrome)` from the launch configuration drop-down. 1. Press the Play (green arrow) button to launch your app - now running remotely from Azure. -- From Teams Toolkit CLI: execute `teamsapp preview --remote` in your project directory to launch your application. +- From Microsoft 365 Agents Toolkit CLI: execute `atk preview --remote` in your project directory to launch your application. ## Validate manifest file To check that your manifest file is valid: -- From Visual Studio Code: open the command palette and select: `Teams: Validate manifest file`. -- From Teams Toolkit CLI: run command `teamsapp validate` in your project directory. +- From Visual Studio Code: open the command palette and select: `Microsoft 365 Agents: Validate manifest file`. +- From Microsoft 365 Agents Toolkit CLI: run command `atk validate` in your project directory. ## Package -- From Visual Studio Code: open the command palette and select `Teams: Zip Teams metadata package`. -- Alternatively, from the command line run `teamsapp package` in the project directory. +- From Visual Studio Code: open the command palette and select `Microsoft 365 Agents: Zip Teams metadata package`. +- Alternatively, from the command line run `atk package` in the project directory. ## Publish to Teams Once deployed, you may want to distribute your application to your organization's internal app store in Teams. Your app will be submitted for admin approval. -- From Visual Studio Code: open the command palette and select: `Teams: Publish to Teams`. -- From Teams Toolkit CLI: run command `teamsapp publish` in your project directory. +- From Visual Studio Code: open the command palette and select: `Microsoft 365 Agents: Publish to Teams`. +- From Microsoft 365 Agents Toolkit CLI: run command `atk publish` in your project directory. diff --git a/hello-world-tab-with-backend/assets/sample.json b/hello-world-tab-with-backend/assets/sample.json index 64b37e24c..913f887e6 100644 --- a/hello-world-tab-with-backend/assets/sample.json +++ b/hello-world-tab-with-backend/assets/sample.json @@ -12,7 +12,7 @@ "updateDateTime": "2023-10-24", "products": [ "Teams", - "TeamsToolkit" + "Microsoft 365 Agents Toolkit" ], "metadata": [ { diff --git a/hello-world-tab-with-backend/cli.md b/hello-world-tab-with-backend/cli.md index aaaad9129..541d36055 100644 --- a/hello-world-tab-with-backend/cli.md +++ b/hello-world-tab-with-backend/cli.md @@ -1,19 +1,19 @@ -## Try sample with Teams Toolkit CLI +## Try sample with Microsoft 365 Agents Toolkit CLI 1. Install [Node.js](https://nodejs.org/en/download/) (use the latest v14 LTS release) -1. To install the Teams Toolkit CLI, use the npm package manager: +1. To install the Microsoft 365 Agents Toolkit CLI, use the npm package manager: ``` - npm install -g @microsoft/teamsapp-cli + npm install -g @microsoft/m365agentstoolkit-cli ``` 1. Create hello-world-tab project. ``` - teamsapp new sample hello-world-tab-with-backend --interactive false + atk new sample hello-world-tab-with-backend --interactive false ``` 1. Provision the project to Azure. ``` - teamsapp provision + atk provision ``` 1. Deploy. ``` - teamsapp deploy + atk deploy ``` \ No newline at end of file diff --git a/hello-world-tab-with-backend/env/.env.dev b/hello-world-tab-with-backend/env/.env.dev index c1b6de2b7..8d81f57ea 100644 --- a/hello-world-tab-with-backend/env/.env.dev +++ b/hello-world-tab-with-backend/env/.env.dev @@ -9,7 +9,7 @@ AZURE_SUBSCRIPTION_ID= AZURE_RESOURCE_GROUP_NAME= RESOURCE_SUFFIX= -# Generated during provision, you can also add your own variables. If you're adding a secret value, add SECRET_ prefix to the name so Teams Toolkit can handle them properly +# Generated during provision, you can also add your own variables. If you're adding a secret value, add SECRET_ prefix to the name so Microsoft 365 Agents Toolkit can handle them properly TEAMS_APP_ID= TEAMS_APP_TENANT_ID= AAD_APP_CLIENT_ID= diff --git a/hello-world-tab-with-backend/teamsapp.local.yml b/hello-world-tab-with-backend/m365agents.local.yml similarity index 99% rename from hello-world-tab-with-backend/teamsapp.local.yml rename to hello-world-tab-with-backend/m365agents.local.yml index 41c3454da..df6089a6c 100644 --- a/hello-world-tab-with-backend/teamsapp.local.yml +++ b/hello-world-tab-with-backend/m365agents.local.yml @@ -58,7 +58,7 @@ provision: outputZipPath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip outputFolder: ./appPackage/build # 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: diff --git a/hello-world-tab-with-backend/teamsapp.yml b/hello-world-tab-with-backend/m365agents.yml similarity index 96% rename from hello-world-tab-with-backend/teamsapp.yml rename to hello-world-tab-with-backend/m365agents.yml index 2daf26970..4e0c3812c 100644 --- a/hello-world-tab-with-backend/teamsapp.yml +++ b/hello-world-tab-with-backend/m365agents.yml @@ -39,7 +39,7 @@ provision: - path: infra/azure.bicep # Relative path to teamsfx folder parameters: infra/azure.parameters.json # Relative path to teamsfx folder. Placeholders will be replaced with corresponding environment variable before ARM deployment. deploymentName: Create-resources-for-tab # Required when deploy ARM template - 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. # Get the deployment token from Azure Static Web Apps - uses: azureStaticWebApps/getDeploymentToken @@ -67,7 +67,7 @@ provision: outputZipPath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip outputJsonPath: ./appPackage/build/manifest.${{TEAMSFX_ENV}}.json # 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: @@ -128,7 +128,7 @@ publish: outputZipPath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip outputJsonPath: ./appPackage/build/manifest.${{TEAMSFX_ENV}}.json # 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: diff --git a/hello-world-tab-with-backend/src/components/HookForProxy.tsx b/hello-world-tab-with-backend/src/components/HookForProxy.tsx index 8cfb6d6ac..8b2d4b487 100644 --- a/hello-world-tab-with-backend/src/components/HookForProxy.tsx +++ b/hello-world-tab-with-backend/src/components/HookForProxy.tsx @@ -28,7 +28,7 @@ if (shouldHookForProxy()) { } // Function extension will check the expiration time of the token, so set it to maximum timestamp. -// The function extension will check the azp claim of the token, so set it to a valid value which should be contained in the ALLOWED_APP_IDS in teamsapp.local.yml. +// The function extension will check the azp claim of the token, so set it to a valid value which should be contained in the ALLOWED_APP_IDS in m365agents.local.yml. function generateMockedAccessToken(): string { const header = { typ: "JWT", diff --git a/hello-world-teams-tab-and-outlook-add-in/.vscode/tasks.json b/hello-world-teams-tab-and-outlook-add-in/.vscode/tasks.json index dffe951cd..9da1ef7c4 100644 --- a/hello-world-teams-tab-and-outlook-add-in/.vscode/tasks.json +++ b/hello-world-teams-tab-and-outlook-add-in/.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", diff --git a/hello-world-teams-tab-and-outlook-add-in/README.md b/hello-world-teams-tab-and-outlook-add-in/README.md index 6e5969060..1919ea093 100644 --- a/hello-world-teams-tab-and-outlook-add-in/README.md +++ b/hello-world-teams-tab-and-outlook-add-in/README.md @@ -29,7 +29,7 @@ Now you have the ability to create a single unit of distribution for all your Mi - Edge or Chrome installed for debugging Teams Tab. Edge installed for debugging Outlook add-in. - Outlook for Windows: Beta Channel, Build 16320 or higher. Follow [this link](https://github.com/OfficeDev/TeamsFx/wiki/How-to-switch-Outlook-client-update-channel-and-verify-Outlook-client-build-version) for information about how to update channels and check your Outlook client build version. - An M365 account. If you do not have M365 account, apply one from [M365 developer program](https://developer.microsoft.com/en-us/microsoft-365/dev-program) -- [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 @@ -38,14 +38,14 @@ Now you have the ability to create a single unit of distribution for all your Mi - From Visual Studio Code: Start debugging the project by hitting the `F5` key in Visual Studio Code. - Alternatively use the `Run and Debug Activity Panel` in Visual Studio Code, select the appropriate configuration, and click the `Run and Debug` green arrow button. ![Visual Studio Code debug configuration for Teams](./images/teams-debug.PNG) -- From Teams Toolkit CLI: Start debugging the project by executing the command `teamsapp preview --env local` in your project directory. +- From Microsoft 365 Agents Toolkit CLI: Start debugging the project by executing the command `atk preview --env local` in your project directory. After installing the app in Teams when prompted, it will launch and you'll be able to view the tab app. ![Sample tab app running in Teams](./images/teams-tab-app.PNG) ### Debug Outlook add-in -- Please note that the same M365 account should be used both in Teams Toolkit and Outlook. +- Please note that the same M365 account should be used both in Microsoft 365 Agents Toolkit and Outlook. - From Visual Studio Code only: use the `Run and Debug Activity Panel` in Visual Studio Code, select `Debug in Outlook Desktop (Edge Chromium)`, and click the `Run and Debug` green arrow button. Please run VSCode as administrator if localhost loopback for Microsoft Edge Webview hasn't been enabled. Once enbaled, administrator priviledge is no longer required. ![Visual Studio Code debug configuration for Outlook](./images/outlook-debug.PNG) @@ -68,9 +68,9 @@ This file contains template arguments with `${{...}}` statements which will be r Deploy your project to Azure by following these steps: -| From Visual Studio Code | From Teams Toolkit CLI | +| From Visual Studio Code | From Microsoft 365 Agents Toolkit CLI | | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | :---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -|
  • Open Teams Toolkit, and sign into Azure by clicking the `Sign in to Azure` under the `ACCOUNTS` section from sidebar.
  • After you signed in, select a subscription under your account.
  • Open the Teams Toolkit and click `Provision` from LIFECYCLE section or open the command palette and select: `Teams: Provision`.
  • Open the Teams Toolkit and click `Deploy` or open the command palette and select: `Teams: Deploy`.
|
  • Run command `teamsapp auth login azure`.
  • (Optional)Set environment variable AZURE_SUBSCRIPTION_ID to your subscription id in env/.env.dev or in your current shell envrionment if you are using non-interactive mode of `teamsfx` CLI.
  • Run command `teamsapp provision`.
  • Run command: `teamsapp deploy`.
| +|
  • Open Microsoft 365 Agents Toolkit, and sign into Azure by clicking the `Sign in to Azure` under the `ACCOUNTS` section from sidebar.
  • After you signed in, select a subscription under your account.
  • Open the Microsoft 365 Agents Toolkit and click `Provision` from LIFECYCLE section or open the command palette and select: `Microsoft 365 Agents: Provision`.
  • Open the Microsoft 365 Agents Toolkit and click `Deploy` or open the command palette and select: `Microsoft 365 Agents: Deploy`.
|
  • Run command `atk auth login azure`.
  • (Optional)Set environment variable AZURE_SUBSCRIPTION_ID to your subscription id in env/.env.dev or in your current shell envrionment if you are using non-interactive mode of `teamsfx` CLI.
  • Run command `atk provision`.
  • Run command: `atk deploy`.
| > Note: Provisioning and deployment may incur charges to your Azure Subscription. @@ -84,7 +84,7 @@ Once the provisioning and deployment steps are finished, you can preview your Te 1. Select `Launch Remote in Teams (Edge)` or `Launch Remote in Teams (Chrome)` from the launch configuration drop-down. 1. Press the Play (green arrow) button to launch your app - now running remotely from Azure. -- From Teams Toolkit CLI: execute `teamsapp preview --env dev` in your project directory to launch your application. +- From Microsoft 365 Agents Toolkit CLI: execute `atk preview --env dev` in your project directory to launch your application. ### Preview Outlook add-in @@ -100,13 +100,13 @@ Once the provisioning and deployment steps are finished, you can preview your Ou To check that your manifest file is valid: -- From Visual Studio Code: open the command palette and select: `Teams: Validate Application` and select `Validate using manifest schema`. -- From Teams Toolkit CLI: run command `teamsapp validate` in your project directory. +- From Visual Studio Code: open the command palette and select: `Microsoft 365 Agents: Validate Application` and select `Validate using manifest schema`. +- From Microsoft 365 Agents Toolkit CLI: run command `atk validate` in your project directory. ### Package -- From Visual Studio Code: open the Teams Toolkit and click `Zip Teams app package` or open the command palette and select `Teams: Zip Teams app package`. -- Alternatively, from the command line run `teamsapp package` in the project directory. +- From Visual Studio Code: open the Microsoft 365 Agents Toolkit and click `Zip Teams app package` or open the command palette and select `Microsoft 365 Agents: Zip Teams app package`. +- Alternatively, from the command line run `atk package` in the project directory. ## Version History diff --git a/hello-world-teams-tab-and-outlook-add-in/env/.env.dev b/hello-world-teams-tab-and-outlook-add-in/env/.env.dev index dac73fb16..167a13a91 100644 --- a/hello-world-teams-tab-and-outlook-add-in/env/.env.dev +++ b/hello-world-teams-tab-and-outlook-add-in/env/.env.dev @@ -12,7 +12,7 @@ TEAMS_APP_ID= AZURE_STATIC_WEB_APPS_RESOURCE_ID= TAB_ENDPOINT= -# Secrets. Keys prefixed with `SECRET_` will be masked in Teams Toolkit logs. +# Secrets. Keys prefixed with `SECRET_` will be masked in Microsoft 365 Agents Toolkit logs. TEAMS_APP_TENANT_ID= TAB_DOMAIN= TEAMS_APP_UPDATE_TIME= \ No newline at end of file diff --git a/hello-world-teams-tab-and-outlook-add-in/teamsapp.local.yml b/hello-world-teams-tab-and-outlook-add-in/m365agents.local.yml similarity index 98% rename from hello-world-teams-tab-and-outlook-add-in/teamsapp.local.yml rename to hello-world-teams-tab-and-outlook-add-in/m365agents.local.yml index d32094f99..7d6ed45e2 100644 --- a/hello-world-teams-tab-and-outlook-add-in/teamsapp.local.yml +++ b/hello-world-teams-tab-and-outlook-add-in/m365agents.local.yml @@ -35,7 +35,7 @@ provision: outputZipPath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip outputJsonPath: ./appPackage/build/manifest.${{TEAMSFX_ENV}}.json # 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: diff --git a/hello-world-teams-tab-and-outlook-add-in/teamsapp.yml b/hello-world-teams-tab-and-outlook-add-in/m365agents.yml similarity index 95% rename from hello-world-teams-tab-and-outlook-add-in/teamsapp.yml rename to hello-world-teams-tab-and-outlook-add-in/m365agents.yml index 21207c5b8..ab373a032 100644 --- a/hello-world-teams-tab-and-outlook-add-in/teamsapp.yml +++ b/hello-world-teams-tab-and-outlook-add-in/m365agents.yml @@ -27,7 +27,7 @@ provision: - path: ./infra/azure.bicep # Relative path to this file parameters: ./infra/azure.parameters.json # Relative path to this file. Placeholders will be replaced with corresponding environment variable before ARM deployment. deploymentName: Create-resources-for-tab-and-addin # Required when deploy ARM template - 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. # Get the deployment token from Azure Static Web Apps - uses: azureStaticWebApps/getDeploymentToken @@ -49,7 +49,7 @@ provision: outputZipPath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip outputJsonPath: ./appPackage/build/manifest.${{TEAMSFX_ENV}}.json # 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: @@ -86,7 +86,7 @@ publish: outputZipPath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip outputJsonPath: ./appPackage/build/manifest.${{TEAMSFX_ENV}}.json # 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: diff --git a/hello-world-teams-tab-and-outlook-add-in/tab/src/components/sample/AddSSO.tsx b/hello-world-teams-tab-and-outlook-add-in/tab/src/components/sample/AddSSO.tsx index 3fbcde1f9..5f4938d2a 100644 --- a/hello-world-teams-tab-and-outlook-add-in/tab/src/components/sample/AddSSO.tsx +++ b/hello-world-teams-tab-and-outlook-add-in/tab/src/components/sample/AddSSO.tsx @@ -18,7 +18,7 @@ export function AddSSO(props: Record) { SSO support ) and interact with Microsoft Graph for building rich and seamless user experience. With - Teams Toolkit, authentication is further simplified by automatic AAD app registration and + Microsoft 365 Agents Toolkit, authentication is further simplified by automatic AAD app registration and configuration.

@@ -34,7 +34,7 @@ export function AddSSO(props: Record) { here - ) to learn how to enable Authentication component with Teams Toolkit and code snippets. + ) to learn how to enable Authentication component with Microsoft 365 Agents Toolkit and code snippets.

); diff --git a/incoming-webhook-notification/assets/sample.json b/incoming-webhook-notification/assets/sample.json index 365237be2..020ca4214 100644 --- a/incoming-webhook-notification/assets/sample.json +++ b/incoming-webhook-notification/assets/sample.json @@ -12,7 +12,7 @@ "updateDateTime": "2023-9-14", "products": [ "Teams", - "TeamsToolkit" + "Microsoft 365 Agents Toolkit" ], "metadata": [ { diff --git a/incoming-webhook-notification/package.json b/incoming-webhook-notification/package.json index d2ff89d5f..b3432b80e 100644 --- a/incoming-webhook-notification/package.json +++ b/incoming-webhook-notification/package.json @@ -1,7 +1,7 @@ { "name": "incoming-webhook-notification", "version": "1.0.0", - "description": "Microsoft Teams Toolkit Incoming Webhook Notification Sample", + "description": "Microsoft 365 Agents Toolkit Incoming Webhook Notification Sample", "author": "Microsoft", "engines": { "node": "18 || 20 || 22" @@ -19,6 +19,7 @@ "url": "https://github.com" }, "dependencies": { + "adaptivecards": "^2.11.1", "adaptivecards-templating": "^2.3.1", "adaptive-expressions": "^4.22.3", "axios": "^0.26.1" diff --git a/intelligent-data-chart-generator/.vscode/tasks.json b/intelligent-data-chart-generator/.vscode/tasks.json index 40ed38eb5..fbd24459c 100644 --- a/intelligent-data-chart-generator/.vscode/tasks.json +++ b/intelligent-data-chart-generator/.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", diff --git a/intelligent-data-chart-generator/README.md b/intelligent-data-chart-generator/README.md index d6724ed3d..1fe9eb19e 100644 --- a/intelligent-data-chart-generator/README.md +++ b/intelligent-data-chart-generator/README.md @@ -31,11 +31,11 @@ This intelligent Microsoft Teams Tab app is powered by Azure OpenAI, which helps - [Node.js](https://nodejs.org/), supported versions: 18, 20, 22 - 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 [M365 developer program](https://developer.microsoft.com/en-us/microsoft-365/dev-program) - An [Azure OpenAI](https://aka.ms/azureopenai) resource and an [Azure SQL Database](https://aka.ms/azuredb) resource. -- [Teams Toolkit Visual Studio Code Extension](https://aka.ms/teams-toolkit) version 5.0.0 and higher or [Teams Toolkit CLI](https://aka.ms/teamsfx-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/teamsfx-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 @@ -68,11 +68,11 @@ This intelligent Microsoft Teams Tab app is powered by Azure OpenAI, which helps Deploy your project to Azure by following these steps: -1. Open Teams Toolkit in Visual Studio Code, and sign in your Azure account by clicking the `Sign in to Azure` in the `ACCOUNTS` section from sidebar. -2. After you signed in, select a subscription under your account. The Teams Toolkit will use this subscription to provision Azure resources to host you app. +1. Open Microsoft 365 Agents Toolkit in Visual Studio Code, and sign in your Azure account by clicking the `Sign in to Azure` in the `ACCOUNTS` section from sidebar. +2. After you signed in, select a subscription under your account. The Microsoft 365 Agents Toolkit will use this subscription to provision Azure resources to host you app. 3. Update the `.env.dev.user` file to add your Azure Open AI and Azure SQL configurations. -4. Open the Teams Toolkit and click `Provision` in the `LIFECYCLE` section. Alternatively open the command palette(Ctrl+Shift+P) and type: `Teams: Provision` command. -5. Open the Teams Toolkit and click `Deploy` in the `LIFECYCLE` section. Alternatively open the command palette(Ctrl+Shift+P) and type: `Teams: Deploy` command. +4. Open the Microsoft 365 Agents Toolkit and click `Provision` in the `LIFECYCLE` section. Alternatively open the command palette(Ctrl+Shift+P) and type: `Microsoft 365 Agents: Provision` command. +5. Open the Microsoft 365 Agents Toolkit and click `Deploy` in the `LIFECYCLE` section. Alternatively open the command palette(Ctrl+Shift+P) and type: `Microsoft 365 Agents: Deploy` command. > Note: Provision Azure cloud resources and deploy to Azure may cause charges to your Azure Subscription. diff --git a/intelligent-data-chart-generator/assets/sample.json b/intelligent-data-chart-generator/assets/sample.json index ddddd2f92..f20c73a59 100644 --- a/intelligent-data-chart-generator/assets/sample.json +++ b/intelligent-data-chart-generator/assets/sample.json @@ -10,7 +10,7 @@ ], "creationDateTime": "2024-01-08", "updateDateTime": "2024-01-08", - "products": ["Teams", "TeamsToolkit"], + "products": ["Teams", "Microsoft 365 Agents Toolkit"], "metadata": [ { "key": "TEAMS-SAMPLE-SOURCE", diff --git a/intelligent-data-chart-generator/cli.md b/intelligent-data-chart-generator/cli.md index 1dd3c6e52..6df9c7fbd 100644 --- a/intelligent-data-chart-generator/cli.md +++ b/intelligent-data-chart-generator/cli.md @@ -1,19 +1,19 @@ -## Try sample with Teams Toolkit CLI +## Try sample with Microsoft 365 Agents Toolkit CLI 1. Install [Node.js](https://nodejs.org/en/download/) (Recommend LTS 20.x) -1. To install the Teams Toolkit CLI, use the npm package manager: +1. To install the Microsoft 365 Agents Toolkit CLI, use the npm package manager: ``` - npm install -g @microsoft/teamsapp-cli + npm install -g @microsoft/m365agentstoolkit-cli ``` 1. Create intelligent-data-chart-generator project. ``` - teamsapp new sample intelligent-data-chart-generator --interactive false + atk new sample intelligent-data-chart-generator --interactive false ``` 1. Provision the project to Azure. ``` - teamsapp provision + atk provision ``` 1. Deploy. ``` - teamsapp deploy + atk deploy ``` diff --git a/intelligent-data-chart-generator/teamsapp.local.yml b/intelligent-data-chart-generator/m365agents.local.yml similarity index 99% rename from intelligent-data-chart-generator/teamsapp.local.yml rename to intelligent-data-chart-generator/m365agents.local.yml index df13cefd2..b40655482 100644 --- a/intelligent-data-chart-generator/teamsapp.local.yml +++ b/intelligent-data-chart-generator/m365agents.local.yml @@ -56,7 +56,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: diff --git a/intelligent-data-chart-generator/teamsapp.yml b/intelligent-data-chart-generator/m365agents.yml similarity index 97% rename from intelligent-data-chart-generator/teamsapp.yml rename to intelligent-data-chart-generator/m365agents.yml index 1b8bd53d8..e2c7a912e 100644 --- a/intelligent-data-chart-generator/teamsapp.yml +++ b/intelligent-data-chart-generator/m365agents.yml @@ -40,7 +40,7 @@ provision: - path: ./infra/azure.bicep # Relative path to teamsfx folder parameters: ./infra/azure.parameters.json # Relative path to teamsfx folder. Placeholders will be replaced with corresponding environment variable before ARM deployment. deploymentName: Create-resources-for-tab # Required when deploy ARM template - 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. # Get the deployment token from Azure Static Web Apps - uses: azureStaticWebApps/getDeploymentToken @@ -73,7 +73,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: diff --git a/large-scale-notification/.funcignore b/large-scale-notification/.funcignore index 756256da6..84bf2f7c5 100644 --- a/large-scale-notification/.funcignore +++ b/large-scale-notification/.funcignore @@ -14,8 +14,8 @@ local.settings.json /node_modules/azurite README.md tsconfig.json -teamsapp.yml -teamsapp.*.yml +m365agents.yml +m365agents.*.yml /env/ /script/ /appPackage/ diff --git a/large-scale-notification/README.md b/large-scale-notification/README.md index 2df906bb7..7de579ae2 100644 --- a/large-scale-notification/README.md +++ b/large-scale-notification/README.md @@ -7,21 +7,21 @@ products: - office name: Large Scale Notification Bot urlFragment: officedev-teamsfx-samples-bot-large-scale-notification -description: This sample demonstrates a Teams notification bot app created by Teams Toolkit to send individual chat messages to a large number of users. +description: This sample demonstrates a Teams notification bot app created by Microsoft 365 Agents Toolkit to send individual chat messages to a large number of users. extensions: createdDate: "2023-10-17" --- # Overview of the Large Scale Notification Bot -This sample demonstrates the architecture of a Teams notfication bot app created by Teams Toolkit to send individual chat messages to a large number of users in a tenant. This app relies on Azure services such as [Durable Function](https://learn.microsoft.com/en-us/azure/azure-functions/durable/durable-functions-overview?tabs=csharp-inproc) and [Service Bus Queue](https://learn.microsoft.com/en-us/azure/service-bus-messaging/service-bus-queues-topics-subscriptions#queues) to handle high volume and speed of notification messaging. +This sample demonstrates the architecture of a Teams notfication bot app created by Microsoft 365 Agents Toolkit to send individual chat messages to a large number of users in a tenant. This app relies on Azure services such as [Durable Function](https://learn.microsoft.com/en-us/azure/azure-functions/durable/durable-functions-overview?tabs=csharp-inproc) and [Service Bus Queue](https://learn.microsoft.com/en-us/azure/service-bus-messaging/service-bus-queues-topics-subscriptions#queues) to handle high volume and speed of notification messaging. # Minimal path to awesome ## Execute lifecycle commands -1. To create the Azure resources and deploy the code to Azure Function, select `Provision` and `Deploy` from the Teams Toolkit sidebar. -2. To publish your app to Teams, select `Publish` from the Teams Toolkit sidebar. +1. To create the Azure resources and deploy the code to Azure Function, select `Provision` and `Deploy` from the Microsoft 365 Agents Toolkit sidebar. +2. To publish your app to Teams, select `Publish` from the Microsoft 365 Agents Toolkit sidebar. ### Preview the app in Teams @@ -57,7 +57,7 @@ Since there are usually at most 25 users in Microsoft 365 E3/E5 subscription in 2. Please ensure you are logged into the Azure account used for deploying the app. 3. Run command in project root folder: `npx ts-node script/mockInstallationData.ts`. 4. Update `storageTableName` in `src/internal/initialize.ts` to `installationMockTableName`. -5. Deploy the code to Azure Function by selecting `Deploy` from the Teams Toolkit sidebar. Your app should now use the mock data. +5. Deploy the code to Azure Function by selecting `Deploy` from the Microsoft 365 Agents Toolkit sidebar. Your app should now use the mock data. ## Note on Local Debugging @@ -67,7 +67,7 @@ Local debugging is not supported for this project. Please ensure that all testin ### Azure Function -This sample extends from the "Chat Notification Message" template created by Teams Toolkit. It makes Azure Function durable to send notifications in a long-running job. +This sample extends from the "Chat Notification Message" template created by Microsoft 365 Agents Toolkit. It makes Azure Function durable to send notifications in a long-running job. Here's the functions used in this sample: | Function | Type | Description | diff --git a/large-scale-notification/assets/sample.json b/large-scale-notification/assets/sample.json index 891907351..94fb4c8eb 100644 --- a/large-scale-notification/assets/sample.json +++ b/large-scale-notification/assets/sample.json @@ -3,16 +3,16 @@ "name": "officedev-teamsfx-samples-bot-large-scale-notification", "source": "officeDev", "title": "Large Scale Notification Bot", - "shortDescription": "This sample demonstrates the architecture of a Teams notification bot app created by Teams Toolkit to send individual chat messages to a large number of users in a tenant.", + "shortDescription": "This sample demonstrates the architecture of a Teams notification bot app created by Microsoft 365 Agents Toolkit to send individual chat messages to a large number of users in a tenant.", "url": "https://github.com/OfficeDev/TeamsFx-Samples/tree/dev/large-scale-notification", "longDescription": [ - "This sample demonstrates the architecture of a Teams notification bot app created by Teams Toolkit to send individual chat messages to a large number of users in a tenant. This app relies on Azure services such as Azure Durable Functions and Service Bus Queue to handle high volume and speed of notification messaging." + "This sample demonstrates the architecture of a Teams notification bot app created by Microsoft 365 Agents Toolkit to send individual chat messages to a large number of users in a tenant. This app relies on Azure services such as Azure Durable Functions and Service Bus Queue to handle high volume and speed of notification messaging." ], "creationDateTime": "2023-10-17", "updateDateTime": "2023-10-24", "products": [ "Teams", - "TeamsToolkit" + "Microsoft 365 Agents Toolkit" ], "metadata": [ { diff --git a/large-scale-notification/teamsapp.local.yml b/large-scale-notification/m365agents.local.yml similarity index 99% rename from large-scale-notification/teamsapp.local.yml rename to large-scale-notification/m365agents.local.yml index e1d184bf9..1a8bd7abc 100644 --- a/large-scale-notification/teamsapp.local.yml +++ b/large-scale-notification/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: diff --git a/large-scale-notification/teamsapp.yml b/large-scale-notification/m365agents.yml similarity index 97% rename from large-scale-notification/teamsapp.yml rename to large-scale-notification/m365agents.yml index 2cdc07edd..92e3a99e0 100644 --- a/large-scale-notification/teamsapp.yml +++ b/large-scale-notification/m365agents.yml @@ -41,7 +41,7 @@ provision: parameters: ./infra/azure.parameters.json # Required when deploying ARM template deploymentName: Create-resources-for-sample - # Teams Toolkit will download this bicep CLI version from github for you, + # 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. bicepCliVersion: v0.9.1 @@ -58,7 +58,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: @@ -108,7 +108,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: diff --git a/large-scale-notification/package.json b/large-scale-notification/package.json index e757bdc65..a49cfe0a5 100644 --- a/large-scale-notification/package.json +++ b/large-scale-notification/package.json @@ -1,7 +1,7 @@ { "name": "large-scale-notification", "version": "1.0.0", - "description": "Microsoft Teams Toolkit Large Scale Notification Bot Sample", + "description": "Microsoft 365 Agents Toolkit Large Scale Notification Bot Sample", "engines": { "node": "18 || 20 || 22" }, diff --git a/live-share-dice-roller/.vscode/tasks.json b/live-share-dice-roller/.vscode/tasks.json index 235a614e2..2243b2979 100644 --- a/live-share-dice-roller/.vscode/tasks.json +++ b/live-share-dice-roller/.vscode/tasks.json @@ -1,4 +1,4 @@ -// The teamsfx tasks defined in this file require Teams Toolkit version >= 5.0.0. +// 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", diff --git a/live-share-dice-roller/README.md b/live-share-dice-roller/README.md index 22646d327..b832bb62d 100644 --- a/live-share-dice-roller/README.md +++ b/live-share-dice-roller/README.md @@ -20,7 +20,7 @@ walkthrough of this example and how it works, check out the [tutorial documentat - [Node.js](https://nodejs.org/), supported versions: 18, 20, 22 - An M365 account. If you do not have M365 account, apply one from [M365 developer program](https://developer.microsoft.com/en-us/microsoft-365/dev-program) -- [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) ## Run the app locally @@ -36,12 +36,12 @@ walkthrough of this example and how it works, check out the [tutorial documentat Deploy your project to Azure by following these steps: -- Open Teams Toolkit in Visual Studio Code, and sign in your Azure account by clicking the `Sign in to Azure` in the `ACCOUNTS` section from sidebar. -- After you signed in, select a subscription under your account. The Teams Toolkit will use this subscription to provision Azure resources to host you app. -- Open the Teams Toolkit and click `Provision` in the `LIFECYLE` section. - - Alternatively open the command palette(Ctrl+Shift+P) and type: `Teams: Provision` command. -- Open the Teams Toolkit and click `Deploy` in the `LIFECYLE` section. - - Alternatively open the command palette(Ctrl+Shift+P) and type: `Teams: Deploy` command. +- Open Microsoft 365 Agents Toolkit in Visual Studio Code, and sign in your Azure account by clicking the `Sign in to Azure` in the `ACCOUNTS` section from sidebar. +- After you signed in, select a subscription under your account. The Microsoft 365 Agents Toolkit will use this subscription to provision Azure resources to host you app. +- Open the Microsoft 365 Agents Toolkit and click `Provision` in the `LIFECYLE` section. + - Alternatively open the command palette(Ctrl+Shift+P) and type: `Microsoft 365 Agents: Provision` command. +- Open the Microsoft 365 Agents Toolkit and click `Deploy` in the `LIFECYLE` section. + - Alternatively open the command palette(Ctrl+Shift+P) and type: `Microsoft 365 Agents: Deploy` command. > Note: Provision Azure cloud resources and deploy to Azure may cause charges to your Azure Subscription. diff --git a/live-share-dice-roller/assets/sample.json b/live-share-dice-roller/assets/sample.json index 89fe13498..bf5f13fa8 100644 --- a/live-share-dice-roller/assets/sample.json +++ b/live-share-dice-roller/assets/sample.json @@ -12,7 +12,7 @@ "updateDateTime": "2023-10-26", "products": [ "Teams", - "TeamsToolkit" + "Microsoft 365 Agents Toolkit" ], "metadata": [ { diff --git a/live-share-dice-roller/env/.env.dev b/live-share-dice-roller/env/.env.dev index aea7b4250..261642121 100644 --- a/live-share-dice-roller/env/.env.dev +++ b/live-share-dice-roller/env/.env.dev @@ -7,7 +7,7 @@ AZURE_SUBSCRIPTION_ID= AZURE_RESOURCE_GROUP_NAME= RESOURCE_SUFFIX= -# Generated during provision, you can also add your own variables. If you're adding a secret value, add SECRET_ prefix to the name so Teams Toolkit can handle them properly +# Generated during provision, you can also add your own variables. If you're adding a secret value, add SECRET_ prefix to the name so Microsoft 365 Agents Toolkit can handle them properly TEAMS_APP_ID= AZURE_STATIC_WEB_APPS_RESOURCE_ID= TAB_ENDPOINT= diff --git a/live-share-dice-roller/teamsapp.local.yml b/live-share-dice-roller/m365agents.local.yml similarity index 95% rename from live-share-dice-roller/teamsapp.local.yml rename to live-share-dice-roller/m365agents.local.yml index 15cc05564..e7c6c80a2 100644 --- a/live-share-dice-roller/teamsapp.local.yml +++ b/live-share-dice-roller/m365agents.local.yml @@ -31,7 +31,7 @@ provision: manifestPath: ./appPackage/manifest.json # Path to manifest template outputZipPath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip outputJsonPath: ./appPackage/build/manifest.${{TEAMSFX_ENV}}.json - - uses: teamsApp/update # Apply the Teams app manifest to an existing Teams app in Teams Developer Portal. Will use the app id in manifest file to determine which Teams app to update. + - uses: teamsApp/update # Apply the Teams app manifest to an existing Teams app in Developer Portal. Will use the app id in manifest file to determine which Teams app to update. with: appPackagePath: ./appPackage/build/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. diff --git a/live-share-dice-roller/teamsapp.yml b/live-share-dice-roller/m365agents.yml similarity index 92% rename from live-share-dice-roller/teamsapp.yml rename to live-share-dice-roller/m365agents.yml index 290c37a39..72633e9d9 100644 --- a/live-share-dice-roller/teamsapp.yml +++ b/live-share-dice-roller/m365agents.yml @@ -24,7 +24,7 @@ provision: - path: ./infra/azure.bicep # Relative path to teamsfx folder parameters: ./infra/azure.parameters.json # Relative path to teamsfx folder. Placeholders will be replaced with corresponding environment variable before ARM deployment. deploymentName: Create-resources # Required when deploy ARM template - 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. # 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. # Get the deployment token from Azure Static Web Apps @@ -48,7 +48,7 @@ provision: with: # Relative path to this file. This is the path for built zip file. appPackagePath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip - - uses: teamsApp/update # Apply the Teams app manifest to an existing Teams app in Teams Developer Portal. Will use the app id in manifest file to determine which Teams app to update. + - uses: teamsApp/update # Apply the Teams app manifest to an existing Teams app in Developer Portal. Will use the app id in manifest file to determine which Teams app to update. with: appPackagePath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip # Relative path to this file. This is the path for built zip file. @@ -80,7 +80,7 @@ publish: with: # Relative path to this file. This is the path for built zip file. appPackagePath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip - - uses: teamsApp/update # Apply the Teams app manifest to an existing Teams app in Teams Developer Portal. Will use the app id in manifest file to determine which Teams app to update. + - uses: teamsApp/update # Apply the Teams app manifest to an existing Teams app in Developer Portal. Will use the app id in manifest file to determine which Teams app to update. with: appPackagePath: ./appPackage/build/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. diff --git a/notification-codespaces/.appserviceignore b/notification-codespaces/.appserviceignore index 3d9c9df35..e11973921 100644 --- a/notification-codespaces/.appserviceignore +++ b/notification-codespaces/.appserviceignore @@ -14,8 +14,8 @@ local.settings.json test tsconfig.json .DS_Store -teamsapp.yml -teamsapp.*.yml +m365agents.yml +m365agents.*.yml /env/ /script/ /node_modules/.bin diff --git a/notification-codespaces/.vscode/tasks.json b/notification-codespaces/.vscode/tasks.json index d0847aeec..79f63e397 100644 --- a/notification-codespaces/.vscode/tasks.json +++ b/notification-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", diff --git a/notification-codespaces/README.md b/notification-codespaces/README.md index e225549d3..a6305cac5 100644 --- a/notification-codespaces/README.md +++ b/notification-codespaces/README.md @@ -9,7 +9,7 @@ The app is built using the TeamsFx SDK, which provides a simple set of functions ![Notification Message in Teams](https://user-images.githubusercontent.com/10163840/224254253-21b4dedd-1079-4cda-ac9e-cd3bce725702.png) ## This sample illustrates -- How to use Teams Toolkit build a notification app. +- How to use Microsoft 365 Agents Toolkit build a notification app. - How to use [Codespaces](https://github.com/features/codespaces) to run and preview a message extension in Teams. ## Prerequisite to use this sample @@ -23,7 +23,7 @@ The app is built using the TeamsFx SDK, which provides a simple set of functions > 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. @@ -43,18 +43,18 @@ The app is built using the TeamsFx SDK, which provides a simple set of functions ### 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| diff --git a/notification-codespaces/teamsapp.local.yml b/notification-codespaces/m365agents.local.yml similarity index 99% rename from notification-codespaces/teamsapp.local.yml rename to notification-codespaces/m365agents.local.yml index e63040b35..bc05a4139 100644 --- a/notification-codespaces/teamsapp.local.yml +++ b/notification-codespaces/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: diff --git a/notification-codespaces/teamsapp.yml b/notification-codespaces/m365agents.yml similarity index 95% rename from notification-codespaces/teamsapp.yml rename to notification-codespaces/m365agents.yml index 21b274c5f..705c27834 100644 --- a/notification-codespaces/teamsapp.yml +++ b/notification-codespaces/m365agents.yml @@ -28,7 +28,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 @@ -48,7 +48,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: @@ -94,7 +94,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: diff --git a/notification-codespaces/package.json b/notification-codespaces/package.json index 21a1fa9eb..09198a915 100644 --- a/notification-codespaces/package.json +++ b/notification-codespaces/package.json @@ -1,7 +1,7 @@ { "name": "notification-app", "version": "1.0.0", - "description": "Microsoft Teams Toolkit Notification Bot Sample (Express)", + "description": "Microsoft 365 Agents Toolkit Notification Bot Sample (Express)", "engines": { "node": "18 || 20 || 22" }, diff --git a/query-org-user-with-message-extension-sso/.vscode/tasks.json b/query-org-user-with-message-extension-sso/.vscode/tasks.json index 5cef41ef3..48fcf77ce 100644 --- a/query-org-user-with-message-extension-sso/.vscode/tasks.json +++ b/query-org-user-with-message-extension-sso/.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", diff --git a/query-org-user-with-message-extension-sso/README.md b/query-org-user-with-message-extension-sso/README.md index 9f9e66254..3796f8c98 100644 --- a/query-org-user-with-message-extension-sso/README.md +++ b/query-org-user-with-message-extension-sso/README.md @@ -24,7 +24,7 @@ This is a simple search-based message extension app demonstrating how to integra ## Prerequisite to use this sample - [Node.js](https://nodejs.org/), supported versions: 18, 20, 22 - A Microsoft 365 account. If you do not have Microsoft 365 account, apply one from [Microsoft 365 developer program](https://developer.microsoft.com/en-us/microsoft-365/dev-program) -- [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**. @@ -36,9 +36,9 @@ This is a simple search-based message extension app demonstrating how to integra ### Deploy the app to Azure Deploy your project to Azure by following these steps: -1. Open Teams Toolkit in Visual Studio Code, and sign in your Azure account by clicking the `Sign in to Azure` in the `ACCOUNTS` section from sidebar. -2. Open Teams Toolkit and click `Provision` in the `LIFECYCLE` section. Alternatively open the command palette(Ctrl+Shift+P) and type: `Teams: Provision` command. -3. Open the Teams Toolkit and click `Deploy` in the `LIFECYCLE` section. Alternatively open the command palette(Ctrl+Shift+P) and type: `Teams: Deploy` command. +1. Open Microsoft 365 Agents Toolkit in Visual Studio Code, and sign in your Azure account by clicking the `Sign in to Azure` in the `ACCOUNTS` section from sidebar. +2. Open Microsoft 365 Agents Toolkit and click `Provision` in the `LIFECYCLE` section. Alternatively open the command palette(Ctrl+Shift+P) and type: `Microsoft 365 Agents: Provision` command. +3. Open the Microsoft 365 Agents Toolkit and click `Deploy` in the `LIFECYCLE` section. Alternatively open the command palette(Ctrl+Shift+P) and type: `Microsoft 365 Agents: Deploy` command. > Note: Provision Azure cloud resources and deploy to Azure may cause charges to your Azure Subscription. ### Preview the app in Teams After you have completed the provision and deploy steps in `Deploy the app to Azure` section, you can preview your app in Teams client by following steps below: diff --git a/query-org-user-with-message-extension-sso/assets/sample.json b/query-org-user-with-message-extension-sso/assets/sample.json index 19590233a..1dd0c60c4 100644 --- a/query-org-user-with-message-extension-sso/assets/sample.json +++ b/query-org-user-with-message-extension-sso/assets/sample.json @@ -12,7 +12,7 @@ "updateDateTime": "2023-10-13", "products": [ "Teams", - "TeamsToolkit" + "Microsoft 365 Agents Toolkit" ], "metadata": [ { diff --git a/query-org-user-with-message-extension-sso/teamsapp.local.yml b/query-org-user-with-message-extension-sso/m365agents.local.yml similarity index 99% rename from query-org-user-with-message-extension-sso/teamsapp.local.yml rename to query-org-user-with-message-extension-sso/m365agents.local.yml index bf1789a1e..dd4c4297c 100644 --- a/query-org-user-with-message-extension-sso/teamsapp.local.yml +++ b/query-org-user-with-message-extension-sso/m365agents.local.yml @@ -76,7 +76,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: diff --git a/query-org-user-with-message-extension-sso/teamsapp.yml b/query-org-user-with-message-extension-sso/m365agents.yml similarity index 96% rename from query-org-user-with-message-extension-sso/teamsapp.yml rename to query-org-user-with-message-extension-sso/m365agents.yml index 1bba18cde..6f9c80ffc 100644 --- a/query-org-user-with-message-extension-sso/teamsapp.yml +++ b/query-org-user-with-message-extension-sso/m365agents.yml @@ -41,7 +41,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. - 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: @@ -66,7 +66,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: @@ -114,7 +114,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: diff --git a/query-org-user-with-message-extension-sso/package.json b/query-org-user-with-message-extension-sso/package.json index 3a14bc84f..71c8d07dd 100644 --- a/query-org-user-with-message-extension-sso/package.json +++ b/query-org-user-with-message-extension-sso/package.json @@ -1,7 +1,7 @@ { "name": "query-org-user-with-me-sso", "version": "1.0.0", - "description": "Microsoft Teams Toolkit message extension Bot sample", + "description": "Microsoft 365 Agents Toolkit message extension Bot sample", "engines": { "node": "18 || 20 || 22" }, diff --git a/query-org-user-with-message-extension-sso/public/auth-end.html b/query-org-user-with-message-extension-sso/public/auth-end.html index bf4e7761e..9181a1653 100644 --- a/query-org-user-with-message-extension-sso/public/auth-end.html +++ b/query-org-user-with-message-extension-sso/public/auth-end.html @@ -1,4 +1,4 @@ - + diff --git a/react-retail-dashboard/.vscode/tasks.json b/react-retail-dashboard/.vscode/tasks.json index a73ca0f0a..88f036eec 100644 --- a/react-retail-dashboard/.vscode/tasks.json +++ b/react-retail-dashboard/.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", diff --git a/react-retail-dashboard/README.md b/react-retail-dashboard/README.md index ddccd8d57..448e45b8f 100644 --- a/react-retail-dashboard/README.md +++ b/react-retail-dashboard/README.md @@ -13,18 +13,18 @@ This is a dashboard sample based on demo sample data that shows you how to creat - [Set up SharePoint Framework development environment](https://aka.ms/teamsfx-spfx-dev-environment-setup)（Recommend to use SPFx v1.18.2） - 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 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 ### Deploy the app ->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 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 sample with Microsoft 365 Agents Toolkit CLI](cli.md) 1. Clone the repo to your local workspace or directly download the source code. -1. Open the project in Visual Studio Code, click `Provision` in LIFECYCLE panel of Microsoft Teams Toolkit extension or open the command palette and select `Teams: Provision`. This step will create an app in Teams App Studio. -1. Go back to Microsoft Teams Toolkit extension, click `Deploy` in LIFECYCLE panel or open the command palette and select `Teams: Deploy`. - > This step will build a SharePoint package (*.sppkg) under `sharepoint/solution` folder. The Teams Toolkit will automatically upload and deploy it to your tenant App Catalog site. Only tenant App Catalog site admin has permission to do it. If you are not the admin, you can create your test tenant following [Setup your Microsoft 365 tenant](https://docs.microsoft.com/en-us/sharepoint/dev/spfx/set-up-your-developer-tenant). +1. Open the project in Visual Studio Code, click `Provision` in LIFECYCLE panel of Microsoft 365 Agents Toolkit extension or open the command palette and select `Microsoft 365 Agents: Provision`. This step will create an app in Teams App Studio. +1. Go back to Microsoft 365 Agents Toolkit extension, click `Deploy` in LIFECYCLE panel or open the command palette and select `Microsoft 365 Agents: Deploy`. + > This step will build a SharePoint package (*.sppkg) under `sharepoint/solution` folder. The Microsoft 365 Agents Toolkit will automatically upload and deploy it to your tenant App Catalog site. Only tenant App Catalog site admin has permission to do it. If you are not the admin, you can create your test tenant following [Setup your Microsoft 365 tenant](https://docs.microsoft.com/en-us/sharepoint/dev/spfx/set-up-your-developer-tenant). ### Launch the app in Teams diff --git a/react-retail-dashboard/cli.md b/react-retail-dashboard/cli.md index 3a9410501..4a66b42e3 100644 --- a/react-retail-dashboard/cli.md +++ b/react-retail-dashboard/cli.md @@ -1,27 +1,27 @@ -## Try sample with Teams Toolkit CLI +## Try sample with Microsoft 365 Agents Toolkit CLI 1. Install [Node.js](https://nodejs.org/en/download/) (Recommend LTS 18.x) -2. To install the Teams Toolkit CLI, use the npm package manager: +2. To install the Microsoft 365 Agents Toolkit CLI, use the npm package manager: ``` - npm install -g @microsoft/teamsapp-cli + npm install -g @microsoft/m365agentstoolkit-cli ``` 3. Create react-retail-dashboard project. ``` - teamsapp new sample react-retail-dashboard --interactive false + atk new sample react-retail-dashboard --interactive false ``` 4. Provision the project to create an app in Teams App Studio. ``` - teamsapp provision + atk provision ``` 5. Deploy your project. > This step will generate a SharePoint package (*.sppkg) under `sharepoint/solution` folder. The cli will automatically upload and deploy it to your tenant App Catalog site. Only tenant App Catalog site admin has permission to do it. If you are not the admin, you can create your test tenant following [Setup your Microsoft 365 tenant](https://docs.microsoft.com/en-us/sharepoint/dev/spfx/set-up-your-developer-tenant). ``` - teamsapp deploy + atk deploy ``` diff --git a/react-retail-dashboard/env/.env.dev b/react-retail-dashboard/env/.env.dev index 221333095..481bea20a 100644 --- a/react-retail-dashboard/env/.env.dev +++ b/react-retail-dashboard/env/.env.dev @@ -5,4 +5,4 @@ APP_NAME_SUFFIX=dev # Generated during provision, you can also add your own variables. TEAMS_APP_ID= -# Secrets. Keys prefixed with `SECRET_` will be masked in Teams Toolkit logs. \ No newline at end of file +# Secrets. Keys prefixed with `SECRET_` will be masked in Microsoft 365 Agents Toolkit logs. \ No newline at end of file diff --git a/react-retail-dashboard/teamsapp.local.yml b/react-retail-dashboard/m365agents.local.yml similarity index 98% rename from react-retail-dashboard/teamsapp.local.yml rename to react-retail-dashboard/m365agents.local.yml index cb9de5a3f..7adaa6e5a 100644 --- a/react-retail-dashboard/teamsapp.local.yml +++ b/react-retail-dashboard/m365agents.local.yml @@ -33,7 +33,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: diff --git a/react-retail-dashboard/teamsapp.yml b/react-retail-dashboard/m365agents.yml similarity index 98% rename from react-retail-dashboard/teamsapp.yml rename to react-retail-dashboard/m365agents.yml index 61990f394..58809a405 100644 --- a/react-retail-dashboard/teamsapp.yml +++ b/react-retail-dashboard/m365agents.yml @@ -55,7 +55,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: @@ -95,7 +95,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: diff --git a/share-now/.vscode/tasks.json b/share-now/.vscode/tasks.json index 4f913c5e9..b43dc67bc 100644 --- a/share-now/.vscode/tasks.json +++ b/share-now/.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", diff --git a/share-now/README.md b/share-now/README.md index a47ce45c0..ae6079d73 100644 --- a/share-now/README.md +++ b/share-now/README.md @@ -28,17 +28,17 @@ Share Now promotes the exchange of information between colleagues by enabling us ## Prerequisite - [Node.js](https://nodejs.org/), supported versions: 18, 20, 22 - A Microsoft 365 account. If you do not have Microsoft 365 account, apply one from [Microsoft 365 developer program](https://developer.microsoft.com/en-us/microsoft-365/dev-program) -- [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) - An [Azure subscription](https://azure.microsoft.com/en-us/free/) ## Minimal path to awesome ### Deploy the app to Azure ->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) 1. Clone the repo to your local workspace or directly download the source code. 1. Open the project in Visual Studio Code. 1. Open **env/.env.dev.user** file, set value for `SQL_USER_NAME` and `SQL_PASSWORD`. -1. Open the command palette and select: `Teams: Provision`. The toolkit will help you to provision Azure SQL. -1. Once provision is completed, open the command palette and select: `Teams: Deploy`. +1. Open the command palette and select: `Microsoft 365 Agents: Provision`. The toolkit will help you to provision Azure SQL. +1. Once provision is completed, open the command palette and select: `Microsoft 365 Agents: Deploy`. 1. Open **env/.env.dev** file, you could get the database name in `PROVISIONOUTPUT__AZURESQLOUTPUT__DATABASENAME` output. [Set IP address of your computer into server-level IP firewall rule from the database overview page](https://docs.microsoft.com/en-us/azure/azure-sql/database/firewall-configure#from-the-database-overview-page). 1. In Azure portal, find the database by `databaseName` and use [query editor](https://docs.microsoft.com/en-us/azure/azure-sql/database/connect-query-portal) with below query to create a table: ```sql diff --git a/share-now/assets/sample.json b/share-now/assets/sample.json index 5c7ba3fd4..6c2b3756b 100644 --- a/share-now/assets/sample.json +++ b/share-now/assets/sample.json @@ -12,7 +12,7 @@ "updateDateTime": "2023-10-24", "products": [ "Teams", - "TeamsToolkit" + "Microsoft 365 Agents Toolkit" ], "metadata": [ { diff --git a/share-now/cli.md b/share-now/cli.md index 9c8478096..c420960f0 100644 --- a/share-now/cli.md +++ b/share-now/cli.md @@ -1,20 +1,20 @@ -## Try the Sample with Teams Toolkit CLI +## Try the Sample with Microsoft 365 Agents Toolkit CLI 1. Install [Node.js](https://nodejs.org/en/download/) (use the LTS release) -2. To install the Teams Toolkit CLI, use the npm package manager: +2. To install the Microsoft 365 Agents Toolkit CLI, use the npm package manager: ``` - npm install -g @microsoft/teamsapp-cli + npm install -g @microsoft/m365agentstoolkit-cli ``` 3. Create share-now project. ``` - teamsapp new sample share-now --interactive false + atk new sample share-now --interactive false ``` 4. Provision the project to azure. You will be asked to input admin name and password of SQL. ``` - teamsapp provision + atk provision ``` 5. Deploy. ``` - teamsapp deploy + atk deploy ``` 6. Open **env/.env.dev** file, you could get the database name in `PROVISIONOUTPUT__AZURESQLOUTPUT__DATABASENAME` output. In Azure portal, find the database and use [query editor](https://docs.microsoft.com/en-us/azure/azure-sql/database/connect-query-portal) with below query to create tables: ```sql diff --git a/share-now/teamsapp.local.yml b/share-now/m365agents.local.yml similarity index 99% rename from share-now/teamsapp.local.yml rename to share-now/m365agents.local.yml index 02bc414fb..e6b4a48b4 100644 --- a/share-now/teamsapp.local.yml +++ b/share-now/m365agents.local.yml @@ -80,7 +80,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: diff --git a/share-now/teamsapp.yml b/share-now/m365agents.yml similarity index 97% rename from share-now/teamsapp.yml rename to share-now/m365agents.yml index 3e1c89259..90dc7fa05 100644 --- a/share-now/teamsapp.yml +++ b/share-now/m365agents.yml @@ -41,7 +41,7 @@ provision: - path: ./infra/main.bicep # Relative path to this file parameters: ./infra/azure.parameters.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.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. # Get the deployment token from Azure Static Web Apps - uses: azureStaticWebApps/getDeploymentToken @@ -76,7 +76,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: @@ -179,7 +179,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: diff --git a/spfx-productivity-dashboard/.vscode/tasks.json b/spfx-productivity-dashboard/.vscode/tasks.json index a73ca0f0a..88f036eec 100644 --- a/spfx-productivity-dashboard/.vscode/tasks.json +++ b/spfx-productivity-dashboard/.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", diff --git a/spfx-productivity-dashboard/README.md b/spfx-productivity-dashboard/README.md index f1ff61c0f..f6c11ac93 100644 --- a/spfx-productivity-dashboard/README.md +++ b/spfx-productivity-dashboard/README.md @@ -13,19 +13,19 @@ - [Set up SharePoint Framework development environment](https://aka.ms/teamsfx-spfx-dev-environment-setup)（Recommend to use SPFx v1.18.2） - 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 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) - [Deploy the Microsoft Graph Toolkit SharePoint Framework package to your tenant](https://learn.microsoft.com/en-us/sharepoint/dev/spfx/web-parts/get-started/build-web-part-microsoft-graph-toolkit?WT.mc_id=m365-80548-wmastyka#deploy-the-microsoft-graph-toolkit-sharepoint-framework-package) ## Minimal path to awesome ### Deploy the app ->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 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 sample with Microsoft 365 Agents Toolkit CLI](cli.md) 1. Clone the repo to your local workspace or directly download the source code. -1. Open the project in Visual Studio Code, click `Provision` in LIFECYCLE panel of Microsoft Teams Toolkit extension or open the command palette and select `Teams: Provision`. This step will create an app in Teams App Studio. -1. Go back to Microsoft Teams Toolkit extension, click `Deploy` in LIFECYCLE panel or open the command palette and select `Teams: Deploy`. - > This step will build a SharePoint package (*.sppkg) under `sharepoint/solution` folder. The Teams Toolkit will automatically upload and deploy it to your tenant App Catalog site. Only tenant App Catalog site admin has permission to do it. If you are not the admin, you can create your test tenant following [Setup your Microsoft 365 tenant](https://docs.microsoft.com/en-us/sharepoint/dev/spfx/set-up-your-developer-tenant). +1. Open the project in Visual Studio Code, click `Provision` in LIFECYCLE panel of Microsoft 365 Agents Toolkit extension or open the command palette and select `Microsoft 365 Agents: Provision`. This step will create an app in Teams App Studio. +1. Go back to Microsoft 365 Agents Toolkit extension, click `Deploy` in LIFECYCLE panel or open the command palette and select `Microsoft 365 Agents: Deploy`. + > This step will build a SharePoint package (*.sppkg) under `sharepoint/solution` folder. The Microsoft 365 Agents Toolkit will automatically upload and deploy it to your tenant App Catalog site. Only tenant App Catalog site admin has permission to do it. If you are not the admin, you can create your test tenant following [Setup your Microsoft 365 tenant](https://docs.microsoft.com/en-us/sharepoint/dev/spfx/set-up-your-developer-tenant). 1. Go to your SharePoint Admin center. In the left-hand navigation, select `Advanced` and then `API Access`. You should see pending requests for each of the permissions requested in src\config\package-solution.json file. Select and approve each permission. ### Launch the app in Teams diff --git a/spfx-productivity-dashboard/cli.md b/spfx-productivity-dashboard/cli.md index a11e45486..9f3890b85 100644 --- a/spfx-productivity-dashboard/cli.md +++ b/spfx-productivity-dashboard/cli.md @@ -1,29 +1,29 @@ -## Try sample with Teams Toolkit CLI +## Try sample with Microsoft 365 Agents Toolkit CLI 1. Install [Node.js](https://nodejs.org/en/download/) (Recommend LTS 18.x) -2. To install the Teams Toolkit CLI, use the npm package manager: +2. To install the Microsoft 365 Agents Toolkit CLI, use the npm package manager: ``` - npm install -g @microsoft/teamsapp-cli + npm install -g @microsoft/m365agentstoolkit-cli ``` 3. Create spfx-productivity-dashboard project. ``` - teamsapp new sample spfx-productivity-dashboard --interactive false + atk new sample spfx-productivity-dashboard --interactive false ``` 4. Provision the project to create an app in Teams App Studio. ``` - teamsapp provision + atk provision ``` 5. Deploy your project. > This step will generate a SharePoint package (*.sppkg) under `sharepoint/solution` folder. The cli will automatically upload and deploy it to your tenant App Catalog site. Only tenant App Catalog site admin has permission to do it. If you are not the admin, you can create your test tenant following [Setup your Microsoft 365 tenant](https://docs.microsoft.com/en-us/sharepoint/dev/spfx/set-up-your-developer-tenant). ``` - teamsapp deploy + atk deploy ``` 6. Go to your [SharePoint Admin center](https://{yourtenant}-admin.sharepoint.com). In the left-hand navigation, select `Advanced` and then `API Access`. You should see pending requests for each of the permissions requested in src\config\package-solution.json file. Select and approve each permission. diff --git a/spfx-productivity-dashboard/env/.env.dev b/spfx-productivity-dashboard/env/.env.dev index 221333095..481bea20a 100644 --- a/spfx-productivity-dashboard/env/.env.dev +++ b/spfx-productivity-dashboard/env/.env.dev @@ -5,4 +5,4 @@ APP_NAME_SUFFIX=dev # Generated during provision, you can also add your own variables. TEAMS_APP_ID= -# Secrets. Keys prefixed with `SECRET_` will be masked in Teams Toolkit logs. \ No newline at end of file +# Secrets. Keys prefixed with `SECRET_` will be masked in Microsoft 365 Agents Toolkit logs. \ No newline at end of file diff --git a/spfx-productivity-dashboard/teamsapp.local.yml b/spfx-productivity-dashboard/m365agents.local.yml similarity index 98% rename from spfx-productivity-dashboard/teamsapp.local.yml rename to spfx-productivity-dashboard/m365agents.local.yml index 50cf4cd40..45b4534da 100644 --- a/spfx-productivity-dashboard/teamsapp.local.yml +++ b/spfx-productivity-dashboard/m365agents.local.yml @@ -33,7 +33,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: diff --git a/spfx-productivity-dashboard/teamsapp.yml b/spfx-productivity-dashboard/m365agents.yml similarity index 98% rename from spfx-productivity-dashboard/teamsapp.yml rename to spfx-productivity-dashboard/m365agents.yml index bd6fd814e..f823d5742 100644 --- a/spfx-productivity-dashboard/teamsapp.yml +++ b/spfx-productivity-dashboard/m365agents.yml @@ -55,7 +55,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: @@ -95,7 +95,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: diff --git a/sso-enabled-tab-via-apim-proxy/.vscode/tasks.json b/sso-enabled-tab-via-apim-proxy/.vscode/tasks.json index 72413ddb7..916ffa11d 100644 --- a/sso-enabled-tab-via-apim-proxy/.vscode/tasks.json +++ b/sso-enabled-tab-via-apim-proxy/.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", diff --git a/sso-enabled-tab-via-apim-proxy/README.md b/sso-enabled-tab-via-apim-proxy/README.md index 9182076dc..29fa74f47 100644 --- a/sso-enabled-tab-via-apim-proxy/README.md +++ b/sso-enabled-tab-via-apim-proxy/README.md @@ -23,7 +23,7 @@ With this sample, you can achieve the SSO feature in your tab app using OBO (on- ## This sample illustrates -- How to use Teams Toolkit to create a Teams tab app. +- How to use Microsoft 365 Agents Toolkit to create a Teams tab app. - How to use integrate APIM in TeamsFx projects. - How to implement SSO in Teams Tab app. - How to use APIM as proxy of Graph Toolkit, use SSO token to call Graph and get user login info. @@ -41,7 +41,7 @@ With this sample, you can achieve the SSO feature in your tab app using OBO (on- - An M365 account. If you do not have M365 account, apply one from [M365 developer program](https://developer.microsoft.com/microsoft-365/dev-program) - [Set up your dev environment for extending Teams apps across Microsoft 365](https://aka.ms/teamsfx-m365-apps-prerequisites) > Please note that after you enrolled your developer tenant in Office 365 Target Release, it may take couple days for the enrollment to take effect. -- [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) ## Getting Started @@ -50,7 +50,7 @@ You can follow the steps [here](https://aka.ms/teamsfx-sso-tab-via-apim) for how ## References * [Extend a Teams personal tabs across Microsoft 365](https://docs.microsoft.com/microsoftteams/platform/m365-apps/extend-m365-teams-personal-tab?tabs=manifest-teams-toolkit) -* [Teams Toolkit Documentations](https://docs.microsoft.com/microsoftteams/platform/toolkit/teams-toolkit-fundamentals) -* [Teams Toolkit CLI](https://docs.microsoft.com/microsoftteams/platform/toolkit/teamsfx-cli) +* [Microsoft 365 Agents Toolkit Documentations](https://docs.microsoft.com/microsoftteams/platform/toolkit/teams-toolkit-fundamentals) +* [Microsoft 365 Agents Toolkit CLI](https://docs.microsoft.com/microsoftteams/platform/toolkit/teamsfx-cli) * [TeamsFx SDK](https://docs.microsoft.com/microsoftteams/platform/toolkit/teamsfx-sdk) -* [Teams Toolkit Samples](https://github.com/OfficeDev/TeamsFx-Samples) +* [Microsoft 365 Agents Toolkit Samples](https://github.com/OfficeDev/TeamsFx-Samples) diff --git a/sso-enabled-tab-via-apim-proxy/assets/sample.json b/sso-enabled-tab-via-apim-proxy/assets/sample.json index e17faca93..f42576d55 100644 --- a/sso-enabled-tab-via-apim-proxy/assets/sample.json +++ b/sso-enabled-tab-via-apim-proxy/assets/sample.json @@ -12,7 +12,7 @@ "updateDateTime": "2023-10-13", "products": [ "Teams", - "TeamsToolkit" + "Microsoft 365 Agents Toolkit" ], "metadata": [ { diff --git a/sso-enabled-tab-via-apim-proxy/teamsapp.local.yml b/sso-enabled-tab-via-apim-proxy/m365agents.local.yml similarity index 96% rename from sso-enabled-tab-via-apim-proxy/teamsapp.local.yml rename to sso-enabled-tab-via-apim-proxy/m365agents.local.yml index 8acf92c79..625718c52 100644 --- a/sso-enabled-tab-via-apim-proxy/teamsapp.local.yml +++ b/sso-enabled-tab-via-apim-proxy/m365agents.local.yml @@ -38,7 +38,7 @@ provision: - path: ./infra/apim.bicep # Relative path to this file parameters: ./infra/azure.parameters.local.json # Relative path to this file. Placeholders will be replaced with corresponding environment variable before ARM deployment. deploymentName: Create-resources-for-tab # Required when deploy ARM template - 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. - uses: script # Set TAB_DOMAIN and TAB_ENDPOINT for local launch @@ -70,7 +70,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: diff --git a/sso-enabled-tab-via-apim-proxy/teamsapp.yml b/sso-enabled-tab-via-apim-proxy/m365agents.yml similarity index 96% rename from sso-enabled-tab-via-apim-proxy/teamsapp.yml rename to sso-enabled-tab-via-apim-proxy/m365agents.yml index 347f97d12..5bace424b 100644 --- a/sso-enabled-tab-via-apim-proxy/teamsapp.yml +++ b/sso-enabled-tab-via-apim-proxy/m365agents.yml @@ -42,7 +42,7 @@ provision: - path: ./infra/provision.bicep # Relative path to this file parameters: ./infra/azure.parameters.json # Relative path to this file. Placeholders will be replaced with corresponding environment variable before ARM deployment. deploymentName: Create-resources-for-tab # Required when deploy ARM template - 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. # Get the deployment token from Azure Static Web Apps - uses: azureStaticWebApps/getDeploymentToken @@ -75,7 +75,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: @@ -124,7 +124,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: diff --git a/stocks-update-notification-bot-dotnet/README.md b/stocks-update-notification-bot-dotnet/README.md index 6f999739e..62a012a05 100644 --- a/stocks-update-notification-bot-dotnet/README.md +++ b/stocks-update-notification-bot-dotnet/README.md @@ -23,7 +23,7 @@ Stocks Update Notifcation Bot is a an application that can be installed in diffe ## Prerequisite to use this sample - [Visual Studio 2022](https://visualstudio.microsoft.com/), version 17.3 or higher. -- Latest [Teams Toolkit for Visual Studio](https://docs.microsoft.com/en-us/microsoftteams/platform/toolkit/teams-toolkit-overview-visual-studio). +- Latest [Microsoft 365 Agents Toolkit for Visual Studio](https://docs.microsoft.com/en-us/microsoftteams/platform/toolkit/teams-toolkit-overview-visual-studio). - A Microsoft 365 account. If you do not have Microsoft 365 account, apply one from [Microsoft 365 developer program](https://developer.microsoft.com/en-us/microsoft-365/dev-program). @@ -31,15 +31,15 @@ Stocks Update Notifcation Bot is a an application that can be installed in diffe ### 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. -1. Right click to the project, select **Teams Toolkit > Prepare Teams App Dependencies**. +1. Right click to the project, select **Microsoft 365 Agents Toolkit > Select Microsoft 365 Account**. 1. Press "F5" to launch the bot 1. Sideloading your app to view into Microsoft Teams to view the Stocks Update Notification bot. ### Deploy the app to Azure -You can create and automatically configure cloud resources for hosting your app in Azure using Teams Toolkit. +You can create and automatically configure cloud resources for hosting your app in Azure using Microsoft 365 Agents Toolkit. 1. If you don't have an Azure subscription, create [a free account](https://azure.microsoft.com/en-us/free/) before you begin -1. Select the **StocksUpdateNotificationBot > Teams Toolkit > Provision** menu. In the Select your subscription window, choose the Azure subscription you want to use to create resources with. Teams Toolkit will create Azure resources in this subscription but no code is deployed during this step. -1. Select the **StocksUpdateNotificationBot > Teams Toolkit > Deploy in the Cloud** menu to deploy your project to these new resources. +1. Select the **StocksUpdateNotificationBot > Microsoft 365 Agents Toolkit > Provision** menu. In the Select your subscription window, choose the Azure subscription you want to use to create resources with. Microsoft 365 Agents Toolkit will create Azure resources in this subscription but no code is deployed during this step. +1. Select the **StocksUpdateNotificationBot > Microsoft 365 Agents Toolkit > Deploy in the Cloud** menu to deploy your project to these new resources. ### Preview the app in Teams 1. When you install the app into Microsoft Teams, it will immediately begin to send messages every thirty seconds into the location where you have installed it. There is no additional configuration required. diff --git a/stocks-update-notification-bot-dotnet/StocksUpdateNotificationBot/GettingStarted.txt b/stocks-update-notification-bot-dotnet/StocksUpdateNotificationBot/GettingStarted.txt index c357cf2b3..d411d49ef 100644 --- a/stocks-update-notification-bot-dotnet/StocksUpdateNotificationBot/GettingStarted.txt +++ b/stocks-update-notification-bot-dotnet/StocksUpdateNotificationBot/GettingStarted.txt @@ -1,4 +1,4 @@ -Welcome to Teams Toolkit! +Welcome to Microsoft 365 Agents Toolkit! Quick Start ------------------------- @@ -14,7 +14,7 @@ Quick Start The demo key will not update values, you can [sign up for a free key](https://www.alphavantage.co/support/#api-key) for the Alpha Vantage service and update the `TEAMSFX_API_ALPHAVANTAGE_API_KEY` setting with your own key. 2. Download and install ngrok (https://ngrok.com/) 3. Open a command prompt and run ngrok http 5130 -4. Right-click your project and select Teams Toolkit > Prepare Teams app dependencies +4. Right-click your project and select Microsoft 365 Agents Toolkit > Select Microsoft 365 Account 5. If prompted, sign in with an M365 account for the Teams organization you want to install the app to 6. Press F5, or select the Debug > Start Debugging menu in Visual Studio @@ -23,7 +23,7 @@ to install the app to Learn more ------------------------- -New to Teams app development or Teams Toolkit? Learn more about +New to Teams app development or Microsoft 365 Agents Toolkit? Learn more about Teams app manifests, deploying to the cloud, and more in the documentation at https://aka.ms/teams-toolkit-vs-docs diff --git a/stocks-update-notification-bot-dotnet/StocksUpdateNotificationBot/teamsapp.local.yml b/stocks-update-notification-bot-dotnet/StocksUpdateNotificationBot/m365agents.local.yml similarity index 98% rename from stocks-update-notification-bot-dotnet/StocksUpdateNotificationBot/teamsapp.local.yml rename to stocks-update-notification-bot-dotnet/StocksUpdateNotificationBot/m365agents.local.yml index 32107d72f..410f2140c 100644 --- a/stocks-update-notification-bot-dotnet/StocksUpdateNotificationBot/teamsapp.local.yml +++ b/stocks-update-notification-bot-dotnet/StocksUpdateNotificationBot/m365agents.local.yml @@ -67,7 +67,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: diff --git a/stocks-update-notification-bot-dotnet/StocksUpdateNotificationBot/teamsapp.yml b/stocks-update-notification-bot-dotnet/StocksUpdateNotificationBot/m365agents.yml similarity index 94% rename from stocks-update-notification-bot-dotnet/StocksUpdateNotificationBot/teamsapp.yml rename to stocks-update-notification-bot-dotnet/StocksUpdateNotificationBot/m365agents.yml index 85a8dbce5..1691c2295 100644 --- a/stocks-update-notification-bot-dotnet/StocksUpdateNotificationBot/teamsapp.yml +++ b/stocks-update-notification-bot-dotnet/StocksUpdateNotificationBot/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 @@ -49,7 +49,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: diff --git a/stocks-update-notification-bot-dotnet/assets/sample.json b/stocks-update-notification-bot-dotnet/assets/sample.json index b34c25cb7..1942fc963 100644 --- a/stocks-update-notification-bot-dotnet/assets/sample.json +++ b/stocks-update-notification-bot-dotnet/assets/sample.json @@ -12,7 +12,7 @@ "updateDateTime": "2023-10-16", "products": [ "Teams", - "TeamsToolkit" + "Microsoft 365 Agents Toolkit" ], "metadata": [ { @@ -50,7 +50,7 @@ ], "references": [ { - "name": "Teams Toolkit Visual Studio Overview", + "name": "Microsoft 365 Agents Toolkit Visual Studio Overview", "url": "https://aka.ms/teams-toolkit-vs-docs" }, { diff --git a/stocks-update-notification-bot/.funcignore b/stocks-update-notification-bot/.funcignore index 59af46d2b..797c9baf5 100644 --- a/stocks-update-notification-bot/.funcignore +++ b/stocks-update-notification-bot/.funcignore @@ -16,7 +16,7 @@ README.md tsconfig.json /appPackage/ /infra/ -teamsapp.yml -teamsapp.*.yml +m365agents.yml +m365agents.*.yml /env/ /devTools/ diff --git a/stocks-update-notification-bot/.vscode/tasks.json b/stocks-update-notification-bot/.vscode/tasks.json index d07dfdcd8..6d454c0f7 100644 --- a/stocks-update-notification-bot/.vscode/tasks.json +++ b/stocks-update-notification-bot/.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", diff --git a/stocks-update-notification-bot/README.md b/stocks-update-notification-bot/README.md index 08090c3b3..96b9eb9ee 100644 --- a/stocks-update-notification-bot/README.md +++ b/stocks-update-notification-bot/README.md @@ -20,13 +20,13 @@ The Stocks Update Notification bot shows you how to request data on a pretermine ![Stocks Update Notification Bot](assets/sampleDemo.png) ## This sample illustrates -- How to launch and debug an app using "F5" using Teams Toolkit for Visual Studio. +- How to launch and debug an app using "F5" using Microsoft 365 Agents Toolkit for Visual Studio. - How to use a bot in different contexts ## Prerequisite to use this sample - [Node.js](https://nodejs.org/), supported versions: 18, 20, 22 - A Microsoft 365 account. If you do not have Microsoft 365 account, apply one from [Microsoft 365 developer program](https://developer.microsoft.com/en-us/microsoft-365/dev-program) -- [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 @@ -47,9 +47,9 @@ The Stocks Update Notification bot shows you how to request data on a pretermine 1. Start debugging the project by hitting the `F5` key in Visual Studio Code. ### Deploy the app to Azure -1. Open Teams Toolkit, and sign into Azure by clicking the `Sign in to Azure` under the `ACCOUNTS` section from sidebar. -1. Open the Teams Toolkit and click `Provision` from LIFECYCLE section or open the command palette and select: `Teams: Provision`. -1. Open the Teams Toolkit and Click `Deploy` or open the command palette and select: `Teams: Deploy`. +1. Open Microsoft 365 Agents Toolkit, and sign into Azure by clicking the `Sign in to Azure` under the `ACCOUNTS` section from sidebar. +1. Open the Microsoft 365 Agents Toolkit and click `Provision` from LIFECYCLE section or open the command palette and select: `Microsoft 365 Agents: Provision`. +1. Open the Microsoft 365 Agents Toolkit and Click `Deploy` or open the command palette and select: `Microsoft 365 Agents: Deploy`. > Note: Provisioning and deployment may incur charges to your Azure Subscription. ### Preview the app in Teams diff --git a/stocks-update-notification-bot/assets/sample.json b/stocks-update-notification-bot/assets/sample.json index c10390f14..90df010f5 100644 --- a/stocks-update-notification-bot/assets/sample.json +++ b/stocks-update-notification-bot/assets/sample.json @@ -12,7 +12,7 @@ "updateDateTime": "2023-10-24", "products": [ "Teams", - "TeamsToolkit" + "Microsoft 365 Agents Toolkit" ], "metadata": [ { diff --git a/stocks-update-notification-bot/teamsapp.local.yml b/stocks-update-notification-bot/m365agents.local.yml similarity index 99% rename from stocks-update-notification-bot/teamsapp.local.yml rename to stocks-update-notification-bot/m365agents.local.yml index de9b68df2..fae28ecab 100644 --- a/stocks-update-notification-bot/teamsapp.local.yml +++ b/stocks-update-notification-bot/m365agents.local.yml @@ -56,7 +56,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: diff --git a/stocks-update-notification-bot/teamsapp.yml b/stocks-update-notification-bot/m365agents.yml similarity index 95% rename from stocks-update-notification-bot/teamsapp.yml rename to stocks-update-notification-bot/m365agents.yml index e54043770..5e526a07e 100644 --- a/stocks-update-notification-bot/teamsapp.yml +++ b/stocks-update-notification-bot/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. # Build Teams app package with latest env value - uses: teamsApp/zipAppPackage @@ -40,7 +40,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: @@ -83,7 +83,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: diff --git a/stocks-update-notification-bot/src/apiConnections/alphaVantage.ts b/stocks-update-notification-bot/src/apiConnections/alphaVantage.ts index 629f05d19..16f22b157 100644 --- a/stocks-update-notification-bot/src/apiConnections/alphaVantage.ts +++ b/stocks-update-notification-bot/src/apiConnections/alphaVantage.ts @@ -1,4 +1,4 @@ -// This file is auto generated by Teams Toolkit to provide you instructions and reference code to call your API. +// This file is auto generated by Microsoft 365 Agents Toolkit to provide you instructions and reference code to call your API. /* Next steps: diff --git a/team-central-dashboard/.vscode/tasks.json b/team-central-dashboard/.vscode/tasks.json index 40ed38eb5..fbd24459c 100644 --- a/team-central-dashboard/.vscode/tasks.json +++ b/team-central-dashboard/.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", diff --git a/team-central-dashboard/README.md b/team-central-dashboard/README.md index e1de23043..d676117ac 100644 --- a/team-central-dashboard/README.md +++ b/team-central-dashboard/README.md @@ -32,11 +32,11 @@ Team Central Dashboard shows you how to build a tab with data chats and content - [Node.js](https://nodejs.org/), supported versions: 18, 20, 22 - 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 [M365 developer program](https://developer.microsoft.com/en-us/microsoft-365/dev-program) -- [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 @@ -51,10 +51,10 @@ Team Central Dashboard shows you how to build a tab with data chats and content Deploy your project to Azure by following these steps: -1. Open Teams Toolkit in Visual Studio Code, and sign in your Azure account by clicking the `Sign in to Azure` in the `ACCOUNTS` section from sidebar. -1. After you signed in, select a subscription under your account. The Teams Toolkit will use this subscription to provision Azure resources to host you app. -1. Open the Teams Toolkit and click `Provision` in the `LIFECYCLE` section. Alternatively open the command palette(Ctrl+Shift+P) and type: `Teams: Provision` command. -1. Open the Teams Toolkit and click `Deploy` in the `LIFECYCLE` section. Alternatively open the command palette(Ctrl+Shift+P) and type: `Teams: Deploy` command. +1. Open Microsoft 365 Agents Toolkit in Visual Studio Code, and sign in your Azure account by clicking the `Sign in to Azure` in the `ACCOUNTS` section from sidebar. +1. After you signed in, select a subscription under your account. The Microsoft 365 Agents Toolkit will use this subscription to provision Azure resources to host you app. +1. Open the Microsoft 365 Agents Toolkit and click `Provision` in the `LIFECYCLE` section. Alternatively open the command palette(Ctrl+Shift+P) and type: `Microsoft 365 Agents: Provision` command. +1. Open the Microsoft 365 Agents Toolkit and click `Deploy` in the `LIFECYCLE` section. Alternatively open the command palette(Ctrl+Shift+P) and type: `Microsoft 365 Agents: Deploy` command. > Note: Provision Azure cloud resources and deploy to Azure may cause charges to your Azure Subscription. diff --git a/team-central-dashboard/assets/sample.json b/team-central-dashboard/assets/sample.json index 76a461653..91cc5d45d 100644 --- a/team-central-dashboard/assets/sample.json +++ b/team-central-dashboard/assets/sample.json @@ -12,7 +12,7 @@ "updateDateTime": "2023-10-24", "products": [ "Teams", - "TeamsToolkit" + "Microsoft 365 Agents Toolkit" ], "metadata": [ { diff --git a/team-central-dashboard/cli.md b/team-central-dashboard/cli.md index 6102e8062..7a44fdec9 100644 --- a/team-central-dashboard/cli.md +++ b/team-central-dashboard/cli.md @@ -1,19 +1,19 @@ -## Try sample with Teams Toolkit CLI +## Try sample with Microsoft 365 Agents Toolkit CLI 1. Install [Node.js](https://nodejs.org/en/download/) (Recommend LTS 16.x) -1. To install the Teams Toolkit CLI, use the npm package manager: +1. To install the Microsoft 365 Agents Toolkit CLI, use the npm package manager: ``` - npm install -g @microsoft/teamsapp-cli + npm install -g @microsoft/m365agentstoolkit-cli ``` 1. Create team-central-dashboard project. ``` - teamsapp new sample team-central-dashboard --interactive false + atk new sample team-central-dashboard --interactive false ``` 1. Provision the project to Azure. ``` - teamsapp provision + atk provision ``` 1. Deploy. ``` - teamsapp deploy + atk deploy ``` \ No newline at end of file diff --git a/team-central-dashboard/teamsapp.local.yml b/team-central-dashboard/m365agents.local.yml similarity index 99% rename from team-central-dashboard/teamsapp.local.yml rename to team-central-dashboard/m365agents.local.yml index a1d0f641c..2fa5fd5a8 100644 --- a/team-central-dashboard/teamsapp.local.yml +++ b/team-central-dashboard/m365agents.local.yml @@ -60,7 +60,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: diff --git a/team-central-dashboard/teamsapp.yml b/team-central-dashboard/m365agents.yml similarity index 97% rename from team-central-dashboard/teamsapp.yml rename to team-central-dashboard/m365agents.yml index 71efb0733..f410e0851 100644 --- a/team-central-dashboard/teamsapp.yml +++ b/team-central-dashboard/m365agents.yml @@ -40,7 +40,7 @@ provision: - path: ./infra/azure.bicep # Relative path to teamsfx folder parameters: ./infra/azure.parameters.json # Relative path to teamsfx folder. Placeholders will be replaced with corresponding environment variable before ARM deployment. deploymentName: Create-resources-for-tab # Required when deploy ARM template - 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. # Get the deployment token from Azure Static Web Apps - uses: azureStaticWebApps/getDeploymentToken @@ -73,7 +73,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: diff --git a/templates/command-and-response-js/.appserviceIgnore b/templates/command-and-response-js/.appserviceIgnore index 2d8a3ad18..866f035b9 100644 --- a/templates/command-and-response-js/.appserviceIgnore +++ b/templates/command-and-response-js/.appserviceIgnore @@ -1,10 +1,10 @@ .appserviceIgnore .fx .deployment -.localConfigs.testTool +.localConfigs.playground .localConfigs .notification.localstore.json -.notification.testtoolstore.json +.notification.playgroundstore.json .vscode *.js.map *.ts.map @@ -17,8 +17,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 diff --git a/templates/command-and-response-js/.gitignore b/templates/command-and-response-js/.gitignore index dfb975ac8..317395710 100644 --- a/templates/command-and-response-js/.gitignore +++ b/templates/command-and-response-js/.gitignore @@ -17,10 +17,10 @@ node_modules/ lib/ # Local data -.localConfigs.testTool +.localConfigs.playground .localConfigs .notification.localstore.json -.notification.testtoolstore.json +.notification.playgroundstore.json # Dev tool directories /devTools/ \ No newline at end of file diff --git a/templates/command-and-response-js/.vscode/launch.json b/templates/command-and-response-js/.vscode/launch.json index ccf408076..49a5485b7 100644 --- a/templates/command-and-response-js/.vscode/launch.json +++ b/templates/command-and-response-js/.vscode/launch.json @@ -117,11 +117,11 @@ "stopAll": true }, { - "name": "Debug in Test Tool", + "name": "Debug in Microsoft 365 Agents playground", "configurations": [ "Attach to Local Service" ], - "preLaunchTask": "Start Teams App (Test Tool)", + "preLaunchTask": "Start Teams App (Microsoft 365 Agents playground)", "presentation": { "group": "1-local", "order": 1 diff --git a/templates/command-and-response-js/.vscode/tasks.json b/templates/command-and-response-js/.vscode/tasks.json index 953e98858..e22532d8d 100644 --- a/templates/command-and-response-js/.vscode/tasks.json +++ b/templates/command-and-response-js/.vscode/tasks.json @@ -1,23 +1,23 @@ -// 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", "tasks": [ { - "label": "Start Teams App (Test Tool)", + "label": "Start Teams App (Microsoft 365 Agents playground)", "dependsOn": [ - "Validate prerequisites (Test Tool)", - "Deploy (Test Tool)", - "Start application (Test Tool)", - "Start Test Tool", + "Validate prerequisites (Microsoft 365 Agents playground)", + "Deploy (Microsoft 365 Agents playground)", + "Start application (Microsoft 365 Agents playground)", + "Start Microsoft 365 Agents playground", ], "dependsOrder": "sequence" }, { // Check all required prerequisites. // See https://aka.ms/teamsfx-tasks/check-prerequisites to know the details and how to customize the args. - "label": "Validate prerequisites (Test Tool)", + "label": "Validate prerequisites (Microsoft 365 Agents playground)", "type": "teamsfx", "command": "debug-check-prerequisites", "args": { @@ -28,22 +28,22 @@ "portOccupancy": [ 3978, // app service port 9239, // app inspector port for Node.js debugger - 56150, // test tool port + 56150, // Microsoft 365 Agents playground port ] } }, { // Build project. // See https://aka.ms/teamsfx-tasks/deploy to know the details and how to customize the args. - "label": "Deploy (Test Tool)", + "label": "Deploy (Microsoft 365 Agents playground)", "type": "teamsfx", "command": "deploy", "args": { - "env": "testtool", + "env": "playground", } }, { - "label": "Start application (Test Tool)", + "label": "Start application (Microsoft 365 Agents playground)", "type": "shell", "command": "npm run dev:teamsfx:testtool", "isBackground": true, @@ -67,7 +67,7 @@ } }, { - "label": "Start Test Tool", + "label": "Start Microsoft 365 Agents playground", "type": "shell", "command": "npm run dev:teamsfx:launch-testtool", "isBackground": true, diff --git a/templates/command-and-response-js/README.md b/templates/command-and-response-js/README.md index 2a9ff0384..f959b8715 100644 --- a/templates/command-and-response-js/README.md +++ b/templates/command-and-response-js/README.md @@ -11,30 +11,30 @@ The app template is built using the TeamsFx SDK, which provides a simple set of > To run the command bot template in your local dev machine, you will need: > > - [Node.js](https://nodejs.org/), supported versions: 18, 20, 22 -> - [Teams Toolkit Visual Studio Code Extension](https://aka.ms/teams-toolkit) version 5.0.0 and higher or [Teams Toolkit CLI](https://aka.ms/teamsfx-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/teamsfx-toolkit-cli) > > **Note** > > Your app can be installed into a team, or a group chat, or as personal app. See [Installation and Uninstallation](https://aka.ms/teamsfx-command-new#customize-installation). -> For local debugging using Teams Toolkit CLI, you need to do some extra steps described in [Set up your Teams Toolkit CLI for local debugging](https://aka.ms/teamsfx-cli-debugging). +> For local debugging using Microsoft 365 Agents Toolkit CLI, you need to do some extra steps described in [Set up your Microsoft 365 Agents Toolkit CLI for local debugging](https://aka.ms/teamsfx-cli-debugging). -1. First, select the Teams Toolkit icon on the left in the VS Code toolbar. -2. Press F5 to start debugging which launches your app in Teams App Test Tool using a web browser. Select `Debug in Test Tool`. -3. The browser will pop up to open Teams App Test Tool. +1. First, select the Microsoft 365 Agents Toolkit icon on the left in the VS Code toolbar. +2. Press F5 to start debugging which launches your app in Microsoft 365 Agents playground using a web browser. Select `Debug in Microsoft 365 Agents playground`. +3. The browser will pop up to open Microsoft 365 Agents playground. 4. Type or select `helloWorld` in the chat to send it to your bot - this is the default command provided by the template. The bot will respond to the `helloWorld` command with an Adaptive Card: -![Command and Response in Test Tool](https://github.com/user-attachments/assets/c17a8565-7607-49a7-93e4-43eccf24da96) +![Command and Response in Microsoft 365 Agents playground](https://github.com/OfficeDev/TeamsFx/assets/9698542/2636fd91-ec7f-4740-a5ea-b272575b0b7c) ## What's included in the template | Folder / File | Contents | | ----------------------- | -------------------------------------------------------------------------------------------------------------------------------- | -| `teamsapp.yml` | Main project file describes your application configuration and defines the set of actions to run in each lifecycle stages | -| `teamsapp.local.yml` | This overrides `teamsapp.yml` with actions that enable local execution and debugging | -| `teamsapp.testtool.yml` | This overrides `teamsapp.yml` with actions that enable local execution and debugging in Teams App Test Tool | -| `env/` | Name / value pairs are stored in environment files and used by `teamsapp.yml` to customize the provisioning and deployment rules | +| `m365agents.yml` | Main project file describes your application configuration and defines the set of actions to run in each lifecycle stages | +| `m365agents.local.yml` | This overrides `m365agents.yml` with actions that enable local execution and debugging | +| `m365agents.playground.yml` | This overrides `m365agents.yml` with actions that enable local execution and debugging in Microsoft 365 Agents playground | +| `env/` | Name / value pairs are stored in environment files and used by `m365agents.yml` to customize the provisioning and deployment rules | | `.vscode/` | VSCode files for debugging | | `appPackage/` | Templates for the Teams application manifest | | `infra/` | Templates for provisioning Azure resources | @@ -191,7 +191,7 @@ Adaptive cards can be updated on user action to allow user progress through a se - [Manage multiple environments](https://docs.microsoft.com/microsoftteams/platform/toolkit/teamsfx-multi-env) - [Collaborate with others](https://docs.microsoft.com/microsoftteams/platform/toolkit/teamsfx-collaboration) -- [Teams Toolkit Documentations](https://docs.microsoft.com/microsoftteams/platform/toolkit/teams-toolkit-fundamentals) -- [Teams Toolkit CLI](https://aka.ms/teamsfx-toolkit-cli) +- [Microsoft 365 Agents Toolkit Documentations](https://docs.microsoft.com/microsoftteams/platform/toolkit/teams-toolkit-fundamentals) +- [Microsoft 365 Agents Toolkit CLI](https://aka.ms/teamsfx-toolkit-cli) - [TeamsFx SDK](https://docs.microsoft.com/microsoftteams/platform/toolkit/teamsfx-sdk) -- [Teams Toolkit Samples](https://github.com/OfficeDev/TeamsFx-Samples) +- [Microsoft 365 Agents Toolkit Samples](https://github.com/OfficeDev/TeamsFx-Samples) diff --git a/templates/notification-restify-js/env/.env.testtool b/templates/command-and-response-js/env/.env.playground similarity index 58% rename from templates/notification-restify-js/env/.env.testtool rename to templates/command-and-response-js/env/.env.playground index 43ce12aad..e89c23c04 100644 --- a/templates/notification-restify-js/env/.env.testtool +++ b/templates/command-and-response-js/env/.env.playground @@ -1,8 +1,8 @@ # This file includes environment variables that can be committed to git. It's gitignored by default because it represents your local development environment. # Built-in environment variables -TEAMSFX_ENV=testtool +TEAMSFX_ENV=playground -# Environment variables used by test tool +# Environment variables used by Microsoft 365 Agents playground TEAMSAPPTESTER_PORT=56150 -TEAMSFX_NOTIFICATION_STORE_FILENAME=.notification.testtoolstore.json +TEAMSFX_NOTIFICATION_STORE_FILENAME=.notification.playgroundstore.json diff --git a/templates/command-and-response-js/env/.env.testtool b/templates/command-and-response-js/env/.env.testtool index 43ce12aad..e89c23c04 100644 --- a/templates/command-and-response-js/env/.env.testtool +++ b/templates/command-and-response-js/env/.env.testtool @@ -1,8 +1,8 @@ # This file includes environment variables that can be committed to git. It's gitignored by default because it represents your local development environment. # Built-in environment variables -TEAMSFX_ENV=testtool +TEAMSFX_ENV=playground -# Environment variables used by test tool +# Environment variables used by Microsoft 365 Agents playground TEAMSAPPTESTER_PORT=56150 -TEAMSFX_NOTIFICATION_STORE_FILENAME=.notification.testtoolstore.json +TEAMSFX_NOTIFICATION_STORE_FILENAME=.notification.playgroundstore.json diff --git a/templates/command-and-response-js/teamsapp.local.yml b/templates/command-and-response-js/m365agents.local.yml similarity index 99% rename from templates/command-and-response-js/teamsapp.local.yml rename to templates/command-and-response-js/m365agents.local.yml index 8a81f8033..7a70223cd 100644 --- a/templates/command-and-response-js/teamsapp.local.yml +++ b/templates/command-and-response-js/m365agents.local.yml @@ -59,7 +59,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: diff --git a/templates/command-and-response-js/teamsapp.testtool.yml b/templates/command-and-response-js/m365agents.playground.yml similarity index 94% rename from templates/command-and-response-js/teamsapp.testtool.yml rename to templates/command-and-response-js/m365agents.playground.yml index 44d71fd1b..1bbc8eb69 100644 --- a/templates/command-and-response-js/teamsapp.testtool.yml +++ b/templates/command-and-response-js/m365agents.playground.yml @@ -19,6 +19,6 @@ deploy: # Generate runtime environment variables - uses: file/createOrUpdateEnvironmentFile with: - target: ./.localConfigs.testTool + target: ./.localConfigs.playground envs: TEAMSFX_NOTIFICATION_STORE_FILENAME: ${{TEAMSFX_NOTIFICATION_STORE_FILENAME}} \ No newline at end of file diff --git a/templates/command-and-response-js/teamsapp.yml b/templates/command-and-response-js/m365agents.yml similarity index 97% rename from templates/command-and-response-js/teamsapp.yml rename to templates/command-and-response-js/m365agents.yml index 5fd1d1016..5910f0ff9 100644 --- a/templates/command-and-response-js/teamsapp.yml +++ b/templates/command-and-response-js/m365agents.yml @@ -38,7 +38,7 @@ provision: parameters: ./infra/azure.parameters.json # Required when deploying ARM template deploymentName: Create-resources-for-bot - # Teams Toolkit will download this bicep CLI version from github for you, + # 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. bicepCliVersion: v0.9.1 @@ -60,7 +60,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: @@ -108,7 +108,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: diff --git a/templates/command-and-response-js/package.json b/templates/command-and-response-js/package.json index d1f42063a..d59fbd006 100644 --- a/templates/command-and-response-js/package.json +++ b/templates/command-and-response-js/package.json @@ -1,7 +1,7 @@ { "name": "commandandresponsejs", "version": "1.0.0", - "description": "Microsoft Teams Toolkit Command and Response Bot Sample", + "description": "Microsoft 365 Agents Toolkit Command and Response Bot Sample", "engines": { "node": "18 || 20 || 22" }, @@ -10,8 +10,8 @@ "main": "./src/index.js", "scripts": { "dev:teamsfx": "env-cmd --silent -f .localConfigs npm run dev", - "dev:teamsfx:testtool": "env-cmd --silent -f .localConfigs.testTool npm run dev", - "dev:teamsfx:launch-testtool": "env-cmd --silent -f env/.env.testtool teamsapptester start", + "dev:teamsfx:testtool": "env-cmd --silent -f .localConfigs.playground npm run dev", + "dev:teamsfx:launch-testtool": "env-cmd --silent -f env/.env.playground teamsapptester start", "dev": "nodemon --inspect=9239 --signal SIGINT ./src/index.js", "start": "node ./src/index.js", "watch": "nodemon ./src/index.js", diff --git a/templates/command-and-response-js/src/adaptiveCards/helloworldCommand.json b/templates/command-and-response-js/src/adaptiveCards/helloworldCommand.json index b8124f615..1ddb0b50d 100644 --- a/templates/command-and-response-js/src/adaptiveCards/helloworldCommand.json +++ b/templates/command-and-response-js/src/adaptiveCards/helloworldCommand.json @@ -21,7 +21,7 @@ }, { "type": "Action.OpenUrl", - "title": "Teams Toolkit Docs", + "title": "Microsoft 365 Agents Toolkit Docs", "url": "https://aka.ms/teamsfx-docs" } ], diff --git a/templates/command-and-response-js/src/helloworldCommandHandler.js b/templates/command-and-response-js/src/helloworldCommandHandler.js index 266672502..863ee1fdf 100644 --- a/templates/command-and-response-js/src/helloworldCommandHandler.js +++ b/templates/command-and-response-js/src/helloworldCommandHandler.js @@ -13,7 +13,7 @@ class HelloWorldCommandHandler { const cardJson = new ACData.Template(helloWorldCard).expand({ $root: { title: "Your Hello World App is Running", - body: "Congratulations! Your Hello World App is running. Open the documentation below to learn more about how to build applications with the Teams Toolkit.", + body: "Congratulations! Your Hello World App is running. Open the documentation below to learn more about how to build applications with the Microsoft 365 Agents Toolkit.", }, }); return MessageFactory.attachment(CardFactory.adaptiveCard(cardJson)); diff --git a/templates/command-and-response-js/src/index.js b/templates/command-and-response-js/src/index.js index 7616001f2..249be271a 100644 --- a/templates/command-and-response-js/src/index.js +++ b/templates/command-and-response-js/src/index.js @@ -21,7 +21,7 @@ const server = expressApp.listen( // Register an API endpoint with `express`. Teams sends messages to your application // through this endpoint. // -// The Teams Toolkit bot registration configures the bot with `/api/messages` as the +// The Microsoft 365 Agents Toolkit bot registration configures the bot with `/api/messages` as the // Bot Framework endpoint. If you customize this route, update the Bot registration // in `templates/azure/provision/botservice.bicep`. const teamsBot = new TeamsBot(); diff --git a/templates/copilot-rag-ai-search/.gitignore b/templates/copilot-rag-ai-search/.gitignore index 75baccc46..b36022000 100644 --- a/templates/copilot-rag-ai-search/.gitignore +++ b/templates/copilot-rag-ai-search/.gitignore @@ -1,7 +1,7 @@ # TeamsFx files env/.env.*.user env/.env.local -env/.env.testtool +env/.env.playground .env appPackage/build diff --git a/templates/copilot-rag-ai-search/.vscode/launch.json b/templates/copilot-rag-ai-search/.vscode/launch.json index a0c18a24f..df5119a81 100644 --- a/templates/copilot-rag-ai-search/.vscode/launch.json +++ b/templates/copilot-rag-ai-search/.vscode/launch.json @@ -65,7 +65,7 @@ "console": "integratedTerminal" }, { - "name": "Start Test Tool", + "name": "Start Microsoft 365 Agents playground", "type": "node", "request": "launch", "program": "${workspaceFolder}/devTools/teamsapptester/node_modules/@microsoft/teams-app-test-tool/cli.js", @@ -111,15 +111,15 @@ "stopAll": true }, { - "name": "Debug in Test Tool", + "name": "Debug in Microsoft 365 Agents playground", "configurations": [ "Start Python", - "Start Test Tool" + "Start Microsoft 365 Agents playground" ], "cascadeTerminateToConfigurations": [ - "Start Test Tool" + "Start Microsoft 365 Agents playground" ], - "preLaunchTask": "Deploy (Test Tool)", + "preLaunchTask": "Deploy (Microsoft 365 Agents playground)", "presentation": { "group": "2-local", "order": 1 diff --git a/templates/copilot-rag-ai-search/.vscode/tasks.json b/templates/copilot-rag-ai-search/.vscode/tasks.json index a964abf89..5dca48ef6 100644 --- a/templates/copilot-rag-ai-search/.vscode/tasks.json +++ b/templates/copilot-rag-ai-search/.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", @@ -7,7 +7,7 @@ { // Check all required prerequisites. // See https://aka.ms/teamsfx-tasks/check-prerequisites to know the details and how to customize the args. - "label": "Validate prerequisites (Test Tool)", + "label": "Validate prerequisites (Microsoft 365 Agents playground)", "type": "teamsfx", "command": "debug-check-prerequisites", "args": { @@ -17,21 +17,21 @@ ], "portOccupancy": [ 3978, // app service port - 56150, // test tool port + 56150, // Microsoft 365 Agents playground port ] } }, { // Build project. // See https://aka.ms/teamsfx-tasks/deploy to know the details and how to customize the args. - "label": "Deploy (Test Tool)", + "label": "Deploy (Microsoft 365 Agents playground)", "dependsOn": [ - "Validate prerequisites (Test Tool)" + "Validate prerequisites (Microsoft 365 Agents playground)" ], "type": "teamsfx", "command": "deploy", "args": { - "env": "testtool", + "env": "playground", } }, { diff --git a/templates/copilot-rag-ai-search/.webappignore b/templates/copilot-rag-ai-search/.webappignore index fc2332c6b..3ba65c03e 100644 --- a/templates/copilot-rag-ai-search/.webappignore +++ b/templates/copilot-rag-ai-search/.webappignore @@ -7,9 +7,9 @@ infra/ env/ __pycache__/ README.md -teamsapp.yml -teamsapp.local.yml -teamsapp.testtool.yml +m365agents.yml +m365agents.local.yml +m365agents.playground.yml .gitignore indexers/ \ No newline at end of file diff --git a/templates/copilot-rag-ai-search/README.md b/templates/copilot-rag-ai-search/README.md index 334bc0829..c4186609a 100644 --- a/templates/copilot-rag-ai-search/README.md +++ b/templates/copilot-rag-ai-search/README.md @@ -14,7 +14,7 @@ This app template also demonstrates usage of techniques like: > > - [Python](https://www.python.org/), version 3.8 to 3.11. > - [Python extension](https://code.visualstudio.com/docs/languages/python), version v2024.0.1 or higher. -> - [Teams Toolkit Visual Studio Code Extension](https://aka.ms/teams-toolkit) latest version or [Teams Toolkit CLI](https://aka.ms/teams-toolkit-cli). +> - [Microsoft 365 Agents Toolkit Visual Studio Code Extension](https://aka.ms/teams-toolkit) latest version or [Microsoft 365 Agents Toolkit CLI](https://aka.ms/teams-toolkit-cli). > - An account with [Azure OpenAI](https://aka.ms/oai/access). > - An [Azure Search service](https://learn.microsoft.com/en-us/azure/search/search-what-is-azure-search). > - A [Microsoft 365 account for development](https://docs.microsoft.com/microsoftteams/platform/toolkit/accounts). @@ -36,7 +36,7 @@ This app template also demonstrates usage of techniques like: 1. Once you're done using the sample it's good practice to delete the index. You can do so with the command `python src/indexers/delete.py`. ### Conversation with bot -1. Select the Teams Toolkit icon on the left in the VS Code toolbar. +1. Select the Microsoft 365 Agents Toolkit icon on the left in the VS Code toolbar. 1. In the Account section, sign in with your [Microsoft 365 account](https://docs.microsoft.com/microsoftteams/platform/toolkit/accounts) if you haven't already. 1. Press F5 to start debugging which launches your app in Teams using a web browser. Select `Debug in Teams (Edge)` or `Debug in Teams (Chrome)`. 1. When Teams launches in the browser, select the Add button in the dialog to install your app to Teams. @@ -44,7 +44,7 @@ This app template also demonstrates usage of techniques like: **Congratulations**! You are running an application that can now interact with users in Teams: -> For local debugging using Teams Toolkit CLI, you need to do some extra steps described in [Set up your Teams Toolkit CLI for local debugging](https://aka.ms/teamsfx-cli-debugging). +> For local debugging using Microsoft 365 Agents Toolkit CLI, you need to do some extra steps described in [Set up your Microsoft 365 Agents Toolkit CLI for local debugging](https://aka.ms/teamsfx-cli-debugging). ![alt text](https://github.com/OfficeDev/TeamsFx/assets/109947924/2c17e3e8-09c1-42b6-b47a-ac4234343883) @@ -78,13 +78,13 @@ The following files are scripts and raw texts that help you to prepare or clean |`src/indexers/setup.py`| A script to create index and upload documents.| |`src/indexers/delete.py`| A script to delete index and documents.| -The following are Teams Toolkit specific project files. You can [visit a complete guide on Github](https://github.com/OfficeDev/TeamsFx/wiki/Teams-Toolkit-Visual-Studio-Code-v5-Guide#overview) to understand how Teams Toolkit works. +The following are Microsoft 365 Agents Toolkit specific project files. You can [visit a complete guide on Github](https://github.com/OfficeDev/TeamsFx/wiki/Teams-Toolkit-Visual-Studio-Code-v5-Guide#overview) to understand how Microsoft 365 Agents Toolkit works. | File | Contents | | - | - | -|`teamsapp.yml`|This is the main Teams Toolkit project file. The project file defines two primary things: Properties and configuration Stage definitions. | -|`teamsapp.local.yml`|This overrides `teamsapp.yml` with actions that enable local execution and debugging.| -|`teamsapp.testtool.yml`|This overrides `teamsapp.yml` with actions that enable local execution and debugging in Teams App Test Tool.| +|`m365agents.yml`|This is the main Microsoft 365 Agents Toolkit project file. The project file defines two primary things: Properties and configuration Stage definitions. | +|`m365agents.local.yml`|This overrides `m365agents.yml` with actions that enable local execution and debugging.| +|`m365agents.playground.yml`|This overrides `m365agents.yml` with actions that enable local execution and debugging in Microsoft 365 Agents playground.| ## Extend the template @@ -95,11 +95,11 @@ You can refer to the section [integrate-vectorization](https://github.com/Office ## Additional information and references -- [Teams Toolkit Documentations](https://docs.microsoft.com/microsoftteams/platform/toolkit/teams-toolkit-fundamentals) -- [Teams Toolkit CLI](https://aka.ms/teamsfx-toolkit-cli) -- [Teams Toolkit Samples](https://github.com/OfficeDev/TeamsFx-Samples) +- [Microsoft 365 Agents Toolkit Documentations](https://docs.microsoft.com/microsoftteams/platform/toolkit/teams-toolkit-fundamentals) +- [Microsoft 365 Agents Toolkit CLI](https://aka.ms/teamsfx-toolkit-cli) +- [Microsoft 365 Agents Toolkit Samples](https://github.com/OfficeDev/TeamsFx-Samples) ## Known issue -- If you use `Debug in Test Tool` to local debug, you might get an error `InternalServiceError: connect ECONNREFUSED 127.0.0.1:3978` in Test Tool console log or error message `Error: Cannot connect to your app, -please make sure your app is running or restart your app` in log panel of Test Tool web page. You can wait for Python launch console ready and then refresh the front end web page. +- If you use `Debug in Microsoft 365 Agents playground` to local debug, you might get an error `InternalServiceError: connect ECONNREFUSED 127.0.0.1:3978` in Microsoft 365 Agents playground console log or error message `Error: Cannot connect to your app, +please make sure your app is running or restart your app` in log panel of Microsoft 365 Agents playground web page. You can wait for Python launch console ready and then refresh the front end web page. - When you use `Launch Remote in Teams` to remote debug after deployment, you might loose interaction with your bot. This is because the remote service needs to restart. Please wait for several minutes to retry it. \ No newline at end of file diff --git a/templates/copilot-rag-ai-search/teamsapp.local.yml b/templates/copilot-rag-ai-search/m365agents.local.yml similarity index 99% rename from templates/copilot-rag-ai-search/teamsapp.local.yml rename to templates/copilot-rag-ai-search/m365agents.local.yml index efb615956..5e21ca381 100644 --- a/templates/copilot-rag-ai-search/teamsapp.local.yml +++ b/templates/copilot-rag-ai-search/m365agents.local.yml @@ -59,7 +59,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: diff --git a/templates/copilot-rag-ai-search/teamsapp.testtool.yml b/templates/copilot-rag-ai-search/m365agents.playground.yml similarity index 100% rename from templates/copilot-rag-ai-search/teamsapp.testtool.yml rename to templates/copilot-rag-ai-search/m365agents.playground.yml diff --git a/templates/copilot-rag-ai-search/teamsapp.yml b/templates/copilot-rag-ai-search/m365agents.yml similarity index 97% rename from templates/copilot-rag-ai-search/teamsapp.yml rename to templates/copilot-rag-ai-search/m365agents.yml index b27b9e38f..8283cf5ba 100644 --- a/templates/copilot-rag-ai-search/teamsapp.yml +++ b/templates/copilot-rag-ai-search/m365agents.yml @@ -53,7 +53,7 @@ provision: parameters: ./infra/azure.parameters.json # Required when deploying ARM template deploymentName: Create-resources-for-tab - # Teams Toolkit will download this bicep CLI version from github for you, + # 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. bicepCliVersion: v0.9.1 @@ -75,7 +75,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: @@ -118,7 +118,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: diff --git a/templates/copilot-rag-customize/.gitignore b/templates/copilot-rag-customize/.gitignore index 75baccc46..b36022000 100644 --- a/templates/copilot-rag-customize/.gitignore +++ b/templates/copilot-rag-customize/.gitignore @@ -1,7 +1,7 @@ # TeamsFx files env/.env.*.user env/.env.local -env/.env.testtool +env/.env.playground .env appPackage/build diff --git a/templates/copilot-rag-customize/.vscode/launch.json b/templates/copilot-rag-customize/.vscode/launch.json index a0c18a24f..df5119a81 100644 --- a/templates/copilot-rag-customize/.vscode/launch.json +++ b/templates/copilot-rag-customize/.vscode/launch.json @@ -65,7 +65,7 @@ "console": "integratedTerminal" }, { - "name": "Start Test Tool", + "name": "Start Microsoft 365 Agents playground", "type": "node", "request": "launch", "program": "${workspaceFolder}/devTools/teamsapptester/node_modules/@microsoft/teams-app-test-tool/cli.js", @@ -111,15 +111,15 @@ "stopAll": true }, { - "name": "Debug in Test Tool", + "name": "Debug in Microsoft 365 Agents playground", "configurations": [ "Start Python", - "Start Test Tool" + "Start Microsoft 365 Agents playground" ], "cascadeTerminateToConfigurations": [ - "Start Test Tool" + "Start Microsoft 365 Agents playground" ], - "preLaunchTask": "Deploy (Test Tool)", + "preLaunchTask": "Deploy (Microsoft 365 Agents playground)", "presentation": { "group": "2-local", "order": 1 diff --git a/templates/copilot-rag-customize/.vscode/tasks.json b/templates/copilot-rag-customize/.vscode/tasks.json index a964abf89..5dca48ef6 100644 --- a/templates/copilot-rag-customize/.vscode/tasks.json +++ b/templates/copilot-rag-customize/.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", @@ -7,7 +7,7 @@ { // Check all required prerequisites. // See https://aka.ms/teamsfx-tasks/check-prerequisites to know the details and how to customize the args. - "label": "Validate prerequisites (Test Tool)", + "label": "Validate prerequisites (Microsoft 365 Agents playground)", "type": "teamsfx", "command": "debug-check-prerequisites", "args": { @@ -17,21 +17,21 @@ ], "portOccupancy": [ 3978, // app service port - 56150, // test tool port + 56150, // Microsoft 365 Agents playground port ] } }, { // Build project. // See https://aka.ms/teamsfx-tasks/deploy to know the details and how to customize the args. - "label": "Deploy (Test Tool)", + "label": "Deploy (Microsoft 365 Agents playground)", "dependsOn": [ - "Validate prerequisites (Test Tool)" + "Validate prerequisites (Microsoft 365 Agents playground)" ], "type": "teamsfx", "command": "deploy", "args": { - "env": "testtool", + "env": "playground", } }, { diff --git a/templates/copilot-rag-customize/.webappignore b/templates/copilot-rag-customize/.webappignore index 0a7d5f285..245c876d8 100644 --- a/templates/copilot-rag-customize/.webappignore +++ b/templates/copilot-rag-customize/.webappignore @@ -7,7 +7,7 @@ infra/ env/ __pycache__/ README.md -teamsapp.yml -teamsapp.local.yml -teamsapp.testtool.yml +m365agents.yml +m365agents.local.yml +m365agents.playground.yml .gitignore diff --git a/templates/copilot-rag-customize/README.md b/templates/copilot-rag-customize/README.md index ebbceba13..d30bc1d32 100644 --- a/templates/copilot-rag-customize/README.md +++ b/templates/copilot-rag-customize/README.md @@ -13,7 +13,7 @@ This app template also demonstrates usage of techniques like: > > - [Python](https://www.python.org/), version 3.8 to 3.11. > - [Python extension](https://code.visualstudio.com/docs/languages/python), version v2024.0.1 or higher. -> - [Teams Toolkit Visual Studio Code Extension](https://aka.ms/teams-toolkit) latest version or [Teams Toolkit CLI](https://aka.ms/teams-toolkit-cli). +> - [Microsoft 365 Agents Toolkit Visual Studio Code Extension](https://aka.ms/teams-toolkit) latest version or [Microsoft 365 Agents Toolkit CLI](https://aka.ms/teams-toolkit-cli). > - An account with [Azure OpenAI](https://aka.ms/oai/access). > - A [Microsoft 365 account for development](https://docs.microsoft.com/microsoftteams/platform/toolkit/accounts). @@ -22,7 +22,7 @@ This app template also demonstrates usage of techniques like: 1. In file *env/.env.local.user*, fill in your Azure OpenAI key `SECRET_AZURE_OPENAI_API_KEY`, deployment name `AZURE_OPENAI_MODEL_DEPLOYMENT_NAME` and endpoint `AZURE_OPENAI_ENDPOINT`. ### Conversation with bot -1. Select the Teams Toolkit icon on the left in the VS Code toolbar. +1. Select the Microsoft 365 Agents Toolkit icon on the left in the VS Code toolbar. 1. In the Account section, sign in with your [Microsoft 365 account](https://docs.microsoft.com/microsoftteams/platform/toolkit/accounts) if you haven't already. 1. Press F5 to start debugging which launches your app in Teams using a web browser. Select `Debug in Teams (Edge)` or `Debug in Teams (Chrome)`. 1. When Teams launches in the browser, select the Add button in the dialog to install your app to Teams. @@ -30,7 +30,7 @@ This app template also demonstrates usage of techniques like: **Congratulations**! You are running an application that can now interact with users in Teams: -> For local debugging using Teams Toolkit CLI, you need to do some extra steps described in [Set up your Teams Toolkit CLI for local debugging](https://aka.ms/teamsfx-cli-debugging). +> For local debugging using Microsoft 365 Agents Toolkit CLI, you need to do some extra steps described in [Set up your Microsoft 365 Agents Toolkit CLI for local debugging](https://aka.ms/teamsfx-cli-debugging). ![alt text](https://github.com/OfficeDev/TeamsFx/assets/109947924/d4f9b455-dbb0-4e14-8557-59f9be5c1200) @@ -56,13 +56,13 @@ The following files can be customized and demonstrate an example implementation |`src/prompts/chat/skprompt.txt`| Defines the prompt.| |`src/prompts/chat/config.json`| Configures the prompt.| -The following are Teams Toolkit specific project files. You can [visit a complete guide on Github](https://github.com/OfficeDev/TeamsFx/wiki/Teams-Toolkit-Visual-Studio-Code-v5-Guide#overview) to understand how Teams Toolkit works. +The following are Microsoft 365 Agents Toolkit specific project files. You can [visit a complete guide on Github](https://github.com/OfficeDev/TeamsFx/wiki/Teams-Toolkit-Visual-Studio-Code-v5-Guide#overview) to understand how Microsoft 365 Agents Toolkit works. | File | Contents | | - | - | -|`teamsapp.yml`|This is the main Teams Toolkit project file. The project file defines two primary things: Properties and configuration Stage definitions. | -|`teamsapp.local.yml`|This overrides `teamsapp.yml` with actions that enable local execution and debugging.| -|`teamsapp.testtool.yml`|This overrides `teamsapp.yml` with actions that enable local execution and debugging in Teams App Test Tool.| +|`m365agents.yml`|This is the main Microsoft 365 Agents Toolkit project file. The project file defines two primary things: Properties and configuration Stage definitions. | +|`m365agents.local.yml`|This overrides `m365agents.yml` with actions that enable local execution and debugging.| +|`m365agents.playground.yml`|This overrides `m365agents.yml` with actions that enable local execution and debugging in Microsoft 365 Agents playground.| ## Extend the template @@ -71,11 +71,11 @@ The following are Teams Toolkit specific project files. You can [visit a complet ## Additional information and references -- [Teams Toolkit Documentations](https://docs.microsoft.com/microsoftteams/platform/toolkit/teams-toolkit-fundamentals) -- [Teams Toolkit CLI](https://aka.ms/teamsfx-toolkit-cli) -- [Teams Toolkit Samples](https://github.com/OfficeDev/TeamsFx-Samples) +- [Microsoft 365 Agents Toolkit Documentations](https://docs.microsoft.com/microsoftteams/platform/toolkit/teams-toolkit-fundamentals) +- [Microsoft 365 Agents Toolkit CLI](https://aka.ms/teamsfx-toolkit-cli) +- [Microsoft 365 Agents Toolkit Samples](https://github.com/OfficeDev/TeamsFx-Samples) ## Known issue -- If you use `Debug in Test Tool` to local debug, you might get an error `InternalServiceError: connect ECONNREFUSED 127.0.0.1:3978` in Test Tool console log or error message `Error: Cannot connect to your app, -please make sure your app is running or restart your app` in log panel of Test Tool web page. You can wait for Python launch console ready and then refresh the front end web page. +- If you use `Debug in Microsoft 365 Agents playground` to local debug, you might get an error `InternalServiceError: connect ECONNREFUSED 127.0.0.1:3978` in Microsoft 365 Agents playground console log or error message `Error: Cannot connect to your app, +please make sure your app is running or restart your app` in log panel of Microsoft 365 Agents playground web page. You can wait for Python launch console ready and then refresh the front end web page. - When you use `Launch Remote in Teams` to remote debug after deployment, you might loose interaction with your bot. This is because the remote service needs to restart. Please wait for several minutes to retry it. \ No newline at end of file diff --git a/templates/copilot-rag-customize/teamsapp.local.yml b/templates/copilot-rag-customize/m365agents.local.yml similarity index 99% rename from templates/copilot-rag-customize/teamsapp.local.yml rename to templates/copilot-rag-customize/m365agents.local.yml index 465868276..f0ad4dcf9 100644 --- a/templates/copilot-rag-customize/teamsapp.local.yml +++ b/templates/copilot-rag-customize/m365agents.local.yml @@ -59,7 +59,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: diff --git a/templates/copilot-rag-customize/teamsapp.testtool.yml b/templates/copilot-rag-customize/m365agents.playground.yml similarity index 100% rename from templates/copilot-rag-customize/teamsapp.testtool.yml rename to templates/copilot-rag-customize/m365agents.playground.yml diff --git a/templates/copilot-rag-customize/teamsapp.yml b/templates/copilot-rag-customize/m365agents.yml similarity index 97% rename from templates/copilot-rag-customize/teamsapp.yml rename to templates/copilot-rag-customize/m365agents.yml index b1c8a0204..d2c5a8224 100644 --- a/templates/copilot-rag-customize/teamsapp.yml +++ b/templates/copilot-rag-customize/m365agents.yml @@ -53,7 +53,7 @@ provision: parameters: ./infra/azure.parameters.json # Required when deploying ARM template deploymentName: Create-resources-for-tab - # Teams Toolkit will download this bicep CLI version from github for you, + # 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. bicepCliVersion: v0.9.1 @@ -75,7 +75,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: @@ -118,7 +118,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: diff --git a/templates/copilot-rag-m365/.gitignore b/templates/copilot-rag-m365/.gitignore index bc090d917..ca1acd9bb 100644 --- a/templates/copilot-rag-m365/.gitignore +++ b/templates/copilot-rag-m365/.gitignore @@ -2,9 +2,9 @@ env/.env.*.user env/.env.local .localConfigs -.localConfigs.testTool +.localConfigs.playground .notification.localstore.json -.notification.testtoolstore.json +.notification.playgroundstore.json appPackage/build # dependencies diff --git a/templates/copilot-rag-m365/.vscode/tasks.json b/templates/copilot-rag-m365/.vscode/tasks.json index e6782df58..0228516a3 100644 --- a/templates/copilot-rag-m365/.vscode/tasks.json +++ b/templates/copilot-rag-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", diff --git a/templates/copilot-rag-m365/.webappignore b/templates/copilot-rag-m365/.webappignore index 18a015a2a..0828a7827 100644 --- a/templates/copilot-rag-m365/.webappignore +++ b/templates/copilot-rag-m365/.webappignore @@ -1,10 +1,10 @@ .webappignore .fx .deployment -.localConfigs.testTool +.localConfigs.playground .localConfigs .notification.localstore.json -.notification.testtoolstore.json +.notification.playgroundstore.json .vscode *.js.map *.ts.map @@ -17,8 +17,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 diff --git a/templates/copilot-rag-m365/README.md b/templates/copilot-rag-m365/README.md index f159d7e6f..e4f2a3ade 100644 --- a/templates/copilot-rag-m365/README.md +++ b/templates/copilot-rag-m365/README.md @@ -14,15 +14,15 @@ This app template also demonstrates usage of techniques like: > > - [Node.js](https://nodejs.org/), supported versions: 18, 20, 22 > - 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 Visual Studio Code Extension](https://aka.ms/teams-toolkit) version 5.0.0 and higher or [Teams Toolkit CLI](https://aka.ms/teamsfx-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/teamsfx-toolkit-cli). > - Prepare your own [Azure OpenAI](https://aka.ms/oai/access) resource. > [!TIP] -> You can adjust this template to use data from a Microsoft Copilot connector. Follow the steps in the [CodeTour](https://marketplace.visualstudio.com/items?itemName=vsls-contrib.codetour) included in the project to apply the necessary changes. To use data from a Microsoft Copilot connector, you need a Copilot connector deployed to your tenant. For testing, we recommend using the [Ingest custom API data using TypeScript, Node.js and Teams Toolkit for Visual Studio Code](https://adoption.microsoft.com/sample-solution-gallery/sample/pnp-graph-connector-nodejs-typescript-food-catalog) sample. +> You can adjust this template to use data from a Microsoft Copilot connector. Follow the steps in the [CodeTour](https://marketplace.visualstudio.com/items?itemName=vsls-contrib.codetour) included in the project to apply the necessary changes. To use data from a Microsoft Copilot connector, you need a Copilot connector deployed to your tenant. For testing, we recommend using the [Ingest custom API data using TypeScript, Node.js and Microsoft 365 Agents Toolkit for Visual Studio Code](https://adoption.microsoft.com/sample-solution-gallery/sample/pnp-graph-connector-nodejs-typescript-food-catalog) sample. -> For local debugging using Teams Toolkit CLI, you need to do some extra steps described in [Set up your Teams Toolkit CLI for local debugging](https://aka.ms/teamsfx-cli-debugging). +> For local debugging using Microsoft 365 Agents Toolkit CLI, you need to do some extra steps described in [Set up your Microsoft 365 Agents Toolkit CLI for local debugging](https://aka.ms/teamsfx-cli-debugging). -1. First, select the Teams Toolkit icon on the left in the VS Code toolbar. +1. First, select the Microsoft 365 Agents Toolkit icon on the left in the VS Code toolbar. 1. In file *env/.env.local.user*, fill in your Azure OpenAI key `SECRET_AZURE_OPENAI_API_KEY=`, endpoint `AZURE_OPENAI_ENDPOINT=` and deployment name `AZURE_OPENAI_DEPLOYMENT_NAME=`. 1. Microsoft Graph Search API is available for searching SharePoint content, thus you just need to ensure your document in *src/data/\*.txt* is [uploaded to SharePoint / OneDrive](https://support.microsoft.com/office/upload-files-and-folders-to-a-library-da549fb1-1fcb-4167-87d0-4693e93cb7a0), no extra data ingestion required. 1. Press F5 to start debugging which launches your app in Teams using a web browser. Select `Debug in Teams (Edge)` or `Debug in Teams (Chrome)`. @@ -55,12 +55,12 @@ The following files can be customized and demonstrate an example implementation |`src/data/*.txt`| Raw text data sources.| |`src/public/*.html`| Auth start page and an auth end page to be used by the user sign in flow.| -The following are Teams Toolkit specific project files. You can [visit a complete guide on Github](https://github.com/OfficeDev/TeamsFx/wiki/Teams-Toolkit-Visual-Studio-Code-v5-Guide#overview) to understand how Teams Toolkit works. +The following are Microsoft 365 Agents Toolkit specific project files. You can [visit a complete guide on Github](https://github.com/OfficeDev/TeamsFx/wiki/Teams-Toolkit-Visual-Studio-Code-v5-Guide#overview) to understand how Microsoft 365 Agents Toolkit works. | File | Contents | | - | - | -|`teamsapp.yml`|This is the main Teams Toolkit project file. The project file defines two primary things: Properties and configuration Stage definitions. | -|`teamsapp.local.yml`|This overrides `teamsapp.yml` with actions that enable local execution and debugging.| +|`m365agents.yml`|This is the main Microsoft 365 Agents Toolkit project file. The project file defines two primary things: Properties and configuration Stage definitions. | +|`m365agents.local.yml`|This overrides `m365agents.yml` with actions that enable local execution and debugging.| ## Extend the template @@ -69,6 +69,6 @@ The following are Teams Toolkit specific project files. You can [visit a complet ## Additional information and references -- [Teams Toolkit Documentations](https://docs.microsoft.com/microsoftteams/platform/toolkit/teams-toolkit-fundamentals) -- [Teams Toolkit CLI](https://aka.ms/teamsfx-toolkit-cli) -- [Teams Toolkit Samples](https://github.com/OfficeDev/TeamsFx-Samples) \ No newline at end of file +- [Microsoft 365 Agents Toolkit Documentations](https://docs.microsoft.com/microsoftteams/platform/toolkit/teams-toolkit-fundamentals) +- [Microsoft 365 Agents Toolkit CLI](https://aka.ms/teamsfx-toolkit-cli) +- [Microsoft 365 Agents Toolkit Samples](https://github.com/OfficeDev/TeamsFx-Samples) \ No newline at end of file diff --git a/templates/copilot-rag-m365/teamsapp.local.yml b/templates/copilot-rag-m365/m365agents.local.yml similarity index 99% rename from templates/copilot-rag-m365/teamsapp.local.yml rename to templates/copilot-rag-m365/m365agents.local.yml index 08f35f9eb..e39a9eb67 100644 --- a/templates/copilot-rag-m365/teamsapp.local.yml +++ b/templates/copilot-rag-m365/m365agents.local.yml @@ -77,7 +77,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: diff --git a/templates/copilot-rag-m365/teamsapp.yml b/templates/copilot-rag-m365/m365agents.yml similarity index 98% rename from templates/copilot-rag-m365/teamsapp.yml rename to templates/copilot-rag-m365/m365agents.yml index 623230a32..68b847e86 100644 --- a/templates/copilot-rag-m365/teamsapp.yml +++ b/templates/copilot-rag-m365/m365agents.yml @@ -52,7 +52,7 @@ provision: parameters: ./infra/azure.parameters.json # Required when deploying ARM template deploymentName: Create-resources-for-bot - # Teams Toolkit will download this bicep CLI version from github for you, + # 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. bicepCliVersion: v0.9.1 @@ -79,7 +79,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: @@ -131,7 +131,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: diff --git a/templates/copilot-rag-m365/package.json b/templates/copilot-rag-m365/package.json index a0890ae98..de3b413f9 100644 --- a/templates/copilot-rag-m365/package.json +++ b/templates/copilot-rag-m365/package.json @@ -4,7 +4,7 @@ "msteams": { "teamsAppId": null }, - "description": "Microsoft Teams Toolkit RAG Bot Sample with Graph API and Teams AI Library", + "description": "Microsoft 365 Agents Toolkit RAG Bot Sample with Graph API and Teams AI Library", "engines": { "node": "18 || 20 || 22" }, @@ -13,8 +13,8 @@ "main": "./lib/src/index.js", "scripts": { "dev:teamsfx": "env-cmd --silent -f .localConfigs npm run dev", - "dev:teamsfx:testtool": "env-cmd --silent -f .localConfigs.testTool npm run dev", - "dev:teamsfx:launch-testtool": "env-cmd --silent -f env/.env.testtool teamsapptester start", + "dev:teamsfx:testtool": "env-cmd --silent -f .localConfigs.playground npm run dev", + "dev:teamsfx:launch-testtool": "env-cmd --silent -f env/.env.playground teamsapptester start", "dev": "nodemon --exec node --inspect=9239 --signal SIGINT -r ts-node/register ./src/index.ts", "build": "tsc --build && shx cp -r ./src/prompts ./lib/src && shx cp -r ./src/public ./lib/src", "start": "node ./lib/src/index.js", diff --git a/templates/custom-copilot-assistant-new/.gitignore b/templates/custom-copilot-assistant-new/.gitignore index 75baccc46..b36022000 100644 --- a/templates/custom-copilot-assistant-new/.gitignore +++ b/templates/custom-copilot-assistant-new/.gitignore @@ -1,7 +1,7 @@ # TeamsFx files env/.env.*.user env/.env.local -env/.env.testtool +env/.env.playground .env appPackage/build diff --git a/templates/custom-copilot-assistant-new/.vscode/launch.json b/templates/custom-copilot-assistant-new/.vscode/launch.json index ec88b3720..f0025c432 100644 --- a/templates/custom-copilot-assistant-new/.vscode/launch.json +++ b/templates/custom-copilot-assistant-new/.vscode/launch.json @@ -65,7 +65,7 @@ "console": "integratedTerminal" }, { - "name": "Start Test Tool", + "name": "Start Microsoft 365 Agents playground", "type": "node", "request": "launch", "program": "${workspaceFolder}/devTools/teamsapptester/node_modules/@microsoft/teams-app-test-tool/cli.js", @@ -111,15 +111,15 @@ "stopAll": true }, { - "name": "Debug in Test Tool", + "name": "Debug in Microsoft 365 Agents playground", "configurations": [ "Start Python", - "Start Test Tool" + "Start Microsoft 365 Agents playground" ], "cascadeTerminateToConfigurations": [ - "Start Test Tool" + "Start Microsoft 365 Agents playground" ], - "preLaunchTask": "Deploy (Test Tool)", + "preLaunchTask": "Deploy (Microsoft 365 Agents playground)", "presentation": { "group": "2-local", "order": 1 diff --git a/templates/custom-copilot-assistant-new/.vscode/tasks.json b/templates/custom-copilot-assistant-new/.vscode/tasks.json index a964abf89..5dca48ef6 100644 --- a/templates/custom-copilot-assistant-new/.vscode/tasks.json +++ b/templates/custom-copilot-assistant-new/.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", @@ -7,7 +7,7 @@ { // Check all required prerequisites. // See https://aka.ms/teamsfx-tasks/check-prerequisites to know the details and how to customize the args. - "label": "Validate prerequisites (Test Tool)", + "label": "Validate prerequisites (Microsoft 365 Agents playground)", "type": "teamsfx", "command": "debug-check-prerequisites", "args": { @@ -17,21 +17,21 @@ ], "portOccupancy": [ 3978, // app service port - 56150, // test tool port + 56150, // Microsoft 365 Agents playground port ] } }, { // Build project. // See https://aka.ms/teamsfx-tasks/deploy to know the details and how to customize the args. - "label": "Deploy (Test Tool)", + "label": "Deploy (Microsoft 365 Agents playground)", "dependsOn": [ - "Validate prerequisites (Test Tool)" + "Validate prerequisites (Microsoft 365 Agents playground)" ], "type": "teamsfx", "command": "deploy", "args": { - "env": "testtool", + "env": "playground", } }, { diff --git a/templates/custom-copilot-assistant-new/.webappignore b/templates/custom-copilot-assistant-new/.webappignore index 63b9af103..a93f2c5f6 100644 --- a/templates/custom-copilot-assistant-new/.webappignore +++ b/templates/custom-copilot-assistant-new/.webappignore @@ -4,7 +4,7 @@ env/ __pycache__/ README.md -teamsapp.yml -teamsapp.local.yml -teamsapp.testtool.yml +m365agents.yml +m365agents.local.yml +m365agents.playground.yml /devTools/ \ No newline at end of file diff --git a/templates/custom-copilot-assistant-new/README.md b/templates/custom-copilot-assistant-new/README.md index 18fbc7255..665689ddd 100644 --- a/templates/custom-copilot-assistant-new/README.md +++ b/templates/custom-copilot-assistant-new/README.md @@ -11,7 +11,7 @@ It showcases how to build an AI agent in Teams capable of chatting with users an > > - [Python](https://www.python.org/), version 3.8 to 3.11. > - [Python extension](https://code.visualstudio.com/docs/languages/python), version v2024.0.1 or higher. -> - [Teams Toolkit Visual Studio Code Extension](https://aka.ms/teams-toolkit) latest version or [Teams Toolkit CLI](https://aka.ms/teams-toolkit-cli). +> - [Microsoft 365 Agents Toolkit Visual Studio Code Extension](https://aka.ms/teams-toolkit) latest version or [Microsoft 365 Agents Toolkit CLI](https://aka.ms/teams-toolkit-cli). > - An account with [Azure OpenAI](https://aka.ms/oai/access). > - A [Microsoft 365 account for development](https://docs.microsoft.com/microsoftteams/platform/toolkit/accounts). @@ -20,7 +20,7 @@ It showcases how to build an AI agent in Teams capable of chatting with users an 1. In file *env/.env.local.user*, fill in your Azure OpenAI key `SECRET_AZURE_OPENAI_API_KEY`, deployment name `AZURE_OPENAI_MODEL_DEPLOYMENT_NAME` and endpoint `AZURE_OPENAI_ENDPOINT`. ### Conversation with bot -1. Select the Teams Toolkit icon on the left in the VS Code toolbar. +1. Select the Microsoft 365 Agents Toolkit icon on the left in the VS Code toolbar. 1. In the Account section, sign in with your [Microsoft 365 account](https://docs.microsoft.com/microsoftteams/platform/toolkit/accounts) if you haven't already. 1. Press F5 to start debugging which launches your app in Teams using a web browser. Select `Debug in Teams (Edge)` or `Debug in Teams (Chrome)`. 1. When Teams launches in the browser, select the Add button in the dialog to install your app to Teams. @@ -28,7 +28,7 @@ It showcases how to build an AI agent in Teams capable of chatting with users an **Congratulations**! You are running an application that can now interact with users in Teams: -> For local debugging using Teams Toolkit CLI, you need to do some extra steps described in [Set up your Teams Toolkit CLI for local debugging](https://aka.ms/teamsfx-cli-debugging). +> For local debugging using Microsoft 365 Agents Toolkit CLI, you need to do some extra steps described in [Set up your Microsoft 365 Agents Toolkit CLI for local debugging](https://aka.ms/teamsfx-cli-debugging). ![ai agent](https://github.com/OfficeDev/TeamsFx/assets/109947924/775a0fde-f2ba-4198-a94d-a43c598d6e9b) @@ -54,13 +54,13 @@ The following files can be customized and demonstrate an example implementation |`src/prompts/planner/config.json`| Configures the prompt.| |`src/prompts/planner/action.json`| Configures the actions.| -The following are Teams Toolkit specific project files. You can [visit a complete guide on Github](https://github.com/OfficeDev/TeamsFx/wiki/Teams-Toolkit-Visual-Studio-Code-v5-Guide#overview) to understand how Teams Toolkit works. +The following are Microsoft 365 Agents Toolkit specific project files. You can [visit a complete guide on Github](https://github.com/OfficeDev/TeamsFx/wiki/Teams-Toolkit-Visual-Studio-Code-v5-Guide#overview) to understand how Microsoft 365 Agents Toolkit works. | File | Contents | | - | - | -|`teamsapp.yml`|This is the main Teams Toolkit project file. The project file defines two primary things: Properties and configuration Stage definitions. | -|`teamsapp.local.yml`|This overrides `teamsapp.yml` with actions that enable local execution and debugging.| -|`teamsapp.testtool.yml`|This overrides `teamsapp.yml` with actions that enable local execution and debugging in Teams App Test Tool.| +|`m365agents.yml`|This is the main Microsoft 365 Agents Toolkit project file. The project file defines two primary things: Properties and configuration Stage definitions. | +|`m365agents.local.yml`|This overrides `m365agents.yml` with actions that enable local execution and debugging.| +|`m365agents.playground.yml`|This overrides `m365agents.yml` with actions that enable local execution and debugging in Microsoft 365 Agents playground.| ## Extend the template @@ -69,11 +69,11 @@ You can follow [Build an AI Agent in Teams](https://aka.ms/teamsfx-ai-agent) to ## Additional information and references -- [Teams Toolkit Documentations](https://docs.microsoft.com/microsoftteams/platform/toolkit/teams-toolkit-fundamentals) -- [Teams Toolkit CLI](https://aka.ms/teamsfx-toolkit-cli) -- [Teams Toolkit Samples](https://github.com/OfficeDev/TeamsFx-Samples) +- [Microsoft 365 Agents Toolkit Documentations](https://docs.microsoft.com/microsoftteams/platform/toolkit/teams-toolkit-fundamentals) +- [Microsoft 365 Agents Toolkit CLI](https://aka.ms/teamsfx-toolkit-cli) +- [Microsoft 365 Agents Toolkit Samples](https://github.com/OfficeDev/TeamsFx-Samples) ## Known issue -- If you use `Debug in Test Tool` to local debug, you might get an error `InternalServiceError: connect ECONNREFUSED 127.0.0.1:3978` in Test Tool console log or error message `Error: Cannot connect to your app, -please make sure your app is running or restart your app` in log panel of Test Tool web page. You can wait for Python launch console ready and then refresh the front end web page. +- If you use `Debug in Microsoft 365 Agents playground` to local debug, you might get an error `InternalServiceError: connect ECONNREFUSED 127.0.0.1:3978` in Microsoft 365 Agents playground console log or error message `Error: Cannot connect to your app, +please make sure your app is running or restart your app` in log panel of Microsoft 365 Agents playground web page. You can wait for Python launch console ready and then refresh the front end web page. - When you use `Launch Remote in Teams` to remote debug after deployment, you might loose interaction with your bot. This is because the remote service needs to restart. Please wait for several minutes to retry it. \ No newline at end of file diff --git a/templates/custom-copilot-assistant-new/teamsapp.local.yml b/templates/custom-copilot-assistant-new/m365agents.local.yml similarity index 99% rename from templates/custom-copilot-assistant-new/teamsapp.local.yml rename to templates/custom-copilot-assistant-new/m365agents.local.yml index 81898b0ac..2b58134e1 100644 --- a/templates/custom-copilot-assistant-new/teamsapp.local.yml +++ b/templates/custom-copilot-assistant-new/m365agents.local.yml @@ -59,7 +59,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: diff --git a/templates/custom-copilot-assistant-new/teamsapp.testtool.yml b/templates/custom-copilot-assistant-new/m365agents.playground.yml similarity index 100% rename from templates/custom-copilot-assistant-new/teamsapp.testtool.yml rename to templates/custom-copilot-assistant-new/m365agents.playground.yml diff --git a/templates/custom-copilot-assistant-new/teamsapp.yml b/templates/custom-copilot-assistant-new/m365agents.yml similarity index 97% rename from templates/custom-copilot-assistant-new/teamsapp.yml rename to templates/custom-copilot-assistant-new/m365agents.yml index 477685c03..773cb998b 100644 --- a/templates/custom-copilot-assistant-new/teamsapp.yml +++ b/templates/custom-copilot-assistant-new/m365agents.yml @@ -53,7 +53,7 @@ provision: parameters: ./infra/azure.parameters.json # Required when deploying ARM template deploymentName: Create-resources-for-tab - # Teams Toolkit will download this bicep CLI version from github for you, + # 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. bicepCliVersion: v0.9.1 @@ -75,7 +75,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: @@ -118,7 +118,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: diff --git a/templates/custom-copilot-assistant/.gitignore b/templates/custom-copilot-assistant/.gitignore index 75baccc46..b36022000 100644 --- a/templates/custom-copilot-assistant/.gitignore +++ b/templates/custom-copilot-assistant/.gitignore @@ -1,7 +1,7 @@ # TeamsFx files env/.env.*.user env/.env.local -env/.env.testtool +env/.env.playground .env appPackage/build diff --git a/templates/custom-copilot-assistant/.vscode/launch.json b/templates/custom-copilot-assistant/.vscode/launch.json index a0c18a24f..df5119a81 100644 --- a/templates/custom-copilot-assistant/.vscode/launch.json +++ b/templates/custom-copilot-assistant/.vscode/launch.json @@ -65,7 +65,7 @@ "console": "integratedTerminal" }, { - "name": "Start Test Tool", + "name": "Start Microsoft 365 Agents playground", "type": "node", "request": "launch", "program": "${workspaceFolder}/devTools/teamsapptester/node_modules/@microsoft/teams-app-test-tool/cli.js", @@ -111,15 +111,15 @@ "stopAll": true }, { - "name": "Debug in Test Tool", + "name": "Debug in Microsoft 365 Agents playground", "configurations": [ "Start Python", - "Start Test Tool" + "Start Microsoft 365 Agents playground" ], "cascadeTerminateToConfigurations": [ - "Start Test Tool" + "Start Microsoft 365 Agents playground" ], - "preLaunchTask": "Deploy (Test Tool)", + "preLaunchTask": "Deploy (Microsoft 365 Agents playground)", "presentation": { "group": "2-local", "order": 1 diff --git a/templates/custom-copilot-assistant/.vscode/tasks.json b/templates/custom-copilot-assistant/.vscode/tasks.json index a964abf89..5dca48ef6 100644 --- a/templates/custom-copilot-assistant/.vscode/tasks.json +++ b/templates/custom-copilot-assistant/.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", @@ -7,7 +7,7 @@ { // Check all required prerequisites. // See https://aka.ms/teamsfx-tasks/check-prerequisites to know the details and how to customize the args. - "label": "Validate prerequisites (Test Tool)", + "label": "Validate prerequisites (Microsoft 365 Agents playground)", "type": "teamsfx", "command": "debug-check-prerequisites", "args": { @@ -17,21 +17,21 @@ ], "portOccupancy": [ 3978, // app service port - 56150, // test tool port + 56150, // Microsoft 365 Agents playground port ] } }, { // Build project. // See https://aka.ms/teamsfx-tasks/deploy to know the details and how to customize the args. - "label": "Deploy (Test Tool)", + "label": "Deploy (Microsoft 365 Agents playground)", "dependsOn": [ - "Validate prerequisites (Test Tool)" + "Validate prerequisites (Microsoft 365 Agents playground)" ], "type": "teamsfx", "command": "deploy", "args": { - "env": "testtool", + "env": "playground", } }, { diff --git a/templates/custom-copilot-assistant/.webappignore b/templates/custom-copilot-assistant/.webappignore index 63b9af103..a93f2c5f6 100644 --- a/templates/custom-copilot-assistant/.webappignore +++ b/templates/custom-copilot-assistant/.webappignore @@ -4,7 +4,7 @@ env/ __pycache__/ README.md -teamsapp.yml -teamsapp.local.yml -teamsapp.testtool.yml +m365agents.yml +m365agents.local.yml +m365agents.playground.yml /devTools/ \ No newline at end of file diff --git a/templates/custom-copilot-assistant/README.md b/templates/custom-copilot-assistant/README.md index 241cb3ef8..7a0bb8af0 100644 --- a/templates/custom-copilot-assistant/README.md +++ b/templates/custom-copilot-assistant/README.md @@ -11,7 +11,7 @@ It showcases how to build an AI agent in Teams capable of helping users accompli > > - [Python](https://www.python.org/), version 3.8 or higher > - [Python extension](https://code.visualstudio.com/docs/languages/python), version v2024.0.1 or higher -> - [Teams Toolkit Visual Studio Code Extension](https://aka.ms/teams-toolkit) version 5.0.0 and higher or [Teams Toolkit CLI](https://aka.ms/teamsfx-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/teamsfx-toolkit-cli) > - An account with [Azure OpenAI](https://aka.ms/oai/access). > - A [Microsoft 365 account for development](https://docs.microsoft.com/microsoftteams/platform/toolkit/accounts). @@ -55,7 +55,7 @@ Before running or debugging your bot, please follow these steps to setup your ow ``` ### Conversation with bot -1. Select the Teams Toolkit icon on the left in the VS Code toolbar. +1. Select the Microsoft 365 Agents Toolkit icon on the left in the VS Code toolbar. 1. In the Account section, sign in with your [Microsoft 365 account](https://docs.microsoft.com/microsoftteams/platform/toolkit/accounts) if you haven't already. 1. Press F5 to start debugging which launches your app in Teams using a web browser. Select `Debug in Teams (Edge)` or `Debug in Teams (Chrome)`. 1. When Teams launches in the browser, select the Add button in the dialog to install your app to Teams. @@ -63,7 +63,7 @@ Before running or debugging your bot, please follow these steps to setup your ow **Congratulations**! You are running an application that can now interact with users in Teams: -> For local debugging using Teams Toolkit CLI, you need to do some extra steps described in [Set up your Teams Toolkit CLI for local debugging](https://aka.ms/teamsfx-cli-debugging). +> For local debugging using Microsoft 365 Agents Toolkit CLI, you need to do some extra steps described in [Set up your Microsoft 365 Agents Toolkit CLI for local debugging](https://aka.ms/teamsfx-cli-debugging). ![AI Agent in Teams](https://github.com/OfficeDev/TeamsFx/assets/37978464/fd1cf673-e7d8-4826-9cac-e9481a74ee1e) @@ -91,13 +91,13 @@ The following file is a script that helps you to prepare an OpenAI assistant. | - | - | |`src/utils/creator.py`| Create an OpenAI assistant with defined functions and prompts.| -The following are Teams Toolkit specific project files. You can [visit a complete guide on Github](https://github.com/OfficeDev/TeamsFx/wiki/Teams-Toolkit-Visual-Studio-Code-v5-Guide#overview) to understand how Teams Toolkit works. +The following are Microsoft 365 Agents Toolkit specific project files. You can [visit a complete guide on Github](https://github.com/OfficeDev/TeamsFx/wiki/Teams-Toolkit-Visual-Studio-Code-v5-Guide#overview) to understand how Microsoft 365 Agents Toolkit works. | File | Contents | | - | - | -|`teamsapp.yml`|This is the main Teams Toolkit project file. The project file defines two primary things: Properties and configuration Stage definitions. | -|`teamsapp.local.yml`|This overrides `teamsapp.yml` with actions that enable local execution and debugging.| -|`teamsapp.testtool.yml`|This overrides `teamsapp.yml` with actions that enable local execution and debugging in Teams App Test Tool.| +|`m365agents.yml`|This is the main Microsoft 365 Agents Toolkit project file. The project file defines two primary things: Properties and configuration Stage definitions. | +|`m365agents.local.yml`|This overrides `m365agents.yml` with actions that enable local execution and debugging.| +|`m365agents.playground.yml`|This overrides `m365agents.yml` with actions that enable local execution and debugging in Microsoft 365 Agents playground.| ## Extend the template @@ -106,11 +106,11 @@ You can follow [Build an AI Agent in Teams](https://aka.ms/teamsfx-ai-agent) to ## Additional information and references -- [Teams Toolkit Documentations](https://docs.microsoft.com/microsoftteams/platform/toolkit/teams-toolkit-fundamentals) -- [Teams Toolkit CLI](https://aka.ms/teamsfx-toolkit-cli) -- [Teams Toolkit Samples](https://github.com/OfficeDev/TeamsFx-Samples) +- [Microsoft 365 Agents Toolkit Documentations](https://docs.microsoft.com/microsoftteams/platform/toolkit/teams-toolkit-fundamentals) +- [Microsoft 365 Agents Toolkit CLI](https://aka.ms/teamsfx-toolkit-cli) +- [Microsoft 365 Agents Toolkit Samples](https://github.com/OfficeDev/TeamsFx-Samples) ## Known issue -- If you use `Debug in Test Tool` to local debug, you might get an error `InternalServiceError: connect ECONNREFUSED 127.0.0.1:3978` in Test Tool console log or error message `Error: Cannot connect to your app, -please make sure your app is running or restart your app` in log panel of Test Tool web page. You can wait for Python launch console ready and then refresh the front end web page. +- If you use `Debug in Microsoft 365 Agents playground` to local debug, you might get an error `InternalServiceError: connect ECONNREFUSED 127.0.0.1:3978` in Microsoft 365 Agents playground console log or error message `Error: Cannot connect to your app, +please make sure your app is running or restart your app` in log panel of Microsoft 365 Agents playground web page. You can wait for Python launch console ready and then refresh the front end web page. - When you use `Launch Remote in Teams` to remote debug after deployment, you might loose interaction with your bot. This is because the remote service needs to restart. Please wait for several minutes to retry it. \ No newline at end of file diff --git a/templates/custom-copilot-assistant/teamsapp.local.yml b/templates/custom-copilot-assistant/m365agents.local.yml similarity index 99% rename from templates/custom-copilot-assistant/teamsapp.local.yml rename to templates/custom-copilot-assistant/m365agents.local.yml index a33454f5f..6aaff6f9c 100644 --- a/templates/custom-copilot-assistant/teamsapp.local.yml +++ b/templates/custom-copilot-assistant/m365agents.local.yml @@ -59,7 +59,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: diff --git a/templates/custom-copilot-assistant/teamsapp.testtool.yml b/templates/custom-copilot-assistant/m365agents.playground.yml similarity index 100% rename from templates/custom-copilot-assistant/teamsapp.testtool.yml rename to templates/custom-copilot-assistant/m365agents.playground.yml diff --git a/templates/custom-copilot-assistant/teamsapp.yml b/templates/custom-copilot-assistant/m365agents.yml similarity index 97% rename from templates/custom-copilot-assistant/teamsapp.yml rename to templates/custom-copilot-assistant/m365agents.yml index 24b96a8f5..16f3f0125 100644 --- a/templates/custom-copilot-assistant/teamsapp.yml +++ b/templates/custom-copilot-assistant/m365agents.yml @@ -53,7 +53,7 @@ provision: parameters: ./infra/azure.parameters.json # Required when deploying ARM template deploymentName: Create-resources-for-bot - # Teams Toolkit will download this bicep CLI version from github for you, + # 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. bicepCliVersion: v0.9.1 @@ -75,7 +75,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: @@ -118,7 +118,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: diff --git a/templates/custom-copilot-basic-python/.gitignore b/templates/custom-copilot-basic-python/.gitignore index 75baccc46..b36022000 100644 --- a/templates/custom-copilot-basic-python/.gitignore +++ b/templates/custom-copilot-basic-python/.gitignore @@ -1,7 +1,7 @@ # TeamsFx files env/.env.*.user env/.env.local -env/.env.testtool +env/.env.playground .env appPackage/build diff --git a/templates/custom-copilot-basic-python/.vscode/launch.json b/templates/custom-copilot-basic-python/.vscode/launch.json index a0c18a24f..df5119a81 100644 --- a/templates/custom-copilot-basic-python/.vscode/launch.json +++ b/templates/custom-copilot-basic-python/.vscode/launch.json @@ -65,7 +65,7 @@ "console": "integratedTerminal" }, { - "name": "Start Test Tool", + "name": "Start Microsoft 365 Agents playground", "type": "node", "request": "launch", "program": "${workspaceFolder}/devTools/teamsapptester/node_modules/@microsoft/teams-app-test-tool/cli.js", @@ -111,15 +111,15 @@ "stopAll": true }, { - "name": "Debug in Test Tool", + "name": "Debug in Microsoft 365 Agents playground", "configurations": [ "Start Python", - "Start Test Tool" + "Start Microsoft 365 Agents playground" ], "cascadeTerminateToConfigurations": [ - "Start Test Tool" + "Start Microsoft 365 Agents playground" ], - "preLaunchTask": "Deploy (Test Tool)", + "preLaunchTask": "Deploy (Microsoft 365 Agents playground)", "presentation": { "group": "2-local", "order": 1 diff --git a/templates/custom-copilot-basic-python/.vscode/tasks.json b/templates/custom-copilot-basic-python/.vscode/tasks.json index a964abf89..5dca48ef6 100644 --- a/templates/custom-copilot-basic-python/.vscode/tasks.json +++ b/templates/custom-copilot-basic-python/.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", @@ -7,7 +7,7 @@ { // Check all required prerequisites. // See https://aka.ms/teamsfx-tasks/check-prerequisites to know the details and how to customize the args. - "label": "Validate prerequisites (Test Tool)", + "label": "Validate prerequisites (Microsoft 365 Agents playground)", "type": "teamsfx", "command": "debug-check-prerequisites", "args": { @@ -17,21 +17,21 @@ ], "portOccupancy": [ 3978, // app service port - 56150, // test tool port + 56150, // Microsoft 365 Agents playground port ] } }, { // Build project. // See https://aka.ms/teamsfx-tasks/deploy to know the details and how to customize the args. - "label": "Deploy (Test Tool)", + "label": "Deploy (Microsoft 365 Agents playground)", "dependsOn": [ - "Validate prerequisites (Test Tool)" + "Validate prerequisites (Microsoft 365 Agents playground)" ], "type": "teamsfx", "command": "deploy", "args": { - "env": "testtool", + "env": "playground", } }, { diff --git a/templates/custom-copilot-basic-python/.webappignore b/templates/custom-copilot-basic-python/.webappignore index 63b9af103..a93f2c5f6 100644 --- a/templates/custom-copilot-basic-python/.webappignore +++ b/templates/custom-copilot-basic-python/.webappignore @@ -4,7 +4,7 @@ env/ __pycache__/ README.md -teamsapp.yml -teamsapp.local.yml -teamsapp.testtool.yml +m365agents.yml +m365agents.local.yml +m365agents.playground.yml /devTools/ \ No newline at end of file diff --git a/templates/custom-copilot-basic-python/README.md b/templates/custom-copilot-basic-python/README.md index 8b043fdf6..80c78a8c4 100644 --- a/templates/custom-copilot-basic-python/README.md +++ b/templates/custom-copilot-basic-python/README.md @@ -12,7 +12,7 @@ This template showcases a bot app that responds to user questions like an AI ass > > - [Python](https://www.python.org/), version 3.8 to 3.11. > - [Python extension](https://code.visualstudio.com/docs/languages/python), version v2024.0.1 or higher. -> - [Teams Toolkit Visual Studio Code Extension](https://aka.ms/teams-toolkit) latest version or [Teams Toolkit CLI](https://aka.ms/teams-toolkit-cli). +> - [Microsoft 365 Agents Toolkit Visual Studio Code Extension](https://aka.ms/teams-toolkit) latest version or [Microsoft 365 Agents Toolkit CLI](https://aka.ms/teams-toolkit-cli). > - An account with [Azure OpenAI](https://aka.ms/oai/access). > - A [Microsoft 365 account for development](https://docs.microsoft.com/microsoftteams/platform/toolkit/accounts). @@ -21,7 +21,7 @@ This template showcases a bot app that responds to user questions like an AI ass 1. In file *env/.env.local.user*, fill in your Azure OpenAI key `SECRET_AZURE_OPENAI_API_KEY`, deployment name `AZURE_OPENAI_MODEL_DEPLOYMENT_NAME` and endpoint `AZURE_OPENAI_ENDPOINT`. ### Conversation with bot -1. Select the Teams Toolkit icon on the left in the VS Code toolbar. +1. Select the Microsoft 365 Agents Toolkit icon on the left in the VS Code toolbar. 1. In the Account section, sign in with your [Microsoft 365 account](https://docs.microsoft.com/microsoftteams/platform/toolkit/accounts) if you haven't already. 1. Press F5 to start debugging which launches your app in Teams using a web browser. Select `Debug in Teams (Edge)` or `Debug in Teams (Chrome)`. 1. When Teams launches in the browser, select the Add button in the dialog to install your app to Teams. @@ -29,7 +29,7 @@ This template showcases a bot app that responds to user questions like an AI ass **Congratulations**! You are running an application that can now interact with users in Teams: -> For local debugging using Teams Toolkit CLI, you need to do some extra steps described in [Set up your Teams Toolkit CLI for local debugging](https://aka.ms/teamsfx-cli-debugging). +> For local debugging using Microsoft 365 Agents Toolkit CLI, you need to do some extra steps described in [Set up your Microsoft 365 Agents Toolkit CLI for local debugging](https://aka.ms/teamsfx-cli-debugging). ![ai chat bot](https://user-images.githubusercontent.com/7642967/258726187-8306610b-579e-4301-872b-1b5e85141eff.png) @@ -53,13 +53,13 @@ The following files can be customized and demonstrate an example implementation |`src/prompts/chat/skprompt.txt`| Defines the prompt.| |`src/prompts/chat/config.json`| Configures the prompt.| -The following are Teams Toolkit specific project files. You can [visit a complete guide on Github](https://github.com/OfficeDev/TeamsFx/wiki/Teams-Toolkit-Visual-Studio-Code-v5-Guide#overview) to understand how Teams Toolkit works. +The following are Microsoft 365 Agents Toolkit specific project files. You can [visit a complete guide on Github](https://github.com/OfficeDev/TeamsFx/wiki/Teams-Toolkit-Visual-Studio-Code-v5-Guide#overview) to understand how Microsoft 365 Agents Toolkit works. | File | Contents | | - | - | -|`teamsapp.yml`|This is the main Teams Toolkit project file. The project file defines two primary things: Properties and configuration Stage definitions. | -|`teamsapp.local.yml`|This overrides `teamsapp.yml` with actions that enable local execution and debugging.| -|`teamsapp.testtool.yml`|This overrides `teamsapp.yml` with actions that enable local execution and debugging in Teams App Test Tool.| +|`m365agents.yml`|This is the main Microsoft 365 Agents Toolkit project file. The project file defines two primary things: Properties and configuration Stage definitions. | +|`m365agents.local.yml`|This overrides `m365agents.yml` with actions that enable local execution and debugging.| +|`m365agents.playground.yml`|This overrides `m365agents.yml` with actions that enable local execution and debugging in Microsoft 365 Agents playground.| ## Extend the template @@ -73,11 +73,11 @@ You can follow [Build a Basic AI Chatbot in Teams](https://aka.ms/teamsfx-basic- ## Additional information and references -- [Teams Toolkit Documentations](https://docs.microsoft.com/microsoftteams/platform/toolkit/teams-toolkit-fundamentals) -- [Teams Toolkit CLI](https://aka.ms/teamsfx-toolkit-cli) -- [Teams Toolkit Samples](https://github.com/OfficeDev/TeamsFx-Samples) +- [Microsoft 365 Agents Toolkit Documentations](https://docs.microsoft.com/microsoftteams/platform/toolkit/teams-toolkit-fundamentals) +- [Microsoft 365 Agents Toolkit CLI](https://aka.ms/teamsfx-toolkit-cli) +- [Microsoft 365 Agents Toolkit Samples](https://github.com/OfficeDev/TeamsFx-Samples) ## Known issue -- If you use `Debug in Test Tool` to local debug, you might get an error `InternalServiceError: connect ECONNREFUSED 127.0.0.1:3978` in Test Tool console log or error message `Error: Cannot connect to your app, -please make sure your app is running or restart your app` in log panel of Test Tool web page. You can wait for Python launch console ready and then refresh the front end web page. +- If you use `Debug in Microsoft 365 Agents playground` to local debug, you might get an error `InternalServiceError: connect ECONNREFUSED 127.0.0.1:3978` in Microsoft 365 Agents playground console log or error message `Error: Cannot connect to your app, +please make sure your app is running or restart your app` in log panel of Microsoft 365 Agents playground web page. You can wait for Python launch console ready and then refresh the front end web page. - When you use `Launch Remote in Teams` to remote debug after deployment, you might loose interaction with your bot. This is because the remote service needs to restart. Please wait for several minutes to retry it. \ No newline at end of file diff --git a/templates/custom-copilot-basic-python/teamsapp.local.yml b/templates/custom-copilot-basic-python/m365agents.local.yml similarity index 99% rename from templates/custom-copilot-basic-python/teamsapp.local.yml rename to templates/custom-copilot-basic-python/m365agents.local.yml index 6b52024c6..7dd1a81db 100644 --- a/templates/custom-copilot-basic-python/teamsapp.local.yml +++ b/templates/custom-copilot-basic-python/m365agents.local.yml @@ -59,7 +59,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: diff --git a/templates/custom-copilot-basic-python/teamsapp.testtool.yml b/templates/custom-copilot-basic-python/m365agents.playground.yml similarity index 100% rename from templates/custom-copilot-basic-python/teamsapp.testtool.yml rename to templates/custom-copilot-basic-python/m365agents.playground.yml diff --git a/templates/custom-copilot-basic-python/teamsapp.yml b/templates/custom-copilot-basic-python/m365agents.yml similarity index 97% rename from templates/custom-copilot-basic-python/teamsapp.yml rename to templates/custom-copilot-basic-python/m365agents.yml index fbe4249a1..cf9375f48 100644 --- a/templates/custom-copilot-basic-python/teamsapp.yml +++ b/templates/custom-copilot-basic-python/m365agents.yml @@ -53,7 +53,7 @@ provision: parameters: ./infra/azure.parameters.json # Required when deploying ARM template deploymentName: Create-resources-for-tab - # Teams Toolkit will download this bicep CLI version from github for you, + # 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. bicepCliVersion: v0.9.1 @@ -75,7 +75,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: @@ -118,7 +118,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: diff --git a/templates/dashboard-tab-ts/.vscode/tasks.json b/templates/dashboard-tab-ts/.vscode/tasks.json index 7272ec795..1c7850872 100644 --- a/templates/dashboard-tab-ts/.vscode/tasks.json +++ b/templates/dashboard-tab-ts/.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", diff --git a/templates/dashboard-tab-ts/README.md b/templates/dashboard-tab-ts/README.md index bea145f6d..833977e58 100644 --- a/templates/dashboard-tab-ts/README.md +++ b/templates/dashboard-tab-ts/README.md @@ -15,9 +15,9 @@ This template showcases an app that embeds a canvas containing multiple cards th > - A [Microsoft 365 account for development](https://docs.microsoft.com/microsoftteams/platform/toolkit/accounts) > - [Set up your dev environment for extending Teams apps across Microsoft 365](https://aka.ms/teamsfx-m365-apps-prerequisites) > Please note that after you enrolled your developer tenant in Office 365 Target Release, it may take couple days for the enrollment to take effect. -> - [Teams Toolkit Visual Studio Code Extension](https://aka.ms/teams-toolkit) version 5.0.0 and higher or [Teams Toolkit CLI](https://aka.ms/teamsfx-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/teamsfx-toolkit-cli) -1. First, select the Teams Toolkit icon on the left in the VS Code toolbar. +1. First, select the Microsoft 365 Agents Toolkit icon on the left in the VS Code toolbar. 2. In the Account section, sign in with your [Microsoft 365 account](https://docs.microsoft.com/microsoftteams/platform/toolkit/accounts) if you haven't already. 3. Press F5 to start debugging which launches your app in Teams using a web browser. Select `Debug in Teams (Edge)` or `Debug in Teams (Chrome)`. 4. When Teams launches in the browser, select the Add button in the dialog to install your app to Teams. @@ -62,12 +62,12 @@ The following are project-related files. You generally will not need to customiz | `index.html` | The entry point of the application | | `vite.config.ts` | Vite configuration file | -The following are Teams Toolkit specific project files. You can [visit a complete guide on Github](https://github.com/OfficeDev/TeamsFx/wiki/Teams-Toolkit-Visual-Studio-Code-v5-Guide#overview) to understand how Teams Toolkit works. +The following are Microsoft 365 Agents Toolkit specific project files. You can [visit a complete guide on Github](https://github.com/OfficeDev/TeamsFx/wiki/Teams-Toolkit-Visual-Studio-Code-v5-Guide#overview) to understand how Microsoft 365 Agents Toolkit works. | File | Contents | | -------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | -| `teamsapp.yml` | This is the main Teams Toolkit project file. The project file defines two primary things: Properties and configuration Stage definitions. | -| `teamsapp.local.yml` | This overrides `teamsapp.yml` with actions that enable local execution and debugging. | +| `m365agents.yml` | This is the main Microsoft 365 Agents Toolkit project file. The project file defines two primary things: Properties and configuration Stage definitions. | +| `m365agents.local.yml` | This overrides `m365agents.yml` with actions that enable local execution and debugging. | ## Extend the Dashboard template to add a new widget diff --git a/templates/dashboard-tab-ts/teamsapp.local.yml b/templates/dashboard-tab-ts/m365agents.local.yml similarity index 99% rename from templates/dashboard-tab-ts/teamsapp.local.yml rename to templates/dashboard-tab-ts/m365agents.local.yml index 5c71add9f..00820169b 100644 --- a/templates/dashboard-tab-ts/teamsapp.local.yml +++ b/templates/dashboard-tab-ts/m365agents.local.yml @@ -38,7 +38,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: diff --git a/templates/dashboard-tab-ts/teamsapp.yml b/templates/dashboard-tab-ts/m365agents.yml similarity index 97% rename from templates/dashboard-tab-ts/teamsapp.yml rename to templates/dashboard-tab-ts/m365agents.yml index ac6834e04..ff7a9de86 100644 --- a/templates/dashboard-tab-ts/teamsapp.yml +++ b/templates/dashboard-tab-ts/m365agents.yml @@ -38,7 +38,7 @@ provision: parameters: ./infra/azure.parameters.json # Required when deploying ARM template deploymentName: Create-resources-for-tab - # Teams Toolkit will download this bicep CLI version from github for you, + # 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. bicepCliVersion: v0.9.1 @@ -68,7 +68,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: @@ -123,7 +123,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: diff --git a/templates/default-bot-js/.gitignore b/templates/default-bot-js/.gitignore index 07a76d44b..5fce151fe 100644 --- a/templates/default-bot-js/.gitignore +++ b/templates/default-bot-js/.gitignore @@ -1,10 +1,10 @@ # TeamsFx files env/.env.*.user env/.env.local -.localConfigs.testTool +.localConfigs.playground .localConfigs .notification.localstore.json -.notification.testtoolstore.json +.notification.playgroundstore.json appPackage/build # dependencies diff --git a/templates/default-bot-js/.vscode/launch.json b/templates/default-bot-js/.vscode/launch.json index ccf408076..49a5485b7 100644 --- a/templates/default-bot-js/.vscode/launch.json +++ b/templates/default-bot-js/.vscode/launch.json @@ -117,11 +117,11 @@ "stopAll": true }, { - "name": "Debug in Test Tool", + "name": "Debug in Microsoft 365 Agents playground", "configurations": [ "Attach to Local Service" ], - "preLaunchTask": "Start Teams App (Test Tool)", + "preLaunchTask": "Start Teams App (Microsoft 365 Agents playground)", "presentation": { "group": "1-local", "order": 1 diff --git a/templates/default-bot-js/.vscode/tasks.json b/templates/default-bot-js/.vscode/tasks.json index 953e98858..e22532d8d 100644 --- a/templates/default-bot-js/.vscode/tasks.json +++ b/templates/default-bot-js/.vscode/tasks.json @@ -1,23 +1,23 @@ -// 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", "tasks": [ { - "label": "Start Teams App (Test Tool)", + "label": "Start Teams App (Microsoft 365 Agents playground)", "dependsOn": [ - "Validate prerequisites (Test Tool)", - "Deploy (Test Tool)", - "Start application (Test Tool)", - "Start Test Tool", + "Validate prerequisites (Microsoft 365 Agents playground)", + "Deploy (Microsoft 365 Agents playground)", + "Start application (Microsoft 365 Agents playground)", + "Start Microsoft 365 Agents playground", ], "dependsOrder": "sequence" }, { // Check all required prerequisites. // See https://aka.ms/teamsfx-tasks/check-prerequisites to know the details and how to customize the args. - "label": "Validate prerequisites (Test Tool)", + "label": "Validate prerequisites (Microsoft 365 Agents playground)", "type": "teamsfx", "command": "debug-check-prerequisites", "args": { @@ -28,22 +28,22 @@ "portOccupancy": [ 3978, // app service port 9239, // app inspector port for Node.js debugger - 56150, // test tool port + 56150, // Microsoft 365 Agents playground port ] } }, { // Build project. // See https://aka.ms/teamsfx-tasks/deploy to know the details and how to customize the args. - "label": "Deploy (Test Tool)", + "label": "Deploy (Microsoft 365 Agents playground)", "type": "teamsfx", "command": "deploy", "args": { - "env": "testtool", + "env": "playground", } }, { - "label": "Start application (Test Tool)", + "label": "Start application (Microsoft 365 Agents playground)", "type": "shell", "command": "npm run dev:teamsfx:testtool", "isBackground": true, @@ -67,7 +67,7 @@ } }, { - "label": "Start Test Tool", + "label": "Start Microsoft 365 Agents playground", "type": "shell", "command": "npm run dev:teamsfx:launch-testtool", "isBackground": true, diff --git a/templates/default-bot-js/.webappignore b/templates/default-bot-js/.webappignore index f79d01ac1..2a59f5879 100644 --- a/templates/default-bot-js/.webappignore +++ b/templates/default-bot-js/.webappignore @@ -1,10 +1,10 @@ .webappignore .fx .deployment -.localConfigs.testTool +.localConfigs.playground .localConfigs .notification.localstore.json -.notification.testtoolstore.json +.notification.playgroundstore.json .vscode *.js.map *.ts.map @@ -17,8 +17,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 diff --git a/templates/default-bot-js/README.md b/templates/default-bot-js/README.md index a4d47d18f..31543b608 100644 --- a/templates/default-bot-js/README.md +++ b/templates/default-bot-js/README.md @@ -15,16 +15,16 @@ A bot interaction can be a quick question and answer, or it can be a complex con > To run the Basic Bot template in your local dev machine, you will need: > > - [Node.js](https://nodejs.org/), supported versions: 18, 20, 22 -> - [Teams Toolkit Visual Studio Code Extension](https://aka.ms/teams-toolkit) version 5.0.0 and higher or [Teams Toolkit CLI](https://aka.ms/teamsfx-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/teamsfx-toolkit-cli) -> For local debugging using Teams Toolkit CLI, you need to do some extra steps described in [Set up your Teams Toolkit CLI for local debugging](https://aka.ms/teamsfx-cli-debugging). +> For local debugging using Microsoft 365 Agents Toolkit CLI, you need to do some extra steps described in [Set up your Microsoft 365 Agents Toolkit CLI for local debugging](https://aka.ms/teamsfx-cli-debugging). -1. First, select the Teams Toolkit icon on the left in the VS Code toolbar. -2. Press F5 to start debugging which launches your app in Teams App Test Tool using a web browser. Select `Debug in Test Tool`. -3. The browser will pop up to open Teams App Test Tool. +1. First, select the Microsoft 365 Agents Toolkit icon on the left in the VS Code toolbar. +2. Press F5 to start debugging which launches your app in Microsoft 365 Agents playground using a web browser. Select `Debug in Microsoft 365 Agents playground`. +3. The browser will pop up to open Microsoft 365 Agents playground. 4. You will receive a welcome message from the bot, and you can send anything to the bot to get an echoed response. -**Congratulations**! You are running an application that can now interact with users in Teams App Test Tool: +**Congratulations**! You are running an application that can now interact with users in Microsoft 365 Agents playground: ![basic bot](https://github.com/user-attachments/assets/eba76665-5210-403e-9c7c-da10e805fd32) @@ -44,13 +44,13 @@ The following files can be customized and demonstrate an example implementation |`teamsBot.js`| Handles business logics for the Basic Bot.| |`index.js`|`index.js` is used to setup and configure the Basic Bot.| -The following are Teams Toolkit specific project files. You can [visit a complete guide on Github](https://github.com/OfficeDev/TeamsFx/wiki/Teams-Toolkit-Visual-Studio-Code-v5-Guide#overview) to understand how Teams Toolkit works. +The following are Microsoft 365 Agents Toolkit specific project files. You can [visit a complete guide on Github](https://github.com/OfficeDev/TeamsFx/wiki/Teams-Toolkit-Visual-Studio-Code-v5-Guide#overview) to understand how Microsoft 365 Agents Toolkit works. | File | Contents | | - | - | -|`teamsapp.yml`|This is the main Teams Toolkit project file. The project file defines two primary things: Properties and configuration Stage definitions. | -|`teamsapp.local.yml`|This overrides `teamsapp.yml` with actions that enable local execution and debugging.| -|`teamsapp.testtool.yml`| This overrides `teamsapp.yml` with actions that enable local execution and debugging in Teams App Test Tool.| +|`m365agents.yml`|This is the main Microsoft 365 Agents Toolkit project file. The project file defines two primary things: Properties and configuration Stage definitions. | +|`m365agents.local.yml`|This overrides `m365agents.yml` with actions that enable local execution and debugging.| +|`m365agents.playground.yml`| This overrides `m365agents.yml` with actions that enable local execution and debugging in Microsoft 365 Agents playground.| ## Extend the Basic Bot template @@ -66,5 +66,5 @@ Following documentation will help you to extend the Basic Bot template. - [Collaborate on app development](https://learn.microsoft.com/microsoftteams/platform/toolkit/teamsfx-collaboration) - [Set up the CI/CD pipeline](https://learn.microsoft.com/microsoftteams/platform/toolkit/use-cicd-template) - [Publish the app to your organization or the Microsoft Teams app store](https://learn.microsoft.com/microsoftteams/platform/toolkit/publish) -- [Develop with Teams Toolkit CLI](https://aka.ms/teams-toolkit-cli/debug) +- [Develop with Microsoft 365 Agents Toolkit CLI](https://aka.ms/teams-toolkit-cli/debug) - [Preview the app on mobile clients](https://aka.ms/teamsfx-mobile) diff --git a/templates/default-bot-js/env/.env.testtool b/templates/default-bot-js/env/.env.playground similarity index 58% rename from templates/default-bot-js/env/.env.testtool rename to templates/default-bot-js/env/.env.playground index 43ce12aad..e89c23c04 100644 --- a/templates/default-bot-js/env/.env.testtool +++ b/templates/default-bot-js/env/.env.playground @@ -1,8 +1,8 @@ # This file includes environment variables that can be committed to git. It's gitignored by default because it represents your local development environment. # Built-in environment variables -TEAMSFX_ENV=testtool +TEAMSFX_ENV=playground -# Environment variables used by test tool +# Environment variables used by Microsoft 365 Agents playground TEAMSAPPTESTER_PORT=56150 -TEAMSFX_NOTIFICATION_STORE_FILENAME=.notification.testtoolstore.json +TEAMSFX_NOTIFICATION_STORE_FILENAME=.notification.playgroundstore.json diff --git a/templates/default-bot-js/teamsapp.local.yml b/templates/default-bot-js/m365agents.local.yml similarity index 99% rename from templates/default-bot-js/teamsapp.local.yml rename to templates/default-bot-js/m365agents.local.yml index 1c0eb33ae..3f18ef555 100644 --- a/templates/default-bot-js/teamsapp.local.yml +++ b/templates/default-bot-js/m365agents.local.yml @@ -57,7 +57,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: diff --git a/templates/default-bot-js/teamsapp.testtool.yml b/templates/default-bot-js/m365agents.playground.yml similarity index 94% rename from templates/default-bot-js/teamsapp.testtool.yml rename to templates/default-bot-js/m365agents.playground.yml index 44d71fd1b..1bbc8eb69 100644 --- a/templates/default-bot-js/teamsapp.testtool.yml +++ b/templates/default-bot-js/m365agents.playground.yml @@ -19,6 +19,6 @@ deploy: # Generate runtime environment variables - uses: file/createOrUpdateEnvironmentFile with: - target: ./.localConfigs.testTool + target: ./.localConfigs.playground envs: TEAMSFX_NOTIFICATION_STORE_FILENAME: ${{TEAMSFX_NOTIFICATION_STORE_FILENAME}} \ No newline at end of file diff --git a/templates/default-bot-js/teamsapp.yml b/templates/default-bot-js/m365agents.yml similarity index 97% rename from templates/default-bot-js/teamsapp.yml rename to templates/default-bot-js/m365agents.yml index 5ef8483ec..174a8e82c 100644 --- a/templates/default-bot-js/teamsapp.yml +++ b/templates/default-bot-js/m365agents.yml @@ -38,7 +38,7 @@ provision: parameters: ./infra/azure.parameters.json # Required when deploying ARM template deploymentName: Create-resources-for-bot - # Teams Toolkit will download this bicep CLI version from github for you, + # 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. bicepCliVersion: v0.9.1 @@ -60,7 +60,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: @@ -108,7 +108,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: diff --git a/templates/default-bot-js/package.json b/templates/default-bot-js/package.json index 6b09395c9..7cb4faa8b 100644 --- a/templates/default-bot-js/package.json +++ b/templates/default-bot-js/package.json @@ -4,7 +4,7 @@ "msteams": { "teamsAppId": null }, - "description": "Microsoft Teams Toolkit hello world Bot sample", + "description": "Microsoft 365 Agents Toolkit hello world Bot sample", "engines": { "node": "18 || 20 || 22" }, @@ -13,8 +13,8 @@ "main": "index.js", "scripts": { "dev:teamsfx": "env-cmd --silent -f .localConfigs npm run dev", - "dev:teamsfx:testtool": "env-cmd --silent -f .localConfigs.testTool npm run dev", - "dev:teamsfx:launch-testtool": "env-cmd --silent -f env/.env.testtool teamsapptester start", + "dev:teamsfx:testtool": "env-cmd --silent -f .localConfigs.playground npm run dev", + "dev:teamsfx:launch-testtool": "env-cmd --silent -f env/.env.playground teamsapptester start", "dev": "nodemon --inspect=9239 --signal SIGINT ./index.js", "start": "node ./index.js", "watch": "nodemon ./index.js", diff --git a/templates/m365-message-extension-js/.funcignore b/templates/m365-message-extension-js/.funcignore index 20a67199c..93861046a 100644 --- a/templates/m365-message-extension-js/.funcignore +++ b/templates/m365-message-extension-js/.funcignore @@ -10,8 +10,8 @@ test node_modules/.bin node_modules/azure-functions-core-tools README.md -teamsapp.yml -teamsapp.*.yml +m365agents.yml +m365agents.*.yml /env/ /appPackage/ /infra/ diff --git a/templates/m365-message-extension-js/.vscode/tasks.json b/templates/m365-message-extension-js/.vscode/tasks.json index d719f7f7d..b6bf212f2 100644 --- a/templates/m365-message-extension-js/.vscode/tasks.json +++ b/templates/m365-message-extension-js/.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", diff --git a/templates/m365-message-extension-js/README.md b/templates/m365-message-extension-js/README.md index a5c83d6c7..6fec1e5d1 100644 --- a/templates/m365-message-extension-js/README.md +++ b/templates/m365-message-extension-js/README.md @@ -15,9 +15,9 @@ This app template allows Teams to interact directly with third-party data, apps, > > - [Node.js](https://nodejs.org/), supported versions: 18, 20, 22 > - A [Microsoft 365 account for development](https://docs.microsoft.com/microsoftteams/platform/toolkit/accounts) -> - [Teams Toolkit Visual Studio Code Extension](https://aka.ms/teams-toolkit) version 5.0.0 and higher or [Teams Toolkit CLI](https://aka.ms/teamsfx-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/teamsfx-toolkit-cli) -1. First, select the Teams Toolkit icon on the left in the VS Code toolbar. +1. First, select the Microsoft 365 Agents Toolkit icon on the left in the VS Code toolbar. 2. In the Account section, sign in with your [Microsoft 365 account](https://docs.microsoft.com/microsoftteams/platform/toolkit/accounts) if you haven't already. 3. Select `Debug in Teams (Edge)` or `Debug in Teams (Chrome)` from the launch configuration dropdown. 4. To trigger the Message Extension, you can click the `+` under compose message area to find your message extension. @@ -42,12 +42,12 @@ The following files can be customized and demonstrate an example implementation | `appPackage/apiSpecificationFile/repair.yml` | A file that describes the structure and behavior of the repair API. | | `appPackage/responseTemplates/repair.json` | A generated Adaptive Card that used to render API response. | -The following are Teams Toolkit specific project files. You can [visit a complete guide on Github](https://github.com/OfficeDev/TeamsFx/wiki/Teams-Toolkit-Visual-Studio-Code-v5-Guide#overview) to understand how Teams Toolkit works. +The following are Microsoft 365 Agents Toolkit specific project files. You can [visit a complete guide on Github](https://github.com/OfficeDev/TeamsFx/wiki/Teams-Toolkit-Visual-Studio-Code-v5-Guide#overview) to understand how Microsoft 365 Agents Toolkit works. | File | Contents | | -------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | -| `teamsapp.yml` | This is the main Teams Toolkit project file. The project file defines two primary things: Properties and configuration Stage definitions. | -| `teamsapp.local.yml` | This overrides `teamsapp.yml` with actions that enable local execution and debugging. | +| `m365agents.yml` | This is the main Microsoft 365 Agents Toolkit project file. The project file defines two primary things: Properties and configuration Stage definitions. | +| `m365agents.local.yml` | This overrides `m365agents.yml` with actions that enable local execution and debugging. | ## Addition information and references diff --git a/templates/m365-message-extension-js/teamsapp.local.yml b/templates/m365-message-extension-js/m365agents.local.yml similarity index 98% rename from templates/m365-message-extension-js/teamsapp.local.yml rename to templates/m365-message-extension-js/m365agents.local.yml index 19ae85f5a..a1bdb8567 100644 --- a/templates/m365-message-extension-js/teamsapp.local.yml +++ b/templates/m365-message-extension-js/m365agents.local.yml @@ -42,7 +42,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: diff --git a/templates/m365-message-extension-js/teamsapp.yml b/templates/m365-message-extension-js/m365agents.yml similarity index 97% rename from templates/m365-message-extension-js/teamsapp.yml rename to templates/m365-message-extension-js/m365agents.yml index 7f5014b3f..39642bfe6 100644 --- a/templates/m365-message-extension-js/teamsapp.yml +++ b/templates/m365-message-extension-js/m365agents.yml @@ -38,7 +38,7 @@ provision: parameters: ./infra/azure.parameters.json # Required when deploying ARM template deploymentName: Create-resources-for-sme - # Teams Toolkit will download this bicep CLI version from github for you, + # 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. bicepCliVersion: v0.9.1 @@ -63,7 +63,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: @@ -123,7 +123,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: diff --git a/templates/message-extension-action-js/.gitignore b/templates/message-extension-action-js/.gitignore index b891a68cb..8618651af 100644 --- a/templates/message-extension-action-js/.gitignore +++ b/templates/message-extension-action-js/.gitignore @@ -2,9 +2,9 @@ env/.env.*.user env/.env.local .localConfigs -.localConfigs.testTool +.localConfigs.playground .notification.localstore.json -.notification.testtoolstore.json +.notification.playgroundstore.json /devTools appPackage/build diff --git a/templates/message-extension-action-js/.vscode/launch.json b/templates/message-extension-action-js/.vscode/launch.json index 9170e827e..69173acca 100644 --- a/templates/message-extension-action-js/.vscode/launch.json +++ b/templates/message-extension-action-js/.vscode/launch.json @@ -79,13 +79,13 @@ ], "compounds": [ { - "name": "Debug in Test Tool", + "name": "Debug in Microsoft 365 Agents playground", "configurations": [ "Attach to Local Service" ], - "preLaunchTask": "Start Teams App (Test Tool)", + "preLaunchTask": "Start Teams App (Microsoft 365 Agents playground)", "presentation": { - "group": "group 0: Teams App Test Tool", + "group": "group 0: Microsoft 365 Agents playground", "order": 1 }, "stopAll": true diff --git a/templates/message-extension-action-js/.vscode/tasks.json b/templates/message-extension-action-js/.vscode/tasks.json index 83ee7eb35..25820fa79 100644 --- a/templates/message-extension-action-js/.vscode/tasks.json +++ b/templates/message-extension-action-js/.vscode/tasks.json @@ -1,23 +1,23 @@ -// 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", "tasks": [ { - "label": "Start Teams App (Test Tool)", + "label": "Start Teams App (Microsoft 365 Agents playground)", "dependsOn": [ - "Validate prerequisites (Test Tool)", - "Deploy (Test Tool)", - "Start application (Test Tool)", - "Start Test Tool" + "Validate prerequisites (Microsoft 365 Agents playground)", + "Deploy (Microsoft 365 Agents playground)", + "Start application (Microsoft 365 Agents playground)", + "Start Microsoft 365 Agents playground" ], "dependsOrder": "sequence" }, { // Check all required prerequisites. // See https://aka.ms/teamsfx-tasks/check-prerequisites to know the details and how to customize the args. - "label": "Validate prerequisites (Test Tool)", + "label": "Validate prerequisites (Microsoft 365 Agents playground)", "type": "teamsfx", "command": "debug-check-prerequisites", "args": { @@ -28,22 +28,22 @@ "portOccupancy": [ 3978, // app service port 9239, // app inspector port for Node.js debugger - 56150 // test tool port + 56150 // Microsoft 365 Agents playground port ] } }, { // Build project. // See https://aka.ms/teamsfx-tasks/deploy to know the details and how to customize the args. - "label": "Deploy (Test Tool)", + "label": "Deploy (Microsoft 365 Agents playground)", "type": "teamsfx", "command": "deploy", "args": { - "env": "testtool" + "env": "playground" } }, { - "label": "Start application (Test Tool)", + "label": "Start application (Microsoft 365 Agents playground)", "type": "shell", "command": "npm run dev:teamsfx:testtool", "isBackground": true, @@ -67,7 +67,7 @@ } }, { - "label": "Start Test Tool", + "label": "Start Microsoft 365 Agents playground", "type": "shell", "command": "npm run dev:teamsfx:launch-testtool", "isBackground": true, diff --git a/templates/message-extension-action-js/.webappignore b/templates/message-extension-action-js/.webappignore index a6ef2018d..bfcce1f8b 100644 --- a/templates/message-extension-action-js/.webappignore +++ b/templates/message-extension-action-js/.webappignore @@ -2,9 +2,9 @@ .fx .deployment .localConfigs -.localConfigs.testTool +.localConfigs.playground .notification.localstore.json -.notification.testtoolstore.json +.notification.playgroundstore.json /devTools .vscode *.js.map @@ -18,8 +18,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 diff --git a/templates/message-extension-action-js/README.md b/templates/message-extension-action-js/README.md index 65b618342..1c470afb2 100644 --- a/templates/message-extension-action-js/README.md +++ b/templates/message-extension-action-js/README.md @@ -11,15 +11,15 @@ This app template implements action command that allows you to present your user > To run the template in your local dev machine, you will need: > > - [Node.js](https://nodejs.org/), supported versions: 18, 20, 22 -> - [Teams Toolkit Visual Studio Code Extension](https://aka.ms/teams-toolkit) version 5.0.0 and higher or [Teams Toolkit CLI](https://aka.ms/teamsfx-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/teamsfx-toolkit-cli) -> For local debugging using Teams Toolkit CLI, you need to do some extra steps described in [Set up your Teams Toolkit CLI for local debugging](https://aka.ms/teamsfx-cli-debugging). +> For local debugging using Microsoft 365 Agents Toolkit CLI, you need to do some extra steps described in [Set up your Microsoft 365 Agents Toolkit CLI for local debugging](https://aka.ms/teamsfx-cli-debugging). -1. First, select the Teams Toolkit icon on the left in the VS Code toolbar. -2. Press F5 to start debugging which launches your app in Teams App Test Tool using a web browser. +1. First, select the Microsoft 365 Agents Toolkit icon on the left in the VS Code toolbar. +2. Press F5 to start debugging which launches your app in Microsoft 365 Agents playground using a web browser. 3. To trigger the action command, you can click the `+` under compose message area and select `Action Command`. -**Congratulations**! You are running an application that can share information in rich format by creating an Adaptive Card in Teams App Test Tool. +**Congratulations**! You are running an application that can share information in rich format by creating an Adaptive Card in Microsoft 365 Agents playground. ![action-ME](https://github.com/user-attachments/assets/b49b530f-9909-4557-b15a-fde9565fc40c) @@ -40,13 +40,13 @@ The following files can be customized and demonstrate an example implementation | `src/actionApp.js` | Handles the business logic for this app template to collect form input and process data. | | `src/index.js` | `index.js` is used to setup and configure the Message Extension. | -The following are Teams Toolkit specific project files. You can [visit a complete guide on Github](https://github.com/OfficeDev/TeamsFx/wiki/Teams-Toolkit-Visual-Studio-Code-v5-Guide#overview) to understand how Teams Toolkit works. +The following are Microsoft 365 Agents Toolkit specific project files. You can [visit a complete guide on Github](https://github.com/OfficeDev/TeamsFx/wiki/Teams-Toolkit-Visual-Studio-Code-v5-Guide#overview) to understand how Microsoft 365 Agents Toolkit works. | File | Contents | | -------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | -| `teamsapp.yml` | This is the main Teams Toolkit project file. The project file defines two primary things: Properties and configuration Stage definitions. | -| `teamsapp.local.yml` | This overrides `teamsapp.yml` with actions that enable local execution and debugging. | -| `teamsapp.testtool.yml`| This overrides `teamsapp.yml` with actions that enable local execution and debugging in Teams App Test Tool. | +| `m365agents.yml` | This is the main Microsoft 365 Agents Toolkit project file. The project file defines two primary things: Properties and configuration Stage definitions. | +| `m365agents.local.yml` | This overrides `m365agents.yml` with actions that enable local execution and debugging. | +| `m365agents.playground.yml`| This overrides `m365agents.yml` with actions that enable local execution and debugging in Microsoft 365 Agents playground. | ## Extend the template @@ -62,6 +62,6 @@ Following documentation will help you to extend the template. - [Collaborate on app development](https://learn.microsoft.com/microsoftteams/platform/toolkit/teamsfx-collaboration) - [Set up the CI/CD pipeline](https://learn.microsoft.com/microsoftteams/platform/toolkit/use-cicd-template) - [Publish the app to your organization or the Microsoft Teams app store](https://learn.microsoft.com/microsoftteams/platform/toolkit/publish) -- [Develop with Teams Toolkit CLI](https://aka.ms/teams-toolkit-cli/debug) +- [Develop with Microsoft 365 Agents Toolkit CLI](https://aka.ms/teams-toolkit-cli/debug) - [Preview the app on mobile clients](https://aka.ms/teamsfx-mobile) diff --git a/templates/workflow-ts/env/.env.testtool b/templates/message-extension-action-js/env/.env.playground similarity index 58% rename from templates/workflow-ts/env/.env.testtool rename to templates/message-extension-action-js/env/.env.playground index 43ce12aad..e89c23c04 100644 --- a/templates/workflow-ts/env/.env.testtool +++ b/templates/message-extension-action-js/env/.env.playground @@ -1,8 +1,8 @@ # This file includes environment variables that can be committed to git. It's gitignored by default because it represents your local development environment. # Built-in environment variables -TEAMSFX_ENV=testtool +TEAMSFX_ENV=playground -# Environment variables used by test tool +# Environment variables used by Microsoft 365 Agents playground TEAMSAPPTESTER_PORT=56150 -TEAMSFX_NOTIFICATION_STORE_FILENAME=.notification.testtoolstore.json +TEAMSFX_NOTIFICATION_STORE_FILENAME=.notification.playgroundstore.json diff --git a/templates/message-extension-action-js/teamsapp.local.yml b/templates/message-extension-action-js/m365agents.local.yml similarity index 99% rename from templates/message-extension-action-js/teamsapp.local.yml rename to templates/message-extension-action-js/m365agents.local.yml index 9b90f42f4..86f869b1a 100644 --- a/templates/message-extension-action-js/teamsapp.local.yml +++ b/templates/message-extension-action-js/m365agents.local.yml @@ -59,7 +59,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: diff --git a/templates/message-extension-action-js/teamsapp.testtool.yml b/templates/message-extension-action-js/m365agents.playground.yml similarity index 94% rename from templates/message-extension-action-js/teamsapp.testtool.yml rename to templates/message-extension-action-js/m365agents.playground.yml index 44d71fd1b..1bbc8eb69 100644 --- a/templates/message-extension-action-js/teamsapp.testtool.yml +++ b/templates/message-extension-action-js/m365agents.playground.yml @@ -19,6 +19,6 @@ deploy: # Generate runtime environment variables - uses: file/createOrUpdateEnvironmentFile with: - target: ./.localConfigs.testTool + target: ./.localConfigs.playground envs: TEAMSFX_NOTIFICATION_STORE_FILENAME: ${{TEAMSFX_NOTIFICATION_STORE_FILENAME}} \ No newline at end of file diff --git a/templates/message-extension-action-js/teamsapp.yml b/templates/message-extension-action-js/m365agents.yml similarity index 97% rename from templates/message-extension-action-js/teamsapp.yml rename to templates/message-extension-action-js/m365agents.yml index 0744b2314..87e106bcd 100644 --- a/templates/message-extension-action-js/teamsapp.yml +++ b/templates/message-extension-action-js/m365agents.yml @@ -38,7 +38,7 @@ provision: parameters: ./infra/azure.parameters.json # Required when deploying ARM template deploymentName: Create-resources-for-me-action - # Teams Toolkit will download this bicep CLI version from github for you, + # 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. bicepCliVersion: v0.9.1 @@ -60,7 +60,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: @@ -111,7 +111,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: diff --git a/templates/message-extension-action-js/package.json b/templates/message-extension-action-js/package.json index f8b05d386..0c1d939be 100644 --- a/templates/message-extension-action-js/package.json +++ b/templates/message-extension-action-js/package.json @@ -1,7 +1,7 @@ { "name": "messageextensionactionjs", "version": "1.0.0", - "description": "Microsoft Teams Toolkit message extension action sample", + "description": "Microsoft 365 Agents Toolkit message extension action sample", "engines": { "node": "18 || 20 || 22" }, @@ -10,8 +10,8 @@ "main": "./src/index.js", "scripts": { "dev:teamsfx": "env-cmd --silent -f .localConfigs npm run dev", - "dev:teamsfx:testtool": "env-cmd --silent -f .localConfigs.testTool npm run dev", - "dev:teamsfx:launch-testtool": "env-cmd --silent -f env/.env.testtool teamsapptester start", + "dev:teamsfx:testtool": "env-cmd --silent -f .localConfigs.playground npm run dev", + "dev:teamsfx:launch-testtool": "env-cmd --silent -f env/.env.playground teamsapptester start", "dev": "nodemon --exec node --inspect=9239 --signal SIGINT ./src/index.js", "start": "node ./src/index.js", "test": "echo \"Error: no test specified\" && exit 1", diff --git a/templates/non-sso-tab-js/.vscode/tasks.json b/templates/non-sso-tab-js/.vscode/tasks.json index a3055b2a0..f3bbe844c 100644 --- a/templates/non-sso-tab-js/.vscode/tasks.json +++ b/templates/non-sso-tab-js/.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", diff --git a/templates/non-sso-tab-js/.webappignore b/templates/non-sso-tab-js/.webappignore index 217473ab1..85622f791 100644 --- a/templates/non-sso-tab-js/.webappignore +++ b/templates/non-sso-tab-js/.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 diff --git a/templates/non-sso-tab-js/README.md b/templates/non-sso-tab-js/README.md index 5df05caf9..ca5efceca 100644 --- a/templates/non-sso-tab-js/README.md +++ b/templates/non-sso-tab-js/README.md @@ -12,9 +12,9 @@ This template showcases how Microsoft Teams supports the ability to run web-base > - A [Microsoft 365 account for development](https://docs.microsoft.com/microsoftteams/platform/toolkit/accounts) > - [Set up your dev environment for extending Teams apps across Microsoft 365](https://aka.ms/teamsfx-m365-apps-prerequisites) > Please note that after you enrolled your developer tenant in Office 365 Target Release, it may take couple days for the enrollment to take effect. -> - [Teams Toolkit Visual Studio Code Extension](https://aka.ms/teams-toolkit) version 5.0.0 and higher or [Teams Toolkit CLI](https://aka.ms/teamsfx-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/teamsfx-toolkit-cli) -1. First, select the Teams Toolkit icon on the left in the VS Code toolbar. +1. First, select the Microsoft 365 Agents Toolkit icon on the left in the VS Code toolbar. 2. In the Account section, sign in with your [Microsoft 365 account](https://docs.microsoft.com/microsoftteams/platform/toolkit/accounts) if you haven't already. 3. Press F5 to start debugging which launches your app in Teams using a web browser. Select `Debug in Teams (Edge)` or `Debug in Teams (Chrome)`. 4. When Teams launches in the browser, select the Add button in the dialog to install your app to Teams. @@ -37,17 +37,17 @@ The following files can be customized and demonstrate an example implementation | File | Contents | | -------------------------------- | --------------------------------------------------------------------------------------------------------------- | -| `src/static/scripts/teamsapp.js` | A script that calls `teamsjs` SDK to get the context of on which Microsoft 365 application your app is running. | +| `src/static/scripts/atk.js` | A script that calls `teamsjs` SDK to get the context of on which Microsoft 365 application your app is running. | | `src/static/styles/custom.css` | css file for the app. | | `src/static/views/hello.html` | html file for the app. | | `src/app.js` | Starting an express server. | -The following are Teams Toolkit specific project files. You can [visit a complete guide on Github](https://github.com/OfficeDev/TeamsFx/wiki/Teams-Toolkit-Visual-Studio-Code-v5-Guide#overview) to understand how Teams Toolkit works. +The following are Microsoft 365 Agents Toolkit specific project files. You can [visit a complete guide on Github](https://github.com/OfficeDev/TeamsFx/wiki/Teams-Toolkit-Visual-Studio-Code-v5-Guide#overview) to understand how Microsoft 365 Agents Toolkit works. | File | Contents | | -------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | -| `teamsapp.yml` | This is the main Teams Toolkit project file. The project file defines two primary things: Properties and configuration Stage definitions. | -| `teamsapp.local.yml` | This overrides `teamsapp.yml` with actions that enable local execution and debugging. | +| `m365agents.yml` | This is the main Microsoft 365 Agents Toolkit project file. The project file defines two primary things: Properties and configuration Stage definitions. | +| `m365agents.local.yml` | This overrides `m365agents.yml` with actions that enable local execution and debugging. | ## Extend the Basic Tab template diff --git a/templates/non-sso-tab-js/teamsapp.local.yml b/templates/non-sso-tab-js/m365agents.local.yml similarity index 99% rename from templates/non-sso-tab-js/teamsapp.local.yml rename to templates/non-sso-tab-js/m365agents.local.yml index e20f5be11..48b5096ae 100644 --- a/templates/non-sso-tab-js/teamsapp.local.yml +++ b/templates/non-sso-tab-js/m365agents.local.yml @@ -38,7 +38,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: diff --git a/templates/non-sso-tab-js/teamsapp.yml b/templates/non-sso-tab-js/m365agents.yml similarity index 97% rename from templates/non-sso-tab-js/teamsapp.yml rename to templates/non-sso-tab-js/m365agents.yml index d14b2f4f1..f89d25d6e 100644 --- a/templates/non-sso-tab-js/teamsapp.yml +++ b/templates/non-sso-tab-js/m365agents.yml @@ -38,7 +38,7 @@ provision: parameters: ./infra/azure.parameters.json # Required when deploying ARM template deploymentName: Create-resources-for-tab - # Teams Toolkit will download this bicep CLI version from github for you, + # 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. bicepCliVersion: v0.9.1 @@ -60,7 +60,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: @@ -118,7 +118,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: diff --git a/templates/notification-restify-js/.appserviceignore b/templates/notification-restify-js/.appserviceignore index 2d8a3ad18..866f035b9 100644 --- a/templates/notification-restify-js/.appserviceignore +++ b/templates/notification-restify-js/.appserviceignore @@ -1,10 +1,10 @@ .appserviceIgnore .fx .deployment -.localConfigs.testTool +.localConfigs.playground .localConfigs .notification.localstore.json -.notification.testtoolstore.json +.notification.playgroundstore.json .vscode *.js.map *.ts.map @@ -17,8 +17,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 diff --git a/templates/notification-restify-js/.gitignore b/templates/notification-restify-js/.gitignore index dfb975ac8..317395710 100644 --- a/templates/notification-restify-js/.gitignore +++ b/templates/notification-restify-js/.gitignore @@ -17,10 +17,10 @@ node_modules/ lib/ # Local data -.localConfigs.testTool +.localConfigs.playground .localConfigs .notification.localstore.json -.notification.testtoolstore.json +.notification.playgroundstore.json # Dev tool directories /devTools/ \ No newline at end of file diff --git a/templates/notification-restify-js/.vscode/launch.json b/templates/notification-restify-js/.vscode/launch.json index ccf408076..49a5485b7 100644 --- a/templates/notification-restify-js/.vscode/launch.json +++ b/templates/notification-restify-js/.vscode/launch.json @@ -117,11 +117,11 @@ "stopAll": true }, { - "name": "Debug in Test Tool", + "name": "Debug in Microsoft 365 Agents playground", "configurations": [ "Attach to Local Service" ], - "preLaunchTask": "Start Teams App (Test Tool)", + "preLaunchTask": "Start Teams App (Microsoft 365 Agents playground)", "presentation": { "group": "1-local", "order": 1 diff --git a/templates/notification-restify-js/.vscode/tasks.json b/templates/notification-restify-js/.vscode/tasks.json index 953e98858..e22532d8d 100644 --- a/templates/notification-restify-js/.vscode/tasks.json +++ b/templates/notification-restify-js/.vscode/tasks.json @@ -1,23 +1,23 @@ -// 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", "tasks": [ { - "label": "Start Teams App (Test Tool)", + "label": "Start Teams App (Microsoft 365 Agents playground)", "dependsOn": [ - "Validate prerequisites (Test Tool)", - "Deploy (Test Tool)", - "Start application (Test Tool)", - "Start Test Tool", + "Validate prerequisites (Microsoft 365 Agents playground)", + "Deploy (Microsoft 365 Agents playground)", + "Start application (Microsoft 365 Agents playground)", + "Start Microsoft 365 Agents playground", ], "dependsOrder": "sequence" }, { // Check all required prerequisites. // See https://aka.ms/teamsfx-tasks/check-prerequisites to know the details and how to customize the args. - "label": "Validate prerequisites (Test Tool)", + "label": "Validate prerequisites (Microsoft 365 Agents playground)", "type": "teamsfx", "command": "debug-check-prerequisites", "args": { @@ -28,22 +28,22 @@ "portOccupancy": [ 3978, // app service port 9239, // app inspector port for Node.js debugger - 56150, // test tool port + 56150, // Microsoft 365 Agents playground port ] } }, { // Build project. // See https://aka.ms/teamsfx-tasks/deploy to know the details and how to customize the args. - "label": "Deploy (Test Tool)", + "label": "Deploy (Microsoft 365 Agents playground)", "type": "teamsfx", "command": "deploy", "args": { - "env": "testtool", + "env": "playground", } }, { - "label": "Start application (Test Tool)", + "label": "Start application (Microsoft 365 Agents playground)", "type": "shell", "command": "npm run dev:teamsfx:testtool", "isBackground": true, @@ -67,7 +67,7 @@ } }, { - "label": "Start Test Tool", + "label": "Start Microsoft 365 Agents playground", "type": "shell", "command": "npm run dev:teamsfx:launch-testtool", "isBackground": true, diff --git a/templates/notification-restify-js/README.md b/templates/notification-restify-js/README.md index 44c5eb4d3..1478538d9 100644 --- a/templates/notification-restify-js/README.md +++ b/templates/notification-restify-js/README.md @@ -11,33 +11,33 @@ The app template is built using the TeamsFx SDK, which provides a simple set of > To run the notification bot template in your local dev machine, you will need: > > - [Node.js](https://nodejs.org/), supported versions: 18, 20, 22 -> - [Teams Toolkit Visual Studio Code Extension](https://aka.ms/teams-toolkit) version 5.0.0 and higher or [Teams Toolkit CLI](https://aka.ms/teamsfx-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/teamsfx-toolkit-cli) > > **Note** > > Your app can be installed into a team, or a group chat, or as personal app. See [Installation and Uninstallation](https://aka.ms/teamsfx-notification-new#customize-installation). -> For local debugging using Teams Toolkit CLI, you need to do some extra steps described in [Set up your Teams Toolkit CLI for local debugging](https://aka.ms/teamsfx-cli-debugging). +> For local debugging using Microsoft 365 Agents Toolkit CLI, you need to do some extra steps described in [Set up your Microsoft 365 Agents Toolkit CLI for local debugging](https://aka.ms/teamsfx-cli-debugging). -1. First, select the Teams Toolkit icon on the left in the VS Code toolbar. -2. Press F5 to start debugging which launches your app in Teams App Test Tool using a web browser. Select `Debug in Test Tool`. -3. The browser will pop up to open Teams App Test Tool. +1. First, select the Microsoft 365 Agents Toolkit icon on the left in the VS Code toolbar. +2. Press F5 to start debugging which launches your app in Microsoft 365 Agents playground using a web browser. Select `Debug in Microsoft 365 Agents playground`. +3. The browser will pop up to open Microsoft 365 Agents playground. 4. Send a POST request to `http:///api/notification` with your favorite tool (like `Postman`) - When your project is running locally, replace `` with `localhost:3978` - When your project is deployed to Azure App Service, replace `` with the url from Azure App Service -The bot will send an Adaptive Card to Teams App Test Tool: +The bot will send an Adaptive Card to Microsoft 365 Agents playground: -![Notification Message in Test Tool](https://github.com/OfficeDev/TeamsFx/assets/9698542/43ee64f4-5554-4e0b-854f-f7e20672cb25) +![Notification Message in Microsoft 365 Agents playground](https://github.com/OfficeDev/TeamsFx/assets/9698542/43ee64f4-5554-4e0b-854f-f7e20672cb25) ## What's included in the template | Folder / File | Contents | | ----------------------- | -------------------------------------------------------------------------------------------------------------------------------- | -| `teamsapp.yml` | Main project file describes your application configuration and defines the set of actions to run in each lifecycle stages | -| `teamsapp.local.yml` | This overrides `teamsapp.yml` with actions that enable local execution and debugging | -| `teamsapp.testtool.yml` | This overrides `teamsapp.yml` with actions that enable local execution and debugging in Teams App Test Tool | -| `env/` | Name / value pairs are stored in environment files and used by `teamsapp.yml` to customize the provisioning and deployment rules | +| `m365agents.yml` | Main project file describes your application configuration and defines the set of actions to run in each lifecycle stages | +| `m365agents.local.yml` | This overrides `m365agents.yml` with actions that enable local execution and debugging | +| `m365agents.playground.yml` | This overrides `m365agents.yml` with actions that enable local execution and debugging in Microsoft 365 Agents playground | +| `env/` | Name / value pairs are stored in environment files and used by `m365agents.yml` to customize the provisioning and deployment rules | | `.vscode/` | VSCode files for debugging | | `src/` | The source code for the notification Teams application | | `appPackage/` | Templates for the Teams application manifest | @@ -61,7 +61,7 @@ There are few customizations you can make to extend the template to fit your bus ### Step 1: Customize the trigger point from event source -By default Teams Toolkit scaffolds a single `express` entry point in `src/index.js`. When a HTTP request is sent to this entry point, the default implementation sends a hard-coded Adaptive Card to Teams. You can customize this behavior by customizing `src/index.js`. A typical implementation might make an API call to retrieve some events and/or data, and then send an Adaptive Card as appropriate. +By default Microsoft 365 Agents Toolkit scaffolds a single `express` entry point in `src/index.js`. When a HTTP request is sent to this entry point, the default implementation sends a hard-coded Adaptive Card to Teams. You can customize this behavior by customizing `src/index.js`. A typical implementation might make an API call to retrieve some events and/or data, and then send an Adaptive Card as appropriate. You can also add additional triggers by: @@ -112,7 +112,7 @@ Adaptive cards can be updated on user action to allow user progress through a se - [Manage multiple environments](https://docs.microsoft.com/microsoftteams/platform/toolkit/teamsfx-multi-env) - [Collaborate with others](https://docs.microsoft.com/microsoftteams/platform/toolkit/teamsfx-collaboration) -- [Teams Toolkit Documentations](https://docs.microsoft.com/microsoftteams/platform/toolkit/teams-toolkit-fundamentals) -- [Teams Toolkit CLI](https://aka.ms/teamsfx-toolkit-cli) +- [Microsoft 365 Agents Toolkit Documentations](https://docs.microsoft.com/microsoftteams/platform/toolkit/teams-toolkit-fundamentals) +- [Microsoft 365 Agents Toolkit CLI](https://aka.ms/teamsfx-toolkit-cli) - [TeamsFx SDK](https://docs.microsoft.com/microsoftteams/platform/toolkit/teamsfx-sdk) -- [Teams Toolkit Samples](https://github.com/OfficeDev/TeamsFx-Samples) +- [Microsoft 365 Agents Toolkit Samples](https://github.com/OfficeDev/TeamsFx-Samples) diff --git a/templates/message-extension-action-js/env/.env.testtool b/templates/notification-restify-js/env/.env.playground similarity index 58% rename from templates/message-extension-action-js/env/.env.testtool rename to templates/notification-restify-js/env/.env.playground index 43ce12aad..e89c23c04 100644 --- a/templates/message-extension-action-js/env/.env.testtool +++ b/templates/notification-restify-js/env/.env.playground @@ -1,8 +1,8 @@ # This file includes environment variables that can be committed to git. It's gitignored by default because it represents your local development environment. # Built-in environment variables -TEAMSFX_ENV=testtool +TEAMSFX_ENV=playground -# Environment variables used by test tool +# Environment variables used by Microsoft 365 Agents playground TEAMSAPPTESTER_PORT=56150 -TEAMSFX_NOTIFICATION_STORE_FILENAME=.notification.testtoolstore.json +TEAMSFX_NOTIFICATION_STORE_FILENAME=.notification.playgroundstore.json diff --git a/templates/notification-restify-js/teamsapp.local.yml b/templates/notification-restify-js/m365agents.local.yml similarity index 99% rename from templates/notification-restify-js/teamsapp.local.yml rename to templates/notification-restify-js/m365agents.local.yml index f092aad69..4b2f49257 100644 --- a/templates/notification-restify-js/teamsapp.local.yml +++ b/templates/notification-restify-js/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: diff --git a/templates/notification-restify-js/teamsapp.testtool.yml b/templates/notification-restify-js/m365agents.playground.yml similarity index 94% rename from templates/notification-restify-js/teamsapp.testtool.yml rename to templates/notification-restify-js/m365agents.playground.yml index 44d71fd1b..1bbc8eb69 100644 --- a/templates/notification-restify-js/teamsapp.testtool.yml +++ b/templates/notification-restify-js/m365agents.playground.yml @@ -19,6 +19,6 @@ deploy: # Generate runtime environment variables - uses: file/createOrUpdateEnvironmentFile with: - target: ./.localConfigs.testTool + target: ./.localConfigs.playground envs: TEAMSFX_NOTIFICATION_STORE_FILENAME: ${{TEAMSFX_NOTIFICATION_STORE_FILENAME}} \ No newline at end of file diff --git a/templates/notification-restify-js/teamsapp.yml b/templates/notification-restify-js/m365agents.yml similarity index 97% rename from templates/notification-restify-js/teamsapp.yml rename to templates/notification-restify-js/m365agents.yml index 4f047753b..ad7afd7b7 100644 --- a/templates/notification-restify-js/teamsapp.yml +++ b/templates/notification-restify-js/m365agents.yml @@ -38,7 +38,7 @@ provision: parameters: ./infra/azure.parameters.json # Required when deploying ARM template deploymentName: Create-resources-for-bot - # Teams Toolkit will download this bicep CLI version from github for you, + # 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. bicepCliVersion: v0.9.1 @@ -60,7 +60,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: @@ -108,7 +108,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: diff --git a/templates/notification-restify-js/package.json b/templates/notification-restify-js/package.json index f8567c0cc..66a613424 100644 --- a/templates/notification-restify-js/package.json +++ b/templates/notification-restify-js/package.json @@ -1,7 +1,7 @@ { "name": "notificationrestifyjs", "version": "1.0.0", - "description": "Microsoft Teams Toolkit Notification Bot Sample (Express)", + "description": "Microsoft 365 Agents Toolkit Notification Bot Sample (Express)", "engines": { "node": "18 || 20 || 22" }, @@ -10,8 +10,8 @@ "main": "./src/index.js", "scripts": { "dev:teamsfx": "env-cmd --silent -f .localConfigs npm run dev", - "dev:teamsfx:testtool": "env-cmd --silent -f .localConfigs.testTool npm run dev", - "dev:teamsfx:launch-testtool": "env-cmd --silent -f env/.env.testtool teamsapptester start", + "dev:teamsfx:testtool": "env-cmd --silent -f .localConfigs.playground npm run dev", + "dev:teamsfx:launch-testtool": "env-cmd --silent -f env/.env.playground teamsapptester start", "dev": "nodemon --inspect=9239 --signal SIGINT ./src/index.js", "start": "node ./src/index.js", "watch": "nodemon ./src/index.js", diff --git a/templates/spfx-tab-ts/.vscode/tasks.json b/templates/spfx-tab-ts/.vscode/tasks.json index a73ca0f0a..88f036eec 100644 --- a/templates/spfx-tab-ts/.vscode/tasks.json +++ b/templates/spfx-tab-ts/.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", diff --git a/templates/spfx-tab-ts/env/.env.dev b/templates/spfx-tab-ts/env/.env.dev index 221333095..481bea20a 100644 --- a/templates/spfx-tab-ts/env/.env.dev +++ b/templates/spfx-tab-ts/env/.env.dev @@ -5,4 +5,4 @@ APP_NAME_SUFFIX=dev # Generated during provision, you can also add your own variables. TEAMS_APP_ID= -# Secrets. Keys prefixed with `SECRET_` will be masked in Teams Toolkit logs. \ No newline at end of file +# Secrets. Keys prefixed with `SECRET_` will be masked in Microsoft 365 Agents Toolkit logs. \ No newline at end of file diff --git a/templates/spfx-tab-ts/teamsapp.local.yml b/templates/spfx-tab-ts/m365agents.local.yml similarity index 98% rename from templates/spfx-tab-ts/teamsapp.local.yml rename to templates/spfx-tab-ts/m365agents.local.yml index b49965f6e..699f9a9a2 100644 --- a/templates/spfx-tab-ts/teamsapp.local.yml +++ b/templates/spfx-tab-ts/m365agents.local.yml @@ -33,7 +33,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: diff --git a/templates/spfx-tab-ts/teamsapp.yml b/templates/spfx-tab-ts/m365agents.yml similarity index 98% rename from templates/spfx-tab-ts/teamsapp.yml rename to templates/spfx-tab-ts/m365agents.yml index 01190f37b..822325164 100644 --- a/templates/spfx-tab-ts/teamsapp.yml +++ b/templates/spfx-tab-ts/m365agents.yml @@ -56,7 +56,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: @@ -97,7 +97,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: diff --git a/templates/spfx-tab-ts/src/README.md b/templates/spfx-tab-ts/src/README.md index af3eac3bc..e1670f45c 100644 --- a/templates/spfx-tab-ts/src/README.md +++ b/templates/spfx-tab-ts/src/README.md @@ -13,7 +13,7 @@ The SharePoint Framework (SPFx) is a page and web part model that provides full > - [Set up SharePoint Framework development environment](https://aka.ms/teamsfx-spfx-dev-environment-setup) > - 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) -> - [Teams Toolkit Visual Studio Code Extension](https://aka.ms/teams-toolkit) version 5.0.0 and higher or [Teams Toolkit CLI](https://aka.ms/teamsfx-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/teamsfx-toolkit-cli) ## Solution @@ -36,26 +36,26 @@ The SharePoint Framework (SPFx) is a page and web part model that provides full ## Minimal Path to Awesome -1. Open the project with VSCode, click `Provision` in LIFECYCLE panel of Teams Toolkit extension. +1. Open the project with VSCode, click `Provision` in LIFECYCLE panel of Microsoft 365 Agents Toolkit extension. - Or you can use Teams Toolkit CLI with running this cmd under your project path: - `teamsapp provision` + Or you can use Microsoft 365 Agents Toolkit CLI with running this cmd under your project path: + `atk provision` It will provision an app in Teams App Studio. You may need to login with your Microsoft 365 tenant admin account. 2. Build and Deploy your SharePoint Package. - - Click `Deploy` in LIFECYCLE panel of Teams Toolkit extension, or run `Teams: Deploy` from command palette. This will generate a SharePoint package (\*.sppkg) under sharepoint/solution folder. + - Click `Deploy` in LIFECYCLE panel of Microsoft 365 Agents Toolkit extension, or run `Microsoft 365 Agents: Deploy` from command palette. This will generate a SharePoint package (\*.sppkg) under sharepoint/solution folder. - Or you can use Teams Toolkit CLI with running this cmd under your project path: - `teamsapp deploy` + Or you can use Microsoft 365 Agents Toolkit CLI with running this cmd under your project path: + `atk deploy` - - After building the \*.sppkg, the Teams Toolkit extension will upload and deploy it to your tenant App Catalog. Only tenant App Catalog site admin has permission to do it. You can create your test tenant following [Setup your Microsoft 365 tenant](https://docs.microsoft.com/en-us/sharepoint/dev/spfx/set-up-your-developer-tenant). + - After building the \*.sppkg, the Microsoft 365 Agents Toolkit extension will upload and deploy it to your tenant App Catalog. Only tenant App Catalog site admin has permission to do it. You can create your test tenant following [Setup your Microsoft 365 tenant](https://docs.microsoft.com/en-us/sharepoint/dev/spfx/set-up-your-developer-tenant). -3. Go back to Teams Toolkit extension, click `Teams: Publish` in LIFECYCLE panel. +3. Go back to Microsoft 365 Agents Toolkit extension, click `Microsoft 365 Agents: Publish` in LIFECYCLE panel. - Or you can use Teams Toolkit CLI with running this cmd under your project path: - `teamsapp publish` + Or you can use Microsoft 365 Agents Toolkit CLI with running this cmd under your project path: + `atk publish` You will find your app in [Microsoft Teams admin center](https://admin.teams.microsoft.com/policies/manage-apps). Enter your app name in the search box. Click the item and select `Publish` in the Publishing status. diff --git a/templates/sso-tab-with-obo-flow-ts/.vscode/tasks.json b/templates/sso-tab-with-obo-flow-ts/.vscode/tasks.json index 0cad6d4d4..27af5184e 100644 --- a/templates/sso-tab-with-obo-flow-ts/.vscode/tasks.json +++ b/templates/sso-tab-with-obo-flow-ts/.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", diff --git a/templates/sso-tab-with-obo-flow-ts/README.md b/templates/sso-tab-with-obo-flow-ts/README.md index 1f864d443..0af73c495 100644 --- a/templates/sso-tab-with-obo-flow-ts/README.md +++ b/templates/sso-tab-with-obo-flow-ts/README.md @@ -14,9 +14,9 @@ This app has adopted [On-Behalf-Of flow](https://learn.microsoft.com/en-us/azure > - A [Microsoft 365 account for development](https://docs.microsoft.com/microsoftteams/platform/toolkit/accounts) > - [Set up your dev environment for extending Teams apps across Microsoft 365](https://aka.ms/teamsfx-m365-apps-prerequisites) > Please note that after you enrolled your developer tenant in Office 365 Target Release, it may take couple days for the enrollment to take effect. -> - [Teams Toolkit Visual Studio Code Extension](https://aka.ms/teams-toolkit) version 5.0.0 and higher or [Teams Toolkit CLI](https://aka.ms/teamsfx-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/teamsfx-toolkit-cli) -1. First, select the Teams Toolkit icon on the left in the VS Code toolbar. +1. First, select the Microsoft 365 Agents Toolkit icon on the left in the VS Code toolbar. 2. In the Account section, sign in with your [Microsoft 365 account](https://docs.microsoft.com/microsoftteams/platform/toolkit/accounts) if you haven't already. 3. Press F5 to start debugging which launches your app in Teams using a web browser. Select `Debug in Teams (Edge)` or `Debug in Teams (Chrome)`. 4. When Teams launches in the browser, select the Add button in the dialog to install your app to Teams. @@ -36,12 +36,12 @@ This app has adopted [On-Behalf-Of flow](https://learn.microsoft.com/en-us/azure | `src` | The source code for the frontend of the Tab application. Implemented with Fluent UI Framework. | | `api` | The source code for the backend of the Tab application. Implemented single-sign-on with OBO flow using Azure Functions. | -The following are Teams Toolkit specific project files. You can [visit a complete guide on Github](https://github.com/OfficeDev/TeamsFx/wiki/Teams-Toolkit-Visual-Studio-Code-v5-Guide#overview) to understand how Teams Toolkit works. +The following are Microsoft 365 Agents Toolkit specific project files. You can [visit a complete guide on Github](https://github.com/OfficeDev/TeamsFx/wiki/Teams-Toolkit-Visual-Studio-Code-v5-Guide#overview) to understand how Microsoft 365 Agents Toolkit works. | File | Contents | | -------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `teamsapp.yml` | This is the main Teams Toolkit project file. The project file defines two primary things: Properties and configuration Stage definitions. | -| `teamsapp.local.yml` | This overrides `teamsapp.yml` with actions that enable local execution and debugging. | +| `m365agents.yml` | This is the main Microsoft 365 Agents Toolkit project file. The project file defines two primary things: Properties and configuration Stage definitions. | +| `m365agents.local.yml` | This overrides `m365agents.yml` with actions that enable local execution and debugging. | | `aad.manifest.json` | This file defines the configuration of Microsoft Entra app. This template will only provision [single tenant](https://learn.microsoft.com/azure/active-directory/develop/single-and-multi-tenant-apps#who-can-sign-in-to-your-app) Microsoft Entra app. | ## Extend the React with Fluent UI template diff --git a/templates/sso-tab-with-obo-flow-ts/api/README.md b/templates/sso-tab-with-obo-flow-ts/api/README.md index 1a9ee1142..05dc9564e 100644 --- a/templates/sso-tab-with-obo-flow-ts/api/README.md +++ b/templates/sso-tab-with-obo-flow-ts/api/README.md @@ -6,11 +6,11 @@ Azure Functions are a great way to add server-side behaviors to any Teams applic - [Node.js](https://nodejs.org/), supported versions: 18, 20, 22 - A Microsoft 365 account. If you do not have Microsoft 365 account, apply one from [Microsoft 365 developer program](https://developer.microsoft.com/en-us/microsoft-365/dev-program) -- [Teams Toolkit Visual Studio Code Extension](https://aka.ms/teams-toolkit) version 5.0.0 and higher or [Teams Toolkit CLI](https://aka.ms/teamsfx-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/teamsfx-toolkit-cli) ## Develop -The Teams Toolkit IDE Extension and Teams Toolkit CLI provide template code for you to get started with Azure Functions for your Teams application. Microsoft Teams Framework simplifies the task of establishing the user's identity within the Azure Functions. +The Microsoft 365 Agents Toolkit IDE Extension and Microsoft 365 Agents Toolkit CLI provide template code for you to get started with Azure Functions for your Teams application. Microsoft Teams Framework simplifies the task of establishing the user's identity within the Azure Functions. The template handles calls from your Teams "custom tab" (client-side of your app), initializes the TeamsFx SDK to access the current user context, and demonstrates how to obtain a pre-authenticated Microsoft Graph Client. Microsoft Graph is the "data plane" of Microsoft 365 - you can use it to access content within Microsoft 365 in your company. With it you can read and write documents, SharePoint collections, Teams channels, and many other entities within Microsoft 365. Read more about [Microsoft Graph](https://docs.microsoft.com/en-us/graph/overview). @@ -39,11 +39,11 @@ const response = await axios.default.get(endpoint + "/api/" + functionName, { ### Add More Functions -- From Visual Studio Code, open the command palette, select `Teams: Add Resources` and select `Azure Functions App`. +- From Visual Studio Code, open the command palette, select `Microsoft 365 Agents: Add Resources` and select `Azure Functions App`. ## Change Node.js runtime version -By default, Teams Toolkit and Teams Toolkit CLI will provision an Azure functions app with function runtime version 3, and node runtime version 12. You can change the node version through Azure Portal. +By default, Microsoft 365 Agents Toolkit and Microsoft 365 Agents Toolkit CLI will provision an Azure functions app with function runtime version 3, and node runtime version 12. You can change the node version through Azure Portal. - Sign in to [Azure Portal](https://azure.microsoft.com/). - Find your application's resource group and Azure Functions app resource. The resource group name and the Azure functions app name are stored in your project configuration file `.fx/env.*.json`. You can find them by searching the key `resourceGroupName` and `functionAppName` in that file. @@ -56,7 +56,7 @@ Then following requests sent to the Azure Functions app will be handled by new n ## Debug - From Visual Studio Code: Start debugging the project by hitting the `F5` key in Visual Studio Code. Alternatively use the `Run and Debug Activity Panel` in Visual Studio Code and click the `Start Debugging` green arrow button. -- From Teams Toolkit CLI: Start debugging the project by executing the command `teamsapp preview --local` in your project directory. +- From Microsoft 365 Agents Toolkit CLI: Start debugging the project by executing the command `atk preview --local` in your project directory. ## Edit the manifest @@ -70,9 +70,9 @@ This file contains template arguments with `${{...}}` statements which will be r Deploy your project to Azure by following these steps: -| From Visual Studio Code | From Teams Toolkit CLI | +| From Visual Studio Code | From Microsoft 365 Agents Toolkit CLI | | :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | :---------------------------------------------------------------------------------------------------------------------------------------------- | -|
  • Open Teams Toolkit, and sign into Azure by clicking the `Sign in to Azure` under the `ACCOUNTS` section from sidebar.
  • After you signed in, select a subscription under your account.
  • Open the command palette and select: `Teams: Provision`.
  • Open the command palette and select: `Teams: Deploy`.
|
  • Run command `teamsapp auth login azure`.
  • Run command `teamsapp provision`.
  • Run command `teamsapp deploy`.
| +|
  • Open Microsoft 365 Agents Toolkit, and sign into Azure by clicking the `Sign in to Azure` under the `ACCOUNTS` section from sidebar.
  • After you signed in, select a subscription under your account.
  • Open the command palette and select: `Microsoft 365 Agents: Provision`.
  • Open the command palette and select: `Microsoft 365 Agents: Deploy`.
|
  • Run command `atk auth login azure`.
  • Run command `atk provision`.
  • Run command `atk deploy`.
| > Note: Provisioning and deployment may incur charges to your Azure Subscription. @@ -86,23 +86,23 @@ Once the provisioning and deployment steps are finished, you can preview your ap 1. Select `Launch Remote (Edge)` or `Launch Remote (Chrome)` from the launch configuration drop-down. 1. Press the Play (green arrow) button to launch your app - now running remotely from Azure. -- From Teams Toolkit CLI: execute `teamsapp preview --remote` in your project directory to launch your application. +- From Microsoft 365 Agents Toolkit CLI: execute `atk preview --remote` in your project directory to launch your application. ## Validate manifest file To check that your manifest file is valid: -- From Visual Studio Code: open the command palette and select: `Teams: Validate manifest file`. -- From Teams Toolkit CLI: run command `teamsapp validate` in your project directory. +- From Visual Studio Code: open the command palette and select: `Microsoft 365 Agents: Validate manifest file`. +- From Microsoft 365 Agents Toolkit CLI: run command `atk validate` in your project directory. ## Package -- From Visual Studio Code: open the command palette and select `Teams: Zip Teams metadata package`. -- Alternatively, from the command line run `teamsapp package` in the project directory. +- From Visual Studio Code: open the command palette and select `Microsoft 365 Agents: Zip Teams metadata package`. +- Alternatively, from the command line run `atk package` in the project directory. ## Publish to Teams Once deployed, you may want to distribute your application to your organization's internal app store in Teams. Your app will be submitted for admin approval. -- From Visual Studio Code: open the command palette and select: `Teams: Publish to Teams`. -- From Teams Toolkit CLI: run command `teamsapp publish` in your project directory. +- From Visual Studio Code: open the command palette and select: `Microsoft 365 Agents: Publish to Teams`. +- From Microsoft 365 Agents Toolkit CLI: run command `atk publish` in your project directory. diff --git a/templates/sso-tab-with-obo-flow-ts/env/.env.dev b/templates/sso-tab-with-obo-flow-ts/env/.env.dev index 6c364bf2a..e7a0f1fd7 100644 --- a/templates/sso-tab-with-obo-flow-ts/env/.env.dev +++ b/templates/sso-tab-with-obo-flow-ts/env/.env.dev @@ -8,7 +8,7 @@ AZURE_SUBSCRIPTION_ID= AZURE_RESOURCE_GROUP_NAME= RESOURCE_SUFFIX= -# Generated during provision, you can also add your own variables. If you're adding a secret value, add SECRET_ prefix to the name so Teams Toolkit can handle them properly +# Generated during provision, you can also add your own variables. If you're adding a secret value, add SECRET_ prefix to the name so Microsoft 365 Agents Toolkit can handle them properly TEAMS_APP_ID= TEAMS_APP_TENANT_ID= AAD_APP_CLIENT_ID= diff --git a/templates/sso-tab-with-obo-flow-ts/teamsapp.local.yml b/templates/sso-tab-with-obo-flow-ts/m365agents.local.yml similarity index 99% rename from templates/sso-tab-with-obo-flow-ts/teamsapp.local.yml rename to templates/sso-tab-with-obo-flow-ts/m365agents.local.yml index 6e73e7686..de266125e 100644 --- a/templates/sso-tab-with-obo-flow-ts/teamsapp.local.yml +++ b/templates/sso-tab-with-obo-flow-ts/m365agents.local.yml @@ -79,7 +79,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: diff --git a/templates/sso-tab-with-obo-flow-ts/teamsapp.yml b/templates/sso-tab-with-obo-flow-ts/m365agents.yml similarity index 98% rename from templates/sso-tab-with-obo-flow-ts/teamsapp.yml rename to templates/sso-tab-with-obo-flow-ts/m365agents.yml index 7916ca331..82294bda7 100644 --- a/templates/sso-tab-with-obo-flow-ts/teamsapp.yml +++ b/templates/sso-tab-with-obo-flow-ts/m365agents.yml @@ -64,7 +64,7 @@ provision: parameters: ./infra/azure.parameters.json # Required when deploying ARM template deploymentName: Create-resources-for-tab - # Teams Toolkit will download this bicep CLI version from github for you, + # 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. bicepCliVersion: v0.9.1 @@ -103,7 +103,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: @@ -187,7 +187,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: diff --git a/templates/workflow-ts/.appserviceignore b/templates/workflow-ts/.appserviceignore index d3ef2d0dd..d368248e4 100644 --- a/templates/workflow-ts/.appserviceignore +++ b/templates/workflow-ts/.appserviceignore @@ -1,10 +1,10 @@ .webappignore .fx .deployment -.localConfigs.testTool +.localConfigs.playground .localConfigs .notification.localstore.json -.notification.testtoolstore.json +.notification.playgroundstore.json .vscode *.js.map *.ts.map @@ -17,8 +17,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 diff --git a/templates/workflow-ts/.gitignore b/templates/workflow-ts/.gitignore index dfb975ac8..317395710 100644 --- a/templates/workflow-ts/.gitignore +++ b/templates/workflow-ts/.gitignore @@ -17,10 +17,10 @@ node_modules/ lib/ # Local data -.localConfigs.testTool +.localConfigs.playground .localConfigs .notification.localstore.json -.notification.testtoolstore.json +.notification.playgroundstore.json # Dev tool directories /devTools/ \ No newline at end of file diff --git a/templates/workflow-ts/.vscode/launch.json b/templates/workflow-ts/.vscode/launch.json index ccf408076..49a5485b7 100644 --- a/templates/workflow-ts/.vscode/launch.json +++ b/templates/workflow-ts/.vscode/launch.json @@ -117,11 +117,11 @@ "stopAll": true }, { - "name": "Debug in Test Tool", + "name": "Debug in Microsoft 365 Agents playground", "configurations": [ "Attach to Local Service" ], - "preLaunchTask": "Start Teams App (Test Tool)", + "preLaunchTask": "Start Teams App (Microsoft 365 Agents playground)", "presentation": { "group": "1-local", "order": 1 diff --git a/templates/workflow-ts/.vscode/tasks.json b/templates/workflow-ts/.vscode/tasks.json index 953e98858..e22532d8d 100644 --- a/templates/workflow-ts/.vscode/tasks.json +++ b/templates/workflow-ts/.vscode/tasks.json @@ -1,23 +1,23 @@ -// 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", "tasks": [ { - "label": "Start Teams App (Test Tool)", + "label": "Start Teams App (Microsoft 365 Agents playground)", "dependsOn": [ - "Validate prerequisites (Test Tool)", - "Deploy (Test Tool)", - "Start application (Test Tool)", - "Start Test Tool", + "Validate prerequisites (Microsoft 365 Agents playground)", + "Deploy (Microsoft 365 Agents playground)", + "Start application (Microsoft 365 Agents playground)", + "Start Microsoft 365 Agents playground", ], "dependsOrder": "sequence" }, { // Check all required prerequisites. // See https://aka.ms/teamsfx-tasks/check-prerequisites to know the details and how to customize the args. - "label": "Validate prerequisites (Test Tool)", + "label": "Validate prerequisites (Microsoft 365 Agents playground)", "type": "teamsfx", "command": "debug-check-prerequisites", "args": { @@ -28,22 +28,22 @@ "portOccupancy": [ 3978, // app service port 9239, // app inspector port for Node.js debugger - 56150, // test tool port + 56150, // Microsoft 365 Agents playground port ] } }, { // Build project. // See https://aka.ms/teamsfx-tasks/deploy to know the details and how to customize the args. - "label": "Deploy (Test Tool)", + "label": "Deploy (Microsoft 365 Agents playground)", "type": "teamsfx", "command": "deploy", "args": { - "env": "testtool", + "env": "playground", } }, { - "label": "Start application (Test Tool)", + "label": "Start application (Microsoft 365 Agents playground)", "type": "shell", "command": "npm run dev:teamsfx:testtool", "isBackground": true, @@ -67,7 +67,7 @@ } }, { - "label": "Start Test Tool", + "label": "Start Microsoft 365 Agents playground", "type": "shell", "command": "npm run dev:teamsfx:launch-testtool", "isBackground": true, diff --git a/templates/workflow-ts/README.md b/templates/workflow-ts/README.md index 0180b00ed..7e602aa9e 100644 --- a/templates/workflow-ts/README.md +++ b/templates/workflow-ts/README.md @@ -11,16 +11,16 @@ The app template is built using the TeamsFx SDK, which provides a simple set of > To run the workflow bot template in your local dev machine, you will need: > > - [Node.js](https://nodejs.org/), supported versions: 18, 20, 22 -> - [Teams Toolkit Visual Studio Code Extension](https://aka.ms/teams-toolkit) version 5.0.0 and higher or [Teams Toolkit CLI](https://aka.ms/teamsfx-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/teamsfx-toolkit-cli) > > **Note** > > Your app can be installed into a team, or a group chat, or as personal app. See [Installation and Uninstallation](https://aka.ms/teamsfx-command-response#customize-installation). -> For local debugging using Teams Toolkit CLI, you need to do some extra steps described in [Set up your Teams Toolkit CLI for local debugging](https://aka.ms/teamsfx-cli-debugging). +> For local debugging using Microsoft 365 Agents Toolkit CLI, you need to do some extra steps described in [Set up your Microsoft 365 Agents Toolkit CLI for local debugging](https://aka.ms/teamsfx-cli-debugging). -1. First, select the Teams Toolkit icon on the left in the VS Code toolbar. -2. Press F5 to start debugging which launches your app in Teams App Test Tool using a web browser. Select `Debug in Test Tool`. -3. The browser will pop up to open Teams App Test Tool. +1. First, select the Microsoft 365 Agents Toolkit icon on the left in the VS Code toolbar. +2. Press F5 to start debugging which launches your app in Microsoft 365 Agents playground using a web browser. Select `Debug in Microsoft 365 Agents playground`. +3. The browser will pop up to open Microsoft 365 Agents playground. 4. Type or select `helloWorld` in the chat to send it to your bot - this is the default command provided by the template. 5. In the response from the bot, select the **DoStuff** button. @@ -38,10 +38,10 @@ When you click the `DoStuff` button, the above adaptive card will be updated to | Folder / File | Contents | | ----------------------- | -------------------------------------------------------------------------------------------------------------------------------- | -| `teamsapp.yml` | Main project file describes your application configuration and defines the set of actions to run in each lifecycle stages | -| `teamsapp.local.yml` | This overrides `teamsapp.yml` with actions that enable local execution and debugging | -| `teamsapp.testtool.yml` | This overrides `teamsapp.yml` with actions that enable local execution and debugging in Teams App Test Tool | -| `env/` | Name / value pairs are stored in environment files and used by `teamsapp.yml` to customize the provisioning and deployment rules | +| `m365agents.yml` | Main project file describes your application configuration and defines the set of actions to run in each lifecycle stages | +| `m365agents.local.yml` | This overrides `m365agents.yml` with actions that enable local execution and debugging | +| `m365agents.playground.yml` | This overrides `m365agents.yml` with actions that enable local execution and debugging in Microsoft 365 Agents playground | +| `env/` | Name / value pairs are stored in environment files and used by `m365agents.yml` to customize the provisioning and deployment rules | | `.vscode/` | VSCode files for debugging | | `appPackage/` | Templates for the Teams application manifest | | `infra/` | Templates for provisioning Azure resources | @@ -200,7 +200,7 @@ The command and response feature adds the ability for your application to "liste - [Manage multiple environments](https://docs.microsoft.com/microsoftteams/platform/toolkit/teamsfx-multi-env) - [Collaborate with others](https://docs.microsoft.com/microsoftteams/platform/toolkit/teamsfx-collaboration) -- [Teams Toolkit Documentations](https://docs.microsoft.com/microsoftteams/platform/toolkit/teams-toolkit-fundamentals) -- [Teams Toolkit CLI](https://aka.ms/teamsfx-toolkit-cli) +- [Microsoft 365 Agents Toolkit Documentations](https://docs.microsoft.com/microsoftteams/platform/toolkit/teams-toolkit-fundamentals) +- [Microsoft 365 Agents Toolkit CLI](https://aka.ms/teamsfx-toolkit-cli) - [TeamsFx SDK](https://docs.microsoft.com/microsoftteams/platform/toolkit/teamsfx-sdk) -- [Teams Toolkit Samples](https://github.com/OfficeDev/TeamsFx-Samples) +- [Microsoft 365 Agents Toolkit Samples](https://github.com/OfficeDev/TeamsFx-Samples) diff --git a/templates/workflow-ts/env/.env.playground b/templates/workflow-ts/env/.env.playground new file mode 100644 index 000000000..e89c23c04 --- /dev/null +++ b/templates/workflow-ts/env/.env.playground @@ -0,0 +1,8 @@ +# This file includes environment variables that can be committed to git. It's gitignored by default because it represents your local development environment. + +# Built-in environment variables +TEAMSFX_ENV=playground + +# Environment variables used by Microsoft 365 Agents playground +TEAMSAPPTESTER_PORT=56150 +TEAMSFX_NOTIFICATION_STORE_FILENAME=.notification.playgroundstore.json diff --git a/templates/workflow-ts/teamsapp.local.yml b/templates/workflow-ts/m365agents.local.yml similarity index 99% rename from templates/workflow-ts/teamsapp.local.yml rename to templates/workflow-ts/m365agents.local.yml index a5783a850..d68dc38b5 100644 --- a/templates/workflow-ts/teamsapp.local.yml +++ b/templates/workflow-ts/m365agents.local.yml @@ -59,7 +59,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: diff --git a/templates/workflow-ts/m365agents.playground.yml b/templates/workflow-ts/m365agents.playground.yml new file mode 100644 index 000000000..1bbc8eb69 --- /dev/null +++ b/templates/workflow-ts/m365agents.playground.yml @@ -0,0 +1,24 @@ +# yaml-language-server: $schema=https://aka.ms/teams-toolkit/v1.5/yaml.schema.json +# Visit https://aka.ms/teamsfx-v5.0-guide for details on this file +# Visit https://aka.ms/teamsfx-actions for details on actions +version: v1.5 + +deploy: + # Install development tool(s) + - uses: devTool/install + with: + testTool: + version: ~0.2.1 + symlinkDir: ./devTools/teamsapptester + + # Run npm command + - uses: cli/runNpmCommand + with: + args: install --no-audit + + # Generate runtime environment variables + - uses: file/createOrUpdateEnvironmentFile + with: + target: ./.localConfigs.playground + envs: + TEAMSFX_NOTIFICATION_STORE_FILENAME: ${{TEAMSFX_NOTIFICATION_STORE_FILENAME}} \ No newline at end of file diff --git a/templates/workflow-ts/teamsapp.yml b/templates/workflow-ts/m365agents.yml similarity index 97% rename from templates/workflow-ts/teamsapp.yml rename to templates/workflow-ts/m365agents.yml index e14c3ceaa..9462591b7 100644 --- a/templates/workflow-ts/teamsapp.yml +++ b/templates/workflow-ts/m365agents.yml @@ -38,7 +38,7 @@ provision: parameters: ./infra/azure.parameters.json # Required when deploying ARM template deploymentName: Create-resources-for-bot - # Teams Toolkit will download this bicep CLI version from github for you, + # 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. bicepCliVersion: v0.9.1 @@ -60,7 +60,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: @@ -112,7 +112,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: diff --git a/templates/workflow-ts/package.json b/templates/workflow-ts/package.json index a6dc7edc9..5396505f6 100644 --- a/templates/workflow-ts/package.json +++ b/templates/workflow-ts/package.json @@ -1,7 +1,7 @@ { "name": "workflowts", "version": "1.0.0", - "description": "Microsoft Teams Toolkit Workflow Bot Sample", + "description": "Microsoft 365 Agents Toolkit Workflow Bot Sample", "engines": { "node": "18 || 20 || 22" }, @@ -10,8 +10,8 @@ "main": "./src/index.js", "scripts": { "dev:teamsfx": "env-cmd --silent -f .localConfigs npm run dev", - "dev:teamsfx:testtool": "env-cmd --silent -f .localConfigs.testTool npm run dev", - "dev:teamsfx:launch-testtool": "env-cmd --silent -f env/.env.testtool teamsapptester start", + "dev:teamsfx:testtool": "env-cmd --silent -f .localConfigs.playground npm run dev", + "dev:teamsfx:launch-testtool": "env-cmd --silent -f env/.env.playground teamsapptester start", "dev": "nodemon --watch ./src --exec node --inspect=9239 --signal SIGINT -r ts-node/register ./src/index.ts", "build": "tsc --build && shx cp -r ./src/adaptiveCards ./lib/src", "start": "node ./lib/src/index.js", diff --git a/templates/workflow-ts/src/index.ts b/templates/workflow-ts/src/index.ts index e674dec11..f51611437 100644 --- a/templates/workflow-ts/src/index.ts +++ b/templates/workflow-ts/src/index.ts @@ -14,7 +14,7 @@ const server = expressApp.listen(process.env.port || process.env.PORT || 3978, ( // Register an API endpoint with `express`. Teams sends messages to your application // through this endpoint. // -// The Teams Toolkit bot registration configures the bot with `/api/messages` as the +// The Microsoft 365 Agents Toolkit bot registration configures the bot with `/api/messages` as the // Bot Framework endpoint. If you customize this route, update the Bot registration // in `/templates/provision/bot.bicep`. const teamsBot = new TeamsBot(); diff --git a/templates/workflow-ts/teamsapp.testtool.yml b/templates/workflow-ts/teamsapp.testtool.yml deleted file mode 100644 index 44d71fd1b..000000000 --- a/templates/workflow-ts/teamsapp.testtool.yml +++ /dev/null @@ -1,24 +0,0 @@ -# yaml-language-server: $schema=https://aka.ms/teams-toolkit/v1.5/yaml.schema.json -# Visit https://aka.ms/teamsfx-v5.0-guide for details on this file -# Visit https://aka.ms/teamsfx-actions for details on actions -version: v1.5 - -deploy: - # Install development tool(s) - - uses: devTool/install - with: - testTool: - version: ~0.2.1 - symlinkDir: ./devTools/teamsapptester - - # Run npm command - - uses: cli/runNpmCommand - with: - args: install --no-audit - - # Generate runtime environment variables - - uses: file/createOrUpdateEnvironmentFile - with: - target: ./.localConfigs.testTool - envs: - TEAMSFX_NOTIFICATION_STORE_FILENAME: ${{TEAMSFX_NOTIFICATION_STORE_FILENAME}} \ No newline at end of file diff --git a/test-tool-sample-app/.gitignore b/test-tool-sample-app/.gitignore index 64d7aaf80..aa0e12c58 100644 --- a/test-tool-sample-app/.gitignore +++ b/test-tool-sample-app/.gitignore @@ -26,10 +26,10 @@ appsettings.json _storage_emulator # Local data -.localConfigs.testTool +.localConfigs.playground .localConfigs .notification.localstore.json -.notification.testtoolstore.json +.notification.playgroundstore.json # production /build diff --git a/test-tool-sample-app/.localConfigs.testTool b/test-tool-sample-app/.localConfigs.testTool index 1a9d409b8..7dbf997c7 100644 --- a/test-tool-sample-app/.localConfigs.testTool +++ b/test-tool-sample-app/.localConfigs.testTool @@ -1,5 +1,5 @@ BOT_ID= BOT_PASSWORD= BOT_ENDPOINT=http://127.0.0.1:3979/api/messages -TEAMSFX_NOTIFICATION_STORE_FILENAME=.notification.testtoolstore.json +TEAMSFX_NOTIFICATION_STORE_FILENAME=.notification.playgroundstore.json TEAMSAPPTESTER_PORT=56150 \ No newline at end of file diff --git a/test-tool-sample-app/.teamsapptesttool.yml b/test-tool-sample-app/.m365agentsplayground.yml similarity index 100% rename from test-tool-sample-app/.teamsapptesttool.yml rename to test-tool-sample-app/.m365agentsplayground.yml diff --git a/test-tool-sample-app/.vscode/launch.json b/test-tool-sample-app/.vscode/launch.json index a85129712..b024ff4b2 100644 --- a/test-tool-sample-app/.vscode/launch.json +++ b/test-tool-sample-app/.vscode/launch.json @@ -16,11 +16,11 @@ ], "compounds": [ { - "name": "Debug in Test Tool (Preview)", + "name": "Debug in Microsoft 365 Agents playground (Preview)", "configurations": [ "Attach to Local Service" ], - "preLaunchTask": "Start Teams App (Test Tool)", + "preLaunchTask": "Start Teams App (Microsoft 365 Agents playground)", "presentation": { "group": "1-local", "order": 1 diff --git a/test-tool-sample-app/.vscode/tasks.json b/test-tool-sample-app/.vscode/tasks.json index 9df093b1d..ec78b99fa 100644 --- a/test-tool-sample-app/.vscode/tasks.json +++ b/test-tool-sample-app/.vscode/tasks.json @@ -1,23 +1,23 @@ -// 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", "tasks": [ { - "label": "Start Teams App (Test Tool)", + "label": "Start Teams App (Microsoft 365 Agents playground)", "dependsOn": [ - "Validate prerequisites (Test Tool)", - "Deploy (Test Tool)", - "Start application (Test Tool)", - "Start Test Tool", + "Validate prerequisites (Microsoft 365 Agents playground)", + "Deploy (Microsoft 365 Agents playground)", + "Start application (Microsoft 365 Agents playground)", + "Start Microsoft 365 Agents playground", ], "dependsOrder": "sequence" }, { // Check all required prerequisites. // See https://aka.ms/teamsfx-tasks/check-prerequisites to know the details and how to customize the args. - "label": "Validate prerequisites (Test Tool)", + "label": "Validate prerequisites (Microsoft 365 Agents playground)", "type": "teamsfx", "command": "debug-check-prerequisites", "args": { @@ -28,22 +28,22 @@ "portOccupancy": [ 3979, // app service port 9241, // app inspector port for Node.js debugger - 56150, // test tool port + 56150, // Microsoft 365 Agents playground port ] } }, { // Build project. // See https://aka.ms/teamsfx-tasks/deploy to know the details and how to customize the args. - "label": "Deploy (Test Tool)", + "label": "Deploy (Microsoft 365 Agents playground)", "type": "teamsfx", "command": "deploy", "args": { - "env": "testtool", + "env": "playground", } }, { - "label": "Start application (Test Tool)", + "label": "Start application (Microsoft 365 Agents playground)", "type": "shell", "command": "npm run dev:teamsfx:testtool", "isBackground": true, @@ -67,7 +67,7 @@ } }, { - "label": "Start Test Tool", + "label": "Start Microsoft 365 Agents playground", "type": "shell", "command": "npm run dev:teamsfx:launch-testtool", "isBackground": true, diff --git a/test-tool-sample-app/.webappignore b/test-tool-sample-app/.webappignore index 32186b0c8..56555737f 100644 --- a/test-tool-sample-app/.webappignore +++ b/test-tool-sample-app/.webappignore @@ -1,10 +1,10 @@ .webappignore .fx .deployment -.localConfigs.testTool +.localConfigs.playground .localConfigs .notification.localstore.json -.notification.testtoolstore.json +.notification.playgroundstore.json .vscode *.js.map *.ts.map @@ -17,8 +17,8 @@ local.settings.json test tsconfig.json .DS_Store -teamsapp.yml -teamsapp.*.yml +m365agents.yml +m365agents.*.yml /env/ /script/ /node_modules/.bin diff --git a/test-tool-sample-app/README.md b/test-tool-sample-app/README.md index 52d9e32ee..f6600e5d8 100644 --- a/test-tool-sample-app/README.md +++ b/test-tool-sample-app/README.md @@ -1,6 +1,6 @@ -# Teams App Test Tool Sample App +# Microsoft 365 Agents playground Sample App -This sample app comprehensively demonstrates the features supported by the Teams App Test Tool, which is a good starting point to try Teams App Test Tool. +This sample app comprehensively demonstrates the features supported by the Microsoft 365 Agents playground, which is a good starting point to try Microsoft 365 Agents playground. The sample app includes common development scenarios when building Teams bot applications: * Send proactive notifications. @@ -9,7 +9,7 @@ The sample app includes common development scenarios when building Teams bot app ## Prerequisite to use this sample - [Node.js](https://nodejs.org/), supported versions: 16, 18 -- [Teams Toolkit Visual Studio Code Extension](https://aka.ms/teams-toolkit) latest pre-release version. +- [Microsoft 365 Agents Toolkit Visual Studio Code Extension](https://aka.ms/teams-toolkit) latest pre-release version. ## Minimal path to awesome >Here are the instructions to run the sample in **Visual Studio Code**. @@ -17,8 +17,8 @@ The sample app includes common development scenarios when building Teams bot app ### 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 Debug View (`Ctrl+Shift+D`) and select "Debug in Test Tool (Preview)" in dropdown list. -1. Press "F5" to launch the Teams App Test Tool. +1. Open Debug View (`Ctrl+Shift+D`) and select "Debug in Microsoft 365 Agents playground (Preview)" in dropdown list. +1. Press "F5" to launch the Microsoft 365 Agents playground. 1. Type `help` command into input box. Bot will response the list of commands available in this sample. ![test-tool](https://aka.ms/emulator-hero-image) \ No newline at end of file diff --git a/test-tool-sample-app/adaptiveCards/welcome.json b/test-tool-sample-app/adaptiveCards/welcome.json index f59bb0d2a..e59c511f2 100644 --- a/test-tool-sample-app/adaptiveCards/welcome.json +++ b/test-tool-sample-app/adaptiveCards/welcome.json @@ -9,7 +9,7 @@ }, { "type": "TextBlock", - "text": "Congratulations! Your hello world bot is running. Click the documentation below to learn more about Bots and the Teams Toolkit.", + "text": "Congratulations! Your hello world bot is running. Click the documentation below to learn more about Bots and the Microsoft 365 Agents Toolkit.", "wrap": true } ], @@ -21,7 +21,7 @@ }, { "type": "Action.OpenUrl", - "title": "Teams Toolkit Docs", + "title": "Microsoft 365 Agents Toolkit Docs", "url": "https://aka.ms/teamsfx-docs" } ], diff --git a/test-tool-sample-app/env/.env.testtool b/test-tool-sample-app/env/.env.playground similarity index 80% rename from test-tool-sample-app/env/.env.testtool rename to test-tool-sample-app/env/.env.playground index d87840e75..1b1f09473 100644 --- a/test-tool-sample-app/env/.env.testtool +++ b/test-tool-sample-app/env/.env.playground @@ -1,4 +1,4 @@ -TEAMSFX_ENV=testtool +TEAMSFX_ENV=playground APP_NAME_SUFFIX=testtool TEAMSAPPTESTER_PORT=56150 BOT_ENDPOINT=http://127.0.0.1:3979/api/messages \ No newline at end of file diff --git a/test-tool-sample-app/teamsapp.local.yml b/test-tool-sample-app/m365agents.local.yml similarity index 98% rename from test-tool-sample-app/teamsapp.local.yml rename to test-tool-sample-app/m365agents.local.yml index 4ac6a8b31..7d985c16e 100644 --- a/test-tool-sample-app/teamsapp.local.yml +++ b/test-tool-sample-app/m365agents.local.yml @@ -56,7 +56,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: diff --git a/test-tool-sample-app/teamsapp.testtool.yml b/test-tool-sample-app/m365agents.playground.yml similarity index 94% rename from test-tool-sample-app/teamsapp.testtool.yml rename to test-tool-sample-app/m365agents.playground.yml index 358dc82a2..5178c046a 100644 --- a/test-tool-sample-app/teamsapp.testtool.yml +++ b/test-tool-sample-app/m365agents.playground.yml @@ -22,6 +22,6 @@ deploy: # Generate runtime environment variables - uses: file/createOrUpdateEnvironmentFile with: - target: ./.localConfigs.testTool + target: ./.localConfigs.playground envs: TEAMSAPPTESTER_PORT: ${{TEAMSAPPTESTER_PORT}} \ No newline at end of file diff --git a/test-tool-sample-app/teamsapp.yml b/test-tool-sample-app/m365agents.yml similarity index 97% rename from test-tool-sample-app/teamsapp.yml rename to test-tool-sample-app/m365agents.yml index 243a4f452..05399a33b 100644 --- a/test-tool-sample-app/teamsapp.yml +++ b/test-tool-sample-app/m365agents.yml @@ -50,7 +50,7 @@ provision: parameters: ./infra/azure.parameters.json # Required when deploying ARM template deploymentName: Create-resources-for-tab - # Teams Toolkit will download this bicep CLI version from github for you, + # 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. bicepCliVersion: v0.9.1 @@ -72,7 +72,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: @@ -123,7 +123,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: diff --git a/test-tool-sample-app/package.json b/test-tool-sample-app/package.json index af6df6652..3cb4ec7bf 100644 --- a/test-tool-sample-app/package.json +++ b/test-tool-sample-app/package.json @@ -1,14 +1,14 @@ { "name": "test-tool-sample-app", "version": "1.0.0", - "description": "Microsoft Teams App Test Tool Sample App", + "description": "Microsoft Microsoft 365 Agents playground Sample App", "author": "Microsoft", "license": "MIT", "main": "./lib/index.js", "scripts": { "dev:teamsfx": "env-cmd --silent -f .localConfigs npm run dev", - "dev:teamsfx:testtool": "env-cmd --silent -f .localConfigs.testTool npm run dev", - "dev:teamsfx:launch-testtool": "env-cmd --silent -f ./env/.env.testtool teamsapptester start", + "dev:teamsfx:testtool": "env-cmd --silent -f .localConfigs.playground npm run dev", + "dev:teamsfx:launch-testtool": "env-cmd --silent -f ./env/.env.playground teamsapptester start", "dev": "nodemon --watch ./src --exec node --inspect=9241 --signal SIGINT -r ts-node/register ./src/index.ts", "test": "echo \"Error: no test specified\" && exit 1" }, diff --git a/todo-list-SPFx/.vscode/tasks.json b/todo-list-SPFx/.vscode/tasks.json index 059cffc91..7fb56d255 100644 --- a/todo-list-SPFx/.vscode/tasks.json +++ b/todo-list-SPFx/.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", diff --git a/todo-list-SPFx/README.md b/todo-list-SPFx/README.md index 746f0eab4..e5ff9f4cd 100644 --- a/todo-list-SPFx/README.md +++ b/todo-list-SPFx/README.md @@ -33,7 +33,7 @@ extensions: - Name the List 'To Do List' - Click `Add Column`, select `Single line of text`, name the column 'description' - Click `Add Column`, select `Yes/No`, name the column 'isCompleted', and set the default value to `No`. -* [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) * [Optional] If you want your users see only the items created by themselves, add access control to your List. - In List Page, click `setting` button and then choose `list setting`. ![ListSetting1](images/ListSetting1.png) @@ -57,14 +57,14 @@ Debug the app with Teams workbench 3. You should see the app running in your Teams. ![localdebug-preview](images/localdebug-preview.png) ### Deploy the app ->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 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 sample with Microsoft 365 Agents Toolkit CLI](cli.md) 1. Clone the repo to your local workspace or directly download the source code. 1. Open [./src/src/webparts/todoList/components/SharePointListManager.ts](./src/src/webparts/todoList/components/SharePointListManager.ts), navigate to line:17, set the `listname` variable to your SharePoint List name. -1. Open the project in Visual Studio Code, click `Provision` in LIFECYCLE panel of Microsoft Teams Toolkit extension or open the command palette and select `Teams: Provision`. This step will create an app in Teams App Studio. -1. Go back to Microsoft Teams Toolkit extension, click `Deploy` in LIFECYCLE panel or open the command palette and select `Teams: Deploy`. - > This step will build a SharePoint package (*.sppkg) under `sharepoint/solution` folder. The Teams Toolkit will automatically upload and deploy it to your tenant App Catalog site. Only tenant App Catalog site admin has permission to do it. If you are not the admin, you can create your test tenant following [Setup your Microsoft 365 tenant](https://docs.microsoft.com/en-us/sharepoint/dev/spfx/set-up-your-developer-tenant). -1. Go back to Microsoft Teams Toolkit extension, in LIFECYCLE panel, click `Publish` or open the command palette and select `Teams: Publish`. +1. Open the project in Visual Studio Code, click `Provision` in LIFECYCLE panel of Microsoft 365 Agents Toolkit extension or open the command palette and select `Microsoft 365 Agents: Provision`. This step will create an app in Teams App Studio. +1. Go back to Microsoft 365 Agents Toolkit extension, click `Deploy` in LIFECYCLE panel or open the command palette and select `Microsoft 365 Agents: Deploy`. + > This step will build a SharePoint package (*.sppkg) under `sharepoint/solution` folder. The Microsoft 365 Agents Toolkit will automatically upload and deploy it to your tenant App Catalog site. Only tenant App Catalog site admin has permission to do it. If you are not the admin, you can create your test tenant following [Setup your Microsoft 365 tenant](https://docs.microsoft.com/en-us/sharepoint/dev/spfx/set-up-your-developer-tenant). +1. Go back to Microsoft 365 Agents Toolkit extension, in LIFECYCLE panel, click `Publish` or open the command palette and select `Microsoft 365 Agents: Publish`. 1. Check the published app in [Microsoft Teams admin center](https://admin.teams.microsoft.com/policies/manage-apps) by searching "todoList" in the search box. ![TeamsAppAdminCenter](images/TeamsAppAdminCenter.png) 1. Click the 'TodoList' app you just published and select `Publish` in the Publishing status. diff --git a/todo-list-SPFx/assets/sample.json b/todo-list-SPFx/assets/sample.json index 9e53f5d22..96fcc10dc 100644 --- a/todo-list-SPFx/assets/sample.json +++ b/todo-list-SPFx/assets/sample.json @@ -12,7 +12,7 @@ "updateDateTime": "2023-10-13", "products": [ "Teams", - "TeamsToolkit" + "Microsoft 365 Agents Toolkit" ], "metadata": [ { diff --git a/todo-list-SPFx/cli.md b/todo-list-SPFx/cli.md index 4630fa062..15b8daa2b 100644 --- a/todo-list-SPFx/cli.md +++ b/todo-list-SPFx/cli.md @@ -1,25 +1,25 @@ -## Try sample with Teams Toolkit CLI +## Try sample with Microsoft 365 Agents Toolkit CLI 1. Install [Node.js](https://nodejs.org/en/download/) (Recommend LTS 18.x) -2. To install the Teams Toolkit CLI, use the npm package manager: +2. To install the Microsoft 365 Agents Toolkit CLI, use the npm package manager: ``` - npm install -g @microsoft/teamsapp-cli + npm install -g @microsoft/m365agentstoolkit-cli ``` 3. Create todo-list-SPFx project. ``` - teamsapp new sample todo-list-SPFx --interactive false + atk new sample todo-list-SPFx --interactive false ``` 4. Provision the project to create an app in Teams App Studio. ``` - teamsapp provision + atk provision ``` 5. Deploy your project. > This step will generate a SharePoint package (*.sppkg) under `sharepoint/solution` folder. The cli will automatically upload and deploy it to your tenant App Catalog site. Only tenant App Catalog site admin has permission to do it. If you are not the admin, you can create your test tenant following [Setup your Microsoft 365 tenant](https://docs.microsoft.com/en-us/sharepoint/dev/spfx/set-up-your-developer-tenant). ``` - teamsapp deploy + atk deploy ``` 6. Publish your app to Teams App Studio. ``` - teamsapp publish + atk publish ``` 7. Check the published app in [Microsoft Teams admin center](https://admin.teams.microsoft.com/policies/manage-apps) by searching "todoList" in the search box. ![TeamsAppAdminCenter](images/TeamsAppAdminCenter.png) diff --git a/todo-list-SPFx/env/.env.dev b/todo-list-SPFx/env/.env.dev index 263ec6183..97e80e6ce 100644 --- a/todo-list-SPFx/env/.env.dev +++ b/todo-list-SPFx/env/.env.dev @@ -2,5 +2,5 @@ TEAMSFX_ENV=dev APP_NAME_SUFFIX=dev -# Generated during provision, you can also add your own variables. If you're adding a secret value, add SECRET_ prefix to the name so Teams Toolkit can handle them properly +# Generated during provision, you can also add your own variables. If you're adding a secret value, add SECRET_ prefix to the name so Microsoft 365 Agents Toolkit can handle them properly TEAMS_APP_ID= diff --git a/todo-list-SPFx/teamsapp.local.yml b/todo-list-SPFx/m365agents.local.yml similarity index 98% rename from todo-list-SPFx/teamsapp.local.yml rename to todo-list-SPFx/m365agents.local.yml index 691efa2dc..1549494cf 100644 --- a/todo-list-SPFx/teamsapp.local.yml +++ b/todo-list-SPFx/m365agents.local.yml @@ -37,7 +37,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: diff --git a/todo-list-SPFx/teamsapp.yml b/todo-list-SPFx/m365agents.yml similarity index 98% rename from todo-list-SPFx/teamsapp.yml rename to todo-list-SPFx/m365agents.yml index 83fc6b017..bc2f2b034 100644 --- a/todo-list-SPFx/teamsapp.yml +++ b/todo-list-SPFx/m365agents.yml @@ -54,7 +54,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: @@ -83,7 +83,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: diff --git a/todo-list-with-Azure-backend-M365/.vscode/tasks.json b/todo-list-with-Azure-backend-M365/.vscode/tasks.json index 3c5ca82da..9ceb0b17c 100644 --- a/todo-list-with-Azure-backend-M365/.vscode/tasks.json +++ b/todo-list-with-Azure-backend-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", diff --git a/todo-list-with-Azure-backend-M365/README.md b/todo-list-with-Azure-backend-M365/README.md index 31f99594f..aa001f814 100644 --- a/todo-list-with-Azure-backend-M365/README.md +++ b/todo-list-with-Azure-backend-M365/README.md @@ -19,29 +19,29 @@ Todo List app helps to manage your personal to do items. This app can be install > Note: This sample will only provision [single tenant](https://learn.microsoft.com/azure/active-directory/develop/single-and-multi-tenant-apps#who-can-sign-in-to-your-app) Azure Active Directory app. For multi-tenant support, please refer to this [wiki](https://aka.ms/teamsfx-multi-tenant). ## This sample illustrates -- How to use Teams Toolkit to build frontend hosting on Azure for your tab app. -- How to use Teams Toolkit to build backend hosting on Azure for your tab app. +- How to use Microsoft 365 Agents Toolkit to build frontend hosting on Azure for your tab app. +- How to use Microsoft 365 Agents Toolkit to build backend hosting on Azure for your tab app. - How to use MS graph client in TeamsFx to get access to Microsoft 365 data. -- How to use Teams Toolkit to build a personal tab app with Azure Function backend that runs across Microsoft 365 including Teams, Outlook and the Microsoft 365 app. +- How to use Microsoft 365 Agents Toolkit to build a personal tab app with Azure Function backend that runs across Microsoft 365 including Teams, Outlook and the Microsoft 365 app. ## 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. Download [Visual Studio Code](https://code.visualstudio.com) and install [Teams Toolkit Visual Studio Code Extension](https://aka.ms/teams-toolkit). +1. Download [Visual Studio Code](https://code.visualstudio.com) and install [Microsoft 365 Agents Toolkit Visual Studio Code Extension](https://aka.ms/teams-toolkit). 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`, `Debug in Outlook` or `Debug in the Microsoft 365 app`. ### 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`, `Launch Remote in Outlook` or `Launch Remote in the Microsoft 365 app`. diff --git a/todo-list-with-Azure-backend-M365/assets/sample.json b/todo-list-with-Azure-backend-M365/assets/sample.json index 42a389fff..9bf3caa14 100644 --- a/todo-list-with-Azure-backend-M365/assets/sample.json +++ b/todo-list-with-Azure-backend-M365/assets/sample.json @@ -12,7 +12,7 @@ "updateDateTime": "2023-10-24", "products": [ "Teams", - "TeamsToolkit" + "Microsoft 365 Agents Toolkit" ], "metadata": [ { diff --git a/todo-list-with-Azure-backend-M365/cli.md b/todo-list-with-Azure-backend-M365/cli.md index 9b3ee5bdc..3a51e0332 100644 --- a/todo-list-with-Azure-backend-M365/cli.md +++ b/todo-list-with-Azure-backend-M365/cli.md @@ -1,18 +1,18 @@ ## 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 todo-list-with-azure-backend-m365 project. ``` - teamsapp new sample todo-list-with-azure-backend-m365 --interactive false + atk new sample todo-list-with-azure-backend-m365 --interactive false ``` 1. Provision. ``` - teamsapp provision --env + atk provision --env ``` 1. Deploy. ``` - teamsapp deploy --env + atk deploy --env ``` -1. Execute `teamsapp preview --env --m365-host ` in your project directory to launch your application, where `m365-host` is `teams`, `outlook` or `office`. +1. Execute `atk preview --env --m365-host ` in your project directory to launch your application, where `m365-host` is `teams`, `outlook` or `office`. diff --git a/todo-list-with-Azure-backend-M365/teamsapp.local.yml b/todo-list-with-Azure-backend-M365/m365agents.local.yml similarity index 99% rename from todo-list-with-Azure-backend-M365/teamsapp.local.yml rename to todo-list-with-Azure-backend-M365/m365agents.local.yml index 52901e39a..792f9707e 100644 --- a/todo-list-with-Azure-backend-M365/teamsapp.local.yml +++ b/todo-list-with-Azure-backend-M365/m365agents.local.yml @@ -61,7 +61,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: diff --git a/todo-list-with-Azure-backend-M365/teamsapp.yml b/todo-list-with-Azure-backend-M365/m365agents.yml similarity index 97% rename from todo-list-with-Azure-backend-M365/teamsapp.yml rename to todo-list-with-Azure-backend-M365/m365agents.yml index b877ca3e4..cedc6c020 100644 --- a/todo-list-with-Azure-backend-M365/teamsapp.yml +++ b/todo-list-with-Azure-backend-M365/m365agents.yml @@ -40,7 +40,7 @@ provision: - path: ./infra/main.bicep # Relative path to this file parameters: ./infra/azure.parameters.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.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. # Get the deployment token from Azure Static Web Apps - uses: azureStaticWebApps/getDeploymentToken @@ -75,7 +75,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: diff --git a/todo-list-with-Azure-backend-M365/tabs/src/components/Tab.js b/todo-list-with-Azure-backend-M365/tabs/src/components/Tab.js index 409d187ba..4879cb1cb 100644 --- a/todo-list-with-Azure-backend-M365/tabs/src/components/Tab.js +++ b/todo-list-with-Azure-backend-M365/tabs/src/components/Tab.js @@ -93,7 +93,7 @@ class Tab extends React.Component { const helpLink = "https://aka.ms/teamsfx-auth-code-flow"; err.message += '\nIf you see "AADSTS50011: The reply URL specified in the request does not match the reply URLs configured for the application" ' + - "in the popup window, you may be using unmatched version for TeamsFx SDK (version >= 0.5.0) and Teams Toolkit (version < 3.3.0) or " + + "in the popup window, you may be using unmatched version for TeamsFx SDK (version >= 0.5.0) and Microsoft 365 Agents Toolkit (version < 3.3.0) or " + `cli (version < 0.11.0). Please refer to the help link for how to fix the issue: ${helpLink}`; } diff --git a/todo-list-with-Azure-backend/.vscode/tasks.json b/todo-list-with-Azure-backend/.vscode/tasks.json index cb34c7a9a..418babb37 100644 --- a/todo-list-with-Azure-backend/.vscode/tasks.json +++ b/todo-list-with-Azure-backend/.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", diff --git a/todo-list-with-Azure-backend/README.md b/todo-list-with-Azure-backend/README.md index 236a1eed2..980912f44 100644 --- a/todo-list-with-Azure-backend/README.md +++ b/todo-list-with-Azure-backend/README.md @@ -30,7 +30,7 @@ Todo List provides an easy way to manage to-do items in Teams Client. This app h ## Prerequisite to use this sample - [Node.js](https://nodejs.org/), supported versions: 18, 20, 22 - A Microsoft 365 account. If you do not have Microsoft 365 account, apply one from [Microsoft 365 developer program](https://developer.microsoft.com/en-us/microsoft-365/dev-program) -- [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) - An [Azure subscription](https://azure.microsoft.com/en-us/free/) ## Minimal path to awesome @@ -62,14 +62,14 @@ To debug the project, you will need to configure an Azure SQL Database to be use ### Deploy the app to Azure ->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) 1. Clone the repo to your local workspace or directly download the source code. -1. Download [Visual Studio Code](https://code.visualstudio.com) and install [Teams Toolkit Visual Studio Code Extension](https://aka.ms/teams-toolkit). +1. Download [Visual Studio Code](https://code.visualstudio.com) and install [Microsoft 365 Agents Toolkit Visual Studio Code Extension](https://aka.ms/teams-toolkit). 1. Open the project in Visual Studio Code. 1. Open **env/.env.dev.user** file, set value for `SQL_USER_NAME` and `SQL_PASSWORD` -1. Open the command palette and select `Teams: Provision`. You will be asked to input admin name and password of SQL. The toolkit will help you to provision Azure SQL. -1. Once provision is completed, open the command palette and select `Teams: Deploy`. +1. Open the command palette and select `Microsoft 365 Agents: Provision`. You will be asked to input admin name and password of SQL. The toolkit will help you to provision Azure SQL. +1. Once provision is completed, open the command palette and select `Microsoft 365 Agents: Deploy`. 1. Open **env/.env.dev** file, you could get the database name in `PROVISIONOUTPUT__AZURESQLOUTPUT__DATABASENAME` output. [Set IP address of your computer into server-level IP firewall rule from the database overview page](https://docs.microsoft.com/en-us/azure/azure-sql/database/firewall-configure#from-the-database-overview-page). 1. In Azure portal, find the database by `databaseName` and use [query editor](https://docs.microsoft.com/en-us/azure/azure-sql/database/connect-query-portal) with below query to create a table: ```sql diff --git a/todo-list-with-Azure-backend/assets/sample.json b/todo-list-with-Azure-backend/assets/sample.json index b6d88ddb0..803d44ad3 100644 --- a/todo-list-with-Azure-backend/assets/sample.json +++ b/todo-list-with-Azure-backend/assets/sample.json @@ -12,7 +12,7 @@ "updateDateTime": "2023-10-24", "products": [ "Teams", - "TeamsToolkit" + "Microsoft 365 Agents Toolkit" ], "metadata": [ { diff --git a/todo-list-with-Azure-backend/cli.md b/todo-list-with-Azure-backend/cli.md index a4092c12c..8a14b3d32 100644 --- a/todo-list-with-Azure-backend/cli.md +++ b/todo-list-with-Azure-backend/cli.md @@ -1,20 +1,20 @@ -## Try the Sample with Teams Toolkit CLI +## Try the Sample with Microsoft 365 Agents Toolkit CLI 1. Install [Node.js](https://nodejs.org/en/download/) (use the latest v14 LTS release) -1. To install the Teams Toolkit CLI, use the npm package manager: +1. To install the Microsoft 365 Agents Toolkit CLI, use the npm package manager: ``` - npm install -g @microsoft/teamsapp-cli + npm install -g @microsoft/m365agentstoolkit-cli ``` 1. Create todo-list project. ``` - teamsapp new sample todo-list-with-Azure-backend --interactive false + atk new sample todo-list-with-Azure-backend --interactive false ``` 1. Provision the project to azure. You will be asked to input admin name and password of SQL. ``` - teamsapp provision + atk provision ``` 1. Deploy. ``` - teamsapp deploy + atk deploy ``` 1. Open **env/.env.dev** file, you could get the database name in `PROVISIONOUTPUT__AZURESQLOUTPUT__DATABASENAME` output. In Azure portal, find the database and use [query editor](https://docs.microsoft.com/en-us/azure/azure-sql/database/connect-query-portal) with below query to create tables: ```sql diff --git a/todo-list-with-Azure-backend/teamsapp.local.yml b/todo-list-with-Azure-backend/m365agents.local.yml similarity index 99% rename from todo-list-with-Azure-backend/teamsapp.local.yml rename to todo-list-with-Azure-backend/m365agents.local.yml index dba40a8b3..7cc1dd805 100644 --- a/todo-list-with-Azure-backend/teamsapp.local.yml +++ b/todo-list-with-Azure-backend/m365agents.local.yml @@ -60,7 +60,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: diff --git a/todo-list-with-Azure-backend/teamsapp.yml b/todo-list-with-Azure-backend/m365agents.yml similarity index 97% rename from todo-list-with-Azure-backend/teamsapp.yml rename to todo-list-with-Azure-backend/m365agents.yml index f85711b06..dd98f498d 100644 --- a/todo-list-with-Azure-backend/teamsapp.yml +++ b/todo-list-with-Azure-backend/m365agents.yml @@ -39,7 +39,7 @@ provision: - path: ./infra/main.bicep # Relative path to this file parameters: ./infra/azure.parameters.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.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. # Get the deployment token from Azure Static Web Apps - uses: azureStaticWebApps/getDeploymentToken @@ -74,7 +74,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: diff --git a/todo-list-with-Azure-backend/tabs/src/components/Tab.js b/todo-list-with-Azure-backend/tabs/src/components/Tab.js index 3612106a1..d48149331 100644 --- a/todo-list-with-Azure-backend/tabs/src/components/Tab.js +++ b/todo-list-with-Azure-backend/tabs/src/components/Tab.js @@ -88,7 +88,7 @@ class Tab extends React.Component { const helpLink = "https://aka.ms/teamsfx-auth-code-flow"; err.message += '\nIf you see "AADSTS50011: The reply URL specified in the request does not match the reply URLs configured for the application" ' + - "in the popup window, you may be using unmatched version for TeamsFx SDK (version >= 0.5.0) and Teams Toolkit (version < 3.3.0) or " + + "in the popup window, you may be using unmatched version for TeamsFx SDK (version >= 0.5.0) and Microsoft 365 Agents Toolkit (version < 3.3.0) or " + `cli (version < 0.11.0). Please refer to the help link for how to fix the issue: ${helpLink}`; } diff --git a/validation-tool/README.md b/validation-tool/README.md index ae8bf8b16..212e40b65 100644 --- a/validation-tool/README.md +++ b/validation-tool/README.md @@ -1,8 +1,8 @@ # TeamsFx Sample Validation Tool -TeamsFx sample validator is a command line tool that can help to validate whether a sample is compatible with Teams Toolkit. It checks the project content like folder structure, Teams manifest, demo gif file, etc. +TeamsFx sample validator is a command line tool that can help to validate whether a sample is compatible with Microsoft 365 Agents Toolkit. It checks the project content like folder structure, Teams manifest, demo gif file, etc. -If you want to contribute to the sample gallery of Teams Toolkit, this tool can help you do a quick validation in local environment. Passing all of the validation is a mandatory requirement for sample onboarding process. +If you want to contribute to the sample gallery of Microsoft 365 Agents Toolkit, this tool can help you do a quick validation in local environment. Passing all of the validation is a mandatory requirement for sample onboarding process. ## How to Use @@ -23,11 +23,11 @@ Following files are required: * env/ * .env.dev * .env.local - * teamsapp.yml - * teamsapp.local.yml + * m365agents.yml + * m365agents.local.yml * README.md ### Teams App YAML -The content of teamsapp.yml should follow these rules: +The content of m365agents.yml should follow these rules: * There is no `projectId` defined. * "teamsApp/create", "teamsApp/zipAppPackage", "teamsApp/update" actions are defined in `provision` lifecycle. * `deploy` lifecycle is defined @@ -37,7 +37,7 @@ The content of teamsapp.yml should follow these rules: ### Teams App Manifest The content of appPackage/manifest.json should follow these rules: * `id` is referencing placeholder from env, which is `${{TEAMS_APP_ID}}` -* Manifest version should be latest to align with Teams Toolkit +* Manifest version should be latest to align with Microsoft 365 Agents Toolkit ### Demo GIF The default path is 'assets/sampleDemo.gif', if the sample is not using this path, validator will show a warning message. The size of sample gif file should be 1600x920/800x460 or other size that has same ratio. diff --git a/validation-tool/src/validators/folderStructureValidator.ts b/validation-tool/src/validators/folderStructureValidator.ts index bb28f28df..aa5911182 100644 --- a/validation-tool/src/validators/folderStructureValidator.ts +++ b/validation-tool/src/validators/folderStructureValidator.ts @@ -13,8 +13,8 @@ const requiredFiles = [ "appPackage/outline.png", "env/.env.dev", // "env/.env.local", - "teamsapp.yml", - "teamsapp.local.yml", + "m365agents.yml", + "m365agents.local.yml", "README.md", ]; diff --git a/validation-tool/src/validators/teamsAppManifestValidator.ts b/validation-tool/src/validators/teamsAppManifestValidator.ts index cfa3a53eb..e7d93f58c 100644 --- a/validation-tool/src/validators/teamsAppManifestValidator.ts +++ b/validation-tool/src/validators/teamsAppManifestValidator.ts @@ -44,11 +44,11 @@ export default async function validateTeamsAppManifest(projectDir: string): Prom result.passed.push(`id is referencing placeholder from env: \${{TEAMS_APP_ID}}.`); } if (jsonData.manifestVersion === MANIFEST_VERSION) { - result.passed.push(`Manifest version is aligned with Teams Toolkit.`); + result.passed.push(`Manifest version is aligned with Microsoft 365 Agents Toolkit.`); } else if (jsonData.manifestVersion === MANIFEST_PREVIEW_VERSION) { result.warning.push(`Manifest version(${MANIFEST_PREVIEW_VERSION}) is using preview version.`); } else { - result.failed.push(`Manifest version(${jsonData.manifestVersion}) is NOT aligned with Teams Toolkit(${MANIFEST_VERSION}).`); + result.failed.push(`Manifest version(${jsonData.manifestVersion}) is NOT aligned with Microsoft 365 Agents Toolkit(${MANIFEST_VERSION}).`); } return result; } diff --git a/validation-tool/src/validators/teamsAppYamlValidator.ts b/validation-tool/src/validators/teamsAppYamlValidator.ts index 91c805622..87cf852f9 100644 --- a/validation-tool/src/validators/teamsAppYamlValidator.ts +++ b/validation-tool/src/validators/teamsAppYamlValidator.ts @@ -47,9 +47,9 @@ export default async function validateTeamsAppYaml(projectDir: string): Promise< warning: [], }; - const yamlFile = path.join(projectDir, "teamsapp.yml"); + const yamlFile = path.join(projectDir, "m365agents.yml"); if (!await fs.exists(yamlFile)) { - result.failed = [`teamsapp.yml does not exist.`]; + result.failed = [`m365agents.yml does not exist.`]; return result; } const fileContent = await fs.readFile(yamlFile, 'utf8'); @@ -58,9 +58,9 @@ export default async function validateTeamsAppYaml(projectDir: string): Promise< // Rule 1: projectId check const projectId = yamlData && yamlData.projectId; if (projectId && projectId !== "") { - result.failed.push(`Project should NOT have projectId in teamsapp.yml.`); + result.failed.push(`Project should NOT have projectId in m365agents.yml.`); } else { - result.passed.push(`Project has no projectId in teamsapp.yml.`); + result.passed.push(`Project has no projectId in m365agents.yml.`); } // Rule 2: lifecycle check @@ -68,7 +68,7 @@ export default async function validateTeamsAppYaml(projectDir: string): Promise< const actions = yamlData[lifecycle.name] as any[]; const failures: string[] = []; if (!actions) { - result.failed.push(`Project should have '${lifecycle.name}' stage in teamsapp.yml.`); + result.failed.push(`Project should have '${lifecycle.name}' stage in m365agents.yml.`); continue; } for (const actionName of lifecycle.actions) { diff --git a/validation-tool/test/data/teamsapp-external-sample.yml b/validation-tool/test/data/m365agents-external-sample.yml similarity index 96% rename from validation-tool/test/data/teamsapp-external-sample.yml rename to validation-tool/test/data/m365agents-external-sample.yml index 6a5d56708..ffc4a6a2f 100644 --- a/validation-tool/test/data/teamsapp-external-sample.yml +++ b/validation-tool/test/data/m365agents-external-sample.yml @@ -48,7 +48,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. - 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: @@ -73,7 +73,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: @@ -117,7 +117,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: diff --git a/validation-tool/test/data/teamsapp-invalid-actions.yml b/validation-tool/test/data/m365agents-invalid-actions.yml similarity index 96% rename from validation-tool/test/data/teamsapp-invalid-actions.yml rename to validation-tool/test/data/m365agents-invalid-actions.yml index 67fa88d3f..da4e3cc6e 100644 --- a/validation-tool/test/data/teamsapp-invalid-actions.yml +++ b/validation-tool/test/data/m365agents-invalid-actions.yml @@ -48,7 +48,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. - 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: @@ -91,7 +91,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: diff --git a/validation-tool/test/data/teamsapp-valid.yml b/validation-tool/test/data/m365agents-valid.yml similarity index 96% rename from validation-tool/test/data/teamsapp-valid.yml rename to validation-tool/test/data/m365agents-valid.yml index 4af8a96af..bce75656b 100644 --- a/validation-tool/test/data/teamsapp-valid.yml +++ b/validation-tool/test/data/m365agents-valid.yml @@ -48,7 +48,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. - 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: @@ -73,7 +73,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: @@ -117,7 +117,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: diff --git a/validation-tool/test/data/teamsapp-with-projectId.yml b/validation-tool/test/data/m365agents-with-projectId.yml similarity index 96% rename from validation-tool/test/data/teamsapp-with-projectId.yml rename to validation-tool/test/data/m365agents-with-projectId.yml index 81413e43b..9793b4998 100644 --- a/validation-tool/test/data/teamsapp-with-projectId.yml +++ b/validation-tool/test/data/m365agents-with-projectId.yml @@ -48,7 +48,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. - 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: @@ -73,7 +73,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: @@ -117,7 +117,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: diff --git a/validation-tool/test/data/teamsapp-without-sampleTag.yml b/validation-tool/test/data/m365agents-without-sampleTag.yml similarity index 96% rename from validation-tool/test/data/teamsapp-without-sampleTag.yml rename to validation-tool/test/data/m365agents-without-sampleTag.yml index 3b0aa5b8e..b3d839ed2 100644 --- a/validation-tool/test/data/teamsapp-without-sampleTag.yml +++ b/validation-tool/test/data/m365agents-without-sampleTag.yml @@ -45,7 +45,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. - 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: @@ -70,7 +70,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: @@ -114,7 +114,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: diff --git a/validation-tool/test/validators/folderStructureValidator.test.ts b/validation-tool/test/validators/folderStructureValidator.test.ts index d0aa57727..1d0548559 100644 --- a/validation-tool/test/validators/folderStructureValidator.test.ts +++ b/validation-tool/test/validators/folderStructureValidator.test.ts @@ -25,8 +25,8 @@ describe('validateFolderStructure()', () => { "outline.png": "test outline.png file", }, "README.md": "test readme file", - "teamsapp.yml": "test teamsapp.yml file", - "teamsapp.local.yml": "test teamsapp.local.yml file", + "m365agents.yml": "test m365agents.yml file", + "m365agents.local.yml": "test m365agents.local.yml file", }, }); @@ -46,8 +46,8 @@ describe('validateFolderStructure()', () => { }, "env": "it should be a folder", "README.md": "test readme file", - "teamsapp.yml": "test teamsapp.yml file", - "teamsapp.local.yml": "test teamsapp.local.yml file", + "m365agents.yml": "test m365agents.yml file", + "m365agents.local.yml": "test m365agents.local.yml file", }, }); diff --git a/validation-tool/test/validators/teamsAppManifestValidator.test.ts b/validation-tool/test/validators/teamsAppManifestValidator.test.ts index ecb4363f6..00f7439bc 100644 --- a/validation-tool/test/validators/teamsAppManifestValidator.test.ts +++ b/validation-tool/test/validators/teamsAppManifestValidator.test.ts @@ -85,6 +85,6 @@ describe('validateTeamsAppManifest()', () => { expect(result.name).toEqual("Teams App Manifest"); expect(result.failed.length).toBe(1); expect(result.passed.length).toBe(1); - expect(result.failed[0]).toEqual("Manifest version(1.12) is NOT aligned with Teams Toolkit(1.17)."); + expect(result.failed[0]).toEqual("Manifest version(1.12) is NOT aligned with Microsoft 365 Agents Toolkit(1.17)."); }); }); diff --git a/validation-tool/test/validators/teamsAppYamlValidator.test.ts b/validation-tool/test/validators/teamsAppYamlValidator.test.ts index 0e8e7c75a..e43b0e904 100644 --- a/validation-tool/test/validators/teamsAppYamlValidator.test.ts +++ b/validation-tool/test/validators/teamsAppYamlValidator.test.ts @@ -12,11 +12,11 @@ describe('validateTeamsAppYaml()', () => { mock.restore(); }); - test('teamsapp.yml is valid', async () => { - const validYamlContent = await fs.readFile(path.join(__dirname, "../data/teamsapp-valid.yml"), "utf8"); + test('m365agents.yml is valid', async () => { + const validYamlContent = await fs.readFile(path.join(__dirname, "../data/m365agents-valid.yml"), "utf8"); mock({ "testFolder": { - "teamsapp.yml": validYamlContent, + "m365agents.yml": validYamlContent, }, }); @@ -26,7 +26,7 @@ describe('validateTeamsAppYaml()', () => { expect(result.passed.length).toBe(6); }); - test('teamsapp.yml does not exist', async () => { + test('m365agents.yml does not exist', async () => { mock({ "testFolder": {}, }); @@ -36,11 +36,11 @@ describe('validateTeamsAppYaml()', () => { expect(result.passed.length).toBe(0); }); - test('teamsapp.yml has projectId', async () => { - const validYamlContent = await fs.readFile(path.join(__dirname, "../data/teamsapp-with-projectId.yml"), "utf8"); + test('m365agents.yml has projectId', async () => { + const validYamlContent = await fs.readFile(path.join(__dirname, "../data/m365agents-with-projectId.yml"), "utf8"); mock({ "testFolder": { - "teamsapp.yml": validYamlContent, + "m365agents.yml": validYamlContent, }, }); @@ -48,14 +48,14 @@ describe('validateTeamsAppYaml()', () => { expect(result.name).toEqual("teamsapp.yaml"); expect(result.failed.length).toBe(1); expect(result.passed.length).toBe(5); - expect(result.failed[0]).toEqual("Project should NOT have projectId in teamsapp.yml."); + expect(result.failed[0]).toEqual("Project should NOT have projectId in m365agents.yml."); }); - test('teamsapp.yml has no sample tag', async () => { - const validYamlContent = await fs.readFile(path.join(__dirname, "../data/teamsapp-without-sampleTag.yml"), "utf8"); + test('m365agents.yml has no sample tag', async () => { + const validYamlContent = await fs.readFile(path.join(__dirname, "../data/m365agents-without-sampleTag.yml"), "utf8"); mock({ "testFolder": { - "teamsapp.yml": validYamlContent, + "m365agents.yml": validYamlContent, }, }); @@ -66,11 +66,11 @@ describe('validateTeamsAppYaml()', () => { expect(result.failed[0]).toEqual("Project should have sampleTag with format 'repo:name'."); }); - test('teamsapp.yml is external sample tag', async () => { - const validYamlContent = await fs.readFile(path.join(__dirname, "../data/teamsapp-external-sample.yml"), "utf8"); + test('m365agents.yml is external sample tag', async () => { + const validYamlContent = await fs.readFile(path.join(__dirname, "../data/m365agents-external-sample.yml"), "utf8"); mock({ "testFolder": { - "teamsapp.yml": validYamlContent, + "m365agents.yml": validYamlContent, }, }); @@ -82,11 +82,11 @@ describe('validateTeamsAppYaml()', () => { expect(result.warning[0]).toEqual("Project is an external sample."); }); - test('teamsapp.yml has invalid actions', async () => { - const validYamlContent = await fs.readFile(path.join(__dirname, "../data/teamsapp-invalid-actions.yml"), "utf8"); + test('m365agents.yml has invalid actions', async () => { + const validYamlContent = await fs.readFile(path.join(__dirname, "../data/m365agents-invalid-actions.yml"), "utf8"); mock({ "testFolder": { - "teamsapp.yml": validYamlContent, + "m365agents.yml": validYamlContent, }, }); @@ -96,6 +96,6 @@ describe('validateTeamsAppYaml()', () => { expect(result.passed.length).toBe(3); expect(result.failed[0]).toEqual("Project should have 'teamsApp/create' action which has TEAMS_APP_ID env variable."); expect(result.failed[1]).toEqual("Project should have 'teamsApp/update' action in provision stage."); - expect(result.failed[2]).toEqual("Project should have 'deploy' stage in teamsapp.yml."); + expect(result.failed[2]).toEqual("Project should have 'deploy' stage in m365agents.yml."); }); }); diff --git a/validation-tool/validator.cjs b/validation-tool/validator.cjs index 3762aeca2..d06a46581 100644 --- a/validation-tool/validator.cjs +++ b/validation-tool/validator.cjs @@ -2417,4 +2417,4 @@ Font modified May 20, 2012 by patorjk to add the 0xCA0 character `;var Dn=se(dl()),K_=Dn.default.green,Y_=Dn.default.yellow,J_=Dn.default.bold.red;function _l(n){let e=K_(`${n.passed.length} validation passed`),t=J_(`${n.failed.length} validation failed`),i=n.warning.length>0?Y_(`${n.warning.length} warning(s)`):void 0;n.failed.length===0?console.log(`\u2705[${n.name}] ${e}${i?`, ${i}`:""}.`):(console.log(`\u274C[${n.name}] ${t}${i?`, ${i}`:""}, ${e}.`),console.log(n.failed.map(r=>` \u274C ${r}`).join(` `))),n.warning.length>0&&console.log(n.warning.map(r=>` \u26A0\uFE0F ${r}`).join(` `)),n.passed.length>0&&console.log(n.passed.map(r=>` \u2705 ${r}`).join(` -`))}var gu=se(Tl()),ss=se(st()),os=se(require("path"));async function as(n){let e={name:"Env Files",passed:[],failed:[],warning:[]},t=[".env.dev",".env.local"];for(let i of t){let r=os.default.join(n,"env",i);if(!await ss.default.exists(r)){e.warning=[`${os.default.join("env",i)} does not exist.`];continue}let s=await ss.default.readFile(r,"utf8"),o=gu.default.parse(s),a=Object.entries(o).map(([c,u])=>({name:c,value:u})),l=!0;for(let c of a)c.name==="TEAMSFX_ENV"||c.name==="APP_NAME_SUFFIX"||c.name==="TEAMS_APP_NAME"||c.value!==""&&(e.failed.push(`${i}: ${c.name} should NOT have value.`),l=!1);l&&e.passed.push(`${i}: All environment variables are valid.`)}return e}var Vt=se(st()),Gt=se(require("path")),yg=[".vscode","appPackage","env"],Tg=["appPackage/manifest.json","appPackage/color.png","appPackage/outline.png","env/.env.dev","teamsapp.yml","teamsapp.local.yml","README.md"];async function ls(n){let e={name:"Folder Structure",passed:[],failed:[],warning:[]};for(let t of yg)!await Vt.default.exists(Gt.default.join(n,t))||!await Vt.default.stat(Gt.default.join(n,t)).then(i=>i.isDirectory())?e.failed.push(`Project should have "${t}" folder.`):e.passed.push(`Project has "${t}" folder.`);for(let t of Tg)!await Vt.default.exists(Gt.default.join(n,t))||!await Vt.default.stat(Gt.default.join(n,t)).then(i=>i.isFile())?e.failed.push(`Project should have "${t}" file.`):e.passed.push(`Project has "${t}" file.`);return e}var tf=se(st()),As=se(require("path")),nf=se(ef());async function ws(n){let e={name:"Image Files",passed:[],failed:[],warning:[]},t=["thumbnail.png","sampleDemo.gif"];for(let i of t){let r=As.default.join(n,"assets",i),s=As.default.join("assets",i);if(!await tf.default.exists(r)){e.warning.push(`${s} does not exist.`);continue}let o=(0,nf.default)(r);o.width&&o.height&&o.width/o.height===40/23?e.passed.push(`${s} has 1600*920/800*460 resolution or same ratio.`):e.failed.push(`${s} should have 1600*920/800*460 resolution or same ratio.`)}return e}var Is=se(sf()),vs=se(st()),of=se(require("path"));async function bs(n){let e={name:"package.json",passed:[],failed:[],warning:[]},t=of.default.join(n,"package.json");if(!await vs.default.exists(t))return e.failed=["package.json does not exist."],e;let i=await vs.default.readFile(t,"utf8");try{let r=JSON.parse(i);if(!r.engines||!r.engines.node)return e.warning=["package.json does not have 'engines.node' field."],e;if(!(0,Is.satisfies)("16.0.0",r.engines.node)&&!(0,Is.satisfies)("18.0.0",r.engines.node))return e.failed=["'engines.node' field should be compatible with 16 or 18."],e}catch{return e.failed=["package.json is not a valid JSON file."],e}return e.passed=["'engines.node' field is compatible with 16 or 18."],e}var Ns=se(st()),cf=se(require("path")),af="1.17",lf="devPreview";async function Os(n){let e={name:"Teams App Manifest",passed:[],failed:[],warning:[]},t=cf.default.join(n,"appPackage","manifest.json");if(!await Ns.default.exists(t))return e.failed=["appPackage/manifest.json does not exist."],e;let i=await Ns.default.readFile(t,"utf8"),r;try{r=JSON.parse(i)}catch{}if(!r)return e.failed.push("appPackage/manifest.json is not a valid JSON file."),e;let s=r.id;return!s||s!=="${{TEAMS_APP_ID}}"?e.failed.push("id should be equal to '${{TEAMS_APP_ID}}'."):e.passed.push("id is referencing placeholder from env: ${{TEAMS_APP_ID}}."),r.manifestVersion===af?e.passed.push("Manifest version is aligned with Teams Toolkit."):r.manifestVersion===lf?e.warning.push(`Manifest version(${lf}) is using preview version.`):e.failed.push(`Manifest version(${r.manifestVersion}) is NOT aligned with Teams Toolkit(${af}).`),e}var fa=se(st()),Jd=se(require("path")),zd=se(Yd()),lL=[{name:"provision",actions:["teamsApp/create","teamsApp/zipAppPackage","teamsApp/update"]},{name:"deploy",actions:[]},{name:"publish",actions:["teamsApp/publishAppPackage"]}];async function ha(n){let e={name:"teamsapp.yaml",passed:[],failed:[],warning:[]},t=Jd.default.join(n,"teamsapp.yml");if(!await fa.default.exists(t))return e.failed=["teamsapp.yml does not exist."],e;let i=await fa.default.readFile(t,"utf8"),r=zd.default.parse(i),s=r&&r.projectId;s&&s!==""?e.failed.push("Project should NOT have projectId in teamsapp.yml."):e.passed.push("Project has no projectId in teamsapp.yml.");for(let c of lL){let u=r[c.name],f=[];if(!u){e.failed.push(`Project should have '${c.name}' stage in teamsapp.yml.`);continue}for(let d of c.actions)if(u&&u.findIndex(_=>_.uses===d)<0&&f.push(`Project should have '${d}' action in ${c.name} stage.`),c.name==="provision"&&d==="teamsApp/create"){let _=u.findIndex(E=>E.uses===d);_>=0&&(u[_].writeToEnvironmentFile.teamsAppId==="TEAMS_APP_ID"?e.passed.push("Project has 'teamsApp/create' action which has TEAMS_APP_ID env variable."):e.failed.push("Project should have 'teamsApp/create' action which has TEAMS_APP_ID env variable."))}f.length===0?e.passed.push(`Project has all mandatory actions in ${c.name} stage.`):e.failed.push(...f)}let o=/^([\w-]+):([\w-]+)$/g,a=r?.additionalMetadata?.sampleTag,l=!1;if(a&&a!==""){let c=o.exec(a);c&&(e.passed.push("Project has sampleTag with format 'repo:name'."),l=!0,c[1]!=="TeamsFx-Samples"&&e.warning.push("Project is an external sample."))}return l||e.failed.push("Project should have sampleTag with format 'repo:name'."),e}var uL=Xd(),Qd=new Ca,fL=[ls,ha,Os,as,ws,bs];async function hL(){await Qd.version(uL.version).description("A tool to validate project content before onboarding to TeamsFx sample gallery.").option("-p, --path ","Path to the project folder to be validated.").parseAsync(process.argv);let n=Qd.opts(),e=process.cwd();n.path&&typeof n.path=="string"&&(e=n.path);for(let t of fL){let i=await t(e);_l(i)}}_r.parseFont("Standard",Ma);console.log(_r.textSync("TeamsFx Sample Validator"));hL(); +`))}var gu=se(Tl()),ss=se(st()),os=se(require("path"));async function as(n){let e={name:"Env Files",passed:[],failed:[],warning:[]},t=[".env.dev",".env.local"];for(let i of t){let r=os.default.join(n,"env",i);if(!await ss.default.exists(r)){e.warning=[`${os.default.join("env",i)} does not exist.`];continue}let s=await ss.default.readFile(r,"utf8"),o=gu.default.parse(s),a=Object.entries(o).map(([c,u])=>({name:c,value:u})),l=!0;for(let c of a)c.name==="TEAMSFX_ENV"||c.name==="APP_NAME_SUFFIX"||c.name==="TEAMS_APP_NAME"||c.value!==""&&(e.failed.push(`${i}: ${c.name} should NOT have value.`),l=!1);l&&e.passed.push(`${i}: All environment variables are valid.`)}return e}var Vt=se(st()),Gt=se(require("path")),yg=[".vscode","appPackage","env"],Tg=["appPackage/manifest.json","appPackage/color.png","appPackage/outline.png","env/.env.dev","m365agents.yml","m365agents.local.yml","README.md"];async function ls(n){let e={name:"Folder Structure",passed:[],failed:[],warning:[]};for(let t of yg)!await Vt.default.exists(Gt.default.join(n,t))||!await Vt.default.stat(Gt.default.join(n,t)).then(i=>i.isDirectory())?e.failed.push(`Project should have "${t}" folder.`):e.passed.push(`Project has "${t}" folder.`);for(let t of Tg)!await Vt.default.exists(Gt.default.join(n,t))||!await Vt.default.stat(Gt.default.join(n,t)).then(i=>i.isFile())?e.failed.push(`Project should have "${t}" file.`):e.passed.push(`Project has "${t}" file.`);return e}var tf=se(st()),As=se(require("path")),nf=se(ef());async function ws(n){let e={name:"Image Files",passed:[],failed:[],warning:[]},t=["thumbnail.png","sampleDemo.gif"];for(let i of t){let r=As.default.join(n,"assets",i),s=As.default.join("assets",i);if(!await tf.default.exists(r)){e.warning.push(`${s} does not exist.`);continue}let o=(0,nf.default)(r);o.width&&o.height&&o.width/o.height===40/23?e.passed.push(`${s} has 1600*920/800*460 resolution or same ratio.`):e.failed.push(`${s} should have 1600*920/800*460 resolution or same ratio.`)}return e}var Is=se(sf()),vs=se(st()),of=se(require("path"));async function bs(n){let e={name:"package.json",passed:[],failed:[],warning:[]},t=of.default.join(n,"package.json");if(!await vs.default.exists(t))return e.failed=["package.json does not exist."],e;let i=await vs.default.readFile(t,"utf8");try{let r=JSON.parse(i);if(!r.engines||!r.engines.node)return e.warning=["package.json does not have 'engines.node' field."],e;if(!(0,Is.satisfies)("16.0.0",r.engines.node)&&!(0,Is.satisfies)("18.0.0",r.engines.node))return e.failed=["'engines.node' field should be compatible with 16 or 18."],e}catch{return e.failed=["package.json is not a valid JSON file."],e}return e.passed=["'engines.node' field is compatible with 16 or 18."],e}var Ns=se(st()),cf=se(require("path")),af="1.17",lf="devPreview";async function Os(n){let e={name:"Teams App Manifest",passed:[],failed:[],warning:[]},t=cf.default.join(n,"appPackage","manifest.json");if(!await Ns.default.exists(t))return e.failed=["appPackage/manifest.json does not exist."],e;let i=await Ns.default.readFile(t,"utf8"),r;try{r=JSON.parse(i)}catch{}if(!r)return e.failed.push("appPackage/manifest.json is not a valid JSON file."),e;let s=r.id;return!s||s!=="${{TEAMS_APP_ID}}"?e.failed.push("id should be equal to '${{TEAMS_APP_ID}}'."):e.passed.push("id is referencing placeholder from env: ${{TEAMS_APP_ID}}."),r.manifestVersion===af?e.passed.push("Manifest version is aligned with Microsoft 365 Agents Toolkit."):r.manifestVersion===lf?e.warning.push(`Manifest version(${lf}) is using preview version.`):e.failed.push(`Manifest version(${r.manifestVersion}) is NOT aligned with Microsoft 365 Agents Toolkit(${af}).`),e}var fa=se(st()),Jd=se(require("path")),zd=se(Yd()),lL=[{name:"provision",actions:["teamsApp/create","teamsApp/zipAppPackage","teamsApp/update"]},{name:"deploy",actions:[]},{name:"publish",actions:["teamsApp/publishAppPackage"]}];async function ha(n){let e={name:"teamsapp.yaml",passed:[],failed:[],warning:[]},t=Jd.default.join(n,"m365agents.yml");if(!await fa.default.exists(t))return e.failed=["m365agents.yml does not exist."],e;let i=await fa.default.readFile(t,"utf8"),r=zd.default.parse(i),s=r&&r.projectId;s&&s!==""?e.failed.push("Project should NOT have projectId in m365agents.yml."):e.passed.push("Project has no projectId in m365agents.yml.");for(let c of lL){let u=r[c.name],f=[];if(!u){e.failed.push(`Project should have '${c.name}' stage in m365agents.yml.`);continue}for(let d of c.actions)if(u&&u.findIndex(_=>_.uses===d)<0&&f.push(`Project should have '${d}' action in ${c.name} stage.`),c.name==="provision"&&d==="teamsApp/create"){let _=u.findIndex(E=>E.uses===d);_>=0&&(u[_].writeToEnvironmentFile.teamsAppId==="TEAMS_APP_ID"?e.passed.push("Project has 'teamsApp/create' action which has TEAMS_APP_ID env variable."):e.failed.push("Project should have 'teamsApp/create' action which has TEAMS_APP_ID env variable."))}f.length===0?e.passed.push(`Project has all mandatory actions in ${c.name} stage.`):e.failed.push(...f)}let o=/^([\w-]+):([\w-]+)$/g,a=r?.additionalMetadata?.sampleTag,l=!1;if(a&&a!==""){let c=o.exec(a);c&&(e.passed.push("Project has sampleTag with format 'repo:name'."),l=!0,c[1]!=="TeamsFx-Samples"&&e.warning.push("Project is an external sample."))}return l||e.failed.push("Project should have sampleTag with format 'repo:name'."),e}var uL=Xd(),Qd=new Ca,fL=[ls,ha,Os,as,ws,bs];async function hL(){await Qd.version(uL.version).description("A tool to validate project content before onboarding to TeamsFx sample gallery.").option("-p, --path ","Path to the project folder to be validated.").parseAsync(process.argv);let n=Qd.opts(),e=process.cwd();n.path&&typeof n.path=="string"&&(e=n.path);for(let t of fL){let i=await t(e);_l(i)}}_r.parseFont("Standard",Ma);console.log(_r.textSync("TeamsFx Sample Validator"));hL(); diff --git a/whos-next-meeting-app/README.md b/whos-next-meeting-app/README.md index d016dc3e6..5c32cdc71 100644 --- a/whos-next-meeting-app/README.md +++ b/whos-next-meeting-app/README.md @@ -16,22 +16,22 @@ This application illustrates the use of Teams Live Share SDK and the Fluid Frame 🚀So [Bob German](https://github.com/BobGerman) and [Rabia Williams](https://github.com/rabwill) decided to take the necessary step, cloud 🥑 style, to create a meeting app called "Who's next" which will help choose attendees from a meeting. 👀 Here is a quick look of how the app works! -⚙️They used [Teams Toolkit](https://learn.microsoft.com/en-us/microsoftteams/platform/toolkit/teams-toolkit-fundamentals?pivots=visual-studio-code), a VS Code extension to create their base teams app from a sample meeting app available in the toolkit itself. +⚙️They used [Microsoft 365 Agents Toolkit](https://learn.microsoft.com/en-us/microsoftteams/platform/toolkit/teams-toolkit-fundamentals?pivots=visual-studio-code), a VS Code extension to create their base teams app from a sample meeting app available in the toolkit itself. Then they used [Fluid Framework](https://fluidframework.com/docs/) to synchronize the view for each attendee. ⚠️ If you can upload a Teams app, you can run this. It doesn't require any Azure AD permission or other administrative consent. ## Prerequisites -- [NodeJS](https://nodejs.org/en/) version as required by Teams Toolkit (v14 or v16 at the time of this sample) +- [NodeJS](https://nodejs.org/en/) version as required by Microsoft 365 Agents Toolkit (v14 or v16 at the time of this sample) - A Microsoft 365 tenant in which you have permission to upload Teams apps. Please don't develop in production; 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 Visual Studio Code Extension](https://aka.ms/teams-toolkit) +- [Microsoft 365 Agents Toolkit Visual Studio Code Extension](https://aka.ms/teams-toolkit) ## Version history Version|Date|Author|Comments -------|----|----|-------- -1.2|February 7, 2023|Bob German|Updates for Teams Toolkit samples repository +1.2|February 7, 2023|Bob German|Updates for Microsoft 365 Agents Toolkit samples repository 1.1|January 25, 2023|Bob German|Update to use [Live Share SDK](https://learn.microsoft.com/microsoftteams/platform/apps-in-teams-meetings/teams-live-share-overview) 1.0|November 21, 2022|Bob German and Rabia Williams|Initial release @@ -43,7 +43,7 @@ Version|Date|Author|Comments ## This demo illustrates -- Use of Teams Toolkit to create a simple meeting tab application +- Use of Microsoft 365 Agents Toolkit to create a simple meeting tab application - Use of Live Share SDK to obtain a Fluid framework container - Use of Fluid framework to synchronize the contents of a meeting tab among meeting attendees @@ -56,7 +56,7 @@ Follow the instructions to [create a meeting in Microsoft Teams](https://support ### Run the app locally - Clone or download the repository to your local machine -- Ensure Teams Toolkit and a supported version of node are installed +- Ensure Microsoft 365 Agents Toolkit and a supported version of node are installed - Within the "whos-next-meeting" folder, run `npm install` to install the developer and server-side dependencies - In Visual Studio Code: Start debugging the project by hitting the `F5` key in your keyboard. - Alternatively open the `Run and Debug Activity` panel(Ctrl+Shift+D) in Visual Studio Code and click the `Run and Debug` green arrow button. @@ -70,12 +70,12 @@ Follow the instructions to [create a meeting in Microsoft Teams](https://support Deploy your project to Azure by following these steps: -- Open Teams Toolkit in Visual Studio Code, and sign in your Azure account by clicking the `Sign in to Azure` in the `ACCOUNTS` section from sidebar. -- After you signed in, select a subscription under your account. The Teams Toolkit will use this subscription to provision Azure resources to host you app. -- Open the Teams Toolkit and click `Provision` in the `LIFECYCLE` section. - - Alternatively open the command palette(Ctrl+Shift+P) and type: `Teams: Provision` command. -- Open the Teams Toolkit and click `Deploy` in the `LIFECYCLE` section. - - Alternatively open the command palette(Ctrl+Shift+P) and type: `Teams: Deploy` command. +- Open Microsoft 365 Agents Toolkit in Visual Studio Code, and sign in your Azure account by clicking the `Sign in to Azure` in the `ACCOUNTS` section from sidebar. +- After you signed in, select a subscription under your account. The Microsoft 365 Agents Toolkit will use this subscription to provision Azure resources to host you app. +- Open the Microsoft 365 Agents Toolkit and click `Provision` in the `LIFECYCLE` section. + - Alternatively open the command palette(Ctrl+Shift+P) and type: `Microsoft 365 Agents: Provision` command. +- Open the Microsoft 365 Agents Toolkit and click `Deploy` in the `LIFECYCLE` section. + - Alternatively open the command palette(Ctrl+Shift+P) and type: `Microsoft 365 Agents: Deploy` command. > Note: Provisioning Azure cloud resources and deploying to Azure may cause charges to your Azure Subscription. diff --git a/whos-next-meeting-app/alt-tabs-azure/README.md b/whos-next-meeting-app/alt-tabs-azure/README.md index 15bbc2dc6..775d46882 100644 --- a/whos-next-meeting-app/alt-tabs-azure/README.md +++ b/whos-next-meeting-app/alt-tabs-azure/README.md @@ -58,12 +58,12 @@ REACT_APP_FLUID_REMOTE_PRIMARY_KEY=(your primary key) REACT_APP_FLUID_REMOTE_ENDPOINT=(your endpoint URL) ~~~ -- Open Teams Toolkit in Visual Studio Code, and sign in your Azure account by clicking the `Sign in to Azure` in the `ACCOUNTS` section from sidebar. -- After you signed in, select a subscription under your account. The Teams Toolkit will use this subscription to provision Azure resources to host you app. -- Open the Teams Toolkit and click `Provision` in the `LIFECYCLE` section. - - Alternatively open the command palette(Ctrl+Shift+P) and type: `Teams: Provision` command. -- Open the Teams Toolkit and click `Deploy` in the `LIFECYCLE` section. - - Alternatively open the command palette(Ctrl+Shift+P) and type: `Teams: Deploy` command. +- Open Microsoft 365 Agents Toolkit in Visual Studio Code, and sign in your Azure account by clicking the `Sign in to Azure` in the `ACCOUNTS` section from sidebar. +- After you signed in, select a subscription under your account. The Microsoft 365 Agents Toolkit will use this subscription to provision Azure resources to host you app. +- Open the Microsoft 365 Agents Toolkit and click `Provision` in the `LIFECYCLE` section. + - Alternatively open the command palette(Ctrl+Shift+P) and type: `Microsoft 365 Agents: Provision` command. +- Open the Microsoft 365 Agents Toolkit and click `Deploy` in the `LIFECYCLE` section. + - Alternatively open the command palette(Ctrl+Shift+P) and type: `Microsoft 365 Agents: Deploy` command. > Note: Provision Azure cloud resources and deploy to Azure may cause charges to your Azure Subscription.