Copy query settings correctly, PR #2169

Author: KanishManuja-MS

src/Microsoft.AspNet.OData.Shared/Query/DefaultQuerySettings.cs

@@ -64,5 +64,16 @@ public int? MaxTop
         /// Gets or sets a value indicating whether the service will use skiptoken or not.
         /// </summary>
         public bool EnableSkipToken { get; set; }
+
+        internal void CopySettings(DefaultQuerySettings settings)
+        {
+            this.EnableCount = settings.EnableCount;
+            this.EnableExpand = settings.EnableExpand;
+            this.EnableFilter = settings.EnableFilter;
+            this.EnableOrderBy = settings.EnableOrderBy;
+            this.EnableSelect = settings.EnableSelect;
+            this.EnableSkipToken = settings.EnableSkipToken;
+            this.MaxTop = settings.MaxTop;
+        }
     }
 }

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

@@ -23,18 +23,18 @@ public static void SetDefaultQuerySettings(this IServiceProvider serviceProvider
                 throw Error.ArgumentNull(nameof(defaultQuerySettings));
             }
 
-            if (!defaultQuerySettings.MaxTop.HasValue || defaultQuerySettings.MaxTop > 0)
-            {
-                ModelBoundQuerySettings.DefaultModelBoundQuerySettings.MaxTop = defaultQuerySettings.MaxTop;
-            }
-
             DefaultQuerySettings querySettings = serviceProvider.GetRequiredService<DefaultQuerySettings>();
             if (querySettings == null)
             {
                 throw Error.InvalidOperation(SRResources.MissingODataServices, nameof(DefaultQuerySettings));
             }
 
-            querySettings = defaultQuerySettings;
+            querySettings.CopySettings(defaultQuerySettings);
+            
+            if (!defaultQuerySettings.MaxTop.HasValue || defaultQuerySettings.MaxTop > 0)
+            {
+                ModelBoundQuerySettings.DefaultModelBoundQuerySettings.MaxTop = defaultQuerySettings.MaxTop;
+            }
         }
 
         public static DefaultQuerySettings GetDefaultQuerySettings(this IServiceProvider serviceProvider)