Skip to content

Commit 84b649f

Browse files
authored
Merge pull request #25945 from microsoftgraph/main
Merge to publish
2 parents 0616df1 + b0b6322 commit 84b649f

19 files changed

+158
-36
lines changed

.vscode/settings.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"githubPullRequests.ignoredPullRequestBranches": [
3+
"main",
34
"main"
45
],
56
"json.schemas": [

api-reference/beta/api/activitybasedtimeoutpolicy-post-activitybasedtimeoutpolicies.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Choose the permission or permissions marked as least privileged for this API. Us
3030
<!-- { "blockType": "ignored" } -->
3131

3232
```http
33-
POST policies/activityBasedTimeoutPolicies
33+
POST /policies/activityBasedTimeoutPolicies
3434
```
3535

3636
## Request headers

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ In the request body, supply the values for relevant fields that should be update
4747
| Property | Type | Description |
4848
|:-------------|:------------|:------------|
4949
|definition|String collection| A string collection containing a JSON string that defines the rules and settings for this policy. Required.|
50-
|description|String| Description for this policy.|
5150
|displayName|String| Display name for this policy. Required.|
5251
|isOrganizationDefault|Boolean|If set to true, activates this policy. There can be many policies for the same policy type, but only one can be activated as the organization default. Optional, default value is false.|
5352

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ Content-Type: application/json
109109
"announcementDateTime": "2022-09-30T00:00:00Z",
110110
"targetDateTime": "2024-09-30T00:00:00Z",
111111
"impactLink": null,
112+
"changeType": "deprecation",
112113
"isCustomerActionRequired": true
113114
}
114115
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ Content-Type: application/json
134134
"announcementDateTime": "2022-09-30T00:00:00Z",
135135
"targetDateTime": "2024-09-30T00:00:00Z",
136136
"impactLink": null,
137+
"changeType": "deprecation",
137138
"isCustomerActionRequired": true
138139
}
139140
]

api-reference/beta/api/directory-deleteditems-restore.md

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ The following table lists the parameters that are required when you call this ac
7070
|Parameter|Type|Description|
7171
|:---|:---|:---|
7272
|autoReconcileProxyConflict|Boolean|Optional parameter. Indicates whether Microsoft Entra ID should remove any conflicting proxy addresses while restoring a soft-deleted user whose one or more proxy addresses are currently used for an active user. Used only for restoring soft-deleted [user](../resources/user.md). The default value for this paramater is `false`.|
73+
|newUserPrincipalName|String|The new **userPrincipalName** to add to the restored [user](../resources/user.md). Optional.|
7374

7475
## Response
7576

