@pnp/cli-microsoft365 6.4.0 → 6.5.0-beta.699c15b

package/dist/m365/spfx/commands/project/project-upgrade/{upgrade-1.17.0-beta.3.js → upgrade-1.17.0.js}

@@ -32,36 +32,36 @@ const FN010010_YORC_sdkVersions_teams_js_1 = require("./rules/FN010010_YORC_sdkV
 const FN014008_CODE_launch_hostedWorkbench_type_1 = require("./rules/FN014008_CODE_launch_hostedWorkbench_type");
 const FN014009_CODE_launch_hostedWorkbench_url_1 = require("./rules/FN014009_CODE_launch_hostedWorkbench_url");
 module.exports = [
-    new FN001001_DEP_microsoft_sp_core_library_1.FN001001_DEP_microsoft_sp_core_library('1.17.0-beta.3'),
-    new FN001002_DEP_microsoft_sp_lodash_subset_1.FN001002_DEP_microsoft_sp_lodash_subset('1.17.0-beta.3'),
-    new FN001003_DEP_microsoft_sp_office_ui_fabric_core_1.FN001003_DEP_microsoft_sp_office_ui_fabric_core('1.17.0-beta.3'),
-    new FN001004_DEP_microsoft_sp_webpart_base_1.FN001004_DEP_microsoft_sp_webpart_base('1.17.0-beta.3'),
-    new FN001011_DEP_microsoft_sp_dialog_1.FN001011_DEP_microsoft_sp_dialog('1.17.0-beta.3'),
-    new FN001012_DEP_microsoft_sp_application_base_1.FN001012_DEP_microsoft_sp_application_base('1.17.0-beta.3'),
-    new FN001014_DEP_microsoft_sp_listview_extensibility_1.FN001014_DEP_microsoft_sp_listview_extensibility('1.17.0-beta.3'),
-    new FN001021_DEP_microsoft_sp_property_pane_1.FN001021_DEP_microsoft_sp_property_pane('1.17.0-beta.3'),
-    new FN001023_DEP_microsoft_sp_component_base_1.FN001023_DEP_microsoft_sp_component_base('1.17.0-beta.3'),
-    new FN001024_DEP_microsoft_sp_diagnostics_1.FN001024_DEP_microsoft_sp_diagnostics('1.17.0-beta.3'),
-    new FN001025_DEP_microsoft_sp_dynamic_data_1.FN001025_DEP_microsoft_sp_dynamic_data('1.17.0-beta.3'),
-    new FN001026_DEP_microsoft_sp_extension_base_1.FN001026_DEP_microsoft_sp_extension_base('1.17.0-beta.3'),
-    new FN001027_DEP_microsoft_sp_http_1.FN001027_DEP_microsoft_sp_http('1.17.0-beta.3'),
-    new FN001028_DEP_microsoft_sp_list_subscription_1.FN001028_DEP_microsoft_sp_list_subscription('1.17.0-beta.3'),
-    new FN001029_DEP_microsoft_sp_loader_1.FN001029_DEP_microsoft_sp_loader('1.17.0-beta.3'),
-    new FN001030_DEP_microsoft_sp_module_interfaces_1.FN001030_DEP_microsoft_sp_module_interfaces('1.17.0-beta.3'),
-    new FN001031_DEP_microsoft_sp_odata_types_1.FN001031_DEP_microsoft_sp_odata_types('1.17.0-beta.3'),
-    new FN001032_DEP_microsoft_sp_page_context_1.FN001032_DEP_microsoft_sp_page_context('1.17.0-beta.3'),
-    new FN001013_DEP_microsoft_decorators_1.FN001013_DEP_microsoft_decorators('1.17.0-beta.3'),
-    new FN001034_DEP_microsoft_sp_adaptive_card_extension_base_1.FN001034_DEP_microsoft_sp_adaptive_card_extension_base('1.17.0-beta.3'),
-    new FN002022_DEVDEP_microsoft_eslint_plugin_spfx_1.FN002022_DEVDEP_microsoft_eslint_plugin_spfx('1.17.0-beta.3'),
-    new FN002023_DEVDEP_microsoft_eslint_config_spfx_1.FN002023_DEVDEP_microsoft_eslint_config_spfx('1.17.0-beta.3'),
-    new FN002001_DEVDEP_microsoft_sp_build_web_1.FN002001_DEVDEP_microsoft_sp_build_web('1.17.0-beta.3'),
-    new FN002002_DEVDEP_microsoft_sp_module_interfaces_1.FN002002_DEVDEP_microsoft_sp_module_interfaces('1.17.0-beta.3'),
+    new FN001001_DEP_microsoft_sp_core_library_1.FN001001_DEP_microsoft_sp_core_library('1.17.0'),
+    new FN001002_DEP_microsoft_sp_lodash_subset_1.FN001002_DEP_microsoft_sp_lodash_subset('1.17.0'),
+    new FN001003_DEP_microsoft_sp_office_ui_fabric_core_1.FN001003_DEP_microsoft_sp_office_ui_fabric_core('1.17.0'),
+    new FN001004_DEP_microsoft_sp_webpart_base_1.FN001004_DEP_microsoft_sp_webpart_base('1.17.0'),
+    new FN001011_DEP_microsoft_sp_dialog_1.FN001011_DEP_microsoft_sp_dialog('1.17.0'),
+    new FN001012_DEP_microsoft_sp_application_base_1.FN001012_DEP_microsoft_sp_application_base('1.17.0'),
+    new FN001014_DEP_microsoft_sp_listview_extensibility_1.FN001014_DEP_microsoft_sp_listview_extensibility('1.17.0'),
+    new FN001021_DEP_microsoft_sp_property_pane_1.FN001021_DEP_microsoft_sp_property_pane('1.17.0'),
+    new FN001023_DEP_microsoft_sp_component_base_1.FN001023_DEP_microsoft_sp_component_base('1.17.0'),
+    new FN001024_DEP_microsoft_sp_diagnostics_1.FN001024_DEP_microsoft_sp_diagnostics('1.17.0'),
+    new FN001025_DEP_microsoft_sp_dynamic_data_1.FN001025_DEP_microsoft_sp_dynamic_data('1.17.0'),
+    new FN001026_DEP_microsoft_sp_extension_base_1.FN001026_DEP_microsoft_sp_extension_base('1.17.0'),
+    new FN001027_DEP_microsoft_sp_http_1.FN001027_DEP_microsoft_sp_http('1.17.0'),
+    new FN001028_DEP_microsoft_sp_list_subscription_1.FN001028_DEP_microsoft_sp_list_subscription('1.17.0'),
+    new FN001029_DEP_microsoft_sp_loader_1.FN001029_DEP_microsoft_sp_loader('1.17.0'),
+    new FN001030_DEP_microsoft_sp_module_interfaces_1.FN001030_DEP_microsoft_sp_module_interfaces('1.17.0'),
+    new FN001031_DEP_microsoft_sp_odata_types_1.FN001031_DEP_microsoft_sp_odata_types('1.17.0'),
+    new FN001032_DEP_microsoft_sp_page_context_1.FN001032_DEP_microsoft_sp_page_context('1.17.0'),
+    new FN001013_DEP_microsoft_decorators_1.FN001013_DEP_microsoft_decorators('1.17.0'),
+    new FN001034_DEP_microsoft_sp_adaptive_card_extension_base_1.FN001034_DEP_microsoft_sp_adaptive_card_extension_base('1.17.0'),
+    new FN002022_DEVDEP_microsoft_eslint_plugin_spfx_1.FN002022_DEVDEP_microsoft_eslint_plugin_spfx('1.17.0'),
+    new FN002023_DEVDEP_microsoft_eslint_config_spfx_1.FN002023_DEVDEP_microsoft_eslint_config_spfx('1.17.0'),
+    new FN002001_DEVDEP_microsoft_sp_build_web_1.FN002001_DEVDEP_microsoft_sp_build_web('1.17.0'),
+    new FN002002_DEVDEP_microsoft_sp_module_interfaces_1.FN002002_DEVDEP_microsoft_sp_module_interfaces('1.17.0'),
     new FN002020_DEVDEP_microsoft_rush_stack_compiler_4_5_1.FN002020_DEVDEP_microsoft_rush_stack_compiler_4_5('0.4.0'),
     new FN002024_DEVDEP_eslint_1.FN002024_DEVDEP_eslint('8.7.0'),
     new FN007002_CFG_S_initialPage_1.FN007002_CFG_S_initialPage('https://{tenantDomain}/_layouts/workbench.aspx'),
-    new FN010001_YORC_version_1.FN010001_YORC_version('1.17.0-beta.3'),
+    new FN010001_YORC_version_1.FN010001_YORC_version('1.17.0'),
     new FN010010_YORC_sdkVersions_teams_js_1.FN010010_YORC_sdkVersions_teams_js('2.9.1'),
     new FN014008_CODE_launch_hostedWorkbench_type_1.FN014008_CODE_launch_hostedWorkbench_type('edge'),
     new FN014009_CODE_launch_hostedWorkbench_url_1.FN014009_CODE_launch_hostedWorkbench_url('https://{tenantDomain}/_layouts/workbench.aspx')
 ];
-//# sourceMappingURL=upgrade-1.17.0-beta.3.js.map
+//# sourceMappingURL=upgrade-1.17.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");
@@ -77,7 +75,7 @@ class SpfxProjectUpgradeCommand extends base_project_command_1.BaseProjectComman
             '1.15.2',
             '1.16.0',
             '1.16.1',
-            '1.17.0-beta.3'
+            '1.17.0'
         ];
         __classPrivateFieldGet(this, _SpfxProjectUpgradeCommand_instances, "m", _SpfxProjectUpgradeCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpfxProjectUpgradeCommand_instances, "m", _SpfxProjectUpgradeCommand_initOptions).call(this);
