@pnp/cli-microsoft365 6.0.0-beta.dc71aa3 → 6.0.0-beta.dc8d53d

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

@@ -94,10 +94,10 @@ _PpCardGetCommand_instances = new WeakSet(), _PpCardGetCommand_initTelemetry = f
     }, {
         option: '-n, --name [name]'
     }, {
-        option: '-a, --asAdmin'
+        option: '--asAdmin'
     });
 }, _PpCardGetCommand_initOptionSets = function _PpCardGetCommand_initOptionSets() {
-    this.optionSets.push(['id', 'name']);
+    this.optionSets.push({ options: ['id', 'name'] });
 }, _PpCardGetCommand_initValidators = function _PpCardGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {

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

@@ -61,7 +61,7 @@ _PpCardListCommand_instances = new WeakSet(), _PpCardListCommand_initTelemetry =
     this.options.unshift({
         option: '-e, --environment <environment>'
     }, {
-        option: '-a, --asAdmin'
+        option: '--asAdmin'
     });
 };
 module.exports = new PpCardListCommand();

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

@@ -112,12 +112,12 @@ _PpCardRemoveCommand_instances = new WeakSet(), _PpCardRemoveCommand_initTelemet
     }, {
         option: '-n, --name [name]'
     }, {
-        option: '-a, --asAdmin'
+        option: '--asAdmin'
     }, {
         option: '--confirm'
     });
 }, _PpCardRemoveCommand_initOptionSets = function _PpCardRemoveCommand_initOptionSets() {
-    this.optionSets.push(['id', 'name']);
+    this.optionSets.push({ options: ['id', 'name'] });
 }, _PpCardRemoveCommand_initValidators = function _PpCardRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {

package/dist/m365/pp/commands/dataverse/dataverse-table-get.js

@@ -70,7 +70,7 @@ _PpDataverseTableGetCommand_instances = new WeakSet(), _PpDataverseTableGetComma
     }, {
         option: '-n, --name <name>'
     }, {
-        option: '-a, --asAdmin'
+        option: '--asAdmin'
     });
 };
 module.exports = new PpDataverseTableGetCommand();

package/dist/m365/pp/commands/dataverse/dataverse-table-list.js

@@ -62,7 +62,7 @@ _PpDataverseTableListCommand_instances = new WeakSet(), _PpDataverseTableListCom
     this.options.unshift({
         option: '-e, --environment <environment>'
     }, {
-        option: '-a, --asAdmin'
+        option: '--asAdmin'
     });
 };
 module.exports = new PpDataverseTableListCommand();

package/dist/m365/pp/commands/dataverse/dataverse-table-remove.js

@@ -86,7 +86,7 @@ _PpDataverseTableRemoveCommand_instances = new WeakSet(), _PpDataverseTableRemov
     }, {
         option: '-n, --name <name>'
     }, {
-        option: '-a, --asAdmin'
+        option: '--asAdmin'
     }, {
         option: '--confirm'
     });

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

@@ -68,7 +68,7 @@ _PpEnvironmentGetCommand_instances = new WeakSet(), _PpEnvironmentGetCommand_ini
     this.options.unshift({
         option: '-n, --name <name>'
     }, {
-        option: '-a, --asAdmin'
+        option: '--asAdmin'
     });
 };
 module.exports = new PpEnvironmentGetCommand();

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

@@ -76,7 +76,7 @@ _PpEnvironmentListCommand_instances = new WeakSet(), _PpEnvironmentListCommand_i
     });
 }, _PpEnvironmentListCommand_initOptions = function _PpEnvironmentListCommand_initOptions() {
     this.options.unshift({
-        option: '-a, --asAdmin'
+        option: '--asAdmin'
     });
 };
 module.exports = new PpEnvironmentListCommand();

package/dist/m365/pp/commands/managementapp/managementapp-add.js

@@ -105,7 +105,7 @@ _PpManagementAppAddCommand_instances = new WeakSet(), _PpManagementAppAddCommand
         return true;
     }));
 }, _PpManagementAppAddCommand_initOptionSets = function _PpManagementAppAddCommand_initOptionSets() {
-    this.optionSets.push(['appId', 'objectId', 'name']);
+    this.optionSets.push({ options: ['appId', 'objectId', 'name'] });
 };
 module.exports = new PpManagementAppAddCommand();
 //# sourceMappingURL=managementapp-add.js.map

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