@@ -239,4 +240,44 @@ Content-type: application/json
239240
}
240241
```
241242

243+
### Request
244+
245+
<!-- {
246+
"blockType": "request",
247+
"name": "restore_directory_deleteditem_newUserPrincipalName"
248+
}-->
249+
```http
250+
POST https://graph.microsoft.com/beta/directory/deleteditems/78bf875b-9343-4edc-9130-0d3958113563/restore
251+
Content-Type: application/json
252+
253+
{
254+
"newUserPrincipalName": "johndoe@contoso.com"
255+
}
256+
```
257+
258+
### Response
259+
> **Note:** The response object shown here might be shortened for readability.
260+
<!-- {
261+
"blockType": "response",
262+
"truncated": true,
263+
"@odata.type": "microsoft.graph.directoryObject"
264+
} -->
265+
```http
266+
HTTP/1.1 200 OK
267+
Content-type: application/json
268+
269+
{
270+
"@odata.context": "https://graph.microsoft.com/beta/$metadata#directoryObjects/$entity",
271+
"@odata.type": "#microsoft.graph.user",
272+
"id": "78bf875b-9343-4edc-9130-0d3958113563",
273+
"businessPhones": [],
274+
"displayName": "SampleUser",
275+
"givenName": "Sample",
276+
"mobilePhone": "+1 425 555 0109",
277+
"officeLocation": "18/2111",
278+
"preferredLanguage": "en-US",
279+
"surname": "Vance",
280+
"userPrincipalName": "johndoe@contoso.com"
281+
}
282+
```
242283

api-reference/beta/api/identitycontainer-list-productchanges.md

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

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

17-
Get a list of the [changeItemBase](../resources/changeitembase.md) objects and their properties.
17+
Get a list of the [changeItemBase](../resources/changeitembase.md) objects and their properties. The API returns both Microsoft Entra change announcements and releases.
1818

1919
## Permissions
2020

@@ -113,27 +113,50 @@ HTTP/1.1 200 OK
113113
Content-Type: application/json
114114
115115
{
116-
"value": [
117-
{
118-
"@odata.type": "#microsoft.graph.roadmap",
119-
"id": "0146c01e-02c1-47a7-ad5b-8458a9351f95",
120-
"changeItemState": "available",
121-
"changeItemService": "reporting",
122-
"tags": [
123-
""
124-
],
125-
"systemTags": [],
126-
"documentationUrls": [
127-
"https://entra.microsoft.com/#view/Microsoft_AAD_DXP/ScenarioHealthSummary.ReactView"
128-
],
129-
"shortDescription": "",
130-
"title": "SLA Attainment Report at Tenant Level",
131-
"description": "*Omitted for brevity*",
132-
"deliveryStage": "ga",
133-
"category": "monitoringReporting",
134-
"publishedDateTime": "2024-06-24T07:00:00Z",
135-
"gotoLink": null
136-
}
137-
]
116+
"@odata.context": "https://graph.microsoft.com/beta/$metadata#identity/productChanges",
117+
"@odata.nextLink": "https://graph.microsoft.com/beta/identity/productChanges?$skip=10",
118+
"@microsoft.graph.tips": "Use $select to choose only the properties your app needs, as this can lead to performance improvements. For example: GET identity/productChanges?$select=changeItemService,description",
119+
"value": [
120+
{
121+
"@odata.type": "#microsoft.graph.announcement",
122+
"id": "01ec4ab4-e288-4e1c-8f8c-d5b0bc68b866",
123+
"changeItemService": "msGraph",
124+
"tags": [
125+
"Identity Security"
126+
],
127+
"systemTags": [],
128+
"documentationUrls": [
129+
"https://techcommunity.microsoft.com/t5/microsoft-entra-blog/important-update-azure-ad-graph-api-retirement/ba-p/4090534"
130+
],
131+
"shortDescription": "Latest update on migrating your applications from Azure AD Graph to Microsoft Graph",
132+
"title": "Migrate your apps to Microsoft Graph API",
133+
"description": "In June of 2023, we shared an update on completion of a three-year notice period for the deprecation of the Azure AD Graph API service. The service is now in the retirement cycle and retirement (shut down) will be done with incremental stages. In the first stage of this retirement cycle, applications that are created after June 30, 2024, will receive an error (HTTP 403) for any requests to Azure AD Graph APIs ( https://graph.windows.net ). \n \n We understand that some apps may not have fully completed migration to Microsoft Graph. We are providing an optional configuration that will allow an application created after June 30, 2024, to resume use of Azure AD Graph APIs through June 2025. If you develop or distribute software that requires applications to be created as part of the installation or setup, and these applications will need to access Azure AD Graph APIs, you must prepare now to avoid interruption. \n \n We have recently begun rollout of Microsoft Entra recommendations to help monitor the status of your tenant, plus provide information about applications and service principals that are using Azure AD Graph APIs in your tenant. These new recommendations provide information to support your efforts to migrate the impacted applications and service principals to Microsoft Graph. \n \n For more information on Azure AD Graph retirement, the new recommendations for Azure AD Graph, and configuring applications created after June 30, 2024, for an extension of Azure AD Graph APIs, please click 'Learn more' below.",
134+
"announcementDateTime": "2020-06-23T00:00:00Z",
135+
"targetDateTime": "2024-06-30T00:00:00Z",
136+
"impactLink": null,
137+
"changeType": "retirement",
138+
"isCustomerActionRequired": true
139+
},
140+
{
141+
"@odata.type": "#microsoft.graph.roadmap",
142+
"id": "0d17a065-f34c-4954-9a0a-2f9b45c5c166",
143+
"changeItemService": "entitlementManagement",
144+
"tags": [
145+
""
146+
],
147+
"systemTags": [],
148+
"documentationUrls": [
149+
"https://learn.microsoft.com/en-us/entra/identity/role-based-access-control/permissions-reference#organizational-branding-administrator"
150+
],
151+
"shortDescription": "",
152+
"title": "Organizational Branding role for Entra ID Company Branding",
153+
"description": "The new Organizational Branding Administrator privileges are limited to branding, allowing you to adhere to the principle of least privilege by eliminating the need for the Global Administrator role to configure branding.",
154+
"changeItemState": "available",
155+
"deliveryStage": "ga",
156+
"category": "accessControl",
157+
"publishedDateTime": "2024-05-06T07:00:00Z",
158+
"gotoLink": null
159+
}
160+
]
138161
}
139162
```

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,9 @@ Content-Type: application/json
9494
"id": "8370d119-d695-4dd9-bce2-00e893fadf7d",
9595
"changeItemState": "available",
9696
"changeItemService": "microsoftAuthenticatorApp",
97-
"tags": null,
97+
"tags": [
98+
""
99+
],
98100
"systemTags": [
99101
"entra_roadmap_highlight_new_feature"
100102
],

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,9 @@ Content-Type: application/json
119119
"id": "8370d119-d695-4dd9-bce2-00e893fadf7d",
120120
"changeItemState": "available",
121121
"changeItemService": "microsoftAuthenticatorApp",
122-
"tags": null,
122+
"tags": [
123+
""
124+
],
123125
"systemTags": [
124126
"entra_roadmap_highlight_new_feature"
125127
],

