Merge pull request #25899 from microsoftgraph/ur

[Cloud PC][Beta]deprecated  crossRegionDisasterRecoveryEnabled AND add userInitiatedDisasterRecoveryAllowed in cloudPcUsersetting

Author: Lauragra

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

@@ -130,13 +130,14 @@ Content-Type: application/json
       "userRestoreEnabled": true
     },
     "crossRegionDisasterRecoverySetting": {
-      "crossRegionDisasterRecoveryEnabled": true,
+      "crossRegionDisasterRecoveryEnabled": false,
       "maintainCrossRegionRestorePointEnabled": true,
       "disasterRecoveryNetworkSetting": {
         "regionName": "westus",
         "regionGroup": "usEast"
       },
-      "disasterRecoveryType": "premium"
+      "disasterRecoveryType": "premium",
+      "userInitiatedDisasterRecoveryAllowed": true
     },
     "lastModifiedDateTime": "2021-02-01T10:29:57Z",
     "createdDateTime": "2021-02-01T10:29:57Z"
@@ -220,13 +221,14 @@ Content-Type: application/json
       "userRestoreEnabled": true
     },
     "crossRegionDisasterRecoverySetting": {
-      "crossRegionDisasterRecoveryEnabled": true,
+      "crossRegionDisasterRecoveryEnabled": false,
       "maintainCrossRegionRestorePointEnabled": true,
       "disasterRecoveryNetworkSetting": {
         "regionName": "westus",
         "regionGroup": "usEast"
       },
-      "disasterRecoveryType": "premium"
+      "disasterRecoveryType": "premium",
+      "userInitiatedDisasterRecoveryAllowed": true
     },
     "lastModifiedDateTime": "2021-02-01T10:29:57Z",
     "createdDateTime": "2021-02-01T10:29:57Z",

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

@@ -61,7 +61,7 @@ The following table shows the properties that are required when you update the [
 
 ## Response
 
-If successful, this method returns a `204 No Content` response code and an updated [cloudPcUserSetting](../resources/cloudpcusersetting.md) object in the response body.
+If successful, this method returns a `204 No Content` response code.
 
 ## Examples
 
@@ -88,13 +88,14 @@ Content-Type: application/json
     "userRestoreEnabled": true
   },
   "crossRegionDisasterRecoverySetting": {
-    "crossRegionDisasterRecoveryEnabled": true,
+    "crossRegionDisasterRecoveryEnabled": false,
     "maintainCrossRegionRestorePointEnabled": true,
     "disasterRecoveryNetworkSetting": {
       "regionName": "westus",
       "regionGroup": "usEast"
     },
-    "disasterRecoveryType": "premium"
+    "disasterRecoveryType": "premium",
+    "userInitiatedDisasterRecoveryAllowed": true
   },
   "localAdminEnabled": false,
   "resetEnabled": true

api-reference/beta/api/virtualendpoint-list-usersettings.md

@@ -57,7 +57,7 @@ If successful, this method returns a `200 OK` response code and a collection of
 ## Examples
 
 ### Request