@@ -101,10 +101,10 @@ _PpSolutionGetCommand_instances = new WeakSet(), _PpSolutionGetCommand_initTelem
     }, {
         option: '-n, --name [name]'
     }, {
-        option: '-a, --asAdmin'
+        option: '--asAdmin'
     });
 }, _PpSolutionGetCommand_initOptionSets = function _PpSolutionGetCommand_initOptionSets() {
-    this.optionSets.push(['id', 'name']);
+    this.optionSets.push({ options: ['id', 'name'] });
 }, _PpSolutionGetCommand_initValidators = function _PpSolutionGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {

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

@@ -74,7 +74,7 @@ _PpSolutionListCommand_instances = new WeakSet(), _PpSolutionListCommand_initTel
     this.options.unshift({
         option: '-e, --environment <environment>'
     }, {
-        option: '-a, --asAdmin'
+        option: '--asAdmin'
     });
 };
 module.exports = new PpSolutionListCommand();

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

@@ -91,10 +91,10 @@ _PpSolutionPublisherGetCommand_instances = new WeakSet(), _PpSolutionPublisherGe
     }, {
         option: '-n, --name [name]'
     }, {
-        option: '-a, --asAdmin'
+        option: '--asAdmin'
     });
 }, _PpSolutionPublisherGetCommand_initOptionSets = function _PpSolutionPublisherGetCommand_initOptionSets() {
-    this.optionSets.push(['id', 'name']);
+    this.optionSets.push({ options: ['id', 'name'] });
 }, _PpSolutionPublisherGetCommand_initValidators = function _PpSolutionPublisherGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {

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

@@ -71,7 +71,7 @@ _PpSolutionPublisherListCommand_instances = new WeakSet(), _PpSolutionPublisherL
     }, {
         option: '--includeMicrosoftPublishers'
     }, {
-        option: '-a, --asAdmin'
+        option: '--asAdmin'
     });
 };
 module.exports = new PpSolutionPublisherListCommand();

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

@@ -112,12 +112,12 @@ _PpSolutionPublisherRemoveCommand_instances = new WeakSet(), _PpSolutionPublishe
     }, {
         option: '-n, --name [name]'
     }, {
-        option: '-a, --asAdmin'
+        option: '--asAdmin'
     }, {
         option: '--confirm'
     });
 }, _PpSolutionPublisherRemoveCommand_initOptionSets = function _PpSolutionPublisherRemoveCommand_initOptionSets() {
-    this.optionSets.push(['id', 'name']);
+    this.optionSets.push({ options: ['id', 'name'] });
 }, _PpSolutionPublisherRemoveCommand_initValidators = function _PpSolutionPublisherRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {

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

@@ -112,12 +112,12 @@ _PpSolutionRemoveCommand_instances = new WeakSet(), _PpSolutionRemoveCommand_ini
     }, {
         option: '-n, --name [name]'
     }, {
-        option: '-a, --asAdmin'
+        option: '--asAdmin'
     }, {
         option: '--confirm'
     });
 }, _PpSolutionRemoveCommand_initOptionSets = function _PpSolutionRemoveCommand_initOptionSets() {
-    this.optionSets.push(['id', 'name']);
+    this.optionSets.push({ options: ['id', 'name'] });
 }, _PpSolutionRemoveCommand_initValidators = function _PpSolutionRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {

package/dist/m365/search/commands/externalconnection/externalconnection-get.js

@@ -79,7 +79,7 @@ _SearchExternalConnectionGetCommand_instances = new WeakSet(), _SearchExternalCo
         option: '-n, --name [name]'
     });
 }, _SearchExternalConnectionGetCommand_initOptionSets = function _SearchExternalConnectionGetCommand_initOptionSets() {
-    this.optionSets.push(['id', 'name']);
+    this.optionSets.push({ options: ['id', 'name'] });
 };
 module.exports = new SearchExternalConnectionGetCommand();
 //# sourceMappingURL=externalconnection-get.js.map

package/dist/m365/search/commands/externalconnection/externalconnection-remove.js

