@pnp/cli-microsoft365 11.0.0-beta.88d51e6 → 11.0.0

package/dist/m365/spo/commands/{tenant/tenant-site-rename.js → site/site-rename.js}

@@ -3,26 +3,26 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _SpoTenantSiteRenameCommand_instances, _SpoTenantSiteRenameCommand_initTelemetry, _SpoTenantSiteRenameCommand_initOptions, _SpoTenantSiteRenameCommand_initValidators;
+var _SpoSiteRenameCommand_instances, _SpoSiteRenameCommand_initTelemetry, _SpoSiteRenameCommand_initOptions, _SpoSiteRenameCommand_initValidators;
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { spo } from '../../../../utils/spo.js';
 import { timersUtil } from '../../../../utils/timersUtil.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
-class SpoTenantSiteRenameCommand extends SpoCommand {
+class SpoSiteRenameCommand extends SpoCommand {
     get name() {
-        return commands.TENANT_SITE_RENAME;
+        return commands.SITE_RENAME;
     }
     get description() {
         return 'Renames the URL and title of a site collection';
     }
     constructor() {
         super();
-        _SpoTenantSiteRenameCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoTenantSiteRenameCommand_instances, "m", _SpoTenantSiteRenameCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoTenantSiteRenameCommand_instances, "m", _SpoTenantSiteRenameCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoTenantSiteRenameCommand_instances, "m", _SpoTenantSiteRenameCommand_initValidators).call(this);
+        _SpoSiteRenameCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoSiteRenameCommand_instances, "m", _SpoSiteRenameCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoSiteRenameCommand_instances, "m", _SpoSiteRenameCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoSiteRenameCommand_instances, "m", _SpoSiteRenameCommand_initValidators).call(this);
     }
     async commandAction(logger, args) {
         try {
@@ -92,11 +92,11 @@ class SpoTenantSiteRenameCommand extends SpoCommand {
         if (this.operationData.JobState === "Success") {
             return;
         }
-        await timersUtil.setTimeout(SpoTenantSiteRenameCommand.checkIntervalInMs);
+        await timersUtil.setTimeout(SpoSiteRenameCommand.checkIntervalInMs);
         await command.waitForRenameCompletion(command, isVerbose, spoAdminUrl, siteUrl, iteration);
     }
 }
-_SpoTenantSiteRenameCommand_instances = new WeakSet(), _SpoTenantSiteRenameCommand_initTelemetry = function _SpoTenantSiteRenameCommand_initTelemetry() {
+_SpoSiteRenameCommand_instances = new WeakSet(), _SpoSiteRenameCommand_initTelemetry = function _SpoSiteRenameCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             newTitle: typeof args.options.newTitle !== 'undefined',
@@ -105,7 +105,7 @@ _SpoTenantSiteRenameCommand_instances = new WeakSet(), _SpoTenantSiteRenameComma
             wait: !!args.options.wait
         });
     });
-}, _SpoTenantSiteRenameCommand_initOptions = function _SpoTenantSiteRenameCommand_initOptions() {
+}, _SpoSiteRenameCommand_initOptions = function _SpoSiteRenameCommand_initOptions() {
     this.options.unshift({
         option: '-u, --url <url>'
     }, {
@@ -119,7 +119,7 @@ _SpoTenantSiteRenameCommand_instances = new WeakSet(), _SpoTenantSiteRenameComma
     }, {
         option: '--wait'
     });
-}, _SpoTenantSiteRenameCommand_initValidators = function _SpoTenantSiteRenameCommand_initValidators() {
+}, _SpoSiteRenameCommand_initValidators = function _SpoSiteRenameCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.url.toLowerCase() === args.options.newUrl.toLowerCase()) {
             return 'The new URL cannot be the same as the target URL.';
@@ -127,6 +127,6 @@ _SpoTenantSiteRenameCommand_instances = new WeakSet(), _SpoTenantSiteRenameComma
         return true;
     });
 };
-SpoTenantSiteRenameCommand.checkIntervalInMs = 5000;
-export default new SpoTenantSiteRenameCommand();
-//# sourceMappingURL=tenant-site-rename.js.map
+SpoSiteRenameCommand.checkIntervalInMs = 5000;
+export default new SpoSiteRenameCommand();
+//# sourceMappingURL=site-rename.js.map

