Skip to content

Commit 44e01f5

Browse files
authored
Merge branch 'main' into mkuninty-serviceActivityForScenarioHealth
2 parents a73c731 + 9a52b9d commit 44e01f5

File tree

580 files changed

+6646
-1523
lines changed

Some content is hidden

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

580 files changed

+6646
-1523
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-update.md

Lines changed: 12 additions & 10 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

@@ -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/authenticationeventlistener-update.md

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@ HTTP/1.1 204 No Content
147147

148148
The following example shows a request to add an application to an authentication event listener's trigger conditions.
149149

150+
# [HTTP](#tab/http)
150151
<!-- {
151152
"blockType": "request",
152153
"name": "update_authenticationeventlistener_2"
@@ -162,6 +163,40 @@ Content-Type: application/json
162163
}
163164
```
164165

166+
# [C#](#tab/csharp)
167+
[!INCLUDE [snippet-not-available](../includes/snippets/snippet-not-available.md)]
168+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
169+
170+
# [CLI](#tab/cli)
171+
[!INCLUDE [snippet-not-available](../includes/snippets/snippet-not-available.md)]
172+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
173+
174+
# [Go](#tab/go)
175+
[!INCLUDE [snippet-not-available](../includes/snippets/snippet-not-available.md)]
176+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
177+
178+
# [Java](#tab/java)
179+
[!INCLUDE [snippet-not-available](../includes/snippets/snippet-not-available.md)]
180+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
181+
182+
# [JavaScript](#tab/javascript)
183+
[!INCLUDE [sample-code](../includes/snippets/javascript/update-authenticationeventlistener-2-javascript-snippets.md)]
184+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
185+
186+
# [PHP](#tab/php)
187+
[!INCLUDE [snippet-not-available](../includes/snippets/snippet-not-available.md)]
188+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
189+
190+
# [PowerShell](#tab/powershell)
191+
[!INCLUDE [snippet-not-available](../includes/snippets/snippet-not-available.md)]
192+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
193+
194+
# [Python](#tab/python)
195+
[!INCLUDE [snippet-not-available](../includes/snippets/snippet-not-available.md)]
196+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
197+
198+
---
199+
165200

166201
#### Response
167202
The following example shows the response to a request to add an application to an authentication event listener's trigger conditions:

api-reference/beta/api/chartcollection-itemat.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,22 @@ GET https://graph.microsoft.com/beta/me/drive/items/{id}/workbook/worksheets/{id
7878
[!INCLUDE [sample-code](../includes/snippets/go/chartcollection-itemat-go-snippets.md)]
7979
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
8080

81+
# [Java](#tab/java)
82+
[!INCLUDE [sample-code](../includes/snippets/java/chartcollection-itemat-java-snippets.md)]
83+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
84+
8185
# [JavaScript](#tab/javascript)
8286
[!INCLUDE [sample-code](../includes/snippets/javascript/chartcollection-itemat-javascript-snippets.md)]
8387
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
8488

89+
# [PHP](#tab/php)
90+
[!INCLUDE [sample-code](../includes/snippets/php/chartcollection-itemat-php-snippets.md)]
91+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
92+
93+
# [Python](#tab/python)
94+
[!INCLUDE [sample-code](../includes/snippets/python/chartcollection-itemat-python-snippets.md)]
95+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
96+
8597
---
8698

8799
##### Response

api-reference/beta/api/chartpointscollection-itemat.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,22 @@ GET https://graph.microsoft.com/beta/me/drive/items/{id}/workbook/worksheets/{id
7878
[!INCLUDE [sample-code](../includes/snippets/go/chartpointscollection-itemat-go-snippets.md)]
7979
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
8080

81+
# [Java](#tab/java)
82+
[!INCLUDE [sample-code](../includes/snippets/java/chartpointscollection-itemat-java-snippets.md)]
83+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
84+
8185
# [JavaScript](#tab/javascript)
8286
[!INCLUDE [sample-code](../includes/snippets/javascript/chartpointscollection-itemat-javascript-snippets.md)]
8387
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
8488

89+
# [PHP](#tab/php)
90+
[!INCLUDE [sample-code](../includes/snippets/php/chartpointscollection-itemat-php-snippets.md)]
91+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
92+
93+
# [Python](#tab/python)
94+
[!INCLUDE [sample-code](../includes/snippets/python/chartpointscollection-itemat-python-snippets.md)]
95+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
96+
8597
---
8698

8799
##### Response

api-reference/beta/api/chartseriescollection-itemat.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,22 @@ GET https://graph.microsoft.com/beta/me/drive/items/{id}/workbook/worksheets/{id
7878
[!INCLUDE [sample-code](../includes/snippets/go/chartseriescollection-itemat-go-snippets.md)]
7979
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
8080

81+
# [Java](#tab/java)
82+
[!INCLUDE [sample-code](../includes/snippets/java/chartseriescollection-itemat-java-snippets.md)]
83+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
84+
8185
# [JavaScript](#tab/javascript)
8286
[!INCLUDE [sample-code](../includes/snippets/javascript/chartseriescollection-itemat-javascript-snippets.md)]
8387
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
8488

89+
# [PHP](#tab/php)
90+
[!INCLUDE [sample-code](../includes/snippets/php/chartseriescollection-itemat-php-snippets.md)]
91+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
92+
93+
# [Python](#tab/python)
94+
[!INCLUDE [sample-code](../includes/snippets/python/chartseriescollection-itemat-python-snippets.md)]
95+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
96+
8597
---
8698

8799
##### Response

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

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -666,6 +666,7 @@ The following example shows a request that gets a chat message with a forwarded
666666

667667
The following example shows a request.
668668

669+
# [HTTP](#tab/http)
669670
<!-- {
670671
"blockType": "request",
671672
"name": "get_chatmessage_6",
@@ -675,6 +676,40 @@ The following example shows a request.
675676
GET https://graph.microsoft.com/beta/chats/19:e2ed97baac8e4bffbb91299a38996790@thread.v2/messages/1727903166936
676677
```
677678

