Fixes #1505 for 9.x: NoDollar top and skip being copied to @odata.nextLink

src/Microsoft.AspNetCore.OData/Extensions/GetNextPageHelper.cs

@@ -23,7 +23,7 @@ namespace Microsoft.AspNetCore.OData.Extensions;
 internal static class GetNextPageHelper
 {
     [SuppressMessage("Globalization", "CA1308:Normalize strings to uppercase", Justification = "<Pending>")]
-    internal static Uri GetNextPageLink(Uri requestUri, IEnumerable<KeyValuePair<string, string>> queryParameters, int pageSize, object instance = null, Func<object, string> objectToSkipTokenValue = null)
+    internal static Uri GetNextPageLink(Uri requestUri, IEnumerable<KeyValuePair<string, string>> queryParameters, int pageSize, object instance = null, Func<object, string> objectToSkipTokenValue = null, bool isNoDollarQueryOptionsEnabled = true)
     {
         Contract.Assert(requestUri != null);
         Contract.Assert(queryParameters != null);
@@ -44,6 +44,7 @@ internal static Uri GetNextPageLink(Uri requestUri, IEnumerable<KeyValuePair<str
             switch (key)
             {
                 case "$top":
+                case "top" when isNoDollarQueryOptionsEnabled:
                     int top;
                     if (Int32.TryParse(value, out top))
                     {
@@ -60,6 +61,7 @@ internal static Uri GetNextPageLink(Uri requestUri, IEnumerable<KeyValuePair<str
                     }
                     break;
                 case "$skip":
+                case "skip" when isNoDollarQueryOptionsEnabled:
                     if (useDefaultSkip)
                     {
                         //Need to increment skip only if we are not using skiptoken 
@@ -114,14 +116,14 @@ internal static Uri GetNextPageLink(Uri requestUri, IEnumerable<KeyValuePair<str
     }
 
     /// <remarks>This signature uses types that are AspNetCore-specific.</remarks>
-    internal static Uri GetNextPageLink(Uri requestUri, int pageSize, object instance = null, Func<object, String> objectToSkipTokenValue = null)
+    internal static Uri GetNextPageLink(Uri requestUri, int pageSize, object instance = null, Func<object, string> objectToSkipTokenValue = null, bool isNoDollarQueryOptionsEnabled = true)
     {
         Contract.Assert(requestUri != null);
 
         Dictionary<string, StringValues> queryValues = QueryHelpers.ParseQuery(requestUri.Query);
         IEnumerable<KeyValuePair<string, string>> queryParameters = queryValues.SelectMany(
             kvp => kvp.Value, (kvp, value) => new KeyValuePair<string, string>(kvp.Key, value));
 
-        return GetNextPageLink(requestUri, queryParameters, pageSize, instance, objectToSkipTokenValue);
+        return GetNextPageLink(requestUri, queryParameters, pageSize, instance, objectToSkipTokenValue, isNoDollarQueryOptionsEnabled);
     }
 }

src/Microsoft.AspNetCore.OData/Extensions/HttpRequestExtensions.cs

@@ -227,8 +227,9 @@ public static Uri GetNextPageLink(this HttpRequest request, int pageSize, object
             uriBuilder.Port = request.Host.Port.Value;
         }
 
+        bool isNoDollarQueryEnable = request.IsNoDollarQueryEnable();
         IEnumerable<KeyValuePair<string, string>> queryParameters = request.Query.SelectMany(kvp => kvp.Value, (kvp, value) => new KeyValuePair<string, string>(kvp.Key, value));
-        return GetNextPageHelper.GetNextPageLink(uriBuilder.Uri, queryParameters, pageSize, instance, objectToSkipTokenValue);
+        return GetNextPageHelper.GetNextPageLink(uriBuilder.Uri, queryParameters, pageSize, instance, objectToSkipTokenValue, isNoDollarQueryEnable);
     }
 
     /// <summary>

src/Microsoft.AspNetCore.OData/Formatter/Serialization/ODataResourceSetSerializer.cs

@@ -722,7 +722,8 @@ private static Uri GetNestedNextPageLink(ODataSerializerContext writeContext, IT
                     return nextLinkGenerator.GenerateNextPageLink(nestedNextLink, truncatedCollection.PageSize, obj, writeContext);
                 }
 
-                return GetNextPageHelper.GetNextPageLink(nestedNextLink, truncatedCollection.PageSize);
+                bool isNoDollarQueryEnable = writeContext.Request.IsNoDollarQueryEnable();
+                return GetNextPageHelper.GetNextPageLink(nestedNextLink, truncatedCollection.PageSize, null, null, isNoDollarQueryEnable);
             }
         }
 

src/Microsoft.AspNetCore.OData/Query/Query/DefaultSkipTokenHandler.cs

@@ -55,14 +55,15 @@ public override Uri GenerateNextPageLink(Uri baseUri, int pageSize, Object insta
         IEdmModel model = context.Model;
 
         DefaultQueryConfigurations queryConfigs = context.QueryContext.DefaultQueryConfigurations;
+        bool isNoDollarQueryEnable = context.Request.IsNoDollarQueryEnable();
         if (queryConfigs.EnableSkipToken)
         {
             if (expandedItem != null)
             {
                 // Handle Delta resource; currently not value based.
                 if (DeltaHelper.IsDeltaOfT(context.ExpandedResource.GetType()))
                 {
-                    return GetNextPageHelper.GetNextPageLink(baseUri, pageSize);
+                    return GetNextPageHelper.GetNextPageLink(baseUri, pageSize, null, null, isNoDollarQueryEnable);
                 }
 
                 if (expandedItem.OrderByOption != null)
@@ -75,7 +76,7 @@ public override Uri GenerateNextPageLink(Uri baseUri, int pageSize, Object insta
                     return GenerateSkipTokenValue(obj, model, orderByClause, context);
                 };
 
-                return GetNextPageHelper.GetNextPageLink(baseUri, pageSize, instance, skipTokenGenerator);
+                return GetNextPageHelper.GetNextPageLink(baseUri, pageSize, instance, skipTokenGenerator, isNoDollarQueryEnable);
             }
 
             if (context.QueryOptions != null && context.QueryOptions.OrderBy != null)
@@ -89,7 +90,7 @@ public override Uri GenerateNextPageLink(Uri baseUri, int pageSize, Object insta
             };
         }
 
-        return GetNextPageHelper.GetNextPageLink(baseUri, pageSize, instance, skipTokenGenerator);
+        return GetNextPageHelper.GetNextPageLink(baseUri, pageSize, instance, skipTokenGenerator, isNoDollarQueryEnable);
     }
 
     /// <summary>

test/Microsoft.AspNetCore.OData.Tests/Query/Query/DefaultSkipTokenHandlerTests.cs

@@ -357,7 +357,8 @@ private ODataSerializerContext GetSerializerContext(IEdmModel model, bool enable
         ResourceContext resource = new ResourceContext();
         ODataSerializerContext context = new ODataSerializerContext(resource, edmProperty, queryContext, null)
         {
-            Model = model
+            Model = model,
+            Request = request
         };
 
         return context;