From ff8164eef5b3d779d0bcd80a90eaed732171ea39 Mon Sep 17 00:00:00 2001 From: Rick Kirkham Date: Fri, 29 Nov 2024 23:41:55 -0800 Subject: [PATCH 1/5] [Doc Improvement] add note to combined add-in & app article --- .../m365-apps/overview-combining-add-in-and-teams-app.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/msteams-platform/m365-apps/overview-combining-add-in-and-teams-app.md b/msteams-platform/m365-apps/overview-combining-add-in-and-teams-app.md index 15e08dbfc09..eb0af5d90c8 100644 --- a/msteams-platform/m365-apps/overview-combining-add-in-and-teams-app.md +++ b/msteams-platform/m365-apps/overview-combining-add-in-and-teams-app.md @@ -47,6 +47,9 @@ Before you start work merging your two existing extensions, get a sense of how t - How the single unified manifest is created. - The differences in how the add-in and the Teams app are sideloaded and debugged. +> [!NOTE] +> Although the article uses an Outlook add-in, the general process of combining an add-in with a Teams app also applies to Excel, PowerPoint, and Word add-ins. + ## Follow proper principles for combining Teams apps and add-ins When you are ready to merge your existing add-in and Teams app, follow these principles: From 2e4d1758f74f7cb0d964e89c33ae47413dc9678c Mon Sep 17 00:00:00 2001 From: Rick Kirkham Date: Sat, 30 Nov 2024 00:43:50 -0800 Subject: [PATCH 2/5] minor fix --- .../m365-apps/overview-combining-add-in-and-teams-app.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/msteams-platform/m365-apps/overview-combining-add-in-and-teams-app.md b/msteams-platform/m365-apps/overview-combining-add-in-and-teams-app.md index eb0af5d90c8..d3b86c946a5 100644 --- a/msteams-platform/m365-apps/overview-combining-add-in-and-teams-app.md +++ b/msteams-platform/m365-apps/overview-combining-add-in-and-teams-app.md @@ -59,7 +59,7 @@ When you are ready to merge your existing add-in and Teams app, follow these pri - Keep configuration files that are applicable to both the add-in and Teams app in the root of the project. - Move source files and configuration files that are only applicable to the Teams app into a subfolder off the root of the project. Similarly, copy source and configuration files that are only used by the add-in from the existing add-in to a different subfolder off the root of the combined project. - Use the same base domain for the built files of both the add-in and Teams app; for example, contoso.com. -- Merge the two manifests into a single manifest. Use the process you went through in step 1 as a guide. +- Merge the two manifests into a single manifest. Use the process you went through in [Add an Outlook Add-in to a Teams app](combine-office-add-in-and-teams-app.md) as a guide. - The [id](../resources/schema/manifest-schema.md#id) property in the new manifest should be the same value as the "id" property in the original Teams app manifest. - Raise the value of the [version](../resources/schema/manifest-schema.md#version) property; for example, raise "1.0.0" to "1.1.0". - Add an [extensions.alternates](../resources/schema/manifest-schema.md#extensionsalternates) property to the manifest and configure it to hide the original Office add-in in versions of Office that support combining an add-in and a Teams app. For more information, see [Manage new and old versions of an add-in](/office/dev/add-ins/concepts/duplicate-legacy-metaos-add-ins). From be8dcce7ff02060c10ab1aad0dc6e84ee0471f76 Mon Sep 17 00:00:00 2001 From: Rick Kirkham Date: Tue, 3 Dec 2024 13:38:17 -0800 Subject: [PATCH 3/5] Update msteams-platform/m365-apps/overview-combining-add-in-and-teams-app.md Co-authored-by: Kushal S --- .../m365-apps/overview-combining-add-in-and-teams-app.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/msteams-platform/m365-apps/overview-combining-add-in-and-teams-app.md b/msteams-platform/m365-apps/overview-combining-add-in-and-teams-app.md index d3b86c946a5..489e44f26ae 100644 --- a/msteams-platform/m365-apps/overview-combining-add-in-and-teams-app.md +++ b/msteams-platform/m365-apps/overview-combining-add-in-and-teams-app.md @@ -59,7 +59,7 @@ When you are ready to merge your existing add-in and Teams app, follow these pri - Keep configuration files that are applicable to both the add-in and Teams app in the root of the project. - Move source files and configuration files that are only applicable to the Teams app into a subfolder off the root of the project. Similarly, copy source and configuration files that are only used by the add-in from the existing add-in to a different subfolder off the root of the combined project. - Use the same base domain for the built files of both the add-in and Teams app; for example, contoso.com. -- Merge the two manifests into a single manifest. Use the process you went through in [Add an Outlook Add-in to a Teams app](combine-office-add-in-and-teams-app.md) as a guide. +- Merge the two manifests into a single manifest. Use the process you went through in [add an Outlook Add-in to a Teams app](combine-office-add-in-and-teams-app.md) as a guide. - The [id](../resources/schema/manifest-schema.md#id) property in the new manifest should be the same value as the "id" property in the original Teams app manifest. - Raise the value of the [version](../resources/schema/manifest-schema.md#version) property; for example, raise "1.0.0" to "1.1.0". - Add an [extensions.alternates](../resources/schema/manifest-schema.md#extensionsalternates) property to the manifest and configure it to hide the original Office add-in in versions of Office that support combining an add-in and a Teams app. For more information, see [Manage new and old versions of an add-in](/office/dev/add-ins/concepts/duplicate-legacy-metaos-add-ins). From cd82be4924248cb0c027d68403808609e6ff7f00 Mon Sep 17 00:00:00 2001 From: v-kushals <145653999+v-kushals@users.noreply.github.com> Date: Wed, 11 Dec 2024 13:41:53 +0530 Subject: [PATCH 4/5] Update overview-combining-add-in-and-teams-app.md --- .../m365-apps/overview-combining-add-in-and-teams-app.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/msteams-platform/m365-apps/overview-combining-add-in-and-teams-app.md b/msteams-platform/m365-apps/overview-combining-add-in-and-teams-app.md index 489e44f26ae..47ca5a638cd 100644 --- a/msteams-platform/m365-apps/overview-combining-add-in-and-teams-app.md +++ b/msteams-platform/m365-apps/overview-combining-add-in-and-teams-app.md @@ -42,7 +42,7 @@ However, we can make some general recommendations about combining an add-in with ## Learn about the manifest and structure of a combined Teams app and Office add-in -Before you start work merging your two existing extensions, get a sense of how to merge the two types of extensions by creating a new Teams app and a new add-in in Teams toolkit and then following the instructions in [Add an Outlook Add-in to a Teams app](combine-office-add-in-and-teams-app.md) to combine them. Pay close attention to the following: +Before you start work merging your two existing extensions, get a sense of how to merge the two types of extensions by creating a new Teams app and a new add-in in Teams toolkit and then following the instructions in [Add an Outlook add-in to a Teams app](combine-office-add-in-and-teams-app.md) to combine them. Pay close attention to the following: - How the single unified manifest is created. - The differences in how the add-in and the Teams app are sideloaded and debugged. From c2749e03b97d99d74d28c2e66596488e8ed5292e Mon Sep 17 00:00:00 2001 From: v-kushals <145653999+v-kushals@users.noreply.github.com> Date: Wed, 11 Dec 2024 13:44:41 +0530 Subject: [PATCH 5/5] Update overview-combining-add-in-and-teams-app.md --- .../m365-apps/overview-combining-add-in-and-teams-app.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/msteams-platform/m365-apps/overview-combining-add-in-and-teams-app.md b/msteams-platform/m365-apps/overview-combining-add-in-and-teams-app.md index 47ca5a638cd..aafaa50910f 100644 --- a/msteams-platform/m365-apps/overview-combining-add-in-and-teams-app.md +++ b/msteams-platform/m365-apps/overview-combining-add-in-and-teams-app.md @@ -42,7 +42,7 @@ However, we can make some general recommendations about combining an add-in with ## Learn about the manifest and structure of a combined Teams app and Office add-in -Before you start work merging your two existing extensions, get a sense of how to merge the two types of extensions by creating a new Teams app and a new add-in in Teams toolkit and then following the instructions in [Add an Outlook add-in to a Teams app](combine-office-add-in-and-teams-app.md) to combine them. Pay close attention to the following: +Before you start work merging your two existing extensions, get a sense of how to merge the two types of extensions by creating a new Teams app and a new add-in in Teams toolkit and then following the instructions in [Add an Outlook Add-in to a Teams app](combine-office-add-in-and-teams-app.md) to combine them. Pay close attention to the following: - How the single unified manifest is created. - The differences in how the add-in and the Teams app are sideloaded and debugged. @@ -59,7 +59,7 @@ When you are ready to merge your existing add-in and Teams app, follow these pri - Keep configuration files that are applicable to both the add-in and Teams app in the root of the project. - Move source files and configuration files that are only applicable to the Teams app into a subfolder off the root of the project. Similarly, copy source and configuration files that are only used by the add-in from the existing add-in to a different subfolder off the root of the combined project. - Use the same base domain for the built files of both the add-in and Teams app; for example, contoso.com. -- Merge the two manifests into a single manifest. Use the process you went through in [add an Outlook Add-in to a Teams app](combine-office-add-in-and-teams-app.md) as a guide. +- Merge the two manifests into a single manifest. Use the process you went through in [add an Outlook add-in to a Teams app](combine-office-add-in-and-teams-app.md) as a guide. - The [id](../resources/schema/manifest-schema.md#id) property in the new manifest should be the same value as the "id" property in the original Teams app manifest. - Raise the value of the [version](../resources/schema/manifest-schema.md#version) property; for example, raise "1.0.0" to "1.1.0". - Add an [extensions.alternates](../resources/schema/manifest-schema.md#extensionsalternates) property to the manifest and configure it to hide the original Office add-in in versions of Office that support combining an add-in and a Teams app. For more information, see [Manage new and old versions of an add-in](/office/dev/add-ins/concepts/duplicate-legacy-metaos-add-ins).