package/dist/m365/spo/commands/{tenant/tenant-site-unarchive.js → site/site-unarchive.js}

@@ -3,7 +3,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _SpoTenantSiteUnarchiveCommand_instances, _SpoTenantSiteUnarchiveCommand_initTelemetry, _SpoTenantSiteUnarchiveCommand_initOptions, _SpoTenantSiteUnarchiveCommand_initValidators, _SpoTenantSiteUnarchiveCommand_initTypes;
+var _SpoSiteUnarchiveCommand_instances, _SpoSiteUnarchiveCommand_initTelemetry, _SpoSiteUnarchiveCommand_initOptions, _SpoSiteUnarchiveCommand_initValidators, _SpoSiteUnarchiveCommand_initTypes;
 import { cli } from '../../../../cli/cli.js';
 import config from '../../../../config.js';
 import request from '../../../../request.js';
@@ -11,20 +11,20 @@ import { spo } from '../../../../utils/spo.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
-class SpoTenantSiteUnarchiveCommand extends SpoCommand {
+class SpoSiteUnarchiveCommand extends SpoCommand {
     get name() {
-        return commands.TENANT_SITE_UNARCHIVE;
+        return commands.SITE_UNARCHIVE;
     }
     get description() {
         return 'Unarchives a site collection';
     }
     constructor() {
         super();
-        _SpoTenantSiteUnarchiveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoTenantSiteUnarchiveCommand_instances, "m", _SpoTenantSiteUnarchiveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoTenantSiteUnarchiveCommand_instances, "m", _SpoTenantSiteUnarchiveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoTenantSiteUnarchiveCommand_instances, "m", _SpoTenantSiteUnarchiveCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoTenantSiteUnarchiveCommand_instances, "m", _SpoTenantSiteUnarchiveCommand_initTypes).call(this);
+        _SpoSiteUnarchiveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoSiteUnarchiveCommand_instances, "m", _SpoSiteUnarchiveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoSiteUnarchiveCommand_instances, "m", _SpoSiteUnarchiveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoSiteUnarchiveCommand_instances, "m", _SpoSiteUnarchiveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoSiteUnarchiveCommand_instances, "m", _SpoSiteUnarchiveCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
         if (args.options.force) {
@@ -76,23 +76,23 @@ class SpoTenantSiteUnarchiveCommand extends SpoCommand {
         }
     }
 }
-_SpoTenantSiteUnarchiveCommand_instances = new WeakSet(), _SpoTenantSiteUnarchiveCommand_initTelemetry = function _SpoTenantSiteUnarchiveCommand_initTelemetry() {
+_SpoSiteUnarchiveCommand_instances = new WeakSet(), _SpoSiteUnarchiveCommand_initTelemetry = function _SpoSiteUnarchiveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             force: !!args.options.force
         });
     });
-}, _SpoTenantSiteUnarchiveCommand_initOptions = function _SpoTenantSiteUnarchiveCommand_initOptions() {
+}, _SpoSiteUnarchiveCommand_initOptions = function _SpoSiteUnarchiveCommand_initOptions() {
     this.options.unshift({
         option: '-u, --url <url>'
     }, {
         option: '-f, --force'
     });
-}, _SpoTenantSiteUnarchiveCommand_initValidators = function _SpoTenantSiteUnarchiveCommand_initValidators() {
+}, _SpoSiteUnarchiveCommand_initValidators = function _SpoSiteUnarchiveCommand_initValidators() {
     this.validators.push(async (args) => validation.isValidSharePointUrl(args.options.url));
-}, _SpoTenantSiteUnarchiveCommand_initTypes = function _SpoTenantSiteUnarchiveCommand_initTypes() {
+}, _SpoSiteUnarchiveCommand_initTypes = function _SpoSiteUnarchiveCommand_initTypes() {
     this.types.string.push('url');
     this.types.boolean.push('force');
 };
-export default new SpoTenantSiteUnarchiveCommand();
-//# sourceMappingURL=tenant-site-unarchive.js.map
+export default new SpoSiteUnarchiveCommand();
+//# sourceMappingURL=site-unarchive.js.map

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

