@pnp/cli-microsoft365 12.0.0-beta.d654135 → 12.0.0-beta.e3af9f8

package/dist/m365/tenant/commands/serviceannouncement/serviceannouncement-message-get.js

@@ -1,12 +1,16 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _TenantServiceAnnouncementMessageGetCommand_instances, _TenantServiceAnnouncementMessageGetCommand_initOptions, _TenantServiceAnnouncementMessageGetCommand_initValidators;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    id: z.string()
+        .refine(val => (/MC\d{6}/).test(val), {
+        message: 'The value is not a valid message ID'
+    })
+        .alias('i')
+});
 class TenantServiceAnnouncementMessageGetCommand extends GraphCommand {
     get name() {
         return commands.SERVICEANNOUNCEMENT_MESSAGE_GET;
@@ -14,11 +18,8 @@ class TenantServiceAnnouncementMessageGetCommand extends GraphCommand {
     get description() {
         return 'Retrieves a specified service update message for the tenant';
     }
-    constructor() {
-        super();
-        _TenantServiceAnnouncementMessageGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _TenantServiceAnnouncementMessageGetCommand_instances, "m", _TenantServiceAnnouncementMessageGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _TenantServiceAnnouncementMessageGetCommand_instances, "m", _TenantServiceAnnouncementMessageGetCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -39,21 +40,6 @@ class TenantServiceAnnouncementMessageGetCommand extends GraphCommand {
             this.handleRejectedODataJsonPromise(err);
         }
     }
-    isValidId(id) {
-        return (/MC\d{6}/).test(id);
-    }
 }
-_TenantServiceAnnouncementMessageGetCommand_instances = new WeakSet(), _TenantServiceAnnouncementMessageGetCommand_initOptions = function _TenantServiceAnnouncementMessageGetCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --id <id>'
-    });
-}, _TenantServiceAnnouncementMessageGetCommand_initValidators = function _TenantServiceAnnouncementMessageGetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (!this.isValidId(args.options.id)) {
-            return `${args.options.id} is not a valid message ID`;
-        }
-        return true;
-    });
-};
 export default new TenantServiceAnnouncementMessageGetCommand();
 //# sourceMappingURL=serviceannouncement-message-get.js.map

package/dist/m365/tenant/commands/serviceannouncement/serviceannouncement-message-list.js

@@ -1,13 +1,13 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _TenantServiceAnnouncementMessageListCommand_instances, _TenantServiceAnnouncementMessageListCommand_initTelemetry, _TenantServiceAnnouncementMessageListCommand_initOptions;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { odata } from '../../../../utils/odata.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    service: z.string().optional().alias('s')
+});
 class TenantServiceAnnouncementMessageListCommand extends GraphCommand {
     get name() {
         return commands.SERVICEANNOUNCEMENT_MESSAGE_LIST;
@@ -18,11 +18,8 @@ class TenantServiceAnnouncementMessageListCommand extends GraphCommand {
     defaultProperties() {
         return ['id', 'title'];
     }
-    constructor() {
-        super();
-        _TenantServiceAnnouncementMessageListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _TenantServiceAnnouncementMessageListCommand_instances, "m", _TenantServiceAnnouncementMessageListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _TenantServiceAnnouncementMessageListCommand_instances, "m", _TenantServiceAnnouncementMessageListCommand_initOptions).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         let endpoint = `${this.resource}/v1.0/admin/serviceAnnouncement/messages`;
@@ -38,16 +35,5 @@ class TenantServiceAnnouncementMessageListCommand extends GraphCommand {
         }
     }
 }
-_TenantServiceAnnouncementMessageListCommand_instances = new WeakSet(), _TenantServiceAnnouncementMessageListCommand_initTelemetry = function _TenantServiceAnnouncementMessageListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            service: typeof args.options.service !== 'undefined'
-        });
-    });
-}, _TenantServiceAnnouncementMessageListCommand_initOptions = function _TenantServiceAnnouncementMessageListCommand_initOptions() {
-    this.options.unshift({
-        option: '-s, --service [service]'
-    });
-};
 export default new TenantServiceAnnouncementMessageListCommand();
 //# sourceMappingURL=serviceannouncement-message-list.js.map

package/dist/m365/util/commands/accesstoken/accesstoken-get.js