@@ -91,15 +89,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) {
@@ -486,9 +484,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

@@ -467,6 +467,21 @@ class SpfxDoctorCommand extends base_project_command_1.BaseProjectCommand {
                     range: '^4',
                     fix: 'npm i -g yo@4'
                 }
+            },
+            '1.17.0': {
+                gulpCli: {
+                    range: '^1 || ^2',
+                    fix: 'npm i -g gulp-cli@2'
+                },
+                node: {
+                    range: '>=16.13.0 <17.0.0',
+                    fix: 'Install Node.js >=16.13.0 <17.0.0'
+                },
+                sp: SharePointVersion.SPO,
+                yo: {
+                    range: '^4',
+                    fix: 'npm i -g yo@4'
+                }
             }
         };
         __classPrivateFieldGet(this, _SpfxDoctorCommand_instances, "m", _SpfxDoctorCommand_initTelemetry).call(this);

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

@@ -15,11 +15,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoApplicationCustomizerAddCommand_instances, _SpoApplicationCustomizerAddCommand_initOptions, _SpoApplicationCustomizerAddCommand_initTelemetry, _SpoApplicationCustomizerAddCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const Cli_1 = require("../../../../cli/Cli");
+const request_1 = require("../../../../request");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
-const spoCustomActionAddCommand = require("../customaction/customaction-add");
 class SpoApplicationCustomizerAddCommand extends SpoCommand_1.default {
     get name() {
         return commands_1.default.APPLICATIONCUSTOMIZER_ADD;
@@ -39,17 +38,25 @@ class SpoApplicationCustomizerAddCommand extends SpoCommand_1.default {
             if (this.verbose) {
                 logger.logToStderr(`Adding application customizer with title '${args.options.title}' and clientSideComponentId '${args.options.clientSideComponentId}' to the site`);
             }
-            const options = {
-                webUrl: args.options.webUrl,
-                name: args.options.title,
-                title: args.options.title,
-                clientSideComponentId: args.options.clientSideComponentId,
-                clientSideComponentProperties: args.options.clientSideComponentProperties || '',
-                location: 'ClientSideExtension.ApplicationCustomizer',
-                debug: this.debug,
-                verbose: this.verbose
+            const requestBody = {
+                Title: args.options.title,
+                Name: args.options.title,
+                Location: 'ClientSideExtension.ApplicationCustomizer',
+                ClientSideComponentId: args.options.clientSideComponentId
             };
-            yield Cli_1.Cli.executeCommand(spoCustomActionAddCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
+            if (args.options.clientSideComponentProperties) {
+                requestBody.ClientSideComponentProperties = args.options.clientSideComponentProperties;
+            }
+            const scope = args.options.scope || 'Site';
+            const requestOptions = {
+                url: `${args.options.webUrl}/_api/${scope}/UserCustomActions`,
+                headers: {
+                    accept: 'application/json;odata=nometadata'
+                },
+                data: requestBody,
+                responseType: 'json'
+            };
+            yield request_1.default.post(requestOptions);
         });
     }
 }
@@ -62,11 +69,14 @@ _SpoApplicationCustomizerAddCommand_instances = new WeakSet(), _SpoApplicationCu
         option: '-i, --clientSideComponentId <clientSideComponentId>'
     }, {
         option: '--clientSideComponentProperties [clientSideComponentProperties]'
+    }, {
+        option: '-s, --scope [scope]', autocomplete: SpoApplicationCustomizerAddCommand.scopes
     });
 }, _SpoApplicationCustomizerAddCommand_initTelemetry = function _SpoApplicationCustomizerAddCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            clientSideComponentProperties: typeof args.options.clientSideComponentProperties !== 'undefined'
