Skip to content

Commit 96c963e

Browse files
authored
Merge branch 'main' into cloud-printing-overview
2 parents 46982e6 + 0b59f07 commit 96c963e

File tree

2,260 files changed

+24013
-5083
lines changed

Some content is hidden

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

2,260 files changed

+24013
-5083
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-delete-accesspackageresourcerolescopes.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: "Remove resourceRoleScope from an access package"
3-
description: "Remove a resourceRoleScope from an access package."
3+
description: "Remove an accessPackageResourceRoleScope from an accessPackage list of resource role scopes."
44
ms.localizationpriority: medium
55
author: "markwahl-msft"
66
ms.subservice: "entra-id-governance"
@@ -13,7 +13,7 @@ Namespace: microsoft.graph
1313

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

16-
Remove a [accessPackageResourceRoleScope](../resources/accesspackageresourcerolescope.md) from an [accessPackage](../resources/accesspackage.md) list of resource role scopes.
16+
Remove an [accessPackageResourceRoleScope](../resources/accesspackageresourcerolescope.md) from an [accessPackage](../resources/accesspackage.md) list of resource role scopes.
1717

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

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ 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+
18+
1519
In [Microsoft Entra Entitlement Management](../resources/entitlementmanagement-overview.md), retrieve a list of [accessPackage](../resources/accesspackage.md) objects filtered on the signed-in user.
1620

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

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,7 @@ Choose the permission or permissions marked as least privileged for this API. Us
2222
<!-- { "blockType": "permissions", "name": "adminconsentrequestpolicy_get" } -->
2323
[!INCLUDE [permissions-table](../includes/permissions/adminconsentrequestpolicy-get-permissions.md)]
2424

25-
When calling on behalf of a user, the user needs to belong to at least one of the following [Microsoft Entra roles](/entra/identity/role-based-access-control/permissions-reference?toc=%2Fgraph%2Ftoc.json):
26-
+ Global Reader
27-
+ Cloud Application Administrator
28-
+ Application Administrator
25+
[!INCLUDE [rbac-adminconsentrequestpolicy-apis-read](../includes/rbac-for-apis/rbac-adminconsentrequestpolicy-apis-read.md)]
2926

3027
## HTTP request
3128

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Choose the permission or permissions marked as least privileged for this API. Us
2020
<!-- { "blockType": "permissions", "name": "adminconsentrequestpolicy_update" } -->
2121
[!INCLUDE [permissions-table](../includes/permissions/adminconsentrequestpolicy-update-permissions.md)]
2222

23-
For delegated scenarios, the calling user needs to belong to at least the *Application Administrator* or *Cloud Application Administrator* [Microsoft Entra roles](/entra/identity/role-based-access-control/permissions-reference?toc=%2Fgraph%2Ftoc.json).
23+
[!INCLUDE [rbac-adminconsentrequestpolicy-apis-update](../includes/rbac-for-apis/rbac-adminconsentrequestpolicy-apis-update.md)]
2424

2525
## HTTP request
2626

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

0 commit comments

Comments
 (0)