Skip to content

Commit 68bd769

Browse files
committed
Merge branch 'main' into blee/Add-VideoOnDemand-Subscription-to-Concepts
2 parents 06c8df4 + 8fb3dd5 commit 68bd769

File tree

6,702 files changed

+39292
-21397
lines changed

Some content is hidden

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

6,702 files changed

+39292
-21397
lines changed

.acrolinx-config.edn

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ If you need a scoring exception for content in this PR, add the *ready for conte
3636
- Escalate the exception request to the Acrolinx Review Team for review.
3737
- Approve the exception and work with the GitHub Admin Team to merge the PR to the default branch.
3838
39-
For more information about the exception criteria and exception process, see [Acrolinx for Microsoft Graph docs](https://aka.ms/msgo?pagePath=/Document%20APIs/Author%20content/Acrolinx).
39+
For more information about the exception criteria and exception process, see [Acrolinx for Microsoft Graph docs](https://eng.ms/cid/27dee76c-3a60-4e65-8fdf-08ea849b3498/fid/d80517923e291f07a0da8b5ce8e082ba680a55ddda65497a1061ca9f97c50290).
4040
4141
Select the scorecard links for each article to review the Acrolinx feedback on grammar, spelling, punctuation, writing style, and terminology:
4242
@@ -52,6 +52,6 @@ Select the scorecard links for each article to review the Acrolinx feedback on g
5252
"
5353
**More info about Acrolinx**
5454
55-
Use the Acrolinx extension, or sidebar, in Visual Studio Code to check spelling, grammar, style, tone, clarity, and key terminology when you're creating or updating content. For more information, see [Use the Visual Studio Code extension to run Acrolinx locally](https://review.docs.microsoft.com/office-authoring-guide/acrolinx-vscode?branch=main).
55+
Use the Acrolinx extension, or sidebar, in Visual Studio Code to check spelling, grammar, style, tone, clarity, and key terminology when you're creating or updating content. For more information, see [Use the Visual Studio Code extension to run Acrolinx locally](https://learn.microsoft.com/help/platform/acrolinx-vscode-setup) (you must sign in to access the page).
5656
"
5757
}

.github/workflows/changelog-links.yml

Lines changed: 0 additions & 25 deletions
This file was deleted.

.vscode/settings.json

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
{
22
"githubPullRequests.ignoredPullRequestBranches": [
3-
"main",
4-
"main",
5-
"main",
6-
"main",
7-
"main",
8-
"main",
93
"main"
104
],
115
"json.schemas": [

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ The following table shows the properties that are required when you update an [a
5757
|requestorSettings|[requestorSettings](../resources/requestorsettings.md)|Users eligible to request this access package from this policy. Required.|
5858
|requestApprovalSettings|[approvalSettings](../resources/approvalsettings.md)|Who must approve requests for access package in this policy. Required.|
5959
|accessReviewSettings|[assignmentReviewSettings](../resources/assignmentreviewsettings.md)|Who must review, and how often, the assignments to the access package from this policy. This property is null if reviews aren't required. Required.|
60+
|accessPackageNotificationSettings|[accessPackageNotificationSettings](../resources/accesspackagenotificationsettings.md)|Represents the settings for email notifications for requests to an access package.|
6061

6162

6263
## Response
Lines changed: 185 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,185 @@
1+
---
2+
title: "Create contentActivity"
3+
toc.title: "Create contentActivity"
4+
description: "Create a content activity for the signed-in user."
5+
author: "ArunGedela"
6+
ms.date: 04/03/2025
7+
ms.localizationpriority: medium
8+
ms.subservice: "security"
9+
doc_type: apiPageType
10+
---
11+
12+
# Create contentActivity
13+
14+
Namespace: microsoft.graph
15+
16+
[!INCLUDE [beta-disclaimer](../../includes/beta-disclaimer.md)]
17+
18+
Create a content activity for the signed-in user.
19+
20+
## Permissions
21+
22+
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).
23+
24+
<!-- {
25+
"blockType": "permissions",
26+
"name": "activitiescontainer-post-contentactivities-permissions"
27+
}
28+
-->
29+
[!INCLUDE [permissions-table](../includes/permissions/activitiescontainer-post-contentactivities-permissions.md)]
30+
31+
## HTTP request
32+
33+
<!-- {
34+
"blockType": "ignored"
35+
}
36+
-->
37+
``` http
38+
POST /me/dataSecurityAndGovernance/activities/contentActivities
39+
```
40+
41+
## Request headers
42+
43+
|Name|Description|
44+
|:---|:---|
45+
|Authorization|Bearer {token}. Required. Learn more about [authentication and authorization](/graph/auth/auth-concepts).|
46+
|Content-Type|application/json. Required.|
47+
48+
## Request body
49+
50+
In the request body, supply a JSON representation of the [contentActivity](../resources/contentactivity.md) object.
51+
52+
## Response
53+
54+
If successful, this method returns a `201 Created` response code and a [contentActivity](../resources/contentactivity.md) object in the response body.
55+
56+
## Examples
57+
58+
### Request
59+
60+
The following example shows a request.
61+
# [HTTP](#tab/http)
62+
<!-- {
63+
"blockType": "request",
64+
"name": "create_contentactivity_from_"
65+
}
66+
-->
67+
``` http
68+
POST https://graph.microsoft.com/beta/me/dataSecurityAndGovernance/activities/contentActivities
69+
Content-Type: application/json
70+
71+
{
72+
"contentMetadata": {
73+
"contentEntries": [
74+
{
75+
"@odata.type": "microsoft.graph.processConversationMetadata",
76+
"identifier": "68fa951a-898a-4427-8e9e-6f8c05e9fe2b",
77+
"name":"API Explorer message",
78+
"correlationId": "559a2343-7aa2-4912-93fe-72c47b2706ed",
79+
"sequenceNo": 0,
80+
"isTruncated": false,
81+
"createdDateTime": "2025-04-28T20:17:55",
82+
"modifiedDateTime": "2025-04-28T20:17:55"
83+
}
84+
],
85+
"activityMetadata": {
86+
"activity": "uploadText"
87+
},
88+
"deviceMetadata": {
89+
"deviceType": "unmanaged",
90+
"operatingSystemSpecifications": {
91+
"operatingSystemPlatform": "Windows 11",
92+
"operatingSystemVersion": "10.0.26100.0"
93+
}
94+
},
95+
"integratedAppMetadata": {
96+
"name": "API Explorer",
97+
"version": "0.1"
98+
},
99+
"userId":"7c2f8f10-cba8-4a8d-9449-db4b76d17390",
100+
"scopeIdentifier":"0"
101+
}
102+
}
103+
```
104+
105+
# [C#](#tab/csharp)
106+
[!INCLUDE [sample-code](../includes/snippets/csharp/create-contentactivity-from--csharp-snippets.md)]
107+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
108+
109+
# [CLI](#tab/cli)
110+
[!INCLUDE [sample-code](../includes/snippets/cli/create-contentactivity-from--cli-snippets.md)]
111+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
112+
113+
# [Go](#tab/go)
114+
[!INCLUDE [sample-code](../includes/snippets/go/create-contentactivity-from--go-snippets.md)]
115+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
116+
117+
# [Java](#tab/java)
118+
[!INCLUDE [sample-code](../includes/snippets/java/create-contentactivity-from--java-snippets.md)]
119+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
120+
121+
# [JavaScript](#tab/javascript)
122+
[!INCLUDE [sample-code](../includes/snippets/javascript/create-contentactivity-from--javascript-snippets.md)]
123+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
124+
125+
# [PHP](#tab/php)
126+
[!INCLUDE [sample-code](../includes/snippets/php/create-contentactivity-from--php-snippets.md)]
127+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
128+
129+
# [Python](#tab/python)
130+
[!INCLUDE [sample-code](../includes/snippets/python/create-contentactivity-from--python-snippets.md)]
131+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
132+
133+
---
134+
135+
### Response
136+
137+
The following example shows the response.
138+
>**Note:** The response object shown here might be shortened for readability.
139+
<!-- {
140+
"blockType": "response",
141+
"truncated": true,
142+
"@odata.type": "microsoft.graph.contentActivity"
143+
}
144+
-->
145+
``` http
146+
HTTP/1.1 201 Created
147+
Content-Type: application/json
148+
149+
{
150+
"@odata.type": "#microsoft.graph.contentActivity",
151+
"id": "420c8b9c-f4d7-4aa8-a392-344b3af9aa83",
152+
"userId": "7c2f8f10-cba8-4a8d-9449-db4b76d17390",
153+
"scopeIdentifier": null,
154+
"contentMetadata": {
155+
"protectedAppMetadata": null,
156+
"contentEntries": [
157+
{
158+
"identifier": "68fa951a-898a-4427-8e9e-6f8c05e9fe2b",
159+
"content": null,
160+
"name": "API Explorer message",
161+
"correlationId": "559a2343-7aa2-4912-93fe-72c47b2706ed",
162+
"sequenceNumber": null,
163+
"length": null,
164+
"isTruncated": false,
165+
"createdDateTime": "2025-04-28T20:17:55Z",
166+
"modifiedDateTime": "2025-04-28T20:17:55Z"
167+
}
168+
],
169+
"activityMetadata": {
170+
"activity": "downloadText"
171+
},
172+
"deviceMetadata": {
173+
"deviceType": "unmanaged",
174+
"operatingSystemSpecifications": {
175+
"operatingSystemPlatform": "Windows 11",
176+
"operatingSystemVersion": "10.0.26100.0"
177+
}
178+
},
179+
"integratedAppMetadata": {
180+
"name": "API Explorer",
181+
"version": "0.1"
182+
}
183+
}
184+
}
185+
```

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

Lines changed: 82 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ author: "sureshja"
55
ms.localizationpriority: high
66
ms.subservice: "entra-applications"
77
doc_type: apiPageType
8-
ms.date: 07/29/2024
8+
ms.date: 05/16/2025
99
---
1010

1111
# List applications
@@ -464,6 +464,87 @@ Content-type: application/json
464464
}
465465
```
466466

467+
### Example 6: Get the applications with identifierUris using the API scheme
468+
469+
#### Request
470+
471+
The following example shows a request. This request requires the **ConsistencyLevel** header set to `eventual` because `$count` is in the request. For more information about the use of **ConsistencyLevel** and `$count`, see [Advanced query capabilities on directory objects](/graph/aad-advanced-queries).
472+
473+
# [HTTP](#tab/http)
474+
<!-- {
475+
"blockType": "request",
476+
"name": "list_application_filteridentifieruris"
477+
}-->
478+
```msgraph-interactive
479+
GET https://graph.microsoft.com/beta/applications?$filter=identifierUris/any(x:startswith(x,'api://'))&$count=true
480+
ConsistencyLevel: eventual
481+
```
482+
483+
# [C#](#tab/csharp)
484+
[!INCLUDE [sample-code](../includes/snippets/csharp/list-application-filteridentifieruris-csharp-snippets.md)]
485+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
486+
487+
# [CLI](#tab/cli)
488+
[!INCLUDE [sample-code](../includes/snippets/cli/list-application-filteridentifieruris-cli-snippets.md)]
489+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
490+
491+
# [Go](#tab/go)
492+
[!INCLUDE [sample-code](../includes/snippets/go/list-application-filteridentifieruris-go-snippets.md)]
493+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
494+
495+
# [Java](#tab/java)
496+
[!INCLUDE [sample-code](../includes/snippets/java/list-application-filteridentifieruris-java-snippets.md)]
497+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
498+
499+
# [JavaScript](#tab/javascript)
500+
[!INCLUDE [sample-code](../includes/snippets/javascript/list-application-filteridentifieruris-javascript-snippets.md)]
501+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
502+
503+
# [PHP](#tab/php)
504+
[!INCLUDE [sample-code](../includes/snippets/php/list-application-filteridentifieruris-php-snippets.md)]
505+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
506+
507+
# [PowerShell](#tab/powershell)
508+
[!INCLUDE [sample-code](../includes/snippets/powershell/list-application-filteridentifieruris-powershell-snippets.md)]
509+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
510+
511+
# [Python](#tab/python)
512+
[!INCLUDE [sample-code](../includes/snippets/python/list-application-filteridentifieruris-python-snippets.md)]
513+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
514+
515+
---
516+
517+
#### Response
518+
519+
The following example shows the response.
520+
> **Note:** The response object shown here might be shortened for readability.
521+
522+
<!-- {
523+
"blockType": "response",
524+
"truncated": true,
525+
"@odata.type": "microsoft.graph.application",
526+
"isCollection": true
527+
} -->
528+
```http
529+
HTTP/1.1 200 OK
530+
Content-type: application/json
531+
532+
{
533+
"@odata.context": "https://graph.microsoft.com/beta/$metadata#applications",
534+
"@odata.count": 15067,
535+
"@odata.nextLink": "https://graph.microsoft.com/beta/applications?$filter=identifierUris%2fany(x%3astartswith(x%2c%27api%3a%2f%2f%27))&$count=true&$skiptoken=m~AQAoOzAxOTk3MTE1OTYyMDQ4MGE4YzE0ZjlkNWM0Y2ViMjE5OzswOzA7Ow",
536+
"@microsoft.graph.tips": "Use $select to choose only the properties your app needs, as this can lead to performance improvements. For example: GET applications?$select=api,appCategory",
537+
"value": [
538+
{
539+
"id": "000101ef-c7d0-47a0-83bd-d234347da0f3",
540+
"identifierUris": [
541+
"api://000101ef-c7d0-47a0-83bd-d234347da0f3"
542+
]
543+
}
544+
]
545+
}
546+
```
547+
467548
<!-- uuid: 8fcb5dbc-d5aa-4681-8e31-b001d5168d79
468549
2015-10-25 14:57:30 UTC -->
469550
<!--

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ Namespace: microsoft.graph
1414

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

17+
[!INCLUDE [permissions-management-retirement-note](../../includes/permissions-management-retirement-note.md)]
18+
1719
Read the properties and relationships of an [assignedComputeInstanceDetails](../resources/assignedcomputeinstancedetails.md) object and its properties for an AWS open security group finding.
1820

1921

@@ -94,3 +96,4 @@ Content-Type: application/json
9496
"accessedStorageBuckets": []
9597
}
9698
```
99+

0 commit comments

Comments
 (0)