Skip to content

Commit 8fdddc0

Browse files
mnorman-msmnorman-ms
authored
Merge branch 'main' into prefer-header-update
2 parents 57580d3 + 0aaaf38 commit 8fdddc0

22 files changed

+194
-235
lines changed

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

Lines changed: 4 additions & 133 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ GET /deviceManagement/virtualEndpoint/cloudPCs/{id}
4747

4848
## Optional query parameters
4949

50-
This method supports the `$select` OData query parameter to help customize the response. For general information, see [OData query parameters](/graph/query-parameters).
50+
This method supports the `$select` [OData query parameter](/graph/query-parameters) to help customize the response.
5151

5252
## Request headers
5353

@@ -174,51 +174,16 @@ Content-Type: application/json
174174

175175
The following example shows a request.
176176

177-
# [HTTP](#tab/http)
178177
<!-- {
179178
"blockType": "request",
180179
"name": "get_cloudpc_selected_properties"
181180
}
182181
-->
183182

184183
``` http
185-
GET https://graph.microsoft.com/beta/deviceManagement/virtualEndpoint/cloudPCs/40cee9d2-03fb-4066-8d35-dbdf2875c33f?$select=id,displayName,imageDisplayName,lastModifiedDateTime,lastRemoteActionResult,lastLoginResult,connectivityResult,allotmentDisplayName,deviceRegionName
184+
GET https://graph.microsoft.com/beta/deviceManagement/virtualEndpoint/cloudPCs/40cee9d2-03fb-4066-8d35-dbdf2875c33f?$select=id,displayName,imageDisplayName,lastModifiedDateTime,lastRemoteActionResult,lastLoginResult,connectivityResult,allotmentDisplayName,deviceRegionName,productType
186185
```
187186

188-
# [C#](#tab/csharp)
189-
[!INCLUDE [sample-code](../includes/snippets/csharp/get-cloudpc-selected-properties-csharp-snippets.md)]
190-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
191-
192-
# [CLI](#tab/cli)
193-
[!INCLUDE [sample-code](../includes/snippets/cli/get-cloudpc-selected-properties-cli-snippets.md)]
194-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
195-
196-
# [Go](#tab/go)
197-
[!INCLUDE [sample-code](../includes/snippets/go/get-cloudpc-selected-properties-go-snippets.md)]
198-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
199-
200-
# [Java](#tab/java)
201-
[!INCLUDE [sample-code](../includes/snippets/java/get-cloudpc-selected-properties-java-snippets.md)]
202-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
203-
204-
# [JavaScript](#tab/javascript)
205-
[!INCLUDE [sample-code](../includes/snippets/javascript/get-cloudpc-selected-properties-javascript-snippets.md)]
206-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
207-
208-
# [PHP](#tab/php)
209-
[!INCLUDE [sample-code](../includes/snippets/php/get-cloudpc-selected-properties-php-snippets.md)]
210-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
211-
212-
# [PowerShell](#tab/powershell)
213-
[!INCLUDE [sample-code](../includes/snippets/powershell/get-cloudpc-selected-properties-powershell-snippets.md)]
214-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
215-
216-
# [Python](#tab/python)
217-
[!INCLUDE [sample-code](../includes/snippets/python/get-cloudpc-selected-properties-python-snippets.md)]
218-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
219-
220-
---
221-
222187
#### Response
223188

