Merge pull request #28578 from microsoftgraph/main

Merge to publish.

Author: learn-build-service-prod[bot]

.github/policies/resourceManagement.yml

@@ -1014,6 +1014,42 @@ configuration:
       then:
       - addLabel:
           label: ready to merge
+    - description: Remove do not merge label when pull request is labeled ready to merge
+      if:
+      - payloadType: Pull_Request
+      - labelAdded:
+          label: ready to merge
+      - isOpen
+      then:
+      - removeLabel:
+          label: do not merge
+    - description: Remove ready to merge label when pull request is labeled do not merge
+      if:
+      - payloadType: Pull_Request
+      - labelAdded:
+          label: do not merge
+      - isOpen
+      then:
+      - removeLabel:
+          label: ready to merge
+    - description: Remove resolved awaiting prod deployment label when pull request is labeled schema live
+      if:
+      - payloadType: Pull_Request
+      - labelAdded:
+          label: schema live
+      - isOpen
+      then:
+      - removeLabel:
+          label: 'resolved: awaiting prod deployment'
+    - description: Add schema live label when pull request is labeled resolved awaiting prod deployment
+      if:
+      - payloadType: Pull_Request
+      - labelAdded:
+          label: 'resolved: awaiting prod deployment'
+      - isOpen
+      then:
+      - addLabel:
+          label: schema live
     - description: Add do not merge label to new pull requests opened by contributors
       if:
       - payloadType: Pull_Request

api-reference/beta/api/channel-getallmessages.md