-
+The following example shows a request.
 # [HTTP](#tab/http)
 <!-- {
   "blockType": "request",
@@ -103,6 +103,7 @@ GET https://graph.microsoft.com/beta/deviceManagement/virtualEndpoint/userSettin
 ---
 
 ### Response
+The following example shows the response.
 >**Note:** The response object shown here might be shortened for readability.
 <!-- {
   "blockType": "response",
@@ -128,13 +129,14 @@ Content-Type: application/json
         "userRestoreEnabled": true
       },
       "crossRegionDisasterRecoverySetting": {
-        "crossRegionDisasterRecoveryEnabled": true,
+        "crossRegionDisasterRecoveryEnabled": false,
         "maintainCrossRegionRestorePointEnabled": true,
         "disasterRecoveryNetworkSetting": {
             "regionName": "westus",
             "regionGroup": "usEast"
         },
-        "disasterRecoveryType": "premium"
+        "disasterRecoveryType": "premium",
+        "userInitiatedDisasterRecoveryAllowed": true
       },
       "lastModifiedDateTime": "2021-02-01T10:29:57Z",
       "createdDateTime": "2021-02-01T10:29:57Z"

api-reference/beta/api/virtualendpoint-post-usersettings.md

@@ -1,6 +1,6 @@
 ---
 title: "Create cloudPcUserSetting"
-description: "Create a new cloudPcUserSetting ."
+description: "Create a new cloudPcUserSetting object."
 author: "AshleyYangSZ"
 ms.localizationpriority: medium
 ms.subservice: "cloud-pc"
@@ -83,13 +83,14 @@ Content-Type: application/json
   "selfServiceEnabled": false,
   "localAdminEnabled": true,
   "crossRegionDisasterRecoverySetting": {
-     "crossRegionDisasterRecoveryEnabled": true,
+     "crossRegionDisasterRecoveryEnabled": false,
      "maintainCrossRegionRestorePointEnabled": true,
      "disasterRecoveryNetworkSetting": {
         "regionName": "westus",
         "regionGroup": "usEast"
       },
-      "disasterRecoveryType": "premium"
+      "disasterRecoveryType": "premium",
+      "userInitiatedDisasterRecoveryAllowed": true
   },
   "restorePointSetting": {
     "frequencyInHours": 16,
@@ -119,13 +120,14 @@ Content-Type: application/json
   "selfServiceEnabled": false,
   "localAdminEnabled": true,
   "crossRegionDisasterRecoverySetting": {
-     "crossRegionDisasterRecoveryEnabled": true,
+     "crossRegionDisasterRecoveryEnabled": false,
      "maintainCrossRegionRestorePointEnabled": true,
      "disasterRecoveryNetworkSetting": {
         "regionName": "westus",
         "regionGroup": "usEast"
       },
-      "disasterRecoveryType": "premium"
+      "disasterRecoveryType": "premium",
+      "userInitiatedDisasterRecoveryAllowed": true
   },
   "restorePointSetting": {
     "frequencyInHours": 16,

api-reference/beta/resources/cloudpccrossregiondisasterrecoverysetting.md

@@ -21,10 +21,11 @@ Represents the settings for cross-region disaster recovery on a Cloud PC.
 
 |Property|Type|Description|
 |:---|:---|:---|
-|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`.|
 |disasterRecoveryNetworkSetting|[cloudPcDisasterRecoveryNetworkSetting](../resources/cloudpcdisasterrecoverynetworksetting.md)|Indicates the network settings of the Cloud PC during a cross-region disaster recovery operation.|
 |disasterRecoveryType|[cloudPcDisasterRecoveryType](#cloudpcdisasterrecoverytype-values)|Indicates the type of disaster recovery to perform when a disaster occurs on the user's Cloud PC. The possible values are: `notConfigured`, `crossRegion`, `premium`, `unknownFutureValue`. The default value is `notConfigured`.|
 |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`.|
+|userInitiatedDisasterRecoveryAllowed|Boolean|Indicates whether the client allows the end user to initiate a disaster recovery activation. `True` indicates that the client includes the option for the end user to activate Backup Cloud PC. When `false`, the end user doesn't have the option to activate disaster recovery. The default value is `false`. Currently, only premium disaster recovery is supported.|
+|crossRegionDisasterRecoveryEnabled (deprecated)|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`. This property is deprecated and will no longer be supported effective February 11, 2025. For scenarios where **crossRegionDisasterRecoveryEnabled** is `true`, set **disasterRecoveryType** to `crossRegion`. For scenarios where **crossRegionDisasterRecoveryEnabled** is `false`,  set **disasterRecoveryType** to `notconfigured`.|
 
 ### cloudPcDisasterRecoveryType values
 
@@ -54,6 +55,7 @@ The following JSON representation shows the resource type.
   "crossRegionDisasterRecoveryEnabled": "Boolean",
   "disasterRecoveryNetworkSetting": {"@odata.type": "microsoft.graph.cloudPcDisasterRecoveryNetworkSetting"},
   "disasterRecoveryType": "String",
-  "maintainCrossRegionRestorePointEnabled": "Boolean"
+  "maintainCrossRegionRestorePointEnabled": "Boolean",
+  "userInitiatedDisasterRecoveryAllowed": "Boolean"
 }
 ```

changelog/Microsoft.CloudManagedDesktop.json

@@ -1,5 +1,31 @@
 {
   "changelog": [
+     {
+        "ChangeList": [
+          {
+            "Id": "d2fbdff0-4da3-4e94-829b-fcee62ccbb58",
+            "ApiChange": "Property",
+            "ChangedApiName": "userInitiatedDisasterRecoveryAllowed",
+            "ChangeType": "Addition",
+            "Description": "Added the **userInitiatedDisasterRecoveryAllowed** property to the [cloudPcCrossRegionDisasterRecoverySetting](https://learn.microsoft.com/en-us/graph/api/resources/cloudPcCrossRegionDisasterRecoverySetting?view=graph-rest-beta) resource.",
+            "Target": "cloudPcCrossRegionDisasterRecoverySetting"
+          },          
+          {
+            "Id": "d2fbdff0-4da3-4e94-829b-fcee62ccbb58",
+            "ApiChange": "Property",
+            "ChangedApiName": "crossRegionDisasterRecoveryEnabled",
+            "ChangeType": "Deprecation",
+            "Description": "Deprecated the **crossRegionDisasterRecoveryEnabled** property of the [cloudPcCrossRegionDisasterRecoverySetting](https://learn.microsoft.com/en-us/graph/api/resources/cloudPcCrossRegionDisasterRecoverySetting?view=graph-rest-beta) resource. The **crossRegionDisasterRecoveryEnabled** property is deprecated and will no longer be supported effective February 11, 2025. For scenarios where **crossRegionDisasterRecoveryEnabled** is `true`, set **disasterRecoveryType** to `crossRegion`. For scenarios where **crossRegionDisasterRecoveryEnabled** is `false`,  set **disasterRecoveryType** to `notconfigured`.",
+            "Target": "cloudPcCrossRegionDisasterRecoverySetting"
+          }
+        ],
+        "Id": "d2fbdff0-4da3-4e94-829b-fcee62ccbb58",
+        "Cloud": "Prod",
+        "Version": "beta",
+        "CreatedDateTime": "2024-12-08T06:09:33.7283612Z",
+        "WorkloadArea": "Device and app management",
+        "SubArea": "Cloud PC"
+    },
     {
       "ChangeList": [
         {

concepts/whats-new-overview.md

@@ -32,8 +32,10 @@ Enabled the **description**, **displayName**, and **severity** properties as sup
 
 ### Device and app management | Cloud PC
 
-- Enabled `endpointConnectivityCheckVMAgentEndPointCommunicationError` as a supported error type in the **errorType** property of the [cloudPcOnPremisesConnectionHealthCheck](/graph/api/resources/cloudpconpremisesconnectionhealthcheck?view=graph-rest-beta&preserve-view=true) resource.
 - Use the **disasterRecoveryType** property on [cloudPcCrossRegionDisasterRecoverySetting](/graph/api/resources/cloudpccrossregiondisasterrecoverysetting?view=graph-rest-beta&preserve-view=true) to get or set the type of disaster recovery to perform when a disaster occurs on a user's Cloud PC.
+- Use the **userInitiatedDisasterRecoveryAllowed** property on [cloudPcCrossRegionDisasterRecoverySetting](/graph/api/resources/cloudpccrossregiondisasterrecoverysetting?view=graph-rest-beta&preserve-view=true) to get or set whether the client allows the end user to initiate a disaster recovery activation.
+- Deprecated the **crossRegionDisasterRecoveryEnabled** property of the [cloudPcCrossRegionDisasterRecoverySetting](/graph/api/resources/cloudpccrossregiondisasterrecoverysetting?view=graph-rest-beta&preserve-view=true) resource. Going forward use the **disasterRecoveryType** property.
+- Enabled `endpointConnectivityCheckVMAgentEndPointCommunicationError` as a supported error type in the **errorType** property of the [cloudPcOnPremisesConnectionHealthCheck](/graph/api/resources/cloudpconpremisesconnectionhealthcheck?view=graph-rest-beta&preserve-view=true) resource.
 
 ### Reports | Identity and access reports