merged conflicts

CHANGELOG.md

@@ -10,7 +10,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 ### Added
 - Added Set-PnPKnowledgeHubSite, Get-PnPKnowledgeHubSite and Remove-PnPKnowledgeHubSite cmdlets
 - Added Register-PnPTenantAppCatalog to create and register a new Tenant App Catalog
-- Added `-FolderServerRelativeUrl` argument to `Get-PnPListItem` to allow for retrieval of only those list items located in a specific folder inside a list [PR #2546](https://github.com/SharePoint/PnP-PowerShell/pull/2546)
+- Added `IncludeHasTeam` flag to `Get-PnPUnifiedGroup` to include a `HasTeam` flag for each returned Office 365 Group indicating if a Microsoft Team has been set up for it [PR #2612](https://github.com/SharePoint/PnP-PowerShell/pull/2612)
 
 ### Changed
 - Connect-PnPOnline with clientid and certificate will now, if API permissions have been granted for the Graph work with the PnP Graph Cmdlets. [PR # 2515](https://github.com/SharePoint/PnP-PowerShell/pull/2515)

Commands/Graph/GetUnifiedGroup.cs

@@ -32,6 +32,10 @@ namespace SharePointPnP.PowerShell.Commands.Graph
        Code = "PS:> Get-PnPUnifiedGroup -Identity $group",
        Remarks = "Retrieves a specific Office 365 Group based on its object instance",
        SortOrder = 5)]
+    [CmdletExample(
+       Code = "PS:> Get-PnPUnifiedGroup -IncludeIfHasTeam",
+       Remarks = "Retrieves all the Office 365 Groups and checks for each of them if it has a Microsoft Team provisioned for it",
+       SortOrder = 6)]
     public class GetUnifiedGroup : PnPGraphCmdlet
     {
         [Parameter(Mandatory = false, HelpMessage = "The Identity of the Office 365 Group.")]
@@ -43,6 +47,9 @@ public class GetUnifiedGroup : PnPGraphCmdlet
         [Parameter(Mandatory = false, HelpMessage = "Include Classification value of Office 365 Groups.")]
         public SwitchParameter IncludeClassification;
 
+        [Parameter(Mandatory = false, HelpMessage = "Include a flag for every Office 365 Group if it has a Microsoft Team provisioned for it. This will slow down the retrieval of Office 365 Groups so only use it if you need it.")]
+        public SwitchParameter IncludeHasTeam;
+
         protected override void ExecuteCmdlet()
         {
             UnifiedGroupEntity group = null;
@@ -55,7 +62,7 @@ protected override void ExecuteCmdlet()
             else
             {
                 // Retrieve all the groups
-                groups = UnifiedGroupsUtility.ListUnifiedGroups(AccessToken, includeSite: !ExcludeSiteUrl.IsPresent, includeClassification:IncludeClassification.IsPresent);
+                groups = UnifiedGroupsUtility.ListUnifiedGroups(AccessToken, includeSite: !ExcludeSiteUrl.IsPresent, includeClassification:IncludeClassification.IsPresent, includeHasTeam: IncludeHasTeam.IsPresent);
             }
 
             if (group != null)