Skip to content

Commit 6f40160

Browse files
doudoujinjindoudoujinjin
authored
Merge branch 'main' into huijunjin/correct_url
2 parents 7316b5d + d9c548e commit 6f40160

File tree

421 files changed

+9599
-445
lines changed

Some content is hidden

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

421 files changed

+9599
-445
lines changed

‎.azure-pipelines/.config/CredScanSuppressions.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,10 @@
5656
{
5757
"hash": "ncUPsLmVZWNkFs8Upvo2loZCG/3RAMIinoJ0OennEZ0=",
5858
"_justification": "tutorial-accessreviews-roleassignments.md line 773 Sample Azure Storage Account Shared Access Signature"
59+
},
60+
{
61+
"hash": "LIUwvKZoGemir5C2hxlAlMXrAJIYqol3WOojWbNRRWY=",
62+
"_justification": "update-socialidentityprovider-python-snippets.md line 13 Sample general password in snippet example"
5963
}
6064
]
6165
}

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,6 @@ GET /copilot/users/{id}/interactionHistory/getAllEnterpriseInteractions
3434

3535
## Optional query parameters
3636

37-
You can use the `model` query parameter, which supports the values `A` and `B`, based on the preferred [licensing and payment model](/graph/teams-licenses), as shown in the following examples.
38-
39-
<!-- { "blockType": "ignored" } -->
40-
```http
41-
GET /copilot/users/{id}/interactionHistory/getAllEnterpriseInteractions?model=A
42-
GET /copilot/users/{id}/interactionHistory/getAllEnterpriseInteractions?model=B
43-
```
44-
45-
If no `model` parameter is specified, [evaluation mode](/graph/teams-licenses#evaluation-mode-default-requirements) is used.
46-
4737
This method supports [date range parameters](/graph/query-parameters) to customize the response, as shown in the following example.
4838

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

‎api-reference/beta/api/application-post-onlinemeetings.md

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Create an online meeting on behalf of a user.
2424
[!INCLUDE [national-cloud-support](../../includes/global-only.md)]
2525

2626
## Permissions
27-
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).
27+
The following tables show the least privileged permission or permissions required to call this API on each supported resource type. Follow [best practices](/graph/permissions-overview#best-practices-for-using-microsoft-graph-permissions) to request least privileged 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).
2828

2929
Permissions for the following HTTP request:
3030

@@ -39,12 +39,7 @@ POST /me/onlineMeetings
3939
"name": "application_post_onlinemeetings",
4040
"requestUrls": ["POST /me/onlineMeetings"]
4141
} -->
42-
43-
|Permission type|Least privileged permissions|Higher privileged permissions|
44-
|:---|:---|:---|
45-
|Delegated (work or school account)|OnlineMeetings.ReadWrite|Not available.|
46-
|Delegated (personal Microsoft account)|Not supported.|Not supported.|
47-
|Application|Not supported.|Not supported.|
42+
[!INCLUDE [permissions-table](../includes/permissions/application-post-onlinemeetings-permissions.md)]
4843

4944

5045
Permissions for the following HTTP request:
@@ -60,12 +55,7 @@ POST /users/{userId}/onlineMeetings
6055
"name": "application_post_onlinemeetings_2",
6156
"requestUrls": ["POST /users/{userId}/onlineMeetings"]
6257
} -->
63-
64-
|Permission type|Least privileged permissions|Higher privileged permissions|
65-
|:---|:---|:---|
66-
|Delegated (work or school account)|OnlineMeetings.ReadWrite|Not available.|
67-
|Delegated (personal Microsoft account)|Not supported.|Not supported.|
68-
|Application|OnlineMeetings.ReadWrite.All|Not available.|
58+
[!INCLUDE [permissions-table](../includes/permissions/application-post-onlinemeetings-2-permissions.md)]
6959

7060
> [!NOTE]
7161
> To use the OnlineMeetings.ReadWrite.All application permission for this API, tenant administrators must create an [application access policy](/graph/cloud-communication-online-meeting-application-access-policy) and grant it to a user to authorize the app configured in the policy to create online meetings on behalf of that user (with user ID specified in the request path).

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ author: "stuartcl"
55
ms.localizationpriority: medium
66
ms.subservice: "security"
77
doc_type: apiPageType
8+
ms.date: 12/01/2024
89
---
910

1011
# Create simulation
@@ -49,7 +50,7 @@ The following table lists the properties that are required when you create the s
4950

