Merge pull request Azure#11166 from dingmeng-xue/fix-resources

Fix resources issues

Author: wyunchi-ms

src/Resources/Resources/ActiveDirectory/Cmdlets/RemoveAzureADGroupCommand.cs

@@ -13,8 +13,6 @@
 // ----------------------------------------------------------------------------------
 
 using Microsoft.WindowsAzure.Commands.Utilities.Common;
-using System;
-using System.Linq;
 using System.Management.Automation;
 using ProjectResources = Microsoft.Azure.Commands.Resources.Properties.Resources;
 
@@ -36,10 +34,10 @@ public class RemoveAzureADGroupCommand : ActiveDirectoryBaseCmdlet
         [ValidateNotNullOrEmpty]
         public PSADGroup InputObject { get; set; }
 
-        [Parameter(Mandatory = true)]
+        [Parameter(Mandatory = false)]
         public SwitchParameter PassThru { get; set; }
 
-        [Parameter(Mandatory = true)]
+        [Parameter(Mandatory = false)]
         public SwitchParameter Force { get; set; }
 
         public override void ExecuteCmdlet()

src/Resources/Resources/ActiveDirectory/Models/ActiveDirectoryClientExtensions.cs

@@ -60,7 +60,9 @@ public static PSADObject ToPSADObject(this AADObject obj)
                     Id = obj.ObjectId,
                     Type = obj.ObjectType,
                     SecurityEnabled = obj.SecurityEnabled,
-                    MailNickname = !string.IsNullOrEmpty(obj.Mail) ? obj.Mail : obj.AdditionalProperties.ContainsKey("mailNickname") ? obj.AdditionalProperties["mailNickname"]?.ToString() : null,
+                    MailNickname = !string.IsNullOrEmpty(obj.Mail) ? obj.Mail :
+                        !string.IsNullOrEmpty(obj.MailNickname) ? obj.MailNickname :
+                        obj.AdditionalProperties.ContainsKey("mailNickname") ? obj.AdditionalProperties["mailNickname"]?.ToString() : null,
                     Description = obj.AdditionalProperties.ContainsKey("description") ? obj.AdditionalProperties["description"]?.ToString() : null
                 };
             }

src/Resources/Resources/ChangeLog.md

@@ -18,6 +18,9 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Fixed for null reference bug in `Get-AzRoleAssignment`
+* Marked switch `-Force` and `-PassThru` optional in `Remove-AzADGroup` (#10849)
+* Fixed issue that `MailNickname` doesn't return in `Remove-AzADGroup` (#11167)
 * Fix for null reference bug in GetAzureRoleAssignmentCommand
 * Add breaking change attributes for upcoming changes to policy cmdlets
 * Updated `Get-AzResourceGroup` to perform resource group tag filtering on server-side

src/Resources/Resources/help/Remove-AzADGroup.md

@@ -91,7 +91,7 @@ Type: System.Management.Automation.SwitchParameter
 Parameter Sets: (All)
 Aliases:
 
-Required: True
+Required: False
 Position: Named
 Default value: None
 Accept pipeline input: False
@@ -136,7 +136,7 @@ Type: System.Management.Automation.SwitchParameter
 Parameter Sets: (All)
 Aliases:
 
-Required: True
+Required: False
 Position: Named
 Default value: None
 Accept pipeline input: False