224189
The following example shows the response.
@@ -266,7 +231,8 @@ Content-Type: application/json
266231
]
267232
},
268233
"allotmentDisplayName": null,
269-
"deviceRegionName": "eastus2"
234+
"deviceRegionName": "eastus2",
235+
"productType": null
270236
}
271237
```
272238

@@ -372,98 +338,3 @@ Content-Type: application/json
372338
"diskEncryptionState": "notAvailable"
373339
}
374340
```
375-
376-
### Example 4: List Cloud PCs filtered by disaster recovery capability type
377-
378-
The following example shows how to list Cloud PCs filtered by disaster recovery capability type and select specific parameters.
379-
380-
#### Request
381-
382-
The following example shows a request.
383-
384-
# [HTTP](#tab/http)
385-
<!-- {
386-
"blockType": "request",
387-
"name": "get_cloudpc_disasterrecoverycapability"
388-
}
389-
-->
390-
``` http
391-
GET https://graph.microsoft.com/beta/deviceManagement/virtualEndpoint/cloudPCs?$select=id,displayName,disasterRecoveryCapability&$filter=disasterRecoveryCapability/capabilityType eq 'failover'
392-
```
393-
394-
# [C#](#tab/csharp)
395-
[!INCLUDE [sample-code](../includes/snippets/csharp/get-cloudpc-disasterrecoverycapability-csharp-snippets.md)]
396-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
397-
398-
# [CLI](#tab/cli)
399-
[!INCLUDE [sample-code](../includes/snippets/cli/get-cloudpc-disasterrecoverycapability-cli-snippets.md)]
400-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
401-
402-
# [Go](#tab/go)
403-
[!INCLUDE [sample-code](../includes/snippets/go/get-cloudpc-disasterrecoverycapability-go-snippets.md)]
404-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
405-
406-
# [Java](#tab/java)
407-
[!INCLUDE [sample-code](../includes/snippets/java/get-cloudpc-disasterrecoverycapability-java-snippets.md)]
408-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
409-
410-
# [JavaScript](#tab/javascript)
411-
[!INCLUDE [sample-code](../includes/snippets/javascript/get-cloudpc-disasterrecoverycapability-javascript-snippets.md)]
412-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
413-
414-
# [PHP](#tab/php)
415-
[!INCLUDE [sample-code](../includes/snippets/php/get-cloudpc-disasterrecoverycapability-php-snippets.md)]
416-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
417-
418-
# [PowerShell](#tab/powershell)
419-
[!INCLUDE [sample-code](../includes/snippets/powershell/get-cloudpc-disasterrecoverycapability-powershell-snippets.md)]
420-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
421-
422-
# [Python](#tab/python)
423-
[!INCLUDE [sample-code](../includes/snippets/python/get-cloudpc-disasterrecoverycapability-python-snippets.md)]
424-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
425-
426-
---
427-
428-
#### Response
429-
430-
The following example shows the response.
431-
432-
<!-- {
433-
"blockType": "response",
434-
"truncated": true,
435-
"name": "get_cloudpc_disasterrecoverycapability",
436-
"@odata.type": "microsoft.graph.cloudPC"
437-
}
438-
-->
439-
440-
``` http
441-
HTTP/1.1 200 OK
442-
Content-Type: application/json
443-
444-
{
445-
"@odata.context": "https://graph.microsoft.com/beta/$metadata#deviceManagement/virtualEndpoint/cloudPCs(id,displayName,disasterRecoveryCapability)",
446-
"value": [
447-
{
448-
"id": "662009bc-7732-4f6f-8726-25883518b33e",
449-
"displayName": "Demo-0",
450-
"disasterRecoveryCapability": {
451-
"primaryRegion": "eastus",
452-
"secondaryRegion": "westus",
453-
"capabilityType": "failover"
454-
}
455-
},
456-
{
457-
"id": "ac74ae8b-85f7-4272-88cc-5419267403ed",
458-
"displayName": "Demo-1",
459-
"disasterRecoveryCapability": {
460-
"primaryRegion": "eastus",
461-
"secondaryRegion": "westus",
462-
"capabilityType": "failover"
463-
}
464-
}
465-
]
466-
}
467-
```
468-
469-

‎api-reference/beta/api/cloudpc-getprovisionedcloudpcs.md

