Merge pull request #1541 from microsoftgraph/po/PagingImprovements

Paging Improvements

Author: timayabi2020

tools/Custom/ListCmdlet.cs

@@ -98,7 +98,7 @@ public void InitializeCmdlet(ref global::System.Management.Automation.Invocation
 
             if (invocationInfo.BoundParameters.ContainsKey("Top"))
             {
-                if ((top > MaxPageSize) || invocationInfo.BoundParameters.ContainsKey("All") || invocationInfo.BoundParameters.ContainsKey("PageSize"))
+                if ((top > MaxPageSize) || IsAllPresent(invocationInfo.BoundParameters) || invocationInfo.BoundParameters.ContainsKey("PageSize"))
                 {
                     limit = top;
                 }
@@ -116,6 +116,11 @@ public void InitializeCmdlet(ref global::System.Management.Automation.Invocation
                     top = PageSize;
                 }
             }
+            else if (invocationInfo.BoundParameters.ContainsKey("PageSize"))
+            {
+                invocationInfo.BoundParameters["Top"] = PageSize;
+                top = PageSize;
+            }
 
             if ((!invocationInfo.BoundParameters.ContainsKey("Count")) && invocationInfo.BoundParameters.ContainsKey("CountVariable"))
             {
@@ -146,7 +151,7 @@ public bool ShouldIteratePages(global::System.Collections.Generic.Dictionary<str
             iteratedPages++;
             totalFetchedItems += itemsCount;
 
-            return (boundParameters.ContainsKey("All") && limit == default) || totalFetchedItems < limit;
+            return (IsAllPresent(boundParameters) && limit == default) || totalFetchedItems < limit;
         }
 
         /// <summary>
@@ -208,5 +213,10 @@ internal void OnBeforeWriteObject(global::System.Collections.Generic.Dictionary<
                 psVI.Set(new PSVariable(CountVariable.Contains(":") ? CountVariable : $"global:{CountVariable}", odataCount));
             }
         }
+
+        private bool IsAllPresent(global::System.Collections.Generic.Dictionary<string, object> boundParameters)
+        {
+            return boundParameters.ContainsKey("All") && All.IsPresent;
+        }
     }
 }

tools/GenerateModules.ps1

@@ -85,11 +85,8 @@ if (!$SkipGeneration)
 
 # Install module locally in order to specify it as a dependency for other modules down the generation pipeline.
 # https://stackoverflow.com/questions/46216038/how-do-i-define-requiredmodules-in-a-powershell-module-manifest-psd1.
-$ExistingAuthModule = Find-Module "Microsoft.Graph.Authentication" -Repository $RepositoryName -AllowPrerelease:$AllowPreRelease
-Write-Host -ForegroundColor Green "Auth Module: $($ExistingAuthModule.Name), $($ExistingAuthModule.Version)"
-if (!(Get-Module -Name $ExistingAuthModule.Name -ListAvailable)) {
-    Install-Module $ExistingAuthModule.Name -Repository $RepositoryName -Force -AllowClobber -AllowPrerelease:$AllowPreRelease
-}
+$AuthModuleManifest = Join-Path $ModulesOutputDir "Authentication" "Authentication" "artifacts" "Microsoft.Graph.Authentication.psd1"
+$ExistingAuthModule = Import-Module $AuthModuleManifest -PassThru -ErrorAction SilentlyContinue
 if ($ExistingAuthModule.Version -like '*preview*' ) {
     $version = $ExistingAuthModule.Version.Remove($ExistingAuthModule.Version.IndexOf('-'))
     Write-Warning "Required Version:  $ModulePrefix.$RequiredModule Version: $version"