@pnp/cli-microsoft365 5.8.0-beta.f956c5d → 6.0.0-beta.0b0fb88

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

@@ -34,26 +34,14 @@ class PlannerTaskGetCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.TASK_GET;
     }
-    alias() {
-        return [commands_1.default.TASK_DETAILS_GET];
-    }
     get description() {
         return 'Retrieve the specified planner task';
     }
     commandAction(logger, args, cb) {
-        this.showDeprecationWarning(logger, commands_1.default.TASK_DETAILS_GET, commands_1.default.TASK_GET);
-        if (args.options.planName) {
-            args.options.planTitle = args.options.planName;
-            this.warn(logger, `Option 'planName' is deprecated. Please use 'planTitle' instead`);
-        }
         if (utils_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken)) {
             this.handleError('This command does not support application permissions.', logger, cb);
             return;
         }
-        // This check has been added to support task details get alias. Needs to be removed when deprecation is removed. 
-        if (args.options.taskId) {
-            args.options.id = args.options.taskId;
-        }
         this
             .getTaskId(args.options)
             .then(taskId => this.getTask(taskId))
@@ -170,14 +158,12 @@ _PlannerTaskGetCommand_instances = new WeakSet(), _PlannerTaskGetCommand_initTel
             bucketId: typeof args.options.bucketId !== 'undefined',
             bucketName: typeof args.options.bucketName !== 'undefined',
             planId: typeof args.options.planId !== 'undefined',
