paging issues from issue 5358

Author: JimDaly

powerapps-docs/developer/data-platform/fetchxml/page-results.md

@@ -1,7 +1,7 @@
 ---
 title: Page results using FetchXml
 description: Learn how to use FetchXml to page results when you retrieve data from Microsoft Dataverse.
-ms.date: 02/29/2024
+ms.date: 08/09/2024
 ms.reviewer: jdaly
 ms.topic: how-to
 author: pnghub
@@ -15,6 +15,7 @@ contributors:
  - dasussMS
  - apahwa-lab
  - DonaldlaGithub
+ - tdashworth
 ---
 # Page results using FetchXml
 
@@ -143,7 +144,7 @@ static EntityCollection RetrieveAll(IOrganizationService service, string fetchXm
         // Set the fetch paging-cookie attribute with the paging cookie from the previous query
         fetchNode.SetAttributeValue("paging-cookie", results.PagingCookie);
 
-        fetchNode.SetAttributeValue("page", page++);
+        fetchNode.SetAttributeValue("page", ++page);
     }
     return new EntityCollection(entities);
 }
@@ -529,7 +530,7 @@ You can adapt the [Quick Start: Web API sample (C#)](../webapi/quick-start-conso
 ```csharp
 #region Web API call
 
-string fetchXml = @"<fetch count='3' page='1'>
+string fetchXml = @"<fetch>
       <entity name='contact'>
          <attribute name='fullname'/>
          <attribute name='jobtitle'/>

powerapps-docs/developer/data-platform/org-service/queryexpression/page-results.md

@@ -1,7 +1,7 @@
 ---
 title: Page results using QueryExpression
 description: Learn how to use QueryExpression to page results when you retrieve data from Microsoft Dataverse.
-ms.date: 05/12/2024
+ms.date: 08/09/2024
 ms.reviewer: jdaly
 ms.topic: how-to
 author: pnghub
@@ -98,14 +98,19 @@ After each request, the method checks the [EntityCollection.MoreRecords property
 /// </summary>
 /// <param name="service">The authenticated IOrganizationService instance.</param>
 /// <param name="query">The QueryExpression query</param>
+/// <param name="page">The page size to use. Defaults to 5000</param>
 /// <returns>All the records that match the criteria</returns>
-static EntityCollection RetrieveAll(IOrganizationService service, QueryExpression query)
+static EntityCollection RetrieveAll(IOrganizationService service, 
+QueryExpression query,
+int page = 5000)
 {
     // The records to return
     List<Entity> entities = new();
 
     // Set the page
     query.PageInfo.PageNumber = 1;
+    // Set the count
+    query.PageInfo.Count = page;
 
     while (true)
     {
@@ -150,10 +155,6 @@ static void Main(string[] args)
             QueryExpression query = new("contact")
             {
                 ColumnSet = new ColumnSet("fullname", "jobtitle", "annualincome"),
-                PageInfo = new PagingInfo() { 
-                  // Set the page size
-                     Count = 25;
-                },
                 Orders = {
                     { 
                         new OrderExpression(