@pnp/cli-microsoft365 11.8.0-beta.52da392 → 11.8.0-beta.6d1d954

package/dist/m365/outlook/commands/calendargroup/calendargroup-remove.js

@@ -0,0 +1,98 @@
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
+import GraphCommand from '../../../base/GraphCommand.js';
+import { cli } from '../../../../cli/cli.js';
+import commands from '../../commands.js';
+import { validation } from '../../../../utils/validation.js';
+import { accessToken } from '../../../../utils/accessToken.js';
+import auth from '../../../../Auth.js';
+import request from '../../../../request.js';
+import { formatting } from '../../../../utils/formatting.js';
+import { calendarGroup } from '../../../../utils/calendarGroup.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    id: z.string().optional(),
+    name: z.string().optional(),
+    userId: z.string().refine(id => validation.isValidGuid(id), {
+        error: e => `'${e.input}' is not a valid GUID.`
+    }).optional(),
+    userName: z.string().refine(name => validation.isValidUserPrincipalName(name), {
+        error: e => `'${e.input}' is not a valid UPN.`
+    }).optional(),
+    force: z.boolean().optional().alias('f')
+});
+class OutlookCalendarGroupRemoveCommand extends GraphCommand {
+    get name() {
+        return commands.CALENDARGROUP_REMOVE;
+    }
+    get description() {
+        return 'Removes a calendar group';
+    }
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => options.id || options.name, {
+            error: 'Specify either id or name.'
+        })
+            .refine(options => !(options.id && options.name), {
+            error: 'Specify either id or name, but not both.'
+        })
+            .refine(options => !(options.userId && options.userName), {
+            error: 'Specify either userId or userName, but not both.'
+        });
+    }
+    async commandAction(logger, args) {
+        const removeCalendarGroup = async () => {
+            try {
+                const token = auth.connection.accessTokens[auth.defaultResource].accessToken;
+                const isAppOnlyAccessToken = accessToken.isAppOnlyAccessToken(token);
+                if (isAppOnlyAccessToken && !args.options.userId && !args.options.userName) {
+                    throw 'When running with application permissions either userId or userName is required.';
+                }
+                let endpoint;
+                let graphUserId;
+                if (args.options.userId || args.options.userName) {
+                    graphUserId = (args.options.userId ?? args.options.userName);
+                }
+                else {
+                    graphUserId = accessToken.getUserIdFromAccessToken(token);
+                }
+                endpoint = `${this.resource}/v1.0/users('${formatting.encodeQueryParameter(graphUserId)}')`;
+                let calendarGroupId = args.options.id;
+                if (args.options.name) {
+                    if (this.verbose) {
+                        await logger.logToStderr(`Retrieving calendar group by name '${args.options.name}'...`);
+                    }
+                    const calendarGroupResult = await calendarGroup.getUserCalendarGroupByName(graphUserId, args.options.name);
+                    calendarGroupId = calendarGroupResult.id;
+                }
+                if (this.verbose) {
+                    await logger.logToStderr(`Removing calendar group '${calendarGroupId}'...`);
+                }
+                const requestOptions = {
+                    url: `${endpoint}/calendarGroups/${calendarGroupId}`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    }
+                };
+                await request.delete(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        };
+        if (args.options.force) {
+            await removeCalendarGroup();
+        }
+        else {
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove calendar group '${args.options.id || args.options.name}'?` });
+            if (result) {
+                await removeCalendarGroup();
+            }
+        }
+    }
+}
+export default new OutlookCalendarGroupRemoveCommand();
+//# sourceMappingURL=calendargroup-remove.js.map

package/dist/m365/outlook/commands.js

@@ -6,6 +6,7 @@ export default {
     CALENDAR_SET: `${prefix} calendar set`,
     CALENDARGROUP_GET: `${prefix} calendargroup get`,
     CALENDARGROUP_LIST: `${prefix} calendargroup list`,
+    CALENDARGROUP_REMOVE: `${prefix} calendargroup remove`,
     CALENDARGROUP_SET: `${prefix} calendargroup set`,
     EVENT_CANCEL: `${prefix} event cancel`,
     EVENT_LIST: `${prefix} event list`,

package/dist/m365/spfx/commands/project/DeployWorkflow.js

@@ -16,11 +16,11 @@ export const workflow = {
             steps: [
                 {
                     name: "Checkout",
-                    uses: "actions/checkout@v4"
+                    uses: "actions/checkout@v6"
                 },
                 {
                     name: "Use Node.js",
-                    uses: "actions/setup-node@v4",
+                    uses: "actions/setup-node@v6",
                     with: {
                         "node-version": "${{ env.NodeVersion }}"
                     }
@@ -35,7 +35,7 @@ export const workflow = {
                 },
                 {
                     name: "CLI for Microsoft 365 Login",
-                    uses: "pnp/action-cli-login@v2.2.4",
+                    uses: "pnp/action-cli-login@v4",
                     with: {
                         "CERTIFICATE_ENCODED": "${{ secrets.CERTIFICATE_ENCODED }}",
                         "CERTIFICATE_PASSWORD": "${{ secrets.CERTIFICATE_PASSWORD }}",
@@ -45,9 +45,9 @@ export const workflow = {
                 },
                 {
                     name: "CLI for Microsoft 365 Deploy App",
-                    uses: "pnp/action-cli-deploy@v4.0.0",
+                    uses: "pnp/action-cli-deploy@v6",
                     with: {
-                        "APP_FILE_PATH": "sharepoint/solution/{{ solutionName }}.sppkg",
+                        "APP_FILE_PATH": "sharepoint/{{ sppkgPath }}",
                         "SKIP_FEATURE_DEPLOYMENT": false,
                         "OVERWRITE": true
                     }
@@ -105,6 +105,10 @@ export const pipeline = {
             name: "PackageName",
             value: ""
         },
+        {
+            name: "SppkgPath",
+            value: ""
+        },
         {
             name: "SiteAppCatalogUrl",
             value: ""

package/dist/m365/spfx/commands/project/project-azuredevops-pipeline-add.js

@@ -34,14 +34,14 @@ class SpfxProjectAzureDevOpsPipelineAddCommand extends BaseProjectCommand {
         if (this.projectRootPath === null) {
             throw new CommandError(`Couldn't find project root folder`, _a.ERROR_NO_PROJECT_ROOT_FOLDER);
         }
-        const solutionPackageJsonFile = path.join(this.projectRootPath, 'package.json');
-        const packageJson = fs.readFileSync(solutionPackageJsonFile, 'utf-8');
-        const solutionName = JSON.parse(packageJson).name;
         if (this.debug) {
             await logger.logToStderr(`Adding Azure DevOps pipeline in the current SPFx project`);
         }
         try {
-            this.updatePipeline(solutionName, pipeline, args.options);
+            const project = { path: this.projectRootPath };
+            this.readAndParseJsonFile(path.join(this.projectRootPath, 'config', 'package-solution.json'), project, 'packageSolutionJson');
+            const sppkgPath = project.packageSolutionJson?.paths?.zippedPackage;
+            this.updatePipeline(sppkgPath, pipeline, args.options);
             this.savePipeline(pipeline);
         }
         catch (error) {
@@ -56,7 +56,7 @@ class SpfxProjectAzureDevOpsPipelineAddCommand extends BaseProjectCommand {
         const pipelineFile = path.join(pipelinesPath, 'deploy-spfx-solution.yml');
         fs.writeFileSync(path.resolve(pipelineFile), yaml.stringify(pipeline), 'utf-8');
     }
-    updatePipeline(solutionName, pipeline, options) {
+    updatePipeline(sppkgPath, pipeline, options) {
         if (options.name) {
             pipeline.name = options.name;
         }
@@ -93,16 +93,17 @@ class SpfxProjectAzureDevOpsPipelineAddCommand extends BaseProjectCommand {
             }
             if (options.scope === 'sitecollection') {
                 script.script = script.script.replace(`{{deploy}}`, `m365 spo app deploy --name '$(PackageName)' --appCatalogScope sitecollection --appCatalogUrl '$(SiteAppCatalogUrl)'`);
-                script.script = script.script.replace(`{{addApp}}`, `m365 spo app add --filePath '$(Build.SourcesDirectory)/sharepoint/solution/$(PackageName)' --appCatalogScope sitecollection --appCatalogUrl '$(SiteAppCatalogUrl)' --overwrite`);
+                script.script = script.script.replace(`{{addApp}}`, `m365 spo app add --filePath '$(Build.SourcesDirectory)/sharepoint/$(SppkgPath)' --appCatalogScope sitecollection --appCatalogUrl '$(SiteAppCatalogUrl)' --overwrite`);
                 this.assignPipelineVariables(pipeline, 'SiteAppCatalogUrl', options.siteUrl);
             }
             else {
                 script.script = script.script.replace(`{{deploy}}`, `m365 spo app deploy --name '$(PackageName)' --appCatalogScope 'tenant'`);
-                script.script = script.script.replace(`{{addApp}}`, `m365 spo app add --filePath '$(Build.SourcesDirectory)/sharepoint/solution/$(PackageName)' --overwrite`);
+                script.script = script.script.replace(`{{addApp}}`, `m365 spo app add --filePath '$(Build.SourcesDirectory)/sharepoint/$(SppkgPath)' --overwrite`);
                 pipeline.variables = pipeline.variables.filter(v => v.name !== 'SiteAppCatalogUrl');
             }
-            if (solutionName) {
-                this.assignPipelineVariables(pipeline, 'PackageName', `${solutionName}.sppkg`);
+            if (sppkgPath) {
+                this.assignPipelineVariables(pipeline, 'SppkgPath', sppkgPath);
+                this.assignPipelineVariables(pipeline, 'PackageName', path.basename(sppkgPath));
             }
             if (options.skipFeatureDeployment) {
                 script.script = script.script.replace(`m365 spo app deploy `, `m365 spo app deploy --skipFeatureDeployment `);

package/dist/m365/spfx/commands/project/project-doctor.js

@@ -308,6 +308,8 @@ ${f.resolution}
         const packagesDepExact = [];
         const packagesDepUn = [];
         const packagesDevUn = [];
+        const packagesOverride = [];
+        const packagesOverrideRemove = [];
         findings.forEach(f => {
             packageManager.mapPackageManagerCommand({
                 command: f.resolution,
@@ -315,6 +317,8 @@ ${f.resolution}
                 packagesDepExact,
                 packagesDepUn,
                 packagesDevUn,
+                packagesOverride,
+                packagesOverrideRemove,
                 packageMgr: this.packageManager
             });
         });
@@ -323,6 +327,8 @@ ${f.resolution}
             packagesDevExact,
             packagesDepUn,
             packagesDevUn,
+            packagesOverride,
+            packagesOverrideRemove,
             packageMgr: this.packageManager
         });
         if (this.packageManager === 'npm') {

package/dist/m365/spfx/commands/project/project-github-workflow-add.js

@@ -34,14 +34,16 @@ class SpfxProjectGithubWorkflowAddCommand extends BaseProjectCommand {
         if (this.projectRootPath === null) {
             throw new CommandError(`Couldn't find project root folder`, _a.ERROR_NO_PROJECT_ROOT_FOLDER);
         }
-        const solutionPackageJsonFile = path.join(this.projectRootPath, 'package.json');
-        const packageJson = fs.readFileSync(solutionPackageJsonFile, 'utf-8');
-        const solutionName = JSON.parse(packageJson).name;
-        if (this.debug) {
-            await logger.logToStderr(`Adding GitHub workflow in the current SPFx project`);
-        }
         try {
-            this.updateWorkflow(solutionName, workflow, args.options);
+            const project = { path: this.projectRootPath };
+            this.readAndParseJsonFile(path.join(this.projectRootPath, 'package.json'), project, 'packageJson');
+            this.readAndParseJsonFile(path.join(this.projectRootPath, 'config', 'package-solution.json'), project, 'packageSolutionJson');
+            const solutionName = project.packageJson.name;
+            const sppkgPath = project.packageSolutionJson?.paths?.zippedPackage;
+            if (this.debug) {
+                await logger.logToStderr(`Adding GitHub workflow in the current SPFx project`);
+            }
+            this.updateWorkflow(solutionName, sppkgPath, workflow, args.options);
             this.saveWorkflow(workflow);
         }
         catch (error) {
@@ -56,7 +58,7 @@ class SpfxProjectGithubWorkflowAddCommand extends BaseProjectCommand {
         const workflowFile = path.join(workflowPath, 'deploy-spfx-solution.yml');
         fs.writeFileSync(path.resolve(workflowFile), yaml.stringify(workflow), 'utf-8');
     }
-    updateWorkflow(solutionName, workflow, options) {
+    updateWorkflow(solutionName, sppkgPath, workflow, options) {
         workflow.name = options.name ? options.name : workflow.name.replace('{{ name }}', solutionName);
         if (options.branchName) {
             workflow.on.push.branches[0] = options.branchName;
@@ -90,9 +92,9 @@ class SpfxProjectGithubWorkflowAddCommand extends BaseProjectCommand {
             deployAction.with.SCOPE = 'sitecollection';
             deployAction.with.SITE_COLLECTION_URL = options.siteUrl;
         }
-        if (solutionName) {
+        if (sppkgPath) {
             const deployAction = this.getDeployAction(workflow);
-            deployAction.with.APP_FILE_PATH = deployAction.with.APP_FILE_PATH.replace('{{ solutionName }}', solutionName);
+            deployAction.with.APP_FILE_PATH = deployAction.with.APP_FILE_PATH.replace('{{ sppkgPath }}', sppkgPath);
         }
     }
     assignNodeVersion(workflow, nodeVersion) {

package/dist/m365/spfx/commands/project/project-upgrade/rules/DependencyRule.js

@@ -7,7 +7,7 @@ var _DependencyRule_instances, _DependencyRule_needsUpdate, _DependencyRule_getM
 import semver from 'semver';
 import { JsonRule } from '../../JsonRule.js';
 export class DependencyRule extends JsonRule {
-    constructor(packageName, packageVersion, isDevDep = false, isOptional = false, add = true) {
+    constructor(packageName, packageVersion, isDevDep = false, isOptional = false, add = true, isOverride = false) {
         super();
         _DependencyRule_instances.add(this);
         this.packageName = packageName;
@@ -15,14 +15,20 @@ export class DependencyRule extends JsonRule {
         this.isDevDep = isDevDep;
         this.isOptional = isOptional;
         this.add = add;
+        this.isOverride = isOverride;
     }
     get title() {
         return this.packageName;
     }
     get description() {
-        return `${(this.add ? 'Upgrade' : 'Remove')} SharePoint Framework ${(this.isDevDep ? 'dev ' : '')}dependency package ${this.packageName}`;
+        return `${(this.add ? 'Upgrade' : 'Remove')} SharePoint Framework ${(this.isOverride ? 'override ' : this.isDevDep ? 'dev ' : '')}dependency package ${this.packageName}`;
     }
     get resolution() {
+        if (this.isOverride) {
+            return this.add ?
+                `override overrides.${this.packageName}=${this.packageVersion}` :
+                `removeOverride overrides.${this.packageName}`;
+        }
         return this.add ?
             `${(this.isDevDep ? 'installDev' : 'install')} ${this.packageName}@${this.packageVersion}` :
             `${(this.isDevDep ? 'uninstallDev' : 'uninstall')} ${this.packageName}`;
@@ -44,10 +50,10 @@ export class DependencyRule extends JsonRule {
         if (!project.packageJson) {
             return;
         }
-        const projectDependencies = this.isDevDep ? project.packageJson.devDependencies : project.packageJson.dependencies;
+        const projectDependencies = this.isOverride ? project.packageJson.overrides : this.isDevDep ? project.packageJson.devDependencies : project.packageJson.dependencies;
         const versionEntry = projectDependencies ? projectDependencies[this.packageName] : '';
         if (this.add) {
-            let jsonProperty = this.isDevDep ? 'devDependencies' : 'dependencies';
+            let jsonProperty = this.isOverride ? 'overrides' : this.isDevDep ? 'devDependencies' : 'dependencies';
             if (versionEntry) {
                 jsonProperty += `.${this.packageName}`;
                 if (__classPrivateFieldGet(this, _DependencyRule_instances, "m", _DependencyRule_needsUpdate).call(this, this.packageVersion, versionEntry)) {
@@ -67,7 +73,7 @@ export class DependencyRule extends JsonRule {
             }
         }
         else {
-            const jsonProperty = `${(this.isDevDep ? 'devDependencies' : 'dependencies')}.${this.packageName}`;
+            const jsonProperty = `${(this.isOverride ? 'overrides' : this.isDevDep ? 'devDependencies' : 'dependencies')}.${this.packageName}`;
             if (versionEntry) {
                 const node = this.getAstNodeFromFile(project.packageJson, jsonProperty);
                 this.addFindingWithPosition(findings, node);

package/dist/m365/spfx/commands/project/project-upgrade/rules/FN027001_OVERRIDES_rushstack_heft.js

@@ -0,0 +1,10 @@
+import { DependencyRule } from "./DependencyRule.js";
+export class FN027001_OVERRIDES_rushstack_heft extends DependencyRule {
+    constructor(version) {
+        super('@rushstack/heft', version, false, false, true, true);
+    }
+    get id() {
+        return 'FN027001';
+    }
+}
+//# sourceMappingURL=FN027001_OVERRIDES_rushstack_heft.js.map

package/dist/m365/spfx/commands/project/project-upgrade/upgrade-1.22.0.js

@@ -48,7 +48,7 @@ import { FN021005_PKG_scripts_test } from './rules/FN021005_PKG_scripts_test.js'
 import { FN021006_PKG_scripts_clean } from './rules/FN021006_PKG_scripts_clean.js';
 import { FN021007_PKG_scripts_start } from './rules/FN021007_PKG_scripts_start.js';
 import { FN021008_PKG_scripts_eject_webpack } from './rules/FN021008_PKG_scripts_eject_webpack.js';
-import { FN021009_PKG_overrides_rushstack_heft } from './rules/FN021009_PKG_overrides_rushstack_heft.js';
+import { FN027001_OVERRIDES_rushstack_heft } from './rules/FN027001_OVERRIDES_rushstack_heft.js';
 import { FN023003_GITIGNORE_libdts } from './rules/FN023003_GITIGNORE_libdts.js';
 import { FN023004_GITIGNORE_libcommonjs } from './rules/FN023004_GITIGNORE_libcommonjs.js';
 import { FN023005_GITIGNORE_libesm } from './rules/FN023005_GITIGNORE_libesm.js';
@@ -151,7 +151,7 @@ export default [
     new FN021006_PKG_scripts_clean('heft clean'),
     new FN021007_PKG_scripts_start('heft start --clean'),
     new FN021008_PKG_scripts_eject_webpack('heft eject-webpack'),
-    new FN021009_PKG_overrides_rushstack_heft('1.1.2'),
+    new FN027001_OVERRIDES_rushstack_heft('1.1.2'),
     new FN023003_GITIGNORE_libdts(),
     new FN023004_GITIGNORE_libcommonjs(),
     new FN023005_GITIGNORE_libesm(),

package/dist/m365/spfx/commands/project/project-upgrade/upgrade-1.23.0-rc.0.js

@@ -31,7 +31,7 @@ import { FN002034_DEVDEP_microsoft_spfx_heft_plugins } from './rules/FN002034_DE
 import { FN010001_YORC_version } from './rules/FN010001_YORC_version.js';
 import { FN015008_FILE_eslintrc_js } from './rules/FN015008_FILE_eslintrc_js.js';
 import { FN015016_FILE_eslint_config_js } from './rules/FN015016_FILE_eslint_config_js.js';
-import { FN021009_PKG_overrides_rushstack_heft } from './rules/FN021009_PKG_overrides_rushstack_heft.js';
+import { FN027001_OVERRIDES_rushstack_heft } from './rules/FN027001_OVERRIDES_rushstack_heft.js';
 export default [
     new FN001001_DEP_microsoft_sp_core_library('1.23.0-rc.0'),
     new FN001002_DEP_microsoft_sp_lodash_subset('1.23.0-rc.0'),
@@ -60,7 +60,7 @@ export default [
     new FN002034_DEVDEP_microsoft_spfx_heft_plugins('1.23.0-rc.0'),
     new FN010001_YORC_version('1.23.0-rc.0'),
     new FN002031_DEVDEP_rushstack_heft('1.2.7'),
-    new FN021009_PKG_overrides_rushstack_heft('1.2.7'),
+    new FN027001_OVERRIDES_rushstack_heft('1.2.7'),
     new FN002025_DEVDEP_eslint_plugin_react_hooks('5.2.0'),
     new FN002024_DEVDEP_eslint('9.37.0'),
     new FN015016_FILE_eslint_config_js(true, `const spfxProfile = require('@microsoft/eslint-config-spfx/lib/flat-profiles/react');

package/dist/m365/spfx/commands/project/project-upgrade.js

@@ -12,7 +12,7 @@ import { BaseProjectCommand } from './base-project-command.js';
 import { FN017001_MISC_npm_dedupe } from './project-upgrade/rules/FN017001_MISC_npm_dedupe.js';
 export const options = z.strictObject({
     ...globalOptionsZod.shape,
-    packageManager: z.enum(['npm', 'pnpm', 'yarn']).default('npm'),
+    packageManager: z.enum(['npm', 'pnpm']).default('npm'),
     preview: z.boolean().optional(),
     toVersion: z.string().optional().alias('v'),
     shell: z.enum(['bash', 'powershell', 'cmd']).default('powershell'),
@@ -201,7 +201,15 @@ class SpfxProjectUpgradeCommand extends BaseProjectCommand {
         // replace package operation tokens with command for the specific package manager
         findingsToReport.forEach(f => {
             // matches must be in this particular order to avoid false matches, eg.
-            // uninstallDev contains install
+            // uninstallDev contains install, removeOverride contains override
+            if (f.resolution.startsWith('removeOverride')) {
+                f.resolution = f.resolution.replace('removeOverride', packageManager.getPackageManagerCommand('removeOverride', this.packageManager));
+                return;
+            }
+            if (f.resolution.startsWith('override')) {
+                f.resolution = f.resolution.replace('override', packageManager.getPackageManagerCommand('override', this.packageManager));
+                return;
+            }
             if (f.resolution.startsWith('uninstallDev')) {
                 f.resolution = f.resolution.replace('uninstallDev', packageManager.getPackageManagerCommand('uninstallDev', this.packageManager));
                 return;
@@ -296,7 +304,9 @@ class SpfxProjectUpgradeCommand extends BaseProjectCommand {
                 .filter((command) => command.indexOf(packageManager.getPackageManagerCommand('install', this.packageManager)) === -1 &&
                 command.indexOf(packageManager.getPackageManagerCommand('installDev', this.packageManager)) === -1 &&
                 command.indexOf(packageManager.getPackageManagerCommand('uninstall', this.packageManager)) === -1 &&
-                command.indexOf(packageManager.getPackageManagerCommand('uninstallDev', this.packageManager)) === -1))).join(os.EOL), os.EOL,
+                command.indexOf(packageManager.getPackageManagerCommand('uninstallDev', this.packageManager)) === -1 &&
+                command.indexOf(packageManager.getPackageManagerCommand('override', this.packageManager)) === -1 &&
+                command.indexOf(packageManager.getPackageManagerCommand('removeOverride', this.packageManager)) === -1))).join(os.EOL), os.EOL,
             os.EOL,
             Object.keys(reportData.modificationPerFile).map(file => {
                 return [
@@ -356,7 +366,9 @@ ${f.resolution}
                 .filter((command) => command.indexOf(packageManager.getPackageManagerCommand('install', this.packageManager)) === -1 &&
                 command.indexOf(packageManager.getPackageManagerCommand('installDev', this.packageManager)) === -1 &&
                 command.indexOf(packageManager.getPackageManagerCommand('uninstall', this.packageManager)) === -1 &&
-                command.indexOf(packageManager.getPackageManagerCommand('uninstallDev', this.packageManager)) === -1))).join(os.EOL), os.EOL,
+                command.indexOf(packageManager.getPackageManagerCommand('uninstallDev', this.packageManager)) === -1 &&
+                command.indexOf(packageManager.getPackageManagerCommand('override', this.packageManager)) === -1 &&
+                command.indexOf(packageManager.getPackageManagerCommand('removeOverride', this.packageManager)) === -1))).join(os.EOL), os.EOL,
             '```', os.EOL,
             os.EOL,
             '### Modify files', os.EOL,
@@ -433,16 +445,19 @@ ${f.resolution}
         const packagesDepExact = [];
         const packagesDepUn = [];
         const packagesDevUn = [];
+        const packagesOverride = [];
+        const packagesOverrideRemove = [];
         findings.forEach(f => {
             if (f.resolutionType === 'cmd') {
-                if (f.resolution.indexOf('npm') > -1 ||
-                    f.resolution.indexOf('yarn') > -1) {
+                if (f.resolution.indexOf('npm') > -1) {
                     packageManager.mapPackageManagerCommand({
                         command: f.resolution,
                         packagesDevExact,
                         packagesDepExact,
                         packagesDepUn,
                         packagesDevUn,
+                        packagesOverride,
+                        packagesOverrideRemove,
                         packageMgr: this.packageManager
                     });
                 }
@@ -468,6 +483,8 @@ ${f.resolution}
             packagesDevExact,
             packagesDepUn,
             packagesDevUn,
+            packagesOverride,
+            packagesOverrideRemove,
             packageMgr: this.packageManager
         });
         if (this.packageManager === 'npm') {

package/dist/request.js

@@ -34,7 +34,7 @@ class Request {
                     await this._logger.logToStderr('Response:');
                     const properties = ['status', 'statusText', 'headers'];
                     if (response.headers['content-type'] &&
-                        response.headers['content-type'].indexOf('json') > -1) {
+                        response.headers['content-type'].toString().indexOf('json') > -1) {
                         properties.push('data');
                     }
                     await this._logger.logToStderr(JSON.stringify({

package/dist/utils/packageManager.js

@@ -3,28 +3,41 @@ const packageCommands = {
         install: 'npm i -SE',
         installDev: 'npm i -DE',
         uninstall: 'npm un -S',
-        uninstallDev: 'npm un -D'
+        uninstallDev: 'npm un -D',
+        override: 'npm pkg set',
+        removeOverride: 'npm pkg delete'
     },
     pnpm: {
         install: 'pnpm i -E',
         installDev: 'pnpm i -DE',
         uninstall: 'pnpm un',
-        uninstallDev: 'pnpm un'
+        uninstallDev: 'pnpm un',
+        override: 'pnpm pkg set',
+        removeOverride: 'pnpm pkg delete'
     },
     yarn: {
         install: 'yarn add -E',
         installDev: 'yarn add -DE',
         uninstall: 'yarn remove',
         uninstallDev: 'yarn remove'
+        // Yarn is not supported for project upgrade since their CLI does not support setting overrides.
     }
 };
 export const packageManager = {
     getPackageManagerCommand(command, packageManager) {
         return packageCommands[packageManager][command];
     },
-    mapPackageManagerCommand({ command, packagesDepExact, packagesDevExact, packagesDepUn, packagesDevUn, packageMgr }) {
+    mapPackageManagerCommand({ command, packagesDepExact, packagesDevExact, packagesDepUn, packagesDevUn, packagesOverride, packagesOverrideRemove, packageMgr }) {
         // matches must be in this particular order to avoid false matches, eg.
-        // uninstallDev contains install
+        // uninstallDev contains install, removeOverride contains override
+        if (command.startsWith(`${packageManager.getPackageManagerCommand('removeOverride', packageMgr)} `)) {
+            packagesOverrideRemove.push(command.replace(packageManager.getPackageManagerCommand('removeOverride', packageMgr), '').trim());
+            return;
+        }
+        if (command.startsWith(`${packageManager.getPackageManagerCommand('override', packageMgr)} `)) {
+            packagesOverride.push(command.replace(packageManager.getPackageManagerCommand('override', packageMgr), '').trim());
+            return;
+        }
         if (command.startsWith(`${packageManager.getPackageManagerCommand('uninstallDev', packageMgr)} `)) {
             packagesDevUn.push(command.replace(packageManager.getPackageManagerCommand('uninstallDev', packageMgr), '').trim());
             return;
@@ -41,10 +54,19 @@ export const packageManager = {
             packagesDepExact.push(command.replace(packageManager.getPackageManagerCommand('install', packageMgr), '').trim());
         }
     },
-    reducePackageManagerCommand({ packagesDepExact, packagesDevExact, packagesDepUn, packagesDevUn, packageMgr }) {
+    reducePackageManagerCommand({ packagesDepExact, packagesDevExact, packagesDepUn, packagesDevUn, packagesOverride, packagesOverrideRemove, packageMgr }) {
         const commandsToExecute = [];
-        // uninstall commands must come first otherwise there is a chance that
-        // whatever we recommended to install, will be immediately uninstalled
+        // override commands must come first to ensure that install/uninstall operations
+        // use the correct package version when an override is added or removed for a
+        // package that is being updated, installed, or uninstalled
+        // uninstall commands must come before install commands otherwise there is a
+        // chance that whatever we recommended to install will be immediately uninstalled
+        if (packagesOverrideRemove.length > 0) {
+            commandsToExecute.push(`${packageManager.getPackageManagerCommand('removeOverride', packageMgr)} ${packagesOverrideRemove.join(' ')}`);
+        }
+        if (packagesOverride.length > 0) {
+            commandsToExecute.push(`${packageManager.getPackageManagerCommand('override', packageMgr)} ${packagesOverride.join(' ')}`);
+        }
         if (packagesDepUn.length > 0) {
             commandsToExecute.push(`${packageManager.getPackageManagerCommand('uninstall', packageMgr)} ${packagesDepUn.join(' ')}`);
         }

package/docs/docs/cmd/outlook/calendargroup/calendargroup-remove.mdx

@@ -0,0 +1,91 @@
+import Global from '../../_global.mdx';
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+
+# outlook calendargroup remove
+
+Removes a calendar group.
+
+## Usage
+
+```sh
+m365 outlook calendargroup remove [options]
+```
+
+## Options
+
+```md definition-list
+`--id [id]`
+: ID of the calendar group to remove. Specify either `id` or `name`, but not both.
+
+`--name [name]`
+: Name of the calendar group to remove. Specify either `id` or `name`, but not both.
+
+`--userId [userId]`
+: ID of the user. Specify either `userId` or `userName`, but not both. This option is required when using application permissions.
+
+`--userName [userName]`
+: UPN of the user. Specify either `userId` or `userName`, but not both. This option is required when using application permissions.
+
+`-f, --force`
+: Don't prompt for confirmation.
+```
+
+<Global />
+
+## Permissions
+
+<Tabs>
+  <TabItem value="Delegated">
+
+  | Resource        | Permissions          |
+  |-----------------|----------------------|
+  | Microsoft Graph | Calendars.ReadWrite  |
+
+  </TabItem>
+  <TabItem value="Application">
+
+  | Resource        | Permissions          |
+  |-----------------|----------------------|
+  | Microsoft Graph | Calendars.ReadWrite  |
+
+  </TabItem>
+</Tabs>
+
+## Remarks
+
+:::warning
+
+The calendar group must be empty before it can be removed. Make sure to delete all calendars in the group first.
+
+:::
+
+## Examples
+
+Remove a calendar group specified by id for the signed-in user.
+
+```sh
+m365 outlook calendargroup remove --id "AAMkAGE0MGM1Y2M5LWEzMmUtNGVlNy05MjRlLTk0YmYyY2I5NTM3ZAAuAAAAAAC_0WfqSjt_SqLtNkuO-bj1AQAbfYq5lmBxQ6a4t1fGbeYAAAAAAEOAAA="
+```
+
+Remove a calendar group specified by name for the signed-in user.
+
+```sh
+m365 outlook calendargroup remove --name "Personal Events"
+```
+
+Remove a calendar group specified by id for a user specified by id.
+
+```sh
+m365 outlook calendargroup remove --id "AAMkADIxYjJiYm" --userId "44288f7d-7710-4293-8c8e-36f310ed2e6a"
+```
+
+Remove a calendar group specified by name for a user specified by UPN without prompting for confirmation.
+
+```sh
+m365 outlook calendargroup remove --name "Personal Events" --userName "john.doe@contoso.com" --force
+```
+
+## Response
+
+The command won't return a response on success.

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

@@ -19,7 +19,7 @@ m365 spfx project upgrade [options]
 : The version of SharePoint Framework to which upgrade the project
 
 `--packageManager [packageManager]`
-: The package manager you use. Supported managers `npm`, `pnpm`, `yarn`. Default `npm`
+: The package manager you use. Supported managers `npm` or `pnpm`. Default `npm`
 
 `--shell [shell]`
 : The shell you use. Supported shells `bash`, `powershell`, `cmd`. Default `powershell`