Removed ResolveAsync from FieldType, removed restriction that resolve needs to return Task<object>, will accept any Task<T> now.

Author: scmccart

src/GraphQL/Execution/DocumentExecuter.cs

@@ -131,12 +131,15 @@ public async Task<object> ResolveField(ExecutionContext context, ObjectGraphType
                 resolveContext.ParentType = parentType;
                 resolveContext.Arguments = arguments;
                 resolveContext.Source = source;
-                var resolve = fieldDefinition.ResolveAsync ?? fieldDefinition.Resolve ?? defaultResolve;
+                var resolve = fieldDefinition.Resolve ?? defaultResolve;
                 var result = resolve(resolveContext);
 
-                if(result is Task<object>)
+                if(result is Task)
                 {
-                    result = await (result as Task<object>);
+                    var task = result as Task;
+                    await task;
+
+                    result = GetProperyValue(task, "Result");
                 }
 
                 if (parentType is __Field && result is Type)

src/GraphQL/Types/FieldType.cs

@@ -18,7 +18,5 @@ public class FieldType : IHaveDefaultValue
         public QueryArguments Arguments { get; set; }
 
         public Func<ResolveFieldContext, object> Resolve { get; set; }
-
-        public Func<ResolveFieldContext, Task<object>> ResolveAsync { get; set; }
     }
 }

src/GraphQL/Types/GraphType.cs

@@ -26,8 +26,7 @@ public void Field<TType>(
             string name, 
             string description = null, 
             QueryArguments arguments = null,
-            Func<ResolveFieldContext, object> resolve = null,
-            Func<ResolveFieldContext, Task<object>> resolveAsync = null)
+            Func<ResolveFieldContext, object> resolve = null)
             where TType : GraphType
         {
             if (_fields.Exists(x => x.Name == name))
@@ -40,8 +39,7 @@ public void Field<TType>(
                 Name = name,
                 Type = typeof(TType),
                 Arguments = arguments,
-                Resolve = resolve,
-                ResolveAsync = resolveAsync
+                Resolve = resolve
             });
         }