Set AutoQueryable targer netstandard 1.3 & net451

Add FilterAttributes for aspnet & aspnet core
Separate filter attributes in different nuget packages

build.bat

@@ -6,5 +6,6 @@ dotnet build
 
 dotnet pack ".\src\AutoQueryable" -c Release -o ".\bin\NuGetPackages"
 dotnet pack ".\src\AutoQueryable.AspNet.Filter" -c Release -o ".\bin\NuGetPackages"
+dotnet pack ".\src\AutoQueryable.AspNetCore.Filter" -c Release -o ".\bin\NuGetPackages"
 
 pause

src/AutoQueryable.AspNet.Filter/Filters/AutoQueryableFilter.cs → src/AutoQueryable.AspNet.Filter/FilterAttributes/AutoQueryableFilter.cs

@@ -1,14 +1,13 @@
 using System;
-using System.Linq;
 using System.Net.Http;
 using System.Net.Http.Formatting;
 using System.Web.Http.Filters;
-using AutoQueryable.Extensions;
+using AutoQueryable.Helpers;
 using AutoQueryable.Models;
 
-namespace AutoQueryable.AspNet.Filter.Filters
+namespace AutoQueryable.AspNet.Filter.FilterAttributes
 {
-    public class AutoQueryableFilter : ActionFilterAttribute
+    public class AutoQueryableAttribute : ActionFilterAttribute
     {
         public string[] UnselectableProperties { get; set; }
 
@@ -18,13 +17,11 @@ public override void OnActionExecuted(HttpActionExecutedContext context)
             var content = context.Response.Content as ObjectContent;
             if (content != null)
             {
-                IQueryable<object> query = content.Value as IQueryable<object>;
+                dynamic query = content.Value;
                 if (query == null) throw new Exception("Unable to retreive value of IQueryable from context result.");
                 Type entityType = query.GetType().GenericTypeArguments[0];
-
                 string queryString = context.Request.RequestUri.Query;
-                // Work on generic type directly, for dto projection
-                var result = query.AutoQueryable(queryString, new AutoQueryableProfile {UnselectableProperties = UnselectableProperties});
+                var result = QueryableHelper.GetAutoQuery(queryString, entityType, query, new AutoQueryableProfile {UnselectableProperties = UnselectableProperties});
                 context.Response.Content = new ObjectContent(result.GetType(), result, new JsonMediaTypeFormatter());
             }
         }

src/AutoQueryable.AspNet.Filter/project.json

@@ -1,4 +1,4 @@
-{
+{
   "version": "0.0.1",
 
   "dependencies": {
@@ -12,5 +12,15 @@
 
       }
     }
-  }
+  },
+  "packOptions": {
+    "licenseUrl": "https://raw.githubusercontent.com/trenoncourt/AutoQueryable/master/LICENSE",
+    "projectUrl": "https://github.com/trenoncourt/AutoQueryable",
+    "tags": [ "AutoQueryable", "AutoQuery", "OData" ],
+    "owners": [ "trenoncourt" ]
+  },
+
+  "title": "AutoQueryable.AspNetCore.Filter add filterAttribute for AutoQueryable to Asp.Net >=4.5.1.",
+  "description": "AutoQueryable.AspNetCore.Filter add filterAttribute for AutoQueryable to Asp.Net >=4.5.1.",
+  "authors": [ "Thibaut Renoncourt" ]
 }

src/AutoQueryable.AspNetCore.Filter/FilterAttributes/AutoQueryableAttribute.cs

@@ -0,0 +1,23 @@
+using System;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Filters;
+using AutoQueryable.Helpers;
+using AutoQueryable.Models;
+
+namespace AutoQueryable.AspNetCore.Filter.FilterAttributes
+{
+    public class AutoQueryableAttribute : ActionFilterAttribute
+    {
+        public string[] UnselectableProperties { get; set; }
+
+        public override void OnActionExecuted(ActionExecutedContext context)
+        {
+            dynamic query = ((ObjectResult)context.Result).Value;
+            if (query == null) throw new Exception("Unable to retreive value of IQueryable from context result.");
+            Type entityType = query.GetType().GenericTypeArguments[0];
+
+            string queryString = context.HttpContext.Request.QueryString.HasValue ? context.HttpContext.Request.QueryString.Value : null;
+            context.Result = new OkObjectResult(QueryableHelper.GetAutoQuery(queryString, entityType, query, new AutoQueryableProfile { UnselectableProperties = UnselectableProperties }));
+        }
+    }
+}

src/AutoQueryable.AspNetCore.Filter/project.json

@@ -10,5 +10,15 @@
 
   "frameworks": {
     "netstandard1.6": {}
-  }
+  },
+  "packOptions": {
+    "licenseUrl": "https://raw.githubusercontent.com/trenoncourt/AutoQueryable/master/LICENSE",
+    "projectUrl": "https://github.com/trenoncourt/AutoQueryable",
+    "tags": [ "AutoQueryable", "AutoQuery", "OData" ],
+    "owners": [ "trenoncourt" ]
+  },
+
+  "title": "AutoQueryable.AspNetCore.Filter add filterAttribute for AutoQueryable to Asp.Net Core.",
+  "description": "AutoQueryable.AspNetCore.Filter add filterAttribute for AutoQueryable to Asp.Net Core.",
+  "authors": [ "Thibaut Renoncourt" ]
 }

src/AutoQueryable/Helpers/QueryableHelper.cs

@@ -12,14 +12,10 @@ public static dynamic GetAutoQuery<TEntity>(string queryString, Type entityType,
         {
             if (string.IsNullOrEmpty(queryString))
             {
-                if (profile?.UnselectableProperties == null)
-                {
-                    return query;
-                }
-                IEnumerable<string> columns = SelectHelper.GetSelectableColumns(profile.UnselectableProperties, entityType);
+                IEnumerable<string> columns = SelectHelper.GetSelectableColumns(profile?.UnselectableProperties, entityType);
                 return query.Select(SelectHelper.GetSelector<TEntity>(string.Join(",", columns.ToArray())));
             }
-            string[] queryStringParts = queryString?.Replace("?", "")?.Split('&');
+            string[] queryStringParts = queryString.Replace("?", "").Split('&');
 
             var criteriaManager = new CriteriaManager();
             IList<Criteria> criterias = criteriaManager.GetCriterias(entityType, queryStringParts).ToList();

src/AutoQueryable/Helpers/SelectHelper.cs

@@ -73,6 +73,10 @@ private static MemberExpression GetMemberExpression<TEntity>(string column, Para
 
         public static IEnumerable<string> GetSelectableColumns(Clause selectClause, string[] unselectableProperties, Type entityType)
         {
+            if (selectClause == null)
+            {
+                return GetSelectableColumns(unselectableProperties, entityType);
+            }
             IEnumerable<string> columns = selectClause.Value.Split(',');
             if (unselectableProperties != null)
             {

src/AutoQueryable/project.json

@@ -5,7 +5,7 @@
   },
 
   "frameworks": {
-    "netstandard1.6": {
+    "netstandard1.3": {
       "dependencies": {
         "System.Reflection.Emit": "4.3.0",
         "System.Linq.Queryable": "4.3.0",