pnp · MathijsVerbeeck · Jul 1, 2023 · Jul 6, 2023 · Jul 1, 2023 · Jul 5, 2023
diff --git a/.eslintrc.js → .eslintrc.cjs b/.eslintrc.js → .eslintrc.cjs
@@ -236,4 +236,4 @@ module.exports = {
       }
     }
   ]
-}
+};
diff --git a/docs/docs/_clisettings.mdx b/docs/docs/_clisettings.mdx
@@ -9,7 +9,7 @@ Setting name|Definition|Default value
 `csvQuotedEmpty`|Quote empty strings and overrides quoted_string on empty strings when defined|`false`
 `disableTelemetry`|Disables sending of telemetry data|`false`
 `errorOutput`|Defines if errors should be written to `stdout` or `stderr`|`stderr`
-`helpMode`|Defines what part of command's help to display. Allowed values are `options`, `examples`, `remarks`, `response`, `full`|`full`
+`helpMode`|Defines what part of command's help to display. Allowed values are `options`, `examples`, `remarks`, `response`, `full`|`options`
 `output`|Defines the default output when issuing a command. Allowed values are `json`, `text`, `csv`, `md`, `none`|`json`
 `printErrorsAsPlainText`|When output mode is set to `json`, print error messages as plain-text rather than JSON|`true`
 `prompt`|Prompts for missing values in required options and enables interactive selection when multiple values are available for a command that requires a specific value to be retrieved.|`false`

diff --git a/docs/docs/about/release-notes.mdx b/docs/docs/about/release-notes.mdx
@@ -4,6 +4,25 @@ sidebar_position: 4
 
 # Release notes
 
