240 changed files with 6551 additions and 21769 deletions
--- a/.editorconfig
+++ b/.editorconfig
@ -1,41 +0,0 @@
-# top-most EditorConfig file
-root = true
-
-[*]
-charset = utf-8
-end_of_line = lf
-indent_style = space
-indent_size = 2
-insert_final_newline = true
-trim_trailing_whitespace = true
-
-# Visual Studio Spell checker configs (https://learn.microsoft.com/en-us/visualstudio/ide/text-spell-checker?view=vs-2022#how-to-customize-the-spell-checker)
-spelling_exclusion_path  = ./exclusion.dic
-
-[*.cs]
-indent_size = 4
-charset = utf-8-bom
-end_of_line = unset
-
-# Solution files
-[*.{sln,slnx}]
-end_of_line = unset
-
-# MSBuild project files
-[*.{csproj,props,targets}]
-end_of_line = unset
-
-# Xml config files
-[*.{ruleset,config,nuspec,resx,runsettings,DotSettings}]
-end_of_line = unset
-
-[*{_AssemblyInfo.cs,.notsupported.cs}]
-generated_code = true
-
-# C# code style settings
-[*.{cs}]
-dotnet_diagnostic.IDE0044.severity = none # IDE0044: Make field readonly
-
-# https://stackoverflow.com/questions/79195382/how-to-disable-fading-unused-methods-in-visual-studio-2022-17-12-0
-dotnet_diagnostic.IDE0051.severity = none # IDE0051: Remove unused private member
-dotnet_diagnostic.IDE0130.severity = none # IDE0130: Namespace does not match folder structure
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@ -1 +0,0 @@
-github: [neuecc]
--- a/.github/dependabot.yaml
+++ b/.github/dependabot.yaml
@ -1,12 +0,0 @@
-# ref: https://docs.github.com/en/code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot
-version: 2
-updates:
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "weekly" # Check for updates to GitHub Actions every week
-    ignore:
-      # I just want update action when major/minor version is updated. patch updates are too noisy.
-      - dependency-name: '*'
-        update-types:
-          - version-update:semver-patch
--- a/.github/workflows/build-debug.yaml
+++ b/.github/workflows/build-debug.yaml
@ -1,92 +0,0 @@
-name: Build-Debug
-
-on:
-  push:
-    branches:
-      - "master"
-  pull_request:
-    branches:
-      - "master"
-
-jobs:
-  build-dotnet:
-    permissions:
-      contents: read
-    runs-on: ubuntu-24.04
-    timeout-minutes: 10
-    steps:
-      - uses: Cysharp/Actions/.github/actions/checkout@main
-      - uses: Cysharp/Actions/.github/actions/setup-dotnet@main
-      - run: dotnet build -c Debug
-      - run: dotnet test -c Debug
-
-  build-unity:
-    if: ${{ ((github.event_name == 'push' && github.repository_owner == 'Cysharp') || startsWith(github.event.pull_request.head.label, 'Cysharp:')) && github.triggering_actor != 'dependabot[bot]' }}
-    strategy:
-      fail-fast: false
-      max-parallel: 2
-      matrix:
-        unity: ["2022.3.39f1", "6000.0.12f1"] # Test with LTS
-    permissions:
-      contents: read
-    runs-on: ubuntu-24.04
-    timeout-minutes: 30 # Unity build takes more than 20min.
-    steps:
-      - name: Load secrets
-        id: op-load-secret
-        uses: 1password/load-secrets-action@581a835fb51b8e7ec56b71cf2ffddd7e68bb25e0 # v2.0.0
-        with:
-          export-env: false
-        env:
-          OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN_PUBLIC }}
-          UNITY_EMAIL: "op://${{ vars.OP_VAULT_ACTIONS_PUBLIC }}/UNITY_LICENSE/username"
-          UNITY_PASSWORD: "op://${{ vars.OP_VAULT_ACTIONS_PUBLIC }}/UNITY_LICENSE/credential"
-          UNITY_SERIAL: "op://${{ vars.OP_VAULT_ACTIONS_PUBLIC }}/UNITY_LICENSE/serial"
-
-      - uses: Cysharp/Actions/.github/actions/checkout@main
-
-      # Execute scripts: Export Package
-      #  /opt/Unity/Editor/Unity -quit -batchmode -nographics -silent-crashes -logFile -projectPath . -executeMethod PackageExporter.Export
-      - name: Build Unity (.unitypacakge)
-        if: ${{ startsWith(matrix.unity, '2022') }} # only execute once
-        uses: Cysharp/Actions/.github/actions/unity-builder@main
-        env:
-          UNITY_EMAIL: ${{ steps.op-load-secret.outputs.UNITY_EMAIL }}
-          UNITY_PASSWORD: ${{ steps.op-load-secret.outputs.UNITY_PASSWORD }}
-          UNITY_SERIAL: ${{ steps.op-load-secret.outputs.UNITY_SERIAL }}
-        with:
-          projectPath: src/UniTask
-          unityVersion: ${{ matrix.unity }}
-          targetPlatform: StandaloneLinux64
-          buildMethod: PackageExporter.Export
-
-      # Execute UnitTest
-      # /opt/Unity/Editor/Unity -quit -batchmode -nographics -silent-crashes -logFile -projectPath . -executeMethod UnitTestBuilder.BuildUnitTest /headless /ScriptBackend IL2CPP /BuildTarget StandaloneLinux64
-      - name: Build UnitTest (IL2CPP)
-        uses: Cysharp/Actions/.github/actions/unity-builder@main
-        env:
-          UNITY_EMAIL: ${{ steps.op-load-secret.outputs.UNITY_EMAIL }}
-          UNITY_PASSWORD: ${{ steps.op-load-secret.outputs.UNITY_PASSWORD }}
-          UNITY_SERIAL: ${{ steps.op-load-secret.outputs.UNITY_SERIAL }}
-        with:
-          projectPath: src/UniTask
-          unityVersion: ${{ matrix.unity }}
-          targetPlatform: StandaloneLinux64
-          buildMethod: UnitTestBuilder.BuildUnitTest
-          customParameters: "/headless /ScriptBackend IL2CPP"
-      - name: Check UnitTest file is generated
-        run: ls -lR ./src/UniTask/bin/UnitTest
-      - name: Execute UnitTest
-        run: ./src/UniTask/bin/UnitTest/StandaloneLinux64_IL2CPP/test
-
-      - uses: Cysharp/Actions/.github/actions/check-metas@main # check meta files
-        with:
-          directory: src/UniTask
-
-      # Store artifacts.
-      - uses: Cysharp/Actions/.github/actions/upload-artifact@main
-        if: ${{ startsWith(matrix.unity, '2021') }} # only execute 2021
-        with:
-          name: UniTask.unitypackage-${{ matrix.unity }}.zip
-          path: ./src/UniTask/*.unitypackage
-          retention-days: 1
--- a/.github/workflows/build-debug.yml
+++ b/.github/workflows/build-debug.yml
@ -0,0 +1,73 @@
+name: Build-Debug
+
+on:
+  push:
+    branches:
+      - "**"
+    tags:
+      - "!*" # not a tag push
+  pull_request:
+    types:
+      - opened
+      - synchronize
+
+jobs:
+  build-dotnet:
+    runs-on: ubuntu-latest
+    env:
+      DOTNET_CLI_TELEMETRY_OPTOUT: 1
+      DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
+      NUGET_XMLDOC_MODE: skip
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: 3.1.101
+      - run: dotnet test -c Debug ./src/UniTask.NetCoreTests/UniTask.NetCoreTests.csproj
+
+  build-unity:
+    strategy:
+      matrix:
+        unity: ['2019.3.9f1', '2020.1.0b5']
+        include:
+          - unity: 2019.3.9f1
+            license: UNITY_2019_3
+          - unity: 2020.1.0b5
+            license: UNITY_2020_1
+    runs-on: ubuntu-latest
+    container:
+      # with linux-il2cpp. image from https://hub.docker.com/r/gableroux/unity3d/tags
+      image: gableroux/unity3d:${{ matrix.unity }}-linux-il2cpp
+    steps:
+      - run: apt update && apt install git -y
+      - uses: actions/checkout@v2
+      # create unity activation file and store to artifacts.
+      - run: /opt/Unity/Editor/Unity -quit -batchmode -nographics -logFile -createManualActivationFile || exit 0
+      - uses: actions/upload-artifact@v1
+        with:
+          name: Unity_v${{ matrix.unity }}.alf
+          path: ./Unity_v${{ matrix.unity }}.alf
+      # activate Unity from manual license file(ulf)
+      - run: echo -n "$UNITY_LICENSE" >> .Unity.ulf
+        env:
+          UNITY_LICENSE: ${{ secrets[matrix.license] }}
+      - name: Activate Unity, always returns a success. But if a subsequent run fails, the activation may have failed(if succeeded, shows `Next license update check is after` and not shows other message(like GUID != GUID). If fails not). In that case, upload the artifact's .alf file to https://license.unity3d.com/manual to get the .ulf file and set it to secrets.
+        run: /opt/Unity/Editor/Unity -quit -batchmode -nographics -silent-crashes -logFile -manualLicenseFile .Unity.ulf || exit 0
+
+      # Execute scripts: RuntimeUnitTestToolkit
+      - name: Build UnitTest(Linux64, mono)
+        run: /opt/Unity/Editor/Unity -quit -batchmode -nographics -silent-crashes -logFile -projectPath . -executeMethod UnitTestBuilder.BuildUnitTest /headless /ScriptBackend mono /BuildTarget StandaloneLinux64
+        working-directory: src/UniTask
+      - name: Execute UnitTest
+        run: ./src/UniTask/bin/UnitTest/StandaloneLinux64_Mono2x/test
+
+      # Execute scripts: Export Package
+      - name: Export unitypackage
+        run: /opt/Unity/Editor/Unity -quit -batchmode -nographics -silent-crashes -logFile -projectPath . -executeMethod PackageExporter.Export
+        working-directory: src/UniTask
+
+      # Store artifacts.      
+      - uses: actions/upload-artifact@v2
+        with:
+          name: UniTask.unitypackage.zip
+          path: ./src/UniTask/*.unitypackage
--- a/.github/workflows/build-docs.yaml
+++ b/.github/workflows/build-docs.yaml
@ -1,34 +0,0 @@
-name: build-docs
-
-on:
-  push:
-    branches:
-      - master
-      - feature/docs
-
-jobs:
-  run-docfx:
-    permissions:
-      contents: write
-      pages: write
-    runs-on: ubuntu-24.04
-    timeout-minutes: 10
-    steps:
-      - uses: Cysharp/Actions/.github/actions/checkout@main
-      - uses: Cysharp/Actions/.github/actions/checkout@main
-        with:
-          repository: Cysharp/DocfxTemplate
-          path: docs/_DocfxTemplate
-      - uses: Kirbyrawr/docfx-action@db9a22c8fe1e8693a2a21be54cb0b87dfaa72cc4
-        name: Docfx metadata
-        with:
-          args: metadata docs/docfx.json
-      - uses: Kirbyrawr/docfx-action@db9a22c8fe1e8693a2a21be54cb0b87dfaa72cc4
-        name: Docfx build
-        with:
-          args: build docs/docfx.json
-      - name: Publish to GitHub Pages
-        uses: peaceiris/actions-gh-pages@4f9cc6602d3f66b9c108549d475ec49e8ef4d45e # v4.0.0
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: docs/_site
--- a/.github/workflows/build-release.yaml
+++ b/.github/workflows/build-release.yaml
@ -1,121 +0,0 @@
-name: build-release
-
-on:
-  workflow_dispatch:
-    inputs:
-      tag:
-        description: "tag: git tag you want create. (sample 1.0.0)"
-        required: true
-      dry-run:
-        description: "dry-run: true will never create relase/nuget."
-        required: true
-        default: false
-        type: boolean
-
-jobs:
-  update-packagejson:
-    permissions:
-      actions: read
-      contents: write
-    uses: Cysharp/Actions/.github/workflows/update-packagejson.yaml@main
-    with:
-      file-path: ./src/UniTask/Assets/Plugins/UniTask/package.json
-      tag: ${{ inputs.tag }}
-      dry-run: ${{ inputs.dry-run }}
-
-  build-dotnet:
-    needs: [update-packagejson]
-    permissions:
-      contents: read
-    runs-on: ubuntu-24.04
-    timeout-minutes: 10
-    steps:
-      - run: echo ${{ needs.update-packagejson.outputs.sha }}
-      - uses: Cysharp/Actions/.github/actions/checkout@main
-        with:
-          ref: ${{ needs.update-packagejson.outputs.sha }}
-      - uses: Cysharp/Actions/.github/actions/setup-dotnet@main
-      # build and pack
-      - 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=${{ inputs.tag }} -o ./publish
-      # Store artifacts.
-      - uses: Cysharp/Actions/.github/actions/upload-artifact@main
-        with:
-          name: nuget
-          path: ./publish/
-          retention-days: 1
-
-  build-unity:
-    needs: [update-packagejson]
-    strategy:
-      matrix:
-        unity: ["2022.3.39f1"]
-    permissions:
-      contents: read
-    runs-on: ubuntu-24.04
-    timeout-minutes: 15
-    steps:
-      - name: Load secrets
-        id: op-load-secret
-        uses: 1password/load-secrets-action@581a835fb51b8e7ec56b71cf2ffddd7e68bb25e0 # v2.0.0
-        with:
-          export-env: false
-        env:
-          OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN_PUBLIC }}
-          UNITY_EMAIL: "op://${{ vars.OP_VAULT_ACTIONS_PUBLIC }}/UNITY_LICENSE/username"
-          UNITY_PASSWORD: "op://${{ vars.OP_VAULT_ACTIONS_PUBLIC }}/UNITY_LICENSE/credential"
-          UNITY_SERIAL: "op://${{ vars.OP_VAULT_ACTIONS_PUBLIC }}/UNITY_LICENSE/serial"
-
-      - run: echo ${{ needs.update-packagejson.outputs.sha }}
-      - uses: Cysharp/Actions/.github/actions/checkout@main
-        with:
-          ref: ${{ needs.update-packagejson.outputs.sha }}
-      # Execute scripts: Export Package
-      # /opt/Unity/Editor/Unity -quit -batchmode -nographics -silent-crashes -logFile -projectPath . -executeMethod PackageExporter.Export
-      - name: Build Unity (.unitypacakge)
-        uses: Cysharp/Actions/.github/actions/unity-builder@main
-        env:
-          UNITY_EMAIL: ${{ steps.op-load-secret.outputs.UNITY_EMAIL }}
-          UNITY_PASSWORD: ${{ steps.op-load-secret.outputs.UNITY_PASSWORD }}
-          UNITY_SERIAL: ${{ steps.op-load-secret.outputs.UNITY_SERIAL }}
-        with:
-          projectPath: src/UniTask
-          unityVersion: ${{ matrix.unity }}
-          targetPlatform: StandaloneLinux64
-          buildMethod: PackageExporter.Export
-
-      - uses: Cysharp/Actions/.github/actions/check-metas@main # check meta files
-        with:
-          directory: src/UniTask
-
-      # Store artifacts.
-      - uses: Cysharp/Actions/.github/actions/upload-artifact@main
-        with:
-          name: UniTask.${{ inputs.tag }}.unitypackage
-          path: ./src/UniTask/UniTask.${{ inputs.tag }}.unitypackage
-          retention-days: 1
-
-  # release
-  create-release:
-    needs: [update-packagejson, build-dotnet, build-unity]
-    permissions:
-      contents: write
-    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' }}
-    needs: [update-packagejson, build-dotnet, build-unity]
-    permissions:
-      contents: write
-    uses: Cysharp/Actions/.github/workflows/clean-packagejson-branch.yaml@main
-    with:
-      branch: ${{ needs.update-packagejson.outputs.branch-name }}
--- a/.github/workflows/build-release.yml
+++ b/.github/workflows/build-release.yml
@ -0,0 +1,108 @@
+name: Build-Release
+
+on:
+  push:
+    tags:
+      - "[0-9]+.[0-9]+.[0-9]+*"
+
+jobs:
+  build-dotnet:
+    runs-on: ubuntu-latest
+    env:
+      DOTNET_CLI_TELEMETRY_OPTOUT: 1
+      DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
+      NUGET_XMLDOC_MODE: skip
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: 3.1.101
+      # set release tag(*.*.*) to env.GIT_TAG
+      - run: echo ::set-env name=GIT_TAG::${GITHUB_REF#refs/tags/}
+
+      # build CommandTools first (use dotnet run command in ZLogger.csproj)
+      - run: dotnet build -c Release ./tools/CommandTools/CommandTools.csproj
+      - run: dotnet build -c Release -p:Version=${{ env.GIT_TAG }}
+      - run: dotnet test -c Release --no-build
+      - run: dotnet pack ./src/ZLogger/ZLogger.csproj -c Release --no-build -p:Version=${{ env.GIT_TAG }}
+
+      # Store artifacts.
+      - uses: actions/upload-artifact@v1
+        with:
+          name: nuget
+          path: ./src/ZLogger/bin/Release/ZLogger.${{ env.GIT_TAG }}.nupkg
+      
+  build-unity:
+    strategy:
+      matrix:
+        unity: ['2019.3.9f1']
+        include:
+          - unity: 2019.3.9f1
+            license: UNITY_2019_3
+    runs-on: ubuntu-latest
+    container:
+      # with linux-il2cpp. image from https://hub.docker.com/r/gableroux/unity3d/tags
+      image: gableroux/unity3d:${{ matrix.unity }}-linux-il2cpp
+    steps:
+      - run: apt update && apt install git -y
+      - uses: actions/checkout@v2
+      - run: echo -n "$UNITY_LICENSE" >> .Unity.ulf
+        env:
+          UNITY_LICENSE: ${{ secrets[matrix.license] }}
+      - run: /opt/Unity/Editor/Unity -quit -batchmode -nographics -silent-crashes -logFile -manualLicenseFile .Unity.ulf || exit 0
+
+      # set release tag(*.*.*) to env.GIT_TAG
+      - run: echo ::set-env name=GIT_TAG::${GITHUB_REF#refs/tags/}
+
+      # Execute scripts: Export Package
+      - name: Export unitypackage
+        run: /opt/Unity/Editor/Unity -quit -batchmode -nographics -silent-crashes -logFile -projectPath . -executeMethod PackageExporter.Export
+        working-directory: src/ZLogger.Unity
+        env:
+          UNITY_PACKAGE_VERSION: ${{ env.GIT_TAG }}
+
+      # Store artifacts.
+      - uses: actions/upload-artifact@v1
+        with:
+          name: ZLogger.Unity.${{ env.GIT_TAG }}.unitypackage
+          path: ./src/ZLogger.Unity/ZLogger.Unity.${{ env.GIT_TAG }}.unitypackage
+
+  create-release:
+    needs: [build-dotnet, build-unity]
+    runs-on: ubuntu-latest
+    env:
+      DOTNET_CLI_TELEMETRY_OPTOUT: 1
+      DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
+      NUGET_XMLDOC_MODE: skip
+    steps:
+    # setup dotnet for nuget push
+    - uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 3.1.101
+    # set release tag(*.*.*) to env.GIT_TAG
+    - run: echo ::set-env name=GIT_TAG::${GITHUB_REF#refs/tags/}
+
+    # Create Releases
+    - uses: actions/create-release@v1
+      id: create_release
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        tag_name: ${{ github.ref }}
+        release_name: Ver.${{ github.ref }}
+
+    # Download (All) Artifacts to current directory
+    - uses: actions/download-artifact@v2-preview
+
+    # Upload to NuGet
+    - run: dotnet nuget push "./nuget/*.nupkg" -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: ./ZLogger.Unity.${{ env.GIT_TAG }}.unitypackage/ZLogger.Unity.${{ env.GIT_TAG }}.unitypackage
+        asset_name: ZLogger.Unity.${{ env.GIT_TAG }}.unitypackage
+        asset_content_type: application/octet-stream
--- a/.github/workflows/prevent-github-change.yaml
+++ b/.github/workflows/prevent-github-change.yaml
@ -1,12 +0,0 @@
-name: Prevent github change
-on:
-  pull_request:
-    paths:
-      - ".github/**/*.yaml"
-      - ".github/**/*.yml"
-
-jobs:
-  detect:
-    permissions:
-      contents: read
-    uses: Cysharp/Actions/.github/workflows/prevent-github-change.yaml@main
--- a/.github/workflows/stale.yaml
+++ b/.github/workflows/stale.yaml
@ -1,14 +0,0 @@
-name: "Close stale issues"
-
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: "0 0 * * *"
-
-jobs:
-  stale:
-    permissions:
-      contents: read
-      pull-requests: write
-      issues: write
-    uses: Cysharp/Actions/.github/workflows/stale-issue.yaml@main
--- a/.github/workflows/toc.yaml
+++ b/.github/workflows/toc.yaml
@ -1,15 +0,0 @@
-name: TOC Generator
-
-on:
-  push:
-    paths:
-      - 'README.md'
-
-jobs:
-  toc:
-    permissions:
-      contents: write
-    uses: Cysharp/Actions/.github/workflows/toc-generator.yaml@main
-    with:
-      TOC_TITLE: "## Table of Contents"
-    secrets: inherit
--- a/.github/workflows/toc.yml
+++ b/.github/workflows/toc.yml
@ -0,0 +1,15 @@
+name: TOC Generator
+
+on:
+  push:
+    paths:
+      - 'README.md'
+
+jobs:
+  generateTOC:
+    name: TOC Generator
+    runs-on: ubuntu-latest
+    steps:
+      - uses: technote-space/toc-generator@v2.4.0
+        with:
+          TOC_TITLE: "## Table of Contents"
--- a/.gitignore
+++ b/.gitignore
@ -130,15 +130,30 @@ UpgradeLog*.XML
 Assets/WSATestCertificate.pfx
 .vs/

-# Unity
+Assembly-CSharp\.csproj

-# Unity
-.vsconfig
-src/UniTask/Library/*
-src/UniTask/Temp/*
-src/UniTask/Logs/*
-src/UniTask/[Uu]ser[Ss]ettings/
-src/UniTask/*.sln
-src/UniTask/*.csproj
-src/UniTask/*.unitypackage
-!src/UniTask/Packages/
+UniRx\.Async\.csproj
+
+UniRx\.Async\.Editor\.csproj
+
+UniRx\.Async\.Tests\.csproj
+
+UniTask\.sln
+
+RuntimeUnitTestToolkit\.csproj
+
+Assembly-CSharp-Editor\.csproj
+
+UniRx\.Async\.unitypackage
+
+UniRx.Async.Tests.Editor.csproj
+
+src/UniTask/UniTask.csproj
+
+src/UniTask/UniTask.Editor.csproj
+
+src/UniTask/UniTask.Tests.csproj
+
+src/UniTask/UniTask.Tests.Editor.csproj
+
+src/UniTask/UniTask.*.unitypackage
--- a/README.md
+++ b/README.md
--- a/README_CN.md
+++ b/README_CN.md
--- a/UniTask.NetCore.sln
+++ b/UniTask.NetCore.sln
@ -1,15 +1,13 @@

 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.0.31606.5
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29613.14
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UniTask.NetCoreTests", "src\UniTask.NetCoreTests\UniTask.NetCoreTests.csproj", "{B3E311A4-70D8-4131-9965-C073A99D201A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.NetCoreTests", "src\UniTask.NetCoreTests\UniTask.NetCoreTests.csproj", "{B3E311A4-70D8-4131-9965-C073A99D201A}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UniTask.NetCore", "src\UniTask.NetCore\UniTask.NetCore.csproj", "{16EE20D0-7FB1-483A-8467-A5EEDBF1F5BF}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UniTask.NetCoreSandbox", "src\UniTask.NetCoreSandbox\UniTask.NetCoreSandbox.csproj", "{3915E72E-33E0-4A14-A6D8-872702200E58}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.Analyzer", "src\UniTask.Analyzer\UniTask.Analyzer.csproj", "{0AC6F052-A255-4EE3-9E05-1C02D49AB1C2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.NetCoreSandbox", "src\UniTask.NetCoreSandbox\UniTask.NetCoreSandbox.csproj", "{3915E72E-33E0-4A14-A6D8-872702200E58}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -29,10 +27,6 @@ Global
 		{3915E72E-33E0-4A14-A6D8-872702200E58}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3915E72E-33E0-4A14-A6D8-872702200E58}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3915E72E-33E0-4A14-A6D8-872702200E58}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0AC6F052-A255-4EE3-9E05-1C02D49AB1C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0AC6F052-A255-4EE3-9E05-1C02D49AB1C2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0AC6F052-A255-4EE3-9E05-1C02D49AB1C2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0AC6F052-A255-4EE3-9E05-1C02D49AB1C2}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/docs/.gitignore
+++ b/docs/.gitignore
@ -1,10 +0,0 @@
-###############
-#    folder   #
-###############
-/**/DROP/
-/**/TEMP/
-/**/packages/
-/**/bin/
-/**/obj/
-_site
-_DocfxTemplate
--- a/docs/api/.gitignore
+++ b/docs/api/.gitignore
@ -1,5 +0,0 @@
-###############
-#  temp file  #
-###############
-*.yml
-.manifest
--- a/docs/docfx.json
+++ b/docs/docfx.json
@ -1,70 +0,0 @@
-{
-  "metadata": [
-    {
-      "src": [
-        {
-          "files": [
-            "UniTask/Assets/Plugins/UniTask/Runtime/**/*.cs"
-          ],
-          "src": "../src"
-        }
-      ],
-      "dest": "api",
-      "disableGitFeatures": false,
-      "disableDefaultFilter": false
-    }
-  ],
-  "build": {
-    "globalMetadata": {
-      "_disableContribution": true,
-      "_appTitle": "UniTask"
-    },
-    "content": [
-      {
-        "files": [
-          "api/**.yml",
-          "api/index.md"
-        ]
-      },
-      {
-        "files": [
-          "articles/**.md",
-          "articles/**/toc.yml",
-          "toc.yml",
-          "*.md"
-        ]
-      }
-    ],
-    "resource": [
-      {
-        "files": [
-          "images/**"
-        ]
-      }
-    ],
-    "overwrite": [
-      {
-        "files": [
-          "apidoc/**.md"
-        ],
-        "exclude": [
-          "obj/**",
-          "_site/**"
-        ]
-      }
-    ],
-    "dest": "_site",
-
-    "globalMetadataFiles": [],
-    "fileMetadataFiles": [],
-    "template": [
-      "_DocfxTemplate/templates/default-v2.5.2",
-      "_DocfxTemplate/templates/cysharp"
-    ],
-    "postProcessors": [],
-    "markdownEngineName": "markdig",
-    "noLangKeyword": false,
-    "keepFileLink": false,
-    "cleanupCacheHistory": false
-  }
-}
--- a/docs/index.md
+++ b/docs/index.md
@ -1,8 +0,0 @@
---
-title: Home
---
-# UniTask
-
-Provides an efficient async/await integration to Unity.
-
-https://github.com/Cysharp/UniTask
--- a/docs/toc.yml
+++ b/docs/toc.yml
@ -1,11 +0,0 @@
- name: API Documentation
-  href: api/
-  homepage: api/Cysharp.Threading.Tasks.html
-
- name: Repository
-  href: https://github.com/Cysharp/UniTask
-  homepage: https://github.com/Cysharp/UniTask
-
- name: Releases
-  href: https://github.com/Cysharp/UniTask/releases
-  homepage: https://github.com/Cysharp/UniTask/releases
--- a/src/UniTask.Analyzer/Properties/launchSettings.json
+++ b/src/UniTask.Analyzer/Properties/launchSettings.json
@ -1,8 +0,0 @@
-{
-  "profiles": {
-    "UniTask.Analyzer": {
-      "commandName": "DebugRoslynComponent",
-      "targetProject": "..\\UniTask.NetCoreSandbox\\UniTask.NetCoreSandbox.csproj"
-    }
-  }
-}
--- a/src/UniTask.Analyzer/UniTask.Analyzer.csproj
+++ b/src/UniTask.Analyzer/UniTask.Analyzer.csproj
@ -1,29 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-    <PropertyGroup>
-        <OutputType>library</OutputType>
-        <TargetFramework>netstandard2.0</TargetFramework>
-        <LangVersion>latest</LangVersion>
-        <Nullable>enable</Nullable>
-        <IsRoslynComponent>true</IsRoslynComponent>
-        <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);PackBuildOutputs</TargetsForTfmSpecificContentInPackage>
-        <IncludeBuildOutput>false</IncludeBuildOutput>
-        <IncludeSymbols>false</IncludeSymbols>
-        <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
-        <DevelopmentDependency>true</DevelopmentDependency>
-    </PropertyGroup>
-
-    <ItemGroup>
-        <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.2">
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-            <PrivateAssets>all</PrivateAssets>
-        </PackageReference>
-        <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.8.0" />
-    </ItemGroup>
-
-    <Target Name="PackBuildOutputs" DependsOnTargets="SatelliteDllsProjectOutputGroup;DebugSymbolsProjectOutputGroup">
-        <ItemGroup>
-            <TfmSpecificPackageFile Include="$(TargetDir)\*.dll" PackagePath="analyzers\dotnet\cs" />
-            <TfmSpecificPackageFile Include="@(SatelliteDllsProjectOutputGroupOutput->'%(FinalOutputPath)')" PackagePath="analyzers\dotnet\cs\%(SatelliteDllsProjectOutputGroupOutput.Culture)\" />
-        </ItemGroup>
-    </Target>
-</Project>
--- a/src/UniTask.Analyzer/UniTaskAnalyzer.cs
+++ b/src/UniTask.Analyzer/UniTaskAnalyzer.cs
@ -1,54 +0,0 @@
-#pragma warning disable RS2008
-
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Diagnostics;
-using Microsoft.CodeAnalysis.Operations;
-using System.Collections.Immutable;
-using System.Threading;
-
-namespace UniTask.Analyzer
-{
-    [DiagnosticAnalyzer(LanguageNames.CSharp)]
-    public class UniTaskAnalyzer : DiagnosticAnalyzer
-    {
-        private static readonly DiagnosticDescriptor Rule = new DiagnosticDescriptor(
-            id: "UNITASK001",
-            title: "UniTaskAnalyzer001: Must pass CancellationToken",
-            messageFormat: "Must pass CancellationToken",
-            category: "Usage",
-            defaultSeverity: DiagnosticSeverity.Error,
-            isEnabledByDefault: true,
-            description: "Pass CancellationToken or CancellationToken.None.");
-
-        public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics { get { return ImmutableArray.Create(Rule); } }
-
-        public override void Initialize(AnalysisContext context)
-        {
-            context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.None);
-            context.EnableConcurrentExecution();
-
-            context.RegisterOperationAction(AnalyzeOperation, OperationKind.Invocation);
-        }
-
-        private static void AnalyzeOperation(OperationAnalysisContext context)
-        {
-            var token = context.Compilation.GetTypeByMetadataName(typeof(CancellationToken).FullName);
-            if (token == null) return;
-
-            if (context.Operation is IInvocationOperation invocation)
-            {
-                foreach (var arg in invocation.Arguments)
-                {
-                    if (arg.ArgumentKind == ArgumentKind.DefaultValue)
-                    {
-                        if (SymbolEqualityComparer.Default.Equals(arg.Parameter.Type, token))
-                        {
-                            var diagnostic = Diagnostic.Create(Rule, arg.Syntax.GetLocation());
-                            context.ReportDiagnostic(diagnostic);
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
--- a/src/UniTask.NetCore/Icon.png
+++ b/src/UniTask.NetCore/Icon.png
--- a/src/UniTask.NetCore/NetCore/AsyncEnumerableExtensions.cs
+++ b/src/UniTask.NetCore/NetCore/AsyncEnumerableExtensions.cs
@ -1,101 +0,0 @@
-#if !NETSTANDARD2_0
-
-#pragma warning disable 0649
-
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Threading.Tasks.Sources;
-
-namespace Cysharp.Threading.Tasks
-{
-    public static class AsyncEnumerableExtensions
-    {
-        public static IUniTaskAsyncEnumerable<T> AsUniTaskAsyncEnumerable<T>(this IAsyncEnumerable<T> source)
-        {
-            return new AsyncEnumerableToUniTaskAsyncEnumerable<T>(source);
-        }
-
-        public static IAsyncEnumerable<T> AsAsyncEnumerable<T>(this IUniTaskAsyncEnumerable<T> source)
-        {
-            return new UniTaskAsyncEnumerableToAsyncEnumerable<T>(source);
-        }
-
-        sealed class AsyncEnumerableToUniTaskAsyncEnumerable<T> : IUniTaskAsyncEnumerable<T>
-        {
-            readonly IAsyncEnumerable<T> source;
-
-            public AsyncEnumerableToUniTaskAsyncEnumerable(IAsyncEnumerable<T> source)
-            {
-                this.source = source;
-            }
-
-            public IUniTaskAsyncEnumerator<T> GetAsyncEnumerator(CancellationToken cancellationToken = default)
-            {
-                return new Enumerator(source.GetAsyncEnumerator(cancellationToken));
-            }
-
-            sealed class Enumerator : IUniTaskAsyncEnumerator<T>
-            {
-                readonly IAsyncEnumerator<T> enumerator;
-
-                public Enumerator(IAsyncEnumerator<T> enumerator)
-                {
-                    this.enumerator = enumerator;
-                }
-
-                public T Current => enumerator.Current;
-
-                public async UniTask DisposeAsync()
-                {
-                    await enumerator.DisposeAsync();
-                }
-
-                public async UniTask<bool> MoveNextAsync()
-                {
-                    return await enumerator.MoveNextAsync();
-                }
-            }
-        }
-
-        sealed class UniTaskAsyncEnumerableToAsyncEnumerable<T> : IAsyncEnumerable<T>
-        {
-            readonly IUniTaskAsyncEnumerable<T> source;
-
-            public UniTaskAsyncEnumerableToAsyncEnumerable(IUniTaskAsyncEnumerable<T> source)
-            {
-                this.source = source;
-            }
-
-            public IAsyncEnumerator<T> GetAsyncEnumerator(CancellationToken cancellationToken = default)
-            {
-                return new Enumerator(source.GetAsyncEnumerator(cancellationToken));
-            }
-
-            sealed class Enumerator : IAsyncEnumerator<T>
-            {
-                readonly IUniTaskAsyncEnumerator<T> enumerator;
-
-                public Enumerator(IUniTaskAsyncEnumerator<T> enumerator)
-                {
-                    this.enumerator = enumerator;
-                }
-
-                public T Current => enumerator.Current;
-
-                public ValueTask DisposeAsync()
-                {
-                    return enumerator.DisposeAsync();
-                }
-
-                public ValueTask<bool> MoveNextAsync()
-                {
-                    return enumerator.MoveNextAsync();
-                }
-            }
-        }
-    }
-}
-
-#endif
--- a/src/UniTask.NetCore/NetCore/UniTask.AsValueTask.cs
+++ b/src/UniTask.NetCore/NetCore/UniTask.AsValueTask.cs
@ -0,0 +1,30 @@
+#pragma warning disable 0649
+
+using System.Threading.Tasks;
+
+namespace Cysharp.Threading.Tasks
+{
+    public static class UniTaskValueTaskExtensions
+    {
+        public static ValueTask AsValueTask(this in UniTask task)
+        {
+            return task;
+        }
+
+        public static ValueTask<T> AsValueTask<T>(this in UniTask<T> task)
+        {
+            return task;
+        }
+
+        public static UniTask<T> AsUniTask<T>(this ValueTask<T> task, bool useCurrentSynchronizationContext = true)
+        {
+            // NOTE: get _obj and _token directly for low overhead conversion but not yet implemented.
+            return task.AsTask().AsUniTask(useCurrentSynchronizationContext);
+        }
+
+        public static UniTask AsUniTask(this ValueTask task, bool useCurrentSynchronizationContext = true)
+        {
+            return task.AsTask().AsUniTask(useCurrentSynchronizationContext);
+        }
+    }
+}
--- a/src/UniTask.NetCore/NetCore/UniTask.Delay.cs
+++ b/src/UniTask.NetCore/NetCore/UniTask.Delay.cs
@ -1,39 +0,0 @@
-//using Cysharp.Threading.Tasks.Internal;
-//using System;
-//using System.Collections.Concurrent;
-//using System.Runtime.CompilerServices;
-//using System.Threading;
-
-//namespace Cysharp.Threading.Tasks
-//{
-//    public partial struct UniTask
-//    {
-//        public static UniTask Delay()
-//        {
-//            return default;
-//        }
-
-//        sealed class DelayPromise : IUniTaskSource
-//        {
-//            public void GetResult(short token)
-//            {
-//                throw new NotImplementedException();
-//            }
-
-//            public UniTaskStatus GetStatus(short token)
-//            {
-//                throw new NotImplementedException();
-//            }
-
-//            public void OnCompleted(Action<object> continuation, object state, short token)
-//            {
-//                throw new NotImplementedException();
-//            }
-
-//            public UniTaskStatus UnsafeGetStatus()
-//            {
-//                throw new NotImplementedException();
-//            }
-//        }
-//    }
-//}
--- a/src/UniTask.NetCore/NetCore/UniTask.Yield.cs
+++ b/src/UniTask.NetCore/NetCore/UniTask.Yield.cs
@ -59,23 +59,16 @@ namespace Cysharp.Threading.Tasks

 #if NETCOREAPP3_1

-            sealed class ThreadPoolWorkItem : IThreadPoolWorkItem, ITaskPoolNode<ThreadPoolWorkItem>
+            public sealed class ThreadPoolWorkItem : IThreadPoolWorkItem
            {
-                static TaskPool<ThreadPoolWorkItem> pool;
-                ThreadPoolWorkItem nextNode;
-                public ref ThreadPoolWorkItem NextNode => ref nextNode;
-
-                static ThreadPoolWorkItem()
-                {
-                    TaskPool.RegisterSizeGetter(typeof(ThreadPoolWorkItem), () => pool.Size);
-                }
+                static readonly ConcurrentQueue<ThreadPoolWorkItem> pool = new ConcurrentQueue<ThreadPoolWorkItem>();

                Action continuation;

                [MethodImpl(MethodImplOptions.AggressiveInlining)]
                public static ThreadPoolWorkItem Create(Action continuation)
                {
-                    if (!pool.TryPop(out var item))
+                    if (!pool.TryDequeue(out var item))
                    {
                        item = new ThreadPoolWorkItem();
                    }
@ -89,11 +82,9 @@ namespace Cysharp.Threading.Tasks
                {
                    var call = continuation;
                    continuation = null;
-                    if (call != null)
-                    {
-                        pool.TryPush(this);
-                        call.Invoke();
-                    }
+                    pool.Enqueue(this);
+
+                    call.Invoke();
                }
            }

--- a/src/UniTask.NetCore/UniTask.NetCore.csproj
+++ b/src/UniTask.NetCore/UniTask.NetCore.csproj
@ -1,43 +1,40 @@
 <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>
-		<DefineConstants>UNITASK_NETCORE</DefineConstants>
-		<GenerateDocumentationFile>true</GenerateDocumentationFile>
-		<NoWarn>$(NoWarn);CS1591</NoWarn>
+    <PropertyGroup>
+        <TargetFrameworks>netcoreapp3.1;netstandard2.1</TargetFrameworks>
+        <AssemblyName>UniTask</AssemblyName>
+        <LangVersion>8.0</LangVersion>
+        <RootNamespace>Cysharp.Threading.Tasks</RootNamespace>
+    </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>
+        <Compile Include="..\UniTask\Assets\Plugins\UniTask\Runtime\**\*.cs"
+                 Exclude="
+..\UniTask\Assets\Plugins\UniTask\Editor\*.cs;
+..\UniTask\Assets\Plugins\UniTask\Runtime\Triggers\*.cs;
+..\UniTask\Assets\Plugins\UniTask\Runtime\Linq\UnityExtensions\*.cs;
  
-	<ItemGroup>
-		<None Include="Icon.png" Pack="true" PackagePath="/" />
-	</ItemGroup>
+..\UniTask\Assets\Plugins\UniTask\Runtime\Internal\UnityEqualityComparer.cs;
+..\UniTask\Assets\Plugins\UniTask\Runtime\Internal\DiagnosticsExtensions.cs;
+..\UniTask\Assets\Plugins\UniTask\Runtime\Internal\PlayerLoopRunner.cs;
+..\UniTask\Assets\Plugins\UniTask\Runtime\Internal\ContinuationQueue.cs;
  
-	<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>
+..\UniTask\Assets\Plugins\UniTask\Runtime\CancellationTokenSourceExtensions.cs;
+..\UniTask\Assets\Plugins\UniTask\Runtime\EnumeratorAsyncExtensions.cs;
+..\UniTask\Assets\Plugins\UniTask\Runtime\PlayerLoopHelper.cs;
+..\UniTask\Assets\Plugins\UniTask\Runtime\UniTask.Delay.cs;
+..\UniTask\Assets\Plugins\UniTask\Runtime\UniTask.Run.cs;
+..\UniTask\Assets\Plugins\UniTask\Runtime\UniTask.Bridge.cs;
+..\UniTask\Assets\Plugins\UniTask\Runtime\UniTask.WaitUntil.cs;
+..\UniTask\Assets\Plugins\UniTask\Runtime\UnityAsyncExtensions.cs;
+..\UniTask\Assets\Plugins\UniTask\Runtime\UnityAsyncExtensions.uGUI.cs;
+..\UniTask\Assets\Plugins\UniTask\Runtime\UnityAsyncExtensions.MonoBehaviour.cs;
+..\UniTask\Assets\Plugins\UniTask\Runtime\UnityBindingExtensions.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.NetCore/opensource.snk
+++ b/src/UniTask.NetCore/opensource.snk
--- a/src/UniTask.NetCoreSandbox/AllocationCheck.cs
+++ b/src/UniTask.NetCoreSandbox/AllocationCheck.cs
@ -0,0 +1,198 @@
+using BenchmarkDotNet.Attributes;
+using System.Linq;
+using BenchmarkDotNet.Configs;
+using BenchmarkDotNet.Diagnosers;
+using BenchmarkDotNet.Exporters;
+using BenchmarkDotNet.Jobs;
+using BenchmarkDotNet.Running;
+using Cysharp.Threading.Tasks;
+using PooledAwait;
+using System;
+using System.Runtime.ExceptionServices;
+using System.Threading.Tasks;
+using System.Threading;
+using System.Runtime.CompilerServices;
+using Cysharp.Threading.Tasks.CompilerServices;
+using System.Collections.Concurrent;
+
+[Config(typeof(BenchmarkConfig))]
+public class AllocationCheck
+{
+    // note: all the benchmarks use Task/Task<T> for the public API, because BenchmarkDotNet
+    // doesn't work reliably with more exotic task-types (even just ValueTask fails); instead,
+    // we'll obscure the cost of the outer awaitable by doing a relatively large number of
+    // iterations, so that we're only really measuring the inner loop
+    private const int InnerOps = 1000;
+
+    [Benchmark(OperationsPerInvoke = InnerOps)]
+    public async Task ViaUniTask()
+    {
+        for (int i = 0; i < InnerOps; i++)
+        {
+            await Core();
+        }
+
+        static async UniTask Core()
+        {
+            await new TestAwaiter(false, UniTaskStatus.Succeeded);
+            await new TestAwaiter(false, UniTaskStatus.Succeeded);
+            await new TestAwaiter(false, UniTaskStatus.Succeeded);
+        }
+    }
+
+    [Benchmark(OperationsPerInvoke = InnerOps)]
+    public async Task<int> ViaUniTaskT()
+    {
+        var sum = 0;
+        for (int i = 0; i < InnerOps; i++)
+        {
+            sum += await Core();
+        }
+        return sum;
+
+        static async UniTask<int> Core()
+        {
+            var a = await new TestAwaiter<int>(false, UniTaskStatus.Succeeded, 10);
+            var b = await new TestAwaiter<int>(false, UniTaskStatus.Succeeded, 10);
+            var c = await new TestAwaiter<int>(false, UniTaskStatus.Succeeded, 10);
+            return 10;
+        }
+    }
+
+    [Benchmark(OperationsPerInvoke = InnerOps)]
+    public Task ViaUniTaskVoid()
+    {
+        for (int i = 0; i < InnerOps; i++)
+        {
+            Core().Forget();
+        }
+        return Task.CompletedTask;
+
+        static async UniTaskVoid Core()
+        {
+            await new TestAwaiter(false, UniTaskStatus.Succeeded);
+            await new TestAwaiter(false, UniTaskStatus.Succeeded);
+            await new TestAwaiter(false, UniTaskStatus.Succeeded);
+        }
+    }
+}
+
+public class TaskTestException : Exception
+{
+
+}
+
+public struct TestAwaiter : ICriticalNotifyCompletion
+{
+    readonly UniTaskStatus status;
+    readonly bool isCompleted;
+
+    public TestAwaiter(bool isCompleted, UniTaskStatus status)
+    {
+        this.isCompleted = isCompleted;
+        this.status = status;
+    }
+
+    public TestAwaiter GetAwaiter() => this;
+
+    public bool IsCompleted => isCompleted;
+
+    public void GetResult()
+    {
+        switch (status)
+        {
+            case UniTaskStatus.Faulted:
+                throw new TaskTestException();
+            case UniTaskStatus.Canceled:
+                throw new OperationCanceledException();
+            case UniTaskStatus.Pending:
+            case UniTaskStatus.Succeeded:
+            default:
+                break;
+        }
+    }
+
+    public void OnCompleted(Action continuation)
+    {
+        ThreadPool.UnsafeQueueUserWorkItem(ThreadPoolWorkItem.Create(continuation), false);
+    }
+
+    public void UnsafeOnCompleted(Action continuation)
+    {
+        ThreadPool.UnsafeQueueUserWorkItem(ThreadPoolWorkItem.Create(continuation), false);
+    }
+
+
+}
+
+public struct TestAwaiter<T> : ICriticalNotifyCompletion
+{
+    readonly UniTaskStatus status;
+    readonly bool isCompleted;
+    readonly T value;
+
+    public TestAwaiter(bool isCompleted, UniTaskStatus status, T value)
+    {
+        this.isCompleted = isCompleted;
+        this.status = status;
+        this.value = value;
+    }
+
+    public TestAwaiter<T> GetAwaiter() => this;
+
+    public bool IsCompleted => isCompleted;
+
+    public T GetResult()
+    {
+        switch (status)
+        {
+            case UniTaskStatus.Faulted:
+                throw new TaskTestException();
+            case UniTaskStatus.Canceled:
+                throw new OperationCanceledException();
+            case UniTaskStatus.Pending:
+            case UniTaskStatus.Succeeded:
+            default:
+                return value;
+        }
+    }
+
+    public void OnCompleted(Action continuation)
+    {
+        ThreadPool.UnsafeQueueUserWorkItem(ThreadPoolWorkItem.Create(continuation), false);
+    }
+
+    public void UnsafeOnCompleted(Action continuation)
+    {
+        ThreadPool.UnsafeQueueUserWorkItem(ThreadPoolWorkItem.Create(continuation), false);
+    }
+}
+
+public sealed class ThreadPoolWorkItem : IThreadPoolWorkItem
+{
+    static readonly ConcurrentQueue<ThreadPoolWorkItem> pool = new ConcurrentQueue<ThreadPoolWorkItem>();
+
+    Action continuation;
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static ThreadPoolWorkItem Create(Action continuation)
+    {
+        if (!pool.TryDequeue(out var item))
+        {
+            item = new ThreadPoolWorkItem();
+        }
+
+        item.continuation = continuation;
+        return item;
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public void Execute()
+    {
+        var call = continuation;
+        continuation = null;
+        pool.Enqueue(this);
+
+        call.Invoke();
+    }
+}
--- a/src/UniTask.NetCoreSandbox/Benchmark.cs
+++ b/src/UniTask.NetCoreSandbox/Benchmark.cs
@ -0,0 +1,283 @@
+using BenchmarkDotNet.Attributes;
+using System.Linq;
+using BenchmarkDotNet.Configs;
+using BenchmarkDotNet.Diagnosers;
+using BenchmarkDotNet.Exporters;
+using BenchmarkDotNet.Jobs;
+using BenchmarkDotNet.Running;
+using Cysharp.Threading.Tasks;
+using PooledAwait;
+using System;
+using System.Runtime.ExceptionServices;
+using System.Threading.Tasks;
+using System.Threading;
+using System.Runtime.CompilerServices;
+using Cysharp.Threading.Tasks.CompilerServices;
+
+//class Program
+//{
+//    static void Main(string[] args)
+//    {
+//        var switcher = new BenchmarkSwitcher(new[]
+//        {
+//            typeof(StandardBenchmark)
+//        });
+
+//#if DEBUG
+//        var b = new StandardBenchmark();
+
+//#else
+//        switcher.Run(args);
+//#endif
+//    }
+//}
+
+public class BenchmarkConfig : ManualConfig
+{
+    public BenchmarkConfig()
+    {
+        AddDiagnoser(MemoryDiagnoser.Default);
+        AddJob(Job.ShortRun.WithLaunchCount(1).WithIterationCount(1).WithWarmupCount(1));
+    }
+}
+
+// borrowed from PooledAwait
+
+[Config(typeof(BenchmarkConfig))]
+[GroupBenchmarksBy(BenchmarkLogicalGroupRule.ByCategory)]
+[CategoriesColumn]
+public class ComparisonBenchmarks
+{
+    // note: all the benchmarks use Task/Task<T> for the public API, because BenchmarkDotNet
+    // doesn't work reliably with more exotic task-types (even just ValueTask fails); instead,
+    // we'll obscure the cost of the outer awaitable by doing a relatively large number of
+    // iterations, so that we're only really measuring the inner loop
+    private const int InnerOps = 1000;
+
+    public bool ConfigureAwait { get; set; } = false;
+
+    [Benchmark(OperationsPerInvoke = InnerOps, Description = ".NET")]
+    [BenchmarkCategory("Task<T>")]
+    public async Task<int> ViaTaskT()
+    {
+        int sum = 0;
+        for (int i = 0; i < InnerOps; i++)
+            sum += await Inner(1, 2).ConfigureAwait(ConfigureAwait);
+        return sum;
+
+        static async Task<int> Inner(int x, int y)
+        {
+            int i = x;
+            await Task.Yield();
+            i *= y;
+            await Task.Yield();
+            return 5 * i;
+        }
+    }
+
+    [Benchmark(OperationsPerInvoke = InnerOps, Description = ".NET")]
+    [BenchmarkCategory("Task")]
+    public async Task ViaTask()
+    {
+        for (int i = 0; i < InnerOps; i++)
+            await Inner().ConfigureAwait(ConfigureAwait);
+
+        static async Task Inner()
+        {
+            await Task.Yield();
+            await Task.Yield();
+        }
+    }
+
+    [Benchmark(OperationsPerInvoke = InnerOps, Description = ".NET")]
+    [BenchmarkCategory("ValueTask<T>")]
+    public async Task<int> ViaValueTaskT()
+    {
+        int sum = 0;
+        for (int i = 0; i < InnerOps; i++)
+            sum += await Inner(1, 2).ConfigureAwait(ConfigureAwait);
+        return sum;
+
+        static async ValueTask<int> Inner(int x, int y)
+        {
+            int i = x;
+            await Task.Yield();
+            i *= y;
+            await Task.Yield();
+            return 5 * i;
+        }
+    }
+
+    [Benchmark(OperationsPerInvoke = InnerOps, Description = ".NET")]
+    [BenchmarkCategory("ValueTask")]
+    public async Task ViaValueTask()
+    {
+        for (int i = 0; i < InnerOps; i++)
+            await Inner().ConfigureAwait(ConfigureAwait);
+
+        static async ValueTask Inner()
+        {
+            await Task.Yield();
+            await Task.Yield();
+        }
+    }
+
+    [Benchmark(OperationsPerInvoke = InnerOps, Description = "Pooled")]
+    [BenchmarkCategory("ValueTask<T>")]
+    public async Task<int> ViaPooledValueTaskT()
+    {
+        int sum = 0;
+        for (int i = 0; i < InnerOps; i++)
+            sum += await Inner(1, 2).ConfigureAwait(ConfigureAwait);
+        return sum;
+
+        static async PooledValueTask<int> Inner(int x, int y)
+        {
+            int i = x;
+            await Task.Yield();
+            i *= y;
+            await Task.Yield();
+            return 5 * i;
+        }
+    }
+
+    [Benchmark(OperationsPerInvoke = InnerOps, Description = "Pooled")]
+    [BenchmarkCategory("ValueTask")]
+    public async Task ViaPooledValueTask()
+    {
+        for (int i = 0; i < InnerOps; i++)
+            await Inner().ConfigureAwait(ConfigureAwait);
+
+        static async PooledValueTask Inner()
+        {
+            await Task.Yield();
+            await Task.Yield();
+        }
+    }
+
+    [Benchmark(OperationsPerInvoke = InnerOps, Description = "Pooled")]
+    [BenchmarkCategory("Task<T>")]
+    public async Task<int> ViaPooledTaskT()
+    {
+        int sum = 0;
+        for (int i = 0; i < InnerOps; i++)
+            sum += await Inner(1, 2).ConfigureAwait(ConfigureAwait);
+        return sum;
+
+        static async PooledTask<int> Inner(int x, int y)
+        {
+            int i = x;
+            await Task.Yield();
+            i *= y;
+            await Task.Yield();
+            return 5 * i;
+        }
+    }
+
+    [Benchmark(OperationsPerInvoke = InnerOps, Description = "Pooled")]
+    [BenchmarkCategory("Task")]
+    public async Task ViaPooledTask()
+    {
+        for (int i = 0; i < InnerOps; i++)
+            await Inner().ConfigureAwait(ConfigureAwait);
+
+        static async PooledTask Inner()
+        {
+            await Task.Yield();
+            await Task.Yield();
+        }
+    }
+
+    // ---
+
+    //[Benchmark(OperationsPerInvoke = InnerOps, Description = "UniTaskVoid")]
+    //[BenchmarkCategory("UniTask")]
+    //public async Task ViaUniTaskVoid()
+    //{
+    //    for (int i = 0; i < InnerOps; i++)
+    //    {
+    //        await Inner();
+    //    }
+
+    //    static async UniTaskVoid Inner()
+    //    {
+    //        await UniTask.Yield();
+    //        await UniTask.Yield();
+    //    }
+    //}
+
+    [Benchmark(OperationsPerInvoke = InnerOps, Description = "UniTask")]
+    [BenchmarkCategory("UniTask")]
+    public async Task ViaUniTask()
+    {
+        for (int i = 0; i < InnerOps; i++)
+        {
+            await Inner();
+        }
+
+        static async UniTask Inner()
+        {
+            await UniTask.Yield();
+            await UniTask.Yield();
+        }
+    }
+
+    [Benchmark(OperationsPerInvoke = InnerOps, Description = "UniTaskT")]
+    [BenchmarkCategory("UniTask")]
+    public async Task<int> ViaUniTaskT()
+    {
+        var sum = 0;
+        for (int i = 0; i < InnerOps; i++)
+        {
+            sum += await Inner(1, 2);
+        }
+        return sum;
+
+        static async UniTask<int> Inner(int x, int y)
+        {
+            int i = x;
+            await UniTask.Yield();
+            i *= y;
+            await UniTask.Yield();
+            return 5 * i;
+        }
+    }
+}
+
+public struct MyAwaiter : ICriticalNotifyCompletion
+{
+    public MyAwaiter GetAwaiter() => this;
+
+    public bool IsCompleted => false;
+
+    public void GetResult()
+    {
+    }
+
+    public void OnCompleted(Action continuation)
+    {
+        continuation();
+    }
+
+    public void UnsafeOnCompleted(Action continuation)
+    {
+        continuation();
+    }
+}
+
+public struct MyTestStateMachine : IAsyncStateMachine
+{
+    public void MoveNext()
+    {
+        //throw new NotImplementedException();
+
+
+
+
+    }
+
+    public void SetStateMachine(IAsyncStateMachine stateMachine)
+    {
+        //throw new NotImplementedException();
+    }
+}
--- a/src/UniTask.NetCoreSandbox/Program.cs
+++ b/src/UniTask.NetCoreSandbox/Program.cs
@ -1,6 +1,4 @@
-#pragma warning disable CS1998
-
-using Cysharp.Threading.Tasks;
+using Cysharp.Threading.Tasks;

 using System.Linq;
 using System;
@ -17,34 +15,400 @@ using System.Reactive.Concurrency;

 namespace NetCoreSandbox
 {
-    public class Program
+    public class Text
    {
-        static async Task Main(string[] args)
+
+        public string text { get; set; }
+    }
+
+    public class ZeroAllocAsyncAwaitInDotNetCore
+    {
+        public ValueTask<int> NanikaAsync(int x, int y)
        {
-            var cts = new CancellationTokenSource();
+            return Core(this, x, y);

+            static async UniTask<int> Core(ZeroAllocAsyncAwaitInDotNetCore self, int x, int y)
+            {
+                // nanika suru...
+                await Task.Delay(TimeSpan.FromSeconds(x + y));

-            // OK.
-            await FooAsync(10, cts.Token);
-
-            // NG(Compiler Error)
-            // await FooAsync(10);
-
-
-
-            
-
-
-
-
-
-
-        }
-
-        static async UniTask FooAsync(int x, CancellationToken cancellationToken = default)
-        {
-            await UniTask.Yield();
+                return 10;
+            }
        }
    }

+
+    public class TaskTestException : Exception
+    {
+
+    }
+
+
+    public struct TestAwaiter : ICriticalNotifyCompletion
+    {
+        readonly UniTaskStatus status;
+        readonly bool isCompleted;
+
+        public TestAwaiter(bool isCompleted, UniTaskStatus status)
+        {
+            this.isCompleted = isCompleted;
+            this.status = status;
+        }
+
+        public TestAwaiter GetAwaiter() => this;
+
+        public bool IsCompleted => isCompleted;
+
+        public void GetResult()
+        {
+            switch (status)
+            {
+                case UniTaskStatus.Faulted:
+                    throw new TaskTestException();
+                case UniTaskStatus.Canceled:
+                    throw new OperationCanceledException();
+                case UniTaskStatus.Pending:
+                case UniTaskStatus.Succeeded:
+                default:
+                    break;
+            }
+        }
+
+        public void OnCompleted(Action continuation)
+        {
+            ThreadPool.QueueUserWorkItem(_ => continuation(), null);
+        }
+
+        public void UnsafeOnCompleted(Action continuation)
+        {
+            ThreadPool.UnsafeQueueUserWorkItem(_ => continuation(), null);
+        }
+    }
+    public struct TestAwaiter<T> : ICriticalNotifyCompletion
+    {
+        readonly UniTaskStatus status;
+        readonly bool isCompleted;
+        readonly T value;
+
+        public TestAwaiter(bool isCompleted, UniTaskStatus status, T value)
+        {
+            this.isCompleted = isCompleted;
+            this.status = status;
+            this.value = value;
+        }
+
+        public TestAwaiter<T> GetAwaiter() => this;
+
+        public bool IsCompleted => isCompleted;
+
+        public T GetResult()
+        {
+            switch (status)
+            {
+                case UniTaskStatus.Faulted:
+                    throw new TaskTestException();
+                case UniTaskStatus.Canceled:
+                    throw new OperationCanceledException();
+                case UniTaskStatus.Pending:
+                case UniTaskStatus.Succeeded:
+                default:
+                    return value;
+            }
+        }
+
+        public void OnCompleted(Action continuation)
+        {
+            ThreadPool.QueueUserWorkItem(_ => continuation(), null);
+        }
+
+        public void UnsafeOnCompleted(Action continuation)
+        {
+            ThreadPool.UnsafeQueueUserWorkItem(_ => continuation(), null);
+        }
+    }
+
+
+    public static partial class UnityUIComponentExtensions
+    {
+        public static void BindTo(this IUniTaskAsyncEnumerable<string> source, Text text)
+        {
+            AAAACORECORE(source, text).Forget();
+
+            async UniTaskVoid AAAACORECORE(IUniTaskAsyncEnumerable<string> source2, Text text2)
+            {
+                var e = source2.GetAsyncEnumerator();
+                try
+                {
+                    while (await e.MoveNextAsync())
+                    {
+                        text2.text = e.Current;
+                        // action(e.Current);
+                    }
+                }
+                finally
+                {
+                    if (e != null)
+                    {
+                        await e.DisposeAsync();
+                    }
+                }
+            }
+        }
+
+        //public static IDisposable SubscribeToText<T>(this IObservable<T> source, Text text)
+        //{
+        //    return source.SubscribeWithState(text, (x, t) => t.text = x.ToString());
+        //}
+
+        //public static IDisposable SubscribeToText<T>(this IObservable<T> source, Text text, Func<T, string> selector)
+        //{
+        //    return source.SubscribeWithState2(text, selector, (x, t, s) => t.text = s(x));
+        //}
+
+        //public static IDisposable SubscribeToInteractable(this IObservable<bool> source, Selectable selectable)
+        //{
+        //    return source.SubscribeWithState(selectable, (x, s) => s.interactable = x);
+        //}
+    }
+
+    class Program
+    {
+        static string FlattenGenArgs(Type type)
+        {
+            if (type.IsGenericType)
+            {
+                var t = string.Join(", ", type.GetGenericArguments().Select(x => FlattenGenArgs(x)));
+                return Regex.Replace(type.Name, "`.+", "") + "<" + t + ">";
+            }
+            //x.ReturnType.GetGenericArguments()
+            else
+            {
+                return type.Name;
+            }
+        }
+
+        static async IAsyncEnumerable<int> FooAsync([EnumeratorCancellation]CancellationToken cancellationToken = default)
+        {
+            yield return 1;
+            await Task.Delay(10, cancellationToken);
+        }
+
+
+
+        static async Task Main(string[] args)
+        {
+#if !DEBUG
+            BenchmarkDotNet.Running.BenchmarkSwitcher.FromAssembly(typeof(Program).Assembly).Run(args);
+
+            //await new ComparisonBenchmarks().ViaUniTaskT();
+            return;
+#endif
+
+
+            AsyncTest().Forget();
+
+
+            //AsyncTest().Forget();
+
+            // AsyncTest().Forget();
+
+
+            await UniTask.Yield();
+            Console.ReadLine();
+        }
+
+#pragma warning disable CS1998
+
+
+        static async UniTaskVoid AsyncTest()
+        {
+            // empty
+            await new TestAwaiter(false, UniTaskStatus.Succeeded);
+            await new TestAwaiter(true, UniTaskStatus.Succeeded);
+            await new TestAwaiter(false, UniTaskStatus.Succeeded);
+
+
+            Console.WriteLine("foo");
+            //return 10;
+        }
+
+
+
+#pragma warning restore CS1998
+
+        void Foo()
+        {
+
+            // AsyncEnumerable.Range(1,10).Do(
+
+            // AsyncEnumerable.t
+
+            var sb = new StringBuilder();
+            sb.AppendLine(@"using System;
+using System.Threading;
+
+namespace Cysharp.Threading.Tasks.Linq
+{
+");
+
+
+
+            var chako = typeof(AsyncEnumerable).GetMethods()
+                .OrderBy(x => x.Name)
+                .Select(x =>
+                {
+                    var ret = FlattenGenArgs(x.ReturnType);
+
+
+                    var generics = string.Join(", ", x.GetGenericArguments().Select(x => x.Name));
+
+                    if (x.GetParameters().Length == 0) return "";
+
+                    var self = x.GetParameters().First();
+                    if (x.GetCustomAttributes(typeof(ExtensionAttribute), true).Length == 0)
+                    {
+                        return "";
+                    }
+
+                    var arg1Type = FlattenGenArgs(x.GetParameters().First().ParameterType);
+
+                    var others = string.Join(", ", x.GetParameters().Skip(1).Select(y => FlattenGenArgs(y.ParameterType) + " " + y.Name));
+
+                    if (!string.IsNullOrEmpty(others))
+                    {
+                        others = ", " + others;
+                    }
+
+                    var template = $"public static {ret} {x.Name}<{generics}>(this {arg1Type} {self.Name}{others})";
+
+
+
+                    return template.Replace("ValueTask", "UniTask").Replace("IAsyncEnumerable", "IUniTaskAsyncEnumerable").Replace("<>", "");
+                })
+                .Where(x => x != "")
+                .Select(x => x + "\r\n{\r\n    throw new NotImplementedException();\r\n}")
+                .ToArray();
+
+            var huga = string.Join("\r\n\r\n", chako);
+
+
+
+
+            foreach (var item in typeof(AsyncEnumerable).GetMethods().Select(x => x.Name).Distinct())
+            {
+                if (item.EndsWith("AwaitAsync") || item.EndsWith("AwaitWithCancellationAsync") || item.EndsWith("WithCancellation"))
+                {
+                    continue;
+                }
+
+                var item2 = item.Replace("Async", "");
+                item2 = item2.Replace("Await", "");
+
+                var format = @"
+    internal sealed class {0}
+    {{
+    }}
+";
+
+                sb.Append(string.Format(format, item2));
+
+            }
+
+            sb.Append("}");
+
+
+            Console.WriteLine(sb.ToString());
+
+
+
+
+        }
+
+
+        public static async IAsyncEnumerable<int> AsyncGen()
+        {
+            await UniTask.SwitchToThreadPool();
+            yield return 10;
+            await UniTask.SwitchToThreadPool();
+            yield return 100;
+        }
+    }
+
+    class MyEnumerable : IEnumerable<int>
+    {
+        public IEnumerator<int> GetEnumerator()
+        {
+            return new MyEnumerator();
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            throw new NotImplementedException();
+        }
+    }
+
+    class MyEnumerator : IEnumerator<int>
+    {
+        public int Current => throw new NotImplementedException();
+
+        object IEnumerator.Current => throw new NotImplementedException();
+
+        public void Dispose()
+        {
+            Console.WriteLine("Called Dispose");
+        }
+
+        public bool MoveNext()
+        {
+            throw new NotImplementedException();
+        }
+
+        public void Reset()
+        {
+            throw new NotImplementedException();
+        }
+    }
+
+
+
+    public class MyClass<T>
+    {
+        public CustomAsyncEnumerator<T> GetAsyncEnumerator()
+        {
+            //IAsyncEnumerable
+            return new CustomAsyncEnumerator<T>();
+        }
+    }
+
+
+    public struct CustomAsyncEnumerator<T>
+    {
+        int count;
+
+        public T Current
+        {
+            get
+            {
+                return default;
+            }
+        }
+
+        public UniTask<bool> MoveNextAsync()
+        {
+            if (count++ == 3)
+            {
+                return UniTask.FromResult(false);
+                //return false;
+            }
+            return UniTask.FromResult(true);
+        }
+
+        public UniTask DisposeAsync()
+        {
+            return default;
+        }
+    }
+
+
+
 }
--- a/src/UniTask.NetCoreSandbox/UniTask.NetCoreSandbox.csproj
+++ b/src/UniTask.NetCoreSandbox/UniTask.NetCoreSandbox.csproj
@ -2,9 +2,8 @@

  <PropertyGroup>
    <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
    <RootNamespace>NetCoreSandbox</RootNamespace>
-    <IsPackable>false</IsPackable>
  </PropertyGroup>

  <ItemGroup>
@ -16,12 +15,6 @@

  <ItemGroup>
    <ProjectReference Include="..\UniTask.NetCore\UniTask.NetCore.csproj" />
-
-
-      <ProjectReference Include="..\UniTask.Analyzer\UniTask.Analyzer.csproj">
-          <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-          <OutputItemType>Analyzer</OutputItemType>
-      </ProjectReference>
  </ItemGroup>

 </Project>
--- a/src/UniTask.NetCoreTests/AsyncLazyTest.cs
+++ b/src/UniTask.NetCoreTests/AsyncLazyTest.cs
@ -1,167 +0,0 @@
-using Cysharp.Threading.Tasks;
-using FluentAssertions;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Channels;
-using Cysharp.Threading.Tasks.Linq;
-using System.Threading.Tasks;
-using Xunit;
-
-namespace NetCoreTests
-{
-    public class AsyncLazyTest
-    {
-        [Fact]
-        public async Task LazyLazy()
-        {
-            {
-                var l = UniTask.Lazy(() => After());
-                var a = AwaitAwait(l.Task);
-                var b = AwaitAwait(l.Task);
-                var c = AwaitAwait(l.Task);
-
-                await a;
-                await b;
-                await c;
-            }
-            {
-                var l = UniTask.Lazy(() => AfterException());
-                var a = AwaitAwait(l.Task);
-                var b = AwaitAwait(l.Task);
-                var c = AwaitAwait(l.Task);
-
-                await Assert.ThrowsAsync<TaskTestException>(async () => await a);
-                await Assert.ThrowsAsync<TaskTestException>(async () => await b);
-                await Assert.ThrowsAsync<TaskTestException>(async () => await c);
-            }
-        }
-
-        [Fact]
-        public async Task LazyImmediate()
-        {
-            {
-                var l = UniTask.Lazy(() => UniTask.FromResult(1).AsUniTask());
-                var a = AwaitAwait(l.Task);
-                var b = AwaitAwait(l.Task);
-                var c = AwaitAwait(l.Task);
-
-                await a;
-                await b;
-                await c;
-            }
-            {
-                var l = UniTask.Lazy(() => UniTask.FromException(new TaskTestException()));
-                var a = AwaitAwait(l.Task);
-                var b = AwaitAwait(l.Task);
-                var c = AwaitAwait(l.Task);
-
-                await Assert.ThrowsAsync<TaskTestException>(async () => await a);
-                await Assert.ThrowsAsync<TaskTestException>(async () => await b);
-                await Assert.ThrowsAsync<TaskTestException>(async () => await c);
-            }
-        }
-
-        static async UniTask AwaitAwait(UniTask t)
-        {
-            await t;
-        }
-
-
-        async UniTask After()
-        {
-            await UniTask.Yield();
-            Thread.Sleep(TimeSpan.FromSeconds(1));
-            await UniTask.Yield();
-            await UniTask.Yield();
-        }
-
-        async UniTask AfterException()
-        {
-            await UniTask.Yield();
-            Thread.Sleep(TimeSpan.FromSeconds(1));
-            await UniTask.Yield();
-            throw new TaskTestException();
-        }
-    }
-
-    public class AsyncLazyTest2
-    {
-        [Fact]
-        public async Task LazyLazy()
-        {
-            {
-                var l = UniTask.Lazy(() => After());
-                var a = AwaitAwait(l.Task);
-                var b = AwaitAwait(l.Task);
-                var c = AwaitAwait(l.Task);
-
-                var a2 = await a;
-                var b2 = await b;
-                var c2 = await c;
-                (a2, b2, c2).Should().Be((10, 10, 10));
-            }
-            {
-                var l = UniTask.Lazy(() => AfterException());
-                var a = AwaitAwait(l.Task);
-                var b = AwaitAwait(l.Task);
-                var c = AwaitAwait(l.Task);
-
-                await Assert.ThrowsAsync<TaskTestException>(async () => await a);
-                await Assert.ThrowsAsync<TaskTestException>(async () => await b);
-                await Assert.ThrowsAsync<TaskTestException>(async () => await c);
-            }
-        }
-
-        [Fact]
-        public async Task LazyImmediate()
-        {
-            {
-                var l = UniTask.Lazy(() => UniTask.FromResult(1));
-                var a = AwaitAwait(l.Task);
-                var b = AwaitAwait(l.Task);
-                var c = AwaitAwait(l.Task);
-
-                var a2 = await a;
-                var b2 = await b;
-                var c2 = await c;
-                (a2, b2, c2).Should().Be((1, 1, 1));
-            }
-            {
-                var l = UniTask.Lazy(() => UniTask.FromException<int>(new TaskTestException()));
-                var a = AwaitAwait(l.Task);
-                var b = AwaitAwait(l.Task);
-                var c = AwaitAwait(l.Task);
-
-                await Assert.ThrowsAsync<TaskTestException>(async () => await a);
-                await Assert.ThrowsAsync<TaskTestException>(async () => await b);
-                await Assert.ThrowsAsync<TaskTestException>(async () => await c);
-            }
-        }
-
-        static async UniTask<int> AwaitAwait(UniTask<int> t)
-        {
-            return await t;
-        }
-
-
-        async UniTask<int> After()
-        {
-            await UniTask.Yield();
-            Thread.Sleep(TimeSpan.FromSeconds(1));
-            await UniTask.Yield();
-            await UniTask.Yield();
-            return 10;
-        }
-
-        async UniTask<int> AfterException()
-        {
-            await UniTask.Yield();
-            Thread.Sleep(TimeSpan.FromSeconds(1));
-            await UniTask.Yield();
-            throw new TaskTestException();
-        }
-    }
-}
--- a/src/UniTask.NetCoreTests/AsyncReactivePropertyTest.cs
+++ b/src/UniTask.NetCoreTests/AsyncReactivePropertyTest.cs
@ -31,7 +31,7 @@ namespace NetCoreTests

            var ar = await array;

-            ar.Should().Equal(new[] { 99, 100, 100, 100, 131 });
+            ar.Should().BeEquivalentTo(new[] { 99, 100, 100, 100, 131 });
        }

        [Fact]
@ -49,7 +49,7 @@ namespace NetCoreTests

            var ar = await array;

-            ar.Should().Equal(new[] { 100, 100, 100, 131, 191 });
+            ar.Should().BeEquivalentTo(new[] { 100, 100, 100, 131, 191 });
        }

        //[Fact]
@ -70,7 +70,7 @@ namespace NetCoreTests

        //    var ar = await array;

-        //    ar.Should().Equal(new[] { 99, 100, 100, 100, 131 });
+        //    ar.Should().BeEquivalentTo(new[] { 99, 100, 100, 100, 131 });
        //}

        //[Fact]
@ -88,7 +88,7 @@ namespace NetCoreTests

        //    var ar = await array;

-        //    ar.Should().Equal(new[] { 100, 100, 100, 131, 191 });
+        //    ar.Should().BeEquivalentTo(new[] { 100, 100, 100, 131, 191 });
        //}


@ -112,85 +112,6 @@ namespace NetCoreTests
            state.Value.Should().Be(20);
        }

-        [Fact]
-        public async Task WaitAsyncTest()
-        {
-            var rp = new AsyncReactiveProperty<int>(128);
-
-            var f = await rp.FirstAsync();
-            f.Should().Be(128);
-
-            {
-                var t = rp.WaitAsync();
-                rp.Value = 99;
-                rp.Value = 100;
-                var v = await t;
-
-                v.Should().Be(99);
-            }
-
-            {
-                var t = rp.WaitAsync();
-                rp.Value = 99;
-                rp.Value = 100;
-                var v = await t;
-
-                v.Should().Be(99);
-            }
-        }
-
-
-        [Fact]
-        public async Task WaitAsyncCancellationTest()
-        {
-            var cts = new CancellationTokenSource();
-
-            var rp = new AsyncReactiveProperty<int>(128);
-
-            var t = rp.WaitAsync(cts.Token);
-
-            cts.Cancel();
-
-            rp.Value = 99;
-            rp.Value = 100;
-
-            await Assert.ThrowsAsync<OperationCanceledException>(async () => { await t; });
-        }
-
-
-        [Fact]
-        public async Task ReadOnlyWaitAsyncTest()
-        {
-            var rp = new AsyncReactiveProperty<int>(128);
-            var rrp = rp.ToReadOnlyAsyncReactiveProperty(CancellationToken.None);
-
-            var t = rrp.WaitAsync();
-            rp.Value = 99;
-            rp.Value = 100;
-            var v = await t;
-
-            v.Should().Be(99);
-        }
-
-
-        [Fact]
-        public async Task ReadOnlyWaitAsyncCancellationTest()
-        {
-            var cts = new CancellationTokenSource();
-
-            var rp = new AsyncReactiveProperty<int>(128);
-            var rrp = rp.ToReadOnlyAsyncReactiveProperty(CancellationToken.None);
-
-            var t = rrp.WaitAsync(cts.Token);
-
-            cts.Cancel();
-
-            rp.Value = 99;
-            rp.Value = 100;
-
-            await Assert.ThrowsAsync<OperationCanceledException>(async () => { await t; });
-        }
-
    }


--- a/src/UniTask.NetCoreTests/ChannelTest.cs
+++ b/src/UniTask.NetCoreTests/ChannelTest.cs
@ -276,8 +276,8 @@ namespace NetCoreTests
            reference.Writer.TryComplete();
            channel.Writer.TryComplete();

-            (await ta1).Should().Equal(new[] { 10, 20, 30 });
-            (await ta2).Should().Equal(new[] { 10, 20, 30 });
+            (await ta1).Should().BeEquivalentTo(new[] { 10, 20, 30 });
+            (await ta2).Should().BeEquivalentTo(new[] { 10, 20, 30 });
        }

        [Fact]
--- a/src/UniTask.NetCoreTests/CompletionSourceTest.cs
+++ b/src/UniTask.NetCoreTests/CompletionSourceTest.cs
@ -1,590 +0,0 @@
-using Cysharp.Threading.Tasks;
-using FluentAssertions;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Channels;
-using Cysharp.Threading.Tasks.Linq;
-using System.Threading.Tasks;
-using Xunit;
-
-namespace NetCoreTests
-{
-    public class CompletionSourceTest
-    {
-        [Fact]
-        public async Task SetFirst()
-        {
-            {
-                var tcs = new UniTaskCompletionSource();
-
-                tcs.TrySetResult();
-                await tcs.Task; // ok.
-                await tcs.Task; // ok.
-                tcs.Task.Status.Should().Be(UniTaskStatus.Succeeded);
-            }
-
-            {
-                var tcs = new UniTaskCompletionSource();
-
-                tcs.TrySetException(new TestException());
-
-                await Assert.ThrowsAsync<TestException>(async () => await tcs.Task);
-                await Assert.ThrowsAsync<TestException>(async () => await tcs.Task);
-
-                tcs.Task.Status.Should().Be(UniTaskStatus.Faulted);
-            }
-
-            var cts = new CancellationTokenSource();
-
-            {
-                var tcs = new UniTaskCompletionSource();
-
-                tcs.TrySetException(new OperationCanceledException(cts.Token));
-
-                (await Assert.ThrowsAsync<OperationCanceledException>(async () => await tcs.Task)).CancellationToken.Should().Be(cts.Token);
-                (await Assert.ThrowsAsync<OperationCanceledException>(async () => await tcs.Task)).CancellationToken.Should().Be(cts.Token);
-
-                tcs.Task.Status.Should().Be(UniTaskStatus.Canceled);
-            }
-
-            {
-                var tcs = new UniTaskCompletionSource();
-
-                tcs.TrySetCanceled(cts.Token);
-
-                (await Assert.ThrowsAsync<OperationCanceledException>(async () => await tcs.Task)).CancellationToken.Should().Be(cts.Token);
-                (await Assert.ThrowsAsync<OperationCanceledException>(async () => await tcs.Task)).CancellationToken.Should().Be(cts.Token);
-
-                tcs.Task.Status.Should().Be(UniTaskStatus.Canceled);
-            }
-        }
-
-        [Fact]
-        public async Task SingleOnFirst()
-        {
-            {
-                var tcs = new UniTaskCompletionSource();
-
-                async UniTask Await()
-                {
-                    await tcs.Task;
-                }
-
-                var a = Await();
-
-                tcs.TrySetResult();
-                await a;
-                await tcs.Task; // ok.
-                tcs.Task.Status.Should().Be(UniTaskStatus.Succeeded);
-            }
-
-            {
-                var tcs = new UniTaskCompletionSource();
-
-                async UniTask Await()
-                {
-                    await tcs.Task;
-                }
-
-                var a = Await();
-
-                tcs.TrySetException(new TestException());
-                await Assert.ThrowsAsync<TestException>(async () => await a);
-                await Assert.ThrowsAsync<TestException>(async () => await tcs.Task);
-                tcs.Task.Status.Should().Be(UniTaskStatus.Faulted);
-            }
-
-            var cts = new CancellationTokenSource();
-
-            {
-                var tcs = new UniTaskCompletionSource();
-
-                async UniTask Await()
-                {
-                    await tcs.Task;
-                }
-
-                var a = Await();
-
-                tcs.TrySetException(new OperationCanceledException(cts.Token));
-                (await Assert.ThrowsAsync<OperationCanceledException>(async () => await a)).CancellationToken.Should().Be(cts.Token);
-                (await Assert.ThrowsAsync<OperationCanceledException>(async () => await tcs.Task)).CancellationToken.Should().Be(cts.Token);
-                tcs.Task.Status.Should().Be(UniTaskStatus.Canceled);
-            }
-            {
-                var tcs = new UniTaskCompletionSource();
-
-                async UniTask Await()
-                {
-                    await tcs.Task;
-                }
-
-                var a = Await();
-
-                tcs.TrySetCanceled(cts.Token);
-                (await Assert.ThrowsAsync<OperationCanceledException>(async () => await a)).CancellationToken.Should().Be(cts.Token);
-                (await Assert.ThrowsAsync<OperationCanceledException>(async () => await tcs.Task)).CancellationToken.Should().Be(cts.Token);
-                tcs.Task.Status.Should().Be(UniTaskStatus.Canceled);
-            }
-        }
-
-        [Fact]
-        public async Task MultiOne()
-        {
-            {
-                var tcs = new UniTaskCompletionSource();
-
-                async UniTask Await()
-                {
-                    await tcs.Task;
-                }
-
-                var a = Await();
-                var b = Await();
-                tcs.TrySetResult();
-                await a;
-                await b;
-                await tcs.Task; // ok.
-                tcs.Task.Status.Should().Be(UniTaskStatus.Succeeded);
-            }
-
-            {
-                var tcs = new UniTaskCompletionSource();
-
-                async UniTask Await()
-                {
-                    await tcs.Task;
-                }
-
-                var a = Await();
-                var b = Await();
-
-                tcs.TrySetException(new TestException());
-                await Assert.ThrowsAsync<TestException>(async () => await a);
-                await Assert.ThrowsAsync<TestException>(async () => await b);
-                await Assert.ThrowsAsync<TestException>(async () => await tcs.Task);
-                tcs.Task.Status.Should().Be(UniTaskStatus.Faulted);
-            }
-
-            var cts = new CancellationTokenSource();
-
-            {
-                var tcs = new UniTaskCompletionSource();
-
-                async UniTask Await()
-                {
-                    await tcs.Task;
-                }
-
-                var a = Await();
-                var b = Await();
-
-                tcs.TrySetException(new OperationCanceledException(cts.Token));
-                (await Assert.ThrowsAsync<OperationCanceledException>(async () => await a)).CancellationToken.Should().Be(cts.Token);
-                (await Assert.ThrowsAsync<OperationCanceledException>(async () => await b)).CancellationToken.Should().Be(cts.Token);
-                (await Assert.ThrowsAsync<OperationCanceledException>(async () => await tcs.Task)).CancellationToken.Should().Be(cts.Token);
-                tcs.Task.Status.Should().Be(UniTaskStatus.Canceled);
-            }
-            {
-                var tcs = new UniTaskCompletionSource();
-
-                async UniTask Await()
-                {
-                    await tcs.Task;
-                }
-
-                var a = Await();
-                var b = Await();
-
-                tcs.TrySetCanceled(cts.Token);
-                (await Assert.ThrowsAsync<OperationCanceledException>(async () => await a)).CancellationToken.Should().Be(cts.Token);
-                (await Assert.ThrowsAsync<OperationCanceledException>(async () => await b)).CancellationToken.Should().Be(cts.Token);
-                (await Assert.ThrowsAsync<OperationCanceledException>(async () => await tcs.Task)).CancellationToken.Should().Be(cts.Token);
-                tcs.Task.Status.Should().Be(UniTaskStatus.Canceled);
-            }
-        }
-
-        [Fact]
-        public async Task MultiTwo()
-        {
-            {
-                var tcs = new UniTaskCompletionSource();
-
-                async UniTask Await()
-                {
-                    await tcs.Task;
-                }
-
-                var a = Await();
-                var b = Await();
-                var c = Await();
-                tcs.TrySetResult();
-                await a;
-                await b;
-                await c;
-                await tcs.Task; // ok.
-                tcs.Task.Status.Should().Be(UniTaskStatus.Succeeded);
-            }
-
-            {
-                var tcs = new UniTaskCompletionSource();
-
-                async UniTask Await()
-                {
-                    await tcs.Task;
-                }
-
-                var a = Await();
-                var b = Await();
-                var c = Await();
-
-                tcs.TrySetException(new TestException());
-                await Assert.ThrowsAsync<TestException>(async () => await a);
-                await Assert.ThrowsAsync<TestException>(async () => await b);
-                await Assert.ThrowsAsync<TestException>(async () => await c);
-                await Assert.ThrowsAsync<TestException>(async () => await tcs.Task);
-                tcs.Task.Status.Should().Be(UniTaskStatus.Faulted);
-            }
-
-            var cts = new CancellationTokenSource();
-
-            {
-                var tcs = new UniTaskCompletionSource();
-
-                async UniTask Await()
-                {
-                    await tcs.Task;
-                }
-
-                var a = Await();
-                var b = Await();
-                var c = Await();
-
-                tcs.TrySetException(new OperationCanceledException(cts.Token));
-                (await Assert.ThrowsAsync<OperationCanceledException>(async () => await a)).CancellationToken.Should().Be(cts.Token);
-                (await Assert.ThrowsAsync<OperationCanceledException>(async () => await b)).CancellationToken.Should().Be(cts.Token);
-                (await Assert.ThrowsAsync<OperationCanceledException>(async () => await c)).CancellationToken.Should().Be(cts.Token);
-                (await Assert.ThrowsAsync<OperationCanceledException>(async () => await tcs.Task)).CancellationToken.Should().Be(cts.Token);
-                tcs.Task.Status.Should().Be(UniTaskStatus.Canceled);
-            }
-            {
-                var tcs = new UniTaskCompletionSource();
-
-                async UniTask Await()
-                {
-                    await tcs.Task;
-                }
-
-                var a = Await();
-                var b = Await();
-                var c = Await();
-
-                tcs.TrySetCanceled(cts.Token);
-                (await Assert.ThrowsAsync<OperationCanceledException>(async () => await a)).CancellationToken.Should().Be(cts.Token);
-                (await Assert.ThrowsAsync<OperationCanceledException>(async () => await b)).CancellationToken.Should().Be(cts.Token);
-                (await Assert.ThrowsAsync<OperationCanceledException>(async () => await c)).CancellationToken.Should().Be(cts.Token);
-                (await Assert.ThrowsAsync<OperationCanceledException>(async () => await tcs.Task)).CancellationToken.Should().Be(cts.Token);
-                tcs.Task.Status.Should().Be(UniTaskStatus.Canceled);
-            }
-        }
-
-        class TestException : Exception
-        {
-
-        }
-    }
-
-    public class CompletionSourceTest2
-    {
-        [Fact]
-        public async Task SetFirst()
-        {
-            {
-                var tcs = new UniTaskCompletionSource<int>();
-
-                tcs.TrySetResult(10);
-                var a = await tcs.Task; // ok.
-                var b = await tcs.Task; // ok.
-                a.Should().Be(10);
-                b.Should().Be(10);
-                tcs.Task.Status.Should().Be(UniTaskStatus.Succeeded);
-            }
-
-            {
-                var tcs = new UniTaskCompletionSource<int>();
-
-                tcs.TrySetException(new TestException());
-
-                await Assert.ThrowsAsync<TestException>(async () => await tcs.Task);
-                await Assert.ThrowsAsync<TestException>(async () => await tcs.Task);
-
-                tcs.Task.Status.Should().Be(UniTaskStatus.Faulted);
-            }
-
-            var cts = new CancellationTokenSource();
-
-            {
-                var tcs = new UniTaskCompletionSource<int>();
-
-                tcs.TrySetException(new OperationCanceledException(cts.Token));
-
-                (await Assert.ThrowsAsync<OperationCanceledException>(async () => await tcs.Task)).CancellationToken.Should().Be(cts.Token);
-                (await Assert.ThrowsAsync<OperationCanceledException>(async () => await tcs.Task)).CancellationToken.Should().Be(cts.Token);
-
-                tcs.Task.Status.Should().Be(UniTaskStatus.Canceled);
-            }
-
-            {
-                var tcs = new UniTaskCompletionSource<int>();
-
-                tcs.TrySetCanceled(cts.Token);
-
-                (await Assert.ThrowsAsync<OperationCanceledException>(async () => await tcs.Task)).CancellationToken.Should().Be(cts.Token);
-                (await Assert.ThrowsAsync<OperationCanceledException>(async () => await tcs.Task)).CancellationToken.Should().Be(cts.Token);
-
-                tcs.Task.Status.Should().Be(UniTaskStatus.Canceled);
-            }
-        }
-
-        [Fact]
-        public async Task SingleOnFirst()
-        {
-            {
-                var tcs = new UniTaskCompletionSource<int>();
-
-                async UniTask<int> Await()
-                {
-                    return await tcs.Task;
-                }
-
-                var a = Await();
-
-                tcs.TrySetResult(10);
-                var r1 = await a;
-                var r2 = await tcs.Task; // ok.
-                r1.Should().Be(10);
-                r2.Should().Be(10);
-                tcs.Task.Status.Should().Be(UniTaskStatus.Succeeded);
-            }
-
-            {
-                var tcs = new UniTaskCompletionSource<int>();
-
-                async UniTask<int> Await()
-                {
-                    return await tcs.Task;
-                }
-
-                var a = Await();
-
-                tcs.TrySetException(new TestException());
-                await Assert.ThrowsAsync<TestException>(async () => await a);
-                await Assert.ThrowsAsync<TestException>(async () => await tcs.Task);
-                tcs.Task.Status.Should().Be(UniTaskStatus.Faulted);
-            }
-
-            var cts = new CancellationTokenSource();
-
-            {
-                var tcs = new UniTaskCompletionSource<int>();
-
-                async UniTask<int> Await()
-                {
-                    return await tcs.Task;
-                }
-
-                var a = Await();
-
-                tcs.TrySetException(new OperationCanceledException(cts.Token));
-                (await Assert.ThrowsAsync<OperationCanceledException>(async () => await a)).CancellationToken.Should().Be(cts.Token);
-                (await Assert.ThrowsAsync<OperationCanceledException>(async () => await tcs.Task)).CancellationToken.Should().Be(cts.Token);
-                tcs.Task.Status.Should().Be(UniTaskStatus.Canceled);
-            }
-            {
-                var tcs = new UniTaskCompletionSource<int>();
-
-                async UniTask<int> Await()
-                {
-                    return await tcs.Task;
-                }
-
-                var a = Await();
-
-                tcs.TrySetCanceled(cts.Token);
-                (await Assert.ThrowsAsync<OperationCanceledException>(async () => await a)).CancellationToken.Should().Be(cts.Token);
-                (await Assert.ThrowsAsync<OperationCanceledException>(async () => await tcs.Task)).CancellationToken.Should().Be(cts.Token);
-                tcs.Task.Status.Should().Be(UniTaskStatus.Canceled);
-            }
-        }
-
-        [Fact]
-        public async Task MultiOne()
-        {
-            {
-                var tcs = new UniTaskCompletionSource<int>();
-
-                async UniTask<int> Await()
-                {
-                    return await tcs.Task;
-                }
-
-                var a = Await();
-                var b = Await();
-                tcs.TrySetResult(10);
-                var r1 = await a;
-                var r2 = await b;
-                var r3 = await tcs.Task; // ok.
-                (r1, r2, r3).Should().Be((10, 10, 10));
-                tcs.Task.Status.Should().Be(UniTaskStatus.Succeeded);
-            }
-
-            {
-                var tcs = new UniTaskCompletionSource<int>();
-
-                async UniTask<int> Await()
-                {
-                    return await tcs.Task;
-                }
-
-                var a = Await();
-                var b = Await();
-
-                tcs.TrySetException(new TestException());
-                await Assert.ThrowsAsync<TestException>(async () => await a);
-                await Assert.ThrowsAsync<TestException>(async () => await b);
-                await Assert.ThrowsAsync<TestException>(async () => await tcs.Task);
-                tcs.Task.Status.Should().Be(UniTaskStatus.Faulted);
-            }
-
-            var cts = new CancellationTokenSource();
-
-            {
-                var tcs = new UniTaskCompletionSource<int>();
-
-                async UniTask<int> Await()
-                {
-                    return await tcs.Task;
-                }
-
-                var a = Await();
-                var b = Await();
-
-                tcs.TrySetException(new OperationCanceledException(cts.Token));
-                (await Assert.ThrowsAsync<OperationCanceledException>(async () => await a)).CancellationToken.Should().Be(cts.Token);
-                (await Assert.ThrowsAsync<OperationCanceledException>(async () => await b)).CancellationToken.Should().Be(cts.Token);
-                (await Assert.ThrowsAsync<OperationCanceledException>(async () => await tcs.Task)).CancellationToken.Should().Be(cts.Token);
-                tcs.Task.Status.Should().Be(UniTaskStatus.Canceled);
-            }
-            {
-                var tcs = new UniTaskCompletionSource<int>();
-
-                async UniTask<int> Await()
-                {
-                    return await tcs.Task;
-                }
-
-                var a = Await();
-                var b = Await();
-
-                tcs.TrySetCanceled(cts.Token);
-                (await Assert.ThrowsAsync<OperationCanceledException>(async () => await a)).CancellationToken.Should().Be(cts.Token);
-                (await Assert.ThrowsAsync<OperationCanceledException>(async () => await b)).CancellationToken.Should().Be(cts.Token);
-                (await Assert.ThrowsAsync<OperationCanceledException>(async () => await tcs.Task)).CancellationToken.Should().Be(cts.Token);
-                tcs.Task.Status.Should().Be(UniTaskStatus.Canceled);
-            }
-        }
-
-        [Fact]
-        public async Task MultiTwo()
-        {
-            {
-                var tcs = new UniTaskCompletionSource<int>();
-
-                async UniTask<int> Await()
-                {
-                    return await tcs.Task;
-                }
-
-                var a = Await();
-                var b = Await();
-                var c = Await();
-                tcs.TrySetResult(10);
-                var r1 = await a;
-                var r2 = await b;
-                var r3 = await c;
-                var r4 = await tcs.Task; // ok.
-                (r1, r2, r3, r4).Should().Be((10, 10, 10, 10));
-                tcs.Task.Status.Should().Be(UniTaskStatus.Succeeded);
-            }
-
-            {
-                var tcs = new UniTaskCompletionSource<int>();
-
-                async UniTask<int> Await()
-                {
-                    return await tcs.Task;
-                }
-
-                var a = Await();
-                var b = Await();
-                var c = Await();
-
-                tcs.TrySetException(new TestException());
-                await Assert.ThrowsAsync<TestException>(async () => await a);
-                await Assert.ThrowsAsync<TestException>(async () => await b);
-                await Assert.ThrowsAsync<TestException>(async () => await c);
-                await Assert.ThrowsAsync<TestException>(async () => await tcs.Task);
-                tcs.Task.Status.Should().Be(UniTaskStatus.Faulted);
-            }
-
-            var cts = new CancellationTokenSource();
-
-            {
-                var tcs = new UniTaskCompletionSource<int>();
-
-                async UniTask<int> Await()
-                {
-                    return await tcs.Task;
-                }
-
-                var a = Await();
-                var b = Await();
-                var c = Await();
-
-                tcs.TrySetException(new OperationCanceledException(cts.Token));
-                (await Assert.ThrowsAsync<OperationCanceledException>(async () => await a)).CancellationToken.Should().Be(cts.Token);
-                (await Assert.ThrowsAsync<OperationCanceledException>(async () => await b)).CancellationToken.Should().Be(cts.Token);
-                (await Assert.ThrowsAsync<OperationCanceledException>(async () => await c)).CancellationToken.Should().Be(cts.Token);
-                (await Assert.ThrowsAsync<OperationCanceledException>(async () => await tcs.Task)).CancellationToken.Should().Be(cts.Token);
-                tcs.Task.Status.Should().Be(UniTaskStatus.Canceled);
-            }
-            {
-                var tcs = new UniTaskCompletionSource<int>();
-
-                async UniTask<int> Await()
-                {
-                    return await tcs.Task;
-                }
-
-                var a = Await();
-                var b = Await();
-                var c = Await();
-
-                tcs.TrySetCanceled(cts.Token);
-                (await Assert.ThrowsAsync<OperationCanceledException>(async () => await a)).CancellationToken.Should().Be(cts.Token);
-                (await Assert.ThrowsAsync<OperationCanceledException>(async () => await b)).CancellationToken.Should().Be(cts.Token);
-                (await Assert.ThrowsAsync<OperationCanceledException>(async () => await c)).CancellationToken.Should().Be(cts.Token);
-                (await Assert.ThrowsAsync<OperationCanceledException>(async () => await tcs.Task)).CancellationToken.Should().Be(cts.Token);
-                tcs.Task.Status.Should().Be(UniTaskStatus.Canceled);
-            }
-        }
-
-        class TestException : Exception
-        {
-
-        }
-    }
-}
--- a/src/UniTask.NetCoreTests/Linq/Aggregate.cs
+++ b/src/UniTask.NetCoreTests/Linq/Aggregate.cs
@ -481,7 +481,7 @@ namespace NetCoreTests.Linq
                list.Add(x);
            });

-            list.Should().Equal(Enumerable.Range(1, 10));
+            list.Should().BeEquivalentTo(Enumerable.Range(1, 10));

            var list2 = new List<(int, int)>();
            await Enumerable.Range(5, 10).ToUniTaskAsyncEnumerable().ForEachAsync((index, x) =>
@ -490,7 +490,7 @@ namespace NetCoreTests.Linq
            });

            var list3 = Enumerable.Range(5, 10).Select((index, x) => (index, x)).ToArray();
-            list2.Should().Equal(list3);
+            list2.Should().BeEquivalentTo(list3);
        }
    }
 }
--- a/src/UniTask.NetCoreTests/Linq/Concat.cs
+++ b/src/UniTask.NetCoreTests/Linq/Concat.cs
@ -24,7 +24,7 @@ namespace NetCoreTests.Linq
            var xs = await Enumerable.Range(start, count).ToUniTaskAsyncEnumerable().Append(99).ToArrayAsync();
            var ys = Enumerable.Range(start, count).Append(99).ToArray();

-            xs.Should().Equal(ys);
+            xs.Should().BeEquivalentTo(ys);
        }

        [Fact]
@ -50,7 +50,7 @@ namespace NetCoreTests.Linq
            var xs = await Enumerable.Range(start, count).ToUniTaskAsyncEnumerable().Prepend(99).ToArrayAsync();
            var ys = Enumerable.Range(start, count).Prepend(99).ToArray();

-            xs.Should().Equal(ys);
+            xs.Should().BeEquivalentTo(ys);
        }

        [Fact]
@ -85,7 +85,7 @@ namespace NetCoreTests.Linq

            var xs = await l.ToUniTaskAsyncEnumerable().Concat(r.ToUniTaskAsyncEnumerable()).ToArrayAsync();
            var ys = l.Concat(r).ToArray();
-            xs.Should().Equal(ys);
+            xs.Should().BeEquivalentTo(ys);
        }

        [Fact]
@ -119,17 +119,17 @@ namespace NetCoreTests.Linq
            {
                var xs = await Enumerable.Range(1, 0).ToUniTaskAsyncEnumerable().DefaultIfEmpty(99).ToArrayAsync();
                var ys = Enumerable.Range(1, 0).DefaultIfEmpty(99).ToArray();
-                xs.Should().Equal(ys);
+                xs.Should().BeEquivalentTo(ys);
            }
            {
                var xs = await Enumerable.Range(1, 1).ToUniTaskAsyncEnumerable().DefaultIfEmpty(99).ToArrayAsync();
                var ys = Enumerable.Range(1, 1).DefaultIfEmpty(99).ToArray();
-                xs.Should().Equal(ys);
+                xs.Should().BeEquivalentTo(ys);
            }
            {
                var xs = await Enumerable.Range(1, 10).ToUniTaskAsyncEnumerable().DefaultIfEmpty(99).ToArrayAsync();
                var ys = Enumerable.Range(1, 10).DefaultIfEmpty(99).ToArray();
-                xs.Should().Equal(ys);
+                xs.Should().BeEquivalentTo(ys);
            }
            // Throw
            {
--- a/src/UniTask.NetCoreTests/Linq/Convert.cs
+++ b/src/UniTask.NetCoreTests/Linq/Convert.cs
@ -34,11 +34,11 @@ namespace NetCoreTests.Linq
        {
            {
                var xs = await UniTaskAsyncEnumerable.Range(1, 10).ToObservable().ToArray();
-                xs.Should().Equal(Enumerable.Range(1, 10));
+                xs.Should().BeEquivalentTo(Enumerable.Range(1, 10));
            }
            {
                var xs = await UniTaskAsyncEnumerable.Range(1, 0).ToObservable().ToArray();
-                xs.Should().Equal(Enumerable.Range(1, 0));
+                xs.Should().BeEquivalentTo(Enumerable.Range(1, 0));
            }
        }

@ -70,21 +70,21 @@ namespace NetCoreTests.Linq
                var xs = await Observable.Range(1, 100).ToUniTaskAsyncEnumerable().ToArrayAsync();
                var ys = await Observable.Range(1, 100).ToArray();

-                xs.Should().Equal(ys);
+                xs.Should().BeEquivalentTo(ys);
            }

            {
                var xs = await Observable.Range(1, 100, ThreadPoolScheduler.Instance).ToUniTaskAsyncEnumerable().ToArrayAsync();
                var ys = await Observable.Range(1, 100, ThreadPoolScheduler.Instance).ToArray();

-                xs.Should().Equal(ys);
+                xs.Should().BeEquivalentTo(ys);
            }

            {
                var xs = await Observable.Empty<int>(ThreadPoolScheduler.Instance).ToUniTaskAsyncEnumerable().ToArrayAsync();
                var ys = await Observable.Empty<int>(ThreadPoolScheduler.Instance).ToArray();

-                xs.Should().Equal(ys);
+                xs.Should().BeEquivalentTo(ys);
            }
        }

@ -95,25 +95,25 @@ namespace NetCoreTests.Linq
                var xs = await Enumerable.Range(1, 100).ToUniTaskAsyncEnumerable().ToDictionaryAsync(x => x);
                var ys = Enumerable.Range(1, 100).ToDictionary(x => x);

-                xs.OrderBy(x => x.Key).Should().Equal(ys.OrderBy(x => x.Key));
+                xs.OrderBy(x => x.Key).Should().BeEquivalentTo(ys.OrderBy(x => x.Key));
            }
            {
                var xs = await Enumerable.Range(1, 0).ToUniTaskAsyncEnumerable().ToDictionaryAsync(x => x);
                var ys = Enumerable.Range(1, 0).ToDictionary(x => x);

-                xs.OrderBy(x => x.Key).Should().Equal(ys.OrderBy(x => x.Key));
+                xs.OrderBy(x => x.Key).Should().BeEquivalentTo(ys.OrderBy(x => x.Key));
            }
            {
                var xs = await Enumerable.Range(1, 100).ToUniTaskAsyncEnumerable().ToDictionaryAsync(x => x, x => x * 2);
                var ys = Enumerable.Range(1, 100).ToDictionary(x => x, x => x * 2);

-                xs.OrderBy(x => x.Key).Should().Equal(ys.OrderBy(x => x.Key));
+                xs.OrderBy(x => x.Key).Should().BeEquivalentTo(ys.OrderBy(x => x.Key));
            }
            {
                var xs = await Enumerable.Range(1, 0).ToUniTaskAsyncEnumerable().ToDictionaryAsync(x => x, x => x * 2);
                var ys = Enumerable.Range(1, 0).ToDictionary(x => x, x => x * 2);

-                xs.OrderBy(x => x.Key).Should().Equal(ys.OrderBy(x => x.Key));
+                xs.OrderBy(x => x.Key).Should().BeEquivalentTo(ys.OrderBy(x => x.Key));
            }
        }

@ -126,34 +126,34 @@ namespace NetCoreTests.Linq
                var ys = arr.ToLookup(x => x);

                xs.Count.Should().Be(ys.Count);
-                xs.Should().BeEquivalentTo(ys);
+                xs.OrderBy(x => x.Key).Should().BeEquivalentTo(ys.OrderBy(x => x.Key));
                foreach (var key in xs.Select(x => x.Key))
                {
-                    xs[key].Should().Equal(ys[key]);
+                    xs[key].Should().BeEquivalentTo(ys[key]);
                }
            }
            {
                var xs = await Enumerable.Range(1, 0).ToUniTaskAsyncEnumerable().ToLookupAsync(x => x);
                var ys = Enumerable.Range(1, 0).ToLookup(x => x);

-                xs.Should().BeEquivalentTo(ys);
+                xs.OrderBy(x => x.Key).Should().BeEquivalentTo(ys.OrderBy(x => x.Key));
            }
            {
                var xs = await arr.ToUniTaskAsyncEnumerable().ToLookupAsync(x => x, x => x * 2);
                var ys = arr.ToLookup(x => x, x => x * 2);

                xs.Count.Should().Be(ys.Count);
-                xs.Should().BeEquivalentTo(ys);
+                xs.OrderBy(x => x.Key).Should().BeEquivalentTo(ys.OrderBy(x => x.Key));
                foreach (var key in xs.Select(x => x.Key))
                {
-                    xs[key].Should().Equal(ys[key]);
+                    xs[key].Should().BeEquivalentTo(ys[key]);
                }
            }
            {
                var xs = await Enumerable.Range(1, 0).ToUniTaskAsyncEnumerable().ToLookupAsync(x => x, x => x * 2);
                var ys = Enumerable.Range(1, 0).ToLookup(x => x, x => x * 2);

-                xs.Should().BeEquivalentTo(ys);
+                xs.OrderBy(x => x.Key).Should().BeEquivalentTo(ys.OrderBy(x => x.Key));
            }
        }

@ -164,13 +164,13 @@ namespace NetCoreTests.Linq
                var xs = await Enumerable.Range(1, 100).ToUniTaskAsyncEnumerable().ToListAsync();
                var ys = Enumerable.Range(1, 100).ToList();

-                xs.Should().Equal(ys);
+                xs.Should().BeEquivalentTo(ys);
            }
            {
                var xs = await Enumerable.Empty<int>().ToUniTaskAsyncEnumerable().ToListAsync();
                var ys = Enumerable.Empty<int>().ToList();

-                xs.Should().Equal(ys);
+                xs.Should().BeEquivalentTo(ys);
            }
        }

@ -181,13 +181,13 @@ namespace NetCoreTests.Linq
                var xs = await new[] { 1, 20, 4, 5, 20, 4, 6 }.ToUniTaskAsyncEnumerable().ToHashSetAsync();
                var ys = new[] { 1, 20, 4, 5, 20, 4, 6 }.ToHashSet();

-                xs.OrderBy(x => x).Should().Equal(ys.OrderBy(x => x));
+                xs.OrderBy(x => x).Should().BeEquivalentTo(ys.OrderBy(x => x));
            }
            {
                var xs = await Enumerable.Empty<int>().ToUniTaskAsyncEnumerable().ToHashSetAsync();
                var ys = Enumerable.Empty<int>().ToHashSet();

-                xs.Should().Equal(ys);
+                xs.Should().BeEquivalentTo(ys);
            }
        }
    }
--- a/src/UniTask.NetCoreTests/Linq/CreateTest.cs
+++ b/src/UniTask.NetCoreTests/Linq/CreateTest.cs
@ -1,194 +0,0 @@
-#pragma warning disable CS1998
-#pragma warning disable CS0162
-
-using Cysharp.Threading.Tasks;
-using Cysharp.Threading.Tasks.Linq;
-using FluentAssertions;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading.Tasks;
-using Xunit;
-
-namespace NetCoreTests.Linq
-{
-    public class CreateTest
-    {
-        [Fact]
-        public async Task SyncCreation()
-        {
-            var from = 10;
-            var count = 100;
-
-            var xs = await UniTaskAsyncEnumerable.Create<int>(async (writer, token) =>
-            {
-                for (int i = 0; i < count; i++)
-                {
-                    await writer.YieldAsync(from + i);
-                }
-            }).ToArrayAsync();
-
-            var ys = await Range(from, count).AsUniTaskAsyncEnumerable().ToArrayAsync();
-
-            xs.Should().Equal(ys);
-        }
-
-        [Fact]
-        public async Task SyncManually()
-        {
-            var list = new List<int>();
-            var xs = UniTaskAsyncEnumerable.Create<int>(async (writer, token) =>
-            {
-                list.Add(100);
-                await writer.YieldAsync(10);
-                
-                list.Add(200);
-                await writer.YieldAsync(20);
-
-                list.Add(300);
-                await writer.YieldAsync(30);
-            
-                list.Add(400);
-            });
-
-            list.Should().BeEmpty();
-            var e = xs.GetAsyncEnumerator();
-
-            list.Should().BeEmpty();
-
-            await e.MoveNextAsync();
-            list.Should().Equal(100);
-            e.Current.Should().Be(10);
-
-            await e.MoveNextAsync();
-            list.Should().Equal(100, 200);
-            e.Current.Should().Be(20);
-
-            await e.MoveNextAsync();
-            list.Should().Equal(100, 200, 300);
-            e.Current.Should().Be(30);
-
-            (await e.MoveNextAsync()).Should().BeFalse();
-            list.Should().Equal(100, 200, 300, 400);
-        }
-
-        [Fact]
-        public async Task SyncExceptionFirst()
-        {
-            var from = 10;
-            var count = 100;
-
-            var xs = UniTaskAsyncEnumerable.Create<int>(async (writer, token) =>
-            {
-                for (int i = 0; i < count; i++)
-                {
-                    throw new UniTaskTestException();
-                    await writer.YieldAsync(from + i);
-                }
-            });
-
-            await Assert.ThrowsAsync<UniTaskTestException>(async () => await xs.ToArrayAsync());
-        }
-
-        [Fact]
-        public async Task SyncException()
-        {
-            var from = 10;
-            var count = 100;
-
-            var xs = UniTaskAsyncEnumerable.Create<int>(async (writer, token) =>
-            {
-                for (int i = 0; i < count; i++)
-                {
-                    await writer.YieldAsync(from + i);
-
-                    if (i == 15)
-                    {
-                        throw new UniTaskTestException();
-                    }
-                }
-            });
-
-            await Assert.ThrowsAsync<UniTaskTestException>(async () => await xs.ToArrayAsync());
-        }
-
-        [Fact]
-        public async Task ASyncManually()
-        {
-            var list = new List<int>();
-            var xs = UniTaskAsyncEnumerable.Create<int>(async (writer, token) =>
-            {
-                await UniTask.Yield();
-
-                list.Add(100);
-                await writer.YieldAsync(10);
-
-                await UniTask.Yield();
-
-                list.Add(200);
-                await writer.YieldAsync(20);
-
-                await UniTask.Yield();
-                list.Add(300);
-                await UniTask.Yield();
-                await writer.YieldAsync(30);
-
-                await UniTask.Yield();
-
-                list.Add(400);
-            });
-
-            list.Should().BeEmpty();
-            var e = xs.GetAsyncEnumerator();
-
-            list.Should().BeEmpty();
-
-            await e.MoveNextAsync();
-            list.Should().Equal(100);
-            e.Current.Should().Be(10);
-
-            await e.MoveNextAsync();
-            list.Should().Equal(100, 200);
-            e.Current.Should().Be(20);
-
-            await e.MoveNextAsync();
-            list.Should().Equal(100, 200, 300);
-            e.Current.Should().Be(30);
-
-            (await e.MoveNextAsync()).Should().BeFalse();
-            list.Should().Equal(100, 200, 300, 400);
-        }
-
-        [Fact]
-        public async Task AwaitForeachBreak()
-        {
-            var finallyCalled = false;
-            var enumerable = UniTaskAsyncEnumerable.Create<int>(async (writer, _) =>
-            {
-                try
-                {
-                    await writer.YieldAsync(1);
-                }
-                finally
-                {
-                    finallyCalled = true;
-                }
-            });
-
-            await foreach (var x in enumerable)
-            {
-                x.Should().Be(1);
-                break;
-            }
-            finallyCalled.Should().BeTrue();
-        }
-
-        async IAsyncEnumerable<int> Range(int from, int count)
-        {
-            for (int i = 0; i < count; i++)
-            {
-                yield return from + i;
-            }
-        }
-    }
-}
--- a/src/UniTask.NetCoreTests/Linq/Factory.cs
+++ b/src/UniTask.NetCoreTests/Linq/Factory.cs
@ -22,7 +22,7 @@ namespace NetCoreTests.Linq
            var xs = await UniTaskAsyncEnumerable.Range(start, count).ToArrayAsync();
            var ys = Enumerable.Range(start, count).ToArray();

-            xs.Should().Equal(ys);
+            xs.Should().BeEquivalentTo(ys);
        }

        [Theory]
@ -36,7 +36,7 @@ namespace NetCoreTests.Linq
            var xs = await UniTaskAsyncEnumerable.Repeat(value, count).ToArrayAsync();
            var ys = Enumerable.Repeat(value, count).ToArray();

-            xs.Should().Equal(ys);
+            xs.Should().BeEquivalentTo(ys);
        }

        [Fact]
@ -45,7 +45,7 @@ namespace NetCoreTests.Linq
            var xs = await UniTaskAsyncEnumerable.Empty<int>().ToArrayAsync();
            var ys = Enumerable.Empty<int>().ToArray();

-            xs.Should().Equal(ys);
+            xs.Should().BeEquivalentTo(ys);
        }

        [Theory]
--- a/src/UniTask.NetCoreTests/Linq/Filtering.cs
+++ b/src/UniTask.NetCoreTests/Linq/Filtering.cs
@ -23,26 +23,26 @@ namespace NetCoreTests.Linq
            {
                var a = await src.Where(x => x % 2 == 0).ToArrayAsync();
                var expected = range.Where(x => x % 2 == 0).ToArray();
-                a.Should().Equal(expected);
+                a.Should().BeEquivalentTo(expected);
            }
            {
                var a = await src.Where((x, i) => (x + i) % 2 == 0).ToArrayAsync();
                var expected = range.Where((x, i) => (x + i) % 2 == 0).ToArray();
-                a.Should().Equal(expected);
+                a.Should().BeEquivalentTo(expected);
            }
            {
                var a = await src.WhereAwait(x => UniTask.Run(() => x % 2 == 0)).ToArrayAsync();
                var b = await src.WhereAwait(x => UniTask.FromResult(x % 2 == 0)).ToArrayAsync();
                var expected = range.Where(x => x % 2 == 0).ToArray();
-                a.Should().Equal(expected);
-                b.Should().Equal(expected);
+                a.Should().BeEquivalentTo(expected);
+                b.Should().BeEquivalentTo(expected);
            }
            {
                var a = await src.WhereAwait((x, i) => UniTask.Run(() => (x + i) % 2 == 0)).ToArrayAsync();
                var b = await src.WhereAwait((x, i) => UniTask.FromResult((x + i) % 2 == 0)).ToArrayAsync();
                var expected = range.Where((x, i) => (x + i) % 2 == 0).ToArray();
-                a.Should().Equal(expected);
-                b.Should().Equal(expected);
+                a.Should().BeEquivalentTo(expected);
+                b.Should().BeEquivalentTo(expected);
            }
        }

@ -79,7 +79,7 @@ namespace NetCoreTests.Linq
            var a = await data.ToUniTaskAsyncEnumerable().OfType<int>().ToArrayAsync();
            var b = data.OfType<int>().ToArray();

-            a.Should().Equal(b);
+            a.Should().BeEquivalentTo(b);
        }


@ -101,7 +101,7 @@ namespace NetCoreTests.Linq
            var a = await data.ToUniTaskAsyncEnumerable().Cast<int>().ToArrayAsync();
            var b = data.Cast<int>().ToArray();

-            a.Should().Equal(b);
+            a.Should().BeEquivalentTo(b);
        }


--- a/src/UniTask.NetCoreTests/Linq/Joins.cs
+++ b/src/UniTask.NetCoreTests/Linq/Joins.cs
@ -38,7 +38,7 @@ namespace NetCoreTests.Linq
            var xs = await outer.ToUniTaskAsyncEnumerable().Join(inner.ToUniTaskAsyncEnumerable(), x => x, x => x, (x, y) => (x, y)).ToArrayAsync();
            var ys = outer.Join(inner, x => x, x => x, (x, y) => (x, y)).ToArray();

-            xs.Should().Equal(ys);
+            xs.Should().BeEquivalentTo(ys);
        }


@ -66,7 +66,7 @@ namespace NetCoreTests.Linq
            var xs = await outer.ToUniTaskAsyncEnumerable().JoinAwait(inner.ToUniTaskAsyncEnumerable(), x => RandomRun(x), x => RandomRun(x), (x, y) => RandomRun((x, y))).ToArrayAsync();
            var ys = outer.Join(inner, x => x, x => x, (x, y) => (x, y)).ToArray();

-            xs.Should().Equal(ys);
+            xs.Should().BeEquivalentTo(ys);
        }


@ -94,7 +94,7 @@ namespace NetCoreTests.Linq
            var xs = await outer.ToUniTaskAsyncEnumerable().JoinAwaitWithCancellation(inner.ToUniTaskAsyncEnumerable(), (x, _) => RandomRun(x), (x, _) => RandomRun(x), (x, y, _) => RandomRun((x, y))).ToArrayAsync();
            var ys = outer.Join(inner, x => x, x => x, (x, y) => (x, y)).ToArray();

-            xs.Should().Equal(ys);
+            xs.Should().BeEquivalentTo(ys);
        }


@ -123,7 +123,7 @@ namespace NetCoreTests.Linq
                var ys = arr.GroupBy(x => x).ToArray();

                xs.Length.Should().Be(ys.Length);
-                xs.Should().BeEquivalentTo(ys);
+                xs.OrderBy(x => x.Key).Should().BeEquivalentTo(ys.OrderBy(x => x.Key));
            }

            {
@ -131,7 +131,7 @@ namespace NetCoreTests.Linq
                var ys = arr.GroupBy(x => x, (key, xs) => (key, xs.ToArray())).ToArray();

                xs.Length.Should().Be(ys.Length);
-                xs.OrderBy(x => x.key).SelectMany(x => x.Item2).Should().Equal(ys.OrderBy(x => x.key).SelectMany(x => x.Item2));
+                xs.OrderBy(x => x.key).SelectMany(x => x.Item2).Should().BeEquivalentTo(ys.OrderBy(x => x.key).SelectMany(x => x.Item2));
            }

            {
@ -139,7 +139,7 @@ namespace NetCoreTests.Linq
                var ys = arr.GroupBy(x => x).ToArray();

                xs.Length.Should().Be(ys.Length);
-                xs.Should().BeEquivalentTo(ys);
+                xs.OrderBy(x => x.Key).Should().BeEquivalentTo(ys.OrderBy(x => x.Key));
            }

            {
@ -147,7 +147,7 @@ namespace NetCoreTests.Linq
                var ys = arr.GroupBy(x => x, (key, xs) => (key, xs.ToArray())).ToArray();

                xs.Length.Should().Be(ys.Length);
-                xs.OrderBy(x => x.key).SelectMany(x => x.Item2).Should().Equal(ys.OrderBy(x => x.key).SelectMany(x => x.Item2));
+                xs.OrderBy(x => x.key).SelectMany(x => x.Item2).Should().BeEquivalentTo(ys.OrderBy(x => x.key).SelectMany(x => x.Item2));
            }

            {
@ -155,7 +155,7 @@ namespace NetCoreTests.Linq
                var ys = arr.GroupBy(x => x).ToArray();

                xs.Length.Should().Be(ys.Length);
-                xs.Should().BeEquivalentTo(ys);
+                xs.OrderBy(x => x.Key).Should().BeEquivalentTo(ys.OrderBy(x => x.Key));
            }

            {
@ -163,7 +163,7 @@ namespace NetCoreTests.Linq
                var ys = arr.GroupBy(x => x, (key, xs) => (key, xs.ToArray())).ToArray();

                xs.Length.Should().Be(ys.Length);
-                xs.OrderBy(x => x.key).SelectMany(x => x.Item2).Should().Equal(ys.OrderBy(x => x.key).SelectMany(x => x.Item2));
+                xs.OrderBy(x => x.key).SelectMany(x => x.Item2).Should().BeEquivalentTo(ys.OrderBy(x => x.key).SelectMany(x => x.Item2));
            }
        }

@ -199,21 +199,21 @@ namespace NetCoreTests.Linq
                var ys = outer.GroupJoin(inner, x => x, x => x, (x, y) => (x, string.Join(", ", y))).ToArray();

                xs.Length.Should().Be(ys.Length);
-                xs.Should().Equal(ys);
+                xs.Should().BeEquivalentTo(ys);
            }
            {
                var xs = await outer.ToUniTaskAsyncEnumerable().GroupJoinAwait(inner.ToUniTaskAsyncEnumerable(), x => RandomRun(x), x => RandomRun(x), (x, y) => RandomRun((x, string.Join(", ", y)))).ToArrayAsync();
                var ys = outer.GroupJoin(inner, x => x, x => x, (x, y) => (x, string.Join(", ", y))).ToArray();

                xs.Length.Should().Be(ys.Length);
-                xs.Should().Equal(ys);
+                xs.Should().BeEquivalentTo(ys);
            }
            {
                var xs = await outer.ToUniTaskAsyncEnumerable().GroupJoinAwaitWithCancellation(inner.ToUniTaskAsyncEnumerable(), (x, _) => RandomRun(x), (x, _) => RandomRun(x), (x, y, _) => RandomRun((x, string.Join(", ", y)))).ToArrayAsync();
                var ys = outer.GroupJoin(inner, x => x, x => x, (x, y) => (x, string.Join(", ", y))).ToArray();

                xs.Length.Should().Be(ys.Length);
-                xs.Should().Equal(ys);
+                xs.Should().BeEquivalentTo(ys);
            }
        }

--- a/src/UniTask.NetCoreTests/Linq/Merge.cs
+++ b/src/UniTask.NetCoreTests/Linq/Merge.cs
@ -1,139 +0,0 @@
-#pragma warning disable CS1998
-
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using Cysharp.Threading.Tasks;
-using Cysharp.Threading.Tasks.Linq;
-using FluentAssertions;
-using Xunit;
-
-namespace NetCoreTests.Linq
-{
-    public class MergeTest
-    {
-        [Fact]
-        public async Task TwoSource()
-        {
-            var semaphore = new SemaphoreSlim(1, 1);
-
-            var a = UniTaskAsyncEnumerable.Create<string>(async (writer, _) =>
-            {
-                await UniTask.SwitchToThreadPool();
-
-                await semaphore.WaitAsync();
-                await writer.YieldAsync("A1");
-                semaphore.Release();
-
-                await semaphore.WaitAsync();
-                await writer.YieldAsync("A2");
-                semaphore.Release();
-            });
-
-            var b = UniTaskAsyncEnumerable.Create<string>(async (writer, _) =>
-            {
-                await UniTask.SwitchToThreadPool();
-
-                await semaphore.WaitAsync();
-                await writer.YieldAsync("B1");
-                await writer.YieldAsync("B2");
-                semaphore.Release();
-
-                await semaphore.WaitAsync();
-                await writer.YieldAsync("B3");
-                semaphore.Release();
-            });
-
-            var result = await a.Merge(b).ToArrayAsync();
-            result.Should().Equal("A1", "B1", "B2", "A2", "B3");
-        }
-
-        [Fact]
-        public async Task ThreeSource()
-        {
-            var semaphore = new SemaphoreSlim(0, 1);
-
-            var a = UniTaskAsyncEnumerable.Create<string>(async (writer, _) =>
-            {
-                await UniTask.SwitchToThreadPool();
-
-                await semaphore.WaitAsync();
-                await writer.YieldAsync("A1");
-                semaphore.Release();
-
-                await semaphore.WaitAsync();
-                await writer.YieldAsync("A2");
-                semaphore.Release();
-            });
-
-            var b = UniTaskAsyncEnumerable.Create<string>(async (writer, _) =>
-            {
-                await UniTask.SwitchToThreadPool();
-
-                await semaphore.WaitAsync();
-                await writer.YieldAsync("B1");
-                await writer.YieldAsync("B2");
-                semaphore.Release();
-
-                await semaphore.WaitAsync();
-                await writer.YieldAsync("B3");
-                semaphore.Release();
-            });
-
-            var c = UniTaskAsyncEnumerable.Create<string>(async (writer, _) =>
-            {
-                await UniTask.SwitchToThreadPool();
-
-                await writer.YieldAsync("C1");
-                semaphore.Release();
-            });
-
-            var result = await a.Merge(b, c).ToArrayAsync();
-            result.Should().Equal("C1", "A1", "B1", "B2", "A2", "B3");
-        }
-
-        [Fact]
-        public async Task Throw()
-        {
-            var a = UniTaskAsyncEnumerable.Create<string>(async (writer, _) =>
-            {
-                await writer.YieldAsync("A1");
-
-            });
-
-            var b = UniTaskAsyncEnumerable.Create<string>(async (writer, _) =>
-            {
-                throw new UniTaskTestException();
-            });
-
-            var enumerator = a.Merge(b).GetAsyncEnumerator();
-            (await enumerator.MoveNextAsync()).Should().Be(true);
-            enumerator.Current.Should().Be("A1");
-
-            await Assert.ThrowsAsync<UniTaskTestException>(async () => await enumerator.MoveNextAsync());
-        }
-
-        [Fact]
-        public async Task Cancel()
-        {
-            var cts = new CancellationTokenSource();
-
-            var a = UniTaskAsyncEnumerable.Create<string>(async (writer, _) =>
-            {
-                await writer.YieldAsync("A1");
-            });
-
-            var b = UniTaskAsyncEnumerable.Create<string>(async (writer, _) =>
-            {
-                await writer.YieldAsync("B1");
-            });
-
-            var enumerator = a.Merge(b).GetAsyncEnumerator(cts.Token);
-            (await enumerator.MoveNextAsync()).Should().Be(true);
-            enumerator.Current.Should().Be("A1");
-
-            cts.Cancel();
-            await Assert.ThrowsAsync<OperationCanceledException>(async () => await enumerator.MoveNextAsync());
-        }
-    }
-}
--- a/src/UniTask.NetCoreTests/Linq/Paging.cs
+++ b/src/UniTask.NetCoreTests/Linq/Paging.cs
@ -27,7 +27,7 @@ namespace NetCoreTests.Linq
            var xs = await UniTaskAsyncEnumerable.Range(1, collection).Skip(skipCount).ToArrayAsync();
            var ys = Enumerable.Range(1, collection).Skip(skipCount).ToArray();

-            xs.Should().Equal(ys);
+            xs.Should().BeEquivalentTo(ys);
        }

        [Fact]
@ -52,7 +52,7 @@ namespace NetCoreTests.Linq
            var xs = await UniTaskAsyncEnumerable.Range(1, collection).SkipLast(skipCount).ToArrayAsync();
            var ys = Enumerable.Range(1, collection).SkipLast(skipCount).ToArray();

-            xs.Should().Equal(ys);
+            xs.Should().BeEquivalentTo(ys);
        }

        [Fact]
@ -77,7 +77,7 @@ namespace NetCoreTests.Linq
            var xs = await UniTaskAsyncEnumerable.Range(1, collection).TakeLast(takeCount).ToArrayAsync();
            var ys = Enumerable.Range(1, collection).TakeLast(takeCount).ToArray();

-            xs.Should().Equal(ys);
+            xs.Should().BeEquivalentTo(ys);
        }

        [Fact]
@ -103,7 +103,7 @@ namespace NetCoreTests.Linq
            var xs = await UniTaskAsyncEnumerable.Range(1, collection).Take(takeCount).ToArrayAsync();
            var ys = Enumerable.Range(1, collection).Take(takeCount).ToArray();

-            xs.Should().Equal(ys);
+            xs.Should().BeEquivalentTo(ys);
        }

        [Fact]
@ -130,37 +130,37 @@ namespace NetCoreTests.Linq
                var xs = await UniTaskAsyncEnumerable.Range(1, collection).SkipWhile(x => x < skipCount).ToArrayAsync();
                var ys = Enumerable.Range(1, collection).SkipWhile(x => x < skipCount).ToArray();

-                xs.Should().Equal(ys);
+                xs.Should().BeEquivalentTo(ys);
            }
            {
                var xs = await UniTaskAsyncEnumerable.Range(1, collection).SkipWhile((x, i) => x < (skipCount - i)).ToArrayAsync();
                var ys = Enumerable.Range(1, collection).SkipWhile((x, i) => x < (skipCount - i)).ToArray();

-                xs.Should().Equal(ys);
+                xs.Should().BeEquivalentTo(ys);
            }
            {
                var xs = await UniTaskAsyncEnumerable.Range(1, collection).SkipWhileAwait(x => UniTask.Run(() => x < skipCount)).ToArrayAsync();
                var ys = Enumerable.Range(1, collection).SkipWhile(x => x < skipCount).ToArray();

-                xs.Should().Equal(ys);
+                xs.Should().BeEquivalentTo(ys);
            }
            {
                var xs = await UniTaskAsyncEnumerable.Range(1, collection).SkipWhileAwait((x, i) => UniTask.Run(() => x < (skipCount - i))).ToArrayAsync();
                var ys = Enumerable.Range(1, collection).SkipWhile((x, i) => x < (skipCount - i)).ToArray();

-                xs.Should().Equal(ys);
+                xs.Should().BeEquivalentTo(ys);
            }
            {
                var xs = await UniTaskAsyncEnumerable.Range(1, collection).SkipWhileAwaitWithCancellation((x, _) => UniTask.Run(() => x < skipCount)).ToArrayAsync();
                var ys = Enumerable.Range(1, collection).SkipWhile(x => x < skipCount).ToArray();

-                xs.Should().Equal(ys);
+                xs.Should().BeEquivalentTo(ys);
            }
            {
                var xs = await UniTaskAsyncEnumerable.Range(1, collection).SkipWhileAwaitWithCancellation((x, i, _) => UniTask.Run(() => x < (skipCount - i))).ToArrayAsync();
                var ys = Enumerable.Range(1, collection).SkipWhile((x, i) => x < (skipCount - i)).ToArray();

-                xs.Should().Equal(ys);
+                xs.Should().BeEquivalentTo(ys);
            }
        }

@ -213,37 +213,37 @@ namespace NetCoreTests.Linq
                var xs = await UniTaskAsyncEnumerable.Range(1, collection).TakeWhile(x => x < skipCount).ToArrayAsync();
                var ys = Enumerable.Range(1, collection).TakeWhile(x => x < skipCount).ToArray();

-                xs.Should().Equal(ys);
+                xs.Should().BeEquivalentTo(ys);
            }
            {
                var xs = await UniTaskAsyncEnumerable.Range(1, collection).TakeWhile((x, i) => x < (skipCount - i)).ToArrayAsync();
                var ys = Enumerable.Range(1, collection).TakeWhile((x, i) => x < (skipCount - i)).ToArray();

-                xs.Should().Equal(ys);
+                xs.Should().BeEquivalentTo(ys);
            }
            {
                var xs = await UniTaskAsyncEnumerable.Range(1, collection).TakeWhileAwait(x => UniTask.Run(() => x < skipCount)).ToArrayAsync();
                var ys = Enumerable.Range(1, collection).TakeWhile(x => x < skipCount).ToArray();

-                xs.Should().Equal(ys);
+                xs.Should().BeEquivalentTo(ys);
            }
            {
                var xs = await UniTaskAsyncEnumerable.Range(1, collection).TakeWhileAwait((x, i) => UniTask.Run(() => x < (skipCount - i))).ToArrayAsync();
                var ys = Enumerable.Range(1, collection).TakeWhile((x, i) => x < (skipCount - i)).ToArray();

-                xs.Should().Equal(ys);
+                xs.Should().BeEquivalentTo(ys);
            }
            {
                var xs = await UniTaskAsyncEnumerable.Range(1, collection).TakeWhileAwaitWithCancellation((x, _) => UniTask.Run(() => x < skipCount)).ToArrayAsync();
                var ys = Enumerable.Range(1, collection).TakeWhile(x => x < skipCount).ToArray();

-                xs.Should().Equal(ys);
+                xs.Should().BeEquivalentTo(ys);
            }
            {
                var xs = await UniTaskAsyncEnumerable.Range(1, collection).TakeWhileAwaitWithCancellation((x, i, _) => UniTask.Run(() => x < (skipCount - i))).ToArrayAsync();
                var ys = Enumerable.Range(1, collection).TakeWhile((x, i) => x < (skipCount - i)).ToArray();

-                xs.Should().Equal(ys);
+                xs.Should().BeEquivalentTo(ys);
            }
        }

--- a/src/UniTask.NetCoreTests/Linq/Projection.cs
+++ b/src/UniTask.NetCoreTests/Linq/Projection.cs
@ -24,7 +24,7 @@ namespace NetCoreTests.Linq
            var xs = await Enumerable.Range(start, count).ToUniTaskAsyncEnumerable().Reverse().ToArrayAsync();
            var ys = Enumerable.Range(start, count).Reverse().ToArray();

-            xs.Should().Equal(ys);
+            xs.Should().BeEquivalentTo(ys);
        }

        [Fact]
@ -46,18 +46,18 @@ namespace NetCoreTests.Linq
            {
                var xs = await UniTaskAsyncEnumerable.Range(1, count).Select(x => x * x).ToArrayAsync();
                var ys = Enumerable.Range(1, count).Select(x => x * x).ToArray();
-                xs.Should().Equal(ys);
+                xs.Should().BeEquivalentTo(ys);

                var zs = await UniTaskAsyncEnumerable.Range(1, count).SelectAwait((x) => UniTask.Run(() => x * x)).ToArrayAsync();
-                zs.Should().Equal(ys);
+                zs.Should().BeEquivalentTo(ys);
            }
            {
                var xs = await UniTaskAsyncEnumerable.Range(1, count).Select((x, i) => x * x * i).ToArrayAsync();
                var ys = Enumerable.Range(1, count).Select((x, i) => x * x * i).ToArray();
-                xs.Should().Equal(ys);
+                xs.Should().BeEquivalentTo(ys);

                var zs = await UniTaskAsyncEnumerable.Range(1, count).SelectAwait((x, i) => UniTask.Run(() => x * x * i)).ToArrayAsync();
-                zs.Should().Equal(ys);
+                zs.Should().BeEquivalentTo(ys);
            }
        }

@ -98,22 +98,22 @@ namespace NetCoreTests.Linq
            {
                var xs = await UniTaskAsyncEnumerable.Range(1, leftCount).SelectMany(x => UniTaskAsyncEnumerable.Range(99, rightCount * x)).ToArrayAsync();
                var ys = Enumerable.Range(1, leftCount).SelectMany(x => Enumerable.Range(99, rightCount * x)).ToArray();
-                xs.Should().Equal(ys);
+                xs.Should().BeEquivalentTo(ys);
            }
            {
                var xs = await UniTaskAsyncEnumerable.Range(1, leftCount).SelectMany((i, x) => UniTaskAsyncEnumerable.Range(99 * i, rightCount * x)).ToArrayAsync();
                var ys = Enumerable.Range(1, leftCount).SelectMany((i, x) => Enumerable.Range(99 * i, rightCount * x)).ToArray();
-                xs.Should().Equal(ys);
+                xs.Should().BeEquivalentTo(ys);
            }
            {
                var xs = await UniTaskAsyncEnumerable.Range(1, leftCount).SelectMany(x => UniTaskAsyncEnumerable.Range(99, rightCount * x), (x, y) => x * y).ToArrayAsync();
                var ys = Enumerable.Range(1, leftCount).SelectMany(x => Enumerable.Range(99, rightCount * x), (x, y) => x * y).ToArray();
-                xs.Should().Equal(ys);
+                xs.Should().BeEquivalentTo(ys);
            }
            {
                var xs = await UniTaskAsyncEnumerable.Range(1, leftCount).SelectMany((i, x) => UniTaskAsyncEnumerable.Range(99 * i, rightCount * x), (x, y) => x * y).ToArrayAsync();
                var ys = Enumerable.Range(1, leftCount).SelectMany((i, x) => Enumerable.Range(99 * i, rightCount * x), (x, y) => x * y).ToArray();
-                xs.Should().Equal(ys);
+                xs.Should().BeEquivalentTo(ys);
            }

            // await
@ -121,22 +121,22 @@ namespace NetCoreTests.Linq
            {
                var xs = await UniTaskAsyncEnumerable.Range(1, leftCount).SelectManyAwait(x => UniTask.Run(() => UniTaskAsyncEnumerable.Range(99, rightCount * x))).ToArrayAsync();
                var ys = Enumerable.Range(1, leftCount).SelectMany(x => Enumerable.Range(99, rightCount * x)).ToArray();
-                xs.Should().Equal(ys);
+                xs.Should().BeEquivalentTo(ys);
            }
            {
                var xs = await UniTaskAsyncEnumerable.Range(1, leftCount).SelectManyAwait((i, x) => UniTask.Run(() => UniTaskAsyncEnumerable.Range(99 * i, rightCount * x))).ToArrayAsync();
                var ys = Enumerable.Range(1, leftCount).SelectMany((i, x) => Enumerable.Range(99 * i, rightCount * x)).ToArray();
-                xs.Should().Equal(ys);
+                xs.Should().BeEquivalentTo(ys);
            }
            {
                var xs = await UniTaskAsyncEnumerable.Range(1, leftCount).SelectManyAwait(x => UniTask.Run(() => UniTaskAsyncEnumerable.Range(99, rightCount * x)), (x, y) => UniTask.Run(() => x * y)).ToArrayAsync();
                var ys = Enumerable.Range(1, leftCount).SelectMany(x => Enumerable.Range(99, rightCount * x), (x, y) => x * y).ToArray();
-                xs.Should().Equal(ys);
+                xs.Should().BeEquivalentTo(ys);
            }
            {
                var xs = await UniTaskAsyncEnumerable.Range(1, leftCount).SelectManyAwait((i, x) => UniTask.Run(() => UniTaskAsyncEnumerable.Range(99 * i, rightCount * x)), (x, y) => UniTask.Run(() => x * y)).ToArrayAsync();
                var ys = Enumerable.Range(1, leftCount).SelectMany((i, x) => Enumerable.Range(99 * i, rightCount * x), (x, y) => x * y).ToArray();
-                xs.Should().Equal(ys);
+                xs.Should().BeEquivalentTo(ys);
            }

            // with cancel
@ -144,22 +144,22 @@ namespace NetCoreTests.Linq
            {
                var xs = await UniTaskAsyncEnumerable.Range(1, leftCount).SelectManyAwaitWithCancellation((x, _) => UniTask.Run(() => UniTaskAsyncEnumerable.Range(99, rightCount * x))).ToArrayAsync();
                var ys = Enumerable.Range(1, leftCount).SelectMany(x => Enumerable.Range(99, rightCount * x)).ToArray();
-                xs.Should().Equal(ys);
+                xs.Should().BeEquivalentTo(ys);
            }
            {
                var xs = await UniTaskAsyncEnumerable.Range(1, leftCount).SelectManyAwaitWithCancellation((i, x, _) => UniTask.Run(() => UniTaskAsyncEnumerable.Range(99 * i, rightCount * x))).ToArrayAsync();
                var ys = Enumerable.Range(1, leftCount).SelectMany((i, x) => Enumerable.Range(99 * i, rightCount * x)).ToArray();
-                xs.Should().Equal(ys);
+                xs.Should().BeEquivalentTo(ys);
            }
            {
                var xs = await UniTaskAsyncEnumerable.Range(1, leftCount).SelectManyAwaitWithCancellation((x, _) => UniTask.Run(() => UniTaskAsyncEnumerable.Range(99, rightCount * x)), (x, y, _) => UniTask.Run(() => x * y)).ToArrayAsync();
                var ys = Enumerable.Range(1, leftCount).SelectMany(x => Enumerable.Range(99, rightCount * x), (x, y) => x * y).ToArray();
-                xs.Should().Equal(ys);
+                xs.Should().BeEquivalentTo(ys);
            }
            {
                var xs = await UniTaskAsyncEnumerable.Range(1, leftCount).SelectManyAwaitWithCancellation((i, x, _) => UniTask.Run(() => UniTaskAsyncEnumerable.Range(99 * i, rightCount * x)), (x, y, _) => UniTask.Run(() => x * y)).ToArrayAsync();
                var ys = Enumerable.Range(1, leftCount).SelectMany((i, x) => Enumerable.Range(99 * i, rightCount * x), (x, y) => x * y).ToArray();
-                xs.Should().Equal(ys);
+                xs.Should().BeEquivalentTo(ys);
            }
        }

@ -219,17 +219,17 @@ namespace NetCoreTests.Linq
            {
                var xs = await UniTaskAsyncEnumerable.Range(1, leftCount).Zip(UniTaskAsyncEnumerable.Range(99, rightCount)).ToArrayAsync();
                var ys = Enumerable.Range(1, leftCount).Zip(Enumerable.Range(99, rightCount)).ToArray();
-                xs.Should().Equal(ys);
+                xs.Should().BeEquivalentTo(ys);
            }
            {
                var xs = await UniTaskAsyncEnumerable.Range(1, leftCount).ZipAwait(UniTaskAsyncEnumerable.Range(99, rightCount), (x, y) => UniTask.Run(() => (x, y))).ToArrayAsync();
                var ys = Enumerable.Range(1, leftCount).Zip(Enumerable.Range(99, rightCount)).ToArray();
-                xs.Should().Equal(ys);
+                xs.Should().BeEquivalentTo(ys);
            }
            {
                var xs = await UniTaskAsyncEnumerable.Range(1, leftCount).ZipAwaitWithCancellation(UniTaskAsyncEnumerable.Range(99, rightCount), (x, y, _) => UniTask.Run(() => (x, y))).ToArrayAsync();
                var ys = Enumerable.Range(1, leftCount).Zip(Enumerable.Range(99, rightCount)).ToArray();
-                xs.Should().Equal(ys);
+                xs.Should().BeEquivalentTo(ys);
            }
        }
        [Fact]
@ -288,7 +288,7 @@ namespace NetCoreTests.Linq
            var xs = await UniTaskAsyncEnumerable.Range(0, rangeCount).Buffer(bufferCount).Select(x => string.Join(",", x)).ToArrayAsync();
            var ys = await AsyncEnumerable.Range(0, rangeCount).Buffer(bufferCount).Select(x => string.Join(",", x)).ToArrayAsync();

-            xs.Should().Equal(ys);
+            xs.Should().BeEquivalentTo(ys);
        }

        [Theory]
@ -305,7 +305,7 @@ namespace NetCoreTests.Linq
            var xs = await UniTaskAsyncEnumerable.Range(0, rangeCount).Buffer(bufferCount, skipCount).Select(x => string.Join(",", x)).ToArrayAsync();
            var ys = await AsyncEnumerable.Range(0, rangeCount).Buffer(bufferCount, skipCount).Select(x => string.Join(",", x)).ToArrayAsync();

-            xs.Should().Equal(ys);
+            xs.Should().BeEquivalentTo(ys);
        }

        [Fact]
@ -402,7 +402,7 @@ namespace NetCoreTests.Linq
        public async Task PariwiseImmediate()
        {
            var xs = await UniTaskAsyncEnumerable.Range(1, 5).Pairwise().ToArrayAsync();
-            xs.Should().Equal((1, 2), (2, 3), (3, 4), (4, 5));
+            xs.Should().BeEquivalentTo((1, 2), (2, 3), (3, 4), (4, 5));
        }

        [Fact]
@ -426,7 +426,7 @@ namespace NetCoreTests.Linq

            await complete;

-            list.Should().Equal((10, 20), (20, 30), (30, 40), (40, 50));
+            list.Should().BeEquivalentTo((10, 20), (20, 30), (30, 40), (40, 50));
        }

        class MyException : Exception
--- a/src/UniTask.NetCoreTests/Linq/PulbishTest.cs
+++ b/src/UniTask.NetCoreTests/Linq/PulbishTest.cs
@ -26,7 +26,7 @@ namespace NetCoreTests.Linq

            rp.Value = 2;

-            (await b).Should().Equal(1, 2);
+            (await b).Should().BeEquivalentTo(1, 2);

            var c = multicast.ToArrayAsync();

@ -36,8 +36,8 @@ namespace NetCoreTests.Linq

            rp.Dispose();

-            (await a).Should().Equal(1, 2, 3, 4, 5);
-            (await c).Should().Equal(3, 4, 5);
+            (await a).Should().BeEquivalentTo(1, 2, 3, 4, 5);
+            (await c).Should().BeEquivalentTo(3, 4, 5);

            disp.Dispose();
        }
@ -56,7 +56,7 @@ namespace NetCoreTests.Linq

            rp.Value = 2;

-            (await b).Should().Equal(1, 2);
+            (await b).Should().BeEquivalentTo(1, 2);

            var c = multicast.ToArrayAsync();

--- a/src/UniTask.NetCoreTests/Linq/QueueTest.cs
+++ b/src/UniTask.NetCoreTests/Linq/QueueTest.cs
@ -23,7 +23,7 @@ namespace NetCoreTests.Linq
                l.Add(x);
            });

-            l.Should().Equal(100, 110, 120, 130, 140, 150, 160, 170, 180, 190);
+            l.Should().BeEquivalentTo(100, 110, 120, 130, 140, 150, 160, 170, 180, 190);
        }
    }
 }
--- a/src/UniTask.NetCoreTests/Linq/Sets.cs
+++ b/src/UniTask.NetCoreTests/Linq/Sets.cs
@ -34,10 +34,10 @@ namespace NetCoreTests.Linq
        {
            var ys = array.Distinct().ToArray();
            {
-                (await array.ToUniTaskAsyncEnumerable().Distinct().ToArrayAsync()).Should().Equal(ys);
-                (await array.ToUniTaskAsyncEnumerable().Distinct(x => x).ToArrayAsync()).Should().Equal(ys);
-                (await array.ToUniTaskAsyncEnumerable().DistinctAwait(x => UniTask.Run(() => x)).ToArrayAsync()).Should().Equal(ys);
-                (await array.ToUniTaskAsyncEnumerable().DistinctAwaitWithCancellation((x, _) => UniTask.Run(() => x)).ToArrayAsync()).Should().Equal(ys);
+                (await array.ToUniTaskAsyncEnumerable().Distinct().ToArrayAsync()).Should().BeEquivalentTo(ys);
+                (await array.ToUniTaskAsyncEnumerable().Distinct(x => x).ToArrayAsync()).Should().BeEquivalentTo(ys);
+                (await array.ToUniTaskAsyncEnumerable().DistinctAwait(x => UniTask.Run(() => x)).ToArrayAsync()).Should().BeEquivalentTo(ys);
+                (await array.ToUniTaskAsyncEnumerable().DistinctAwaitWithCancellation((x, _) => UniTask.Run(() => x)).ToArrayAsync()).Should().BeEquivalentTo(ys);
            }
        }

@ -71,10 +71,10 @@ namespace NetCoreTests.Linq
        {
            var ys = await array.ToAsyncEnumerable().DistinctUntilChanged().ToArrayAsync();
            {
-                (await array.ToUniTaskAsyncEnumerable().DistinctUntilChanged().ToArrayAsync()).Should().Equal(ys);
-                (await array.ToUniTaskAsyncEnumerable().DistinctUntilChanged(x => x).ToArrayAsync()).Should().Equal(ys);
-                (await array.ToUniTaskAsyncEnumerable().DistinctUntilChangedAwait(x => UniTask.Run(() => x)).ToArrayAsync()).Should().Equal(ys);
-                (await array.ToUniTaskAsyncEnumerable().DistinctUntilChangedAwaitWithCancellation((x, _) => UniTask.Run(() => x)).ToArrayAsync()).Should().Equal(ys);
+                (await array.ToUniTaskAsyncEnumerable().DistinctUntilChanged().ToArrayAsync()).Should().BeEquivalentTo(ys);
+                (await array.ToUniTaskAsyncEnumerable().DistinctUntilChanged(x => x).ToArrayAsync()).Should().BeEquivalentTo(ys);
+                (await array.ToUniTaskAsyncEnumerable().DistinctUntilChangedAwait(x => UniTask.Run(() => x)).ToArrayAsync()).Should().BeEquivalentTo(ys);
+                (await array.ToUniTaskAsyncEnumerable().DistinctUntilChangedAwaitWithCancellation((x, _) => UniTask.Run(() => x)).ToArrayAsync()).Should().BeEquivalentTo(ys);
            }
        }

@ -112,7 +112,7 @@ namespace NetCoreTests.Linq
                {
                    var xs = await a1.ToUniTaskAsyncEnumerable().Except(a2.ToUniTaskAsyncEnumerable()).ToArrayAsync();
                    var ys = a1.Except(a2).ToArray();
-                    xs.Should().Equal(ys);
+                    xs.Should().BeEquivalentTo(ys);
                }
            }
        }
@ -141,7 +141,7 @@ namespace NetCoreTests.Linq
                {
                    var xs = await a1.ToUniTaskAsyncEnumerable().Intersect(a2.ToUniTaskAsyncEnumerable()).ToArrayAsync();
                    var ys = a1.Intersect(a2).ToArray();
-                    xs.Should().Equal(ys);
+                    xs.Should().BeEquivalentTo(ys);
                }
            }
        }
@ -170,7 +170,7 @@ namespace NetCoreTests.Linq
                {
                    var xs = await a1.ToUniTaskAsyncEnumerable().Union(a2.ToUniTaskAsyncEnumerable()).ToArrayAsync();
                    var ys = a1.Union(a2).ToArray();
-                    xs.Should().Equal(ys);
+                    xs.Should().BeEquivalentTo(ys);
                }
            }
        }
--- a/src/UniTask.NetCoreTests/Linq/Sort.cs
+++ b/src/UniTask.NetCoreTests/Linq/Sort.cs
@ -59,32 +59,32 @@ namespace NetCoreTests.Linq
            {
                var xs = await array.ToUniTaskAsyncEnumerable().OrderBy(x => x).ToArrayAsync();
                var ys = array.OrderBy(x => x).ToArray();
-                xs.Should().Equal(ys);
+                xs.Should().BeEquivalentTo(ys);
            }
            {
                var xs = await array.ToUniTaskAsyncEnumerable().OrderByDescending(x => x).ToArrayAsync();
                var ys = array.OrderByDescending(x => x).ToArray();
-                xs.Should().Equal(ys);
+                xs.Should().BeEquivalentTo(ys);
            }
            {
                var xs = await array.ToUniTaskAsyncEnumerable().OrderByAwait(RandomRun).ToArrayAsync();
                var ys = array.OrderBy(x => x).ToArray();
-                xs.Should().Equal(ys);
+                xs.Should().BeEquivalentTo(ys);
            }
            {
                var xs = await array.ToUniTaskAsyncEnumerable().OrderByDescendingAwait(RandomRun).ToArrayAsync();
                var ys = array.OrderByDescending(x => x).ToArray();
-                xs.Should().Equal(ys);
+                xs.Should().BeEquivalentTo(ys);
            }
            {
                var xs = await array.ToUniTaskAsyncEnumerable().OrderByAwaitWithCancellation(RandomRun).ToArrayAsync();
                var ys = array.OrderBy(x => x).ToArray();
-                xs.Should().Equal(ys);
+                xs.Should().BeEquivalentTo(ys);
            }
            {
                var xs = await array.ToUniTaskAsyncEnumerable().OrderByDescendingAwaitWithCancellation(RandomRun).ToArrayAsync();
                var ys = array.OrderByDescending(x => x).ToArray();
-                xs.Should().Equal(ys);
+                xs.Should().BeEquivalentTo(ys);
            }
        }

@ -125,14 +125,14 @@ namespace NetCoreTests.Linq
                    var g2 = await array.ToUniTaskAsyncEnumerable().OrderByDescending(x => x.Age).ThenByDescending(x => x.FirstName).ThenBy(x => x.LastName).ToArrayAsync();
                    var h2 = await array.ToUniTaskAsyncEnumerable().OrderByDescending(x => x.Age).ThenByDescending(x => x.FirstName).ThenByDescending(x => x.LastName).ToArrayAsync();

-                    a.Should().Equal(a2);
-                    b.Should().Equal(b2);
-                    c.Should().Equal(c2);
-                    d.Should().Equal(d2);
-                    e.Should().Equal(e2);
-                    f.Should().Equal(f2);
-                    g.Should().Equal(g2);
-                    h.Should().Equal(h2);
+                    a.Should().BeEquivalentTo(a2);
+                    b.Should().BeEquivalentTo(b2);
+                    c.Should().BeEquivalentTo(c2);
+                    d.Should().BeEquivalentTo(d2);
+                    e.Should().BeEquivalentTo(e2);
+                    f.Should().BeEquivalentTo(f2);
+                    g.Should().BeEquivalentTo(g2);
+                    h.Should().BeEquivalentTo(h2);
                }
                {
                    var a2 = await array.ToUniTaskAsyncEnumerable().OrderByAwait(x => RandomRun(x.Age)).ThenByAwait(x => RandomRun(x.FirstName)).ThenByAwait(x => RandomRun(x.LastName)).ToArrayAsync();
@ -144,14 +144,14 @@ namespace NetCoreTests.Linq
                    var g2 = await array.ToUniTaskAsyncEnumerable().OrderByDescendingAwait(x => RandomRun(x.Age)).ThenByDescendingAwait(x => RandomRun(x.FirstName)).ThenByAwait(x => RandomRun(x.LastName)).ToArrayAsync();
                    var h2 = await array.ToUniTaskAsyncEnumerable().OrderByDescendingAwait(x => RandomRun(x.Age)).ThenByDescendingAwait(x => RandomRun(x.FirstName)).ThenByDescendingAwait(x => RandomRun(x.LastName)).ToArrayAsync();

-                    a.Should().Equal(a2);
-                    b.Should().Equal(b2);
-                    c.Should().Equal(c2);
-                    d.Should().Equal(d2);
-                    e.Should().Equal(e2);
-                    f.Should().Equal(f2);
-                    g.Should().Equal(g2);
-                    h.Should().Equal(h2);
+                    a.Should().BeEquivalentTo(a2);
+                    b.Should().BeEquivalentTo(b2);
+                    c.Should().BeEquivalentTo(c2);
+                    d.Should().BeEquivalentTo(d2);
+                    e.Should().BeEquivalentTo(e2);
+                    f.Should().BeEquivalentTo(f2);
+                    g.Should().BeEquivalentTo(g2);
+                    h.Should().BeEquivalentTo(h2);
                }
                {
                    var a2 = await array.ToUniTaskAsyncEnumerable().OrderByAwaitWithCancellation((x, ct) => RandomRun(x.Age)).ThenByAwaitWithCancellation((x, ct) => RandomRun(x.FirstName)).ThenByAwaitWithCancellation((x, ct) => RandomRun(x.LastName)).ToArrayAsync();
@ -163,14 +163,14 @@ namespace NetCoreTests.Linq
                    var g2 = await array.ToUniTaskAsyncEnumerable().OrderByDescendingAwaitWithCancellation((x, ct) => RandomRun(x.Age)).ThenByDescendingAwaitWithCancellation((x, ct) => RandomRun(x.FirstName)).ThenByAwaitWithCancellation((x, ct) => RandomRun(x.LastName)).ToArrayAsync();
                    var h2 = await array.ToUniTaskAsyncEnumerable().OrderByDescendingAwaitWithCancellation((x, ct) => RandomRun(x.Age)).ThenByDescendingAwaitWithCancellation((x, ct) => RandomRun(x.FirstName)).ThenByDescendingAwaitWithCancellation((x, ct) => RandomRun(x.LastName)).ToArrayAsync();

-                    a.Should().Equal(a2);
-                    b.Should().Equal(b2);
-                    c.Should().Equal(c2);
-                    d.Should().Equal(d2);
-                    e.Should().Equal(e2);
-                    f.Should().Equal(f2);
-                    g.Should().Equal(g2);
-                    h.Should().Equal(h2);
+                    a.Should().BeEquivalentTo(a2);
+                    b.Should().BeEquivalentTo(b2);
+                    c.Should().BeEquivalentTo(c2);
+                    d.Should().BeEquivalentTo(d2);
+                    e.Should().BeEquivalentTo(e2);
+                    f.Should().BeEquivalentTo(f2);
+                    g.Should().BeEquivalentTo(g2);
+                    h.Should().BeEquivalentTo(h2);
                }
            }
        }
--- a/src/UniTask.NetCoreTests/Linq/TakeInfinityTest.cs
+++ b/src/UniTask.NetCoreTests/Linq/TakeInfinityTest.cs
@ -24,7 +24,7 @@ namespace NetCoreTests.Linq
            rp.Value = 4;
            rp.Value = 5;

-            (await xs).Should().Equal(1, 2, 3, 4, 5);
+            (await xs).Should().BeEquivalentTo(1, 2, 3, 4, 5);
        }

        [Fact]
@ -39,11 +39,11 @@ namespace NetCoreTests.Linq
            rp.Value = 4;
            rp.Value = 5;

-            (await xs).Should().Equal(1, 2, 3, 4);
+            (await xs).Should().BeEquivalentTo(1, 2, 3, 4);
        }

        [Fact]
-        public async Task TakeUntilCanceled()
+        public async Task TakeUntil()
        {
            var cts = new CancellationTokenSource();

@ -56,7 +56,7 @@ namespace NetCoreTests.Linq
            await c;
            var foo = await xs;

-            foo.Should().Equal(new[] { 1, 10, 20 });
+            foo.Should().BeEquivalentTo(new[] { 1, 10, 20 });

            async Task CancelAsync()
            {
@ -72,7 +72,7 @@ namespace NetCoreTests.Linq
        }

        [Fact]
-        public async Task SkipUntilCanceled()
+        public async Task SkipUntil()
        {
            var cts = new CancellationTokenSource();

@ -85,7 +85,7 @@ namespace NetCoreTests.Linq
            await c;
            var foo = await xs;

-            foo.Should().Equal(new[] { 20, 30, 40 });
+            foo.Should().BeEquivalentTo(new[] { 30, 40 });

            async Task CancelAsync()
            {
@ -102,64 +102,5 @@ namespace NetCoreTests.Linq
            }
        }

-        [Fact]
-        public async Task TakeUntil()
-        {
-            var cts = new AsyncReactiveProperty<int>(0);
-
-            var rp = new AsyncReactiveProperty<int>(1);
-
-            var xs = rp.TakeUntil(cts.WaitAsync()).ToArrayAsync();
-
-            var c = CancelAsync();
-
-            await c;
-            var foo = await xs;
-
-            foo.Should().Equal(new[] { 1, 10, 20 });
-
-            async Task CancelAsync()
-            {
-                rp.Value = 10;
-                await Task.Yield();
-                rp.Value = 20;
-                await Task.Yield();
-                cts.Value = 9999;
-                rp.Value = 30;
-                await Task.Yield();
-                rp.Value = 40;
-            }
-        }
-
-        [Fact]
-        public async Task SkipUntil()
-        {
-            var cts = new AsyncReactiveProperty<int>(0);
-
-            var rp = new AsyncReactiveProperty<int>(1);
-
-            var xs = rp.SkipUntil(cts.WaitAsync()).ToArrayAsync();
-
-            var c = CancelAsync();
-
-            await c;
-            var foo = await xs;
-
-            foo.Should().Equal(new[] { 20, 30, 40 });
-
-            async Task CancelAsync()
-            {
-                rp.Value = 10;
-                await Task.Yield();
-                rp.Value = 20;
-                await Task.Yield();
-                cts.Value = 9999;
-                rp.Value = 30;
-                await Task.Yield();
-                rp.Value = 40;
-
-                rp.Dispose(); // complete.
-            }
-        }
    }
 }
--- a/src/UniTask.NetCoreTests/TaskExtensionsTest.cs
+++ b/src/UniTask.NetCoreTests/TaskExtensionsTest.cs
@ -1,45 +0,0 @@
-#pragma warning disable CS1998
-
-using System;
-using System.Threading.Tasks;
-using Cysharp.Threading.Tasks;
-using Xunit;
-
-namespace NetCoreTests
-{
-    public class TaskExtensionsTest
-    {
-        [Fact]
-        public async Task PropagateException()
-        {
-            await Assert.ThrowsAsync<InvalidOperationException>(async () =>
-            {
-                await ThrowAsync().AsUniTask();
-            });
-            
-            await Assert.ThrowsAsync<InvalidOperationException>(async () =>
-            {
-                await ThrowOrValueAsync().AsUniTask();
-            });
-        }
-
-        [Fact]
-        public async Task PropagateExceptionWhenAll()
-        {
-            await Assert.ThrowsAsync<InvalidOperationException>(async () =>
-            {
-                await Task.WhenAll(ThrowAsync(), ThrowAsync()).AsUniTask();
-            });
-        }
- 
-        async Task ThrowAsync()
-        {
-            throw new InvalidOperationException();
-        }
-
-        async Task<int> ThrowOrValueAsync()
-        {
-            throw new InvalidOperationException();
-        }
-   }
-}
--- a/src/UniTask.NetCoreTests/TriggerEventTest.cs
+++ b/src/UniTask.NetCoreTests/TriggerEventTest.cs
@ -1,637 +0,0 @@
-using Cysharp.Threading.Tasks;
-using FluentAssertions;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Channels;
-using Cysharp.Threading.Tasks.Linq;
-using System.Threading.Tasks;
-using Xunit;
-
-namespace NetCoreTests
-{
-    public class TriggerEventTest
-    {
-        [Fact]
-        public void SimpleAdd()
-        {
-            var ev = new TriggerEvent<int>();
-
-            // do nothing
-            ev.SetResult(0);
-            ev.SetError(null);
-            ev.SetCompleted();
-            ev.SetCanceled(default);
-
-            {
-                var one = new TestEvent(1);
-
-                ev.Add(one);
-
-                ev.SetResult(10);
-                ev.SetResult(20);
-                ev.SetResult(30);
-
-                one.NextCalled.Should().Equal(10, 20, 30);
-
-                ev.SetCompleted();
-
-                one.CompletedCalled.Count.Should().Be(1);
-
-                // do nothing
-                ev.SetResult(0);
-                ev.SetError(null);
-                ev.SetCompleted();
-                ev.SetCanceled(default);
-
-                one.NextCalled.Should().Equal(10, 20, 30);
-                one.CompletedCalled.Count.Should().Be(1);
-            }
-            // after removed, onemore
-            {
-                var one = new TestEvent(1);
-
-                ev.Add(one);
-
-                ev.SetResult(10);
-                ev.SetResult(20);
-                ev.SetResult(30);
-
-                one.NextCalled.Should().Equal(10, 20, 30);
-
-                ev.SetCompleted();
-
-                one.CompletedCalled.Count.Should().Be(1);
-
-                // do nothing
-                ev.SetResult(0);
-                ev.SetError(null);
-                ev.SetCompleted();
-                ev.SetCanceled(default);
-
-                one.NextCalled.Should().Equal(10, 20, 30);
-                one.CompletedCalled.Count.Should().Be(1);
-            }
-        }
-
-        [Fact]
-        public void AddFour()
-        {
-            var ev = new TriggerEvent<int>();
-
-            // do nothing
-            ev.SetResult(0);
-            ev.SetError(null);
-            ev.SetCompleted();
-            ev.SetCanceled(default);
-
-            {
-                var one = new TestEvent(1);
-                var two = new TestEvent(2);
-                var three = new TestEvent(3);
-                var four = new TestEvent(4);
-
-                ev.Add(one);
-                ev.Add(two);
-                ev.Add(three);
-                ev.Add(four);
-
-                ev.SetResult(10);
-                ev.SetResult(20);
-                ev.SetResult(30);
-
-                one.NextCalled.Should().Equal(10, 20, 30);
-                two.NextCalled.Should().Equal(10, 20, 30);
-                three.NextCalled.Should().Equal(10, 20, 30);
-                four.NextCalled.Should().Equal(10, 20, 30);
-
-                ev.SetCompleted();
-
-                one.CompletedCalled.Count.Should().Be(1);
-                two.CompletedCalled.Count.Should().Be(1);
-                three.CompletedCalled.Count.Should().Be(1);
-
-
-                // do nothing
-                ev.SetResult(0);
-                ev.SetError(null);
-                ev.SetCompleted();
-                ev.SetCanceled(default);
-
-                one.NextCalled.Should().Equal(10, 20, 30);
-                one.CompletedCalled.Count.Should().Be(1);
-                two.NextCalled.Should().Equal(10, 20, 30);
-                three.CompletedCalled.Count.Should().Be(1);
-                two.NextCalled.Should().Equal(10, 20, 30);
-                three.CompletedCalled.Count.Should().Be(1);
-            }
-
-            // after removed, onemore.
-            {
-                var one = new TestEvent(1);
-                var two = new TestEvent(2);
-                var three = new TestEvent(3);
-                var four = new TestEvent(4);
-
-                ev.Add(one);
-                ev.Add(two);
-                ev.Add(three);
-                ev.Add(four);
-
-                ev.SetResult(10);
-                ev.SetResult(20);
-                ev.SetResult(30);
-                ev.Add(four);
-
-                one.NextCalled.Should().Equal(10, 20, 30);
-                two.NextCalled.Should().Equal(10, 20, 30);
-                three.NextCalled.Should().Equal(10, 20, 30);
-                four.NextCalled.Should().Equal(10, 20, 30);
-
-                ev.SetCompleted();
-
-                one.CompletedCalled.Count.Should().Be(1);
-                two.CompletedCalled.Count.Should().Be(1);
-                three.CompletedCalled.Count.Should().Be(1);
-
-
-                // do nothing
-                ev.SetResult(0);
-                ev.SetError(null);
-                ev.SetCompleted();
-                ev.SetCanceled(default);
-
-                one.NextCalled.Should().Equal(10, 20, 30);
-                one.CompletedCalled.Count.Should().Be(1);
-                two.NextCalled.Should().Equal(10, 20, 30);
-                three.CompletedCalled.Count.Should().Be(1);
-                two.NextCalled.Should().Equal(10, 20, 30);
-                three.CompletedCalled.Count.Should().Be(1);
-            }
-        }
-
-
-        [Fact]
-        public void OneRemove()
-        {
-            var ev = new TriggerEvent<int>();
-            {
-                var one = new TestEvent(1);
-                var two = new TestEvent(2);
-                var three = new TestEvent(3);
-
-                ev.Add(one);
-                ev.Add(two);
-                ev.Add(three);
-
-                ev.SetResult(10);
-                ev.SetResult(20);
-                ev.SetResult(30);
-
-                one.NextCalled.Should().Equal(10, 20, 30);
-                two.NextCalled.Should().Equal(10, 20, 30);
-                three.NextCalled.Should().Equal(10, 20, 30);
-
-                ev.Remove(one);
-
-                ev.SetResult(40);
-                ev.SetResult(50);
-                ev.SetResult(60);
-
-                one.NextCalled.Should().Equal(10, 20, 30);
-                two.NextCalled.Should().Equal(10, 20, 30, 40, 50, 60);
-                three.NextCalled.Should().Equal(10, 20, 30, 40, 50, 60);
-            }
-        }
-        [Fact]
-        public void TwoRemove()
-        {
-            var ev = new TriggerEvent<int>();
-            {
-                var one = new TestEvent(1);
-                var two = new TestEvent(2);
-                var three = new TestEvent(3);
-
-                ev.Add(one);
-                ev.Add(two);
-                ev.Add(three);
-
-                ev.SetResult(10);
-                ev.SetResult(20);
-                ev.SetResult(30);
-
-                one.NextCalled.Should().Equal(10, 20, 30);
-                two.NextCalled.Should().Equal(10, 20, 30);
-                three.NextCalled.Should().Equal(10, 20, 30);
-
-                ev.Remove(two);
-
-                ev.SetResult(40);
-                ev.SetResult(50);
-                ev.SetResult(60);
-
-                one.NextCalled.Should().Equal(10, 20, 30, 40, 50, 60);
-                two.NextCalled.Should().Equal(10, 20, 30);
-                three.NextCalled.Should().Equal(10, 20, 30, 40, 50, 60);
-            }
-        }
-        [Fact]
-        public void ThreeRemove()
-        {
-            var ev = new TriggerEvent<int>();
-            {
-                var one = new TestEvent(1);
-                var two = new TestEvent(2);
-                var three = new TestEvent(3);
-
-                ev.Add(one);
-                ev.Add(two);
-                ev.Add(three);
-
-                ev.SetResult(10);
-                ev.SetResult(20);
-                ev.SetResult(30);
-
-                one.NextCalled.Should().Equal(10, 20, 30);
-                two.NextCalled.Should().Equal(10, 20, 30);
-                three.NextCalled.Should().Equal(10, 20, 30);
-
-                ev.Remove(three);
-
-                ev.SetResult(40);
-                ev.SetResult(50);
-                ev.SetResult(60);
-
-                one.NextCalled.Should().Equal(10, 20, 30, 40, 50, 60);
-                two.NextCalled.Should().Equal(10, 20, 30, 40, 50, 60);
-                three.NextCalled.Should().Equal(10, 20, 30);
-            }
-        }
-
-        [Fact]
-        public void RemoveSelf()
-        {
-            new RemoveMe().Run1();
-            new RemoveMe().Run2();
-            new RemoveMe().Run3();
-        }
-
-        [Fact]
-        public void RemoveNextInIterating()
-        {
-            new RemoveNext().Run1();
-            new RemoveNext().Run2();
-            new RemoveNext().Run3();
-        }
-
-        [Fact]
-        public void RemoveNextNextTest()
-        {
-            new RemoveNextNext().Run1();
-            new RemoveNextNext().Run2();
-        }
-
-
-        [Fact]
-        public void AddTest()
-        {
-            new AddMe().Run1();
-            new AddMe().Run2();
-        }
-
-        public class RemoveMe
-        {
-            TriggerEvent<int> ev;
-
-            public void Run1()
-            {
-                TestEvent one = default;
-                one = new TestEvent(1, () => ev.Remove(one));
-
-                var two = new TestEvent(2);
-                var three = new TestEvent(3);
-
-                ev.Add(one);
-                ev.Add(two);
-                ev.Add(three);
-
-                ev.SetResult(10);
-                ev.SetResult(20);
-                ev.SetResult(30);
-
-                one.NextCalled.Should().Equal(10);
-                two.NextCalled.Should().Equal(10, 20, 30);
-                three.NextCalled.Should().Equal(10, 20, 30);
-            }
-
-            public void Run2()
-            {
-                TestEvent one = default;
-                one = new TestEvent(1, () => ev.Remove(one));
-
-                var two = new TestEvent(2);
-                var three = new TestEvent(3);
-
-                ev.Add(two);
-                ev.Add(one); // add second.
-                ev.Add(three);
-
-                ev.SetResult(10);
-                ev.SetResult(20);
-                ev.SetResult(30);
-
-                one.NextCalled.Should().Equal(10);
-                two.NextCalled.Should().Equal(10, 20, 30);
-                three.NextCalled.Should().Equal(10, 20, 30);
-            }
-
-            public void Run3()
-            {
-                TestEvent one = default;
-                one = new TestEvent(1, () => ev.Remove(one));
-
-                var two = new TestEvent(2);
-                var three = new TestEvent(3);
-
-                ev.Add(two);
-                ev.Add(three);
-                ev.Add(one); // add thired.
-
-                ev.SetResult(10);
-                ev.SetResult(20);
-                ev.SetResult(30);
-
-                one.NextCalled.Should().Equal(10);
-                two.NextCalled.Should().Equal(10, 20, 30);
-                three.NextCalled.Should().Equal(10, 20, 30);
-            }
-        }
-
-        public class RemoveNext
-        {
-            TriggerEvent<int> ev;
-
-            public void Run1()
-            {
-                TestEvent one = default;
-                TestEvent two = default;
-                TestEvent three = default;
-                one = new TestEvent(1, () => ev.Remove(two));
-                two = new TestEvent(2);
-                three = new TestEvent(3);
-
-                ev.Add(one);
-                ev.Add(two);
-                ev.Add(three);
-
-                ev.SetResult(10);
-                ev.SetResult(20);
-                ev.SetResult(30);
-
-                one.NextCalled.Should().Equal(10, 20, 30);
-                two.NextCalled.Count.Should().Be(0);
-                three.NextCalled.Should().Equal(10, 20, 30);
-            }
-
-            public void Run2()
-            {
-                TestEvent one = default;
-                TestEvent two = default;
-                TestEvent three = default;
-                one = new TestEvent(1, () => ev.Remove(two));
-                two = new TestEvent(2);
-                three = new TestEvent(3);
-
-                ev.Add(two);
-                ev.Add(one); // add second
-                ev.Add(three);
-
-                ev.SetResult(10);
-                ev.SetResult(20);
-                ev.SetResult(30);
-
-                one.NextCalled.Should().Equal(10, 20, 30);
-                two.NextCalled.Should().Equal(10);
-                three.NextCalled.Should().Equal(10, 20, 30);
-            }
-
-            public void Run3()
-            {
-                TestEvent one = default;
-                TestEvent two = default;
-                TestEvent three = default;
-                one = new TestEvent(1, () => ev.Remove(two));
-                two = new TestEvent(2);
-                three = new TestEvent(3);
-
-                ev.Add(two);
-                ev.Add(three);
-                ev.Add(one); // add thired.
-
-                ev.SetResult(10);
-                ev.SetResult(20);
-                ev.SetResult(30);
-
-                one.NextCalled.Should().Equal(10, 20, 30);
-                two.NextCalled.Should().Equal(10);
-                three.NextCalled.Should().Equal(10, 20, 30);
-            }
-        }
-
-        public class RemoveNextNext
-        {
-            TriggerEvent<int> ev;
-
-            public void Run1()
-            {
-                TestEvent one = default;
-                TestEvent two = default;
-                TestEvent three = default;
-                TestEvent four = default;
-                one = new TestEvent(1, () => { ev.Remove(two); ev.Remove(three); });
-                two = new TestEvent(2);
-                three = new TestEvent(3);
-                four = new TestEvent(4);
-
-                ev.Add(one);
-                ev.Add(two);
-                ev.Add(three);
-                ev.Add(four);
-
-                ev.SetResult(10);
-                ev.SetResult(20);
-                ev.SetResult(30);
-
-                one.NextCalled.Should().Equal(10, 20, 30);
-                two.NextCalled.Count.Should().Be(0);
-                three.NextCalled.Count.Should().Be(0);
-                four.NextCalled.Should().Equal(10, 20, 30);
-            }
-
-            public void Run2()
-            {
-                TestEvent one = default;
-                TestEvent two = default;
-                TestEvent three = default;
-                TestEvent four = default;
-                one = new TestEvent(1, () => { ev.Remove(one); ev.Remove(two); ev.Remove(three); });
-                two = new TestEvent(2);
-                three = new TestEvent(3);
-                four = new TestEvent(4);
-
-                ev.Add(one);
-                ev.Add(two);
-                ev.Add(three);
-                ev.Add(four);
-
-                ev.SetResult(10);
-                ev.SetResult(20);
-                ev.SetResult(30);
-
-                one.NextCalled.Should().Equal(10);
-                two.NextCalled.Count.Should().Be(0);
-                three.NextCalled.Count.Should().Be(0);
-                four.NextCalled.Should().Equal(10, 20, 30);
-            }
-
-
-        }
-
-        public class AddMe
-        {
-            TriggerEvent<int> ev;
-
-            public void Run1()
-            {
-                TestEvent one = default;
-                TestEvent two = default;
-                TestEvent three = default;
-                TestEvent four = default;
-
-                one = new TestEvent(1, () =>
-                {
-                    if (two == null)
-                    {
-                        ev.Add(two = new TestEvent(2));
-                    }
-                    else if (three == null)
-                    {
-                        ev.Add(three = new TestEvent(3));
-                    }
-                    else if (four == null)
-                    {
-                        ev.Add(four = new TestEvent(4));
-                    }
-                });
-
-                ev.Add(one);
-
-                ev.SetResult(10);
-                ev.SetResult(20);
-                ev.SetResult(30);
-                ev.SetResult(40);
-
-                one.NextCalled.Should().Equal(10, 20, 30, 40);
-                two.NextCalled.Should().Equal(20, 30, 40);
-                three.NextCalled.Should().Equal(30, 40);
-                four.NextCalled.Should().Equal(40);
-            }
-
-            public void Run2()
-            {
-                TestEvent one = default;
-                TestEvent two = default;
-                TestEvent three = default;
-                TestEvent four = default;
-
-                one = new TestEvent(1, () =>
-                {
-                    if (two == null)
-                    {
-                        ev.Add(two = new TestEvent(2, () =>
-                        {
-                            if (three == null)
-                            {
-                                ev.Add(three = new TestEvent(3, () =>
-                                {
-                                    if (four == null)
-                                    {
-                                        ev.Add(four = new TestEvent(4));
-                                    }
-                                }));
-                            }
-                        }));
-                    }
-                });
-
-                ev.Add(one);
-
-                ev.SetResult(10);
-                ev.SetResult(20);
-                ev.SetResult(30);
-                ev.SetResult(40);
-
-                one.NextCalled.Should().Equal(10, 20, 30, 40);
-                two.NextCalled.Should().Equal(20, 30, 40);
-                three.NextCalled.Should().Equal(30, 40);
-                four.NextCalled.Should().Equal(40);
-            }
-        }
-    }
-
-    public class TestEvent : ITriggerHandler<int>
-    {
-        public readonly int Id;
-        readonly Action iteratingEvent;
-
-        public TestEvent(int id)
-        {
-            this.Id = id;
-        }
-
-        public TestEvent(int id, Action iteratingEvent)
-        {
-            this.Id = id;
-            this.iteratingEvent = iteratingEvent;
-        }
-
-        public List<int> NextCalled = new List<int>();
-        public List<Exception> ErrorCalled = new List<Exception>();
-        public List<object> CompletedCalled = new List<object>();
-        public List<CancellationToken> CancelCalled = new List<CancellationToken>();
-
-        public ITriggerHandler<int> Prev { get; set; }
-        public ITriggerHandler<int> Next { get; set; }
-
-        public void OnCanceled(CancellationToken cancellationToken)
-        {
-            CancelCalled.Add(cancellationToken);
-
-        }
-
-        public void OnCompleted()
-        {
-            CompletedCalled.Add(new object());
-        }
-
-        public void OnError(Exception ex)
-        {
-            ErrorCalled.Add(ex);
-        }
-
-        public void OnNext(int value)
-        {
-            NextCalled.Add(value);
-            iteratingEvent?.Invoke();
-        }
-
-        public override string ToString()
-        {
-            return Id.ToString();
-        }
-    }
-
-
-}
--- a/src/UniTask.NetCoreTests/UniTask.NetCoreTests.csproj
+++ b/src/UniTask.NetCoreTests/UniTask.NetCoreTests.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>

    <IsPackable>false</IsPackable>

--- a/src/UniTask.NetCoreTests/UniTaskCompletionSourceTest.cs
+++ b/src/UniTask.NetCoreTests/UniTaskCompletionSourceTest.cs
@ -1,80 +0,0 @@
-using System.Threading.Tasks;
-using Cysharp.Threading.Tasks;
-using FluentAssertions;
-using NetCoreTests.Linq;
-using Xunit;
-
-namespace NetCoreTests
-{
-    public class AutoResetUniTaskCompletionSourceTest
-    {
-        [Fact]
-        public async Task SetResultAfterReturn()
-        {
-            var source1 = AutoResetUniTaskCompletionSource.Create();
-            source1.TrySetResult();
-            await source1.Task;
-            
-            source1.TrySetResult().Should().BeFalse();
-            
-            var source2 = AutoResetUniTaskCompletionSource.Create();
-            source2.TrySetResult();
-            await source2.Task;
-
-            source2.TrySetResult().Should().BeFalse();
-        }
-
-        [Fact]
-        public async Task SetCancelAfterReturn()
-        {
-            var source = AutoResetUniTaskCompletionSource.Create();
-            source.TrySetResult();
-            await source.Task;
-            
-            source.TrySetCanceled().Should().BeFalse();
-        }
-        
-        [Fact]
-        public async Task SetExceptionAfterReturn()
-        {
-            var source = AutoResetUniTaskCompletionSource.Create();
-            source.TrySetResult();
-            await source.Task;
-            
-            source.TrySetException(new UniTaskTestException()).Should().BeFalse();
-        }
-        
-        [Fact]
-        public async Task SetResultWithValueAfterReturn()
-        {
-            var source1 = AutoResetUniTaskCompletionSource<int>.Create();
-            source1.TrySetResult(100);
-            (await source1.Task).Should().Be(100);
-            
-            source1.TrySetResult(100).Should().BeFalse();
-            
-            var source2 = AutoResetUniTaskCompletionSource.Create();
-            source2.TrySetResult();
-            await source2.Task;
-            source2.TrySetResult().Should().BeFalse();
-        }
-
-        [Fact]
-        public async Task SetCancelWithValueAfterReturn()
-        {
-            var source = AutoResetUniTaskCompletionSource<int>.Create();
-            source.TrySetResult(100);
-            (await source.Task).Should().Be(100);
-            source.TrySetCanceled().Should().BeFalse();
-        }
-        
-        [Fact]
-        public async Task SetExceptionWithValueAfterReturn()
-        {
-            var source = AutoResetUniTaskCompletionSource<int>.Create();
-            source.TrySetResult(100);
-            (await source.Task).Should().Be(100);
-            source.TrySetException(new UniTaskTestException()).Should().BeFalse();
-        }
-    }
-}
--- a/src/UniTask.NetCoreTests/WhenEachTest.cs
+++ b/src/UniTask.NetCoreTests/WhenEachTest.cs
@ -1,69 +0,0 @@
-using Cysharp.Threading.Tasks;
-using FluentAssertions;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Xunit;
-
-namespace NetCoreTests
-{
-    public class WhenEachTest
-    {
-        [Fact]
-        public async Task Each()
-        {
-            var a = Delay(1, 3000);
-            var b = Delay(2, 1000);
-            var c = Delay(3, 2000);
-
-            var l = new List<int>();
-            await foreach (var item in UniTask.WhenEach(a, b, c))
-            {
-                l.Add(item.Result);
-            }
-
-            l.Should().Equal(2, 3, 1);
-        }
-
-        [Fact]
-        public async Task Error()
-        {
-            var a = Delay2(1, 3000);
-            var b = Delay2(2, 1000);
-            var c = Delay2(3, 2000);
-
-            var l = new List<WhenEachResult<int>>();
-            await foreach (var item in UniTask.WhenEach(a, b, c))
-            {
-                l.Add(item);
-            }
-
-            l[0].IsCompletedSuccessfully.Should().BeTrue();
-            l[0].IsFaulted.Should().BeFalse();
-            l[0].Result.Should().Be(2);
-
-            l[1].IsCompletedSuccessfully.Should().BeFalse();
-            l[1].IsFaulted.Should().BeTrue();
-            l[1].Exception.Message.Should().Be("ERROR");
-
-            l[2].IsCompletedSuccessfully.Should().BeTrue();
-            l[2].IsFaulted.Should().BeFalse();
-            l[2].Result.Should().Be(1);
-        }
-
-        async UniTask<int> Delay(int id, int sleep)
-        {
-            await Task.Delay(sleep);
-            return id;
-        }
-
-        async UniTask<int> Delay2(int id, int sleep)
-        {
-            await Task.Delay(sleep);
-            if (id == 3) throw new Exception("ERROR");
-            return id;
-        }
-    }
-}
--- a/src/UniTask.NetCoreTests/WithCancellationTest.cs
+++ b/src/UniTask.NetCoreTests/WithCancellationTest.cs
@ -1,40 +0,0 @@
-using Cysharp.Threading.Tasks;
-using FluentAssertions;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using Xunit;
-
-namespace NetCoreTests
-{
-    public class WithCancellationTest
-    {
-        [Fact]
-        public async Task Standard()
-        {
-            CancellationTokenSource cts = new CancellationTokenSource();
-
-            var v = await UniTask.Run(() => 10).AttachExternalCancellation(cts.Token);
-
-            v.Should().Be(10);
-        }
-
-        [Fact]
-        public async Task Cancel()
-        {
-            CancellationTokenSource cts = new CancellationTokenSource();
-
-            var t = UniTask.Create(async () =>
-            {
-                await Task.Delay(TimeSpan.FromSeconds(1));
-                return 10;
-            }).AttachExternalCancellation(cts.Token);
-
-            cts.Cancel();
-
-            (await Assert.ThrowsAsync<OperationCanceledException>(async () => await t)).CancellationToken.Should().Be(cts.Token);
-        }
-    }
-}
--- a/src/UniTask/Assets/Editor/EditorRunnerChecker.cs
+++ b/src/UniTask/Assets/Editor/EditorRunnerChecker.cs
@ -20,11 +20,8 @@ public static class EditorRunnerChecker
    {
        Debug.Log("Start");

-        //var r = await UnityWebRequest.Get("https://bing.com/").SendWebRequest().ToUniTask();
-        //Debug.Log(r.downloadHandler.text.Substring(0, 100));
-        //await UniTask.Yield();
-
-        await UniTask.DelayFrame(30);
+        var r = await UnityWebRequest.Get("https://bing.com/").SendWebRequest().ToUniTask();
+        Debug.Log(r.downloadHandler.text.Substring(0, 100));

        Debug.Log("End");
    }
--- a/src/UniTask/Assets/Plugins/UniTask/Editor/UniTask.Editor.asmdef
+++ b/src/UniTask/Assets/Plugins/UniTask/Editor/UniTask.Editor.asmdef
@ -10,7 +10,7 @@
    "allowUnsafeCode": false,
    "overrideReferences": false,
    "precompiledReferences": [],
-    "autoReferenced": false,
+    "autoReferenced": true,
    "defineConstraints": [],
    "versionDefines": [],
    "noEngineReferences": false
--- a/src/UniTask/Assets/Plugins/UniTask/Runtime/AsyncLazy.cs
+++ b/src/UniTask/Assets/Plugins/UniTask/Runtime/AsyncLazy.cs
@ -7,239 +7,113 @@ namespace Cysharp.Threading.Tasks
 {
    public class AsyncLazy
    {
-        static Action<object> continuation = SetCompletionSource;
-
-        Func<UniTask> taskFactory;
-        UniTaskCompletionSource completionSource;
-        UniTask.Awaiter awaiter;
-
+        Func<UniTask> valueFactory;
+        UniTask target;
        object syncLock;
        bool initialized;

-        public AsyncLazy(Func<UniTask> taskFactory)
+        public AsyncLazy(Func<UniTask> valueFactory)
        {
-            this.taskFactory = taskFactory;
-            this.completionSource = new UniTaskCompletionSource();
+            this.valueFactory = valueFactory;
+            this.target = default;
            this.syncLock = new object();
            this.initialized = false;
        }

-        internal AsyncLazy(UniTask task)
+        internal AsyncLazy(UniTask value)
        {
-            this.taskFactory = null;
-            this.completionSource = new UniTaskCompletionSource();
+            this.valueFactory = null;
+            this.target = value;
            this.syncLock = null;
            this.initialized = true;
-
-            var awaiter = task.GetAwaiter();
-            if (awaiter.IsCompleted)
-            {
-                SetCompletionSource(awaiter);
-            }
-            else
-            {
-                this.awaiter = awaiter;
-                awaiter.SourceOnCompleted(continuation, this);
-            }
        }

-        public UniTask Task
-        {
-            get
-            {
-                EnsureInitialized();
-                return completionSource.Task;
-            }
-        }
+        public UniTask Task => EnsureInitialized();

+        public UniTask.Awaiter GetAwaiter() => EnsureInitialized().GetAwaiter();

-        public UniTask.Awaiter GetAwaiter() => Task.GetAwaiter();
-
-        void EnsureInitialized()
+        UniTask EnsureInitialized()
        {
            if (Volatile.Read(ref initialized))
            {
-                return;
+                return target;
            }

-            EnsureInitializedCore();
+            return EnsureInitializedCore();
        }

-        void EnsureInitializedCore()
+        UniTask EnsureInitializedCore()
        {
            lock (syncLock)
            {
                if (!Volatile.Read(ref initialized))
                {
-                    var f = Interlocked.Exchange(ref taskFactory, null);
+                    var f = Interlocked.Exchange(ref valueFactory, null);
                    if (f != null)
                    {
-                        var task = f();
-                        var awaiter = task.GetAwaiter();
-                        if (awaiter.IsCompleted)
-                        {
-                            SetCompletionSource(awaiter);
-                        }
-                        else
-                        {
-                            this.awaiter = awaiter;
-                            awaiter.SourceOnCompleted(continuation, this);
-                        }
-
+                        target = f().Preserve(); // with preserve(allow multiple await).
                        Volatile.Write(ref initialized, true);
                    }
                }
            }
-        }

-        void SetCompletionSource(in UniTask.Awaiter awaiter)
-        {
-            try
-            {
-                awaiter.GetResult();
-                completionSource.TrySetResult();
-            }
-            catch (Exception ex)
-            {
-                completionSource.TrySetException(ex);
-            }
-        }
-
-        static void SetCompletionSource(object state)
-        {
-            var self = (AsyncLazy)state;
-            try
-            {
-                self.awaiter.GetResult();
-                self.completionSource.TrySetResult();
-            }
-            catch (Exception ex)
-            {
-                self.completionSource.TrySetException(ex);
-            }
-            finally
-            {
-                self.awaiter = default;
-            }
+            return target;
        }
    }

    public class AsyncLazy<T>
    {
-        static Action<object> continuation = SetCompletionSource;
-
-        Func<UniTask<T>> taskFactory;
-        UniTaskCompletionSource<T> completionSource;
-        UniTask<T>.Awaiter awaiter;
-
+        Func<UniTask<T>> valueFactory;
+        UniTask<T> target;
        object syncLock;
        bool initialized;

-        public AsyncLazy(Func<UniTask<T>> taskFactory)
+        public AsyncLazy(Func<UniTask<T>> valueFactory)
        {
-            this.taskFactory = taskFactory;
-            this.completionSource = new UniTaskCompletionSource<T>();
+            this.valueFactory = valueFactory;
+            this.target = default;
            this.syncLock = new object();
            this.initialized = false;
        }

-        internal AsyncLazy(UniTask<T> task)
+        internal AsyncLazy(UniTask<T> value)
        {
-            this.taskFactory = null;
-            this.completionSource = new UniTaskCompletionSource<T>();
+            this.valueFactory = null;
+            this.target = value;
            this.syncLock = null;
            this.initialized = true;
-
-            var awaiter = task.GetAwaiter();
-            if (awaiter.IsCompleted)
-            {
-                SetCompletionSource(awaiter);
-            }
-            else
-            {
-                this.awaiter = awaiter;
-                awaiter.SourceOnCompleted(continuation, this);
-            }
        }

-        public UniTask<T> Task
-        {
-            get
-            {
-                EnsureInitialized();
-                return completionSource.Task;
-            }
-        }
+        public UniTask<T> Task => EnsureInitialized();

+        public UniTask<T>.Awaiter GetAwaiter() => EnsureInitialized().GetAwaiter();

-        public UniTask<T>.Awaiter GetAwaiter() => Task.GetAwaiter();
-
-        void EnsureInitialized()
+        UniTask<T> EnsureInitialized()
        {
            if (Volatile.Read(ref initialized))
            {
-                return;
+                return target;
            }

-            EnsureInitializedCore();
+            return EnsureInitializedCore();
        }

-        void EnsureInitializedCore()
+        UniTask<T> EnsureInitializedCore()
        {
            lock (syncLock)
            {
                if (!Volatile.Read(ref initialized))
                {
-                    var f = Interlocked.Exchange(ref taskFactory, null);
+                    var f = Interlocked.Exchange(ref valueFactory, null);
                    if (f != null)
                    {
-                        var task = f();
-                        var awaiter = task.GetAwaiter();
-                        if (awaiter.IsCompleted)
-                        {
-                            SetCompletionSource(awaiter);
-                        }
-                        else
-                        {
-                            this.awaiter = awaiter;
-                            awaiter.SourceOnCompleted(continuation, this);
-                        }
-
+                        target = f().Preserve(); // with preserve(allow multiple await).
                        Volatile.Write(ref initialized, true);
                    }
                }
            }
-        }

-        void SetCompletionSource(in UniTask<T>.Awaiter awaiter)
-        {
-            try
-            {
-                var result = awaiter.GetResult();
-                completionSource.TrySetResult(result);
-            }
-            catch (Exception ex)
-            {
-                completionSource.TrySetException(ex);
-            }
-        }
-
-        static void SetCompletionSource(object state)
-        {
-            var self = (AsyncLazy<T>)state;
-            try
-            {
-                var result = self.awaiter.GetResult();
-                self.completionSource.TrySetResult(result);
-            }
-            catch (Exception ex)
-            {
-                self.completionSource.TrySetException(ex);
-            }
-            finally
-            {
-                self.awaiter = default;
-            }
+            return target;
        }
    }
 }
--- a/src/UniTask/Assets/Plugins/UniTask/Runtime/AsyncReactiveProperty.cs
+++ b/src/UniTask/Assets/Plugins/UniTask/Runtime/AsyncReactiveProperty.cs
@ -1,4 +1,5 @@
-using System;
+using Cysharp.Threading.Tasks.Linq;
+using System;
 using System.Threading;

 namespace Cysharp.Threading.Tasks
@ -7,7 +8,6 @@ namespace Cysharp.Threading.Tasks
    {
        T Value { get; }
        IUniTaskAsyncEnumerable<T> WithoutCurrent();
-        UniTask<T> WaitAsync(CancellationToken cancellationToken = default);
    }

    public interface IAsyncReactiveProperty<T> : IReadOnlyAsyncReactiveProperty<T>
@ -70,11 +70,6 @@ namespace Cysharp.Threading.Tasks
            return latestValue?.ToString();
        }

-        public UniTask<T> WaitAsync(CancellationToken cancellationToken = default)
-        {
-            return new UniTask<T>(WaitAsyncSource.Create(this, cancellationToken, out var token), token);
-        }
-
        static bool isValueType;

        static AsyncReactiveProperty()
@ -82,136 +77,7 @@ namespace Cysharp.Threading.Tasks
            isValueType = typeof(T).IsValueType;
        }

-        sealed class WaitAsyncSource : IUniTaskSource<T>, ITriggerHandler<T>, ITaskPoolNode<WaitAsyncSource>
-        {
-            static Action<object> cancellationCallback = CancellationCallback;
-
-            static TaskPool<WaitAsyncSource> pool;
-            WaitAsyncSource nextNode;
-            ref WaitAsyncSource ITaskPoolNode<WaitAsyncSource>.NextNode => ref nextNode;
-
-            static WaitAsyncSource()
-            {
-                TaskPool.RegisterSizeGetter(typeof(WaitAsyncSource), () => pool.Size);
-            }
-
-            AsyncReactiveProperty<T> parent;
-            CancellationToken cancellationToken;
-            CancellationTokenRegistration cancellationTokenRegistration;
-            UniTaskCompletionSourceCore<T> core;
-
-            WaitAsyncSource()
-            {
-            }
-
-            public static IUniTaskSource<T> Create(AsyncReactiveProperty<T> parent, CancellationToken cancellationToken, out short token)
-            {
-                if (cancellationToken.IsCancellationRequested)
-                {
-                    return AutoResetUniTaskCompletionSource<T>.CreateFromCanceled(cancellationToken, out token);
-                }
-
-                if (!pool.TryPop(out var result))
-                {
-                    result = new WaitAsyncSource();
-                }
-
-                result.parent = parent;
-                result.cancellationToken = cancellationToken;
-
-                if (cancellationToken.CanBeCanceled)
-                {
-                    result.cancellationTokenRegistration = cancellationToken.RegisterWithoutCaptureExecutionContext(cancellationCallback, result);
-                }
-
-                result.parent.triggerEvent.Add(result);
-
-                TaskTracker.TrackActiveTask(result, 3);
-
-                token = result.core.Version;
-                return result;
-            }
-
-            bool TryReturn()
-            {
-                TaskTracker.RemoveTracking(this);
-                core.Reset();
-                cancellationTokenRegistration.Dispose();
-                cancellationTokenRegistration = default;
-                parent.triggerEvent.Remove(this);
-                parent = null;
-                cancellationToken = default;
-                return pool.TryPush(this);
-            }
-
-            static void CancellationCallback(object state)
-            {
-                var self = (WaitAsyncSource)state;
-                self.OnCanceled(self.cancellationToken);
-            }
-
-            // IUniTaskSource
-
-            public T GetResult(short token)
-            {
-                try
-                {
-                    return core.GetResult(token);
-                }
-                finally
-                {
-                    TryReturn();
-                }
-            }
-
-            void IUniTaskSource.GetResult(short token)
-            {
-                GetResult(token);
-            }
-
-            public void OnCompleted(Action<object> continuation, object state, short token)
-            {
-                core.OnCompleted(continuation, state, token);
-            }
-
-            public UniTaskStatus GetStatus(short token)
-            {
-                return core.GetStatus(token);
-            }
-
-            public UniTaskStatus UnsafeGetStatus()
-            {
-                return core.UnsafeGetStatus();
-            }
-
-            // ITriggerHandler
-
-            ITriggerHandler<T> ITriggerHandler<T>.Prev { get; set; }
-            ITriggerHandler<T> ITriggerHandler<T>.Next { get; set; }
-
-            public void OnCanceled(CancellationToken cancellationToken)
-            {
-                core.TrySetCanceled(cancellationToken);
-            }
-
-            public void OnCompleted()
-            {
-                // Complete as Cancel.
-                core.TrySetCanceled(CancellationToken.None);
-            }
-
-            public void OnError(Exception ex)
-            {
-                core.TrySetException(ex);
-            }
-
-            public void OnNext(T value)
-            {
-                core.TrySetResult(value);
-            }
-        }
-
-        sealed class WithoutCurrentEnumerable : IUniTaskAsyncEnumerable<T>
+        class WithoutCurrentEnumerable : IUniTaskAsyncEnumerable<T>
        {
            readonly AsyncReactiveProperty<T> parent;

@ -254,9 +120,6 @@ namespace Cysharp.Threading.Tasks

            public T Current => value;

-            ITriggerHandler<T> ITriggerHandler<T>.Prev { get; set; }
-            ITriggerHandler<T> ITriggerHandler<T>.Next { get; set; }
-
            public UniTask<bool> MoveNextAsync()
            {
                // raise latest value on first call.
@ -388,11 +251,6 @@ namespace Cysharp.Threading.Tasks
            return latestValue?.ToString();
        }

-        public UniTask<T> WaitAsync(CancellationToken cancellationToken = default)
-        {
-            return new UniTask<T>(WaitAsyncSource.Create(this, cancellationToken, out var token), token);
-        }
-
        static bool isValueType;

        static ReadOnlyAsyncReactiveProperty()
@ -400,136 +258,7 @@ namespace Cysharp.Threading.Tasks
            isValueType = typeof(T).IsValueType;
        }

-        sealed class WaitAsyncSource : IUniTaskSource<T>, ITriggerHandler<T>, ITaskPoolNode<WaitAsyncSource>
-        {
-            static Action<object> cancellationCallback = CancellationCallback;
-
-            static TaskPool<WaitAsyncSource> pool;
-            WaitAsyncSource nextNode;
-            ref WaitAsyncSource ITaskPoolNode<WaitAsyncSource>.NextNode => ref nextNode;
-
-            static WaitAsyncSource()
-            {
-                TaskPool.RegisterSizeGetter(typeof(WaitAsyncSource), () => pool.Size);
-            }
-
-            ReadOnlyAsyncReactiveProperty<T> parent;
-            CancellationToken cancellationToken;
-            CancellationTokenRegistration cancellationTokenRegistration;
-            UniTaskCompletionSourceCore<T> core;
-
-            WaitAsyncSource()
-            {
-            }
-
-            public static IUniTaskSource<T> Create(ReadOnlyAsyncReactiveProperty<T> parent, CancellationToken cancellationToken, out short token)
-            {
-                if (cancellationToken.IsCancellationRequested)
-                {
-                    return AutoResetUniTaskCompletionSource<T>.CreateFromCanceled(cancellationToken, out token);
-                }
-
-                if (!pool.TryPop(out var result))
-                {
-                    result = new WaitAsyncSource();
-                }
-
-                result.parent = parent;
-                result.cancellationToken = cancellationToken;
-
-                if (cancellationToken.CanBeCanceled)
-                {
-                    result.cancellationTokenRegistration = cancellationToken.RegisterWithoutCaptureExecutionContext(cancellationCallback, result);
-                }
-
-                result.parent.triggerEvent.Add(result);
-
-                TaskTracker.TrackActiveTask(result, 3);
-
-                token = result.core.Version;
-                return result;
-            }
-
-            bool TryReturn()
-            {
-                TaskTracker.RemoveTracking(this);
-                core.Reset();
-                cancellationTokenRegistration.Dispose();
-                cancellationTokenRegistration = default;
-                parent.triggerEvent.Remove(this);
-                parent = null;
-                cancellationToken = default;
-                return pool.TryPush(this);
-            }
-
-            static void CancellationCallback(object state)
-            {
-                var self = (WaitAsyncSource)state;
-                self.OnCanceled(self.cancellationToken);
-            }
-
-            // IUniTaskSource
-
-            public T GetResult(short token)
-            {
-                try
-                {
-                    return core.GetResult(token);
-                }
-                finally
-                {
-                    TryReturn();
-                }
-            }
-
-            void IUniTaskSource.GetResult(short token)
-            {
-                GetResult(token);
-            }
-
-            public void OnCompleted(Action<object> continuation, object state, short token)
-            {
-                core.OnCompleted(continuation, state, token);
-            }
-
-            public UniTaskStatus GetStatus(short token)
-            {
-                return core.GetStatus(token);
-            }
-
-            public UniTaskStatus UnsafeGetStatus()
-            {
-                return core.UnsafeGetStatus();
-            }
-
-            // ITriggerHandler
-
-            ITriggerHandler<T> ITriggerHandler<T>.Prev { get; set; }
-            ITriggerHandler<T> ITriggerHandler<T>.Next { get; set; }
-
-            public void OnCanceled(CancellationToken cancellationToken)
-            {
-                core.TrySetCanceled(cancellationToken);
-            }
-
-            public void OnCompleted()
-            {
-                // Complete as Cancel.
-                core.TrySetCanceled(CancellationToken.None);
-            }
-
-            public void OnError(Exception ex)
-            {
-                core.TrySetException(ex);
-            }
-
-            public void OnNext(T value)
-            {
-                core.TrySetResult(value);
-            }
-        }
-
-        sealed class WithoutCurrentEnumerable : IUniTaskAsyncEnumerable<T>
+        class WithoutCurrentEnumerable : IUniTaskAsyncEnumerable<T>
        {
            readonly ReadOnlyAsyncReactiveProperty<T> parent;

@ -571,8 +300,6 @@ namespace Cysharp.Threading.Tasks
            }

            public T Current => value;
-            ITriggerHandler<T> ITriggerHandler<T>.Prev { get; set; }
-            ITriggerHandler<T> ITriggerHandler<T>.Next { get; set; }

            public UniTask<bool> MoveNextAsync()
            {
--- a/src/UniTask/Assets/Plugins/UniTask/Runtime/CancellationTokenExtensions.cs
+++ b/src/UniTask/Assets/Plugins/UniTask/Runtime/CancellationTokenExtensions.cs
@ -9,56 +9,6 @@ namespace Cysharp.Threading.Tasks
    public static class CancellationTokenExtensions
    {
        static readonly Action<object> cancellationTokenCallback = Callback;
-        static readonly Action<object> disposeCallback = DisposeCallback;
-
-        public static CancellationToken ToCancellationToken(this UniTask task)
-        {
-            var cts = new CancellationTokenSource();
-            ToCancellationTokenCore(task, cts).Forget();
-            return cts.Token;
-        }
-
-        public static CancellationToken ToCancellationToken(this UniTask task, CancellationToken linkToken)
-        {
-            if (linkToken.IsCancellationRequested)
-            {
-                return linkToken;
-            }
-
-            if (!linkToken.CanBeCanceled)
-            {
-                return ToCancellationToken(task);
-            }
-
-            var cts = CancellationTokenSource.CreateLinkedTokenSource(linkToken);
-            ToCancellationTokenCore(task, cts).Forget();
-
-            return cts.Token;
-        }
-
-        public static CancellationToken ToCancellationToken<T>(this UniTask<T> task)
-        {
-            return ToCancellationToken(task.AsUniTask());
-        }
-
-        public static CancellationToken ToCancellationToken<T>(this UniTask<T> task, CancellationToken linkToken)
-        {
-            return ToCancellationToken(task.AsUniTask(), linkToken);
-        }
-
-        static async UniTaskVoid ToCancellationTokenCore(UniTask task, CancellationTokenSource cts)
-        {
-            try
-            {
-                await task;
-            }
-            catch (Exception ex)
-            {
-                UniTaskScheduler.PublishUnobservedTaskException(ex);
-            }
-            cts.Cancel();
-            cts.Dispose();
-        }

        public static (UniTask, CancellationTokenRegistration) ToUniTask(this CancellationToken cancellationToken)
        {
@ -125,17 +75,6 @@ namespace Cysharp.Threading.Tasks
                }
            }
        }
-
-        public static CancellationTokenRegistration AddTo(this IDisposable disposable, CancellationToken cancellationToken)
-        {
-            return cancellationToken.RegisterWithoutCaptureExecutionContext(disposeCallback, disposable);
-        }
-
-        static void DisposeCallback(object state)
-        {
-            var d = (IDisposable)state;
-            d.Dispose();
-        }
    }

    public struct CancellationTokenAwaitable
--- a/src/UniTask/Assets/Plugins/UniTask/Runtime/CancellationTokenSourceExtensions.cs
+++ b/src/UniTask/Assets/Plugins/UniTask/Runtime/CancellationTokenSourceExtensions.cs
@ -4,29 +4,31 @@ using System.Threading;
 using UnityEngine;
 using Cysharp.Threading.Tasks.Triggers;
 using System;
-using Cysharp.Threading.Tasks.Internal;

 namespace Cysharp.Threading.Tasks
 {
-
-    public static partial class CancellationTokenSourceExtensions
+    public static class CancellationTokenSourceExtensions
    {
-        readonly static Action<object> CancelCancellationTokenSourceStateDelegate = new Action<object>(CancelCancellationTokenSourceState);
-
-        static void CancelCancellationTokenSourceState(object state)
+        public static void CancelAfterSlim(this CancellationTokenSource cts, int millisecondsDelay, bool ignoreTimeScale = false, PlayerLoopTiming delayTiming = PlayerLoopTiming.Update)
        {
-            var cts = (CancellationTokenSource)state;
-            cts.Cancel();
+            var delay = UniTask.Delay(millisecondsDelay, ignoreTimeScale, delayTiming, cts.Token);
+            CancelAfterCore(cts, delay).Forget();
        }

-        public static IDisposable CancelAfterSlim(this CancellationTokenSource cts, int millisecondsDelay, DelayType delayType = DelayType.DeltaTime, PlayerLoopTiming delayTiming = PlayerLoopTiming.Update)
+        public static void CancelAfterSlim(this CancellationTokenSource cts, TimeSpan delayTimeSpan, bool ignoreTimeScale = false, PlayerLoopTiming delayTiming = PlayerLoopTiming.Update)
        {
-            return CancelAfterSlim(cts, TimeSpan.FromMilliseconds(millisecondsDelay), delayType, delayTiming);
+            var delay = UniTask.Delay(delayTimeSpan, ignoreTimeScale, delayTiming, cts.Token);
+            CancelAfterCore(cts, delay).Forget();
        }

-        public static IDisposable CancelAfterSlim(this CancellationTokenSource cts, TimeSpan delayTimeSpan, DelayType delayType = DelayType.DeltaTime, PlayerLoopTiming delayTiming = PlayerLoopTiming.Update)
+        static async UniTaskVoid CancelAfterCore(CancellationTokenSource cts, UniTask delayTask)
        {
-            return PlayerLoopTimer.StartNew(delayTimeSpan, false, delayType, delayTiming, cts.Token, CancelCancellationTokenSourceStateDelegate, cts);
+            var alreadyCanceled = await delayTask.SuppressCancellationThrow();
+            if (!alreadyCanceled)
+            {
+                cts.Cancel();
+                cts.Dispose();
+            }
        }

        public static void RegisterRaiseCancelOnDestroy(this CancellationTokenSource cts, Component component)
@ -37,7 +39,11 @@ namespace Cysharp.Threading.Tasks
        public static void RegisterRaiseCancelOnDestroy(this CancellationTokenSource cts, GameObject gameObject)
        {
            var trigger = gameObject.GetAsyncDestroyTrigger();
-            trigger.CancellationToken.RegisterWithoutCaptureExecutionContext(CancelCancellationTokenSourceStateDelegate, cts);
+            trigger.CancellationToken.RegisterWithoutCaptureExecutionContext(state =>
+            {
+                var cts2 = (CancellationTokenSource)state;
+                cts2.Cancel();
+            }, cts);
        }
    }
 }
--- a/src/UniTask/Assets/Plugins/UniTask/Runtime/CompilerServices/AsyncUniTaskMethodBuilder.cs
+++ b/src/UniTask/Assets/Plugins/UniTask/Runtime/CompilerServices/AsyncUniTaskMethodBuilder.cs
@ -12,8 +12,9 @@ namespace Cysharp.Threading.Tasks.CompilerServices
    [StructLayout(LayoutKind.Auto)]
    public struct AsyncUniTaskMethodBuilder
    {
-        IStateMachineRunnerPromise runnerPromise;
-        Exception ex;
+        // cache items.
+        AutoResetUniTaskCompletionSource promise;
+        internal IMoveNextRunner runner;

        // 1. Static Create method.
        [DebuggerHidden]
@ -30,81 +31,102 @@ namespace Cysharp.Threading.Tasks.CompilerServices
            [MethodImpl(MethodImplOptions.AggressiveInlining)]
            get
            {
-                if (runnerPromise != null)
+                if (promise != null)
                {
-                    return runnerPromise.Task;
+                    return promise.Task;
                }
-                else if (ex != null)
-                {
-                    return UniTask.FromException(ex);
-                }
-                else
+
+                if (runner == null)
                {
                    return UniTask.CompletedTask;
                }
+
+                promise = AutoResetUniTaskCompletionSource.Create();
+                return promise.Task;
            }
        }

        // 3. SetException
        [DebuggerHidden]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
        public void SetException(Exception exception)
        {
-            if (runnerPromise == null)
+            var p = promise; // after return, promise will clear so require to store local.
+
+            // runner is finished, return first.
+            if (runner != null)
            {
-                ex = exception;
+                runner.Return();
+                runner = null;
+            }
+
+            if (p != null)
+            {
+                p.TrySetException(exception);
            }
            else
            {
-                runnerPromise.SetException(exception);
+                promise = AutoResetUniTaskCompletionSource.CreateFromException(exception, out _);
            }
        }

        // 4. SetResult
        [DebuggerHidden]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
        public void SetResult()
        {
-            if (runnerPromise != null)
+            var p = promise; // after return, promise will clear so require to store local.
+
+            // runner is finished, return first.
+            if (runner != null)
            {
-                runnerPromise.SetResult();
+                runner.Return();
+                runner = null;
+            }
+
+            if (p != null)
+            {
+                p.TrySetResult();
            }
        }

        // 5. AwaitOnCompleted
        [DebuggerHidden]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
        public void AwaitOnCompleted<TAwaiter, TStateMachine>(ref TAwaiter awaiter, ref TStateMachine stateMachine)
            where TAwaiter : INotifyCompletion
            where TStateMachine : IAsyncStateMachine
        {
-            if (runnerPromise == null)
+            if (promise == null)
            {
-                AsyncUniTask<TStateMachine>.SetStateMachine(ref stateMachine, ref runnerPromise);
+                promise = AutoResetUniTaskCompletionSource.Create();
+            }
+            if (runner == null)
+            {
+                MoveNextRunner<TStateMachine>.SetRunner(ref this, ref stateMachine);
            }

-            awaiter.OnCompleted(runnerPromise.MoveNext);
+            awaiter.OnCompleted(runner.CallMoveNext);
        }

        // 6. AwaitUnsafeOnCompleted
        [DebuggerHidden]
        [SecuritySafeCritical]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
        public void AwaitUnsafeOnCompleted<TAwaiter, TStateMachine>(ref TAwaiter awaiter, ref TStateMachine stateMachine)
            where TAwaiter : ICriticalNotifyCompletion
            where TStateMachine : IAsyncStateMachine
        {
-            if (runnerPromise == null)
+            if (promise == null)
            {
-                AsyncUniTask<TStateMachine>.SetStateMachine(ref stateMachine, ref runnerPromise);
+                promise = AutoResetUniTaskCompletionSource.Create();
+            }
+            if (runner == null)
+            {
+                MoveNextRunner<TStateMachine>.SetRunner(ref this, ref stateMachine);
            }

-            awaiter.UnsafeOnCompleted(runnerPromise.MoveNext);
+            awaiter.UnsafeOnCompleted(runner.CallMoveNext);
        }

        // 7. Start
        [DebuggerHidden]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
        public void Start<TStateMachine>(ref TStateMachine stateMachine)
            where TStateMachine : IAsyncStateMachine
        {
@ -138,8 +160,9 @@ namespace Cysharp.Threading.Tasks.CompilerServices
    [StructLayout(LayoutKind.Auto)]
    public struct AsyncUniTaskMethodBuilder<T>
    {
-        IStateMachineRunnerPromise<T> runnerPromise;
-        Exception ex;
+        // cache items.
+        AutoResetUniTaskCompletionSource<T> promise;
+        internal IMoveNextRunner runner;
        T result;

        // 1. Static Create method.
@ -151,91 +174,111 @@ namespace Cysharp.Threading.Tasks.CompilerServices
        }

        // 2. TaskLike Task property.
+        [DebuggerHidden]
        public UniTask<T> Task
        {
-            [DebuggerHidden]
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
            get
            {
-                if (runnerPromise != null)
+                if (promise != null)
                {
-                    return runnerPromise.Task;
+                    return promise.Task;
                }
-                else if (ex != null)
-                {
-                    return UniTask.FromException<T>(ex);
-                }
-                else
+
+                if (runner == null)
                {
                    return UniTask.FromResult(result);
                }
+
+                promise = AutoResetUniTaskCompletionSource<T>.Create();
+                return promise.Task;
            }
        }

        // 3. SetException
        [DebuggerHidden]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
        public void SetException(Exception exception)
        {
-            if (runnerPromise == null)
+            var p = promise; // after return, promise will clear so require to store local.
+
+            // runner is finished, return first.
+            if (runner != null)
            {
-                ex = exception;
+                runner.Return();
+                runner = null;
+            }
+
+            if (p == null)
+            {
+                promise = AutoResetUniTaskCompletionSource<T>.CreateFromException(exception, out _);
            }
            else
            {
-                runnerPromise.SetException(exception);
+                p.TrySetException(exception);
            }
        }

        // 4. SetResult
        [DebuggerHidden]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
        public void SetResult(T result)
        {
-            if (runnerPromise == null)
+            var p = promise; // after return, promise will clear so require to store local.
+
+            // runner is finished, return first.
+            if (runner != null)
+            {
+                runner.Return();
+                runner = null;
+            }
+
+            if (p == null)
            {
                this.result = result;
            }
            else
            {
-                runnerPromise.SetResult(result);
+                p.TrySetResult(result);
            }
        }

        // 5. AwaitOnCompleted
        [DebuggerHidden]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
        public void AwaitOnCompleted<TAwaiter, TStateMachine>(ref TAwaiter awaiter, ref TStateMachine stateMachine)
            where TAwaiter : INotifyCompletion
            where TStateMachine : IAsyncStateMachine
        {
-            if (runnerPromise == null)
+            if (promise == null)
            {
-                AsyncUniTask<TStateMachine, T>.SetStateMachine(ref stateMachine, ref runnerPromise);
+                promise = AutoResetUniTaskCompletionSource<T>.Create();
+            }
+            if (runner == null)
+            {
+                MoveNextRunner<TStateMachine>.SetRunner(ref this, ref stateMachine);
            }

-            awaiter.OnCompleted(runnerPromise.MoveNext);
+            awaiter.OnCompleted(runner.CallMoveNext);
        }

        // 6. AwaitUnsafeOnCompleted
        [DebuggerHidden]
        [SecuritySafeCritical]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
        public void AwaitUnsafeOnCompleted<TAwaiter, TStateMachine>(ref TAwaiter awaiter, ref TStateMachine stateMachine)
            where TAwaiter : ICriticalNotifyCompletion
            where TStateMachine : IAsyncStateMachine
        {
-            if (runnerPromise == null)
+            if (promise == null)
            {
-                AsyncUniTask<TStateMachine, T>.SetStateMachine(ref stateMachine, ref runnerPromise);
+                promise = AutoResetUniTaskCompletionSource<T>.Create();
+            }
+            if (runner == null)
+            {
+                MoveNextRunner<TStateMachine>.SetRunner(ref this, ref stateMachine);
            }

-            awaiter.UnsafeOnCompleted(runnerPromise.MoveNext);
+            awaiter.UnsafeOnCompleted(runner.CallMoveNext);
        }

        // 7. Start
        [DebuggerHidden]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
        public void Start<TStateMachine>(ref TStateMachine stateMachine)
            where TStateMachine : IAsyncStateMachine
        {
--- a/src/UniTask/Assets/Plugins/UniTask/Runtime/CompilerServices/AsyncUniTaskVoidMethodBuilder.cs
+++ b/src/UniTask/Assets/Plugins/UniTask/Runtime/CompilerServices/AsyncUniTaskVoidMethodBuilder.cs
@ -4,15 +4,13 @@
 using System;
 using System.Diagnostics;
 using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
 using System.Security;

 namespace Cysharp.Threading.Tasks.CompilerServices
 {
-    [StructLayout(LayoutKind.Auto)]
    public struct AsyncUniTaskVoidMethodBuilder
    {
-        IStateMachineRunner runner;
+        internal IMoveNextRunner runner;

        // 1. Static Create method.
        [DebuggerHidden]
@ -35,18 +33,12 @@ namespace Cysharp.Threading.Tasks.CompilerServices

        // 3. SetException
        [DebuggerHidden]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
        public void SetException(Exception exception)
        {
            // runner is finished, return first.
            if (runner != null)
            {
-#if ENABLE_IL2CPP
-                // workaround for IL2CPP bug.
-                PlayerLoopHelper.AddContinuation(PlayerLoopTiming.LastPostLateUpdate, runner.ReturnAction);
-#else
                runner.Return();
-#endif
                runner = null;
            }

@ -55,51 +47,43 @@ namespace Cysharp.Threading.Tasks.CompilerServices

        // 4. SetResult
        [DebuggerHidden]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
        public void SetResult()
        {
            // runner is finished, return.
            if (runner != null)
            {
-#if ENABLE_IL2CPP
-                // workaround for IL2CPP bug.
-                PlayerLoopHelper.AddContinuation(PlayerLoopTiming.LastPostLateUpdate, runner.ReturnAction);
-#else
                runner.Return();
-#endif
                runner = null;
            }
        }

        // 5. AwaitOnCompleted
        [DebuggerHidden]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
        public void AwaitOnCompleted<TAwaiter, TStateMachine>(ref TAwaiter awaiter, ref TStateMachine stateMachine)
            where TAwaiter : INotifyCompletion
            where TStateMachine : IAsyncStateMachine
        {
            if (runner == null)
            {
-                AsyncUniTaskVoid<TStateMachine>.SetStateMachine(ref stateMachine, ref runner);
+                MoveNextRunner<TStateMachine>.SetRunner(ref this, ref stateMachine);
            }

-            awaiter.OnCompleted(runner.MoveNext);
+            awaiter.OnCompleted(runner.CallMoveNext);
        }

        // 6. AwaitUnsafeOnCompleted
        [DebuggerHidden]
        [SecuritySafeCritical]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
        public void AwaitUnsafeOnCompleted<TAwaiter, TStateMachine>(ref TAwaiter awaiter, ref TStateMachine stateMachine)
            where TAwaiter : ICriticalNotifyCompletion
            where TStateMachine : IAsyncStateMachine
        {
            if (runner == null)
            {
-                AsyncUniTaskVoid<TStateMachine>.SetStateMachine(ref stateMachine, ref runner);
+                MoveNextRunner<TStateMachine>.SetRunner(ref this, ref stateMachine);
            }

-            awaiter.UnsafeOnCompleted(runner.MoveNext);
+            awaiter.UnsafeOnCompleted(runner.CallMoveNext);
        }

        // 7. Start
--- a/src/UniTask/Assets/Plugins/UniTask/Runtime/CompilerServices/MoveNextRunner.cs
+++ b/src/UniTask/Assets/Plugins/UniTask/Runtime/CompilerServices/MoveNextRunner.cs
@ -0,0 +1,86 @@
+
+#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
+
+using System;
+using System.Diagnostics;
+using System.Runtime.CompilerServices;
+using Cysharp.Threading.Tasks.Internal;
+
+namespace Cysharp.Threading.Tasks.CompilerServices
+{
+    internal interface IMoveNextRunner
+    {
+        Action CallMoveNext { get; }
+        void Return();
+    }
+
+    internal sealed class MoveNextRunner<TStateMachine> : IMoveNextRunner, IPromisePoolItem
+        where TStateMachine : IAsyncStateMachine
+    {
+        static PromisePool<MoveNextRunner<TStateMachine>> pool = new PromisePool<MoveNextRunner<TStateMachine>>();
+
+        TStateMachine stateMachine;
+        internal readonly Action callMoveNext;
+
+        public Action CallMoveNext => callMoveNext;
+
+        MoveNextRunner()
+        {
+            callMoveNext = Run;
+        }
+
+        public static void SetRunner(ref AsyncUniTaskMethodBuilder builder, ref TStateMachine stateMachine)
+        {
+            var result = pool.TryRent();
+            if (result == null)
+            {
+                result = new MoveNextRunner<TStateMachine>();
+            }
+
+            builder.runner = result; // set runner before copied.
+            result.stateMachine = stateMachine; // copy struct StateMachine(in release build).
+        }
+
+        public static void SetRunner<T>(ref AsyncUniTaskMethodBuilder<T> builder, ref TStateMachine stateMachine)
+        {
+            var result = pool.TryRent();
+            if (result == null)
+            {
+                result = new MoveNextRunner<TStateMachine>();
+            }
+
+            builder.runner = result; // set runner before copied.
+            result.stateMachine = stateMachine; // copy struct StateMachine(in release build).
+        }
+
+        public static void SetRunner(ref AsyncUniTaskVoidMethodBuilder builder, ref TStateMachine stateMachine)
+        {
+            var result = pool.TryRent();
+            if (result == null)
+            {
+                result = new MoveNextRunner<TStateMachine>();
+            }
+
+            builder.runner = result; // set runner before copied.
+            result.stateMachine = stateMachine; // copy struct StateMachine(in release build).
+        }
+
+        [DebuggerHidden]
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        void Run()
+        {
+            stateMachine.MoveNext();
+        }
+
+        public void Return()
+        {
+            pool.TryReturn(this);
+        }
+
+        void IPromisePoolItem.Reset()
+        {
+            stateMachine = default;
+        }
+    }
+}
+
--- a/src/UniTask/Assets/Plugins/UniTask/Runtime/CompilerServices/StateMachineRunner.cs.meta
+++ b/src/UniTask/Assets/Plugins/UniTask/Runtime/CompilerServices/StateMachineRunner.cs.meta
--- a/src/UniTask/Assets/Plugins/UniTask/Runtime/CompilerServices/StateMachineRunner.cs
+++ b/src/UniTask/Assets/Plugins/UniTask/Runtime/CompilerServices/StateMachineRunner.cs
@ -1,380 +0,0 @@
-#pragma warning disable CS1591
-
-using Cysharp.Threading.Tasks.Internal;
-using System;
-using System.Linq;
-using System.Diagnostics;
-using System.Runtime.CompilerServices;
-
-namespace Cysharp.Threading.Tasks.CompilerServices
-{
-    // #ENABLE_IL2CPP in this file is to avoid bug of IL2CPP VM.
-    // Issue is tracked on https://issuetracker.unity3d.com/issues/il2cpp-incorrect-results-when-calling-a-method-from-outside-class-in-a-struct
-    // but currently it is labeled `Won't Fix`.
-
-    internal interface IStateMachineRunner
-    {
-        Action MoveNext { get; }
-        void Return();
-
-#if ENABLE_IL2CPP
-        Action ReturnAction { get; }
-#endif
-    }
-
-    internal interface IStateMachineRunnerPromise : IUniTaskSource
-    {
-        Action MoveNext { get; }
-        UniTask Task { get; }
-        void SetResult();
-        void SetException(Exception exception);
-    }
-
-    internal interface IStateMachineRunnerPromise<T> : IUniTaskSource<T>
-    {
-        Action MoveNext { get; }
-        UniTask<T> Task { get; }
-        void SetResult(T result);
-        void SetException(Exception exception);
-    }
-
-    internal static class StateMachineUtility
-    {
-        // Get AsyncStateMachine internal state to check IL2CPP bug
-        public static int GetState(IAsyncStateMachine stateMachine)
-        {
-            var info = stateMachine.GetType().GetFields(System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)
-                .First(x => x.Name.EndsWith("__state"));
-            return (int)info.GetValue(stateMachine);
-        }
-    }
-
-    internal sealed class AsyncUniTaskVoid<TStateMachine> : IStateMachineRunner, ITaskPoolNode<AsyncUniTaskVoid<TStateMachine>>, IUniTaskSource
-        where TStateMachine : IAsyncStateMachine
-    {
-        static TaskPool<AsyncUniTaskVoid<TStateMachine>> pool;
-
-#if ENABLE_IL2CPP
-        public Action ReturnAction { get; }
-#endif
-
-        TStateMachine stateMachine;
-
-        public Action MoveNext { get; }
-
-        public AsyncUniTaskVoid()
-        {
-            MoveNext = Run;
-#if ENABLE_IL2CPP
-            ReturnAction = Return;
-#endif
-        }
-
-        public static void SetStateMachine(ref TStateMachine stateMachine, ref IStateMachineRunner runnerFieldRef)
-        {
-            if (!pool.TryPop(out var result))
-            {
-                result = new AsyncUniTaskVoid<TStateMachine>();
-            }
-            TaskTracker.TrackActiveTask(result, 3);
-
-            runnerFieldRef = result; // set runner before copied.
-            result.stateMachine = stateMachine; // copy struct StateMachine(in release build).
-        }
-
-        static AsyncUniTaskVoid()
-        {
-            TaskPool.RegisterSizeGetter(typeof(AsyncUniTaskVoid<TStateMachine>), () => pool.Size);
-        }
-
-        AsyncUniTaskVoid<TStateMachine> nextNode;
-        public ref AsyncUniTaskVoid<TStateMachine> NextNode => ref nextNode;
-
-        public void Return()
-        {
-            TaskTracker.RemoveTracking(this);
-            stateMachine = default;
-            pool.TryPush(this);
-        }
-
-        [DebuggerHidden]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        void Run()
-        {
-            stateMachine.MoveNext();
-        }
-
-        // dummy interface implementation for TaskTracker.
-
-        UniTaskStatus IUniTaskSource.GetStatus(short token)
-        {
-            return UniTaskStatus.Pending;
-        }
-
-        UniTaskStatus IUniTaskSource.UnsafeGetStatus()
-        {
-            return UniTaskStatus.Pending;
-        }
-
-        void IUniTaskSource.OnCompleted(Action<object> continuation, object state, short token)
-        {
-        }
-
-        void IUniTaskSource.GetResult(short token)
-        {
-        }
-    }
-
-    internal sealed class AsyncUniTask<TStateMachine> : IStateMachineRunnerPromise, IUniTaskSource, ITaskPoolNode<AsyncUniTask<TStateMachine>>
-        where TStateMachine : IAsyncStateMachine
-    {
-        static TaskPool<AsyncUniTask<TStateMachine>> pool;
-
-#if ENABLE_IL2CPP
-        readonly Action returnDelegate;  
-#endif
-        public Action MoveNext { get; }
-
-        TStateMachine stateMachine;
-        UniTaskCompletionSourceCore<AsyncUnit> core;
-
-        AsyncUniTask()
-        {
-            MoveNext = Run;
-#if ENABLE_IL2CPP
-            returnDelegate = Return;
-#endif
-        }
-
-        public static void SetStateMachine(ref TStateMachine stateMachine, ref IStateMachineRunnerPromise runnerPromiseFieldRef)
-        {
-            if (!pool.TryPop(out var result))
-            {
-                result = new AsyncUniTask<TStateMachine>();
-            }
-            TaskTracker.TrackActiveTask(result, 3);
-
-            runnerPromiseFieldRef = result; // set runner before copied.
-            result.stateMachine = stateMachine; // copy struct StateMachine(in release build).
-        }
-
-        AsyncUniTask<TStateMachine> nextNode;
-        public ref AsyncUniTask<TStateMachine> NextNode => ref nextNode;
-
-        static AsyncUniTask()
-        {
-            TaskPool.RegisterSizeGetter(typeof(AsyncUniTask<TStateMachine>), () => pool.Size);
-        }
-
-        void Return()
-        {
-            TaskTracker.RemoveTracking(this);
-            core.Reset();
-            stateMachine = default;
-            pool.TryPush(this);
-        }
-
-        bool TryReturn()
-        {
-            TaskTracker.RemoveTracking(this);
-            core.Reset();
-            stateMachine = default;
-            return pool.TryPush(this);
-        }
-
-        [DebuggerHidden]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        void Run()
-        {
-            stateMachine.MoveNext();
-        }
-
-        public UniTask Task
-        {
-            [DebuggerHidden]
-            get
-            {
-                return new UniTask(this, core.Version);
-            }
-        }
-
-        [DebuggerHidden]
-        public void SetResult()
-        {
-            core.TrySetResult(AsyncUnit.Default);
-        }
-
-        [DebuggerHidden]
-        public void SetException(Exception exception)
-        {
-            core.TrySetException(exception);
-        }
-
-        [DebuggerHidden]
-        public void GetResult(short token)
-        {
-            try
-            {
-                core.GetResult(token);
-            }
-            finally
-            {
-#if ENABLE_IL2CPP
-                // workaround for IL2CPP bug.
-                PlayerLoopHelper.AddContinuation(PlayerLoopTiming.LastPostLateUpdate, returnDelegate);
-#else
-                TryReturn();
-#endif
-            }
-        }
-
-        [DebuggerHidden]
-        public UniTaskStatus GetStatus(short token)
-        {
-            return core.GetStatus(token);
-        }
-
-        [DebuggerHidden]
-        public UniTaskStatus UnsafeGetStatus()
-        {
-            return core.UnsafeGetStatus();
-        }
-
-        [DebuggerHidden]
-        public void OnCompleted(Action<object> continuation, object state, short token)
-        {
-            core.OnCompleted(continuation, state, token);
-        }
-    }
-
-    internal sealed class AsyncUniTask<TStateMachine, T> : IStateMachineRunnerPromise<T>, IUniTaskSource<T>, ITaskPoolNode<AsyncUniTask<TStateMachine, T>>
-        where TStateMachine : IAsyncStateMachine
-    {
-        static TaskPool<AsyncUniTask<TStateMachine, T>> pool;
-
-#if ENABLE_IL2CPP
-        readonly Action returnDelegate;  
-#endif
-
-        public Action MoveNext { get; }
-
-        TStateMachine stateMachine;
-        UniTaskCompletionSourceCore<T> core;
-
-        AsyncUniTask()
-        {
-            MoveNext = Run;
-#if ENABLE_IL2CPP
-            returnDelegate = Return;
-#endif
-        }
-
-        public static void SetStateMachine(ref TStateMachine stateMachine, ref IStateMachineRunnerPromise<T> runnerPromiseFieldRef)
-        {
-            if (!pool.TryPop(out var result))
-            {
-                result = new AsyncUniTask<TStateMachine, T>();
-            }
-            TaskTracker.TrackActiveTask(result, 3);
-
-            runnerPromiseFieldRef = result; // set runner before copied.
-            result.stateMachine = stateMachine; // copy struct StateMachine(in release build).
-        }
-
-        AsyncUniTask<TStateMachine, T> nextNode;
-        public ref AsyncUniTask<TStateMachine, T> NextNode => ref nextNode;
-
-        static AsyncUniTask()
-        {
-            TaskPool.RegisterSizeGetter(typeof(AsyncUniTask<TStateMachine, T>), () => pool.Size);
-        }
-
-        void Return()
-        {
-            TaskTracker.RemoveTracking(this);
-            core.Reset();
-            stateMachine = default;
-            pool.TryPush(this);
-        }
-
-        bool TryReturn()
-        {
-            TaskTracker.RemoveTracking(this);
-            core.Reset();
-            stateMachine = default;
-            return pool.TryPush(this);
-        }
-
-        [DebuggerHidden]
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        void Run()
-        {
-            // UnityEngine.Debug.Log($"MoveNext State:" + StateMachineUtility.GetState(stateMachine));
-            stateMachine.MoveNext();
-        }
-
-        public UniTask<T> Task
-        {
-            [DebuggerHidden]
-            get
-            {
-                return new UniTask<T>(this, core.Version);
-            }
-        }
-
-        [DebuggerHidden]
-        public void SetResult(T result)
-        {
-            core.TrySetResult(result);
-        }
-
-        [DebuggerHidden]
-        public void SetException(Exception exception)
-        {
-            core.TrySetException(exception);
-        }
-
-        [DebuggerHidden]
-        public T GetResult(short token)
-        {
-            try
-            {
-                return core.GetResult(token);
-            }
-            finally
-            {
-#if ENABLE_IL2CPP
-                // workaround for IL2CPP bug.
-                PlayerLoopHelper.AddContinuation(PlayerLoopTiming.LastPostLateUpdate, returnDelegate);
-#else
-                TryReturn();
-#endif
-            }
-        }
-
-        [DebuggerHidden]
-        void IUniTaskSource.GetResult(short token)
-        {
-            GetResult(token);
-        }
-
-        [DebuggerHidden]
-        public UniTaskStatus GetStatus(short token)
-        {
-            return core.GetStatus(token);
-        }
-
-        [DebuggerHidden]
-        public UniTaskStatus UnsafeGetStatus()
-        {
-            return core.UnsafeGetStatus();
-        }
-
-        [DebuggerHidden]
-        public void OnCompleted(Action<object> continuation, object state, short token)
-        {
-            core.OnCompleted(continuation, state, token);
-        }
-    }
-}
-
--- a/src/UniTask/Assets/Plugins/UniTask/Runtime/EnumeratorAsyncExtensions.cs
+++ b/src/UniTask/Assets/Plugins/UniTask/Runtime/EnumeratorAsyncExtensions.cs
@ -12,12 +12,10 @@ namespace Cysharp.Threading.Tasks
 {
    public static class EnumeratorAsyncExtensions
    {
-        public static UniTask.Awaiter GetAwaiter<T>(this T enumerator)
-            where T : IEnumerator
+        public static UniTask.Awaiter GetAwaiter(this IEnumerator enumerator)
        {
-            var e = (IEnumerator)enumerator;
-            Error.ThrowArgumentNullException(e, nameof(enumerator));
-            return new UniTask(EnumeratorPromise.Create(e, PlayerLoopTiming.Update, CancellationToken.None, out var token), token).GetAwaiter();
+            Error.ThrowArgumentNullException(enumerator, nameof(enumerator));
+            return new UniTask(EnumeratorPromise.Create(enumerator, PlayerLoopTiming.Update, CancellationToken.None, out var token), token).GetAwaiter();
        }

        public static UniTask WithCancellation(this IEnumerator enumerator, CancellationToken cancellationToken)
@ -32,35 +30,12 @@ namespace Cysharp.Threading.Tasks
            return new UniTask(EnumeratorPromise.Create(enumerator, timing, cancellationToken, out var token), token);
        }

-        public static UniTask ToUniTask(this IEnumerator enumerator, MonoBehaviour coroutineRunner)
+        class EnumeratorPromise : IUniTaskSource, IPlayerLoopItem, IPromisePoolItem
        {
-            var source = AutoResetUniTaskCompletionSource.Create();
-            coroutineRunner.StartCoroutine(Core(enumerator, coroutineRunner, source));
-            return source.Task;
-        }
-
-        static IEnumerator Core(IEnumerator inner, MonoBehaviour coroutineRunner, AutoResetUniTaskCompletionSource source)
-        {
-            yield return coroutineRunner.StartCoroutine(inner);
-            source.TrySetResult();
-        }
-
-        sealed class EnumeratorPromise : IUniTaskSource, IPlayerLoopItem, ITaskPoolNode<EnumeratorPromise>
-        {
-            static TaskPool<EnumeratorPromise> pool;
-            EnumeratorPromise nextNode;
-            public ref EnumeratorPromise NextNode => ref nextNode;
-
-            static EnumeratorPromise()
-            {
-                TaskPool.RegisterSizeGetter(typeof(EnumeratorPromise), () => pool.Size);
-            }
+            static readonly PromisePool<EnumeratorPromise> pool = new PromisePool<EnumeratorPromise>();

            IEnumerator innerEnumerator;
            CancellationToken cancellationToken;
-            int initialFrame;
-            bool loopRunning;
-            bool calledGetResult;

            UniTaskCompletionSourceCore<object> core;

@ -75,26 +50,16 @@ namespace Cysharp.Threading.Tasks
                    return AutoResetUniTaskCompletionSource.CreateFromCanceled(cancellationToken, out token);
                }

-                if (!pool.TryPop(out var result))
-                {
-                    result = new EnumeratorPromise();
-                }
-                TaskTracker.TrackActiveTask(result, 3);
+                var result = pool.TryRent() ?? new EnumeratorPromise();

                result.innerEnumerator = ConsumeEnumerator(innerEnumerator);
                result.cancellationToken = cancellationToken;
-                result.loopRunning = true;
-                result.calledGetResult = false;
-                result.initialFrame = -1;
+
+                TaskTracker.TrackActiveTask(result, 3);
+
+                PlayerLoopHelper.AddAction(timing, result);

                token = result.core.Version;
-
-                // run immediately.
-                if (result.MoveNext())
-                {
-                    PlayerLoopHelper.AddAction(timing, result);
-                }
-                
                return result;
            }

@ -102,15 +67,12 @@ namespace Cysharp.Threading.Tasks
            {
                try
                {
-                    calledGetResult = true;
+                    TaskTracker.RemoveTracking(this);
                    core.GetResult(token);
                }
                finally
                {
-                    if (!loopRunning)
-                    {
-                        TryReturn();
-                    }
+                    pool.TryReturn(this);
                }
            }

@ -131,38 +93,12 @@ namespace Cysharp.Threading.Tasks

            public bool MoveNext()
            {
-                if (calledGetResult)
-                {
-                    loopRunning = false;
-                    TryReturn();
-                    return false;
-                }
-
-                if (innerEnumerator == null) // invalid status, returned but loop running?
-                {
-                    return false;
-                }
-
                if (cancellationToken.IsCancellationRequested)
                {
-                    loopRunning = false;
                    core.TrySetCanceled(cancellationToken);
                    return false;
                }

-                if (initialFrame == -1)
-                {
-                    // Time can not touch in threadpool.
-                    if (PlayerLoopHelper.IsMainThread)
-                    {
-                        initialFrame = Time.frameCount;
-                    }
-                }
-                else if (initialFrame == Time.frameCount)
-                {
-                    return true; // already executed in first frame, skip.
-                }
-
                try
                {
                    if (innerEnumerator.MoveNext())
@ -172,24 +108,27 @@ namespace Cysharp.Threading.Tasks
                }
                catch (Exception ex)
                {
-                    loopRunning = false;
                    core.TrySetException(ex);
                    return false;
                }

-                loopRunning = false;
                core.TrySetResult(null);
                return false;
            }

-            bool TryReturn()
+            public void Reset()
            {
-                TaskTracker.RemoveTracking(this);
                core.Reset();
                innerEnumerator = default;
                cancellationToken = default;
+            }

-                return pool.TryPush(this);
+            ~EnumeratorPromise()
+            {
+                if (pool.TryReturn(this))
+                {
+                    GC.ReRegisterForFinalize(this);
+                }
            }

            // Unwrap YieldInstructions
@ -203,10 +142,11 @@ namespace Cysharp.Threading.Tasks
                    {
                        yield return null;
                    }
-                    else if (current is CustomYieldInstruction cyi)
+                    else if (current is CustomYieldInstruction)
                    {
                        // WWW, WaitForSecondsRealtime
-                        while (cyi.keepWaiting)
+                        var e2 = UnwrapWaitCustomYieldInstruction((CustomYieldInstruction)current);
+                        while (e2.MoveNext())
                        {
                            yield return null;
                        }
@ -232,7 +172,7 @@ namespace Cysharp.Threading.Tasks
                        }
                        else
                        {
-                            goto WARN;
+                            yield return null;
                        }
                    }
                    else if (current is IEnumerator e3)
@ -245,14 +185,17 @@ namespace Cysharp.Threading.Tasks
                    }
                    else
                    {
-                        goto WARN;
+                        // WaitForEndOfFrame, WaitForFixedUpdate, others.
+                        yield return null;
                    }
+                }
+            }

-                    continue;
-
-                    WARN:
-                    // WaitForEndOfFrame, WaitForFixedUpdate, others.
-                    UnityEngine.Debug.LogWarning($"yield {current.GetType().Name} is not supported on await IEnumerator or IEnumerator.ToUniTask(), please use ToUniTask(MonoBehaviour coroutineRunner) instead.");
+            // WWW and others as CustomYieldInstruction.
+            static IEnumerator UnwrapWaitCustomYieldInstruction(CustomYieldInstruction yieldInstruction)
+            {
+                while (yieldInstruction.keepWaiting)
+                {
                    yield return null;
                }
            }
@ -262,12 +205,12 @@ namespace Cysharp.Threading.Tasks
            static IEnumerator UnwrapWaitForSeconds(WaitForSeconds waitForSeconds)
            {
                var second = (float)waitForSeconds_Seconds.GetValue(waitForSeconds);
-                var elapsed = 0.0f;
+                var startTime = DateTimeOffset.UtcNow;
                while (true)
                {
                    yield return null;

-                    elapsed += Time.deltaTime;
+                    var elapsed = (DateTimeOffset.UtcNow - startTime).TotalSeconds;
                    if (elapsed >= second)
                    {
                        break;
@ -285,3 +228,4 @@ namespace Cysharp.Threading.Tasks
        }
    }
 }
+
--- a/src/UniTask/Assets/Plugins/UniTask/Runtime/External/AddressableAsyncExtensions.cs
+++ b/src/UniTask/Assets/Plugins/UniTask/Runtime/External/AddressableAsyncExtensions.cs
@ -0,0 +1,377 @@
+// asmdef Version Defines, enabled when com.unity.addressables is imported.
+
+#if UNITASK_ADDRESSABLE_SUPPORT
+
+using Cysharp.Threading.Tasks.Internal;
+using System;
+using System.Runtime.CompilerServices;
+using System.Runtime.ExceptionServices;
+using System.Threading;
+using UnityEngine.ResourceManagement.AsyncOperations;
+
+namespace Cysharp.Threading.Tasks
+{
+    public static class AddressableAsyncExtensions
+    {
+        #region AsyncOperationHandle
+
+        public static AsyncOperationHandleAwaiter GetAwaiter(this AsyncOperationHandle handle)
+        {
+            return new AsyncOperationHandleAwaiter(handle);
+        }
+
+        public static UniTask WithCancellation(this AsyncOperationHandle handle, CancellationToken cancellationToken)
+        {
+            if (handle.IsDone) return UniTask.CompletedTask;
+            return new UniTask(AsyncOperationHandleConfiguredSource.Create(handle, PlayerLoopTiming.Update, null, cancellationToken, out var token), token);
+        }
+
+        public static UniTask ToUniTask(this AsyncOperationHandle handle, IProgress<float> progress = null, PlayerLoopTiming timing = PlayerLoopTiming.Update, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            if (handle.IsDone) return UniTask.CompletedTask;
+            return new UniTask(AsyncOperationHandleConfiguredSource.Create(handle, timing, progress, cancellationToken, out var token), token);
+        }
+
+        public struct AsyncOperationHandleAwaiter : ICriticalNotifyCompletion
+        {
+            AsyncOperationHandle handle;
+            Action<AsyncOperationHandle> continuationAction;
+
+            public AsyncOperationHandleAwaiter(AsyncOperationHandle handle)
+            {
+                this.handle = handle;
+                this.continuationAction = null;
+            }
+
+            public bool IsCompleted => handle.IsDone;
+
+            public void GetResult()
+            {
+                if (continuationAction != null)
+                {
+                    handle.Completed -= continuationAction;
+                    continuationAction = null;
+                }
+
+                if (handle.Status == AsyncOperationStatus.Failed)
+                {
+                    var e = handle.OperationException;
+                    handle = default;
+                    ExceptionDispatchInfo.Capture(e).Throw();
+                }
+
+                var result = handle.Result;
+                handle = default;
+            }
+
+            public void OnCompleted(Action continuation)
+            {
+                UnsafeOnCompleted(continuation);
+            }
+
+            public void UnsafeOnCompleted(Action continuation)
+            {
+                Error.ThrowWhenContinuationIsAlreadyRegistered(continuationAction);
+                continuationAction = continuation.AsFuncOfT<AsyncOperationHandle>(); // allocate delegate.
+                handle.Completed += continuationAction;
+            }
+        }
+
+        sealed class AsyncOperationHandleConfiguredSource : IUniTaskSource, IPlayerLoopItem, IPromisePoolItem
+        {
+            static readonly PromisePool<AsyncOperationHandleConfiguredSource> pool = new PromisePool<AsyncOperationHandleConfiguredSource>();
+
+            AsyncOperationHandle handle;
+            IProgress<float> progress;
+            CancellationToken cancellationToken;
+
+            UniTaskCompletionSourceCore<AsyncUnit> core;
+
+            AsyncOperationHandleConfiguredSource()
+            {
+
+            }
+
+            public static IUniTaskSource Create(AsyncOperationHandle handle, PlayerLoopTiming timing, IProgress<float> progress, CancellationToken cancellationToken, out short token)
+            {
+                if (cancellationToken.IsCancellationRequested)
+                {
+                    return AutoResetUniTaskCompletionSource.CreateFromCanceled(cancellationToken, out token);
+                }
+
+                var result = pool.TryRent() ?? new AsyncOperationHandleConfiguredSource();
+
+                result.handle = handle;
+                result.progress = progress;
+                result.cancellationToken = cancellationToken;
+
+                TaskTracker.TrackActiveTask(result, 3);
+
+                PlayerLoopHelper.AddAction(timing, result);
+
+                token = result.core.Version;
+                return result;
+            }
+
+            public void GetResult(short token)
+            {
+                try
+                {
+                    TaskTracker.RemoveTracking(this);
+                    core.GetResult(token);
+                }
+                finally
+                {
+                    pool.TryReturn(this);
+                }
+            }
+
+            public UniTaskStatus GetStatus(short token)
+            {
+                return core.GetStatus(token);
+            }
+
+            public UniTaskStatus UnsafeGetStatus()
+            {
+                return core.UnsafeGetStatus();
+            }
+
+            public void OnCompleted(Action<object> continuation, object state, short token)
+            {
+                core.OnCompleted(continuation, state, token);
+            }
+
+            public bool MoveNext()
+            {
+                if (cancellationToken.IsCancellationRequested)
+                {
+                    core.TrySetCanceled(cancellationToken);
+                    return false;
+                }
+
+                if (progress != null)
+                {
+                    progress.Report(handle.PercentComplete);
+                }
+
+                if (handle.IsDone)
+                {
+                    if (handle.Status == AsyncOperationStatus.Failed)
+                    {
+                        core.TrySetException(handle.OperationException);
+                    }
+                    else
+                    {
+                        core.TrySetResult(AsyncUnit.Default);
+                    }
+                    return false;
+                }
+
+                return true;
+            }
+
+            public void Reset()
+            {
+                core.Reset();
+                handle = default;
+                progress = default;
+                cancellationToken = default;
+            }
+
+            ~AsyncOperationHandleConfiguredSource()
+            {
+                if (pool.TryReturn(this))
+                {
+                    GC.ReRegisterForFinalize(this);
+                }
+            }
+        }
+
+        #endregion
+
+        #region AsyncOperationHandle_T
+
+        public static AsyncOperationHandleAwaiter<T> GetAwaiter<T>(this AsyncOperationHandle<T> handle)
+        {
+            return new AsyncOperationHandleAwaiter<T>(handle);
+        }
+
+        public static UniTask<T> WithCancellation<T>(this AsyncOperationHandle<T> handle, CancellationToken cancellationToken)
+        {
+            if (handle.IsDone) return UniTask.FromResult(handle.Result);
+            return new UniTask<T>(AsyncOperationHandleConfiguredSource<T>.Create(handle, PlayerLoopTiming.Update, null, cancellationToken, out var token), token);
+        }
+
+        public static UniTask<T> ToUniTask<T>(this AsyncOperationHandle<T> handle, IProgress<float> progress = null, PlayerLoopTiming timing = PlayerLoopTiming.Update, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            if (handle.IsDone) return UniTask.FromResult(handle.Result);
+            return new UniTask<T>(AsyncOperationHandleConfiguredSource<T>.Create(handle, timing, progress, cancellationToken, out var token), token);
+        }
+
+        public struct AsyncOperationHandleAwaiter<T> : ICriticalNotifyCompletion
+        {
+            AsyncOperationHandle<T> handle;
+            Action<AsyncOperationHandle> continuationAction;
+
+            public AsyncOperationHandleAwaiter(AsyncOperationHandle<T> handle)
+            {
+                this.handle = handle;
+                this.continuationAction = null;
+            }
+
+            public bool IsCompleted => handle.IsDone;
+
+            public T GetResult()
+            {
+                if (continuationAction != null)
+                {
+                    handle.CompletedTypeless -= continuationAction;
+                    continuationAction = null;
+                }
+
+                if (handle.Status == AsyncOperationStatus.Failed)
+                {
+                    var e = handle.OperationException;
+                    handle = default;
+                    ExceptionDispatchInfo.Capture(e).Throw();
+                }
+
+                var result = handle.Result;
+                handle = default;
+                return result;
+            }
+
+            public void OnCompleted(Action continuation)
+            {
+                UnsafeOnCompleted(continuation);
+            }
+
+            public void UnsafeOnCompleted(Action continuation)
+            {
+                Error.ThrowWhenContinuationIsAlreadyRegistered(continuationAction);
+                continuationAction = continuation.AsFuncOfT<AsyncOperationHandle>(); // allocate delegate.
+                handle.CompletedTypeless += continuationAction;
+            }
+        }
+
+        sealed class AsyncOperationHandleConfiguredSource<T> : IUniTaskSource<T>, IPlayerLoopItem, IPromisePoolItem
+        {
+            static readonly PromisePool<AsyncOperationHandleConfiguredSource<T>> pool = new PromisePool<AsyncOperationHandleConfiguredSource<T>>();
+
+            AsyncOperationHandle<T> handle;
+            IProgress<float> progress;
+            CancellationToken cancellationToken;
+
+            UniTaskCompletionSourceCore<T> core;
+
+            AsyncOperationHandleConfiguredSource()
+            {
+
+            }
+
+            public static IUniTaskSource<T> Create(AsyncOperationHandle<T> handle, PlayerLoopTiming timing, IProgress<float> progress, CancellationToken cancellationToken, out short token)
+            {
+                if (cancellationToken.IsCancellationRequested)
+                {
+                    return AutoResetUniTaskCompletionSource<T>.CreateFromCanceled(cancellationToken, out token);
+                }
+
+                var result = pool.TryRent() ?? new AsyncOperationHandleConfiguredSource<T>();
+
+                result.handle = handle;
+                result.progress = progress;
+                result.cancellationToken = cancellationToken;
+
+                TaskTracker.TrackActiveTask(result, 3);
+
+                PlayerLoopHelper.AddAction(timing, result);
+
+                token = result.core.Version;
+                return result;
+            }
+
+            public T GetResult(short token)
+            {
+                try
+                {
+                    TaskTracker.RemoveTracking(this);
+
+                    return core.GetResult(token);
+                }
+                finally
+                {
+                    pool.TryReturn(this);
+                }
+            }
+
+            void IUniTaskSource.GetResult(short token)
+            {
+                GetResult(token);
+            }
+
+            public UniTaskStatus GetStatus(short token)
+            {
+                return core.GetStatus(token);
+            }
+
+            public UniTaskStatus UnsafeGetStatus()
+            {
+                return core.UnsafeGetStatus();
+            }
+
+            public void OnCompleted(Action<object> continuation, object state, short token)
+            {
+                core.OnCompleted(continuation, state, token);
+            }
+
+            public bool MoveNext()
+            {
+                if (cancellationToken.IsCancellationRequested)
+                {
+                    core.TrySetCanceled(cancellationToken);
+                    return false;
+                }
+
+                if (progress != null)
+                {
+                    progress.Report(handle.PercentComplete);
+                }
+
+                if (handle.IsDone)
+                {
+                    if (handle.Status == AsyncOperationStatus.Failed)
+                    {
+                        core.TrySetException(handle.OperationException);
+                    }
+                    else
+                    {
+                        core.TrySetResult(handle.Result);
+                    }
+                    return false;
+                }
+
+                return true;
+            }
+
+            public void Reset()
+            {
+                core.Reset();
+                handle = default;
+                progress = default;
+                cancellationToken = default;
+            }
+
+            ~AsyncOperationHandleConfiguredSource()
+            {
+                if (pool.TryReturn(this))
+                {
+                    GC.ReRegisterForFinalize(this);
+                }
+            }
+        }
+
+        #endregion
+    }
+}
+
+#endif
--- a/src/UniTask/Assets/Plugins/UniTask/Runtime/External/Addressables/AddressablesAsyncExtensions.cs.meta
+++ b/src/UniTask/Assets/Plugins/UniTask/Runtime/External/Addressables/AddressablesAsyncExtensions.cs.meta
--- a/src/UniTask/Assets/Plugins/UniTask/Runtime/External/Addressables/AddressablesAsyncExtensions.cs
+++ b/src/UniTask/Assets/Plugins/UniTask/Runtime/External/Addressables/AddressablesAsyncExtensions.cs
@ -1,483 +0,0 @@
-// asmdef Version Defines, enabled when com.unity.addressables is imported.
-
-#if UNITASK_ADDRESSABLE_SUPPORT
-
-using Cysharp.Threading.Tasks.Internal;
-using System;
-using System.Runtime.CompilerServices;
-using System.Runtime.ExceptionServices;
-using System.Threading;
-using UnityEngine.AddressableAssets;
-using UnityEngine.ResourceManagement.AsyncOperations;
-
-namespace Cysharp.Threading.Tasks
-{
-    public static class AddressablesAsyncExtensions
-    {
-#region AsyncOperationHandle
-
-        public static UniTask.Awaiter GetAwaiter(this AsyncOperationHandle handle)
-        {
-            return ToUniTask(handle).GetAwaiter();
-        }
-
-        public static UniTask WithCancellation(this AsyncOperationHandle handle, CancellationToken cancellationToken, bool cancelImmediately = false, bool autoReleaseWhenCanceled = false)
-        {
-            return ToUniTask(handle, cancellationToken: cancellationToken, cancelImmediately: cancelImmediately, autoReleaseWhenCanceled: autoReleaseWhenCanceled);
-        }
-
-        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);
-
-            if (!handle.IsValid())
-            {
-                // autoReleaseHandle:true handle is invalid(immediately internal handle == null) so return completed.
-                return UniTask.CompletedTask;
-            }
-
-            if (handle.IsDone)
-            {
-                if (handle.Status == AsyncOperationStatus.Failed)
-                {
-                    return UniTask.FromException(handle.OperationException);
-                }
-                return UniTask.CompletedTask;
-            }
-
-            return new UniTask(AsyncOperationHandleConfiguredSource.Create(handle, timing, progress, cancellationToken, cancelImmediately, autoReleaseWhenCanceled, out var token), token);
-        }
-
-        public struct AsyncOperationHandleAwaiter : ICriticalNotifyCompletion
-        {
-            AsyncOperationHandle handle;
-            Action<AsyncOperationHandle> continuationAction;
-
-            public AsyncOperationHandleAwaiter(AsyncOperationHandle handle)
-            {
-                this.handle = handle;
-                this.continuationAction = null;
-            }
-
-            public bool IsCompleted => handle.IsDone;
-
-            public void GetResult()
-            {
-                if (continuationAction != null)
-                {
-                    handle.Completed -= continuationAction;
-                    continuationAction = null;
-                }
-
-                if (handle.Status == AsyncOperationStatus.Failed)
-                {
-                    var e = handle.OperationException;
-                    handle = default;
-                    ExceptionDispatchInfo.Capture(e).Throw();
-                }
-
-                var result = handle.Result;
-                handle = default;
-            }
-
-            public void OnCompleted(Action continuation)
-            {
-                UnsafeOnCompleted(continuation);
-            }
-
-            public void UnsafeOnCompleted(Action continuation)
-            {
-                Error.ThrowWhenContinuationIsAlreadyRegistered(continuationAction);
-                continuationAction = PooledDelegate<AsyncOperationHandle>.Create(continuation);
-                handle.Completed += continuationAction;
-            }
-        }
-
-        sealed class AsyncOperationHandleConfiguredSource : IUniTaskSource, IPlayerLoopItem, ITaskPoolNode<AsyncOperationHandleConfiguredSource>
-        {
-            static TaskPool<AsyncOperationHandleConfiguredSource> pool;
-            AsyncOperationHandleConfiguredSource nextNode;
-            public ref AsyncOperationHandleConfiguredSource NextNode => ref nextNode;
-
-            static AsyncOperationHandleConfiguredSource()
-            {
-                TaskPool.RegisterSizeGetter(typeof(AsyncOperationHandleConfiguredSource), () => pool.Size);
-            }
-
-            readonly Action<AsyncOperationHandle> completedCallback;
-            AsyncOperationHandle handle;
-            CancellationToken cancellationToken;
-            CancellationTokenRegistration cancellationTokenRegistration;
-            IProgress<float> progress;
-            bool autoReleaseWhenCanceled;
-            bool cancelImmediately;
-            bool completed;
-
-            UniTaskCompletionSourceCore<AsyncUnit> core;
-
-            AsyncOperationHandleConfiguredSource()
-            {
-                completedCallback = HandleCompleted;
-            }
-
-            public static IUniTaskSource Create(AsyncOperationHandle handle, PlayerLoopTiming timing, IProgress<float> progress, CancellationToken cancellationToken, bool cancelImmediately, bool autoReleaseWhenCanceled, out short token)
-            {
-                if (cancellationToken.IsCancellationRequested)
-                {
-                    return AutoResetUniTaskCompletionSource.CreateFromCanceled(cancellationToken, out token);
-                }
-
-                if (!pool.TryPop(out var result))
-                {
-                    result = new AsyncOperationHandleConfiguredSource();
-                }
-
-                result.handle = handle;
-                result.progress = progress;
-                result.cancellationToken = cancellationToken;
-                result.cancelImmediately = cancelImmediately;
-                result.autoReleaseWhenCanceled = autoReleaseWhenCanceled;
-                result.completed = false;
-                
-                if (cancelImmediately && cancellationToken.CanBeCanceled)
-                {
-                    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);
-                }
-
-                TaskTracker.TrackActiveTask(result, 3);
-
-                PlayerLoopHelper.AddAction(timing, result);
-
-                handle.Completed += result.completedCallback;
-
-                token = result.core.Version;
-                return result;
-            }
-
-            void HandleCompleted(AsyncOperationHandle _)
-            {
-                if (handle.IsValid())
-                {
-                    handle.Completed -= completedCallback;
-                }
-
-                if (completed)
-                {
-                    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
-                {
-                    core.TrySetResult(AsyncUnit.Default);
-                }
-            }
-
-            public void GetResult(short token)
-            {
-                try
-                {
-                    core.GetResult(token);
-                }
-                finally
-                {
-                    if (!(cancelImmediately && cancellationToken.IsCancellationRequested))
-                    {
-                        TryReturn();
-                    }
-                    else
-                    {
-                        TaskTracker.RemoveTracking(this);
-                    }
-                }
-            }
-
-            public UniTaskStatus GetStatus(short token)
-            {
-                return core.GetStatus(token);
-            }
-
-            public UniTaskStatus UnsafeGetStatus()
-            {
-                return core.UnsafeGetStatus();
-            }
-
-            public void OnCompleted(Action<object> continuation, object state, short token)
-            {
-                core.OnCompleted(continuation, state, token);
-            }
-
-            public bool MoveNext()
-            {
-                if (completed)
-                {
-                    return false;
-                }
-
-                if (cancellationToken.IsCancellationRequested)
-                {
-                    completed = true;
-                    if (autoReleaseWhenCanceled && handle.IsValid())
-                    {
-                        Addressables.Release(handle);
-                    }
-                    core.TrySetCanceled(cancellationToken);
-                    return false;
-                }
-
-                if (progress != null && handle.IsValid())
-                {
-                    progress.Report(handle.GetDownloadStatus().Percent);
-                }
-
-                return true;
-            }
-
-            bool TryReturn()
-            {
-                TaskTracker.RemoveTracking(this);
-                core.Reset();
-                handle = default;
-                progress = default;
-                cancellationToken = default;
-                cancellationTokenRegistration.Dispose();
-                return pool.TryPush(this);
-            }
-        }
-
-#endregion
-
-#region AsyncOperationHandle_T
-
-        public static UniTask<T>.Awaiter GetAwaiter<T>(this AsyncOperationHandle<T> handle)
-        {
-            return ToUniTask(handle).GetAwaiter();
-        }
-
-        public static UniTask<T> WithCancellation<T>(this AsyncOperationHandle<T> handle, CancellationToken cancellationToken, bool cancelImmediately = false, bool autoReleaseWhenCanceled = false)
-        {
-            return ToUniTask(handle, cancellationToken: cancellationToken, cancelImmediately: cancelImmediately, autoReleaseWhenCanceled: autoReleaseWhenCanceled);
-        }
-
-        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);
-
-            if (!handle.IsValid())
-            {
-                throw new Exception("Attempting to use an invalid operation handle");
-            }
-
-            if (handle.IsDone)
-            {
-                if (handle.Status == AsyncOperationStatus.Failed)
-                {
-                    return UniTask.FromException<T>(handle.OperationException);
-                }
-                return UniTask.FromResult(handle.Result);
-            }
-
-            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>>
-        {
-            static TaskPool<AsyncOperationHandleConfiguredSource<T>> pool;
-            AsyncOperationHandleConfiguredSource<T> nextNode;
-            public ref AsyncOperationHandleConfiguredSource<T> NextNode => ref nextNode;
-
-            static AsyncOperationHandleConfiguredSource()
-            {
-                TaskPool.RegisterSizeGetter(typeof(AsyncOperationHandleConfiguredSource<T>), () => pool.Size);
-            }
-
-            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()
-            {
-                completedCallback = HandleCompleted;
-            }
-
-            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)
-                {
-                    return AutoResetUniTaskCompletionSource<T>.CreateFromCanceled(cancellationToken, out token);
-                }
-
-                if (!pool.TryPop(out var result))
-                {
-                    result = new AsyncOperationHandleConfiguredSource<T>();
-                }
-
-                result.handle = handle;
-                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);
-                }
-
-                TaskTracker.TrackActiveTask(result, 3);
-
-                PlayerLoopHelper.AddAction(timing, result);
-
-                handle.Completed += result.completedCallback;
-
-                token = result.core.Version;
-                return result;
-            }
-
-            void HandleCompleted(AsyncOperationHandle<T> argHandle)
-            {
-                if (handle.IsValid())
-                {
-                    handle.Completed -= completedCallback;
-                }
-
-                if (completed)
-                {
-                    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
-                {
-                    core.TrySetResult(argHandle.Result);
-                }
-            }
-
-            public T GetResult(short token)
-            {
-                try
-                {
-                    return core.GetResult(token);
-                }
-                finally
-                {
-                    if (!(cancelImmediately && cancellationToken.IsCancellationRequested))
-                    {
-                        TryReturn();
-                    }
-                    else
-                    {
-                        TaskTracker.RemoveTracking(this);
-                    }
-                }
-            }
-
-            void IUniTaskSource.GetResult(short token)
-            {
-                GetResult(token);
-            }
-
-            public UniTaskStatus GetStatus(short token)
-            {
-                return core.GetStatus(token);
-            }
-
-            public UniTaskStatus UnsafeGetStatus()
-            {
-                return core.UnsafeGetStatus();
-            }
-
-            public void OnCompleted(Action<object> continuation, object state, short token)
-            {
-                core.OnCompleted(continuation, state, token);
-            }
-
-            public bool MoveNext()
-            {
-                if (completed)
-                {
-                    return false;
-                }
-
-                if (cancellationToken.IsCancellationRequested)
-                {
-                    completed = true;
-                    if (autoReleaseWhenCanceled && handle.IsValid())
-                    {
-                        Addressables.Release(handle);
-                    }
-                    core.TrySetCanceled(cancellationToken);
-                    return false;
-                }
-
-                if (progress != null && handle.IsValid())
-                {
-                    progress.Report(handle.GetDownloadStatus().Percent);
-                }
-
-                return true;
-            }
-
-            bool TryReturn()
-            {
-                TaskTracker.RemoveTracking(this);
-                core.Reset();
-                handle = default;
-                progress = default;
-                cancellationToken = default;
-                cancellationTokenRegistration.Dispose();
-                return pool.TryPush(this);
-            }
-        }
-
-#endregion
-    }
-}
-
-#endif
--- a/src/UniTask/Assets/Plugins/UniTask/Runtime/External/Addressables/UniTask.Addressables.asmdef
+++ b/src/UniTask/Assets/Plugins/UniTask/Runtime/External/Addressables/UniTask.Addressables.asmdef
@ -1,28 +0,0 @@
-{
-    "name": "UniTask.Addressables",
-    "references": [
-        "UniTask",
-        "Unity.ResourceManager",
-        "Unity.Addressables"
-    ],
-    "includePlatforms": [],
-    "excludePlatforms": [],
-    "allowUnsafeCode": false,
-    "overrideReferences": false,
-    "precompiledReferences": [],
-    "autoReferenced": true,
-    "defineConstraints": [],
-    "versionDefines": [
-        {
-            "name": "com.unity.addressables",
-            "expression": "",
-            "define": "UNITASK_ADDRESSABLE_SUPPORT"
-        },
-	{
-            "name": "com.unity.addressables.cn",
-            "expression": "",
-            "define": "UNITASK_ADDRESSABLE_SUPPORT"
-        }
-    ],
-    "noEngineReferences": false
-}
--- a/src/UniTask/Assets/Plugins/UniTask/Runtime/External/Addressables/UniTask.Addressables.asmdef.meta
+++ b/src/UniTask/Assets/Plugins/UniTask/Runtime/External/Addressables/UniTask.Addressables.asmdef.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 593a5b492d29ac6448b1ebf7f035ef33
-AssemblyDefinitionImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/src/UniTask/Assets/Plugins/UniTask/Runtime/External/DOTween.meta
+++ b/src/UniTask/Assets/Plugins/UniTask/Runtime/External/DOTween.meta
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 25cb2f742bfeb1d48a4e65d3140b955d
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/src/UniTask/Assets/Plugins/UniTask/Runtime/External/DOTween/DOTweenAsyncExtensions.cs
+++ b/src/UniTask/Assets/Plugins/UniTask/Runtime/External/DOTween/DOTweenAsyncExtensions.cs
@ -1,436 +0,0 @@
-// asmdef Version Defines, enabled when com.demigiant.dotween is imported.
-
-#if UNITASK_DOTWEEN_SUPPORT
-
-using Cysharp.Threading.Tasks.Internal;
-using DG.Tweening;
-using System;
-using System.Collections.Concurrent;
-using System.Runtime.CompilerServices;
-using System.Threading;
-
-namespace Cysharp.Threading.Tasks
-{
-    public enum TweenCancelBehaviour
-    {
-        Kill,
-        KillWithCompleteCallback,
-        Complete,
-        CompleteWithSequenceCallback,
-        CancelAwait,
-
-        // AndCancelAwait
-        KillAndCancelAwait,
-        KillWithCompleteCallbackAndCancelAwait,
-        CompleteAndCancelAwait,
-        CompleteWithSequenceCallbackAndCancelAwait
-    }
-
-    public static class DOTweenAsyncExtensions
-    {
-        enum CallbackType
-        {
-            Kill,
-            Complete,
-            Pause,
-            Play,
-            Rewind,
-            StepComplete
-        }
-
-        public static TweenAwaiter GetAwaiter(this Tween tween)
-        {
-            return new TweenAwaiter(tween);
-        }
-
-        public static UniTask WithCancellation(this Tween tween, CancellationToken cancellationToken)
-        {
-            Error.ThrowArgumentNullException(tween, nameof(tween));
-
-            if (!tween.IsActive()) return UniTask.CompletedTask;
-            return new UniTask(TweenConfiguredSource.Create(tween, TweenCancelBehaviour.Kill, cancellationToken, CallbackType.Kill, out var token), token);
-        }
-
-        public static UniTask ToUniTask(this Tween tween, TweenCancelBehaviour tweenCancelBehaviour = TweenCancelBehaviour.Kill, CancellationToken cancellationToken = default)
-        {
-            Error.ThrowArgumentNullException(tween, nameof(tween));
-
-            if (!tween.IsActive()) return UniTask.CompletedTask;
-            return new UniTask(TweenConfiguredSource.Create(tween, tweenCancelBehaviour, cancellationToken, CallbackType.Kill, out var token), token);
-        }
-
-        public static UniTask AwaitForComplete(this Tween tween, TweenCancelBehaviour tweenCancelBehaviour = TweenCancelBehaviour.Kill, CancellationToken cancellationToken = default)
-        {
-            Error.ThrowArgumentNullException(tween, nameof(tween));
-
-            if (!tween.IsActive()) return UniTask.CompletedTask;
-            return new UniTask(TweenConfiguredSource.Create(tween, tweenCancelBehaviour, cancellationToken, CallbackType.Complete, out var token), token);
-        }
-
-        public static UniTask AwaitForPause(this Tween tween, TweenCancelBehaviour tweenCancelBehaviour = TweenCancelBehaviour.Kill, CancellationToken cancellationToken = default)
-        {
-            Error.ThrowArgumentNullException(tween, nameof(tween));
-
-            if (!tween.IsActive()) return UniTask.CompletedTask;
-            return new UniTask(TweenConfiguredSource.Create(tween, tweenCancelBehaviour, cancellationToken, CallbackType.Pause, out var token), token);
-        }
-
-        public static UniTask AwaitForPlay(this Tween tween, TweenCancelBehaviour tweenCancelBehaviour = TweenCancelBehaviour.Kill, CancellationToken cancellationToken = default)
-        {
-            Error.ThrowArgumentNullException(tween, nameof(tween));
-
-            if (!tween.IsActive()) return UniTask.CompletedTask;
-            return new UniTask(TweenConfiguredSource.Create(tween, tweenCancelBehaviour, cancellationToken, CallbackType.Play, out var token), token);
-        }
-
-        public static UniTask AwaitForRewind(this Tween tween, TweenCancelBehaviour tweenCancelBehaviour = TweenCancelBehaviour.Kill, CancellationToken cancellationToken = default)
-        {
-            Error.ThrowArgumentNullException(tween, nameof(tween));
-
-            if (!tween.IsActive()) return UniTask.CompletedTask;
-            return new UniTask(TweenConfiguredSource.Create(tween, tweenCancelBehaviour, cancellationToken, CallbackType.Rewind, out var token), token);
-        }
-
-        public static UniTask AwaitForStepComplete(this Tween tween, TweenCancelBehaviour tweenCancelBehaviour = TweenCancelBehaviour.Kill, CancellationToken cancellationToken = default)
-        {
-            Error.ThrowArgumentNullException(tween, nameof(tween));
-
-            if (!tween.IsActive()) return UniTask.CompletedTask;
-            return new UniTask(TweenConfiguredSource.Create(tween, tweenCancelBehaviour, cancellationToken, CallbackType.StepComplete, out var token), token);
-        }
-
-        public struct TweenAwaiter : ICriticalNotifyCompletion
-        {
-            readonly Tween tween;
-
-            // killed(non active) as completed.
-            public bool IsCompleted => !tween.IsActive();
-
-            public TweenAwaiter(Tween tween)
-            {
-                this.tween = tween;
-            }
-
-            public TweenAwaiter GetAwaiter()
-            {
-                return this;
-            }
-
-            public void GetResult()
-            {
-            }
-
-            public void OnCompleted(System.Action continuation)
-            {
-                UnsafeOnCompleted(continuation);
-            }
-
-            public void UnsafeOnCompleted(System.Action continuation)
-            {
-                // onKill is called after OnCompleted, both Complete(false/true) and Kill(false/true).
-                tween.onKill = PooledTweenCallback.Create(continuation);
-            }
-        }
-
-        sealed class TweenConfiguredSource : IUniTaskSource, ITaskPoolNode<TweenConfiguredSource>
-        {
-            static TaskPool<TweenConfiguredSource> pool;
-            TweenConfiguredSource nextNode;
-            public ref TweenConfiguredSource NextNode => ref nextNode;
-
-            static TweenConfiguredSource()
-            {
-                TaskPool.RegisterSizeGetter(typeof(TweenConfiguredSource), () => pool.Size);
-            }
-
-            readonly TweenCallback onCompleteCallbackDelegate;
-
-            Tween tween;
-            TweenCancelBehaviour cancelBehaviour;
-            CancellationToken cancellationToken;
-            CancellationTokenRegistration cancellationRegistration;
-            CallbackType callbackType;
-            bool canceled;
-
-            TweenCallback originalCompleteAction;
-            UniTaskCompletionSourceCore<AsyncUnit> core;
-
-            TweenConfiguredSource()
-            {
-                onCompleteCallbackDelegate = OnCompleteCallbackDelegate;
-            }
-
-            public static IUniTaskSource Create(Tween tween, TweenCancelBehaviour cancelBehaviour, CancellationToken cancellationToken, CallbackType callbackType, out short token)
-            {
-                if (cancellationToken.IsCancellationRequested)
-                {
-                    DoCancelBeforeCreate(tween, cancelBehaviour);
-                    return AutoResetUniTaskCompletionSource.CreateFromCanceled(cancellationToken, out token);
-                }
-
-                if (!pool.TryPop(out var result))
-                {
-                    result = new TweenConfiguredSource();
-                }
-
-                result.tween = tween;
-                result.cancelBehaviour = cancelBehaviour;
-                result.cancellationToken = cancellationToken;
-                result.callbackType = callbackType;
-                result.canceled = false;
-
-                switch (callbackType)
-                {
-                    case CallbackType.Kill:
-                        result.originalCompleteAction = tween.onKill;
-                        tween.onKill = result.onCompleteCallbackDelegate;
-                        break;
-                    case CallbackType.Complete:
-                        result.originalCompleteAction = tween.onComplete;
-                        tween.onComplete = result.onCompleteCallbackDelegate;
-                        break;
-                    case CallbackType.Pause:
-                        result.originalCompleteAction = tween.onPause;
-                        tween.onPause = result.onCompleteCallbackDelegate;
-                        break;
-                    case CallbackType.Play:
-                        result.originalCompleteAction = tween.onPlay;
-                        tween.onPlay = result.onCompleteCallbackDelegate;
-                        break;
-                    case CallbackType.Rewind:
-                        result.originalCompleteAction = tween.onRewind;
-                        tween.onRewind = result.onCompleteCallbackDelegate;
-                        break;
-                    case CallbackType.StepComplete:
-                        result.originalCompleteAction = tween.onStepComplete;
-                        tween.onStepComplete = result.onCompleteCallbackDelegate;
-                        break;
-                    default:
-                        break;
-                }
-
-                if (result.originalCompleteAction == result.onCompleteCallbackDelegate)
-                {
-                    result.originalCompleteAction = null;
-                }
-
-                if (cancellationToken.CanBeCanceled)
-                {
-                    result.cancellationRegistration = cancellationToken.RegisterWithoutCaptureExecutionContext(x =>
-                    {
-                        var source = (TweenConfiguredSource)x;
-                        switch (source.cancelBehaviour)
-                        {
-                            case TweenCancelBehaviour.Kill:
-                            default:
-                                source.tween.Kill(false);
-                                break;
-                            case TweenCancelBehaviour.KillAndCancelAwait:
-                                source.canceled = true;
-                                source.tween.Kill(false);
-                                break;
-                            case TweenCancelBehaviour.KillWithCompleteCallback:
-                                source.tween.Kill(true);
-                                break;
-                            case TweenCancelBehaviour.KillWithCompleteCallbackAndCancelAwait:
-                                source.canceled = true;
-                                source.tween.Kill(true);
-                                break;
-                            case TweenCancelBehaviour.Complete:
-                                source.tween.Complete(false);
-                                break;
-                            case TweenCancelBehaviour.CompleteAndCancelAwait:
-                                source.canceled = true;
-                                source.tween.Complete(false);
-                                break;
-                            case TweenCancelBehaviour.CompleteWithSequenceCallback:
-                                source.tween.Complete(true);
-                                break;
-                            case TweenCancelBehaviour.CompleteWithSequenceCallbackAndCancelAwait:
-                                source.canceled = true;
-                                source.tween.Complete(true);
-                                break;
-                            case TweenCancelBehaviour.CancelAwait:
-                                source.RestoreOriginalCallback();
-                                source.core.TrySetCanceled(source.cancellationToken);
-                                break;
-                        }
-                    }, result);
-                }
-
-                TaskTracker.TrackActiveTask(result, 3);
-
-                token = result.core.Version;
-                return result;
-            }
-
-            void OnCompleteCallbackDelegate()
-            {
-                if (cancellationToken.IsCancellationRequested)
-                {
-                    if (this.cancelBehaviour == TweenCancelBehaviour.KillAndCancelAwait
-                        || this.cancelBehaviour == TweenCancelBehaviour.KillWithCompleteCallbackAndCancelAwait
-                        || this.cancelBehaviour == TweenCancelBehaviour.CompleteAndCancelAwait
-                        || this.cancelBehaviour == TweenCancelBehaviour.CompleteWithSequenceCallbackAndCancelAwait
-                        || this.cancelBehaviour == TweenCancelBehaviour.CancelAwait)
-                    {
-                        canceled = true;
-                    }
-                }
-                if (canceled)
-                {
-                    core.TrySetCanceled(cancellationToken);
-                }
-                else
-                {
-                    originalCompleteAction?.Invoke();
-                    core.TrySetResult(AsyncUnit.Default);
-                }
-            }
-
-            static void DoCancelBeforeCreate(Tween tween, TweenCancelBehaviour tweenCancelBehaviour)
-            {
-
-                switch (tweenCancelBehaviour)
-                {
-                    case TweenCancelBehaviour.Kill:
-                    default:
-                        tween.Kill(false);
-                        break;
-                    case TweenCancelBehaviour.KillAndCancelAwait:
-                        tween.Kill(false);
-                        break;
-                    case TweenCancelBehaviour.KillWithCompleteCallback:
-                        tween.Kill(true);
-                        break;
-                    case TweenCancelBehaviour.KillWithCompleteCallbackAndCancelAwait:
-                        tween.Kill(true);
-                        break;
-                    case TweenCancelBehaviour.Complete:
-                        tween.Complete(false);
-                        break;
-                    case TweenCancelBehaviour.CompleteAndCancelAwait:
-                        tween.Complete(false);
-                        break;
-                    case TweenCancelBehaviour.CompleteWithSequenceCallback:
-                        tween.Complete(true);
-                        break;
-                    case TweenCancelBehaviour.CompleteWithSequenceCallbackAndCancelAwait:
-                        tween.Complete(true);
-                        break;
-                    case TweenCancelBehaviour.CancelAwait:
-                        break;
-                }
-            }
-
-            public void GetResult(short token)
-            {
-                try
-                {
-                    core.GetResult(token);
-                }
-                finally
-                {
-                    TryReturn();
-                }
-            }
-
-            public UniTaskStatus GetStatus(short token)
-            {
-                return core.GetStatus(token);
-            }
-
-            public UniTaskStatus UnsafeGetStatus()
-            {
-                return core.UnsafeGetStatus();
-            }
-
-            public void OnCompleted(Action<object> continuation, object state, short token)
-            {
-                core.OnCompleted(continuation, state, token);
-            }
-
-            bool TryReturn()
-            {
-                TaskTracker.RemoveTracking(this);
-                core.Reset();
-                cancellationRegistration.Dispose();
-
-                RestoreOriginalCallback();
-
-                tween = default;
-                cancellationToken = default;
-                originalCompleteAction = default;
-                return pool.TryPush(this);
-            }
-
-            void RestoreOriginalCallback()
-            {
-                switch (callbackType)
-                {
-                    case CallbackType.Kill:
-                        tween.onKill = originalCompleteAction;
-                        break;
-                    case CallbackType.Complete:
-                        tween.onComplete = originalCompleteAction;
-                        break;
-                    case CallbackType.Pause:
-                        tween.onPause = originalCompleteAction;
-                        break;
-                    case CallbackType.Play:
-                        tween.onPlay = originalCompleteAction;
-                        break;
-                    case CallbackType.Rewind:
-                        tween.onRewind = originalCompleteAction;
-                        break;
-                    case CallbackType.StepComplete:
-                        tween.onStepComplete = originalCompleteAction;
-                        break;
-                    default:
-                        break;
-                }
-            }
-        }
-    }
-
-    sealed class PooledTweenCallback
-    {
-        static readonly ConcurrentQueue<PooledTweenCallback> pool = new ConcurrentQueue<PooledTweenCallback>();
-
-        readonly TweenCallback runDelegate;
-
-        Action continuation;
-
-
-        PooledTweenCallback()
-        {
-            runDelegate = Run;
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static TweenCallback Create(Action continuation)
-        {
-            if (!pool.TryDequeue(out var item))
-            {
-                item = new PooledTweenCallback();
-            }
-
-            item.continuation = continuation;
-            return item.runDelegate;
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        void Run()
-        {
-            var call = continuation;
-            continuation = null;
-            if (call != null)
-            {
-                pool.Enqueue(this);
-                call.Invoke();
-            }
-        }
-    }
-}
-
-#endif
--- a/src/UniTask/Assets/Plugins/UniTask/Runtime/External/DOTween/UniTask.DOTween.asmdef
+++ b/src/UniTask/Assets/Plugins/UniTask/Runtime/External/DOTween/UniTask.DOTween.asmdef
@ -1,22 +0,0 @@
-{
-    "name": "UniTask.DOTween",
-    "references": [
-        "UniTask",
-        "DOTween.Modules"
-    ],
-    "includePlatforms": [],
-    "excludePlatforms": [],
-    "allowUnsafeCode": false,
-    "overrideReferences": false,
-    "precompiledReferences": [],
-    "autoReferenced": true,
-    "defineConstraints": [],
-    "versionDefines": [
-        {
-            "name": "com.demigiant.dotween",
-            "expression": "",
-            "define": "UNITASK_DOTWEEN_SUPPORT"
-        }
-    ],
-    "noEngineReferences": false
-}
--- a/src/UniTask/Assets/Plugins/UniTask/Runtime/External/DOTween/UniTask.DOTween.asmdef.meta
+++ b/src/UniTask/Assets/Plugins/UniTask/Runtime/External/DOTween/UniTask.DOTween.asmdef.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 029c1c1b674aaae47a6841a0b89ad80e
-AssemblyDefinitionImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/src/UniTask/Assets/Plugins/UniTask/Runtime/External/DoTweenAsyncExtensions.cs
+++ b/src/UniTask/Assets/Plugins/UniTask/Runtime/External/DoTweenAsyncExtensions.cs
@ -0,0 +1,239 @@
+// asmdef Version Defines, enabled when com.demigiant.dotween is imported.
+
+#if UNITASK_DOTWEEN_SUPPORT
+
+using Cysharp.Threading.Tasks.Internal;
+using DG.Tweening;
+using System;
+using System.Runtime.CompilerServices;
+using System.Threading;
+
+namespace Cysharp.Threading.Tasks
+{
+    // The idea of TweenCancelBehaviour is borrowed from https://www.shibuya24.info/entry/dotween_async_await
+    public enum TweenCancelBehaviour
+    {
+        Kill,
+        KillWithCompleteCallback,
+        Complete,
+        CompleteWithSeqeunceCallback,
+        CancelAwait,
+
+        // AndCancelAwait
+        KillAndCancelAwait,
+        KillWithCompleteCallbackAndCancelAwait,
+        CompleteAndCancelAwait,
+        CompleteWithSeqeunceCallbackAndCancelAwait
+    }
+
+    public static class DOTweenAsyncExtensions
+    {
+        public static TweenAwaiter GetAwaiter(this Tween tween)
+        {
+            return new TweenAwaiter(tween);
+        }
+
+        public static UniTask WithCancellation(this Tween tween, CancellationToken cancellationToken)
+        {
+            Error.ThrowArgumentNullException(tween, nameof(tween));
+
+            if (!tween.IsActive()) return UniTask.CompletedTask;
+            return new UniTask(TweenConfiguredSource.Create(tween, TweenCancelBehaviour.Kill, cancellationToken, out var token), token);
+        }
+
+        public static UniTask ToUniTask(this Tween tween, TweenCancelBehaviour tweenCancelBehaviour = TweenCancelBehaviour.Kill, CancellationToken cancellationToken = default)
+        {
+            Error.ThrowArgumentNullException(tween, nameof(tween));
+
+            if (!tween.IsActive()) return UniTask.CompletedTask;
+            return new UniTask(TweenConfiguredSource.Create(tween, tweenCancelBehaviour, cancellationToken, out var token), token);
+        }
+
+        public struct TweenAwaiter : ICriticalNotifyCompletion
+        {
+            readonly Tween tween;
+
+            // killed(non active) as completed.
+            public bool IsCompleted => !tween.IsActive();
+
+            public TweenAwaiter(Tween tween)
+            {
+                this.tween = tween;
+            }
+
+            public TweenAwaiter GetAwaiter()
+            {
+                return this;
+            }
+
+            public void GetResult()
+            {
+            }
+
+            public void OnCompleted(System.Action continuation)
+            {
+                UnsafeOnCompleted(continuation);
+            }
+
+            public void UnsafeOnCompleted(System.Action continuation)
+            {
+                // convert Action -> TweenCallback allocation.
+                // onKill is called after OnCompleted, both Complete(false/true) and Kill(false/true).
+                tween.onKill = new TweenCallback(continuation);
+            }
+        }
+
+        sealed class TweenConfiguredSource : IUniTaskSource, IPromisePoolItem
+        {
+            static readonly PromisePool<TweenConfiguredSource> pool = new PromisePool<TweenConfiguredSource>();
+            static readonly Action<object> CancellationCallbackDelegate = CancellationCallback;
+            static readonly TweenCallback EmptyTweenCallback = () => { };
+
+            Tween tween;
+            TweenCancelBehaviour cancelBehaviour;
+            CancellationToken cancellationToken;
+            bool canceled;
+
+            CancellationTokenRegistration cancellationTokenRegistration;
+            UniTaskCompletionSourceCore<AsyncUnit> core;
+
+            TweenConfiguredSource()
+            {
+
+            }
+
+            public static IUniTaskSource Create(Tween tween, TweenCancelBehaviour cancelBehaviour, CancellationToken cancellationToken, out short token)
+            {
+                if (cancellationToken.IsCancellationRequested)
+                {
+                    return AutoResetUniTaskCompletionSource.CreateFromCanceled(cancellationToken, out token);
+                }
+
+                var result = pool.TryRent() ?? new TweenConfiguredSource();
+
+                result.tween = tween;
+                result.cancelBehaviour = cancelBehaviour;
+                result.cancellationToken = cancellationToken;
+
+                TaskTracker.TrackActiveTask(result, 3);
+
+                result.RegisterEvent();
+
+                token = result.core.Version;
+                return result;
+            }
+
+            void RegisterEvent()
+            {
+                if (cancellationToken.CanBeCanceled)
+                {
+                    cancellationTokenRegistration = cancellationToken.RegisterWithoutCaptureExecutionContext(CancellationCallbackDelegate, this);
+                }
+
+                // allocate delegate.
+                tween.OnKill(new TweenCallback(OnKill));
+            }
+
+            void OnKill()
+            {
+                cancellationTokenRegistration.Dispose();
+                if (canceled)
+                {
+                    core.TrySetCanceled(cancellationToken);
+                }
+                else
+                {
+                    core.TrySetResult(AsyncUnit.Default);
+                }
+            }
+
+            static void CancellationCallback(object state)
+            {
+                var self = (TweenConfiguredSource)state;
+
+                switch (self.cancelBehaviour)
+                {
+                    case TweenCancelBehaviour.Kill:
+                    default:
+                        self.tween.Kill(false);
+                        break;
+                    case TweenCancelBehaviour.KillAndCancelAwait:
+                        self.canceled = true;
+                        self.tween.Kill(false);
+                        break;
+                    case TweenCancelBehaviour.KillWithCompleteCallback:
+                        self.tween.Kill(true);
+                        break;
+                    case TweenCancelBehaviour.KillWithCompleteCallbackAndCancelAwait:
+                        self.canceled = true;
+                        self.tween.Kill(true);
+                        break;
+                    case TweenCancelBehaviour.Complete:
+                        self.tween.Complete(false);
+                        break;
+                    case TweenCancelBehaviour.CompleteAndCancelAwait:
+                        self.canceled = true;
+                        self.tween.Complete(false);
+                        break;
+                    case TweenCancelBehaviour.CompleteWithSeqeunceCallback:
+                        self.tween.Complete(true);
+                        break;
+                    case TweenCancelBehaviour.CompleteWithSeqeunceCallbackAndCancelAwait:
+                        self.canceled = true;
+                        self.tween.Complete(true);
+                        break;
+                    case TweenCancelBehaviour.CancelAwait:
+                        self.tween.onKill = EmptyTweenCallback; // replace to empty(avoid callback after Caceled(instance is returned to pool.)
+                        self.core.TrySetCanceled(self.cancellationToken);
+                        break;
+                }
+            }
+
+            public void GetResult(short token)
+            {
+                try
+                {
+                    TaskTracker.RemoveTracking(this);
+                    core.GetResult(token);
+                }
+                finally
+                {
+                    pool.TryReturn(this);
+                }
+            }
+
+
+            public UniTaskStatus GetStatus(short token)
+            {
+                return core.GetStatus(token);
+            }
+
+            public UniTaskStatus UnsafeGetStatus()
+            {
+                return core.UnsafeGetStatus();
+            }
+
+            public void OnCompleted(Action<object> continuation, object state, short token)
+            {
+                core.OnCompleted(continuation, state, token);
+            }
+
+            public void Reset()
+            {
+                core.Reset();
+                tween = default;
+                cancellationToken = default;
+            }
+
+            ~TweenConfiguredSource()
+            {
+                if (pool.TryReturn(this))
+                {
+                    GC.ReRegisterForFinalize(this);
+                }
+            }
+        }
+    }
+}
+
+#endif
--- a/src/UniTask/Assets/Plugins/UniTask/Runtime/External/DOTween/DOTweenAsyncExtensions.cs.meta
+++ b/src/UniTask/Assets/Plugins/UniTask/Runtime/External/DOTween/DOTweenAsyncExtensions.cs.meta
--- a/src/UniTask/Assets/Plugins/UniTask/Runtime/External/TextMeshPro/TextMeshProAsyncExtensions.InputField.cs
+++ b/src/UniTask/Assets/Plugins/UniTask/Runtime/External/TextMeshPro/TextMeshProAsyncExtensions.InputField.cs
@ -1,224 +0,0 @@
-#if UNITASK_TEXTMESHPRO_SUPPORT
-
-using System;
-using System.Threading;
-using TMPro;
-
-namespace Cysharp.Threading.Tasks
-{
-    public static partial class TextMeshProAsyncExtensions
-    {
-        public static IAsyncValueChangedEventHandler<string> GetAsyncValueChangedEventHandler(this TMP_InputField inputField)
-        {
-            return new AsyncUnityEventHandler<string>(inputField.onValueChanged, inputField.GetCancellationTokenOnDestroy(), false);
-        }
-
-        public static IAsyncValueChangedEventHandler<string> GetAsyncValueChangedEventHandler(this TMP_InputField inputField, CancellationToken cancellationToken)
-        {
-            return new AsyncUnityEventHandler<string>(inputField.onValueChanged, cancellationToken, false);
-        }
-
-        public static UniTask<string> OnValueChangedAsync(this TMP_InputField inputField)
-        {
-            return new AsyncUnityEventHandler<string>(inputField.onValueChanged, inputField.GetCancellationTokenOnDestroy(), true).OnInvokeAsync();
-        }
-
-        public static UniTask<string> OnValueChangedAsync(this TMP_InputField inputField, CancellationToken cancellationToken)
-        {
-            return new AsyncUnityEventHandler<string>(inputField.onValueChanged, cancellationToken, true).OnInvokeAsync();
-        }
-
-        public static IUniTaskAsyncEnumerable<string> OnValueChangedAsAsyncEnumerable(this TMP_InputField inputField)
-        {
-            return new UnityEventHandlerAsyncEnumerable<string>(inputField.onValueChanged, inputField.GetCancellationTokenOnDestroy());
-        }
-
-        public static IUniTaskAsyncEnumerable<string> OnValueChangedAsAsyncEnumerable(this TMP_InputField inputField, CancellationToken cancellationToken)
-        {
-            return new UnityEventHandlerAsyncEnumerable<string>(inputField.onValueChanged, cancellationToken);
-        }
-
-        public static IAsyncEndEditEventHandler<string> GetAsyncEndEditEventHandler(this TMP_InputField inputField)
-        {
-            return new AsyncUnityEventHandler<string>(inputField.onEndEdit, inputField.GetCancellationTokenOnDestroy(), false);
-        }
-
-        public static IAsyncEndEditEventHandler<string> GetAsyncEndEditEventHandler(this TMP_InputField inputField, CancellationToken cancellationToken)
-        {
-            return new AsyncUnityEventHandler<string>(inputField.onEndEdit, cancellationToken, false);
-        }
-
-        public static UniTask<string> OnEndEditAsync(this TMP_InputField inputField)
-        {
-            return new AsyncUnityEventHandler<string>(inputField.onEndEdit, inputField.GetCancellationTokenOnDestroy(), true).OnInvokeAsync();
-        }
-
-        public static UniTask<string> OnEndEditAsync(this TMP_InputField inputField, CancellationToken cancellationToken)
-        {
-            return new AsyncUnityEventHandler<string>(inputField.onEndEdit, cancellationToken, true).OnInvokeAsync();
-        }
-
-        public static IUniTaskAsyncEnumerable<string> OnEndEditAsAsyncEnumerable(this TMP_InputField inputField)
-        {
-            return new UnityEventHandlerAsyncEnumerable<string>(inputField.onEndEdit, inputField.GetCancellationTokenOnDestroy());
-        }
-
-        public static IUniTaskAsyncEnumerable<string> OnEndEditAsAsyncEnumerable(this TMP_InputField inputField, CancellationToken cancellationToken)
-        {
-            return new UnityEventHandlerAsyncEnumerable<string>(inputField.onEndEdit, cancellationToken);
-        }
-
-        public static IAsyncEndTextSelectionEventHandler<(string, int, int)> GetAsyncEndTextSelectionEventHandler(this TMP_InputField inputField)
-        {
-            return new AsyncUnityEventHandler<(string, int, int)>(new TextSelectionEventConverter(inputField.onEndTextSelection), inputField.GetCancellationTokenOnDestroy(), false);
-        }
-
-        public static IAsyncEndTextSelectionEventHandler<(string, int, int)> GetAsyncEndTextSelectionEventHandler(this TMP_InputField inputField, CancellationToken cancellationToken)
-        {
-            return new AsyncUnityEventHandler<(string, int, int)>(new TextSelectionEventConverter(inputField.onEndTextSelection), cancellationToken, false);
-        }
-
-        public static UniTask<(string, int, int)> OnEndTextSelectionAsync(this TMP_InputField inputField)
-        {
-            return new AsyncUnityEventHandler<(string, int, int)>(new TextSelectionEventConverter(inputField.onEndTextSelection), inputField.GetCancellationTokenOnDestroy(), true).OnInvokeAsync();
-        }
-
-        public static UniTask<(string, int, int)> OnEndTextSelectionAsync(this TMP_InputField inputField, CancellationToken cancellationToken)
-        {
-            return new AsyncUnityEventHandler<(string, int, int)>(new TextSelectionEventConverter(inputField.onEndTextSelection), cancellationToken, true).OnInvokeAsync();
-        }
-
-        public static IUniTaskAsyncEnumerable<(string, int, int)> OnEndTextSelectionAsAsyncEnumerable(this TMP_InputField inputField)
-        {
-            return new UnityEventHandlerAsyncEnumerable<(string, int, int)>(new TextSelectionEventConverter(inputField.onEndTextSelection), inputField.GetCancellationTokenOnDestroy());
-        }
-
-        public static IUniTaskAsyncEnumerable<(string, int, int)> OnEndTextSelectionAsAsyncEnumerable(this TMP_InputField inputField, CancellationToken cancellationToken)
-        {
-            return new UnityEventHandlerAsyncEnumerable<(string, int, int)>(new TextSelectionEventConverter(inputField.onEndTextSelection), cancellationToken);
-        }
-
-        public static IAsyncTextSelectionEventHandler<(string, int, int)> GetAsyncTextSelectionEventHandler(this TMP_InputField inputField)
-        {
-            return new AsyncUnityEventHandler<(string, int, int)>(new TextSelectionEventConverter(inputField.onTextSelection), inputField.GetCancellationTokenOnDestroy(), false);
-        }
-
-        public static IAsyncTextSelectionEventHandler<(string, int, int)> GetAsyncTextSelectionEventHandler(this TMP_InputField inputField, CancellationToken cancellationToken)
-        {
-            return new AsyncUnityEventHandler<(string, int, int)>(new TextSelectionEventConverter(inputField.onTextSelection), cancellationToken, false);
-        }
-
-        public static UniTask<(string, int, int)> OnTextSelectionAsync(this TMP_InputField inputField)
-        {
-            return new AsyncUnityEventHandler<(string, int, int)>(new TextSelectionEventConverter(inputField.onTextSelection), inputField.GetCancellationTokenOnDestroy(), true).OnInvokeAsync();
-        }
-
-        public static UniTask<(string, int, int)> OnTextSelectionAsync(this TMP_InputField inputField, CancellationToken cancellationToken)
-        {
-            return new AsyncUnityEventHandler<(string, int, int)>(new TextSelectionEventConverter(inputField.onTextSelection), cancellationToken, true).OnInvokeAsync();
-        }
-
-        public static IUniTaskAsyncEnumerable<(string, int, int)> OnTextSelectionAsAsyncEnumerable(this TMP_InputField inputField)
-        {
-            return new UnityEventHandlerAsyncEnumerable<(string, int, int)>(new TextSelectionEventConverter(inputField.onTextSelection), inputField.GetCancellationTokenOnDestroy());
-        }
-
-        public static IUniTaskAsyncEnumerable<(string, int, int)> OnTextSelectionAsAsyncEnumerable(this TMP_InputField inputField, CancellationToken cancellationToken)
-        {
-            return new UnityEventHandlerAsyncEnumerable<(string, int, int)>(new TextSelectionEventConverter(inputField.onTextSelection), cancellationToken);
-        }
-
-        public static IAsyncDeselectEventHandler<string> GetAsyncDeselectEventHandler(this TMP_InputField inputField)
-        {
-            return new AsyncUnityEventHandler<string>(inputField.onDeselect, inputField.GetCancellationTokenOnDestroy(), false);
-        }
-
-        public static IAsyncDeselectEventHandler<string> GetAsyncDeselectEventHandler(this TMP_InputField inputField, CancellationToken cancellationToken)
-        {
-            return new AsyncUnityEventHandler<string>(inputField.onDeselect, cancellationToken, false);
-        }
-
-        public static UniTask<string> OnDeselectAsync(this TMP_InputField inputField)
-        {
-            return new AsyncUnityEventHandler<string>(inputField.onDeselect, inputField.GetCancellationTokenOnDestroy(), true).OnInvokeAsync();
-        }
-
-        public static UniTask<string> OnDeselectAsync(this TMP_InputField inputField, CancellationToken cancellationToken)
-        {
-            return new AsyncUnityEventHandler<string>(inputField.onDeselect, cancellationToken, true).OnInvokeAsync();
-        }
-
-        public static IUniTaskAsyncEnumerable<string> OnDeselectAsAsyncEnumerable(this TMP_InputField inputField)
-        {
-            return new UnityEventHandlerAsyncEnumerable<string>(inputField.onDeselect, inputField.GetCancellationTokenOnDestroy());
-        }
-
-        public static IUniTaskAsyncEnumerable<string> OnDeselectAsAsyncEnumerable(this TMP_InputField inputField, CancellationToken cancellationToken)
-        {
-            return new UnityEventHandlerAsyncEnumerable<string>(inputField.onDeselect, cancellationToken);
-        }
-
-        public static IAsyncSelectEventHandler<string> GetAsyncSelectEventHandler(this TMP_InputField inputField)
-        {
-            return new AsyncUnityEventHandler<string>(inputField.onSelect, inputField.GetCancellationTokenOnDestroy(), false);
-        }
-
-        public static IAsyncSelectEventHandler<string> GetAsyncSelectEventHandler(this TMP_InputField inputField, CancellationToken cancellationToken)
-        {
-            return new AsyncUnityEventHandler<string>(inputField.onSelect, cancellationToken, false);
-        }
-
-        public static UniTask<string> OnSelectAsync(this TMP_InputField inputField)
-        {
-            return new AsyncUnityEventHandler<string>(inputField.onSelect, inputField.GetCancellationTokenOnDestroy(), true).OnInvokeAsync();
-        }
-
-        public static UniTask<string> OnSelectAsync(this TMP_InputField inputField, CancellationToken cancellationToken)
-        {
-            return new AsyncUnityEventHandler<string>(inputField.onSelect, cancellationToken, true).OnInvokeAsync();
-        }
-
-        public static IUniTaskAsyncEnumerable<string> OnSelectAsAsyncEnumerable(this TMP_InputField inputField)
-        {
-            return new UnityEventHandlerAsyncEnumerable<string>(inputField.onSelect, inputField.GetCancellationTokenOnDestroy());
-        }
-
-        public static IUniTaskAsyncEnumerable<string> OnSelectAsAsyncEnumerable(this TMP_InputField inputField, CancellationToken cancellationToken)
-        {
-            return new UnityEventHandlerAsyncEnumerable<string>(inputField.onSelect, cancellationToken);
-        }
-
-        public static IAsyncSubmitEventHandler<string> GetAsyncSubmitEventHandler(this TMP_InputField inputField)
-        {
-            return new AsyncUnityEventHandler<string>(inputField.onSubmit, inputField.GetCancellationTokenOnDestroy(), false);
-        }
-
-        public static IAsyncSubmitEventHandler<string> GetAsyncSubmitEventHandler(this TMP_InputField inputField, CancellationToken cancellationToken)
-        {
-            return new AsyncUnityEventHandler<string>(inputField.onSubmit, cancellationToken, false);
-        }
-
-        public static UniTask<string> OnSubmitAsync(this TMP_InputField inputField)
-        {
-            return new AsyncUnityEventHandler<string>(inputField.onSubmit, inputField.GetCancellationTokenOnDestroy(), true).OnInvokeAsync();
-        }
-
-        public static UniTask<string> OnSubmitAsync(this TMP_InputField inputField, CancellationToken cancellationToken)
-        {
-            return new AsyncUnityEventHandler<string>(inputField.onSubmit, cancellationToken, true).OnInvokeAsync();
-        }
-
-        public static IUniTaskAsyncEnumerable<string> OnSubmitAsAsyncEnumerable(this TMP_InputField inputField)
-        {
-            return new UnityEventHandlerAsyncEnumerable<string>(inputField.onSubmit, inputField.GetCancellationTokenOnDestroy());
-        }
-
-        public static IUniTaskAsyncEnumerable<string> OnSubmitAsAsyncEnumerable(this TMP_InputField inputField, CancellationToken cancellationToken)
-        {
-            return new UnityEventHandlerAsyncEnumerable<string>(inputField.onSubmit, cancellationToken);
-        }
-
-    }
-}
-
-#endif
--- a/src/UniTask/Assets/Plugins/UniTask/Runtime/External/TextMeshPro/TextMeshProAsyncExtensions.InputField.tt
+++ b/src/UniTask/Assets/Plugins/UniTask/Runtime/External/TextMeshPro/TextMeshProAsyncExtensions.InputField.tt
@ -1,66 +0,0 @@
-<#@ template debug="false" hostspecific="false" language="C#" #>
-<#@ assembly name="System.Core" #>
-<#@ import namespace="System.Linq" #>
-<#@ import namespace="System.Text" #>
-<#@ import namespace="System.Collections.Generic" #>
-<#@ output extension=".cs" #>
-<#
-    var handlers = new (string name, string type)[] {
-        ("ValueChanged", "string"),
-        ("EndEdit", "string"),
-        ("EndTextSelection", "(string, int, int)"),
-        ("TextSelection", "(string, int, int)"),
-        ("Deselect", "string"),
-        ("Select", "string"),
-        ("Submit", "string"),
-    };
-
-    Func<string, bool> shouldConvert = x => x.EndsWith("TextSelection");
-    Func<string, string> eventName = x => shouldConvert(x) ? $"new TextSelectionEventConverter(inputField.on{x})" : $"inputField.on{x}";
-#>
-#if UNITASK_TEXTMESHPRO_SUPPORT
-
-using System;
-using System.Threading;
-using TMPro;
-
-namespace Cysharp.Threading.Tasks
-{
-    public static partial class TextMeshProAsyncExtensions
-    {
-<# foreach(var (name, type) in handlers) { #>
-        public static IAsync<#= (name) #>EventHandler<<#= type #>> GetAsync<#= (name) #>EventHandler(this TMP_InputField inputField)
-        {
-            return new AsyncUnityEventHandler<<#= type #>>(<#= eventName(name) #>, inputField.GetCancellationTokenOnDestroy(), false);
-        }
-
-        public static IAsync<#= (name) #>EventHandler<<#= type #>> GetAsync<#= (name) #>EventHandler(this TMP_InputField inputField, CancellationToken cancellationToken)
-        {
-            return new AsyncUnityEventHandler<<#= type #>>(<#= eventName(name) #>, cancellationToken, false);
-        }
-
-        public static UniTask<<#= type #>> On<#= (name) #>Async(this TMP_InputField inputField)
-        {
-            return new AsyncUnityEventHandler<<#= type #>>(<#= eventName(name) #>, inputField.GetCancellationTokenOnDestroy(), true).OnInvokeAsync();
-        }
-
-        public static UniTask<<#= type #>> On<#= (name) #>Async(this TMP_InputField inputField, CancellationToken cancellationToken)
-        {
-            return new AsyncUnityEventHandler<<#= type #>>(<#= eventName(name) #>, cancellationToken, true).OnInvokeAsync();
-        }
-
-        public static IUniTaskAsyncEnumerable<<#= type #>> On<#= (name) #>AsAsyncEnumerable(this TMP_InputField inputField)
-        {
-            return new UnityEventHandlerAsyncEnumerable<<#= type #>>(<#= eventName(name) #>, inputField.GetCancellationTokenOnDestroy());
-        }
-
-        public static IUniTaskAsyncEnumerable<<#= type #>> On<#= (name) #>AsAsyncEnumerable(this TMP_InputField inputField, CancellationToken cancellationToken)
-        {
-            return new UnityEventHandlerAsyncEnumerable<<#= type #>>(<#= eventName(name) #>, cancellationToken);
-        }
-
-<# } #>
-    }
-}
-
-#endif
--- a/src/UniTask/Assets/Plugins/UniTask/Runtime/External/TextMeshPro/TextMeshProAsyncExtensions.cs
+++ b/src/UniTask/Assets/Plugins/UniTask/Runtime/External/TextMeshPro/TextMeshProAsyncExtensions.cs
@ -1,130 +0,0 @@
-#if UNITASK_TEXTMESHPRO_SUPPORT
-
-using System;
-using System.Threading;
-using TMPro;
-using UnityEngine.Events;
-
-namespace Cysharp.Threading.Tasks
-{
-    public static partial class TextMeshProAsyncExtensions
-    {
-        // <string> -> Text
-        public static void BindTo(this IUniTaskAsyncEnumerable<string> source, TMP_Text text, bool rebindOnError = true)
-        {
-            BindToCore(source, text, text.GetCancellationTokenOnDestroy(), rebindOnError).Forget();
-        }
-
-        public static void BindTo(this IUniTaskAsyncEnumerable<string> source, TMP_Text text, CancellationToken cancellationToken, bool rebindOnError = true)
-        {
-            BindToCore(source, text, cancellationToken, rebindOnError).Forget();
-        }
-
-        static async UniTaskVoid BindToCore(IUniTaskAsyncEnumerable<string> source, TMP_Text text, CancellationToken cancellationToken, bool rebindOnError)
-        {
-            var repeat = false;
-            BIND_AGAIN:
-            var e = source.GetAsyncEnumerator(cancellationToken);
-            try
-            {
-                while (true)
-                {
-                    bool moveNext;
-                    try
-                    {
-                        moveNext = await e.MoveNextAsync();
-                        repeat = false;
-                    }
-                    catch (Exception ex)
-                    {
-                        if (ex is OperationCanceledException) return;
-
-                        if (rebindOnError && !repeat)
-                        {
-                            repeat = true;
-                            goto BIND_AGAIN;
-                        }
-                        else
-                        {
-                            throw;
-                        }
-                    }
-
-                    if (!moveNext) return;
-
-                    text.text = e.Current;
-                }
-            }
-            finally
-            {
-                if (e != null)
-                {
-                    await e.DisposeAsync();
-                }
-            }
-        }
-
-        // <T> -> Text
-
-        public static void BindTo<T>(this IUniTaskAsyncEnumerable<T> source, TMP_Text text, bool rebindOnError = true)
-        {
-            BindToCore(source, text, text.GetCancellationTokenOnDestroy(), rebindOnError).Forget();
-        }
-
-        public static void BindTo<T>(this IUniTaskAsyncEnumerable<T> source, TMP_Text text, CancellationToken cancellationToken, bool rebindOnError = true)
-        {
-            BindToCore(source, text, cancellationToken, rebindOnError).Forget();
-        }
-
-        public static void BindTo<T>(this AsyncReactiveProperty<T> source, TMP_Text text, bool rebindOnError = true)
-        {
-            BindToCore(source, text, text.GetCancellationTokenOnDestroy(), rebindOnError).Forget();
-        }
-
-        static async UniTaskVoid BindToCore<T>(IUniTaskAsyncEnumerable<T> source, TMP_Text text, CancellationToken cancellationToken, bool rebindOnError)
-        {
-            var repeat = false;
-            BIND_AGAIN:
-            var e = source.GetAsyncEnumerator(cancellationToken);
-            try
-            {
-                while (true)
-                {
-                    bool moveNext;
-                    try
-                    {
-                        moveNext = await e.MoveNextAsync();
-                        repeat = false;
-                    }
-                    catch (Exception ex)
-                    {
-                        if (ex is OperationCanceledException) return;
-
-                        if (rebindOnError && !repeat)
-                        {
-                            repeat = true;
-                            goto BIND_AGAIN;
-                        }
-                        else
-                        {
-                            throw;
-                        }
-                    }
-
-                    if (!moveNext) return;
-
-                    text.text = e.Current.ToString();
-                }
-            }
-            finally
-            {
-                if (e != null)
-                {
-                    await e.DisposeAsync();
-                }
-            }
-        }
-    }
-}
-
-#endif
--- a/src/UniTask/Assets/Plugins/UniTask/Runtime/External/TextMeshPro/UniTask.TextMeshPro.asmdef
+++ b/src/UniTask/Assets/Plugins/UniTask/Runtime/External/TextMeshPro/UniTask.TextMeshPro.asmdef
@ -1,27 +0,0 @@
-{
-    "name": "UniTask.TextMeshPro",
-    "references": [
-        "UniTask",
-        "Unity.TextMeshPro"
-    ],
-    "includePlatforms": [],
-    "excludePlatforms": [],
-    "allowUnsafeCode": false,
-    "overrideReferences": false,
-    "precompiledReferences": [],
-    "autoReferenced": true,
-    "defineConstraints": [],
-    "versionDefines": [
-        {
-            "name": "com.unity.textmeshpro",
-            "expression": "",
-            "define": "UNITASK_TEXTMESHPRO_SUPPORT"
-        },
-        {
-            "name": "com.unity.ugui",
-            "expression": "2.0.0",
-            "define": "UNITASK_TEXTMESHPRO_SUPPORT"
-        }
-    ],
-    "noEngineReferences": false
-}
--- a/src/UniTask/Assets/Plugins/UniTask/Runtime/External/TextMeshPro/UniTask.TextMeshPro.asmdef.meta
+++ b/src/UniTask/Assets/Plugins/UniTask/Runtime/External/TextMeshPro/UniTask.TextMeshPro.asmdef.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: dc47925d1a5fa2946bdd37746b2b5d48
-AssemblyDefinitionImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/src/UniTask/Assets/Plugins/UniTask/Runtime/IUniTaskSource.cs
+++ b/src/UniTask/Assets/Plugins/UniTask/Runtime/IUniTaskSource.cs
@ -1,9 +1,4 @@
 #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;
@ -24,8 +19,9 @@ namespace Cysharp.Threading.Tasks

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

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

-#if SUPPORT_VALUETASK
+#if !UNITY_2018_3_OR_NEWER
+#pragma warning restore CS0108

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

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

-#if SUPPORT_VALUETASK
+#if !UNITY_2018_3_OR_NEWER

        new public UniTaskStatus GetStatus(short token)
        {
--- a/src/UniTask/Assets/Plugins/UniTask/Runtime/Internal/ContinuationQueue.cs
+++ b/src/UniTask/Assets/Plugins/UniTask/Runtime/Internal/ContinuationQueue.cs
@ -12,7 +12,7 @@ namespace Cysharp.Threading.Tasks.Internal
        
        readonly PlayerLoopTiming timing;

-        SpinLock gate = new SpinLock(false);
+        SpinLock gate = new SpinLock();
        bool dequing = false;

        int actionListCount = 0;
@ -70,17 +70,13 @@ namespace Cysharp.Threading.Tasks.Internal
            }
        }

-        public int Clear()
+        public void Clear()
        {
-            var rest = actionListCount + waitingListCount;
-
            actionListCount = 0;
            actionList = new Action[InitialSize];

            waitingListCount = 0;
            waitingList = new Action[InitialSize];
-
-            return rest;
        }

        // delegate entrypoint.
@ -132,14 +128,6 @@ namespace Cysharp.Threading.Tasks.Internal
                case PlayerLoopTiming.LastPostLateUpdate:
                    LastPostLateUpdate();
                    break;
-#if UNITY_2020_2_OR_NEWER
-                case PlayerLoopTiming.TimeUpdate:
-                    TimeUpdate();
-                    break;
-                case PlayerLoopTiming.LastTimeUpdate:
-                    LastTimeUpdate();
-                    break;
-#endif
                default:
                    break;
            }
@ -162,10 +150,6 @@ namespace Cysharp.Threading.Tasks.Internal
        void LastPreLateUpdate() => RunCore();
        void PostLateUpdate() => RunCore();
        void LastPostLateUpdate() => RunCore();
-#if UNITY_2020_2_OR_NEWER
-        void TimeUpdate() => RunCore();
-        void LastTimeUpdate() => RunCore();
-#endif

        [System.Diagnostics.DebuggerHidden]
        void RunCore()
@ -186,17 +170,10 @@ namespace Cysharp.Threading.Tasks.Internal

            for (int i = 0; i < actionListCount; i++)
            {
-
                var action = actionList[i];
                actionList[i] = null;
-                try
-                {
-                    action();
-                }
-                catch (Exception ex)
-                {
-                    UnityEngine.Debug.LogException(ex);
-                }
+
+                action();
            }

            {
--- a/src/UniTask/Assets/Plugins/UniTask/Runtime/Internal/DiagnosticsExtensions.cs
+++ b/src/UniTask/Assets/Plugins/UniTask/Runtime/Internal/DiagnosticsExtensions.cs
@ -148,7 +148,7 @@ namespace Cysharp.Threading.Tasks.Internal

            foreach (var candidateMethod in methods)
            {
-                var attributes = candidateMethod.GetCustomAttributes<StateMachineAttribute>(false);
+                var attributes = candidateMethod.GetCustomAttributes<StateMachineAttribute>();
                if (attributes == null)
                {
                    continue;
@ -239,7 +239,7 @@ namespace Cysharp.Threading.Tasks.Internal
            }
            else
            {
-                var fname = fi.FullName.Replace(Path.DirectorySeparatorChar, '/').Replace(PlayerLoopHelper.ApplicationDataPath, "");
+                var fname = fi.FullName.Replace(Path.DirectorySeparatorChar, '/').Replace(Application.dataPath, "");
                var withAssetsPath = "Assets/" + fname;
                return "<a href=\"" + withAssetsPath + "\" line=\"" + line + "\">" + withAssetsPath + ":" + line + "</a>";
            }
--- a/src/UniTask/Assets/Plugins/UniTask/Runtime/Internal/Error.cs
+++ b/src/UniTask/Assets/Plugins/UniTask/Runtime/Internal/Error.cs
@ -39,7 +39,7 @@ namespace Cysharp.Threading.Tasks.Internal
        }

        [MethodImpl(MethodImplOptions.NoInlining)]
-        public static void ThrowArgumentException(string message)
+        public static void ThrowArgumentException<T>(string message)
        {
            throw new ArgumentException(message);
        }
--- a/src/UniTask/Assets/Plugins/UniTask/Runtime/Internal/Hack.cs
+++ b/src/UniTask/Assets/Plugins/UniTask/Runtime/Internal/Hack.cs
@ -0,0 +1,23 @@
+#if NET_4_6 || NET_STANDARD_2_0 || CSHARP_7_OR_LATER
+
+using System;
+
+namespace Cysharp.Threading.Tasks.Internal
+{
+    internal static class FuncExtensions
+    {
+        // avoid lambda capture
+
+        internal static Action<T> AsFuncOfT<T>(this Action action)
+        {
+            return new Action<T>(action.Invoke);
+        }
+
+        static void Invoke<T>(this Action action, T unused)
+        {
+            action();
+        }
+    }
+}
+
+#endif
--- a/src/UniTask/Assets/Plugins/UniTask/Runtime/External/TextMeshPro/TextMeshProAsyncExtensions.InputField.cs.meta
+++ b/src/UniTask/Assets/Plugins/UniTask/Runtime/External/TextMeshPro/TextMeshProAsyncExtensions.InputField.cs.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 79f4f2475e0b2c44e97ed1dee760627b
+guid: 4d5a9a3e1f0f069478969f752fde29a9
 MonoImporter:
  externalObjects: {}
  serializedVersion: 2
--- a/src/UniTask/Assets/Plugins/UniTask/Runtime/Internal/PlayerLoopRunner.cs
+++ b/src/UniTask/Assets/Plugins/UniTask/Runtime/Internal/PlayerLoopRunner.cs
@ -48,24 +48,14 @@ namespace Cysharp.Threading.Tasks.Internal
            }
        }

-        public int Clear()
+        public void Clear()
        {
            lock (arrayLock)
            {
-                var rest = 0;
-
                for (var index = 0; index < loopItems.Length; index++)
                {
-                    if (loopItems[index] != null)
-                    {
-                        rest++;
-                    }
-
                    loopItems[index] = null;
                }
-
-                tail = 0;
-                return rest;
            }
        }

@ -118,14 +108,6 @@ namespace Cysharp.Threading.Tasks.Internal
                case PlayerLoopTiming.LastPostLateUpdate:
                    LastPostLateUpdate();
                    break;
-#if UNITY_2020_2_OR_NEWER
-                case PlayerLoopTiming.TimeUpdate:
-                    TimeUpdate();
-                    break;
-                case PlayerLoopTiming.LastTimeUpdate:
-                    LastTimeUpdate();
-                    break;
-#endif
                default:
                    break;
            }
@ -148,10 +130,6 @@ namespace Cysharp.Threading.Tasks.Internal
        void LastPreLateUpdate() => RunCore();
        void PostLateUpdate() => RunCore();
        void LastPostLateUpdate() => RunCore();
-#if UNITY_2020_2_OR_NEWER
-        void TimeUpdate() => RunCore();
-        void LastTimeUpdate() => RunCore();
-#endif

        [System.Diagnostics.DebuggerHidden]
        void RunCore()
@ -165,6 +143,7 @@ namespace Cysharp.Threading.Tasks.Internal
            {
                var j = tail - 1;

+                // eliminate array-bound check for i
                for (int i = 0; i < loopItems.Length; i++)
                {
                    var action = loopItems[i];
--- a/src/UniTask/Assets/Plugins/UniTask/Runtime/Internal/PooledDelegate.cs
+++ b/src/UniTask/Assets/Plugins/UniTask/Runtime/Internal/PooledDelegate.cs
@ -1,50 +0,0 @@
-using System;
-using System.Runtime.CompilerServices;
-
-namespace Cysharp.Threading.Tasks.Internal
-{
-    internal sealed class PooledDelegate<T> : ITaskPoolNode<PooledDelegate<T>>
-    {
-        static TaskPool<PooledDelegate<T>> pool;
-
-        PooledDelegate<T> nextNode;
-        public ref PooledDelegate<T> NextNode => ref nextNode;
-
-        static PooledDelegate()
-        {
-            TaskPool.RegisterSizeGetter(typeof(PooledDelegate<T>), () => pool.Size);
-        }
-
-        readonly Action<T> runDelegate;
-        Action continuation;
-
-        PooledDelegate()
-        {
-            runDelegate = Run;
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static Action<T> Create(Action continuation)
-        {
-            if (!pool.TryPop(out var item))
-            {
-                item = new PooledDelegate<T>();
-            }
-
-            item.continuation = continuation;
-            return item.runDelegate;
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        void Run(T _)
-        {
-            var call = continuation;
-            continuation = null;
-            if (call != null)
-            {
-                pool.TryPush(this);
-                call.Invoke();
-            }
-        }
-    }
-}
--- a/src/UniTask/Assets/Plugins/UniTask/Runtime/Internal/PromisePool.cs
+++ b/src/UniTask/Assets/Plugins/UniTask/Runtime/Internal/PromisePool.cs
@ -0,0 +1,55 @@
+using System.Collections.Concurrent;
+using System.Runtime.CompilerServices;
+using System.Threading;
+
+namespace Cysharp.Threading.Tasks.Internal
+{
+    // public, allow to user create custom operator with pool.
+
+    public interface IPromisePoolItem
+    {
+        void Reset();
+    }
+
+    public class PromisePool<T>
+        where T : class, IPromisePoolItem
+    {
+        int count = 0;
+        readonly ConcurrentQueue<T> queue = new ConcurrentQueue<T>();
+        readonly int maxSize;
+
+        public PromisePool(int maxSize = 256)
+        {
+            this.maxSize = maxSize;
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public T TryRent()
+        {
+            if (queue.TryDequeue(out var value))
+            {
+                Interlocked.Decrement(ref count);
+                return value;
+            }
+
+            return null;
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public bool TryReturn(T value)
+        {
+            value.Reset(); // reset when return.
+
+            if (count < maxSize)
+            {
+                queue.Enqueue(value);
+                Interlocked.Increment(ref count);
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+    }
+}
--- a/src/UniTask/Assets/Plugins/UniTask/Runtime/External/TextMeshPro/TextMeshProAsyncExtensions.cs.meta
+++ b/src/UniTask/Assets/Plugins/UniTask/Runtime/External/TextMeshPro/TextMeshProAsyncExtensions.cs.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: b6ba480edafb67d4e91bb10feb64fae5
+guid: fcb1f7467a3e2b64c8a016c8aee2f9b4
 MonoImporter:
  externalObjects: {}
  serializedVersion: 2
--- a/src/UniTask/Assets/Plugins/UniTask/Runtime/Internal/TaskTracker.cs
+++ b/src/UniTask/Assets/Plugins/UniTask/Runtime/Internal/TaskTracker.cs
@ -3,7 +3,6 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Text;
 using System.Threading;
 using Cysharp.Threading.Tasks.Internal;

@ -60,9 +59,9 @@ namespace Cysharp.Threading.Tasks
 #endif


-        static List<KeyValuePair<IUniTaskSource, (string formattedType, int trackingId, DateTime addTime, string stackTrace)>> listPool = new List<KeyValuePair<IUniTaskSource, (string formattedType, int trackingId, DateTime addTime, string stackTrace)>>();
+        static List<KeyValuePair<IUniTaskSource, (int trackingId, DateTime addTime, string stackTrace)>> listPool = new List<KeyValuePair<IUniTaskSource, (int trackingId, DateTime addTime, string stackTrace)>>();

-        static readonly WeakDictionary<IUniTaskSource, (string formattedType, int trackingId, DateTime addTime, string stackTrace)> tracking = new WeakDictionary<IUniTaskSource, (string formattedType, int trackingId, DateTime addTime, string stackTrace)>();
+        static readonly WeakDictionary<IUniTaskSource, (int trackingId, DateTime addTime, string stackTrace)> tracking = new WeakDictionary<IUniTaskSource, (int trackingId, DateTime addTime, string stackTrace)>();

        [Conditional("UNITY_EDITOR")]
        public static void TrackActiveTask(IUniTaskSource task, int skipFrame)
@ -71,19 +70,7 @@ namespace Cysharp.Threading.Tasks
            dirty = true;
            if (!EditorEnableState.EnableTracking) return;
            var stackTrace = EditorEnableState.EnableStackTrace ? new StackTrace(skipFrame, true).CleanupAsyncStackTrace() : "";
-
-            string typeName;
-            if (EditorEnableState.EnableStackTrace)
-            {
-                var sb = new StringBuilder();
-                TypeBeautify(task.GetType(), sb);
-                typeName = sb.ToString();
-            }
-            else
-            {
-                typeName = task.GetType().Name;
-            }
-            tracking.TryAdd(task, (typeName, Interlocked.Increment(ref trackingId), DateTime.UtcNow, stackTrace));
+            tracking.TryAdd(task, (Interlocked.Increment(ref trackingId), DateTime.UtcNow, stackTrace));
 #endif
        }

@ -116,8 +103,19 @@ namespace Cysharp.Threading.Tasks
                {
                    for (int i = 0; i < count; i++)
                    {
-                        action(listPool[i].Value.trackingId, listPool[i].Value.formattedType, listPool[i].Key.UnsafeGetStatus(), listPool[i].Value.addTime, listPool[i].Value.stackTrace);
-                        listPool[i] = default;
+                        string typeName = null;
+                        var keyType = listPool[i].Key.GetType();
+                        if (keyType.IsNested)
+                        {
+                            typeName = keyType.DeclaringType.Name + "." + keyType.Name;
+                        }
+                        else
+                        {
+                            typeName = keyType.Name;
+                        }
+
+                        action(listPool[i].Value.trackingId, typeName, listPool[i].Key.UnsafeGetStatus(), listPool[i].Value.addTime, listPool[i].Value.stackTrace);
+                        listPool[i] = new KeyValuePair<IUniTaskSource, (int trackingId, DateTime addTime, string stackTrace)>(null, (0, default(DateTime), null)); // clear
                    }
                }
                catch
@ -127,52 +125,6 @@ namespace Cysharp.Threading.Tasks
                }
            }
        }
-
-        static void TypeBeautify(Type type, StringBuilder sb)
-        {
-            if (type.IsNested)
-            {
-                // TypeBeautify(type.DeclaringType, sb);
-                sb.Append(type.DeclaringType.Name.ToString());
-                sb.Append(".");
-            }
-
-            if (type.IsGenericType)
-            {
-                var genericsStart = type.Name.IndexOf("`");
-                if (genericsStart != -1)
-                {
-                    sb.Append(type.Name.Substring(0, genericsStart));
-                }
-                else
-                {
-                    sb.Append(type.Name);
-                }
-                sb.Append("<");
-                var first = true;
-                foreach (var item in type.GetGenericArguments())
-                {
-                    if (!first)
-                    {
-                        sb.Append(", ");
-                    }
-                    first = false;
-                    TypeBeautify(item, sb);
-                }
-                sb.Append(">");
-            }
-            else
-            {
-                sb.Append(type.Name);
-            }
-        }
-
-        //static string RemoveUniTaskNamespace(string str)
-        //{
-        //    return str.Replace("Cysharp.Threading.Tasks.CompilerServices", "")
-        //        .Replace("Cysharp.Threading.Tasks.Linq", "")
-        //        .Replace("Cysharp.Threading.Tasks", "");
-        //}
    }
 }

--- a/src/UniTask/Assets/Plugins/UniTask/Runtime/Internal/UnityWebRequestExtensions.cs
+++ b/src/UniTask/Assets/Plugins/UniTask/Runtime/Internal/UnityWebRequestExtensions.cs
@ -1,28 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using UnityEngine.Networking;
-
-namespace Cysharp.Threading.Tasks.Internal
-{
-#if ENABLE_UNITYWEBREQUEST && (!UNITY_2019_1_OR_NEWER || UNITASK_WEBREQUEST_SUPPORT)
-    
-    internal static class UnityWebRequestResultExtensions
-    {
-        public static bool IsError(this UnityWebRequest unityWebRequest)
-        {
-#if UNITY_2020_2_OR_NEWER
-            var result = unityWebRequest.result;
-            return (result == UnityWebRequest.Result.ConnectionError)
-                || (result == UnityWebRequest.Result.DataProcessingError)
-                || (result == UnityWebRequest.Result.ProtocolError);
-#else
-            return unityWebRequest.isHttpError || unityWebRequest.isNetworkError;
-#endif
-        }
-    }
-
-#endif
-}
--- a/Show More
+++ b/Show More