@pnp/cli-microsoft365 6.0.0-beta.a644c64 → 6.0.0-beta.b689fd4

package/dist/m365/spo/commands/tenant/tenant-appcatalog-add.js

@@ -5,7 +5,7 @@ const Command_1 = require("../../../../Command");
 const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
-const spoSiteClassicAddCommand = require("../site/site-classic-add");
+const spoSiteAddCommand = require("../site/site-add");
 const spoSiteGetCommand = require("../site/site-get");
 const spoSiteRemoveCommand = require("../site/site-remove");
 const spoTenantAppCatalogUrlGetCommand = require("./tenant-appcatalogurl-get");
@@ -21,7 +21,7 @@ class SpoTenantAppCatalogAddCommand extends SpoCommand_1.default {
             logger.logToStderr('Checking for existing app catalog URL...');
         }
         cli_1.Cli
-            .executeCommandWithOutput(spoTenantAppCatalogUrlGetCommand, { options: { _: [] } })
+            .executeCommandWithOutput(spoTenantAppCatalogUrlGetCommand, { options: { output: 'text', _: [] } })
             .then((spoTenantAppCatalogUrlGetCommandOutput) => {
             const appCatalogUrl = spoTenantAppCatalogUrlGetCommandOutput.stdout;
             if (!appCatalogUrl) {
@@ -33,6 +33,7 @@ class SpoTenantAppCatalogAddCommand extends SpoCommand_1.default {
             if (this.verbose) {
                 logger.logToStderr(`Found app catalog URL ${appCatalogUrl}`);
             }
+            //Using JSON.parse
             return this.ensureNoExistingSite(appCatalogUrl, args.options.force, logger);
         })
             .then(() => this.ensureNoExistingSite(args.options.url, args.options.force, logger))
@@ -92,17 +93,19 @@ class SpoTenantAppCatalogAddCommand extends SpoCommand_1.default {
         if (this.verbose) {
             logger.logToStderr(`Creating app catalog at ${options.url}...`);
         }
-        const siteClassicAddOptions = {
+        const siteAddOptions = {
             webTemplate: 'APPCATALOG#0',
             title: 'App catalog',
+            type: 'ClassicSite',
             url: options.url,
             timeZone: options.timeZone,
-            owner: options.owner,
+            owners: options.owner,
             wait: options.wait,
             verbose: this.verbose,
-            debug: this.debug
+            debug: this.debug,
+            removeDeletedSite: false
         };
-        return cli_1.Cli.executeCommand(spoSiteClassicAddCommand, { options: Object.assign(Object.assign({}, siteClassicAddOptions), { _: [] }) });
+        return cli_1.Cli.executeCommand(spoSiteAddCommand, { options: Object.assign(Object.assign({}, siteAddOptions), { _: [] }) });
     }
     options() {
         const options = [

package/dist/m365/spo/commands.js

@@ -189,9 +189,6 @@ exports.default = {
     SITE_APPPERMISSION_LIST: `${prefix} site apppermission list`,
     SITE_APPPERMISSION_REMOVE: `${prefix} site apppermission remove`,
     SITE_APPPERMISSION_SET: `${prefix} site apppermission set`,
-    SITE_CLASSIC_ADD: `${prefix} site classic add`,
-    SITE_CLASSIC_LIST: `${prefix} site classic list`,
-    SITE_CLASSIC_SET: `${prefix} site classic set`,
     SITE_COMMSITE_ENABLE: `${prefix} site commsite enable`,
     SITE_ENSURE: `${prefix} site ensure`,
     SITE_GET: `${prefix} site get`,

package/dist/m365/teams/commands/team/team-clone.js

@@ -15,13 +15,24 @@ class TeamsTeamCloneCommand extends GraphCommand_1.default {
         const telemetryProps = super.getTelemetryProperties(args);
         telemetryProps.description = typeof args.options.description !== 'undefined';
         telemetryProps.classification = typeof args.options.classification !== 'undefined';
-        telemetryProps.visibility = typeof args.options.visibility !== 'undefined';
+        telemetryProps.id = typeof args.options.id !== 'undefined';
+        telemetryProps.teamId = typeof args.options.teamId !== 'undefined';
+        telemetryProps.name = typeof args.options.name !== 'undefined';
+        telemetryProps.displayName = typeof args.options.displayName !== 'undefined';
         return telemetryProps;
     }
     commandAction(logger, args, cb) {
+        if (args.options.teamId) {
+            args.options.id = args.options.teamId;
+            this.warn(logger, `Option 'teamId' is deprecated. Please use 'id' instead.`);
+        }
+        if (args.options.displayName) {
+            args.options.name = args.options.displayName;
+            this.warn(logger, `Option 'displayName' is deprecated. Please use 'name' instead.`);
+        }
         const data = {
-            displayName: args.options.displayName,
-            mailNickname: this.generateMailNickname(args.options.displayName),
+            displayName: args.options.name,
+            mailNickname: this.generateMailNickname(args.options.name),
             partsToClone: args.options.partsToClone
         };
         if (args.options.description) {
@@ -34,7 +45,7 @@ class TeamsTeamCloneCommand extends GraphCommand_1.default {
             data.visibility = args.options.visibility;
         }
         const requestOptions = {
-            url: `${this.resource}/v1.0/teams/${encodeURIComponent(args.options.teamId)}/clone`,
+            url: `${this.resource}/v1.0/teams/${encodeURIComponent(args.options.id)}/clone`,
             headers: {
                 "content-type": "application/json",
                 accept: 'application/json;odata.metadata=none'
@@ -46,13 +57,25 @@ class TeamsTeamCloneCommand extends GraphCommand_1.default {
             .post(requestOptions)
             .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
     }
+    optionSets() {
+        return [
+            ['id', 'teamId'],
+            ['name', 'displayName']
+        ];
+    }
     options() {
         const options = [
             {
-                option: '-i, --teamId <teamId>'
+                option: '-i, --id [teamId]'
             },
             {
-                option: '-n, --displayName <displayName>'
+                option: '--teamId [teamId]'
+            },
+            {
+                option: '-n, --name [name]'
+            },
+            {
+                option: '--displayName [displayName]'
             },
             {
                 option: '-p, --partsToClone <partsToClone>',
@@ -73,9 +96,12 @@ class TeamsTeamCloneCommand extends GraphCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        if (!utils_1.validation.isValidGuid(args.options.teamId)) {
+        if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
+        if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
+        }
         const partsToClone = args.options.partsToClone.replace(/\s/g, '').split(',');
         for (const partToClone of partsToClone) {
             const part = partToClone.toLowerCase();

package/dist/m365/teams/commands/team/team-set.js

@@ -20,8 +20,8 @@ class TeamsTeamSetCommand extends GraphCommand_1.default {
     }
     mapRequestBody(options) {
         const requestBody = {};
-        if (options.displayName) {
-            requestBody.displayName = options.displayName;
+        if (options.name) {
+            requestBody.displayName = options.name;
         }
         if (options.description) {
             requestBody.description = options.description;
@@ -38,9 +38,17 @@ class TeamsTeamSetCommand extends GraphCommand_1.default {
         return requestBody;
     }
     commandAction(logger, args, cb) {
+        if (args.options.teamId) {
+            args.options.id = args.options.teamId;
+            this.warn(logger, `Option 'teamId' is deprecated. Please use 'id' instead.`);
+        }
+        if (args.options.displayName) {
+            args.options.name = args.options.displayName;
+            this.warn(logger, `Option 'displayName' is deprecated. Please use 'name' instead.`);
+        }
         const data = this.mapRequestBody(args.options);
         const requestOptions = {
-            url: `${this.resource}/v1.0/groups/${encodeURIComponent(args.options.teamId)}`,
+            url: `${this.resource}/v1.0/groups/${encodeURIComponent(args.options.id)}`,
             headers: {
                 accept: 'application/json;odata.metadata=none'
             },
@@ -51,10 +59,19 @@ class TeamsTeamSetCommand extends GraphCommand_1.default {
             .patch(requestOptions)
             .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
     }
+    optionSets() {
+        return [['id', 'teamId']];
+    }
     options() {
         const options = [
             {
-                option: '-i, --teamId <teamId>'
+                option: '-i, --id [id]'
+            },
+            {
+                option: '--teamId [teamId]'
+            },
+            {
+                option: '-n, --name [name]'
             },
             {
                 option: '--displayName [displayName]'
@@ -77,9 +94,12 @@ class TeamsTeamSetCommand extends GraphCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        if (!utils_1.validation.isValidGuid(args.options.teamId)) {
+        if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
+        if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
+        }
         if (args.options.visibility) {
             if (args.options.visibility.toLowerCase() !== 'private' && args.options.visibility.toLowerCase() !== 'public') {
                 return `${args.options.visibility} is not a valid visibility type. Allowed values are Private|Public`;

package/docs/docs/cmd/aad/o365group/o365group-recyclebinitem-restore.md

@@ -16,15 +16,33 @@ m365 aad o365group restore [options]
 
 ## Options
 
-`-i, --id <id>`
-: The ID of the Microsoft 365 Group to restore
+`-i, --id [id]`
+: The ID of the Microsoft 365 Group to restore. Specify either `id`, `displayName` or `mailNickname` but not multiple.
+
+`-d, --displayName [displayName]`
+: Display name for the Microsoft 365 Group to restore. Specify either `id`, `displayName` or `mailNickname` but not multiple.
+
+`-m, --mailNickname [mailNickname]`
+: Name of the group e-mail (part before the @). Specify either `id`, `displayName` or `mailNickname` but not multiple.
 
 --8<-- "docs/cmd/_global.md"
 
 ## Examples
 
-Restores the Microsoft 365 Group with id _28beab62-7540-4db1-a23f-29a6018a3848_
+Restores the Microsoft 365 Group with specific ID
 
 ```sh
 m365 aad o365group recyclebinitem restore --id 28beab62-7540-4db1-a23f-29a6018a3848
 ```
+
+Restores the Microsoft 365 Group with specific name
+
+```sh
+m365 aad o365group recyclebinitem restore --displayName "My Group"
+```
+
+Restores the Microsoft 365 Group with specific mail nickname
+
+```sh
+m365 aad o365group recyclebinitem restore --mailNickname "Mygroup"
+```

package/docs/docs/cmd/planner/bucket/bucket-add.md

@@ -19,9 +19,6 @@ m365 planner bucket add [options]
 `--planTitle [planTitle]`
 : Title of the plan to which the bucket belongs. Specify either `planId` or `planTitle` but not both.
 
-`--planName [planName]`
-: (deprecated. Use `planTitle` instead) Title of the plan to which the bucket belongs.
-
 `--ownerGroupId [ownerGroupId]`
 : ID of the group to which the plan belongs. Specify `ownerGroupId` or `ownerGroupName` when using `planTitle`.
 

package/docs/docs/cmd/planner/bucket/bucket-get.md

@@ -22,9 +22,6 @@ m365 planner bucket get [options]
 `--planTitle [planTitle]`
 : Title of the plan to which the bucket belongs. Specify either `planId` or `planTitle` when using `name`.
 
-`--planName [planName]`
-: (deprecated. Use `planTitle` instead) Title of the plan to which the bucket belongs.
-
 `--ownerGroupId [ownerGroupId]`
 : ID of the group to which the plan belongs. Specify `ownerGroupId` or `ownerGroupName` when using `planTitle`.
 

package/docs/docs/cmd/planner/bucket/bucket-list.md

@@ -16,9 +16,6 @@ m365 planner bucket list [options]
 `--planTitle [planTitle]`
 : Title of the plan to list the buckets of. Specify either `planId` or `planTitle` but not both.
 
-`--planName [planName]`
-: (deprecated. Use `planTitle` instead) Title of the plan to which the bucket belongs.
-
 `--ownerGroupId [ownerGroupId]`
 : ID of the group to which the plan belongs. Specify `ownerGroupId` or `ownerGroupName` when using `planTitle`.
 

package/docs/docs/cmd/planner/bucket/bucket-remove.md

@@ -22,9 +22,6 @@ m365 planner bucket remove [options]
 `--planTitle [planTitle]`
 : Title of the plan to which the bucket to remove belongs. Specify either `planId` or `planTitle` when using `name`.
 
-`--planName [planName]`
-: (deprecated. Use `planTitle` instead) Title of the plan to which the bucket belongs.
-
 `--ownerGroupId [ownerGroupId]`
 : ID of the group to which the plan belongs. Specify either `ownerGroupId` or `ownerGroupName` when using `planTitle`.
 

package/docs/docs/cmd/planner/bucket/bucket-set.md

@@ -22,9 +22,6 @@ m365 planner bucket set [options]
 `--planTitle [planTitle]`
 : Title of the plan to update the bucket of. Specify either `planId` or `planTitle` when using `name`. Always use in combination with either `ownerGroupId` or `ownerGroupName`. 
 
-`--planName [planName]`
-: (deprecated. Use `planTitle` instead) Title of the plan to which the bucket belongs.
-
 `--ownerGroupId [ownerGroupId]`
 : ID of the group to which the plan belongs. Specify `ownerGroupId` or `ownerGroupName` when using `planTitle`.
 

package/docs/docs/cmd/planner/plan/plan-get.md

@@ -8,12 +8,6 @@ Retrieve information about the specified plan
 m365 planner plan get [options]
 ```
 
-## Alias
-
-```sh
-m365 planner plan details get [options]
-```
-
 ## Options
 
 `-i, --id [id]`

package/docs/docs/cmd/planner/task/task-add.md

@@ -19,9 +19,6 @@ m365 planner task add [options]
 `--planTitle [planTitle]`
 : Title of the plan to which the task belongs. Specify either `planId` or `planTitle` but not both.
 
-`--planName [planName]`
-: (deprecated. Use `planTitle` instead) Title of the plan to which the bucket belongs.
-
 `--ownerGroupId [ownerGroupId]`
 : ID of the group to which the plan belongs. Specify `ownerGroupId` or `ownerGroupName` when using `planTitle`.
 

package/docs/docs/cmd/planner/task/task-get.md

@@ -37,9 +37,6 @@ m365 planner task details get [options]
 `--planTitle [planTitle]`
 : Title of the plan to which the task belongs. Specify `planId` or `planTitle` when using `bucketName`.
 
-`--planName [planName]`
-: (deprecated. Use `planTitle` instead) Title of the plan to which the bucket belongs.
-
 `--ownerGroupId [ownerGroupId]`
 : ID of the group to which the plan belongs. Specify `ownerGroupId` or `ownerGroupName` when using `planTitle`.
 

package/docs/docs/cmd/planner/task/task-list.md

@@ -22,9 +22,6 @@ m365 planner task list [options]
 `--planTitle [planTitle]`
 : Title of a plan to list the tasks of. To retrieve all tasks from a plan, specify either `planId` or `planTitle` but not both. Always use in combination with either `ownerGroupId` or `ownerGroupName`. Use in combination with `bucketName` to retrieve tasks from a specific bucket.
 
-`--planName [planName]`
-: (deprecated. Use `planTitle` instead) Title of the plan to which the bucket belongs.
-
 `--ownerGroupId [ownerGroupId]`
 : ID of the group to which the plan belongs. Specify `ownerGroupId` or `ownerGroupName` when using `planTitle`.
 

package/docs/docs/cmd/planner/task/task-set.md

@@ -28,9 +28,6 @@ m365 planner task set [options]
 `--planTitle [planTitle]`
 : Title of the plan to which the bucket belongs to. Specify either `planId` or `planTitle` when using `bucketName`.
 
-`--planName [planName]`
-: (deprecated. Use `planTitle` instead) Title of the plan to which the bucket belongs.
-
 `--ownerGroupId [ownerGroupId]`
 : ID of the group to which the plan belongs. Specify `ownerGroupId` or `ownerGroupName` when using `planTitle`.
 

package/docs/docs/cmd/spo/customaction/customaction-get.md

@@ -10,8 +10,11 @@ m365 spo customaction get [options]
 
 ## Options
 
-`-i, --id <id>`
-: ID of the user custom action to retrieve information for
+`-i, --id [id]`
+: ID of the user custom action to retrieve information for. Specify either `id` or `title`
+
+`-t, --title [title]`
+: Title of the user custom action to retrieve information for. Specify either `id` or `title`
 
 `-u, --url <url>`
 : Url of the site or site collection to retrieve the custom action from
@@ -21,6 +24,10 @@ m365 spo customaction get [options]
 
 --8<-- "docs/cmd/_global.md"
 
+## Remarks
+
+If the command finds multiple user custom actions with the specified title, it will prompt you to disambiguate which user custom action it should use, listing the discovered IDs.
+
 ## Examples
 
 Return details about the user custom action with ID _058140e3-0e37-44fc-a1d3-79c487d371a3_ located in site or site collection _https://contoso.sharepoint.com/sites/test_
@@ -29,6 +36,12 @@ Return details about the user custom action with ID _058140e3-0e37-44fc-a1d3-79c
 m365 spo customaction get --id 058140e3-0e37-44fc-a1d3-79c487d371a3 --url https://contoso.sharepoint.com/sites/test
 ```
 
+Return details about the user custom action with Title _YourAppCustomizer_ located in site or site collection _https://contoso.sharepoint.com/sites/test_
+
+```sh
+m365 spo customaction get --title "YourAppCustomizer" --url https://contoso.sharepoint.com/sites/test
+```
+
 Return details about the user custom action with ID _058140e3-0e37-44fc-a1d3-79c487d371a3_ located in site collection _https://contoso.sharepoint.com/sites/test_
 
 ```sh

package/docs/docs/cmd/spo/customaction/customaction-remove.md

@@ -10,8 +10,11 @@ m365 spo customaction remove [options]
 
 ## Options
 
-`-i, --id <id>`
-: Id (GUID) of the custom action to remove
+`-i, --id [id]`
+: Id (GUID) of the custom action to remove. Specify either `id` or `title`
+
+`-t, --title [title]`
+: Title of the user custom action to retrieve information for. Specify either `id` or `title`
 
 `-u, --url <url>`
 : Url of the site or site collection to remove the custom action from
@@ -24,6 +27,10 @@ m365 spo customaction remove [options]
 
 --8<-- "docs/cmd/_global.md"
 
+## Remarks
+
+If the command finds multiple user custom actions with the specified title, it will prompt you to disambiguate which user custom action it should use, listing the discovered IDs.
+
 ## Examples
 
 Removes user custom action with ID _058140e3-0e37-44fc-a1d3-79c487d371a3_ located in site or site collection _https://contoso.sharepoint.com/sites/test_
@@ -32,24 +39,48 @@ Removes user custom action with ID _058140e3-0e37-44fc-a1d3-79c487d371a3_ locate
 m365 spo customaction remove --id 058140e3-0e37-44fc-a1d3-79c487d371a3 --url https://contoso.sharepoint.com/sites/test
 ```
 
+Removes user custom action with Title _YourAppCustomizer_ located in site or site collection _https://contoso.sharepoint.com/sites/test_
+
+```sh
+m365 spo customaction remove --title "YourAppCustomizer" --url https://contoso.sharepoint.com/sites/test
+```
+
 Removes user custom action with ID _058140e3-0e37-44fc-a1d3-79c487d371a3_ located in site or site collection _https://contoso.sharepoint.com/sites/test_. Skips the confirmation prompt message.
 
 ```sh
 m365 spo customaction remove --id 058140e3-0e37-44fc-a1d3-79c487d371a3 --url https://contoso.sharepoint.com/sites/test --confirm
 ```
 
+Removes user custom action with Title _YourAppCustomizer_ located in site or site collection _https://contoso.sharepoint.com/sites/test_. Skips the confirmation prompt message.
+
+```sh
+m365 spo customaction remove --title "YourAppCustomizer" --url https://contoso.sharepoint.com/sites/test --confirm
+```
+
 Removes user custom action with ID _058140e3-0e37-44fc-a1d3-79c487d371a3_ located in site collection _https://contoso.sharepoint.com/sites/test_
 
 ```sh
 m365 spo customaction remove --id 058140e3-0e37-44fc-a1d3-79c487d371a3 --url https://contoso.sharepoint.com/sites/test --scope Site
 ```
 
+Removes user custom action with Title _YourAppCustomizer_ located in site collection _https://contoso.sharepoint.com/sites/test_
+
+```sh
+m365 spo customaction remove --title "YourAppCustomizer" --url https://contoso.sharepoint.com/sites/test --scope Site
+```
+
 Removes user custom action with ID _058140e3-0e37-44fc-a1d3-79c487d371a3_ located in site _https://contoso.sharepoint.com/sites/test_
 
 ```sh
 m365 spo customaction remove --id 058140e3-0e37-44fc-a1d3-79c487d371a3 --url https://contoso.sharepoint.com/sites/test --scope Web
 ```
 
+Removes user custom action with Title _YourAppCustomizer_ located in site _https://contoso.sharepoint.com/sites/test_
+
+```sh
+m365 spo customaction remove --title "YourAppCustomizer" --url https://contoso.sharepoint.com/sites/test --scope Web
+```
+
 ## More information
 
 - UserCustomAction REST API resources: [https://msdn.microsoft.com/en-us/library/office/dn531432.aspx#bk_UserCustomAction](https://msdn.microsoft.com/en-us/library/office/dn531432.aspx#bk_UserCustomAction)

package/docs/docs/cmd/spo/list/list-list.md

@@ -13,9 +13,6 @@ m365 spo list list [options]
 `-u, --webUrl <webUrl>`
 : URL of the site where the lists to retrieve are located
 
-`--executeWithLimitedPermissions`
-: Use this option to execute this command with site member or visitor permissions. Not specifying this option will require site owner (or admin) permissions.
-
 --8<-- "docs/cmd/_global.md"
 
 ## Examples

package/docs/docs/cmd/spo/site/site-list.md

@@ -10,12 +10,18 @@ m365 spo site list [options]
 
 ## Options
 
-`--type [type]`
-: type of modern sites to list. Allowed values `TeamSite,CommunicationSite`, default `TeamSite`
+`-t, --type [type]`
+: convenience option for type of sites to list. Allowed values are `TeamSite,CommunicationSite`.
+
+`--webTemplate [webTemplate]`
+: type of sites to list. To be used with values like `GROUP#0` and `SITEPAGEPUBLISHING#0`. Specify either `type` or `webTemplate`, but not both.  
 
 `-f, --filter [filter]`
 : filter to apply when retrieving sites
 
+`--includeOneDriveSites`
+: use this switch to include OneDrive sites in the result when retrieving sites. Do not specify the `type` or `webTemplate` options when using this.
+
 `--deleted`
 : use this switch to only return deleted sites
 
@@ -28,34 +34,40 @@ m365 spo site list [options]
 
 Using the `-f, --filter` option you can specify which sites you want to retrieve. For example, to get sites with _project_ in their URL, use `Url -like 'project'` as the filter.
 
-When using the text output type (default), the command lists only the values of the `Title`, and `Url` properties of the site. When setting the output type to JSON, all available properties are included in the command output.
+When using the text output type, the command lists only the values of the `Title`, and `Url` properties of the site. When setting the output type to JSON, all available properties are included in the command output.
 
 ## Examples
 
-List all modern team sites in the currently connected tenant
+List all sites in the currently connected tenant
 
 ```sh
 m365 spo site list
 ```
 
-List all modern team sites in the currently connected tenant
+List all group connected team sites in the currently connected tenant
 
 ```sh
 m365 spo site list --type TeamSite
 ```
 
-List all modern communication sites in the currently connected tenant
+List all communication sites in the currently connected tenant
 
 ```sh
 m365 spo site list --type CommunicationSite
 ```
 
-List all modern team sites that contain _project_ in the URL
+List all group connected team sites that contain _project_ in the URL
 
 ```sh
 m365 spo site list --type TeamSite --filter "Url -like 'project'"
 ```
 
+List all sites in the currently connected tenant including OneDrive sites
+
+```sh
+m365 spo site list --includeOneDriveSites
+```
+
 List all deleted sites in the tenant you're logged in to
 
 ```sh

package/docs/docs/cmd/spo/site/site-set.md

@@ -13,6 +13,12 @@ m365 spo site set [options]
 `-u, --url <url>`
 : The URL of the site collection to update
 
+`-t, --title [title]`
+: The new title for the site collection
+
+`-d, --description [description]`
+: The site description
+
 `--classification [classification]`
 : The new classification for the site collection
 
@@ -31,18 +37,36 @@ m365 spo site set [options]
 `--siteDesignId [siteDesignId]`
 : Id of the custom site design to apply to the site
 
-`--title [title]`
-: The new title for the site collection
-
-`--description [description]`
-: The site description
-
 `--sharingCapability [sharingCapability]`
 : The sharing capability for the site. Allowed values:  `Disabled`, `ExternalUserSharingOnly`, `ExternalUserAndGuestSharing`, `ExistingExternalUserSharingOnly`.
 
 `--siteLogoUrl [siteLogoUrl]`
 : Set the logo for the site collection. This can be an absolute or relative URL to a file on the current site collection.
 
+`--resourceQuota [resourceQuota]`
+: The quota for this site collection in Sandboxed Solutions units
+
+`--resourceQuotaWarningLevel [resourceQuotaWarningLevel]`
+: The warning level for the resource quota
+
+`--storageQuota [storageQuota]`
+: The storage quota for this site collection in megabytes
+
+`--storageQuotaWarningLevel [storageQuotaWarningLevel]`
+: The warning level for the storage quota in megabytes
+
+`--allowSelfServiceUpgrade [allowSelfServiceUpgrade]`
+: Set to allow tenant administrators to upgrade the site collection
+
+`--lockState [lockState]`
+: Sets site's lock state. Allowed values `Unlock,NoAdditions,ReadOnly,NoAccess`
+
+`--noScriptSite [noScriptSite]`
+: Specifies if the site allows custom script or not
+
+`--wait`
+: Wait for the settings to be applied before completing the command
+
 --8<-- "docs/cmd/_global.md"
 
 !!! important
@@ -56,6 +80,20 @@ The `isPublic` property can be set only on groupified site collections. If you t
 
 When setting owners, the specified owners will be added to the already configured owners. Existing owners will not be removed.
 
+The value of the `--resourceQuota` option must not exceed the company's aggregate available Sandboxed Solutions quota. For more information, see Resource Usage Limits on Sandboxed Solutions in SharePoint 2010: [http://msdn.microsoft.com/en-us/library/gg615462.aspx](http://msdn.microsoft.com/en-us/library/gg615462.aspx).
+
+The value of the `--resourceQuotaWarningLevel` option must not exceed the value of the `--resourceQuota` option or the current value of the _UserCodeMaximumLevel_ property.
+
+The value of the `--storageQuota` option must not exceed the company's available quota.
+
+The value of the `--storageQuotaWarningLevel` option must not exceed the the value of the `--storageQuota` option or the current value of the _StorageMaximumLevel_ property.
+
+For more information on locking sites see [https://technet.microsoft.com/en-us/library/cc263238.aspx](https://technet.microsoft.com/en-us/library/cc263238.aspx).
+
+For more information on configuring no script sites see [https://support.office.com/en-us/article/Turn-scripting-capabilities-on-or-off-1f2c515f-5d7e-448a-9fd7-835da935584f](https://support.office.com/en-us/article/Turn-scripting-capabilities-on-or-off-1f2c515f-5d7e-448a-9fd7-835da935584f).
+
+Setting site properties is by default asynchronous and depending on the current state of Microsoft 365, might take up to few minutes. If you're building a script with steps that require the site to be fully configured, you should use the `--wait` flag. When using this flag, the `spo site set` command will keep running until it received confirmation from Microsoft 365 that the site has been fully configured.
+
 ## Examples
 
 Update site collection's classification
@@ -129,3 +167,9 @@ Unset the logo on the site
 ```sh
 m365 spo site set --url https://estruyfdev2.sharepoint.com/sites/sales --siteLogoUrl ""
 ```
+
+Lock the site preventing users from accessing it. Wait for the configuration to complete
+
+```sh
+m365 spo site set --url https://contoso.sharepoint.com/sites/team --LockState NoAccess --wait
+```