+## [v7.0.0 (beta)](https://github.com/pnp/cli-microsoft365/releases/tag/v7.0.0)
+
+### Changes
+
+- renamed confirm to force [#4551](https://github.com/pnp/cli-microsoft365/issues/4551)
+- removed 'spo list label get' and 'spo list  label set' aliases [#4177](https://github.com/pnp/cli-microsoft365/issues/4177)
+- removed option 'folder' in 'spo folder list' [#4803](https://github.com/pnp/cli-microsoft365/issues/4803)
+- renamed various options [#4467](https://github.com/pnp/cli-microsoft365/issues/4467)
+- removed schemaXml option from 'spo list' commands [#4370](https://github.com/pnp/cli-microsoft365/issues/4370)
+- removed 'deleted' option from 'aad user list' command [#4516](https://github.com/pnp/cli-microsoft365/issues/4516)
+- extended 'spo tenant commandset set' with get options 'id', 'title' or 'clientSideComponentId' [#4961](https://github.com/pnp/cli-microsoft365/issues/4961)
+- updated command output of few 'flow' commands [#4444](https://github.com/pnp/cli-microsoft365/issues/4444)
+- migrated CLI to esm [#4306](https://github.com/pnp/cli-microsoft365/issues/4306)
+- migrated scripts to esm
+- updated 'spo tenant applicationcustomizer get' command [#4872](https://github.com/pnp/cli-microsoft365/issues/4872)
+- updated default help mode to 'options' [#5182](https://github.com/pnp/cli-microsoft365/issues/5182)
+- removed deprecated options from 'spo retentionlabel ensure' [#4207](https://github.com/pnp/cli-microsoft365/issues/4207)
+- updated 'teams meeting list' command response [#4782](https://github.com/pnp/cli-microsoft365/issues/4782)
+
 ## [v6.11.0 (beta)](https://github.com/pnp/cli-microsoft365/releases/tag/v6.11.0)
 
 ### New commands

diff --git a/docs/docs/cmd/_global.mdx b/docs/docs/cmd/_global.mdx
@@ -1,6 +1,6 @@
 ```md definition-list
 `-h, --help [help]`
-: Output usage information. Optionally, specify which section of command's help you want to see. Allowed values are `options`, `examples`, `remarks`, `response`, `full`. Default is `full`.
+: Output usage information. Optionally, specify which section of command's help you want to see. Allowed values are `options`, `examples`, `remarks`, `response`, `full`. Default is `options`.
 
 `--query [query]`
 : JMESPath query string. See [http://jmespath.org/](http://jmespath.org/) for more information and examples.

diff --git a/docs/docs/cmd/aad/app/app-remove.mdx b/docs/docs/cmd/aad/app/app-remove.mdx
@@ -22,7 +22,7 @@ m365 aad app remove [options]
 `--name [name]`
 : Name of the Azure AD application registration to remove. Specify either `appId`, `objectId` or `name` but not multiple.
 
-`--confirm`
+`-f, --force`
 : Don't prompt for confirmation to remove the app.
 ```
 
@@ -51,7 +51,7 @@ m365 aad app remove --objectId d75be2e1-0204-4f95-857d-51a37cf40be8
 Remove the Azure AD application registration by its name. Will NOT prompt for confirmation before deleting.
 
 ```sh
-m365 aad app remove --name "My app" --confirm
+m365 aad app remove --name "My app" --force
 ```
 
 ## Response

diff --git a/docs/docs/cmd/aad/app/app-role-remove.mdx b/docs/docs/cmd/aad/app/app-role-remove.mdx
@@ -31,7 +31,7 @@ m365 aad app role remove [options]
 `-c, --claim [claim]`
 : Claim value of the role to remove. Specify either `name`, `id` or `claim`
 
-`--confirm`
+`-f, --force`
 : Don't prompt for confirmation to remove the role.
 ```
 
@@ -70,7 +70,7 @@ m365 aad app role remove --appName "My app" --claim "Product.Get"
 Remove role from a Azure AD application registration using object ID and role id options. Will NOT prompt for confirmation before deleting the role.
 
 ```sh
-m365 aad app role remove --appObjectId d75be2e1-0204-4f95-857d-51a37cf40be8 --id 15927ce6-1933-4b2f-b029-4dee3d53f4dd --confirm
+m365 aad app role remove --appObjectId d75be2e1-0204-4f95-857d-51a37cf40be8 --id 15927ce6-1933-4b2f-b029-4dee3d53f4dd --force
 ```
 
 ## Response

diff --git a/docs/docs/cmd/aad/approleassignment/approleassignment-remove.mdx b/docs/docs/cmd/aad/approleassignment/approleassignment-remove.mdx
@@ -28,7 +28,7 @@ m365 aad approleassignment remove [options]
 `-s, --scope <scope>`
 : Permissions known also as scopes and roles to be deleted from the application. If multiple permissions have to be deleted, they have to be comma-separated e.g. `Sites.Read.All`,`Sites.ReadWrite.All`
 
-`--confirm`
+`-f, --force`
 : Don't prompt for confirming removing the all role assignment
 ```
 

diff --git a/docs/docs/cmd/aad/groupsetting/groupsetting-remove.mdx b/docs/docs/cmd/aad/groupsetting/groupsetting-remove.mdx
@@ -16,7 +16,7 @@ m365 aad groupsetting remove [options]
 `-i, --id <id>`
 : The ID of the group setting to remove
 
-`--confirm`
+`-f, --force`
 : Don't prompt for confirming removing the group setting
 ```
 
@@ -37,7 +37,7 @@ m365 aad groupsetting remove --id 28beab62-7540-4db1-a23f-29a6018a3848
 Remove group setting with id _28beab62-7540-4db1-a23f-29a6018a3848_ without prompting for confirmation
 
 ```sh
-m365 aad groupsetting remove --id 28beab62-7540-4db1-a23f-29a6018a3848 --confirm
+m365 aad groupsetting remove --id 28beab62-7540-4db1-a23f-29a6018a3848 --force
 ```
 
 ## Response

diff --git a/docs/docs/cmd/aad/o365group/o365group-recyclebinitem-clear.mdx b/docs/docs/cmd/aad/o365group/o365group-recyclebinitem-clear.mdx
@@ -13,7 +13,7 @@ m365 aad o365group recyclebinitem clear [options]
 ## Options
 
 ```md definition-list
-`--confirm`
+`-f, --force`
 : Don't prompt for confirmation to clear the recycle bin items.
 ```
 
@@ -30,7 +30,7 @@ m365 aad o365group recyclebinitem clear
 Removes all deleted Microsoft 365 Groups in the tenant. Will NOT prompt for confirmation before permanently removing groups.
 
 ```sh
-m365 aad o365group recyclebinitem clear --confirm
+m365 aad o365group recyclebinitem clear --force
 ```
 
 ## Response

diff --git a/docs/docs/cmd/aad/o365group/o365group-recyclebinitem-remove.mdx b/docs/docs/cmd/aad/o365group/o365group-recyclebinitem-remove.mdx
@@ -22,7 +22,7 @@ m365 aad o365group recyclebinitem remove [options]
 `-m, --mailNickname [mailNickname]`
 : Name of the group e-mail (part before the @). Specify either `id`, `displayName` or `mailNickname` but not multiple.
 
-`--confirm`
+`-f, --force`
 : Don't prompt for confirmation.
 ```
 
@@ -45,7 +45,7 @@ m365 aad o365group recyclebinitem remove --displayName "My Group"
 Remove the Microsoft 365 Group with specific mail nickname without confirmation
 
 ```sh
-m365 aad o365group recyclebinitem remove --mailNickname "Mygroup" --confirm
+m365 aad o365group recyclebinitem remove --mailNickname "Mygroup" --force
 ```
 
 ## Response

diff --git a/docs/docs/cmd/aad/o365group/o365group-remove.mdx b/docs/docs/cmd/aad/o365group/o365group-remove.mdx
@@ -16,7 +16,7 @@ m365 aad o365group remove [options]
 `-i, --id <id>`
 : The ID of the Microsoft 365 Group to remove
 
-`--confirm`
+`-f, --force`
 : Don't prompt for confirming removing the group
 
 `--skipRecycleBin`
@@ -40,13 +40,13 @@ m365 aad o365group remove --id 28beab62-7540-4db1-a23f-29a6018a3848
 Remove group with id _28beab62-7540-4db1-a23f-29a6018a3848_ without prompting for confirmation
 
 ```sh
-m365 aad o365group remove --id 28beab62-7540-4db1-a23f-29a6018a3848 --confirm
+m365 aad o365group remove --id 28beab62-7540-4db1-a23f-29a6018a3848 --force
 ```
 
 Remove group with id _28beab62-7540-4db1-a23f-29a6018a3848_ without prompting for confirmation and without moving it to the Recycle Bin
 
 ```sh
-m365 aad o365group remove --id 28beab62-7540-4db1-a23f-29a6018a3848 --confirm --skipRecycleBin
+m365 aad o365group remove --id 28beab62-7540-4db1-a23f-29a6018a3848 --force --skipRecycleBin
 ```
 
 ## Response

diff --git a/docs/docs/cmd/aad/o365group/o365group-report-activitycounts.mdx b/docs/docs/cmd/aad/o365group/o365group-report-activitycounts.mdx
@@ -18,7 +18,7 @@ m365 aad o365group report activitycounts [options]
 `-p, --period <period>`
 : The length of time over which the report is aggregated. Supported values `D7`, `D30`, `D90`, `D180`
 
-`-f, --outputFile [outputFile]`
+`--outputFile [outputFile]`
 : Path to the file where the Microsoft 365 Groups activities across group workloads report should be stored in
 ```
 

diff --git a/docs/docs/cmd/aad/o365group/o365group-report-activitydetail.mdx b/docs/docs/cmd/aad/o365group/o365group-report-activitydetail.mdx
@@ -21,7 +21,7 @@ m365 aad o365group report activitydetail [options]
 `-d, --date [date]`
 : The date for which you would like to view the users who performed any activity. Supported date format is `YYYY-MM-DD`. Specify the `date` or `period`, but not both.
 
-`-f, --outputFile [outputFile]`
+`--outputFile [outputFile]`
 : Path to the file where the Microsoft 365 Groups activity by group report should be stored in
 ```
 

diff --git a/docs/docs/cmd/aad/o365group/o365group-report-activityfilecounts.mdx b/docs/docs/cmd/aad/o365group/o365group-report-activityfilecounts.mdx
@@ -18,7 +18,7 @@ m365 aad o365group report activityfilecounts [options]
 `-p, --period <period>`
 : The length of time over which the report is aggregated. Supported values `D7`, `D30`, `D90`, `D180`
 
-`-f, --outputFile [outputFile]`
+`--outputFile [outputFile]`
 : Path to the file where the Microsoft 365 Groups activities across group workloads report should be stored in
 ```
 

diff --git a/docs/docs/cmd/aad/o365group/o365group-report-activitygroupcounts.mdx b/docs/docs/cmd/aad/o365group/o365group-report-activitygroupcounts.mdx
@@ -18,7 +18,7 @@ m365 aad o365group report activitygroupcounts [options]
 `-p, --period <period>`
 : The length of time over which the report is aggregated. Supported values `D7`, `D30`, `D90`, `D180`
 
-`-f, --outputFile [outputFile]`
+`--outputFile [outputFile]`
 : Path to the file where the Microsoft 365 Groups activities report should be stored in
 ```
 

diff --git a/docs/docs/cmd/aad/o365group/o365group-report-activitystorage.mdx b/docs/docs/cmd/aad/o365group/o365group-report-activitystorage.mdx
@@ -18,7 +18,7 @@ m365 aad o365group report activitystorage  [options]
 `-p, --period <period>`
 : The length of time over which the report is aggregated. Supported values `D7`, `D30`, `D90`, `D180`
 
-`-f, --outputFile [outputFile]`
+`--outputFile [outputFile]`
 : Path to the file where the Microsoft 365 Groups activities report should be stored in
 ```
 

diff --git a/docs/docs/cmd/aad/o365group/o365group-user-remove.mdx b/docs/docs/cmd/aad/o365group/o365group-user-remove.mdx
@@ -28,7 +28,7 @@ m365 aad teams user remove
 `-n, --userName <userName>`
 : User's UPN (user principal name), eg. `[email protected]`
 
-`--confirm`
+`-f, --force`
 : Don't prompt for confirming removing the user from the specified Microsoft 365 Group or Microsoft Teams team
 ```
 
@@ -49,7 +49,7 @@ m365 aad o365group user remove --groupId '00000000-0000-0000-0000-000000000000'
 Removes user from the specified Microsoft 365 Group without confirmation
 
 ```sh
-m365 aad o365group user remove --groupId '00000000-0000-0000-0000-000000000000' --userName '[email protected]' --confirm
+m365 aad o365group user remove --groupId '00000000-0000-0000-0000-000000000000' --userName '[email protected]' --force
 ```
 
 Removes user from the specified Microsoft Teams team

diff --git a/docs/docs/cmd/aad/oauth2grant/oauth2grant-remove.mdx b/docs/docs/cmd/aad/oauth2grant/oauth2grant-remove.mdx
@@ -16,7 +16,7 @@ m365 aad oauth2grant remove [options]
 `-i, --grantId <grantId>`
 : `objectId` of OAuth2 permission grant to remove
 
-`--confirm`
+`-f, --force`
 : Do not prompt for confirmation before removing OAuth2 permission grant
 ```
 
@@ -43,7 +43,7 @@ m365 aad oauth2grant remove --grantId YgA60KYa4UOPSdc-lpxYEnQkr8KVLDpCsOXkiV8i-e
 Remove the OAuth2 permission grant with ID _YgA60KYa4UOPSdc-lpxYEnQkr8KVLDpCsOXkiV8i-ek_ without being asked for confirmation
 
 ```sh
-m365 aad oauth2grant remove --grantId YgA60KYa4UOPSdc-lpxYEnQkr8KVLDpCsOXkiV8i-ek --confirm
+m365 aad oauth2grant remove --grantId YgA60KYa4UOPSdc-lpxYEnQkr8KVLDpCsOXkiV8i-ek --force
 ```
 
 ## Response

diff --git a/docs/docs/cmd/aad/siteclassification/siteclassification-disable.mdx b/docs/docs/cmd/aad/siteclassification/siteclassification-disable.mdx
@@ -13,7 +13,7 @@ m365 aad siteclassification disable [options]
 ## Options
 
 ```md definition-list
-`--confirm`
+`-f, --force`
 : Don't prompt for confirming disabling site classification
 ```
 
@@ -30,7 +30,7 @@ m365 aad siteclassification disable
 Disable site classification without confirmation
 
 ```sh
-m365 aad siteclassification disable --confirm
+m365 aad siteclassification disable --force
 ```
 
 ## Response

diff --git a/docs/docs/cmd/aad/user/user-license-remove.mdx b/docs/docs/cmd/aad/user/user-license-remove.mdx
@@ -22,7 +22,7 @@ m365 aad user license remove [options]
 `--ids <ids>`
 : A comma separated list of IDs that specify the licenses to remove.
 
-`--confirm`
+`-f, --force`
 : Don't prompt for confirmation.
 ```
 

diff --git a/docs/docs/cmd/aad/user/user-list.mdx b/docs/docs/cmd/aad/user/user-list.mdx
@@ -17,9 +17,6 @@ m365 aad user list [options]
 ```md definition-list
 `-p, --properties [properties]`
 : Comma-separated list of properties to retrieve
-
-`-d, --deleted`
-: Use to retrieve deleted users
 ```
 
 <Global />
@@ -40,12 +37,6 @@ List all users in the tenant
 m365 aad user list
 ```
 
-List all recently deleted users in the tenant
-
-```sh
-m365 aad user list --deleted
-```
-
 List all users in the tenant. For each one return the display name and e-mail address
 
 ```sh

diff --git a/docs/docs/cmd/aad/user/user-recyclebinitem-clear.mdx b/docs/docs/cmd/aad/user/user-recyclebinitem-clear.mdx
@@ -13,7 +13,7 @@ m365 aad user recyclebinitem clear [options]
 ## Options
 
 ```md definition-list
-`--confirm`
+`-f, --force`
 : Don't prompt for confirmation.
 ```
 
@@ -44,7 +44,7 @@ m365 aad user recyclebinitem clear
 Removes all users from the tenant recycle bin without confirmation prompt
 
 ```sh
-m365 aad user recyclebinitem clear --confirm
+m365 aad user recyclebinitem clear --force
 ```
 
 ## Response

diff --git a/docs/docs/cmd/aad/user/user-recyclebinitem-remove.mdx b/docs/docs/cmd/aad/user/user-recyclebinitem-remove.mdx
@@ -16,7 +16,7 @@ m365 aad user recyclebinitem remove [options]
 `--id <id>`
 : ID of the deleted user.
 
-`--confirm`
+`-f, --force`
 : Don't prompt for confirmation.
 ```
 
@@ -47,7 +47,7 @@ m365 aad user recyclebinitem remove --id 59f80e08-24b1-41f8-8586-16765fd830d3
 Removes a specific user from the recycle bin without confirmation prompt
 
 ```sh
-m365 aad user recyclebinitem remove --id 59f80e08-24b1-41f8-8586-16765fd830d3 --confirm
+m365 aad user recyclebinitem remove --id 59f80e08-24b1-41f8-8586-16765fd830d3 --force
 ```
 
 ## Response

diff --git a/docs/docs/cmd/aad/user/user-remove.mdx b/docs/docs/cmd/aad/user/user-remove.mdx
@@ -19,7 +19,7 @@ m365 aad user remove [options]
 `--userName [userName]`
 :	User principal name of the user. Specify either `id` or `userName` but not both.
 
-`--confirm`
+`-f, --force`
 : Don't prompt for confirmation.
 ```