Skip to content

Commit 5583706

Browse files
authored
Merge pull request #27769 from microsoftgraph/main
Merge main into live
2 parents 358e5ba + 0b869a2 commit 5583706

30 files changed

+425
-374
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,8 @@ Content-Type: application/json
196196
"isPasscodeRequired": false,
197197
"joinMeetingId": "1234567890",
198198
"passcode": null
199-
}
199+
},
200+
"meetingSpokenLanguageTag": "en-US"
200201
}
201202
```
202203
>**Note:** If 'Accept-Language: ja' is specified to indicate Japanese, for example, the response will include the following.

api-reference/beta/api/chatmessage-post.md

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1810,12 +1810,18 @@ Content-type: application/json
18101810

18111811
The following example shows how to send a message with a code block.
18121812

1813+
> [!NOTE]
1814+
> - To specify a language for syntax highlighting in a code block, use the `class` attribute in the `<codeblock>` HTML element.
1815+
> - If no language is specified, the code block defaults to plaintext formatting.
1816+
> - Supported languages include: `bash`, `c`, `cpp`, `csharp`, `css`, `dart`, `dockerfile`, `dos`, `go`, `graphql`, `html`, `http`, `java`, `javascript`, `json`, `jsp`, `jsx`, `kotlin`, `markdown`, `objectivec`, `octave`, `perl`, `php`, `powershell`, `python`, `r`, `ruby`, `rust`, `scala`, `scss`, `shell`, `sql`, `swift`, `typescript`, `vbnet`, `vbscript`, `verilog`, `vhdl`, `xml`, `yaml`, and `plaintext`.
1817+
1818+
18131819
#### Request
18141820

18151821
The following example shows a request.
18161822

18171823
> [!NOTE]
1818-
> The highlighted code isn't supported for code blocks when sending a chat message with a code block.
1824+
> - Highlighted code isn't supported when sending chat messages with code blocks
18191825
18201826
# [HTTP](#tab/http)
18211827
<!-- {
@@ -1831,7 +1837,7 @@ Content-type: application/json
18311837
{
18321838
"body": {
18331839
"contentType": "html",
1834-
"content": "<codeblock><code>Hello world</code></codeblock>"
1840+
"content": "<codeblock class=\"plaintext\"><code>Hello world</code></codeblock>"
18351841
}
18361842
}
18371843
```
@@ -1914,13 +1920,14 @@ Content-type: application/json
19141920
},
19151921
"body": {
19161922
"contentType": "html",
1917-
"content": "\n<codeblock class=\"\"><code>Hello world</code></codeblock>"
1923+
"content": "\n<codeblock class=\"plaintext\"><code>Hello world</code></codeblock>"
19181924
},
19191925
"attachments": [],
19201926
"mentions": [],
19211927
"reactions": []
19221928
}
19231929
```
1930+
19241931
### Example 15: Send a message with a Loop component
19251932

19261933
The following example shows how to send a message with an embedded Loop component. The Loop component is a special type of message that allows users to collaborate in real-time on a shared task or project. It can be used to create a collaborative workspace within a chat or channel.

api-reference/beta/api/driveitem-getretentionlabel.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ author: "kyracatwork"
55
ms.localizationpriority: medium
66
ms.subservice: "onedrive"
77
doc_type: apiPageType
8-
ms.date: 08/14/2024
8+
ms.date: 11/06/2025
99
---
1010

1111
# driveItem: getRetentionLabel
@@ -36,7 +36,6 @@ Choose the permission or permissions marked as least privileged for this API. Us
3636
}
3737
-->
3838
```http
39-
GET /driveitem/retentionLabel
4039
GET /drives/{drive-id}/items/{item-id}/retentionLabel
4140
GET /drives/{drive-id}/items/{item-id}?$expand=retentionLabel
4241
```
@@ -68,11 +67,11 @@ The following example shows a request.
6867
<!-- {
6968
"blockType": "request",
7069
"name": "driveItem_getRetentionLabel",
71-
"sampleKeys": ["22e064df-3562-4a3c-98c3-74721ca06aa0", "44d372fc-2eb6-4c85-8538-f3a0386a568f"]
70+
"sampleKeys": ["b!t18F8ybsHUq1z3LTz8xvZqP8zaSWjkFNhsME-Fepo75dTf9vQKfeRblBZjoSQrd7", "01NKDM7HMOJTVYMDOSXFDK2QJDXCDI3WUK"]
7271
}
7372
-->
7473
```http
75-
GET https://graph.microsoft.com/beta/drives/22e064df-3562-4a3c-98c3-74721ca06aa0/lists/documents/items/44d372fc-2eb6-4c85-8538-f3a0386a568f/driveitem/retentionLabel
74+
GET https://graph.microsoft.com/beta/drives/b!t18F8ybsHUq1z3LTz8xvZqP8zaSWjkFNhsME-Fepo75dTf9vQKfeRblBZjoSQrd7/items/01NKDM7HMOJTVYMDOSXFDK2QJDXCDI3WUK/retentionLabel
7675
```
7776

7877
### Response

api-reference/beta/api/driveitem-lockorunlockrecord.md

Lines changed: 3 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ author: "kyracatwork"
55
ms.localizationpriority: medium
66
ms.subservice: "onedrive"
77
doc_type: apiPageType
8-
ms.date: 08/14/2024
8+
ms.date: 11/06/2025
99
---
1010

1111
# driveItem: lockOrUnlockRecord
@@ -36,7 +36,6 @@ Choose the permission or permissions marked as least privileged for this API. Us
3636
}
3737
-->
3838
```http
39-
PATCH /driveitem/retentionLabel
4039
PATCH /drives/{drive-id}/items/{item-id}/retentionLabel
4140
```
4241

@@ -65,16 +64,15 @@ If successful, this method returns a `200 OK` response code and an updated [item
6564

6665
The following example shows a request.
6766

68-
# [HTTP](#tab/http)
6967
<!-- {
7068
"blockType": "request",
7169
"name": "driveItem_lockOrUnlockRecord",
72-
"sampleKeys": ["22e064df-3562-4a3c-98c3-74721ca06aa0", "44d372fc-2eb6-4c85-8538-f3a0386a568f"]
70+
"sampleKeys": ["b!t18F8ybsHUq1z3LTz8xvZqP8zaSWjkFNhsME-Fepo75dTf9vQKfeRblBZjoSQrd7", "01NKDM7HMOJTVYMDOSXFDK2QJDXCDI3WUK"]
7371
}
7472
-->
7573

7674
```http
77-
PATCH https://graph.microsoft.com/beta/drives/22e064df-3562-4a3c-98c3-74721ca06aa0/items/44d372fc-2eb6-4c85-8538-f3a0386a568f/retentionLabel
75+
PATCH https://graph.microsoft.com/beta/drives/b!t18F8ybsHUq1z3LTz8xvZqP8zaSWjkFNhsME-Fepo75dTf9vQKfeRblBZjoSQrd7/items/01NKDM7HMOJTVYMDOSXFDK2QJDXCDI3WUK/retentionLabel
7876
Content-Type: application/json
7977
8078
{
@@ -84,36 +82,6 @@ Content-Type: application/json
8482
}
8583
```
8684

87-
# [C#](#tab/csharp)
88-
[!INCLUDE [sample-code](../includes/snippets/csharp/driveitem-lockorunlockrecord-csharp-snippets.md)]
89-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
90-
91-
# [Go](#tab/go)
92-
[!INCLUDE [sample-code](../includes/snippets/go/driveitem-lockorunlockrecord-go-snippets.md)]
93-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
94-
95-
# [Java](#tab/java)
96-
[!INCLUDE [sample-code](../includes/snippets/java/driveitem-lockorunlockrecord-java-snippets.md)]
97-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
98-
99-
# [JavaScript](#tab/javascript)
100-
[!INCLUDE [sample-code](../includes/snippets/javascript/driveitem-lockorunlockrecord-javascript-snippets.md)]
101-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
102-
103-
# [PHP](#tab/php)
104-
[!INCLUDE [sample-code](../includes/snippets/php/driveitem-lockorunlockrecord-php-snippets.md)]
105-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
106-
107-
# [PowerShell](#tab/powershell)
108-
[!INCLUDE [sample-code](../includes/snippets/powershell/driveitem-lockorunlockrecord-powershell-snippets.md)]
109-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
110-
111-
# [Python](#tab/python)
112-
[!INCLUDE [sample-code](../includes/snippets/python/driveitem-lockorunlockrecord-python-snippets.md)]
113-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
114-
115-
---
116-
11785
### Response
11886

11987
The following example shows the response.

api-reference/beta/api/driveitem-removeretentionlabel.md

Lines changed: 3 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ author: "kyracatwork"
55
ms.localizationpriority: medium
66
ms.subservice: "onedrive"
77
doc_type: apiPageType
8-
ms.date: 08/14/2024
8+
ms.date: 11/06/2025
99
---
1010

1111
# driveItem: removeRetentionLabel
@@ -39,7 +39,6 @@ Choose the permission or permissions marked as least privileged for this API. Us
3939
}
4040
-->
4141
```http
42-
DELETE /driveitem/retentionLabel
4342
DELETE /drives/{drive-id}/items/{item-id}/retentionLabel
4443
```
4544

@@ -63,48 +62,17 @@ If successful, this method returns a `204 No Content` response code. It doesn't
6362

6463
The following example shows a request.
6564

66-
# [HTTP](#tab/http)
6765
<!-- {
6866
"blockType": "request",
6967
"name": "driveItem_removeRetentionLabel",
70-
"sampleKeys": ["22e064df-3562-4a3c-98c3-74721ca06aa0", "44d372fc-2eb6-4c85-8538-f3a0386a568f"]
68+
"sampleKeys": ["b!t18F8ybsHUq1z3LTz8xvZqP8zaSWjkFNhsME-Fepo75dTf9vQKfeRblBZjoSQrd7", "01NKDM7HMOJTVYMDOSXFDK2QJDXCDI3WUK"]
7169
}
7270
-->
7371

7472
```http
75-
DELETE https://graph.microsoft.com/beta/drives/22e064df-3562-4a3c-98c3-74721ca06aa0/items/44d372fc-2eb6-4c85-8538-f3a0386a568f/retentionLabel
73+
DELETE https://graph.microsoft.com/beta/drives/b!t18F8ybsHUq1z3LTz8xvZqP8zaSWjkFNhsME-Fepo75dTf9vQKfeRblBZjoSQrd7/items/01NKDM7HMOJTVYMDOSXFDK2QJDXCDI3WUK/retentionLabel
7674
```
7775

78-
# [C#](#tab/csharp)
79-
[!INCLUDE [sample-code](../includes/snippets/csharp/driveitem-removeretentionlabel-csharp-snippets.md)]
80-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
81-
82-
# [Go](#tab/go)
83-
[!INCLUDE [sample-code](../includes/snippets/go/driveitem-removeretentionlabel-go-snippets.md)]
84-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
85-
86-
# [Java](#tab/java)
87-
[!INCLUDE [sample-code](../includes/snippets/java/driveitem-removeretentionlabel-java-snippets.md)]
88-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
89-
90-
# [JavaScript](#tab/javascript)
91-
[!INCLUDE [sample-code](../includes/snippets/javascript/driveitem-removeretentionlabel-javascript-snippets.md)]
92-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
93-
94-
# [PHP](#tab/php)
95-
[!INCLUDE [sample-code](../includes/snippets/php/driveitem-removeretentionlabel-php-snippets.md)]
96-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
97-
98-
# [PowerShell](#tab/powershell)
99-
[!INCLUDE [sample-code](../includes/snippets/powershell/driveitem-removeretentionlabel-powershell-snippets.md)]
100-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
101-
102-
# [Python](#tab/python)
103-
[!INCLUDE [sample-code](../includes/snippets/python/driveitem-removeretentionlabel-python-snippets.md)]
104-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
105-
106-
---
107-
10876
### Response
10977

11078
The following example shows the response.

api-reference/beta/api/driveitem-setretentionlabel.md

Lines changed: 3 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ author: "kyracatwork"
55
ms.localizationpriority: medium
66
ms.subservice: "onedrive"
77
doc_type: apiPageType
8-
ms.date: 08/14/2024
8+
ms.date: 11/06/2025
99
---
1010

1111
# driveItem: setRetentionLabel
@@ -39,7 +39,6 @@ Choose the permission or permissions marked as least privileged for this API. Us
3939
}
4040
-->
4141
``` http
42-
PATCH /driveitem/retentionLabel
4342
PATCH /drives/{drive-id}/items/{item-id}/retentionLabel
4443
```
4544

@@ -68,53 +67,22 @@ When a file is applied with a retention label for the first time, this method re
6867

6968
The following example shows a request.
7069

71-
# [HTTP](#tab/http)
7270
<!-- {
7371
"blockType": "request",
7472
"name": "driveItem_setRetentionLabel",
75-
"sampleKeys": ["22e064df-3562-4a3c-98c3-74721ca06aa0", "44d372fc-2eb6-4c85-8538-f3a0386a568f"]
73+
"sampleKeys": ["b!t18F8ybsHUq1z3LTz8xvZqP8zaSWjkFNhsME-Fepo75dTf9vQKfeRblBZjoSQrd7", "01NKDM7HMOJTVYMDOSXFDK2QJDXCDI3WUK"]
7674
}
7775
-->
7876

7977
```http
80-
PATCH https://graph.microsoft.com/beta/drives/22e064df-3562-4a3c-98c3-74721ca06aa0/items/44d372fc-2eb6-4c85-8538-f3a0386a568f/retentionLabel
78+
PATCH https://graph.microsoft.com/beta/drives/b!t18F8ybsHUq1z3LTz8xvZqP8zaSWjkFNhsME-Fepo75dTf9vQKfeRblBZjoSQrd7/items/01NKDM7HMOJTVYMDOSXFDK2QJDXCDI3WUK/retentionLabel
8179
Content-Type: application/json
8280
8381
{
8482
"name": "Retention label for Contracts"
8583
}
8684
```
8785

88-
# [C#](#tab/csharp)
89-
[!INCLUDE [sample-code](../includes/snippets/csharp/driveitem-setretentionlabel-csharp-snippets.md)]
90-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
91-
92-
# [Go](#tab/go)
93-
[!INCLUDE [sample-code](../includes/snippets/go/driveitem-setretentionlabel-go-snippets.md)]
94-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
95-
96-
# [Java](#tab/java)
97-
[!INCLUDE [sample-code](../includes/snippets/java/driveitem-setretentionlabel-java-snippets.md)]
98-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
99-
100-
# [JavaScript](#tab/javascript)
101-
[!INCLUDE [sample-code](../includes/snippets/javascript/driveitem-setretentionlabel-javascript-snippets.md)]
102-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
103-
104-
# [PHP](#tab/php)
105-
[!INCLUDE [sample-code](../includes/snippets/php/driveitem-setretentionlabel-php-snippets.md)]
106-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
107-
108-
# [PowerShell](#tab/powershell)
109-
[!INCLUDE [sample-code](../includes/snippets/powershell/driveitem-setretentionlabel-powershell-snippets.md)]
110-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
111-
112-
# [Python](#tab/python)
113-
[!INCLUDE [sample-code](../includes/snippets/python/driveitem-setretentionlabel-python-snippets.md)]
114-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
115-
116-
---
117-
11886
### Response
11987

12088
The following example shows the response.

api-reference/beta/api/onlinemeeting-get.md

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -288,6 +288,7 @@ Content-Length: 1574
288288
},
289289
"creationDateTime": "2018-05-30T00:12:19.0726086Z",
290290
"endDateTime": "2018-05-30T01:00:00Z",
291+
"expiryDateTime": "2025-04-12T23:57:47.6388574Z",
291292
"id": "112f7296-5fa4-42ca-bae8-6a692b15d4b8_19:[email protected]",
292293
"joinWebUrl": "https://teams.microsoft.com/l/meetup-join/19%3a:[email protected]/0?context=%7b%22Tid%22%3a%aa674c-875-432d-bd41-3720e0a%22%2c%22Oid%22%3a%2f7296-5fa4-42ca-bae8-6a4b8%22%7d",
293294
"participants": {
@@ -332,10 +333,12 @@ Content-Length: 1574
332333
"joinMeetingId": "1234567890",
333334
"passcode": null
334335
},
336+
"meetingSpokenLanguageTag": "en-US",
335337
"isEntryExitAnnounced": true,
336338
"allowedPresenters": "everyone",
337339
"allowMeetingChat": "enabled",
338-
"allowTeamworkReactions": true
340+
"allowTeamworkReactions": true,
341+
"meetingOptionsWebUrl": "https://teams.microsoft.com/meetingOptions/?meetingId=abc123"
339342
}
340343
```
341344
>**Note:** If 'Accept-Language: ja' is specified to indicate Japanese, for example, the response will include the following.
@@ -380,6 +383,7 @@ The following example shows the response.
380383
"creationDateTime": "2020-09-29T22:35:33.1594516Z",
381384
"startDateTime": "2020-09-29T22:35:31.389759Z",
382385
"endDateTime": "2020-09-29T23:35:31.389759Z",
386+
"expiryDateTime": "2025-04-12T23:57:47.6388574Z",
383387
"joinWebUrl": "https://teams.microsoft.com/l/meetup-join/19%3ameeting_MGQ4YxODYzMmY2%40thread.v2/0?context=%7b%22Tid%22%3a%22c581-5130-43e9-88f3-fc82cde37%22%2c%22Oid%22%3a%22674c-81d9-4adb-bb2-8f62e4622%22%7d",
384388
"subject": null,
385389
"autoAdmittedUsers": "EveryoneInCompany",
@@ -413,7 +417,9 @@ The following example shows the response.
413417
"isPasscodeRequired": false,
414418
"joinMeetingId": "1234567890",
415419
"passcode": null
416-
}
420+
},
421+
"meetingOptionsWebUrl": "https://teams.microsoft.com/meetingOptions/?meetingId=abc123"
422+
"meetingSpokenLanguageTag": "en-US"
417423
}
418424
```
419425

@@ -483,7 +489,8 @@ The following example shows the response.
483489
"isPasscodeRequired": false,
484490
"joinMeetingId": "1234567890",
485491
"passcode": null
486-
}
492+
},
493+
"meetingOptionsWebUrl": "https://teams.microsoft.com/meetingOptions/?meetingId=abc123"
487494
}
488495
]
489496
}
@@ -593,7 +600,8 @@ Content-Type: application/json
593600
"isPasscodeRequired": false,
594601
"joinMeetingId": "1234567890",
595602
"passcode": null
596-
}
603+
},
604+
"meetingOptionsWebUrl": "https://teams.microsoft.com/meetingOptions/?meetingId=abc123"
597605
}
598606
]
599607
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ The last column indicates whether updating this property takes effect for an in-
106106
| isEndToEndEncryptionEnabled | Boolean | Indicates whether end-to-end encryption (E2EE) is enabled for the meeting. | No |
107107
| isEntryExitAnnounced | Boolean | Whether or not to announce when callers join or leave. | Yes |
108108
| lobbyBypassSettings | [lobbyBypassSettings](../resources/lobbybypasssettings.md) | Specifies which participants can bypass the meeting lobby. | Yes |
109+
| meetingSpokenLanguageTag | String | Specifies the spoken language used during the meeting for recording and transcription purposes. | No |
109110
| participants | [meetingParticipants](../resources/meetingparticipants.md) | The participants associated with the online meeting. Only attendees can be updated. | No |
110111
| recordAutomatically | Boolean | Indicates whether to record the meeting automatically. | No |
111112
| startDateTime | DateTime | The meeting start time in UTC. | No |

api-reference/beta/api/virtualevent-list-sessions.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,8 @@ Content-Type: application/json
165165
"allowTeamworkReactions": null,
166166
"recordAutomatically": null,
167167
"watermarkProtection": null,
168-
"allowParticipantsToChangeName": null
168+
"allowParticipantsToChangeName": null,
169+
"meetingSpokenLanguageTag": "en-US"
169170
}
170171
]
171172
}

api-reference/beta/api/virtualeventsession-get.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,8 @@ Content-Type: application/json
168168
"allowTeamworkReactions": null,
169169
"recordAutomatically": null,
170170
"watermarkProtection": null,
171-
"allowParticipantsToChangeName": null
171+
"allowParticipantsToChangeName": null,
172+
"meetingSpokenLanguageTag": "en-US"
172173
}
173174
}
174175
```

0 commit comments

Comments
 (0)