Merge pull request #25343 from microsoftgraph/main

Lauragra · web-flow · commit 85d98212ac03 · 2024-10-07T20:03:21.000-07:00
Merge to publish.
diff --git a/api-reference/beta/api/educationalactivity-delete.md b/api-reference/beta/api/educationalactivity-delete.md
@@ -29,7 +29,7 @@ Permissions for the following HTTP syntax:
 DELETE /me/profile/educationalActivities/{id} 
 ```
 
-<!-- { "blockType": "permissions", "name": "educationalactivity_delete", "requestUrls": "DELETE /me/profile/educationalActivities/{id} "} -->
+<!-- { "blockType": "permissions", "name": "educationalactivity_delete", "requestUrls": ["DELETE /me/profile/educationalActivities/{id}"]} -->
 |Permission type|Least privileged permissions|Higher privileged permissions|
 |:---|:---|:---|
 |Delegated (work or school account)|User.ReadWrite|User.ReadWrite.All|
@@ -44,7 +44,7 @@ Permissions for the following HTTP syntax:
 DELETE /users/{id | userPrincipalName}/profile/educationalActivities/{id}
 ```
 
-<!-- { "blockType": "permissions", "name": "educationalactivity_delete", "requestUrls": "DELETE /users/{id | userPrincipalName}/profile/educationalActivities/{id}"} -->
+<!-- { "blockType": "permissions", "name": "educationalactivity_delete", "requestUrls": ["DELETE /users/{id | userPrincipalName}/profile/educationalActivities/{id}"]} -->
 |Permission type|Least privileged permissions|Higher privileged permissions|
 |:---|:---|:---|
 |Delegated (work or school account)|User.ReadWrite|User.ReadWrite.All|
diff --git a/api-reference/beta/api/educationalactivity-get.md b/api-reference/beta/api/educationalactivity-get.md
@@ -29,7 +29,7 @@ Permissions for the following HTTP syntax:
 GET /me/profile/educationalActivities/{id}
 ```
 
-<!-- { "blockType": "permissions", "name": "educationalactivity_get", "requestUrls": "GET /me/profile/educationalActivities/{id}"} -->
+<!-- { "blockType": "permissions", "name": "educationalactivity_get", "requestUrls": ["GET /me/profile/educationalActivities/{id}"]} -->
 |Permission type|Least privileged permissions|Higher privileged permissions|
 |:---|:---|:---|
 |Delegated (work or school account)|User.Read|User.ReadWrite, User.Read.All, User.ReadBasic.All, User.ReadWrite.All|
@@ -44,7 +44,7 @@ Permissions for the following HTTP syntax:
 GET /users/{id | userPrincipalName}/profile/educationalActivities/{id}
 ```
 
-<!-- { "blockType": "permissions", "name": "educationalactivity_get", "requestUrls": "GET /users/{id | userPrincipalName}/profile/educationalActivities/{id}"} -->
+<!-- { "blockType": "permissions", "name": "educationalactivity_get", "requestUrls": ["GET /users/{id | userPrincipalName}/profile/educationalActivities/{id}"]} -->
 |Permission type|Least privileged permissions|Higher privileged permissions|
 |:---|:---|:---|
 |Delegated (work or school account)|User.Read|User.ReadWrite, User.Read.All, User.ReadBasic.All, User.ReadWrite.All|
diff --git a/api-reference/beta/api/educationalactivity-update.md b/api-reference/beta/api/educationalactivity-update.md
@@ -29,7 +29,7 @@ Permissions for the following HTTP syntax:
 PATCH /me/profile/educationalActivities/{id}
 ```
 
-<!-- { "blockType": "permissions", "name": "educationalactivity_update", "requestUrls": "PATCH /me/profile/educationalActivities/{id}"} -->
+<!-- { "blockType": "permissions", "name": "educationalactivity_update", "requestUrls": ["PATCH /me/profile/educationalActivities/{id}"]} -->
 |Permission type|Least privileged permissions|Higher privileged permissions|
 |:---|:---|:---|
 |Delegated (work or school account)|User.ReadWrite|User.ReadWrite.All|
@@ -44,7 +44,7 @@ Permissions for the following HTTP syntax:
 PATCH /users/{id | userPrincipalName}/profile/educationalActivities/{id}
 ```
 