@@ -31,9 +31,6 @@ class SpoTermListCommand extends SpoCommand {
         __classPrivateFieldGet(this, _SpoTermListCommand_instances, "m", _SpoTermListCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
-        if (args.options.includeChildTerms) {
-            await this.warn(logger, `Parameter 'includeChildTerms' is deprecated. Please use 'withChildTerms' instead`);
-        }
         try {
             const spoWebUrl = args.options.webUrl ? args.options.webUrl : await spo.getSpoAdminUrl(logger, this.debug);
             const res = await spo.getRequestDigest(spoWebUrl);
@@ -43,7 +40,7 @@ class SpoTermListCommand extends SpoCommand {
             const termGroupQuery = args.options.termGroupId ? `<Method Id="77" ParentId="75" Name="GetById"><Parameters><Parameter Type="Guid">{${args.options.termGroupId}}</Parameter></Parameters></Method>` : `<Method Id="77" ParentId="75" Name="GetByName"><Parameters><Parameter Type="String">${formatting.escapeXml(args.options.termGroupName)}</Parameter></Parameters></Method>`;
             const termSetQuery = args.options.termSetId ? `<Method Id="82" ParentId="80" Name="GetById"><Parameters><Parameter Type="Guid">{${args.options.termSetId}}</Parameter></Parameters></Method>` : `<Method Id="82" ParentId="80" Name="GetByName"><Parameters><Parameter Type="String">${formatting.escapeXml(args.options.termSetName)}</Parameter></Parameters></Method>`;
             const 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="70" ObjectPathId="69" /><ObjectIdentityQuery Id="71" ObjectPathId="69" /><ObjectPath Id="73" ObjectPathId="72" /><ObjectIdentityQuery Id="74" ObjectPathId="72" /><ObjectPath Id="76" ObjectPathId="75" /><ObjectPath Id="78" ObjectPathId="77" /><ObjectIdentityQuery Id="79" ObjectPathId="77" /><ObjectPath Id="81" ObjectPathId="80" /><ObjectPath Id="83" ObjectPathId="82" /><ObjectIdentityQuery Id="84" ObjectPathId="82" /><ObjectPath Id="86" ObjectPathId="85" /><Query Id="87" ObjectPathId="85"><Query SelectAllProperties="false"><Properties /></Query><ChildItemQuery SelectAllProperties="true"><Properties><Property Name="Name" ScalarProperty="true" /><Property Name="Id" ScalarProperty="true" /></Properties></ChildItemQuery></Query></Actions><ObjectPaths><StaticMethod Id="69" Name="GetTaxonomySession" TypeId="{981cbc68-9edc-4f8d-872f-71146fcbb84f}" /><Method Id="72" ParentId="69" Name="GetDefaultSiteCollectionTermStore" /><Property Id="75" ParentId="72" Name="Groups" />${termGroupQuery}<Property Id="80" ParentId="77" Name="TermSets" />${termSetQuery}<Property Id="85" ParentId="82" Name="Terms" /></ObjectPaths></Request>`;
-            const shouldIncludeChildTerms = args.options.includeChildTerms || args.options.withChildTerms;
+            const shouldIncludeChildTerms = args.options.withChildTerms;
             const result = await this.executeCsomCall(data, spoWebUrl, res);
             const terms = [];
             if (result._Child_Items_ && result._Child_Items_.length > 0) {
@@ -146,7 +143,6 @@ _SpoTermListCommand_instances = new WeakSet(), _SpoTermListCommand_initTelemetry
             termGroupName: typeof args.options.termGroupName !== 'undefined',
             termSetId: typeof args.options.termSetId !== 'undefined',
             termSetName: typeof args.options.termSetName !== 'undefined',
-            includeChildTerms: !!args.options.includeChildTerms,
             withChildTerms: !!args.options.withChildTerms
         });
     });
@@ -161,8 +157,6 @@ _SpoTermListCommand_instances = new WeakSet(), _SpoTermListCommand_initTelemetry
         option: '--termSetId [termSetId]'
     }, {
         option: '--termSetName [termSetName]'
-    }, {
-        option: '--includeChildTerms'
     }, {
         option: '--withChildTerms'
     });

package/dist/m365/spo/commands.js

@@ -265,6 +265,7 @@ export default {
     SITE_APPPERMISSION_LIST: `${prefix} site apppermission list`,
     SITE_APPPERMISSION_REMOVE: `${prefix} site apppermission remove`,
     SITE_APPPERMISSION_SET: `${prefix} site apppermission set`,
+    SITE_ARCHIVE: `${prefix} site archive`,
     SITE_COMMSITE_ENABLE: `${prefix} site commsite enable`,
     SITE_ENSURE: `${prefix} site ensure`,
     SITE_GET: `${prefix} site get`,
@@ -273,6 +274,7 @@ export default {
     SITE_HUBSITE_DISCONNECT: `${prefix} site hubsite disconnect`,
     SITE_HUBSITE_THEME_SYNC: `${prefix} site hubsite theme sync`,
     SITE_LIST: `${prefix} site list`,
+    SITE_MEMBERSHIP_LIST: `${prefix} site membership list`,
     SITE_INPLACERECORDSMANAGEMENT_SET: `${prefix} site inplacerecordsmanagement set`,
     SITE_RECYCLEBINITEM_CLEAR: `${prefix} site recyclebinitem clear`,
     SITE_RECYCLEBINITEM_LIST: `${prefix} site recyclebinitem list`,
@@ -280,9 +282,11 @@ export default {
     SITE_RECYCLEBINITEM_REMOVE: `${prefix} site recyclebinitem remove`,
     SITE_RECYCLEBINITEM_RESTORE: `${prefix} site recyclebinitem restore`,
     SITE_REMOVE: `${prefix} site remove`,
+    SITE_RENAME: `${prefix} site rename`,
     SITE_SET: `${prefix} site set`,
     SITE_SHARINGPERMISSION_SET: `${prefix} site sharingpermission set`,
     SITE_CHROME_SET: `${prefix} site chrome set`,
+    SITE_UNARCHIVE: `${prefix} site unarchive`,
     SITEDESIGN_ADD: `${prefix} sitedesign add`,
     SITEDESIGN_APPLY: `${prefix} sitedesign apply`,
     SITEDESIGN_GET: `${prefix} sitedesign get`,
@@ -325,17 +329,11 @@ export default {
     TENANT_COMMANDSET_LIST: `${prefix} tenant commandset list`,
     TENANT_COMMANDSET_REMOVE: `${prefix} tenant commandset remove`,
     TENANT_COMMANDSET_SET: `${prefix} tenant commandset set`,
-    TENANT_HOMESITE_LIST: `${prefix} tenant homesite list`,
     TENANT_RECYCLEBINITEM_LIST: `${prefix} tenant recyclebinitem list`,
     TENANT_RECYCLEBINITEM_REMOVE: `${prefix} tenant recyclebinitem remove`,
     TENANT_RECYCLEBINITEM_RESTORE: `${prefix} tenant recyclebinitem restore`,
     TENANT_SETTINGS_LIST: `${prefix} tenant settings list`,
     TENANT_SETTINGS_SET: `${prefix} tenant settings set`,
-    TENANT_SITE_ARCHIVE: `${prefix} tenant site archive`,
-    TENANT_SITE_LIST: `${prefix} tenant site list`,
-    TENANT_SITE_RENAME: `${prefix} tenant site rename`,
-    TENANT_SITE_MEMBERSHIP_LIST: `${prefix} tenant site membership list`,
-    TENANT_SITE_UNARCHIVE: `${prefix} tenant site unarchive`,
     TERM_ADD: `${prefix} term add`,
     TERM_GET: `${prefix} term get`,
     TERM_LIST: `${prefix} term list`,

package/dist/m365/teams/commands/chat/chat-member-add.js

@@ -29,9 +29,6 @@ class TeamsChatMemberAddCommand extends GraphCommand {
             if (this.verbose) {
                 await logger.logToStderr(`Adding member ${args.options.userId || args.options.userName} to chat with id ${args.options.chatId}...`);
             }
-            if (args.options.includeAllHistory) {
-                await this.warn(logger, `Parameter 'includeAllHistory' is deprecated. Please use 'withAllHistory' instead`);
-            }
             const chatMemberAddOptions = {
                 url: `${this.resource}/v1.0/chats/${args.options.chatId}/members`,
                 headers: {
@@ -41,7 +38,7 @@ class TeamsChatMemberAddCommand extends GraphCommand {
                 data: {
                     '@odata.type': '#microsoft.graph.aadUserConversationMember',
                     'user@odata.bind': `https://graph.microsoft.com/v1.0/users/${args.options.userId || formatting.encodeQueryParameter(args.options.userName)}`,
-                    visibleHistoryStartDateTime: (args.options.includeAllHistory || args.options.withAllHistory) ? '0001-01-01T00:00:00Z' : args.options.visibleHistoryStartDateTime,
+                    visibleHistoryStartDateTime: args.options.withAllHistory ? '0001-01-01T00:00:00Z' : args.options.visibleHistoryStartDateTime,
                     roles: [args.options.role || 'owner']
                 }
             };
@@ -59,7 +56,6 @@ _a = TeamsChatMemberAddCommand, _TeamsChatMemberAddCommand_instances = new WeakS
             userName: typeof args.options.userName !== 'undefined',
             role: typeof args.options.role !== 'undefined',
             visibleHistoryStartDateTime: typeof args.options.visibleHistoryStartDateTime !== 'undefined',
-            includeAllHistory: !!args.options.includeAllHistory,
             withAllHistory: !!args.options.withAllHistory
         });
     });