@@ -103,7 +103,7 @@ _SearchExternalConnectionRemoveCommand_instances = new WeakSet(), _SearchExterna
 }, _SearchExternalConnectionRemoveCommand_initOptions = function _SearchExternalConnectionRemoveCommand_initOptions() {
     this.options.unshift({ option: '--id [id]' }, { option: '--name [name]' }, { option: '--confirm' });
 }, _SearchExternalConnectionRemoveCommand_initOptionSets = function _SearchExternalConnectionRemoveCommand_initOptionSets() {
-    this.optionSets.push(['id', 'name']);
+    this.optionSets.push({ options: ['id', 'name'] });
 };
 module.exports = new SearchExternalConnectionRemoveCommand();
 //# sourceMappingURL=externalconnection-remove.js.map

package/dist/m365/spfx/commands/project/project-doctor/{doctor-1.16.0-rc.0.js → doctor-1.16.0.js}

@@ -20,4 +20,4 @@ module.exports = [
     new FN002016_DEVDEP_types_react_dom_1.FN002016_DEVDEP_types_react_dom('17'),
     new FN002019_DEVDEP_microsoft_rush_stack_compiler_1.FN002019_DEVDEP_microsoft_rush_stack_compiler(['4.5'])
 ];
-//# sourceMappingURL=doctor-1.16.0-rc.0.js.map
+//# sourceMappingURL=doctor-1.16.0.js.map

package/dist/m365/spfx/commands/project/project-doctor.js

@@ -62,7 +62,7 @@ class SpfxProjectDoctorCommand extends base_project_command_1.BaseProjectCommand
             '1.14.0',
             '1.15.0',
             '1.15.2',
-            '1.16.0-rc.0'
+            '1.16.0'
         ];
         __classPrivateFieldGet(this, _SpfxProjectDoctorCommand_instances, "m", _SpfxProjectDoctorCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpfxProjectDoctorCommand_instances, "m", _SpfxProjectDoctorCommand_initOptions).call(this);

package/dist/m365/spfx/commands/project/project-upgrade/{upgrade-1.16.0-rc.0.js → upgrade-1.16.0.js}