-<!-- { "blockType": "permissions", "name": "educationalactivity_update", "requestUrls": "PATCH /users/{id | userPrincipalName}/profile/educationalActivities/{id}"} -->
+<!-- { "blockType": "permissions", "name": "educationalactivity_update", "requestUrls": ["PATCH /users/{id | userPrincipalName}/profile/educationalActivities/{id}"]} -->
 |Permission type|Least privileged permissions|Higher privileged permissions|
 |:---|:---|:---|
 |Delegated (work or school account)|User.ReadWrite|User.ReadWrite.All|
diff --git a/api-reference/beta/api/group-assignlicense.md b/api-reference/beta/api/group-assignlicense.md
@@ -56,7 +56,7 @@ In the request body, provide a JSON object with the following parameters.
 | Parameter      | Type                                                          | Description                                                                                                                                                                                                                                                                    |
 | :------------- | :------------------------------------------------------------ | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | addLicenses    | [assignedLicense](../resources/assignedlicense.md) collection | A collection of [assignedLicense](../resources/assignedlicense.md) objects that specify the licenses to add. You can disable servicePlans associated with a license by setting the **disabledPlans** property on an [assignedLicense](../resources/assignedlicense.md) object. |
-| removeLicenses | Guid collection                                               | A collection of skuIds that identify the licenses to remove. Required.                                                                                                                                                                                                                   |
+| removeLicenses | Guid collection                                               | A collection of skuIds that identify the licenses to remove. Required. Can be an empty collection.                                                                                                                                                                                                                   |
 
 ## Response
 
@@ -156,7 +156,7 @@ location: https://graph.microsoft.com/v2/e8e96c2a-d787-4eb1-98d7-9e57c965f1de/di
   "id": "1132b215-826f-42a9-8cfe-1643d19d17fd",
   "createdDateTime": "2021-03-12T11:15:03Z",
   "groupTypes": [],
-  "securityEnabled": true,
+  "securityEnabled": true
 }
 ```
 
@@ -241,7 +241,7 @@ location: https://graph.microsoft.com/v2/e8e96c2a-d787-4eb1-98d7-9e57c965f1de/di
   "id": "1132b215-826f-42a9-8cfe-1643d19d17fd",
   "createdDateTime": "2021-03-12T11:15:03Z",
   "groupTypes": [],
-  "securityEnabled": true,
+  "securityEnabled": true
 }
 ```
 
diff --git a/api-reference/beta/api/user-assignlicense.md b/api-reference/beta/api/user-assignlicense.md
@@ -48,7 +48,7 @@ In the request body, provide a JSON object with the following parameters.
 | Parameter       | Type    |Description|
 |:---------------|:--------|:----------|
 |addLicenses|[assignedLicense](../resources/assignedlicense.md) collection|A collection of [assignedLicense](../resources/assignedlicense.md) objects that specify the licenses to add. You can disable servicePlans associated with a license by setting the **disabledPlans** property on an [assignedLicense](../resources/assignedlicense.md) object.|
-|removeLicenses|Guid collection|A collection of skuIds that identify the licenses to remove. Required.|
+|removeLicenses|Guid collection|A collection of skuIds that identify the licenses to remove. Required. Can be an empty collection.|
 
 
 ## Response
