@pnp/cli-microsoft365 4.1.0-beta.6c0929c → 4.1.0-beta.7fbe6cd

package/dist/m365/aad/commands/o365group/{o365group-restore.js → o365group-recyclebinitem-restore.js}

@@ -4,17 +4,15 @@ const request_1 = require("../../../../request");
 const Utils_1 = require("../../../../Utils");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
-class AadO365GroupRestoreCommand extends GraphCommand_1.default {
+class AadO365GroupRecycleBinItemRestoreCommand extends GraphCommand_1.default {
     get name() {
-        return commands_1.default.O365GROUP_RESTORE;
+        return commands_1.default.O365GROUP_RECYCLEBINITEM_RESTORE;
     }
     get description() {
         return 'Restores a deleted Microsoft 365 Group';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.id = (!(!args.options.id)).toString();
-        return telemetryProps;
+    alias() {
+        return [commands_1.default.O365GROUP_RESTORE];
     }
     commandAction(logger, args, cb) {
         if (this.verbose) {
@@ -23,8 +21,10 @@ class AadO365GroupRestoreCommand extends GraphCommand_1.default {
         const requestOptions = {
             url: `${this.resource}/v1.0/directory/deleteditems/${args.options.id}/restore/`,
             headers: {
-                'accept': 'application/json;odata.metadata=none'
-            }
+                'accept': 'application/json;odata.metadata=none',
+                'content-type': 'application/json'
+            },
+            responseType: 'json'
         };
         request_1.default
             .post(requestOptions)
@@ -46,5 +46,5 @@ class AadO365GroupRestoreCommand extends GraphCommand_1.default {
         return true;
     }
 }
-module.exports = new AadO365GroupRestoreCommand();
-//# sourceMappingURL=o365group-restore.js.map
+module.exports = new AadO365GroupRecycleBinItemRestoreCommand();
+//# sourceMappingURL=o365group-recyclebinitem-restore.js.map

package/dist/m365/aad/commands/o365group/o365group-teamify.js

@@ -11,6 +11,30 @@ class AadO365GroupTeamifyCommand extends GraphCommand_1.default {
     get description() {
         return 'Creates a new Microsoft Teams team under existing Microsoft 365 group';
     }
+    getGroupId(args) {
+        if (args.options.groupId) {
+            return Promise.resolve(args.options.groupId);
+        }
+        const requestOptions = {
+            url: `${this.resource}/v1.0/groups?$filter=mailNickname eq '${encodeURIComponent(args.options.mailNickname)}'`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        return request_1.default
+            .get(requestOptions)
+            .then(response => {
+            const groupItem = response.value[0];
+            if (!groupItem) {
+                return Promise.reject(`The specified Microsoft 365 Group does not exist`);
+            }
+            if (response.value.length > 1) {
+                return Promise.reject(`Multiple Microsoft 365 Groups with name ${args.options.mailNickname} found: ${response.value.map(x => x.id)}`);
+            }
+            return Promise.resolve(groupItem.id);
+        });
+    }
     commandAction(logger, args, cb) {
         const data = {
             "memberSettings": {
@@ -26,29 +50,41 @@ class AadO365GroupTeamifyCommand extends GraphCommand_1.default {
                 "giphyContentRating": "strict"
             }
         };
-        const requestOptions = {
-            url: `${this.resource}/v1.0/groups/${encodeURIComponent(args.options.groupId)}/team`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            data: data,
-            responseType: 'json'
-        };
-        request_1.default
-            .put(requestOptions)
+        this
+            .getGroupId(args)
+            .then((groupId) => {
+            const requestOptions = {
+                url: `${this.resource}/v1.0/groups/${encodeURIComponent(groupId)}/team`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                data: data,
+                responseType: 'json'
+            };
+            return request_1.default.put(requestOptions);
+        })
             .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
     }
     options() {
         const options = [
             {
-                option: '-i, --groupId <groupId>'
+                option: '-i, --groupId [groupId]'
+            },
+            {
+                option: '--mailNickname [mailNickname]'
             }
         ];
         const parentOptions = super.options();
         return options.concat(parentOptions);
     }
     validate(args) {
-        if (!Utils_1.default.isValidGuid(args.options.groupId)) {
+        if (args.options.groupId && args.options.mailNickname) {
+            return 'Specify either groupId or mailNickname, but not both.';
+        }
+        if (!args.options.groupId && !args.options.mailNickname) {
+            return 'Specify groupId or mailNickname, one is required';
+        }
+        if (args.options.groupId && !Utils_1.default.isValidGuid(args.options.groupId)) {
             return `${args.options.groupId} is not a valid GUID`;
         }
         return true;

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

@@ -0,0 +1,116 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const request_1 = require("../../../../request");
+const Utils_1 = require("../../../../Utils");
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const commands_1 = require("../../commands");
+class AadServicePrincipalGetCommand extends GraphCommand_1.default {
+    get name() {
+        return commands_1.default.SERVICEPRINCIPAL_GET;
+    }
+    get description() {
+        return 'Retrieves a service principal from Azure AD directory';
+    }
+    getTelemetryProperties(args) {
+        const telemetryProps = super.getTelemetryProperties(args);
+        telemetryProps.id = typeof args.options.id !== 'undefined';
+        telemetryProps.appId = typeof args.options.appId !== 'undefined';
+        telemetryProps.name = typeof args.options.name !== 'undefined';
+        return telemetryProps;
+    }
+    getServicePrincipalId(args) {
+        if (args.options.id) {
+            return Promise.resolve(args.options.id);
+        }
+        let requestURL = '';
+        if (args.options.appId) {
+            requestURL = `${this.resource}/v1.0/serviceprincipals?$filter=appId eq '${encodeURIComponent(args.options.appId)}'&$select=id`;
+        }
+        else {
+            requestURL = `${this.resource}/v1.0/serviceprincipals?$filter=displayName eq '${encodeURIComponent(args.options.name)}'&$select=id`;
+        }
+        const requestOptions = {
+            url: requestURL,
+            headers: {
+                accept: 'application/json;odata.metadata=none',
+                ConsistencyLevel: 'eventual'
+            },
+            responseType: 'json'
+        };
+        return request_1.default
+            .get(requestOptions)
+            .then(response => {
+            const servicePrincipalItem = response.value[0];
+            if (!servicePrincipalItem) {
+                return Promise.reject(`The specified service principal doesn't exist in Azure AD`);
+            }
+            if (response.value.length > 1 && args.options.name) {
+                return Promise.reject(`Multiple service principals with name ${args.options.name} found: ${response.value.map(x => x.id)}`);
+            }
+            if (response.value.length > 1 && args.options.appId) {
+                return Promise.reject(`Multiple service principals with appId ${args.options.appId} found: ${response.value.map(x => x.id)}`);
+            }
+            return Promise.resolve(servicePrincipalItem.id);
+        });
+    }
+    commandAction(logger, args, cb) {
+        this
+            .getServicePrincipalId(args)
+            .then((servicePrincipalId) => {
+            const requestOptions = {
+                url: `${this.resource}/v1.0/serviceprincipals/${encodeURIComponent(servicePrincipalId)}`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none',
+                    ConsistencyLevel: 'eventual'
+                },
+                responseType: 'json'
+            };
+            return request_1.default.get(requestOptions);
+        })
+            .then((res) => {
+            logger.log(res);
+            cb();
+        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    }
+    options() {
+        const options = [
+            {
+                option: '-i, --id [id]'
+            },
+            {
+                option: '--appId [appId]'
+            },
+            {
+                option: '--n, --name [name]'
+            }
+        ];
+        const parentOptions = super.options();
+        return options.concat(parentOptions);
+    }
+    validate(args) {
+        if (args.options.id && args.options.appId && args.options.name) {
+            return 'Specify either id, appId or name, but not all.';
+        }
+        if (args.options.id && args.options.appId) {
+            return 'Specify either id or appId, but not both.';
+        }
+        if (args.options.appId && args.options.name) {
+            return 'Specify either appId or name, but not both.';
+        }
+        if (args.options.name && args.options.id) {
+            return 'Specify either id or name, but not both.';
+        }
+        if (!args.options.id && !args.options.appId && !args.options.name) {
+            return 'Specify id, appId or name, one is required';
+        }
+        if (args.options.id && !Utils_1.default.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
+        }
+        if (args.options.appId && !Utils_1.default.isValidGuid(args.options.appId)) {
+            return `${args.options.appId} is not a valid GUID`;
+        }
+        return true;
+    }
+}
+module.exports = new AadServicePrincipalGetCommand();
+//# sourceMappingURL=serviceprincipal-get.js.map

package/dist/m365/aad/commands/siteclassification/siteclassification-enable.js

@@ -19,7 +19,7 @@ class AadSiteClassificationEnableCommand extends GraphCommand_1.default {
     }
     commandAction(logger, args, cb) {
         const requestOptions = {
-            url: `${this.resource}/beta/directorySettingTemplates`,
+            url: `${this.resource}/v1.0/groupSettingTemplates`,
             headers: {
                 accept: 'application/json;odata.metadata=none'
             },
@@ -88,7 +88,7 @@ class AadSiteClassificationEnableCommand extends GraphCommand_1.default {
                 }
             });
             const requestOptions = {
-                url: `${this.resource}/beta/settings`,
+                url: `${this.resource}/v1.0/groupSettings`,
                 headers: {
                     accept: 'application/json;odata.metadata=none',
                     'content-type': 'application/json'

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

@@ -14,7 +14,7 @@ class AadSiteClassificationGetCommand extends GraphCommand_1.default {
     }
     commandAction(logger, args, cb) {
         const requestOptions = {
-            url: `${this.resource}/beta/settings`,
+            url: `${this.resource}/v1.0/groupSettings`,
             headers: {
                 accept: 'application/json;odata.metadata=none'
             },

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

@@ -21,7 +21,7 @@ class AadSiteClassificationSetCommand extends GraphCommand_1.default {
     }
     commandAction(logger, args, cb) {
         const requestOptions = {
-            url: `${this.resource}/beta/settings`,
+            url: `${this.resource}/v1.0/groupSettings`,
             headers: {
                 accept: 'application/json;odata.metadata=none'
             },
@@ -105,7 +105,7 @@ class AadSiteClassificationSetCommand extends GraphCommand_1.default {
                 }
             });
             const requestOptions = {
-                url: `${this.resource}/beta/settings/${unifiedGroupSetting[0].id}`,
+                url: `${this.resource}/v1.0/groupSettings/${unifiedGroupSetting[0].id}`,
                 headers: {
                     accept: 'application/json;odata.metadata=none',
                     'content-type': 'application/json'

package/dist/m365/aad/commands.js

@@ -22,6 +22,7 @@ exports.default = {
     O365GROUP_LIST: `${prefix} o365group list`,
     O365GROUP_RECYCLEBINITEM_CLEAR: `${prefix} o365group recyclebinitem clear`,
     O365GROUP_RECYCLEBINITEM_LIST: `${prefix} o365group recyclebinitem list`,
+    O365GROUP_RECYCLEBINITEM_RESTORE: `${prefix} o365group recyclebinitem restore`,
     O365GROUP_SET: `${prefix} o365group set`,
     O365GROUP_TEAMIFY: `${prefix} o365group teamify`,
     O365GROUP_REMOVE: `${prefix} o365group remove`,
@@ -41,6 +42,7 @@ exports.default = {
     OAUTH2GRANT_REMOVE: `${prefix} oauth2grant remove`,
     OAUTH2GRANT_SET: `${prefix} oauth2grant set`,
     POLICY_LIST: `${prefix} policy list`,
+    SERVICEPRINCIPAL_GET: `${prefix} serviceprincipal get`,
     SITECLASSIFICATION_DISABLE: `${prefix} siteclassification disable`,
     SITECLASSIFICATION_ENABLE: `${prefix} siteclassification enable`,
     SITECLASSIFICATION_GET: `${prefix} siteclassification get`,

package/dist/m365/pa/commands/connector/connector-export.js

@@ -80,7 +80,7 @@ class PaConnectorExportCommand extends AzmgmtCommand_1.default {
                     .get({
                     url: connector.properties.apiDefinitions.originalSwaggerUrl,
                     headers: {
-                        'x-anonymous': true
+                        'x-anonymous': 'true'
                     }
                 });
             }
@@ -111,7 +111,7 @@ class PaConnectorExportCommand extends AzmgmtCommand_1.default {
                     url: connector.properties.iconUri,
                     responseType: 'arraybuffer',
                     headers: {
-                        'x-anonymous': true
+                        'x-anonymous': 'true'
                     }
                 });
             }

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Utils = void 0;
 const fs = require("fs");
 const path = require("path");
-const stripJsonComments = require('strip-json-comments');
+const stripJsonComments = require("strip-json-comments");
 class Utils {
     static removeSingleLineComments(s) {
         return stripJsonComments(s);

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

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FN002017_DEVDEP_microsoft_rush_stack_compiler_3_7 = void 0;
 const DependencyRule_1 = require("./DependencyRule");
 class FN002017_DEVDEP_microsoft_rush_stack_compiler_3_7 extends DependencyRule_1.DependencyRule {
-    constructor(packageVersion) {
-        super('@microsoft/rush-stack-compiler-3.7', packageVersion, true);
+    constructor(packageVersion, add = true) {
+        super('@microsoft/rush-stack-compiler-3.7', packageVersion, true, false, add);
     }
     get id() {
         return 'FN002017';

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

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FN002018_DEVDEP_microsoft_rush_stack_compiler_3_9 = void 0;
+const DependencyRule_1 = require("./DependencyRule");
+class FN002018_DEVDEP_microsoft_rush_stack_compiler_3_9 extends DependencyRule_1.DependencyRule {
+    constructor(packageVersion) {
+        super('@microsoft/rush-stack-compiler-3.9', packageVersion, true);
+    }
+    get id() {
+        return 'FN002018';
+    }
+    get supersedes() {
+        return ['FN002010', 'FN002011', 'FN002012', 'FN002017'];
+    }
+}
+exports.FN002018_DEVDEP_microsoft_rush_stack_compiler_3_9 = FN002018_DEVDEP_microsoft_rush_stack_compiler_3_9;
+//# sourceMappingURL=FN002018_DEVDEP_microsoft_rush_stack_compiler_3_9.js.map

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

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FN015007_FILE_config_copy_assets_json = void 0;
+const FileAddRemoveRule_1 = require("./FileAddRemoveRule");
+class FN015007_FILE_config_copy_assets_json extends FileAddRemoveRule_1.FileAddRemoveRule {
+    constructor(add) {
+        super('./config/copy-assets.json', add);
+    }
+    get id() {
+        return 'FN015007';
+    }
+    get supersedes() {
+        return ['FN004001', 'FN004002'];
+    }
+}
+exports.FN015007_FILE_config_copy_assets_json = FN015007_FILE_config_copy_assets_json;
+//# sourceMappingURL=FN015007_FILE_config_copy_assets_json.js.map

package/dist/m365/spfx/commands/project/project-upgrade/{upgrade-1.13.0-beta.20.js → upgrade-1.13.0-rc.1.js}

@@ -4,11 +4,14 @@ const FN001001_DEP_microsoft_sp_core_library_1 = require("./rules/FN001001_DEP_m
 const FN001002_DEP_microsoft_sp_lodash_subset_1 = require("./rules/FN001002_DEP_microsoft_sp_lodash_subset");
 const FN001003_DEP_microsoft_sp_office_ui_fabric_core_1 = require("./rules/FN001003_DEP_microsoft_sp_office_ui_fabric_core");
 const FN001004_DEP_microsoft_sp_webpart_base_1 = require("./rules/FN001004_DEP_microsoft_sp_webpart_base");
+const FN001008_DEP_react_1 = require("./rules/FN001008_DEP_react");
+const FN001009_DEP_react_dom_1 = require("./rules/FN001009_DEP_react_dom");
 const FN001011_DEP_microsoft_sp_dialog_1 = require("./rules/FN001011_DEP_microsoft_sp_dialog");
 const FN001012_DEP_microsoft_sp_application_base_1 = require("./rules/FN001012_DEP_microsoft_sp_application_base");
 const FN001013_DEP_microsoft_decorators_1 = require("./rules/FN001013_DEP_microsoft_decorators");
 const FN001014_DEP_microsoft_sp_listview_extensibility_1 = require("./rules/FN001014_DEP_microsoft_sp_listview_extensibility");
 const FN001021_DEP_microsoft_sp_property_pane_1 = require("./rules/FN001021_DEP_microsoft_sp_property_pane");
+const FN001022_DEP_office_ui_fabric_react_1 = require("./rules/FN001022_DEP_office_ui_fabric_react");
 const FN001023_DEP_microsoft_sp_component_base_1 = require("./rules/FN001023_DEP_microsoft_sp_component_base");
 const FN001024_DEP_microsoft_sp_diagnostics_1 = require("./rules/FN001024_DEP_microsoft_sp_diagnostics");
 const FN001025_DEP_microsoft_sp_dynamic_data_1 = require("./rules/FN001025_DEP_microsoft_sp_dynamic_data");
@@ -23,41 +26,56 @@ const FN002001_DEVDEP_microsoft_sp_build_web_1 = require("./rules/FN002001_DEVDE
 const FN002002_DEVDEP_microsoft_sp_module_interfaces_1 = require("./rules/FN002002_DEVDEP_microsoft_sp_module_interfaces");
 const FN002003_DEVDEP_microsoft_sp_webpart_workbench_1 = require("./rules/FN002003_DEVDEP_microsoft_sp_webpart_workbench");
 const FN002009_DEVDEP_microsoft_sp_tslint_rules_1 = require("./rules/FN002009_DEVDEP_microsoft_sp_tslint_rules");
+const FN002015_DEVDEP_types_react_1 = require("./rules/FN002015_DEVDEP_types_react");
+const FN002017_DEVDEP_microsoft_rush_stack_compiler_3_7_1 = require("./rules/FN002017_DEVDEP_microsoft_rush_stack_compiler_3_7");
+const FN002018_DEVDEP_microsoft_rush_stack_compiler_3_9_1 = require("./rules/FN002018_DEVDEP_microsoft_rush_stack_compiler_3_9");
 const FN006004_CFG_PS_developer_1 = require("./rules/FN006004_CFG_PS_developer");
 const FN007002_CFG_S_initialPage_1 = require("./rules/FN007002_CFG_S_initialPage");
 const FN007003_CFG_S_api_1 = require("./rules/FN007003_CFG_S_api");
+const FN008002_CFG_TSL_removeRule_1 = require("./rules/FN008002_CFG_TSL_removeRule");
 const FN010001_YORC_version_1 = require("./rules/FN010001_YORC_version");
+const FN012017_TSC_extends_1 = require("./rules/FN012017_TSC_extends");
 const FN014007_CODE_launch_localWorkbench_1 = require("./rules/FN014007_CODE_launch_localWorkbench");
+const FN015007_FILE_config_copy_assets_json_1 = require("./rules/FN015007_FILE_config_copy_assets_json");
 const FN024001_NPMIGNORE_file_1 = require("./rules/FN024001_NPMIGNORE_file");
 module.exports = [
-    new FN001001_DEP_microsoft_sp_core_library_1.FN001001_DEP_microsoft_sp_core_library('1.13.0-beta.20'),
-    new FN001002_DEP_microsoft_sp_lodash_subset_1.FN001002_DEP_microsoft_sp_lodash_subset('1.13.0-beta.20'),
-    new FN001003_DEP_microsoft_sp_office_ui_fabric_core_1.FN001003_DEP_microsoft_sp_office_ui_fabric_core('1.13.0-beta.20'),
-    new FN001004_DEP_microsoft_sp_webpart_base_1.FN001004_DEP_microsoft_sp_webpart_base('1.13.0-beta.20'),
-    new FN001011_DEP_microsoft_sp_dialog_1.FN001011_DEP_microsoft_sp_dialog('1.13.0-beta.20'),
-    new FN001012_DEP_microsoft_sp_application_base_1.FN001012_DEP_microsoft_sp_application_base('1.13.0-beta.20'),
-    new FN001013_DEP_microsoft_decorators_1.FN001013_DEP_microsoft_decorators('1.13.0-beta.20'),
-    new FN001014_DEP_microsoft_sp_listview_extensibility_1.FN001014_DEP_microsoft_sp_listview_extensibility('1.13.0-beta.20'),
-    new FN001021_DEP_microsoft_sp_property_pane_1.FN001021_DEP_microsoft_sp_property_pane('1.13.0-beta.20'),
-    new FN001023_DEP_microsoft_sp_component_base_1.FN001023_DEP_microsoft_sp_component_base('1.13.0-beta.20'),
-    new FN001024_DEP_microsoft_sp_diagnostics_1.FN001024_DEP_microsoft_sp_diagnostics('1.13.0-beta.20'),
-    new FN001025_DEP_microsoft_sp_dynamic_data_1.FN001025_DEP_microsoft_sp_dynamic_data('1.13.0-beta.20'),
-    new FN001026_DEP_microsoft_sp_extension_base_1.FN001026_DEP_microsoft_sp_extension_base('1.13.0-beta.20'),
-    new FN001027_DEP_microsoft_sp_http_1.FN001027_DEP_microsoft_sp_http('1.13.0-beta.20'),
-    new FN001028_DEP_microsoft_sp_list_subscription_1.FN001028_DEP_microsoft_sp_list_subscription('1.13.0-beta.20'),
-    new FN001029_DEP_microsoft_sp_loader_1.FN001029_DEP_microsoft_sp_loader('1.13.0-beta.20'),
-    new FN001030_DEP_microsoft_sp_module_interfaces_1.FN001030_DEP_microsoft_sp_module_interfaces('1.13.0-beta.20'),
-    new FN001031_DEP_microsoft_sp_odata_types_1.FN001031_DEP_microsoft_sp_odata_types('1.13.0-beta.20'),
-    new FN001032_DEP_microsoft_sp_page_context_1.FN001032_DEP_microsoft_sp_page_context('1.13.0-beta.20'),
-    new FN002001_DEVDEP_microsoft_sp_build_web_1.FN002001_DEVDEP_microsoft_sp_build_web('1.13.0-beta.20'),
-    new FN002002_DEVDEP_microsoft_sp_module_interfaces_1.FN002002_DEVDEP_microsoft_sp_module_interfaces('1.13.0-beta.20'),
+    new FN001001_DEP_microsoft_sp_core_library_1.FN001001_DEP_microsoft_sp_core_library('1.13.0-rc.1'),
+    new FN001002_DEP_microsoft_sp_lodash_subset_1.FN001002_DEP_microsoft_sp_lodash_subset('1.13.0-rc.1'),
+    new FN001003_DEP_microsoft_sp_office_ui_fabric_core_1.FN001003_DEP_microsoft_sp_office_ui_fabric_core('1.13.0-rc.1'),
+    new FN001004_DEP_microsoft_sp_webpart_base_1.FN001004_DEP_microsoft_sp_webpart_base('1.13.0-rc.1'),
+    new FN001008_DEP_react_1.FN001008_DEP_react('16.13.1'),
+    new FN001009_DEP_react_dom_1.FN001009_DEP_react_dom('16.13.1'),
+    new FN001011_DEP_microsoft_sp_dialog_1.FN001011_DEP_microsoft_sp_dialog('1.13.0-rc.1'),
+    new FN001012_DEP_microsoft_sp_application_base_1.FN001012_DEP_microsoft_sp_application_base('1.13.0-rc.1'),
+    new FN001013_DEP_microsoft_decorators_1.FN001013_DEP_microsoft_decorators('1.13.0-rc.1'),
+    new FN001014_DEP_microsoft_sp_listview_extensibility_1.FN001014_DEP_microsoft_sp_listview_extensibility('1.13.0-rc.1'),
+    new FN001021_DEP_microsoft_sp_property_pane_1.FN001021_DEP_microsoft_sp_property_pane('1.13.0-rc.1'),
+    new FN001022_DEP_office_ui_fabric_react_1.FN001022_DEP_office_ui_fabric_react('7.174.1'),
+    new FN001023_DEP_microsoft_sp_component_base_1.FN001023_DEP_microsoft_sp_component_base('1.13.0-rc.1'),
+    new FN001024_DEP_microsoft_sp_diagnostics_1.FN001024_DEP_microsoft_sp_diagnostics('1.13.0-rc.1'),
+    new FN001025_DEP_microsoft_sp_dynamic_data_1.FN001025_DEP_microsoft_sp_dynamic_data('1.13.0-rc.1'),
+    new FN001026_DEP_microsoft_sp_extension_base_1.FN001026_DEP_microsoft_sp_extension_base('1.13.0-rc.1'),
+    new FN001027_DEP_microsoft_sp_http_1.FN001027_DEP_microsoft_sp_http('1.13.0-rc.1'),
+    new FN001028_DEP_microsoft_sp_list_subscription_1.FN001028_DEP_microsoft_sp_list_subscription('1.13.0-rc.1'),
+    new FN001029_DEP_microsoft_sp_loader_1.FN001029_DEP_microsoft_sp_loader('1.13.0-rc.1'),
+    new FN001030_DEP_microsoft_sp_module_interfaces_1.FN001030_DEP_microsoft_sp_module_interfaces('1.13.0-rc.1'),
+    new FN001031_DEP_microsoft_sp_odata_types_1.FN001031_DEP_microsoft_sp_odata_types('1.13.0-rc.1'),
+    new FN001032_DEP_microsoft_sp_page_context_1.FN001032_DEP_microsoft_sp_page_context('1.13.0-rc.1'),
+    new FN002001_DEVDEP_microsoft_sp_build_web_1.FN002001_DEVDEP_microsoft_sp_build_web('1.13.0-rc.1'),
+    new FN002002_DEVDEP_microsoft_sp_module_interfaces_1.FN002002_DEVDEP_microsoft_sp_module_interfaces('1.13.0-rc.1'),
     new FN002003_DEVDEP_microsoft_sp_webpart_workbench_1.FN002003_DEVDEP_microsoft_sp_webpart_workbench('', false),
-    new FN002009_DEVDEP_microsoft_sp_tslint_rules_1.FN002009_DEVDEP_microsoft_sp_tslint_rules('1.13.0-beta.20'),
-    new FN006004_CFG_PS_developer_1.FN006004_CFG_PS_developer('1.13.0-beta.20'),
+    new FN002009_DEVDEP_microsoft_sp_tslint_rules_1.FN002009_DEVDEP_microsoft_sp_tslint_rules('1.13.0-rc.1'),
+    new FN002015_DEVDEP_types_react_1.FN002015_DEVDEP_types_react('16.9.51'),
+    new FN002017_DEVDEP_microsoft_rush_stack_compiler_3_7_1.FN002017_DEVDEP_microsoft_rush_stack_compiler_3_7('', false),
+    new FN002018_DEVDEP_microsoft_rush_stack_compiler_3_9_1.FN002018_DEVDEP_microsoft_rush_stack_compiler_3_9('0.4.47'),
+    new FN006004_CFG_PS_developer_1.FN006004_CFG_PS_developer('1.13.0-rc.1'),
     new FN007002_CFG_S_initialPage_1.FN007002_CFG_S_initialPage('https://enter-your-SharePoint-site/_layouts/workbench.aspx'),
     new FN007003_CFG_S_api_1.FN007003_CFG_S_api(),
-    new FN010001_YORC_version_1.FN010001_YORC_version('1.13.0-beta.20'),
+    new FN008002_CFG_TSL_removeRule_1.FN008002_CFG_TSL_removeRule('no-use-before-declare'),
+    new FN010001_YORC_version_1.FN010001_YORC_version('1.13.0-rc.1'),
+    new FN012017_TSC_extends_1.FN012017_TSC_extends('./node_modules/@microsoft/rush-stack-compiler-3.9/includes/tsconfig-web.json'),
     new FN014007_CODE_launch_localWorkbench_1.FN014007_CODE_launch_localWorkbench(),
+    new FN015007_FILE_config_copy_assets_json_1.FN015007_FILE_config_copy_assets_json(false),
     new FN024001_NPMIGNORE_file_1.FN024001_NPMIGNORE_file()
 ];
-//# sourceMappingURL=upgrade-1.13.0-beta.20.js.map
+//# sourceMappingURL=upgrade-1.13.0-rc.1.js.map

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

@@ -43,7 +43,7 @@ class SpfxProjectUpgradeCommand extends base_project_command_1.BaseProjectComman
             '1.11.0',
             '1.12.0',
             '1.12.1',
-            '1.13.0-beta.20'
+            '1.13.0-rc.1'
         ];
     }
     get name() {

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

@@ -1,11 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const cli_1 = require("../../../../cli");
 const Command_1 = require("../../../../Command");
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
 const Utils_1 = require("../../../../Utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
+const SpoContentTypeGetCommand = require("./contenttype-get");
 class SpoContentTypeAddCommand extends SpoCommand_1.default {
     get name() {
         return commands_1.default.CONTENTTYPE_ADD;
@@ -52,7 +54,25 @@ class SpoContentTypeAddCommand extends SpoCommand_1.default {
                 cb(new Command_1.CommandError(response.ErrorInfo.ErrorMessage));
                 return;
             }
-            cb();
+            const options = {
+                webUrl: args.options.webUrl,
+                listTitle: args.options.listTitle,
+                id: args.options.id,
+                output: 'json',
+                debug: this.debug,
+                verbose: this.verbose
+            };
+            cli_1.Cli.executeCommandWithOutput(SpoContentTypeGetCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) })
+                .then((res) => {
+                if (this.debug) {
+                    logger.logToStderr(res.stderr);
+                }
+                logger.log(JSON.parse(res.stdout));
+                cb();
+            }, (err) => {
+                cb(err.error);
+            });
+            return;
         }, (err) => this.handleRejectedPromise(err, logger, cb));
     }
     getParentInfo(listTitle, webUrl, logger) {

package/dist/m365/teams/commands/user/user-app-list.js

@@ -23,7 +23,7 @@ class TeamsUserAppListCommand extends GraphItemsListCommand_1.GraphItemsListComm
             .getUserId(args)
             .then((_userId) => {
             userId = _userId.value;
-            const endpoint = `${this.resource}/v1.0/users/${encodeURIComponent(userId)}/teamwork/installedApps`;
+            const endpoint = `${this.resource}/v1.0/users/${encodeURIComponent(userId)}/teamwork/installedApps?$expand=teamsAppDefinition`;
             return this.getAllItems(endpoint, logger, true);
         })
             .then(() => {
@@ -39,7 +39,9 @@ class TeamsUserAppListCommand extends GraphItemsListCommand_1.GraphItemsListComm
                 logger.log(this.items.map(i => {
                     return {
                         id: i.id,
-                        appId: i.appId
+                        appId: i.appId,
+                        displayName: i.teamsAppDefinition.displayName,
+                        version: i.teamsAppDefinition.version
                     };
                 }));
             }
@@ -62,10 +64,10 @@ class TeamsUserAppListCommand extends GraphItemsListCommand_1.GraphItemsListComm
     options() {
         const options = [
             {
-                option: '--userId'
+                option: '--userId [userId]'
             },
             {
-                option: '--userName'
+                option: '--userName [userName]'
             }
         ];
         const parentOptions = super.options();
@@ -73,10 +75,10 @@ class TeamsUserAppListCommand extends GraphItemsListCommand_1.GraphItemsListComm
     }
     validate(args) {
         if (!args.options.userId && !args.options.userName) {
-            return `--userId or --userName need to be provided`;
+            return `userId or userName need to be provided`;
         }
         if (args.options.userId && args.options.userName) {
-            return `Please specify either --userId or --userName, not both`;
+            return `Please specify either userId or userName, not both`;
         }
         if (args.options.userId && !Utils_1.default.isValidGuid(args.options.userId)) {
             return `${args.options.userId} is not a valid GUID`;

package/docs/docs/cmd/aad/o365group/{o365group-restore.md → o365group-recyclebinitem-restore.md}

@@ -4,6 +4,12 @@ Restores a deleted Microsoft 365 Group
 
 ## Usage
 
+```sh
+m365 aad o365group recyclebinitem restore [options]
+```
+
+## Alias
+
 ```sh
 m365 aad o365group restore [options]
 ```
@@ -20,5 +26,5 @@ m365 aad o365group restore [options]
 Restores the Microsoft 365 Group with id _28beab62-7540-4db1-a23f-29a6018a3848_
 
 ```sh
-m365 aad o365group restore --id 28beab62-7540-4db1-a23f-29a6018a3848
+m365 aad o365group recyclebinitem restore --id 28beab62-7540-4db1-a23f-29a6018a3848
 ```

package/docs/docs/cmd/aad/o365group/o365group-teamify.md

@@ -10,15 +10,24 @@ m365 aad o365group teamify [options]
 
 ## Options
 
-`-i, --groupId <groupId>`
-: The ID of the Microsoft 365 Group to connect to Microsoft Teams
+`-i, --groupId [groupId]`
+: The ID of the Microsoft 365 Group to connect to Microsoft Teams. Specify either groupId or mailNickname but not both
+
+`--mailNickname [mailNickname]`
+: The mail alias of the Microsoft 365 Group to connect to Microsoft Teams. Specify either groupId or mailNickname but not both
 
 --8<-- "docs/cmd/_global.md"
 
 ## Examples
 
-Creates a new Microsoft Teams team under existing Microsoft 365 group
+Creates a new Microsoft Teams team under existing Microsoft 365 group with id _e3f60f99-0bad-481f-9e9f-ff0f572fbd03_
 
 ```sh
 m365 aad o365group teamify --groupId e3f60f99-0bad-481f-9e9f-ff0f572fbd03
+```
+
+Creates a new Microsoft Teams team under existing Microsoft 365 group with mailNickname _GroupName_
+
+```sh
+m365 aad o365group teamify --mailNickname GroupName
 ```