Skip to content

Commit c1f93e2

Browse files
LauragraLauragra
authored
Merge pull request #25083 from microsoftgraph/main
Merge to publish.
2 parents fccdb13 + ddef90e commit c1f93e2

31 files changed

+434
-175
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ Choose the permission or permissions marked as least privileged for this API. Us
3333
GET /education/classes/{id}/assignments/{id}
3434
```
3535
## Optional query parameters
36-
This method supports the `$select` and `$expand` OData query parameters to help customize the response. For general information, see [OData query parameters](/graph/query-parameters).
36+
This method supports the `$select`, `$orderby`, and `$expand` OData query parameters to help customize the response. For general information, see [OData query parameters](/graph/query-parameters).
37+
38+
You can use `$orderby` with the following properties of the [educationAssignment](../resources/educationassignment.md) resource: **assignDateTime**, **assignedDateTime**, **closeDateTime**, **createdDateTime**, **displayName**, **dueDateTime**, **lastModifiedDateTime**, **moduleUrl**, and **status**.
3739

3840
The following `$expand` options are available for this method: `categories`, `resources`, `rubric`, `submissions`, `gradingScheme`, `gradingCategory`, and `*`. `*` specifies all the previous options.
3941

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ GET /education/classes/{id}/assignmentCategories/{id}
3333

3434
## Optional query parameters
3535

36-
This method supports the `$select` OData query parameter to help customize the response. For general information, see [OData query parameters](/graph/query-parameters).
36+
This method supports the `$select` and `$orderby` OData query parameters to help customize the response. For general information, see [OData query parameters](/graph/query-parameters).
37+
38+
You can use `$orderby` with the **displayName** property of the [educationCategory](../resources/educationcategory.md) resource.
3739

3840
## Request headers
3941
| Header | Value |

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,9 @@ GET /education/classes/{class-id}/assignments/{assignment-id}/submissions/{submi
3939

4040
## Optional query parameters
4141

42-
This method supports the `$select` OData query parameters to help customize the response. For general information, see [OData query parameters](/graph/query-parameters).
42+
This method supports the `$select` and `$orderby` OData query parameters to help customize the response. For general information, see [OData query parameters](/graph/query-parameters).
43+
44+
You can use `$orderby` with the following properties of the [educationSubmission](../resources/educationsubmission.md) resource: **excusedDateTime**, **reassignedDateTime**, **returnedDateTime**, **status**, **submittedDateTime**, and **unsubmittedDateTime**.
4345

4446
## Request headers
4547
| Header | Value |

‎api-reference/beta/api/educationsubmission-reassign.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ The following is an example of the response when `Prefer: include-unknown-enum-m
102102

103103
<!-- {
104104
"blockType": "response",
105+
"truncated": true,
105106
"@odata.type": "microsoft.graph.educationSubmission"
106107
} -->
107108
```http
@@ -213,7 +214,8 @@ Prefer: include-unknown-enum-members
213214
The following is an example of the response when `Prefer: include-unknown-enum-members` is provided in the request header and the submission hasn't been returned before.
214215

215216
<!-- {
216-
"blockType": "response",
217+
"blockType": "response",
218+
"truncated": true,
217219
"@odata.type": "microsoft.graph.educationSubmission"
218220
} -->
219221
```http

‎api-reference/beta/api/educationuser-list-assignments.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,9 @@ This method supports the `$top`, `$filter`, `$orderby`, and `$select` OData quer
4545

4646
The following `$expand` options are available for this method: `categories`, `resources`, `gradingCategory`, `rubric`, `submissions`, and `*`, which includes all the previous options.
4747

