@pnp/cli-microsoft365 7.2.0-beta.c7e1c03 → 7.2.0-beta.d785eb6

package/dist/m365/spo/commands/site/site-add.js

@@ -33,12 +33,13 @@ class SpoSiteAddCommand extends SpoCommand {
     }
     async commandAction(logger, args) {
         const isClassicSite = args.options.type === 'ClassicSite';
-        if (isClassicSite) {
-            await this.createClassicSite(logger, args);
-        }
-        else {
-            await this.createModernSite(logger, args);
+        const siteUrl = isClassicSite
+            ? await this.createClassicSite(logger, args)
+            : await this.createModernSite(logger, args);
+        if (siteUrl && args.options.withAppCatalog) {
+            await this.addAppCatalog(siteUrl, logger);
         }
+        await logger.log(siteUrl);
     }
     async createModernSite(logger, args) {
         const isTeamSite = args.options.type !== 'CommunicationSite';
@@ -132,19 +133,18 @@ class SpoSiteAddCommand extends SpoCommand {
                 if (response.ErrorMessage !== null) {
                     throw response.ErrorMessage;
                 }
-                await logger.log(response.SiteUrl);
+                return response.SiteUrl;
             }
             else {
-                if (response.SiteStatus === 2) {
-                    await logger.log(response.SiteUrl);
-                }
-                else {
+                if (response.SiteStatus !== 2) {
                     throw 'An error has occurred while creating the site';
                 }
+                return response.SiteUrl;
             }
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
+            return;
         }
     }
     async createClassicSite(logger, args) {
@@ -195,8 +195,8 @@ class SpoSiteAddCommand extends SpoCommand {
             }
             const operation = json[json.length - 1];
             const isComplete = operation.IsComplete;
-            if (!args.options.wait || isComplete) {
-                return;
+            if ((!args.options.wait && !args.options.withAppCatalog) || isComplete) {
+                return args.options.url;
             }
             await new Promise((resolve, reject) => {
                 setTimeout(() => {
@@ -212,9 +212,11 @@ class SpoSiteAddCommand extends SpoCommand {
                     });
                 }, operation.PollingInterval);
             });
+            return args.options.url;
         }
         catch (err) {
             this.handleRejectedPromise(err);
+            return;
         }
     }
     async siteExists(url, logger) {
@@ -304,6 +306,34 @@ class SpoSiteAddCommand extends SpoCommand {
             }, operation.PollingInterval);
         });
     }