api-reference/beta/resources/activitybasedtimeoutpolicy.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ Inherits from [stsPolicy](stsPolicy.md).
3535
|:-------------|:------------|:------------|
3636
|id|String| Unique identifier for this policy. Read-only.|
3737
|definition|String collection| A string collection containing a JSON string that defines the rules and settings for this policy. See below for more details about the JSON schema for this property. Required.|
38-
|description|String| Description for this policy.|
3938
|displayName|String| Display name for this policy. Required.|
4039
|isOrganizationDefault|Boolean|If set to true, activates this policy. There can be many policies for the same policy type, but only one can be activated as the organization default. Optional, default value is false.|
4140

api-reference/beta/resources/announcement.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ Inherits from [changeItemBase](../resources/changeitembase.md).
2929
|Property|Type|Description|
3030
|:---|:---|:---|
3131
|announcementDateTime|DateTimeOffset|Change announcement date. Supports `$filter` (`eq`, `ne`, `gt`, `lt`, `le` and `ge` on `year()`, `month()`, `day()`, `hour()`, `minute()`, and `second()` built in functions) and `$orderby`.|
32+
|changeType|changeAnnouncementChangeType|Specifies the nature of the change. The possible values are: `breakingChange`, `deprecation`, `endOfSupport`, `featureChange`, `other`, `retirement`, `securityIncident`, `uxChange`, `unknownFutureValue`. Supports `$filter` (`eq`, `ne`, `in`) and `$orderby`.|
3233
|changeItemService|String|Specifies the Microsoft Entra service name to which this item belongs. Inherited from [changeItemBase](../resources/changeitembase.md). Supports `$filter` (`eq`, `ne`, `in`) and `$orderby`.|
3334
|description|String|Description of the change announcement. Inherited from [changeItemBase](../resources/changeitembase.md). Supports `$filter` (`eq`, `ne`, `in`, `startswith`) and `$orderby`.|
3435
|documentationUrls|String collection|Link to the change documentation. Inherited from [changeItemBase](../resources/changeitembase.md). Supports `$filter` (`any` with `eq`).|
@@ -59,6 +60,7 @@ The following JSON representation shows the resource type.
5960
"@odata.type": "#microsoft.graph.announcement",
6061
"id": "String (identifier)",
6162
"changeItemService": "String",
63+
"changeType": "String",
6264
"tags": [
6365
"String"
6466
],

api-reference/beta/resources/changeitembase.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ Namespace: microsoft.graph
1717

1818
Represents either a planned change or planned new feature in Microsoft Entra. This resource is an abstract type from which the following resources inherit:
1919

