Skip to content

Commit 403ae38

Browse files
authored
Merge pull request #25920 from microsoftgraph/main
Merge to publish.
2 parents 340f892 + 201bdb7 commit 403ae38

15 files changed

+123
-26
lines changed

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,19 @@ Namespace: microsoft.graph
1414

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

17-
List [apps](../resources/teamsapp.md) from the Microsoft Teams app catalog.
18-
19-
This includes apps from the Microsoft Teams store and apps from your organization's app catalog (the tenant app catalog). To get apps from your organization's app catalog only, specify `organization` as the **distributionMethod** in the request.
17+
List [apps](../resources/teamsapp.md) from the Microsoft Teams app catalog, including apps from the Microsoft Teams store and apps from your organization's app catalog (the tenant app catalog). To get apps from your organization's app catalog only, specify `organization` as the **distributionMethod** in the request.
2018

2119
> [!NOTE]
2220
> 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.
2321
2422
[!INCLUDE [national-cloud-support](../../includes/global-us.md)]
2523

24+
> [!IMPORTANT]
25+
> * Currently, this API is only supported in the user context and not in the admin view.
26+
> * The Teams apps that this API returns comply with the app management policies established by the admin.
27+
> * 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.
28+
> * For more information, see [App management policies](/microsoftteams/manage-apps#manage-org-wide-app-settings).
29+
2630
## Permissions
2731

2832
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/cloudpc-createsnapshot.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,14 @@ POST /deviceManagement/virtualEndpoint/cloudPCs/{id}/createSnapshot
4444

4545
## Request body
4646

47-
Don't supply a request body for this method.
47+
In the request body, supply a JSON representation of the parameters.
48+
49+
The following table shows the parameter that you can use with this action.
50+
51+
|Parameter|Type|Description|
52+
|:---|:---|:---|
53+
|storageAccountId|String| The storage account which receives the restore point (snapshot).|
54+
|accessTier|String|The access tier of the blob file that the snapshot is copied to. Possible values are `hot`, `cool`, `cold`, `archive`, and `unknownFutureValue`. The default value is `hot`.|
4855

4956
## Response
5057

api-reference/beta/api/cloudpc-setreviewstatus.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,8 @@ Content-Type: application/json
7272
"reviewStatus": {
7373
"inReview": true,
7474
"userAccessLevel": "restricted",
75-
"azureStorageAccountId": "/subscriptions/f68bd846-16ad-4b51-a7c6-c84944a3367c/resourceGroups/Review/providers/Microsoft.Storage/storageAccounts/snapshotsUnderReview"
75+
"azureStorageAccountId": "/subscriptions/f68bd846-16ad-4b51-a7c6-c84944a3367c/resourceGroups/Review/providers/Microsoft.Storage/storageAccounts/snapshotsUnderReview",
76+
"accessTier": "hot"
7677
}
7778
}
7879
```

api-reference/beta/api/intune-cloudpkigraphservice-cloudcertificationauthority-list.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ One of the following permissions is required to call this API. To learn more, in
2727
|:---|:---|
2828
|Delegated (work or school account)|DeviceManagementConfiguration.Read.All, DeviceManagementConfiguration.ReadWrite.All|
2929
|Delegated (personal Microsoft account)|Not supported.|
30-
|Application|DeviceManagementConfiguration.Read.All, DeviceManagementConfiguration.ReadWrite.All|
30+
|Application|Not supported.|
3131

3232
## HTTP Request
3333
<!-- {

api-reference/beta/api/manageddevice-getcloudpcreviewstatus.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,8 @@ Content-Type: application/json
124124
"subscriptionName": "deschutes-INT-DR-test",
125125
"azureStorageAccountId": "/subscriptions/f68bd846-16ad-4b51-a7c6-c84944a3367c/resourceGroups/Review/providers/Microsoft.Storage/storageAccounts/snapshotsUnderReview",
126126
"azureStorageAccountName": "snapshotsUnderReview",
127-
"azureStorageContainerName": "snapshotsContainer"
127+
"azureStorageContainerName": "snapshotsContainer",
128+
"accessTier":"hot"
128129
}
129130
```
130131

