Skip to content

Commit a8866a2

Browse files
committed
Merge branch 'main' into binbwu/extendParametersForSnapshot
2 parents 33bc50f + c4e06bd commit a8866a2

File tree

1,698 files changed

+24016
-6256
lines changed

Some content is hidden

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

1,698 files changed

+24016
-6256
lines changed

.github/pull_request_template.md

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
1-
**Instructions:** _Add any supporting information, such as a description of the PR changes, here._
2-
3-
1+
> [!IMPORTANT]
2+
> Required for API changes:
3+
> - Link to API.md file: *ADD LINK HERE*
4+
> - Link to **PR** for public-facing schema changes (schema-Prod-beta/v1.0.csdl): *ADD LINK HERE*
45
6+
---
7+
Add other supporting information, such as a description of the PR changes:
58

9+
*ADD INFORMATION HERE*
610

711
---
8-
> [!NOTE]
12+
> [!IMPORTANT]
913
> The following guidance is for Microsoft employees only. Community contributors can ignore this message; our content team will manage the status.
1014
<details><summary><i>After you've created your PR</i>, expand this section for tips and additional instructions.</summary>
1115
1216

1317
- **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.
14-
- Add the **ready for content review** label to start a review. Your PR won't be reviewed until you add this 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.
1519
- 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.
1620
- 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.
1721
- 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.

api-reference/beta/api/accesspackage-filterbycurrentuser.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ Namespace: microsoft.graph
1212

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

15+
> [!CAUTION]
16+
> The **filterByCurrentUser** function is on a deprecation path and exists only to support current customers. We don't recommend using this function.
17+
1518
In [Microsoft Entra Entitlement Management](../resources/entitlementmanagement-overview.md), retrieve a list of [accessPackage](../resources/accesspackage.md) objects filtered on the signed-in user.
1619

1720
[!INCLUDE [national-cloud-support](../../includes/global-us.md)]

api-reference/beta/api/administrativeunit-delta.md

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

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

16-
Get newly created, updated, or deleted **administrativeUnits** without having to perform a full read of the entire resource collection. For details, see [Using delta query](/graph/delta-query-overview).
16+
Get newly created, updated, or deleted **administrativeUnits** without having to perform a full read of the entire resource collection. For more information, see [Use delta query to track changes in Microsoft Graph data](/graph/delta-query-overview) for details.
1717

1818
[!INCLUDE [national-cloud-support](../../includes/all-clouds.md)]
1919

@@ -25,6 +25,8 @@ Choose the permission or permissions marked as least privileged for this API. Us
2525
<!-- { "blockType": "permissions", "name": "administrativeunit_delta" } -->
2626
[!INCLUDE [permissions-table](../includes/permissions/administrativeunit-delta-permissions.md)]
2727

28+
[!INCLUDE [rbac-admin-units-apis-read](../includes/rbac-for-apis/rbac-admin-units-apis-read.md)]
29+
2830
## HTTP request
2931

3032
To begin tracking changes, you make a request that includes the delta function on the **administrativeUnit** resource.
@@ -44,7 +46,7 @@ You only need to specify any query parameters once up front.
4446
In subsequent requests, copy and apply the `@odata.nextLink` or `@odata.deltaLink` URL from the previous response. That URL already
4547
includes the encoded parameters.
4648

47-
| Query parameter | Type |Description|
49+
| Query parameter | Type |Description|
4850
|:---------------|:--------|:----------|
4951
| $deltatoken | string | A [state token](/graph/delta-query-overview) returned in the `@odata.deltaLink` URL of the previous **delta** function call for the same resource collection, indicating the completion of that round of change tracking. Save and apply the entire `@odata.deltaLink` URL including this token in the first request of the next round of change tracking for that collection.|
5052
| $skiptoken | string | A [state token](/graph/delta-query-overview) returned in the `@odata.nextLink` URL of the previous **delta** function call, indicating there are further changes to be tracked in the same resource collection. |

api-reference/beta/api/administrativeunit-get-members.md

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

27+
[!INCLUDE [rbac-admin-units-apis-read](../includes/rbac-for-apis/rbac-admin-units-apis-read.md)]
28+
2729
## HTTP request
2830

2931
```http

api-reference/beta/api/administrativeunit-get-scopedrolemembers.md

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

27+
[!INCLUDE [rbac-admin-units-apis-read](../includes/rbac-for-apis/rbac-admin-units-apis-read.md)]
28+
2729
## HTTP request
2830
<!-- { "blockType": "ignored" } -->
2931
```http