@@ -75,8 +71,6 @@ _a = TeamsChatMemberAddCommand, _TeamsChatMemberAddCommand_instances = new WeakS
         autocomplete: _a.roles
     }, {
         option: '--visibleHistoryStartDateTime [visibleHistoryStartDateTime]'
-    }, {
-        option: '--includeAllHistory'
     }, {
         option: '--withAllHistory'
     });
@@ -101,8 +95,8 @@ _a = TeamsChatMemberAddCommand, _TeamsChatMemberAddCommand_instances = new WeakS
     });
 }, _TeamsChatMemberAddCommand_initOptionSets = function _TeamsChatMemberAddCommand_initOptionSets() {
     this.optionSets.push({ options: ['userId', 'userName'] }, {
-        options: ['visibleHistoryStartDateTime', 'includeAllHistory', 'withAllHistory'],
-        runsWhen: (args) => args.options.visibleHistoryStartDateTime || args.options.includeAllHistory || args.options.withAllHistory
+        options: ['visibleHistoryStartDateTime', 'withAllHistory'],
+        runsWhen: (args) => args.options.visibleHistoryStartDateTime || args.options.withAllHistory
     });
 };
 TeamsChatMemberAddCommand.roles = ['owner', 'guest'];

package/dist/m365/viva/commands/engage/engage-network-list.js