20-
- [announcement](../resources/announcement.md)
21-
- [roadmap](../resources/roadmap.md).
20+
- [announcement](../resources/announcement.md) - represents a Microsoft Entra change announcement, such as deprecations, breaking changes, retirements, feature changes, and Microsoft-managed policies
21+
- [roadmap](../resources/roadmap.md) - represents previews and generally available releases
2222

2323
Inherits from [entity](../resources/entity.md).
2424

api-reference/beta/resources/enums.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,20 @@ ms.date: 12/06/2024
1212

1313
Namespace: microsoft.graph
1414

15+
### changeAnnouncementChangeType values
16+
17+
|Member|
18+
|:---|
19+
|breakingChange|
20+
|deprecation|
21+
|endOfSupport|
22+
|featureChange|
23+
|other|
24+
|retirement|
25+
|securityIncident|
26+
|uxChange|
27+
|unknownFutureValue|
28+
1529
### hardwareOathTokenHashFunction values
1630

1731
|Member|

api-reference/v1.0/api/activitybasedtimeoutpolicy-list.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Choose the permission or permissions marked as least privileged for this API. Us
3030
<!-- { "blockType": "ignored" } -->
3131

3232
```http
33-
GET policies/activityBasedTimeoutPolicies
33+
GET /policies/activityBasedTimeoutPolicies
3434
```
3535

3636
## Optional query parameters

api-reference/v1.0/api/activitybasedtimeoutpolicy-update.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ In the request body, supply the values for relevant fields that should be update
4747
| Property | Type | Description |
4848
|:-------------|:------------|:------------|
4949
|definition|String collection| A string collection containing a JSON string that defines the rules and settings for this policy. Required.|
50-
|description|String| Description for this policy.|
5150
|displayName|String| Display name for this policy. Required.|
5251
|isOrganizationDefault|Boolean|If set to true, activates this policy. There can be many policies for the same policy type, but only one can be activated as the organization default. Optional, default value is false.|
5352

api-reference/v1.0/resources/activitybasedtimeoutpolicy.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ Inherits from [stsPolicy](stsPolicy.md).
3232
| Property | Type | Description |
3333
|:-------------|:------------|:------------|
3434
|definition|String collection| A string collection containing a JSON string that defines the rules and settings for this policy. See below for more details about the JSON schema for this property. Required.|
35-
|description|String| Description for this policy.|
3635
|displayName|String| Display name for this policy. Required.|
3736
|id|String| Unique identifier for this policy. Read-only.|
3837
|isOrganizationDefault|Boolean|If set to true, activates this policy. There can be many policies for the same policy type, but only one can be activated as the organization default. Optional, default value is false.|

changelog/Microsoft.DirectoryServices.json

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13889,7 +13889,33 @@
1388913889
"CreatedDateTime": "2024-10-09T23:15:04.1920065Z",
1389013890
"WorkloadArea": "Identity and access",
1389113891
"SubArea": "Directory management"
13892-
}
13892+
},
13893+
{
13894+
"ChangeList": [
13895+
{
13896+
"Id": "8cd03a79-71de-467d-bd73-0b3449a28bfc",
13897+
"ApiChange": "Method",
13898+
"ChangedApiName": "restore",
13899+
"ChangeType": "Deletion",
13900+
"Description": "Removed the **restore** method from the [directoryObject](https://learn.microsoft.com/en-us/graph/api/resources/directoryObject?view=graph-rest-beta) resource.",
13901+
"Target": "directoryObject"
13902+
},
13903+
{
13904+
"Id": "8cd03a79-71de-467d-bd73-0b3449a28bfc",
13905+
"ApiChange": "Method",
13906+
"ChangedApiName": "restore",
13907+
"ChangeType": "Addition",
13908+
"Description": "Added the [restore](https://learn.microsoft.com/en-us/graph/api/directory-deleteditems-restore?view=graph-rest-beta) method to the [directoryObject](https://learn.microsoft.com/en-us/graph/api/resources/directoryObject?view=graph-rest-beta) resource.",
13909+
"Target": "directoryObject"
13910+
}
13911+
],
13912+
"Id": "8cd03a79-71de-467d-bd73-0b3449a28bfc",
13913+
"Cloud": "Prod",
13914+
"Version": "beta",
13915+
"CreatedDateTime": "2024-12-17T00:35:00.3307839Z",
13916+
"WorkloadArea": "Identity and access",
13917+
"SubArea": "Directory management"
13918+
}
1389313919
]
1389413920
}
1389513921

