Merge branch 'master' of https://github.com/Infragistics/DataSource-Reference-Implementations.git

Author: JM

DataSource.DataProviders.OData/ODataSampleApp/MainWindow.xaml.cs

@@ -2,6 +2,7 @@
 using Infragistics.Controls.DataSource;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -33,7 +34,7 @@ public MainWindow()
                 DesiredPageSize = 200
             };
 
-            source.SortDescriptions.Add(new DataSourceSortDescription("OrderID", true));
+            source.SortDescriptions.Add(new SortDescription("OrderID", ListSortDirection.Descending));
             //source.FilterExpressions.Add(DataSourceFilterExpression.CreateSimpleOperation(
             //    "ShipName", DataSourceExpressionOperatorType.Equal, "Wartian Herkku"));
 

ODataDataProvider/ODataVirtualDataSourceDataProvider.cs

@@ -25,9 +25,9 @@ public class ODataVirtualDataSourceDataProvider
 
         public ODataVirtualDataSourceDataProvider()
         {
-            _sortDescriptions = new DataSourceSortDescriptionCollection();
+            _sortDescriptions = new SortDescriptionCollection();
             _sortDescriptions.CollectionChanged += SortDescriptions_CollectionChanged;
-            _filterExpressions = new DataSourceFilterExpressionCollection();
+            _filterExpressions = new FilterExpressionCollection();
             _filterExpressions.CollectionChanged += FilterExpressions_CollectionChanged;
         }
 
@@ -329,8 +329,8 @@ public bool IsFilteringSupported
             }
         }
 
-        private DataSourceSortDescriptionCollection _sortDescriptions;
-        public DataSourceSortDescriptionCollection SortDescriptions
+        private SortDescriptionCollection _sortDescriptions;
+        public SortDescriptionCollection SortDescriptions
         {
             get
             {
@@ -352,8 +352,8 @@ public string[] DesiredProperties
             }
         }
 
-        private DataSourceFilterExpressionCollection _filterExpressions;
-        public DataSourceFilterExpressionCollection FilterExpressions
+        private FilterExpressionCollection _filterExpressions;
+        public FilterExpressionCollection FilterExpressions
         {
             get
             {

ODataDataProvider/ODataVirtualDataSourceDataProviderWorker.cs

@@ -21,9 +21,9 @@ internal class ODataVirtualDataSourceDataProviderWorkerSettings
         public string BaseUri { get; set; }
         public string EntitySet { get; set; }
 
-        public DataSourceSortDescriptionCollection SortDescriptions { get; set; }
+        public SortDescriptionCollection SortDescriptions { get; set; }
 
-        public DataSourceFilterExpressionCollection FilterExpressions { get; set; }
+        public FilterExpressionCollection FilterExpressions { get; set; }
 
         public string[] DesiredProperties { get; set; }
     }
@@ -45,19 +45,19 @@ internal class ODataVirtualDataSourceDataProviderWorker
         private ODataClient _client;
         private string _baseUri;
         private string _entitySet;
-        private DataSourceSortDescriptionCollection _sortDescriptions;
-        private DataSourceFilterExpressionCollection _filterExpressions;
+        private SortDescriptionCollection _sortDescriptions;
+        private FilterExpressionCollection _filterExpressions;
         private string[] _desiredPropeties;
 
-        protected DataSourceSortDescriptionCollection SortDescriptions
+        protected SortDescriptionCollection SortDescriptions
         {
             get
             {
                 return _sortDescriptions;
             }
         }
 
-        protected DataSourceFilterExpressionCollection FilterExpressions
+        protected FilterExpressionCollection FilterExpressions
         {
             get
             {
@@ -245,7 +245,7 @@ private IDataSourceSchema ResolveSchema(IDictionary<string, object> item)
         protected override void MakeTaskForRequest(AsyncDataSourcePageRequest request, int retryDelay)
         {
             int actualPageSize = 0;
-            DataSourceSortDescriptionCollection sortDescriptions = null;
+            SortDescriptionCollection sortDescriptions = null;
             lock (SyncLock)
             {
                 actualPageSize = ActualPageSize;
@@ -298,7 +298,7 @@ protected override void MakeTaskForRequest(AsyncDataSourcePageRequest request, i
                 {
                     foreach (var sort in SortDescriptions)
                     {
-                        if (sort.IsDescending)
+                        if (sort.Direction == System.ComponentModel.ListSortDirection.Descending)
                         {
                             client = client.OrderByDescending(sort.PropertyName);
                         }