Merge pull request #27772 from microsoftgraph/main

Merge to publish.

Author: Danipocket

api-reference/beta/api/onlinemeeting-get.md

@@ -392,6 +392,9 @@ The following example shows the response.
     "allowMeetingChat": "enabled",
     "allowTeamworkReactions": true,
     "videoTeleconferenceId": "(redacted)",
+    "sensitivityLabelAssignment": {
+      "sensitivityLabelId": "c7f2d7a7-6a36-4a41-9a6b-0d2761a9f4f0"
+    },
     "participants": {
         "organizer": {
             "upn": "(redacted)",
@@ -490,6 +493,9 @@ The following example shows the response.
                 "joinMeetingId": "1234567890",
                 "passcode": null
             },
+            "sensitivityLabelAssignment": {
+              "sensitivityLabelId": "c7f2d7a7-6a36-4a41-9a6b-0d2761a9f4f0"
+            }
             "meetingOptionsWebUrl": "https://teams.microsoft.com/meetingOptions/?meetingId=abc123"
         }
     ]
@@ -601,6 +607,9 @@ Content-Type: application/json
                 "joinMeetingId": "1234567890",
                 "passcode": null
             },
+            "sensitivityLabelAssignment": {
+              "sensitivityLabelId": "c7f2d7a7-6a36-4a41-9a6b-0d2761a9f4f0"
+            },
             "meetingOptionsWebUrl": "https://teams.microsoft.com/meetingOptions/?meetingId=abc123"
         }
     ]

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

@@ -109,6 +109,7 @@ The last column indicates whether updating this property takes effect for an in-
 | meetingSpokenLanguageTag | String | Specifies the spoken language used during the meeting for recording and transcription purposes. |  No                                  |
 | participants                | [meetingParticipants](../resources/meetingparticipants.md) | The participants associated with the online meeting. Only attendees can be updated. | No                                  |
 | recordAutomatically         | Boolean                                                    | Indicates whether to record the meeting automatically.                              | No                                  |
+|sensitivityLabelAssignment|[onlineMeetingSensitivityLabelAssignment](../resources/onlinemeetingsensitivitylabelassignment.md)|Specifies the sensitivity label applied to the Teams meeting.| No                                  |
 | startDateTime               | DateTime                                                   | The meeting start time in UTC.                                                      | No                                  |
 | subject                     | String                                                     | The subject of the online meeting.                                                  | No                                  |
 | watermarkProtection         | [watermarkProtectionValues](../resources/watermarkprotectionvalues.md)  | Specifies whether the client application should apply a watermark to a content type. Inherited from [onlineMeetingBase](../resources/onlinemeetingbase.md). |No                                  |
@@ -221,7 +222,10 @@ Content-Type: application/json
       "tollNumber":"+1-900-555-0100",
       "tollFreeNumber":"+1-800-555-0100",
       "dialinUrl":"url"