api-reference/beta/api/administrativeunit-list-scopedrolemembers.md

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

27+
[!INCLUDE [rbac-admin-units-apis-read](../includes/rbac-for-apis/rbac-admin-units-apis-read.md)]
28+
2729
## HTTP request
2830
<!-- { "blockType": "ignored" } -->
2931
```http

api-reference/beta/api/administrativeunit-post-members.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ One of the following permissions is required to call this API. To learn more, in
3030
|Delegated (personal Microsoft account) | Not supported. |
3131
|Application | AdministrativeUnit.ReadWrite.All |
3232

33-
To add a user, group, or device to an administrative unit, the calling user must be assigned the *Privileged Role Administrator* [Microsoft Entra role](/entra/identity/role-based-access-control/permissions-reference?toc=%2Fgraph%2Ftoc.json).
33+
[!INCLUDE [rbac-admin-units-apis-write](../includes/rbac-for-apis/rbac-admin-units-apis-write.md)]
3434

3535
### Permissions to create a new group
3636
<!-- { "blockType": "ignored" } // Note: Removing this line will result in the permissions autogeneration tool overwriting the table. -->
@@ -40,12 +40,12 @@ To add a user, group, or device to an administrative unit, the calling user must
4040
|Delegated (personal Microsoft account) | Not supported. |
4141
|Application | Group.Create and AdministrativeUnit.Read.All, Group.ReadWrite.All and AdministrativeUnit.Read.All, Directory.ReadWrite.All |
4242

43-
To create a new group in an administrative unit, the calling principal must be assigned at least one of the following [Microsoft Entra roles](/entra/identity/role-based-access-control/permissions-reference?toc=%2Fgraph%2Ftoc.json) at the scope of the administrative unit:
44-
45-
* Groups Administrator
46-
* User Administrator
47-
48-
When these roles are assigned to a service principal, additional permissions are required to read the directory, such as assignment to the Directory Readers role, or having Microsoft Graph application permissions, such as Directory.Read.All.
43+
> [!IMPORTANT]
44+
> To create a new group in an administrative unit, the calling principal must be assigned at least one of the following [Microsoft Entra roles](/entra/identity/role-based-access-control/permissions-reference?toc=%2Fgraph%2Ftoc.json) at the scope of the administrative unit:
45+
> - Groups Administrator
46+
> - User Administrator
47+
>
48+
> For app-only scenarios - apart from these roles, the service principal requires additional permissions to read the directory. These permissions can be granted via assignment of supported Microsoft Entra roles, such the Directory Readers role; or they can be granted via Microsoft Graph application permissions that allow reading the directory, such as *Directory.Read.All*.
4949
5050
## HTTP request
5151

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

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
---
2-
title: "Update administrativeunit"
2+
title: "Update administrativeUnit"
33
description: "Update the properties of an administrativeUnit object."
44
author: "DougKirschner"
55
ms.localizationpriority: medium
66
ms.subservice: "entra-directory-management"
77
doc_type: apiPageType
88
---
99

10-
# Update administrativeunit
10+
# Update administrativeUnit
1111

1212
Namespace: microsoft.graph
1313

@@ -24,7 +24,7 @@ Choose the permission or permissions marked as least privileged for this API. Us
2424
<!-- { "blockType": "permissions", "name": "administrativeunit_update" } -->
2525
[!INCLUDE [permissions-table](../includes/permissions/administrativeunit-update-permissions.md)]
2626

27-
In delegated scenarios, the signed-in user must also be assigned a supported [Microsoft Entra role](/entra/identity/role-based-access-control/permissions-reference?toc=%2Fgraph%2Ftoc.json) or a custom role with the `microsoft.directory/administrativeUnits/allProperties/allTasks` role permission. *Privileged Role Administrator* is the least privileged role for this operation.
27+
[!INCLUDE [rbac-admin-units-apis-write](../includes/rbac-for-apis/rbac-admin-units-apis-write.md)]
2828

2929
## HTTP request
3030
<!-- { "blockType": "ignored" } -->
@@ -41,29 +41,29 @@ PATCH /directory/administrativeUnits/{id}
4141

4242
## Request body
4343

44-
In the request body, supply the values for relevant fields that should be updated. Existing properties that aren't included in the request body maintains their previous values or be recalculated based on changes to other property values. For best performance, you shouldn't include existing values that haven't changed.
44+
[!INCLUDE [table-intro](../../includes/update-property-table-intro.md)]
4545

4646
| Property | Type |Description|
4747
|:---------------|:--------|:----------|
4848
| description | String | Description for the administrative unit.|
4949
| displayName | String | Display name for the administrative unit. |
50-
| membershipRule | String | Dynamic membership rule for the administrative unit. For more about the rules that you can use for dynamic administrative units and dynamic groups, see [Using attributes to create advanced rules](https://azure.microsoft.com/documentation/articles/active-directory-accessmanagement-groups-with-advanced-rules/).|
51-
| membershipRuleProcessingState | String | Used to control whether the dynamic membership rule is actively processed. Set to `On` when you want the dynamic membership rule to be active and `Paused` if you want to stop updating membership dynamically. |
52-
| membershipType | String | Membership type for the administrative unit. Can be `dynamic` or `assigned`. |
53-
| visibility | String | Visibility for the administrative unit. If not set, then the default is `public`. Can be set to `HiddenMembership`, which hides the membership from nonmembers. |
50+
| membershipRule | String | The dynamic membership rule for the administrative unit. For more information about the rules you can use for dynamic administrative units and dynamic groups, see [Manage rules for dynamic membership groups in Microsoft Entra ID](/entra/identity/users/groups-dynamic-membership).|
51+
| membershipRuleProcessingState | String | Controls whether the dynamic membership rule is actively processed. Set to `On` to activate the dynamic membership rule, or `Paused` to stop updating membership dynamically. |
52+
| membershipType | String | Indicates the membership type for the administrative unit. The possible values are: `dynamic`, `assigned`. If not set, the default value is `null` and the default behavior is assigned. |
53+
| visibility | String | The visibility of the administrative unit. If not set, the default value is `null` and the default behavior is public. It can be set to `HiddenMembership` to hide the membership from nonmembers. |
5454

55-
Since the **administrativeUnit** resource supports [extensions](/graph/extensibility-overview), you can use the `PATCH` operation to add, update, or delete your own app-specific data in custom properties of an extension in an existing **administrativeUnit** instance.
55+
The **administrativeUnit** resource supports [extensions](/graph/extensibility-overview), which allows you to use the `PATCH` operation to add, update, or delete your own app-specific data in custom properties of an extension in an existing **administrativeUnit** instance.
5656

5757
## Response
5858

5959
If successful, this method returns a `204 No Content` response code.
6060

6161
## Examples
6262

63-
The following example sets a dynamic membership rule on an existing administrative unit to include all users whose country is United States. It also updates the administrative unit display name.
64-
6563
### Request
6664

65+
The following example shows a request that sets a dynamic membership rule on an existing administrative unit to include all users whose country is the United States. It also updates the display name of the administrative unit.
66+
6767
# [HTTP](#tab/http)
6868
<!-- {
6969
"blockType": "request",
@@ -117,6 +117,8 @@ Content-type: application/json
117117

118118
### Response
119119

120+
The following example shows the response.
121+
120122
<!-- {
121123
"blockType": "response"
122124
} -->

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

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

27-
The signed-in user must also be assigned one of the following [directory roles](/entra/identity/role-based-access-control/permissions-reference?toc=%2Fgraph%2Ftoc.json):
28-
29-
+ Attribute Definition Reader
30-
+ Attribute Definition Administrator
31-
32-
By default, Global Administrator and other administrator roles do not have permissions to read, define, or assign custom security attributes.
27+
> [!IMPORTANT]
28+
> In delegated scenarios with work or school accounts, the signed-in user must be assigned a supported [Microsoft Entra role](/entra/identity/role-based-access-control/permissions-reference?toc=%2Fgraph%2Ftoc.json) or a custom role with a supported role permission. The following privileged roles are supported for this operation.
29+
> - Attribute Definition Reader
30+
> - Attribute Definition Administrator
31+
>
32+
> - By default, Global Administrator and other administrator roles do not have permissions to read, define, or assign custom security attributes.
3333
3434
## HTTP request
3535

api-reference/beta/api/application-delta.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Namespace: microsoft.graph
1313

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

16-
Get newly created, updated, or deleted applications without having to perform a full read of the entire resource collection. See [Using Delta Query](/graph/delta-query-overview) for details.
16+
Get newly created, updated, or deleted applications without having to perform a full read of the entire resource collection. For more information, see [Use delta query to track changes in Microsoft Graph data](/graph/delta-query-overview) for details.
1717

1818
[!INCLUDE [national-cloud-support](../../includes/all-clouds.md)]
1919

0 commit comments

Comments
 (0)