@@ -24,9 +24,6 @@ class VivaEngageNetworkListCommand extends VivaEngageCommand {
         __classPrivateFieldGet(this, _VivaEngageNetworkListCommand_instances, "m", _VivaEngageNetworkListCommand_initOptions).call(this);
     }
     async commandAction(logger, args) {
-        if (args.options.includeSuspended) {
-            await this.warn(logger, `Parameter 'includeSuspended' is deprecated. Please use 'withSuspended' instead`);
-        }
         const requestOptions = {
             url: `${this.resource}/v1/networks/current.json`,
             headers: {
@@ -35,7 +32,7 @@ class VivaEngageNetworkListCommand extends VivaEngageCommand {
             },
             responseType: 'json',
             data: {
-                includeSuspended: (args.options.includeSuspended !== undefined && args.options.includeSuspended !== false) || (args.options.withSuspended !== undefined && args.options.withSuspended !== false)
+                includeSuspended: (args.options.withSuspended !== undefined && args.options.withSuspended !== false)
             }
         };
         try {
@@ -50,14 +47,11 @@ class VivaEngageNetworkListCommand extends VivaEngageCommand {
 _VivaEngageNetworkListCommand_instances = new WeakSet(), _VivaEngageNetworkListCommand_initTelemetry = function _VivaEngageNetworkListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            includeSuspended: args.options.includeSuspended,
             withSuspended: args.options.withSuspended
         });
     });
 }, _VivaEngageNetworkListCommand_initOptions = function _VivaEngageNetworkListCommand_initOptions() {
     this.options.unshift({
-        option: '--includeSuspended'
-    }, {
         option: '--withSuspended'
     });
 };

package/dist/utils/entraAdministrativeUnit.js

@@ -19,7 +19,7 @@ export const entraAdministrativeUnit = {
             }
         }
         const queryString = queryParameters.length > 0
-            ? `?${queryParameters.join('&')}`
+            ? `&${queryParameters.join('&')}`
             : '';
         const graphResource = 'https://graph.microsoft.com';
         const administrativeUnits = await odata.getAllItems(`${graphResource}/v1.0/directory/administrativeUnits?$filter=displayName eq '${formatting.encodeQueryParameter(displayName)}'${queryString}`);