48-
All [properties](../resources/educationassignment.md#properties) are supported for the query parameters `$filter` and `$orderby`.
48+
All [properties](../resources/educationassignment.md#properties) are supported by the `$filter` query parameter.
49+
50+
You can use `$orderby` with the following properties of the [educationAssignment](../resources/educationassignment.md) resource: **assignDateTime**, **assignedDateTime**, **closeDateTime**, **createdDateTime**, **displayName**, **dueDateTime**, **lastModifiedDateTime**, and **status**.
4951

5052
## Request headers
5153

‎api-reference/beta/api/teamsapp-publish.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,9 @@ Choose the permission or permissions marked as least privileged for this API. Us
2929
[!INCLUDE [permissions-table](../includes/permissions/teamsapp-publish-permissions.md)]
3030

3131
> [!NOTE]
32-
> The Directory.ReadWrite.All permission is supported only for backward compatibility. We recommend that you update your solutions to use an alternative permission listed in the previous table and avoid using these permissions going forward.
32+
>
33+
> * The `Directory.ReadWrite.All` permission is supported only for backward compatibility. We recommend that you update your solutions to use an alternative permission listed in the previous table and avoid using these permissions going forward.
34+
> * The `AppCatalog.Submit` permission allows you to submit apps for review only, not to publish them to the catalog.
3335
3436
## HTTP request
3537

‎api-reference/beta/resources/cloudpccrossregiondisasterrecoverysetting.md

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
---
2+
title: "cloudPcCrossRegionDisasterRecoverySetting resource type"
3+
description: "Represents the settings for cross-region disaster recovery on a Cloud PC."
4+
author: "Guoan-Tang"
5+
ms.localizationpriority: medium
6+
ms.subservice: "cloud-pc"
7+
doc_type: resourcePageType
8+
toc.title: Cloud PC cross-region disaster recovery setting
9+
---
10+
11+
# cloudPcCrossRegionDisasterRecoverySetting resource type
12+
13+
Namespace: microsoft.graph
14+
15+
[!INCLUDE [beta-disclaimer](../../includes/beta-disclaimer.md)]
16+
17+
Represents the settings for cross-region disaster recovery on a Cloud PC.
18+
19+
## Properties
20+
21+
|Property|Type|Description|
22+
|:---|:---|:---|
23+
|crossRegionDisasterRecoveryEnabled|Boolean|`True` if an end user is allowed to set up cross-region disaster recovery for Cloud PC; otherwise, `false`. The default value is `false`.|
24+
|disasterRecoveryNetworkSetting|[cloudPcDisasterRecoveryNetworkSetting](../resources/cloudpcdisasterrecoverynetworksetting.md)|Indicates the network settings of the Cloud PC during a cross-region disaster recovery operation.|
25+
|maintainCrossRegionRestorePointEnabled|Boolean|Indicates whether Windows 365 maintain the cross-region disaster recovery function generated restore points. If `true`, the Windows 365 stored restore points; `false` indicates that Windows 365 doesn't generate or keep the restore point from the original Cloud PC. If a disaster occurs, the new Cloud PC can only be provisioned using the initial image. This limitation can result in the loss of some user data on the original Cloud PC. The default value is `false`.|
26+
27+
## Relationships
28+
29+
None.
30+
31+
## JSON representation
32+
33+
The following JSON representation shows the resource type.
34+
<!-- {
35+
"blockType": "resource",
36+
"@odata.type": "microsoft.graph.cloudPcCrossRegionDisasterRecoverySetting"
37+
}
38+
-->
39+
40+
``` json
41+
{
42+
"@odata.type": "#microsoft.graph.cloudPcRestorePointSetting",
43+
"crossRegionDisasterRecoveryEnabled": "Boolean",
44+
"disasterRecoveryNetworkSetting": {"@odata.type": "microsoft.graph.cloudPcDisasterRecoveryNetworkSetting"},
45+
"maintainCrossRegionRestorePointEnabled": "Boolean"
46+
}
47+
```

‎api-reference/beta/resources/cloudpcdisasterrecoveryazureconnectionsetting.md

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
---
2+
title: "cloudPcDisasterRecoveryAzureConnectionSetting resource type"
3+
description: "Represents the Azure network connection configuration of backup Cloud PCs provisioned for cross-region disaster recovery."
4+
author: "Guoan-Tang"
5+
ms.localizationpriority: medium
6+
ms.subservice: "cloud-pc"
7+
doc_type: resourcePageType
8+
---
9+
10+
# cloudPcDisasterRecoveryAzureConnectionSetting resource type
11+
12+
Namespace: microsoft.graph
13+
14+
[!INCLUDE [beta-disclaimer](../../includes/beta-disclaimer.md)]
15+
16+
Represents the Azure network connection configuration of backup Cloud PCs provisioned for cross-region disaster recovery.
17+
18+
Inherits from [cloudPcDisasterRecoveryNetworkSetting](../resources/cloudpcdisasterrecoverynetworksetting.md).
19+
20+
## Properties
21+
22+
|Property|Type|Description|
23+
|:---|:---|:---|
24+
|onPremisesConnectionId|String|Indicates the unique ID of the virtual network that the new Cloud PC joins.|
25+
26+
## Relationships
27+
28+
None.
29+
30+
## JSON representation
31+
32+
The following JSON representation shows the resource type.
33+
<!-- {
34+
"blockType": "resource",
35+
"@odata.type": "microsoft.graph.cloudPcDisasterRecoveryAzureConnectionSetting"
36+
}
37+
-->
38+
39+
``` json
40+
{
41+
"@odata.type": "#microsoft.graph.cloudPcDisasterRecoveryAzureConnectionSetting",
42+
"onPremisesConnectionId": "String"
43+
}
44+
```

‎api-reference/beta/resources/cloudpcdisasterrecoverymicrosofthostednetworksetting.md

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
---
2+
title: "cloudPcDisasterRecoveryMicrosoftHostedNetworkSetting resource type"
3+
description: "Represents the configuration of Microsoft-hosted network for backup Cloud PCs provisioned for cross-region disaster recovery."
4+
author: "Guoan-Tang"
5+
ms.localizationpriority: medium
6+
ms.subservice: "cloud-pc"
7+
doc_type: resourcePageType
8+
---
9+
10+
# cloudPcDisasterRecoveryMicrosoftHostedNetworkSetting resource type
11+
12+
Namespace: microsoft.graph
13+
14+
[!INCLUDE [beta-disclaimer](../../includes/beta-disclaimer.md)]
15+
16+
Represents the configuration of Microsoft-hosted network for backup Cloud PCs provisioned for cross-region disaster recovery.
17+
18+
Inherits from [cloudPcDisasterRecoveryNetworkSetting](../resources/cloudpcdisasterrecoverynetworksetting.md).
19+
20+
## Properties
21+
22+
|Property|Type|Description|
23+
|:---|:---|:---|
24+
|regionGroup|[cloudPcRegionGroup](../resources/cloudpcsupportedregion.md#cloudpcregiongroup-values)|Indicates the logic geographic group this region belongs to. Multiple regions can belong to one region group. When a region group is configured for disaster recovery, the new Cloud PC is assigned to one of the regions within the group based on resource availability. For example, the `europeUnion` region group contains the North Europe and West Europe regions. Possible values are: `default`, `australia`, `canada`, `usCentral`, `usEast`, `usWest`, `france`, `germany`, `europeUnion`, `unitedKingdom`, `japan`, `asia`, `india`, `southAmerica`, `euap`, `usGovernment`, `usGovernmentDOD`, `unknownFutureValue`, `norway`, `switzerland`，`southKorea`. You must use the `Prefer: include-unknown-enum-members` request header to get the following values in this [evolvable enum](/graph/best-practices-concept#handling-future-members-in-evolvable-enumerations): `norway`, `switzerland`，`southKorea`.|
25+
|regionName|String|Indicates the Azure region that the new Cloud PC is assigned to. The Windows 365 service creates and manages the underlying virtual network.|
26+
27+
## Relationships
28+
29+
None.
30+
31+
## JSON representation
32+
33+
The following JSON representation shows the resource type.
34+
<!-- {
35+
"blockType": "resource",
36+
"@odata.type": "microsoft.graph.cloudPcDisasterRecoveryMicrosoftHostedNetworkSetting"
37+
}
38+
-->
39+
40+
``` json
41+
{
42+
"@odata.type": "#microsoft.graph.cloudPcDisasterRecoveryMicrosoftHostedNetworkSetting",
43+
"regionGroup": "String",
44+
"regionName": "String"
45+
}
46+
```

‎api-reference/beta/resources/cloudpcdisasterrecoverynetworksetting.md

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
---
2+
title: "cloudPcDisasterRecoveryNetworkSetting resource type"
3+
description: "An abstract type that represents the network configuration of backup Cloud PCs provisioned for cross-region disaster recovery."
4+
author: "Guoan-Tang"
5+
ms.localizationpriority: medium
6+
ms.subservice: "cloud-pc"
7+
doc_type: resourcePageType
8+
---
9+
10+
# cloudPcDisasterRecoveryNetworkSetting resource type
11+
12+
Namespace: microsoft.graph
13+
14+
[!INCLUDE [beta-disclaimer](../../includes/beta-disclaimer.md)]
15+
16+
An abstract type that represents the network configuration of backup Cloud PCs provisioned for cross-region disaster recovery.
17+
18+
Base type of [cloudPcDisasterRecoveryAzureConnectionSetting](../resources/cloudpcdisasterrecoveryazureconnectionsetting.md) and [cloudPcDisasterRecoveryMicrosoftHostedNetworkSetting](../resources/cloudpcdisasterrecoverymicrosofthostednetworksetting.md)
19+
20+
## Properties
21+
22+
None.
23+
24+
## Relationships
25+
26+
None.
27+
28+
## JSON representation
29+
30+
The following JSON representation shows the resource type.
31+
<!-- {
32+
"blockType": "resource",
33+
"@odata.type": "microsoft.graph.cloudPcDisasterRecoveryNetworkSetting"
34+
}
35+
-->
36+
37+
``` json
38+
{
39+
"@odata.type": "#microsoft.graph.cloudPcDisasterRecoveryNetworkSetting"
40+
}
41+
```

0 commit comments

Comments
 (0)