-   }
+   },
+    "sensitivityLabelAssignment": {
+      "sensitivityLabelId": "c7f2d7a7-6a36-4a41-9a6b-0d2761a9f4f0"
+    }
 }
 ```
 

api-reference/beta/api/place-descendants.md

@@ -102,7 +102,7 @@ Content-Type: application/json
       "parentId": "ca163ae1-14a3-4e2a-8a97-5f82d672186f",
       "isWheelChairAccessible": false,
       "mode": {
-        "@odata.type": "#microsoft.graph.offlinePlaceMode",
+        "@odata.type": "#microsoft.graph.unavailablePlaceMode",
         "reason": "New"
       }
     },

api-reference/beta/api/place-get.md

@@ -253,7 +253,7 @@ Content-Type: application/json
   "displayName": "Desk6",
   "parentId": "ca163ae1-14a3-4e2a-8a97-5f82d672186f",
   "mode": {
-    "@odata.type": "#microsoft.graph.offlinePlaceMode",
+    "@odata.type": "#microsoft.graph.unavailablePlaceMode",
     "reason": "New"
   }
 }

api-reference/beta/api/place-list.md

@@ -416,7 +416,7 @@ Content-Type: application/json
       "parentId": "ca163ae1-14a3-4e2a-8a97-5f82d672186f",
       "isWheelChairAccessible": true,
       "mode": {
-        "@odata.type": "#microsoft.graph.offlinePlaceMode",
+        "@odata.type": "#microsoft.graph.unavailablePlaceMode",
         "reason": "New"
       }
     }

api-reference/beta/api/place-post.md

@@ -353,7 +353,7 @@ Content-Type: application/json
   "tags": [],
   "isWheelChairAccessible": false,
   "mode": {
-    "@odata.type": "#microsoft.graph.offlinePlaceMode",
+    "@odata.type": "#microsoft.graph.unavailablePlaceMode",
     "reason": "New"
   }
 }
@@ -514,7 +514,7 @@ Content-Type: application/json
   "emailAddress": "[email protected]",
   "nickname": "testSpace001",
   "mode": {
-    "@odata.type": "#microsoft.graph.offlinePlaceMode",
+    "@odata.type": "#microsoft.graph.unavailablePlaceMode",
     "reason": "New"
   }
 }

api-reference/beta/resources/building.md

@@ -37,9 +37,9 @@ For more supported methods, see [place](./place.md).
 |label |String |User-defined description of the building. Inherited from [place](./place.md). |
 |parentId|String|Currently, buildings don't have a parent. Don't use. Inherited from [place](./place.md).|
 |phone|String|The phone number of the **building**. Inherited from [place](./place.md). |
-|placeId|String|An alternate immutable unique identifier of the **building**. Read-only. Inherited from [place](./place.md). |
 |resourceLinks|[resourceLink](./resourcelink.md) collection|A set of links to external resources that are associated with the **building**. Inherited from [place](./place.md). |
 |tags|String collection|Custom tags that are associated with the building for categorization or filtering. Inherited from [place](./place.md). |
+|wifiState |placeFeatureEnablement |A state that indicates whether the building has Wi-Fi. Possible values are: `unknown`, `enabled`, `disabled`, `unknownFutureValue`.|
 
 ## Relationships
 |Relationship|Type|Description|
@@ -68,9 +68,9 @@ The following JSON representation shows the resource type.
   "label": "String",
   "parentId": "String",
   "phone": "String",
-  "placeId": "String",
   "resourceLinks": [{"@odata.type": "microsoft.graph.resourceLink"}],
-  "tags": ["String"]
+  "tags": ["String"],
+  "wifiState": "String"
 }
 ```
 

api-reference/beta/resources/desk.md

@@ -29,14 +29,14 @@ For the list of supported methods, see [place](./place.md).
 |displayDeviceName |String |The name of the display device (for example, `monitor` or `projector`) that is available at the **desk**. |
 |displayName|String|The name that is associated with the **desk**. Inherited from [place](./place.md).|
 |geoCoordinates|[outlookGeoCoordinates](./outlookgeocoordinates.md)|Specifies the **desk** location in latitude, longitude, and (optionally) altitude coordinates. Inherited from [place](./place.md).|
+|heightAdjustableState |placeFeatureEnablement|A state that indicates whether the desk is height adjustable. The possible values are: `unknown`, `enabled`, `disabled`, `unknownFutureValue`.|
 |id|String|The unique identifier for the **desk**. Read-only. This identifier isn't immutable and can change if the mailbox or tenant configuration changes. Inherited from [place](./place.md). |
 |isWheelChairAccessible|Boolean|Indicates whether the **desk** is wheelchair accessible. Inherited from [place](./place.md).|
 |label |String |User-defined description of the **desk**. Inherited from [place](../resources/place.md).|
 |mailboxDetails |[mailboxDetails](mailboxdetails.md) |The mailbox object **id** and email address that are associated with the desk. |
