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

package/dist/m365/entra/commands/pim/pim-role-request-list.js

@@ -30,9 +30,6 @@ class EntraPimRoleRequestListCommand extends GraphCommand {
         __classPrivateFieldGet(this, _EntraPimRoleRequestListCommand_instances, "m", _EntraPimRoleRequestListCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
-        if (args.options.includePrincipalDetails) {
-            await this.warn(logger, `Parameter 'includePrincipalDetails' is deprecated. Please use 'withPrincipalDetails' instead`);
-        }
         if (this.verbose) {
             await logger.logToStderr(`Retrieving list of PIM roles requests for ${args.options.userId || args.options.userName || args.options.groupId || args.options.groupName || 'all users'}...`);
         }
@@ -54,7 +51,7 @@ class EntraPimRoleRequestListCommand extends GraphCommand {
                 queryParameters.push(`$filter=${filters.join(' and ')}`);
             }
             expands.push('roleDefinition($select=displayName)');
-            if (args.options.includePrincipalDetails || args.options.withPrincipalDetails) {
+            if (args.options.withPrincipalDetails) {
                 expands.push('principal');
             }
             queryParameters.push(`$expand=${expands.join(',')}`);
@@ -103,7 +100,6 @@ _EntraPimRoleRequestListCommand_instances = new WeakSet(), _EntraPimRoleRequestL
             groupName: typeof args.options.groupName !== 'undefined',
             createdDateTime: typeof args.options.createdDateTime !== 'undefined',
             status: typeof args.options.status !== 'undefined',
-            includePrincipalDetails: !!args.options.includePrincipalDetails,
             withPrincipalDetails: !!args.options.withPrincipalDetails
         });
     });
@@ -121,8 +117,6 @@ _EntraPimRoleRequestListCommand_instances = new WeakSet(), _EntraPimRoleRequestL
     }, {
         option: '-s, --status [status]',
         autocomplete: this.allowedStatuses
-    }, {
-        option: '--includePrincipalDetails'
     }, {
         option: '--withPrincipalDetails'
     });

package/dist/m365/entra/commands/roleassignment/roleassignment-add.js

