Skip to content

Commit 5750301

Browse files
authored
Merge pull request #26311 from microsoftgraph/main
Publish to live
2 parents c6006ca + 4458a5a commit 5750301

File tree

283 files changed

+5004
-777
lines changed

Some content is hidden

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

283 files changed

+5004
-777
lines changed

.github/pull_request_template.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ Add other supporting information, such as a description of the PR changes:
1515
1616

1717
- **do not merge** is the default PR status and is automatically added to all open PRs that don't have the **ready to merge** label.
18-
- Add the **ready for content review** label to start a review. Only PRs that have met the [minimum requirements for content review](https://dev.azure.com/msazure/One/_wiki/wikis/Microsoft%20Graph%20Partners/707655/Minimum-requirements-for-content-review) and have this label are reviewed.
18+
- Add the **ready for content review** label to start a review. Only PRs that have met the [minimum requirements for content review](https://eng.ms/cid/27dee76c-3a60-4e65-8fdf-08ea849b3498/fid/679c4bf497d767aa4c1e409cd143d7109564b93a118c29e0e11b15eb04b78844) and have this label are reviewed.
1919
- If your content reviewer requests changes, review the feedback and address accordingly as soon as possible to keep your pull request moving forward. After you address the feedback, remove the **changes requested** label, add the **review feedback addressed** label, and select the **Re-request review** icon next to the content reviewer's alias. If you can't add labels, add a comment with `#feedback-addressed` to the pull request.
2020
- After the content review is complete, your reviewer will add the **content review complete** label. When the updates in this PR are ready for external customers to use, replace the **do not merge** label with **ready to merge** and the PR will be merged within 24 working hours.
2121
- Pull requests that are inactive for more than 6 weeks will be automatically closed. Before that, you receive reminders at 2 weeks, 4 weeks, and 6 weeks. If you still need the PR, you can reopen or recreate the request.
2222

23-
For more information, see the [Content review process summary](https://dev.azure.com/msazure/One/_wiki/wikis/Microsoft%20Graph%20Partners/614263/Content-workflow).
23+
For more information, see the [Content review process summary](https://eng.ms/cid/27dee76c-3a60-4e65-8fdf-08ea849b3498/fid/3a993b6c9d547e46f59d8d7851f191c38bbbea6ead01253dc62fcdd8101a1ff9).
2424

2525
</details>

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

Lines changed: 102 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,105 @@ Location: /chats('19:82fe7758-5bb3-4f0d-a43f-e555fd399c6f_bfb5bb25-3a8d-487d-982
361361

362362
The async operation is initiated, and the response contains a Location header, which includes a link to the [teamsAsyncOperation](../resources/teamsasyncoperation.md). The link can be used to get the operation status and details. For details, see [Get operation on chat](teamsasyncoperation-get.md#example-get-operation-on-chat).
363363

364-
### Example 4: Create a one-on-one chat using user principal name
364+
### Example 4: Create a one-on-one chat with RSC-granted apps
365+
366+
The following example shows how to create a one-on-one chat with installed apps that have resource-specific consent (RSC) permissions.
367+
368+
#### Request
369+
370+
The following example shows a request.
371+
372+
# [HTTP](#tab/http)
373+
<!-- {
374+
"blockType": "request",
375+
"name": "create_chat_oneonone_with_rsc_granted_apps"
376+
}
377+
-->
378+
``` http
379+
POST https://graph.microsoft.com/beta/chats
380+
Content-Type: application/json
381+
382+
{
383+
"chatType": "oneOnOne",
384+
"members": [
385+
{
386+
"@odata.type": "#microsoft.graph.aadUserConversationMember",
387+
"roles": ["owner"],
388+
"user@odata.bind": "https://graph.microsoft.com/beta/users('4b822dfc-2864-44e6-aa1e-7e0e8552168f')"
389+
},
390+
{
391+
"@odata.type": "#microsoft.graph.aadUserConversationMember",
392+
"roles": ["owner"],
393+
"user@odata.bind": "https://graph.microsoft.com/beta/users('6d1e1501-7a3d-45b7-b71b-68d372e5ce14')"
394+
}
395+
],
396+
"installedApps": [
397+
{
398+
"teamsApp@odata.bind": "https://graph.microsoft.com/beta/appCatalogs/teamsApps/8e55a7b1-6766-4f0a-8610-ecacfe3d569a",
399+
"consentedPermissionSet": {
400+
"resourceSpecificPermissions": [
401+
{
402+
"permissionValue": "ChatMessage.Read.Chat",
403+
"permissionType": "application"
404+
},
405+
{
406+
"permissionValue": "OnlineMeeting.ReadBasic.Chat",
407+
"permissionType": "application"
408+
}
409+
]
410+
}
411+
}
412+
]
413+
}
414+
```
415+
416+
# [C#](#tab/csharp)
417+
[!INCLUDE [sample-code](../includes/snippets/csharp/create-chat-oneonone-with-rsc-granted-apps-csharp-snippets.md)]
418+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
419+
420+
# [CLI](#tab/cli)
421+
[!INCLUDE [sample-code](../includes/snippets/cli/create-chat-oneonone-with-rsc-granted-apps-cli-snippets.md)]
422+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
423+
424+
# [Go](#tab/go)
425+
[!INCLUDE [sample-code](../includes/snippets/go/create-chat-oneonone-with-rsc-granted-apps-go-snippets.md)]
426+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
427+
428+
# [Java](#tab/java)
429+
[!INCLUDE [sample-code](../includes/snippets/java/create-chat-oneonone-with-rsc-granted-apps-java-snippets.md)]
430+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
431+
432+
# [JavaScript](#tab/javascript)
433+
[!INCLUDE [sample-code](../includes/snippets/javascript/create-chat-oneonone-with-rsc-granted-apps-javascript-snippets.md)]
434+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
435+
436+
# [PHP](#tab/php)
437+
[!INCLUDE [sample-code](../includes/snippets/php/create-chat-oneonone-with-rsc-granted-apps-php-snippets.md)]
438+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
439+
440+
# [PowerShell](#tab/powershell)
441+
[!INCLUDE [sample-code](../includes/snippets/powershell/create-chat-oneonone-with-rsc-granted-apps-powershell-snippets.md)]
442+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
443+
444+
# [Python](#tab/python)
445+
[!INCLUDE [sample-code](../includes/snippets/python/create-chat-oneonone-with-rsc-granted-apps-python-snippets.md)]
446+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
447+
448+
---
449+
450+
#### Response
451+
The following example shows the response.
452+
<!-- {
453+
"blockType": "response"
454+
}
455+
-->
456+
```http
457+
HTTP/1.1 202 Accepted
458+
Content-Type: application/json
459+
Location: /chats('19:82fe7758-5bb3-4f0d-a43f-e555fd399c6f_bfb5bb25-3a8d-487d-9828-7875ced51a30@unq.gbl.spaces')/operations('2432b57b-0abd-43db-aa7b-16eadd115d34-861f06db-0208-4815-b67a-965df0d28b7f-10adc8a6-60db-42e2-9761-e56a7e4c7bc9')
460+
```
461+
462+
### Example 5: Create a one-on-one chat using user principal name
365463

366464
#### Request
367465

@@ -465,7 +563,7 @@ Content-Type: application/json
465563
}
466564
```
467565

468-
### Example 5: Create a group chat with in-tenant guest
566+
### Example 6: Create a group chat with in-tenant guest
469567

470568
#### Request
471569

@@ -574,7 +672,7 @@ Content-Type: application/json
574672
}
575673
```
576674

577-
### Example 6: Create a one-on-one chat with a federated user (outside of own organization)
675+
### Example 7: Create a one-on-one chat with a federated user (outside of own organization)
578676

579677
#### Request
580678

@@ -655,7 +753,7 @@ HTTP/1.1 201 Created
655753
Content-Type: application/json
656754
657755
{
658-
"@odata.context": "https://graph.microsoft.com/v1.0/$metadata#chats/$entity",
756+
"@odata.context": "https://graph.microsoft.com/beta/$metadata#chats/$entity",
659757
"id": "19:82af01c5-f7cc-4a2e-a728-3a5df21afd9d_8b081ef6-4792-4def-b2c9-c363a1bf41d5@unq.gbl.spaces",
660758
"topic": null,
661759
"createdDateTime": "2020-12-04T23:10:28.51Z",

api-reference/beta/api/cloudpcreports-getconnectionqualityreports.md

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ If successful, this action returns a `200 OK` response code and a Stream in the
7171

7272
The following example shows a request.
7373

74+
# [HTTP](#tab/http)
7475
<!-- {
7576
"blockType": "request",
7677
"name": "cloudpcreportsthis.getconnectionqualityreports"
@@ -103,6 +104,36 @@ Content-length: 200
103104
}
104105
```
105106

107+
# [C#](#tab/csharp)
108+
[!INCLUDE [sample-code](../includes/snippets/csharp/cloudpcreportsthisgetconnectionqualityreports-csharp-snippets.md)]
109+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
110+
111+
# [CLI](#tab/cli)
112+
[!INCLUDE [sample-code](../includes/snippets/cli/cloudpcreportsthisgetconnectionqualityreports-cli-snippets.md)]
113+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
114+
115+
# [Go](#tab/go)
116+
[!INCLUDE [sample-code](../includes/snippets/go/cloudpcreportsthisgetconnectionqualityreports-go-snippets.md)]
117+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
118+
119+
# [Java](#tab/java)
120+
[!INCLUDE [sample-code](../includes/snippets/java/cloudpcreportsthisgetconnectionqualityreports-java-snippets.md)]
121+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
122+
123+
# [JavaScript](#tab/javascript)
124+
[!INCLUDE [sample-code](../includes/snippets/javascript/cloudpcreportsthisgetconnectionqualityreports-javascript-snippets.md)]
125+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
126+
127+
# [PHP](#tab/php)
128+
[!INCLUDE [sample-code](../includes/snippets/php/cloudpcreportsthisgetconnectionqualityreports-php-snippets.md)]
129+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
130+
131+
# [Python](#tab/python)
132+
[!INCLUDE [sample-code](../includes/snippets/python/cloudpcreportsthisgetconnectionqualityreports-python-snippets.md)]
133+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
134+
135+
---
136+
106137
### Response
107138

108139
The following example shows the response.

api-reference/beta/api/cloudpcreports-getdailyaggregatedremoteconnectionreports.md

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ If successful, this action returns a `200 OK` response code and a Stream in the
6565
### Request
6666
The following example shows a request.
6767

68+
# [HTTP](#tab/http)
6869
<!-- {
6970
"blockType": "request",
7071
"name": "cloudpcreportsthis.getdailyaggregatedremoteconnectionreports"
@@ -84,6 +85,36 @@ Content-length: 199
8485
}
8586
```
8687

88+
# [C#](#tab/csharp)
89+
[!INCLUDE [sample-code](../includes/snippets/csharp/cloudpcreportsthisgetdailyaggregatedremoteconnectionreports-csharp-snippets.md)]
90+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
91+
92+
# [CLI](#tab/cli)
93+
[!INCLUDE [sample-code](../includes/snippets/cli/cloudpcreportsthisgetdailyaggregatedremoteconnectionreports-cli-snippets.md)]
94+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
95+
96+
# [Go](#tab/go)
97+
[!INCLUDE [sample-code](../includes/snippets/go/cloudpcreportsthisgetdailyaggregatedremoteconnectionreports-go-snippets.md)]
98+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
99+
100+
# [Java](#tab/java)
101+
[!INCLUDE [sample-code](../includes/snippets/java/cloudpcreportsthisgetdailyaggregatedremoteconnectionreports-java-snippets.md)]
102+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
103+
104+
# [JavaScript](#tab/javascript)
105+
[!INCLUDE [sample-code](../includes/snippets/javascript/cloudpcreportsthisgetdailyaggregatedremoteconnectionreports-javascript-snippets.md)]
106+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
107+
108+
# [PHP](#tab/php)
109+
[!INCLUDE [sample-code](../includes/snippets/php/cloudpcreportsthisgetdailyaggregatedremoteconnectionreports-php-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/cloudpcreportsthisgetdailyaggregatedremoteconnectionreports-python-snippets.md)]
114+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
115+
116+
---
117+
87118
### Response
88119
The following example shows the response.
89120
>**Note:** The response object shown here might be shortened for readability.

api-reference/beta/api/cloudpcreports-getrawremoteconnectionreports.md

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ If successful, this action returns a `200 OK` response code and a Stream in the
6565

6666
The following example shows a request.
6767

68+
# [HTTP](#tab/http)
6869
<!-- {
6970
"blockType": "request",
7071
"name": "cloudpcreportsthis.getrawremoteconnectionreports"
@@ -83,6 +84,36 @@ Content-length: 199
8384
}
8485
```
8586

87+
# [C#](#tab/csharp)
88+
[!INCLUDE [sample-code](../includes/snippets/csharp/cloudpcreportsthisgetrawremoteconnectionreports-csharp-snippets.md)]
89+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
90+
91+
# [CLI](#tab/cli)
92+
[!INCLUDE [sample-code](../includes/snippets/cli/cloudpcreportsthisgetrawremoteconnectionreports-cli-snippets.md)]
93+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
94+
95+
# [Go](#tab/go)
96+
[!INCLUDE [sample-code](../includes/snippets/go/cloudpcreportsthisgetrawremoteconnectionreports-go-snippets.md)]
97+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
98+
99+
# [Java](#tab/java)
100+
[!INCLUDE [sample-code](../includes/snippets/java/cloudpcreportsthisgetrawremoteconnectionreports-java-snippets.md)]
101+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
102+
103+
# [JavaScript](#tab/javascript)
104+
[!INCLUDE [sample-code](../includes/snippets/javascript/cloudpcreportsthisgetrawremoteconnectionreports-javascript-snippets.md)]
105+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
106+
107+
# [PHP](#tab/php)
108+
[!INCLUDE [sample-code](../includes/snippets/php/cloudpcreportsthisgetrawremoteconnectionreports-php-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/cloudpcreportsthisgetrawremoteconnectionreports-python-snippets.md)]
113+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
114+
115+
---
116+
86117
### Response
87118

88119
The following example shows the response.

api-reference/beta/api/cloudpcreports-getremoteconnectionhistoricalreports.md

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ If successful, this action returns a `200 OK` response code and a Stream in the
6565
### Request
6666
The following example shows a request.
6767

68+
# [HTTP](#tab/http)
6869
<!-- {
6970
"blockType": "request",
7071
"name": "cloudpcreportsthis.getremoteconnectionhistoricalreports"
@@ -90,6 +91,36 @@ Content-length: 199
9091
}
9192
```
9293

94+
# [C#](#tab/csharp)
95+
[!INCLUDE [sample-code](../includes/snippets/csharp/cloudpcreportsthisgetremoteconnectionhistoricalreports-csharp-snippets.md)]
96+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
97+
98+
# [CLI](#tab/cli)
99+
[!INCLUDE [sample-code](../includes/snippets/cli/cloudpcreportsthisgetremoteconnectionhistoricalreports-cli-snippets.md)]
100+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
101+
102+
# [Go](#tab/go)
103+
[!INCLUDE [sample-code](../includes/snippets/go/cloudpcreportsthisgetremoteconnectionhistoricalreports-go-snippets.md)]
104+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
105+
106+
# [Java](#tab/java)
107+
[!INCLUDE [sample-code](../includes/snippets/java/cloudpcreportsthisgetremoteconnectionhistoricalreports-java-snippets.md)]
108+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
109+
110+
# [JavaScript](#tab/javascript)
111+
[!INCLUDE [sample-code](../includes/snippets/javascript/cloudpcreportsthisgetremoteconnectionhistoricalreports-javascript-snippets.md)]
112+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
113+
114+
# [PHP](#tab/php)
115+
[!INCLUDE [sample-code](../includes/snippets/php/cloudpcreportsthisgetremoteconnectionhistoricalreports-php-snippets.md)]
116+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
117+
118+
# [Python](#tab/python)
119+
[!INCLUDE [sample-code](../includes/snippets/python/cloudpcreportsthisgetremoteconnectionhistoricalreports-python-snippets.md)]
120+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
121+
122+
---
123+
93124
### Response
94125
The following example shows the response
95126
>**Note:** The response object shown here might be shortened for readability.

api-reference/beta/api/cloudpcreports-post-exportjobs.md

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,7 @@ The following example shows how to create an export job to download the `RemoteC
166166

167167
The following example shows a request.
168168

169+
# [HTTP](#tab/http)
169170
<!-- {
170171
"blockType": "request",
171172
"name": "create_cloudpcexportjob_from_example2"
@@ -195,6 +196,40 @@ Content-length: 315
195196
}
196197
```
197198

199+
# [C#](#tab/csharp)
200+
[!INCLUDE [sample-code](../includes/snippets/csharp/create-cloudpcexportjob-from-example2-csharp-snippets.md)]
201+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
202+
203+
# [CLI](#tab/cli)
204+
[!INCLUDE [sample-code](../includes/snippets/cli/create-cloudpcexportjob-from-example2-cli-snippets.md)]
205+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
206+
207+
# [Go](#tab/go)
208+
[!INCLUDE [sample-code](../includes/snippets/go/create-cloudpcexportjob-from-example2-go-snippets.md)]
209+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
210+
211+
# [Java](#tab/java)
212+
[!INCLUDE [sample-code](../includes/snippets/java/create-cloudpcexportjob-from-example2-java-snippets.md)]
213+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
214+
215+
# [JavaScript](#tab/javascript)
216+
[!INCLUDE [sample-code](../includes/snippets/javascript/create-cloudpcexportjob-from-example2-javascript-snippets.md)]
217+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
218+
219+
# [PHP](#tab/php)
220+
[!INCLUDE [sample-code](../includes/snippets/php/create-cloudpcexportjob-from-example2-php-snippets.md)]
221+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
222+
223+
# [PowerShell](#tab/powershell)
224+
[!INCLUDE [sample-code](../includes/snippets/powershell/create-cloudpcexportjob-from-example2-powershell-snippets.md)]
225+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
226+
227+
# [Python](#tab/python)
228+
[!INCLUDE [sample-code](../includes/snippets/python/create-cloudpcexportjob-from-example2-python-snippets.md)]
229+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
230+
231+
---
232+
198233
#### Response
199234

200235
The following example shows the response.

api-reference/beta/api/cloudpcreports-retrievecloudpctenantmetricsreport.md

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

1717
Get a report related to the performance of Cloud PCs.
1818

19-
[!INCLUDE [national-cloud-support](../../includes/global-us.md)]
19+
[!INCLUDE [national-cloud-support](../../includes/global-only.md)]
2020

2121
## Permissions
2222

@@ -285,4 +285,4 @@ HTTP/1.1 200 OK
285285
]
286286
]
287287
}
288-
```
288+
```

0 commit comments

Comments
 (0)