package/dist/utils/spe.js

@@ -1,58 +1,24 @@
-import request from '../request.js';
 import { formatting } from './formatting.js';
 import { cli } from '../cli/cli.js';
-import config from '../config.js';
 import { odata } from './odata.js';
 const graphResource = 'https://graph.microsoft.com';
 export const spe = {
-    /**
-     * Get all container types.
-     * @param spoAdminUrl The URL of the SharePoint Online admin center site (e.g. https://contoso-admin.sharepoint.com)
-     * @returns Array of container types
-     */
-    async getAllContainerTypes(spoAdminUrl) {
-        const requestOptions = {
-            url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
-            headers: {
-                accept: 'application/json;odata=nometadata'
-            },
-            responseType: 'json',
-            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="46" ObjectPathId="45" /><Method Name="GetSPOContainerTypes" Id="47" ObjectPathId="45"><Parameters><Parameter Type="Enum">1</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="45" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
-        };
-        const json = await request.post(requestOptions);
-        const response = json[0];
-        if (response.ErrorInfo) {
-            throw new Error(response.ErrorInfo.ErrorMessage);
-        }
-        const containerTypes = json[json.length - 1];
-        // Format the response to remove CSOM GUIDs and convert them to real GUIDs
-        containerTypes.forEach(ct => {
-            delete ct._ObjectType_;
-            ct.AzureSubscriptionId = formatting.extractCsomGuid(ct.AzureSubscriptionId);
-            ct.ContainerTypeId = formatting.extractCsomGuid(ct.ContainerTypeId);
-            ct.OwningAppId = formatting.extractCsomGuid(ct.OwningAppId);
-            ct.OwningTenantId = formatting.extractCsomGuid(ct.OwningTenantId);
-        });
-        return containerTypes;
-    },
     /**
      * Get the ID of a container type by its name.
-     * @param spoAdminUrl SharePoint Online admin center URL (e.g. https://contoso-admin.sharepoint.com)
      * @param name Name of the container type to search for
      * @returns ID of the container type
      */
-    async getContainerTypeIdByName(spoAdminUrl, name) {
-        const allContainerTypes = await this.getAllContainerTypes(spoAdminUrl);
-        const containerTypes = allContainerTypes.filter(ct => ct.DisplayName.toLowerCase() === name.toLowerCase());
+    async getContainerTypeIdByName(name) {
+        const containerTypes = await odata.getAllItems(`${graphResource}/beta/storage/fileStorage/containerTypes?$select=id,name&$filter=name eq '${formatting.encodeQueryParameter(name)}'`);
         if (containerTypes.length === 0) {
             throw new Error(`The specified container type '${name}' does not exist.`);
         }
         if (containerTypes.length > 1) {
-            const containerTypeKeyValuePair = formatting.convertArrayToHashTable('ContainerTypeId', containerTypes);
+            const containerTypeKeyValuePair = formatting.convertArrayToHashTable('id', containerTypes);
             const containerType = await cli.handleMultipleResultsFound(`Multiple container types with name '${name}' found.`, containerTypeKeyValuePair);
-            return containerType.ContainerTypeId;
+            return containerType.id;
         }
-        return containerTypes[0].ContainerTypeId;
+        return containerTypes[0].id;
     },
     /**
      * Get the ID of a container by its name.

package/docs/docs/cmd/entra/group/group-member-add.mdx

@@ -14,28 +14,21 @@ m365 entra group member add [options]
 
 ```md definition-list
 `-i, --groupId [groupId]`
-: The ID of the Microsoft Entra group. Specify `groupId`, `groupDisplayName` or `groupName` but not multiple.
-
-`-n, --groupDisplayName [groupDisplayName]`
-: (deprecated. Use option `groupName` instead) The display name of the Microsoft Entra group. Specify `groupId`, `groupDisplayName` or `groupName` but not multiple.
-
-`--groupName [groupName]`
-: The display name of the Microsoft Entra group. Specify `groupId`, `groupDisplayName` or `groupName` but not multiple.
-
-`--ids [ids]`
-: (deprecated. Use option `userIds` instead) Microsoft Entra IDs of users. You can also pass a comma-separated list of IDs. Specify either `ids`, `userIds`,`userNames`, `subgroupIds`, or `subgroupNames` but not multiple.
+: The ID of the Microsoft Entra group. Specify `groupId` or `groupName` but not both.
 
+`-n, --groupName [groupName]`
+: The display name of the Microsoft Entra group. Specify `groupId` or `groupName` but not both.
 `--userIds [userIds]`
-: Microsoft Entra IDs of users. You can also pass a comma-separated list of IDs. Specify either `ids`, `userIds`,`userNames`, `subgroupIds`, or `subgroupNames` but not multiple.
+: Microsoft Entra IDs of users. You can also pass a comma-separated list of IDs. Specify either `userIds`,`userNames`, `subgroupIds`, or `subgroupNames` but not multiple.
 
 `--userNames [userNames]`
-: The user principal names of users. You can also pass a comma-separated list of UPNs. Specify either `ids`, `userIds`,`userNames`, `subgroupIds`, or `subgroupNames` but not multiple.
+: The user principal names of users. You can also pass a comma-separated list of UPNs. Specify either `userIds`,`userNames`, `subgroupIds`, or `subgroupNames` but not multiple.
 
 `--subgroupIds [subgroupIds]`
-: Comma-separated list of Microsoft Entra group IDs to add. Specify either `ids`, `userIds`,`userNames`, `subgroupIds`, or `subgroupNames` but not multiple.
+: Comma-separated list of Microsoft Entra group IDs to add. Specify either `userIds`,`userNames`, `subgroupIds`, or `subgroupNames` but not multiple.
 
 `--subgroupNames [subgroupNames]`
-: Comma-separated list of Microsoft Entra group titles to add. Specify either `ids`, `userIds`,`userNames`, `subgroupIds`, or `subgroupNames` but not multiple.
+: Comma-separated list of Microsoft Entra group titles to add. Specify either `userIds`,`userNames`, `subgroupIds`, or `subgroupNames` but not multiple.
 
 `-r, --role <role>`
 : The role to be assigned to the new users. Valid values: `Owner`, `Member`.
@@ -45,12 +38,6 @@ m365 entra group member add [options]
 
 ## Examples
 
-Add a single member specified by ID as a member to a group specified by display name.
-
-```sh
-m365 entra group member add --groupDisplayName Developers --userIds 098b9f52-f48c-4401-819f-29c33794c3f5 --role Member
-```
-
 Add a single member specified by ID as a member to a group specified by group name.
 
 ```sh
@@ -63,12 +50,6 @@ Add multiple members specified by ID as members to a group specified by ID.
 m365 entra group member add --groupId a03c0c35-ef9a-419b-8cab-f89e0a8d2d2a --userIds "098b9f52-f48c-4401-819f-29c33794c3f5,f1e06e31-3abf-4746-83c2-1513d71f38b8" --role Member
 ```
 
-Add a single member specified by UPN as an owner to a group specified by display name.
-
-```sh
-m365 entra group member add --groupDisplayName Developers --userNames john.doe@contoso.com --role Owner
-```
-
 Add a single member specified by UPN as an owner to a group specified by group name.
 
 ```sh

package/docs/docs/cmd/entra/group/group-member-set.mdx

@@ -14,22 +14,16 @@ m365 entra group member set [options]
 
 ```md definition-list
 `-i, --groupId [groupId]`
-: The ID of the Entra ID group. Specify `groupId`, `groupDisplayName` or `groupName` but not multiple.
+: The ID of the Entra ID group. Specify `groupId`, or `groupName` but not both.
 
-`-n, --groupDisplayName [groupDisplayName]`
-: (deprecated. Use option `groupName` instead) The display name of the Entra ID group. Specify `groupId`, `groupDisplayName` or `groupName` but not multiple.
-
-`--groupName [groupName]`
-: The display name of the Microsoft Entra group. Specify `groupId`, `groupDisplayName` or `groupName` but not multiple.
-
-`--ids [ids]`
-: (deprecated. Use option `userIds` instead) Comma-separated list of user IDs. Specify either `ids`, `userIds` or `userNames` but not multiple.
+`-n, --groupName [groupName]`
+: The display name of the Microsoft Entra group. Specify `groupId`, `groupName` but not both.
 
 `--userIds [userIds]`
-: Comma-separated list of user IDs. Specify either `ids`, `userIds` or `userNames` but not multiple.
+: Comma-separated list of user IDs. Specify either `userIds` or `userNames` but not multiple.
 
 `--userNames [userNames]`
-: The user principal names of users. You can also pass a comma-separated list of UPNs. Specify either `ids` or `userNames` but not both.
+: The user principal names of users. You can also pass a comma-separated list of UPNs. Specify either `userIds` or `userNames` but not both.
 
 `-r, --role <role>`
 : The new role to be assigned to the members. Valid values: `Owner`, `Member`.
@@ -39,12 +33,6 @@ m365 entra group member set [options]
 
 ## Examples
 
-Update a single member specified by ID to a member of a group specified by display name
-
-```sh
-m365 entra group member set --groupDisplayName Developers --userIds 098b9f52-f48c-4401-819f-29c33794c3f5 --role Member
-```
-
 Update a single member specified by ID to a member of a group specified by group name
 
 ```sh
@@ -57,12 +45,6 @@ Update multiple members specified by ID to members of a group specified by ID
 m365 entra group member set --groupId a03c0c35-ef9a-419b-8cab-f89e0a8d2d2a --userIds "098b9f52-f48c-4401-819f-29c33794c3f5,f1e06e31-3abf-4746-83c2-1513d71f38b8" --role Member
 ```
 
-Update a single member specified by UPN to an owner of a group specified by display name
-
-```sh
-m365 entra group member set --groupDisplayName Developers --userNames john.doe@contoso.com --role Owner
-```
-
 Update a single member specified by UPN to an owner of a group specified by group name
 
 ```sh

package/docs/docs/cmd/entra/m365group/m365group-get.mdx

@@ -21,9 +21,6 @@ m365 entra m365group get [options]
 `-n, --displayName [displayName]`
 : Display name of the Microsoft 365 Group or Microsoft Teams team to retrieve information for. Specify either `id` or `displayName`, but not both.
 
-`--includeSiteUrl`
-: (deprecated. Use option `withSiteUrl` instead) Set to retrieve the site URL for the group.
-
 `--withSiteUrl`
 : Set to retrieve the site URL for the group.
 ```

package/docs/docs/cmd/entra/m365group/m365group-list.mdx

@@ -21,9 +21,6 @@ m365 entra m365group list [options]
 `-m, --mailNickname [displayName]`
 : Retrieve only groups with mailNickname starting with the specified value.
 
-`--includeSiteUrl`
-: (deprecated. Use option `withSiteUrl` instead) Set to retrieve the site URL for each group.
-
 `--withSiteUrl`
 : Set to retrieve the site URL for each group.
 

package/docs/docs/cmd/entra/pim/pim-role-assignment-eligibility-list.mdx

@@ -27,9 +27,6 @@ m365 entra pim role assignment eligibility list [options]
 `--groupName [groupName]`
 : Display name of the group for which to list eligible roles. Specify either `userId`, `userName`, `groupId` or `groupName`. If not specified, all eligible roles will be listed.
 
-`--includePrincipalDetails`
-: (deprecated. Use option `withPrincipalDetails` instead) An optional flag to include details of the principals that were eligible for a role.
-
 `--withPrincipalDetails`
 : An optional flag to include details of the principals that were eligible for a role.
 ```

package/docs/docs/cmd/entra/pim/pim-role-assignment-list.mdx

@@ -30,9 +30,6 @@ m365 entra pim role assignment list [options]
 `-s, --startDateTime [startDateTime]`
 : An optional ISO 8601 formatted date filter to search from.
 
-`--includePrincipalDetails`
-: (deprecated. Use option `withPrincipalDetails` instead) An optional flag to include details of the principals that were assigned a role.
-
 `--withPrincipalDetails`
 : An optional flag to include details of the principals that were assigned a role.
 ```

package/docs/docs/cmd/entra/pim/pim-role-request-list.mdx

@@ -33,9 +33,6 @@ m365 entra pim role request list [options]
 `-s, --status [status]`
 : An optional value to filter the list of requests. Allowed values are: `Canceled`, `Denied`, `Failed`, `Granted`, `PendingAdminDecision`, `PendingApproval`, `PendingProvisioning`, `PendingScheduleCreation`, `Provisioned`, `Revoked`, and `ScheduleCreated`.
 
-`--includePrincipalDetails`
-: (deprecated. Use option `withPrincipalDetails` instead) An optional flag to include details of the principals that were assigned a role.
-
 `--withPrincipalDetails`
 : An optional flag to include details of the principals that were assigned a role.
 ```