Compare commits

..

4 Commits

Author SHA1 Message Date
github-actions[bot]
2e993ff18f chore(automate): Update package.json to 2.5.11
Commit by [GitHub Actions](https://github.com/Cysharp/UniTask/actions/runs/26083685280)
2026-05-19 07:47:19 +00:00
Yoshifumi Kawai
f248391774 Merge pull request #706 from chikacc/master
fix: resolve TreeView deprecation in Unity 6.2+
2026-05-19 16:46:26 +09:00
Chika Chang
0d304f1feb fix: resolve TreeView deprecation in Unity 6.2+ 2026-03-28 15:36:49 +08:00
Ikiru Yoshizaki
a9e27c03d4 chore: add groups for dependabot 2026-02-25 18:03:24 +09:00
4 changed files with 28 additions and 18 deletions

View File

@@ -5,6 +5,10 @@ updates:
directory: "/"
schedule:
interval: "weekly" # Check for updates to GitHub Actions every week
groups:
dependencies:
patterns:
- "*"
cooldown:
default-days: 14 # Wait 14 days before creating another PR for the same dependency. This will prevent vulnerability on the package impact.
ignore:

View File

@@ -10,6 +10,11 @@ using UnityEditor.IMGUI.Controls;
using Cysharp.Threading.Tasks.Internal;
using System.Text;
using System.Text.RegularExpressions;
#if UNITY_6000_2_OR_NEWER
using TreeView = UnityEditor.IMGUI.Controls.TreeView<int>;
using TreeViewItem = UnityEditor.IMGUI.Controls.TreeViewItem<int>;
using TreeViewState = UnityEditor.IMGUI.Controls.TreeViewState<int>;
#endif
namespace Cysharp.Threading.Tasks.Editor
{
@@ -179,4 +184,3 @@ namespace Cysharp.Threading.Tasks.Editor
}
}

View File

@@ -66,11 +66,12 @@ namespace Cysharp.Threading.Tasks
await UniTask.SwitchToThreadPool();
cancellationToken.ThrowIfCancellationRequested();
if (configureAwait)
{
try
{
cancellationToken.ThrowIfCancellationRequested();
action();
}
finally
@@ -80,7 +81,6 @@ namespace Cysharp.Threading.Tasks
}
else
{
cancellationToken.ThrowIfCancellationRequested();
action();
}
@@ -94,11 +94,12 @@ namespace Cysharp.Threading.Tasks
await UniTask.SwitchToThreadPool();
cancellationToken.ThrowIfCancellationRequested();
if (configureAwait)
{
try
{
cancellationToken.ThrowIfCancellationRequested();
action(state);
}
finally
@@ -108,7 +109,6 @@ namespace Cysharp.Threading.Tasks
}
else
{
cancellationToken.ThrowIfCancellationRequested();
action(state);
}
@@ -122,11 +122,12 @@ namespace Cysharp.Threading.Tasks
await UniTask.SwitchToThreadPool();
cancellationToken.ThrowIfCancellationRequested();
if (configureAwait)
{
try
{
cancellationToken.ThrowIfCancellationRequested();
await action();
}
finally
@@ -136,7 +137,6 @@ namespace Cysharp.Threading.Tasks
}
else
{
cancellationToken.ThrowIfCancellationRequested();
await action();
}
@@ -150,11 +150,12 @@ namespace Cysharp.Threading.Tasks
await UniTask.SwitchToThreadPool();
cancellationToken.ThrowIfCancellationRequested();
if (configureAwait)
{
try
{
cancellationToken.ThrowIfCancellationRequested();
await action(state);
}
finally
@@ -164,7 +165,6 @@ namespace Cysharp.Threading.Tasks
}
else
{
cancellationToken.ThrowIfCancellationRequested();
await action(state);
}
@@ -178,11 +178,12 @@ namespace Cysharp.Threading.Tasks
await UniTask.SwitchToThreadPool();
cancellationToken.ThrowIfCancellationRequested();
if (configureAwait)
{
try
{
cancellationToken.ThrowIfCancellationRequested();
return func();
}
finally
@@ -193,7 +194,6 @@ namespace Cysharp.Threading.Tasks
}
else
{
cancellationToken.ThrowIfCancellationRequested();
return func();
}
}
@@ -205,22 +205,23 @@ namespace Cysharp.Threading.Tasks
await UniTask.SwitchToThreadPool();
cancellationToken.ThrowIfCancellationRequested();
if (configureAwait)
{
try
{
cancellationToken.ThrowIfCancellationRequested();
return await func();
}
finally
{
cancellationToken.ThrowIfCancellationRequested();
await UniTask.Yield();
cancellationToken.ThrowIfCancellationRequested();
}
}
else
{
cancellationToken.ThrowIfCancellationRequested();
var result = await func();
cancellationToken.ThrowIfCancellationRequested();
return result;
@@ -234,11 +235,12 @@ namespace Cysharp.Threading.Tasks
await UniTask.SwitchToThreadPool();
cancellationToken.ThrowIfCancellationRequested();
if (configureAwait)
{
try
{
cancellationToken.ThrowIfCancellationRequested();
return func(state);
}
finally
@@ -249,7 +251,6 @@ namespace Cysharp.Threading.Tasks
}
else
{
cancellationToken.ThrowIfCancellationRequested();
return func(state);
}
}
@@ -261,22 +262,23 @@ namespace Cysharp.Threading.Tasks
await UniTask.SwitchToThreadPool();
cancellationToken.ThrowIfCancellationRequested();
if (configureAwait)
{
try
{
cancellationToken.ThrowIfCancellationRequested();
return await func(state);
}
finally
{
cancellationToken.ThrowIfCancellationRequested();
await UniTask.Yield();
cancellationToken.ThrowIfCancellationRequested();
}
}
else
{
cancellationToken.ThrowIfCancellationRequested();
var result = await func(state);
cancellationToken.ThrowIfCancellationRequested();
return result;

View File

@@ -2,7 +2,7 @@
"name": "com.cysharp.unitask",
"displayName": "UniTask",
"author": { "name": "Cysharp, Inc.", "url": "https://cysharp.co.jp/en/" },
"version": "2.5.10",
"version": "2.5.11",
"unity": "2018.4",
"description": "Provides an efficient async/await integration to Unity.",
"keywords": [ "async/await", "async", "Task", "UniTask" ],