mirror of
https://github.com/Cysharp/UniTask.git
synced 2026-05-15 11:30:09 +00:00
Compare commits
32 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d2245bc38b | ||
|
|
f092f6a112 | ||
|
|
ed617a04a6 | ||
|
|
340736795c | ||
|
|
dc804ffb13 | ||
|
|
a879989d1c | ||
|
|
ee54559532 | ||
|
|
4a72ec2a1a | ||
|
|
e999268305 | ||
|
|
8300c1b1e6 | ||
|
|
daa0c7b9a0 | ||
|
|
9b9a4ec76a | ||
|
|
3f8e43b83f | ||
|
|
cf6f0799e9 | ||
|
|
91ba4f003a | ||
|
|
f48cb4b03e | ||
|
|
70a243d978 | ||
|
|
9b95f3b9f6 | ||
|
|
a25adb601b | ||
|
|
e6240879c4 | ||
|
|
a94e8cceac | ||
|
|
0595a4182a | ||
|
|
df96c119c1 | ||
|
|
534f4a2588 | ||
|
|
873485ad1a | ||
|
|
78db78c7bd | ||
|
|
226e272787 | ||
|
|
9e2163616b | ||
|
|
52df6fbf3f | ||
|
|
33d32baea4 | ||
|
|
b0250cfe75 | ||
|
|
7a35f121cd |
36
.github/workflows/build-debug.yml
vendored
36
.github/workflows/build-debug.yml
vendored
@@ -4,8 +4,6 @@ on:
|
||||
push:
|
||||
branches:
|
||||
- "master"
|
||||
tags:
|
||||
- "!*" # not a tag push
|
||||
pull_request:
|
||||
branches:
|
||||
- "master"
|
||||
@@ -13,13 +11,16 @@ on:
|
||||
jobs:
|
||||
build-dotnet:
|
||||
runs-on: ubuntu-latest
|
||||
env:
|
||||
DOTNET_CLI_TELEMETRY_OPTOUT: 1
|
||||
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
|
||||
NUGET_XMLDOC_MODE: skip
|
||||
timeout-minutes: 10
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- run: dotnet test -c Debug ./src/UniTask.NetCoreTests/UniTask.NetCoreTests.csproj
|
||||
- uses: actions/checkout@v3
|
||||
- uses: Cysharp/Actions/.github/actions/setup-dotnet@main
|
||||
with:
|
||||
dotnet-version: |
|
||||
3.1.x
|
||||
6.0.x
|
||||
- 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:'))"
|
||||
@@ -34,12 +35,13 @@ jobs:
|
||||
- unity: 2020.1.12f1
|
||||
license: UNITY_LICENSE_2020
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 15
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- uses: actions/checkout@v3
|
||||
# Execute scripts: RuntimeUnitTestToolkit
|
||||
# /opt/Unity/Editor/Unity -quit -batchmode -nographics -silent-crashes -logFile -projectPath . -executeMethod UnitTestBuilder.BuildUnitTest /headless /ScriptBackend mono /BuildTarget StandaloneLinux64
|
||||
- name: Build UnitTest(Linux64, mono)
|
||||
uses: game-ci/unity-builder@v2.0-alpha-6
|
||||
uses: game-ci/unity-builder@v2
|
||||
env:
|
||||
UNITY_LICENSE: ${{ secrets[matrix.license] }}
|
||||
with:
|
||||
@@ -55,7 +57,7 @@ jobs:
|
||||
# Execute scripts: Export Package
|
||||
# /opt/Unity/Editor/Unity -quit -batchmode -nographics -silent-crashes -logFile -projectPath . -executeMethod PackageExporter.Export
|
||||
- name: Export unitypackage
|
||||
uses: game-ci/unity-builder@v2.0-alpha-6
|
||||
uses: game-ci/unity-builder@v2
|
||||
env:
|
||||
UNITY_LICENSE: ${{ secrets[matrix.license] }}
|
||||
with:
|
||||
@@ -65,15 +67,9 @@ jobs:
|
||||
buildMethod: PackageExporter.Export
|
||||
versioning: None
|
||||
|
||||
- name: check all .meta is commited
|
||||
run: |
|
||||
if git ls-files --others --exclude-standard -t | grep --regexp='[.]meta$'; then
|
||||
echo "Detected .meta file generated. Do you forgot commit a .meta file?"
|
||||
exit 1
|
||||
else
|
||||
echo "Great, all .meta files are commited."
|
||||
fi
|
||||
working-directory: src/UniTask
|
||||
- uses: Cysharp/Actions/.github/actions/check-metas@main # check meta files
|
||||
with:
|
||||
directory: src/UniTask
|
||||
|
||||
# Store artifacts.
|
||||
- uses: actions/upload-artifact@v2
|
||||
|
||||
5
.github/workflows/build-docs.yml
vendored
5
.github/workflows/build-docs.yml
vendored
@@ -9,9 +9,10 @@ on:
|
||||
jobs:
|
||||
run-docfx:
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 10
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- uses: actions/checkout@v2
|
||||
- uses: actions/checkout@v3
|
||||
- uses: actions/checkout@v3
|
||||
with:
|
||||
repository: Cysharp/DocfxTemplate
|
||||
path: docs/_DocfxTemplate
|
||||
|
||||
118
.github/workflows/build-release.yml
vendored
118
.github/workflows/build-release.yml
vendored
@@ -6,90 +6,44 @@ on:
|
||||
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."
|
||||
dry-run:
|
||||
description: "dry-run: true will never create relase/nuget."
|
||||
required: true
|
||||
default: "false"
|
||||
default: false
|
||||
type: boolean
|
||||
|
||||
env:
|
||||
GIT_TAG: ${{ github.event.inputs.tag }}
|
||||
DRY_RUN: ${{ github.event.inputs.dry_run }}
|
||||
DRY_RUN_BRANCH_PREFIX: "test_release"
|
||||
DRY_RUN: ${{ github.event.inputs.dry-run }}
|
||||
|
||||
jobs:
|
||||
update-packagejson:
|
||||
runs-on: ubuntu-latest
|
||||
env:
|
||||
TARGET_FILE: ./src/UniTask/Assets/Plugins/UniTask/package.json
|
||||
outputs:
|
||||
sha: ${{ steps.commit.outputs.sha }}
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- name: Output package.json (Before)
|
||||
run: cat ${{ env.TARGET_FILE}}
|
||||
|
||||
- name: Update package.json to version ${{ env.GIT_TAG }}
|
||||
run: sed -i -e "s/\(\"version\":\) \"\(.*\)\",/\1 \"${{ env.GIT_TAG }}\",/" ${{ env.TARGET_FILE }}
|
||||
|
||||
- name: Check update
|
||||
id: check_update
|
||||
run: |
|
||||
cat ${{ env.TARGET_FILE}}
|
||||
git diff --exit-code || echo "::set-output name=changed::1"
|
||||
|
||||
- name: Commit files
|
||||
id: commit
|
||||
if: steps.check_update.outputs.changed == '1'
|
||||
run: |
|
||||
git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
|
||||
git config --local user.name "github-actions[bot]"
|
||||
git commit -m "feat: Update package.json to ${{ env.GIT_TAG }}" -a
|
||||
echo "::set-output name=sha::$(git rev-parse HEAD)"
|
||||
|
||||
- name: Check sha
|
||||
run: echo "SHA ${SHA}"
|
||||
env:
|
||||
SHA: ${{ steps.commit.outputs.sha }}
|
||||
|
||||
- name: Create Tag
|
||||
if: steps.check_update.outputs.changed == '1'
|
||||
run: git tag ${{ env.GIT_TAG }}
|
||||
|
||||
- name: Push changes
|
||||
if: env.DRY_RUN == 'false' && steps.check_update.outputs.changed == '1'
|
||||
uses: ad-m/github-push-action@master
|
||||
with:
|
||||
github_token: ${{ secrets.GITHUB_TOKEN }}
|
||||
branch: ${{ github.ref }}
|
||||
tags: true
|
||||
|
||||
- name: Push changes (dry_run)
|
||||
if: env.DRY_RUN == 'true' && steps.check_update.outputs.changed == '1'
|
||||
uses: ad-m/github-push-action@master
|
||||
with:
|
||||
github_token: ${{ secrets.GITHUB_TOKEN }}
|
||||
branch: ${{ env.DRY_RUN_BRANCH_PREFIX }}-${{ env.GIT_TAG }}
|
||||
tags: false
|
||||
uses: Cysharp/Actions/.github/workflows/update-packagejson.yaml@main
|
||||
with:
|
||||
file-path: ./src/UniTask/Assets/Plugins/UniTask/package.json
|
||||
tag: ${{ github.event.inputs.tag }}
|
||||
dry-run: ${{ fromJson(github.event.inputs.dry-run) }}
|
||||
|
||||
build-dotnet:
|
||||
needs: [update-packagejson]
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 10
|
||||
env:
|
||||
DOTNET_CLI_TELEMETRY_OPTOUT: 1
|
||||
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
|
||||
NUGET_XMLDOC_MODE: skip
|
||||
steps:
|
||||
- run: echo ${{ needs.update-packagejson.outputs.sha }}
|
||||
- uses: actions/checkout@v2
|
||||
- uses: actions/checkout@v3
|
||||
with:
|
||||
ref: ${{ needs.update-packagejson.outputs.sha }}
|
||||
- uses: Cysharp/Actions/.github/actions/setup-dotnet@main
|
||||
with:
|
||||
dotnet-version: |
|
||||
3.1.x
|
||||
6.0.x
|
||||
# build and pack
|
||||
- run: dotnet build -c Release -p:Version=${{ env.GIT_TAG }}
|
||||
- run: dotnet test -c Release --no-build
|
||||
- run: dotnet pack ./src/UniTask.NetCore/UniTask.NetCore.csproj -c Release --no-build -p:Version=${{ env.GIT_TAG }} -o ./publish
|
||||
# Store artifacts.
|
||||
- uses: actions/upload-artifact@v1
|
||||
- uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: nuget
|
||||
path: ./publish/
|
||||
@@ -106,13 +60,13 @@ jobs:
|
||||
timeout-minutes: 15
|
||||
steps:
|
||||
- run: echo ${{ needs.update-packagejson.outputs.sha }}
|
||||
- uses: actions/checkout@v2
|
||||
- uses: actions/checkout@v3
|
||||
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: Export unitypackage
|
||||
uses: game-ci/unity-builder@v2.0-alpha-6
|
||||
uses: game-ci/unity-builder@v2
|
||||
env:
|
||||
UNITY_LICENSE: ${{ secrets[matrix.license] }}
|
||||
with:
|
||||
@@ -122,15 +76,9 @@ jobs:
|
||||
buildMethod: PackageExporter.Export
|
||||
versioning: None
|
||||
|
||||
- name: check all .meta is commited
|
||||
run: |
|
||||
if git ls-files --others --exclude-standard -t | grep --regexp='[.]meta$'; then
|
||||
echo "Detected .meta file generated. Do you forgot commit a .meta file?"
|
||||
exit 1
|
||||
else
|
||||
echo "Great, all .meta files are commited."
|
||||
fi
|
||||
working-directory: src/UniTask
|
||||
- uses: Cysharp/Actions/.github/actions/check-metas@main # check meta files
|
||||
with:
|
||||
directory: src/UniTask
|
||||
|
||||
# Store artifacts.
|
||||
- uses: actions/upload-artifact@v2
|
||||
@@ -139,14 +87,12 @@ jobs:
|
||||
path: ./src/UniTask/UniTask.${{ env.GIT_TAG }}.unitypackage
|
||||
|
||||
create-release:
|
||||
if: github.event.inputs.dry_run == 'false'
|
||||
if: github.event.inputs.dry-run == 'false'
|
||||
needs: [update-packagejson, build-dotnet, build-unity]
|
||||
runs-on: ubuntu-latest
|
||||
env:
|
||||
DOTNET_CLI_TELEMETRY_OPTOUT: 1
|
||||
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
|
||||
NUGET_XMLDOC_MODE: skip
|
||||
timeout-minutes: 10
|
||||
steps:
|
||||
- uses: Cysharp/Actions/.github/actions/setup-dotnet@main
|
||||
# Create Releases
|
||||
- uses: actions/create-release@v1
|
||||
id: create_release
|
||||
@@ -173,12 +119,8 @@ jobs:
|
||||
asset_content_type: application/octet-stream
|
||||
|
||||
cleanup:
|
||||
if: github.event.inputs.dry_run == 'true'
|
||||
needs: [build-dotnet, build-unity]
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Delete branch
|
||||
uses: dawidd6/action-delete-branch@v3
|
||||
with:
|
||||
github_token: ${{ github.token }}
|
||||
branches: ${{ env.DRY_RUN_BRANCH_PREFIX }}-${{ env.GIT_TAG }}
|
||||
if: needs.update-packagejson.outputs.is-branch-created == 'true'
|
||||
needs: [update-packagejson, build-dotnet, build-unity]
|
||||
uses: Cysharp/Actions/.github/workflows/clean-packagejson-branch.yaml@main
|
||||
with:
|
||||
branch: ${{ needs.update-packagejson.outputs.branch-name }}
|
||||
|
||||
18
.github/workflows/stale.yml
vendored
18
.github/workflows/stale.yml
vendored
@@ -1,24 +1,10 @@
|
||||
name: "Close stale issues"
|
||||
|
||||
on:
|
||||
workflow_dispatch:
|
||||
schedule:
|
||||
- cron: "0 0 * * *"
|
||||
|
||||
jobs:
|
||||
stale:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/stale@v3
|
||||
with:
|
||||
repo-token: ${{ secrets.GITHUB_TOKEN }}
|
||||
# enable issue
|
||||
stale-issue-message: "This issue is stale because it has been open 90 days with no activity. Remove stale label or comment or this will be closed in 7 days."
|
||||
stale-issue-label: "stale"
|
||||
# enable pr
|
||||
stale-pr-message: "This PR is stale because it has been open 90 days with no activity. Remove stale label or comment or this will be closed in 7 days."
|
||||
stale-pr-label: "stale"
|
||||
days-before-stale: 90
|
||||
days-before-close: 7
|
||||
exempt-issue-labels: "wip"
|
||||
exempt-pr-labels: "wip"
|
||||
remove-stale-when-updated: true
|
||||
uses: Cysharp/Actions/.github/workflows/stale-issue.yaml@main
|
||||
|
||||
@@ -23,6 +23,7 @@
|
||||
<PackageIcon>Icon.png</PackageIcon>
|
||||
<SignAssembly>true</SignAssembly>
|
||||
<AssemblyOriginatorKeyFile>opensource.snk</AssemblyOriginatorKeyFile>
|
||||
<IsPackable>true</IsPackable>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
||||
@@ -28,7 +28,7 @@ namespace NetCoreSandbox
|
||||
await FooAsync(10, cts.Token);
|
||||
|
||||
// NG(Compiler Error)
|
||||
await FooAsync(10);
|
||||
// await FooAsync(10);
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
<OutputType>Exe</OutputType>
|
||||
<TargetFramework>netcoreapp3.1</TargetFramework>
|
||||
<RootNamespace>NetCoreSandbox</RootNamespace>
|
||||
<IsPackable>false</IsPackable>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
||||
@@ -16,7 +16,12 @@
|
||||
"name": "com.unity.addressables",
|
||||
"expression": "",
|
||||
"define": "UNITASK_ADDRESSABLE_SUPPORT"
|
||||
},
|
||||
{
|
||||
"name": "com.unity.addressables.cn",
|
||||
"expression": "",
|
||||
"define": "UNITASK_ADDRESSABLE_SUPPORT"
|
||||
}
|
||||
],
|
||||
"noEngineReferences": false
|
||||
}
|
||||
}
|
||||
|
||||
@@ -524,6 +524,14 @@ namespace Cysharp.Threading.Tasks
|
||||
{
|
||||
sb.AppendFormat("------{0}------", header.type.Name);
|
||||
sb.AppendLine();
|
||||
|
||||
if (header.subSystemList is null)
|
||||
{
|
||||
sb.AppendFormat("{0} has no subsystems!", header.ToString());
|
||||
sb.AppendLine();
|
||||
continue;
|
||||
}
|
||||
|
||||
foreach (var subSystem in header.subSystemList)
|
||||
{
|
||||
sb.AppendFormat("{0}", subSystem.type.Name);
|
||||
@@ -545,6 +553,11 @@ namespace Cysharp.Threading.Tasks
|
||||
|
||||
foreach (var header in playerLoop.subSystemList)
|
||||
{
|
||||
if (header.subSystemList is null)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
foreach (var subSystem in header.subSystemList)
|
||||
{
|
||||
if (subSystem.type == typeof(UniTaskLoopRunners.UniTaskLoopRunnerInitialization))
|
||||
|
||||
@@ -7,7 +7,7 @@ using System.Threading;
|
||||
|
||||
namespace Cysharp.Threading.Tasks
|
||||
{
|
||||
// internaly used but public, allow to user create custom operator with pooling.
|
||||
// internally used but public, allow to user create custom operator with pooling.
|
||||
|
||||
public static class TaskPool
|
||||
{
|
||||
|
||||
@@ -99,7 +99,7 @@ namespace Cysharp.Threading.Tasks
|
||||
|
||||
public void Reset()
|
||||
{
|
||||
timer.Stop();
|
||||
timer?.Stop();
|
||||
}
|
||||
|
||||
public void Dispose()
|
||||
@@ -109,7 +109,7 @@ namespace Cysharp.Threading.Tasks
|
||||
try
|
||||
{
|
||||
// stop timer.
|
||||
timer.Dispose();
|
||||
timer?.Dispose();
|
||||
|
||||
// cancel and dispose.
|
||||
timeoutSource.Cancel();
|
||||
|
||||
@@ -8,6 +8,16 @@ namespace Cysharp.Threading.Tasks
|
||||
{
|
||||
public static class UniTaskCancellationExtensions
|
||||
{
|
||||
#if UNITY_2022_2_OR_NEWER
|
||||
|
||||
/// <summary>This CancellationToken is canceled when the MonoBehaviour will be destroyed.</summary>
|
||||
public static CancellationToken GetCancellationTokenOnDestroy(this MonoBehaviour monoBehaviour)
|
||||
{
|
||||
return monoBehaviour.destroyCancellationToken;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
/// <summary>This CancellationToken is canceled when the MonoBehaviour will be destroyed.</summary>
|
||||
public static CancellationToken GetCancellationTokenOnDestroy(this GameObject gameObject)
|
||||
{
|
||||
@@ -17,6 +27,13 @@ namespace Cysharp.Threading.Tasks
|
||||
/// <summary>This CancellationToken is canceled when the MonoBehaviour will be destroyed.</summary>
|
||||
public static CancellationToken GetCancellationTokenOnDestroy(this Component component)
|
||||
{
|
||||
#if UNITY_2022_2_OR_NEWER
|
||||
if (component is MonoBehaviour mb)
|
||||
{
|
||||
return mb.destroyCancellationToken;
|
||||
}
|
||||
#endif
|
||||
|
||||
return component.GetAsyncDestroyTrigger().CancellationToken;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -94,19 +94,21 @@ namespace Cysharp.Threading.Tasks
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Same as UniTask.Yield(PlayerLoopTiming.FixedUpdate).
|
||||
/// Same as UniTask.Yield(PlayerLoopTiming.LastFixedUpdate).
|
||||
/// </summary>
|
||||
public static YieldAwaitable WaitForFixedUpdate()
|
||||
{
|
||||
return UniTask.Yield(PlayerLoopTiming.FixedUpdate);
|
||||
// use LastFixedUpdate instead of FixedUpdate
|
||||
// https://github.com/Cysharp/UniTask/issues/377
|
||||
return UniTask.Yield(PlayerLoopTiming.LastFixedUpdate);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Same as UniTask.Yield(PlayerLoopTiming.FixedUpdate, cancellationToken).
|
||||
/// Same as UniTask.Yield(PlayerLoopTiming.LastFixedUpdate, cancellationToken).
|
||||
/// </summary>
|
||||
public static UniTask WaitForFixedUpdate(CancellationToken cancellationToken)
|
||||
{
|
||||
return UniTask.Yield(PlayerLoopTiming.FixedUpdate, cancellationToken);
|
||||
return UniTask.Yield(PlayerLoopTiming.LastFixedUpdate, cancellationToken);
|
||||
}
|
||||
|
||||
public static UniTask DelayFrame(int delayFrameCount, PlayerLoopTiming delayTiming = PlayerLoopTiming.Update, CancellationToken cancellationToken = default(CancellationToken))
|
||||
|
||||
@@ -133,7 +133,7 @@ namespace Cysharp.Threading.Tasks
|
||||
{
|
||||
var self = (ToUniTaskObserver<T>)state;
|
||||
self.disposable.Dispose();
|
||||
self.promise.TrySetCanceled();
|
||||
self.promise.TrySetCanceled(self.cancellationToken);
|
||||
}
|
||||
|
||||
public void OnNext(T value)
|
||||
@@ -203,7 +203,7 @@ namespace Cysharp.Threading.Tasks
|
||||
{
|
||||
var self = (FirstValueToUniTaskObserver<T>)state;
|
||||
self.disposable.Dispose();
|
||||
self.promise.TrySetCanceled();
|
||||
self.promise.TrySetCanceled(self.cancellationToken);
|
||||
}
|
||||
|
||||
public void OnNext(T value)
|
||||
|
||||
@@ -21,7 +21,7 @@ namespace Cysharp.Threading.Tasks
|
||||
|
||||
public static UniTask<UnityEngine.Object[]> AwaitForAllAssets(this AssetBundleRequest asyncOperation, CancellationToken cancellationToken)
|
||||
{
|
||||
return AwaitForAllAssets(asyncOperation, cancellationToken: cancellationToken);
|
||||
return AwaitForAllAssets(asyncOperation, null, PlayerLoopTiming.Update, cancellationToken: cancellationToken);
|
||||
}
|
||||
|
||||
public static UniTask<UnityEngine.Object[]> AwaitForAllAssets(this AssetBundleRequest asyncOperation, IProgress<float> progress = null, PlayerLoopTiming timing = PlayerLoopTiming.Update, CancellationToken cancellationToken = default(CancellationToken))
|
||||
|
||||
@@ -15,11 +15,15 @@ namespace Cysharp.Threading.Tasks
|
||||
{
|
||||
#region AsyncOperation
|
||||
|
||||
#if !UNITY_2023_1_OR_NEWER
|
||||
// from Unity2023.1.0a15, AsyncOperationAwaitableExtensions.GetAwaiter is defined in UnityEngine.
|
||||
|
||||
public static AsyncOperationAwaiter GetAwaiter(this AsyncOperation asyncOperation)
|
||||
{
|
||||
Error.ThrowArgumentNullException(asyncOperation, nameof(asyncOperation));
|
||||
return new AsyncOperationAwaiter(asyncOperation);
|
||||
}
|
||||
#endif
|
||||
|
||||
public static UniTask WithCancellation(this AsyncOperation asyncOperation, CancellationToken cancellationToken)
|
||||
{
|
||||
|
||||
@@ -688,13 +688,27 @@ namespace Cysharp.Threading.Tasks
|
||||
static void OnCanceled1(object state)
|
||||
{
|
||||
var self = (UnityEventHandlerAsyncEnumerator)state;
|
||||
self.DisposeAsync().Forget();
|
||||
try
|
||||
{
|
||||
self.completionSource.TrySetCanceled(self.cancellationToken1);
|
||||
}
|
||||
finally
|
||||
{
|
||||
self.DisposeAsync().Forget();
|
||||
}
|
||||
}
|
||||
|
||||
static void OnCanceled2(object state)
|
||||
{
|
||||
var self = (UnityEventHandlerAsyncEnumerator)state;
|
||||
self.DisposeAsync().Forget();
|
||||
try
|
||||
{
|
||||
self.completionSource.TrySetCanceled(self.cancellationToken2);
|
||||
}
|
||||
finally
|
||||
{
|
||||
self.DisposeAsync().Forget();
|
||||
}
|
||||
}
|
||||
|
||||
public UniTask DisposeAsync()
|
||||
@@ -706,6 +720,8 @@ namespace Cysharp.Threading.Tasks
|
||||
registration1.Dispose();
|
||||
registration2.Dispose();
|
||||
unityEvent.RemoveListener(unityAction);
|
||||
|
||||
completionSource.TrySetCanceled();
|
||||
}
|
||||
|
||||
return default;
|
||||
@@ -793,13 +809,27 @@ namespace Cysharp.Threading.Tasks
|
||||
static void OnCanceled1(object state)
|
||||
{
|
||||
var self = (UnityEventHandlerAsyncEnumerator)state;
|
||||
self.DisposeAsync().Forget();
|
||||
try
|
||||
{
|
||||
self.completionSource.TrySetCanceled(self.cancellationToken1);
|
||||
}
|
||||
finally
|
||||
{
|
||||
self.DisposeAsync().Forget();
|
||||
}
|
||||
}
|
||||
|
||||
static void OnCanceled2(object state)
|
||||
{
|
||||
var self = (UnityEventHandlerAsyncEnumerator)state;
|
||||
self.DisposeAsync().Forget();
|
||||
try
|
||||
{
|
||||
self.completionSource.TrySetCanceled(self.cancellationToken2);
|
||||
}
|
||||
finally
|
||||
{
|
||||
self.DisposeAsync().Forget();
|
||||
}
|
||||
}
|
||||
|
||||
public UniTask DisposeAsync()
|
||||
@@ -815,6 +845,8 @@ namespace Cysharp.Threading.Tasks
|
||||
disp.Dispose();
|
||||
}
|
||||
unityEvent.RemoveListener(unityAction);
|
||||
|
||||
completionSource.TrySetCanceled();
|
||||
}
|
||||
|
||||
return default;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#if ENABLE_UNITYWEBREQUEST && (!UNITY_2019_1_OR_NEWER || UNITASK_WEBREQUEST_SUPPORT)
|
||||
#if ENABLE_UNITYWEBREQUEST && (!UNITY_2019_1_OR_NEWER || UNITASK_WEBREQUEST_SUPPORT)
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
@@ -49,7 +49,7 @@ namespace Cysharp.Threading.Tasks
|
||||
{
|
||||
if (msg == null)
|
||||
{
|
||||
if (Text != null)
|
||||
if(!string.IsNullOrWhiteSpace(Text))
|
||||
{
|
||||
msg = Error + Environment.NewLine + Text;
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
"name": "com.cysharp.unitask",
|
||||
"displayName": "UniTask",
|
||||
"author": { "name": "Cysharp, Inc.", "url": "https://cysharp.co.jp/en/" },
|
||||
"version": "2.3.0",
|
||||
"version": "2.3.2",
|
||||
"unity": "2018.4",
|
||||
"description": "Provides an efficient async/await integration to Unity.",
|
||||
"keywords": [ "async/await", "async", "Task", "UniTask" ],
|
||||
|
||||
@@ -310,33 +310,33 @@ namespace Cysharp.Threading.TasksTests
|
||||
yield return null;
|
||||
}
|
||||
|
||||
[UnityTest]
|
||||
public IEnumerator ExceptionUnobserved1() => UniTask.ToCoroutine(async () =>
|
||||
{
|
||||
bool calledEx = false;
|
||||
Action<Exception> action = exx =>
|
||||
{
|
||||
calledEx = true;
|
||||
exx.Message.Should().Be("MyException");
|
||||
};
|
||||
//[UnityTest]
|
||||
//public IEnumerator ExceptionUnobserved1() => UniTask.ToCoroutine(async () =>
|
||||
//{
|
||||
// bool calledEx = false;
|
||||
// Action<Exception> action = exx =>
|
||||
// {
|
||||
// calledEx = true;
|
||||
// exx.Message.Should().Be("MyException");
|
||||
// };
|
||||
|
||||
UniTaskScheduler.UnobservedTaskException += action;
|
||||
// UniTaskScheduler.UnobservedTaskException += action;
|
||||
|
||||
var ex = InException1();
|
||||
ex = default(UniTask);
|
||||
// var ex = InException1();
|
||||
// ex = default(UniTask);
|
||||
|
||||
await UniTask.DelayFrame(3);
|
||||
// await UniTask.DelayFrame(3);
|
||||
|
||||
GC.Collect();
|
||||
GC.WaitForPendingFinalizers();
|
||||
GC.Collect();
|
||||
// GC.Collect();
|
||||
// GC.WaitForPendingFinalizers();
|
||||
// GC.Collect();
|
||||
|
||||
await UniTask.DelayFrame(1);
|
||||
// await UniTask.DelayFrame(1);
|
||||
|
||||
calledEx.Should().BeTrue();
|
||||
// calledEx.Should().BeTrue();
|
||||
|
||||
UniTaskScheduler.UnobservedTaskException -= action;
|
||||
});
|
||||
// UniTaskScheduler.UnobservedTaskException -= action;
|
||||
//});
|
||||
|
||||
[UnityTest]
|
||||
public IEnumerator ExceptionUnobserved2() => UniTask.ToCoroutine(async () =>
|
||||
|
||||
Reference in New Issue
Block a user