Lines changed: 5 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -197,50 +197,15 @@ The following example shows how to get all provisioned Cloud PCs and use `$selec
197197

198198
The following example shows a request.
199199

200-
# [HTTP](#tab/http)
201200
<!-- {
202201
"blockType": "request",
203202
"name": "cloudpc.getProvisionedCloudPCs_2"
204203
}
205204
-->
206205
``` http
207-
GET https://graph.microsoft.com/beta/deviceManagement/virtualEndpoint/cloudPCs/getProvisionedCloudPCs(groupId='30d0e128-de93-41dc-89ec-33d84bb662a0',servicePlanId='9ecf691d-8b82-46cb-b254-cd061b2c02fb')?$select=id,displayName,powerState,connectivityResult,lastLoginResult,lastRemoteActionResult,osVersion,provisioningPolicyName,userAccountType
206+
GET https://graph.microsoft.com/beta/deviceManagement/virtualEndpoint/cloudPCs/getProvisionedCloudPCs(groupId='30d0e128-de93-41dc-89ec-33d84bb662a0',servicePlanId='9ecf691d-8b82-46cb-b254-cd061b2c02fb')?$select=id,displayName,powerState,connectivityResult,lastLoginResult,lastRemoteActionResult,osVersion,provisioningPolicyName,userAccountType,productType
208207
```
209208

210-
# [C#](#tab/csharp)
211-
[!INCLUDE [sample-code](../includes/snippets/csharp/cloudpcgetprovisionedcloudpcs-2-csharp-snippets.md)]
212-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
213-
214-
# [CLI](#tab/cli)
215-
[!INCLUDE [sample-code](../includes/snippets/cli/cloudpcgetprovisionedcloudpcs-2-cli-snippets.md)]
216-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
217-
218-
# [Go](#tab/go)
219-
[!INCLUDE [sample-code](../includes/snippets/go/cloudpcgetprovisionedcloudpcs-2-go-snippets.md)]
220-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
221-
222-
# [Java](#tab/java)
223-
[!INCLUDE [sample-code](../includes/snippets/java/cloudpcgetprovisionedcloudpcs-2-java-snippets.md)]
224-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
225-
226-
# [JavaScript](#tab/javascript)
227-
[!INCLUDE [sample-code](../includes/snippets/javascript/cloudpcgetprovisionedcloudpcs-2-javascript-snippets.md)]
228-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
229-
230-
# [PHP](#tab/php)
231-
[!INCLUDE [sample-code](../includes/snippets/php/cloudpcgetprovisionedcloudpcs-2-php-snippets.md)]
232-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
233-
234-
# [PowerShell](#tab/powershell)
235-
[!INCLUDE [sample-code](../includes/snippets/powershell/cloudpcgetprovisionedcloudpcs-2-powershell-snippets.md)]
236-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
237-
238-
# [Python](#tab/python)
239-
[!INCLUDE [sample-code](../includes/snippets/python/cloudpcgetprovisionedcloudpcs-2-python-snippets.md)]
240-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
241-
242-
---
243-
244209
#### Response
245210

246211
The following example shows the response.
@@ -268,7 +233,8 @@ Content-Type: application/json
268233
"lastRemoteActionResult": "Succeed",
269234
"osVersion": null,
270235
"provisioningPolicyName": "Test-Policy",
271-
"userAccountType": null
236+
"userAccountType": null,
237+
"productType": null
272238
},
273239
{
274240
"@odata.type": "#microsoft.graph.cloudPC",
@@ -280,7 +246,8 @@ Content-Type: application/json
280246
"lastRemoteActionResult": "Succeed",
281247
"osVersion": null,
282248
"provisioningPolicyName": "Test-Policy",
283-
"userAccountType": null
249+
"userAccountType": null,
250+
"productType": null
284251
}
285252
]
286253
}

‎api-reference/beta/api/customauthenticationextension-delete.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,4 +109,4 @@ The following example shows the response.
109109
-->
110110
``` http
111111
HTTP/1.1 204 No Content
112-
```
112+
```

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,4 +141,4 @@ Content-Type: application/json
141141
}
142142
]
143143
}
144-
```
144+
```

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,4 +149,4 @@ The following example shows the response.
149149
-->
150150
``` http
151151
HTTP/1.1 204 No Content
152-
```
152+
```

‎api-reference/beta/api/customauthenticationextension-validateauthenticationconfiguration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,4 +221,4 @@ Content-Type: application/json
221221
},
222222
]
223223
}
224-
```
224+
```

‎api-reference/beta/api/fido2authenticationmethod-creationoptions.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,9 @@ Don't supply a request body for this method.
5959

6060
If successful, this function returns a `200 OK` response code and a [webauthnCredentialCreationOptions](../resources/webauthncredentialcreationoptions.md) in the response body.
6161

62+
> [!NOTE]
63+
> This method also returns **excludeCredentials** key IDs formatted in Base64URL with a padding number suffix. To decode the key IDs, convert the trailing integer value of 0, 1, or 2 to the same number of base64 padding characters.
64+
6265
## Examples
6366

6467
### Request
@@ -99,7 +102,9 @@ GET https://graph.microsoft.com/beta/users/{usersId}/authentication/fido2Methods
99102
### Response
100103

101104
The following example shows the response.
102-
>**Note:** The response object shown here might be shortened for readability.
105+
106+
> **Note:** The response object shown here might be shortened for readability.
107+
103108
<!-- {
104109
"blockType": "response",
105110
"truncated": true,
@@ -173,4 +178,3 @@ Content-Type: application/json
173178
}
174179
}
175180
```
176-

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,13 @@ Don't supply a request body for this method.
5959

