Skip to content

Commit ab2e4e0

Browse files
author
github-actions
committed
Merge branch 'main' into live
2 parents 0708498 + 5937344 commit ab2e4e0

File tree

74 files changed

+537
-458
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+537
-458
lines changed

Contributing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ Once your changes are successfully merged into the main repository, delete the b
160160
#### To delete a branch
161161

162162
1. In the Git Bash command prompt, type `git checkout main`. This ensures that you aren't in the branch to be deleted (which isn't allowed).
163-
2. Next, at the command prompt, type `git branch -d <branch name>`. This deletes the branch on your computer only if it has been successfully merged to the upstream repository. (You can override this behavior with the `D` flag, but first be sure you want to do this.)
163+
2. Next, at the command prompt, type `git branch -d <branch name>`. This deletes the branch on your computer only if it has been successfully merged to the upstream repository. (You can override this behavior with the `-D` flag, but first be sure you want to do this.)
164164
3. Finally, type `git push origin :<branch name>` at the command prompt (a space before the colon and no space after it). This will delete the branch on your GitHub fork.
165165

166166
Congratulations, you have successfully contributed to the project!

docs/concepts/duplicate-legacy-metaos-add-ins.md

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,21 @@ One important improvement we're working on is the ability to create a single uni
1515
> [!TIP]
1616
> For information about converting an existing add-in to use the unified manifest, see [Convert an add-in to use the unified manifest for Microsoft 365](../develop/convert-xml-to-json-manifest.md).
1717
18-
After you've created a version of your add-in that uses the unified manifest, you must link the existing add-in and the app built using the unified manifest to ensure users don't see two copies of the add-in UI inside of Outlook.
18+
After you've created a version of your add-in that uses the unified manifest, you must link the existing add-in and the app built using the unified manifest to ensure users don't see two copies of the add-in UI inside of Outlook.
1919

2020
> [!NOTE]
21-
> The configuration described below doesn't take effect for up to 24 hours after the new version is installed on a user's computer. During that period, the UI of both versions is visible. For example, if both versions have a custom ribbon button, both buttons appear on the ribbon.
21+
> The configuration described below doesn't take effect for up to 24 hours after the new version is installed on a user's computer. During that period, the UI of both versions is visible. For example, if both versions have a custom ribbon button, both buttons appear on the ribbon.
2222
2323
Use the following steps.
2424

