@pnp/cli-microsoft365 6.4.0-beta.6b65014 → 6.4.0-beta.8c5ba0e

package/README.md

@@ -15,7 +15,7 @@
       alt="GitHub" />
   </a>
 
-  <a href="https://discord.com/invite/7rfW4kg6B5">
+  <a href="https://discord.gg/35HTFJ544b">
     <img src="https://img.shields.io/badge/Discord-Join-7289da?style=flat-square"
       alt="Discord" />
   </a>
@@ -213,6 +213,17 @@ If you want to get involved with helping us grow the CLI, whether that is sugges
 
 Checkout our [Wiki](https://github.com/pnp/cli-microsoft365/wiki) for guides on how to contribute to this project.
 
+## Need Help?
+
+<h4 align="center">
+  Join our community
+</h4>
+<p align="center">
+  <a href="https://discord.gg/35HTFJ544b">
+    <img alt="Discord" src="./docs/docs/images/discord-logo.png" width="100"/>
+  </a>
+</p>
+
 ## Microsoft 365 Platform Community
 
 CLI for Microsoft 365 is a [Microsoft 365 Platform Community](https://pnp.github.io) (PnP) project. Microsoft 365 Platform Community is a virtual team consisting of Microsoft employees and community members focused on helping the community make the best use of Microsoft products. CLI for Microsoft 365 is an open-source project not affiliated with Microsoft and not covered by Microsoft support. If you experience any issues using the CLI, please submit an issue in the [issues list](https://github.com/pnp/cli-microsoft365/issues).

package/dist/m365/aad/commands/user/user-get.js

@@ -101,6 +101,9 @@ _AadUserGetCommand_instances = new WeakSet(), _AadUserGetCommand_initTelemetry =
             !validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
+        if (args.options.userName && !validation_1.validation.isValidUserPrincipalName(args.options.userName)) {
+            return `${args.options.userName} is not a valid userName`;
+        }
         return true;
     }));
 }, _AadUserGetCommand_initOptionSets = function _AadUserGetCommand_initOptionSets() {

package/dist/m365/aad/commands/user/user-set.js

@@ -170,6 +170,9 @@ _AadUserSetCommand_instances = new WeakSet(), _AadUserSetCommand_initTelemetry =
             !validation_1.validation.isValidGuid(args.options.objectId)) {
             return `${args.options.objectId} is not a valid GUID`;
         }
+        if (args.options.userPrincipalName && !validation_1.validation.isValidUserPrincipalName(args.options.userPrincipalName)) {
+            return `${args.options.userPrincipalName} is not a valid userPrincipalName`;
+        }
         if (!args.options.resetPassword && ((args.options.currentPassword && !args.options.newPassword) || (args.options.newPassword && !args.options.currentPassword))) {
             return `Specify both currentPassword and newPassword when you want to change your password`;
         }

package/dist/m365/aad/commands/user/user-signin-list.js

@@ -90,6 +90,9 @@ _AadUserSigninListCommand_instances = new WeakSet(), _AadUserSigninListCommand_i
         if (args.options.appId && args.options.appDisplayName) {
             return 'Specify either appId or appDisplayName, but not both';
         }
+        if (args.options.userName && !validation_1.validation.isValidUserPrincipalName(args.options.userName)) {
+            return `${args.options.userName} is not a valid userName`;
+        }
         if (args.options.userId && !validation_1.validation.isValidGuid(args.options.userId)) {
             return `${args.options.userId} is not a valid GUID`;
         }

package/dist/m365/planner/commands/roster/roster-member-add.js

@@ -106,6 +106,9 @@ _PlannerRosterMemberAddCommand_instances = new WeakSet(), _PlannerRosterMemberAd
         if (args.options.userId && !validation_1.validation.isValidGuid(args.options.userId)) {
             return `${args.options.userId} is not a valid GUID`;
         }
+        if (args.options.userName && !validation_1.validation.isValidUserPrincipalName(args.options.userName)) {
+            return `${args.options.userName} is not a valid user principal name (UPN)`;
+        }
         return true;
     }));
 };

package/dist/m365/purview/commands/retentionevent/retentionevent-add.js

@@ -0,0 +1,138 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+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 _PurviewRetentionEventAddCommand_instances, _PurviewRetentionEventAddCommand_initOptions, _PurviewRetentionEventAddCommand_initValidators, _PurviewRetentionEventAddCommand_initTelemetry, _PurviewRetentionEventAddCommand_initOptionSets;
+Object.defineProperty(exports, "__esModule", { value: true });
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const commands_1 = require("../../commands");
+const accessToken_1 = require("../../../../utils/accessToken");
+const Auth_1 = require("../../../../Auth");
+const request_1 = require("../../../../request");
+const validation_1 = require("../../../../utils/validation");
+const odata_1 = require("../../../../utils/odata");
+class PurviewRetentionEventAddCommand extends GraphCommand_1.default {
+    get name() {
+        return commands_1.default.RETENTIONEVENT_ADD;
+    }
+    get description() {
+        return 'Create a retention event';
+    }
+    constructor() {
+        super();
+        _PurviewRetentionEventAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _PurviewRetentionEventAddCommand_instances, "m", _PurviewRetentionEventAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _PurviewRetentionEventAddCommand_instances, "m", _PurviewRetentionEventAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _PurviewRetentionEventAddCommand_instances, "m", _PurviewRetentionEventAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _PurviewRetentionEventAddCommand_instances, "m", _PurviewRetentionEventAddCommand_initOptionSets).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (accessToken_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken)) {
+                this.handleError('This command does not support application permissions.');
+            }
+            if (this.verbose) {
+                logger.logToStderr(`Creating retention event...`);
+            }
+            const eventQueries = [];
+            if (args.options.assetIds) {
+                eventQueries.push({ queryType: "files", query: args.options.assetIds });
+            }
+            if (args.options.keywords) {
+                eventQueries.push({ queryType: "messages", query: args.options.keywords });
+            }
+            const eventTypeId = yield this.getEventTypeId(logger, args);
+            const data = {
+                'retentionEventType@odata.bind': `https://graph.microsoft.com/beta/security/triggerTypes/retentionEventTypes/${eventTypeId}`,
+                displayName: args.options.displayName,
+                description: args.options.description,
+                eventQueries: eventQueries,
+                eventTriggerDateTime: args.options.triggerDateTime
+            };
+            try {
+                const requestOptions = {
+                    url: `${this.resource}/beta/security/triggers/retentionEvents`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json',
+                    data: data
+                };
+                const res = yield request_1.default.post(requestOptions);
+                logger.log(res);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+    getEventTypeId(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.eventTypeId) {
+                return args.options.eventTypeId;
+            }
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving the event type id for event type ${args.options.eventTypeName}`);
+            }
+            const items = yield odata_1.odata.getAllItems(`${this.resource}/beta/security/triggerTypes/retentionEventTypes`);
+            const eventTypes = items.filter((x) => x.displayName === args.options.eventTypeName);
+            if (eventTypes.length === 0) {
+                throw `The specified event type '${args.options.eventTypeName}' does not exist.`;
+            }
+            return eventTypes[0].id;
+        });
+    }
+}
+_PurviewRetentionEventAddCommand_instances = new WeakSet(), _PurviewRetentionEventAddCommand_initOptions = function _PurviewRetentionEventAddCommand_initOptions() {
+    this.options.unshift({
+        option: '-n, --displayName <displayName>'
+    }, {
+        option: '-i, --eventTypeId [eventTypeId]'
+    }, {
+        option: '-e, --eventTypeName [eventTypeName]'
+    }, {
+        option: '-d, --description [description]'
+    }, {
+        option: '--triggerDateTime [triggerDateTime]'
+    }, {
+        option: '-a, --assetIds [assetIds]'
+    }, {
+        option: '-k, --keywords [keywords]'
+    });
+}, _PurviewRetentionEventAddCommand_initValidators = function _PurviewRetentionEventAddCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (args.options.triggerDateTime && !validation_1.validation.isValidISODateTime(args.options.triggerDateTime)) {
+            return 'The triggerDateTime is not a valid ISO date string';
+        }
+        if (!args.options.assetIds && !args.options.keywords) {
+            return 'Specify assetIds and/or keywords, but at least one.';
+        }
+        return true;
+    }));
+}, _PurviewRetentionEventAddCommand_initTelemetry = function _PurviewRetentionEventAddCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            description: typeof args.options.description !== 'undefined',
+            triggerDateTime: typeof args.options.triggerDateTime !== 'undefined',
+            eventTypeId: typeof args.options.eventTypeId !== 'undefined',
+            eventTypeName: typeof args.options.eventTypeName !== 'undefined',
+            assetIds: typeof args.options.assetIds !== 'undefined',
+            keywords: typeof args.options.keywords !== 'undefined'
+        });
+    });
+}, _PurviewRetentionEventAddCommand_initOptionSets = function _PurviewRetentionEventAddCommand_initOptionSets() {
+    this.optionSets.push({ options: ['eventTypeId', 'eventTypeName'] });
+};
+module.exports = new PurviewRetentionEventAddCommand();
+//# sourceMappingURL=retentionevent-add.js.map

package/dist/m365/purview/commands/retentionlabel/retentionlabel-add.js

@@ -13,13 +13,14 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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 _PurviewRetentionLabelAddCommand_instances, _PurviewRetentionLabelAddCommand_initTelemetry, _PurviewRetentionLabelAddCommand_initOptions, _PurviewRetentionLabelAddCommand_initValidators;
+var _PurviewRetentionLabelAddCommand_instances, _PurviewRetentionLabelAddCommand_initTelemetry, _PurviewRetentionLabelAddCommand_initOptions, _PurviewRetentionLabelAddCommand_initValidators, _PurviewRetentionLabelAddCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../../../Auth");
 const request_1 = require("../../../../request");
 const accessToken_1 = require("../../../../utils/accessToken");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
+const odata_1 = require("../../../../utils/odata");
 class PurviewRetentionLabelAddCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.RETENTIONLABEL_ADD;
@@ -33,6 +34,7 @@ class PurviewRetentionLabelAddCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _PurviewRetentionLabelAddCommand_instances, "m", _PurviewRetentionLabelAddCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _PurviewRetentionLabelAddCommand_instances, "m", _PurviewRetentionLabelAddCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _PurviewRetentionLabelAddCommand_instances, "m", _PurviewRetentionLabelAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _PurviewRetentionLabelAddCommand_instances, "m", _PurviewRetentionLabelAddCommand_initOptionSets).call(this);
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -52,6 +54,10 @@ class PurviewRetentionLabelAddCommand extends GraphCommand_1.default {
                 },
                 defaultRecordBehavior: defaultRecordBehavior
             };
+            if (args.options.retentionTrigger === 'dateOfEvent') {
+                const eventTypeId = yield this.getEventTypeId(args, logger);
+                requestBody['retentionEventType@odata.bind'] = `https://graph.microsoft.com/beta/security/triggerTypes/retentionEventTypes/${eventTypeId}`;
+            }
             if (args.options.descriptionForAdmins) {
                 if (this.verbose) {
                     logger.logToStderr(`Using '${args.options.descriptionForAdmins}' as descriptionForAdmins`);
@@ -87,6 +93,22 @@ class PurviewRetentionLabelAddCommand extends GraphCommand_1.default {
             }
         });
     }
