@pnp/cli-microsoft365 12.0.0-beta.0be7d8d → 12.0.0-beta.c9bd7f3

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

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

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

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

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

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

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

@@ -5,8 +5,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TeamsChannelSetCommand_instances, _TeamsChannelSetCommand_initTelemetry, _TeamsChannelSetCommand_initOptions, _TeamsChannelSetCommand_initValidators, _TeamsChannelSetCommand_initOptionSets;
 import request from '../../../../request.js';
-import { entraGroup } from '../../../../utils/entraGroup.js';
 import { formatting } from '../../../../utils/formatting.js';
+import { teams } from '../../../../utils/teams.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
@@ -58,13 +58,7 @@ class TeamsChannelSetCommand extends GraphCommand {
         if (args.options.teamId) {
             return args.options.teamId;
         }
-        const group = await entraGroup.getGroupByDisplayName(args.options.teamName);
-        if (group.resourceProvisioningOptions.indexOf('Team') === -1) {
-            throw 'The specified team does not exist';
-        }
-        else {
-            return group.id;
-        }
+        return teams.getTeamIdByDisplayName(args.options.teamName);
     }
     async getChannelId(teamId, args) {
         if (args.options.id) {

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

@@ -5,8 +5,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TeamsTabGetCommand_instances, _TeamsTabGetCommand_initTelemetry, _TeamsTabGetCommand_initOptions, _TeamsTabGetCommand_initValidators, _TeamsTabGetCommand_initOptionSets;
 import request from '../../../../request.js';
-import { entraGroup } from '../../../../utils/entraGroup.js';
 import { formatting } from '../../../../utils/formatting.js';
+import { teams } from '../../../../utils/teams.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
@@ -31,11 +31,7 @@ class TeamsTabGetCommand extends GraphCommand {
         if (args.options.teamId) {
             return args.options.teamId;
         }
-        const group = await entraGroup.getGroupByDisplayName(args.options.teamName);
-        if (group.resourceProvisioningOptions.indexOf('Team') === -1) {
-            throw 'The specified team does not exist in the Microsoft Teams';
-        }
-        return group.id;
+        return teams.getTeamIdByDisplayName(args.options.teamName);
     }
     async getChannelId(args) {
         if (args.options.channelId) {

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

@@ -5,8 +5,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TeamsTeamArchiveCommand_instances, _TeamsTeamArchiveCommand_initTelemetry, _TeamsTeamArchiveCommand_initOptions, _TeamsTeamArchiveCommand_initValidators, _TeamsTeamArchiveCommand_initOptionSets;
 import request from '../../../../request.js';
-import { entraGroup } from '../../../../utils/entraGroup.js';
 import { formatting } from '../../../../utils/formatting.js';
+import { teams } from '../../../../utils/teams.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
@@ -29,11 +29,7 @@ class TeamsTeamArchiveCommand extends GraphCommand {
         if (args.options.id) {
             return args.options.id;
         }
-        const group = await entraGroup.getGroupByDisplayName(args.options.name);
-        if (group.resourceProvisioningOptions.indexOf('Team') === -1) {
-            throw 'The specified team does not exist in the Microsoft Teams';
-        }
-        return group.id;
+        return teams.getTeamIdByDisplayName(args.options.name);
     }
     async commandAction(logger, args) {
         const siteReadOnlyForMembers = args.options.shouldSetSpoSiteReadOnlyForMembers === true;

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

@@ -6,8 +6,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _TeamsTeamRemoveCommand_instances, _TeamsTeamRemoveCommand_initTelemetry, _TeamsTeamRemoveCommand_initOptions, _TeamsTeamRemoveCommand_initValidators, _TeamsTeamRemoveCommand_initOptionSets;
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
-import { entraGroup } from '../../../../utils/entraGroup.js';
 import { formatting } from '../../../../utils/formatting.js';
+import { teams } from '../../../../utils/teams.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
@@ -30,11 +30,7 @@ class TeamsTeamRemoveCommand extends GraphCommand {
         if (args.options.id) {
             return args.options.id;
         }
-        const group = await entraGroup.getGroupByDisplayName(args.options.name);
-        if (group.resourceProvisioningOptions.indexOf('Team') === -1) {
-            throw `The specified team does not exist in the Microsoft Teams`;
-        }
-        return group.id;
+        return teams.getTeamIdByDisplayName(args.options.name);
     }
     async commandAction(logger, args) {
         const removeTeam = async () => {

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

@@ -5,8 +5,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TeamsTeamUnarchiveCommand_instances, _TeamsTeamUnarchiveCommand_initOptions, _TeamsTeamUnarchiveCommand_initValidators, _TeamsTeamUnarchiveCommand_initOptionSets;
 import request from '../../../../request.js';
-import { entraGroup } from '../../../../utils/entraGroup.js';
 import { formatting } from '../../../../utils/formatting.js';
+import { teams } from '../../../../utils/teams.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
@@ -28,11 +28,7 @@ class TeamsTeamUnarchiveCommand extends GraphCommand {
         if (args.options.id) {
             return args.options.id;
         }
-        const group = await entraGroup.getGroupByDisplayName(args.options.name);
-        if (group.resourceProvisioningOptions.indexOf('Team') === -1) {
-            throw 'The specified team does not exist in the Microsoft Teams';
-        }
-        return group.id;
+        return teams.getTeamIdByDisplayName(args.options.name);
     }
     async commandAction(logger, args) {
         const endpoint = `${this.resource}/v1.0`;

package/docs/docs/cmd/entra/m365group/m365group-remove.mdx

@@ -24,8 +24,11 @@ m365 entra m365group remove [options]
 `-f, --force`
 : Don't prompt for confirming removing the group
 
+`--permanent`
+: Permanently remove the group without leaving it in the recycle bin.
+
 `--skipRecycleBin`
-: Set to directly remove the group without moving it to the Recycle Bin
+: Deprecated: use `--permanent` instead.
 ```
 
 <Global />
@@ -53,7 +56,7 @@ m365 entra m365group remove [options]
 
 If the specified _id_ doesn't refer to an existing group, you will get a `Resource does not exist` error. Additionally, if you do not have access to the group or the associated group-connected site, you will get an `Access denied` error.
 
-When you use `--skipRecycleBin` flag to remove a Microsoft 365 group permanently, the process involves deleting the associated group-connected site and the group, and then checking if the group has been moved to the deleted groups list. In some cases, it may take a few seconds for the group to appear in the deleted groups list.
+When you use the `--permanent` flag to remove a Microsoft 365 group permanently, the process involves deleting the associated group-connected site and the group, and then checking if the group has been moved to the deleted groups list. In some cases, it may take a few seconds for the group to appear in the deleted groups list.
 
 To ensure a smooth deletion process, the command employs a retry mechanism with the following parameters:
 
@@ -80,7 +83,7 @@ m365 entra m365group remove --displayName Finance --force
 Remove group with id _28beab62-7540-4db1-a23f-29a6018a3848_ without prompting for confirmation and without moving it to the Recycle Bin
 
 ```sh
-m365 entra m365group remove --id 28beab62-7540-4db1-a23f-29a6018a3848 --force --skipRecycleBin
+m365 entra m365group remove --id 28beab62-7540-4db1-a23f-29a6018a3848 --force --permanent
 ```
 
 ## Response

package/docs/docs/cmd/spe/container/container-remove.mdx

@@ -27,8 +27,8 @@ m365 spe container remove [options]
 `--containerTypeName [containerTypeName]`
 : The name of the container type. Specify either `containerTypeId` or `containerTypeName` when using `name` but not both.
 
-`--recycle`
-: Recycle the container instance instead of permanently deleting it.
+`--permanent`
+: Permanently delete the container instance instead of moving it to the recycle bin.
 
 `-f, --force`
 : Do not prompt for confirmation.
@@ -67,16 +67,16 @@ The command is based on an API that is currently in preview and is subject to ch
 
 ## Examples
 
-Remove a container by ID.
+Move a container specified by ID to the recycle bin.
 
 ```sh
 m365 spe container remove --id "b!ISJs1WRro0y0EWgkUYcktDa0mE8zSlFEqFzqRn70Zwp1CEtDEBZgQICPkRbil_5Z"
 ```
 
-Move a container specified by ID to the recycle bin.
+Permanently remove a container by ID.
 
 ```sh
-m365 spe container remove --id "b!ISJs1WRro0y0EWgkUYcktDa0mE8zSlFEqFzqRn70Zwp1CEtDEBZgQICPkRbil_5Z" --recycle
+m365 spe container remove --id "b!ISJs1WRro0y0EWgkUYcktDa0mE8zSlFEqFzqRn70Zwp1CEtDEBZgQICPkRbil_5Z" --permanent
 ```
 
 Remove a container by name specifying the container type id.

package/docs/docs/cmd/spo/file/file-archive.mdx

@@ -30,6 +30,14 @@ m365 spo file archive [options]
 
 <Global />
 
+## Remarks
+
+:::warning
+
+You will be able to reactivate an archived file instantly for the first 7 days. After that, it will take up to 24 hours to reactivate.
+
+:::
+
 ## Permissions
 
 <Tabs>

package/docs/docs/cmd/spo/file/file-remove.mdx

@@ -30,8 +30,8 @@ m365 spo page template remove
 `--url [url]`
 : The server- or site-relative decoded URL of the file to remove. Specify either `id` or `url` but not both.
 
-`--recycle`
-: Recycle the file instead of actually deleting it.
+`--permanent`
+: Permanently delete the file instead of moving it to the recycle bin.
 
 `--bypassSharedLock`
 : Remove the file even if it is locked for shared use.
@@ -75,10 +75,10 @@ Remove a file by site-relative URL.
 m365 spo file remove --webUrl https://contoso.sharepoint.com/sites/project-x --url "/Shared Documents/Test.docx"
 ```
 
-Remove a file by server-relative URL to the recycle bin.
+Permanently remove a file by server-relative URL.
 
 ```sh
-m365 spo file remove --webUrl https://contoso.sharepoint.com/sites/project-x --url "/sites/project-x/Shared Documents/Test.docx" --recycle
+m365 spo file remove --webUrl https://contoso.sharepoint.com/sites/project-x --url "/sites/project-x/Shared Documents/Test.docx" --permanent
 ```
 
 Remove a file that is locked

package/docs/docs/cmd/spo/file/file-unarchive.mdx

@@ -30,6 +30,14 @@ m365 spo file unarchive [options]
 
 <Global />
 
+## Remarks
+
+:::warning
+
+Reactivation could take up to 24 hours. Files that are reactivated cannot be archived again for **120 days**.
+
+:::
+
 ## Permissions
 
 <Tabs>

package/docs/docs/cmd/spo/folder/folder-archive.mdx

@@ -32,6 +32,12 @@ m365 spo folder archive [options]
 
 ## Remarks
 
+:::warning
+
+You will be able to reactivate an archived folder instantly for the first 7 days. After that, it will take up to 24 hours to reactivate.
+
+:::
+
 Folder archival can take some time to complete, as the status might not be reflected immediately.
 
 ## Permissions

package/docs/docs/cmd/spo/folder/folder-remove.mdx

@@ -21,8 +21,8 @@ m365 spo folder remove [options]
 `--url <url>`
 : The server- or site-relative decoded URL of the folder to delete.
 
-`--recycle`
-: Recycles the folder instead of actually deleting it.
+`--permanent`
+: Permanently deletes the folder instead of moving it to the recycle bin.
 
 `-f, --force`
 : Don't prompt for confirming deleting the folder.
@@ -61,10 +61,10 @@ Remove a folder with a specific site-relative URL.
 m365 spo folder remove --webUrl https://contoso.sharepoint.com/sites/project-x --url '/Shared Documents/My Folder'
 ```
 
-Remove a folder with a specific server relative URL to the site recycle bin.
+Permanently remove a folder with a specific server-relative URL.
 
 ```sh
-m365 spo folder remove --webUrl https://contoso.sharepoint.com/sites/project-x --url '/sites/project-x/Shared Documents/My Folder' --recycle
+m365 spo folder remove --webUrl https://contoso.sharepoint.com/sites/project-x --url '/sites/project-x/Shared Documents/My Folder' --permanent
 ```
 
 ## Response

package/docs/docs/cmd/spo/list/list-remove.mdx

@@ -24,8 +24,8 @@ m365 spo list remove [options]
 `-t, --title [title]`
 : Title of the list to remove. Specify either `id` or `title` but not both.
 
-`--recycle`
-: Instead of permanently deleting, send the list to the recycle bin.
+`--permanent`
+: Permanently delete the list instead of moving it to the recycle bin.
 
 `-f, --force`
 : Don't prompt for confirming removing the list.
@@ -66,10 +66,10 @@ Remove the list with a specific title located in a specific site.
 m365 spo list remove --webUrl https://contoso.sharepoint.com/sites/project-x --title 'List 1'
 ```
 
-Remove a list specified by id by sending it to the recycle bin instead of permanently removing it
+Permanently remove a list specified by ID.
 
 ```sh
-m365 spo list remove --webUrl https://contoso.sharepoint.com/sites/project-x --id 0cd891ef-afce-4e55-b836-fce03286cccf --recycle
+m365 spo list remove --webUrl https://contoso.sharepoint.com/sites/project-x --id 0cd891ef-afce-4e55-b836-fce03286cccf --permanent
 ```
 
 ## Response

package/docs/docs/cmd/spo/listitem/listitem-batch-remove.mdx

@@ -31,8 +31,8 @@ m365 spo listitem batch remove [options]
 `-i, --ids [ids]`
 : Comma separated list of list item IDs. Specify `filePath` or `ids`, but not both.
 
-`-r, --recycle`
-: Recycle the list items. Otherwise, they will be permanently deleted.
+`--permanent`
+: Permanently delete the list items instead of moving them to the recycle bin.
 
 `-f, --force`
 : Don't prompt for confirmation.
@@ -65,6 +65,12 @@ Remove a list of IDs from a list by specifying the IDs
 m365 spo listitem batch remove --webUrl https://contoso.sharepoint.com/sites/project-x --listTitle "Demo List" --ids "123,234,345"
 ```
 
+Permanently remove a list of IDs from a list.
+
+```sh
+m365 spo listitem batch remove --webUrl https://contoso.sharepoint.com/sites/project-x --listTitle "Demo List" --ids "123,234,345" --permanent
+```
+
 ## Response
 
 The command won't return a response on success.

package/docs/docs/cmd/spo/listitem/listitem-remove.mdx

@@ -28,8 +28,8 @@ m365 spo listitem remove [options]
 `--listUrl [listUrl]`
 : Server- or site-relative URL of the list. Specify either `listTitle`, `listId` or `listUrl`
 
-`--recycle`
-: Recycle the list item
+`--permanent`
+: Permanently delete the list item instead of moving it to the recycle bin.
 
 `-f, --force`
 : Don't prompt for confirming removing the list item
@@ -57,6 +57,12 @@ Remove the list item located in a given site based on the server-relative list u
 m365 spo listitem remove --webUrl https://contoso.sharepoint.com/sites/project-x --listUrl /sites/project-x/lists/TestList --id 1
 ```
 
+Permanently remove a list item.
+
+```sh
+m365 spo listitem remove --webUrl https://contoso.sharepoint.com/sites/project-x --listTitle 'List 1' --id 1 --permanent
+```
+
 ## Response
 
 The command won't return a response on success.

package/docs/docs/cmd/spo/page/page-remove.mdx

@@ -19,8 +19,8 @@ m365 spo page remove [options]
 `-n, --name <name>`
 : Name of the page.
 
-`--recycle`
-: Send the page to the recycle bin instead of permanently deleting it.
+`--permanent`
+: Permanently delete the page instead of moving it to the recycle bin.
 
 `--bypassSharedLock`
 : Remove the page even if it is locked for shared use.
@@ -45,10 +45,10 @@ Remove a modern page without a confirmation prompt
 m365 spo page remove --name HR.aspx --webUrl https://contoso.sharepoint.com/sites/Marketing --force
 ```
 
-Send a page to the recycle bin
+Permanently remove a page
 
 ```sh
-m365 spo page remove --name HR.aspx --webUrl https://contoso.sharepoint.com/sites/Marketing --recycle
+m365 spo page remove --name HR.aspx --webUrl https://contoso.sharepoint.com/sites/Marketing --permanent
 ```
 
 Remove a page that is locked

package/docs/docs/cmd/spo/site/site-apppermission-add.mdx

@@ -34,14 +34,45 @@ m365 spo site apppermission add [options]
 
 To set permissions, specify at minimum either `appId` or `appDisplayName`. For best performance specify both values to avoid extra lookup.
 
-## Example
+## Permissions
 
-Grants the specified app the _read_ permission to site _https://contoso.sharepoint.com/sites/project-x_
+<Tabs>
+  <TabItem value="Delegated">
+
+  | Resource        | Permissions                                 |
+  |-----------------|---------------------------------------------|
+  | Microsoft Graph | Sites.FullControl.All, Application.Read.All |
+
+  </TabItem>
+  <TabItem value="Application">
+
+  | Resource        | Permissions                                 |
+  |-----------------|---------------------------------------------|
+  | Microsoft Graph | Sites.FullControl.All, Application.Read.All |
+
+  </TabItem>
+</Tabs>
+
+## Examples
+
+Grants the app with the specified display name the _read_ permission to a specific site
 
 ```sh
 m365 spo site apppermission add --siteUrl https://contoso.sharepoint.com/sites/project-x --permission read --appDisplayName Foo
 ```
 
+Grants the app with the specified ID the _write_ permission to a specific site
+
+```sh
+m365 spo site apppermission add --siteUrl https://contoso.sharepoint.com/sites/project-x --permission write --appId 5c89fbbf-670e-48e7-a0bc-fa8942c895a2
+```
+
+Grants the app with the specified ID and display name the _manage_ permission to a specific site
+
+```sh
+m365 spo site apppermission add --siteUrl https://contoso.sharepoint.com/sites/project-x --permission manage --appId 5c89fbbf-670e-48e7-a0bc-fa8942c895a2 --appDisplayName Foo
+```
+
 ## Response
 
 <Tabs>
@@ -49,27 +80,27 @@ m365 spo site apppermission add --siteUrl https://contoso.sharepoint.com/sites/p
 
   ```json
   {
-  "id": "aTowaS50fG1zLnNwLmV4dHw1Yzg5ZmJiZi02NzBlLTQ4ZTctYTBiYy1mYTg5NDJjODk1YTJAMWU4NTJiNDktYmY0Yi00YmE1LWJjZDQtYThjNDcwNmM4ZWQ0",
-  "roles": [
-    "read"
-  ],
-  "grantedToIdentitiesV2": [
-    {
-      "application": {
-        "displayName": "Foo",
-        "id": "5c89fbbf-670e-48e7-a0bc-fa8942c895a2"
+    "id": "aTowaS50fG1zLnNwLmV4dHw1Yzg5ZmJiZi02NzBlLTQ4ZTctYTBiYy1mYTg5NDJjODk1YTJAMWU4NTJiNDktYmY0Yi00YmE1LWJjZDQtYThjNDcwNmM4ZWQ0",
+    "roles": [
+      "read"
+    ],
+    "grantedToIdentitiesV2": [
+      {
+        "application": {
+          "displayName": "Foo",
+          "id": "5c89fbbf-670e-48e7-a0bc-fa8942c895a2"
+        }
       }
-    }
-  ],
-  "grantedToIdentities": [
-    {
-      "application": {
-        "displayName": "Foo",
-        "id": "5c89fbbf-670e-48e7-a0bc-fa8942c895a2"
+    ],
+    "grantedToIdentities": [
+      {
+        "application": {
+          "displayName": "Foo",
+          "id": "5c89fbbf-670e-48e7-a0bc-fa8942c895a2"
+        }
       }
-    }
-  ]
-}
+    ]
+  }
   ```
 
   </TabItem>

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

@@ -16,7 +16,10 @@ m365 spo site list [options]
 
 ```md definition-list
 `-t, --type [type]`
-: convenience option for type of sites to list. Allowed values are `TeamSite,CommunicationSite`.
+: convenience option for type of sites to list. Allowed values are `TeamSite` and `CommunicationSite`.
+
+`--state [state]`
+: option to filter sites by their archived state. Allowed values are `active`, `fullyArchived`, `recentlyArchived` and `archived`.
 
 `--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.  
@@ -31,6 +34,12 @@ m365 spo site list [options]
 <Global />
 
 ## Remarks
+When providing a value for option `state`, consider the following:
+
+- `active`: return sites that are not archived
+- `fullyArchived`: return sites that are fully archived (longer than 7 days)
+- `recentlyArchived`: return sites that are recently archived (within 7 days)
+- `archived`: return both recently archived and fully archived sites
 
 Using the `--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.
 
@@ -76,6 +85,18 @@ List all sites in the currently connected tenant including OneDrive sites.
 m365 spo site list --withOneDriveSites
 ```
 
+List all active (non-archived) sites in the currently connected tenant.
+
+```sh
+m365 spo site list --state active
+```
+
+List all archived sites in the currently connected tenant.
+
+```sh
+m365 spo site list --state archived
+```
+
 ## Response
 
 <Tabs>

package/docs/docs/cmd/spo/site/site-remove.mdx

@@ -16,8 +16,11 @@ m365 spo site remove [options]
 `-u, --url <url>`
 : URL of the site.
 
+`--permanent`
+: Permanently remove the site without leaving it in the recycle bin.
+
 `--skipRecycleBin`
-: Set to directly remove the site without moving it to the recycle bin.
+: Deprecated: use `--permanent` instead.
 
 `--fromRecycleBin`
 : Set to remove the site from the recycle bin.
@@ -49,7 +52,7 @@ m365 spo site remove --url https://contoso.sharepoint.com/sites/demosite
 Remove the site without moving it to the recycle bin.
 
 ```sh
-m365 spo site remove --url https://contoso.sharepoint.com/sites/demosite --skipRecycleBin
+m365 spo site remove --url https://contoso.sharepoint.com/sites/demosite --permanent
 ```
 
 Remove the previously deleted site from the recycle bin.

package/docs/docs/cmd/spo/storageentity/storageentity-get.mdx

@@ -17,22 +17,31 @@ m365 spo storageentity get [options]
 ```md definition-list
 `-k, --key <key>`
 : Name of the tenant property to retrieve
+
+`-u, --appCatalogUrl [appCatalogUrl]`
+: URL of the app catalog site. If not specified, the tenant app catalog URL will be used.
 ```
 
 <Global />
 
 ## Remarks
 
-Tenant properties are stored in the app catalog site associated with the site to which you are currently connected. When retrieving the specified tenant property, SharePoint will automatically find the associated app catalog and try to retrieve the property from it.
+Tenant properties are stored in the app catalog site associated with the site to which you are currently connected. When retrieving the specified tenant property, SharePoint will use the specified app catalog URL or automatically resolve the tenant app catalog URL.
 
 ## Examples
 
-Show the value, description and comment of the _AnalyticsId_ tenant property
+Show the value, description and comment of the _AnalyticsId_ tenant property using the tenant app catalog
 
 ```sh
 m365 spo storageentity get -k AnalyticsId
 ```
 
+Show the value, description and comment of the _AnalyticsId_ tenant property from a specific app catalog site
+
+```sh
+m365 spo storageentity get -k AnalyticsId -u https://contoso.sharepoint.com/sites/appcatalog
+```
+
 ## Response
 
 <Tabs>