@@ -37,36 +37,36 @@ const FN021003_PKG_engines_node_1 = require("./rules/FN021003_PKG_engines_node")
 const FN022001_SCSS_remove_fabric_react_1 = require("./rules/FN022001_SCSS_remove_fabric_react");
 const FN022002_SCSS_add_fabric_react_1 = require("./rules/FN022002_SCSS_add_fabric_react");
 module.exports = [
-    new FN001001_DEP_microsoft_sp_core_library_1.FN001001_DEP_microsoft_sp_core_library('1.16.0-rc.0'),
-    new FN001002_DEP_microsoft_sp_lodash_subset_1.FN001002_DEP_microsoft_sp_lodash_subset('1.16.0-rc.0'),
-    new FN001003_DEP_microsoft_sp_office_ui_fabric_core_1.FN001003_DEP_microsoft_sp_office_ui_fabric_core('1.16.0-rc.0'),
-    new FN001004_DEP_microsoft_sp_webpart_base_1.FN001004_DEP_microsoft_sp_webpart_base('1.16.0-rc.0'),
+    new FN001001_DEP_microsoft_sp_core_library_1.FN001001_DEP_microsoft_sp_core_library('1.16.0'),
+    new FN001002_DEP_microsoft_sp_lodash_subset_1.FN001002_DEP_microsoft_sp_lodash_subset('1.16.0'),
+    new FN001003_DEP_microsoft_sp_office_ui_fabric_core_1.FN001003_DEP_microsoft_sp_office_ui_fabric_core('1.16.0'),
+    new FN001004_DEP_microsoft_sp_webpart_base_1.FN001004_DEP_microsoft_sp_webpart_base('1.16.0'),
     new FN001008_DEP_react_1.FN001008_DEP_react('17.0.1'),
     new FN001009_DEP_react_dom_1.FN001009_DEP_react_dom('17.0.1'),
-    new FN001011_DEP_microsoft_sp_dialog_1.FN001011_DEP_microsoft_sp_dialog('1.16.0-rc.0'),
-    new FN001012_DEP_microsoft_sp_application_base_1.FN001012_DEP_microsoft_sp_application_base('1.16.0-rc.0'),
-    new FN001014_DEP_microsoft_sp_listview_extensibility_1.FN001014_DEP_microsoft_sp_listview_extensibility('1.16.0-rc.0'),
-    new FN001021_DEP_microsoft_sp_property_pane_1.FN001021_DEP_microsoft_sp_property_pane('1.16.0-rc.0'),
+    new FN001011_DEP_microsoft_sp_dialog_1.FN001011_DEP_microsoft_sp_dialog('1.16.0'),
+    new FN001012_DEP_microsoft_sp_application_base_1.FN001012_DEP_microsoft_sp_application_base('1.16.0'),
+    new FN001014_DEP_microsoft_sp_listview_extensibility_1.FN001014_DEP_microsoft_sp_listview_extensibility('1.16.0'),
+    new FN001021_DEP_microsoft_sp_property_pane_1.FN001021_DEP_microsoft_sp_property_pane('1.16.0'),
     new FN001022_DEP_office_ui_fabric_react_1.FN001022_DEP_office_ui_fabric_react('7.199.1'),
-    new FN001023_DEP_microsoft_sp_component_base_1.FN001023_DEP_microsoft_sp_component_base('1.16.0-rc.0'),
-    new FN001024_DEP_microsoft_sp_diagnostics_1.FN001024_DEP_microsoft_sp_diagnostics('1.16.0-rc.0'),
-    new FN001025_DEP_microsoft_sp_dynamic_data_1.FN001025_DEP_microsoft_sp_dynamic_data('1.16.0-rc.0'),
-    new FN001026_DEP_microsoft_sp_extension_base_1.FN001026_DEP_microsoft_sp_extension_base('1.16.0-rc.0'),
-    new FN001027_DEP_microsoft_sp_http_1.FN001027_DEP_microsoft_sp_http('1.16.0-rc.0'),
-    new FN001028_DEP_microsoft_sp_list_subscription_1.FN001028_DEP_microsoft_sp_list_subscription('1.16.0-rc.0'),
-    new FN001029_DEP_microsoft_sp_loader_1.FN001029_DEP_microsoft_sp_loader('1.16.0-rc.0'),
-    new FN001030_DEP_microsoft_sp_module_interfaces_1.FN001030_DEP_microsoft_sp_module_interfaces('1.16.0-rc.0'),
-    new FN001031_DEP_microsoft_sp_odata_types_1.FN001031_DEP_microsoft_sp_odata_types('1.16.0-rc.0'),
-    new FN001032_DEP_microsoft_sp_page_context_1.FN001032_DEP_microsoft_sp_page_context('1.16.0-rc.0'),
-    new FN001013_DEP_microsoft_decorators_1.FN001013_DEP_microsoft_decorators('1.16.0-rc.0'),
-    new FN001034_DEP_microsoft_sp_adaptive_card_extension_base_1.FN001034_DEP_microsoft_sp_adaptive_card_extension_base('1.16.0-rc.0'),
-    new FN002022_DEVDEP_microsoft_eslint_plugin_spfx_1.FN002022_DEVDEP_microsoft_eslint_plugin_spfx('1.16.0-rc.0'),
-    new FN002023_DEVDEP_microsoft_eslint_config_spfx_1.FN002023_DEVDEP_microsoft_eslint_config_spfx('1.16.0-rc.0'),
-    new FN002001_DEVDEP_microsoft_sp_build_web_1.FN002001_DEVDEP_microsoft_sp_build_web('1.16.0-rc.0'),
-    new FN002002_DEVDEP_microsoft_sp_module_interfaces_1.FN002002_DEVDEP_microsoft_sp_module_interfaces('1.16.0-rc.0'),
+    new FN001023_DEP_microsoft_sp_component_base_1.FN001023_DEP_microsoft_sp_component_base('1.16.0'),
+    new FN001024_DEP_microsoft_sp_diagnostics_1.FN001024_DEP_microsoft_sp_diagnostics('1.16.0'),
+    new FN001025_DEP_microsoft_sp_dynamic_data_1.FN001025_DEP_microsoft_sp_dynamic_data('1.16.0'),
+    new FN001026_DEP_microsoft_sp_extension_base_1.FN001026_DEP_microsoft_sp_extension_base('1.16.0'),
+    new FN001027_DEP_microsoft_sp_http_1.FN001027_DEP_microsoft_sp_http('1.16.0'),
+    new FN001028_DEP_microsoft_sp_list_subscription_1.FN001028_DEP_microsoft_sp_list_subscription('1.16.0'),
+    new FN001029_DEP_microsoft_sp_loader_1.FN001029_DEP_microsoft_sp_loader('1.16.0'),
+    new FN001030_DEP_microsoft_sp_module_interfaces_1.FN001030_DEP_microsoft_sp_module_interfaces('1.16.0'),
+    new FN001031_DEP_microsoft_sp_odata_types_1.FN001031_DEP_microsoft_sp_odata_types('1.16.0'),
+    new FN001032_DEP_microsoft_sp_page_context_1.FN001032_DEP_microsoft_sp_page_context('1.16.0'),
+    new FN001013_DEP_microsoft_decorators_1.FN001013_DEP_microsoft_decorators('1.16.0'),
+    new FN001034_DEP_microsoft_sp_adaptive_card_extension_base_1.FN001034_DEP_microsoft_sp_adaptive_card_extension_base('1.16.0'),
+    new FN002022_DEVDEP_microsoft_eslint_plugin_spfx_1.FN002022_DEVDEP_microsoft_eslint_plugin_spfx('1.16.0'),
+    new FN002023_DEVDEP_microsoft_eslint_config_spfx_1.FN002023_DEVDEP_microsoft_eslint_config_spfx('1.16.0'),
+    new FN002001_DEVDEP_microsoft_sp_build_web_1.FN002001_DEVDEP_microsoft_sp_build_web('1.16.0'),
+    new FN002002_DEVDEP_microsoft_sp_module_interfaces_1.FN002002_DEVDEP_microsoft_sp_module_interfaces('1.16.0'),
     new FN002015_DEVDEP_types_react_1.FN002015_DEVDEP_types_react('17.0.45'),
     new FN002016_DEVDEP_types_react_dom_1.FN002016_DEVDEP_types_react_dom('17.0.17'),
-    new FN010001_YORC_version_1.FN010001_YORC_version('1.16.0-rc.0'),
+    new FN010001_YORC_version_1.FN010001_YORC_version('1.16.0'),
     new FN010008_YORC_nodeVersion_1.FN010008_YORC_nodeVersion(),
     new FN010009_YORC_sdkVersions_microsoft_graph_client_1.FN010009_YORC_sdkVersions_microsoft_graph_client('3.0.2'),
     new FN010010_YORC_sdkVersions_teams_js_1.FN010010_YORC_sdkVersions_teams_js('2.4.1'),
@@ -74,4 +74,4 @@ module.exports = [
     new FN022001_SCSS_remove_fabric_react_1.FN022001_SCSS_remove_fabric_react('~office-ui-fabric-react/dist/sass/References.scss'),
     new FN022002_SCSS_add_fabric_react_1.FN022002_SCSS_add_fabric_react('~@fluentui/react/dist/sass/References.scss')
 ];
-//# sourceMappingURL=upgrade-1.16.0-rc.0.js.map
+//# sourceMappingURL=upgrade-1.16.0.js.map

package/dist/m365/spfx/commands/project/project-upgrade.js

@@ -18,8 +18,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const os = require("os");
 const path = require("path");
-// uncomment to support upgrading to preview releases
-const semver_1 = require("semver");
 const Command_1 = require("../../../../Command");
 const fsUtil_1 = require("../../../../utils/fsUtil");
 const packageManager_1 = require("../../../../utils/packageManager");
@@ -66,7 +64,7 @@ class SpfxProjectUpgradeCommand extends base_project_command_1.BaseProjectComman
             '1.14.0',
             '1.15.0',
             '1.15.2',
-            '1.16.0-rc.0'
+            '1.16.0'
         ];
         __classPrivateFieldGet(this, _SpfxProjectUpgradeCommand_instances, "m", _SpfxProjectUpgradeCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpfxProjectUpgradeCommand_instances, "m", _SpfxProjectUpgradeCommand_initOptions).call(this);
@@ -89,15 +87,15 @@ class SpfxProjectUpgradeCommand extends base_project_command_1.BaseProjectComman
             }
             this.toVersion = args.options.toVersion ? args.options.toVersion : this.supportedVersions[this.supportedVersions.length - 1];
             // uncomment to support upgrading to preview releases
-            if (!args.options.toVersion &&
-                !args.options.preview &&
-                (0, semver_1.prerelease)(this.toVersion)) {
-                // no version and no preview specified while the current version to
-                // upgrade to is a prerelease so let's grab the first non-preview version
-                // since we're supporting only one preview version, it's sufficient for
-                // us to take second to last version
-                this.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
-            }
+            // if (!args.options.toVersion &&
+            //   !args.options.preview &&
+            //   prerelease(this.toVersion)) {
+            //   // no version and no preview specified while the current version to
+            //   // upgrade to is a prerelease so let's grab the first non-preview version
+            //   // since we're supporting only one preview version, it's sufficient for
+            //   // us to take second to last version
+            //   this.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
+            // }
             this.packageManager = args.options.packageManager || 'npm';
             this.shell = args.options.shell || 'bash';
             if (this.supportedVersions.indexOf(this.toVersion) < 0) {
@@ -479,9 +477,9 @@ _SpfxProjectUpgradeCommand_instances = new WeakSet(), _SpfxProjectUpgradeCommand
             preview: args.options.preview
         });
         // uncomment to support upgrading to preview releases