679+
# [C#](#tab/csharp)
680+
[!INCLUDE [sample-code](../includes/snippets/csharp/get-chatmessage-6-csharp-snippets.md)]
681+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
682+
683+
# [CLI](#tab/cli)
684+
[!INCLUDE [sample-code](../includes/snippets/cli/get-chatmessage-6-cli-snippets.md)]
685+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
686+
687+
# [Go](#tab/go)
688+
[!INCLUDE [sample-code](../includes/snippets/go/get-chatmessage-6-go-snippets.md)]
689+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
690+
691+
# [Java](#tab/java)
692+
[!INCLUDE [sample-code](../includes/snippets/java/get-chatmessage-6-java-snippets.md)]
693+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
694+
695+
# [JavaScript](#tab/javascript)
696+
[!INCLUDE [sample-code](../includes/snippets/javascript/get-chatmessage-6-javascript-snippets.md)]
697+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
698+
699+
# [PHP](#tab/php)
700+
[!INCLUDE [sample-code](../includes/snippets/php/get-chatmessage-6-php-snippets.md)]
701+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
702+
703+
# [PowerShell](#tab/powershell)
704+
[!INCLUDE [sample-code](../includes/snippets/powershell/get-chatmessage-6-powershell-snippets.md)]
705+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
706+
707+
# [Python](#tab/python)
708+
[!INCLUDE [sample-code](../includes/snippets/python/get-chatmessage-6-python-snippets.md)]
709+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
710+
711+
---
712+
678713
#### Response
679714

680715
The following example shows the response. The message body contains a forwarded message as an attachment. The **contentType** for the forwarded message is identified as `forwardedMessageReference`. The original message that was forwarded is also available in the attachment **content**.

api-reference/beta/api/companysubscription-get.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": "companysubscription_get" } -->
2525
[!INCLUDE [permissions-table](../includes/permissions/companysubscription-get-permissions.md)]
2626

27+
[!INCLUDE [rbac-company-subscriptions-subscribedskus-apis](../includes/rbac-for-apis/rbac-company-subscriptions-subscribedskus-apis.md)]
28+
2729
## HTTP request
2830

2931
<!-- { "blockType": "ignored" } -->

api-reference/beta/api/directory-list-subscriptions.md

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

27+
[!INCLUDE [rbac-company-subscriptions-subscribedskus-apis](../includes/rbac-for-apis/rbac-company-subscriptions-subscribedskus-apis.md)]
28+
29+
2730
## HTTP request
2831

2932
<!-- { "blockType": "ignored" } -->

0 commit comments

Comments
 (0)