6060
If successful, this method returns a `200 OK` response code and the requested [fido2AuthenticationMethod](../resources/fido2authenticationmethod.md) object in the response body.
6161

62+
> [!NOTE]
63+
> This method also returns credentials key IDs formatted in Base64URL with a padding number suffix. To decode the key IDs, convert the trailing integer value of 0, 1, or 2 to the same number of base64 padding characters.
64+
6265
## Examples
6366

6467
### Request
65-
68+
The following example shows a request.
6669

6770
# [HTTP](#tab/http)
6871
<!-- {
@@ -112,7 +115,8 @@ GET https://graph.microsoft.com/beta/me/authentication/fido2Methods/-2_GRUg2-HYz
112115
### Response
113116
The following example shows the response.
114117

115-
**Note:** The response object shown here might be shortened for readability.
118+
>**Note:** The response object shown here might be shortened for readability.
119+
116120
<!-- {
117121
"blockType": "response",
118122
"truncated": true,

‎api-reference/beta/api/identitycontainer-list-customauthenticationextensions.md

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,7 @@ Get a list of the [customAuthenticationExtension](../resources/customauthenticat
2626

2727
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).
2828

29-
<!-- {
30-
"blockType": "permissions",
31-
"name": "identitycontainer-list-customauthenticationextensions-permissions"
32-
}
33-
-->
29+
<!-- { "blockType": "permissions", "name": "identitycontainer_list_customauthenticationextensions" } -->
3430
[!INCLUDE [permissions-table](../includes/permissions/identitycontainer-list-customauthenticationextensions-permissions.md)]
3531

3632
[!INCLUDE [rbac-custom-auth-ext-apis-read](../includes/rbac-for-apis/rbac-custom-auth-ext-apis-read.md)]
@@ -150,4 +146,4 @@ Content-Type: application/json
150146
}
151147
]
152148
}
153-
```
149+
```

‎api-reference/beta/api/identitycontainer-post-customauthenticationextensions.md

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,7 @@ Create a new [customAuthenticationExtension](../resources/customauthenticationex
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).
3333

34-
<!-- {
35-
"blockType": "permissions",
36-
"name": "identitycontainer-post-customauthenticationextensions-permissions"
37-
}
38-
-->
34+
<!-- { "blockType": "permissions", "name": "identitycontainer_post_customauthenticationextensions" } -->
3935
[!INCLUDE [permissions-table](../includes/permissions/identitycontainer-post-customauthenticationextensions-permissions.md)]
4036

4137
[!INCLUDE [rbac-custom-auth-ext-apis-write](../includes/rbac-for-apis/rbac-custom-auth-ext-apis-write.md)]
@@ -479,4 +475,4 @@ Content-Type: application/json
479475
"@odata.type": "microsoft.graph.customExtensionBehaviorOnError"
480476
}
481477
}
482-
```
478+
```

0 commit comments

Comments
 (0)