Merge pull request #24677 from microsoftgraph/main

Merge to publish

api-reference/beta/api/plannerplan-archive.md

@@ -27,11 +27,7 @@ Archived tasks are not included in the response for [list of tasks assigned to a
 
 One of the following permissions is required to call this API. To learn more, including how to choose permissions, see [Permissions](/graph/permissions-reference).
 
-<!-- {
-  "blockType": "permissions",
-  "name": "plannerplan-unarchive-permissions"
-}
--->
+<!-- { "blockType": "permissions", "name": "plannerplan_archive" } -->
 [!INCLUDE [permissions-table](../includes/permissions/plannerplan-archive-permissions.md)]
 
 ## HTTP request

api-reference/beta/api/plannerplan-unarchive.md

@@ -21,11 +21,7 @@ Only a plan that is [archived](plannerplan-archive.md) can be unarchived.
 
 One of the following permissions is required to call this API. To learn more, including how to choose permissions, see [Permissions](/graph/permissions-reference).
 
-<!-- {
-  "blockType": "permissions",
-  "name": "plannerplan-unarchive-permissions"
-}
--->
+<!-- { "blockType": "permissions", "name": "plannerplan_unarchive" } -->
 [!INCLUDE [permissions-table](../includes/permissions/plannerplan-unarchive-permissions.md)]
 
 ## HTTP request

api-reference/beta/includes/permissions/plannerplan-archive-permissions.md

@@ -1,5 +1,5 @@
 ---
-description: Automatically generated file. DO NOT MODIFY
+description: "Automatically generated file. DO NOT MODIFY"
 ms.topic: include
 ms.localizationpriority: medium
 ---
@@ -10,4 +10,3 @@ ms.localizationpriority: medium
 |Delegated (personal Microsoft account)|Not supported.|Not supported.|
 |Application|Tasks.ReadWrite.All|Not available.|
 
-

api-reference/beta/includes/permissions/plannerplan-unarchive-permissions.md

@@ -1,5 +1,5 @@
 ---
-description: Automatically generated file. DO NOT MODIFY
+description: "Automatically generated file. DO NOT MODIFY"
 ms.topic: include
 ms.localizationpriority: medium
 ---
@@ -10,4 +10,3 @@ ms.localizationpriority: medium
 |Delegated (personal Microsoft account)|Not supported.|Not supported.|
 |Application|Tasks.ReadWrite.All|Not available.|
 
-

api-reference/beta/toc/identity-and-access/toc.yml

@@ -569,9 +569,9 @@ items:
       href: ../../api/tenantrelationship-findtenantinformationbytenantid.md
   - name: Trusted certificate authorities for apps (preview)
     items:
-    - name: Certificate based application configuration
+    - name: Certificate-based application configuration
       items:
-      - name: Certificate based application configuration
+      - name: Certificate-based application configuration
         href: ../../resources/certificatebasedapplicationconfiguration.md
       - name: List
         href: ../../api/certificateauthoritypath-list-certificatebasedapplicationconfigurations.md
@@ -2000,9 +2000,9 @@ items:
     items:
     - name: Overview
       href: ../../resources/authenticationmethods-overview.md
-    - name: Authentication
+    - name: Authentication states
       items:
-      - name: Authentication
+      - name: Authentication states
         href: ../../resources/authentication.md
       - name: Get
         href: ../../api/authentication-get.md
@@ -2179,10 +2179,10 @@ items:
         href: ../../api/authenticationstrengthroot-list-authenticationmethodmodes.md
       - name: Get authentication method modes
         href: ../../api/authenticationmethodmodedetail-get.md
-  - name: Certificate based auth configuration
+  - name: Certificate-based auth configuration
     displayName: CBA
     items:
-    - name: Certificate based auth configuration
+    - name: Certificate-based auth configuration
       href: ../../resources/certificatebasedauthconfiguration.md
     - name: List
       href: ../../api/certificatebasedauthconfiguration-list.md
@@ -2283,27 +2283,27 @@ items:
     items:
     - name: Overview
       href: ../../resources/crosstenantaccesspolicy-overview.md
-    - name: Cross tenant access policy
+    - name: Cross-tenant access policy
       items:
-      - name: Cross tenant access policy
+      - name: Cross-tenant access policy
         href: ../../resources/crosstenantaccesspolicy.md
       - name: Get
         href: ../../api/crosstenantaccesspolicy-get.md
       - name: Update
         href: ../../api/crosstenantaccesspolicy-update.md
-    - name: Cross tenant access policy configuration default
+    - name: Cross-tenant access policy configuration default
       items:
-      - name: Cross tenant access policy configuration default
+      - name: Cross-tenant access policy configuration default
         href: ../../resources/crosstenantaccesspolicyconfigurationdefault.md
       - name: Get
         href: ../../api/crosstenantaccesspolicyconfigurationdefault-get.md
       - name: Update
         href: ../../api/crosstenantaccesspolicyconfigurationdefault-update.md
       - name: Reset to system default
         href: ../../api/crosstenantaccesspolicyconfigurationdefault-resettosystemdefault.md
-    - name: Cross tenant access policy configuration partner
+    - name: Cross-tenant access policy configuration partner
       items:
-      - name: Cross tenant access policy configuration partner
+      - name: Cross-tenant access policy configuration partner
         href: ../../resources/crosstenantaccesspolicyconfigurationpartner.md
       - name: List
         href: ../../api/crosstenantaccesspolicy-list-partners.md
@@ -2315,9 +2315,9 @@ items:
         href: ../../api/crosstenantaccesspolicyconfigurationpartner-update.md
       - name: Delete
         href: ../../api/crosstenantaccesspolicyconfigurationpartner-delete.md
-    - name: Cross tenant identity sync policy partner
+    - name: Cross-tenant identity sync policy partner
       items:
-      - name: Cross tenant identity sync policy partner
+      - name: Cross-tenant identity sync policy partner
         href: ../../resources/crosstenantidentitysyncpolicypartner.md
       - name: Create
         href: ../../api/crosstenantaccesspolicyconfigurationpartner-put-identitysynchronization.md
@@ -4075,9 +4075,9 @@ items:
     href: ../../resources/networkaccess-remotenetworkhealthevent.md
   - name: Settings
     items:
-    - name: Cross tenant access settings
+    - name: Cross-tenant access settings
       items:
-      - name: Cross tenant access settings
+      - name: Cross-tenant access settings
         href: ../../resources/networkaccess-crosstenantaccesssettings.md
       - name: Get
         href: ../../api/networkaccess-crosstenantaccesssettings-get.md

api-reference/beta/toc/reports/toc.yml

@@ -138,11 +138,11 @@ items:
           href: ../../api/dailyuserinsightmetricsroot-list-signups.md
         - name: List monthly
           href: ../../api/monthlyuserinsightmetricsroot-list-signups.md
-    - name: Microsoft Entra authentication
+    - name: Microsoft Entra health
       items:
-      - name: Microsoft Entra authentication
+      - name: Microsoft Entra health
         href: ../../resources/azureadauthentication.md
-      - name: Get Microsoft Entra authentication
+      - name: Get SLA attainment
         href: ../../api/azureadauthentication-get.md
     - name: Registration and usage
       items:

api-reference/beta/toc/tasks-and-plans/toc.yml

@@ -22,6 +22,10 @@ items:
     href: ../../api/plannerplan-delta.md
   - name: Move to container
     href: ../../api/plannerplan-movetocontainer.md
+  - name: Archive plan
+    href: ../../api/plannerplan-archive.md
+  - name: Unarchive plan
+    href: ../../api/plannerplan-unarchive.md
 - name: Planner task
   items:
   - name: Planner task

api-reference/v1.0/toc.yml

@@ -68,7 +68,7 @@ items:
     displayName: OneDrive, OneDrive for Business, OneDrive business, OneDrive personal, SharePoint
   - name: Identity and access
     href: toc/identity-and-access/toc.yml
-    displayName: Azure AD, Microsoft identity platform, Identity and access
+    displayName: Azure AD, Microsoft identity platform, Microsoft Entra ID, Identity and access
   - name: Mail
     href: toc/mail/toc.yml
     displayName: Outlook, Outlook mail

api-reference/v1.0/toc/identity-and-access/toc.yml

@@ -44,6 +44,14 @@ items:
       href: ../../api/bitlocker-list-recoverykeys.md
     - name: Get
       href: ../../api/bitlockerrecoverykey-get.md
+  - name: Company subscription
+    items:
+    - name: Company subscription
+      href: ../../resources/companysubscription.md
+    - name: Get
+      href: ../../api/companysubscription-get.md
+    - name: List
+      href: ../../api/directory-list-subscriptions.md
   - name: Contract
     items:
     - name: Contract
@@ -341,7 +349,7 @@ items:
     - name: Find tenant by tenant ID
       href: ../../api/tenantrelationship-findtenantinformationbytenantid.md
 - name: Governance
-  displayName: Identity Governance, Access reviews, Entitlement Management, Terms of Use, Privileged Identity Management
+  displayName: Identity Governance, Access reviews, Entitlement Management, Terms of Use, Privileged Identity Management, Microsoft Entra ID Governance
   items:
   - name: Overview
     href: ../../resources/identitygovernance-overview.md
@@ -1522,10 +1530,10 @@ items:
         href: ../../api/authenticationstrengthroot-list-authenticationmethodmodes.md
       - name: Get authentication method modes
         href: ../../api/authenticationmethodmodedetail-get.md
-  - name: Certificate based auth configuration
+  - name: Certificate-based auth configuration
     displayName: CBA
     items:
-    - name: Certificate based auth configuration
+    - name: Certificate-based auth configuration
       href: ../../resources/certificatebasedauthconfiguration.md
     - name: List
       href: ../../api/certificatebasedauthconfiguration-list.md
@@ -1613,27 +1621,27 @@ items:
     items:
     - name: Overview
       href: ../../resources/crosstenantaccesspolicy-overview.md
-    - name: Cross tenant access policy
+    - name: Cross-tenant access policy
       items:
-      - name: Cross tenant access policy
+      - name: Cross-tenant access policy
         href: ../../resources/crosstenantaccesspolicy.md
       - name: Get
         href: ../../api/crosstenantaccesspolicy-get.md
       - name: Update
         href: ../../api/crosstenantaccesspolicy-update.md
-    - name: Cross tenant access policy configuration default
+    - name: Cross-tenant access policy configuration default
       items:
-      - name: Cross tenant access policy configuration default
+      - name: Cross-tenant access policy configuration default
         href: ../../resources/crosstenantaccesspolicyconfigurationdefault.md
       - name: Get
         href: ../../api/crosstenantaccesspolicyconfigurationdefault-get.md
       - name: Update
         href: ../../api/crosstenantaccesspolicyconfigurationdefault-update.md
       - name: Reset to system default
         href: ../../api/crosstenantaccesspolicyconfigurationdefault-resettosystemdefault.md
-    - name: Cross tenant access policy configuration partner
+    - name: Cross-tenant access policy configuration partner
       items:
-      - name: Cross tenant access policy configuration partner
+      - name: Cross-tenant access policy configuration partner
         href: ../../resources/crosstenantaccesspolicyconfigurationpartner.md
       - name: List
         href: ../../api/crosstenantaccesspolicy-list-partners.md
@@ -1645,9 +1653,9 @@ items:
         href: ../../api/crosstenantaccesspolicyconfigurationpartner-update.md
       - name: Delete
         href: ../../api/crosstenantaccesspolicyconfigurationpartner-delete.md
-    - name: Cross tenant identity sync policy partner
+    - name: Cross-tenant identity sync policy partner
       items:
-      - name: Cross tenant identity sync policy partner
+      - name: Cross-tenant identity sync policy partner
         href: ../../resources/crosstenantidentitysyncpolicypartner.md
       - name: Create
         href: ../../api/crosstenantaccesspolicyconfigurationpartner-put-identitysynchronization.md

concepts/change-notifications-delivery-event-hubs.md

@@ -229,7 +229,7 @@ The maximum message size for Event Hubs is 1 MB. When you use [rich notification
 ### Set up storage and create a subscription
 
 1.  [Create a storage account](/azure/storage/common/storage-account-create).
-2.  [Create a container in the storage account](/azure/storage/blobs/blob-containers-portal) and assign it a name.
+2.  [Create a container in the storage account](/azure/storage/blobs/blob-containers-portal). The container name must be set to `microsoft-graph-change-notifications`.
 3.  [Retrieve the storage account access keys or connection string](/azure/storage/common/storage-account-keys-manage#view-account-access-keys).
 4.  Add the connection string to the key vault and give it a name. This value is the secret name.
 5.  Create or recreate your subscription, now including the **blobStoreUrl** property in the following syntax: `blobStoreUrl: "https://<azurekeyvaultname>.vault.azure.net/secrets/<secretname>?tenantId=<domainname>"`

concepts/change-notifications-with-resource-data.md

@@ -13,7 +13,7 @@ ms.date: 05/30/2024
 
 # Set up change notifications that include resource data (rich notifications)
 
-Microsoft Graph allows apps to subscribe to and receive notifications of changes to resources they're interested in. While you can subscribe to the basic kind of change notifications, some resources such as Microsoft Teams chat message and presence resources, support rich notifications. 
+Microsoft Graph allows apps to subscribe to and receive notifications of changes to resources they're interested in. While you can subscribe to basic change notifications, resources such as Microsoft Teams chat message and presence resources, for example, support rich notifications. 
 
 **Rich notifications** include the resource data that changed, allowing your app to run business logic without having to make a separate API call to fetch the changed resource. This article guides you through the process of setting up rich notifications in your application.
 
@@ -384,7 +384,7 @@ To decrypt resource data, your app should perform the reverse steps, using the p
 
 1. Use the **encryptionCertificateId** property to identify the certificate to use.
 
-2. Initialize an RSA cryptographic component (such as the .NET [RSACryptoServiceProvider](/dotnet/api/system.security.cryptography.rsacryptoserviceprovider.decrypt?view=netframework-4.8&preserve-view=true)) with the private key.
+2. Initialize an RSA cryptographic component with the private key. An easy way to initialize an RSA component is to use the [RSACertificateExtensions.GetRSAPrivateKey(X509Certificate2) Method](/dotnet/api/system.security.cryptography.x509certificates.rsacertificateextensions.getrsaprivatekey?view=netframework-4.8&preserve-view=true) with an [X509Certificate2](/dotnet/api/system.security.cryptography.x509certificates.x509certificate2?view=netframework-4.8&preserve-view=true) instance, which contains the private key described in [Managing encryption keys](#managing-encryption-keys).
 
 3. Decrypt the symmetric key delivered in the **dataKey** property of each item in the change notification.
 
@@ -394,7 +394,7 @@ To decrypt resource data, your app should perform the reverse steps, using the p
 
     Compare it to the value in **dataSignature**. If they don't match, assume the payload has been tampered with and don't decrypt it.
 
-5. Use the symmetric key with an Advanced Encryption Standard (AES) (such as the .NET [AesCryptoServiceProvider](/dotnet/api/system.security.cryptography.aescryptoserviceprovider?view=netframework-4.8&preserve-view=true)) to decrypt the content in **data**.
+5. Use the symmetric key with an Advanced Encryption Standard (AES) (such as the .NET [Aes](/dotnet/api/system.security.cryptography.aes?view=netframework-4.8&preserve-view=true)) to decrypt the content in **data**.
 
     - Use the following decryption parameters for the AES algorithm:
 
@@ -445,11 +445,12 @@ This section contains some useful code snippets that use C# and .NET for each st
 # [C#](#tab/csharp)
 ```csharp
 // Initialize with the private key that matches the encryptionCertificateId.
-RSACryptoServiceProvider rsaProvider = ...;        
+X509Certificate2 certificate = <instance of X509Certificate2 matching the encryptionCertificateId property>;
+RSA rsa = certificate.GetRSAPrivateKey();        
 byte[] encryptedSymmetricKey = Convert.FromBase64String(<value from dataKey property>);
 
 // Decrypt using OAEP padding.
-byte[] decryptedSymmetricKey = rsaProvider.Decrypt(encryptedSymmetricKey, fOAEP: true);
+byte[] decryptedSymmetricKey = rsa.Decrypt(encryptedSymmetricKey, fOAEP: true);
 
 // Can now use decryptedSymmetricKey with the AES algorithm.
 ```
@@ -544,7 +545,7 @@ else
 
 # [C#](#tab/csharp)
 ```csharp
-AesCryptoServiceProvider aesProvider = new AesCryptoServiceProvider();
+Aes aesProvider = Aes.Create();
 aesProvider.Key = decryptedSymmetricKey;
 aesProvider.Padding = PaddingMode.PKCS7;
 aesProvider.Mode = CipherMode.CBC;
@@ -601,4 +602,4 @@ decryptedPayload += decipher.final('utf8');
 
 ## Related content
 
-- [Subscription resource type](/graph/api/resources/subscription)
+- [Subscription resource type](/graph/api/resources/subscription)