-        if ((0, semver_1.prerelease)(this.telemetryProperties.toVersion) && !args.options.preview) {
-            this.telemetryProperties.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
-        }
+        // if (prerelease(this.telemetryProperties.toVersion) && !args.options.preview) {
+        //   this.telemetryProperties.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
+        // }
     });
 }, _SpfxProjectUpgradeCommand_initOptions = function _SpfxProjectUpgradeCommand_initOptions() {
     this.options.unshift({

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

@@ -429,7 +429,7 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
                     fix: 'npm i -g yo@4'
                 }
             },
-            '1.16.0-rc.0': {
+            '1.16.0': {
                 gulpCli: {
                     range: '^1 || ^2',
                     fix: 'npm i -g gulp-cli@2'

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

@@ -128,7 +128,7 @@ _SpoAppDeployCommand_instances = new WeakSet(), _SpoAppDeployCommand_initTelemet
         return true;
     }));
 }, _SpoAppDeployCommand_initOptionSets = function _SpoAppDeployCommand_initOptionSets() {
-    this.optionSets.push(['id', 'name']);
+    this.optionSets.push({ options: ['id', 'name'] });
 };
 module.exports = new SpoAppDeployCommand();
 //# sourceMappingURL=app-deploy.js.map

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

@@ -120,7 +120,7 @@ _SpoAppGetCommand_instances = new WeakSet(), _SpoAppGetCommand_initTelemetry = f
         return true;
     }));
 }, _SpoAppGetCommand_initOptionSets = function _SpoAppGetCommand_initOptionSets() {
-    this.optionSets.push(['id', 'name']);
+    this.optionSets.push({ options: ['id', 'name'] });
 };
 module.exports = new SpoAppGetCommand();
 //# sourceMappingURL=app-get.js.map

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

@@ -15,7 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoAppListCommand_instances, _SpoAppListCommand_initTelemetry, _SpoAppListCommand_initOptions, _SpoAppListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const request_1 = require("../../../../request");
+const odata_1 = require("../../../../utils/odata");
 const spo_1 = require("../../../../utils/spo");
 const validation_1 = require("../../../../utils/validation");
 const commands_1 = require("../../commands");
@@ -48,16 +48,9 @@ class SpoAppListCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
                 if (this.verbose) {
                     logger.logToStderr(`Retrieving apps...`);
                 }
