feat: Update package.json to 2.5.4

Merge pull request #557 from Cysharp/hadashiA/fix-cancel-immediate
Fix unintended returning to pool with cancelImmediately
2026-05-15 11:30:09 +00:00 · 2024-03-28 06:22:15 +00:00 · 2024-03-28 15:21:40 +09:00 · 2024-03-28 15:15:55 +09:00 · 2024-03-28 15:14:10 +09:00 · 2024-03-28 15:00:41 +09:00
18 changed files with 397 additions and 264 deletions
--- a/.github/workflows/build-release.yml
+++ b/.github/workflows/build-release.yml
@@ -12,17 +12,13 @@ on:
        default: false
        type: boolean

-env:
-  GIT_TAG: ${{ github.event.inputs.tag }}
-  DRY_RUN: ${{ github.event.inputs.dry-run }}
-
 jobs:
  update-packagejson:
    uses: Cysharp/Actions/.github/workflows/update-packagejson.yaml@main
    with:
      file-path: ./src/UniTask/Assets/Plugins/UniTask/package.json
-      tag: ${{ github.event.inputs.tag }}
-      dry-run: ${{ fromJson(github.event.inputs.dry-run) }}
+      tag: ${{ inputs.tag }}
+      dry-run: ${{ inputs.dry-run }}

  build-dotnet:
    needs: [update-packagejson]
@@ -35,9 +31,9 @@ jobs:
          ref: ${{ needs.update-packagejson.outputs.sha }}
      - uses: Cysharp/Actions/.github/actions/setup-dotnet@main
      # build and pack
-      - run: dotnet build -c Release -p:Version=${{ env.GIT_TAG }}
+      - run: dotnet build -c Release -p:Version=${{ inputs.tag }}
      - run: dotnet test -c Release --no-build
-      - run: dotnet pack ./src/UniTask.NetCore/UniTask.NetCore.csproj -c Release --no-build -p:Version=${{ env.GIT_TAG }} -o ./publish
+      - run: dotnet pack ./src/UniTask.NetCore/UniTask.NetCore.csproj -c Release --no-build -p:Version=${{ inputs.tag }} -o ./publish
      # Store artifacts.
      - uses: actions/upload-artifact@v2
        with:
@@ -77,43 +73,24 @@ jobs:
      # Store artifacts.
      - uses: actions/upload-artifact@v2
        with:
-          name: UniTask.${{ env.GIT_TAG }}.unitypackage
-          path: ./src/UniTask/UniTask.${{ env.GIT_TAG }}.unitypackage
+          name: UniTask.${{ inputs.tag }}.unitypackage
+          path: ./src/UniTask/UniTask.${{ inputs.tag }}.unitypackage

+  # release
  create-release:
-    if: github.event.inputs.dry-run == 'false'
    needs: [update-packagejson, build-dotnet, build-unity]
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-    steps:
-      - uses: Cysharp/Actions/.github/actions/setup-dotnet@main
-      # Create Releases
-      - uses: actions/create-release@v1
-        id: create_release
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag_name: ${{ env.GIT_TAG }}
-          release_name: Ver.${{ env.GIT_TAG }}
-          commitish: ${{ needs.update-packagejson.outputs.sha }}
-          draft: true
-          prerelease: false
-      # Download(All) Artifacts to current directory
-      - uses: actions/download-artifact@v2
-      # Upload to NuGet
-      - run: dotnet nuget push "./nuget/*.nupkg" --skip-duplicate -s https://www.nuget.org/api/v2/package -k ${{ secrets.NUGET_KEY }}
-      # Upload to Releases(unitypackage)
-      - uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./UniTask.${{ env.GIT_TAG }}.unitypackage/UniTask.${{ env.GIT_TAG }}.unitypackage
-          asset_name: UniTask.${{ env.GIT_TAG }}.unitypackage
-          asset_content_type: application/octet-stream
+    uses: Cysharp/Actions/.github/workflows/create-release.yaml@main
+    with:
+      commit-id: ${{ needs.update-packagejson.outputs.sha }}
+      dry-run: ${{ inputs.dry-run }}
+      tag: ${{ inputs.tag }}
+      nuget-push: true
+      release-upload: true
+      release-asset-path: ./UniTask.${{ inputs.tag }}.unitypackage/UniTask.${{ inputs.tag }}.unitypackage
+    secrets: inherit

  cleanup:
-    if: needs.update-packagejson.outputs.is-branch-created == 'true'
+    if: ${{ needs.update-packagejson.outputs.is-branch-created == 'true' }}
    needs: [update-packagejson, build-dotnet, build-unity]
    uses: Cysharp/Actions/.github/workflows/clean-packagejson-branch.yaml@main
    with:
--- a/README.md
+++ b/README.md
@@ -51,7 +51,7 @@ For advanced tips, see blog post: [Extends UnityWebRequest via async decorator p

 Getting started
 ---
-Install via [UPM package](#upm-package) or asset package(`UniTask.*.*.*.unitypackage`) available in [UniTask/releases](https://github.com/Cysharp/UniTask/releases) page.
+Install via [UPM package](#upm-package) with git reference or asset package(`UniTask.*.*.*.unitypackage`) available in [UniTask/releases](https://github.com/Cysharp/UniTask/releases).

 ```csharp
 // extension awaiter/methods can be used by this namespace
--- a/src/UniTask.NetCore/UniTask.NetCore.csproj
+++ b/src/UniTask.NetCore/UniTask.NetCore.csproj
@@ -1,42 +1,43 @@
 <Project Sdk="Microsoft.NET.Sdk">

-    <PropertyGroup>
-        <TargetFrameworks>net6.0;net7.0;netstandard2.1;netstandard2.0</TargetFrameworks>
-        <AssemblyName>UniTask</AssemblyName>
-        <LangVersion>8.0</LangVersion>
-        <RootNamespace>Cysharp.Threading.Tasks</RootNamespace>
-        <GenerateDocumentationFile>true</GenerateDocumentationFile>
-        <NoWarn>$(NoWarn);CS1591</NoWarn>
+	<PropertyGroup>
+		<TargetFrameworks>net6.0;net7.0;netstandard2.1;netstandard2.0</TargetFrameworks>
+		<AssemblyName>UniTask</AssemblyName>
+		<LangVersion>8.0</LangVersion>
+		<RootNamespace>Cysharp.Threading.Tasks</RootNamespace>
+		<DefineConstants>UNITASK_NETCORE</DefineConstants>
+		<GenerateDocumentationFile>true</GenerateDocumentationFile>
+		<NoWarn>$(NoWarn);CS1591</NoWarn>

-        <!-- NuGet Packaging -->
-        <Id>UniTask</Id>
-        <PackageVersion>$(Version)</PackageVersion>
-        <Company>Cysharp</Company>
-        <Authors>Cysharp</Authors>
-        <Copyright>© Cysharp, Inc.</Copyright>
-        <PackageTags>task;async</PackageTags>
-        <Description>Provides an efficient async/await integration to Unity and .NET Core.</Description>
-        <PackageProjectUrl>https://github.com/Cysharp/UniTask</PackageProjectUrl>
-        <RepositoryUrl>$(PackageProjectUrl)</RepositoryUrl>
-        <RepositoryType>git</RepositoryType>
-        <PackageLicenseExpression>MIT</PackageLicenseExpression>
-        <PackageIcon>Icon.png</PackageIcon>
-        <SignAssembly>true</SignAssembly>
-        <AssemblyOriginatorKeyFile>opensource.snk</AssemblyOriginatorKeyFile>
-        <IsPackable>true</IsPackable>
-    </PropertyGroup>
+		<!-- NuGet Packaging -->
+		<Id>UniTask</Id>
+		<PackageVersion>$(Version)</PackageVersion>
+		<Company>Cysharp</Company>
+		<Authors>Cysharp</Authors>
+		<Copyright>© Cysharp, Inc.</Copyright>
+		<PackageTags>task;async</PackageTags>
+		<Description>Provides an efficient async/await integration to Unity and .NET Core.</Description>
+		<PackageProjectUrl>https://github.com/Cysharp/UniTask</PackageProjectUrl>
+		<RepositoryUrl>$(PackageProjectUrl)</RepositoryUrl>
+		<RepositoryType>git</RepositoryType>
+		<PackageLicenseExpression>MIT</PackageLicenseExpression>
+		<PackageIcon>Icon.png</PackageIcon>
+		<SignAssembly>true</SignAssembly>
+		<AssemblyOriginatorKeyFile>opensource.snk</AssemblyOriginatorKeyFile>
+		<IsPackable>true</IsPackable>
+	</PropertyGroup>

-    <ItemGroup>
-        <None Include="Icon.png" Pack="true" PackagePath="/" />
-    </ItemGroup>
+	<ItemGroup>
+		<None Include="Icon.png" Pack="true" PackagePath="/" />
+	</ItemGroup>

-    <ItemGroup>
-        <Compile Include="..\UniTask\Assets\Plugins\UniTask\Runtime\**\*.cs" Exclude="&#xD;&#xA;..\UniTask\Assets\Plugins\UniTask\Editor\*.cs;&#xD;&#xA;..\UniTask\Assets\Plugins\UniTask\Runtime\Triggers\*.cs;&#xD;&#xA;..\UniTask\Assets\Plugins\UniTask\Runtime\Linq\UnityExtensions\*.cs;&#xD;&#xA;  &#xD;&#xA;..\UniTask\Assets\Plugins\UniTask\Runtime\Internal\UnityEqualityComparer.cs;&#xD;&#xA;..\UniTask\Assets\Plugins\UniTask\Runtime\Internal\DiagnosticsExtensions.cs;&#xD;&#xA;..\UniTask\Assets\Plugins\UniTask\Runtime\Internal\PlayerLoopRunner.cs;&#xD;&#xA;..\UniTask\Assets\Plugins\UniTask\Runtime\Internal\ContinuationQueue.cs;&#xD;&#xA;..\UniTask\Assets\Plugins\UniTask\Runtime\Internal\UnityWebRequestExtensions.cs;&#xD;&#xA;  &#xD;&#xA;..\UniTask\Assets\Plugins\UniTask\Runtime\UniTaskSynchronizationContext.cs;&#xD;&#xA;..\UniTask\Assets\Plugins\UniTask\Runtime\CancellationTokenSourceExtensions.cs;&#xD;&#xA;..\UniTask\Assets\Plugins\UniTask\Runtime\EnumeratorAsyncExtensions.cs;&#xD;&#xA;..\UniTask\Assets\Plugins\UniTask\Runtime\TimeoutController.cs;&#xD;&#xA;..\UniTask\Assets\Plugins\UniTask\Runtime\PlayerLoopHelper.cs;&#xD;&#xA;..\UniTask\Assets\Plugins\UniTask\Runtime\PlayerLoopTimer.cs;&#xD;&#xA;..\UniTask\Assets\Plugins\UniTask\Runtime\UniTask.Delay.cs;&#xD;&#xA;..\UniTask\Assets\Plugins\UniTask\Runtime\UniTask.Run.cs;&#xD;&#xA;..\UniTask\Assets\Plugins\UniTask\Runtime\UniTask.Bridge.cs;&#xD;&#xA;..\UniTask\Assets\Plugins\UniTask\Runtime\UniTask.WaitUntil.cs;&#xD;&#xA;..\UniTask\Assets\Plugins\UniTask\Runtime\UnityAsyncExtensions.*;&#xD;&#xA;..\UniTask\Assets\Plugins\UniTask\Runtime\UnityBindingExtensions.cs;&#xD;&#xA;" />
-        <Compile Remove="..\UniTask\Assets\Plugins\UniTask\Runtime\_InternalVisibleTo.cs" />
-    </ItemGroup>
+	<ItemGroup>
+		<Compile Include="..\UniTask\Assets\Plugins\UniTask\Runtime\**\*.cs" Exclude="&#xD;&#xA;..\UniTask\Assets\Plugins\UniTask\Editor\*.cs;&#xD;&#xA;..\UniTask\Assets\Plugins\UniTask\Runtime\Triggers\*.cs;&#xD;&#xA;..\UniTask\Assets\Plugins\UniTask\Runtime\Linq\UnityExtensions\*.cs;&#xD;&#xA;  &#xD;&#xA;..\UniTask\Assets\Plugins\UniTask\Runtime\Internal\UnityEqualityComparer.cs;&#xD;&#xA;..\UniTask\Assets\Plugins\UniTask\Runtime\Internal\DiagnosticsExtensions.cs;&#xD;&#xA;..\UniTask\Assets\Plugins\UniTask\Runtime\Internal\PlayerLoopRunner.cs;&#xD;&#xA;..\UniTask\Assets\Plugins\UniTask\Runtime\Internal\ContinuationQueue.cs;&#xD;&#xA;..\UniTask\Assets\Plugins\UniTask\Runtime\Internal\UnityWebRequestExtensions.cs;&#xD;&#xA;  &#xD;&#xA;..\UniTask\Assets\Plugins\UniTask\Runtime\UniTaskSynchronizationContext.cs;&#xD;&#xA;..\UniTask\Assets\Plugins\UniTask\Runtime\CancellationTokenSourceExtensions.cs;&#xD;&#xA;..\UniTask\Assets\Plugins\UniTask\Runtime\EnumeratorAsyncExtensions.cs;&#xD;&#xA;..\UniTask\Assets\Plugins\UniTask\Runtime\TimeoutController.cs;&#xD;&#xA;..\UniTask\Assets\Plugins\UniTask\Runtime\PlayerLoopHelper.cs;&#xD;&#xA;..\UniTask\Assets\Plugins\UniTask\Runtime\PlayerLoopTimer.cs;&#xD;&#xA;..\UniTask\Assets\Plugins\UniTask\Runtime\UniTask.Delay.cs;&#xD;&#xA;..\UniTask\Assets\Plugins\UniTask\Runtime\UniTask.Run.cs;&#xD;&#xA;..\UniTask\Assets\Plugins\UniTask\Runtime\UniTask.Bridge.cs;&#xD;&#xA;..\UniTask\Assets\Plugins\UniTask\Runtime\UniTask.WaitUntil.cs;&#xD;&#xA;..\UniTask\Assets\Plugins\UniTask\Runtime\UnityAsyncExtensions.*;&#xD;&#xA;..\UniTask\Assets\Plugins\UniTask\Runtime\UnityBindingExtensions.cs;&#xD;&#xA;" />
+		<Compile Remove="..\UniTask\Assets\Plugins\UniTask\Runtime\_InternalVisibleTo.cs" />
+	</ItemGroup>

-    <ItemGroup>
-        <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
-    </ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
+	</ItemGroup>

 </Project>
--- a/src/UniTask.NetCoreTests/Linq/Merge.cs
+++ b/src/UniTask.NetCoreTests/Linq/Merge.cs
@@ -1,3 +1,5 @@
+#pragma warning disable CS1998
+
 using System;
 using System.Threading;
 using System.Threading.Tasks;
--- a/src/UniTask.NetCoreTests/TaskExtensionsTest.cs
+++ b/src/UniTask.NetCoreTests/TaskExtensionsTest.cs
@@ -1,3 +1,5 @@
+#pragma warning disable CS1998
+
 using System;
 using System.Threading.Tasks;
 using Cysharp.Threading.Tasks;
--- a/src/UniTask/Assets/Plugins/UniTask/Runtime/External/Addressables/AddressablesAsyncExtensions.cs
+++ b/src/UniTask/Assets/Plugins/UniTask/Runtime/External/Addressables/AddressablesAsyncExtensions.cs
@@ -7,6 +7,7 @@ using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.ExceptionServices;
 using System.Threading;
+using UnityEngine.AddressableAssets;
 using UnityEngine.ResourceManagement.AsyncOperations;

 namespace Cysharp.Threading.Tasks
@@ -20,17 +21,12 @@ namespace Cysharp.Threading.Tasks
            return ToUniTask(handle).GetAwaiter();
        }

-        public static UniTask WithCancellation(this AsyncOperationHandle handle, CancellationToken cancellationToken)
+        public static UniTask WithCancellation(this AsyncOperationHandle handle, CancellationToken cancellationToken, bool cancelImmediately = false, bool autoReleaseWhenCanceled = false)
        {
-            return ToUniTask(handle, cancellationToken: cancellationToken);
+            return ToUniTask(handle, cancellationToken: cancellationToken, cancelImmediately: cancelImmediately, autoReleaseWhenCanceled: autoReleaseWhenCanceled);
        }

-        public static UniTask WithCancellation(this AsyncOperationHandle handle, CancellationToken cancellationToken, bool cancelImmediately)
-        {
-            return ToUniTask(handle, cancellationToken: cancellationToken, cancelImmediately: cancelImmediately);
-        }
-
-        public static UniTask ToUniTask(this AsyncOperationHandle handle, IProgress<float> progress = null, PlayerLoopTiming timing = PlayerLoopTiming.Update, CancellationToken cancellationToken = default(CancellationToken), bool cancelImmediately = false)
+        public static UniTask ToUniTask(this AsyncOperationHandle handle, IProgress<float> progress = null, PlayerLoopTiming timing = PlayerLoopTiming.Update, CancellationToken cancellationToken = default(CancellationToken), bool cancelImmediately = false, bool autoReleaseWhenCanceled = false)
        {
            if (cancellationToken.IsCancellationRequested) return UniTask.FromCanceled(cancellationToken);

@@ -49,7 +45,7 @@ namespace Cysharp.Threading.Tasks
                return UniTask.CompletedTask;
            }

-            return new UniTask(AsyncOperationHandleConfiguredSource.Create(handle, timing, progress, cancellationToken, cancelImmediately, out var token), token);
+            return new UniTask(AsyncOperationHandleConfiguredSource.Create(handle, timing, progress, cancellationToken, cancelImmediately, autoReleaseWhenCanceled, out var token), token);
        }

        public struct AsyncOperationHandleAwaiter : ICriticalNotifyCompletion
@@ -108,21 +104,23 @@ namespace Cysharp.Threading.Tasks
                TaskPool.RegisterSizeGetter(typeof(AsyncOperationHandleConfiguredSource), () => pool.Size);
            }

-            readonly Action<AsyncOperationHandle> continuationAction;
+            readonly Action<AsyncOperationHandle> completedCallback;
            AsyncOperationHandle handle;
            CancellationToken cancellationToken;
            CancellationTokenRegistration cancellationTokenRegistration;
            IProgress<float> progress;
+            bool autoReleaseWhenCanceled;
+            bool cancelImmediately;
            bool completed;

            UniTaskCompletionSourceCore<AsyncUnit> core;

            AsyncOperationHandleConfiguredSource()
            {
-                continuationAction = Continuation;
+                completedCallback = HandleCompleted;
            }

-            public static IUniTaskSource Create(AsyncOperationHandle handle, PlayerLoopTiming timing, IProgress<float> progress, CancellationToken cancellationToken, bool cancelImmediately, out short token)
+            public static IUniTaskSource Create(AsyncOperationHandle handle, PlayerLoopTiming timing, IProgress<float> progress, CancellationToken cancellationToken, bool cancelImmediately, bool autoReleaseWhenCanceled, out short token)
            {
                if (cancellationToken.IsCancellationRequested)
                {
@@ -137,6 +135,8 @@ namespace Cysharp.Threading.Tasks
                result.handle = handle;
                result.progress = progress;
                result.cancellationToken = cancellationToken;
+                result.cancelImmediately = cancelImmediately;
+                result.autoReleaseWhenCanceled = autoReleaseWhenCanceled;
                result.completed = false;
                
                if (cancelImmediately && cancellationToken.CanBeCanceled)
@@ -144,6 +144,10 @@ namespace Cysharp.Threading.Tasks
                    result.cancellationTokenRegistration = cancellationToken.RegisterWithoutCaptureExecutionContext(state =>
                    {
                        var promise = (AsyncOperationHandleConfiguredSource)state;
+                        if (promise.autoReleaseWhenCanceled && promise.handle.IsValid())
+                        {
+                            Addressables.Release(promise.handle);
+                        }
                        promise.core.TrySetCanceled(promise.cancellationToken);
                    }, result);
                }
@@ -152,41 +156,56 @@ namespace Cysharp.Threading.Tasks

                PlayerLoopHelper.AddAction(timing, result);

-                handle.Completed += result.continuationAction;
+                handle.Completed += result.completedCallback;

                token = result.core.Version;
                return result;
            }

-            void Continuation(AsyncOperationHandle _)
+            void HandleCompleted(AsyncOperationHandle _)
            {
-                handle.Completed -= continuationAction;
+                if (handle.IsValid())
+                {
+                    handle.Completed -= completedCallback;
+                }

                if (completed)
                {
-                    TryReturn();
+                    return;
+                }
+                
+                completed = true;
+                if (cancellationToken.IsCancellationRequested)
+                {
+                    if (autoReleaseWhenCanceled && handle.IsValid())
+                    {
+                        Addressables.Release(handle);
+                    }
+                    core.TrySetCanceled(cancellationToken);
+                }
+                else if (handle.Status == AsyncOperationStatus.Failed)
+                {
+                    core.TrySetException(handle.OperationException);
                }
                else
                {
-                    completed = true;
-                    if (cancellationToken.IsCancellationRequested)
-                    {
-                        core.TrySetCanceled(cancellationToken);
-                    }
-                    else if (handle.Status == AsyncOperationStatus.Failed)
-                    {
-                        core.TrySetException(handle.OperationException);
-                    }
-                    else
-                    {
-                        core.TrySetResult(AsyncUnit.Default);
-                    }
+                    core.TrySetResult(AsyncUnit.Default);
                }
            }

            public void GetResult(short token)
            {
-                core.GetResult(token);
+                try
+                {
+                    core.GetResult(token);
+                }
+                finally
+                {
+                    if (!(cancelImmediately && cancellationToken.IsCancellationRequested))
+                    {
+                        TryReturn();
+                    }
+                }
            }

            public UniTaskStatus GetStatus(short token)
@@ -208,13 +227,16 @@ namespace Cysharp.Threading.Tasks
            {
                if (completed)
                {
-                    TryReturn();
                    return false;
                }

                if (cancellationToken.IsCancellationRequested)
                {
                    completed = true;
+                    if (autoReleaseWhenCanceled && handle.IsValid())
+                    {
+                        Addressables.Release(handle);
+                    }
                    core.TrySetCanceled(cancellationToken);
                    return false;
                }
@@ -248,17 +270,12 @@ namespace Cysharp.Threading.Tasks
            return ToUniTask(handle).GetAwaiter();
        }

-        public static UniTask<T> WithCancellation<T>(this AsyncOperationHandle<T> handle, CancellationToken cancellationToken)
+        public static UniTask<T> WithCancellation<T>(this AsyncOperationHandle<T> handle, CancellationToken cancellationToken, bool cancelImmediately = false, bool autoReleaseWhenCanceled = false)
        {
-            return ToUniTask(handle, cancellationToken: cancellationToken);
+            return ToUniTask(handle, cancellationToken: cancellationToken, cancelImmediately: cancelImmediately, autoReleaseWhenCanceled: autoReleaseWhenCanceled);
        }

-        public static UniTask<T> WithCancellation<T>(this AsyncOperationHandle<T> handle, CancellationToken cancellationToken, bool cancelImmediately)
-        {
-            return ToUniTask(handle, cancellationToken: cancellationToken, cancelImmediately: cancelImmediately);
-        }
-
-        public static UniTask<T> ToUniTask<T>(this AsyncOperationHandle<T> handle, IProgress<float> progress = null, PlayerLoopTiming timing = PlayerLoopTiming.Update, CancellationToken cancellationToken = default(CancellationToken), bool cancelImmediately = false)
+        public static UniTask<T> ToUniTask<T>(this AsyncOperationHandle<T> handle, IProgress<float> progress = null, PlayerLoopTiming timing = PlayerLoopTiming.Update, CancellationToken cancellationToken = default(CancellationToken), bool cancelImmediately = false, bool autoReleaseWhenCanceled = false)
        {
            if (cancellationToken.IsCancellationRequested) return UniTask.FromCanceled<T>(cancellationToken);

@@ -276,7 +293,7 @@ namespace Cysharp.Threading.Tasks
                return UniTask.FromResult(handle.Result);
            }

-            return new UniTask<T>(AsyncOperationHandleConfiguredSource<T>.Create(handle, timing, progress, cancellationToken, cancelImmediately, out var token), token);
+            return new UniTask<T>(AsyncOperationHandleConfiguredSource<T>.Create(handle, timing, progress, cancellationToken, cancelImmediately, autoReleaseWhenCanceled, out var token), token);
        }

        sealed class AsyncOperationHandleConfiguredSource<T> : IUniTaskSource<T>, IPlayerLoopItem, ITaskPoolNode<AsyncOperationHandleConfiguredSource<T>>
@@ -290,21 +307,23 @@ namespace Cysharp.Threading.Tasks
                TaskPool.RegisterSizeGetter(typeof(AsyncOperationHandleConfiguredSource<T>), () => pool.Size);
            }

-            readonly Action<AsyncOperationHandle<T>> continuationAction;
+            readonly Action<AsyncOperationHandle<T>> completedCallback;
            AsyncOperationHandle<T> handle;
            CancellationToken cancellationToken;
            CancellationTokenRegistration cancellationTokenRegistration;
            IProgress<float> progress;
+            bool autoReleaseWhenCanceled;
+            bool cancelImmediately;
            bool completed;

            UniTaskCompletionSourceCore<T> core;

            AsyncOperationHandleConfiguredSource()
            {
-                continuationAction = Continuation;
+                completedCallback = HandleCompleted;
            }

-            public static IUniTaskSource<T> Create(AsyncOperationHandle<T> handle, PlayerLoopTiming timing, IProgress<float> progress, CancellationToken cancellationToken, bool cancelImmediately, out short token)
+            public static IUniTaskSource<T> Create(AsyncOperationHandle<T> handle, PlayerLoopTiming timing, IProgress<float> progress, CancellationToken cancellationToken, bool cancelImmediately, bool autoReleaseWhenCanceled, out short token)
            {
                if (cancellationToken.IsCancellationRequested)
                {
@@ -320,12 +339,18 @@ namespace Cysharp.Threading.Tasks
                result.cancellationToken = cancellationToken;
                result.completed = false;
                result.progress = progress;
+                result.autoReleaseWhenCanceled = autoReleaseWhenCanceled;
+                result.cancelImmediately = cancelImmediately;
                
                if (cancelImmediately && cancellationToken.CanBeCanceled)
                {
                    result.cancellationTokenRegistration = cancellationToken.RegisterWithoutCaptureExecutionContext(state =>
                    {
                        var promise = (AsyncOperationHandleConfiguredSource<T>)state;
+                        if (promise.autoReleaseWhenCanceled && promise.handle.IsValid())
+                        {
+                            Addressables.Release(promise.handle);
+                        }
                        promise.core.TrySetCanceled(promise.cancellationToken);
                    }, result);
                }
@@ -334,41 +359,53 @@ namespace Cysharp.Threading.Tasks

                PlayerLoopHelper.AddAction(timing, result);

-                handle.Completed += result.continuationAction;
+                handle.Completed += result.completedCallback;

                token = result.core.Version;
                return result;
            }

-            void Continuation(AsyncOperationHandle<T> argHandle)
+            void HandleCompleted(AsyncOperationHandle<T> argHandle)
            {
-                handle.Completed -= continuationAction;
+                if (handle.IsValid())
+                {
+                    handle.Completed -= completedCallback;
+                }

                if (completed)
                {
-                    TryReturn();
+                    return;
+                }
+                completed = true;
+                if (cancellationToken.IsCancellationRequested)
+                {
+                    if (autoReleaseWhenCanceled && handle.IsValid())
+                    {
+                        Addressables.Release(handle);
+                    }
+                    core.TrySetCanceled(cancellationToken);
+                }
+                else if (argHandle.Status == AsyncOperationStatus.Failed)
+                {
+                    core.TrySetException(argHandle.OperationException);
                }
                else
                {
-                    completed = true;
-                    if (cancellationToken.IsCancellationRequested)
-                    {
-                        core.TrySetCanceled(cancellationToken);
-                    }
-                    else if (argHandle.Status == AsyncOperationStatus.Failed)
-                    {
-                        core.TrySetException(argHandle.OperationException);
-                    }
-                    else
-                    {
-                        core.TrySetResult(argHandle.Result);
-                    }
+                    core.TrySetResult(argHandle.Result);
                }
            }

            public T GetResult(short token)
            {
-                return core.GetResult(token);
+                try
+                {
+                    return core.GetResult(token);
+                }
+                finally
+                {
+                    if (!(cancelImmediately && cancellationToken.IsCancellationRequested))
+                        TryReturn();
+                }
            }

            void IUniTaskSource.GetResult(short token)
@@ -395,13 +432,16 @@ namespace Cysharp.Threading.Tasks
            {
                if (completed)
                {
-                    TryReturn();
                    return false;
                }

                if (cancellationToken.IsCancellationRequested)
                {
                    completed = true;
+                    if (autoReleaseWhenCanceled && handle.IsValid())
+                    {
+                        Addressables.Release(handle);
+                    }
                    core.TrySetCanceled(cancellationToken);
                    return false;
                }
--- a/src/UniTask/Assets/Plugins/UniTask/Runtime/External/Addressables/UniTask.Addressables.asmdef
+++ b/src/UniTask/Assets/Plugins/UniTask/Runtime/External/Addressables/UniTask.Addressables.asmdef
@@ -2,7 +2,8 @@
    "name": "UniTask.Addressables",
    "references": [
        "UniTask",
-        "Unity.ResourceManager"
+        "Unity.ResourceManager",
+        "Unity.Addressables"
    ],
    "includePlatforms": [],
    "excludePlatforms": [],
--- a/src/UniTask/Assets/Plugins/UniTask/Runtime/IUniTaskSource.cs
+++ b/src/UniTask/Assets/Plugins/UniTask/Runtime/IUniTaskSource.cs
@@ -1,4 +1,9 @@
 #pragma warning disable CS1591
+#pragma warning disable CS0108
+
+#if (UNITASK_NETCORE && !NETSTANDARD2_0) || UNITY_2022_3_OR_NEWER
+#define SUPPORT_VALUETASK
+#endif

 using System;
 using System.Runtime.CompilerServices;
@@ -19,9 +24,8 @@ namespace Cysharp.Threading.Tasks

    // similar as IValueTaskSource
    public interface IUniTaskSource
-#if (!UNITY_2018_3_OR_NEWER || UNITY_2021_2_OR_NEWER) && !NETSTANDARD2_0
+#if SUPPORT_VALUETASK
        : System.Threading.Tasks.Sources.IValueTaskSource
-#pragma warning disable CS0108
 #endif
    {
        UniTaskStatus GetStatus(short token);
@@ -30,8 +34,7 @@ namespace Cysharp.Threading.Tasks

        UniTaskStatus UnsafeGetStatus(); // only for debug use.

-#if (!UNITY_2018_3_OR_NEWER || UNITY_2021_2_OR_NEWER) && !NETSTANDARD2_0
-#pragma warning restore CS0108
+#if SUPPORT_VALUETASK

        System.Threading.Tasks.Sources.ValueTaskSourceStatus System.Threading.Tasks.Sources.IValueTaskSource.GetStatus(short token)
        {
@@ -53,13 +56,13 @@ namespace Cysharp.Threading.Tasks
    }

    public interface IUniTaskSource<out T> : IUniTaskSource
-#if (!UNITY_2018_3_OR_NEWER || UNITY_2021_2_OR_NEWER) && !NETSTANDARD2_0
+#if SUPPORT_VALUETASK
        , System.Threading.Tasks.Sources.IValueTaskSource<T>
 #endif
    {
        new T GetResult(short token);

-#if (!UNITY_2018_3_OR_NEWER || UNITY_2021_2_OR_NEWER) && !NETSTANDARD2_0
+#if SUPPORT_VALUETASK

        new public UniTaskStatus GetStatus(short token)
        {
--- a/src/UniTask/Assets/Plugins/UniTask/Runtime/Linq/Merge.cs
+++ b/src/UniTask/Assets/Plugins/UniTask/Runtime/Linq/Merge.cs
@@ -27,7 +27,9 @@ namespace Cysharp.Threading.Tasks.Linq

        public static IUniTaskAsyncEnumerable<T> Merge<T>(this IEnumerable<IUniTaskAsyncEnumerable<T>> sources)
        {
-            return new Merge<T>(sources.ToArray());
+            return sources is IUniTaskAsyncEnumerable<T>[] array
+                ? new Merge<T>(array)
+                : new Merge<T>(sources.ToArray());
        }

        public static IUniTaskAsyncEnumerable<T> Merge<T>(params IUniTaskAsyncEnumerable<T>[] sources)
--- a/src/UniTask/Assets/Plugins/UniTask/Runtime/UniTask.AsValueTask.cs
+++ b/src/UniTask/Assets/Plugins/UniTask/Runtime/UniTask.AsValueTask.cs
@@ -1,5 +1,10 @@
-#if !UNITY_2018_3_OR_NEWER || UNITY_2021_2_OR_NEWER
-#pragma warning disable 0649
+#pragma warning disable 0649
+
+#if UNITASK_NETCORE || UNITY_2022_3_OR_NEWER
+#define SUPPORT_VALUETASK
+#endif
+
+#if SUPPORT_VALUETASK

 using System;
 using System.Threading.Tasks;
@@ -11,7 +16,7 @@ namespace Cysharp.Threading.Tasks
    {
        public static ValueTask AsValueTask(this in UniTask task)
        {
-#if NETSTANDARD2_0
+#if (UNITASK_NETCORE && NETSTANDARD2_0)
            return new ValueTask(new UniTaskValueTaskSource(task), 0);
 #else
            return task;
@@ -20,7 +25,7 @@ namespace Cysharp.Threading.Tasks

        public static ValueTask<T> AsValueTask<T>(this in UniTask<T> task)
        {
-#if NETSTANDARD2_0
+#if (UNITASK_NETCORE && NETSTANDARD2_0)
            return new ValueTask<T>(new UniTaskValueTaskSource<T>(task), 0);
 #else
            return task;
@@ -37,7 +42,7 @@ namespace Cysharp.Threading.Tasks
            await task;
        }

-#if NETSTANDARD2_0
+#if (UNITASK_NETCORE && NETSTANDARD2_0)

        class UniTaskValueTaskSource : IValueTaskSource
        {
--- a/src/UniTask/Assets/Plugins/UniTask/Runtime/UniTask.Delay.cs
+++ b/src/UniTask/Assets/Plugins/UniTask/Runtime/UniTask.Delay.cs
@@ -208,6 +208,7 @@ namespace Cysharp.Threading.Tasks

            CancellationToken cancellationToken;
            CancellationTokenRegistration cancellationTokenRegistration;
+            bool cancelImmediately;
            UniTaskCompletionSourceCore<object> core;

            YieldPromise()
@@ -227,6 +228,7 @@ namespace Cysharp.Threading.Tasks
                }

                result.cancellationToken = cancellationToken;
+                result.cancelImmediately = cancelImmediately;
                
                if (cancelImmediately && cancellationToken.CanBeCanceled)
                {
@@ -253,7 +255,10 @@ namespace Cysharp.Threading.Tasks
                }
                finally
                {
-                    TryReturn();
+                    if (!(cancelImmediately && cancellationToken.IsCancellationRequested))
+                    {
+                        TryReturn();
+                    }
                }
            }

@@ -290,6 +295,7 @@ namespace Cysharp.Threading.Tasks
                core.Reset();
                cancellationToken = default;
                cancellationTokenRegistration.Dispose();
+                cancelImmediately = default;
                return pool.TryPush(this);
            }
        }
@@ -309,6 +315,7 @@ namespace Cysharp.Threading.Tasks
            UniTaskCompletionSourceCore<AsyncUnit> core;
            CancellationToken cancellationToken;
            CancellationTokenRegistration cancellationTokenRegistration;
+            bool cancelImmediately;

            NextFramePromise()
            {
@@ -328,6 +335,7 @@ namespace Cysharp.Threading.Tasks

                result.frameCount = PlayerLoopHelper.IsMainThread ? Time.frameCount : -1;
                result.cancellationToken = cancellationToken;
+                result.cancelImmediately = cancelImmediately;

                if (cancelImmediately && cancellationToken.CanBeCanceled)
                {
@@ -354,7 +362,10 @@ namespace Cysharp.Threading.Tasks
                }
                finally
                {
-                    TryReturn();
+                    if (!(cancelImmediately && cancellationToken.IsCancellationRequested))
+                    {
+                        TryReturn();
+                    }
                }
            }

@@ -414,6 +425,7 @@ namespace Cysharp.Threading.Tasks
            UniTaskCompletionSourceCore<object> core;
            CancellationToken cancellationToken;
            CancellationTokenRegistration cancellationTokenRegistration;
+            bool cancelImmediately;

            WaitForEndOfFramePromise()
            {
@@ -432,6 +444,7 @@ namespace Cysharp.Threading.Tasks
                }

                result.cancellationToken = cancellationToken;
+                result.cancelImmediately = cancelImmediately;

                if (cancelImmediately && cancellationToken.CanBeCanceled)
                {
@@ -458,7 +471,10 @@ namespace Cysharp.Threading.Tasks
                }
                finally
                {
-                    TryReturn();
+                    if (!(cancelImmediately && cancellationToken.IsCancellationRequested))
+                    {
+                        TryReturn();
+                    }
                }
            }

@@ -533,6 +549,7 @@ namespace Cysharp.Threading.Tasks
            int delayFrameCount;
            CancellationToken cancellationToken;
            CancellationTokenRegistration cancellationTokenRegistration;
+            bool cancelImmediately;

            int currentFrameCount;
            UniTaskCompletionSourceCore<AsyncUnit> core;
@@ -556,6 +573,7 @@ namespace Cysharp.Threading.Tasks
                result.delayFrameCount = delayFrameCount;
                result.cancellationToken = cancellationToken;
                result.initialFrame = PlayerLoopHelper.IsMainThread ? Time.frameCount : -1;
+                result.cancelImmediately = cancelImmediately;

                if (cancelImmediately && cancellationToken.CanBeCanceled)
                {
@@ -582,7 +600,10 @@ namespace Cysharp.Threading.Tasks
                }
                finally
                {
-                    TryReturn();
+                    if (!(cancelImmediately && cancellationToken.IsCancellationRequested))
+                    {
+                        TryReturn();
+                    }
                }
            }

@@ -653,6 +674,7 @@ namespace Cysharp.Threading.Tasks
                delayFrameCount = default;
                cancellationToken = default;
                cancellationTokenRegistration.Dispose();
+                cancelImmediately = default;
                return pool.TryPush(this);
            }
        }
@@ -673,6 +695,7 @@ namespace Cysharp.Threading.Tasks
            float elapsed;
            CancellationToken cancellationToken;
            CancellationTokenRegistration cancellationTokenRegistration;
+            bool cancelImmediately;

            UniTaskCompletionSourceCore<object> core;

@@ -696,6 +719,7 @@ namespace Cysharp.Threading.Tasks
                result.delayTimeSpan = (float)delayTimeSpan.TotalSeconds;
                result.cancellationToken = cancellationToken;
                result.initialFrame = PlayerLoopHelper.IsMainThread ? Time.frameCount : -1;
+                result.cancelImmediately = cancelImmediately;

                if (cancelImmediately && cancellationToken.CanBeCanceled)
                {
@@ -722,7 +746,10 @@ namespace Cysharp.Threading.Tasks
                }
                finally
                {
-                    TryReturn();
+                    if (!(cancelImmediately && cancellationToken.IsCancellationRequested))
+                    {
+                        TryReturn();
+                    }
                }
            }

@@ -775,6 +802,7 @@ namespace Cysharp.Threading.Tasks
                elapsed = default;
                cancellationToken = default;
                cancellationTokenRegistration.Dispose();
+                cancelImmediately = default;
                return pool.TryPush(this);
            }
        }
@@ -795,6 +823,7 @@ namespace Cysharp.Threading.Tasks
            int initialFrame;
            CancellationToken cancellationToken;
            CancellationTokenRegistration cancellationTokenRegistration;
+            bool cancelImmediately;

            UniTaskCompletionSourceCore<object> core;

@@ -818,6 +847,7 @@ namespace Cysharp.Threading.Tasks
                result.delayFrameTimeSpan = (float)delayFrameTimeSpan.TotalSeconds;
                result.initialFrame = PlayerLoopHelper.IsMainThread ? Time.frameCount : -1;
                result.cancellationToken = cancellationToken;
+                result.cancelImmediately = cancelImmediately;

                if (cancelImmediately && cancellationToken.CanBeCanceled)
                {
@@ -844,7 +874,10 @@ namespace Cysharp.Threading.Tasks
                }
                finally
                {
-                    TryReturn();
+                    if (!(cancelImmediately && cancellationToken.IsCancellationRequested))
+                    {
+                        TryReturn();
+                    }
                }
            }

@@ -897,6 +930,7 @@ namespace Cysharp.Threading.Tasks
                elapsed = default;
                cancellationToken = default;
                cancellationTokenRegistration.Dispose();
+                cancelImmediately = default;
                return pool.TryPush(this);
            }
        }
@@ -916,6 +950,7 @@ namespace Cysharp.Threading.Tasks
            ValueStopwatch stopwatch;
            CancellationToken cancellationToken;
            CancellationTokenRegistration cancellationTokenRegistration;
+            bool cancelImmediately;

            UniTaskCompletionSourceCore<AsyncUnit> core;

@@ -938,6 +973,7 @@ namespace Cysharp.Threading.Tasks
                result.stopwatch = ValueStopwatch.StartNew();
                result.delayTimeSpanTicks = delayTimeSpan.Ticks;
                result.cancellationToken = cancellationToken;
+                result.cancelImmediately = cancelImmediately;

                if (cancelImmediately && cancellationToken.CanBeCanceled)
                {
@@ -964,7 +1000,10 @@ namespace Cysharp.Threading.Tasks
                }
                finally
                {
-                    TryReturn();
+                    if (!(cancelImmediately && cancellationToken.IsCancellationRequested))
+                    {
+                        TryReturn();
+                    }
                }
            }

@@ -1013,6 +1052,7 @@ namespace Cysharp.Threading.Tasks
                stopwatch = default;
                cancellationToken = default;
                cancellationTokenRegistration.Dispose();
+                cancelImmediately = default;
                return pool.TryPush(this);
            }
        }
--- a/src/UniTask/Assets/Plugins/UniTask/Runtime/UniTask.WaitUntil.cs
+++ b/src/UniTask/Assets/Plugins/UniTask/Runtime/UniTask.WaitUntil.cs
@@ -49,6 +49,7 @@ namespace Cysharp.Threading.Tasks
            Func<bool> predicate;
            CancellationToken cancellationToken;
            CancellationTokenRegistration cancellationTokenRegistration;
+            bool cancelImmediately;

            UniTaskCompletionSourceCore<object> core;

@@ -70,6 +71,7 @@ namespace Cysharp.Threading.Tasks

                result.predicate = predicate;
                result.cancellationToken = cancellationToken;
+                result.cancelImmediately = cancelImmediately;

                if (cancelImmediately && cancellationToken.CanBeCanceled)
                {
@@ -96,7 +98,10 @@ namespace Cysharp.Threading.Tasks
                }
                finally
                {
-                    TryReturn();
+                    if (!(cancelImmediately && cancellationToken.IsCancellationRequested))
+                    {
+                        TryReturn();
+                    }
                }
            }

@@ -147,6 +152,7 @@ namespace Cysharp.Threading.Tasks
                predicate = default;
                cancellationToken = default;
                cancellationTokenRegistration.Dispose();
+                cancelImmediately = default;
                return pool.TryPush(this);
            }
        }
@@ -165,6 +171,7 @@ namespace Cysharp.Threading.Tasks
            Func<bool> predicate;
            CancellationToken cancellationToken;
            CancellationTokenRegistration cancellationTokenRegistration;
+            bool cancelImmediately;

            UniTaskCompletionSourceCore<object> core;

@@ -212,7 +219,10 @@ namespace Cysharp.Threading.Tasks
                }
                finally
                {
-                    TryReturn();
+                    if (!(cancelImmediately && cancellationToken.IsCancellationRequested))
+                    {
+                        TryReturn();
+                    }
                }
            }

@@ -263,6 +273,7 @@ namespace Cysharp.Threading.Tasks
                predicate = default;
                cancellationToken = default;
                cancellationTokenRegistration.Dispose();
+                cancelImmediately = default;
                return pool.TryPush(this);
            }
        }
@@ -280,6 +291,7 @@ namespace Cysharp.Threading.Tasks

            CancellationToken cancellationToken;
            CancellationTokenRegistration cancellationTokenRegistration;
+            bool cancelImmediately;

            UniTaskCompletionSourceCore<object> core;

@@ -287,7 +299,7 @@ namespace Cysharp.Threading.Tasks
            {
            }

-            public static IUniTaskSource Create(CancellationToken cancellationToken, PlayerLoopTiming timing, bool completeImmediately, out short token)
+            public static IUniTaskSource Create(CancellationToken cancellationToken, PlayerLoopTiming timing, bool cancelImmediately, out short token)
            {
                if (cancellationToken.IsCancellationRequested)
                {
@@ -300,8 +312,9 @@ namespace Cysharp.Threading.Tasks
                }

                result.cancellationToken = cancellationToken;
+                result.cancelImmediately = cancelImmediately;

-                if (completeImmediately && cancellationToken.CanBeCanceled)
+                if (cancelImmediately && cancellationToken.CanBeCanceled)
                {
                    result.cancellationTokenRegistration = cancellationToken.RegisterWithoutCaptureExecutionContext(state =>
                    {
@@ -326,7 +339,10 @@ namespace Cysharp.Threading.Tasks
                }
                finally
                {
-                    TryReturn();
+                    if (!(cancelImmediately && cancellationToken.IsCancellationRequested))
+                    {
+                        TryReturn();
+                    }
                }
            }

@@ -362,6 +378,7 @@ namespace Cysharp.Threading.Tasks
                core.Reset();
                cancellationToken = default;
                cancellationTokenRegistration.Dispose();
+                cancelImmediately = default;
                return pool.TryPush(this);
            }
        }
@@ -385,6 +402,7 @@ namespace Cysharp.Threading.Tasks
            IEqualityComparer<U> equalityComparer;
            CancellationToken cancellationToken;
            CancellationTokenRegistration cancellationTokenRegistration;
+            bool cancelImmediately;

            UniTaskCompletionSourceCore<U> core;

@@ -410,6 +428,7 @@ namespace Cysharp.Threading.Tasks
                result.currentValue = monitorFunction(target);
                result.equalityComparer = equalityComparer ?? UnityEqualityComparer.GetDefault<U>();
                result.cancellationToken = cancellationToken;
+                result.cancelImmediately = cancelImmediately;
                
                if (cancelImmediately && cancellationToken.CanBeCanceled)
                {
@@ -436,7 +455,10 @@ namespace Cysharp.Threading.Tasks
                }
                finally
                {
-                    TryReturn();
+                    if (!(cancelImmediately && cancellationToken.IsCancellationRequested))
+                    {
+                        TryReturn();
+                    }
                }
            }

@@ -497,6 +519,7 @@ namespace Cysharp.Threading.Tasks
                equalityComparer = default;
                cancellationToken = default;
                cancellationTokenRegistration.Dispose();
+                cancelImmediately = default;
                return pool.TryPush(this);
            }
        }
@@ -519,6 +542,7 @@ namespace Cysharp.Threading.Tasks
            IEqualityComparer<U> equalityComparer;
            CancellationToken cancellationToken;
            CancellationTokenRegistration cancellationTokenRegistration;
+            bool cancelImmediately;

            UniTaskCompletionSourceCore<U> core;

@@ -543,6 +567,7 @@ namespace Cysharp.Threading.Tasks
                result.currentValue = monitorFunction(target);
                result.equalityComparer = equalityComparer ?? UnityEqualityComparer.GetDefault<U>();
                result.cancellationToken = cancellationToken;
+                result.cancelImmediately = cancelImmediately;
                
                if (cancelImmediately && cancellationToken.CanBeCanceled)
                {
@@ -569,7 +594,10 @@ namespace Cysharp.Threading.Tasks
                }
                finally
                {
-                    TryReturn();
+                    if (!(cancelImmediately && cancellationToken.IsCancellationRequested))
+                    {
+                        TryReturn();
+                    }
                }
            }

@@ -630,6 +658,7 @@ namespace Cysharp.Threading.Tasks
                equalityComparer = default;
                cancellationToken = default;
                cancellationTokenRegistration.Dispose();
+                cancelImmediately = default;
                return pool.TryPush(this);
            }
        }
--- a/src/UniTask/Assets/Plugins/UniTask/Runtime/UniTask.cs
+++ b/src/UniTask/Assets/Plugins/UniTask/Runtime/UniTask.cs
@@ -1,6 +1,10 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 #pragma warning disable CS0436

+#if UNITASK_NETCORE || UNITY_2022_3_OR_NEWER
+#define SUPPORT_VALUETASK
+#endif
+
 using Cysharp.Threading.Tasks.CompilerServices;
 using System;
 using System.Diagnostics;
@@ -69,7 +73,7 @@ namespace Cysharp.Threading.Tasks
            return new UniTask<bool>(new IsCanceledSource(source), token);
        }

-#if !UNITY_2018_3_OR_NEWER || UNITY_2021_2_OR_NEWER
+#if SUPPORT_VALUETASK

        public static implicit operator System.Threading.Tasks.ValueTask(in UniTask self)
        {
@@ -78,7 +82,7 @@ namespace Cysharp.Threading.Tasks
                return default;
            }

-#if NETSTANDARD2_0
+#if (UNITASK_NETCORE && NETSTANDARD2_0)
            return self.AsValueTask();
 #else
            return new System.Threading.Tasks.ValueTask(self.source, self.token);
@@ -118,7 +122,7 @@ namespace Cysharp.Threading.Tasks
                this.source.GetResult(this.token);
                return CompletedTasks.AsyncUnit;
            }
-            else if(this.source is IUniTaskSource<AsyncUnit> asyncUnitSource)
+            else if (this.source is IUniTaskSource<AsyncUnit> asyncUnitSource)
            {
                return new UniTask<AsyncUnit>(asyncUnitSource, this.token);
            }
@@ -440,7 +444,7 @@ namespace Cysharp.Threading.Tasks
            return self.AsUniTask();
        }

-#if !UNITY_2018_3_OR_NEWER || UNITY_2021_2_OR_NEWER
+#if SUPPORT_VALUETASK

        public static implicit operator System.Threading.Tasks.ValueTask<T>(in UniTask<T> self)
        {
@@ -449,7 +453,7 @@ namespace Cysharp.Threading.Tasks
                return new System.Threading.Tasks.ValueTask<T>(self.result);
            }

-#if NETSTANDARD2_0
+#if (UNITASK_NETCORE && NETSTANDARD2_0)
            return self.AsValueTask();
 #else
            return new System.Threading.Tasks.ValueTask<T>(self.source, self.token);
--- a/src/UniTask/Assets/Plugins/UniTask/Runtime/UnityAsyncExtensions.AssetBundleRequestAllAssets.cs
+++ b/src/UniTask/Assets/Plugins/UniTask/Runtime/UnityAsyncExtensions.AssetBundleRequestAllAssets.cs
@@ -101,6 +101,7 @@ namespace Cysharp.Threading.Tasks
            IProgress<float> progress;
            CancellationToken cancellationToken;
            CancellationTokenRegistration cancellationTokenRegistration;
+            bool cancelImmediately;
            bool completed;

            UniTaskCompletionSourceCore<UnityEngine.Object[]> core;
@@ -127,6 +128,7 @@ namespace Cysharp.Threading.Tasks
                result.asyncOperation = asyncOperation;
                result.progress = progress;
                result.cancellationToken = cancellationToken;
+                result.cancelImmediately = cancelImmediately;
                result.completed = false;

                asyncOperation.completed += result.continuationAction;
@@ -156,7 +158,10 @@ namespace Cysharp.Threading.Tasks
                }
                finally
                {
-                    TryReturn();
+                    if (!(cancelImmediately && cancellationToken.IsCancellationRequested))
+                    {
+                        TryReturn();
+                    }
                }
            }

@@ -216,6 +221,7 @@ namespace Cysharp.Threading.Tasks
                progress = default;
                cancellationToken = default;
                cancellationTokenRegistration.Dispose();
+                cancelImmediately = default;
                return pool.TryPush(this);
            }
            
@@ -223,19 +229,17 @@ namespace Cysharp.Threading.Tasks
            {
                if (completed)
                {
-                    TryReturn();
+                    return;
+                }
+                
+                completed = true;
+                if (cancellationToken.IsCancellationRequested)
+                {
+                    core.TrySetCanceled(cancellationToken);
                }
                else
                {
-                    completed = true;
-                    if (cancellationToken.IsCancellationRequested)
-                    {
-                        core.TrySetCanceled(cancellationToken);
-                    }
-                    else
-                    {
-                        core.TrySetResult(asyncOperation.allAssets);
-                    }
+                    core.TrySetResult(asyncOperation.allAssets);
                }
            }
        }
--- a/src/UniTask/Assets/Plugins/UniTask/Runtime/UnityAsyncExtensions.AsyncGPUReadback.cs
+++ b/src/UniTask/Assets/Plugins/UniTask/Runtime/UnityAsyncExtensions.AsyncGPUReadback.cs
@@ -45,7 +45,7 @@ namespace Cysharp.Threading.Tasks
            AsyncGPUReadbackRequest asyncOperation;
            CancellationToken cancellationToken;
            CancellationTokenRegistration cancellationTokenRegistration;
-
+            bool cancelImmediately;
            UniTaskCompletionSourceCore<AsyncGPUReadbackRequest> core;

            AsyncGPUReadbackRequestAwaiterConfiguredSource()
@@ -66,6 +66,7 @@ namespace Cysharp.Threading.Tasks

                result.asyncOperation = asyncOperation;
                result.cancellationToken = cancellationToken;
+                result.cancelImmediately = cancelImmediately;
                
                if (cancelImmediately && cancellationToken.CanBeCanceled)
                {
@@ -92,7 +93,10 @@ namespace Cysharp.Threading.Tasks
                }
                finally
                {
-                    TryReturn();
+                    if (!(cancelImmediately && cancellationToken.IsCancellationRequested))
+                    {
+                        TryReturn();
+                    }
                }
            }

@@ -146,6 +150,7 @@ namespace Cysharp.Threading.Tasks
                asyncOperation = default;
                cancellationToken = default;
                cancellationTokenRegistration.Dispose();
+                cancelImmediately = default;
                return pool.TryPush(this);
            }
        }
--- a/src/UniTask/Assets/Plugins/UniTask/Runtime/UnityAsyncExtensions.cs
+++ b/src/UniTask/Assets/Plugins/UniTask/Runtime/UnityAsyncExtensions.cs
@@ -97,6 +97,7 @@ namespace Cysharp.Threading.Tasks
            IProgress<float> progress;
            CancellationToken cancellationToken;
            CancellationTokenRegistration cancellationTokenRegistration;
+            bool cancelImmediately;
            bool completed;

            UniTaskCompletionSourceCore<AsyncUnit> core;
@@ -123,6 +124,7 @@ namespace Cysharp.Threading.Tasks
                result.asyncOperation = asyncOperation;
                result.progress = progress;
                result.cancellationToken = cancellationToken;
+                result.cancelImmediately = cancelImmediately;
                result.completed = false;
                
                asyncOperation.completed += result.continuationAction;
@@ -152,7 +154,10 @@ namespace Cysharp.Threading.Tasks
                }
                finally
                {
-                    TryReturn();
+                    if (!(cancelImmediately && cancellationToken.IsCancellationRequested))
+                    {
+                        TryReturn();
+                    }
                }
            }

@@ -209,6 +214,7 @@ namespace Cysharp.Threading.Tasks
                progress = default;
                cancellationToken = default;
                cancellationTokenRegistration.Dispose();
+                cancelImmediately = default;
                return pool.TryPush(this);
            }

@@ -216,19 +222,16 @@ namespace Cysharp.Threading.Tasks
            {
                if (completed)
                {
-                    TryReturn();
+                    return;
+                }
+                completed = true;
+                if (cancellationToken.IsCancellationRequested)
+                {
+                    core.TrySetCanceled(cancellationToken);
                }
                else
                {
-                    completed = true;
-                    if (cancellationToken.IsCancellationRequested)
-                    {
-                        core.TrySetCanceled(cancellationToken);
-                    }
-                    else
-                    {
-                        core.TrySetResult(AsyncUnit.Default);
-                    }
+                    core.TrySetResult(AsyncUnit.Default);
                }
            }
        }
@@ -320,6 +323,7 @@ namespace Cysharp.Threading.Tasks
            IProgress<float> progress;
            CancellationToken cancellationToken;
            CancellationTokenRegistration cancellationTokenRegistration;
+            bool cancelImmediately;
            bool completed;

            UniTaskCompletionSourceCore<UnityEngine.Object> core;
@@ -346,6 +350,7 @@ namespace Cysharp.Threading.Tasks
                result.asyncOperation = asyncOperation;
                result.progress = progress;
                result.cancellationToken = cancellationToken;
+                result.cancelImmediately = cancelImmediately;
                result.completed = false;
                
                asyncOperation.completed += result.continuationAction;
@@ -375,7 +380,10 @@ namespace Cysharp.Threading.Tasks
                }
                finally
                {
-                    TryReturn();
+                    if (!(cancelImmediately && cancellationToken.IsCancellationRequested))
+                    {
+                        TryReturn();
+                    }
                }
            }

@@ -436,6 +444,7 @@ namespace Cysharp.Threading.Tasks
                progress = default;
                cancellationToken = default;
                cancellationTokenRegistration.Dispose();
+                cancelImmediately = default;
                return pool.TryPush(this);
            }

@@ -443,19 +452,16 @@ namespace Cysharp.Threading.Tasks
            {
                if (completed)
                {
-                    TryReturn();
+                    return;
+                }
+                completed = true;
+                if (cancellationToken.IsCancellationRequested)
+                {
+                    core.TrySetCanceled(cancellationToken);
                }
                else
                {
-                    completed = true;
-                    if (cancellationToken.IsCancellationRequested)
-                    {
-                        core.TrySetCanceled(cancellationToken);
-                    }
-                    else
-                    {
-                        core.TrySetResult(asyncOperation.asset);
-                    }
+                    core.TrySetResult(asyncOperation.asset);
                }
            }
        }
@@ -548,6 +554,7 @@ namespace Cysharp.Threading.Tasks
            IProgress<float> progress;
            CancellationToken cancellationToken;
            CancellationTokenRegistration cancellationTokenRegistration;
+            bool cancelImmediately;
            bool completed;

            UniTaskCompletionSourceCore<UnityEngine.Object> core;
@@ -574,6 +581,7 @@ namespace Cysharp.Threading.Tasks
                result.asyncOperation = asyncOperation;
                result.progress = progress;
                result.cancellationToken = cancellationToken;
+                result.cancelImmediately = cancelImmediately;
                result.completed = false;
                
                asyncOperation.completed += result.continuationAction;
@@ -603,7 +611,10 @@ namespace Cysharp.Threading.Tasks
                }
                finally
                {
-                    TryReturn();
+                    if (!(cancelImmediately && cancellationToken.IsCancellationRequested))
+                    {
+                        TryReturn();
+                    }
                }
            }

@@ -664,6 +675,7 @@ namespace Cysharp.Threading.Tasks
                progress = default;
                cancellationToken = default;
                cancellationTokenRegistration.Dispose();
+                cancelImmediately = default;
                return pool.TryPush(this);
            }

@@ -671,19 +683,16 @@ namespace Cysharp.Threading.Tasks
            {
                if (completed)
                {
-                    TryReturn();
+                    return;
+                }
+                completed = true;
+                if (cancellationToken.IsCancellationRequested)
+                {
+                    core.TrySetCanceled(cancellationToken);
                }
                else
                {
-                    completed = true;
-                    if (cancellationToken.IsCancellationRequested)
-                    {
-                        core.TrySetCanceled(cancellationToken);
-                    }
-                    else
-                    {
-                        core.TrySetResult(asyncOperation.asset);
-                    }
+                    core.TrySetResult(asyncOperation.asset);
                }
            }
        }
@@ -777,6 +786,7 @@ namespace Cysharp.Threading.Tasks
            IProgress<float> progress;
            CancellationToken cancellationToken;
            CancellationTokenRegistration cancellationTokenRegistration;
+            bool cancelImmediately;
            bool completed;

            UniTaskCompletionSourceCore<AssetBundle> core;
@@ -803,6 +813,7 @@ namespace Cysharp.Threading.Tasks
                result.asyncOperation = asyncOperation;
                result.progress = progress;
                result.cancellationToken = cancellationToken;
+                result.cancelImmediately = cancelImmediately;
                result.completed = false;
                
                asyncOperation.completed += result.continuationAction;
@@ -832,7 +843,10 @@ namespace Cysharp.Threading.Tasks
                }
                finally
                {
-                    TryReturn();
+                    if (!(cancelImmediately && cancellationToken.IsCancellationRequested))
+                    {
+                        TryReturn();
+                    }
                }
            }

@@ -893,6 +907,7 @@ namespace Cysharp.Threading.Tasks
                progress = default;
                cancellationToken = default;
                cancellationTokenRegistration.Dispose();
+                cancelImmediately = default;
                return pool.TryPush(this);
            }

@@ -900,19 +915,16 @@ namespace Cysharp.Threading.Tasks
            {
                if (completed)
                {
-                    TryReturn();
+                    return;
+                }
+                completed = true;
+                if (cancellationToken.IsCancellationRequested)
+                {
+                    core.TrySetCanceled(cancellationToken);
                }
                else
                {
-                    completed = true;
-                    if (cancellationToken.IsCancellationRequested)
-                    {
-                        core.TrySetCanceled(cancellationToken);
-                    }
-                    else
-                    {
-                        core.TrySetResult(asyncOperation.assetBundle);
-                    }
+                    core.TrySetResult(asyncOperation.assetBundle);
                }
            }
        }
@@ -1021,6 +1033,7 @@ namespace Cysharp.Threading.Tasks
            IProgress<float> progress;
            CancellationToken cancellationToken;
            CancellationTokenRegistration cancellationTokenRegistration;
+            bool cancelImmediately;
            bool completed;

            UniTaskCompletionSourceCore<UnityWebRequest> core;
@@ -1047,6 +1060,7 @@ namespace Cysharp.Threading.Tasks
                result.asyncOperation = asyncOperation;
                result.progress = progress;
                result.cancellationToken = cancellationToken;
+                result.cancelImmediately = cancelImmediately;
                result.completed = false;
                
                asyncOperation.completed += result.continuationAction;
@@ -1077,7 +1091,10 @@ namespace Cysharp.Threading.Tasks
                }
                finally
                {
-                    TryReturn();
+                    if (!(cancelImmediately && cancellationToken.IsCancellationRequested))
+                    {
+                        TryReturn();
+                    }
                }
            }

@@ -1146,6 +1163,7 @@ namespace Cysharp.Threading.Tasks
                progress = default;
                cancellationToken = default;
                cancellationTokenRegistration.Dispose();
+                cancelImmediately = default;
                return pool.TryPush(this);
            }

@@ -1153,23 +1171,20 @@ namespace Cysharp.Threading.Tasks
            {
                if (completed)
                {
-                    TryReturn();
+                    return;
+                }
+                completed = true;
+                if (cancellationToken.IsCancellationRequested)
+                {
+                    core.TrySetCanceled(cancellationToken);
+                }
+                else if (asyncOperation.webRequest.IsError())
+                {
+                    core.TrySetException(new UnityWebRequestException(asyncOperation.webRequest));
                }
                else
                {
-                    completed = true;
-                    if (cancellationToken.IsCancellationRequested)
-                    {
-                        core.TrySetCanceled(cancellationToken);
-                    }
-                    else if (asyncOperation.webRequest.IsError())
-                    {
-                        core.TrySetException(new UnityWebRequestException(asyncOperation.webRequest));
-                    }
-                    else
-                    {
-                        core.TrySetResult(asyncOperation.webRequest);
-                    }
+                    core.TrySetResult(asyncOperation.webRequest);
                }
            }
        }
--- a/src/UniTask/Assets/Plugins/UniTask/Runtime/UnityAsyncExtensions.tt
+++ b/src/UniTask/Assets/Plugins/UniTask/Runtime/UnityAsyncExtensions.tt
@@ -165,6 +165,7 @@ namespace Cysharp.Threading.Tasks
            IProgress<float> progress;
            CancellationToken cancellationToken;
            CancellationTokenRegistration cancellationTokenRegistration;
+            bool cancelImmediately;
            bool completed;

            UniTaskCompletionSourceCore<<#= IsVoid(t) ? "AsyncUnit" : t.returnType #>> core;
@@ -191,6 +192,7 @@ namespace Cysharp.Threading.Tasks
                result.asyncOperation = asyncOperation;
                result.progress = progress;
                result.cancellationToken = cancellationToken;
+                result.cancelImmediately = cancelImmediately;
                result.completed = false;
                
                asyncOperation.completed += result.continuationAction;
@@ -227,7 +229,10 @@ namespace Cysharp.Threading.Tasks
                }
                finally
                {
-                    TryReturn();
+                    if (!(cancelImmediately && cancellationToken.IsCancellationRequested))
+                    {
+                        TryReturn();
+                    }
                }
            }

@@ -304,6 +309,7 @@ namespace Cysharp.Threading.Tasks
                progress = default;
                cancellationToken = default;
                cancellationTokenRegistration.Dispose();
+                cancelImmediately = default;
                return pool.TryPush(this);
            }

@@ -311,31 +317,28 @@ namespace Cysharp.Threading.Tasks
            {
                if (completed)
                {
-                    TryReturn();
+                    return;
+                }
+                completed = true;
+                if (cancellationToken.IsCancellationRequested)
+                {
+                    core.TrySetCanceled(cancellationToken);
+                }
+<# if(IsUnityWebRequest(t)) { #>
+                else if (asyncOperation.webRequest.IsError())
+                {
+                    core.TrySetException(new UnityWebRequestException(asyncOperation.webRequest));
                }
                else
                {
-                    completed = true;
-                    if (cancellationToken.IsCancellationRequested)
-                    {
-                        core.TrySetCanceled(cancellationToken);
-                    }
-<# if(IsUnityWebRequest(t)) { #>
-                    else if (asyncOperation.webRequest.IsError())
-                    {
-                        core.TrySetException(new UnityWebRequestException(asyncOperation.webRequest));
-                    }
-                    else
-                    {
-                        core.TrySetResult(asyncOperation.webRequest);
-                    }
-<# } else { #>
-                    else
-                    {
-                        core.TrySetResult(<#= IsVoid(t) ? "AsyncUnit.Default" : $"asyncOperation.{t.returnField}" #>);
-                    }
-<# } #>
+                    core.TrySetResult(asyncOperation.webRequest);
                }
+<# } else { #>
+                else
+                {
+                    core.TrySetResult(<#= IsVoid(t) ? "AsyncUnit.Default" : $"asyncOperation.{t.returnField}" #>);
+                }
+<# } #>
            }
        }

--- a/src/UniTask/Assets/Plugins/UniTask/package.json
+++ b/src/UniTask/Assets/Plugins/UniTask/package.json
@@ -2,7 +2,7 @@
    "name": "com.cysharp.unitask",
    "displayName": "UniTask",
    "author": { "name": "Cysharp, Inc.", "url": "https://cysharp.co.jp/en/" },
-    "version": "2.5.1",
+    "version": "2.5.4",
    "unity": "2018.4",
    "description": "Provides an efficient async/await integration to Unity.",
    "keywords": [ "async/await", "async", "Task", "UniTask" ],
Author	SHA1	Message	Date
github-actions[bot]	d057074f17	feat: Update package.json to 2.5.4	2024-03-28 06:22:15 +00:00
hadashiA	b724a2aa84	Merge pull request #557 from Cysharp/hadashiA/fix-cancel-immediate Fix unintended returning to pool with cancelImmediately	2024-03-28 15:21:40 +09:00
hadashiA	938ddd5356	Tweaks	2024-03-28 15:15:55 +09:00
hadashiA	911c37d4d8	Tweaks	2024-03-28 15:14:10 +09:00
hadashiA	caccccb0b5	Fix timing to returning to pool	2024-03-28 15:00:41 +09:00
hadashiA	a48f11d31b	Fix unintended returning to pool with cancelImmediately (WaitUntil,etc)	2024-03-28 14:46:37 +09:00
hadashiA	fcd93feb56	Fix unintended returning to pool with cancelImmediately (AsyncOperation)	2024-03-28 14:45:55 +09:00
hadashiA	b472b23773	Fix unintended returning to pool with cancelImmediately (UniTask.Delay)	2024-03-28 14:29:30 +09:00
Yoshifumi Kawai	01c8fada1f	Merge pull request #542 from Cysharp/feature/new_release ci: Cysharp/Actions/.github/workflows/create-release.yaml	2024-03-25 18:30:50 +09:00
Ikiru Yoshizaki	10cd137126	ci: Cysharp/Actions/.github/workflows/create-release.yaml	2024-02-07 21:04:48 +09:00
Yoshifumi Kawai	809d23edae	Merge pull request #541 from TORISOUP/fix_ToArray Optimization of ToArray in Merge method	2024-02-04 23:19:47 +09:00
TORISOUP	d38731bc44	fix call ToArray	2024-02-04 20:51:21 +09:00
github-actions[bot]	64792b672d	feat: Update package.json to 2.5.3	2024-01-25 12:52:16 +00:00
neuecc	3892cc2299	Merge branch 'master' of https://github.com/Cysharp/UniTask	2024-01-25 21:51:45 +09:00
neuecc	5bfccaa3b6	autoReleaseWhenCancelled -> autoReleaseWhenCanceled	2024-01-25 21:51:40 +09:00
github-actions[bot]	b49b7332bb	feat: Update package.json to 2.5.2	2024-01-25 11:43:24 +00:00
neuecc	08184af737	simplify UNITASK define	2024-01-25 20:42:42 +09:00
Yoshifumi Kawai	0ef6c59385	Merge pull request #535 from kochounoyume/valuetask-error-netframework UniTask does not work in .NET Framework environment after adding UniTask.AsValueTask	2024-01-25 20:26:21 +09:00
Yoshifumi Kawai	4b0bd3b509	Merge pull request #536 from Cysharp/hadashiA/release-handle Fix "Release handle when cancellation is requested"	2024-01-25 20:26:13 +09:00
Kochoyume	9a4720d180	Fix:Addressed generic parameter attributes error in the .Net Framework	2024-01-25 20:05:45 +09:00
hadashiA	b99646558c	Add a flag autoReleaseWhenCancelled to addressable extensionhs	2024-01-25 19:03:00 +09:00
hadashiA	ee12dd9ae7	Fix omissions in Addressable.Release and IsValid checks	2024-01-25 17:47:06 +09:00
Kochoyume	006e0f2c81	Revert "Fix conditional compilation to work with .NET Framework" This reverts commit `7d31299b5c`.	2024-01-25 16:16:01 +09:00
Kochoyume	7d31299b5c	Fix conditional compilation to work with .NET Framework	2024-01-25 01:02:57 +09:00
Yoshifumi Kawai	fe8bf834e6	Update README.md	2024-01-24 10:47:31 +09:00
Luciano Prestes Cavalcanti	36ac0863ad	Release handle when cancellation is requested	2023-11-22 08:09:03 -03:00