25-
1. Open the extension object in the "extensions" array.
26-
1. Create an "alternatives" array property, if there isn’t one already.
27-
1. In the "alternatives" array, create an "alternate" object that has a "hide" property.
28-
1. If the existing add-in is marketed through AppSource, give the "hide" object a "storeOfficeAddin" property. Otherwise, skip to step 6.
29-
1. Give the "storeOfficeAddin" object two properties:
25+
1. Open the extension object in the [`"extensions"`](/microsoft-365/extensibility/schema/root#extensions) array.
26+
1. Create an [`"alternates"`](/microsoft-365/extensibility/schema/element-extensions#alternates) array property, if there isn’t one already.
27+
1. In the `"alternates"` array, create an alternate object that has a [`"hide"`](/microsoft-365/extensibility/schema/extension-alternate-versions-array#hide) property.
28+
1. If the existing add-in is marketed through AppSource, give the `"hide"` object a [`"storeOfficeAddin"`](/microsoft-365/extensibility/schema/extension-alternate-versions-array-hide#storeofficeaddin) property. Otherwise, skip to step 6.
29+
1. Give the `"storeOfficeAddin"` object two properties:
3030

31-
- An "officeAddinId" with the GUID of the old add-in as its value.
32-
- An "assetId" with the AppSource asset ID as its value.
31+
- An `"officeAddinId"` with the GUID of the old add-in as its value.
32+
- An `"assetId"` with the AppSource asset ID as its value.
3333

3434
The following is an example:
3535

@@ -56,12 +56,11 @@ Use the following steps.
5656

5757
> [!NOTE]
5858
>
59-
> - The asset ID of the add-in in your unified manifest must match with an existing add-in that has been published by your seller account on Partner Center. If the asset ID of the add-in that you have linked in your unified manifest doesn't match an existing offer published by your seller account, the unified manifest submission will fail. You'll need to update the manifest to use the correct add-in asset ID and re-submit the unified manifest.
59+
> - The asset ID of the add-in in your unified manifest must match with an existing add-in that has been published by your seller account on Partner Center. If the asset ID of the add-in that you have linked in your unified manifest doesn't match an existing offer published by your seller account, the unified manifest submission will fail. You'll need to update the manifest to use the correct add-in asset ID and re-submit the unified manifest.
6060
> - An existing add-in can only be hidden by a single unified manifest. At this time, you may not use multiple unified manifests to hide the same add-in. If you try to hide an already linked add-in using a different unified manifest, the submission will fail. You'll need to remove the linking and re-submit the unified manifest.
6161

62-
63-
1. If the old add-in isn't distributed through AppSource, then give the "hide" object a "customOfficeAddin" property.
64-
1. Give the "customOfficeAddin" object an "officeAddinId" property with the GUID of the old add-in as its value. The following is an example.
62+
1. If the old add-in isn't distributed through AppSource, then give the `"hide"` object a [`"customOfficeAddin"`](/microsoft-365/extensibility/schema/extension-alternate-versions-array-hide-custom-office-addin) property.
63+
1. Give the `"customOfficeAddin"` object an `"officeAddinId"` property with the GUID of the old add-in as its value. The following is an example.
6564

6665
```json
6766
"extensions": [
@@ -87,7 +86,7 @@ Don't remove the existing add-in from AppSource or the Microsoft 365 Admin Cente
8786

8887
## Maintain both versions for the immediate future
8988

90-
Generally, add-ins that use the unified manifest can be installed only on Microsoft 365 Version 2307 (Build 16626.20132) and later. However, there are two exceptions which enable these add-ins to be installed on older versions of Microsoft 365 and on perpetual license versions of Office.
89+
Generally, add-ins that use the unified manifest can be installed only on Microsoft 365 Version 2307 (Build 16626.20132) and later. However, there are two exceptions which enable these add-ins to be installed on older versions of Microsoft 365 and on perpetual license versions of Office.
9190

9291
- The user's Microsoft 365 administrator deploys the add-in for all users.
9392
- The user installs the add-in on another Microsoft 365 client app that *is* version Version 2307 (Build 16626.20132) and later. This makes the add-in available on the same user's other Office clients, including older or perpetual license.
@@ -99,12 +98,11 @@ There are also some scenarios where you might want to maintain both both version
9998
- [Outlook modules](../outlook/extension-module-outlook-add-ins.md) aren't supported. But you can provide a nearly identical experience using the unified manifest by [including a Teams Tab with your add-in in a single app](/microsoftteams/platform/m365-apps/combine-office-add-in-and-teams-app).
10099
- [Outlook contextual add-ins](../outlook/contextual-outlook-add-ins.md) (also known as "activation rules") aren't supported. But you can provide similar experiences using the unified manifest and [Event-based activation](../outlook/autolaunch.md).
101100

102-
The critical requirement for making two versions available is to be sure that the two of them appear distinct in the Outlook UI.
101+
The critical requirement for making two versions available is to be sure that the two of them appear distinct in the Outlook UI.
103102

104-
- Give the new version a different name from the existing add-in.
103+
- Give the new version a different name from the existing add-in.
105104
- Create and use different icons for the new version.
106-
- Be sure that the "id" property of the unified manifest in the new version is a different GUID from the **\<Id\>** element in the add-in only manifest of the existing add-in.
105+
- Be sure that the [`"id"`](/microsoft-365/extensibility/schema/root#id) property of the unified manifest in the new version is a different GUID from the **\<Id\>** element in the add-in only manifest of the existing add-in.
107106

108107
> [!NOTE]
109-
> If you use the same name and icon, the old and new solutions appear indistinguishable in the Outlook UI for add-in installation.
110-
108+
> If you use the same name and icon, the old and new solutions appear indistinguishable in the Outlook UI for add-in installation.

docs/design/add-in-icons-fresh.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ Office icons are designed to render well in high contrast modes. Foreground elem
130130

131131
### Unified manifest reference
132132

133-
- ["extensions.ribbons" array](/microsoftteams/platform/resources/schema/manifest-schema#extensionsribbons)
133+
- [`"extensions.ribbons"` array](/microsoft-365/extensibility/schema/extension-ribbons-array)
134134

135135
### Add-in only manifest reference
136136

docs/design/add-in-icons-monoline.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ The final icons should be saved as .png image files. Use PNG format with a trans
207207

208208
### Unified manifest reference
209209

210-
- ["extensions.ribbons" array](/microsoftteams/platform/resources/schema/manifest-schema#extensionsribbons)
210+
- ["extensions.ribbons" array](/microsoft-365/extensibility/schema/extension-ribbons-array)
211211

212212
### Add-in only manifest reference
213213

docs/design/built-in-button-integration.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,10 @@ Open the tab for the type of manifest your add-in uses for the details of the ma
2525

2626
## Insert a built-in control group into a custom tab
2727

28-
To insert a built-in Office control group into a custom tab, add a group object with a "builtInGroupId" property *instead of an "id" property* to the "groups" array of your custom tab object. Set to the ID of the built-in group. See [Find the IDs of controls and control groups](#find-the-ids-of-controls-and-control-groups). *The built-in group object should have no other properties.*
28+
To insert a built-in Office control group into a custom tab, add a group object with a [`"builtInGroupId"`](/microsoft-365/extensibility/schema/extension-ribbons-array-tabs-item#builtintabid) property *instead of an [`"id"`](/microsoft-365/extensibility/schema/extension-ribbons-array-tabs-item#id) property* to the [`"groups"`](/microsoft-365/extensibility/schema/extension-ribbons-array-tabs-item#groups) array of your custom tab object. Set to the ID of the built-in group. See [Find the IDs of controls and control groups](#find-the-ids-of-controls-and-control-groups). *The built-in group object should have no other properties.*
2929

3030
The following example adds the Office Paragraph control group to a custom tab.
3131

32-
3332
```json
3433
"extensions": [
3534
...
@@ -60,7 +59,7 @@ The following example adds the Office Paragraph control group to a custom tab.
6059

6160
## Insert a built-in control into a custom group
6261

63-
To insert a built-in Office control into a custom group, add a control object with a "builtInControlId" property *instead of an "id" property* to the "controls" array of your custom group object. Set to the ID of the built-in control. See [Find the IDs of controls and control groups](#find-the-ids-of-controls-and-control-groups). *The built-in control object should have no other properties.*
62+
To insert a built-in Office control into a custom group, add a control object with a `"builtInControlId"` property *instead of an `"id"` property* to the [`"controls"`](/microsoft-365/extensibility/schema/extension-ribbons-custom-tab-groups-item#controls) array of your custom group object. Set to the ID of the built-in control. See [Find the IDs of controls and control groups](#find-the-ids-of-controls-and-control-groups). *The built-in control object should have no other properties.*
6463

6564
The following example adds the Office Superscript control to a custom group.
6665

docs/design/content-add-ins.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -46,19 +46,19 @@ There are minor differences in the manifests between content add-ins and add-ins
4646
# [Unified manifest for Microsoft 365](#tab/jsonmanifest)
4747

4848
> [!NOTE]
49-
> The unified manifest is available in Excel, PowerPoint, and Word as a developer preview. For Outlook, it's generally available and can be used in production add-ins.
49+
> The unified manifest is available in Excel, PowerPoint, and Word as a developer preview. For Outlook, it's generally available and can be used in production add-ins.
5050
5151
Configure the manifest with the following steps.
5252

53-
1. Add a "contentRuntimes" child array to the extension object in the "extensions" array.
54-
1. Remove the "runtimes" property if it is present. The "runtimes" array is for task pane or mail add-ins. These cannot be combined with a content add-in.
55-
1. Add an anonymous content runtime object in the "contentRuntimes" array.
56-
1. Set the "id" property of the object to a descriptive name.
57-
1. Set the "code.page" object to the full URL of the custom content that you want to embed in the document.
58-
1. Optionally, set the "requestedWidth" and "requestedHeight" properties to a size between 32 and 1000 pixels. If these properties aren't used, the Office application determines the size.
59-
1. Optionally, set the "disableSnapshot" property to `true` to prevent Office from saving a snapshot of the content component with the document.
53+
1. Add a [`"contentRuntimes"`](/microsoft-365/extensibility/schema/element-extensions#contentruntimes) child array to the extension object in the [`"extensions"`](/microsoft-365/extensibility/schema/root#extensions) array.
54+
1. Remove the [`"runtimes"`](/microsoft-365/extensibility/schema/element-extensions#runtimes) property if it is present. The `"runtimes"` array is for task pane or mail add-ins. These cannot be combined with a content add-in.
55+
1. Add an anonymous content runtime object in the `"contentRuntimes"` array.
56+
1. Set the [`"id"`](/microsoft-365/extensibility/schema/extension-content-runtime-array#id) property of the object to a descriptive name.
57+
1. Set the [`"code.page"`](/microsoft-365/extensibility/schema/extension-runtime-code#page) object to the full URL of the custom content that you want to embed in the document.
58+
1. Optionally, set the [`"requestedWidth"`](/microsoft-365/extensibility/schema/extension-content-runtime-array#requestedwidth) and [`"requestedHeight"`](/microsoft-365/extensibility/schema/extension-content-runtime-array#requestedheight) properties to a size between 32 and 1000 pixels. If these properties aren't used, the Office application determines the size.
59+
1. Optionally, set the [`"disableSnapshot"`](/microsoft-365/extensibility/schema/extension-content-runtime-array#disablesnapshot) property to `true` to prevent Office from saving a snapshot of the content component with the document.
6060

61-
The following is an example of a "contentRuntimes" property.
61+
The following is an example of a `"contentRuntimes"` property.
6262

6363
```json
6464
"contentRuntimes": [

0 commit comments

Comments
 (0)