diff --git a/api-reference/beta/resources/cloudpcdisasterrecoverymicrosofthostednetworksetting.md b/api-reference/beta/resources/cloudpcdisasterrecoverymicrosofthostednetworksetting.md
@@ -21,7 +21,7 @@ Inherits from [cloudPcDisasterRecoveryNetworkSetting](../resources/cloudpcdisast
 
 |Property|Type|Description|
 |:---|:---|:---|
-|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`.|
+|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`, `middleEast`, `mexico`. 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`, `middleEast`, `mexico`.|
 |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.|
 
 ## Relationships
diff --git a/api-reference/beta/resources/cloudpcsupportedregion.md b/api-reference/beta/resources/cloudpcsupportedregion.md
@@ -27,7 +27,7 @@ Represents a supported region to establish an Azure network connection for Cloud
 |:---      |:---  |:---         |
 |displayName|String|The name for the supported region. Read-only.|
 |id|String|The unique identifier for the supported region. Read-only.|
-|regionGroup|[cloudPcRegionGroup](#cloudpcregiongroup-values)|The geographic group this region belongs to. Multiple regions can belong to one region group. For example, the `europeUnion` region group contains the Northern Europe and Western Europe regions. A customer can select a region group when provisioning a Cloud PC; however, the Cloud PC is put under one of the regions under the group based on resource capacity. The region with more quota is chosen. 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 value(s) in this [evolvable enum](/graph/best-practices-concept#handling-future-members-in-evolvable-enumerations): `norway`, `switzerland`，`southKorea`. Read-only.|
+|regionGroup|[cloudPcRegionGroup](#cloudpcregiongroup-values)|The geographic group this region belongs to. Multiple regions can belong to one region group. For example, the `europeUnion` region group contains the Northern Europe and Western Europe regions. A customer can select a region group when provisioning a Cloud PC; however, the Cloud PC is put under one of the regions under the group based on resource capacity. The region with more quota is chosen. Possible values are: `default`, `australia`, `canada`, `usCentral`, `usEast`, `usWest`, `france`, `germany`, `europeUnion`, `unitedKingdom`, `japan`, `asia`, `india`, `southAmerica`, `euap`, `usGovernment`, `usGovernmentDOD`, `unknownFutureValue`, `norway`, `switzerland`，`southKorea`, `middleEast`, `mexico`. 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`, `middleEast`, `mexico`. Read-only.|
 |regionStatus|[cloudPcSupportedRegionStatus](#cloudpcsupportedregionstatus-values)|The status of the supported region. Possible values are: `available`, `restricted`, `unavailable`, `unknownFutureValue`. Read-only.|
 |supportedSolution|[cloudPcManagementService](../resources/cloudpconpremisesconnection.md#cloudpcmanagementservice-values)|The supported service or solution for the region. The possible values are: `windows365`, `devBox`, `unknownFutureValue`, `rpaBox`. You must use the `Prefer: include-unknown-enum-members` request header to get the following value or values in this [evolvable enum](/graph/best-practices-concept#handling-future-members-in-evolvable-enumerations): `rpaBox`. Read-only.|
 
diff --git a/api-reference/beta/toc/industry-data-etl-(preview)/toc.yml b/api-reference/beta/toc/industry-data-etl-(preview)/toc.yml
@@ -210,6 +210,8 @@ items:
     href: ../../resources/industrydata-basicfilter.md
   - name: Class group configuration
     href: ../../resources/industrydata-classgroupconfiguration.md
+  - name: Credential
+    href: ../../resources/industrydata-credential.md
   - name: Enrollment mappings
     href: ../../resources/industrydata-enrollmentmappings.md
   - name: File data connector
diff --git a/api-reference/v1.0/api/group-assignlicense.md b/api-reference/v1.0/api/group-assignlicense.md
@@ -54,7 +54,7 @@ In the request body, provide a JSON object with the following parameters.
 | Parameter      | Type                                                          | Description                                                                                                                                                                                                                                                                    |
 | :------------- | :------------------------------------------------------------ | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | addLicenses    | [assignedLicense](../resources/assignedlicense.md) collection | A collection of [assignedLicense](../resources/assignedlicense.md) objects that specify the licenses to add. You can disable servicePlans associated with a license by setting the **disabledPlans** property on an [assignedLicense](../resources/assignedlicense.md) object. |
-| removeLicenses | Guid collection                                               | A collection of skuIds that identify the licenses to remove. Required.                                                                                                                                                                                                                   |
+| removeLicenses | Guid collection                                               | A collection of skuIds that identify the licenses to remove. Required. Can be an empty collection.                                                                                                                                                                                                                   |
 
 ## Response
 
@@ -154,7 +154,7 @@ location: https://graph.microsoft.com/v2/e8e96c2a-d787-4eb1-98d7-9e57c965f1de/di
   "id": "1132b215-826f-42a9-8cfe-1643d19d17fd",
   "createdDateTime": "2021-03-12T11:15:03Z",
   "groupTypes": [],
-  "securityEnabled": true,
+  "securityEnabled": true
 }
 ```
 
@@ -241,7 +241,7 @@ location: https://graph.microsoft.com/v2/d056d009-17b3-4106-8173-cd3978ada898/di
   "deletedDateTime": null,
   "classification": null,
   "createdDateTime": "2018-04-18T22:05:03Z",
-  "securityEnabled": true,
+  "securityEnabled": true
 
 }
 ```
diff --git a/api-reference/v1.0/api/user-assignlicense.md b/api-reference/v1.0/api/user-assignlicense.md
diff --git a/changelog/Microsoft.CloudManagedDesktop.json b/changelog/Microsoft.CloudManagedDesktop.json
diff --git a/concepts/permissions-reference.md b/concepts/permissions-reference.md
diff --git a/concepts/whats-new-overview.md b/concepts/whats-new-overview.md