5051
| Property | Type | Description |
5152
|:-------------|:------------|:------------|
52-
|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`. Note that 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`. 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`. 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).|
5354
|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`.|
5455
|createdBy|[emailIdentity](../resources/emailidentity.md)|Identity of the user who created the attack simulation and training campaign.|
5556
|displayName|String|Display name of the attack simulation and training campaign. Supports `$filter` and `$orderby`.|
@@ -113,7 +114,7 @@ Content-type: application/json
113114
"settingType": "noTraining",
114115
"positiveReinforcement": {
115116
"deliveryPreference": "deliverAfterCampaignEnd",
116-
"endUserNotification": "https://graph.microsoft.com/beta/security/attacksimulation/endUserNotifications/1ewer3678-9abc-def0-123456789a",
117+
"endUserNotification@odata.bind": "https://graph.microsoft.com/beta/security/attacksimulation/endUserNotifications/1ewer3678-9abc-def0-123456789a",
117118
"defaultLanguage": "en"
118119
},
119120
"simulationNotification": {

‎api-reference/beta/api/cloudpcreports-getcloudpcperformancereport.md

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ If successful, this method returns a `200 OK` response code and a Stream object
7474

7575
The following example shows a request.
7676

77+
# [HTTP](#tab/http)
7778
<!-- {
7879
"blockType": "request",
7980
"name": "cloudpcreportsthis.getcloudpcperformancereport"
@@ -99,6 +100,40 @@ Content-Type: application/json
99100
}
100101
```
101102

103+
# [C#](#tab/csharp)
104+
[!INCLUDE [sample-code](../includes/snippets/csharp/cloudpcreportsthisgetcloudpcperformancereport-csharp-snippets.md)]
105+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
106+
107+
# [CLI](#tab/cli)
108+
[!INCLUDE [sample-code](../includes/snippets/cli/cloudpcreportsthisgetcloudpcperformancereport-cli-snippets.md)]
109+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
110+
111+
# [Go](#tab/go)
112+
[!INCLUDE [sample-code](../includes/snippets/go/cloudpcreportsthisgetcloudpcperformancereport-go-snippets.md)]
113+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
114+
115+
# [Java](#tab/java)
116+
[!INCLUDE [sample-code](../includes/snippets/java/cloudpcreportsthisgetcloudpcperformancereport-java-snippets.md)]
117+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
118+
119+
# [JavaScript](#tab/javascript)
120+
[!INCLUDE [sample-code](../includes/snippets/javascript/cloudpcreportsthisgetcloudpcperformancereport-javascript-snippets.md)]
121+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
122+
123+
# [PHP](#tab/php)
124+
[!INCLUDE [sample-code](../includes/snippets/php/cloudpcreportsthisgetcloudpcperformancereport-php-snippets.md)]
125+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
126+
127+
# [PowerShell](#tab/powershell)
128+
[!INCLUDE [sample-code](../includes/snippets/powershell/cloudpcreportsthisgetcloudpcperformancereport-powershell-snippets.md)]
129+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
130+
131+
# [Python](#tab/python)
132+
[!INCLUDE [sample-code](../includes/snippets/python/cloudpcreportsthisgetcloudpcperformancereport-python-snippets.md)]
133+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
134+
135+
---
136+
102137
### Response
103138

104139
The following example shows the response.

‎api-reference/beta/api/copilotadminlimitedmode-get.md

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ The API can return more HTTP status codes: `403 Forbidden`, `500 Internal Server
6060
### Request
6161

6262
The following example shows a request.
63+
# [HTTP](#tab/http)
6364
<!-- {
6465
"blockType": "request",
6566
"name": "get_copilotadminlimitedmode"
@@ -69,6 +70,36 @@ The following example shows a request.
6970
GET https://graph.microsoft.com/beta/copilot/admin/settings/limitedMode
7071
```
7172

73+
# [C#](#tab/csharp)
74+
[!INCLUDE [sample-code](../includes/snippets/csharp/get-copilotadminlimitedmode-csharp-snippets.md)]
75+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
76+
77+
# [CLI](#tab/cli)
78+
[!INCLUDE [sample-code](../includes/snippets/cli/get-copilotadminlimitedmode-cli-snippets.md)]
79+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
80+
81+
# [Go](#tab/go)
82+
[!INCLUDE [sample-code](../includes/snippets/go/get-copilotadminlimitedmode-go-snippets.md)]
83+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
84+
85+
# [Java](#tab/java)
86+
[!INCLUDE [sample-code](../includes/snippets/java/get-copilotadminlimitedmode-java-snippets.md)]
87+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
88+
89+
# [JavaScript](#tab/javascript)
90+
[!INCLUDE [sample-code](../includes/snippets/javascript/get-copilotadminlimitedmode-javascript-snippets.md)]
91+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
92+
93+
# [PHP](#tab/php)
94+
[!INCLUDE [sample-code](../includes/snippets/php/get-copilotadminlimitedmode-php-snippets.md)]
95+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
96+
97+
# [Python](#tab/python)
98+
[!INCLUDE [sample-code](../includes/snippets/python/get-copilotadminlimitedmode-python-snippets.md)]
99+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
100+
101+
---
102+
72103

73104
### Response
74105

‎api-reference/beta/api/copilotadminlimitedmode-update.md

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ API can return additional HTTP status codes such as `403 Forbidden`, `500 Intern
6464
### Request
6565

6666
The following example shows a request.
67+
# [HTTP](#tab/http)
6768
<!-- {
6869
"blockType": "request",
6970
"name": "update_copilotadminlimitedmode"
@@ -80,6 +81,36 @@ Content-Type: application/json
8081
}
8182
```
8283

84+
# [C#](#tab/csharp)
85+
[!INCLUDE [sample-code](../includes/snippets/csharp/update-copilotadminlimitedmode-csharp-snippets.md)]
86+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
87+
88+
# [CLI](#tab/cli)
89+
[!INCLUDE [sample-code](../includes/snippets/cli/update-copilotadminlimitedmode-cli-snippets.md)]
90+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
91+
92+
# [Go](#tab/go)
93+
[!INCLUDE [sample-code](../includes/snippets/go/update-copilotadminlimitedmode-go-snippets.md)]
94+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
95+
96+
# [Java](#tab/java)
97+
[!INCLUDE [sample-code](../includes/snippets/java/update-copilotadminlimitedmode-java-snippets.md)]
98+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
99+
100+
# [JavaScript](#tab/javascript)
101+
[!INCLUDE [sample-code](../includes/snippets/javascript/update-copilotadminlimitedmode-javascript-snippets.md)]
102+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
103+
104+
# [PHP](#tab/php)
105+
[!INCLUDE [sample-code](../includes/snippets/php/update-copilotadminlimitedmode-php-snippets.md)]
106+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
107+
108+
# [Python](#tab/python)
109+
[!INCLUDE [sample-code](../includes/snippets/python/update-copilotadminlimitedmode-python-snippets.md)]
110+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
111+
112+
---
113+
83114

84115
### Response
85116

‎api-reference/beta/api/identityproviderbase-get.md

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -380,6 +380,7 @@ Content-type: application/json
380380

381381
The following example shows a request.
382382

383+
# [HTTP](#tab/http)
383384
<!-- {
384385
"blockType": "request",
385386
"name": "get_oidcidentityprovider_from_identityproviderbase",
@@ -389,6 +390,40 @@ The following example shows a request.
389390
GET https://graph.microsoft.com/beta/identity/identityProviders/12345678-abcd-1234-cdef-aaaaaaaaaaaa
390391
```
391392

393+
# [C#](#tab/csharp)
394+
[!INCLUDE [sample-code](../includes/snippets/csharp/get-oidcidentityprovider-from-identityproviderbase-csharp-snippets.md)]
395+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
396+
397+
# [CLI](#tab/cli)
398+
[!INCLUDE [sample-code](../includes/snippets/cli/get-oidcidentityprovider-from-identityproviderbase-cli-snippets.md)]
399+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
400+
401+
# [Go](#tab/go)
402+
[!INCLUDE [sample-code](../includes/snippets/go/get-oidcidentityprovider-from-identityproviderbase-go-snippets.md)]
403+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
404+
405+
# [Java](#tab/java)
406+
[!INCLUDE [sample-code](../includes/snippets/java/get-oidcidentityprovider-from-identityproviderbase-java-snippets.md)]
407+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
408+
409+
# [JavaScript](#tab/javascript)
410+
[!INCLUDE [sample-code](../includes/snippets/javascript/get-oidcidentityprovider-from-identityproviderbase-javascript-snippets.md)]
411+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
412+
413+
# [PHP](#tab/php)
414+
[!INCLUDE [sample-code](../includes/snippets/php/get-oidcidentityprovider-from-identityproviderbase-php-snippets.md)]
415+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
416+
417+
# [PowerShell](#tab/powershell)
418+
[!INCLUDE [sample-code](../includes/snippets/powershell/get-oidcidentityprovider-from-identityproviderbase-powershell-snippets.md)]
419+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
420+
421+
# [Python](#tab/python)
422+
[!INCLUDE [sample-code](../includes/snippets/python/get-oidcidentityprovider-from-identityproviderbase-python-snippets.md)]
423+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
424+
425+
---
426+
392427
#### Response
393428

394429
The following example shows the response.

‎api-reference/beta/api/intune-devices-userexperienceanalyticsremoteconnection-get.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ doc_type: apiPageType
1111

1212
Namespace: microsoft.graph
1313

14+
> **Caution:** This API is deprecated and will stop returning data on December 31, 2024. Going forward, use the [getRawRemoteConnectionReports](./cloudpcreports-getrawremoteconnectionreports.md) resource and its supported APIs.
15+
1416
> **Important:** Microsoft Graph APIs under the /beta version are subject to change; production use is not supported.
1517
1618
> **Note:** The Microsoft Graph API for Intune requires an [active Intune license](https://go.microsoft.com/fwlink/?linkid=839381) for the tenant.

‎api-reference/beta/api/intune-devices-userexperienceanalyticsremoteconnection-list.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ doc_type: apiPageType
1111

1212
Namespace: microsoft.graph
1313

14+
> **Caution:** This API is deprecated and will stop returning data on December 31, 2024. Going forward, use the [getRawRemoteConnectionReports](./cloudpcreports-getrawremoteconnectionreports.md) resource and its supported APIs.
15+
1416
> **Important:** Microsoft Graph APIs under the /beta version are subject to change; production use is not supported.
1517
1618
> **Note:** The Microsoft Graph API for Intune requires an [active Intune license](https://go.microsoft.com/fwlink/?linkid=839381) for the tenant.

0 commit comments

Comments
 (0)