@pnp/cli-microsoft365 7.0.0-beta.9229cf8 → 7.0.0-beta.99e75a7

package/dist/m365/spo/commands/file/file-version-get.js

@@ -42,7 +42,7 @@ class SpoFileVersionGetCommand extends SpoCommand {
         let requestUrl = `${args.options.webUrl}/_api/web/`;
         if (args.options.fileUrl) {
             const serverRelUrl = urlUtil.getServerRelativePath(args.options.webUrl, args.options.fileUrl);
-            requestUrl += `GetFileByServerRelativeUrl('${formatting.encodeQueryParameter(serverRelUrl)}')/versions/?$filter=VersionLabel eq '${args.options.label}'`;
+            requestUrl += `GetFileByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(serverRelUrl)}')/versions/?$filter=VersionLabel eq '${args.options.label}'`;
         }
         else {
             requestUrl += `GetFileById('${args.options.fileId}')/versions/?$filter=VersionLabel eq '${args.options.label}'`;

package/dist/m365/spo/commands/file/file-version-list.js

@@ -36,7 +36,7 @@ class SpoFileVersionListCommand extends SpoCommand {
             let requestUrl = `${args.options.webUrl}/_api/web`;
             if (args.options.fileUrl) {
                 const serverRelativeUrl = urlUtil.getServerRelativePath(args.options.webUrl, args.options.fileUrl);
-                requestUrl += `/GetFileByServerRelativeUrl('${formatting.encodeQueryParameter(serverRelativeUrl)}')`;
+                requestUrl += `/GetFileByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(serverRelativeUrl)}')`;
             }
             else {
                 requestUrl += `/GetFileById('${args.options.fileId}')`;

package/dist/m365/spo/commands/file/file-version-remove.js

@@ -55,7 +55,7 @@ class SpoFileVersionRemoveCommand extends SpoCommand {
         let requestUrl = `${args.options.webUrl}/_api/web/`;
         if (args.options.fileUrl) {
             const serverRelativePath = urlUtil.getServerRelativePath(args.options.webUrl, args.options.fileUrl);
-            requestUrl += `GetFileByServerRelativeUrl('${formatting.encodeQueryParameter(serverRelativePath)}')/versions/DeleteByLabel('${args.options.label}')`;
+            requestUrl += `GetFileByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(serverRelativePath)}')/versions/DeleteByLabel('${args.options.label}')`;
         }
         else {
             requestUrl += `GetFileById('${args.options.fileId}')/versions/DeleteByLabel('${args.options.label}')`;

package/dist/m365/spo/commands/file/file-version-restore.js

@@ -55,7 +55,7 @@ class SpoFileVersionRestoreCommand extends SpoCommand {
         let requestUrl = `${args.options.webUrl}/_api/web/`;
         if (args.options.fileUrl) {
             const serverRelativePath = urlUtil.getServerRelativePath(args.options.webUrl, args.options.fileUrl);
-            requestUrl += `GetFileByServerRelativeUrl('${formatting.encodeQueryParameter(serverRelativePath)}')/versions/RestoreByLabel('${args.options.label}')`;
+            requestUrl += `GetFileByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(serverRelativePath)}')/versions/RestoreByLabel('${args.options.label}')`;
         }
         else {
             requestUrl += `GetFileById('${args.options.fileId}')/versions/RestoreByLabel('${args.options.label}')`;

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

@@ -5,6 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoFolderAddCommand_instances, _SpoFolderAddCommand_initOptions, _SpoFolderAddCommand_initValidators;
 import request from '../../../../request.js';
+import { formatting } from '../../../../utils/formatting.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
@@ -28,15 +29,12 @@ class SpoFolderAddCommand extends SpoCommand {
         }
         const parentFolderServerRelativeUrl = urlUtil.getServerRelativePath(args.options.webUrl, args.options.parentFolderUrl);
         const serverRelativeUrl = `${parentFolderServerRelativeUrl}/${args.options.name}`;
-        const requestUrl = `${args.options.webUrl}/_api/web/folders`;
+        const requestUrl = `${args.options.webUrl}/_api/web/folders/addUsingPath(decodedUrl='${formatting.encodeQueryParameter(serverRelativeUrl)}')`;
         const requestOptions = {
             url: requestUrl,
             headers: {
                 'accept': 'application/json;odata=nometadata'
             },
-            data: {
-                'ServerRelativeUrl': serverRelativeUrl
-            },
             responseType: 'json'
         };
         try {

package/dist/m365/spo/commands/folder/folder-get.js

@@ -40,7 +40,7 @@ class SpoFolderGetCommand extends SpoCommand {
         }
         else if (args.options.url) {
             const serverRelativePath = urlUtil.getServerRelativePath(args.options.webUrl, args.options.url);
-            requestUrl += `/GetFolderByServerRelativeUrl('${formatting.encodeQueryParameter(serverRelativePath)}')`;
+            requestUrl += `/GetFolderByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(serverRelativePath)}')`;
         }
         if (args.options.withPermissions) {
             requestUrl += `?$expand=ListItemAllFields/HasUniqueRoleAssignments,ListItemAllFields/RoleAssignments/Member,ListItemAllFields/RoleAssignments/RoleDefinitionBindings`;

package/dist/m365/spo/commands/folder/folder-list.js

@@ -52,7 +52,7 @@ class SpoFolderListCommand extends SpoCommand {
         }
         const allFolders = [];
         const serverRelativeUrl = urlUtil.getServerRelativePath(args.options.webUrl, parentFolderUrl);
-        const requestUrl = `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl(@url)/Folders?@url='${formatting.encodeQueryParameter(serverRelativeUrl)}'`;
+        const requestUrl = `${args.options.webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(serverRelativeUrl)}')/Folders`;
         const queryParams = [`$skip=${skip}`, `$top=${SpoFolderListCommand.pageSize}`];
         if (fieldProperties.expandProperties.length > 0) {
             queryParams.push(`$expand=${fieldProperties.expandProperties.join(',')}`);
@@ -64,7 +64,7 @@ class SpoFolderListCommand extends SpoCommand {
             queryParams.push(`$filter=${args.options.filter}`);
         }
         const requestOptions = {
-            url: `${requestUrl}&${queryParams.join('&')}`,
+            url: `${requestUrl}?${queryParams.join('&')}`,
             method: 'GET',
             headers: {
                 'accept': 'application/json;odata=nometadata'

package/dist/m365/spo/commands/folder/folder-remove.js

@@ -25,6 +25,9 @@ class SpoFolderRemoveCommand extends SpoCommand {
         __classPrivateFieldGet(this, _SpoFolderRemoveCommand_instances, "m", _SpoFolderRemoveCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoFolderRemoveCommand_instances, "m", _SpoFolderRemoveCommand_initValidators).call(this);
     }
+    getExcludedOptionsWithUrls() {
+        return ['url'];
+    }
     async commandAction(logger, args) {
         if (args.options.force) {
             await this.removeFolder(logger, args.options);
@@ -45,8 +48,8 @@ class SpoFolderRemoveCommand extends SpoCommand {
         if (this.verbose) {
             await logger.logToStderr(`Removing folder in site at ${options.webUrl}...`);
         }
-        const serverRelativeUrl = urlUtil.getServerRelativePath(options.webUrl, options.url);
-        let requestUrl = `${options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting.encodeQueryParameter(serverRelativeUrl)}')`;
+        const serverRelativePath = urlUtil.getServerRelativePath(options.webUrl, options.url);
+        let requestUrl = `${options.webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(serverRelativePath)}')`;
         if (options.recycle) {
             requestUrl += `/recycle()`;
         }
@@ -71,8 +74,8 @@ class SpoFolderRemoveCommand extends SpoCommand {
 _SpoFolderRemoveCommand_instances = new WeakSet(), _SpoFolderRemoveCommand_initTelemetry = function _SpoFolderRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            recycle: (!(!args.options.recycle)).toString(),
-            force: (!(!args.options.force)).toString()
+            recycle: !!args.options.recycle,
+            force: !!args.options.force
         });
     });
 }, _SpoFolderRemoveCommand_initOptions = function _SpoFolderRemoveCommand_initOptions() {

package/dist/m365/spo/commands/folder/folder-rename.js

@@ -4,9 +4,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _SpoFolderRenameCommand_instances, _SpoFolderRenameCommand_initOptions, _SpoFolderRenameCommand_initValidators;
-import config from '../../../../config.js';
 import request from '../../../../request.js';
-import { spo } from '../../../../utils/spo.js';
+import { formatting } from '../../../../utils/formatting.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
@@ -29,32 +28,29 @@ class SpoFolderRenameCommand extends SpoCommand {
     }
     async commandAction(logger, args) {
         try {
-            const contextResponse = await spo.getRequestDigest(args.options.webUrl);
-            const formDigestValue = contextResponse.FormDigestValue;
-            const webIdentityResp = await spo.getCurrentWebIdentity(args.options.webUrl, formDigestValue);
-            const folderObjectIdentity = await spo.getFolderIdentity(webIdentityResp.objectIdentity, args.options.webUrl, args.options.url, formDigestValue);
             if (this.verbose) {
                 await logger.logToStderr(`Renaming folder ${args.options.url} to ${args.options.name}`);
             }
             const serverRelativePath = urlUtil.getServerRelativePath(args.options.webUrl, args.options.url);
-            const serverRelativeUrlWithoutOldFolder = serverRelativePath.substring(0, serverRelativePath.lastIndexOf('/'));
-            const renamedServerRelativeUrl = `${serverRelativeUrlWithoutOldFolder}/${args.options.name}`;
             const requestOptions = {
-                url: `${args.options.webUrl}/_vti_bin/client.svc/ProcessQuery`,
+                url: `${args.options.webUrl}/_api/Web/GetFolderByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(serverRelativePath)}')/ListItemAllFields`,
                 headers: {
-                    'X-RequestDigest': formDigestValue
+                    accept: 'application/json;odata=nometadata',
+                    'if-match': '*'
                 },
-                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><Method Name="MoveTo" Id="32" ObjectPathId="26"><Parameters><Parameter Type="String">${renamedServerRelativeUrl}</Parameter></Parameters></Method></Actions><ObjectPaths><Identity Id="26" Name="${folderObjectIdentity.objectIdentity}" /></ObjectPaths></Request>`
+                data: {
+                    FileLeafRef: args.options.name,
+                    Title: args.options.name
+                },
+                responseType: 'json'
             };
-            const res = await request.post(requestOptions);
-            const json = JSON.parse(res);
-            const contents = json.find(x => { return x['ErrorInfo']; });
-            if (contents && contents.ErrorInfo) {
-                throw contents.ErrorInfo.ErrorMessage || 'ClientSvc unknown error';
+            const response = await request.patch(requestOptions);
+            if (response && response['odata.null'] === true) {
+                throw 'Folder not found.';
             }
         }
         catch (err) {
-            this.handleRejectedPromise(err);
+            this.handleRejectedODataJsonPromise(err);
         }
     }
 }

package/dist/m365/spo/commands/folder/folder-retentionlabel-ensure.js

@@ -75,7 +75,7 @@ class SpoFolderRetentionLabelEnsureCommand extends SpoCommand {
         }
         else {
             const serverRelativeUrl = urlUtil.getServerRelativePath(args.options.webUrl, args.options.folderUrl);
-            requestUrl += `GetFolderByServerRelativeUrl('${formatting.encodeQueryParameter(serverRelativeUrl)}')`;
+            requestUrl += `GetFolderByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(serverRelativeUrl)}')`;
         }
         const requestOptions = {
             url: `${requestUrl}?$expand=ListItemAllFields,ListItemAllFields/ParentList&$select=ServerRelativeUrl,ListItemAllFields/ParentList/Id,ListItemAllFields/Id`,

package/dist/m365/spo/commands/folder/folder-retentionlabel-remove.js

@@ -91,7 +91,7 @@ class SpoFolderRetentionLabelRemoveCommand extends SpoCommand {
         }
         else {
             const serverRelativeUrl = urlUtil.getServerRelativePath(args.options.webUrl, args.options.folderUrl);
-            requestUrl += `GetFolderByServerRelativeUrl('${formatting.encodeQueryParameter(serverRelativeUrl)}')`;
+            requestUrl += `GetFolderByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(serverRelativeUrl)}')`;
         }
         const requestOptions = {
             url: `${requestUrl}?$expand=ListItemAllFields,ListItemAllFields/ParentList&$select=ServerRelativeUrl,ListItemAllFields/ParentList/Id,ListItemAllFields/Id`,

package/dist/m365/spo/commands/folder/folder-roleassignment-add.js

@@ -41,7 +41,7 @@ class SpoFolderRoleAssignmentAddCommand extends SpoCommand {
                 requestUrl += `GetList('${formatting.encodeQueryParameter(serverRelativeUrl)}')`;
             }
             else {
-                requestUrl += `GetFolderByServerRelativeUrl('${formatting.encodeQueryParameter(serverRelativeUrl)}')/ListItemAllFields`;
+                requestUrl += `GetFolderByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(serverRelativeUrl)}')/ListItemAllFields`;
             }
             const roleDefinitionId = await this.getRoleDefinitionId(args.options);
             if (args.options.upn) {

package/dist/m365/spo/commands/folder/folder-roleassignment-remove.js

@@ -33,7 +33,7 @@ class SpoFolderRoleAssignmentRemoveCommand extends SpoCommand {
                 await logger.logToStderr(`Removing role assignment from folder in site at ${args.options.webUrl}...`);
             }
             const serverRelativeUrl = urlUtil.getServerRelativePath(args.options.webUrl, args.options.folderUrl);
-            const requestUrl = `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting.encodeQueryParameter(serverRelativeUrl)}')/ListItemAllFields`;
+            const requestUrl = `${args.options.webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(serverRelativeUrl)}')/ListItemAllFields`;
             try {
                 if (args.options.upn) {
                     args.options.principalId = await this.getUserPrincipalId(args.options);

package/dist/m365/spo/commands/folder/folder-roleinheritance-break.js

@@ -36,7 +36,7 @@ class SpoFolderRoleInheritanceBreakCommand extends SpoCommand {
                     requestUrl += `GetList('${formatting.encodeQueryParameter(serverRelativeUrl)}')`;
                 }
                 else {
-                    requestUrl += `GetFolderByServerRelativeUrl('${formatting.encodeQueryParameter(serverRelativeUrl)}')/ListItemAllFields`;
+                    requestUrl += `GetFolderByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(serverRelativeUrl)}')/ListItemAllFields`;
                 }
                 const requestOptions = {
                     url: `${requestUrl}/breakroleinheritance(${keepExistingPermissions})`,

package/dist/m365/spo/commands/folder/folder-roleinheritance-reset.js

@@ -35,7 +35,7 @@ class SpoFolderRoleInheritanceResetCommand extends SpoCommand {
                     requestUrl += `GetList('${formatting.encodeQueryParameter(serverRelativeUrl)}')`;
                 }
                 else {
-                    requestUrl += `GetFolderByServerRelativeUrl('${formatting.encodeQueryParameter(serverRelativeUrl)}')/ListItemAllFields`;
+                    requestUrl += `GetFolderByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(serverRelativeUrl)}')/ListItemAllFields`;
                 }
                 const requestOptions = {
                     url: `${requestUrl}/resetroleinheritance`,

package/dist/m365/spo/commands/group/group-list.js

@@ -57,7 +57,6 @@ class SpoGroupListCommand extends SpoCommand {
             responseType: 'json'
         };
         const groupProperties = await request.get(requestOptions);
-        await logger.log(groupProperties);
         if (!options.output || !Cli.shouldTrimOutput(options.output)) {
             await logger.log(groupProperties);
         }

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

@@ -12,7 +12,7 @@ import { formatting } from '../../../../utils/formatting.js';
 import { spo } from '../../../../utils/spo.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
-import aadO365GroupSetCommand from '../../../aad/commands/o365group/o365group-set.js';
+import aadM365GroupSetCommand from '../../../aad/commands/m365group/m365group-set.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
 import { SharingCapabilities } from '../site/SharingCapabilities.js';
@@ -238,7 +238,7 @@ class SpoSiteSetCommand extends SpoCommand {
                     debug: this.debug,
                     verbose: this.verbose
                 };
-                promises.push(Cli.executeCommand(aadO365GroupSetCommand, { options: { ...commandOptions, _: [] } }));
+                promises.push(Cli.executeCommand(aadM365GroupSetCommand, { options: { ...commandOptions, _: [] } }));
             }
             if (args.options.description) {
                 promises.push(this.setGroupifiedSiteDescription(args.options.description));

package/dist/m365/spo/commands/theme/theme-list.js

@@ -26,15 +26,7 @@ class SpoThemeListCommand extends SpoCommand {
                 responseType: 'json'
             };
             const rawRes = await request.post(requestOptions);
-            const themePreviews = rawRes.themePreviews;
-            if (themePreviews && themePreviews.length > 0) {
-                await logger.log(themePreviews);
-            }
-            else {
-                if (this.verbose) {
-                    await logger.logToStderr('No themes found');
-                }
-            }
+            await logger.log(rawRes.themePreviews);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

package/dist/utils/spo.js

@@ -292,7 +292,7 @@ export const spo = {
             nextFolder += `/${folders[folderIndex]}`;
             const folderServerRelativeUrl = urlUtil.getServerRelativePath(webFullUrl, nextFolder);
             const requestOptions = {
-                url: `${webFullUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting.encodeQueryParameter(folderServerRelativeUrl)}')`,
+                url: `${webFullUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(folderServerRelativeUrl)}')`,
                 headers: {
                     'accept': 'application/json;odata=nometadata'
                 }

package/docs/docs/cmd/aad/{o365group/o365group-add.mdx → m365group/m365group-add.mdx}

@@ -2,14 +2,14 @@ import Global from '/docs/cmd/_global.mdx';
 import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 
-# aad o365group add
+# aad m365group add
 
 Creates a Microsoft 365 Group
 
 ## Usage
 
 ```sh
-m365 aad o365group add [options]
+m365 aad m365group add [options]
 ```
 
 ## Options
@@ -61,55 +61,55 @@ If an invalid user is provided in the comma-separated list of Owners or Members,
 Create a public Microsoft 365 Group
 
 ```sh
-m365 aad o365group add --displayName Finance --description "This is the Contoso Finance Group. Please come here and check out the latest news, posts, files, and more." --mailNickname finance
+m365 aad m365group add --displayName Finance --description "This is the Contoso Finance Group. Please come here and check out the latest news, posts, files, and more." --mailNickname finance
 ```
 
 Create a private Microsoft 365 Group
 
 ```sh
-m365 aad o365group add --displayName Finance --description "This is the Contoso Finance Group. Please come here and check out the latest news, posts, files, and more." --mailNickname finance --isPrivate
+m365 aad m365group add --displayName Finance --description "This is the Contoso Finance Group. Please come here and check out the latest news, posts, files, and more." --mailNickname finance --isPrivate
 ```
 
 Create a public Microsoft 365 Group and set specified users as its owners
 
 ```sh
-m365 aad o365group add --displayName Finance --description "This is the Contoso Finance Group. Please come here and check out the latest news, posts, files, and more." --mailNickname finance --owners "DebraB@contoso.onmicrosoft.com,DiegoS@contoso.onmicrosoft.com"
+m365 aad m365group add --displayName Finance --description "This is the Contoso Finance Group. Please come here and check out the latest news, posts, files, and more." --mailNickname finance --owners "DebraB@contoso.onmicrosoft.com,DiegoS@contoso.onmicrosoft.com"
 ```
 
 Create a public Microsoft 365 Group and set specified users as its members
 
 ```sh
-m365 aad o365group add --displayName Finance --description "This is the Contoso Finance Group. Please come here and check out the latest news, posts, files, and more." --mailNickname finance --members "DebraB@contoso.onmicrosoft.com,DiegoS@contoso.onmicrosoft.com"
+m365 aad m365group add --displayName Finance --description "This is the Contoso Finance Group. Please come here and check out the latest news, posts, files, and more." --mailNickname finance --members "DebraB@contoso.onmicrosoft.com,DiegoS@contoso.onmicrosoft.com"
 ```
 
 Create a public Microsoft 365 Group and allow only group members to be able to post conversations to the group.
 
 ```sh
-m365 aad o365group add --displayName Finance --description "This is the Contoso Finance Group. Please come here and check out the latest news, posts, files, and more." --mailNickname finance --allowMembersToPost
+m365 aad m365group add --displayName Finance --description "This is the Contoso Finance Group. Please come here and check out the latest news, posts, files, and more." --mailNickname finance --allowMembersToPost
 ```
 
 Create a public Microsoft 365 Group and hide it from the Outlook experiences (web and client).
 
 ```sh
-m365 aad o365group add --displayName Finance --description "This is the Contoso Finance Group. Please come here and check out the latest news, posts, files, and more." --mailNickname finance --hideGroupInOutlook
+m365 aad m365group add --displayName Finance --description "This is the Contoso Finance Group. Please come here and check out the latest news, posts, files, and more." --mailNickname finance --hideGroupInOutlook
 ```
 
 Create a public Microsoft 365 Group and subscribe all new group members to receive group conversation emails when new messages are posted in the group.
 
 ```sh
-m365 aad o365group add --displayName Finance --description "This is the Contoso Finance Group. Please come here and check out the latest news, posts, files, and more." --mailNickname finance --subscribeNewGroupMembers
+m365 aad m365group add --displayName Finance --description "This is the Contoso Finance Group. Please come here and check out the latest news, posts, files, and more." --mailNickname finance --subscribeNewGroupMembers
 ```
 
 Create a public Microsoft 365 Group and set to not send welcome emails to new group members.
 
 ```sh
-m365 aad o365group add --displayName Finance --description "This is the Contoso Finance Group. Please come here and check out the latest news, posts, files, and more." --mailNickname finance --welcomeEmailDisabled
+m365 aad m365group add --displayName Finance --description "This is the Contoso Finance Group. Please come here and check out the latest news, posts, files, and more." --mailNickname finance --welcomeEmailDisabled
 ```
 
 Create a public Microsoft 365 Group and set its logo
 
 ```sh
-m365 aad o365group add --displayName Finance --description "This is the Contoso Finance Group. Please come here and check out the latest news, posts, files, and more." --mailNickname finance --logoPath images/logo.png
+m365 aad m365group add --displayName Finance --description "This is the Contoso Finance Group. Please come here and check out the latest news, posts, files, and more." --mailNickname finance --logoPath images/logo.png
 ```
 
 ## Response
@@ -208,7 +208,7 @@ m365 aad o365group add --displayName Finance --description "This is the Contoso
   <TabItem value="Markdown">
 
   ```md
-  # aad o365group add --displayName "Finance" --description "This is the Contoso Finance Group. Please come here and check out the latest news, posts, files, and more." --mailNickname "finance"
+  # aad m365group add --displayName "Finance" --description "This is the Contoso Finance Group. Please come here and check out the latest news, posts, files, and more." --mailNickname "finance"
 
   Date: 2023-06-01
 
@@ -230,4 +230,4 @@ m365 aad o365group add --displayName Finance --description "This is the Contoso
   ```
 
   </TabItem>
-</Tabs>
+</Tabs>

package/docs/docs/cmd/aad/{o365group/o365group-conversation-list.mdx → m365group/m365group-conversation-list.mdx}

@@ -2,14 +2,14 @@ import Global from '/docs/cmd/_global.mdx';
 import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 
-# aad o365group conversation list
+# aad m365group conversation list
 
 Lists conversations for the specified Microsoft 365 group
 
 ## Usage
 
 ```sh
-m365 aad o365group conversation list [options]
+m365 aad m365group conversation list [options]
 ```
 
 ## Options
@@ -26,7 +26,7 @@ m365 aad o365group conversation list [options]
 Lists conversations for the specified Microsoft 365 group
 
 ```sh
-m365 aad o365group conversation list --groupId '00000000-0000-0000-0000-000000000000'
+m365 aad m365group conversation list --groupId '00000000-0000-0000-0000-000000000000'
 ```
 
 ## Response
@@ -77,7 +77,7 @@ m365 aad o365group conversation list --groupId '00000000-0000-0000-0000-00000000
   <TabItem value="Markdown">
 
   ```md
-  # aad o365group conversation list --groupId "1cdce329-46a9-4fd3-8826-fe6587d25a8c"
+  # aad m365group conversation list --groupId "1cdce329-46a9-4fd3-8826-fe6587d25a8c"
 
   Date: 2023-06-01
 

package/docs/docs/cmd/aad/{o365group/o365group-conversation-post-list.mdx → m365group/m365group-conversation-post-list.mdx}

@@ -2,24 +2,24 @@ import Global from '/docs/cmd/_global.mdx';
 import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 
-# aad o365group conversation post list
+# aad m365group conversation post list
 
 Lists conversation posts of a Microsoft 365 group
 
 ## Usage
 
 ```sh
-m365 aad o365group conversation post list [options]
+m365 aad m365group conversation post list [options]
 ```
 
 ## Options
 
 ```md definition-list
 `-i, --groupId [groupId]`
-: The Id of the Office 365 Group. You can specify the groupId or groupDisplayName, but not both.
+: The Id of the Microsoft 365 Group. You can specify the groupId or groupDisplayName, but not both.
 
 `-d, --groupDisplayName [groupDisplayName]`
-: The Displayname of the Office 365 Group. You can specify the groupId or groupDisplayName, but not both.
+: The Displayname of the Microsoft 365 Group. You can specify the groupId or groupDisplayName, but not both.
 
 `-t, --threadId <threadId>`
 : The ID of the thread to retrieve details for
@@ -32,13 +32,13 @@ m365 aad o365group conversation post list [options]
 Lists the posts of the specific conversation of Microsoft 365 group by groupId
 
 ```sh
-m365 aad o365group conversation post list --groupId '00000000-0000-0000-0000-000000000000' --threadId 'AAQkADkwN2Q2NDg1LWQ3ZGYtNDViZi1iNGRiLTVhYjJmN2Q5NDkxZQAQAOnRAfDf71lIvrdK85FAn5E='
+m365 aad m365group conversation post list --groupId '00000000-0000-0000-0000-000000000000' --threadId 'AAQkADkwN2Q2NDg1LWQ3ZGYtNDViZi1iNGRiLTVhYjJmN2Q5NDkxZQAQAOnRAfDf71lIvrdK85FAn5E='
 ```
 
 Lists the posts of the specific conversation of Microsoft 365 group by groupDisplayName
 
 ```sh
-m365 aad o365group conversation post list --groupDisplayName 'MyGroup' --threadId 'AAQkADkwN2Q2NDg1LWQ3ZGYtNDViZi1iNGRiLTVhYjJmN2Q5NDkxZQAQAOnRAfDf71lIvrdK85FAn5E='
+m365 aad m365group conversation post list --groupDisplayName 'MyGroup' --threadId 'AAQkADkwN2Q2NDg1LWQ3ZGYtNDViZi1iNGRiLTVhYjJmN2Q5NDkxZQAQAOnRAfDf71lIvrdK85FAn5E='
 ```
 
 ## Response
@@ -97,7 +97,7 @@ m365 aad o365group conversation post list --groupDisplayName 'MyGroup' --threadI
   <TabItem value="Markdown">
 
   ```md
-  # aad o365group conversation post list --groupId "1cdce329-46a9-4fd3-8826-fe6587d25a8c" --threadId "AAQkADEzYjY5N2FmLTVmZDYtNDgyYi1iZjBlLTgyNDU5ZTYyNGFkZQAQAGhnITi5DTNEgxisPwMQu74="
+  # aad m365group conversation post list --groupId "1cdce329-46a9-4fd3-8826-fe6587d25a8c" --threadId "AAQkADEzYjY5N2FmLTVmZDYtNDgyYi1iZjBlLTgyNDU5ZTYyNGFkZQAQAGhnITi5DTNEgxisPwMQu74="
 
   Date: 2023-06-02
 
@@ -114,4 +114,4 @@ m365 aad o365group conversation post list --groupDisplayName 'MyGroup' --threadI
   ```
 
   </TabItem>
-</Tabs>
+</Tabs>

package/docs/docs/cmd/aad/{o365group/o365group-get.mdx → m365group/m365group-get.mdx}

@@ -2,14 +2,14 @@ import Global from '/docs/cmd/_global.mdx';
 import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 
-# aad o365group get
+# aad m365group get
 
 Gets information about the specified Microsoft 365 Group or Microsoft Teams team
 
 ## Usage
 
 ```sh
-m365 aad o365group get [options]
+m365 aad m365group get [options]
 ```
 
 ## Options
@@ -29,13 +29,13 @@ m365 aad o365group get [options]
 Get information about the Microsoft 365 Group with id _1caf7dcd-7e83-4c3a-94f7-932a1299c844_
 
 ```sh
-m365 aad o365group get --id 1caf7dcd-7e83-4c3a-94f7-932a1299c844
+m365 aad m365group get --id 1caf7dcd-7e83-4c3a-94f7-932a1299c844
 ```
 
 Get information about the Microsoft 365 Group with id _1caf7dcd-7e83-4c3a-94f7-932a1299c844_ and also retrieve the URL of the corresponding SharePoint site
 
 ```sh
-m365 aad o365group get --id 1caf7dcd-7e83-4c3a-94f7-932a1299c844 --includeSiteUrl
+m365 aad m365group get --id 1caf7dcd-7e83-4c3a-94f7-932a1299c844 --includeSiteUrl
 ```
 
 ## Response
@@ -134,7 +134,7 @@ m365 aad o365group get --id 1caf7dcd-7e83-4c3a-94f7-932a1299c844 --includeSiteUr
   <TabItem value="Markdown">
 
   ```md
-  # aad o365group get --id "ff99b38f-0a4b-4fbb-a034-b86988061e6d"
+  # aad m365group get --id "ff99b38f-0a4b-4fbb-a034-b86988061e6d"
 
   Date: 2023-06-01
 
@@ -156,4 +156,4 @@ m365 aad o365group get --id 1caf7dcd-7e83-4c3a-94f7-932a1299c844 --includeSiteUr
   ```
 
   </TabItem>
-</Tabs>
+</Tabs>