@@ -0,0 +1,146 @@
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
+import GraphCommand from '../../../base/GraphCommand.js';
+import commands from '../../commands.js';
+import request from '../../../../request.js';
+import { validation } from '../../../../utils/validation.js';
+import { entraAdministrativeUnit } from '../../../../utils/entraAdministrativeUnit.js';
+import { entraApp } from '../../../../utils/entraApp.js';
+import { entraServicePrincipal } from '../../../../utils/entraServicePrincipal.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
+import { roleDefinition } from '../../../../utils/roleDefinition.js';
+import { entraUser } from '../../../../utils/entraUser.js';
+const options = globalOptionsZod
+    .extend({
+    roleDefinitionId: z.string().refine(id => validation.isValidGuid(id), id => ({
+        message: `'${id}' is not a valid GUID.`
+    })).optional(),
+    roleDefinitionName: z.string().optional(),
+    principal: z.string().refine(principal => validation.isValidGuid(principal) || validation.isValidUserPrincipalName(principal) || validation.isValidMailNickname(principal), principal => ({
+        message: `'${principal}' is not a valid GUID, UPN or group mail nickname.`
+    })),
+    userId: z.string().refine(id => validation.isValidGuid(id), id => ({
+        message: `'${id}' is not a valid GUID.`
+    })).optional(),
+    userName: z.string().refine(upn => validation.isValidUserPrincipalName(upn), upn => ({
+        message: `'${upn}' is not a valid UPN.`
+    })).optional(),
+    administrativeUnitId: z.string().refine(id => validation.isValidGuid(id), id => ({
+        message: `'${id}' is not a valid GUID.`
+    })).optional(),
+    administrativeUnitName: z.string().optional(),
+    applicationId: z.string().refine(id => validation.isValidGuid(id), id => ({
+        message: `'${id}' is not a valid GUID.`
+    })).optional(),
+    applicationObjectId: z.string().refine(id => validation.isValidGuid(id), id => ({
+        message: `'${id}' is not a valid GUID.`
+    })).optional(),
+    applicationName: z.string().optional(),
+    servicePrincipalId: z.string().refine(id => validation.isValidGuid(id), id => ({
+        message: `'${id}' is not a valid GUID.`
+    })).optional(),
+    servicePrincipalName: z.string().optional(),
+    groupId: z.string().refine(id => validation.isValidGuid(id), id => ({
+        message: `'${id}' is not a valid GUID.`
+    })).optional(),
+    groupName: z.string().optional()
+})
+    .strict();
+class EntraRoleAssignmentAddCommand extends GraphCommand {
+    get name() {
+        return commands.ROLEASSIGNMENT_ADD;
+    }
+    get description() {
+        return 'Assign a Entra ID role to a user and specify the scope for which the user has been granted access';
+    }
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => [options.roleDefinitionId, options.roleDefinitionName].filter(o => o !== undefined).length === 1, {
+            message: 'Specify either roleDefinitionId or roleDefinitionName'
+        })
+            .refine(options => Object.values([options.userId, options.userName, options.administrativeUnitId, options.administrativeUnitName, options.applicationId, options.applicationObjectId, options.applicationName,
+            options.servicePrincipalId, options.servicePrincipalName, options.groupId, options.groupName]).filter(v => typeof v !== 'undefined').length < 2, {
+            message: 'Provide value for only one of the following parameters: userId, userName, administrativeUnitId, administrativeUnitName, applicationId, applicationObjectId, applicationName, servicePrincipalId, servicePrincipalName, groupId or groupName'
+        });
+    }
+    async commandAction(logger, args) {
+        try {
+            const roleDefinitionId = await this.getRoleDefinitionId(args.options, logger);
+            const data = {
+                roleDefinitionId: roleDefinitionId,
+                principalId: await this.getPrincipalId(args.options, logger),
+                directoryScopeId: await this.getDirectoryScopeId(args.options)
+            };
+            const requestOptions = {
+                url: `${this.resource}/v1.0/roleManagement/directory/roleAssignments`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json',
+                data: data
+            };
+            const response = await request.post(requestOptions);
+            await logger.log(response);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+    async getRoleDefinitionId(options, logger) {
+        if (options.roleDefinitionId) {
+            return options.roleDefinitionId;
+        }
+        if (this.verbose) {
+            await logger.logToStderr(`Retrieving role definition by its name '${options.roleDefinitionName}'`);
+        }
+        const role = await roleDefinition.getRoleDefinitionByDisplayName(options.roleDefinitionName);
+        return role.id;
+    }
+    async getPrincipalId(options, logger) {
+        if (validation.isValidGuid(options.principal)) {
+            return options.principal;
+        }
+        if (validation.isValidUserPrincipalName(options.principal)) {
+            if (this.verbose) {
+                await logger.logToStderr(`Retrieving user id by UPN '${options.principal}'`);
+            }
+            return await entraUser.getUserIdByUpn(options.principal);
+        }
+        if (this.verbose) {
+            await logger.logToStderr(`Retrieving group id by mail nickname '${options.principal}'`);
+        }
+        return await entraGroup.getGroupIdByMailNickname(options.principal);
+    }
+    async getDirectoryScopeId(options) {
+        let prefix = '/';
+        let resourceId = '';
+        if (options.userId || options.userName) {
+            resourceId = options.userId || await entraUser.getUserIdByUpn(options.userName);
+        }
+        else if (options.administrativeUnitId || options.administrativeUnitName) {
+            prefix = '/administrativeUnits/';
+            resourceId = options.administrativeUnitId || (await entraAdministrativeUnit.getAdministrativeUnitByDisplayName(options.administrativeUnitName, "id")).id;
+        }
+        else if (options.applicationId || options.applicationObjectId || options.applicationName) {
+            resourceId = options.applicationObjectId;
+            if (options.applicationId) {
+                resourceId = (await entraApp.getAppRegistrationByAppId(options.applicationId, ["id"])).id;
+            }
+            else if (options.applicationName) {
+                resourceId = (await entraApp.getAppRegistrationByAppName(options.applicationName, ["id"])).id;
+            }
+        }
+        else if (options.servicePrincipalId || options.servicePrincipalName) {
+            resourceId = options.servicePrincipalId || (await entraServicePrincipal.getServicePrincipalByAppName(options.servicePrincipalName, "id")).id;
+        }
+        else if (options.groupId || options.groupName) {
+            resourceId = options.groupId || (await entraGroup.getGroupIdByDisplayName(options.groupName));
+        }
+        return `${prefix}${resourceId}`;
+    }
+}
+export default new EntraRoleAssignmentAddCommand();
+//# sourceMappingURL=roleassignment-add.js.map

package/dist/m365/entra/commands.js

@@ -92,6 +92,7 @@ export default {
     PIM_ROLE_REQUEST_LIST: `${prefix} pim role request list`,
     POLICY_LIST: `${prefix} policy list`,
     RESOURCENAMESPACE_LIST: `${prefix} resourcenamespace list`,
+    ROLEASSIGNMENT_ADD: `${prefix} roleassignment add`,
     ROLEDEFINITION_ADD: `${prefix} roledefinition add`,
     ROLEDEFINITION_LIST: `${prefix} roledefinition list`,
     ROLEDEFINITION_GET: `${prefix} roledefinition get`,

package/dist/m365/flow/commands/flow-list.js

@@ -28,33 +28,29 @@ class FlowListCommand extends PowerAutomateCommand {
         __classPrivateFieldGet(this, _FlowListCommand_instances, "m", _FlowListCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
-        if (args.options.includeSolutions) {
-            await this.warn(logger, `Parameter 'includeSolutions' is deprecated. Please use 'withSolutions' instead`);
-        }
         if (this.verbose) {
             await logger.logToStderr(`Getting Power Automate flows${args.options.asAdmin ? ' as admin' : ''} in environment '${args.options.environmentName}'...`);
         }
         try {
-            const { environmentName, asAdmin, sharingStatus, includeSolutions, withSolutions } = args.options;
+            const { environmentName, asAdmin, sharingStatus, withSolutions } = args.options;
             let items = [];
-            const shouldIncludeSolutions = withSolutions || includeSolutions;
             if (sharingStatus === 'personal') {
-                const url = this.getApiUrl(environmentName, asAdmin, shouldIncludeSolutions, 'personal');
+                const url = this.getApiUrl(environmentName, asAdmin, withSolutions, 'personal');
                 items = await odata.getAllItems(url);
             }
             else if (sharingStatus === 'sharedWithMe') {
-                const url = this.getApiUrl(environmentName, asAdmin, shouldIncludeSolutions, 'team');
+                const url = this.getApiUrl(environmentName, asAdmin, withSolutions, 'team');
                 items = await odata.getAllItems(url);
             }
             else if (sharingStatus === 'all') {
-                let url = this.getApiUrl(environmentName, asAdmin, shouldIncludeSolutions, 'personal');
+                let url = this.getApiUrl(environmentName, asAdmin, withSolutions, 'personal');
                 items = await odata.getAllItems(url);
-                url = this.getApiUrl(environmentName, asAdmin, shouldIncludeSolutions, 'team');
+                url = this.getApiUrl(environmentName, asAdmin, withSolutions, 'team');
                 const teamFlows = await odata.getAllItems(url);
                 items = items.concat(teamFlows);
             }
             else {
-                const url = this.getApiUrl(environmentName, asAdmin, shouldIncludeSolutions);
+                const url = this.getApiUrl(environmentName, asAdmin, withSolutions);
                 items = await odata.getAllItems(url);
             }
             // Remove duplicates
@@ -84,7 +80,6 @@ _FlowListCommand_instances = new WeakSet(), _FlowListCommand_initTelemetry = fun
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             sharingStatus: typeof args.options.sharingStatus !== 'undefined',
-            includeSolutions: !!args.options.includeSolutions,
             withSolutions: !!args.options.withSolutions,
             asAdmin: !!args.options.asAdmin
         });
@@ -95,8 +90,6 @@ _FlowListCommand_instances = new WeakSet(), _FlowListCommand_initTelemetry = fun
     }, {
         option: '--sharingStatus [sharingStatus]',
         autocomplete: this.allowedSharingStatuses
-    }, {
-        option: '--includeSolutions'
     }, {
         option: '--withSolutions'
     }, {
@@ -114,7 +107,7 @@ _FlowListCommand_instances = new WeakSet(), _FlowListCommand_initTelemetry = fun
     });
 }, _FlowListCommand_initTypes = function _FlowListCommand_initTypes() {
     this.types.string.push('environmentName', 'sharingStatus');
-    this.types.boolean.push('includeSolutions', 'withSolutions', 'asAdmin');
+    this.types.boolean.push('withSolutions', 'asAdmin');
 };
 export default new FlowListCommand();
 //# sourceMappingURL=flow-list.js.map