concepts/delta-query-overview.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,14 @@ The typical call pattern is as follows:
3333

3434
b. If Microsoft Graph returns a `@odata.deltaLink` URL, there's no more data about the existing state of the resource to return in the current session. For future requests, the application uses the `@odata.deltaLink` URL to learn about changes to the resource.
3535

36+
c. A page can't contain both `@odata.deltaLink` and `@odata.nextLink`.
37+
3638
> [!NOTE]
3739
> The Microsoft Graph response in Step 2 includes the resources that *currently* exist in the collection. Resources that were deleted prior to the initial delta query aren't returned. Updates made before the initial request are summarized on the resource returned as its latest state.
3840
39-
3. When the application needs to learn about changes to the resource, it uses the `@odata.deltaLink` URL it received in step 2 to make requests. The application can make this request immediately after completing step 2 or when it checks for changes.
41+
4. When the application needs to learn about changes to the resource, it uses the `@odata.deltaLink` URL it received in step 2 to make requests. The application can make this request immediately after completing step 2 or when it checks for changes.
4042

41-
4. Microsoft Graph returns a response describing changes to the resource since the previous request, and either a `@odata.nextLink` URL or a `@odata.deltaLink` URL.
43+
5. Microsoft Graph returns a response describing changes to the resource since the previous request, and either a `@odata.nextLink` URL or a `@odata.deltaLink` URL.
4244

4345
> [!NOTE]
4446
> - Resources stored in Microsoft Entra ID (such as users and groups) support "sync from now" scenarios. This allows you to skip steps 1 and 2 (if you're not interested in retrieving the full state of the resource) and ask for the latest `@odata.deltaLink` instead. Append `$deltatoken=latest` to the `delta` function and the response will contain a `@odata.deltaLink` and no resource data. Resources in OneDrive and SharePoint also support this feature but require `token=latest` instead.

concepts/whats-new-overview.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,17 @@ Use the new restore bulk addition request API for more convenient, efficient, an
4949
- 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.
5050
- 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.
5151

52+
### Identity and access | Directory management
53+
54+
While [restoring soft-deleted users](/graph/api/directory-deleteditems-restore?view=graph-rest-beta&preserve-view=true), you can now specify whether Microsoft Entra ID should replace the user's **userPrincipalName** with a new value.
55+
56+
### Identity and access | Identity and sign-in
57+
58+
- Use Microsoft Graph APIs to stay informed about the latest [product updates](/graph/api/resources/changeitembase?view=graph-rest-beta&preserve-view=true), including the [product roadmap](/graph/api/resources/roadmap?view=graph-rest-beta&preserve-view=true) and [change announcements](/graph/api/resources/announcement?view=graph-rest-beta&preserve-view=true), the programmatic alternative to the *What's new* tab on the Microsoft Entra admin center.
59+
- You can now manage hardware OATH tokens for your organization and users programmatically via the following Microsoft Graph APIs:
60+
- [hardwareOathTokenAuthenticationMethodDevice resource type and its associated methods](/graph/api/resources/hardwareoathtokenauthenticationmethoddevice?view=graph-rest-beta&preserve-view=true) to manage the hardware tokens in your tenant, including assigning to users
61+
- [hardwareOathAuthenticationMethod resource type and its associated methods](/graph/api/resources/hardwareoathauthenticationmethod?view=graph-rest-beta&preserve-view=true) to manage tokens that are already assigned to users by activating or deactivating them
62+
5263
### Reports | Microsoft 365 monitoring reports
5364

5465
The Microsoft 365 monitoring APIs provide telemetry data to monitor the health of various Microsoft services within a Microsoft 365 subscription for your organization. Use the new operations in the [serviceActivity](/graph/api/resources/serviceactivity?view=graph-rest-beta&preserve-view=true) resource to get telemetry data for Exchange Online, Microsoft 365 Apps, and Microsoft Teams.

0 commit comments

Comments
 (0)