api-reference/beta/resources/cloudpcbulkcreatesnapshot.md

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,19 @@ Inherits from [cloudPcBulkAction](../resources/cloudpcbulkaction.md).
2929
|initiatedByUserPrincipalName|String|The user principal name (UPN) of the user who initiated this bulk action. Read-only. Inherited from [cloudPcBulkAction](../resources/cloudpcbulkaction.md).|
3030
|scheduledDuringMaintenanceWindow|Boolean|Indicates whether the bulk action is scheduled according to the maintenance window. When `true`, the bulk action uses the maintenance window to schedule the action; `false` means that the bulk action doesn't use the maintenance window. The default value is `false`. Inherited from [cloudPcBulkAction](../resources/cloudpcbulkaction.md).|
3131
|status|[cloudPcBulkActionStatus](../resources/cloudpcbulkaction.md#cloudpcbulkactionstatus-values)|The status of the bulk actions. Possible values are `pending`, `succeeded`, `failed`, `unknownFutureValue`. The default value is `pending`. Read-only. Inherited from [cloudPcBulkAction](../resources/cloudpcbulkaction.md).|
32+
|storageAccountId|String|The unique identifier for Secure Azure Storage Account, which receives the restore points (snapshots). The value can't be modified after it's created. For example, '/subscriptions/06199b73-30a1-4922-8734-93feca64cdf6/resourceGroups/res2627/providers/Microsoft.Storage/storageAccounts/sto1125'. Read-Only.|
33+
|accessTier|[cloudPcBlobAccessTier](#cloudpcblobaccesstier-values)|Indicates the access tier of the blob file that the snapshot is copied to. Possible values are `hot`, `cool`, `cold`, `archive`, and `unknownFutureValue`. The default value is `hot`. Read-Only.|
34+
35+
36+
### cloudPcBlobAccessTier values
37+
38+
|Member|Description|
39+
|:---|:---|
40+
|hot|Indicates an online tier optimized for storing data that is accessed or modified frequently.|
41+
|cool|Indicates an online tier optimized for storing data that is infrequently accessed or modified.|
42+
|cold|Indicates an online tier optimized for storing data that is rarely accessed or modified, but still requires fast retrieval.|
43+
|archive|Indicates an offline access tier optimized for storing data that is rarely accessed, and that has flexible latency requirements that can be up to a few hours.|
44+
|unknownFutureValue|Evolvable enumeration sentinel value. Don't use.|
3245

3346
## Relationships
3447
None.
@@ -53,6 +66,8 @@ The following JSON representation shows the resource type.
5366
"id": "String (identifier)",
5467
"initiatedByUserPrincipalName": "String",
5568
"scheduledDuringMaintenanceWindow": "Boolean",
56-
"status": "String"
69+
"status": "String",
70+
"storageAccountId": "String",
71+
"accessTier": "String"
5772
}
5873
```

api-reference/beta/resources/cloudpcforensicstorageaccount.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ Represents the storage account information that can be used to store a snapshot
2121
|:---|:---|:---|
2222
|storageAccountId|String|The ID of the storage account.|
2323
|storageAccountName|String|The name of the storage account.|
24+
|immutableStorage|Boolean|Indicates whether immutability policies are configured for the storage account. When `true`, the storage account only accepts `hot` as the snapshot access tier. When `false`, the storage account accepts all valid access tiers. Read-Only.|
2425

2526
## Relationships
2627
None.
@@ -39,6 +40,7 @@ The following JSON representation shows the resource type.
3940
{
4041
"@odata.type": "#microsoft.graph.cloudPcForensicStorageAccount",
4142
"storageAccountId": "String",
42-
"storageAccountName": "String"
43+
"storageAccountName": "String",
44+
"immutableStorage": "Boolean"
4345
}
4446
```

api-reference/beta/resources/cloudpcreviewstatus.md

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,25 @@ Represents details about the review status of a Cloud PC.
2828
|subscriptionId|String|The ID of the Azure subscription in which the Cloud PC snapshot is being saved, in GUID format.|
2929
|subscriptionName|String|The name of the Azure subscription in which the Cloud PC snapshot is being saved.|
3030
|userAccessLevel|[cloudPcUserAccessLevel](#cloudpcuseraccesslevel-values)|The access level of the end user on the Cloud PC. Possible values are: `unrestricted`, `restricted`.|
31+
|accessTier|[cloudPcBlobAccessTier](#cloudpcblobaccesstier-values)| The blob access tier of the Azure Storage account in which the Cloud PC snapshot is saved with. Possible values are `hot`, `cool`, `cold`, and `archive`, default value is `hot`.|
3132

3233
### cloudPcUserAccessLevel values
3334

3435
|Member|Value|Description|
3536
|:---|:---|:---|
3637
|unrestricted|0|No restriction. Users can access the Cloud PC.|
37-
|restricted|1|Users are not allowed to access the Cloud PC.|
38-
|unknownFutureValue|999|Evolvable enumeration sentinel value. Do not use.|
38+
|restricted|1|Users aren't allowed to access the Cloud PC.|
39+
|unknownFutureValue|999|Evolvable enumeration sentinel value. Don't use.|
3940

41+
### cloudPcBlobAccessTier values
42+
43+
|Member|Description|
44+
|:---|:---|
45+
|hot|Indicates an online tier optimized for storing data that is accessed or modified frequently.|
46+
|cool|Indicates an online tier optimized for storing data that is infrequently accessed or modified.|
47+
|cold|Indicates an online tier optimized for storing data that is rarely accessed or modified, but still requires fast retrieval.|
48+
|archive|Indicates an offline access tier optimized for storing data that is rarely accessed, and that has flexible latency requirements that can be up to a few hours.|
49+
|unknownFutureValue|Evolvable enumeration sentinel value. Don't use.|
4050

4151
## Relationships
4252
None.
@@ -59,7 +69,8 @@ The following JSON representation shows the resource type.
5969
"reviewStartDateTime": "String (timestamp)",
6070
"subscriptionId": "String",
6171
"subscriptionName": "String",
62-
"userAccessLevel": "String"
72+
"userAccessLevel": "String",
73+
"accessTier": "String"
6374
}
6475
```
6576

api-reference/beta/resources/onlinemeeting.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ This resource supports subscribing to [change notifications](/graph/webhooks). F
2020

2121
Inherits from [onlineMeetingBase](../resources/onlinemeetingbase.md).
2222

23+
> [!CAUTION]
24+
>
25+
> Microsoft Graph online meeting APIs that support Microsoft Teams live events are deprecated and stopped returning data on September 30, 2024. New Microsoft Graph APIs will replace these APIs in spring of 2025. For more information, see [Retirement of Teams live events API on Microsoft Graph](https://devblogs.microsoft.com/microsoft365dev/deprecation-of-teams-live-events-api-on-microsoft-graph/).
26+
2327
## Methods
2428

2529
| Method | Return Type |Description |
@@ -34,11 +38,8 @@ Inherits from [onlineMeetingBase](../resources/onlinemeetingbase.md).
3438

3539
> [!NOTE]
3640
>
37-
> A bearer token is required for the `Authorization` header for all the methods listed in the previous table. For details about how to get the `token` for the `Authorization` header, see [Get access on behalf of a user](/graph/auth-v2-user?tabs=http#3-request-an-access-token).
38-
39-
> [!CAUTION]
40-
>
41-
> Graph Online Meeting APIs that support Microsoft Teams live event is deprecated and will stop functioning on September 30, 2024. New Graph APIs will replace this in Spring of 2024. For more information, see [Retirement of Teams live events API on Microsoft Graph](https://devblogs.microsoft.com/microsoft365dev/deprecation-of-teams-live-events-api-on-microsoft-graph/).
41+
> - A bearer token is required for the `Authorization` header for all the methods listed in the previous table. For details about how to get the `token` for the `Authorization` header, see [Get access on behalf of a user](/graph/auth-v2-user?tabs=http#3-request-an-access-token).
42+
> - The expiry time for online meetings is set to 60 days after the meeting's start or end time. If the meeting is updated or activated before it expires, the expiry time will be extended by another 60 days.
4243
4344
## Properties
4445

api-reference/beta/resources/sitepage.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ Inherits from [baseSitePage](../resources/basesitepage.md).
3131
| [Publish](../api/sitepage-publish.md) | None | Publish a [sitePage](../resources/sitepage.md) object. |
3232
| [Get by position](../api/sitepage-getwebpartsbyposition.md) | [webPart](../resources/webpart.md) collection | Get a collection of [WebPart](../resources/webpart.md) by providing [webPartPosition](../resources/webpartposition.md) information. |
3333
| [Save as template](../api/sitepage-saveastemplate.md) | [pageTemplate](../resources/pagetemplate.md) | Save a [sitePage](../resources/sitepage.md) as a [pageTemplate](../resources/pagetemplate.md) in a [site](../resources/site.md). |
34-
| [Create from template](../api/sitepage-createfromtemplate.md) | [sitePage](../resources/sitepage.md) | Create a new [sitePage](../resources/sitepage.md) from a [pageTemplate](../resources/pagetemplate.md) in a [site](../resources/site.md). |
3534

3635
## Properties
3736

0 commit comments

Comments
 (0)