Skip to content

Commit f8c2a84

Browse files
mnorman-msmnorman-ms
authored
Merge branch 'main' into ReviewSetTagsdocumentation
2 parents 362d38b + 648092c commit f8c2a84

File tree

548 files changed

+10967
-1001
lines changed

Some content is hidden

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

548 files changed

+10967
-1001
lines changed

‎.vscode/settings.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"githubPullRequests.ignoredPullRequestBranches": [
3+
"main",
34
"main"
45
],
56
"json.schemas": [

‎api-reference/beta/api/accessreviewpolicy-get.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ Choose the permission or permissions marked as least privileged for this API. Us
2323
<!-- { "blockType": "permissions", "name": "accessreviewpolicy_get" } -->
2424
[!INCLUDE [permissions-table](../includes/permissions/accessreviewpolicy-get-permissions.md)]
2525

26+
[!INCLUDE [rbac-access-review-policy-apis-read](../includes/rbac-for-apis/rbac-access-review-policy-apis-read.md)]
27+
2628
## HTTP request
2729

2830
<!-- {

‎api-reference/beta/api/accessreviewpolicy-update.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ Choose the permission or permissions marked as least privileged for this API. Us
2323
<!-- { "blockType": "permissions", "name": "accessreviewpolicy_update" } -->
2424
[!INCLUDE [permissions-table](../includes/permissions/accessreviewpolicy-update-permissions.md)]
2525

26+
[!INCLUDE [rbac-access-review-policy-apis-update](../includes/rbac-for-apis/rbac-access-review-policy-apis-update.md)]
27+
2628
## HTTP request
2729

2830
<!-- {

‎api-reference/beta/api/activitybasedtimeoutpolicy-post-activitybasedtimeoutpolicies.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Choose the permission or permissions marked as least privileged for this API. Us
3030
<!-- { "blockType": "ignored" } -->
3131

3232
```http
33-
POST policies/activityBasedTimeoutPolicies
33+
POST /policies/activityBasedTimeoutPolicies
3434
```
3535

3636
## Request headers

‎api-reference/beta/api/activitybasedtimeoutpolicy-update.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ In the request body, supply the values for relevant fields that should be update
4747
| Property | Type | Description |
4848
|:-------------|:------------|:------------|
4949
|definition|String collection| A string collection containing a JSON string that defines the rules and settings for this policy. Required.|
50-
|description|String| Description for this policy.|
5150
|displayName|String| Display name for this policy. Required.|
5251
|isOrganizationDefault|Boolean|If set to true, activates this policy. There can be many policies for the same policy type, but only one can be activated as the organization default. Optional, default value is false.|
5352

‎api-reference/beta/api/aiinteractionhistory-getallenterpriseinteractions.md

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ The following example shows a request that gets all the Copilot interactions for
6767

6868
The following example shows a request.
6969

70+
# [HTTP](#tab/http)
7071
<!-- {
7172
"blockType": "request",
7273
"name": "aiInteraction_getAllEnterpriseInteractions_1"
@@ -75,6 +76,36 @@ The following example shows a request.
7576
GET https://graph.microsoft.com/beta/copilot/users/9fcefe95-9677-483e-a3c1-22c5d501d737/interactionHistory/getAllEnterpriseInteractions
7677
```
7778

79+
# [C#](#tab/csharp)
80+
[!INCLUDE [sample-code](../includes/snippets/csharp/aiinteraction-getallenterpriseinteractions-1-csharp-snippets.md)]
81+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
82+
83+
# [CLI](#tab/cli)
84+
[!INCLUDE [sample-code](../includes/snippets/cli/aiinteraction-getallenterpriseinteractions-1-cli-snippets.md)]
85+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
86+
87+
# [Go](#tab/go)
88+
[!INCLUDE [sample-code](../includes/snippets/go/aiinteraction-getallenterpriseinteractions-1-go-snippets.md)]
89+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
90+
91+
# [Java](#tab/java)
92+
[!INCLUDE [sample-code](../includes/snippets/java/aiinteraction-getallenterpriseinteractions-1-java-snippets.md)]
93+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
94+
95+
# [JavaScript](#tab/javascript)
96+
[!INCLUDE [sample-code](../includes/snippets/javascript/aiinteraction-getallenterpriseinteractions-1-javascript-snippets.md)]
97+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
98+
99+
# [PHP](#tab/php)
100+
[!INCLUDE [sample-code](../includes/snippets/php/aiinteraction-getallenterpriseinteractions-1-php-snippets.md)]
101+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
102+
103+
# [Python](#tab/python)
104+
[!INCLUDE [sample-code](../includes/snippets/python/aiinteraction-getallenterpriseinteractions-1-python-snippets.md)]
105+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
106+
107+
---
108+
78109
#### Response
79110

80111
The following example shows the response.
@@ -151,6 +182,7 @@ The following example shows a request that gets all the Copilot interactions for
151182

152183
The following example shows a request.
153184

185+
# [HTTP](#tab/http)
154186
<!-- {
155187
"blockType": "request",
156188
"name": "aiInteraction_getAllEnterpriseInteractions_2"
@@ -159,6 +191,36 @@ The following example shows a request.
159191
GET https://graph.microsoft.com/beta/copilot/users/4db02e4b-d144-400e-b194-53253a34c5be/interactionHistory/getAllEnterpriseInteractions?$filter=appClass eq 'IPM.SkypeTeams.Message.Copilot.BizChat'
160192
```
161193

194+
# [C#](#tab/csharp)
195+
[!INCLUDE [sample-code](../includes/snippets/csharp/aiinteraction-getallenterpriseinteractions-2-csharp-snippets.md)]
196+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
197+
198+
# [CLI](#tab/cli)
199+
[!INCLUDE [sample-code](../includes/snippets/cli/aiinteraction-getallenterpriseinteractions-2-cli-snippets.md)]
200+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
201+
202+
# [Go](#tab/go)
203+
[!INCLUDE [sample-code](../includes/snippets/go/aiinteraction-getallenterpriseinteractions-2-go-snippets.md)]
204+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
205+
206+
# [Java](#tab/java)
207+
[!INCLUDE [sample-code](../includes/snippets/java/aiinteraction-getallenterpriseinteractions-2-java-snippets.md)]
208+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
209+
210+
# [JavaScript](#tab/javascript)
211+
[!INCLUDE [sample-code](../includes/snippets/javascript/aiinteraction-getallenterpriseinteractions-2-javascript-snippets.md)]
212+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
213+
214+
# [PHP](#tab/php)
215+
[!INCLUDE [sample-code](../includes/snippets/php/aiinteraction-getallenterpriseinteractions-2-php-snippets.md)]
216+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
217+
218+
# [Python](#tab/python)
219+
[!INCLUDE [sample-code](../includes/snippets/python/aiinteraction-getallenterpriseinteractions-2-python-snippets.md)]
220+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
221+
222+
---
223+
162224
#### Response
163225

164226
The following example shows the response.

‎api-reference/beta/api/announcement-get.md

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,7 @@ Read the properties of an [announcement](../resources/announcement.md) object.
2020

2121
Choose the permission or permissions marked as least privileged for this API. Use a higher privileged permission or permissions [only if your app requires it](/graph/permissions-overview#best-practices-for-using-microsoft-graph-permissions). For details about delegated and application permissions, see [Permission types](/graph/permissions-overview#permission-types). To learn more about these permissions, see the [permissions reference](/graph/permissions-reference).
2222

23-
<!-- {
24-
"blockType": "permissions",
25-
"name": "announcement-get-permissions"
26-
}
27-
-->
23+
<!-- { "blockType": "permissions", "name": "announcement_get" } -->
2824
[!INCLUDE [permissions-table](../includes/permissions/announcement-get-permissions.md)]
2925

3026
Any user can call these APIs, there are no admin role requirements.
@@ -62,6 +58,7 @@ If successful, this method returns a `200 OK` response code and an [announcement
6258
### Request
6359

6460
The following example shows a request.
61+
# [HTTP](#tab/http)
6562
<!-- {
6663
"blockType": "request",
6764
"name": "get_announcement"
@@ -71,6 +68,12 @@ The following example shows a request.
7168
GET https://graph.microsoft.com/beta/identity/productChanges/microsoft.graph.announcement/ddde9e3b-7ee4-4066-a62e-fb1fc5fb87a1
7269
```
7370

71+
# [JavaScript](#tab/javascript)
72+
[!INCLUDE [sample-code](../includes/snippets/javascript/get-announcement-javascript-snippets.md)]
73+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
74+
75+
---
76+
7477
### Response
7578

7679
The following example shows the response.
@@ -106,6 +109,7 @@ Content-Type: application/json
106109
"announcementDateTime": "2022-09-30T00:00:00Z",
107110
"targetDateTime": "2024-09-30T00:00:00Z",
108111
"impactLink": null,
112+
"changeType": "deprecation",
109113
"isCustomerActionRequired": true
110114
}
111115
}

‎api-reference/beta/api/announcement-list.md

Lines changed: 33 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,7 @@ Get a list of the [announcement](../resources/announcement.md) objects and their
2020

2121
Choose the permission or permissions marked as least privileged for this API. Use a higher privileged permission or permissions [only if your app requires it](/graph/permissions-overview#best-practices-for-using-microsoft-graph-permissions). For details about delegated and application permissions, see [Permission types](/graph/permissions-overview#permission-types). To learn more about these permissions, see the [permissions reference](/graph/permissions-reference).
2222

23-
<!-- {
24-
"blockType": "permissions",
25-
"name": "announcement-list-permissions"
26-
}
27-
-->
23+
<!-- { "blockType": "permissions", "name": "announcement_list" } -->
2824
[!INCLUDE [permissions-table](../includes/permissions/announcement-list-permissions.md)]
2925

3026
Any user can call these APIs, there are no admin role requirements.
@@ -62,6 +58,7 @@ If successful, this method returns a `200 OK` response code and a collection of
6258
### Request
6359

6460
The following example shows a request.
61+
# [HTTP](#tab/http)
6562
<!-- {
6663
"blockType": "request",
6764
"name": "list_announcement"
@@ -71,6 +68,36 @@ The following example shows a request.
7168
GET https://graph.microsoft.com/beta/identity/productChanges/microsoft.graph.announcement
7269
```
7370

71+
# [C#](#tab/csharp)
72+
[!INCLUDE [sample-code](../includes/snippets/csharp/list-announcement-csharp-snippets.md)]
73+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
74+
75+
# [CLI](#tab/cli)
76+
[!INCLUDE [sample-code](../includes/snippets/cli/list-announcement-cli-snippets.md)]
77+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
78+
79+
# [Go](#tab/go)
80+
[!INCLUDE [sample-code](../includes/snippets/go/list-announcement-go-snippets.md)]
81+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
82+
83+
# [Java](#tab/java)
84+
[!INCLUDE [sample-code](../includes/snippets/java/list-announcement-java-snippets.md)]
85+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
86+
87+
# [JavaScript](#tab/javascript)
88+
[!INCLUDE [sample-code](../includes/snippets/javascript/list-announcement-javascript-snippets.md)]
89+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
90+
91+
# [PHP](#tab/php)
92+
[!INCLUDE [sample-code](../includes/snippets/php/list-announcement-php-snippets.md)]
93+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
94+
95+
# [Python](#tab/python)
96+
[!INCLUDE [sample-code](../includes/snippets/python/list-announcement-python-snippets.md)]
97+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
98+
99+
---
100+
74101
### Response
75102

76103
The following example shows the response.
@@ -107,6 +134,7 @@ Content-Type: application/json
107134
"announcementDateTime": "2022-09-30T00:00:00Z",
108135
"targetDateTime": "2024-09-30T00:00:00Z",
109136
"impactLink": null,
137+
"changeType": "deprecation",
110138
"isCustomerActionRequired": true
111139
}
112140
]

‎api-reference/beta/api/attendancerecord-list.md

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,11 @@ Content-Type: application/json
366366
"leaveDateTime": "2021-10-05T04:43:49.7702391Z",
367367
"durationInSeconds": 322
368368
}
369-
]
369+
],
370+
"externalRegistrationInformation": {
371+
"referrer": "Facebook",
372+
"registrationId": "myExternalRegistrationId"
373+
},
370374
},
371375
{
372376
"emailAddress": "lisa.adkins@contoso.com",
@@ -384,7 +388,11 @@ Content-Type: application/json
384388
"leaveDateTime": "2021-10-04T23:18:57.5639338Z",
385389
"durationInSeconds": 314
386390
}
387-
]
391+
],
392+
"externalRegistrationInformation": {
393+
"referrer": "Facebook",
394+
"registrationId": "anotherExternalRegistrationId"
395+
},
388396
}
389397
]
390398
}

