PHXH
/
UniTask
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support exception unwrapping for AsUniTask of Task.WhenAll

master
hadashiA 2023-09-01 16:58:11 +09:00
parent 8eac07ad24
commit 6fb4f2d6d2
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/UniTask.NetCoreTests/TaskExtensionsTest.cs
View File

@ -19,14 +19,17 @@ namespace NetCoreTests
{ {
await ThrowOrValueAsync().AsUniTask(); await ThrowOrValueAsync().AsUniTask();
}); });
}
[Fact]
public async Task PropagateWhenAllException()
{
await Assert.ThrowsAsync<InvalidOperationException>(async () => await Assert.ThrowsAsync<InvalidOperationException>(async () =>
{ {
await Task.WhenAll(ThrowAsync(), ThrowAsync(), ThrowAsync()); await Task.WhenAll(ThrowAsync(), ThrowAsync(), ThrowAsync()).AsUniTask();
}); });
} }
async Task ThrowAsync() async Task ThrowAsync()
{ {
throw new InvalidOperationException(); throw new InvalidOperationException();

4
src/UniTask/Assets/Plugins/UniTask/Runtime/UniTaskExtensions.cs
View File

@ -28,7 +28,7 @@ namespace Cysharp.Threading.Tasks
p.TrySetCanceled(); p.TrySetCanceled();
break; break;
case TaskStatus.Faulted: case TaskStatus.Faulted:
p.TrySetException(x.Exception.InnerExceptions.Count == 1 ? x.Exception.InnerException : x.Exception); p.TrySetException(x.Exception.InnerException);
break; break;
case TaskStatus.RanToCompletion: case TaskStatus.RanToCompletion:
p.TrySetResult(x.Result); p.TrySetResult(x.Result);
@ -58,7 +58,7 @@ namespace Cysharp.Threading.Tasks
p.TrySetCanceled(); p.TrySetCanceled();
break; break;
case TaskStatus.Faulted: case TaskStatus.Faulted:
p.TrySetException(x.Exception.InnerExceptions.Count == 1 ? x.Exception.InnerException : x.Exception); p.TrySetException(x.Exception.InnerException);
break; break;
case TaskStatus.RanToCompletion: case TaskStatus.RanToCompletion:
p.TrySetResult(); p.TrySetResult();