Fix Dashboard UI to display "await" keyword on all task-like methods

Previously "await" keyword was added only for methods backed by async state machine. Fixes #1418
HangfireIO · Jun 20, 2019 · dfee307 · dfee307
1 parent b53d30c
commit dfee307
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/Hangfire.Core/Dashboard/JobMethodCallRenderer.cs b/src/Hangfire.Core/Dashboard/JobMethodCallRenderer.cs
@@ -25,6 +25,7 @@
 using System.Threading;
 using Hangfire.Common;
 using Hangfire.Dashboard.Resources;
+using Hangfire.Processing;
 
 namespace Hangfire.Dashboard
 {
@@ -65,7 +66,8 @@ public static NonEscapedString Render(Job job)
                 builder.AppendLine();
             }
 
-            if (job.Method.GetCustomAttribute<AsyncStateMachineAttribute>() != null)
+            if (job.Method.GetCustomAttribute<AsyncStateMachineAttribute>() != null ||
+                job.Method.ReturnType.IsTaskLike(out _))
             {
                 builder.Append($"{WrapKeyword("await")} ");
             }

diff --git a/src/Hangfire.Core/Processing/TaskExtensions.cs b/src/Hangfire.Core/Processing/TaskExtensions.cs
@@ -94,7 +94,8 @@ public static bool IsTaskLike(this Type type, out Func<object, Task> getTaskFunc
                 // This method can be replaced with wrapping in a custom awaiter like
                 // in ASP.NET Core, but this step requires using the `await` keyword
                 // to get the result, so can be implemented only in future.
-                if (typeInfo.FullName.StartsWith("System.Threading.Tasks.ValueTask", StringComparison.Ordinal))
+                if (typeInfo.FullName != null &&
+                    typeInfo.FullName.StartsWith("System.Threading.Tasks.ValueTask", StringComparison.Ordinal))
                 {
                     var asTask = type.GetRuntimeMethod("AsTask", EmptyTypes);