Merge branch 'main' into live

Author: github-actions

docs/develop/troubleshoot-sso-in-office-add-ins.md

@@ -1,7 +1,7 @@
 ---
 title: Troubleshoot error messages for single sign-on (SSO)
 description: Guidance about how to troubleshoot problems with single sign-on (SSO) in Office Add-ins, and handle special conditions or errors.
-ms.date: 10/24/2024
+ms.date: 02/07/2024
 ms.localizationpriority: medium
 ---
 
@@ -77,7 +77,14 @@ Client Error. This error is only seen in **Office on the web**. Your code should
 The Office application was unable to get an access token to the add-in's web service.
 
 - If this error occurs during development, be sure that your add-in registration and add-in manifest specify the `profile` permission (and the `openid` permission, if you are using MSAL.NET). For more information, see [Register an Office Add-in that uses single sign-on (SSO) with the Microsoft identity platform](register-sso-add-in-aad-v2.md).
-- In production, an account mismatch could cause this error. For example, if the user attempts to sign in with a personal Microsoft account (MSA) when a Work or school account was expected. For these cases, your code should fall back to an alternate system of user authentication. For more information on account types, see [Identity and account types for single- and multi-tenant apps](/security/zero-trust/develop/identity-supported-account-types)
+- In production, an account mismatch could cause this error. For example, if the user attempts to sign in with a personal Microsoft account (MSA) when a Work or school account was expected. For these cases, your code should fall back to an alternate system of user authentication. For more information on account types, see [Identity and account types for single- and multi-tenant apps](/security/zero-trust/develop/identity-supported-account-types).
+- Make sure your application is enabled for users to sign-in for your organization.
+    1. Sign in to the [Microsoft Azure portal](https://portal.azure.com/).
+    2. Go to your add-in's app registration.
+    3. On the **Overview** page,  select **Managed application in local directory**.
+        :::image type="content" source="../images/azure-portal-managed-application.png" alt-text="The Managed application in local directory option in the App Registration Overview window.":::
+    1. Select **Manage** > **Properties**, and ensure that the value of **Enabled for users to sign-in?** is **Yes**.
+        :::image type="content" source="../images/azure-portal-enable-sign-in.png" alt-text="The option to allow users in the organization to sign-in to an application in the Properties window.":::
 
 ### 13008
 

docs/images/azure-portal-enable-sign-in.png

@@ -0,0 +1 @@
+Add-ins that interact with the user's calendar, meetings, or appointments are available only if the user opens the calendar in Outlook, not Teams.

docs/images/azure-portal-managed-application.png

@@ -1,7 +1,7 @@
 ---
 title: Add and remove attachments in an Outlook add-in
 description: Use various attachment APIs to manage the files or Outlook items attached to the item the user is composing.
-ms.date: 02/13/2025
+ms.date: 02/18/2025
 ms.topic: how-to
 ms.localizationpriority: medium
 ---
@@ -76,39 +76,32 @@ Office.context.mailbox.item.addFileAttachmentAsync(
 );
 ```
 
-To add inline a Base64-encoded image to the body of a message or appointment being composed, you must first get the current item body using the `Office.context.mailbox.item.body.getAsync` method before inserting the image using the `addFileAttachmentFromBase64Async` method. Otherwise, the image won't render in the body once it's inserted. For guidance, see the following JavaScript example, which adds an inline Base64 image to the beginning of an item body.
+To add an inline Base64-encoded image to the body of a message or appointment being composed, use the [Body API](/javascript/api/outlook/office.body) methods, such as [prependAsync](/javascript/api/outlook/office.body#outlook-office-body-prependasync-member(1)), [setSignatureAsync](/javascript/api/outlook/office.body#outlook-office-body-setsignatureasync-member(1)), or [setAsync](/javascript/api/outlook/office.body#outlook-office-body-setasync-member(1)).
+
+> [!TIP]
+> Before inserting the image inline using `Office.context.mailbox.item.body.setAsync`, you must first call `Office.context.mailbox.item.body.getAsync` to get the current body of the mail item. Otherwise, the image won't render in the body once it's inserted. For guidance, see the [Add inline Base64-encoded image to message or appointment body (Compose)](https://raw.githubusercontent.com/OfficeDev/office-js-snippets/refs/heads/main/samples/outlook/20-item-body/add-inline-base64-image.yaml) sample in [Script Lab](../overview/explore-with-script-lab.md).
+
+The following is an example of a Base64-encoded image prepended to the body of a mail item.
 
 ```javascript
-const mailItem = Office.context.mailbox.item;
 const base64String =
   "iVBORw0KGgoAAAANSUhEUgAAAGAAAABgCAMAAADVRocKAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAnUExURQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAN0S+bUAAAAMdFJOUwAQIDBAUI+fr7/P7yEupu8AAAAJcEhZcwAADsMAAA7DAcdvqGQAAAF8SURBVGhD7dfLdoMwDEVR6Cspzf9/b20QYOthS5Zn0Z2kVdY6O2WULrFYLBaLxd5ur4mDZD14b8ogWS/dtxV+dmx9ysA2QUj9TQRWv5D7HyKwuIW9n0vc8tkpHP0W4BOg3wQ8wtlvA+PC1e8Ao8Ld7wFjQtHvAiNC2e8DdqHqKwCrUPc1gE1AfRVgEXBfB+gF0lcCWoH2tYBOYPpqQCNwfT3QF9i+AegJfN8CtAWhbwJagtS3AbIg9o2AJMh9M5C+SVGBvx6zAfmT0r+Bv8JMwP4kyFPir+cswF5KL3WLv14zAFBCLf56Tw9cparFX4upgaJUtPhrOS1QlY5W+vWTXrGgBFB/b72ev3/0igUdQPppP/nfowfKUUEFcP207y/yxKmgAYQ+PywoAFOfCH3A2MdCFzD3kdADBvq10AGG+pXQBgb7pdAEhvuF0AIc/VtoAK7+JciAs38KIuDugyAC/v4hiMCE/i7IwLRBsh68N2WQjMVisVgs9i5bln8LGScNcCrONQAAAABJRU5ErkJggg==";
 
-// Get the current body of the message or appointment.
-mailItem.body.getAsync(Office.CoercionType.Html, (bodyResult) => {
-    if (bodyResult.status === Office.AsyncResultStatus.Failed) {
-        console.error(bodyResult.error.message);
-        return;
+// Add the Base64-encoded image to the beginning of the body.
+Office.context.mailbox.item.addFileAttachmentFromBase64Async(base64String, "sample.png", { isInline: true }, (attachmentResult) => {
+    if (attachmentResult.status === Office.AsyncResultStatus.Failed) {
+      console.log(`Failed to attach file: ${attachmentResult.error.message}`);
+      return;
     }
 
-    // Insert the Base64-encoded image at the beginning of the body.
-    const options = { isInline: true, asyncContext: bodyResult.value };
-    mailItem.addFileAttachmentFromBase64Async(base64String, "sample.png", options, (attachResult) => {
-        if (attachResult.status === Office.AsyncResultStatus.Failed) {
-            console.error(attachResult.error.message);
-            return;
-        }
-
-        let body = attachResult.asyncContext;
-        body = body.replace("<p class=MsoNormal>", `<p class=MsoNormal><img src="cid:sample.png">`);
-        mailItem.body.setAsync(body, { coercionType: Office.CoercionType.Html }, (setResult) => {
-            if (setResult.status === Office.AsyncResultStatus.Failed) {
-                console.error(setResult.error.message);
-                return;
-            }
+    Office.context.mailbox.item.body.prependAsync('<img src="cid:sample.png" />', { coercionType: Office.CoercionType.Html }, (prependResult) => {
+      if (prependResult.status === Office.AsyncResultStatus.Failed) {
+        console.log(`Failed to prepend image to body: ${attachmentResult.error.message}`);
+        return;
+      }
 
-            console.log("Inline Base64 image added to the body.");
-        });
-    });
+      console.log("Inline Base64-encoded image added to the beginning of the body.");
+    })
 });
 ```
 

docs/includes/calendar-availability.md

@@ -1,7 +1,7 @@
 ---
 title: Outlook add-ins overview
 description: Outlook add-ins extend or customize the Outlook UI and are developed by Microsoft and partners using our web-based platform.
-ms.date: 07/18/2024
+ms.date: 02/19/2025
 ms.topic: overview
 ms.custom: scenarios:getting-started
 ms.localizationpriority: high
@@ -25,6 +25,9 @@ Outlook add-ins are different from COM or VSTO add-ins, which are older integrat
 
 The Outlook items that support add-ins include email messages, meeting requests, responses and cancellations, and appointments. Each Outlook add-in defines the context in which it is available, including the types of items and if the user is reading or composing an item.
 
+> [!NOTE]
+> [!INCLUDE [Calendar add-ins not available in Teams](../includes/calendar-availability.md)]
+
 [!INCLUDE [publish policies note](../includes/note-publish-policies.md)]
 
 ## Extension points
@@ -55,7 +58,7 @@ Outlook add-ins activate when the user is composing or reading a message or appo
 
 - A .msg or .eml file opened from the file system.
 
-- In a [group mailbox](/microsoft-365/admin/create-groups/compare-groups?view=o365-worldwide&preserve-view=true#shared-mailboxes), in a shared mailbox\*, in another user's mailbox\*, in an [archive mailbox](/office365/servicedescriptions/exchange-online-archiving-service-description/archive-client-and-compliance-&-security-feature-details?tabs=Archive-features#archive-mailbox), or in a public folder.
+- In a [group mailbox](/microsoft-365/admin/create-groups/compare-groups?view=o365-worldwide&preserve-view=true#shared-mailboxes), in a shared mailbox\*, in another user's mailbox\*, in an [archive mailbox](/purview/archive-mailboxes), or in a public folder.
 
   > [!IMPORTANT]
   > \* Support for delegate access scenarios (for example, folders shared from another user's mailbox) was introduced in [requirement set 1.8](/javascript/api/requirement-sets/outlook/requirement-set-1.8/outlook-requirement-set-1.8), while shared mailbox support was introduced in [requirement set 1.13](/javascript/api/requirement-sets/outlook/requirement-set-1.13/outlook-requirement-set-1.13). To learn more, see [Implement shared folders and shared mailbox scenarios](delegate-access.md).

docs/outlook/add-and-remove-attachments-to-an-item-in-a-compose-form.md

@@ -1,7 +1,7 @@
 ---
 title: Outlook add-in design
 description: Guidelines to help you design and build a compelling add-in, which brings the best of your app right into Outlook on the web, on Windows, on Mac, on Android, and on iOS.
-ms.date: 08/12/2021
+ms.date: 02/19/2025
 ms.topic: best-practice
 ms.localizationpriority: high
 ---
@@ -20,6 +20,9 @@ The best designed add-ins are simple to use, focused, and provide real value to
 
 Your add-in will be an extension of our experience and it's important to make sure the scenarios you enable feel like a natural fit inside Outlook. Think carefully about which of your common use cases will benefit the most from having hooks to them from within our email and calendaring experiences.
 
+> [!NOTE]
+> [!INCLUDE [Calendar add-ins not available in Teams](../includes/calendar-availability.md)]
+
 An add-in shouldn't attempt to do everything your app does. The focus should be on the most frequently used, and appropriate, actions in the context of Outlook content. Think about your call to action and make it clear what the user should do when your task pane opens.
 
 ### Make it feel as native as possible

docs/outlook/outlook-add-ins-overview.md

@@ -1,7 +1,7 @@
 ---
 title: Automatically check for an attachment before a message is sent
 description: Learn how to implement an event-based add-in that implements Smart Alerts to automatically check a message for an attachment before it's sent.
-ms.date: 10/08/2024
+ms.date: 02/18/2025
 ms.topic: how-to
 ms.localizationpriority: medium
 ---
@@ -544,7 +544,7 @@ If you implemented the optional steps to customize the **Don't Send** button or
           }
 
           let body = attachResult.asyncContext;
-          body = body.replace("<p class=MsoNormal>", `<p class=MsoNormal><img src="cid:sample.png">`);
+          body += '<img src="cid:sample.png" />';
           mailItem.body.setAsync(body, { coercionType: Office.CoercionType.Html }, (setResult) => {
             if (setResult.status === Office.AsyncResultStatus.Failed) {
               console.log(setResult.error.message);

docs/outlook/outlook-addin-design.md

@@ -1,7 +1,7 @@
 ---
 title: Implement an integrated spam-reporting add-in
 description: Learn how to implement an integrated spam-reporting add-in in Outlook.
-ms.date: 01/22/2025
+ms.date: 02/19/2025
 ms.topic: how-to
 ms.localizationpriority: medium
 ---
@@ -102,6 +102,7 @@ Select the tab for the type of manifest you're using.
 
 1. Add the following object to the "extensions.ribbons" array. Note the following about this markup.
     - The "contexts" array contains the "spamReportingOverride" string. This prevents the add-in button from appearing at the end of the ribbon or in the overflow section.
+    - The "tabs" array must be specified in an "extensions.ribbons" object. However, because the button of a spam-reporting add-in is displayed in a specific spot on the ribbon, only an empty array is specified.
     - The "fixedControls" array contains an object that configures the look and functionality of the add-in button on the ribbon. The name of the event handler specified in the "actionId" property must match the value used in the "id" property of the object in the "actions" array. While the "enabled" property must be specified in the array, its value doesn't affect the functionality of a spam-reporting add-in.
     - The "spamPreProcessingDialog" object specifies the information and options that are shown in the preprocessing dialog. While you must specify a "title" and "description" for the dialog, you can optionally configure the following properties.
         - The "spamReportingOptions" object. It provides a multiple-selection list of up to five choices. This helps a user identify the type of message they're reporting.
@@ -113,6 +114,7 @@ Select the tab for the type of manifest you're using.
         "contexts": [
             "spamReportingOverride"
         ],
+        "tabs": [],
         "fixedControls": [
             {
                 "id": "spamReportingButton",

docs/outlook/smart-alerts-onmessagesend-walkthrough.md

@@ -1,7 +1,7 @@
 ---
 title: Office Add-ins platform overview
 description:  Use familiar web technologies such as HTML, CSS, and JavaScript to extend and interact with Word, Excel, PowerPoint, OneNote, Project, and Outlook.
-ms.date: 07/25/2024
+ms.date: 02/19/2025
 ms.topic: overview
 ms.custom: scenarios:getting-started
 ms.localizationpriority: high
@@ -97,6 +97,9 @@ Users can run Outlook add-ins when they view, reply, or create emails, meeting r
 - Display contextually next to an Outlook item when you're viewing or composing it.
 - Perform a task when a specific event occurs, such as when a user creates a new message.
 
+> [!NOTE]
+> [!INCLUDE [Calendar add-ins not available in Teams](../includes/calendar-availability.md)]
+
 For an overview of Outlook add-ins, see [Outlook add-ins overview](../outlook/outlook-add-ins-overview.md).
 
 ### Create new objects in Office documents