package/dist/m365/flow/commands/run/run-get.js

@@ -27,9 +27,6 @@ class FlowRunGetCommand extends PowerAutomateCommand {
         if (this.verbose) {
             await logger.logToStderr(`Retrieving information about run ${args.options.name} of Microsoft Flow ${args.options.flowName}...`);
         }
-        if (args.options.includeTriggerInformation) {
-            await this.warn(logger, `Parameter 'includeTriggerInformation' is deprecated. Please use 'withTrigger' instead`);
-        }
         const actionsParameter = args.options.withActions ? '$expand=properties%2Factions&' : '';
         const requestOptions = {
             url: `${PowerAutomateCommand.resource}/providers/Microsoft.ProcessSimple/environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/runs/${formatting.encodeQueryParameter(args.options.name)}?${actionsParameter}api-version=2016-11-01`,
@@ -44,7 +41,7 @@ class FlowRunGetCommand extends PowerAutomateCommand {
             res.endTime = res.properties.endTime || '';
             res.status = res.properties.status;
             res.triggerName = res.properties.trigger.name;
-            if ((args.options.includeTriggerInformation || args.options.withTrigger) && res.properties.trigger.outputsLink) {
+            if (args.options.withTrigger && res.properties.trigger.outputsLink) {
                 res.triggerInformation = await this.getTriggerInformation(res);
             }
             if (!!args.options.withActions) {
@@ -96,8 +93,6 @@ _FlowRunGetCommand_instances = new WeakSet(), _FlowRunGetCommand_initOptions = f
         option: '--flowName <flowName>'
     }, {
         option: '-e, --environmentName <environmentName>'
-    }, {
-        option: '--includeTriggerInformation'
     }, {
         option: '--withTrigger'
     }, {
@@ -116,7 +111,6 @@ _FlowRunGetCommand_instances = new WeakSet(), _FlowRunGetCommand_initOptions = f
 }, _FlowRunGetCommand_initTelemetry = function _FlowRunGetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            includeTriggerInformation: !!args.options.includeTriggerInformation,
             withTrigger: !!args.options.withTrigger,
             withActions: typeof args.options.withActions !== 'undefined'
         });

package/dist/m365/graph/commands/openextension/openextension-add.js

@@ -12,7 +12,7 @@ const options = globalOptionsZod
     resourceId: zod.alias('i', z.string()),
     resourceType: zod.alias('t', z.enum(['user', 'group', 'device', 'organization']))
 })