-|mode |[placeMode](./placemode.md) |The mode of the desk. The supported modes are:<ul><li>[assignedPlaceMode](./assignedplacemode.md) - Desks that are assigned to a user.</li><li>[reservablePlaceMode](./reservableplacemode.md) - Desks that can be booked in advance using desk reservation tools.</li><li>[dropInPlaceMode](./dropinplacemode.md) - First come, first served desks. When you plug into a peripheral on one of these desks, the desk is booked for you, assuming the peripheral is associated with the desk in the Microsoft Teams Rooms Pro management portal.</li><li>[offlinePlaceMode](./offlineplacemode.md) - Desk that is taken down for maintenance or marked as not reservable.</li></ul> |
+|mode |[placeMode](./placemode.md) |The mode of the desk. The supported modes are:<ul><li>[assignedPlaceMode](./assignedplacemode.md) - Desks that are assigned to a user.</li><li>[reservablePlaceMode](./reservableplacemode.md) - Desks that can be booked in advance using desk reservation tools.</li><li>[dropInPlaceMode](./dropinplacemode.md) - First come, first served desks. When you plug into a peripheral on one of these desks, the desk is booked for you, assuming the peripheral is associated with the desk in the Microsoft Teams Rooms Pro management portal.</li><li>[unavailablePlaceMode](./unavailableplacemode.md) - Desk that is taken down for maintenance or marked as not reservable.</li></ul> |
 |parentId|String|The ID of a parent [section](./section.md). Inherited from [place](./place.md).|
 |phone|String|The phone number of the **desk**. Inherited from [place](./place.md).|
-|placeId|String|An alternate immutable unique identifier of the **desk**. Read-only. Inherited from [place](./place.md).|
 |tags|String collection|Custom tags that are associated with the **desk** for categorization or filtering. Inherited from [place](./place.md).|
 
 ## Relationships
@@ -59,14 +59,14 @@ The following JSON representation shows the resource type.
   "displayDeviceName": "String",
   "displayName": "String",
   "geoCoordinates": {"@odata.type": "microsoft.graph.outlookGeoCoordinates"},
+  "heightAdjustableState": "String",
   "id": "String (identifier)",
   "isWheelChairAccessible": "Boolean",
   "label": "String",
   "mailboxDetails": {"@odata.type": "microsoft.graph.mailboxDetails"},
   "mode": {"@odata.type": "microsoft.graph.placeMode"},
   "parentId": "String",
   "phone": "String",
-  "placeId": "String",
   "tags": ["String"]
 }
 ```

api-reference/beta/resources/enums.md

@@ -13,6 +13,15 @@ ms.custom: sfi-ropc-nochange
 
 Namespace: microsoft.graph
 
+### placeFeatureEnablement values
+
+|Member|
+|:---|
+|unknown|
+|enabled|
+|disabled|
+|unknownFutureValue|
+
 ### accessReviewPrincipalScopeType values
 
 |Member|

api-reference/beta/resources/floor.md

@@ -32,7 +32,6 @@ For the list of supported methods, see [place](./place.md).
 |label |String |User-defined description of the **floor**. Inherited from [place](./place.md).|
 |parentId|String|The ID of a parent [building](./building.md). Inherited from [place](./place.md).|
 |phone|String|The phone number of the **floor**. Inherited from [place](./place.md).|
-|placeId|String|An alternate immutable unique identifier of the **floor**. Read-only. Inherited from [place](./place.md).|
 |sortOrder|Int32|Specifies the sort order of the **floor**. For example, a floor might be named "Lobby" with a sort order of `0` to show this floor first in ordered lists. |
 |tags|String collection|Custom tags that are associated with the **floor** for categorization or filtering. Inherited from [place](./place.md).|
 
@@ -60,7 +59,6 @@ The following JSON representation shows the resource type.
   "label": "String",
   "parentId": "String",
   "phone": "String",
-  "placeId": "String",
   "sortOrder": "Int32",
   "tags": ["String"]
 }