Skip to content

Commit 1b5b0a9

Browse files
committed
Merge branch 'main' into yuxiang/onboard-regionalInaccessibleCloudPcTrendReport
2 parents c63e4bb + 70316e4 commit 1b5b0a9

File tree

1,787 files changed

+22201
-4579
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,787 files changed

+22201
-4579
lines changed

.vscode/settings.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
{
22
"githubPullRequests.ignoredPullRequestBranches": [
3+
"main",
4+
"main",
35
"main",
46
"main"
57
],

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ Choose the permission or permissions marked as least privileged for this API. Us
2828
<!-- { "blockType": "permissions", "name": "accesspackage_delete" } -->
2929
[!INCLUDE [permissions-table](../includes/permissions/accesspackage-delete-permissions.md)]
3030

31+
[!INCLUDE [rbac-entitlement-access-package-manager-write](../includes/rbac-for-apis/rbac-entitlement-management-access-package-manager-apis-write.md)]
32+
3133
## HTTP request
3234

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

api-reference/beta/api/accesspackage-getapplicablepolicyrequirements.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": "accesspackage_getapplicablepolicyrequirements" } -->
2424
[!INCLUDE [permissions-table](../includes/permissions/accesspackage-getapplicablepolicyrequirements-permissions.md)]
2525

26+
[!INCLUDE [rbac-entitlement-access-package-manager-write](../includes/rbac-for-apis/rbac-entitlement-management-access-package-manager-apis-write.md)]
27+
2628
## HTTP request
2729

2830
<!-- {

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

27+
[!INCLUDE [rbac-entitlement-access-package-manager-write](../includes/rbac-for-apis/rbac-entitlement-management-access-package-manager-apis-write.md)]
28+
2729
## HTTP request
2830
<!-- {
2931
"blockType": "ignored"

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

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

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

17-
"Get all Microsoft 365 Copilot interaction data, including user prompts to Copilot and Copilot responses. This API captures the user intent, the resources accessed by Copilot, and the response to the user for Microsoft 365 apps such as Teams, Word, and Outlook.
17+
Get all Microsoft 365 Copilot interaction data, including user prompts to Copilot and Copilot responses. This API captures the user intent, the resources accessed by Copilot, and the response to the user for Microsoft 365 apps such as Teams, Word, and Outlook.
1818

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

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ Content-Type: application/json
109109
"announcementDateTime": "2022-09-30T00:00:00Z",
110110
"targetDateTime": "2024-09-30T00:00:00Z",
111111
"impactLink": null,
112+
"changeType": "deprecation",
112113
"isCustomerActionRequired": true
113114
}
114115
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ Content-Type: application/json
134134
"announcementDateTime": "2022-09-30T00:00:00Z",
135135
"targetDateTime": "2024-09-30T00:00:00Z",
136136
"impactLink": null,
137+
"changeType": "deprecation",
137138
"isCustomerActionRequired": true
138139
}
139140
]

api-reference/beta/api/appcatalogs-list-teamsapps.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ List [apps](../resources/teamsapp.md) from the Microsoft Teams app catalog, incl
1919
> [!NOTE]
2020
> In general, the **id** of a **teamsApp** resource is generated by the server. It is not the same as the **id** specified in a Teams app manifest, unless its **distributionMethod** is `store`. For other cases, the **id** provided by the developer as part of the Teams app manifest is stamped as the **externalId** in the **teamsApp** resource.
2121
22-
[!INCLUDE [national-cloud-support](../../includes/global-us.md)]
23-
2422
> [!IMPORTANT]
2523
> * Currently, this API is only supported in the user context and not in the admin view.
2624
> * The Teams apps that this API returns comply with the app management policies established by the admin.
2725
> * After the Teams apps are published, it typically takes 24-48 hours for the policies to be applied, so some apps might not appear in the API results immediately.
2826
> * For more information, see [App management policies](/microsoftteams/manage-apps#manage-org-wide-app-settings).
2927
28+
[!INCLUDE [national-cloud-support](../../includes/global-us.md)]
29+
3030
## Permissions
3131

3232
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).

api-reference/beta/api/attacksimulationroot-post-simulation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ The following table lists the properties that are required when you create the s
5050

5151
| Property | Type | Description |
5252
|:-------------|:------------|:------------|
53-
|attackTechnique|[simulationAttackTechnique](../resources/simulation.md#simulationattacktechnique-values)|The social engineering technique used in the attack simulation and training campaign. Supports `$filter` and `$orderby`. Possible values are: `unknown`, `credentialHarvesting`, `attachmentMalware`, `driveByUrl`, `linkInAttachment`, `linkToMalwareFile`, `unknownFutureValue`, `oAuthConsentGrant`, `phishTraining`. You must use the `Prefer: include-unknown-enum-members` request header to get the following values from this [evolvable enum](/graph/best-practices-concept#handling-future-members-in-evolvable-enumerations): `oAuthConsentGrant`, `phishTraining`. For more information about the types of social engineering attack techniques, see [simulations](/microsoft-365/security/office-365-security/attack-simulation-training-get-started?view=o365-worldwide&preserve-view=true#simulations).|
53+
|attackTechnique|[simulationAttackTechnique](../resources/simulation.md#simulationattacktechnique-values)|The social engineering technique used in the attack simulation and training campaign. Supports `$filter` and `$orderby`. Possible values are: `unknown`, `credentialHarvesting`, `attachmentMalware`, `driveByUrl`, `linkInAttachment`, `linkToMalwareFile`, `unknownFutureValue`, `oAuthConsentGrant`, `phishTraining`. Use the `Prefer: include-unknown-enum-members` request header to get the following values from this [evolvable enum](/graph/best-practices-concept#handling-future-members-in-evolvable-enumerations): `oAuthConsentGrant`, `phishTraining`. For more information about the types of social engineering attack techniques, see [simulations](/microsoft-365/security/office-365-security/attack-simulation-training-get-started?view=o365-worldwide&preserve-view=true#simulations).|
5454
|attackType|[simulationAttackType](../resources/simulation.md#simulationattacktype-values)|Attack type of the attack simulation and training campaign. Supports `$filter` and `$orderby`. Possible values are: `unknown`, `social`, `cloud`, `endpoint`, `unknownFutureValue`.|
5555
|createdBy|[emailIdentity](../resources/emailidentity.md)|Identity of the user who created the attack simulation and training campaign.|
5656
|displayName|String|Display name of the attack simulation and training campaign. Supports `$filter` and `$orderby`.|

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
}

0 commit comments

Comments
 (0)