Resolve some review comments

1. Revert version back to 0.8.4
2. For resource group uses the right method to list with paging.

Author: felixwa

src/ResourceManager/CognitiveServices/ChangeLog.md

@@ -18,8 +18,6 @@
         - Additional information about change #1
 -->
 ## Current Release
-
-## Version 0.8.5
 * Integrate with Cognitive Services Management SDK version 2.0.0.
 * Get-AzureRmCognitiveServicesAccount now can correctly support paging.
 

src/ResourceManager/CognitiveServices/Commands.Management.CognitiveServices/CognitiveServicesAccount/GetAzureCognitiveServicesAccount.cs

@@ -63,13 +63,13 @@ public override void ExecuteCmdlet()
             {
                 if (string.IsNullOrEmpty(this.ResourceGroupName))
                 {
-                    var cognitiveServicesAccounts = GetWithPaging(this.CognitiveServicesClient.Accounts.List());
+                    var cognitiveServicesAccounts = GetWithPaging(this.CognitiveServicesClient.Accounts.List(), false);
 
                     WriteCognitiveServicesAccountList(cognitiveServicesAccounts);
                 }
                 else if (string.IsNullOrEmpty(this.Name))
                 {
-                    var cognitiveServicesAccounts = GetWithPaging(this.CognitiveServicesClient.Accounts.ListByResourceGroup(this.ResourceGroupName));
+                    var cognitiveServicesAccounts = GetWithPaging(this.CognitiveServicesClient.Accounts.ListByResourceGroup(this.ResourceGroupName), true);
                     if (cognitiveServicesAccounts == null)
                     {
                         WriteWarningWithTimestamp("Received empty accounts list");
@@ -87,13 +87,21 @@ public override void ExecuteCmdlet()
             });
         }
 
-        private IEnumerable<CognitiveServicesAccount> GetWithPaging(IPage<CognitiveServicesAccount> firstPage)
+        private IEnumerable<CognitiveServicesAccount> GetWithPaging(IPage<CognitiveServicesAccount> firstPage, bool isResourceGroup)
         {
             var cognitiveServicesAccounts = new List<CognitiveServicesAccount>(firstPage);
             IPage<CognitiveServicesAccount> nextPage = null;
             for (var nextLink = firstPage.NextPageLink; !string.IsNullOrEmpty(nextLink); nextLink = nextPage.NextPageLink)
             {
-                nextPage = this.CognitiveServicesClient.Accounts.ListNext(nextLink);
+                if (isResourceGroup)
+                {
+                    nextPage = this.CognitiveServicesClient.Accounts.ListByResourceGroupNext(nextLink);
+                }
+                else
+                {
+                    nextPage = this.CognitiveServicesClient.Accounts.ListNext(nextLink);
+                }
+
                 cognitiveServicesAccounts.AddRange(nextPage);
             }
 

src/ResourceManager/CognitiveServices/Commands.Management.CognitiveServices/Properties/AssemblyInfo.cs

@@ -46,5 +46,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("0.8.5")]
-[assembly: AssemblyFileVersion("0.8.5")]
+[assembly: AssemblyVersion("0.8.4")]
+[assembly: AssemblyFileVersion("0.8.4")]