@@ -1,13 +1,14 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _UtilAccessTokenGetCommand_instances, _UtilAccessTokenGetCommand_initTelemetry, _UtilAccessTokenGetCommand_initOptions;
+import { z } from 'zod';
 import auth, { Auth } from '../../../../Auth.js';
-import Command from '../../../../Command.js';
+import Command, { globalOptionsZod } from '../../../../Command.js';
 import commands from '../../commands.js';
 import { accessToken } from '../../../../utils/accessToken.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    resource: z.string().alias('r'),
+    new: z.boolean().optional(),
+    decoded: z.boolean().optional()
+});
 class UtilAccessTokenGetCommand extends Command {
     get name() {
         return commands.ACCESSTOKEN_GET;
@@ -15,11 +16,8 @@ class UtilAccessTokenGetCommand extends Command {
     get description() {
         return 'Gets access token for the specified resource';
     }
-    constructor() {
-        super();
-        _UtilAccessTokenGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _UtilAccessTokenGetCommand_instances, "m", _UtilAccessTokenGetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _UtilAccessTokenGetCommand_instances, "m", _UtilAccessTokenGetCommand_initOptions).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         let resource = args.options.resource;
@@ -49,21 +47,5 @@ class UtilAccessTokenGetCommand extends Command {
         }
     }
 }
-_UtilAccessTokenGetCommand_instances = new WeakSet(), _UtilAccessTokenGetCommand_initTelemetry = function _UtilAccessTokenGetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            new: args.options.new,
-            decoded: args.options.decoded
-        });
-    });
-}, _UtilAccessTokenGetCommand_initOptions = function _UtilAccessTokenGetCommand_initOptions() {
-    this.options.unshift({
-        option: '-r, --resource <resource>'
-    }, {
-        option: '--new'
-    }, {
-        option: '--decoded'
-    });
-};
 export default new UtilAccessTokenGetCommand();
 //# sourceMappingURL=accesstoken-get.js.map

package/dist/telemetry.js

@@ -1,25 +1,21 @@
-import appInsights from './appInsights.js';
 import { cli } from './cli/cli.js';
