Merge branch 'master' into enhancements/async-git-setup-rollup

StanleyGoldman · web-flow · commit 25b32d8932c0 · 2018-01-04T12:54:52.000-05:00
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2016 GitHub
+Copyright (c) 2016-2018 GitHub
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/src/GitHub.Api/Tasks/TaskBase.cs b/src/GitHub.Api/Tasks/TaskBase.cs
@@ -597,7 +597,7 @@ public TaskBase(CancellationToken token)
         {
             Task = new Task<TResult>(() =>
             {
-                var ret = RunWithData(DependsOn?.Successful ?? previousSuccess, DependsOn.Successful ? ((ITask<T>)DependsOn).Result : default(T));
+                var ret = RunWithData(DependsOn?.Successful ?? previousSuccess, (DependsOn?.Successful ?? false) ? ((ITask<T>)DependsOn).Result : default(T));
                 tcs.SetResult(ret);
                 AdjustNextTask(ret);
                 return ret;

Original file line number	Diff line number	Diff line change
`@@ -597,7 +597,7 @@ public TaskBase(CancellationToken token)`
`597`	`597`	`{`
`598`	`598`	`Task = new Task<TResult>(() =>`
`599`	`599`	`{`
`600`		`- var ret = RunWithData(DependsOn?.Successful ?? previousSuccess, DependsOn.Successful ? ((ITask<T>)DependsOn).Result : default(T));`
	`600`	`+ var ret = RunWithData(DependsOn?.Successful ?? previousSuccess, (DependsOn?.Successful ?? false) ? ((ITask<T>)DependsOn).Result : default(T));`
`601`	`601`	`tcs.SetResult(ret);`
`602`	`602`	`AdjustNextTask(ret);`
`603`	`603`	`return ret;`