‎api-reference/beta/api/authentication-delete-hardwareoathmethods.md

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,7 @@ Choose the permission or permissions marked as least privileged for this API. Us
2626
"name": "authentication-delete-hardwareoathmethods-permissions"
2727
}
2828
-->
29-
<!-- {
30-
"blockType": "permissions",
31-
"name": "authentication-delete-hardwareoathmethods-permissions"
32-
}
33-
-->
29+
<!-- { "blockType": "permissions", "name": "authentication_delete_hardwareoathmethods" } -->
3430
[!INCLUDE [permissions-table](../includes/permissions/authentication-delete-hardwareoathmethods-permissions.md)]
3531

3632
## Permissions acting on other users
@@ -41,6 +37,8 @@ Choose the permission or permissions marked as least privileged for this API. Us
4137
-->
4238
[!INCLUDE [permissions-table](../includes/permissions/authentication-delete-hardwareoathmethods-2-permissions.md)]
4339

40+
[!INCLUDE [rbac-authentication-methods-apis-write-others](../includes/rbac-for-apis/rbac-authentication-methods-apis-write-others.md)]
41+
4442
## HTTP request
4543

4644
Unassign yourself a hardware OATH authentication method.
@@ -120,7 +118,6 @@ DELETE https://graph.microsoft.com/beta/me/authentication/hardwareOathMethods/{h
120118

121119
---
122120

123-
124121
### Response
125122

126123
The following example shows the response.

0 commit comments

Comments
 (0)