-    .and(z.any());
+    .passthrough();
 class GraphOpenExtensionAddCommand extends GraphCommand {
     get name() {
         return commands.OPENEXTENSION_ADD;
@@ -38,7 +38,7 @@ class GraphOpenExtensionAddCommand extends GraphCommand {
         try {
             const requestBody = {};
             requestBody["extensionName"] = args.options.name;
-            const unknownOptions = optionsUtils.getUnknownOptions(args.options, this.options);
+            const unknownOptions = optionsUtils.getUnknownOptions(args.options, zod.schemaToOptions(this.schema));
             const unknownOptionsNames = Object.getOwnPropertyNames(unknownOptions);
             unknownOptionsNames.forEach(async (o) => {
                 try {

package/dist/m365/graph/commands/openextension/openextension-set.js

@@ -13,11 +13,10 @@ const options = globalOptionsZod
     resourceType: zod.alias('t', z.enum(['user', 'group', 'device', 'organization'])),
     keepUnchangedProperties: zod.alias('k', z.boolean().optional())
 })
-    .and(z.any());
+    .passthrough();
 class GraphOpenExtensionSetCommand extends GraphCommand {
     constructor() {
         super(...arguments);
-        this.commandOptions = ['keepUnchangedProperties', 'resourceType', 'resourceId', 'name'];
         this.defaultOpenExtensionProperties = ['id', 'extensionName'];
     }
     get name() {
@@ -46,12 +45,9 @@ class GraphOpenExtensionSetCommand extends GraphCommand {
             const currentExtensionNames = Object.getOwnPropertyNames(currentExtension);
             const requestBody = {};
             requestBody["@odata.type"] = '#microsoft.graph.openTypeExtension';
-            const unknownOptions = optionsUtils.getUnknownOptions(args.options, this.options);
+            const unknownOptions = optionsUtils.getUnknownOptions(args.options, zod.schemaToOptions(this.schema));
             const unknownOptionsNames = Object.getOwnPropertyNames(unknownOptions);
             unknownOptionsNames.forEach(async (option) => {
-                if (this.commandOptions.includes(option)) {
-                    return;
-                }
                 const value = unknownOptions[option];
                 if (value === "") {
                     requestBody[option] = null;

package/dist/m365/graph/commands/subscription/subscription-add.js

@@ -49,7 +49,7 @@ class GraphSubscriptionAddCommand extends GraphCommand {
             notificationUrl: args.options.notificationUrl,
             expirationDateTime: await this.getExpirationDateTimeOrDefault(logger, args),
             clientState: args.options.clientState,
-            includeResourceData: args.options.withResourceData || args.options.includeResourceData,
+            includeResourceData: args.options.withResourceData,
             encryptionCertificate: args.options.encryptionCertificate,
             encryptionCertificateId: args.options.encryptionCertificateId,
             lifecycleNotificationUrl: args.options.lifecycleNotificationUrl,
@@ -66,9 +66,6 @@ class GraphSubscriptionAddCommand extends GraphCommand {
             responseType: 'json'
         };
         try {
-            if (args.options.includeResourceData) {
-                await this.warn(logger, `Parameter 'includeResourceData' is deprecated. Please use 'withResourceData' instead`);
-            }
             const res = await request.post(requestOptions);
             await logger.log(res);
         }
@@ -135,7 +132,6 @@ _GraphSubscriptionAddCommand_instances = new WeakSet(), _GraphSubscriptionAddCom
             lifecycleNotificationUrl: typeof args.options.lifecycleNotificationUrl !== 'undefined',
             notificationUrlAppId: typeof args.options.notificationUrlAppId !== 'undefined',
             latestTLSVersion: typeof args.options.latestTLSVersion !== 'undefined',
-            includeResourceData: !!args.options.includeResourceData,
             withResourceData: !!args.options.withResourceData,
             encryptionCertificate: typeof args.options.encryptionCertificate !== 'undefined',
             encryptionCertificateId: typeof args.options.encryptionCertificateId !== 'undefined'
@@ -160,8 +156,6 @@ _GraphSubscriptionAddCommand_instances = new WeakSet(), _GraphSubscriptionAddCom
     }, {
         option: '--latestTLSVersion [latestTLSVersion]',
         autocomplete: this.allowedTlsVersions
-    }, {
-        option: '--includeResourceData [includeResourceData]'
     }, {
         option: '--withResourceData [withResourceData]'
     }, {
@@ -193,11 +187,10 @@ _GraphSubscriptionAddCommand_instances = new WeakSet(), _GraphSubscriptionAddCom
         if (args.options.latestTLSVersion && this.allowedTlsVersions.map(x => x.toLowerCase()).indexOf(args.options.latestTLSVersion.toLowerCase()) === -1) {
             return `${args.options.latestTLSVersion} is not a valid TLS version. Allowed values are ${this.allowedTlsVersions.join(', ')}`;
         }
-        const shouldIncludeResourceData = args.options.includeResourceData || args.options.withResourceData;
-        if (shouldIncludeResourceData && !args.options.encryptionCertificate) {
+        if (args.options.withResourceData && !args.options.encryptionCertificate) {
             return `The 'encryptionCertificate' options is required to include the changed resource data`;
         }
-        if (shouldIncludeResourceData && !args.options.encryptionCertificateId) {
+        if (args.options.withResourceData && !args.options.encryptionCertificateId) {
             return `The 'encryptionCertificateId' options is required to include the changed resource data`;
         }
         if (args.options.notificationUrlAppId && !validation.isValidGuid(args.options.notificationUrlAppId)) {

package/dist/m365/pp/commands/copilot/copilot-get.js

@@ -18,9 +18,6 @@ class PpCopilotGetCommand extends PowerPlatformCommand {
     get description() {
         return 'Get information about the specified copilot';
     }
-    alias() {
-        return [commands.CHATBOT_GET];
-    }
     constructor() {
         super();
         _PpCopilotGetCommand_instances.add(this);
@@ -30,7 +27,6 @@ class PpCopilotGetCommand extends PowerPlatformCommand {
         __classPrivateFieldGet(this, _PpCopilotGetCommand_instances, "m", _PpCopilotGetCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
-        await this.showDeprecationWarning(logger, commands.CHATBOT_GET, commands.COPILOT_GET);
         if (this.verbose) {
             await logger.logToStderr(`Retrieving copilot '${args.options.id || args.options.name}'...`);
         }

package/dist/m365/pp/commands/copilot/copilot-list.js

@@ -15,9 +15,6 @@ class PpCopilotListCommand extends PowerPlatformCommand {
     get description() {
         return 'Lists Microsoft Power Platform copilots in the specified Power Platform environment';
     }
-    alias() {
-        return [commands.CHATBOT_LIST];
-    }
     defaultProperties() {
         return ['name', 'botid', 'publishedOn', 'createdOn', 'botModifiedOn'];
     }
@@ -28,7 +25,6 @@ class PpCopilotListCommand extends PowerPlatformCommand {
         __classPrivateFieldGet(this, _PpCopilotListCommand_instances, "m", _PpCopilotListCommand_initOptions).call(this);
     }
     async commandAction(logger, args) {
-        await this.showDeprecationWarning(logger, commands.CHATBOT_LIST, commands.COPILOT_LIST);
         if (this.verbose) {
             await logger.logToStderr(`Retrieving list of copilots for environment '${args.options.environmentName}'.`);
         }

package/dist/m365/pp/commands/copilot/copilot-remove.js

@@ -18,9 +18,6 @@ class PpCopilotRemoveCommand extends PowerPlatformCommand {
     get description() {
         return 'Removes the specified copilot';
     }
-    alias() {
-        return [commands.CHATBOT_REMOVE];
-    }
     constructor() {
         super();
         _PpCopilotRemoveCommand_instances.add(this);
@@ -30,7 +27,6 @@ class PpCopilotRemoveCommand extends PowerPlatformCommand {
         __classPrivateFieldGet(this, _PpCopilotRemoveCommand_instances, "m", _PpCopilotRemoveCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
-        await this.showDeprecationWarning(logger, commands.CHATBOT_REMOVE, commands.COPILOT_REMOVE);
         if (this.verbose) {
             await logger.logToStderr(`Removing copilot '${args.options.id || args.options.name}'...`);
         }

package/dist/m365/pp/commands/solution/solution-publisher-list.js

@@ -25,17 +25,13 @@ class PpSolutionPublisherListCommand extends PowerPlatformCommand {
         __classPrivateFieldGet(this, _PpSolutionPublisherListCommand_instances, "m", _PpSolutionPublisherListCommand_initOptions).call(this);
     }
     async commandAction(logger, args) {
-        if (args.options.includeMicrosoftPublishers) {
-            await this.warn(logger, `Parameter 'includeMicrosoftPublishers' is deprecated. Please use 'withMicrosoftPublishers' instead`);
-        }
         if (this.verbose) {
             await logger.logToStderr(`Retrieving list of publishers...`);
         }
         try {
             const dynamicsApiUrl = await powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
-            const shouldIncludeMicrosoftPublishers = args.options.withMicrosoftPublishers || args.options.includeMicrosoftPublishers;
             const requestOptions = {
-                url: `${dynamicsApiUrl}/api/data/v9.0/publishers?$select=publisherid,uniquename,friendlyname,versionnumber,isreadonly,description,customizationprefix,customizationoptionvalueprefix${!shouldIncludeMicrosoftPublishers ? `&$filter=publisherid ne 'd21aab70-79e7-11dd-8874-00188b01e34f'` : ''}&api-version=9.1`,
+                url: `${dynamicsApiUrl}/api/data/v9.0/publishers?$select=publisherid,uniquename,friendlyname,versionnumber,isreadonly,description,customizationprefix,customizationoptionvalueprefix${!args.options.withMicrosoftPublishers ? `&$filter=publisherid ne 'd21aab70-79e7-11dd-8874-00188b01e34f'` : ''}&api-version=9.1`,
                 headers: {
                     accept: 'application/json;odata.metadata=none'
                 },
@@ -52,7 +48,6 @@ class PpSolutionPublisherListCommand extends PowerPlatformCommand {
 _PpSolutionPublisherListCommand_instances = new WeakSet(), _PpSolutionPublisherListCommand_initTelemetry = function _PpSolutionPublisherListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            includeMicrosoftPublishers: typeof args.options.includeMicrosoftPublishers !== 'undefined',
             withMicrosoftPublishers: typeof args.options.withMicrosoftPublishers !== 'undefined',
             asAdmin: !!args.options.asAdmin
         });
@@ -60,8 +55,6 @@ _PpSolutionPublisherListCommand_instances = new WeakSet(), _PpSolutionPublisherL
 }, _PpSolutionPublisherListCommand_initOptions = function _PpSolutionPublisherListCommand_initOptions() {
     this.options.unshift({
         option: '-e, --environmentName <environmentName>'
-    }, {
-        option: '--includeMicrosoftPublishers'
     }, {
         option: '--withMicrosoftPublishers'
     }, {

package/dist/m365/pp/commands.js

@@ -3,9 +3,6 @@ export default {
     AIBUILDERMODEL_GET: `${prefix} aibuildermodel get`,
     AIBUILDERMODEL_LIST: `${prefix} aibuildermodel list`,
     AIBUILDERMODEL_REMOVE: `${prefix} aibuildermodel remove`,
-    CHATBOT_GET: `${prefix} chatbot get`,
-    CHATBOT_LIST: `${prefix} chatbot list`,
-    CHATBOT_REMOVE: `${prefix} chatbot remove`,
     COPILOT_GET: `${prefix} copilot get`,
     COPILOT_LIST: `${prefix} copilot list`,
     COPILOT_REMOVE: `${prefix} copilot remove`,

package/dist/m365/purview/commands/threatassessment/threatassessment-get.js

@@ -24,15 +24,11 @@ class PurviewThreatAssessmentGetCommand extends GraphCommand {
     }
     async commandAction(logger, args) {
         try {
-            if (args.options.includeResults) {
-                await this.warn(logger, `Parameter 'includeResults' is deprecated. Please use 'withResults' instead`);
-            }
             if (this.verbose) {
                 await logger.logToStderr(`Retrieving threat assessment with id ${args.options.id}`);
             }
-            const shouldIncludeResults = args.options.includeResults || args.options.withResults;
             const requestOptions = {
-                url: `${this.resource}/v1.0/informationProtection/threatAssessmentRequests/${args.options.id}${shouldIncludeResults ? '?$expand=results' : ''}`,
+                url: `${this.resource}/v1.0/informationProtection/threatAssessmentRequests/${args.options.id}${args.options.withResults ? '?$expand=results' : ''}`,
                 headers: {
                     accept: 'application/json;odata.metadata=none'
                 },
@@ -56,8 +52,6 @@ _PurviewThreatAssessmentGetCommand_instances = new WeakSet(), _PurviewThreatAsse
 }, _PurviewThreatAssessmentGetCommand_initOptions = function _PurviewThreatAssessmentGetCommand_initOptions() {
     this.options.unshift({
         option: '-i, --id <id>'
-    }, {
-        option: '--includeResults'
     }, {
         option: '--withResults'
     });

package/dist/m365/spe/commands/container/container-add.js

@@ -4,7 +4,6 @@ import { zod } from '../../../../utils/zod.js';
 import commands from '../../commands.js';
 import { validation } from '../../../../utils/validation.js';
 import { spe } from '../../../../utils/spe.js';
-import { spo } from '../../../../utils/spo.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import request from '../../../../request.js';
 const options = globalOptionsZod
@@ -77,8 +76,7 @@ class SpeContainerAddCommand extends GraphCommand {
         if (this.verbose) {
             await logger.logToStderr(`Getting container type with name '${options.containerTypeName}'...`);
         }
-        const adminUrl = await spo.getSpoAdminUrl(logger, this.verbose);
-        return spe.getContainerTypeIdByName(adminUrl, options.containerTypeName);
+        return spe.getContainerTypeIdByName(options.containerTypeName);
     }
 }
 export default new SpeContainerAddCommand();

package/dist/m365/spe/commands/container/container-list.js

@@ -10,7 +10,6 @@ import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
 import { spe } from '../../../../utils/spe.js';
-import { spo } from '../../../../utils/spo.js';
 class SpeContainerListCommand extends GraphCommand {
     get name() {
         return commands.CONTAINER_LIST;
@@ -47,8 +46,7 @@ class SpeContainerListCommand extends GraphCommand {
         if (options.containerTypeId) {
             return options.containerTypeId;
         }
-        const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
-        return spe.getContainerTypeIdByName(spoAdminUrl, options.containerTypeName);
+        return spe.getContainerTypeIdByName(options.containerTypeName);
     }
 }
 _SpeContainerListCommand_instances = new WeakSet(), _SpeContainerListCommand_initTelemetry = function _SpeContainerListCommand_initTelemetry() {

package/dist/m365/spe/commands/container/container-recyclebinitem-list.js

@@ -2,7 +2,6 @@ import { globalOptionsZod } from '../../../../Command.js';
 import { z } from 'zod';
 import commands from '../../commands.js';
 import { validation } from '../../../../utils/validation.js';
-import { spo } from '../../../../utils/spo.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import { spe } from '../../../../utils/spe.js';
 import { odata } from '../../../../utils/odata.js';
@@ -54,8 +53,7 @@ class SpeContainerRecycleBinItemListCommand extends GraphCommand {
         if (this.verbose) {
             await logger.logToStderr(`Retrieving container type id for container type '${options.containerTypeName}'...`);
         }
-        const adminUrl = await spo.getSpoAdminUrl(logger, this.verbose);
-        return spe.getContainerTypeIdByName(adminUrl, options.containerTypeName);
+        return spe.getContainerTypeIdByName(options.containerTypeName);
     }
 }
 export default new SpeContainerRecycleBinItemListCommand();

package/dist/m365/spe/commands/container/container-recyclebinitem-restore.js

@@ -2,7 +2,6 @@ import { globalOptionsZod } from '../../../../Command.js';
 import { z } from 'zod';
 import commands from '../../commands.js';
 import { validation } from '../../../../utils/validation.js';
-import { spo } from '../../../../utils/spo.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import { spe } from '../../../../utils/spe.js';
 import { odata } from '../../../../utils/odata.js';
@@ -88,8 +87,7 @@ class SpeContainerRecycleBinItemRestoreCommand extends GraphCommand {
         if (this.verbose) {
             await logger.logToStderr(`Getting container type with name '${options.containerTypeName}'...`);
         }
-        const adminUrl = await spo.getSpoAdminUrl(logger, this.verbose);
-        return spe.getContainerTypeIdByName(adminUrl, options.containerTypeName);
+        return spe.getContainerTypeIdByName(options.containerTypeName);
     }
 }
 export default new SpeContainerRecycleBinItemRestoreCommand();

package/dist/m365/spe/commands/container/container-remove.js

@@ -4,7 +4,6 @@ import { zod } from '../../../../utils/zod.js';
 import commands from '../../commands.js';
 import { validation } from '../../../../utils/validation.js';
 import { spe } from '../../../../utils/spe.js';
-import { spo } from '../../../../utils/spo.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import request from '../../../../request.js';
 import { cli } from '../../../../cli/cli.js';
@@ -91,8 +90,7 @@ class SpeContainerRemoveCommand extends GraphCommand {
         if (this.verbose) {
             await logger.logToStderr(`Getting container type with name '${options.containerTypeName}'...`);
         }
-        const adminUrl = await spo.getSpoAdminUrl(logger, this.verbose);
-        return spe.getContainerTypeIdByName(adminUrl, options.containerTypeName);
+        return spe.getContainerTypeIdByName(options.containerTypeName);
     }
 }
 export default new SpeContainerRemoveCommand();