@@ -18,7 +18,6 @@ Retrieve [messages](../resources/chatmessage.md) across all [channels](../resour
 
 To learn more about using the Microsoft Teams export APIs to export content, see [Export content with the Microsoft Teams export APIs](/microsoftteams/export-teams-content).
 
-[!INCLUDE [teams-metered-apis](../../includes/teams-metered-apis.md)]
 
 [!INCLUDE [national-cloud-support](../../includes/global-only.md)]
 
@@ -38,16 +37,6 @@ GET /teams/{team-id}/channels/getAllMessages
 
 ## Optional query parameters
 
-You can use `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.  
-If no `model` is specified, [evaluation mode](/graph/teams-licenses#evaluation-mode-default-requirements) is used.
-
-```http
-GET /teams/{team-id}/channels/getAllMessages?model=A
-GET /teams/{team-id}/channels/getAllMessages?model=B
-```
-If no `model` parameter is specified, [evaluation mode](/graph/teams-licenses#evaluation-mode-default-requirements) is used. 
-
 You can use the [$top](/graph/query-parameters#top-parameter) query parameter to control the number of items per response.
 Additionally, [$filter](/graph/query-parameters#filter-parameter) is supported with **dateTime** range query on **lastModifiedDateTime**. The other [OData query parameters](/graph/query-parameters) aren't currently supported.
 

api-reference/beta/api/channel-getallretainedmessages.md

@@ -18,7 +18,6 @@ Get all retained [messages](../resources/chatmessage.md) across all [channels](.
 
 To learn more about how to use the Microsoft Teams export APIs to export content, see [Export content with the Microsoft Teams export APIs](/microsoftteams/export-teams-content).
 
-[!INCLUDE [teams-metered-apis](../../includes/teams-metered-apis.md)]
 
 > [!NOTE]  
 > This API requires [Teams retention policies](/purview/create-retention-policies?tabs=teams-retention) to be configured. For more information, see [Learn about retention for Microsoft Teams](/purview/retention-policies-teams).
@@ -47,13 +46,6 @@ GET /teams/{teamsId}/channels/getAllRetainedMessages
 
 ## Optional query parameters
 
-The following example shows how to use the `model` query parameter with values `A` or `B` to select the preferred [licensing and payment model](/graph/teams-licenses). If you don't specify a `model`, [evaluation mode](/graph/teams-licenses#evaluation-mode-default-requirements) is used by default.
-
-```http
-GET /teams/{team-id}/channels/getAllRetainedMessages?model=A
-GET /teams/{team-id}/channels/getAllRetainedMessages?model=B
-```
-
 This method supports the following OData query parameters to help customize the response. For general information, see [OData query parameters](/graph/query-parameters).
 
 | Name    |Description|

api-reference/beta/api/channel-list-enabledapps.md

@@ -51,7 +51,7 @@ Don't supply a request body for this method.
 
 ## Response
 
-If successful, this method returns a `200 OK` response code and a collection of [teamsApp](../resources/teamsapp.md) objects in the response body. The response also includes the **@odata.id** property which can be used to access the **teamsApp** and run other operations on the [teamsApp](../resources/teamsApp.md) object.
+If successful, this method returns a `200 OK` response code and a collection of [teamsApp](../resources/teamsapp.md) objects in the response body. The response also includes the **@odata.id** property which can be used to access the **teamsApp** and run other operations on the [teamsApp](../resources/teamsapp.md) object.
 
 ## Examples
 

api-reference/beta/api/channel-patch.md

@@ -16,8 +16,6 @@ Namespace: microsoft.graph
 
 Update the properties of the specified [channel](../resources/channel.md).
 
-[!INCLUDE [teams-model-A-only-disclaimer](../../includes/teams-model-A-only-disclaimer.md)]
-
 [!INCLUDE [national-cloud-support](../../includes/all-clouds.md)]
 
 ## Permissions

api-reference/beta/api/chat-getallretainedmessages.md

@@ -18,7 +18,6 @@ Get all retained [messages](../resources/chatmessage.md) from all [chats](../res
 
 To learn more about how to use the Microsoft Teams export APIs to export content, see [Export content with the Microsoft Teams export APIs](/microsoftteams/export-teams-content).
 
-[!INCLUDE [teams-metered-apis](../../includes/teams-metered-apis.md)]
 
 > [!NOTE]  
 > This API requires [Teams retention policies](/purview/create-retention-policies?tabs=teams-retention) to be configured. For more information, see [Learn about retention for Microsoft Teams](/purview/retention-policies-teams).
@@ -44,13 +43,6 @@ GET /users/{id}/chats/getAllRetainedMessages
 
 ## Optional query parameters
 
-The following example shows how to use the `model` query parameter with values `A` or `B` to select the preferred [licensing and payment model](/graph/teams-licenses). If you don't specify a payment model, [evaluation mode](/graph/teams-licenses#evaluation-mode-default-requirements) is used by default.
-
-```http
-GET /users/{id}/chats/getAllRetainedMessages?model=A
-GET /users/{id}/chats/getAllRetainedMessages?model=B
-```
-
 This method supports the following OData query parameters to help customize the response. For general information, see [OData query parameters](/graph/query-parameters).
 
 | Name    |Description|

api-reference/beta/api/chatmessage-update.md

@@ -20,7 +20,8 @@ Updating works only for chats where conversation members are Microsoft Teams use
 
 This method doesn't support federation. Only the user in the tenant who sent the message can perform data loss prevention (DLP) updates on the specified chat message.
 
-[!INCLUDE [teams-model-A-only-disclaimer](../../includes/teams-model-A-only-disclaimer.md)]
+> [!NOTE]
+> When used with application permissions, a [license](/office365/servicedescriptions/microsoft-365-service-descriptions/microsoft-365-tenantlevel-services-licensing-guidance/microsoft-365-security-compliance-licensing-guidance#microsoft-purview-data-loss-prevention-graph-apis-for-teams-data-loss-prevention-dlp-and-for-teams-export) that includes the Microsoft Communications DLP [service plan](/azure/active-directory/enterprise-users/licensing-service-plan-reference) is required.
 
 [!INCLUDE [national-cloud-support](../../includes/global-only.md)]
 
@@ -64,19 +65,6 @@ To update a **chatMessage** in a **chat**:
 ```http
 PATCH /chats/{chatThread-id}/messages/{message-id}
 ```
-
-## Optional query parameters
-
-You can use `model` query parameter, which only supports the value `A`, as shown in the following examples.
-
-```http
-PATCH /teams/(team-id)/channels/{channel-id}/messages/{message-id}?model=A
-PATCH /teams/(team-id)/channels/{channel-id}/messages/{message-id}/replies/{reply-id}?model=A
-PATCH /chats/{chatThread-id}/messages/{message-id}?model=A
-```
-
-If no `model` is specified, [evaluation mode](/graph/teams-licenses#evaluation-mode-default-requirements) is used.
-
 ## Request headers
 
 | Name          | Description                 |
@@ -108,7 +96,11 @@ If successful, this method returns a `200 OK` response.
 
 ### Errors
 
-[!INCLUDE [teams-model-A-only-errors](../../includes/teams-model-A-only-errors.md)]
+The following table lists other response codes that this API can return.
+
+| Sample error type | Status code | Sample error messages |
+|:---|:---|:---|
+| E5 license or Microsoft Communications service plan requirement not met.  | 402 Payment Required | `"...needs a valid license to access this API..."` </br> `"...tenant needs a valid license to access this API..."` |
 
 ## Examples
 

api-reference/beta/api/chats-getallmessages.md

@@ -18,7 +18,6 @@ Get all messages from all [chats](../resources/chatmessage.md) in which a user i
 
 To learn more about how to use the Microsoft Teams export APIs to export content, see [Export content with the Microsoft Teams export APIs](/microsoftteams/export-teams-content).
 
-[!INCLUDE [teams-metered-apis](../../includes/teams-metered-apis.md)]
 
 [!INCLUDE [national-cloud-support](../../includes/global-only.md)]
 
@@ -38,17 +37,6 @@ GET /users/{id | user-principal-name}/chats/getAllMessages
 
 ## Optional query parameters
 
-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.
-
-<!-- { "blockType": "ignored" } -->
-```http
-GET /users/{id | user-principal-name}/chats/getAllMessages?model=A
-GET /users/{id | user-principal-name}/chats/getAllMessages?model=B
-```
-
-If no `model` parameter is specified, [evaluation mode](/graph/teams-licenses#evaluation-mode-default-requirements) will be used.
-
 This method also supports [date range parameters](/graph/query-parameters) to customize the response, as shown in the following example.
 
 <!-- { "blockType": "ignored" } -->

api-reference/beta/api/deletedteam-getallmessages.md

@@ -17,8 +17,6 @@ Retrieve all [messages](../resources/chatmessage.md) across all [channels](../re
 
 To learn more about using the Microsoft Teams export APIs to export content, see [Export content with the Microsoft Teams Export APIs](/microsoftteams/export-teams-content).
 
-[!INCLUDE [teams-model-A-and-B-disclaimer](../../includes/teams-model-A-and-B-disclaimer.md)]
-
 [!INCLUDE [national-cloud-support](../../includes/all-clouds.md)]
 
 ## Permissions
@@ -44,16 +42,6 @@ GET /teamwork/deletedTeams/{deletedTeamId}/channels/getAllMessages
 
 ## Optional query parameters
 
-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.  
-
-```http
-GET /teamwork/deletedTeams/{deletedTeamId}/channels/getAllMessages?model=A
-GET /teamwork/deletedTeams/{deletedTeamId}/channels/getAllMessages?model=B
-```
-
-If the `model` parameter is not specified, the [evaluation mode](/graph/teams-licenses#evaluation-mode-default-requirements) will be used.
-
 This method supports the [$top](/graph/query-parameters#top-parameter) query parameter to control the number of items per response and the [$filter](/graph/query-parameters#filter-parameter) query parameter with the **dateTime** range query on **lastModifiedDateTime**. Other [OData query parameters](/graph/query-parameters) are currently not supported.
 
 ## Request body

api-reference/beta/resources/teamsapp.md

@@ -43,11 +43,12 @@ Users can see these apps in the Microsoft Teams Store, and these apps can be ins
 
 ### teamsAppDistributionMethod values
 
-|Member|Value|Description|
-|:---|:---|:---|
-|store|0| The app is available to all tenants through the Microsoft Teams app store.|
-|organization|1|The app is available only in this tenant.|
-|sideloaded|2|The app is available only to the user/team its installed to.|
+|Member|Description|
+|:---|:---|
+|store| The app is available to all tenants through the Microsoft Teams app store.|
+|organization|The app is available only in this tenant.|
+|sideloaded|The app is available only to the user or team it's installed to.|
+|unknownFutureValue|Evolvable enumeration sentinel value. Don't use. |
 
 ## Relationships