+    async addAppCatalog(url, logger) {
+        try {
+            this.spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
+            this.context = await spo.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug);
+            if (this.verbose) {
+                await logger.logToStderr(`Adding site collection app catalog...`);
+            }
+            const requestOptions = {
+                url: `${this.spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                headers: {
+                    'X-RequestDigest': this.context.FormDigestValue
+                },
+                data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="38" ObjectPathId="37" /><ObjectPath Id="40" ObjectPathId="39" /><ObjectPath Id="42" ObjectPathId="41" /><ObjectPath Id="44" ObjectPathId="43" /><ObjectPath Id="46" ObjectPathId="45" /><ObjectPath Id="48" ObjectPathId="47" /></Actions><ObjectPaths><Constructor Id="37" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="39" ParentId="37" Name="GetSiteByUrl"><Parameters><Parameter Type="String">${formatting.escapeXml(url)}</Parameter></Parameters></Method><Property Id="41" ParentId="39" Name="RootWeb" /><Property Id="43" ParentId="41" Name="TenantAppCatalog" /><Property Id="45" ParentId="43" Name="SiteCollectionAppCatalogsSites" /><Method Id="47" ParentId="45" Name="Add"><Parameters><Parameter Type="String">${formatting.escapeXml(url)}</Parameter></Parameters></Method></ObjectPaths></Request>`
+            };
+            const response = await request.post(requestOptions);
+            const json = JSON.parse(response);
+            const responseContents = json[0];
+            if (responseContents.ErrorInfo) {
+                throw responseContents.ErrorInfo.ErrorMessage;
+            }
+            if (this.verbose) {
+                await logger.logToStderr('Site collection app catalog created');
+            }
+        }
+        catch (err) {
+            this.handleRejectedPromise(err);
+        }
+    }
 }
 _SpoSiteAddCommand_instances = new WeakSet(), _SpoSiteAddCommand_initTelemetry = function _SpoSiteAddCommand_initTelemetry() {
     this.telemetry.push((args) => {
@@ -316,6 +346,7 @@ _SpoSiteAddCommand_instances = new WeakSet(), _SpoSiteAddCommand_initTelemetry =
         telemetryProps.isPublic = args.options.isPublic || false;
         telemetryProps.lcid = args.options.lcid;
         telemetryProps.owners = typeof args.options.owners !== 'undefined';
+        telemetryProps.withAppCatalog = args.options.withAppCatalog || false;
         if (isCommunicationSite) {
             telemetryProps.shareByEmailEnabled = args.options.shareByEmailEnabled || false;
             telemetryProps.siteDesign = args.options.siteDesign;
@@ -373,6 +404,8 @@ _SpoSiteAddCommand_instances = new WeakSet(), _SpoSiteAddCommand_initTelemetry =
         option: '--storageQuotaWarningLevel [storageQuotaWarningLevel]'
     }, {
         option: '--removeDeletedSite'
+    }, {
+        option: '--withAppCatalog'
     }, {
         option: '--wait'
     });

package/dist/m365/spo/commands/tenant/tenant-recyclebinitem-restore.js

@@ -9,6 +9,7 @@ import { spo } from '../../../../utils/spo.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+import { setTimeout } from 'timers/promises';
 class SpoTenantRecycleBinItemRestoreCommand extends SpoCommand {
     get name() {
         return commands.TENANT_RECYCLEBINITEM_RESTORE;
@@ -36,13 +37,29 @@ class SpoTenantRecycleBinItemRestoreCommand extends SpoCommand {
                     siteUrl: args.options.siteUrl
                 }
             };
-            const res = await request.post(requestOptions);
-            await logger.log(JSON.parse(res));
+            const response = await request.post(requestOptions);
+            let responseContent = JSON.parse(response);
+            if (args.options.wait && !responseContent.IsComplete) {
+                responseContent = await this.waitUntilTenantRestoreFinished(responseContent.PollingInterval, requestOptions, logger);
+            }
+            await logger.log(responseContent);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
         }
     }
+    async waitUntilTenantRestoreFinished(pollingInterval, requestOptions, logger) {
+        if (this.verbose) {
+            await logger.logToStderr(`Site collection still restoring. Retrying in ${pollingInterval / 1000} seconds...`);
+        }
+        await setTimeout(pollingInterval);
+        const response = await request.post(requestOptions);
+        const responseContent = JSON.parse(response);
+        if (responseContent.IsComplete) {
+            return responseContent;
+        }
+        return await this.waitUntilTenantRestoreFinished(responseContent.PollingInterval, requestOptions, logger);
+    }
 }
 _SpoTenantRecycleBinItemRestoreCommand_instances = new WeakSet(), _SpoTenantRecycleBinItemRestoreCommand_initTelemetry = function _SpoTenantRecycleBinItemRestoreCommand_initTelemetry() {
     this.telemetry.push((args) => {

package/dist/request.js

@@ -3,6 +3,7 @@ import { Stream } from 'stream';
 import auth, { Auth } from './Auth.js';
 import { app } from './utils/app.js';
 import { formatting } from './utils/formatting.js';
+import { timings } from './cli/timings.js';
 class Request {
     set debug(debug) {
         // if the value to set is the same as current value return early to avoid
@@ -125,6 +126,7 @@ class Request {
         return this.execute(options);
     }
     execute(options, resolve, reject) {
+        const start = process.hrtime.bigint();
         if (!this._logger) {
             return Promise.reject('Logger not set on the request object');
         }
@@ -159,6 +161,8 @@ class Request {
                     resolve((options.responseType === 'stream' || options.fullResponse) ? res : res.data);
                 }
                 else {
+                    const end = process.hrtime.bigint();
+                    timings.api.push(Number(end - start));
                     _resolve((options.responseType === 'stream' || options.fullResponse) ? res : res.data);
                 }
             }, (error) => {
@@ -181,6 +185,8 @@ class Request {
                         reject(error);
                     }
                     else {
+                        const end = process.hrtime.bigint();
+                        timings.api.push(Number(end - start));
                         _reject(error);
                     }
                 }

package/docs/docs/cmd/aad/approleassignment/approleassignment-add.mdx

@@ -124,4 +124,4 @@ m365 aad approleassignment add --appObjectId "57907bf8-73fa-43a6-89a5-1f603e29e4
 
 ## More information
 
-- Microsoft Graph permissions reference: [https://docs.microsoft.com/en-us/graph/permissions-reference](https://docs.microsoft.com/en-us/graph/permissions-reference)
+- Microsoft Graph permissions reference: [https://learn.microsoft.com/graph/permissions-reference](https://learn.microsoft.com/graph/permissions-reference)

package/docs/docs/cmd/aad/approleassignment/approleassignment-list.mdx

@@ -53,7 +53,7 @@ m365 aad approleassignment list --appObjectId b2307a39-e878-458b-bc90-03bc578531
 
 ## More information
 
-- Application and service principal objects in Azure Active Directory (Azure AD): [https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-application-objects](https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-application-objects)
+- Application and service principal objects in Azure Active Directory (Azure AD): [https://learn.microsoft.com/azure/active-directory/develop/active-directory-application-objects](https://learn.microsoft.com/azure/active-directory/develop/active-directory-application-objects)
 
 ## Response
 
@@ -110,4 +110,4 @@ m365 aad approleassignment list --appObjectId b2307a39-e878-458b-bc90-03bc578531
   ```
 
   </TabItem>
-</Tabs>
+</Tabs>

package/docs/docs/cmd/aad/approleassignment/approleassignment-remove.mdx

@@ -70,4 +70,4 @@ The command won't return a response on success.
 
 ## More information
 
-- Microsoft Graph permissions reference: [https://docs.microsoft.com/en-us/graph/permissions-reference](https://docs.microsoft.com/en-us/graph/permissions-reference)
+- Microsoft Graph permissions reference: [https://learn.microsoft.com/graph/permissions-reference](https://learn.microsoft.com/graph/permissions-reference)

package/docs/docs/cmd/aad/oauth2grant/oauth2grant-add.mdx

@@ -55,4 +55,4 @@ The command won't return a response on success.
 
 ## More information
 
-- Application and service principal objects in Azure Active Directory (Azure AD): [https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-application-objects](https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-application-objects)
+- Application and service principal objects in Azure Active Directory (Azure AD): [https://learn.microsoft.com/azure/active-directory/develop/active-directory-application-objects](https://learn.microsoft.com/azure/active-directory/develop/active-directory-application-objects)

package/docs/docs/cmd/aad/oauth2grant/oauth2grant-list.mdx

@@ -94,5 +94,5 @@ m365 aad oauth2grant list --spObjectId b2307a39-e878-458b-bc90-03bc578531d6
 
 ## More information
 
-- Application and service principal objects in Azure Active Directory (Azure AD): [https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-application-objects](https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-application-objects)
-- List oauth2PermissionGrants: [https://docs.microsoft.com/en-us/graph/api/oauth2permissiongrant-list?view=graph-rest-1.0](https://docs.microsoft.com/en-us/graph/api/oauth2permissiongrant-list?view=graph-rest-1.0)
+- Application and service principal objects in Azure Active Directory (Azure AD): [https://learn.microsoft.com/azure/active-directory/develop/active-directory-application-objects](https://learn.microsoft.com/azure/active-directory/develop/active-directory-application-objects)
+- List oauth2PermissionGrants: [https://learn.microsoft.com/graph/api/oauth2permissiongrant-list?view=graph-rest-1.0](https://learn.microsoft.com/graph/api/oauth2permissiongrant-list?view=graph-rest-1.0)

package/docs/docs/cmd/aad/oauth2grant/oauth2grant-remove.mdx

@@ -52,5 +52,5 @@ The command won't return a response on success.
 
 ## More information
 
-- Application and service principal objects in Azure Active Directory (Azure AD): [https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-application-objects](https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-application-objects)
-- Delete a delegated permission grant (oAuth2PermissionGrant): [https://docs.microsoft.com/en-us/graph/api/oauth2permissiongrant-delete?view=graph-rest-1.0](https://docs.microsoft.com/en-us/graph/api/oauth2permissiongrant-delete?view=graph-rest-1.0)
+- Application and service principal objects in Azure Active Directory (Azure AD): [https://learn.microsoft.com/azure/active-directory/develop/active-directory-application-objects](https://learn.microsoft.com/azure/active-directory/develop/active-directory-application-objects)
+- Delete a delegated permission grant (oAuth2PermissionGrant): [https://learn.microsoft.com/graph/api/oauth2permissiongrant-delete?view=graph-rest-1.0](https://learn.microsoft.com/graph/api/oauth2permissiongrant-delete?view=graph-rest-1.0)

package/docs/docs/cmd/aad/oauth2grant/oauth2grant-set.mdx

@@ -46,5 +46,5 @@ The command won't return a response on success.
 
 ## More information
 
-- Application and service principal objects in Azure Active Directory (Azure AD): [https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-application-objects](https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-application-objects)
-- Update a delegated permission grant (oAuth2PermissionGrant): [https://docs.microsoft.com/en-us/graph/api/oauth2permissiongrant-update?view=graph-rest-1.0](https://docs.microsoft.com/en-us/graph/api/oauth2permissiongrant-update?view=graph-rest-1.0)
+- Application and service principal objects in Azure Active Directory (Azure AD): [https://learn.microsoft.com/azure/active-directory/develop/active-directory-application-objects](https://learn.microsoft.com/azure/active-directory/develop/active-directory-application-objects)
+- Update a delegated permission grant (oAuth2PermissionGrant): [https://learn.microsoft.com/graph/api/oauth2permissiongrant-update?view=graph-rest-1.0](https://learn.microsoft.com/graph/api/oauth2permissiongrant-update?view=graph-rest-1.0)

package/docs/docs/cmd/aad/policy/policy-list.mdx

@@ -112,4 +112,4 @@ m365 aad policy list --type "claimsMapping"
 
 ## More information
 
-- Microsoft Graph Azure AD policy overview: [https://docs.microsoft.com/en-us/graph/api/resources/policy-overview?view=graph-rest-1.0](https://docs.microsoft.com/en-us/graph/api/resources/policy-overview?view=graph-rest-1.0)
+- Microsoft Graph Azure AD policy overview: [https://learn.microsoft.com/graph/api/resources/policy-overview?view=graph-rest-1.0](https://learn.microsoft.com/graph/api/resources/policy-overview?view=graph-rest-1.0)

package/docs/docs/cmd/aad/siteclassification/siteclassification-disable.mdx

@@ -39,4 +39,4 @@ The command won't return a response on success.
 
 ## More information
 
-- SharePoint "modern" sites classification: [https://docs.microsoft.com/en-us/sharepoint/dev/solution-guidance/modern-experience-site-classification](https://docs.microsoft.com/en-us/sharepoint/dev/solution-guidance/modern-experience-site-classification)
+- SharePoint "modern" sites classification: [https://learn.microsoft.com/sharepoint/dev/solution-guidance/modern-experience-site-classification](https://learn.microsoft.com/sharepoint/dev/solution-guidance/modern-experience-site-classification)

package/docs/docs/cmd/aad/siteclassification/siteclassification-enable.mdx

@@ -54,4 +54,4 @@ The command won't return a response on success.
 
 ## More information
 
-- SharePoint "modern" sites classification: [https://docs.microsoft.com/en-us/sharepoint/dev/solution-guidance/modern-experience-site-classification](https://docs.microsoft.com/en-us/sharepoint/dev/solution-guidance/modern-experience-site-classification)
+- SharePoint "modern" sites classification: [https://learn.microsoft.com/sharepoint/dev/solution-guidance/modern-experience-site-classification](https://learn.microsoft.com/sharepoint/dev/solution-guidance/modern-experience-site-classification)

package/docs/docs/cmd/aad/siteclassification/siteclassification-get.mdx

@@ -81,4 +81,4 @@ m365 aad siteclassification get
 
 ## More information
 
-- SharePoint "modern" sites classification: [https://docs.microsoft.com/en-us/sharepoint/dev/solution-guidance/modern-experience-site-classification](https://docs.microsoft.com/en-us/sharepoint/dev/solution-guidance/modern-experience-site-classification)
+- SharePoint "modern" sites classification: [https://learn.microsoft.com/sharepoint/dev/solution-guidance/modern-experience-site-classification](https://learn.microsoft.com/sharepoint/dev/solution-guidance/modern-experience-site-classification)

package/docs/docs/cmd/aad/siteclassification/siteclassification-set.mdx

@@ -61,4 +61,4 @@ The command won't return a response on success.
 
 ## More information
 
-- SharePoint "modern" sites classification: [https://docs.microsoft.com/en-us/sharepoint/dev/solution-guidance/modern-experience-site-classification](https://docs.microsoft.com/en-us/sharepoint/dev/solution-guidance/modern-experience-site-classification)
+- SharePoint "modern" sites classification: [https://learn.microsoft.com/sharepoint/dev/solution-guidance/modern-experience-site-classification](https://learn.microsoft.com/sharepoint/dev/solution-guidance/modern-experience-site-classification)

package/docs/docs/cmd/aad/sp/sp-add.mdx

@@ -189,5 +189,5 @@ m365 aad sp add --objectId b2307a39-e878-458b-bc90-03bc578531d6
 
 ## More information
 
-- Application and service principal objects in Azure Active Directory (Azure AD): [https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-application-objects](https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-application-objects)
-- Create servicePrincipal: [https://docs.microsoft.com/en-us/graph/api/serviceprincipal-post-serviceprincipals?view=graph-rest-1.0](https://docs.microsoft.com/en-us/graph/api/serviceprincipal-post-serviceprincipals?view=graph-rest-1.0)
+- Application and service principal objects in Azure Active Directory (Azure AD): [https://learn.microsoft.com/azure/active-directory/develop/active-directory-application-objects](https://learn.microsoft.com/azure/active-directory/develop/active-directory-application-objects)
+- Create servicePrincipal: [https://learn.microsoft.com/graph/api/serviceprincipal-post-serviceprincipals?view=graph-rest-1.0](https://learn.microsoft.com/graph/api/serviceprincipal-post-serviceprincipals?view=graph-rest-1.0)

package/docs/docs/cmd/aad/sp/sp-get.mdx

@@ -217,5 +217,5 @@ m365 aad sp get --appObjectId b2307a39-e878-458b-bc90-03bc578531dd
 
 ## More information
 
-- Application and service principal objects in Azure Active Directory (Azure AD): [https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-application-objects](https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-application-objects)
-- Get servicePrincipal: [https://docs.microsoft.com/en-us/graph/api/serviceprincipal-get?view=graph-rest-1.0](https://docs.microsoft.com/en-us/graph/api/serviceprincipal-get?view=graph-rest-1.0)
+- Application and service principal objects in Azure Active Directory (Azure AD): [https://learn.microsoft.com/azure/active-directory/develop/active-directory-application-objects](https://learn.microsoft.com/azure/active-directory/develop/active-directory-application-objects)
+- Get servicePrincipal: [https://learn.microsoft.com/graph/api/serviceprincipal-get?view=graph-rest-1.0](https://learn.microsoft.com/graph/api/serviceprincipal-get?view=graph-rest-1.0)

package/docs/docs/cmd/aad/user/user-add.mdx

@@ -43,7 +43,7 @@ m365 aad user add [options]
 : Whether the user should change his/her password on the next login and setup MFA.
 
 `--usageLocation [usageLocation]`
-: A two letter [country code](https://learn.microsoft.com/en-us/partner-center/commercial-marketplace-co-sell-location-codes#country-and-region-codes) (ISO standard 3166). Required for users that will be assigned licenses.
+: A two letter [country code](https://learn.microsoft.com/partner-center/commercial-marketplace-co-sell-location-codes#country-and-region-codes) (ISO standard 3166). Required for users that will be assigned licenses.
 
 `--officeLocation [officeLocation]` 
 : The office location in the user's place of business.
@@ -58,7 +58,7 @@ m365 aad user add [options]
 : The name for the department in which the user works. Maximum length is 64 characters.
 
 `--preferredLanguage [preferredLanguage]`
-: The preferred language for the user. Should follow [ISO 639-1 Code](https://learn.microsoft.com/en-us/openspecs/office_standards/ms-oe376/6c085406-a698-4e12-9d4d-c3b0ee3dbc4a). Example: `en-US`.
+: The preferred language for the user. Should follow [ISO 639-1 Code](https://learn.microsoft.com/openspecs/office_standards/ms-oe376/6c085406-a698-4e12-9d4d-c3b0ee3dbc4a). Example: `en-US`.
 
 `--managerUserId [managerUserId]`
 : User ID of the user's manager. Specify `managerUserId` or `managerUserName` but not both.
@@ -83,7 +83,7 @@ After running this command, it may take a minute before the user is effectively
 
 :::
 
-This command allows using unknown options. For a comprehensive list of user properties, please refer to the [Graph documentation page](https://learn.microsoft.com/en-us/graph/api/resources/user?view=graph-rest-1.0#properties).
+This command allows using unknown options. For a comprehensive list of user properties, please refer to the [Graph documentation page](https://learn.microsoft.com/graph/api/resources/user?view=graph-rest-1.0#properties).
 
 If the specified option is not found, you will receive a `Resource 'xyz' does not exist or one of its queried reference-property objects are not present.` error.
 

package/docs/docs/cmd/aad/user/user-guest-add.mdx

@@ -31,7 +31,7 @@ m365 aad user guest add [options]
 : Additional recipients the invitation message should be sent to. Currently only 1 additional recipient is supported.
 
 `--messageLanguage [messageLanguage]`
-: The language you want to send the default message in. The language format should be in [ISO 639](https://learn.microsoft.com/en-us/openspecs/office_standards/ms-oi29500/ed06cf15-306c-43be-9053-ca81ca51e656). The default is `en-US`.
+: The language you want to send the default message in. The language format should be in [ISO 639](https://learn.microsoft.com/openspecs/office_standards/ms-oi29500/ed06cf15-306c-43be-9053-ca81ca51e656). The default is `en-US`.
 
 `--sendInvitationMessage`
 : Indicates whether an email should be sent to the user.

package/docs/docs/cmd/aad/user/user-set.mdx

@@ -47,7 +47,7 @@ m365 aad user set [options]
 : The user's surname (family name or last name). Maximum length is 64 characters.
 
 `--usageLocation [usageLocation]`
-: A two letter [country code](https://learn.microsoft.com/en-us/partner-center/commercial-marketplace-co-sell-location-codes#country-and-region-codes) (ISO standard 3166). Required for users that will be assigned licenses.
+: A two letter [country code](https://learn.microsoft.com/partner-center/commercial-marketplace-co-sell-location-codes#country-and-region-codes) (ISO standard 3166). Required for users that will be assigned licenses.
 
 `--officeLocation [officeLocation]` 
 : The office location in the user's place of business.
@@ -62,7 +62,7 @@ m365 aad user set [options]
 : The name for the department in which the user works. Maximum length is 64 characters.
 
 `--preferredLanguage [preferredLanguage]`
-: The preferred language for the user. Should follow [ISO 639-1 Code](https://learn.microsoft.com/en-us/openspecs/office_standards/ms-oe376/6c085406-a698-4e12-9d4d-c3b0ee3dbc4a). Example: `en-US`.
+: The preferred language for the user. Should follow [ISO 639-1 Code](https://learn.microsoft.com/openspecs/office_standards/ms-oe376/6c085406-a698-4e12-9d4d-c3b0ee3dbc4a). Example: `en-US`.
 
 `--managerUserId [managerUserId]`
 : User ID of the user's manager. Specify `managerUserId`, `managerUserName` or `removeManager` but not both.
@@ -78,7 +78,7 @@ m365 aad user set [options]
 
 ## Remarks
 
-This command allows using unknown options. For a comprehensive list of user properties, please refer to the [Graph documentation page](https://learn.microsoft.com/en-us/graph/api/resources/user?view=graph-rest-1.0#properties).
+This command allows using unknown options. For a comprehensive list of user properties, please refer to the [Graph documentation page](https://learn.microsoft.com/graph/api/resources/user?view=graph-rest-1.0#properties).
 
 If the user with the specified ID or username doesn't exist, or if the specified option is not found, you will receive a `Resource 'xyz' does not exist or one of its queried reference-property objects are not present.` error.
 

package/docs/docs/cmd/graph/changelog/changelog-list.mdx

@@ -72,7 +72,7 @@ m365 graph changelog list --startDate '2021-01-01' --endDate '2021-05-01'
       "guid": "2693683c-f49a-4715-a649-edadd3f54aadv1.0",
       "category": "v1.0",
       "title": "Teamwork and communications",
-      "description": "Added the **chatMessageActions** enumeration type.\r\\\nAdded the [chatMessageHistoryItem](https://learn.microsoft.com/en-us/graph/api/resources/chatMessageHistoryItem?view=graph-rest-1.0) resource type.\r\\\nAdded the **messageHistory** property to the [chatMessage](https://learn.microsoft.com/en-us/graph/api/resources/chatMessage?view=graph-rest-1.0) resource.\r\\\n",
+      "description": "Added the **chatMessageActions** enumeration type.\r\\\nAdded the [chatMessageHistoryItem](https://learn.microsoft.com/graph/api/resources/chatMessageHistoryItem?view=graph-rest-1.0) resource type.\r\\\nAdded the **messageHistory** property to the [chatMessage](https://learn.microsoft.com/graph/api/resources/chatMessage?view=graph-rest-1.0) resource.\r\\\n",
       "pubDate": "2023-05-18T23:04:05.000Z"
     }
   ]
@@ -93,8 +93,8 @@ m365 graph changelog list --startDate '2021-01-01' --endDate '2021-05-01'
   ```csv
   guid,category,title,description
   2693683c-f49a-4715-a649-edadd3f54aadv1.0,v1.0,Teamwork and communications,"Added the **chatMessageActions** enumeration type.
-  Added the [chatMessageHistoryItem](https://learn.microsoft.com/en-us/graph/api/resources/chatMessageHistoryItem?view=graph-rest-1.0) resource type.
-  Added the **messageHistory** property to the [chatMessage](https://learn.microsoft.com/en-us/graph/api/resources/chatMessage?view=graph-rest-1.0) resource.
+  Added the [chatMessageHistoryItem](https://learn.microsoft.com/graph/api/resources/chatMessageHistoryItem?view=graph-rest-1.0) resource type.
+  Added the **messageHistory** property to the [chatMessage](https://learn.microsoft.com/graph/api/resources/chatMessage?view=graph-rest-1.0) resource.
   ```
 
   </TabItem>
@@ -113,8 +113,8 @@ m365 graph changelog list --startDate '2021-01-01' --endDate '2021-05-01'
   category | v1.0
   title | Teamwork and communications
   description | Added the \*\*chatMessageActions\*\* enumeration type.
-  <br>Added the [chatMessageHistoryItem](https://learn.microsoft.com/en-us/graph/api/resources/chatMessageHistoryItem?view=graph-rest-1.0) resource type.
-  <br>Added the \*\*messageHistory\*\* property to the [chatMessage](https://learn.microsoft.com/en-us/graph/api/resources/chatMessage?view=graph-rest-1.0) resource.
+  <br>Added the [chatMessageHistoryItem](https://learn.microsoft.com/graph/api/resources/chatMessageHistoryItem?view=graph-rest-1.0) resource type.
+  <br>Added the \*\*messageHistory\*\* property to the [chatMessage](https://learn.microsoft.com/graph/api/resources/chatMessage?view=graph-rest-1.0) resource.
   ```
 
   </TabItem>

package/docs/docs/cmd/onenote/notebook/notebook-list.mdx

@@ -159,4 +159,4 @@ m365 onenote notebook list --webUrl https://contoso.sharepoint.com/sites/testsit
 
 ## More information
 
-- List notebooks (MS Graph docs): [https://docs.microsoft.com/en-us/graph/api/onenote-list-notebooks?view=graph-rest-1.0&tabs=http](https://docs.microsoft.com/en-us/graph/api/onenote-list-notebooks?view=graph-rest-1.0&tabs=http)
+- List notebooks (MS Graph docs): [https://learn.microsoft.com/graph/api/onenote-list-notebooks?view=graph-rest-1.0&tabs=http](https://learn.microsoft.com/graph/api/onenote-list-notebooks?view=graph-rest-1.0&tabs=http)

package/docs/docs/cmd/outlook/message/message-list.mdx

@@ -163,4 +163,4 @@ m365 outlook message list --folderName inbox
 
 ## More information
 
-- Well-known folder names: [https://docs.microsoft.com/en-us/graph/api/resources/mailfolder?view=graph-rest-1.0](https://docs.microsoft.com/en-us/graph/api/resources/mailfolder?view=graph-rest-1.0)
+- Well-known folder names: [https://learn.microsoft.com/graph/api/resources/mailfolder?view=graph-rest-1.0](https://learn.microsoft.com/graph/api/resources/mailfolder?view=graph-rest-1.0)

package/docs/docs/cmd/outlook/message/message-move.mdx

@@ -58,4 +58,4 @@ The command won't return a response on success.
 
 ## More information
 
-- Well-known folder names: [https://docs.microsoft.com/en-us/graph/api/resources/mailfolder?view=graph-rest-1.0](https://docs.microsoft.com/en-us/graph/api/resources/mailfolder?view=graph-rest-1.0)
+- Well-known folder names: [https://learn.microsoft.com/graph/api/resources/mailfolder?view=graph-rest-1.0](https://learn.microsoft.com/graph/api/resources/mailfolder?view=graph-rest-1.0)

package/docs/docs/cmd/planner/bucket/bucket-add.mdx

@@ -34,7 +34,7 @@ m365 planner bucket add [options]
 : Name of the group to which the plan belongs. Specify `ownerGroupId` or `ownerGroupName` when using `planTitle`.
 
 `--orderHint [orderHint]`
-: Hint used to order items of this type in a list view. The format is defined as outlined [here](https://docs.microsoft.com/en-us/graph/api/resources/planner-order-hint-format?view=graph-rest-1.0).
+: Hint used to order items of this type in a list view. The format is defined as outlined [here](https://learn.microsoft.com/graph/api/resources/planner-order-hint-format?view=graph-rest-1.0).
 ```
 
 <Global />

package/docs/docs/cmd/planner/bucket/bucket-set.mdx

@@ -38,7 +38,7 @@ m365 planner bucket set [options]
 : New name of the bucket.
 
 `--orderHint [orderHint]`
-: Hint used to order items of this type in a list view. The format is defined as outlined [here](https://docs.microsoft.com/en-us/graph/api/resources/planner-order-hint-format?view=graph-rest-1.0).
+: Hint used to order items of this type in a list view. The format is defined as outlined [here](https://learn.microsoft.com/graph/api/resources/planner-order-hint-format?view=graph-rest-1.0).
 ```
 
 <Global />

package/docs/docs/cmd/planner/plan/plan-set.mdx

@@ -250,6 +250,6 @@ When we make use of the option `shareWithUserIds` or `shareWithUserNames` the re
 
 ## More information
 
-- Update plannerPlan: [https://learn.microsoft.com/en-us/graph/api/plannerplan-update?view=graph-rest-1.0&tabs=http](https://learn.microsoft.com/en-us/graph/api/plannerplan-update?view=graph-rest-1.0&tabs=http)
-- plannerPlanDetails resource type: [https://learn.microsoft.com/en-us/graph/api/resources/plannerplandetails?view=graph-rest-1.0](https://learn.microsoft.com/en-us/graph/api/resources/plannerplandetails?view=graph-rest-1.0)
-- plannerCategoryDescriptions resource type: [https://learn.microsoft.com/en-us/graph/api/resources/plannercategorydescriptions?view=graph-rest-1.0](https://learn.microsoft.com/en-us/graph/api/resources/plannercategorydescriptions?view=graph-rest-1.0)
+- Update plannerPlan: [https://learn.microsoft.com/graph/api/plannerplan-update?view=graph-rest-1.0&tabs=http](https://learn.microsoft.com/graph/api/plannerplan-update?view=graph-rest-1.0&tabs=http)
+- plannerPlanDetails resource type: [https://learn.microsoft.com/graph/api/resources/plannerplandetails?view=graph-rest-1.0](https://learn.microsoft.com/graph/api/resources/plannerplandetails?view=graph-rest-1.0)
+- plannerCategoryDescriptions resource type: [https://learn.microsoft.com/graph/api/resources/plannercategorydescriptions?view=graph-rest-1.0](https://learn.microsoft.com/graph/api/resources/plannercategorydescriptions?view=graph-rest-1.0)

package/docs/docs/cmd/planner/task/task-set.mdx

@@ -364,4 +364,4 @@ m365 planner task set --id "2Vf8JHgsBUiIf-nuvBtv-ZgAAYw2" --percentComplete 50 -
 ## More information
 
 - Using order hints in Planner: [https://docs.microsoft.com/graph/api/resources/planner-order-hint-format?view=graph-rest-1.0](https://docs.microsoft.com/graph/api/resources/planner-order-hint-format?view=graph-rest-1.0)
-- Applied categories in Planner: [https://docs.microsoft.com/graph/api/resources/plannerappliedcategories?view=graph-rest-1.0](https://docs.microsoft.com/en-us/graph/api/resources/plannerappliedcategories?view=graph-rest-1.0)
+- Applied categories in Planner: [https://docs.microsoft.com/graph/api/resources/plannerappliedcategories?view=graph-rest-1.0](https://learn.microsoft.com/graph/api/resources/plannerappliedcategories?view=graph-rest-1.0)

package/docs/docs/cmd/purview/auditlog/auditlog-list.mdx

@@ -31,7 +31,7 @@ m365 purview auditlog list [options]
 
 :::info
 
-Before you can access audit log data, you must enable unified audit logging for your Microsoft 365 tenant. For instructions, check out the page [Turn auditing on or off](https://learn.microsoft.com/en-us/microsoft-365/compliance/audit-log-enable-disable).
+Before you can access audit log data, you must enable unified audit logging for your Microsoft 365 tenant. For instructions, check out the page [Turn auditing on or off](https://learn.microsoft.com/microsoft-365/compliance/audit-log-enable-disable).
 
 :::
 
@@ -145,5 +145,5 @@ m365 purview auditlog list --contentType SharePoint --startTime "2023-01-01T00:0
 
 ## More information
 
-- Explanation of all available audit log activities/operations: https://learn.microsoft.com/en-us/purview/audit-log-activities
-- Explanation of all available audit log properties: https://learn.microsoft.com/en-us/purview/audit-log-detailed-properties
+- Explanation of all available audit log activities/operations: https://learn.microsoft.com/purview/audit-log-activities
+- Explanation of all available audit log properties: https://learn.microsoft.com/purview/audit-log-detailed-properties

package/docs/docs/cmd/purview/retentionevent/retentionevent-add.mdx

@@ -153,4 +153,4 @@ m365 purview retentionevent add --displayName 'Employee information expiration'
 
 This command is part of a series of commands that have to do with event-based retention. Event-based retention is about starting a retention period when a specific event occurs, instead of the moment a document was labeled or created.
 
-[Read more on event-based retention here](https://learn.microsoft.com/en-us/microsoft-365/compliance/event-driven-retention?view=o365-worldwide)
+[Read more on event-based retention here](https://learn.microsoft.com/microsoft-365/compliance/event-driven-retention?view=o365-worldwide)

package/docs/docs/cmd/purview/retentionevent/retentionevent-get.mdx

@@ -139,4 +139,4 @@ This command is based on an API that is currently in preview and is subject to c
 
 This command is part of a series of commands that have to do with event-based retention. Event-based retention is about starting a retention period when a specific event occurs, instead of the moment a document was labeled or created.
 
-[Read more on event-based retention here](https://learn.microsoft.com/en-us/microsoft-365/compliance/event-driven-retention?view=o365-worldwide)
+[Read more on event-based retention here](https://learn.microsoft.com/microsoft-365/compliance/event-driven-retention?view=o365-worldwide)

package/docs/docs/cmd/purview/retentioneventtype/retentioneventtype-add.mdx

@@ -114,4 +114,4 @@ m365 purview retentioneventtype add --displayName 'Contract Expiry' --descriptio
 
 ## More information
 
-This command is part of a series of commands that have to do with event-based retention. Event-based retention is about starting a retention period when a specific event occurs, instead of the moment a document was labeled or created. [Read more about event-based retention here](https://learn.microsoft.com/en-us/microsoft-365/compliance/event-driven-retention?view=o365-worldwide)
+This command is part of a series of commands that have to do with event-based retention. Event-based retention is about starting a retention period when a specific event occurs, instead of the moment a document was labeled or created. [Read more about event-based retention here](https://learn.microsoft.com/microsoft-365/compliance/event-driven-retention?view=o365-worldwide)

package/docs/docs/cmd/purview/retentioneventtype/retentioneventtype-get.mdx

@@ -111,4 +111,4 @@ m365 purview retentioneventtype get --id c37d695e-d581-4ae9-82a0-9364eba4291e
 
 This command is part of a series of commands that have to do with event-based retention. Event-based retention is about starting a retention period when a specific event occurs, instead of the moment a document was labeled or created.
 
-[Read more on event-based retention here](https://learn.microsoft.com/en-us/microsoft-365/compliance/event-driven-retention?view=o365-worldwide)
+[Read more on event-based retention here](https://learn.microsoft.com/microsoft-365/compliance/event-driven-retention?view=o365-worldwide)

package/docs/docs/cmd/purview/retentioneventtype/retentioneventtype-remove.mdx

@@ -44,4 +44,4 @@ The command won't return a response on success.
 
 ## More information
 
-This command is part of a series of commands that have to do with event-based retention. Event-based retention is about starting a retention period when a specific event occurs, instead of the moment a document was labeled or created. [Read more about event-based retention here](https://learn.microsoft.com/en-us/microsoft-365/compliance/event-driven-retention?view=o365-worldwide)
+This command is part of a series of commands that have to do with event-based retention. Event-based retention is about starting a retention period when a specific event occurs, instead of the moment a document was labeled or created. [Read more about event-based retention here](https://learn.microsoft.com/microsoft-365/compliance/event-driven-retention?view=o365-worldwide)

package/docs/docs/cmd/purview/retentioneventtype/retentioneventtype-set.mdx

@@ -44,4 +44,4 @@ The command won't return a response on success.
 
 ## More information
 
-This command is part of a series of commands that have to do with event-based retention. Event-based retention is about starting a retention period when a specific event occurs, instead of the moment a document was labeled or created. [Read more about event-based retention here](https://learn.microsoft.com/en-us/microsoft-365/compliance/event-driven-retention?view=o365-worldwide)
+This command is part of a series of commands that have to do with event-based retention. Event-based retention is about starting a retention period when a specific event occurs, instead of the moment a document was labeled or created. [Read more about event-based retention here](https://learn.microsoft.com/microsoft-365/compliance/event-driven-retention?view=o365-worldwide)

package/docs/docs/cmd/purview/retentionlabel/retentionlabel-add.mdx

@@ -152,4 +152,4 @@ m365 purview retentionlabel add --displayName 'some label' --behaviorDuringReten
 
 ## More information
 
-- Create retentionLabel: [https://learn.microsoft.com/en-us/graph/api/security-retentionlabel-post?view=graph-rest-beta&tabs=http](https://learn.microsoft.com/en-us/graph/api/security-retentionlabel-post?view=graph-rest-beta&tabs=http)
+- Create retentionLabel: [https://learn.microsoft.com/graph/api/security-retentionlabel-post?view=graph-rest-beta&tabs=http](https://learn.microsoft.com/graph/api/security-retentionlabel-post?view=graph-rest-beta&tabs=http)

package/docs/docs/cmd/purview/sensitivitylabel/sensitivitylabel-policysettings-list.mdx

@@ -66,7 +66,7 @@ m365 purview sensitivitylabel policysettings list --userName john.doe@contoso.co
   ```json
   {
     "id": "71F139249895C2F6DC861031DAC47E0C2C37C6595582D4248CC77FD7293681B5DE348BC71AEB44068CB397DB021CADB4",
-    "moreInfoUrl": "https://docs.microsoft.com/en-us/microsoft-365/compliance/get-started-with-sensitivity-labels?view=o365-worldwide#end-user-documentation-for-sensitivity-labels",
+    "moreInfoUrl": "https://learn.microsoft.com/microsoft-365/compliance/get-started-with-sensitivity-labels?view=o365-worldwide#end-user-documentation-for-sensitivity-labels",
     "isMandatory": true,
     "isDowngradeJustificationRequired": true,
     "defaultLabelId": "022bb90d-0cda-491d-b861-d195b14532dc"
@@ -82,7 +82,7 @@ m365 purview sensitivitylabel policysettings list --userName john.doe@contoso.co
   DB021CADB4
   isDowngradeJustificationRequired: true
   isMandatory                     : true
-  moreInfoUrl                     : https://docs.microsoft.com/en-us/microsoft-365/compliance/get-started-with-sensitivity-labels?view=o365-worldwide#end-user-documentation-for-sensitivity-labels
+  moreInfoUrl                     : https://learn.microsoft.com/microsoft-365/compliance/get-started-with-sensitivity-labels?view=o365-worldwide#end-user-documentation-for-sensitivity-labels
   ```
 
   </TabItem>
@@ -90,7 +90,7 @@ m365 purview sensitivitylabel policysettings list --userName john.doe@contoso.co
 
   ```csv
   id,moreInfoUrl,isMandatory,isDowngradeJustificationRequired,defaultLabelId
-  71F139249895C2F6DC861031DAC47E0C2C37C6595582D4248CC77FD7293681B5DE348BC71AEB44068CB397DB021CADB4,https://docs.microsoft.com/en-us/microsoft-365/compliance/get-started-with-sensitivity-labels?view=o365-worldwide#end-user-documentation-for-sensitivity-labels,1,1,022bb90d-0cda-491d-b861-d195b14532dc
+  71F139249895C2F6DC861031DAC47E0C2C37C6595582D4248CC77FD7293681B5DE348BC71AEB44068CB397DB021CADB4,https://learn.microsoft.com/microsoft-365/compliance/get-started-with-sensitivity-labels?view=o365-worldwide#end-user-documentation-for-sensitivity-labels,1,1,022bb90d-0cda-491d-b861-d195b14532dc
   ```
 
   </TabItem>
@@ -106,7 +106,7 @@ m365 purview sensitivitylabel policysettings list --userName john.doe@contoso.co
   Property | Value
   ---------|-------
   id | 71F139249895C2F6DC861031DAC47E0C2C37C6595582D4248CC77FD7293681B5DE348BC71AEB44068CB397DB021CADB4
-  moreInfoUrl | https://docs.microsoft.com/en-us/microsoft-365/compliance/get-started-with-sensitivity-labels?view=o365-worldwide#end-user-documentation-for-sensitivity-labels
+  moreInfoUrl | https://learn.microsoft.com/microsoft-365/compliance/get-started-with-sensitivity-labels?view=o365-worldwide#end-user-documentation-for-sensitivity-labels
   isMandatory | true
   isDowngradeJustificationRequired | true
   defaultLabelId | 022bb90d-0cda-491d-b861-d195b14532dc