@pnp/cli-microsoft365 11.8.0-beta.ae98113 → 11.9.0-beta.0365d84

package/dist/m365/outlook/commands/mailbox/mailbox-settings-get.js

@@ -26,7 +26,11 @@ class OutlookMailboxSettingsGetCommand extends GraphCommand {
     getRefinedSchema(schema) {
         return schema
             .refine(options => !(options.userId && options.userName), {
-            error: 'Specify either userId or userName, but not both'
+            error: 'Specify either userId or userName, but not both',
+            params: {
+                customCode: 'optionSet',
+                options: ['userId', 'userName']
+            }
         });
     }
     async commandAction(logger, args) {

package/dist/m365/outlook/commands/mailbox/mailbox-settings-set.js

@@ -45,7 +45,11 @@ class OutlookMailboxSettingsSetCommand extends GraphCommand {
     getRefinedSchema(schema) {
         return schema
             .refine(options => !(options.userId && options.userName), {
-            error: 'Specify either userId or userName, but not both'
+            error: 'Specify either userId or userName, but not both',
+            params: {
+                customCode: 'optionSet',
+                options: ['userId', 'userName']
+            }
         })
             .refine(options => [
             options.workingDays, options.workingHoursStartTime, options.workingHoursEndTime, options.workingHoursTimeZone,
@@ -53,7 +57,10 @@ class OutlookMailboxSettingsSetCommand extends GraphCommand {
             options.autoReplyStartDateTime, options.autoReplyStartTimeZone, options.autoReplyEndDateTime, options.autoReplyEndTimeZone,
             options.timeFormat, options.timeZone, options.dateFormat, options.delegateMeetingMessageDeliveryOptions, options.language
         ].filter(o => o !== undefined).length > 0, {
-            error: 'Specify at least one of the following options: workingDays, workingHoursStartTime, workingHoursEndTime, workingHoursTimeZone, autoReplyStatus, autoReplyExternalAudience, autoReplyExternalMessage, autoReplyInternalMessage, autoReplyStartDateTime, autoReplyStartTimeZone, autoReplyEndDateTime, autoReplyEndTimeZone, timeFormat, timeZone, dateFormat, delegateMeetingMessageDeliveryOptions, or language'
+            error: 'Specify at least one of the following options: workingDays, workingHoursStartTime, workingHoursEndTime, workingHoursTimeZone, autoReplyStatus, autoReplyExternalAudience, autoReplyExternalMessage, autoReplyInternalMessage, autoReplyStartDateTime, autoReplyStartTimeZone, autoReplyEndDateTime, autoReplyEndTimeZone, timeFormat, timeZone, dateFormat, delegateMeetingMessageDeliveryOptions, or language',
+            params: {
+                customCode: 'required'
+            }
         });
     }
     async commandAction(logger, args) {

package/dist/m365/pa/commands/environment/environment-get.js

@@ -22,7 +22,11 @@ class PaEnvironmentGetCommand extends PowerAppsCommand {
     getRefinedSchema(schema) {
         return schema
             .refine(options => !!options.name !== !!options.default, {
-            error: `Specify either name or default, but not both.`
+            error: `Specify either name or default, but not both.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['name', 'default']
+            }
         });
     }
     async commandAction(logger, args) {

package/dist/m365/pp/commands/environment/environment-get.js

@@ -23,7 +23,11 @@ class PpEnvironmentGetCommand extends PowerPlatformCommand {
     getRefinedSchema(schema) {
         return schema
             .refine(options => !!options.name !== !!options.default, {
-            error: `Specify either name or default, but not both.`
+            error: `Specify either name or default, but not both.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['name', 'default']
+            }
         });
     }
     async commandAction(logger, args) {

package/dist/m365/pp/commands/website/website-get.js

@@ -28,7 +28,11 @@ class PpWebSiteGetCommand extends PowerPlatformCommand {
     getRefinedSchema(schema) {
         return schema
             .refine(options => [options.url, options.id, options.name].filter(x => x !== undefined).length === 1, {
-            error: `Specify either url, id or name, but not multiple.`
+            error: `Specify either url, id or name, but not multiple.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['url', 'id', 'name']
+            }
         });
     }
     async commandAction(logger, args) {

package/dist/m365/spe/commands/container/container-add.js

@@ -31,7 +31,11 @@ class SpeContainerAddCommand extends GraphCommand {
     getRefinedSchema(schema) {
         return schema
             .refine((options) => [options.containerTypeId, options.containerTypeName].filter(o => o !== undefined).length === 1, {
-            error: 'Use one of the following options: containerTypeId or containerTypeName.'
+            error: 'Use one of the following options: containerTypeId or containerTypeName.',
+            params: {
+                customCode: 'optionSet',
+                options: ['containerTypeId', 'containerTypeName']
+            }
         });
     }
     async commandAction(logger, args) {

package/dist/m365/spe/commands/container/container-recyclebinitem-list.js

@@ -25,7 +25,11 @@ class SpeContainerRecycleBinItemListCommand extends GraphCommand {
     getRefinedSchema(schema) {
         return schema
             .refine((options) => [options.containerTypeId, options.containerTypeName].filter(o => o !== undefined).length === 1, {
-            error: 'Use one of the following options: containerTypeId or containerTypeName.'
+            error: 'Use one of the following options: containerTypeId or containerTypeName.',
+            params: {
+                customCode: 'optionSet',
+                options: ['containerTypeId', 'containerTypeName']
+            }
         });
     }
     async commandAction(logger, args) {

package/dist/m365/spe/commands/container/container-recyclebinitem-remove.js

@@ -28,10 +28,18 @@ class SpeContainerRecycleBinItemRemoveCommand extends GraphCommand {
     getRefinedSchema(schema) {
         return schema
             .refine((options) => [options.id, options.name].filter(o => o !== undefined).length === 1, {
-            error: 'Use one of the following options: id or name.'
+            error: 'Use one of the following options: id or name.',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'name']
+            }
         })
             .refine((options) => !options.name || [options.containerTypeId, options.containerTypeName].filter(o => o !== undefined).length === 1, {
-            error: 'Use one of the following options when specifying the container name: containerTypeId or containerTypeName.'
+            error: 'Use one of the following options when specifying the container name: containerTypeId or containerTypeName.',
+            params: {
+                customCode: 'optionSet',
+                options: ['containerTypeId', 'containerTypeName']
+            }
         })
             .refine((options) => options.name || [options.containerTypeId, options.containerTypeName].filter(o => o !== undefined).length === 0, {
             error: 'Options containerTypeId and containerTypeName are only required when removing a container by name.'

package/dist/m365/spe/commands/container/container-recyclebinitem-restore.js

@@ -27,10 +27,18 @@ class SpeContainerRecycleBinItemRestoreCommand extends GraphCommand {
     getRefinedSchema(schema) {
         return schema
             .refine((options) => [options.id, options.name].filter(o => o !== undefined).length === 1, {
-            error: 'Use one of the following options: id or name.'
+            error: 'Use one of the following options: id or name.',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'name']
+            }
         })
             .refine((options) => !options.name || [options.containerTypeId, options.containerTypeName].filter(o => o !== undefined).length === 1, {
-            error: 'Use one of the following options when specifying the container name: containerTypeId or containerTypeName.'
+            error: 'Use one of the following options when specifying the container name: containerTypeId or containerTypeName.',
+            params: {
+                customCode: 'optionSet',
+                options: ['containerTypeId', 'containerTypeName']
+            }
         })
             .refine((options) => options.name || [options.containerTypeId, options.containerTypeName].filter(o => o !== undefined).length === 0, {
             error: 'Options containerTypeId and containerTypeName are only required when restoring a container by name.'

package/dist/m365/spe/commands/container/container-remove.js

@@ -27,10 +27,18 @@ class SpeContainerRemoveCommand extends GraphCommand {
     getRefinedSchema(schema) {
         return schema
             .refine((options) => [options.id, options.name].filter(o => o !== undefined).length === 1, {
-            error: 'Use one of the following options: id or name.'
+            error: 'Use one of the following options: id or name.',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'name']
+            }
         })
             .refine((options) => !options.name || [options.containerTypeId, options.containerTypeName].filter(o => o !== undefined).length === 1, {
-            error: 'Use one of the following options when specifying the container name: containerTypeId or containerTypeName.'
+            error: 'Use one of the following options when specifying the container name: containerTypeId or containerTypeName.',
+            params: {
+                customCode: 'optionSet',
+                options: ['containerTypeId', 'containerTypeName']
+            }
         })
             .refine((options) => options.name || [options.containerTypeId, options.containerTypeName].filter(o => o !== undefined).length === 0, {
             error: 'Options containerTypeId and containerTypeName are only required when deleting a container by name.'

package/dist/m365/spe/commands/containertype/containertype-get.js

@@ -24,7 +24,11 @@ class SpeContainerTypeGetCommand extends GraphDelegatedCommand {
     getRefinedSchema(schema) {
         return schema
             .refine(options => [options.id, options.name].filter(o => o !== undefined).length === 1, {
-            error: 'Use one of the following options: id or name.'
+            error: 'Use one of the following options: id or name.',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'name']
+            }
         });
     }
     async commandAction(logger, args) {

package/dist/m365/spe/commands/containertype/containertype-remove.js

@@ -26,7 +26,11 @@ class SpeContainerTypeRemoveCommand extends SpoCommand {
     getRefinedSchema(schema) {
         return schema
             .refine(options => [options.id, options.name].filter(o => o !== undefined).length === 1, {
-            error: 'Use one of the following options: id, name.'
+            error: 'Use one of the following options: id, name.',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'name']
+            }
         });
     }
     async commandAction(logger, args) {

package/dist/m365/spfx/commands/SpfxCompatibilityMatrix.js

@@ -624,7 +624,7 @@ export const versions = {
             fix: 'npm i -g yo@7'
         }
     },
-    '1.23.0-rc.0': {
+    '1.23.0': {
         heft: {
             range: '^1',
             fix: 'npm i -g @rushstack/heft@1'

package/dist/m365/spfx/commands/project/project-doctor/{doctor-1.23.0-rc.0.js → doctor-1.23.0.js}

@@ -16,4 +16,4 @@ export default [
     new FN002022_DEVDEP_typescript('~5.8.0'),
     new FN021001_PKG_spfx_deps_versions_match_project_version(true)
 ];
-//# sourceMappingURL=doctor-1.23.0-rc.0.js.map
+//# sourceMappingURL=doctor-1.23.0.js.map

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

@@ -77,7 +77,7 @@ class SpfxProjectDoctorCommand extends BaseProjectCommand {
             '1.22.0',
             '1.22.1',
             '1.22.2',
-            '1.23.0-rc.0'
+            '1.23.0'
         ];
         __classPrivateFieldGet(this, _SpfxProjectDoctorCommand_instances, "m", _SpfxProjectDoctorCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpfxProjectDoctorCommand_instances, "m", _SpfxProjectDoctorCommand_initOptions).call(this);
@@ -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-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/FN002035_DEVDEP_types_heft_jest.js

@@ -1,7 +1,7 @@
 import { DependencyRule } from "./DependencyRule.js";
 export class FN002035_DEVDEP_types_heft_jest extends DependencyRule {
-    constructor(packageVersion) {
-        super('@types/heft-jest', packageVersion, true);
+    constructor(packageVersion, add = true) {
+        super('@types/heft-jest', packageVersion, true, false, add);
     }
     get id() {
         return 'FN002035';

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

@@ -0,0 +1,10 @@
+import { DependencyRule } from "./DependencyRule.js";
+export class FN002036_DEVDEP_types_jest extends DependencyRule {
+    constructor(packageVersion) {
+        super('@types/jest', packageVersion, true);
+    }
+    get id() {
+        return 'FN002036';
+    }
+}
+//# sourceMappingURL=FN002036_DEVDEP_types_jest.js.map

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

@@ -0,0 +1,33 @@
+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';
+    }
+    visit(project, findings) {
+        // If an override entry for the package already exists in package.json,
+        // emit an extra finding to remove the existing override first. This avoids
+        // having to use a separate remove-override rule (e.g. FN027002) in the upgrade scripts.
+        if (project.packageJson?.overrides?.[this.packageName] &&
+            project.packageJson.overrides[this.packageName] !== this.packageVersion) {
+            const node = this.getAstNodeFromFile(project.packageJson, `overrides.${this.packageName}`);
+            findings.push({
+                id: `${this.id}_REMOVE`,
+                title: this.packageName,
+                description: `Remove existing SharePoint Framework override dependency package ${this.packageName}`,
+                occurrences: [{
+                        file: this.file,
+                        resolution: `removeOverride overrides.${this.packageName}`,
+                        position: this.getPositionFromNode(node)
+                    }],
+                resolutionType: 'cmd',
+                severity: 'Required',
+                supersedes: []
+            });
+        }
+        super.visit(project, findings);
+    }
+}
+//# 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 → upgrade-1.23.0.js}

@@ -28,39 +28,43 @@ import { FN002030_DEVDEP_microsoft_spfx_web_build_rig } from './rules/FN002030_D
 import { FN002031_DEVDEP_rushstack_heft } from './rules/FN002031_DEVDEP_rushstack_heft.js';
 import { FN002032_DEVDEP_typescript_eslint_parser } from './rules/FN002032_DEVDEP_typescript_eslint_parser.js';
 import { FN002034_DEVDEP_microsoft_spfx_heft_plugins } from './rules/FN002034_DEVDEP_microsoft_spfx_heft_plugins.js';
+import { FN002035_DEVDEP_types_heft_jest } from './rules/FN002035_DEVDEP_types_heft_jest.js';
+import { FN002036_DEVDEP_types_jest } from './rules/FN002036_DEVDEP_types_jest.js';
 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 { FN022001_SCSS_remove_fabric_react } from './rules/FN022001_SCSS_remove_fabric_react.js';
+import { FN022002_SCSS_add_fabric_react } from './rules/FN022002_SCSS_add_fabric_react.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'),
-    new FN001003_DEP_microsoft_sp_office_ui_fabric_core('1.23.0-rc.0'),
-    new FN001004_DEP_microsoft_sp_webpart_base('1.23.0-rc.0'),
-    new FN001011_DEP_microsoft_sp_dialog('1.23.0-rc.0'),
-    new FN001012_DEP_microsoft_sp_application_base('1.23.0-rc.0'),
-    new FN001014_DEP_microsoft_sp_listview_extensibility('1.23.0-rc.0'),
-    new FN001021_DEP_microsoft_sp_property_pane('1.23.0-rc.0'),
-    new FN001023_DEP_microsoft_sp_component_base('1.23.0-rc.0'),
-    new FN001024_DEP_microsoft_sp_diagnostics('1.23.0-rc.0'),
-    new FN001025_DEP_microsoft_sp_dynamic_data('1.23.0-rc.0'),
-    new FN001026_DEP_microsoft_sp_extension_base('1.23.0-rc.0'),
-    new FN001027_DEP_microsoft_sp_http('1.23.0-rc.0'),
-    new FN001028_DEP_microsoft_sp_list_subscription('1.23.0-rc.0'),
-    new FN001029_DEP_microsoft_sp_loader('1.23.0-rc.0'),
-    new FN001030_DEP_microsoft_sp_module_interfaces('1.23.0-rc.0'),
-    new FN001031_DEP_microsoft_sp_odata_types('1.23.0-rc.0'),
-    new FN001032_DEP_microsoft_sp_page_context('1.23.0-rc.0'),
-    new FN001013_DEP_microsoft_decorators('1.23.0-rc.0'),
-    new FN001034_DEP_microsoft_sp_adaptive_card_extension_base('1.23.0-rc.0'),
-    new FN002002_DEVDEP_microsoft_sp_module_interfaces('1.23.0-rc.0'),
-    new FN002022_DEVDEP_microsoft_eslint_plugin_spfx('1.23.0-rc.0'),
-    new FN002023_DEVDEP_microsoft_eslint_config_spfx('1.23.0-rc.0'),
-    new FN002030_DEVDEP_microsoft_spfx_web_build_rig('1.23.0-rc.0'),
-    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 FN001001_DEP_microsoft_sp_core_library('1.23.0'),
+    new FN001002_DEP_microsoft_sp_lodash_subset('1.23.0'),
+    new FN001003_DEP_microsoft_sp_office_ui_fabric_core('1.23.0'),
+    new FN001004_DEP_microsoft_sp_webpart_base('1.23.0'),
+    new FN001011_DEP_microsoft_sp_dialog('1.23.0'),
+    new FN001012_DEP_microsoft_sp_application_base('1.23.0'),
+    new FN001014_DEP_microsoft_sp_listview_extensibility('1.23.0'),
+    new FN001021_DEP_microsoft_sp_property_pane('1.23.0'),
+    new FN001023_DEP_microsoft_sp_component_base('1.23.0'),
+    new FN001024_DEP_microsoft_sp_diagnostics('1.23.0'),
+    new FN001025_DEP_microsoft_sp_dynamic_data('1.23.0'),
+    new FN001026_DEP_microsoft_sp_extension_base('1.23.0'),
+    new FN001027_DEP_microsoft_sp_http('1.23.0'),
+    new FN001028_DEP_microsoft_sp_list_subscription('1.23.0'),
+    new FN001029_DEP_microsoft_sp_loader('1.23.0'),
+    new FN001030_DEP_microsoft_sp_module_interfaces('1.23.0'),
+    new FN001031_DEP_microsoft_sp_odata_types('1.23.0'),
+    new FN001032_DEP_microsoft_sp_page_context('1.23.0'),
+    new FN001013_DEP_microsoft_decorators('1.23.0'),
+    new FN001034_DEP_microsoft_sp_adaptive_card_extension_base('1.23.0'),
+    new FN002002_DEVDEP_microsoft_sp_module_interfaces('1.23.0'),
+    new FN002022_DEVDEP_microsoft_eslint_plugin_spfx('1.23.0'),
+    new FN002023_DEVDEP_microsoft_eslint_config_spfx('1.23.0'),
+    new FN002030_DEVDEP_microsoft_spfx_web_build_rig('1.23.0'),
+    new FN002034_DEVDEP_microsoft_spfx_heft_plugins('1.23.0'),
+    new FN010001_YORC_version('1.23.0'),
+    new FN002031_DEVDEP_rushstack_heft('1.2.17'),
+    new FN027001_OVERRIDES_rushstack_heft('1.2.17'),
     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');
@@ -79,6 +83,10 @@ module.exports = [
 ];`),
     new FN015008_FILE_eslintrc_js(false),
     new FN002021_DEVDEP_rushstack_eslint_config('4.5.2', false),
-    new FN002032_DEVDEP_typescript_eslint_parser('8.46.2', false)
+    new FN002032_DEVDEP_typescript_eslint_parser('8.46.2', false),
+    new FN002035_DEVDEP_types_heft_jest('1.0.2', false),
+    new FN002036_DEVDEP_types_jest('30.0.0'),
+    new FN022001_SCSS_remove_fabric_react('~@fluentui/react/dist/sass/References.scss'),
+    new FN022002_SCSS_add_fabric_react('pkg:@fluentui/react/dist/sass/References.scss')
 ];
-//# sourceMappingURL=upgrade-1.23.0-rc.0.js.map
+//# sourceMappingURL=upgrade-1.23.0.js.map

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

@@ -1,8 +1,8 @@
 import fs from 'fs';
 import os from 'os';
 import path from 'path';
-// uncomment to support upgrading to preview releases
-import { prerelease } from 'semver';
+// Uncomment to support upgrading to preview releases
+// import { prerelease } from 'semver';
 import { z } from 'zod';
 import { CommandError, globalOptionsZod } from '../../../../Command.js';
 import { fsUtil } from '../../../../utils/fsUtil.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'),
@@ -86,7 +86,7 @@ class SpfxProjectUpgradeCommand extends BaseProjectCommand {
             '1.22.0',
             '1.22.1',
             '1.22.2',
-            '1.23.0-rc.0'
+            '1.23.0'
         ];
     }
     async commandAction(logger, args) {
@@ -95,16 +95,16 @@ class SpfxProjectUpgradeCommand extends BaseProjectCommand {
             throw new CommandError(`Couldn't find project root folder`, SpfxProjectUpgradeCommand.ERROR_NO_PROJECT_ROOT_FOLDER);
         }
         this.toVersion = args.options.toVersion ? args.options.toVersion : this.supportedVersions[this.supportedVersions.length - 1];
-        // uncomment to support upgrading to preview releases
-        if (!args.options.toVersion &&
-            !args.options.preview &&
-            prerelease(this.toVersion)) {
-            // no version and no preview specified while the current version to
-            // upgrade to is a prerelease so let's grab the first non-preview version
-            // since we're supporting only one preview version, it's sufficient for
-            // us to take second to last version
-            this.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
-        }
+        // Uncomment to support upgrading to preview releases
+        // if (!args.options.toVersion &&
+        //   !args.options.preview &&
+        //   prerelease(this.toVersion)) {
+        //   // no version and no preview specified while the current version to
+        //   // upgrade to is a prerelease so let's grab the first non-preview version
+        //   // since we're supporting only one preview version, it's sufficient for
+        //   // us to take second to last version
+        //   this.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
+        // }
         this.packageManager = args.options.packageManager || 'npm';
         this.shell = args.options.shell || 'powershell';
         if (this.supportedVersions.indexOf(this.toVersion) < 0) {
@@ -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/m365/spo/commands/file/file-version-keep.js

@@ -31,7 +31,11 @@ class SpoFileVersionKeepCommand extends SpoCommand {
     getRefinedSchema(schema) {
         return schema
             .refine(options => [options.fileUrl, options.fileId].filter(o => o !== undefined).length === 1, {
-            error: `Specify 'fileUrl' or 'fileId', but not both.`
+            error: `Specify 'fileUrl' or 'fileId', but not both.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['fileUrl', 'fileId']
+            }
         });
     }
     async commandAction(logger, args) {

package/dist/m365/spo/commands/homesite/homesite-add.js

@@ -37,7 +37,11 @@ class SpoHomeSiteAddCommand extends SpoCommand {
     getRefinedSchema(schema) {
         return schema
             .refine((options) => [options.audienceIds, options.audienceNames].filter(o => o !== undefined).length <= 1, {
-            message: 'You must specify either audienceIds or audienceNames but not both.'
+            message: 'You must specify either audienceIds or audienceNames but not both.',
+            params: {
+                customCode: 'optionSet',
+                options: ['audienceIds', 'audienceNames']
+            }
         });
     }
     async commandAction(logger, args) {