-            planName: typeof args.options.planName !== 'undefined',
             ownerGroupId: typeof args.options.ownerGroupId !== 'undefined',
             ownerGroupName: typeof args.options.ownerGroupName !== 'undefined'
         });
     });
 }, _PlannerTaskGetCommand_initOptions = function _PlannerTaskGetCommand_initOptions() {
-    this.options.unshift({ option: '--taskId [taskId]' }, // This option has been added to support task details get alias. Needs to be removed when deprecation is removed. 
-    { option: '-i, --id [id]' }, { option: '-t, --title [title]' }, { option: '--bucketId [bucketId]' }, { option: '--bucketName [bucketName]' }, { option: '--planId [planId]' }, { option: '--planName [planName]' }, { option: '--planTitle [planTitle]' }, { option: '--ownerGroupId [ownerGroupId]' }, { option: '--ownerGroupName [ownerGroupName]' });
+    this.options.unshift({ option: '-i, --id [id]' }, { option: '-t, --title [title]' }, { option: '--bucketId [bucketId]' }, { option: '--bucketName [bucketName]' }, { option: '--planId [planId]' }, { option: '--planTitle [planTitle]' }, { option: '--ownerGroupId [ownerGroupId]' }, { option: '--ownerGroupName [ownerGroupName]' });
 }, _PlannerTaskGetCommand_initValidators = function _PlannerTaskGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.id) {
@@ -193,16 +179,16 @@ _PlannerTaskGetCommand_instances = new WeakSet(), _PlannerTaskGetCommand_initTel
         if (args.options.title && args.options.bucketId && args.options.bucketName) {
             return 'Specify either bucketId or bucketName when using title but not both';
         }
-        if (args.options.bucketName && !args.options.planId && !args.options.planName && !args.options.planTitle) {
+        if (args.options.bucketName && !args.options.planId && !args.options.planTitle) {
             return 'Specify either planId or planTitle when using bucketName';
         }
-        if (args.options.bucketName && args.options.planId && (args.options.planName || args.options.planTitle)) {
+        if (args.options.bucketName && args.options.planId && args.options.planTitle) {
             return 'Specify either planId or planTitle when using bucketName but not both';
         }
-        if ((args.options.planName || args.options.planTitle) && !args.options.ownerGroupId && !args.options.ownerGroupName) {
+        if (args.options.planTitle && !args.options.ownerGroupId && !args.options.ownerGroupName) {
             return 'Specify either ownerGroupId or ownerGroupName when using planTitle';
         }
-        if ((args.options.planName || args.options.planTitle) && args.options.ownerGroupId && args.options.ownerGroupName) {
+        if (args.options.planTitle && args.options.ownerGroupId && args.options.ownerGroupName) {
             return 'Specify either ownerGroupId or ownerGroupName when using planTitle but not both';
         }
         if (args.options.ownerGroupId && !utils_1.validation.isValidGuid(args.options.ownerGroupId)) {

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

@@ -40,10 +40,6 @@ class PlannerTaskListCommand extends GraphCommand_1.default {
         return ['id', 'title', 'startDateTime', 'dueDateTime', 'completedDateTime'];
     }
     commandAction(logger, args, cb) {
-        if (args.options.planName) {
-            args.options.planTitle = args.options.planName;
-            this.warn(logger, `Option 'planName' is deprecated. Please use 'planTitle' instead`);
-        }
         if (utils_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken)) {
             this.handleError('This command does not support application permissions.', logger, cb);
             return;
@@ -157,7 +153,6 @@ _PlannerTaskListCommand_instances = new WeakSet(), _PlannerTaskListCommand_initT
             bucketId: typeof args.options.bucketId !== 'undefined',
             bucketName: typeof args.options.bucketName !== 'undefined',
             planId: typeof args.options.planId !== 'undefined',
-            planName: typeof args.options.planName !== 'undefined',
             planTitle: typeof args.options.planTitle !== 'undefined',
             ownerGroupId: typeof args.options.ownerGroupId !== 'undefined',
             ownerGroupName: typeof args.options.ownerGroupName !== 'undefined'
@@ -170,8 +165,6 @@ _PlannerTaskListCommand_instances = new WeakSet(), _PlannerTaskListCommand_initT
         option: '--bucketName [bucketName]'
     }, {
         option: '--planId [planId]'
-    }, {
-        option: '--planName [planName]'
     }, {
         option: '--planTitle [planTitle]'
     }, {
@@ -184,16 +177,16 @@ _PlannerTaskListCommand_instances = new WeakSet(), _PlannerTaskListCommand_initT
         if (args.options.bucketId && args.options.bucketName) {
             return 'To retrieve tasks from a bucket, specify bucketId or bucketName, but not both';
         }
-        if (args.options.bucketName && !args.options.planId && !args.options.planName && !args.options.planTitle) {
+        if (args.options.bucketName && !args.options.planId && !args.options.planTitle) {
             return 'Specify either planId or planTitle when using bucketName';
         }
-        if (args.options.planId && (args.options.planName || args.options.planTitle)) {
+        if (args.options.planId && args.options.planTitle) {
             return 'Specify either planId or planTitle but not both';
         }
-        if ((args.options.planName || args.options.planTitle) && !args.options.ownerGroupId && !args.options.ownerGroupName) {
+        if (args.options.planTitle && !args.options.ownerGroupId && !args.options.ownerGroupName) {
             return 'Specify either ownerGroupId or ownerGroupName when using planTitle';
         }
-        if ((args.options.planName || args.options.planTitle) && args.options.ownerGroupId && args.options.ownerGroupName) {
+        if (args.options.planTitle && args.options.ownerGroupId && args.options.ownerGroupName) {
             return 'Specify either ownerGroupId or ownerGroupName when using planTitle but not both';
         }
         if (args.options.ownerGroupId && !utils_1.validation.isValidGuid(args.options.ownerGroupId)) {

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

@@ -39,10 +39,6 @@ class PlannerTaskSetCommand extends GraphCommand_1.default {
         return 'Updates a Microsoft Planner Task';
     }
     commandAction(logger, args, cb) {
-        if (args.options.planName) {
-            args.options.planTitle = args.options.planName;
-            this.warn(logger, `Option 'planName' is deprecated. Please use 'planTitle' instead`);
-        }
         if (utils_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken)) {
             this.handleError('This command does not support application permissions.', logger, cb);
             return;
@@ -267,7 +263,6 @@ _PlannerTaskSetCommand_instances = new WeakSet(), _PlannerTaskSetCommand_initTel
         Object.assign(this.telemetryProperties, {
             title: typeof args.options.title !== 'undefined',
             planId: typeof args.options.planId !== 'undefined',
-            planName: typeof args.options.planName !== 'undefined',
             planTitle: typeof args.options.planTitle !== 'undefined',
             ownerGroupId: typeof args.options.ownerGroupId !== 'undefined',
             ownerGroupName: typeof args.options.ownerGroupName !== 'undefined',
@@ -286,22 +281,22 @@ _PlannerTaskSetCommand_instances = new WeakSet(), _PlannerTaskSetCommand_initTel
         });
     });
 }, _PlannerTaskSetCommand_initOptions = function _PlannerTaskSetCommand_initOptions() {
-    this.options.unshift({ option: '-i, --id <id>' }, { option: '-t, --title [title]' }, { option: '--planId [planId]' }, { option: '--planName [planName]' }, { option: '--planTitle [planTitle]' }, { option: '--ownerGroupId [ownerGroupId]' }, { option: '--ownerGroupName [ownerGroupName]' }, { option: '--bucketId [bucketId]' }, { option: '--bucketName [bucketName]' }, { option: '--startDateTime [startDateTime]' }, { option: '--dueDateTime [dueDateTime]' }, { option: '--percentComplete [percentComplete]' }, { option: '--assignedToUserIds [assignedToUserIds]' }, { option: '--assignedToUserNames [assignedToUserNames]' }, { option: '--assigneePriority [assigneePriority]' }, { option: '--description [description]' }, { option: '--appliedCategories [appliedCategories]' }, { option: '--orderHint [orderHint]' }, { option: '--priority [priority]', autocomplete: taskPriority_1.taskPriority.priorityValues });
+    this.options.unshift({ option: '-i, --id <id>' }, { option: '-t, --title [title]' }, { option: '--planId [planId]' }, { option: '--planTitle [planTitle]' }, { option: '--ownerGroupId [ownerGroupId]' }, { option: '--ownerGroupName [ownerGroupName]' }, { option: '--bucketId [bucketId]' }, { option: '--bucketName [bucketName]' }, { option: '--startDateTime [startDateTime]' }, { option: '--dueDateTime [dueDateTime]' }, { option: '--percentComplete [percentComplete]' }, { option: '--assignedToUserIds [assignedToUserIds]' }, { option: '--assignedToUserNames [assignedToUserNames]' }, { option: '--assigneePriority [assigneePriority]' }, { option: '--description [description]' }, { option: '--appliedCategories [appliedCategories]' }, { option: '--orderHint [orderHint]' }, { option: '--priority [priority]', autocomplete: taskPriority_1.taskPriority.priorityValues });
 }, _PlannerTaskSetCommand_initValidators = function _PlannerTaskSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.bucketId && args.options.bucketName) {
             return 'Specify either bucketId or bucketName but not both';
         }
-        if (args.options.bucketName && !args.options.planId && !args.options.planName && !args.options.planTitle) {
+        if (args.options.bucketName && !args.options.planId && !args.options.planTitle) {
             return 'Specify either planId or planTitle when using bucketName';
         }
-        if (args.options.bucketName && args.options.planId && (args.options.planName || args.options.planTitle)) {
+        if (args.options.bucketName && args.options.planId && args.options.planTitle) {
             return 'Specify either planId or planTitle when using bucketName but not both';
         }
-        if ((args.options.planName || args.options.planTitle) && !args.options.ownerGroupId && !args.options.ownerGroupName) {
+        if (args.options.planTitle && !args.options.ownerGroupId && !args.options.ownerGroupName) {
             return 'Specify either ownerGroupId or ownerGroupName when using planTitle';
         }
-        if ((args.options.planName || args.options.planTitle) && args.options.ownerGroupId && args.options.ownerGroupName) {
+        if (args.options.planTitle && args.options.ownerGroupId && args.options.ownerGroupName) {
             return 'Specify either ownerGroupId or ownerGroupName when using planTitle but not both';
         }
         if (args.options.ownerGroupId && !utils_1.validation.isValidGuid(args.options.ownerGroupId)) {

package/dist/m365/planner/commands.js

@@ -8,7 +8,6 @@ exports.default = {
     BUCKET_SET: `${prefix} bucket set`,
     BUCKET_REMOVE: `${prefix} bucket remove`,
     PLAN_ADD: `${prefix} plan add`,
-    PLAN_DETAILS_GET: `${prefix} plan details get`,
     PLAN_GET: `${prefix} plan get`,
     PLAN_LIST: `${prefix} plan list`,
     PLAN_REMOVE: `${prefix} plan remove`,
@@ -16,7 +15,6 @@ exports.default = {
     TASK_CHECKLISTITEM_ADD: `${prefix} task checklistitem add`,
     TASK_CHECKLISTITEM_LIST: `${prefix} task checklistitem list`,
     TASK_CHECKLISTITEM_REMOVE: `${prefix} task checklistitem remove`,
-    TASK_DETAILS_GET: `${prefix} task details get`,
     TASK_GET: `${prefix} task get`,
     TASK_LIST: `${prefix} task list`,
     TASK_REFERENCE_ADD: `${prefix} task reference add`,

package/dist/m365/spfx/commands/package/package-generate.js

@@ -131,7 +131,7 @@ class SpfxPackageGenerateCommand extends AnonymousCommand_1.default {
             if (this.debug) {
                 logger.log('Writing archive...');
             }
-            this.archive.writeZip(`${args.options.packageName}.sppkg`);
+            this.archive.writeZip(`${args.options.name}.sppkg`);
         }
         catch (err) {
             error = err.message;
@@ -189,7 +189,7 @@ _SpfxPackageGenerateCommand_instances = new WeakSet(), _SpfxPackageGenerateComma
         });
     });
 }, _SpfxPackageGenerateCommand_initOptions = function _SpfxPackageGenerateCommand_initOptions() {
-    this.options.unshift({ option: '-t, --webPartTitle <webPartTitle>' }, { option: '-d, --webPartDescription <webPartDescription>' }, { option: '-n, --packageName <packageName>' }, { option: '--html <html>' }, {
+    this.options.unshift({ option: '-t, --webPartTitle <webPartTitle>' }, { option: '-d, --webPartDescription <webPartDescription>' }, { option: '-n, --name <name>' }, { option: '--html <html>' }, {
         option: '--enableForTeams [enableForTeams]',
         autocomplete: SpfxPackageGenerateCommand.enableForTeamsOptions
     }, { option: '--exposePageContextGlobally' }, { option: '--exposeTeamsContextGlobally' }, { option: '--allowTenantWideDeployment' }, { option: '--developerName [developerName]' }, { option: '--developerPrivacyUrl [developerPrivacyUrl]' }, { option: '--developerTermsOfUseUrl [developerTermsOfUseUrl]' }, { option: '--developerWebsiteUrl [developerWebsiteUrl]' }, { option: '--developerMpnId [developerMpnId]' });

package/dist/m365/spo/commands/app/SpoAppBaseCommand.js

@@ -6,7 +6,7 @@ const SpoCommand_1 = require("../../../base/SpoCommand");
 class SpoAppBaseCommand extends SpoCommand_1.default {
     getAppCatalogSiteUrl(logger, authSiteUrl, args) {
         return new Promise((resolve, reject) => {
-            if (args.options.scope === 'sitecollection') {
+            if (args.options.appCatalogScope === 'sitecollection') {
                 return resolve(args.options.appCatalogUrl.toLowerCase().replace('/appcatalog', ''));
             }
             if (args.options.appCatalogUrl) {

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

@@ -36,7 +36,7 @@ class SpoAppAddCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
         return 'Adds an app to the specified SharePoint Online app catalog';
     }
     commandAction(logger, args, cb) {
-        const scope = (args.options.scope) ? args.options.scope.toLowerCase() : 'tenant';
+        const scope = (args.options.appCatalogScope) ? args.options.appCatalogScope.toLowerCase() : 'tenant';
         const overwrite = args.options.overwrite || false;
         utils_1.spo
             .getSpoUrl(logger, this.debug)
@@ -75,7 +75,7 @@ _SpoAppAddCommand_instances = new WeakSet(), _SpoAppAddCommand_initTelemetry = f
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             overwrite: (!(!args.options.overwrite)).toString(),
-            scope: args.options.scope || 'tenant',
+            appCatalogScope: args.options.appCatalogScope || 'tenant',
             appCatalogUrl: (!(!args.options.appCatalogUrl)).toString()
         });
     });
@@ -83,7 +83,7 @@ _SpoAppAddCommand_instances = new WeakSet(), _SpoAppAddCommand_initTelemetry = f
     this.options.unshift({
         option: '-p, --filePath <filePath>'
     }, {
-        option: '-s, --scope [scope]',
+        option: '-s, --appCatalogScope [appCatalogScope]',
         autocomplete: ['tenant', 'sitecollection']
     }, {
         option: '-u, --appCatalogUrl [appCatalogUrl]'
@@ -93,13 +93,13 @@ _SpoAppAddCommand_instances = new WeakSet(), _SpoAppAddCommand_initTelemetry = f
 }, _SpoAppAddCommand_initValidators = function _SpoAppAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         // verify either 'tenant' or 'sitecollection' specified if scope provided
-        if (args.options.scope) {
-            const testScope = args.options.scope.toLowerCase();
+        if (args.options.appCatalogScope) {
+            const testScope = args.options.appCatalogScope.toLowerCase();
             if (!(testScope === 'tenant' || testScope === 'sitecollection')) {
-                return `Scope must be either 'tenant' or 'sitecollection'`;
+                return `appCatalogScope must be either 'tenant' or 'sitecollection'`;
             }
             if (testScope === 'sitecollection' && !args.options.appCatalogUrl) {
-                return `You must specify appCatalogUrl when the scope is sitecollection`;
+                return `You must specify appCatalogUrl when the appCatalogScope is sitecollection`;
             }
         }
         const fullPath = path.resolve(args.options.filePath);

package/dist/m365/spo/commands/app/app-deploy.js

@@ -36,7 +36,7 @@ class SpoAppDeployCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
     }
     commandAction(logger, args, cb) {
         let appId = '';
-        const scope = (args.options.scope) ? args.options.scope.toLowerCase() : 'tenant';
+        const scope = (args.options.appCatalogScope) ? args.options.appCatalogScope.toLowerCase() : 'tenant';
         let appCatalogUrl = '';
         utils_1.spo
             .getSpoUrl(logger, this.debug)
@@ -91,7 +91,7 @@ _SpoAppDeployCommand_instances = new WeakSet(), _SpoAppDeployCommand_initTelemet
             name: (!(!args.options.name)).toString(),
             appCatalogUrl: (!(!args.options.appCatalogUrl)).toString(),
             skipFeatureDeployment: args.options.skipFeatureDeployment || false,
-            scope: (!(!args.options.scope)).toString()
+            appCatalogScope: (!(!args.options.appCatalogScope)).toString()
         });
     });
 }, _SpoAppDeployCommand_initOptions = function _SpoAppDeployCommand_initOptions() {
@@ -104,19 +104,19 @@ _SpoAppDeployCommand_instances = new WeakSet(), _SpoAppDeployCommand_initTelemet
     }, {
         option: '--skipFeatureDeployment'
     }, {
-        option: '-s, --scope [scope]',
+        option: '-s, --appCatalogScope [appCatalogScope]',
         autocomplete: ['tenant', 'sitecollection']
     });
 }, _SpoAppDeployCommand_initValidators = function _SpoAppDeployCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         // verify either 'tenant' or 'sitecollection' specified if scope provided
-        if (args.options.scope) {
-            const testScope = args.options.scope.toLowerCase();
+        if (args.options.appCatalogScope) {
+            const testScope = args.options.appCatalogScope.toLowerCase();
             if (!(testScope === 'tenant' || testScope === 'sitecollection')) {
-                return `Scope must be either 'tenant' or 'sitecollection'`;
+                return `appCatalogScope must be either 'tenant' or 'sitecollection'`;
             }
             if (testScope === 'sitecollection' && !args.options.appCatalogUrl) {
-                return `You must specify appCatalogUrl when the scope is sitecollection`;
+                return `You must specify appCatalogUrl when the appCatalogScope is sitecollection`;
             }
         }
         if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {

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

@@ -35,7 +35,7 @@ class SpoAppGetCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
         return 'Gets information about the specific app from the specified app catalog';
     }
     commandAction(logger, args, cb) {
-        const scope = (args.options.scope) ? args.options.scope.toLowerCase() : 'tenant';
+        const scope = (args.options.appCatalogScope) ? args.options.appCatalogScope.toLowerCase() : 'tenant';
         let appCatalogSiteUrl = '';
         utils_1.spo
             .getSpoUrl(logger, this.debug)
@@ -84,7 +84,7 @@ _SpoAppGetCommand_instances = new WeakSet(), _SpoAppGetCommand_initTelemetry = f
             id: (!(!args.options.id)).toString(),
             name: (!(!args.options.name)).toString(),
             appCatalogUrl: (!(!args.options.appCatalogUrl)).toString(),
-            scope: args.options.scope || 'tenant'
+            appCatalogScope: args.options.appCatalogScope || 'tenant'
         });
     });
 }, _SpoAppGetCommand_initOptions = function _SpoAppGetCommand_initOptions() {
@@ -95,19 +95,19 @@ _SpoAppGetCommand_instances = new WeakSet(), _SpoAppGetCommand_initTelemetry = f
     }, {
         option: '-u, --appCatalogUrl [appCatalogUrl]'
     }, {
-        option: '-s, --scope [scope]',
+        option: '-s, --appCatalogScope [appCatalogScope]',
         autocomplete: ['tenant', 'sitecollection']
     });
 }, _SpoAppGetCommand_initValidators = function _SpoAppGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         // verify either 'tenant' or 'sitecollection' specified if scope provided
-        if (args.options.scope) {
-            const testScope = args.options.scope.toLowerCase();
+        if (args.options.appCatalogScope) {
+            const testScope = args.options.appCatalogScope.toLowerCase();
             if (!(testScope === 'tenant' || testScope === 'sitecollection')) {
-                return `Scope must be either 'tenant' or 'sitecollection'`;
+                return `appCatalogScope must be either 'tenant' or 'sitecollection'`;
             }
             if (testScope === 'sitecollection' && !args.options.appCatalogUrl) {
-                return `You must specify appCatalogUrl when the scope is sitecollection`;
+                return `You must specify appCatalogUrl when the appCatalogScope is sitecollection`;
             }
         }
         if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {

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

@@ -34,7 +34,7 @@ class SpoAppInstallCommand extends SpoCommand_1.default {
         return 'Installs an app from the specified app catalog in the site';
     }
     commandAction(logger, args, cb) {
-        const scope = (args.options.scope) ? args.options.scope.toLowerCase() : 'tenant';
+        const scope = (args.options.appCatalogScope) ? args.options.appCatalogScope.toLowerCase() : 'tenant';
         if (this.verbose) {
             logger.logToStderr(`Installing app '${args.options.id}' in site '${args.options.siteUrl}'...`);
         }
@@ -52,7 +52,7 @@ class SpoAppInstallCommand extends SpoCommand_1.default {
 _SpoAppInstallCommand_instances = new WeakSet(), _SpoAppInstallCommand_initTelemetry = function _SpoAppInstallCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            scope: args.options.scope || 'tenant'
+            appCatalogScope: args.options.appCatalogScope || 'tenant'
         });
     });
 }, _SpoAppInstallCommand_initOptions = function _SpoAppInstallCommand_initOptions() {
@@ -61,15 +61,15 @@ _SpoAppInstallCommand_instances = new WeakSet(), _SpoAppInstallCommand_initTelem
     }, {
         option: '-s, --siteUrl <siteUrl>'
     }, {
-        option: '--scope [scope]',
+        option: '--appCatalogScope [appCatalogScope]',
         autocomplete: ['tenant', 'sitecollection']
     });
 }, _SpoAppInstallCommand_initValidators = function _SpoAppInstallCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.scope) {
-            const testScope = args.options.scope.toLowerCase();
+        if (args.options.appCatalogScope) {
+            const testScope = args.options.appCatalogScope.toLowerCase();
             if (!(testScope === 'tenant' || testScope === 'sitecollection')) {
-                return `Scope must be either 'tenant' or 'sitecollection' if specified`;
+                return `appCatalogScope must be either 'tenant' or 'sitecollection' if specified`;
             }
         }
         if (!utils_1.validation.isValidGuid(args.options.id)) {

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

@@ -37,7 +37,7 @@ class SpoAppListCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
         return [`Title`, `ID`, `Deployed`, `AppCatalogVersion`];
     }
     commandAction(logger, args, cb) {
-        const scope = (args.options.scope) ? args.options.scope.toLowerCase() : 'tenant';
+        const scope = (args.options.appCatalogScope) ? args.options.appCatalogScope.toLowerCase() : 'tenant';
         let appCatalogSiteUrl = '';
         let spoUrl = '';
         utils_1.spo
@@ -77,12 +77,12 @@ _SpoAppListCommand_instances = new WeakSet(), _SpoAppListCommand_initTelemetry =
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             appCatalogUrl: (!(!args.options.appCatalogUrl)).toString(),
-            scope: args.options.scope || 'tenant'
+            appCatalogScope: args.options.appCatalogScope || 'tenant'
         });
     });
 }, _SpoAppListCommand_initOptions = function _SpoAppListCommand_initOptions() {
     this.options.unshift({
-        option: '-s, --scope [scope]',
+        option: '-s, --appCatalogScope [appCatalogScope]',
         autocomplete: ['tenant', 'sitecollection']
     }, {
         option: '-u, --appCatalogUrl [appCatalogUrl]'
@@ -90,13 +90,13 @@ _SpoAppListCommand_instances = new WeakSet(), _SpoAppListCommand_initTelemetry =
 }, _SpoAppListCommand_initValidators = function _SpoAppListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         // verify either 'tenant' or 'sitecollection' specified if scope provided
-        if (args.options.scope) {
-            const testScope = args.options.scope.toLowerCase();
+        if (args.options.appCatalogScope) {
+            const testScope = args.options.appCatalogScope.toLowerCase();
             if (!(testScope === 'tenant' || testScope === 'sitecollection')) {
-                return `Scope must be either 'tenant' or 'sitecollection'`;
+                return `appCatalogScope must be either 'tenant' or 'sitecollection'`;
             }
             if (testScope === 'sitecollection' && !args.options.appCatalogUrl) {
-                return `You must specify appCatalogUrl when the scope is sitecollection`;
+                return `You must specify appCatalogUrl when the appCatalogScope is sitecollection`;
             }
             if (args.options.appCatalogUrl) {
                 return utils_1.validation.isValidSharePointUrl(args.options.appCatalogUrl);

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

@@ -35,7 +35,7 @@ class SpoAppRemoveCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
         return 'Removes the specified app from the specified app catalog';
     }
     commandAction(logger, args, cb) {
-        const scope = (args.options.scope) ? args.options.scope.toLowerCase() : 'tenant';
+        const scope = (args.options.appCatalogScope) ? args.options.appCatalogScope.toLowerCase() : 'tenant';
         const removeApp = () => {
             utils_1.spo
                 .getSpoUrl(logger, this.debug)
@@ -81,7 +81,7 @@ _SpoAppRemoveCommand_instances = new WeakSet(), _SpoAppRemoveCommand_initTelemet
         Object.assign(this.telemetryProperties, {
             appCatalogUrl: (!(!args.options.appCatalogUrl)).toString(),
             confirm: (!(!args.options.confirm)).toString(),
-            scope: args.options.scope || 'tenant'
+            appCatalogScope: args.options.appCatalogScope || 'tenant'
         });
     });
 }, _SpoAppRemoveCommand_initOptions = function _SpoAppRemoveCommand_initOptions() {
@@ -90,7 +90,7 @@ _SpoAppRemoveCommand_instances = new WeakSet(), _SpoAppRemoveCommand_initTelemet
     }, {
         option: '-u, --appCatalogUrl [appCatalogUrl]'
     }, {
-        option: '-s, --scope [scope]',
+        option: '-s, --appCatalogScope [appCatalogScope]',
         autocomplete: ['tenant', 'sitecollection']
     }, {
         option: '--confirm'
@@ -98,13 +98,13 @@ _SpoAppRemoveCommand_instances = new WeakSet(), _SpoAppRemoveCommand_initTelemet
 }, _SpoAppRemoveCommand_initValidators = function _SpoAppRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         // verify either 'tenant' or 'sitecollection' specified if scope provided
-        if (args.options.scope) {
-            const testScope = args.options.scope.toLowerCase();
+        if (args.options.appCatalogScope) {
+            const testScope = args.options.appCatalogScope.toLowerCase();
             if (!(testScope === 'tenant' || testScope === 'sitecollection')) {
-                return `Scope must be either 'tenant' or 'sitecollection' if specified`;
+                return `appCatalogScope must be either 'tenant' or 'sitecollection' if specified`;
             }
             if (testScope === 'sitecollection' && !args.options.appCatalogUrl) {
-                return `You must specify appCatalogUrl when the scope is sitecollection`;
+                return `You must specify appCatalogUrl when the appCatalogScope is sitecollection`;
             }
         }
         if (!utils_1.validation.isValidGuid(args.options.id)) {

package/dist/m365/spo/commands/app/app-retract.js

@@ -35,7 +35,7 @@ class SpoAppRetractCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
         return 'Retracts the specified app from the specified app catalog';
     }
     commandAction(logger, args, cb) {
-        const scope = (args.options.scope) ? args.options.scope.toLowerCase() : 'tenant';
+        const scope = (args.options.appCatalogScope) ? args.options.appCatalogScope.toLowerCase() : 'tenant';
         const retractApp = () => {
             utils_1.spo
                 .getSpoUrl(logger, this.debug)
@@ -81,7 +81,7 @@ _SpoAppRetractCommand_instances = new WeakSet(), _SpoAppRetractCommand_initTelem
         Object.assign(this.telemetryProperties, {
             appCatalogUrl: (!(!args.options.appCatalogUrl)).toString(),
             confirm: (!(!args.options.confirm)).toString(),
-            scope: args.options.scope || 'tenant'
+            appCatalogScope: args.options.appCatalogScope || 'tenant'
         });
     });
 }, _SpoAppRetractCommand_initOptions = function _SpoAppRetractCommand_initOptions() {
@@ -90,20 +90,20 @@ _SpoAppRetractCommand_instances = new WeakSet(), _SpoAppRetractCommand_initTelem
     }, {
         option: '-u, --appCatalogUrl [appCatalogUrl]'
     }, {
-        option: '-s, --scope [scope]',
+        option: '-s, --appCatalogScope [appCatalogScope]',
         autocomplete: ['tenant', 'sitecollection']
     }, {
         option: '--confirm'
     });
 }, _SpoAppRetractCommand_initValidators = function _SpoAppRetractCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.scope) {
-            const testScope = args.options.scope.toLowerCase();
+        if (args.options.appCatalogScope) {
+            const testScope = args.options.appCatalogScope.toLowerCase();
             if (!(testScope === 'tenant' || testScope === 'sitecollection')) {
-                return `Scope must be either 'tenant' or 'sitecollection' if specified`;
+                return `appCatalogScope must be either 'tenant' or 'sitecollection' if specified`;
             }
             if (testScope === 'sitecollection' && !args.options.appCatalogUrl) {
-                return `You must specify appCatalogUrl when the scope is sitecollection`;
+                return `You must specify appCatalogUrl when the appCatalogScope is sitecollection`;
             }
         }
         if (!utils_1.validation.isValidGuid(args.options.id)) {

package/dist/m365/spo/commands/app/app-uninstall.js

@@ -36,7 +36,7 @@ class SpoAppUninstallCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args, cb) {
         const uninstallApp = () => {
-            const scope = (args.options.scope) ? args.options.scope.toLowerCase() : 'tenant';
+            const scope = (args.options.appCatalogScope) ? args.options.appCatalogScope.toLowerCase() : 'tenant';
             if (this.verbose) {
                 logger.logToStderr(`Uninstalling app '${args.options.id}' from the site '${args.options.siteUrl}'...`);
             }
@@ -74,7 +74,7 @@ _SpoAppUninstallCommand_instances = new WeakSet(), _SpoAppUninstallCommand_initT
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             confirm: (!(!args.options.confirm)).toString(),
-            scope: args.options.scope || 'tenant'
+            appCatalogScope: args.options.appCatalogScope || 'tenant'
         });
     });
 }, _SpoAppUninstallCommand_initOptions = function _SpoAppUninstallCommand_initOptions() {
@@ -83,17 +83,17 @@ _SpoAppUninstallCommand_instances = new WeakSet(), _SpoAppUninstallCommand_initT
     }, {
         option: '-s, --siteUrl <siteUrl>'
     }, {
-        option: '--scope [scope]',
+        option: '--appCatalogScope [appCatalogScope]',
         autocomplete: ['tenant', 'sitecollection']
     }, {
         option: '--confirm'
     });
 }, _SpoAppUninstallCommand_initValidators = function _SpoAppUninstallCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.scope) {
-            const testScope = args.options.scope.toLowerCase();
+        if (args.options.appCatalogScope) {
+            const testScope = args.options.appCatalogScope.toLowerCase();
             if (!(testScope === 'tenant' || testScope === 'sitecollection')) {
-                return `Scope must be either 'tenant' or 'sitecollection' if specified`;
+                return `appCatalogScope must be either 'tenant' or 'sitecollection' if specified`;
             }
         }
         if (!utils_1.validation.isValidGuid(args.options.id)) {

package/dist/m365/spo/commands/app/app-upgrade.js

@@ -34,7 +34,7 @@ class SpoAppUpgradeCommand extends SpoCommand_1.default {
         return 'Upgrades app in the specified site';
     }
     commandAction(logger, args, cb) {
-        const scope = (args.options.scope) ? args.options.scope.toLowerCase() : 'tenant';
+        const scope = (args.options.appCatalogScope) ? args.options.appCatalogScope.toLowerCase() : 'tenant';
         if (this.verbose) {
             logger.logToStderr(`Upgrading app '${args.options.id}' in site '${args.options.siteUrl}'...`);
         }
@@ -52,7 +52,7 @@ class SpoAppUpgradeCommand extends SpoCommand_1.default {
 _SpoAppUpgradeCommand_instances = new WeakSet(), _SpoAppUpgradeCommand_initTelemetry = function _SpoAppUpgradeCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            scope: args.options.scope || 'tenant'
+            appCatalogScope: args.options.appCatalogScope || 'tenant'
         });
     });
 }, _SpoAppUpgradeCommand_initOptions = function _SpoAppUpgradeCommand_initOptions() {
@@ -61,15 +61,15 @@ _SpoAppUpgradeCommand_instances = new WeakSet(), _SpoAppUpgradeCommand_initTelem
     }, {
         option: '-s, --siteUrl <siteUrl>'
     }, {
-        option: '--scope [scope]',
+        option: '--appCatalogScope [appCatalogScope]',
         autocomplete: ['tenant', 'sitecollection']
     });
 }, _SpoAppUpgradeCommand_initValidators = function _SpoAppUpgradeCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.scope) {
-            const testScope = args.options.scope.toLowerCase();
+        if (args.options.appCatalogScope) {
+            const testScope = args.options.appCatalogScope.toLowerCase();
             if (!(testScope === 'tenant' || testScope === 'sitecollection')) {
-                return `Scope must be either 'tenant' or 'sitecollection' if specified`;
+                return `appCatalogScope must be either 'tenant' or 'sitecollection' if specified`;
             }
         }
         if (!utils_1.validation.isValidGuid(args.options.id)) {

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

@@ -41,7 +41,7 @@ class SpoAppPageSetCommand extends SpoCommand_1.default {
             },
             responseType: 'json',
             data: {
-                serverRelativeUrl: `${utils_1.urlUtil.getServerRelativePath(args.options.webUrl, '')}/SitePages/${args.options.pageName}`,
+                serverRelativeUrl: `${utils_1.urlUtil.getServerRelativePath(args.options.webUrl, '')}/SitePages/${args.options.name}`,
                 webPartDataAsJson: args.options.webPartData
             }
         };
@@ -54,7 +54,7 @@ _SpoAppPageSetCommand_instances = new WeakSet(), _SpoAppPageSetCommand_initOptio
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-n, --pageName <pageName>'
+        option: '-n, --name <name>'
     }, {
         option: '-d, --webPartData <webPartData>'
     });