Skip to content

Commit 015995a

Browse files
authored
Merge branch 'main' into hut/healthMonitoringDocs
2 parents a48f3e4 + 2d44d80 commit 015995a

File tree

651 files changed

+9136
-3145
lines changed

Some content is hidden

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

651 files changed

+9136
-3145
lines changed

.openpublishing.redirection.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,4 +271,4 @@
271271
"redirect_document_id": false
272272
}
273273
]
274-
}
274+
}

api-reference/beta/api/application-post-federatedidentitycredentials.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ The following table lists the properties that are required when you create the [
4444

4545
|Property|Type|Description|
4646
|:---|:---|:---|
47-
|audiences|String collection|The audience that can appear in the external token. This field is mandatory and should be set to `api://AzureADTokenExchange` for Microsoft Entra ID. It says what Microsoft identity platform should accept in the `aud` claim in the incoming token. This value represents Microsoft Entra ID in your external identity provider and has no fixed value across identity providers - you may need to create a new application registration in your identity provider to serve as the audience of this token. This field can only accept a single value and has a limit of 600 characters. Required.|
48-
|issuer|String|TThe URL of the external identity provider and must match the issuer claim of the external token being exchanged. The combination of the values of **issuer** and **subject** must be unique on the app. It has a limit of 600 characters. Required.|
49-
|name|String|The unique identifier for the federated identity credential, which has a limit of 120 characters and must be URL friendly. It is immutable once created|
47+
|audiences|String collection|Required. The audience that can appear in the external token. This field is mandatory and should be set to `api://AzureADTokenExchange` for Microsoft Entra ID. It says what Microsoft identity platform should accept in the `aud` claim in the incoming token. This value represents Microsoft Entra ID in your external identity provider and has no fixed value across identity providers - you may need to create a new application registration in your identity provider to serve as the audience of this token. This field can only accept a single value and has a limit of 600 characters.|
48+
|issuer|String|Required. The URL of the external identity provider and must match the issuer claim of the external token being exchanged. The combination of the values of **issuer** and **subject** must be unique on the app. It has a limit of 600 characters.|
49+
|name|String|Required. The unique identifier for the federated identity credential, which has a limit of 120 characters and must be URL friendly. It is immutable once created.|
5050
|subject|String|Required. The identifier of the external software workload within the external identity provider. Like the audience value, it has no fixed format, as each identity provider uses their own - sometimes a GUID, sometimes a colon delimited identifier, sometimes arbitrary strings. The value here must match the sub claim within the token presented to Microsoft Entra ID. It has a limit of 600 characters. The combination of **issuer** and **subject** must be unique on the app.|
5151

5252

api-reference/beta/api/applicationtemplate-instantiate.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ In the request body, provide a JSON object with the following parameters.
4949
| Parameter | Type | Description |
5050
|:-------------|:------------|:------------|
5151
|displayName|String|Custom name of the application|
52+
|serviceManagementReference|String|The service tree ID for this service. Optional.|
5253

5354
## Response
5455

@@ -60,7 +61,7 @@ The following example shows how to call this API.
6061

6162
### Request
6263

63-
The following example shows a request. The request URL specifies `8adf8e6e-67b2-4cf2-a259-e3dc5476c621` as the application template ID. This means the request is instantiating a non-gallery app.
64+
The following example shows a request. The request URL specifies `8adf8e6e-67b2-4cf2-a259-e3dc5476c621` as the application template ID, which means that the request is instantiating a non-gallery app.
6465

6566
# [HTTP](#tab/http)
6667
<!-- {

api-reference/beta/api/backuprestoreroot-enable.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ Namespace: microsoft.graph
1616

1717
Enable the [Microsoft 365 Backup Storage](../resources/backuprestoreroot.md) service for a tenant.
1818

19-
Before you call this API, call [List protection policies](../api/backuprestoreroot-list-protectionpolicies.md) to initialize the data store in the tenant. Data store initialization takes about 5 minutes. If you call this API before the data store is initialized, the call results in an error.
20-
2119
[!INCLUDE [national-cloud-support](../../includes/global-only.md)]
2220

2321
## Permissions

api-reference/beta/api/businessscenarioplanner-delete-tasks.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ DELETE /solutions/businessScenarios/{businessScenarioId}/planner/tasks/{business
3939
|Name|Description|
4040
|:---|:---|
4141
|Authorization|Bearer {token}. Required. Learn more about [authentication and authorization](/graph/auth/auth-concepts).|
42+
| If-Match | Last known ETag value for the **businessScenarioTask** to be updated. Required.|
4243

4344
## Request body
4445

@@ -63,6 +64,7 @@ The following example shows a request.
6364
-->
6465
``` http
6566
DELETE https://graph.microsoft.com/beta/solutions/businessScenarios/c5d514e6c6864911ac46c720affb6e4d/planner/tasks/pmc1rS1Io0C3rXQhyXIsNmUAOeIi
67+
If-Match: W/"JzEtVGFzayAgQEBAQEBAQEBAQEBAQEBAWCc="
6668
```
6769

6870
# [C#](#tab/csharp)

api-reference/beta/api/businessscenariotask-update.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ PATCH /solutions/businessScenarios/{businessScenarioId}/planner/tasks/{businessS
4040
|:---|:---|
4141
|Authorization|Bearer {token}. Required. Learn more about [authentication and authorization](/graph/auth/auth-concepts).|
4242
|Content-Type|application/json. Required.|
43+
| If-Match | Last known ETag value for the **businessScenarioTask** to be updated. Required.|
4344

4445
## Request body
4546

@@ -82,6 +83,7 @@ The following example shows a request.
8283
``` http
8384
PATCH https://graph.microsoft.com/beta/solutions/businessScenarios/c5d514e6c6864911ac46c720affb6e4d/planner/tasks/pmc1rS1Io0C3rXQhyXIsNmUAOeIi
8485
Content-Type: application/json
86+
If-Match: W/"JzEtVGFzayAgQEBAQEBAQEBAQEBAQEBAWCc="
8587
8688
{
8789
"title": "Customer order #12010",

api-reference/beta/api/channel-getallretainedmessages.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: "channel: getAllRetainedMessages"
3-
description: "Get retained messages across all channels in a team."
3+
description: "Get all retained messages across all channels in a team."
44
author: "AgnesLiu"
55
ms.localizationpriority: medium
66
ms.subservice: "teams"
@@ -13,7 +13,7 @@ Namespace: microsoft.graph
1313

1414
[!INCLUDE [beta-disclaimer](../../includes/beta-disclaimer.md)]
1515

16-
Get retained [messages](../resources/chatmessage.md) across all [channels](../resources/channel.md) in a [team](../resources/team.md).
16+
Get all retained [messages](../resources/chatmessage.md) across all [channels](../resources/channel.md) in a [team](../resources/team.md).
1717

1818
To learn more about how to use the Microsoft Teams export APIs to export content, see [Export content with the Microsoft Teams export APIs](/microsoftteams/export-teams-content).
1919

api-reference/beta/api/channel-list-messages.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,6 @@ This method supports the following [OData query parameters](/graph/query-paramet
5252

5353
The other [OData query parameters](/graph/query-parameters) aren't currently supported.
5454

55-
> **Note:** [GET /teams/{team-id}/channels/{channel-id}/messages/delta](chatmessage-delta.md) supports filtering by date, which provides similar data to GET /teams/{team-id}/channels/{channel-id}/messages .
56-
5755
## Request headers
5856

5957
| Header | Value |

api-reference/beta/api/chat-getallretainedmessages.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: "chat: getAllRetainedMessages"
3-
description: "Get retained messages from all chats that a user is a participant in, including one-on-one chats, group chats, and meeting chats."
3+
description: "Get all retained messages from all chats that a user is a participant in, including one-on-one chats, group chats, and meeting chats."
44
author: "AgnesLiu"
55
ms.localizationpriority: medium
66
ms.subservice: "teams"
@@ -13,7 +13,7 @@ Namespace: microsoft.graph
1313

1414
[!INCLUDE [beta-disclaimer](../../includes/beta-disclaimer.md)]
1515

16-
Get all retained messages from all [chats](../resources/chatmessage.md) that a user is a participant in, including one-on-one chats, group chats, and meeting chats.
16+
Get all retained [messages](../resources/chatmessage.md) from all [chats](../resources/chat.md) that a user is a participant in, including one-on-one chats, group chats, and meeting chats.
1717

1818
To learn more about how to use the Microsoft Teams export APIs to export content, see [Export content with the Microsoft Teams export APIs](/microsoftteams/export-teams-content).
1919

@@ -67,8 +67,8 @@ The following table lists examples that show how to use the `$filter` parameter.
6767

6868
|Scenario | `$filter` parameter |Possible values |
6969
|:-----------------------------------------|:---------------------------------------------------------------------------------------|:-----------------------------------------------------------------------------------------------------------|
70-
|Get messages sent by user identity type |$filter=from/user/userIdentityType eq '{teamworkUserIdentityType}' |aadUser, onPremiseAadUser, anonymousGuest, federatedUser, personalMicrosoftAccountUser, skypeUser, phoneUser|
71-
|Get messages sent by application type |$filter=from/application/applicationIdentityType eq '{teamworkApplicationIdentity}' |aadApplication, bot, tenantBot, office365Connector, outgoingWebhook |
70+
|Get messages sent by user identity type |$filter=from/user/userIdentityType eq '{teamworkUserIdentityType}' |`aadUser`, `onPremiseAadUser`, `anonymousGuest`, `federatedUser`, `personalMicrosoftAccountUser`, `skypeUser`, `phoneUser`|
71+
|Get messages sent by application type |$filter=from/application/applicationIdentityType eq '{teamworkApplicationIdentity}' |`aadApplication`, `bot`, `tenantBot`, `office365Connector`, `outgoingWebhook` |
7272
|Get messages sent by user ID |$filter=from/user/id eq '{oid}' ||
7373
|Get control (system event) messages |$filter=messageType eq 'systemEventMessage' ||
7474
|Exclude control (system event) messages |$filter=messageType ne 'systemEventMessage' ||

0 commit comments

Comments
 (0)