+            clientSideComponentProperties: typeof args.options.clientSideComponentProperties !== 'undefined',
+            scope: typeof args.options.scope !== 'undefined'
         });
     });
 }, _SpoApplicationCustomizerAddCommand_initValidators = function _SpoApplicationCustomizerAddCommand_initValidators() {
@@ -88,8 +98,12 @@ _SpoApplicationCustomizerAddCommand_instances = new WeakSet(), _SpoApplicationCu
                 return `An error has occurred while parsing clientSideComponentProperties: ${e}`;
             }
         }
+        if (args.options.scope && SpoApplicationCustomizerAddCommand.scopes.indexOf(args.options.scope) < 0) {
+            return `${args.options.scope} is not a valid value for allowedMembers. Valid values are ${SpoApplicationCustomizerAddCommand.scopes.join(', ')}`;
+        }
         return true;
     }));
 };
+SpoApplicationCustomizerAddCommand.scopes = ['Site', 'Web'];
 module.exports = new SpoApplicationCustomizerAddCommand();
 //# sourceMappingURL=applicationcustomizer-add.js.map

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

@@ -0,0 +1,72 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _SpoApplicationCustomizerListCommand_instances, _SpoApplicationCustomizerListCommand_initOptions, _SpoApplicationCustomizerListCommand_initTelemetry, _SpoApplicationCustomizerListCommand_initValidators;
+Object.defineProperty(exports, "__esModule", { value: true });
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
+const SpoCommand_1 = require("../../../base/SpoCommand");
+const commands_1 = require("../../commands");
+class SpoApplicationCustomizerListCommand extends SpoCommand_1.default {
+    get name() {
+        return commands_1.default.APPLICATIONCUSTOMIZER_LIST;
+    }
+    get description() {
+        return 'Get a list of application customizers that are added to a site.';
+    }
+    defaultProperties() {
+        return ['Name', 'Location', 'Scope', 'Id'];
+    }
+    constructor() {
+        super();
+        _SpoApplicationCustomizerListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoApplicationCustomizerListCommand_instances, "m", _SpoApplicationCustomizerListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoApplicationCustomizerListCommand_instances, "m", _SpoApplicationCustomizerListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoApplicationCustomizerListCommand_instances, "m", _SpoApplicationCustomizerListCommand_initValidators).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving application customizers...`);
+            }
+            const applicationCustomizers = yield spo_1.spo.getCustomActions(args.options.webUrl, args.options.scope, `Location eq 'ClientSideExtension.ApplicationCustomizer'`);
+            logger.log(applicationCustomizers);
+        });
+    }
+}
+_SpoApplicationCustomizerListCommand_instances = new WeakSet(), _SpoApplicationCustomizerListCommand_initOptions = function _SpoApplicationCustomizerListCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '-s, --scope [scope]',
+        autocomplete: SpoApplicationCustomizerListCommand.scopes
+    });
+}, _SpoApplicationCustomizerListCommand_initTelemetry = function _SpoApplicationCustomizerListCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            scope: typeof args.options.scope !== 'undefined'
+        });
+    });
+}, _SpoApplicationCustomizerListCommand_initValidators = function _SpoApplicationCustomizerListCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (args.options.scope && SpoApplicationCustomizerListCommand.scopes.indexOf(args.options.scope) < 0) {
+            return `${args.options.scope} is not a valid scope. Allowed values are ${SpoApplicationCustomizerListCommand.scopes.join(', ')}`;
+        }
+        return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
+    }));
+};
+SpoApplicationCustomizerListCommand.scopes = ['All', 'Site', 'Web'];
+module.exports = new SpoApplicationCustomizerListCommand();
+//# sourceMappingURL=applicationcustomizer-list.js.map

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

@@ -48,7 +48,8 @@ class SpoCommandSetAddCommand extends SpoCommand_1.default {
                     Title: args.options.title,
                     Location: location,
                     ClientSideComponentId: args.options.clientSideComponentId,
-                    RegistrationId: listType
+                    RegistrationId: listType,
+                    RegistrationType: 1
                 };
                 if (args.options.clientSideComponentProperties) {
                     requestBody.ClientSideComponentProperties = args.options.clientSideComponentProperties;

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

@@ -58,36 +58,39 @@ class SpoCommandSetRemoveCommand extends SpoCommand_1.default {
             }
         });
     }
-    getCommandSetId(options) {
+    getCustomAction(options) {
         return __awaiter(this, void 0, void 0, function* () {
+            let commandSets = [];
             if (options.id) {
-                return options.id;
+                const commandSet = yield spo_1.spo.getCustomActionById(options.webUrl, options.id, options.scope);
+                if (commandSet) {
+                    commandSets.push(commandSet);
+                }
             }
-            let commandSets = [];
-            if (options.title) {
+            else if (options.title) {
                 commandSets = yield spo_1.spo.getCustomActions(options.webUrl, options.scope, `(Title eq '${formatting_1.formatting.encodeQueryParameter(options.title)}') and (startswith(Location,'ClientSideExtension.ListViewCommandSet'))`);
             }
             else {
                 commandSets = yield spo_1.spo.getCustomActions(options.webUrl, options.scope, `(ClientSideComponentId eq guid'${options.clientSideComponentId}') and (startswith(Location,'ClientSideExtension.ListViewCommandSet'))`);
             }
             if (commandSets.length === 0) {
-                throw `No user commandsets with ${options.title ? `title '${options.title}'` : `ClientSideComponentId '${options.clientSideComponentId}'`} found`;
+                throw `No user commandsets with ${options.title && `title '${options.title}'` || options.clientSideComponentId && `ClientSideComponentId '${options.clientSideComponentId}'` || options.id && `id '${options.id}'`} found`;
             }
             if (commandSets.length > 1) {
                 throw `Multiple user commandsets with ${options.title ? `title '${options.title}'` : `ClientSideComponentId '${options.clientSideComponentId}'`} found. Please disambiguate using IDs: ${commandSets.map((commandSet) => commandSet.Id).join(', ')}`;
             }
-            return commandSets[0].Id;
+            return commandSets[0];
         });
     }
     deleteCommandset(args) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!args.options.scope) {
-                args.options.scope = 'Site';
+                args.options.scope = 'All';
             }
             try {
-                const id = yield this.getCommandSetId(args.options);
+                const customAction = yield this.getCustomAction(args.options);
                 const requestOptions = {
-                    url: `${args.options.webUrl}/_api/${args.options.scope}/UserCustomActions('${formatting_1.formatting.encodeQueryParameter(id)}')`,
+                    url: `${args.options.webUrl}/_api/${customAction.Scope === 3 ? "Web" : "Site"}/UserCustomActions('${formatting_1.formatting.encodeQueryParameter(customAction.Id)}')`,
                     headers: {
                         accept: 'application/json;odata=nometadata'
                     },

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

@@ -42,7 +42,7 @@ class SpoCommandSetSetCommand extends SpoCommand_1.default {
                 logger.logToStderr(`Updating ListView Command Set ${args.options.clientSideComponentId} to site '${args.options.webUrl}'...`);
             }
             if (!args.options.scope) {
-                args.options.scope = 'Site';
+                args.options.scope = 'All';
             }
             const location = this.getLocation(args.options.location ? args.options.location : '');
             try {
@@ -59,9 +59,9 @@ class SpoCommandSetSetCommand extends SpoCommand_1.default {
                 if (args.options.clientSideComponentProperties) {
                     requestBody.ClientSideComponentProperties = args.options.clientSideComponentProperties;
                 }
-                const id = yield this.getCommandSetId(args.options);
+                const customAction = yield this.getCustomAction(args.options);
                 const requestOptions = {
-                    url: `${args.options.webUrl}/_api/${args.options.scope}/UserCustomActions('${formatting_1.formatting.encodeQueryParameter(id)}')`,
+                    url: `${args.options.webUrl}/_api/${customAction.Scope === 3 ? "Web" : "Site"}/UserCustomActions('${formatting_1.formatting.encodeQueryParameter(customAction.Id)}')`,
                     headers: {
                         accept: 'application/json;odata=nometadata',
                         'X-HTTP-Method': 'MERGE'
@@ -76,25 +76,28 @@ class SpoCommandSetSetCommand extends SpoCommand_1.default {
             }
         });
     }
-    getCommandSetId(options) {
+    getCustomAction(options) {
         return __awaiter(this, void 0, void 0, function* () {
+            let commandSets = [];
             if (options.id) {
-                return options.id;
+                const commandSet = yield spo_1.spo.getCustomActionById(options.webUrl, options.id, options.scope);
+                if (commandSet) {
+                    commandSets.push(commandSet);
+                }
             }
-            let commandSets = [];
-            if (options.title) {
+            else if (options.title) {
                 commandSets = yield spo_1.spo.getCustomActions(options.webUrl, options.scope, `(Title eq '${formatting_1.formatting.encodeQueryParameter(options.title)}') and (startswith(Location,'ClientSideExtension.ListViewCommandSet'))`);
             }
             else {
                 commandSets = yield spo_1.spo.getCustomActions(options.webUrl, options.scope, `(ClientSideComponentId eq guid'${options.clientSideComponentId}') and (startswith(Location,'ClientSideExtension.ListViewCommandSet'))`);
             }
             if (commandSets.length === 0) {
-                throw `No user commandsets with ${options.title ? `title '${options.title}'` : `ClientSideComponentId '${options.clientSideComponentId}'`} found`;
+                throw `No user commandsets with ${options.title && `title '${options.title}'` || options.clientSideComponentId && `ClientSideComponentId '${options.clientSideComponentId}'` || options.id && `id '${options.id}'`} found`;
             }
             if (commandSets.length > 1) {
                 throw `Multiple user commandsets with ${options.title ? `title '${options.title}'` : `ClientSideComponentId '${options.clientSideComponentId}'`} found. Please disambiguate using IDs: ${commandSets.map((commandSet) => commandSet.Id).join(', ')}`;
             }
-            return commandSets[0].Id;
+            return commandSets[0];
         });
     }
     getLocation(location) {

package/dist/m365/spo/commands/file/file-move.js

@@ -147,7 +147,7 @@ class SpoFileMoveCommand extends SpoCommand_1.default {
                 yield Cli_1.Cli.executeCommand(removeCommand, { options: Object.assign(Object.assign({}, removeOptions), { _: [] }) });
             }
             catch (err) {
-                if (err.error !== undefined && err.error.message !== undefined && err.error.message.includes('does not exist')) {
+                if (err !== undefined && err.message !== undefined && err.message.includes('does not exist')) {
                 }
                 else {
                     throw err;

package/dist/m365/spo/commands/file/file-retentionlabel-ensure.js

@@ -42,6 +42,9 @@ class SpoFileRetentionLabelEnsureCommand extends SpoCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 const fileProperties = yield this.getFileProperties(logger, args);
+                if (args.options.assetId) {
+                    yield this.applyAssetId(args.options.webUrl, fileProperties.ListItemAllFields.ParentList.Id, fileProperties.ListItemAllFields.Id, args.options.assetId);
+                }
                 const options = {
                     webUrl: args.options.webUrl,
                     listId: fileProperties.ListItemAllFields.ParentList.Id,
@@ -84,12 +87,28 @@ class SpoFileRetentionLabelEnsureCommand extends SpoCommand_1.default {
             return yield request_1.default.get(requestOptions);
         });
     }
+    applyAssetId(webUrl, listId, listItemId, assetId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestUrl = `${webUrl}/_api/web/lists(guid'${formatting_1.formatting.encodeQueryParameter(listId)}')`;
+            const requestBody = { "formValues": [{ "FieldName": "ComplianceAssetId", "FieldValue": assetId }] };
+            const requestOptions = {
+                url: `${requestUrl}/items(${listItemId})/ValidateUpdateListItem()`,
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                data: requestBody,
+                responseType: 'json'
+            };
+            yield request_1.default.post(requestOptions);
+        });
+    }
 }
 _SpoFileRetentionLabelEnsureCommand_instances = new WeakSet(), _SpoFileRetentionLabelEnsureCommand_initTelemetry = function _SpoFileRetentionLabelEnsureCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             fileUrl: typeof args.options.fileUrl !== 'undefined',
-            fileId: typeof args.options.fileId !== 'undefined'
+            fileId: typeof args.options.fileId !== 'undefined',
+            assetId: typeof args.options.assetId !== 'undefined'
         });
     });
 }, _SpoFileRetentionLabelEnsureCommand_initOptions = function _SpoFileRetentionLabelEnsureCommand_initOptions() {
@@ -101,6 +120,8 @@ _SpoFileRetentionLabelEnsureCommand_instances = new WeakSet(), _SpoFileRetention
         option: '--fileUrl [fileUrl]'
     }, {
         option: '-i, --fileId [fileId]'
+    }, {
+        option: '-a, --assetId [assetId]'
     });
 }, _SpoFileRetentionLabelEnsureCommand_initValidators = function _SpoFileRetentionLabelEnsureCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

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

@@ -58,8 +58,14 @@ class SpoListItemGetCommand extends SpoCommand_1.default {
             const propertiesToExpand = propertiesWithSlash.map(e => e.split('/')[0]);
             const expandPropertiesArray = propertiesToExpand.filter((item, pos) => propertiesToExpand.indexOf(item) === pos);
             const fieldExpand = expandPropertiesArray.length > 0 ? `&$expand=${expandPropertiesArray.join(",")}` : ``;
+            if (args.options.id) {
+                requestUrl += `/items(${args.options.id})`;
+            }
+            else {
+                requestUrl += `/GetItemByUniqueId(guid'${args.options.uniqueId}')`;
+            }
             const requestOptions = {
-                url: `${requestUrl}/items(${args.options.id})?$select=${formatting_1.formatting.encodeQueryParameter(propertiesSelect.join(","))}${fieldExpand}`,
+                url: `${requestUrl}?$select=${formatting_1.formatting.encodeQueryParameter(propertiesSelect.join(","))}${fieldExpand}`,
                 headers: {
                     'accept': 'application/json;odata=nometadata'
                 },
@@ -68,7 +74,7 @@ class SpoListItemGetCommand extends SpoCommand_1.default {
             try {
                 const itemProperties = yield request_1.default.get(requestOptions);
                 if (args.options.withPermissions) {
-                    requestOptions.url = `${requestUrl}/items(${args.options.id})/RoleAssignments?$expand=Member,RoleDefinitionBindings`;
+                    requestOptions.url = `${requestUrl}/RoleAssignments?$expand=Member,RoleDefinitionBindings`;
                     const response = yield request_1.default.get(requestOptions);
                     response.value.forEach((r) => {
                         r.RoleDefinitionBindings = formatting_1.formatting.setFriendlyPermissions(r.RoleDefinitionBindings);
@@ -90,6 +96,8 @@ _SpoListItemGetCommand_instances = new WeakSet(), _SpoListItemGetCommand_initTel
             listId: typeof args.options.listId !== 'undefined',
             listTitle: typeof args.options.listTitle !== 'undefined',
             listUrl: typeof args.options.listUrl !== 'undefined',
+            id: typeof args.options.id !== 'undefined',
+            uniqueId: typeof args.options.uniqueId !== 'undefined',
             withPermissions: !!args.options.withPermissions
         });
     });
@@ -97,7 +105,9 @@ _SpoListItemGetCommand_instances = new WeakSet(), _SpoListItemGetCommand_initTel
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-i, --id <id>'
+        option: '-i, --id [id]'
+    }, {
+        option: '--uniqueId [uniqueId]'
     }, {
         option: '-l, --listId [listId]'
     }, {
@@ -119,15 +129,20 @@ _SpoListItemGetCommand_instances = new WeakSet(), _SpoListItemGetCommand_initTel
             !validation_1.validation.isValidGuid(args.options.listId)) {
             return `${args.options.listId} in option listId is not a valid GUID`;
         }
-        if (isNaN(parseInt(args.options.id))) {
+        if (args.options.id &&
+            isNaN(parseInt(args.options.id))) {
             return `${args.options.id} is not a number`;
         }
+        if (args.options.uniqueId &&
+            !validation_1.validation.isValidGuid(args.options.uniqueId)) {
+            return `${args.options.uniqueId} in option uniqueId is not a valid GUID`;
+        }
         return true;
     }));
 }, _SpoListItemGetCommand_initTypes = function _SpoListItemGetCommand_initTypes() {
-    this.types.string.push('webUrl', 'listId', 'listTitle', 'id', 'properties');
+    this.types.string.push('webUrl', 'listId', 'listTitle', 'id', 'uniqueId', 'properties');
 }, _SpoListItemGetCommand_initOptionSets = function _SpoListItemGetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] });
+    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] }, { options: ['id', 'uniqueId'] });
 };
 module.exports = new SpoListItemGetCommand();
 //# sourceMappingURL=listitem-get.js.map

package/dist/m365/spo/commands/listitem/listitem-retentionlabel-ensure.js

@@ -42,6 +42,9 @@ class SpoListItemRetentionLabelEnsureCommand extends SpoCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 const labelInformation = yield this.getLabelInformation(args.options, logger);
+                if (args.options.assetId) {
+                    yield this.applyAssetId(args.options, logger);
+                }
                 yield this.applyLabel(args.options, labelInformation, logger);
             }
             catch (err) {
@@ -106,6 +109,34 @@ class SpoListItemRetentionLabelEnsureCommand extends SpoCommand_1.default {
             yield request_1.default.post(requestOptions);
         });
     }
+    applyAssetId(options, logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Applying the asset Id ${options.assetId}...`);
+            }
+            let requestUrl = `${options.webUrl}/_api/web`;
+            if (options.listId) {
+                requestUrl += `/lists(guid'${formatting_1.formatting.encodeQueryParameter(options.listId)}')/items(${options.listItemId})/ValidateUpdateListItem()`;
+            }
+            else if (options.listTitle) {
+                requestUrl += `/lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(options.listTitle)}')/items(${options.listItemId})/ValidateUpdateListItem()`;
+            }
+            else if (options.listUrl) {
+                const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(options.webUrl, options.listUrl);
+                requestUrl += `/GetList(@listUrl)/items(${options.listItemId})/ValidateUpdateListItem()?@listUrl='${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}'`;
+            }
+            const requestBody = { "formValues": [{ "FieldName": "ComplianceAssetId", "FieldValue": options.assetId }] };
+            const requestOptions = {
+                url: requestUrl,
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                data: requestBody,
+                responseType: 'json'
+            };
+            yield request_1.default.post(requestOptions);
+        });
+    }
 }
 _SpoListItemRetentionLabelEnsureCommand_instances = new WeakSet(), _SpoListItemRetentionLabelEnsureCommand_initTelemetry = function _SpoListItemRetentionLabelEnsureCommand_initTelemetry() {
     this.telemetry.push((args) => {
@@ -114,7 +145,8 @@ _SpoListItemRetentionLabelEnsureCommand_instances = new WeakSet(), _SpoListItemR
             listTitle: typeof args.options.listTitle !== 'undefined',
             listUrl: typeof args.options.listUrl !== 'undefined',
             name: typeof args.options.name !== 'undefined',
-            id: typeof args.options.id !== 'undefined'
+            id: typeof args.options.id !== 'undefined',
+            assetId: typeof args.options.assetId !== 'undefined'
         });
     });
 }, _SpoListItemRetentionLabelEnsureCommand_initOptions = function _SpoListItemRetentionLabelEnsureCommand_initOptions() {
@@ -132,6 +164,8 @@ _SpoListItemRetentionLabelEnsureCommand_instances = new WeakSet(), _SpoListItemR
         option: '-n, --name [name]'
     }, {
         option: '-i, --id [id]'
+    }, {
+        option: '-a, --assetId [assetId]'
     });
 }, _SpoListItemRetentionLabelEnsureCommand_initValidators = function _SpoListItemRetentionLabelEnsureCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {