@pnp/cli-microsoft365 7.5.0-beta.494c631 → 7.5.0-beta.4f8e5bf

package/dist/m365/planner/commands/task/task-add.js

@@ -5,7 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _PlannerTaskAddCommand_instances, _PlannerTaskAddCommand_initTelemetry, _PlannerTaskAddCommand_initOptions, _PlannerTaskAddCommand_initValidators, _PlannerTaskAddCommand_initOptionSets, _PlannerTaskAddCommand_initTypes;
 import request from '../../../../request.js';
-import { aadGroup } from '../../../../utils/aadGroup.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { planner } from '../../../../utils/planner.js';
 import { validation } from '../../../../utils/validation.js';
@@ -156,7 +156,7 @@ class PlannerTaskAddCommand extends GraphCommand {
         if (args.options.ownerGroupId) {
             return args.options.ownerGroupId;
         }
-        const group = await aadGroup.getGroupByDisplayName(args.options.ownerGroupName);
+        const group = await entraGroup.getGroupByDisplayName(args.options.ownerGroupName);
         return group.id;
     }
     async getUserIds(options) {

package/dist/m365/planner/commands/task/task-get.js

@@ -5,7 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _PlannerTaskGetCommand_instances, _PlannerTaskGetCommand_initTelemetry, _PlannerTaskGetCommand_initOptions, _PlannerTaskGetCommand_initValidators, _PlannerTaskGetCommand_initOptionSets, _PlannerTaskGetCommand_initTypes;
 import request from '../../../../request.js';
-import { aadGroup } from '../../../../utils/aadGroup.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { planner } from '../../../../utils/planner.js';
 import { validation } from '../../../../utils/validation.js';
@@ -129,7 +129,7 @@ class PlannerTaskGetCommand extends GraphCommand {
         if (options.ownerGroupId) {
             return options.ownerGroupId;
         }
-        const group = await aadGroup.getGroupByDisplayName(options.ownerGroupName);
+        const group = await entraGroup.getGroupByDisplayName(options.ownerGroupName);
         return group.id;
     }
 }

package/dist/m365/planner/commands/task/task-list.js

@@ -5,7 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _PlannerTaskListCommand_instances, _PlannerTaskListCommand_initTelemetry, _PlannerTaskListCommand_initOptions, _PlannerTaskListCommand_initValidators, _PlannerTaskListCommand_initOptionSets, _PlannerTaskListCommand_initTypes;
 import request from '../../../../request.js';
-import { aadGroup } from '../../../../utils/aadGroup.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { odata } from '../../../../utils/odata.js';
 import { planner } from '../../../../utils/planner.js';
@@ -107,7 +107,7 @@ class PlannerTaskListCommand extends GraphCommand {
         if (args.options.ownerGroupId) {
             return formatting.encodeQueryParameter(args.options.ownerGroupId);
         }
-        const group = await aadGroup.getGroupByDisplayName(args.options.ownerGroupName);
+        const group = await entraGroup.getGroupByDisplayName(args.options.ownerGroupName);
         return group.id;
     }
     mergeTaskPriority(taskItems, betaTaskItems) {

package/dist/m365/planner/commands/task/task-remove.js

@@ -6,7 +6,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _PlannerTaskRemoveCommand_instances, _PlannerTaskRemoveCommand_initTelemetry, _PlannerTaskRemoveCommand_initOptions, _PlannerTaskRemoveCommand_initValidators, _PlannerTaskRemoveCommand_initOptionSets, _PlannerTaskRemoveCommand_initTypes;
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
-import { aadGroup } from '../../../../utils/aadGroup.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 import { odata } from '../../../../utils/odata.js';
 import { planner } from '../../../../utils/planner.js';
 import { validation } from '../../../../utils/validation.js';
@@ -127,7 +127,7 @@ class PlannerTaskRemoveCommand extends GraphCommand {
         if (ownerGroupId) {
             return ownerGroupId;
         }
-        const group = await aadGroup.getGroupByDisplayName(ownerGroupName);
+        const group = await entraGroup.getGroupByDisplayName(ownerGroupName);
         return group.id;
     }
 }

package/dist/m365/planner/commands/task/task-set.js

@@ -5,7 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _PlannerTaskSetCommand_instances, _PlannerTaskSetCommand_initTelemetry, _PlannerTaskSetCommand_initOptions, _PlannerTaskSetCommand_initValidators, _PlannerTaskSetCommand_initOptionSets, _PlannerTaskSetCommand_initTypes;
 import request from '../../../../request.js';
-import { aadGroup } from '../../../../utils/aadGroup.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { planner } from '../../../../utils/planner.js';
 import { validation } from '../../../../utils/validation.js';
@@ -186,7 +186,7 @@ class PlannerTaskSetCommand extends GraphCommand {
         if (options.ownerGroupId) {
             return options.ownerGroupId;
         }
-        const group = await aadGroup.getGroupByDisplayName(options.ownerGroupName);
+        const group = await entraGroup.getGroupByDisplayName(options.ownerGroupName);
         return group.id;
     }
     mapRequestBody(options, appliedCategories) {

package/dist/m365/purview/commands/auditlog/auditlog-list.js

@@ -44,7 +44,7 @@ class PurviewAuditLogListCommand extends O365MgmtCommand {
             if (this.verbose) {
                 await logger.logToStderr(`Getting audit logs for content type '${args.options.contentType}' within a time frame from '${startTime.toISOString()}' to '${endTime.toISOString()}'.`);
             }
-            const tenantId = accessToken.getTenantIdFromAccessToken(Auth.service.accessTokens[Auth.defaultResource].accessToken);
+            const tenantId = accessToken.getTenantIdFromAccessToken(Auth.connection.accessTokens[Auth.defaultResource].accessToken);
             const contentTypeValue = args.options.contentType === 'DLP' ? 'DLP.All' : 'Audit.' + args.options.contentType;
             await this.ensureSubscription(tenantId, contentTypeValue);
             if (this.verbose) {

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

@@ -25,7 +25,7 @@ class PurviewSensitivityLabelGetCommand extends GraphCommand {
         __classPrivateFieldGet(this, _PurviewSensitivityLabelGetCommand_instances, "m", _PurviewSensitivityLabelGetCommand_initValidators).call(this);
     }
     async commandAction(logger, args) {
-        const isAppOnlyAccessToken = accessToken.isAppOnlyAccessToken(auth.service.accessTokens[this.resource].accessToken);
+        const isAppOnlyAccessToken = accessToken.isAppOnlyAccessToken(auth.connection.accessTokens[this.resource].accessToken);
         if (isAppOnlyAccessToken && !args.options.userId && !args.options.userName) {
             this.handleError(`Specify at least 'userId' or 'userName' when using application permissions.`);
         }

package/dist/m365/purview/commands/sensitivitylabel/sensitivitylabel-list.js

@@ -28,7 +28,7 @@ class PurviewSensitivityLabelListCommand extends GraphCommand {
         return ['id', 'name', 'isActive'];
     }
     async commandAction(logger, args) {
-        const isAppOnlyAccessToken = accessToken.isAppOnlyAccessToken(auth.service.accessTokens[this.resource].accessToken);
+        const isAppOnlyAccessToken = accessToken.isAppOnlyAccessToken(auth.connection.accessTokens[this.resource].accessToken);
         if (isAppOnlyAccessToken && !args.options.userId && !args.options.userName) {
             this.handleError(`Specify at least 'userId' or 'userName' when using application permissions.`);
         }

package/dist/m365/purview/commands/sensitivitylabel/sensitivitylabel-policysettings-list.js

@@ -25,7 +25,7 @@ class PurviewSensitivityLabelPolicySettingsListCommand extends GraphCommand {
         __classPrivateFieldGet(this, _PurviewSensitivityLabelPolicySettingsListCommand_instances, "m", _PurviewSensitivityLabelPolicySettingsListCommand_initValidators).call(this);
     }
     async commandAction(logger, args) {
-        const isAppOnlyAccessToken = accessToken.isAppOnlyAccessToken(auth.service.accessTokens[this.resource].accessToken);
+        const isAppOnlyAccessToken = accessToken.isAppOnlyAccessToken(auth.connection.accessTokens[this.resource].accessToken);
         if (isAppOnlyAccessToken && !args.options.userId && !args.options.userName) {
             this.handleError(`Specify at least 'userId' or 'userName' when using application permissions.`);
         }

package/dist/m365/spfx/commands/project/DeployWorkflow.js

@@ -13,11 +13,11 @@ export const workflow = {
             steps: [
                 {
                     name: "Checkout",
-                    uses: "actions/checkout@v3.5.3"
+                    uses: "actions/checkout@v4"
                 },
                 {
                     name: "Use Node.js",
-                    uses: "actions/setup-node@v3.7.0",
+                    uses: "actions/setup-node@v4",
                     with: {
                         "node-version": "18.x"
                     }
@@ -36,7 +36,8 @@ export const workflow = {
                     with: {
                         "CERTIFICATE_ENCODED": "${{ secrets.CERTIFICATE_ENCODED }}",
                         "CERTIFICATE_PASSWORD": "${{ secrets.CERTIFICATE_PASSWORD }}",
-                        "APP_ID": "${{ secrets.APP_ID }}"
+                        "APP_ID": "${{ secrets.APP_ID }}",
+                        "TENANT": "${{ secrets.TENANT_ID }}"
                     }
                 },
                 {

package/dist/m365/spfx/commands/project/project-github-workflow-add.js

@@ -55,7 +55,7 @@ class SpfxProjectGithubWorkflowAddCommand extends BaseProjectCommand {
         fs.writeFileSync(path.resolve(workflowFile), yaml.stringify(workflow), 'utf-8');
     }
     updateWorkflow(solutionName, workflow, options) {
-        workflow.name = workflow.name.replace('{{ name }}', options.name ?? solutionName);
+        workflow.name = options.name ? options.name : workflow.name.replace('{{ name }}', solutionName);
         if (options.branchName) {
             workflow.on.push.branches[0] = options.branchName;
         }

package/dist/m365/spo/commands/group/group-member-add.js

@@ -5,8 +5,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoGroupMemberAddCommand_instances, _SpoGroupMemberAddCommand_initTelemetry, _SpoGroupMemberAddCommand_initOptions, _SpoGroupMemberAddCommand_initValidators, _SpoGroupMemberAddCommand_initOptionSets;
 import request from '../../../../request.js';
-import { aadGroup } from '../../../../utils/aadGroup.js';
-import { aadUser } from '../../../../utils/aadUser.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
+import { entraUser } from '../../../../utils/entraUser.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { spo } from '../../../../utils/spo.js';
 import { validation } from '../../../../utils/validation.js';
@@ -111,14 +111,14 @@ class SpoGroupMemberAddCommand extends SpoCommand {
                     if (this.verbose) {
                         await logger.logToStderr(`Getting ID of Azure AD group ${trimmedIdentifier}`);
                     }
-                    const groupId = await aadGroup.getGroupIdByDisplayName(trimmedIdentifier);
+                    const groupId = await entraGroup.getGroupIdByDisplayName(trimmedIdentifier);
                     validUserNames.push(groupId);
                 }
                 else {
                     if (this.verbose) {
                         await logger.logToStderr(`Getting Azure AD ID for user ${trimmedIdentifier}`);
                     }
-                    const upn = await aadUser.getUserIdByEmail(trimmedIdentifier);
+                    const upn = await entraUser.getUserIdByEmail(trimmedIdentifier);
                     validUserNames.push(upn);
                 }
             }

package/dist/m365/spo/commands/group/group-member-remove.js

@@ -8,7 +8,7 @@ import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
-import aadUserGetCommand from '../../../entra/commands/user/user-get.js';
+import entraUserGetCommand from '../../../entra/commands/user/user-get.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
 import SpoGroupMemberListCommand from './group-member-list.js';
@@ -40,7 +40,7 @@ class SpoGroupMemberRemoveCommand extends SpoCommand {
             debug: args.options.debug,
             verbose: args.options.verbose
         };
-        const userGetOutput = await cli.executeCommandWithOutput(aadUserGetCommand, { options: { ...options, _: [] } });
+        const userGetOutput = await cli.executeCommandWithOutput(entraUserGetCommand, { options: { ...options, _: [] } });
         const userOutput = JSON.parse(userGetOutput.stdout);
         return userOutput.userPrincipalName;
     }

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

@@ -7,7 +7,7 @@ var _SpoGroupSetCommand_instances, _SpoGroupSetCommand_initTelemetry, _SpoGroupS
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
-import aadUserGetCommand from '../../../entra/commands/user/user-get.js';
+import entraUserGetCommand from '../../../entra/commands/user/user-get.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
 class SpoGroupSetCommand extends SpoCommand {
@@ -77,7 +77,7 @@ class SpoGroupSetCommand extends SpoCommand {
             debug: options.debug,
             verbose: options.verbose
         };
-        const output = await cli.executeCommandWithOutput(aadUserGetCommand, { options: { ...cmdOptions, _: [] } });
+        const output = await cli.executeCommandWithOutput(entraUserGetCommand, { options: { ...cmdOptions, _: [] } });
         const getUserOutput = JSON.parse(output.stdout);
         const requestOptions = {
             url: `${options.webUrl}/_api/web/ensureUser('${getUserOutput.userPrincipalName}')?$select=Id`,

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

@@ -8,7 +8,7 @@ import chalk from 'chalk';
 import { cli } from '../../../../cli/cli.js';
 import config from '../../../../config.js';
 import request from '../../../../request.js';
-import { aadGroup } from '../../../../utils/aadGroup.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { spo } from '../../../../utils/spo.js';
 import { validation } from '../../../../utils/validation.js';
@@ -57,7 +57,7 @@ class SpoSiteRemoveCommand extends SpoCommand {
                         await logger.logToStderr(`Site attached to group ${groupId}. Initiating group delete operation via Graph API`);
                     }
                     try {
-                        const group = await aadGroup.getGroupById(groupId);
+                        const group = await entraGroup.getGroupById(groupId);
                         if (args.options.skipRecycleBin || args.options.wait) {
                             await logger.logToStderr(chalk.yellow(`Entered site is a groupified site. Hence, the parameters 'skipRecycleBin' and 'wait' will not be applicable.`));
                         }

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 aadM365GroupSetCommand from '../../../entra/commands/m365group/m365group-set.js';
+import entraM365GroupSetCommand from '../../../entra/commands/m365group/m365group-set.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
 import { SharingCapabilities } from '../site/SharingCapabilities.js';
@@ -243,7 +243,7 @@ class SpoSiteSetCommand extends SpoCommand {
                 debug: this.debug,
                 verbose: this.verbose
             };
-            promises.push(cli.executeCommand(aadM365GroupSetCommand, { options: { ...commandOptions, _: [] } }));
+            promises.push(cli.executeCommand(entraM365GroupSetCommand, { options: { ...commandOptions, _: [] } }));
         }
         if (args.options.description) {
             promises.push(this.setGroupifiedSiteDescription(args.options.description));

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

@@ -10,7 +10,7 @@ class SpoGetCommand extends SpoCommand {
     }
     async commandAction(logger) {
         const spoContext = {
-            SpoUrl: auth.service.spoUrl ? auth.service.spoUrl : ''
+            SpoUrl: auth.connection.spoUrl ? auth.connection.spoUrl : ''
         };
         await logger.log(spoContext);
     }

package/dist/m365/spo/commands/spo-search.js

@@ -38,16 +38,15 @@ class SpoSearchCommand extends SpoCommand {
             if (this.verbose) {
                 await logger.logToStderr(`Executing search query '${args.options.queryText}' on site at ${webUrl}...`);
             }
-            const startRow = args.options.startRow ? args.options.startRow : 0;
-            const results = await this.executeSearchQuery(logger, args, webUrl, [], startRow);
+            const results = await this.executeSearchQuery(logger, args, webUrl, []);
             this.printResults(logger, args, results);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
         }
     }
-    async executeSearchQuery(logger, args, webUrl, resultSet, startRow) {
-        const requestUrl = await this.getRequestUrl(webUrl, logger, args, startRow);
+    async executeSearchQuery(logger, args, webUrl, resultSet, lastDocId = '0') {
+        const requestUrl = await this.getRequestUrl(webUrl, logger, args, lastDocId);
         const requestOptions = {
             url: requestUrl,
             headers: {
@@ -57,26 +56,36 @@ class SpoSearchCommand extends SpoCommand {
         };
         const searchResult = await request.get(requestOptions);
         resultSet.push(searchResult);
-        if (args.options.allResults && startRow + searchResult.PrimaryQueryResult.RelevantResults.RowCount < searchResult.PrimaryQueryResult.RelevantResults.TotalRows) {
-            const nextStartRow = startRow + searchResult.PrimaryQueryResult.RelevantResults.RowCount;
-            return this.executeSearchQuery(logger, args, webUrl, resultSet, nextStartRow);
+        const rowLimit = args.options.rowLimit ? args.options.rowLimit : 500;
+        if (args.options.allResults && searchResult.PrimaryQueryResult.RelevantResults.RowCount === rowLimit) {
+            if (this.verbose) {
+                await logger.logToStderr(`Processing search query, retrieved ${resultSet.length * searchResult.PrimaryQueryResult.RelevantResults.RowCount} of ${resultSet[0].PrimaryQueryResult.RelevantResults.TotalRows} items...`);
+            }
+            // When running in allResults mode, paging is done using the DocId property
+            // This is a more stable way than using the StartRow property.
+            // Explanation: https://learn.microsoft.com/sharepoint/dev/general-development/pagination-for-large-result-sets
+            const lastRow = searchResult.PrimaryQueryResult.RelevantResults.Table.Rows[searchResult.PrimaryQueryResult.RelevantResults.RowCount - 1];
+            const newLastDocId = lastRow.Cells.filter(cell => cell.Key === 'DocId')[0].Value;
+            return this.executeSearchQuery(logger, args, webUrl, resultSet, newLastDocId);
         }
         return resultSet;
     }
-    async getRequestUrl(webUrl, logger, args, startRow) {
+    async getRequestUrl(webUrl, logger, args, lastDocId) {
         // get the list of selected properties
         const selectPropertiesArray = this.getSelectPropertiesArray(args);
+        // get the sort list
+        const sortList = this.getSortList(args);
         // transform arg data to query string parameters
-        const propertySelectRequestString = `&selectproperties='${formatting.encodeQueryParameter(selectPropertiesArray.join(","))}'`;
-        const startRowRequestString = `&startrow=${startRow ? startRow : 0}`;
-        const rowLimitRequestString = args.options.rowLimit ? `&rowlimit=${args.options.rowLimit}` : ``;
+        const propertySelectRequestString = `&selectproperties='${formatting.encodeQueryParameter(selectPropertiesArray.join(','))}'`;
+        const startRowRequestString = `&startrow=${args.options.startRow ? args.options.startRow : 0}`;
+        const rowLimitRequestString = args.options.rowLimit ? `&rowlimit=${args.options.rowLimit}` : (args.options.allResults ? `&rowlimit=500` : '');
         const sourceIdRequestString = args.options.sourceId ? `&sourceid='${args.options.sourceId}'` : ``;
-        const trimDuplicatesRequestString = `&trimduplicates=${args.options.trimDuplicates ? args.options.trimDuplicates : "false"}`;
-        const enableStemmingRequestString = `&enablestemming=${typeof (args.options.enableStemming) === 'undefined' ? "true" : args.options.enableStemming}`;
+        const trimDuplicatesRequestString = `&trimduplicates=${args.options.trimDuplicates ? args.options.trimDuplicates : 'false'}`;
+        const enableStemmingRequestString = `&enablestemming=${typeof (args.options.enableStemming) === 'undefined' ? 'true' : args.options.enableStemming}`;
         const cultureRequestString = args.options.culture ? `&culture=${args.options.culture}` : ``;
         const refinementFiltersRequestString = args.options.refinementFilters ? `&refinementfilters='${args.options.refinementFilters}'` : ``;
         const queryTemplateRequestString = args.options.queryTemplate ? `&querytemplate='${args.options.queryTemplate}'` : ``;
-        const sortListRequestString = args.options.sortList ? `&sortList='${formatting.encodeQueryParameter(args.options.sortList)}'` : ``;
+        const sortListRequestString = sortList ? `&sortList='${sortList}'` : ``;
         const rankingModelIdRequestString = args.options.rankingModelId ? `&rankingmodelid='${args.options.rankingModelId}'` : ``;
         const propertiesRequestString = this.getPropertiesRequestString(args);
         const refinersRequestString = args.options.refiners ? `&refiners='${args.options.refiners}'` : ``;
@@ -86,8 +95,9 @@ class SpoSearchCommand extends SpoCommand {
         const processBestBetsRequestString = typeof (args.options.processBestBets) === 'undefined' ? `` : `&processbestbets=${args.options.processBestBets}`;
         const enableQueryRulesRequestString = typeof (args.options.enableQueryRules) === 'undefined' ? `` : `&enablequeryrules=${args.options.enableQueryRules}`;
         const processPersonalFavoritesRequestString = typeof (args.options.processPersonalFavorites) === 'undefined' ? `` : `&processpersonalfavorites=${args.options.processPersonalFavorites}`;
+        const indexDocIdQueryText = args.options.allResults ? ` IndexDocId>${lastDocId}` : '';
         // construct single requestUrl
-        const requestUrl = `${webUrl}/_api/search/query?querytext='${args.options.queryText}'`.concat(propertySelectRequestString, startRowRequestString, rowLimitRequestString, sourceIdRequestString, trimDuplicatesRequestString, enableStemmingRequestString, cultureRequestString, refinementFiltersRequestString, queryTemplateRequestString, sortListRequestString, rankingModelIdRequestString, propertiesRequestString, refinersRequestString, hiddenConstraintsRequestString, clientTypeRequestString, enablePhoneticRequestString, processBestBetsRequestString, enableQueryRulesRequestString, processPersonalFavoritesRequestString);
+        const requestUrl = `${webUrl}/_api/search/query?querytext='${args.options.queryText}${indexDocIdQueryText}'`.concat(propertySelectRequestString, startRowRequestString, rowLimitRequestString, sourceIdRequestString, trimDuplicatesRequestString, enableStemmingRequestString, cultureRequestString, refinementFiltersRequestString, queryTemplateRequestString, sortListRequestString, rankingModelIdRequestString, propertiesRequestString, refinersRequestString, hiddenConstraintsRequestString, clientTypeRequestString, enablePhoneticRequestString, processBestBetsRequestString, enableQueryRulesRequestString, processPersonalFavoritesRequestString);
         if (this.debug) {
             await logger.logToStderr(`RequestURL: ${requestUrl}`);
         }
@@ -96,7 +106,7 @@ class SpoSearchCommand extends SpoCommand {
     getPropertiesRequestString(args) {
         let properties = args.options.properties ? args.options.properties : '';
         if (args.options.sourceName) {
-            if (properties && !properties.endsWith(",")) {
+            if (properties && !properties.endsWith(',')) {
                 properties += `,`;
             }
             properties += `SourceName:${args.options.sourceName},SourceLevel:SPSite`;
@@ -104,9 +114,26 @@ class SpoSearchCommand extends SpoCommand {
         return properties ? `&properties='${properties}'` : ``;
     }
     getSelectPropertiesArray(args) {
-        return args.options.selectProperties
-            ? args.options.selectProperties.split(",")
-            : ["Title", "OriginalPath"];
+        const selectProperties = args.options.selectProperties
+            ? args.options.selectProperties.split(',')
+            : ['Title', 'OriginalPath'];
+        if (args.options.allResults) {
+            selectProperties.filter(p => p.toLowerCase() !== 'docid').push('DocId');
+        }
+        return selectProperties;
+    }
+    getSortList(args) {
+        const sortList = [];
+        if (args.options.allResults) {
+            sortList.push(formatting.encodeQueryParameter('[DocId]:ascending'));
+        }
+        if (args.options.sortList) {
+            const sortListArray = args.options.sortList.split(',');
+            sortListArray.forEach(sortItem => {
+                sortList.push(formatting.encodeQueryParameter(sortItem));
+            });
+        }
+        return sortList.join(',');
     }
     async printResults(logger, args, results) {
         if (args.options.rawOutput) {
@@ -116,9 +143,9 @@ class SpoSearchCommand extends SpoCommand {
             await logger.log(this.getParsedOutput(args, results));
         }
         if (!args.options.output || cli.shouldTrimOutput(args.options.output)) {
-            await logger.log("# Rows: " + results[results.length - 1].PrimaryQueryResult.RelevantResults.TotalRows);
-            await logger.log("# Rows (Including duplicates): " + results[results.length - 1].PrimaryQueryResult.RelevantResults.TotalRowsIncludingDuplicates);
-            await logger.log("Elapsed Time: " + this.getElapsedTime(results));
+            await logger.log('# Rows: ' + results[results.length - 1].PrimaryQueryResult.RelevantResults.TotalRows);
+            await logger.log('# Rows (Including duplicates): ' + results[results.length - 1].PrimaryQueryResult.RelevantResults.TotalRowsIncludingDuplicates);
+            await logger.log('Elapsed Time: ' + this.getElapsedTime(results));
         }
     }
     getElapsedTime(results) {
@@ -245,6 +272,9 @@ _SpoSearchCommand_instances = new WeakSet(), _SpoSearchCommand_initTelemetry = f
         if (args.options.startRow && !isNumber(args.options.startRow)) {
             return `${args.options.startRow} is not a valid number`;
         }
+        if (args.options.startRow && args.options.allResults) {
+            return 'You cannot specify startRow when allResults is set';
+        }
         if (args.options.culture && !isNumber(args.options.culture)) {
             return `${args.options.culture} is not a valid number`;
         }

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

@@ -22,7 +22,7 @@ class SpoSetCommand extends SpoCommand {
         __classPrivateFieldGet(this, _SpoSetCommand_instances, "m", _SpoSetCommand_initValidators).call(this);
     }
     async commandAction(logger, args) {
-        auth.service.spoUrl = args.options.url;
+        auth.connection.spoUrl = args.options.url;
         try {
             await auth.storeConnectionInfo();
         }

package/dist/m365/spo/commands/user/user-ensure.js

@@ -5,7 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoUserEnsureCommand_instances, _SpoUserEnsureCommand_initTelemetry, _SpoUserEnsureCommand_initOptions, _SpoUserEnsureCommand_initValidators, _SpoUserEnsureCommand_initOptionSets;
 import request from '../../../../request.js';
-import { aadUser } from '../../../../utils/aadUser.js';
+import { entraUser } from '../../../../utils/entraUser.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
@@ -55,7 +55,7 @@ class SpoUserEnsureCommand extends SpoCommand {
         if (this.verbose) {
             await logger.logToStderr(`Retrieving user principal name for user with id ${entraId}`);
         }
-        return await aadUser.getUpnByUserId(entraId);
+        return await entraUser.getUpnByUserId(entraId);
     }
 }
 _SpoUserEnsureCommand_instances = new WeakSet(), _SpoUserEnsureCommand_initTelemetry = function _SpoUserEnsureCommand_initTelemetry() {

package/dist/m365/teams/commands/app/app-install.js

@@ -8,7 +8,7 @@ import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
-import aadUserGetCommand from '../../../entra/commands/user/user-get.js';
+import entraUserGetCommand from '../../../entra/commands/user/user-get.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
 class TeamsAppInstallCommand extends GraphCommand {
@@ -70,7 +70,7 @@ class TeamsAppInstallCommand extends GraphCommand {
             verbose: args.options.verbose
         };
         try {
-            const res = await cli.executeCommandWithOutput(aadUserGetCommand, { options: { ...options, _: [] } });
+            const res = await cli.executeCommandWithOutput(entraUserGetCommand, { options: { ...options, _: [] } });
             if (this.verbose) {
                 await logger.logToStderr(res.stderr);
             }

package/dist/m365/teams/commands/channel/channel-get.js

@@ -5,7 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TeamsChannelGetCommand_instances, _TeamsChannelGetCommand_initTelemetry, _TeamsChannelGetCommand_initOptions, _TeamsChannelGetCommand_initValidators, _TeamsChannelGetCommand_initOptionSets;
 import request from '../../../../request.js';
-import { aadGroup } from '../../../../utils/aadGroup.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
@@ -30,7 +30,7 @@ class TeamsChannelGetCommand extends GraphCommand {
         if (args.options.teamId) {
             return args.options.teamId;
         }
-        const group = await aadGroup.getGroupByDisplayName(args.options.teamName);
+        const group = await entraGroup.getGroupByDisplayName(args.options.teamName);
         if (group.resourceProvisioningOptions.indexOf('Team') === -1) {
             throw `The specified team does not exist in the Microsoft Teams`;
         }

package/dist/m365/teams/commands/channel/channel-list.js

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _TeamsChannelListCommand_instances, _TeamsChannelListCommand_initTelemetry, _TeamsChannelListCommand_initOptions, _TeamsChannelListCommand_initValidators, _TeamsChannelListCommand_initOptionSets;
-import { aadGroup } from '../../../../utils/aadGroup.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 import { odata } from '../../../../utils/odata.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
@@ -31,7 +31,7 @@ class TeamsChannelListCommand extends GraphCommand {
         if (args.options.teamId) {
             return args.options.teamId;
         }
-        const group = await aadGroup.getGroupByDisplayName(args.options.teamName);
+        const group = await entraGroup.getGroupByDisplayName(args.options.teamName);
         if (group.resourceProvisioningOptions.indexOf('Team') === -1) {
             throw 'The specified team does not exist in the Microsoft Teams';
         }

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

@@ -5,7 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TeamsChannelMemberAddCommand_instances, _TeamsChannelMemberAddCommand_initTelemetry, _TeamsChannelMemberAddCommand_initOptions, _TeamsChannelMemberAddCommand_initValidators, _TeamsChannelMemberAddCommand_initOptionSets;
 import request from '../../../../request.js';
-import { aadGroup } from '../../../../utils/aadGroup.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
@@ -63,7 +63,7 @@ class TeamsChannelMemberAddCommand extends GraphCommand {
         if (args.options.teamId) {
             return args.options.teamId;
         }
-        const group = await aadGroup.getGroupByDisplayName(args.options.teamName);
+        const group = await entraGroup.getGroupByDisplayName(args.options.teamName);
         if (group.resourceProvisioningOptions.indexOf('Team') === -1) {
             throw 'The specified team does not exist in the Microsoft Teams';
         }

package/dist/m365/teams/commands/channel/channel-member-list.js

@@ -5,7 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TeamsChannelMemberListCommand_instances, _TeamsChannelMemberListCommand_initTelemetry, _TeamsChannelMemberListCommand_initOptions, _TeamsChannelMemberListCommand_initValidators, _TeamsChannelMemberListCommand_initOptionSets;
 import request from '../../../../request.js';
-import { aadGroup } from '../../../../utils/aadGroup.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { odata } from '../../../../utils/odata.js';
 import { validation } from '../../../../utils/validation.js';
@@ -55,7 +55,7 @@ class TeamsChannelMemberListCommand extends GraphCommand {
         if (args.options.teamId) {
             return args.options.teamId;
         }
-        const group = await aadGroup.getGroupByDisplayName(args.options.teamName);
+        const group = await entraGroup.getGroupByDisplayName(args.options.teamName);
         if (group.resourceProvisioningOptions.indexOf('Team') === -1) {
             throw 'The specified team does not exist in the Microsoft Teams';
         }

package/dist/m365/teams/commands/channel/channel-member-remove.js

@@ -6,7 +6,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _TeamsChannelMemberRemoveCommand_instances, _TeamsChannelMemberRemoveCommand_initTelemetry, _TeamsChannelMemberRemoveCommand_initOptions, _TeamsChannelMemberRemoveCommand_initValidators, _TeamsChannelMemberRemoveCommand_initOptionSets;
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
-import { aadGroup } from '../../../../utils/aadGroup.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
@@ -72,7 +72,7 @@ class TeamsChannelMemberRemoveCommand extends GraphCommand {
         if (args.options.teamId) {
             return args.options.teamId;
         }
-        const group = await aadGroup.getGroupByDisplayName(args.options.teamName);
+        const group = await entraGroup.getGroupByDisplayName(args.options.teamName);
         if (group.resourceProvisioningOptions.indexOf('Team') === -1) {
             throw 'The specified team does not exist in the Microsoft Teams';
         }

package/dist/m365/teams/commands/channel/channel-member-set.js

@@ -5,7 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TeamsChannelMemberSetCommand_instances, _TeamsChannelMemberSetCommand_initTelemetry, _TeamsChannelMemberSetCommand_initOptions, _TeamsChannelMemberSetCommand_initValidators, _TeamsChannelMemberSetCommand_initOptionSets;
 import request from '../../../../request.js';
-import { aadGroup } from '../../../../utils/aadGroup.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
@@ -56,7 +56,7 @@ class TeamsChannelMemberSetCommand extends GraphCommand {
         if (args.options.teamId) {
             return args.options.teamId;
         }
-        const group = await aadGroup.getGroupByDisplayName(args.options.teamName);
+        const group = await entraGroup.getGroupByDisplayName(args.options.teamName);
         if (group.resourceProvisioningOptions.indexOf('Team') === -1) {
             throw `The specified team does not exist in the Microsoft Teams`;
         }

package/dist/m365/teams/commands/channel/channel-remove.js

@@ -6,7 +6,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _TeamsChannelRemoveCommand_instances, _TeamsChannelRemoveCommand_initTelemetry, _TeamsChannelRemoveCommand_initOptions, _TeamsChannelRemoveCommand_initValidators, _TeamsChannelRemoveCommand_initOptionSets;
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
-import { aadGroup } from '../../../../utils/aadGroup.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
@@ -63,7 +63,7 @@ class TeamsChannelRemoveCommand extends GraphCommand {
         if (args.options.teamId) {
             return args.options.teamId;
         }
-        const group = await aadGroup.getGroupByDisplayName(args.options.teamName);
+        const group = await entraGroup.getGroupByDisplayName(args.options.teamName);
         if (group.resourceProvisioningOptions.indexOf('Team') === -1) {
             throw 'The specified team does not exist';
         }