@pnp/cli-microsoft365 7.0.0-beta.093ef31 → 7.0.0-beta.14c7857

package/dist/m365/tenant/commands.js

@@ -1,6 +1,7 @@
 const prefix = 'tenant';
 export default {
     ID_GET: `${prefix} id get`,
+    INFO_GET: `${prefix} info get`,
     REPORT_ACTIVEUSERCOUNTS: `${prefix} report activeusercounts`,
     REPORT_ACTIVEUSERDETAIL: `${prefix} report activeuserdetail`,
     REPORT_OFFICE365ACTIVATIONCOUNTS: `${prefix} report office365activationcounts`,

package/dist/utils/aadGroup.js

@@ -1,13 +1,14 @@
 import request from "../request.js";
 import { formatting } from "./formatting.js";
 import { odata } from "./odata.js";
+import { Cli } from '../cli/Cli.js';
 const graphResource = 'https://graph.microsoft.com';
 export const aadGroup = {
     /**
      * Retrieve a single group.
      * @param id Group ID.
      */
-    getGroupById(id) {
+    async getGroupById(id) {
         const requestOptions = {
             url: `${graphResource}/v1.0/groups/${id}`,
             headers: {
@@ -21,7 +22,7 @@ export const aadGroup = {
      * Get a list of groups by display name.
      * @param displayName Group display name.
      */
-    getGroupsByDisplayName(displayName) {
+    async getGroupsByDisplayName(displayName) {
         return odata.getAllItems(`${graphResource}/v1.0/groups?$filter=displayName eq '${formatting.encodeQueryParameter(displayName)}'`);
     },
     /**
@@ -36,7 +37,8 @@ export const aadGroup = {
             throw Error(`The specified group '${displayName}' does not exist.`);
         }
         if (groups.length > 1) {
-            throw Error(`Multiple groups with name '${displayName}' found: ${groups.map(x => x.id).join(',')}.`);
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', groups);
+            return await Cli.handleMultipleResultsFound(`Multiple groups with name '${displayName}' found.`, resultAsKeyValuePair);
         }
         return groups[0];
     },

package/dist/utils/formatting.js

@@ -153,6 +153,13 @@ export const formatting = {
         const success = primarySupported ? '✔' : '√';
         const failure = primarySupported ? '✖' : '×';
         return `${result === CheckStatus.Success ? chalk.green(success) : chalk.red(failure)} ${message}`;
+    },
+    convertArrayToHashTable(key, array) {
+        const resultAsKeyValuePair = {};
+        array.forEach((obj) => {
+            resultAsKeyValuePair[obj[key]] = obj;
+        });
+        return resultAsKeyValuePair;
     }
 };
 //# sourceMappingURL=formatting.js.map

package/dist/utils/powerPlatform.js

@@ -19,7 +19,7 @@ export const powerPlatform = {
         };
         try {
             const response = await request.get(requestOptions);
-            return Promise.resolve(response.properties.linkedEnvironmentMetadata.instanceApiUrl);
+            return response.properties.linkedEnvironmentMetadata.instanceApiUrl;
         }
         catch (ex) {
             throw Error(`The environment '${environment}' could not be retrieved. See the inner exception for more details: ${ex.message}`);

package/docs/docs/cmd/aad/app/app-set.mdx

@@ -14,34 +14,34 @@ m365 aad app set [options]
 
 ```md definition-list
 `--appId [appId]`
-: Application (client) ID of the Azure AD application registration to update. Specify either `appId`, `objectId` or `name`
+: Application (client) ID of the Azure AD application registration to update. Specify either `appId`, `objectId` or `name`.
 
 `--objectId [objectId]`
-: Object ID of the Azure AD application registration to update. Specify either `appId`, `objectId` or `name`
+: Object ID of the Azure AD application registration to update. Specify either `appId`, `objectId` or `name`.
 
 `--name [name]`
-: Name of the Azure AD application registration to update. Specify either `appId`, `objectId` or `name`
+: Name of the Azure AD application registration to update. Specify either `appId`, `objectId` or `name`.
 
-`-u, --uri [uri]`
-: Comma-separated list of Application ID URIs to update
+`-u, --uris [uris]`
+: Comma-separated list of Application ID URIs to update.
 
 `-r, --redirectUris [redirectUris]`
-: Comma-separated list of redirect URIs to add to the app registration. Requires `platform` to be specified
+: Comma-separated list of redirect URIs to add to the app registration. Requires `platform` to be specified.
 
 `-p, --platform [platform]`
-: Platform for which the `redirectUri` should be configured. Allowed values `spa`, `web`, `publicClient`
+: Platform for which the `redirectUri` should be configured. Allowed values `spa`, `web`, `publicClient`.
 
 `--redirectUrisToRemove [redirectUrisToRemove]`
-: Comma-separated list of existing redirect URIs to remove. Specify, when you want to replace existing redirect URIs with another
+: Comma-separated list of existing redirect URIs to remove. Specify, when you want to replace existing redirect URIs with another.
 
 `--certificateFile [certificateFile]`
-: Path to the file with certificate public key. Specify either `certificateFile` or `certificateBase64Encoded`
+: Path to the file with certificate public key. Specify either `certificateFile` or `certificateBase64Encoded`.
 
 `--certificateBase64Encoded [certificateBase64Encoded]`
-: Base64-encoded string with certificate public key. Specify either `certificateFile` or `certificateBase64Encoded`
+: Base64-encoded string with certificate public key. Specify either `certificateFile` or `certificateBase64Encoded`.
 
 `--certificateDisplayName [certificateDisplayName]`
-: Display name for the certificate. If not given, the displayName will be set to the certificate subject. When specified, also specify either `certificateFile` or `certificateBase64Encoded`
+: Display name for the certificate. If not given, the displayName will be set to the certificate subject. When specified, also specify either `certificateFile` or `certificateBase64Encoded`.
 ```
 
 <Global />
@@ -59,19 +59,19 @@ When a certificate is specified it will be added to the list of certificates of
 Update the app URI of the Azure AD application registration specified by its object ID
 
 ```sh
-m365 aad app set --objectId d75be2e1-0204-4f95-857d-51a37cf40be8 --uri https://contoso.com/e75be2e1-0204-4f95-857d-51a37cf40be8
+m365 aad app set --objectId d75be2e1-0204-4f95-857d-51a37cf40be8 --uris https://contoso.com/e75be2e1-0204-4f95-857d-51a37cf40be8
 ```
 
 Update the app URI of the Azure AD application registration specified by its app (client) ID
 
 ```sh
-m365 aad app set --appId e75be2e1-0204-4f95-857d-51a37cf40be8 --uri https://contoso.com/e75be2e1-0204-4f95-857d-51a37cf40be8
+m365 aad app set --appId e75be2e1-0204-4f95-857d-51a37cf40be8 --uris https://contoso.com/e75be2e1-0204-4f95-857d-51a37cf40be8
 ```
 
 Update the app URI of the Azure AD application registration specified by its name
 
 ```sh
-m365 aad app set --name "My app" --uri https://contoso.com/e75be2e1-0204-4f95-857d-51a37cf40be8
+m365 aad app set --name "My app" --uris https://contoso.com/e75be2e1-0204-4f95-857d-51a37cf40be8
 ```
 
 Add a new redirect URI for SPA authentication
@@ -94,4 +94,4 @@ m365 aad app set --appId e75be2e1-0204-4f95-857d-51a37cf40be8 --certificateDispl
 
 ## Response
 
-The command won't return a response on success.
+The command won't return a response on success.

package/docs/docs/cmd/aad/approleassignment/approleassignment-add.mdx

@@ -16,19 +16,19 @@ m365 aad approleassignment add [options]
 
 ```md definition-list
 `--appId [appId]`
-: Application appId also known as clientId of the App Registration to which the configured scopes (app roles) should be applied
+: Application appId also known as clientId of the App Registration to which the configured scopes (app roles) should be applied.
 
 `--appObjectId [appObjectId]`
-: Application objectId of the App Registration to which the configured scopes (app roles) should be applied
+: Application objectId of the App Registration to which the configured scopes (app roles) should be applied.
 
 `--appDisplayName [appDisplayName]`
-: Application name of the App Registration to which the configured scopes (app roles) should be applied
+: Application name of the App Registration to which the configured scopes (app roles) should be applied.
 
 `-r, --resource <resource>`
 : Service principal name, appId or objectId that has the scopes (roles) e.g. `SharePoint`.
 
-`-s, --scope <scope>`
-: Permissions known also as scopes and roles to grant the application with. If multiple permissions have to be granted, they have to be comma-separated e.g. `Sites.Read.All`, `Sites.ReadWrite.all`
+`-s, --scopes <scopes>`
+: Permissions known also as scopes and roles to grant the application with. If multiple permissions have to be granted, they have to be comma-separated e.g. `Sites.Read.All`, `Sites.ReadWrite.all`.
 ```
 
 <Global />
@@ -48,19 +48,19 @@ This command can also be used to assign permissions to system or user-assigned m
 Adds SharePoint _Sites.Read.All_ application permissions to Azure AD application with app id _57907bf8-73fa-43a6-89a5-1f603e29e451_
 
 ```sh
-m365 aad approleassignment add --appId "57907bf8-73fa-43a6-89a5-1f603e29e451" --resource "SharePoint" --scope "Sites.Read.All"
+m365 aad approleassignment add --appId "57907bf8-73fa-43a6-89a5-1f603e29e451" --resource "SharePoint" --scopes "Sites.Read.All"
 ```
 
 Adds multiple Microsoft Graph application permissions to an Azure AD application with the name _MyAppName__
 
 ```sh
-m365 aad approleassignment add --appDisplayName "MyAppName" --resource "Microsoft Graph" --scope "Mail.Read,Mail.Send"
+m365 aad approleassignment add --appDisplayName "MyAppName" --resource "Microsoft Graph" --scopes "Mail.Read,Mail.Send"
 ```
 
 Adds Microsoft Graph _Mail.Read_ application permissions to a system-managed identity app with objectId _57907bf8-73fa-43a6-89a5-1f603e29e451_
 
 ```sh
-m365 aad approleassignment add --appObjectId "57907bf8-73fa-43a6-89a5-1f603e29e451" --resource "Microsoft Graph" --scope "Mail.Read"
+m365 aad approleassignment add --appObjectId "57907bf8-73fa-43a6-89a5-1f603e29e451" --resource "Microsoft Graph" --scopes "Mail.Read"
 ```
 
 ## Response
@@ -106,7 +106,7 @@ m365 aad approleassignment add --appObjectId "57907bf8-73fa-43a6-89a5-1f603e29e4
   <TabItem value="Markdown">
 
   ```md
-  # aad approleassignment add --appId "e89804ac-a571-48cf-b2ba-fd57b5d49993" --resource "Microsoft Graph" --scope "Mail.Read"
+  # aad approleassignment add --appId "e89804ac-a571-48cf-b2ba-fd57b5d49993" --resource "Microsoft Graph" --scopes "Mail.Read"
 
   Date: 2023-06-01
 

package/docs/docs/cmd/aad/approleassignment/approleassignment-remove.mdx

@@ -14,22 +14,22 @@ m365 aad approleassignment remove [options]
 
 ```md definition-list
 `--appId [appId]`
-: Application appId also known as clientId of the App Registration for which the configured scopes (app roles) should be deleted
+: Application appId also known as clientId of the App Registration for which the configured scopes (app roles) should be deleted.
 
 `--appObjectId [appObjectId]`
-: Application objectId of the App Registration for which the configured scopes (app roles) should be deleted
+: Application objectId of the App Registration for which the configured scopes (app roles) should be deleted.
 
 `--appDisplayName [appDisplayName]`
-: Application name of the App Registration for which the configured scopes (app roles) should be deleted
+: Application name of the App Registration for which the configured scopes (app roles) should be deleted.
 
 `-r, --resource <resource>`
-: Service principal name, appId or objectId that has the scopes (roles) e.g. `SharePoint`
+: Service principal name, appId or objectId that has the scopes (roles) e.g. `SharePoint`.
 
-`-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`
+`-s, --scopes <scopes>`
+: 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`.
 
 `-f, --force`
-: Don't prompt for confirming removing the all role assignment
+: Don't prompt for confirming removing the all role assignment.
 ```
 
 <Global />
@@ -49,19 +49,19 @@ This command can also be used to assign permissions to system- or user-assigned
 Deletes SharePoint _Sites.Read.All_ application permissions from Azure AD application with app id _57907bf8-73fa-43a6-89a5-1f603e29e451_
 
 ```sh
-m365 aad approleassignment remove --appId "57907bf8-73fa-43a6-89a5-1f603e29e451" --resource "SharePoint" --scope "Sites.Read.All"
+m365 aad approleassignment remove --appId "57907bf8-73fa-43a6-89a5-1f603e29e451" --resource "SharePoint" --scopes "Sites.Read.All"
 ```
 
 Deletes multiple Microsoft Graph application permissions from an Azure AD application with name _MyAppName_
 
 ```sh
-m365 aad approleassignment remove --appDisplayName "MyAppName" --resource "Microsoft Graph" --scope "Mail.Read,Mail.Send"
+m365 aad approleassignment remove --appDisplayName "MyAppName" --resource "Microsoft Graph" --scopes "Mail.Read,Mail.Send"
 ```
 
 Deletes Microsoft Graph _Mail.Read_ application permissions from a system-managed identity app with objectId _57907bf8-73fa-43a6-89a5-1f603e29e451_
 
 ```sh
-m365 aad approleassignment remove --appObjectId "57907bf8-73fa-43a6-89a5-1f603e29e451" --resource "Microsoft Graph" --scope "Mail.Read"
+m365 aad approleassignment remove --appObjectId "57907bf8-73fa-43a6-89a5-1f603e29e451" --resource "Microsoft Graph" --scopes "Mail.Read"
 ```
 
 ## Response

package/docs/docs/cmd/aad/group/group-get.mdx

@@ -16,10 +16,10 @@ m365 aad group get [options]
 
 ```md definition-list
 `-i, --id [id]`
-: The object Id of the Azure AD group. Specify either `id` or `title` but not both
+: The object Id of the Azure AD group. Specify either `id` or `displayName` but not both.
 
-`-t, --title [title]`
-: The display name of the Azure AD group. Specify either `id` or `title` but not both
+`-n, --displayName [displayName]`
+: The display name of the Azure AD group. Specify either `id` or `displayName` but not both.
 ```
 
 <Global />
@@ -32,10 +32,10 @@ Get information about an Azure AD Group by id
 m365 aad group get --id 1caf7dcd-7e83-4c3a-94f7-932a1299c844
 ```
 
-Get information about an Azure AD Group by title
+Get information about an Azure AD Group by its display name
 
 ```sh
-m365 aad group get --title "Finance"
+m365 aad group get --displayName Finance
 ```
 
 ## Response

package/docs/docs/cmd/aad/group/group-list.mdx

@@ -14,11 +14,6 @@ m365 aad group list [options]
 
 ## Options
 
-```md definition-list
-`-d, --deleted`
-: Use to retrieve deleted groups
-```
-
 <Global />
 
 ## Examples
@@ -29,12 +24,6 @@ Lists all groups defined in Azure Active Directory.
 m365 aad group list
 ```
 
-List all recently deleted groups in the tenant
-
-```sh
-m365 aad group list --deleted
-```
-
 ## Response
 
 <Tabs>

package/docs/docs/cmd/aad/group/group-remove.mdx

@@ -0,0 +1,44 @@
+import Global from '/docs/cmd/_global.mdx';
+
+# aad group remove
+
+Removes an Azure AD group
+
+## Usage
+
+```sh
+m365 aad group remove [options]
+```
+
+## Options
+
+```md definition-list
+`-i, --id [id]`
+: The ID of the Azure AD group. Specify either `id` or `displayName` but not both.
+
+`-n, --displayName [displayName]`
+: The display name of the Azure AD group. Specify either `id` or `displayName` but not both.
+
+`-f, --force`
+: Don't prompt for confirmation.
+```
+
+<Global />
+
+## Examples
+
+Remove an Azure AD group by display name
+
+```sh
+m365 aad group remove --displayName Developers
+```
+
+Remove an Azure AD group by ID
+
+```sh
+m365 aad group remove --id 016bf125-195b-43c5-a1a0-28ccd3192c6d
+```
+
+## Response
+
+The command won't return a response on success.

package/docs/docs/cmd/aad/m365group/m365group-add.mdx

@@ -30,8 +30,8 @@ m365 aad m365group add [options]
 `--members [members]`
 : Comma-separated list of Microsoft 365 Group members
 
-`--isPrivate`
-: Specify, if the Microsoft 365 Group should be private. If not specified, will create a public group (default)
+`--visibility [visibility]`
+: Specifies the group join policy and group content visibility for groups. Possible values are: `Private`, `Public`, or `HiddenMembership`. Defaults to `Public`.
 
 `--allowMembersToPost [allowMembersToPost]`
 : Set if only group members should be able to post conversations to the group
@@ -53,9 +53,19 @@ m365 aad m365group add [options]
 
 ## Remarks
 
+You cannot change the group type when you choose `HiddenMembership` visibility. HiddenMembership can be set only for Microsoft 365 groups, when the groups are created. It can't be updated later.
+
 When specifying the path to the logo image you can use both relative and absolute paths. Note, that ~ in the path, will not be resolved and will most likely result in an error.
 If an invalid user is provided in the comma-separated list of Owners or Members, the command operation will fail and the Microsoft 365 Group will not be created.
 
+Group visibility options:
+
+Value	| Description
+-------|-------------
+Public | Anyone can join the group without needing owner permission. Anyone can view the attributes of the group. Anyone can see the members of the group.
+Private | Owner permission is needed to join the group. Anyone can view the attributes of the group. Anyone can see the members of the group.
+HiddenMembership | Owner permission is needed to join the group. Guest users cannot view the attributes of the group. Non-members cannot see the members of the group. Administrators (global, company, user, and helpdesk) can view the membership of the group. The group appears in the global address book (GAL).
+
 ## Examples
 
 Create a public Microsoft 365 Group
@@ -67,7 +77,7 @@ m365 aad m365group add --displayName Finance --description "This is the Contoso
 Create a private Microsoft 365 Group
 
 ```sh
-m365 aad m365group add --displayName Finance --description "This is the Contoso Finance Group. Please come here and check out the latest news, posts, files, and more." --mailNickname finance --isPrivate
+m365 aad m365group add --displayName Finance --description "This is the Contoso Finance Group. Please come here and check out the latest news, posts, files, and more." --mailNickname finance --visibility Private
 ```
 
 Create a public Microsoft 365 Group and set specified users as its owners

package/docs/docs/cmd/aad/policy/policy-list.mdx

@@ -35,10 +35,6 @@ Returns claim-mapping policies from Azure AD
 m365 aad policy list --type "claimsMapping"
 ```
 
-## More information
-
-- Microsoft Graph Azure AD policy overview: [https://docs.microsoft.com/en-us/graph/api/resources/policy-overview?view=graph-rest-1.0](https://docs.microsoft.com/en-us/graph/api/resources/policy-overview?view=graph-rest-1.0)
-
 ## Response
 
 <Tabs>
@@ -112,4 +108,8 @@ m365 aad policy list --type "claimsMapping"
   ```
 
   </TabItem>
-</Tabs>
+</Tabs>
+
+## More information
+
+- Microsoft Graph Azure AD policy overview: [https://docs.microsoft.com/en-us/graph/api/resources/policy-overview?view=graph-rest-1.0](https://docs.microsoft.com/en-us/graph/api/resources/policy-overview?view=graph-rest-1.0)

package/docs/docs/cmd/cli/config/config-list.mdx

@@ -5,7 +5,7 @@ import TabItem from '@theme/TabItem';
 
 # cli config list
 
-List all self set CLI for Microsoft 365 configurations
+List all self-set CLI for Microsoft 365 configurations
 
 ## Usage
 

package/docs/docs/cmd/graph/subscription/subscription-add.mdx

@@ -16,19 +16,19 @@ m365 graph subscription add [options]
 
 ```md definition-list
 `-r, --resource <resource>`
-: The resource that will be monitored for changes
+: The resource that will be monitored for changes.
 
-`-c, --changeType <changeType>`
-: The type of change in the subscribed resource that will raise a notification. The supported values are: `created`, `updated`, `deleted`. Multiple values can be combined using a comma-separated list
+`-c, --changeTypes <changeTypes>`
+: The type of change in the subscribed resource that will raise a notification. The supported values are: `created`, `updated`, `deleted`. Multiple values can be combined using a comma-separated list.
 
 `-u, --notificationUrl <notificationUrl>`
-: The URL of the endpoint that will receive the notifications. This URL must use the HTTPS protocol
+: The URL of the endpoint that will receive the notifications. This URL must use the HTTPS protocol.
 
 `-e, --expirationDateTime [expirationDateTime]`
-: The date and time when the webhook subscription expires. The time is in UTC, and can be an amount of time from subscription creation that varies for the resource subscribed to. If not specified, the maximum allowed expiration for the specified resource will be used
+: The date and time when the webhook subscription expires. The time is in UTC, and can be an amount of time from subscription creation that varies for the resource subscribed to. If not specified, the maximum allowed expiration for the specified resource will be used.
 
 `-s, --clientState [clientState]`
-: The value of the clientState property sent by the service in each notification. The maximum length is 128 characters
+: The value of the clientState property sent by the service in each notification. The maximum length is 128 characters.
 ```
 
 <Global />
@@ -52,19 +52,19 @@ To subscribe to change notifications of Outlook contacts, events, or messages in
 Create a subscription
 
 ```sh
-m365 graph subscription add --resource "me/mailFolders('Inbox')/messages" --changeType "updated" --notificationUrl "https://webhook.azurewebsites.net/api/send/myNotifyClient" --expirationDateTime "2016-11-20T18:23:45.935Z" --clientState "secretClientState"
+m365 graph subscription add --resource "me/mailFolders('Inbox')/messages" --changeTypes "updated" --notificationUrl "https://webhook.azurewebsites.net/api/send/myNotifyClient" --expirationDateTime "2016-11-20T18:23:45.935Z" --clientState "secretClientState"
 ```
 
 Create a subscription on multiple change types
 
 ```sh
-m365 graph subscription add --resource groups --changeType updated,deleted --notificationUrl "https://webhook.azurewebsites.net/api/send/myNotifyClient" --expirationDateTime "2016-11-20T18:23:45.935Z" --clientState "secretClientState"
+m365 graph subscription add --resource groups --changeTypes "updated,deleted" --notificationUrl "https://webhook.azurewebsites.net/api/send/myNotifyClient" --expirationDateTime "2016-11-20T18:23:45.935Z" --clientState "secretClientState"
 ```
 
 Create a subscription using the maximum allowed expiration for Group resources
 
 ```sh
-m365 graph subscription add --resource groups --changeType "updated" --notificationUrl "https://webhook.azurewebsites.net/api/send/myNotifyClient"
+m365 graph subscription add --resource groups --changeTypes "updated" --notificationUrl "https://webhook.azurewebsites.net/api/send/myNotifyClient"
 ```
 
 ## Response
@@ -125,7 +125,7 @@ m365 graph subscription add --resource groups --changeType "updated" --notificat
   <TabItem value="Markdown">
 
   ```md
-  # graph subscription add --resource "groups" --changeType "updated" --notificationUrl "https://webhook.azurewebsites.net/api/changeNotificationHook" --expirationDateTime "2023-05-23T18:23:45.935Z" --clientState "some secret value"
+  # graph subscription add --resource "groups" --changeTypes "updated" --notificationUrl "https://webhook.azurewebsites.net/api/changeNotificationHook" --expirationDateTime "2023-05-23T18:23:45.935Z" --clientState "some secret value"
 
   Date: 2023-05-22
 

package/docs/docs/cmd/pa/app/app-export.mdx

@@ -13,13 +13,13 @@ m365 pa app export [options]
 ## Options
 
 ```md definition-list
-`-i, --id <id>`
-: The id of the Power App to export
+`-n, --name <name>`
+: The name (GUID) of the Power Apps app to export
 
 `-e, --environmentName <environmentName>`
 : The name of the environment for which to export the app
 
-`-n, --packageDisplayName [packageDisplayName]`
+`--packageDisplayName [packageDisplayName]`
 : The display name to use in the exported package
 
 `-d, --packageDescription [packageDescription]`
@@ -42,13 +42,13 @@ m365 pa app export [options]
 Export the specified Power App as a ZIP file
 
 ```sh
-m365 pa app export --environmentName Default-d87a7535-dd31-4437-bfe1-95340acd55c5 --id 3989cb59-ce1a-4a5c-bb78-257c5c39381d --packageDisplayName "PowerApp"
+m365 pa app export --environmentName Default-d87a7535-dd31-4437-bfe1-95340acd55c5 --name 3989cb59-ce1a-4a5c-bb78-257c5c39381d --packageDisplayName "PowerApp"
 ```
 
 Export the specified Power App as a ZIP file with the package displayname, package description, the one who created it, the package source environment and the path
 
 ```sh
-m365 pa app export --environmentName Default-d87a7535-dd31-4437-bfe1-95340acd55c5 --id 3989cb59-ce1a-4a5c-bb78-257c5c39381d --packageDisplayName "PowerApp" --packageDescription "Power App Description" --packageCreatedBy "John Doe" --packageSourceEnvironment "Contoso" --path "C:/Users/John/Documents"
+m365 pa app export --environmentName Default-d87a7535-dd31-4437-bfe1-95340acd55c5 --name 3989cb59-ce1a-4a5c-bb78-257c5c39381d --packageDisplayName "PowerApp" --packageDescription "Power App Description" --packageCreatedBy "John Doe" --packageSourceEnvironment "Contoso" --path "C:/Users/John/Documents"
 ```
 
 ## Response

package/docs/docs/cmd/pp/solution/solution-publisher-get.mdx

@@ -19,10 +19,10 @@ m365 pp solution publisher get [options]
 : The name of the environment.
 
 `-i --id [id]`
-: The ID of the solution. Specify either `id` or `name` but not both.
+: The ID of the publisher. Specify either `id` or `name` but not both.
 
 `-n, --name [name]`
-: The unique name (not the display name) of the solution. Specify either `id` or `name` but not both.
+: The unique name of the publisher. Specify either `id` or `name` but not both.
 
 `--asAdmin`
 : Run the command as admin for environments you do not have explicitly assigned permissions to.

package/docs/docs/cmd/pp/solution/solution-publisher-remove.mdx

@@ -17,10 +17,10 @@ m365 pp solution publisher remove [options]
 : The name of the environment.
 
 `-i, --id [id]`
-: The id of the solution. Specify either `id` or `name` but not both.
+: The id of the publisher. Specify either `id` or `name` but not both.
 
 `-n, --name [name]`
-: The name of the solution. Specify either `id` or `name` but not both.
+: The unique name of the publisher. Specify either `id` or `name` but not both.
 
 `--asAdmin`
 : Run the command as admin for environments you do not have explicitly assigned permissions to.

package/docs/docs/cmd/spfx/project/project-upgrade.mdx

@@ -35,7 +35,7 @@ m365 spfx project upgrade [options]
 
 ## Remarks
 
-The `spfx project upgrade` command helps you upgrade your SharePoint Framework project to the specified version. If no version is specified, the command will upgrade to the latest version of the SharePoint Framework it supports (v1.17.4).
+The `spfx project upgrade` command helps you upgrade your SharePoint Framework project to the specified version. If no version is specified, the command will upgrade to the latest version of the SharePoint Framework it supports (v1.18.0).
 
 This command doesn't change your project files. Instead, it gives you a report with all steps necessary to upgrade your project to the specified version of the SharePoint Framework. Changing project files is error-prone, especially when it comes to updating your solution's code. This is why at this moment, this command produces a report that you can use yourself to perform the necessary updates and verify that everything is working as expected.
 

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

@@ -15,10 +15,10 @@ m365 spo file get [options]
 ## Options
 
 ```md definition-list
-`-w, --webUrl <webUrl>`
+`-u, --webUrl <webUrl>`
 : The URL of the site where the file is located
 
-`-u, --url [url]`
+`--url [url]`
 : The server- or site-relative decoded URL of the file to retrieve. Specify either `url` or `id` but not both
 
 `-i, --id [id]`

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

@@ -19,13 +19,13 @@ m365 spo page template remove
 ## Options
 
 ```md definition-list
-`-w, --webUrl <webUrl>`
+`-u, --webUrl <webUrl>`
 : URL of the site where the file to remove is located
 
 `-i, --id [id]`
 : The ID of the file to remove. Specify either `id` or `url` but not both
 
-`-u, --url [url]`
+`--url [url]`
 : The server- or site-relative decoded URL of the file to remove. Specify either `id` or `url` but not both
 
 `--recycle`

package/docs/docs/cmd/spo/file/file-version-clear.mdx

@@ -13,10 +13,10 @@ m365 spo file version clear [options]
 ## Options
 
 ```md definition-list
-`-w, --webUrl <webUrl>`
+`-u, --webUrl <webUrl>`
 : The URL of the site where the file is located
 
-`-u, --fileUrl [fileUrl]`
+`--fileUrl [fileUrl]`
 : The server- or site-relative decoded URL of the file. Specify either `fileUrl` or `fileId` but not both
 
 `-i, --fileId [fileId]`

package/docs/docs/cmd/spo/file/file-version-get.mdx

@@ -15,13 +15,13 @@ m365 spo file version get [options]
 ## Options
 
 ```md definition-list
-`-w, --webUrl <webUrl>`
+`-u, --webUrl <webUrl>`
 : The URL of the site where the file is located
 
 `--label <label>`
 : Label of version which will be retrieved
 
-`-u, --fileUrl [fileUrl]`
+`--fileUrl [fileUrl]`
 : The server- or site-relative decoded URL of the file to retrieve. Specify either `fileUrl` or `fileId` but not both
 
 `-i, --fileId [fileId]`

package/docs/docs/cmd/spo/file/file-version-list.mdx

@@ -15,10 +15,10 @@ m365 spo file version list [options]
 ## Options
 
 ```md definition-list
-`-w, --webUrl <webUrl>`
+`-u, --webUrl <webUrl>`
 : The URL of the site where the file is located
 
-`-u, --fileUrl [fileUrl]`
+`--fileUrl [fileUrl]`
 : The server- or site-relative decoded URL of the file. Specify either `fileUrl` or `fileId` but not both
 
 `-i, --fileId [fileId]`