-                const requestOptions = {
-                    url: `${appCatalogSiteUrl}/_api/web/${scope}appcatalog/AvailableApps`,
-                    headers: {
-                        accept: 'application/json;odata=nometadata'
-                    },
-                    responseType: 'json'
-                };
-                const apps = yield request_1.default.get(requestOptions);
-                if (apps.value && apps.value.length > 0) {
-                    logger.log(apps.value);
+                const apps = yield odata_1.odata.getAllItems(`${appCatalogSiteUrl}/_api/web/${scope}appcatalog/AvailableApps`);
+                if (apps && apps.length > 0) {
+                    logger.log(apps);
                 }
                 else {
                     if (this.verbose) {

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

@@ -127,7 +127,7 @@ _SpoContentTypeGetCommand_instances = new WeakSet(), _SpoContentTypeGetCommand_i
 }, _SpoContentTypeGetCommand_initTypes = function _SpoContentTypeGetCommand_initTypes() {
     this.types.string.push('id', 'i');
 }, _SpoContentTypeGetCommand_initOptionSets = function _SpoContentTypeGetCommand_initOptionSets() {
-    this.optionSets.push(['id', 'name']);
+    this.optionSets.push({ options: ['id', 'name'] });
 };
 module.exports = new SpoContentTypeGetCommand();
 //# sourceMappingURL=contenttype-get.js.map

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

@@ -15,8 +15,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoContentTypeListCommand_instances, _SpoContentTypeListCommand_initTelemetry, _SpoContentTypeListCommand_initOptions, _SpoContentTypeListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
+const odata_1 = require("../../../../utils/odata");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -44,15 +44,8 @@ class SpoContentTypeListCommand extends SpoCommand_1.default {
                 if (args.options.category) {
                     requestUrl += `?$filter=Group eq '${formatting_1.formatting.encodeQueryParameter(args.options.category)}'`;
                 }
-                const requestOptions = {
-                    url: requestUrl,
-                    headers: {
-                        accept: 'application/json;odata=nometadata'
-                    },
-                    responseType: 'json'
-                };
-                const res = yield request_1.default.get(requestOptions);
-                logger.log(res.value);
+                const res = yield odata_1.odata.getAllItems(requestUrl);
+                logger.log(res);
             }
             catch (err) {
                 this.handleRejectedODataJsonPromise(err);

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

@@ -128,7 +128,7 @@ _SpoContentTypeRemoveCommand_instances = new WeakSet(), _SpoContentTypeRemoveCom
 }, _SpoContentTypeRemoveCommand_initTypes = function _SpoContentTypeRemoveCommand_initTypes() {
     this.types.string.push('id', 'i');
 }, _SpoContentTypeRemoveCommand_initOptionSets = function _SpoContentTypeRemoveCommand_initOptionSets() {
-    this.optionSets.push(['id', 'name']);
+    this.optionSets.push({ options: ['id', 'name'] });
 };
 module.exports = new SpoContentTypeRemoveCommand();
 //# sourceMappingURL=contenttype-remove.js.map

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

@@ -162,7 +162,7 @@ _SpoContentTypeSetCommand_instances = new WeakSet(), _SpoContentTypeSetCommand_i
 }, _SpoContentTypeSetCommand_initTypes = function _SpoContentTypeSetCommand_initTypes() {
     this.types.string.push('id', 'i');
 }, _SpoContentTypeSetCommand_initOptionSets = function _SpoContentTypeSetCommand_initOptionSets() {
-    this.optionSets.push(['id', 'name']);
+    this.optionSets.push({ options: ['id', 'name'] });
 };
 module.exports = new SpoContentTypeSetCommand();
 //# sourceMappingURL=contenttype-set.js.map

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

@@ -182,7 +182,7 @@ _SpoCustomActionGetCommand_instances = new WeakSet(), _SpoCustomActionGetCommand
         return true;
     }));
 }, _SpoCustomActionGetCommand_initOptionSets = function _SpoCustomActionGetCommand_initOptionSets() {
-    this.optionSets.push(['id', 'title']);
+    this.optionSets.push({ options: ['id', 'title'] });
 };
 module.exports = new SpoCustomActionGetCommand();
 //# sourceMappingURL=customaction-get.js.map

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