+import { googleAnalytics } from './googleAnalytics.js';
 import { settingsNames } from './settingsNames.js';
 import { pid } from './utils/pid.js';
 import { session } from './utils/session.js';
 async function trackTelemetry(object) {
     try {
         const { commandName, properties, exception } = object;
-        appInsights.commonProperties.shell = pid.getProcessName(process.ppid) || '';
-        appInsights.context.tags[appInsights.context.keys.sessionId] = session.getId(process.ppid);
+        const context = {
+            shell: pid.getProcessName(process.ppid) || '',
+            sessionId: session.getId(process.ppid)
+        };
         if (exception) {
-            appInsights.trackException({
-                exception
-            });
+            await googleAnalytics.trackException(exception, context);
         }
         else {
-            appInsights.trackEvent({
-                name: commandName,
-                properties
-            });
+            await googleAnalytics.trackEvent(commandName, properties, context);
         }
-        await appInsights.flush();
     }
     catch {
         // Do nothing

package/dist/utils/spo.js

@@ -576,6 +576,45 @@ export const spo = {
         return request.post(requestOptions);
     },
     /**
+    * Retrieves the navigation node with the specified key.
+    * Returns the node along with the menu state that contains it.
+    * @param webUrl Web url
+    * @param key Key (ID) of the navigation node
+    * @param location Navigation to search. When not specified, searches the quick launch first and then the top navigation
+    */
+    async getMenuStateNodeByKey(webUrl, key, location) {
+        const locations = location ? [location] : ['QuickLaunch', 'TopNavigationBar'];
+        for (const navigationLocation of locations) {
+            const menuState = navigationLocation === 'TopNavigationBar'
+                ? await this.getTopNavigationMenuState(webUrl)
+                : await this.getQuickLaunchMenuState(webUrl);
+            const node = this.findMenuStateNode(menuState.Nodes, key);
+            if (node) {
+                return { menuState, node };
+            }
+        }
+        throw location
+            ? `Navigation node with id '${key}' not found in ${location}.`
+            : `Navigation node with id '${key}' not found.`;
+    },
+    /**
+    * Recursively searches the specified menu state nodes for the node with the specified key.
+    * @param nodes Menu state nodes to search
+    * @param key Key (ID) of the navigation node
+    */
+    findMenuStateNode(nodes, key) {
+        for (const node of nodes) {
+            if (node.Key === key) {
+                return node;
+            }
+            const childNode = this.findMenuStateNode(node.Nodes, key);
+            if (childNode) {
+                return childNode;
+            }
+        }
+        return undefined;
+    },
+    /**
     * Retrieves the spo group by name.
     * Returns a group object
     * @param webUrl Web url
@@ -1250,9 +1289,7 @@ export const spo = {
             // Neither properties nor contentTypeName provided, no need to proceed
             throw 'Either properties or contentTypeName must be provided for systemUpdateListItem.';
         }
-        const parsedUrl = new URL(absoluteListUrl);
-        const serverRelativeSiteMatch = absoluteListUrl.match(new RegExp('/sites/[^/]+'));
-        const webUrl = `${parsedUrl.protocol}//${parsedUrl.host}${serverRelativeSiteMatch ?? ''}`;
+        const webUrl = absoluteListUrl.substring(0, absoluteListUrl.indexOf('/_api/'));
         if (verbose && logger) {
             await logger.logToStderr(`Getting list id...`);
         }

package/dist/utils/urlUtil.js

@@ -165,8 +165,8 @@ export const urlUtil = {
     */
     getTargetSiteAbsoluteUrl(webUrl, url) {
         const fullUrl = url.startsWith('https://') ? url : urlUtil.getAbsoluteUrl(webUrl, url);
-        // Pattern to match SharePoint URLs
-        const urlPattern = /https:\/\/[\w-]+\.sharepoint\.com\/(teams|sites|personal)\/([\w-]+)/;
+        // Pattern to match SharePoint site collection URLs on any of the supported managed paths
+        const urlPattern = /^https:\/\/[\w-]+\.sharepoint\.com\/(teams|sites|personal)\/[^/?#]+/i;
         const match = fullUrl.match(urlPattern);
         if (match) {
             // If a match is found, return the matched URL

package/dist/utils/zod.js

@@ -110,14 +110,14 @@ export const zod = {
         });
         return options;
     },
-    coercedEnum: (e) => z.preprocess(val => {
-        const target = String(val)?.toLowerCase();
+    coercedEnum: (e) => z.string().pipe(z.preprocess(val => {
+        const target = String(val).toLowerCase();
         for (const k of Object.values(e)) {
-            if (String(k)?.toLowerCase() === target) {
+            if (String(k).toLowerCase() === target) {
                 return k;
             }
         }
         return null;
-    }, z.enum(e))
+    }, z.enum(e)))
 };
 //# sourceMappingURL=zod.js.map

package/docs/docs/cmd/login.mdx

@@ -78,7 +78,20 @@ When logging in to Microsoft 365 using the user name and password, next to the a
 
 When logging in to Microsoft 365 using a certificate, the CLI for Microsoft 365 will store the contents of the certificate so that it can automatically re-authenticate if necessary. The contents of the certificate are removed by re-authenticating using the device code or by calling the [logout](logout.mdx) command.  
 
-Federated Identity is currently supported in GitHub Actions. To use this you need to set `authType` to `federatedIdentity` and specify `appId` and `tenant` to the values of the app registration you've configured a federated credential on. 
+Federated Identity is currently supported in GitHub Actions, Azure DevOps and GitLab CI/CD. To use this you need to set `authType` to `federatedIdentity` and specify `appId` and `tenant` to the values of the app registration you've configured a federated credential on.
+
+To use Federated Identity in GitLab CI/CD, the job must request an ID token named `GITLAB_OIDC_TOKEN` with audience `api://AzureADTokenExchange`, for example:
+
+```yaml
+job:
+  id_tokens:
+    GITLAB_OIDC_TOKEN:
+      aud: "api://AzureADTokenExchange"
+  script:
+    - m365 login --authType federatedIdentity --appId eb96cfd0-abfa-4477-8d1d-c6dfde3efb19 --tenant 9a1a1bbd-e158-4cf5-967d-a53b8e85c628
+```
+
+The corresponding federated credential on the Microsoft Entra app registration must have issuer `https://gitlab.com` (or your self-managed GitLab instance URL) and a subject matching the GitLab OIDC claim for the job, for example `project_path:<group>/<project>:ref_type:branch:ref:<branch>`.
 
 To log in to Microsoft 365 using a certificate or secret, you will typically [create a custom Microsoft Entra application](../user-guide/using-own-identity.mdx). To use this application with the CLI for Microsoft 365, you will set the `CLIMICROSOFT365_ENTRAAPPID` environment variable to the application's ID and the `CLIMICROSOFT365_TENANT` environment variable to the ID of the Microsoft Entra tenant, where you created the Microsoft Entra application. Also, please make sure to read about [the caveats when using the certificate login option](../user-guide/cli-certificate-caveats.mdx).
 
@@ -202,7 +215,7 @@ Log in to Microsoft 365 using a user-assigned managed identity with `clientId` s
 m365 login --authType identity --userName ac9fbed5-804c-4362-a369-21a4ec51109e
 ```
 
-Log in to Microsoft 365 using a federated identity. Can currently only be used in GitHub Actions.
+Log in to Microsoft 365 using a federated identity. Can currently only be used in GitHub Actions, Azure DevOps and GitLab CI/CD.
 
 ```sh
 m365 login --authType federatedIdentity --appId eb96cfd0-abfa-4477-8d1d-c6dfde3efb19 --tenant 9a1a1bbd-e158-4cf5-967d-a53b8e85c628

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

@@ -0,0 +1,78 @@
+import Global from '../../_global.mdx';
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+
+# spe container permission remove
+
+Removes permissions from a SharePoint Embedded Container
+
+## Usage
+
+```sh
+m365 spe container permission remove [options]
+```
+
+## Options
+
+```md definition-list
+`-i, --id <id>`
+: ID of the permission to remove.
+
+`--containerId [containerId]`
+: ID of a SharePoint Embedded container. Specify either `containerId` or `containerName` but not both.
+
+`-n, --containerName [containerName]`
+: Display name of the Container. Specify either `containerId` or `containerName` but not both.
+
+`--containerTypeId [containerTypeId]`
+: The ID of the container type. Specify either `containerTypeId` or `containerTypeName` when using `containerName` but not both.
+
+`--containerTypeName [containerTypeName]`
+: The name of the container type. Specify either `containerTypeId` or `containerTypeName` when using `containerName` but not both.
+
+`-f, --force [force]`
+: Don't prompt for confirmation.
+```
+
+<Global />
+
+## Permissions
+
+<Tabs>
+  <TabItem value="Delegated">
+
+  | Resource        | Permissions                                                        |
+  |-----------------|--------------------------------------------------------------------|
+  | Microsoft Graph | FileStorageContainer.Selected, FileStorageContainerType.Manage.All |
+
+  `FileStorageContainerType.Manage.All` is required only when using `containerTypeName`.
+
+  </TabItem>
+  <TabItem value="Application">
+
+  This command only supports application permissions when **not** using the `containerTypeName` option.
+
+  | Resource        | Permissions                   |
+  |-----------------|-------------------------------|
+  | Microsoft Graph | FileStorageContainer.Selected |
+
+  </TabItem>
+</Tabs>
+
+## Examples
+
+Removes the specified permission from a container
+
+```sh
+m365 spe container permission remove --containerId "b!ISJs1WRro0y0EWgkUYcktDa0mE8zSlFEqFzqRn70Zwp1CEtDEBZgQICPkRbil_5Z"  --id "cmVhZGVyX2k6MCMuZnxtZW1iZXJzaGlwfHJvcnlicjExMUBvdXRsb29rLmNvbQ"
+```
+
+Removes the specified permission from a container and doesn't prompt for confirmation
+
+```sh
+m365 spe container permission remove --containerId "b!ISJs1WRro0y0EWgkUYcktDa0mE8zSlFEqFzqRn70Zwp1CEtDEBZgQICPkRbil_5Z"  --id "cmVhZGVyX2k6MCMuZnxtZW1iZXJzaGlwfHJvcnlicjExMUBvdXRsb29rLmNvbQ" --force
+```
+
+## Response
+
+The command won't return a response on success.

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

@@ -45,7 +45,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.23.2).
+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.24.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-archive.mdx

@@ -22,7 +22,7 @@ m365 spo file archive [options]
 : The server- or site-relative decoded URL of the file to archive. Specify either `url` or `id`, but not both.
 
 `-i, --id [id]`
-: The UniqueId (GUID) of the file to archive. Specify either `url` or `id`, but not both.
+: The unique ID (GUID) of the file to archive. Specify either `url` or `id`, but not both.
 
 `-f, --force`
 : Don't prompt for confirmation.

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

@@ -22,7 +22,7 @@ m365 spo file checkin [options]
 : The server- or site-relative decoded URL of the file to retrieve. Specify either `url` or `id` but not both.
 
 `-i, --id [id]`
-: The UniqueId (GUID) of the file to retrieve. Specify either `url` or `id` but not both.
+: The unique ID (GUID) of the file to retrieve. Specify either `url` or `id` but not both.
 
 `-t, --type [type]`
 : Type of the check in. Allowed values: `Minor`, `Major`, `Overwrite`. Defaults to `Major`.
@@ -54,7 +54,7 @@ m365 spo file checkin [options]
 
 ## Examples
 
-Checks in file with the specified UniqueId located in the specified site.
+Checks in file with the specified unique ID located in the specified site.
 
 ```sh
 m365 spo file checkin --webUrl https://contoso.sharepoint.com/sites/project-x --id 'b2307a39-e878-458b-bc90-03bc578531d6'

package/docs/docs/cmd/spo/file/file-checkout-undo.mdx

@@ -22,7 +22,7 @@ m365 spo file checkout undo [options]
 : The server- or site-relative decoded URL of the file to retrieve. Specify either `fileUrl` or `fileId` but not both.
 
 `-i, --fileId [fileId]`
-: The UniqueId (GUID) of the file to retrieve. Specify either `fileUrl` or `fileId` but not both.
+: The unique ID (GUID) of the file to retrieve. Specify either `fileUrl` or `fileId` but not both.
 
 `-f, --force`
 : Don't prompt for confirmation.

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

@@ -22,7 +22,7 @@ m365 spo file checkout [options]
 : The server- or site-relative decoded URL of the file to retrieve. Specify either `url` or `id` but not both.
 
 `-i, --id [id]`
-: The UniqueId (GUID) of the file to retrieve. Specify either `url` or `id` but not both.
+: The unique ID (GUID) of the file to retrieve. Specify either `url` or `id` but not both.
 ```
 
 <Global />
@@ -48,7 +48,7 @@ m365 spo file checkout [options]
 
 ## Examples
 
-Checks out file with the specified UniqueId located in the specified site.
+Checks out file with the specified unique ID located in the specified site.
 
 ```sh
 m365 spo file checkout --webUrl https://contoso.sharepoint.com/sites/project-x --id 'b2307a39-e878-458b-bc90-03bc578531d6'

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

@@ -85,13 +85,13 @@ Copy a file by site-relative URL to a document library in another site collectio
 m365 spo file copy --webUrl https://contoso.sharepoint.com/sites/project --sourceUrl "/Shared Documents/Document.pdf" --targetUrl "/sites/IT/Shared Documents" --ignoreVersionHistory
 ```
 
-Copy file by sourceId (UniqueId) to a document library in another site collection and rename the file (without specifying the file extension).
+Copy file by sourceId (unique ID) to a document library in another site collection and rename the file (without specifying the file extension).
 
 ```sh
 m365 spo file copy --webUrl https://contoso.sharepoint.com/sites/project --sourceId "b2307a39-e878-458b-bc90-03bc578531d6" --targetUrl "/sites/IT/Shared Documents" --newName "Report.pdf"
 ```
 
-Copy file by sourceId (UniqueId) to a document library in another site collection with a new name, rename the file if it already exists.
+Copy file by sourceId (unique ID) to a document library in another site collection with a new name, rename the file if it already exists.
 
 ```sh
 m365 spo file copy --webUrl https://contoso.sharepoint.com/sites/project --sourceId "b2307a39-e878-458b-bc90-03bc578531d6" --targetUrl "/sites/IT/Shared Documents" --newName "Report.pdf" --nameConflictBehavior rename

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

@@ -22,7 +22,7 @@ m365 spo file get [options]
 : The server- or site-relative decoded URL of the file to retrieve. Specify either `url` or `id` but not both.
 
 `-i, --id [id]`
-: The UniqueId (GUID) of the file to retrieve. Specify either `url` or `id` but not both.
+: The unique ID (GUID) of the file to retrieve. Specify either `url` or `id` but not both.
 
 `--asString`
 : Set to retrieve the contents of the specified file as string.
@@ -63,25 +63,25 @@ m365 spo file get [options]
 
 ## Examples
 
-Get file properties for a file with id (UniqueId) parameter located in a site.
+Get file properties for a file with id (unique ID) parameter located in a site.
 
 ```sh
 m365 spo file get --webUrl https://contoso.sharepoint.com/sites/project-x --id 'b2307a39-e878-458b-bc90-03bc578531d6'
 ```
 
-Get contents of the file with id (UniqueId) parameter located in a site.
+Get contents of the file with id (unique ID) parameter located in a site.
 
 ```sh
 m365 spo file get --webUrl https://contoso.sharepoint.com/sites/project-x --id 'b2307a39-e878-458b-bc90-03bc578531d6' --asString
 ```
 
-Get list item properties for a file with id (UniqueId) parameter located in a site.
+Get list item properties for a file with id (unique ID) parameter located in a site.
 
 ```sh
 m365 spo file get --webUrl https://contoso.sharepoint.com/sites/project-x --id 'b2307a39-e878-458b-bc90-03bc578531d6' --asListItem
 ```
 
-Saves the file with id (UniqueId) parameter located in a site to a local file.
+Saves the file with id (unique ID) parameter located in a site to a local file.
 
 ```sh
 m365 spo file get --webUrl https://contoso.sharepoint.com/sites/project-x --id 'b2307a39-e878-458b-bc90-03bc578531d6' --asFile --path /Users/user/documents/SavedAsTest1.docx
@@ -111,7 +111,7 @@ Saves a file with the server-relative url located in a site to a local file.
 m365 spo file get --webUrl https://contoso.sharepoint.com/sites/project-x --url '/sites/project-x/documents/Test1.docx' --asFile --path /Users/user/documents/SavedAsTest1.docx
 ```
 
-Gets the file properties for a file with id (UniqueId) parameter located in a site with permissions.
+Gets the file properties for a file with id (unique ID) parameter located in a site with permissions.
 
 ```sh
 m365 spo file get --webUrl https://contoso.sharepoint.com/sites/project-x --id 'b2307a39-e878-458b-bc90-03bc578531d6' --withPermissions

package/docs/docs/cmd/spo/file/file-retentionlabel-ensure.mdx

@@ -22,7 +22,7 @@ m365 spo file retentionlabel ensure [options]
 : The site- or server-relative decoded URL of the file that should be labelled. Specify either `fileUrl` or `fileId` but not both.
 
 `-i, --fileId [fileId]`
-: The UniqueId (GUID) of the file that should be labelled. Specify either `fileUrl` or `fileId` but not both.
+: The unique ID (GUID) of the file that should be labelled. Specify either `fileUrl` or `fileId` but not both.
 
 `--name <name>`
 : Name of the retention label to apply to the file.

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

@@ -22,7 +22,7 @@ m365 spo file retentionlabel remove [options]
 : The server- or site-relative decoded URL of the file of which the label should be removed. Specify either `fileUrl` or `fileId` but not both.
 
 `-i, --fileId [fileId]`
-: The UniqueId (GUID) of the file of which the label should be removed. Specify either `fileUrl` or `fileId` but not both.
+: The unique ID (GUID) of the file of which the label should be removed. Specify either `fileUrl` or `fileId` but not both.
 
 `-f, --force`
 : Don't prompt for confirming removing the retention label from a file.

package/docs/docs/cmd/spo/file/file-roleassignment-add.mdx

@@ -22,7 +22,7 @@ m365 spo file roleassignment add [options]
 : The server- or site-relative decoded URL of the file to retrieve. Specify either `fileUrl` or `fileId` but not both.
 
 `-i, --fileId [fileId]`
-: The UniqueId (GUID) of the file to retrieve. Specify either `fileUrl` or `fileId` but not both.
+: The unique ID (GUID) of the file to retrieve. Specify either `fileUrl` or `fileId` but not both.
 
 `--principalId [principalId]`
 : The SharePoint Id of the principal. It may be either a user id or group id to add a role assignment for. Specify either `upn`, `groupName`, or `principalId` but not multiple.

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

@@ -22,7 +22,7 @@ m365 spo file roleassignment remove [options]
 : The server- or site-relative decoded URL of the file. Specify either `fileUrl` or `fileId` but not both.
 
 `-i, --fileId [fileId]`
-: The UniqueId (GUID) of the file. Specify either `fileUrl` or `fileId` but not both.
+: The unique ID (GUID) of the file. Specify either `fileUrl` or `fileId` but not both.
 
 `--principalId [principalId]`
 : The SharePoint Id of the principal. It may be either a user id or group id. Specify either `upn`, `groupName`, `entraGroupId`, `entraGroupName`, or `principalId` but not multiple.

package/docs/docs/cmd/spo/file/file-roleinheritance-break.mdx

@@ -22,7 +22,7 @@ m365 spo file roleinheritance break [options]
 : The server- or site-relative decoded URL of the file. Specify either `fileUrl` or `fileId` but not both.
 
 `-i, --fileId [fileId]`
-: The UniqueId (GUID) of the file. Specify either `fileUrl` or `fileId` but not both.
+: The unique ID (GUID) of the file. Specify either `fileUrl` or `fileId` but not both.
 
 `-c, --clearExistingPermissions`
 : Clear all existing permissions from the file.
@@ -54,13 +54,13 @@ m365 spo file roleinheritance break [options]
 
 ## Examples
 
-Break the inheritance of a file with a specific id (UniqueId).
+Break the inheritance of a file with a specific id (unique ID).
 
 ```sh
 m365 spo file roleinheritance break --webUrl "https://contoso.sharepoint.com/sites/project-x" --fileId "b2307a39-e878-458b-bc90-03bc578531d6"
 ```
 
-Break the inheritance of a file with a specific id (UniqueId) and clear all existing permissions.
+Break the inheritance of a file with a specific id (unique ID) and clear all existing permissions.
 
 ```sh
 m365 spo file roleinheritance break --webUrl "https://contoso.sharepoint.com/sites/project-x" --fileId "b2307a39-e878-458b-bc90-03bc578531d6" --clearExistingPermissions

package/docs/docs/cmd/spo/file/file-roleinheritance-reset.mdx

@@ -22,7 +22,7 @@ m365 spo file roleinheritance reset [options]
 : The server- or site-relative decoded URL of the file to retrieve. Specify either `fileUrl` or `fileId` but not both.
 
 `-i, --fileId [fileId]`
-: The UniqueId (GUID) of the file to retrieve. Specify either `fileUrl` or `fileId` but not both.
+: The unique ID (GUID) of the file to retrieve. Specify either `fileUrl` or `fileId` but not both.
 
 `-f, --force`
 : Don't prompt for confirmation.
@@ -51,7 +51,7 @@ m365 spo file roleinheritance reset [options]
 
 ## Examples
 
-Reset inheritance of file with the specified id (UniqueId) located in the specified site.
+Reset inheritance of file with the specified id (unique ID) located in the specified site.
 
 ```sh
 m365 spo file roleinheritance reset --webUrl "https://contoso.sharepoint.com/sites/project-x" --fileId "b2307a39-e878-458b-bc90-03bc578531d6"

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

@@ -22,7 +22,7 @@ m365 spo file sharinginfo get [options]
 : The server- or site-relative decoded URL of the file for which to build the report. Specify either `fileUrl` or `fileId` but not both.
 
 `-i, --fileId [fileId]`
-: The UniqueId (GUID) of the file for which to build the report. Specify either `fileUrl` or `fileId` but not both.
+: The unique ID (GUID) of the file for which to build the report. Specify either `fileUrl` or `fileId` but not both.
 ```
 
 <Global />
@@ -54,7 +54,7 @@ Get file sharing information report for the file with the specified server-relat
 m365 spo file sharinginfo get --webUrl https://contoso.sharepoint.com/sites/project-x --fileUrl "/sites/M365CLI/Shared Documents/SharedFile.docx"
 ```
 
-Get file sharing information report for file with the specified id (UniqueId) located in the specified site.
+Get file sharing information report for file with the specified id (unique ID) located in the specified site.
 
 ```sh
 m365 spo file sharinginfo get --webUrl https://contoso.sharepoint.com/sites/project-x --fileId "b2307a39-e878-458b-bc90-03bc578531d6"