Compare commits

..

6 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
Ikiru Yoshizaki
73a63b7f67 Merge pull request #680 from Cysharp/ci/nuget_release
ci: add id-token: write for NuGet Trusted Publish
2025-10-01 16:31:33 +09:00
Ikiru Yoshizaki
30bec5d5c4 ci: add id-token: write for NuGet Trusted Publish 2025-10-01 16:03:54 +09:00
5 changed files with 29 additions and 18 deletions

View File

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

View File

@@ -101,6 +101,7 @@ jobs:
needs: [update-packagejson, build-dotnet, build-unity] needs: [update-packagejson, build-dotnet, build-unity]
permissions: permissions:
contents: write contents: write
id-token: write # required for NuGet Trusted Publish
uses: Cysharp/Actions/.github/workflows/create-release.yaml@main uses: Cysharp/Actions/.github/workflows/create-release.yaml@main
with: with:
commit-id: ${{ needs.update-packagejson.outputs.sha }} commit-id: ${{ needs.update-packagejson.outputs.sha }}

View File

@@ -10,6 +10,11 @@ using UnityEditor.IMGUI.Controls;
using Cysharp.Threading.Tasks.Internal; using Cysharp.Threading.Tasks.Internal;
using System.Text; using System.Text;
using System.Text.RegularExpressions; 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 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(); await UniTask.SwitchToThreadPool();
cancellationToken.ThrowIfCancellationRequested();
if (configureAwait) if (configureAwait)
{ {
try try
{ {
cancellationToken.ThrowIfCancellationRequested();
action(); action();
} }
finally finally
@@ -80,7 +81,6 @@ namespace Cysharp.Threading.Tasks
} }
else else
{ {
cancellationToken.ThrowIfCancellationRequested();
action(); action();
} }
@@ -94,11 +94,12 @@ namespace Cysharp.Threading.Tasks
await UniTask.SwitchToThreadPool(); await UniTask.SwitchToThreadPool();
cancellationToken.ThrowIfCancellationRequested();
if (configureAwait) if (configureAwait)
{ {
try try
{ {
cancellationToken.ThrowIfCancellationRequested();
action(state); action(state);
} }
finally finally
@@ -108,7 +109,6 @@ namespace Cysharp.Threading.Tasks
} }
else else
{ {
cancellationToken.ThrowIfCancellationRequested();
action(state); action(state);
} }
@@ -122,11 +122,12 @@ namespace Cysharp.Threading.Tasks
await UniTask.SwitchToThreadPool(); await UniTask.SwitchToThreadPool();
cancellationToken.ThrowIfCancellationRequested();
if (configureAwait) if (configureAwait)
{ {
try try
{ {
cancellationToken.ThrowIfCancellationRequested();
await action(); await action();
} }
finally finally
@@ -136,7 +137,6 @@ namespace Cysharp.Threading.Tasks
} }
else else
{ {
cancellationToken.ThrowIfCancellationRequested();
await action(); await action();
} }
@@ -150,11 +150,12 @@ namespace Cysharp.Threading.Tasks
await UniTask.SwitchToThreadPool(); await UniTask.SwitchToThreadPool();
cancellationToken.ThrowIfCancellationRequested();
if (configureAwait) if (configureAwait)
{ {
try try
{ {
cancellationToken.ThrowIfCancellationRequested();
await action(state); await action(state);
} }
finally finally
@@ -164,7 +165,6 @@ namespace Cysharp.Threading.Tasks
} }
else else
{ {
cancellationToken.ThrowIfCancellationRequested();
await action(state); await action(state);
} }
@@ -178,11 +178,12 @@ namespace Cysharp.Threading.Tasks
await UniTask.SwitchToThreadPool(); await UniTask.SwitchToThreadPool();
cancellationToken.ThrowIfCancellationRequested();
if (configureAwait) if (configureAwait)
{ {
try try
{ {
cancellationToken.ThrowIfCancellationRequested();
return func(); return func();
} }
finally finally
@@ -193,7 +194,6 @@ namespace Cysharp.Threading.Tasks
} }
else else
{ {
cancellationToken.ThrowIfCancellationRequested();
return func(); return func();
} }
} }
@@ -205,22 +205,23 @@ namespace Cysharp.Threading.Tasks
await UniTask.SwitchToThreadPool(); await UniTask.SwitchToThreadPool();
cancellationToken.ThrowIfCancellationRequested();
if (configureAwait) if (configureAwait)
{ {
try try
{ {
cancellationToken.ThrowIfCancellationRequested();
return await func(); return await func();
} }
finally finally
{ {
cancellationToken.ThrowIfCancellationRequested();
await UniTask.Yield(); await UniTask.Yield();
cancellationToken.ThrowIfCancellationRequested(); cancellationToken.ThrowIfCancellationRequested();
} }
} }
else else
{ {
cancellationToken.ThrowIfCancellationRequested();
var result = await func(); var result = await func();
cancellationToken.ThrowIfCancellationRequested(); cancellationToken.ThrowIfCancellationRequested();
return result; return result;
@@ -234,11 +235,12 @@ namespace Cysharp.Threading.Tasks
await UniTask.SwitchToThreadPool(); await UniTask.SwitchToThreadPool();
cancellationToken.ThrowIfCancellationRequested();
if (configureAwait) if (configureAwait)
{ {
try try
{ {
cancellationToken.ThrowIfCancellationRequested();
return func(state); return func(state);
} }
finally finally
@@ -249,7 +251,6 @@ namespace Cysharp.Threading.Tasks
} }
else else
{ {
cancellationToken.ThrowIfCancellationRequested();
return func(state); return func(state);
} }
} }
@@ -261,22 +262,23 @@ namespace Cysharp.Threading.Tasks
await UniTask.SwitchToThreadPool(); await UniTask.SwitchToThreadPool();
cancellationToken.ThrowIfCancellationRequested();
if (configureAwait) if (configureAwait)
{ {
try try
{ {
cancellationToken.ThrowIfCancellationRequested();
return await func(state); return await func(state);
} }
finally finally
{ {
cancellationToken.ThrowIfCancellationRequested();
await UniTask.Yield(); await UniTask.Yield();
cancellationToken.ThrowIfCancellationRequested(); cancellationToken.ThrowIfCancellationRequested();
} }
} }
else else
{ {
cancellationToken.ThrowIfCancellationRequested();
var result = await func(state); var result = await func(state);
cancellationToken.ThrowIfCancellationRequested(); cancellationToken.ThrowIfCancellationRequested();
return result; return result;

View File

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