@@ -15,7 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoCustomActionListCommand_instances, _SpoCustomActionListCommand_initTelemetry, _SpoCustomActionListCommand_initOptions, _SpoCustomActionListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const request_1 = require("../../../../request");
+const odata_1 = require("../../../../utils/odata");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -69,22 +69,9 @@ class SpoCustomActionListCommand extends SpoCommand_1.default {
         });
     }
     getCustomActions(options) {
-        const requestOptions = {
-            url: `${options.webUrl}/_api/${options.scope}/UserCustomActions`,
-            headers: {
-                accept: 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        return new Promise((resolve, reject) => {
-            request_1.default
-                .get(requestOptions)
-                .then((response) => {
-                resolve(response.value);
-            })
-                .catch((error) => {
-                reject(error);
-            });
+        return __awaiter(this, void 0, void 0, function* () {
+            const response = yield odata_1.odata.getAllItems(`${options.webUrl}/_api/${options.scope}/UserCustomActions`);
+            return response;
         });
     }
     /**

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

@@ -178,7 +178,7 @@ _SpoCustomActionRemoveCommand_instances = new WeakSet(), _SpoCustomActionRemoveC
         return true;
     }));
 }, _SpoCustomActionRemoveCommand_initOptionSets = function _SpoCustomActionRemoveCommand_initOptionSets() {
-    this.optionSets.push(['id', 'title']);
+    this.optionSets.push({ options: ['id', 'title'] });
 };
 module.exports = new SpoCustomActionRemoveCommand();
 //# sourceMappingURL=customaction-remove.js.map

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

@@ -38,44 +38,60 @@ class SpoEventreceiverGetCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            let requestUrl = `${args.options.webUrl}/_api/`;
-            let listUrl = '';
-            let filter = '?$filter=';
+            try {
+                const eventReceiver = yield this.getEventReceiver(args);
+                logger.log(eventReceiver);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+    getEventReceiver(args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `${args.options.webUrl}/_api`,
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            if (!args.options.scope || args.options.scope === 'web') {
+                requestOptions.url += `/web`;
+            }
+            else {
+                requestOptions.url += '/site';
+            }
             if (args.options.listId) {
-                listUrl = `lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')/`;
+                requestOptions.url += `/lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')`;
             }
             else if (args.options.listTitle) {
-                listUrl = `lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')/`;
+                requestOptions.url += `/lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
             }
             else if (args.options.listUrl) {
                 const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
-                listUrl = `GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/`;
-            }
-            if (!args.options.scope || args.options.scope === 'web') {
-                requestUrl += `web/${listUrl}eventreceivers`;
-            }
-            else {
-                requestUrl += 'site/eventreceivers';
+                requestOptions.url += `/GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
             }
+            requestOptions.url += '/eventreceivers';
             if (args.options.id) {
-                filter += `receiverid eq (guid'${args.options.id}')`;
+                requestOptions.url += `(guid'${args.options.id}')`;
+                const res = yield request_1.default.get(requestOptions);
+                // Instead of failing, the request will return an 'odata.null' object if the event receiver doesn't exist.
+                if (res && res['odata.null']) {
+                    throw `The specified event receiver '${args.options.id}' does not exist.`;
+                }
+                return res;
             }
             else {
-                filter += `receivername eq '${args.options.name}'`;
-            }
-            const requestOptions = {
-                url: requestUrl + filter,
-                headers: {
-                    'accept': 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            try {
+                requestOptions.url += `?$filter=receivername eq '${args.options.name}'`;
                 const res = yield request_1.default.get(requestOptions);
-                logger.log(res.value);
-            }
-            catch (err) {
-                this.handleRejectedODataJsonPromise(err);
+                if (res.value.length === 0) {
+                    throw `The specified event receiver '${args.options.name}' does not exist.`;
+                }
+                if (res.value && res.value.length > 1) {
+                    throw `Multiple event receivers with name '${args.options.name}' found: ${res.value.map(x => x.ReceiverId)}`;
+                }
+                return res.value[0];
             }
         });
     }
@@ -130,7 +146,7 @@ _SpoEventreceiverGetCommand_instances = new WeakSet(), _SpoEventreceiverGetComma
         return true;
     }));
 }, _SpoEventreceiverGetCommand_initOptionSets = function _SpoEventreceiverGetCommand_initOptionSets() {
-    this.optionSets.push(['name', 'id']);
+    this.optionSets.push({ options: ['name', 'id'] });
 };
 module.exports = new SpoEventreceiverGetCommand();
 //# sourceMappingURL=eventreceiver-get.js.map