+    getEventTypeId(args, logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.eventTypeId) {
+                return args.options.eventTypeId;
+            }
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving the event type id for event type ${args.options.eventTypeName}`);
+            }
+            const eventTypes = yield odata_1.odata.getAllItems(`${this.resource}/beta/security/triggerTypes/retentionEventTypes`);
+            const filteredEventTypes = eventTypes.filter((eventType) => eventType.displayName === args.options.eventTypeName);
+            if (filteredEventTypes.length === 0) {
+                throw `The specified retention event type '${args.options.eventTypeName}' does not exist.`;
+            }
+            return filteredEventTypes[0].id;
+        });
+    }
 }
 _PurviewRetentionLabelAddCommand_instances = new WeakSet(), _PurviewRetentionLabelAddCommand_initTelemetry = function _PurviewRetentionLabelAddCommand_initTelemetry() {
     this.telemetry.push((args) => {
@@ -95,7 +117,9 @@ _PurviewRetentionLabelAddCommand_instances = new WeakSet(), _PurviewRetentionLab
             defaultRecordBehavior: typeof args.options.defaultRecordBehavior !== 'undefined',
             descriptionForUsers: typeof args.options.descriptionForUsers !== 'undefined',
             descriptionForAdmins: typeof args.options.descriptionForAdmins !== 'undefined',
-            labelToBeApplied: typeof args.options.labelToBeApplied !== 'undefined'
+            labelToBeApplied: typeof args.options.labelToBeApplied !== 'undefined',
+            eventTypeId: typeof args.options.eventTypeId !== 'undefined',
+            eventTypeName: typeof args.options.eventTypeName !== 'undefined'
         });
     });
 }, _PurviewRetentionLabelAddCommand_initOptions = function _PurviewRetentionLabelAddCommand_initOptions() {
@@ -103,46 +127,56 @@ _PurviewRetentionLabelAddCommand_instances = new WeakSet(), _PurviewRetentionLab
         option: '-n, --displayName <displayName>'
     }, {
         option: '--behaviorDuringRetentionPeriod <behaviorDuringRetentionPeriod>',
-        autocomplete: ['doNotRetain', 'retain', 'retainAsRecord', 'retainAsRegulatoryRecord']
+        autocomplete: PurviewRetentionLabelAddCommand.behaviorDuringRetentionPeriods
     }, {
         option: '--actionAfterRetentionPeriod <actionAfterRetentionPeriod>',
-        autocomplete: ['none', 'delete', 'startDispositionReview']
+        autocomplete: PurviewRetentionLabelAddCommand.actionAfterRetentionPeriods
     }, {
         option: '--retentionDuration <retentionDuration>'
     }, {
         option: '-t, --retentionTrigger [retentionTrigger]',
-        autocomplete: ['dateLabeled', 'dateCreated', 'dateModified', 'dateOfEvent']
+        autocomplete: PurviewRetentionLabelAddCommand.retentionTriggers
     }, {
         option: '--defaultRecordBehavior [defaultRecordBehavior]',
-        autocomplete: ['startLocked', 'startUnlocked']
+        autocomplete: PurviewRetentionLabelAddCommand.defaultRecordBehavior
     }, {
         option: '--descriptionForUsers [descriptionForUsers]'
     }, {
         option: '--descriptionForAdmins [descriptionForAdmins]'
     }, {
         option: '--labelToBeApplied [labelToBeApplied]'
+    }, {
+        option: '--eventTypeId [eventTypeId]'
+    }, {
+        option: '--eventTypeName [eventTypeName]'
     });
 }, _PurviewRetentionLabelAddCommand_initValidators = function _PurviewRetentionLabelAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (isNaN(args.options.retentionDuration)) {
             return `Specified retentionDuration ${args.options.retentionDuration} is not a number`;
         }
-        if (['doNotRetain', 'retain', 'retainAsRecord', 'retainAsRegulatoryRecord'].indexOf(args.options.behaviorDuringRetentionPeriod) === -1) {
-            return `${args.options.behaviorDuringRetentionPeriod} is not a valid behavior of a document with the label. Allowed values are doNotRetain|retain|retainAsRecord|retainAsRegulatoryRecord`;
+        if (PurviewRetentionLabelAddCommand.behaviorDuringRetentionPeriods.indexOf(args.options.behaviorDuringRetentionPeriod) === -1) {
+            return `${args.options.behaviorDuringRetentionPeriod} is not a valid behavior of a document with the label. Allowed values are ${PurviewRetentionLabelAddCommand.behaviorDuringRetentionPeriods.join(', ')}`;
         }
-        if (['none', 'delete', 'startDispositionReview'].indexOf(args.options.actionAfterRetentionPeriod) === -1) {
-            return `${args.options.actionAfterRetentionPeriod} is not a valid action to take on a document with the label. Allowed values are none|delete|startDispositionReview`;
+        if (PurviewRetentionLabelAddCommand.actionAfterRetentionPeriods.indexOf(args.options.actionAfterRetentionPeriod) === -1) {
+            return `${args.options.actionAfterRetentionPeriod} is not a valid action to take on a document with the label. Allowed values are ${PurviewRetentionLabelAddCommand.actionAfterRetentionPeriods.join(', ')}`;
         }
         if (args.options.retentionTrigger &&
-            ['dateLabeled', 'dateCreated', 'dateModified', 'dateOfEvent'].indexOf(args.options.retentionTrigger) === -1) {
-            return `${args.options.retentionTrigger} is not a valid action retention duration calculation. Allowed values are dateLabeled|dateCreated|dateModified|dateOfEvent`;
+            PurviewRetentionLabelAddCommand.retentionTriggers.indexOf(args.options.retentionTrigger) === -1) {
+            return `${args.options.retentionTrigger} is not a valid action retention duration calculation. Allowed values are ${PurviewRetentionLabelAddCommand.retentionTriggers.join(', ')}`;
         }
         if (args.options.defaultRecordBehavior &&
-            ['startLocked', 'startUnlocked'].indexOf(args.options.defaultRecordBehavior) === -1) {
-            return `${args.options.defaultRecordBehavior} is not a valid state of a record label. Allowed values are startLocked|startUnlocked`;
+            PurviewRetentionLabelAddCommand.defaultRecordBehavior.indexOf(args.options.defaultRecordBehavior) === -1) {
+            return `${args.options.defaultRecordBehavior} is not a valid state of a record label. Allowed values are ${PurviewRetentionLabelAddCommand.defaultRecordBehavior.join(', ')}`;
         }
         return true;
     }));
+}, _PurviewRetentionLabelAddCommand_initOptionSets = function _PurviewRetentionLabelAddCommand_initOptionSets() {
+    this.optionSets.push({ options: ['eventTypeId', 'eventTypeName'], runsWhen(args) { return args.options.retentionTrigger === 'dateOfEvent'; } });
 };
+PurviewRetentionLabelAddCommand.behaviorDuringRetentionPeriods = ['doNotRetain', 'retain', 'retainAsRecord', 'retainAsRegulatoryRecord'];
+PurviewRetentionLabelAddCommand.actionAfterRetentionPeriods = ['none', 'delete', 'startDispositionReview'];
+PurviewRetentionLabelAddCommand.retentionTriggers = ['dateLabeled', 'dateCreated', 'dateModified', 'dateOfEvent'];
+PurviewRetentionLabelAddCommand.defaultRecordBehavior = ['startLocked', 'startUnlocked'];
 module.exports = new PurviewRetentionLabelAddCommand();
 //# sourceMappingURL=retentionlabel-add.js.map

package/dist/m365/purview/commands.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const prefix = 'purview';
 exports.default = {
     AUDITLOG_LIST: `${prefix} auditlog list`,
+    RETENTIONEVENT_ADD: `${prefix} retentionevent add`,
     RETENTIONEVENT_GET: `${prefix} retentionevent get`,
     RETENTIONEVENT_LIST: `${prefix} retentionevent list`,
     RETENTIONEVENT_REMOVE: `${prefix} retentionevent remove`,

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

@@ -18,8 +18,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const chalk = require("chalk");
 const child_process = require("child_process");
 const semver_1 = require("semver");
-const AnonymousCommand_1 = require("../../base/AnonymousCommand");
 const commands_1 = require("../commands");
+const base_project_command_1 = require("./project/base-project-command");
 /**
  * Has the particular check passed or failed
  */
@@ -64,7 +64,7 @@ var SharePointVersion;
     SharePointVersion[SharePointVersion["SPO"] = 4] = "SPO";
     SharePointVersion[SharePointVersion["All"] = 7] = "All";
 })(SharePointVersion || (SharePointVersion = {}));
-class SpfxDoctorCommand extends AnonymousCommand_1.default {
+class SpfxDoctorCommand extends base_project_command_1.BaseProjectCommand {
     get allowedOutputs() {
         return ['text'];
     }
@@ -479,6 +479,7 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
             if (!args.options.output) {
                 args.options.output = 'text';
             }
+            this.projectRootPath = this.getProjectRoot(process.cwd());
             logger.log(' ');
             logger.log('CLI for Microsoft 365 SharePoint Framework doctor');
             logger.log('Verifying configuration of your system for working with the SharePoint Framework');
@@ -557,9 +558,11 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
         });
     }
     checkSharePointFrameworkVersion(spfxVersionRequested, fixes, logger) {
-        return this
-            .getPackageVersion('@microsoft/generator-sharepoint', PackageSearchMode.GlobalOnly, HandlePromise.Continue, logger)
-            .then((spfxVersionDetected) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            let spfxVersionDetected = this.getSPFxVersionFromYoRcFile(logger);
+            if (!spfxVersionDetected) {
+                spfxVersionDetected = yield this.getPackageVersion('@microsoft/generator-sharepoint', PackageSearchMode.GlobalOnly, HandlePromise.Continue, logger);
+            }
             const versionCheck = {
                 range: spfxVersionRequested,
                 fix: `npm i -g @microsoft/generator-sharepoint@${spfxVersionRequested}`
@@ -625,39 +628,50 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
     spVersionStringToEnum(sp) {
         return SharePointVersion[sp.toUpperCase()];
     }
+    getSPFxVersionFromYoRcFile(logger) {
+        if (this.projectRootPath !== null) {
+            const spfxVersion = this.getProjectVersion();
+            if (spfxVersion) {
+                if (this.debug) {
+                    logger.logToStderr(`SPFx version retrieved from .yo-rc.json file. Retrieved version: ${spfxVersion}`);
+                }
+                return spfxVersion;
+            }
+        }
+        return undefined;
+    }
     getSharePointFrameworkVersion(logger) {
-        return new Promise((resolve, reject) => {
-            if (this.debug) {
-                logger.logToStderr('Detecting SharePoint Framework version based on @microsoft/sp-core-library local...');
+        return __awaiter(this, void 0, void 0, function* () {
+            let spfxVersion = this.getSPFxVersionFromYoRcFile(logger);
+            if (spfxVersion) {
+                return spfxVersion;
             }
-            this
-                .getPackageVersion('@microsoft/sp-core-library', PackageSearchMode.LocalOnly, HandlePromise.Fail, logger)
-                .then((version) => {
+            try {
+                spfxVersion = yield this.getPackageVersion('@microsoft/sp-core-library', PackageSearchMode.LocalOnly, HandlePromise.Fail, logger);
                 if (this.debug) {
-                    logger.logToStderr(`Found @microsoft/sp-core-library@${version}`);
+                    logger.logToStderr(`Found @microsoft/sp-core-library@${spfxVersion}`);
                 }
-                return Promise.resolve(version);
-            })
-                .catch(() => {
+                return spfxVersion;
+            }
+            catch (_a) {
                 if (this.debug) {
                     logger.logToStderr(`@microsoft/sp-core-library not found. Search for @microsoft/generator-sharepoint local or global...`);
                 }
-                return this.getPackageVersion('@microsoft/generator-sharepoint', PackageSearchMode.LocalAndGlobal, HandlePromise.Fail, logger);
-            })
-                .then((version) => {
-                resolve(version);
-            })
-                .catch((error) => {
-                if (this.debug) {
-                    logger.logToStderr('@microsoft/generator-sharepoint not found');
-                }
-                if (error && error.indexOf('ENOENT') > -1) {
-                    reject('npm not found');
+                try {
+                    return yield this.getPackageVersion('@microsoft/generator-sharepoint', PackageSearchMode.LocalAndGlobal, HandlePromise.Fail, logger);
                 }
-                else {
-                    resolve('');
+                catch (error) {
+                    if (this.debug) {
+                        logger.logToStderr('@microsoft/generator-sharepoint not found');
+                    }
+                    if (error && error.indexOf('ENOENT') > -1) {
+                        throw 'npm not found';
+                    }
+                    else {
+                        return '';
+                    }
                 }
-            });
+            }
         });
     }
     getPackageVersion(packageName, searchMode, handlePromise, logger) {