From d565f39dde256fa18d876054f9bfd991e6f6d3fa Mon Sep 17 00:00:00 2001 From: neuecc Date: Tue, 5 May 2020 19:46:43 +0900 Subject: [PATCH] renaming namspeac to Cysharp.Threading.Tasks and move to under Plugins/UniTask --- Assets/Editor/PackageExporter.cs | 4 +-- Assets/Plugins.meta | 2 +- ...System.Runtime.CompilerServices.Unsafe.dll | Bin 23600 -> 0 bytes ...m.Runtime.CompilerServices.Unsafe.dll.meta | 33 ------------------ .../System.Threading.Tasks.Extensions.dll | Bin 33048 -> 0 bytes ...System.Threading.Tasks.Extensions.dll.meta | 33 ------------------ .../UniTask.meta} | 2 +- .../UniTask}/AsyncLazy.cs | 2 +- .../UniTask}/AsyncLazy.cs.meta | 0 .../UniTask}/AsyncUnit.cs | 2 +- .../UniTask}/AsyncUnit.cs.meta | 0 .../CancellationTokenEqualityComparer.cs | 2 +- .../CancellationTokenEqualityComparer.cs.meta | 0 .../UniTask}/CancellationTokenExtensions.cs | 2 +- .../CancellationTokenExtensions.cs.meta | 0 .../CancellationTokenSourceExtensions.cs | 4 +-- .../CancellationTokenSourceExtensions.cs.meta | 0 .../UniTask}/CompilerServices.meta | 0 .../AsyncMethodBuilderAttribute.cs | 0 .../AsyncMethodBuilderAttribute.cs.meta | 0 .../AsyncUniTaskMethodBuilder.cs | 2 +- .../AsyncUniTaskMethodBuilder.cs.meta | 0 .../AsyncUniTaskVoidMethodBuilder.cs | 2 +- .../AsyncUniTaskVoidMethodBuilder.cs.meta | 0 .../CompilerServices/MoveNextRunner.cs | 4 +-- .../CompilerServices/MoveNextRunner.cs.meta | 0 .../UniTask}/Editor.meta | 0 .../UniTask}/Editor/SplitterGUILayout.cs | 2 +- .../UniTask}/Editor/SplitterGUILayout.cs.meta | 0 .../UniTask}/Editor/UniRx.Async.Editor.asmdef | 0 .../Editor/UniRx.Async.Editor.asmdef.meta | 0 .../UniTask}/Editor/UniTaskTrackerTreeView.cs | 4 +-- .../Editor/UniTaskTrackerTreeView.cs.meta | 0 .../UniTask}/Editor/UniTaskTrackerWindow.cs | 4 +-- .../Editor/UniTaskTrackerWindow.cs.meta | 0 .../UniTask}/EnumerableAsyncExtensions.cs | 2 +- .../EnumerableAsyncExtensions.cs.meta | 0 .../UniTask}/EnumeratorAsyncExtensions.cs | 4 +-- .../EnumeratorAsyncExtensions.cs.meta | 0 .../UniTask}/ExceptionExtensions.cs | 2 +- .../UniTask}/ExceptionExtensions.cs.meta | 0 .../UniTask}/IUniTaskSource.cs | 2 +- .../UniTask}/IUniTaskSource.cs.meta | 0 .../UniTask}/Internal.meta | 0 .../UniTask}/Internal/ArrayPool.cs | 2 +- .../UniTask}/Internal/ArrayPool.cs.meta | 0 .../UniTask}/Internal/ArrayPoolUtil.cs | 2 +- .../UniTask}/Internal/ArrayPoolUtil.cs.meta | 0 .../UniTask}/Internal/ArrayUtil.cs | 2 +- .../UniTask}/Internal/ArrayUtil.cs.meta | 0 .../UniTask}/Internal/ContinuationQueue.cs | 2 +- .../Internal/ContinuationQueue.cs.meta | 0 .../Internal/DiagnosticsExtensions.cs | 12 +++---- .../Internal/DiagnosticsExtensions.cs.meta | 0 .../UniTask}/Internal/Error.cs | 2 +- .../UniTask}/Internal/Error.cs.meta | 0 .../UniTask}/Internal/Hack.cs | 2 +- .../UniTask}/Internal/Hack.cs.meta | 0 .../UniTask}/Internal/MinimumQueue.cs | 2 +- .../UniTask}/Internal/MinimumQueue.cs.meta | 0 .../UniTask}/Internal/PlayerLoopRunner.cs | 2 +- .../Internal/PlayerLoopRunner.cs.meta | 0 .../UniTask}/Internal/PromisePool.cs | 2 +- .../UniTask}/Internal/PromisePool.cs.meta | 0 .../Internal/RuntimeHelpersAbstraction.cs | 2 +- .../RuntimeHelpersAbstraction.cs.meta | 0 .../UniTask}/Internal/StatePool.cs | 2 +- .../UniTask}/Internal/StatePool.cs.meta | 0 .../UniTask}/Internal/TaskTracker.cs | 4 +-- .../UniTask}/Internal/TaskTracker.cs.meta | 0 .../Internal/UnityEqualityComparer.cs | 2 +- .../Internal/UnityEqualityComparer.cs.meta | 0 .../UniTask}/Internal/WeakDictionary.cs | 2 +- .../UniTask}/Internal/WeakDictionary.cs.meta | 0 .../UniTask}/PlayerLoopHelper.cs | 4 +-- .../UniTask}/PlayerLoopHelper.cs.meta | 0 .../UniTask}/Progress.cs | 4 +-- .../UniTask}/Progress.cs.meta | 0 .../UniTask}/Triggers.meta | 0 .../UniTask}/Triggers/AsyncAwakeTrigger.cs | 2 +- .../Triggers/AsyncAwakeTrigger.cs.meta | 0 .../UniTask}/Triggers/AsyncDestroyTrigger.cs | 2 +- .../Triggers/AsyncDestroyTrigger.cs.meta | 0 .../UniTask}/Triggers/AsyncStartTrigger.cs | 2 +- .../Triggers/AsyncStartTrigger.cs.meta | 0 .../UniTask}/Triggers/AsyncTriggerBase.cs | 4 +-- .../Triggers/AsyncTriggerBase.cs.meta | 0 .../Triggers/AsyncTriggerExtensions.cs | 6 ++-- .../Triggers/AsyncTriggerExtensions.cs.meta | 0 .../Triggers/MonoBehaviourMessagesTriggers.cs | 2 +- .../MonoBehaviourMessagesTriggers.cs.meta | 0 .../Triggers/MonoBehaviourMessagesTriggers.tt | 2 +- .../MonoBehaviourMessagesTriggers.tt.meta | 0 .../UniTask}/UniRx.Async.asmdef | 0 .../UniTask}/UniRx.Async.asmdef.meta | 0 .../UniTask}/UniTask.Bridge.cs | 2 +- .../UniTask}/UniTask.Bridge.cs.meta | 0 .../UniTask}/UniTask.Delay.cs | 4 +-- .../UniTask}/UniTask.Delay.cs.meta | 0 .../UniTask}/UniTask.Factory.cs | 4 +-- .../UniTask}/UniTask.Factory.cs.meta | 0 .../UniTask}/UniTask.Run.cs | 2 +- .../UniTask}/UniTask.Run.cs.meta | 0 .../UniTask}/UniTask.Threading.cs | 4 +-- .../UniTask}/UniTask.Threading.cs.meta | 0 .../UniTask}/UniTask.WaitUntil.cs | 4 +-- .../UniTask}/UniTask.WaitUntil.cs.meta | 0 .../UniTask}/UniTask.WhenAll.Generated.cs | 4 +-- .../UniTask.WhenAll.Generated.cs.meta | 0 .../UniTask}/UniTask.WhenAll.Generated.tt | 4 +-- .../UniTask.WhenAll.Generated.tt.meta | 0 .../UniTask}/UniTask.WhenAll.cs | 4 +-- .../UniTask}/UniTask.WhenAll.cs.meta | 0 .../UniTask}/UniTask.WhenAny.Generated.cs | 4 +-- .../UniTask.WhenAny.Generated.cs.meta | 0 .../UniTask}/UniTask.WhenAny.Generated.tt | 4 +-- .../UniTask.WhenAny.Generated.tt.meta | 0 .../UniTask}/UniTask.WhenAny.cs | 4 +-- .../UniTask}/UniTask.WhenAny.cs.meta | 0 .../UniTask}/UniTask.cs | 6 ++-- .../UniTask}/UniTask.cs.meta | 0 .../UniTask}/UniTaskCompletionSource.cs | 4 +-- .../UniTask}/UniTaskCompletionSource.cs.meta | 0 .../UniTask}/UniTaskExtensions.Shorthand.cs | 2 +- .../UniTaskExtensions.Shorthand.cs.meta | 0 .../UniTask}/UniTaskExtensions.Shorthand.tt | 2 +- .../UniTaskExtensions.Shorthand.tt.meta | 0 .../UniTask}/UniTaskExtensions.cs | 4 +-- .../UniTask}/UniTaskExtensions.cs.meta | 0 .../UniTask}/UniTaskObservableExtensions.cs | 8 ++--- .../UniTaskObservableExtensions.cs.meta | 0 .../UniTask}/UniTaskScheduler.cs | 2 +- .../UniTask}/UniTaskScheduler.cs.meta | 0 .../UniTask}/UniTaskVoid.cs | 4 +-- .../UniTask}/UniTaskVoid.cs.meta | 0 .../UniTask}/UnityAsyncExtensions.Jobs.cs | 2 +- .../UnityAsyncExtensions.Jobs.cs.meta | 0 .../UnityAsyncExtensions.MonoBehaviour.cs | 2 +- ...UnityAsyncExtensions.MonoBehaviour.cs.meta | 0 .../UniTask}/UnityAsyncExtensions.cs | 4 +-- .../UniTask}/UnityAsyncExtensions.cs.meta | 0 .../UniTask}/UnityAsyncExtensions.tt | 4 +-- .../UniTask}/UnityAsyncExtensions.tt.meta | 0 .../UniTask}/UnityAsyncExtensions.uGUI.cs | 4 +-- .../UnityAsyncExtensions.uGUI.cs.meta | 0 .../UniTask}/package.json | 0 .../UniTask}/package.json.meta | 0 Assets/Scenes/SandboxMain.cs | 2 +- Assets/Tests/AsyncTest.cs | 5 ++- Assets/Tests/Editor/AsyncTestEditor.cs | 5 ++- Assets/Tests/Editor/RunTestEditor.cs | 5 ++- Assets/Tests/Editor/WhenAnyTestEditor.cs | 5 ++- Assets/Tests/RunTest.cs | 5 ++- Assets/Tests/WhenAnyTest.cs | 5 ++- 154 files changed, 118 insertions(+), 190 deletions(-) delete mode 100644 Assets/Plugins/System.Runtime.CompilerServices.Unsafe.dll delete mode 100644 Assets/Plugins/System.Runtime.CompilerServices.Unsafe.dll.meta delete mode 100644 Assets/Plugins/System.Threading.Tasks.Extensions.dll delete mode 100644 Assets/Plugins/System.Threading.Tasks.Extensions.dll.meta rename Assets/{UniRx.Async.meta => Plugins/UniTask.meta} (77%) rename Assets/{UniRx.Async => Plugins/UniTask}/AsyncLazy.cs (98%) rename Assets/{UniRx.Async => Plugins/UniTask}/AsyncLazy.cs.meta (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/AsyncUnit.cs (93%) rename Assets/{UniRx.Async => Plugins/UniTask}/AsyncUnit.cs.meta (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/CancellationTokenEqualityComparer.cs (94%) rename Assets/{UniRx.Async => Plugins/UniTask}/CancellationTokenEqualityComparer.cs.meta (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/CancellationTokenExtensions.cs (98%) rename Assets/{UniRx.Async => Plugins/UniTask}/CancellationTokenExtensions.cs.meta (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/CancellationTokenSourceExtensions.cs (96%) rename Assets/{UniRx.Async => Plugins/UniTask}/CancellationTokenSourceExtensions.cs.meta (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/CompilerServices.meta (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/CompilerServices/AsyncMethodBuilderAttribute.cs (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/CompilerServices/AsyncMethodBuilderAttribute.cs.meta (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/CompilerServices/AsyncUniTaskMethodBuilder.cs (99%) rename Assets/{UniRx.Async => Plugins/UniTask}/CompilerServices/AsyncUniTaskMethodBuilder.cs.meta (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/CompilerServices/AsyncUniTaskVoidMethodBuilder.cs (98%) rename Assets/{UniRx.Async => Plugins/UniTask}/CompilerServices/AsyncUniTaskVoidMethodBuilder.cs.meta (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/CompilerServices/MoveNextRunner.cs (93%) rename Assets/{UniRx.Async => Plugins/UniTask}/CompilerServices/MoveNextRunner.cs.meta (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/Editor.meta (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/Editor/SplitterGUILayout.cs (98%) rename Assets/{UniRx.Async => Plugins/UniTask}/Editor/SplitterGUILayout.cs.meta (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/Editor/UniRx.Async.Editor.asmdef (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/Editor/UniRx.Async.Editor.asmdef.meta (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/Editor/UniTaskTrackerTreeView.cs (98%) rename Assets/{UniRx.Async => Plugins/UniTask}/Editor/UniTaskTrackerTreeView.cs.meta (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/Editor/UniTaskTrackerWindow.cs (98%) rename Assets/{UniRx.Async => Plugins/UniTask}/Editor/UniTaskTrackerWindow.cs.meta (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/EnumerableAsyncExtensions.cs (96%) rename Assets/{UniRx.Async => Plugins/UniTask}/EnumerableAsyncExtensions.cs.meta (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/EnumeratorAsyncExtensions.cs (98%) rename Assets/{UniRx.Async => Plugins/UniTask}/EnumeratorAsyncExtensions.cs.meta (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/ExceptionExtensions.cs (89%) rename Assets/{UniRx.Async => Plugins/UniTask}/ExceptionExtensions.cs.meta (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/IUniTaskSource.cs (98%) rename Assets/{UniRx.Async => Plugins/UniTask}/IUniTaskSource.cs.meta (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/Internal.meta (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/Internal/ArrayPool.cs (98%) rename Assets/{UniRx.Async => Plugins/UniTask}/Internal/ArrayPool.cs.meta (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/Internal/ArrayPoolUtil.cs (98%) rename Assets/{UniRx.Async => Plugins/UniTask}/Internal/ArrayPoolUtil.cs.meta (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/Internal/ArrayUtil.cs (97%) rename Assets/{UniRx.Async => Plugins/UniTask}/Internal/ArrayUtil.cs.meta (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/Internal/ContinuationQueue.cs (98%) rename Assets/{UniRx.Async => Plugins/UniTask}/Internal/ContinuationQueue.cs.meta (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/Internal/DiagnosticsExtensions.cs (92%) rename Assets/{UniRx.Async => Plugins/UniTask}/Internal/DiagnosticsExtensions.cs.meta (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/Internal/Error.cs (97%) rename Assets/{UniRx.Async => Plugins/UniTask}/Internal/Error.cs.meta (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/Internal/Hack.cs (89%) rename Assets/{UniRx.Async => Plugins/UniTask}/Internal/Hack.cs.meta (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/Internal/MinimumQueue.cs (98%) rename Assets/{UniRx.Async => Plugins/UniTask}/Internal/MinimumQueue.cs.meta (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/Internal/PlayerLoopRunner.cs (99%) rename Assets/{UniRx.Async => Plugins/UniTask}/Internal/PlayerLoopRunner.cs.meta (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/Internal/PromisePool.cs (96%) rename Assets/{UniRx.Async => Plugins/UniTask}/Internal/PromisePool.cs.meta (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/Internal/RuntimeHelpersAbstraction.cs (97%) rename Assets/{UniRx.Async => Plugins/UniTask}/Internal/RuntimeHelpersAbstraction.cs.meta (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/Internal/StatePool.cs (98%) rename Assets/{UniRx.Async => Plugins/UniTask}/Internal/StatePool.cs.meta (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/Internal/TaskTracker.cs (98%) rename Assets/{UniRx.Async => Plugins/UniTask}/Internal/TaskTracker.cs.meta (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/Internal/UnityEqualityComparer.cs (99%) rename Assets/{UniRx.Async => Plugins/UniTask}/Internal/UnityEqualityComparer.cs.meta (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/Internal/WeakDictionary.cs (99%) rename Assets/{UniRx.Async => Plugins/UniTask}/Internal/WeakDictionary.cs.meta (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/PlayerLoopHelper.cs (99%) rename Assets/{UniRx.Async => Plugins/UniTask}/PlayerLoopHelper.cs.meta (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/Progress.cs (96%) rename Assets/{UniRx.Async => Plugins/UniTask}/Progress.cs.meta (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/Triggers.meta (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/Triggers/AsyncAwakeTrigger.cs (97%) rename Assets/{UniRx.Async => Plugins/UniTask}/Triggers/AsyncAwakeTrigger.cs.meta (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/Triggers/AsyncDestroyTrigger.cs (98%) rename Assets/{UniRx.Async => Plugins/UniTask}/Triggers/AsyncDestroyTrigger.cs.meta (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/Triggers/AsyncStartTrigger.cs (97%) rename Assets/{UniRx.Async => Plugins/UniTask}/Triggers/AsyncStartTrigger.cs.meta (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/Triggers/AsyncTriggerBase.cs (99%) rename Assets/{UniRx.Async => Plugins/UniTask}/Triggers/AsyncTriggerBase.cs.meta (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/Triggers/AsyncTriggerExtensions.cs (95%) rename Assets/{UniRx.Async => Plugins/UniTask}/Triggers/AsyncTriggerExtensions.cs.meta (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/Triggers/MonoBehaviourMessagesTriggers.cs (99%) rename Assets/{UniRx.Async => Plugins/UniTask}/Triggers/MonoBehaviourMessagesTriggers.cs.meta (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/Triggers/MonoBehaviourMessagesTriggers.tt (99%) rename Assets/{UniRx.Async => Plugins/UniTask}/Triggers/MonoBehaviourMessagesTriggers.tt.meta (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/UniRx.Async.asmdef (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/UniRx.Async.asmdef.meta (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/UniTask.Bridge.cs (91%) rename Assets/{UniRx.Async => Plugins/UniTask}/UniTask.Bridge.cs.meta (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/UniTask.Delay.cs (99%) rename Assets/{UniRx.Async => Plugins/UniTask}/UniTask.Delay.cs.meta (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/UniTask.Factory.cs (97%) rename Assets/{UniRx.Async => Plugins/UniTask}/UniTask.Factory.cs.meta (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/UniTask.Run.cs (98%) rename Assets/{UniRx.Async => Plugins/UniTask}/UniTask.Run.cs.meta (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/UniTask.Threading.cs (98%) rename Assets/{UniRx.Async => Plugins/UniTask}/UniTask.Threading.cs.meta (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/UniTask.WaitUntil.cs (99%) rename Assets/{UniRx.Async => Plugins/UniTask}/UniTask.WaitUntil.cs.meta (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/UniTask.WhenAll.Generated.cs (99%) rename Assets/{UniRx.Async => Plugins/UniTask}/UniTask.WhenAll.Generated.cs.meta (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/UniTask.WhenAll.Generated.tt (98%) rename Assets/{UniRx.Async => Plugins/UniTask}/UniTask.WhenAll.Generated.tt.meta (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/UniTask.WhenAll.cs (98%) rename Assets/{UniRx.Async => Plugins/UniTask}/UniTask.WhenAll.cs.meta (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/UniTask.WhenAny.Generated.cs (99%) rename Assets/{UniRx.Async => Plugins/UniTask}/UniTask.WhenAny.Generated.cs.meta (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/UniTask.WhenAny.Generated.tt (98%) rename Assets/{UniRx.Async => Plugins/UniTask}/UniTask.WhenAny.Generated.tt.meta (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/UniTask.WhenAny.cs (99%) rename Assets/{UniRx.Async => Plugins/UniTask}/UniTask.WhenAny.cs.meta (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/UniTask.cs (99%) rename Assets/{UniRx.Async => Plugins/UniTask}/UniTask.cs.meta (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/UniTaskCompletionSource.cs (99%) rename Assets/{UniRx.Async => Plugins/UniTask}/UniTaskCompletionSource.cs.meta (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/UniTaskExtensions.Shorthand.cs (99%) rename Assets/{UniRx.Async => Plugins/UniTask}/UniTaskExtensions.Shorthand.cs.meta (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/UniTaskExtensions.Shorthand.tt (98%) rename Assets/{UniRx.Async => Plugins/UniTask}/UniTaskExtensions.Shorthand.tt.meta (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/UniTaskExtensions.cs (99%) rename Assets/{UniRx.Async => Plugins/UniTask}/UniTaskExtensions.cs.meta (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/UniTaskObservableExtensions.cs (98%) rename Assets/{UniRx.Async => Plugins/UniTask}/UniTaskObservableExtensions.cs.meta (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/UniTaskScheduler.cs (98%) rename Assets/{UniRx.Async => Plugins/UniTask}/UniTaskScheduler.cs.meta (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/UniTaskVoid.cs (92%) rename Assets/{UniRx.Async => Plugins/UniTask}/UniTaskVoid.cs.meta (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/UnityAsyncExtensions.Jobs.cs (98%) rename Assets/{UniRx.Async => Plugins/UniTask}/UnityAsyncExtensions.Jobs.cs.meta (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/UnityAsyncExtensions.MonoBehaviour.cs (91%) rename Assets/{UniRx.Async => Plugins/UniTask}/UnityAsyncExtensions.MonoBehaviour.cs.meta (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/UnityAsyncExtensions.cs (99%) rename Assets/{UniRx.Async => Plugins/UniTask}/UnityAsyncExtensions.cs.meta (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/UnityAsyncExtensions.tt (99%) rename Assets/{UniRx.Async => Plugins/UniTask}/UnityAsyncExtensions.tt.meta (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/UnityAsyncExtensions.uGUI.cs (99%) rename Assets/{UniRx.Async => Plugins/UniTask}/UnityAsyncExtensions.uGUI.cs.meta (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/package.json (100%) rename Assets/{UniRx.Async => Plugins/UniTask}/package.json.meta (100%) diff --git a/Assets/Editor/PackageExporter.cs b/Assets/Editor/PackageExporter.cs index 1e3fa93..d1e8327 100644 --- a/Assets/Editor/PackageExporter.cs +++ b/Assets/Editor/PackageExporter.cs @@ -12,8 +12,8 @@ public static class PackageExporter public static void Export() { // configure - var root = "UniRx.Async"; - var exportPath = "./UniRx.Async.unitypackage"; + var root = "UniTask"; + var exportPath = "./UniTask.unitypackage"; var path = Path.Combine(Application.dataPath, root); var assets = Directory.EnumerateFiles(path, "*", SearchOption.AllDirectories) diff --git a/Assets/Plugins.meta b/Assets/Plugins.meta index 4d1ab8a..1584fc7 100644 --- a/Assets/Plugins.meta +++ b/Assets/Plugins.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 14eb6ba721535664b9d31e3a2d7664f9 +guid: b42c9a22c4f7bc7448ed60496a4dc359 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Plugins/System.Runtime.CompilerServices.Unsafe.dll b/Assets/Plugins/System.Runtime.CompilerServices.Unsafe.dll deleted file mode 100644 index 3156239266db9cceede249731f00c3822e479a1f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23600 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 OyIXQg_#$)@0sTLk9O=pc diff --git a/Assets/Plugins/System.Runtime.CompilerServices.Unsafe.dll.meta b/Assets/Plugins/System.Runtime.CompilerServices.Unsafe.dll.meta deleted file mode 100644 index 4f6fc19..0000000 --- a/Assets/Plugins/System.Runtime.CompilerServices.Unsafe.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: 28705d6096348bb4893f8f783cd912bb -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/System.Threading.Tasks.Extensions.dll b/Assets/Plugins/System.Threading.Tasks.Extensions.dll deleted file mode 100644 index e059050bb2066f749b6e37a5b42e4bffc3f48a70..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 33048 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 diff --git a/Assets/Plugins/System.Threading.Tasks.Extensions.dll.meta b/Assets/Plugins/System.Threading.Tasks.Extensions.dll.meta deleted file mode 100644 index ce46b66..0000000 --- a/Assets/Plugins/System.Threading.Tasks.Extensions.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: 563706d062bb0b545959896ab500001a -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/UniRx.Async.meta b/Assets/Plugins/UniTask.meta similarity index 77% rename from Assets/UniRx.Async.meta rename to Assets/Plugins/UniTask.meta index e996cef..4e36c38 100644 --- a/Assets/UniRx.Async.meta +++ b/Assets/Plugins/UniTask.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 38249c6f05d584f44a219b4c97790f99 +guid: 4929ac1f6fcfe944a99529b6fb5bd9ef folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/UniRx.Async/AsyncLazy.cs b/Assets/Plugins/UniTask/AsyncLazy.cs similarity index 98% rename from Assets/UniRx.Async/AsyncLazy.cs rename to Assets/Plugins/UniTask/AsyncLazy.cs index 9a11b2f..176c0d0 100644 --- a/Assets/UniRx.Async/AsyncLazy.cs +++ b/Assets/Plugins/UniTask/AsyncLazy.cs @@ -4,7 +4,7 @@ using System; using System.Threading; -namespace UniRx.Async +namespace Cysharp.Threading.Tasks { public class AsyncLazy { diff --git a/Assets/UniRx.Async/AsyncLazy.cs.meta b/Assets/Plugins/UniTask/AsyncLazy.cs.meta similarity index 100% rename from Assets/UniRx.Async/AsyncLazy.cs.meta rename to Assets/Plugins/UniTask/AsyncLazy.cs.meta diff --git a/Assets/UniRx.Async/AsyncUnit.cs b/Assets/Plugins/UniTask/AsyncUnit.cs similarity index 93% rename from Assets/UniRx.Async/AsyncUnit.cs rename to Assets/Plugins/UniTask/AsyncUnit.cs index 1a8f09d..db32c58 100644 --- a/Assets/UniRx.Async/AsyncUnit.cs +++ b/Assets/Plugins/UniTask/AsyncUnit.cs @@ -3,7 +3,7 @@ using System; -namespace UniRx.Async +namespace Cysharp.Threading.Tasks { public struct AsyncUnit : IEquatable { diff --git a/Assets/UniRx.Async/AsyncUnit.cs.meta b/Assets/Plugins/UniTask/AsyncUnit.cs.meta similarity index 100% rename from Assets/UniRx.Async/AsyncUnit.cs.meta rename to Assets/Plugins/UniTask/AsyncUnit.cs.meta diff --git a/Assets/UniRx.Async/CancellationTokenEqualityComparer.cs b/Assets/Plugins/UniTask/CancellationTokenEqualityComparer.cs similarity index 94% rename from Assets/UniRx.Async/CancellationTokenEqualityComparer.cs rename to Assets/Plugins/UniTask/CancellationTokenEqualityComparer.cs index 72cdea2..8052791 100644 --- a/Assets/UniRx.Async/CancellationTokenEqualityComparer.cs +++ b/Assets/Plugins/UniTask/CancellationTokenEqualityComparer.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.Threading; -namespace UniRx.Async +namespace Cysharp.Threading.Tasks { public class CancellationTokenEqualityComparer : IEqualityComparer { diff --git a/Assets/UniRx.Async/CancellationTokenEqualityComparer.cs.meta b/Assets/Plugins/UniTask/CancellationTokenEqualityComparer.cs.meta similarity index 100% rename from Assets/UniRx.Async/CancellationTokenEqualityComparer.cs.meta rename to Assets/Plugins/UniTask/CancellationTokenEqualityComparer.cs.meta diff --git a/Assets/UniRx.Async/CancellationTokenExtensions.cs b/Assets/Plugins/UniTask/CancellationTokenExtensions.cs similarity index 98% rename from Assets/UniRx.Async/CancellationTokenExtensions.cs rename to Assets/Plugins/UniTask/CancellationTokenExtensions.cs index 3e0fbc1..d511906 100644 --- a/Assets/UniRx.Async/CancellationTokenExtensions.cs +++ b/Assets/Plugins/UniTask/CancellationTokenExtensions.cs @@ -4,7 +4,7 @@ using System; using System.Threading; -namespace UniRx.Async +namespace Cysharp.Threading.Tasks { public static class CancellationTokenExtensions { diff --git a/Assets/UniRx.Async/CancellationTokenExtensions.cs.meta b/Assets/Plugins/UniTask/CancellationTokenExtensions.cs.meta similarity index 100% rename from Assets/UniRx.Async/CancellationTokenExtensions.cs.meta rename to Assets/Plugins/UniTask/CancellationTokenExtensions.cs.meta diff --git a/Assets/UniRx.Async/CancellationTokenSourceExtensions.cs b/Assets/Plugins/UniTask/CancellationTokenSourceExtensions.cs similarity index 96% rename from Assets/UniRx.Async/CancellationTokenSourceExtensions.cs rename to Assets/Plugins/UniTask/CancellationTokenSourceExtensions.cs index 4b943b0..b980ffe 100644 --- a/Assets/UniRx.Async/CancellationTokenSourceExtensions.cs +++ b/Assets/Plugins/UniTask/CancellationTokenSourceExtensions.cs @@ -3,10 +3,10 @@ using System.Threading; using UnityEngine; -using UniRx.Async.Triggers; +using Cysharp.Threading.Tasks.Triggers; using System; -namespace UniRx.Async +namespace Cysharp.Threading.Tasks { public static class CancellationTokenSourceExtensions { diff --git a/Assets/UniRx.Async/CancellationTokenSourceExtensions.cs.meta b/Assets/Plugins/UniTask/CancellationTokenSourceExtensions.cs.meta similarity index 100% rename from Assets/UniRx.Async/CancellationTokenSourceExtensions.cs.meta rename to Assets/Plugins/UniTask/CancellationTokenSourceExtensions.cs.meta diff --git a/Assets/UniRx.Async/CompilerServices.meta b/Assets/Plugins/UniTask/CompilerServices.meta similarity index 100% rename from Assets/UniRx.Async/CompilerServices.meta rename to Assets/Plugins/UniTask/CompilerServices.meta diff --git a/Assets/UniRx.Async/CompilerServices/AsyncMethodBuilderAttribute.cs b/Assets/Plugins/UniTask/CompilerServices/AsyncMethodBuilderAttribute.cs similarity index 100% rename from Assets/UniRx.Async/CompilerServices/AsyncMethodBuilderAttribute.cs rename to Assets/Plugins/UniTask/CompilerServices/AsyncMethodBuilderAttribute.cs diff --git a/Assets/UniRx.Async/CompilerServices/AsyncMethodBuilderAttribute.cs.meta b/Assets/Plugins/UniTask/CompilerServices/AsyncMethodBuilderAttribute.cs.meta similarity index 100% rename from Assets/UniRx.Async/CompilerServices/AsyncMethodBuilderAttribute.cs.meta rename to Assets/Plugins/UniTask/CompilerServices/AsyncMethodBuilderAttribute.cs.meta diff --git a/Assets/UniRx.Async/CompilerServices/AsyncUniTaskMethodBuilder.cs b/Assets/Plugins/UniTask/CompilerServices/AsyncUniTaskMethodBuilder.cs similarity index 99% rename from Assets/UniRx.Async/CompilerServices/AsyncUniTaskMethodBuilder.cs rename to Assets/Plugins/UniTask/CompilerServices/AsyncUniTaskMethodBuilder.cs index 0c10c95..0b38d25 100644 --- a/Assets/UniRx.Async/CompilerServices/AsyncUniTaskMethodBuilder.cs +++ b/Assets/Plugins/UniTask/CompilerServices/AsyncUniTaskMethodBuilder.cs @@ -8,7 +8,7 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Security; -namespace UniRx.Async.CompilerServices +namespace Cysharp.Threading.Tasks.CompilerServices { [StructLayout(LayoutKind.Auto)] public struct AsyncUniTaskMethodBuilder diff --git a/Assets/UniRx.Async/CompilerServices/AsyncUniTaskMethodBuilder.cs.meta b/Assets/Plugins/UniTask/CompilerServices/AsyncUniTaskMethodBuilder.cs.meta similarity index 100% rename from Assets/UniRx.Async/CompilerServices/AsyncUniTaskMethodBuilder.cs.meta rename to Assets/Plugins/UniTask/CompilerServices/AsyncUniTaskMethodBuilder.cs.meta diff --git a/Assets/UniRx.Async/CompilerServices/AsyncUniTaskVoidMethodBuilder.cs b/Assets/Plugins/UniTask/CompilerServices/AsyncUniTaskVoidMethodBuilder.cs similarity index 98% rename from Assets/UniRx.Async/CompilerServices/AsyncUniTaskVoidMethodBuilder.cs rename to Assets/Plugins/UniTask/CompilerServices/AsyncUniTaskVoidMethodBuilder.cs index 2a3b43f..1a0728b 100644 --- a/Assets/UniRx.Async/CompilerServices/AsyncUniTaskVoidMethodBuilder.cs +++ b/Assets/Plugins/UniTask/CompilerServices/AsyncUniTaskVoidMethodBuilder.cs @@ -7,7 +7,7 @@ using System.Diagnostics; using System.Runtime.CompilerServices; using System.Security; -namespace UniRx.Async.CompilerServices +namespace Cysharp.Threading.Tasks.CompilerServices { public struct AsyncUniTaskVoidMethodBuilder { diff --git a/Assets/UniRx.Async/CompilerServices/AsyncUniTaskVoidMethodBuilder.cs.meta b/Assets/Plugins/UniTask/CompilerServices/AsyncUniTaskVoidMethodBuilder.cs.meta similarity index 100% rename from Assets/UniRx.Async/CompilerServices/AsyncUniTaskVoidMethodBuilder.cs.meta rename to Assets/Plugins/UniTask/CompilerServices/AsyncUniTaskVoidMethodBuilder.cs.meta diff --git a/Assets/UniRx.Async/CompilerServices/MoveNextRunner.cs b/Assets/Plugins/UniTask/CompilerServices/MoveNextRunner.cs similarity index 93% rename from Assets/UniRx.Async/CompilerServices/MoveNextRunner.cs rename to Assets/Plugins/UniTask/CompilerServices/MoveNextRunner.cs index 89f03a8..12c6a4c 100644 --- a/Assets/UniRx.Async/CompilerServices/MoveNextRunner.cs +++ b/Assets/Plugins/UniTask/CompilerServices/MoveNextRunner.cs @@ -5,9 +5,9 @@ using System; using System.Diagnostics; using System.Runtime.CompilerServices; -using UniRx.Async.Internal; +using Cysharp.Threading.Tasks.Internal; -namespace UniRx.Async.CompilerServices +namespace Cysharp.Threading.Tasks.CompilerServices { internal interface IMoveNextRunner { diff --git a/Assets/UniRx.Async/CompilerServices/MoveNextRunner.cs.meta b/Assets/Plugins/UniTask/CompilerServices/MoveNextRunner.cs.meta similarity index 100% rename from Assets/UniRx.Async/CompilerServices/MoveNextRunner.cs.meta rename to Assets/Plugins/UniTask/CompilerServices/MoveNextRunner.cs.meta diff --git a/Assets/UniRx.Async/Editor.meta b/Assets/Plugins/UniTask/Editor.meta similarity index 100% rename from Assets/UniRx.Async/Editor.meta rename to Assets/Plugins/UniTask/Editor.meta diff --git a/Assets/UniRx.Async/Editor/SplitterGUILayout.cs b/Assets/Plugins/UniTask/Editor/SplitterGUILayout.cs similarity index 98% rename from Assets/UniRx.Async/Editor/SplitterGUILayout.cs rename to Assets/Plugins/UniTask/Editor/SplitterGUILayout.cs index bca6a95..dc0bd2a 100644 --- a/Assets/UniRx.Async/Editor/SplitterGUILayout.cs +++ b/Assets/Plugins/UniTask/Editor/SplitterGUILayout.cs @@ -7,7 +7,7 @@ using System.Reflection; using UnityEditor; using UnityEngine; -namespace UniRx.Async.Editor +namespace Cysharp.Threading.Tasks.Editor { // reflection call of UnityEditor.SplitterGUILayout internal static class SplitterGUILayout diff --git a/Assets/UniRx.Async/Editor/SplitterGUILayout.cs.meta b/Assets/Plugins/UniTask/Editor/SplitterGUILayout.cs.meta similarity index 100% rename from Assets/UniRx.Async/Editor/SplitterGUILayout.cs.meta rename to Assets/Plugins/UniTask/Editor/SplitterGUILayout.cs.meta diff --git a/Assets/UniRx.Async/Editor/UniRx.Async.Editor.asmdef b/Assets/Plugins/UniTask/Editor/UniRx.Async.Editor.asmdef similarity index 100% rename from Assets/UniRx.Async/Editor/UniRx.Async.Editor.asmdef rename to Assets/Plugins/UniTask/Editor/UniRx.Async.Editor.asmdef diff --git a/Assets/UniRx.Async/Editor/UniRx.Async.Editor.asmdef.meta b/Assets/Plugins/UniTask/Editor/UniRx.Async.Editor.asmdef.meta similarity index 100% rename from Assets/UniRx.Async/Editor/UniRx.Async.Editor.asmdef.meta rename to Assets/Plugins/UniTask/Editor/UniRx.Async.Editor.asmdef.meta diff --git a/Assets/UniRx.Async/Editor/UniTaskTrackerTreeView.cs b/Assets/Plugins/UniTask/Editor/UniTaskTrackerTreeView.cs similarity index 98% rename from Assets/UniRx.Async/Editor/UniTaskTrackerTreeView.cs rename to Assets/Plugins/UniTask/Editor/UniTaskTrackerTreeView.cs index 661b4c0..377d0da 100644 --- a/Assets/UniRx.Async/Editor/UniTaskTrackerTreeView.cs +++ b/Assets/Plugins/UniTask/Editor/UniTaskTrackerTreeView.cs @@ -8,11 +8,11 @@ using System.Linq; using System.Reflection; using System; using UnityEditor.IMGUI.Controls; -using UniRx.Async.Internal; +using Cysharp.Threading.Tasks.Internal; using System.Text; using System.Text.RegularExpressions; -namespace UniRx.Async.Editor +namespace Cysharp.Threading.Tasks.Editor { public class UniTaskTrackerViewItem : TreeViewItem { diff --git a/Assets/UniRx.Async/Editor/UniTaskTrackerTreeView.cs.meta b/Assets/Plugins/UniTask/Editor/UniTaskTrackerTreeView.cs.meta similarity index 100% rename from Assets/UniRx.Async/Editor/UniTaskTrackerTreeView.cs.meta rename to Assets/Plugins/UniTask/Editor/UniTaskTrackerTreeView.cs.meta diff --git a/Assets/UniRx.Async/Editor/UniTaskTrackerWindow.cs b/Assets/Plugins/UniTask/Editor/UniTaskTrackerWindow.cs similarity index 98% rename from Assets/UniRx.Async/Editor/UniTaskTrackerWindow.cs rename to Assets/Plugins/UniTask/Editor/UniTaskTrackerWindow.cs index 9f5447e..08027a7 100644 --- a/Assets/UniRx.Async/Editor/UniTaskTrackerWindow.cs +++ b/Assets/Plugins/UniTask/Editor/UniTaskTrackerWindow.cs @@ -8,9 +8,9 @@ using System.Linq; using System.Reflection; using System; using UnityEditor.IMGUI.Controls; -using UniRx.Async.Internal; +using Cysharp.Threading.Tasks.Internal; -namespace UniRx.Async.Editor +namespace Cysharp.Threading.Tasks.Editor { public class UniTaskTrackerWindow : EditorWindow { diff --git a/Assets/UniRx.Async/Editor/UniTaskTrackerWindow.cs.meta b/Assets/Plugins/UniTask/Editor/UniTaskTrackerWindow.cs.meta similarity index 100% rename from Assets/UniRx.Async/Editor/UniTaskTrackerWindow.cs.meta rename to Assets/Plugins/UniTask/Editor/UniTaskTrackerWindow.cs.meta diff --git a/Assets/UniRx.Async/EnumerableAsyncExtensions.cs b/Assets/Plugins/UniTask/EnumerableAsyncExtensions.cs similarity index 96% rename from Assets/UniRx.Async/EnumerableAsyncExtensions.cs rename to Assets/Plugins/UniTask/EnumerableAsyncExtensions.cs index 344ccc4..5ab19bb 100644 --- a/Assets/UniRx.Async/EnumerableAsyncExtensions.cs +++ b/Assets/Plugins/UniTask/EnumerableAsyncExtensions.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; -namespace UniRx.Async +namespace Cysharp.Threading.Tasks { public static class EnumerableAsyncExtensions { diff --git a/Assets/UniRx.Async/EnumerableAsyncExtensions.cs.meta b/Assets/Plugins/UniTask/EnumerableAsyncExtensions.cs.meta similarity index 100% rename from Assets/UniRx.Async/EnumerableAsyncExtensions.cs.meta rename to Assets/Plugins/UniTask/EnumerableAsyncExtensions.cs.meta diff --git a/Assets/UniRx.Async/EnumeratorAsyncExtensions.cs b/Assets/Plugins/UniTask/EnumeratorAsyncExtensions.cs similarity index 98% rename from Assets/UniRx.Async/EnumeratorAsyncExtensions.cs rename to Assets/Plugins/UniTask/EnumeratorAsyncExtensions.cs index 4c66bbb..548d896 100644 --- a/Assets/UniRx.Async/EnumeratorAsyncExtensions.cs +++ b/Assets/Plugins/UniTask/EnumeratorAsyncExtensions.cs @@ -6,10 +6,10 @@ using System.Collections; using System.Reflection; using System.Runtime.ExceptionServices; using System.Threading; -using UniRx.Async.Internal; +using Cysharp.Threading.Tasks.Internal; using UnityEngine; -namespace UniRx.Async +namespace Cysharp.Threading.Tasks { public static class EnumeratorAsyncExtensions { diff --git a/Assets/UniRx.Async/EnumeratorAsyncExtensions.cs.meta b/Assets/Plugins/UniTask/EnumeratorAsyncExtensions.cs.meta similarity index 100% rename from Assets/UniRx.Async/EnumeratorAsyncExtensions.cs.meta rename to Assets/Plugins/UniTask/EnumeratorAsyncExtensions.cs.meta diff --git a/Assets/UniRx.Async/ExceptionExtensions.cs b/Assets/Plugins/UniTask/ExceptionExtensions.cs similarity index 89% rename from Assets/UniRx.Async/ExceptionExtensions.cs rename to Assets/Plugins/UniTask/ExceptionExtensions.cs index eb7d071..1f0da48 100644 --- a/Assets/UniRx.Async/ExceptionExtensions.cs +++ b/Assets/Plugins/UniTask/ExceptionExtensions.cs @@ -2,7 +2,7 @@ using System; -namespace UniRx.Async +namespace Cysharp.Threading.Tasks { public static class ExceptionExtensions { diff --git a/Assets/UniRx.Async/ExceptionExtensions.cs.meta b/Assets/Plugins/UniTask/ExceptionExtensions.cs.meta similarity index 100% rename from Assets/UniRx.Async/ExceptionExtensions.cs.meta rename to Assets/Plugins/UniTask/ExceptionExtensions.cs.meta diff --git a/Assets/UniRx.Async/IUniTaskSource.cs b/Assets/Plugins/UniTask/IUniTaskSource.cs similarity index 98% rename from Assets/UniRx.Async/IUniTaskSource.cs rename to Assets/Plugins/UniTask/IUniTaskSource.cs index d346b36..f646084 100644 --- a/Assets/UniRx.Async/IUniTaskSource.cs +++ b/Assets/Plugins/UniTask/IUniTaskSource.cs @@ -4,7 +4,7 @@ using System; using System.Runtime.CompilerServices; -namespace UniRx.Async +namespace Cysharp.Threading.Tasks { public enum UniTaskStatus { diff --git a/Assets/UniRx.Async/IUniTaskSource.cs.meta b/Assets/Plugins/UniTask/IUniTaskSource.cs.meta similarity index 100% rename from Assets/UniRx.Async/IUniTaskSource.cs.meta rename to Assets/Plugins/UniTask/IUniTaskSource.cs.meta diff --git a/Assets/UniRx.Async/Internal.meta b/Assets/Plugins/UniTask/Internal.meta similarity index 100% rename from Assets/UniRx.Async/Internal.meta rename to Assets/Plugins/UniTask/Internal.meta diff --git a/Assets/UniRx.Async/Internal/ArrayPool.cs b/Assets/Plugins/UniTask/Internal/ArrayPool.cs similarity index 98% rename from Assets/UniRx.Async/Internal/ArrayPool.cs rename to Assets/Plugins/UniTask/Internal/ArrayPool.cs index 5f7907b..961840e 100644 --- a/Assets/UniRx.Async/Internal/ArrayPool.cs +++ b/Assets/Plugins/UniTask/Internal/ArrayPool.cs @@ -4,7 +4,7 @@ using System; using System.Threading; -namespace UniRx.Async.Internal +namespace Cysharp.Threading.Tasks.Internal { // Same interface as System.Buffers.ArrayPool but only provides Shared. diff --git a/Assets/UniRx.Async/Internal/ArrayPool.cs.meta b/Assets/Plugins/UniTask/Internal/ArrayPool.cs.meta similarity index 100% rename from Assets/UniRx.Async/Internal/ArrayPool.cs.meta rename to Assets/Plugins/UniTask/Internal/ArrayPool.cs.meta diff --git a/Assets/UniRx.Async/Internal/ArrayPoolUtil.cs b/Assets/Plugins/UniTask/Internal/ArrayPoolUtil.cs similarity index 98% rename from Assets/UniRx.Async/Internal/ArrayPoolUtil.cs rename to Assets/Plugins/UniTask/Internal/ArrayPoolUtil.cs index 2112582..a3d782f 100644 --- a/Assets/UniRx.Async/Internal/ArrayPoolUtil.cs +++ b/Assets/Plugins/UniTask/Internal/ArrayPoolUtil.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; using System.Runtime.CompilerServices; -namespace UniRx.Async.Internal +namespace Cysharp.Threading.Tasks.Internal { internal static class ArrayPoolUtil { diff --git a/Assets/UniRx.Async/Internal/ArrayPoolUtil.cs.meta b/Assets/Plugins/UniTask/Internal/ArrayPoolUtil.cs.meta similarity index 100% rename from Assets/UniRx.Async/Internal/ArrayPoolUtil.cs.meta rename to Assets/Plugins/UniTask/Internal/ArrayPoolUtil.cs.meta diff --git a/Assets/UniRx.Async/Internal/ArrayUtil.cs b/Assets/Plugins/UniTask/Internal/ArrayUtil.cs similarity index 97% rename from Assets/UniRx.Async/Internal/ArrayUtil.cs rename to Assets/Plugins/UniTask/Internal/ArrayUtil.cs index 33b2df9..b9ca649 100644 --- a/Assets/UniRx.Async/Internal/ArrayUtil.cs +++ b/Assets/Plugins/UniTask/Internal/ArrayUtil.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; using System.Runtime.CompilerServices; -namespace UniRx.Async.Internal +namespace Cysharp.Threading.Tasks.Internal { internal static class ArrayUtil { diff --git a/Assets/UniRx.Async/Internal/ArrayUtil.cs.meta b/Assets/Plugins/UniTask/Internal/ArrayUtil.cs.meta similarity index 100% rename from Assets/UniRx.Async/Internal/ArrayUtil.cs.meta rename to Assets/Plugins/UniTask/Internal/ArrayUtil.cs.meta diff --git a/Assets/UniRx.Async/Internal/ContinuationQueue.cs b/Assets/Plugins/UniTask/Internal/ContinuationQueue.cs similarity index 98% rename from Assets/UniRx.Async/Internal/ContinuationQueue.cs rename to Assets/Plugins/UniTask/Internal/ContinuationQueue.cs index a9f5cc9..4b4da75 100644 --- a/Assets/UniRx.Async/Internal/ContinuationQueue.cs +++ b/Assets/Plugins/UniTask/Internal/ContinuationQueue.cs @@ -4,7 +4,7 @@ using System; using System.Threading; -namespace UniRx.Async.Internal +namespace Cysharp.Threading.Tasks.Internal { internal sealed class ContinuationQueue { diff --git a/Assets/UniRx.Async/Internal/ContinuationQueue.cs.meta b/Assets/Plugins/UniTask/Internal/ContinuationQueue.cs.meta similarity index 100% rename from Assets/UniRx.Async/Internal/ContinuationQueue.cs.meta rename to Assets/Plugins/UniTask/Internal/ContinuationQueue.cs.meta diff --git a/Assets/UniRx.Async/Internal/DiagnosticsExtensions.cs b/Assets/Plugins/UniTask/Internal/DiagnosticsExtensions.cs similarity index 92% rename from Assets/UniRx.Async/Internal/DiagnosticsExtensions.cs rename to Assets/Plugins/UniTask/Internal/DiagnosticsExtensions.cs index 77fd2e1..c5c849d 100644 --- a/Assets/UniRx.Async/Internal/DiagnosticsExtensions.cs +++ b/Assets/Plugins/UniTask/Internal/DiagnosticsExtensions.cs @@ -15,7 +15,7 @@ using System.Text.RegularExpressions; using System.Threading.Tasks; using UnityEngine; -namespace UniRx.Async.Internal +namespace Cysharp.Threading.Tasks.Internal { internal static class DiagnosticsExtensions { @@ -183,7 +183,7 @@ namespace UniRx.Async.Internal { return "(" + string.Join(", ", t.GetGenericArguments().Select(x => BeautifyType(x, true))) + ")"; } - if (!t.IsGenericType) return shortName ? t.Name : t.FullName.Replace("UniRx.Async.Triggers.", "").Replace("UniRx.Async.Internal.", "").Replace("UniRx.Async.", "") ?? t.Name; + if (!t.IsGenericType) return shortName ? t.Name : t.FullName.Replace("Cysharp.Threading.Tasks.Triggers.", "").Replace("Cysharp.Threading.Tasks.Internal.", "").Replace("Cysharp.Threading.Tasks.", "") ?? t.Name; var innerFormat = string.Join(", ", t.GetGenericArguments().Select(x => BeautifyType(x, true))); @@ -193,7 +193,7 @@ namespace UniRx.Async.Internal genericType = "Task"; } - return typeBeautifyRegex.Replace(genericType, "").Replace("UniRx.Async.Triggers.", "").Replace("UniRx.Async.Internal.", "").Replace("UniRx.Async.", "") + "<" + innerFormat + ">"; + return typeBeautifyRegex.Replace(genericType, "").Replace("Cysharp.Threading.Tasks.Triggers.", "").Replace("Cysharp.Threading.Tasks.Internal.", "").Replace("Cysharp.Threading.Tasks.", "") + "<" + innerFormat + ">"; } static bool IgnoreLine(MethodBase methodInfo) @@ -207,7 +207,7 @@ namespace UniRx.Async.Internal { return true; } - else if (declareType.StartsWith("UniRx.Async.CompilerServices")) + else if (declareType.StartsWith("Cysharp.Threading.Tasks.CompilerServices")) { return true; } @@ -219,11 +219,11 @@ namespace UniRx.Async.Internal { return true; } - else if (declareType.StartsWith("UniRx.Async.UniTaskCompletionSourceCore")) + else if (declareType.StartsWith("Cysharp.Threading.Tasks.UniTaskCompletionSourceCore")) { return true; } - else if (declareType.StartsWith("UniRx.Async.AwaiterActions")) + else if (declareType.StartsWith("Cysharp.Threading.Tasks.AwaiterActions")) { return true; } diff --git a/Assets/UniRx.Async/Internal/DiagnosticsExtensions.cs.meta b/Assets/Plugins/UniTask/Internal/DiagnosticsExtensions.cs.meta similarity index 100% rename from Assets/UniRx.Async/Internal/DiagnosticsExtensions.cs.meta rename to Assets/Plugins/UniTask/Internal/DiagnosticsExtensions.cs.meta diff --git a/Assets/UniRx.Async/Internal/Error.cs b/Assets/Plugins/UniTask/Internal/Error.cs similarity index 97% rename from Assets/UniRx.Async/Internal/Error.cs rename to Assets/Plugins/UniTask/Internal/Error.cs index 378af62..76ac7dd 100644 --- a/Assets/UniRx.Async/Internal/Error.cs +++ b/Assets/Plugins/UniTask/Internal/Error.cs @@ -4,7 +4,7 @@ using System; using System.Runtime.CompilerServices; -namespace UniRx.Async.Internal +namespace Cysharp.Threading.Tasks.Internal { internal static class Error { diff --git a/Assets/UniRx.Async/Internal/Error.cs.meta b/Assets/Plugins/UniTask/Internal/Error.cs.meta similarity index 100% rename from Assets/UniRx.Async/Internal/Error.cs.meta rename to Assets/Plugins/UniTask/Internal/Error.cs.meta diff --git a/Assets/UniRx.Async/Internal/Hack.cs b/Assets/Plugins/UniTask/Internal/Hack.cs similarity index 89% rename from Assets/UniRx.Async/Internal/Hack.cs rename to Assets/Plugins/UniTask/Internal/Hack.cs index 7c600d0..d7cb43e 100644 --- a/Assets/UniRx.Async/Internal/Hack.cs +++ b/Assets/Plugins/UniTask/Internal/Hack.cs @@ -2,7 +2,7 @@ using System; -namespace UniRx.Async.Internal +namespace Cysharp.Threading.Tasks.Internal { internal static class FuncExtensions { diff --git a/Assets/UniRx.Async/Internal/Hack.cs.meta b/Assets/Plugins/UniTask/Internal/Hack.cs.meta similarity index 100% rename from Assets/UniRx.Async/Internal/Hack.cs.meta rename to Assets/Plugins/UniTask/Internal/Hack.cs.meta diff --git a/Assets/UniRx.Async/Internal/MinimumQueue.cs b/Assets/Plugins/UniTask/Internal/MinimumQueue.cs similarity index 98% rename from Assets/UniRx.Async/Internal/MinimumQueue.cs rename to Assets/Plugins/UniTask/Internal/MinimumQueue.cs index 8638a47..da3d821 100644 --- a/Assets/UniRx.Async/Internal/MinimumQueue.cs +++ b/Assets/Plugins/UniTask/Internal/MinimumQueue.cs @@ -5,7 +5,7 @@ using System; using System.Runtime.CompilerServices; -namespace UniRx.Async.Internal +namespace Cysharp.Threading.Tasks.Internal { // optimized version of Standard Queue. internal class MinimumQueue diff --git a/Assets/UniRx.Async/Internal/MinimumQueue.cs.meta b/Assets/Plugins/UniTask/Internal/MinimumQueue.cs.meta similarity index 100% rename from Assets/UniRx.Async/Internal/MinimumQueue.cs.meta rename to Assets/Plugins/UniTask/Internal/MinimumQueue.cs.meta diff --git a/Assets/UniRx.Async/Internal/PlayerLoopRunner.cs b/Assets/Plugins/UniTask/Internal/PlayerLoopRunner.cs similarity index 99% rename from Assets/UniRx.Async/Internal/PlayerLoopRunner.cs rename to Assets/Plugins/UniTask/Internal/PlayerLoopRunner.cs index 7ee6de4..fba2bdf 100644 --- a/Assets/UniRx.Async/Internal/PlayerLoopRunner.cs +++ b/Assets/Plugins/UniTask/Internal/PlayerLoopRunner.cs @@ -3,7 +3,7 @@ using System; using UnityEngine; -namespace UniRx.Async.Internal +namespace Cysharp.Threading.Tasks.Internal { internal sealed class PlayerLoopRunner { diff --git a/Assets/UniRx.Async/Internal/PlayerLoopRunner.cs.meta b/Assets/Plugins/UniTask/Internal/PlayerLoopRunner.cs.meta similarity index 100% rename from Assets/UniRx.Async/Internal/PlayerLoopRunner.cs.meta rename to Assets/Plugins/UniTask/Internal/PlayerLoopRunner.cs.meta diff --git a/Assets/UniRx.Async/Internal/PromisePool.cs b/Assets/Plugins/UniTask/Internal/PromisePool.cs similarity index 96% rename from Assets/UniRx.Async/Internal/PromisePool.cs rename to Assets/Plugins/UniTask/Internal/PromisePool.cs index 5667bac..e43aad2 100644 --- a/Assets/UniRx.Async/Internal/PromisePool.cs +++ b/Assets/Plugins/UniTask/Internal/PromisePool.cs @@ -2,7 +2,7 @@ using System.Runtime.CompilerServices; using System.Threading; -namespace UniRx.Async.Internal +namespace Cysharp.Threading.Tasks.Internal { internal interface IPromisePoolItem { diff --git a/Assets/UniRx.Async/Internal/PromisePool.cs.meta b/Assets/Plugins/UniTask/Internal/PromisePool.cs.meta similarity index 100% rename from Assets/UniRx.Async/Internal/PromisePool.cs.meta rename to Assets/Plugins/UniTask/Internal/PromisePool.cs.meta diff --git a/Assets/UniRx.Async/Internal/RuntimeHelpersAbstraction.cs b/Assets/Plugins/UniTask/Internal/RuntimeHelpersAbstraction.cs similarity index 97% rename from Assets/UniRx.Async/Internal/RuntimeHelpersAbstraction.cs rename to Assets/Plugins/UniTask/Internal/RuntimeHelpersAbstraction.cs index e628145..2e1f250 100644 --- a/Assets/UniRx.Async/Internal/RuntimeHelpersAbstraction.cs +++ b/Assets/Plugins/UniTask/Internal/RuntimeHelpersAbstraction.cs @@ -4,7 +4,7 @@ using System; using UnityEngine; -namespace UniRx.Async.Internal +namespace Cysharp.Threading.Tasks.Internal { internal static class RuntimeHelpersAbstraction { diff --git a/Assets/UniRx.Async/Internal/RuntimeHelpersAbstraction.cs.meta b/Assets/Plugins/UniTask/Internal/RuntimeHelpersAbstraction.cs.meta similarity index 100% rename from Assets/UniRx.Async/Internal/RuntimeHelpersAbstraction.cs.meta rename to Assets/Plugins/UniTask/Internal/RuntimeHelpersAbstraction.cs.meta diff --git a/Assets/UniRx.Async/Internal/StatePool.cs b/Assets/Plugins/UniTask/Internal/StatePool.cs similarity index 98% rename from Assets/UniRx.Async/Internal/StatePool.cs rename to Assets/Plugins/UniTask/Internal/StatePool.cs index 9182952..e1d40bd 100644 --- a/Assets/UniRx.Async/Internal/StatePool.cs +++ b/Assets/Plugins/UniTask/Internal/StatePool.cs @@ -2,7 +2,7 @@ using System.Collections.Concurrent; using System.Runtime.CompilerServices; -namespace UniRx.Async.Internal +namespace Cysharp.Threading.Tasks.Internal { internal static class StateTuple { diff --git a/Assets/UniRx.Async/Internal/StatePool.cs.meta b/Assets/Plugins/UniTask/Internal/StatePool.cs.meta similarity index 100% rename from Assets/UniRx.Async/Internal/StatePool.cs.meta rename to Assets/Plugins/UniTask/Internal/StatePool.cs.meta diff --git a/Assets/UniRx.Async/Internal/TaskTracker.cs b/Assets/Plugins/UniTask/Internal/TaskTracker.cs similarity index 98% rename from Assets/UniRx.Async/Internal/TaskTracker.cs rename to Assets/Plugins/UniTask/Internal/TaskTracker.cs index 2ef81bb..c99668c 100644 --- a/Assets/UniRx.Async/Internal/TaskTracker.cs +++ b/Assets/Plugins/UniTask/Internal/TaskTracker.cs @@ -5,9 +5,9 @@ using System; using System.Collections.Generic; using System.Diagnostics; using System.Threading; -using UniRx.Async.Internal; +using Cysharp.Threading.Tasks.Internal; -namespace UniRx.Async +namespace Cysharp.Threading.Tasks { // public for add user custom. diff --git a/Assets/UniRx.Async/Internal/TaskTracker.cs.meta b/Assets/Plugins/UniTask/Internal/TaskTracker.cs.meta similarity index 100% rename from Assets/UniRx.Async/Internal/TaskTracker.cs.meta rename to Assets/Plugins/UniTask/Internal/TaskTracker.cs.meta diff --git a/Assets/UniRx.Async/Internal/UnityEqualityComparer.cs b/Assets/Plugins/UniTask/Internal/UnityEqualityComparer.cs similarity index 99% rename from Assets/UniRx.Async/Internal/UnityEqualityComparer.cs rename to Assets/Plugins/UniTask/Internal/UnityEqualityComparer.cs index 268b82f..2fab3fe 100644 --- a/Assets/UniRx.Async/Internal/UnityEqualityComparer.cs +++ b/Assets/Plugins/UniTask/Internal/UnityEqualityComparer.cs @@ -6,7 +6,7 @@ using System; using System.Collections.Generic; using UnityEngine; -namespace UniRx.Async.Internal +namespace Cysharp.Threading.Tasks.Internal { internal static class UnityEqualityComparer { diff --git a/Assets/UniRx.Async/Internal/UnityEqualityComparer.cs.meta b/Assets/Plugins/UniTask/Internal/UnityEqualityComparer.cs.meta similarity index 100% rename from Assets/UniRx.Async/Internal/UnityEqualityComparer.cs.meta rename to Assets/Plugins/UniTask/Internal/UnityEqualityComparer.cs.meta diff --git a/Assets/UniRx.Async/Internal/WeakDictionary.cs b/Assets/Plugins/UniTask/Internal/WeakDictionary.cs similarity index 99% rename from Assets/UniRx.Async/Internal/WeakDictionary.cs rename to Assets/Plugins/UniTask/Internal/WeakDictionary.cs index e2fd9fb..a9e09c9 100644 --- a/Assets/UniRx.Async/Internal/WeakDictionary.cs +++ b/Assets/Plugins/UniTask/Internal/WeakDictionary.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; using System.Threading; -namespace UniRx.Async.Internal +namespace Cysharp.Threading.Tasks.Internal { // Add, Remove, Enumerate with sweep. All operations are thread safe(in spinlock). internal class WeakDictionary diff --git a/Assets/UniRx.Async/Internal/WeakDictionary.cs.meta b/Assets/Plugins/UniTask/Internal/WeakDictionary.cs.meta similarity index 100% rename from Assets/UniRx.Async/Internal/WeakDictionary.cs.meta rename to Assets/Plugins/UniTask/Internal/WeakDictionary.cs.meta diff --git a/Assets/UniRx.Async/PlayerLoopHelper.cs b/Assets/Plugins/UniTask/PlayerLoopHelper.cs similarity index 99% rename from Assets/UniRx.Async/PlayerLoopHelper.cs rename to Assets/Plugins/UniTask/PlayerLoopHelper.cs index cd4516c..e754230 100644 --- a/Assets/UniRx.Async/PlayerLoopHelper.cs +++ b/Assets/Plugins/UniTask/PlayerLoopHelper.cs @@ -4,7 +4,7 @@ using System; using System.Linq; using UnityEngine; -using UniRx.Async.Internal; +using Cysharp.Threading.Tasks.Internal; using System.Threading; #if UNITY_2019_3_OR_NEWER @@ -17,7 +17,7 @@ using UnityEngine.Experimental.LowLevel; using UnityEditor; #endif -namespace UniRx.Async +namespace Cysharp.Threading.Tasks { public static class UniTaskLoopRunners { diff --git a/Assets/UniRx.Async/PlayerLoopHelper.cs.meta b/Assets/Plugins/UniTask/PlayerLoopHelper.cs.meta similarity index 100% rename from Assets/UniRx.Async/PlayerLoopHelper.cs.meta rename to Assets/Plugins/UniTask/PlayerLoopHelper.cs.meta diff --git a/Assets/UniRx.Async/Progress.cs b/Assets/Plugins/UniTask/Progress.cs similarity index 96% rename from Assets/UniRx.Async/Progress.cs rename to Assets/Plugins/UniTask/Progress.cs index b9eaf38..c154c3d 100644 --- a/Assets/UniRx.Async/Progress.cs +++ b/Assets/Plugins/UniTask/Progress.cs @@ -3,9 +3,9 @@ using System; using System.Collections.Generic; -using UniRx.Async.Internal; +using Cysharp.Threading.Tasks.Internal; -namespace UniRx.Async +namespace Cysharp.Threading.Tasks { ///

/// Lightweight IProgress[T] factory. diff --git a/Assets/UniRx.Async/Progress.cs.meta b/Assets/Plugins/UniTask/Progress.cs.meta similarity index 100% rename from Assets/UniRx.Async/Progress.cs.meta rename to Assets/Plugins/UniTask/Progress.cs.meta diff --git a/Assets/UniRx.Async/Triggers.meta b/Assets/Plugins/UniTask/Triggers.meta similarity index 100% rename from Assets/UniRx.Async/Triggers.meta rename to Assets/Plugins/UniTask/Triggers.meta diff --git a/Assets/UniRx.Async/Triggers/AsyncAwakeTrigger.cs b/Assets/Plugins/UniTask/Triggers/AsyncAwakeTrigger.cs similarity index 97% rename from Assets/UniRx.Async/Triggers/AsyncAwakeTrigger.cs rename to Assets/Plugins/UniTask/Triggers/AsyncAwakeTrigger.cs index 82661b2..123c9f2 100644 --- a/Assets/UniRx.Async/Triggers/AsyncAwakeTrigger.cs +++ b/Assets/Plugins/UniTask/Triggers/AsyncAwakeTrigger.cs @@ -4,7 +4,7 @@ using System.Threading; using UnityEngine; -namespace UniRx.Async.Triggers +namespace Cysharp.Threading.Tasks.Triggers { public static partial class AsyncTriggerExtensions { diff --git a/Assets/UniRx.Async/Triggers/AsyncAwakeTrigger.cs.meta b/Assets/Plugins/UniTask/Triggers/AsyncAwakeTrigger.cs.meta similarity index 100% rename from Assets/UniRx.Async/Triggers/AsyncAwakeTrigger.cs.meta rename to Assets/Plugins/UniTask/Triggers/AsyncAwakeTrigger.cs.meta diff --git a/Assets/UniRx.Async/Triggers/AsyncDestroyTrigger.cs b/Assets/Plugins/UniTask/Triggers/AsyncDestroyTrigger.cs similarity index 98% rename from Assets/UniRx.Async/Triggers/AsyncDestroyTrigger.cs rename to Assets/Plugins/UniTask/Triggers/AsyncDestroyTrigger.cs index 2eaf42b..7e9bd4a 100644 --- a/Assets/UniRx.Async/Triggers/AsyncDestroyTrigger.cs +++ b/Assets/Plugins/UniTask/Triggers/AsyncDestroyTrigger.cs @@ -4,7 +4,7 @@ using System.Threading; using UnityEngine; -namespace UniRx.Async.Triggers +namespace Cysharp.Threading.Tasks.Triggers { public static partial class AsyncTriggerExtensions { diff --git a/Assets/UniRx.Async/Triggers/AsyncDestroyTrigger.cs.meta b/Assets/Plugins/UniTask/Triggers/AsyncDestroyTrigger.cs.meta similarity index 100% rename from Assets/UniRx.Async/Triggers/AsyncDestroyTrigger.cs.meta rename to Assets/Plugins/UniTask/Triggers/AsyncDestroyTrigger.cs.meta diff --git a/Assets/UniRx.Async/Triggers/AsyncStartTrigger.cs b/Assets/Plugins/UniTask/Triggers/AsyncStartTrigger.cs similarity index 97% rename from Assets/UniRx.Async/Triggers/AsyncStartTrigger.cs rename to Assets/Plugins/UniTask/Triggers/AsyncStartTrigger.cs index 53a859e..4cc4766 100644 --- a/Assets/UniRx.Async/Triggers/AsyncStartTrigger.cs +++ b/Assets/Plugins/UniTask/Triggers/AsyncStartTrigger.cs @@ -4,7 +4,7 @@ using System.Threading; using UnityEngine; -namespace UniRx.Async.Triggers +namespace Cysharp.Threading.Tasks.Triggers { public static partial class AsyncTriggerExtensions { diff --git a/Assets/UniRx.Async/Triggers/AsyncStartTrigger.cs.meta b/Assets/Plugins/UniTask/Triggers/AsyncStartTrigger.cs.meta similarity index 100% rename from Assets/UniRx.Async/Triggers/AsyncStartTrigger.cs.meta rename to Assets/Plugins/UniTask/Triggers/AsyncStartTrigger.cs.meta diff --git a/Assets/UniRx.Async/Triggers/AsyncTriggerBase.cs b/Assets/Plugins/UniTask/Triggers/AsyncTriggerBase.cs similarity index 99% rename from Assets/UniRx.Async/Triggers/AsyncTriggerBase.cs rename to Assets/Plugins/UniTask/Triggers/AsyncTriggerBase.cs index a1294a6..7e87fbc 100644 --- a/Assets/UniRx.Async/Triggers/AsyncTriggerBase.cs +++ b/Assets/Plugins/UniTask/Triggers/AsyncTriggerBase.cs @@ -4,10 +4,10 @@ using System; using System.Collections.Generic; using System.Threading; -using UniRx.Async.Internal; +using Cysharp.Threading.Tasks.Internal; using UnityEngine; -namespace UniRx.Async.Triggers +namespace Cysharp.Threading.Tasks.Triggers { public abstract class AsyncTriggerBase : MonoBehaviour { diff --git a/Assets/UniRx.Async/Triggers/AsyncTriggerBase.cs.meta b/Assets/Plugins/UniTask/Triggers/AsyncTriggerBase.cs.meta similarity index 100% rename from Assets/UniRx.Async/Triggers/AsyncTriggerBase.cs.meta rename to Assets/Plugins/UniTask/Triggers/AsyncTriggerBase.cs.meta diff --git a/Assets/UniRx.Async/Triggers/AsyncTriggerExtensions.cs b/Assets/Plugins/UniTask/Triggers/AsyncTriggerExtensions.cs similarity index 95% rename from Assets/UniRx.Async/Triggers/AsyncTriggerExtensions.cs rename to Assets/Plugins/UniTask/Triggers/AsyncTriggerExtensions.cs index 8516cd9..a3ae68a 100644 --- a/Assets/UniRx.Async/Triggers/AsyncTriggerExtensions.cs +++ b/Assets/Plugins/UniTask/Triggers/AsyncTriggerExtensions.cs @@ -3,9 +3,9 @@ using System.Threading; using UnityEngine; -using UniRx.Async.Triggers; +using Cysharp.Threading.Tasks.Triggers; -namespace UniRx.Async +namespace Cysharp.Threading.Tasks { public static class UniTaskCancellationExtensions { @@ -23,7 +23,7 @@ namespace UniRx.Async } } -namespace UniRx.Async.Triggers +namespace Cysharp.Threading.Tasks.Triggers { public static partial class AsyncTriggerExtensions { diff --git a/Assets/UniRx.Async/Triggers/AsyncTriggerExtensions.cs.meta b/Assets/Plugins/UniTask/Triggers/AsyncTriggerExtensions.cs.meta similarity index 100% rename from Assets/UniRx.Async/Triggers/AsyncTriggerExtensions.cs.meta rename to Assets/Plugins/UniTask/Triggers/AsyncTriggerExtensions.cs.meta diff --git a/Assets/UniRx.Async/Triggers/MonoBehaviourMessagesTriggers.cs b/Assets/Plugins/UniTask/Triggers/MonoBehaviourMessagesTriggers.cs similarity index 99% rename from Assets/UniRx.Async/Triggers/MonoBehaviourMessagesTriggers.cs rename to Assets/Plugins/UniTask/Triggers/MonoBehaviourMessagesTriggers.cs index 1eb35a8..da2e038 100644 --- a/Assets/UniRx.Async/Triggers/MonoBehaviourMessagesTriggers.cs +++ b/Assets/Plugins/UniTask/Triggers/MonoBehaviourMessagesTriggers.cs @@ -4,7 +4,7 @@ using System.Threading; using UnityEngine; using UnityEngine.EventSystems; -namespace UniRx.Async.Triggers +namespace Cysharp.Threading.Tasks.Triggers { #region FixedUpdate diff --git a/Assets/UniRx.Async/Triggers/MonoBehaviourMessagesTriggers.cs.meta b/Assets/Plugins/UniTask/Triggers/MonoBehaviourMessagesTriggers.cs.meta similarity index 100% rename from Assets/UniRx.Async/Triggers/MonoBehaviourMessagesTriggers.cs.meta rename to Assets/Plugins/UniTask/Triggers/MonoBehaviourMessagesTriggers.cs.meta diff --git a/Assets/UniRx.Async/Triggers/MonoBehaviourMessagesTriggers.tt b/Assets/Plugins/UniTask/Triggers/MonoBehaviourMessagesTriggers.tt similarity index 99% rename from Assets/UniRx.Async/Triggers/MonoBehaviourMessagesTriggers.tt rename to Assets/Plugins/UniTask/Triggers/MonoBehaviourMessagesTriggers.tt index b2b56d7..a0ff5ba 100644 --- a/Assets/UniRx.Async/Triggers/MonoBehaviourMessagesTriggers.tt +++ b/Assets/Plugins/UniTask/Triggers/MonoBehaviourMessagesTriggers.tt @@ -112,7 +112,7 @@ using System.Threading; using UnityEngine; using UnityEngine.EventSystems; -namespace UniRx.Async.Triggers +namespace Cysharp.Threading.Tasks.Triggers { <# foreach(var t in triggers) { #> #region <#= t.triggerName #> diff --git a/Assets/UniRx.Async/Triggers/MonoBehaviourMessagesTriggers.tt.meta b/Assets/Plugins/UniTask/Triggers/MonoBehaviourMessagesTriggers.tt.meta similarity index 100% rename from Assets/UniRx.Async/Triggers/MonoBehaviourMessagesTriggers.tt.meta rename to Assets/Plugins/UniTask/Triggers/MonoBehaviourMessagesTriggers.tt.meta diff --git a/Assets/UniRx.Async/UniRx.Async.asmdef b/Assets/Plugins/UniTask/UniRx.Async.asmdef similarity index 100% rename from Assets/UniRx.Async/UniRx.Async.asmdef rename to Assets/Plugins/UniTask/UniRx.Async.asmdef diff --git a/Assets/UniRx.Async/UniRx.Async.asmdef.meta b/Assets/Plugins/UniTask/UniRx.Async.asmdef.meta similarity index 100% rename from Assets/UniRx.Async/UniRx.Async.asmdef.meta rename to Assets/Plugins/UniTask/UniRx.Async.asmdef.meta diff --git a/Assets/UniRx.Async/UniTask.Bridge.cs b/Assets/Plugins/UniTask/UniTask.Bridge.cs similarity index 91% rename from Assets/UniRx.Async/UniTask.Bridge.cs rename to Assets/Plugins/UniTask/UniTask.Bridge.cs index 814bd02..d98b278 100644 --- a/Assets/UniRx.Async/UniTask.Bridge.cs +++ b/Assets/Plugins/UniTask/UniTask.Bridge.cs @@ -4,7 +4,7 @@ using System; using System.Collections; -namespace UniRx.Async +namespace Cysharp.Threading.Tasks { // UnityEngine Bridges. diff --git a/Assets/UniRx.Async/UniTask.Bridge.cs.meta b/Assets/Plugins/UniTask/UniTask.Bridge.cs.meta similarity index 100% rename from Assets/UniRx.Async/UniTask.Bridge.cs.meta rename to Assets/Plugins/UniTask/UniTask.Bridge.cs.meta diff --git a/Assets/UniRx.Async/UniTask.Delay.cs b/Assets/Plugins/UniTask/UniTask.Delay.cs similarity index 99% rename from Assets/UniRx.Async/UniTask.Delay.cs rename to Assets/Plugins/UniTask/UniTask.Delay.cs index 05048d4..9c08019 100644 --- a/Assets/UniRx.Async/UniTask.Delay.cs +++ b/Assets/Plugins/UniTask/UniTask.Delay.cs @@ -4,10 +4,10 @@ using System; using System.Runtime.CompilerServices; using System.Threading; -using UniRx.Async.Internal; +using Cysharp.Threading.Tasks.Internal; using UnityEngine; -namespace UniRx.Async +namespace Cysharp.Threading.Tasks { public partial struct UniTask { diff --git a/Assets/UniRx.Async/UniTask.Delay.cs.meta b/Assets/Plugins/UniTask/UniTask.Delay.cs.meta similarity index 100% rename from Assets/UniRx.Async/UniTask.Delay.cs.meta rename to Assets/Plugins/UniTask/UniTask.Delay.cs.meta diff --git a/Assets/UniRx.Async/UniTask.Factory.cs b/Assets/Plugins/UniTask/UniTask.Factory.cs similarity index 97% rename from Assets/UniRx.Async/UniTask.Factory.cs rename to Assets/Plugins/UniTask/UniTask.Factory.cs index d0c906a..c70860e 100644 --- a/Assets/UniRx.Async/UniTask.Factory.cs +++ b/Assets/Plugins/UniTask/UniTask.Factory.cs @@ -5,7 +5,7 @@ using System; using System.Threading; using UnityEngine.Events; -namespace UniRx.Async +namespace Cysharp.Threading.Tasks { public partial struct UniTask { @@ -134,7 +134,7 @@ namespace UniRx.Async internal static class CompletedTasks { - public static readonly UniTask AsyncUnit = UniTask.FromResult(UniRx.Async.AsyncUnit.Default); + public static readonly UniTask AsyncUnit = UniTask.FromResult(Cysharp.Threading.Tasks.AsyncUnit.Default); public static readonly UniTask True = UniTask.FromResult(true); public static readonly UniTask False = UniTask.FromResult(false); public static readonly UniTask Zero = UniTask.FromResult(0); diff --git a/Assets/UniRx.Async/UniTask.Factory.cs.meta b/Assets/Plugins/UniTask/UniTask.Factory.cs.meta similarity index 100% rename from Assets/UniRx.Async/UniTask.Factory.cs.meta rename to Assets/Plugins/UniTask/UniTask.Factory.cs.meta diff --git a/Assets/UniRx.Async/UniTask.Run.cs b/Assets/Plugins/UniTask/UniTask.Run.cs similarity index 98% rename from Assets/UniRx.Async/UniTask.Run.cs rename to Assets/Plugins/UniTask/UniTask.Run.cs index 6363d3f..1f382d2 100644 --- a/Assets/UniRx.Async/UniTask.Run.cs +++ b/Assets/Plugins/UniTask/UniTask.Run.cs @@ -3,7 +3,7 @@ using System; -namespace UniRx.Async +namespace Cysharp.Threading.Tasks { public partial struct UniTask { diff --git a/Assets/UniRx.Async/UniTask.Run.cs.meta b/Assets/Plugins/UniTask/UniTask.Run.cs.meta similarity index 100% rename from Assets/UniRx.Async/UniTask.Run.cs.meta rename to Assets/Plugins/UniTask/UniTask.Run.cs.meta diff --git a/Assets/UniRx.Async/UniTask.Threading.cs b/Assets/Plugins/UniTask/UniTask.Threading.cs similarity index 98% rename from Assets/UniRx.Async/UniTask.Threading.cs rename to Assets/Plugins/UniTask/UniTask.Threading.cs index 53dd1f8..94d01ce 100644 --- a/Assets/UniRx.Async/UniTask.Threading.cs +++ b/Assets/Plugins/UniTask/UniTask.Threading.cs @@ -5,9 +5,9 @@ using System; using System.Runtime.CompilerServices; using System.Threading; using System.Threading.Tasks; -using UniRx.Async.Internal; +using Cysharp.Threading.Tasks.Internal; -namespace UniRx.Async +namespace Cysharp.Threading.Tasks { public partial struct UniTask { diff --git a/Assets/UniRx.Async/UniTask.Threading.cs.meta b/Assets/Plugins/UniTask/UniTask.Threading.cs.meta similarity index 100% rename from Assets/UniRx.Async/UniTask.Threading.cs.meta rename to Assets/Plugins/UniTask/UniTask.Threading.cs.meta diff --git a/Assets/UniRx.Async/UniTask.WaitUntil.cs b/Assets/Plugins/UniTask/UniTask.WaitUntil.cs similarity index 99% rename from Assets/UniRx.Async/UniTask.WaitUntil.cs rename to Assets/Plugins/UniTask/UniTask.WaitUntil.cs index 877fe2f..cf035eb 100644 --- a/Assets/UniRx.Async/UniTask.WaitUntil.cs +++ b/Assets/Plugins/UniTask/UniTask.WaitUntil.cs @@ -4,9 +4,9 @@ using System; using System.Collections.Generic; using System.Threading; -using UniRx.Async.Internal; +using Cysharp.Threading.Tasks.Internal; -namespace UniRx.Async +namespace Cysharp.Threading.Tasks { public partial struct UniTask { diff --git a/Assets/UniRx.Async/UniTask.WaitUntil.cs.meta b/Assets/Plugins/UniTask/UniTask.WaitUntil.cs.meta similarity index 100% rename from Assets/UniRx.Async/UniTask.WaitUntil.cs.meta rename to Assets/Plugins/UniTask/UniTask.WaitUntil.cs.meta diff --git a/Assets/UniRx.Async/UniTask.WhenAll.Generated.cs b/Assets/Plugins/UniTask/UniTask.WhenAll.Generated.cs similarity index 99% rename from Assets/UniRx.Async/UniTask.WhenAll.Generated.cs rename to Assets/Plugins/UniTask/UniTask.WhenAll.Generated.cs index 95c6a4c..e93a384 100644 --- a/Assets/UniRx.Async/UniTask.WhenAll.Generated.cs +++ b/Assets/Plugins/UniTask/UniTask.WhenAll.Generated.cs @@ -3,9 +3,9 @@ using System; using System.Runtime.CompilerServices; using System.Runtime.ExceptionServices; using System.Threading; -using UniRx.Async.Internal; +using Cysharp.Threading.Tasks.Internal; -namespace UniRx.Async +namespace Cysharp.Threading.Tasks { public partial struct UniTask { diff --git a/Assets/UniRx.Async/UniTask.WhenAll.Generated.cs.meta b/Assets/Plugins/UniTask/UniTask.WhenAll.Generated.cs.meta similarity index 100% rename from Assets/UniRx.Async/UniTask.WhenAll.Generated.cs.meta rename to Assets/Plugins/UniTask/UniTask.WhenAll.Generated.cs.meta diff --git a/Assets/UniRx.Async/UniTask.WhenAll.Generated.tt b/Assets/Plugins/UniTask/UniTask.WhenAll.Generated.tt similarity index 98% rename from Assets/UniRx.Async/UniTask.WhenAll.Generated.tt rename to Assets/Plugins/UniTask/UniTask.WhenAll.Generated.tt index 5480dc0..b837cbe 100644 --- a/Assets/UniRx.Async/UniTask.WhenAll.Generated.tt +++ b/Assets/Plugins/UniTask/UniTask.WhenAll.Generated.tt @@ -9,9 +9,9 @@ using System; using System.Runtime.CompilerServices; using System.Runtime.ExceptionServices; using System.Threading; -using UniRx.Async.Internal; +using Cysharp.Threading.Tasks.Internal; -namespace UniRx.Async +namespace Cysharp.Threading.Tasks { public partial struct UniTask { diff --git a/Assets/UniRx.Async/UniTask.WhenAll.Generated.tt.meta b/Assets/Plugins/UniTask/UniTask.WhenAll.Generated.tt.meta similarity index 100% rename from Assets/UniRx.Async/UniTask.WhenAll.Generated.tt.meta rename to Assets/Plugins/UniTask/UniTask.WhenAll.Generated.tt.meta diff --git a/Assets/UniRx.Async/UniTask.WhenAll.cs b/Assets/Plugins/UniTask/UniTask.WhenAll.cs similarity index 98% rename from Assets/UniRx.Async/UniTask.WhenAll.cs rename to Assets/Plugins/UniTask/UniTask.WhenAll.cs index ed6f2dc..11b995a 100644 --- a/Assets/UniRx.Async/UniTask.WhenAll.cs +++ b/Assets/Plugins/UniTask/UniTask.WhenAll.cs @@ -4,9 +4,9 @@ using System; using System.Collections.Generic; using System.Threading; -using UniRx.Async.Internal; +using Cysharp.Threading.Tasks.Internal; -namespace UniRx.Async +namespace Cysharp.Threading.Tasks { public partial struct UniTask { diff --git a/Assets/UniRx.Async/UniTask.WhenAll.cs.meta b/Assets/Plugins/UniTask/UniTask.WhenAll.cs.meta similarity index 100% rename from Assets/UniRx.Async/UniTask.WhenAll.cs.meta rename to Assets/Plugins/UniTask/UniTask.WhenAll.cs.meta diff --git a/Assets/UniRx.Async/UniTask.WhenAny.Generated.cs b/Assets/Plugins/UniTask/UniTask.WhenAny.Generated.cs similarity index 99% rename from Assets/UniRx.Async/UniTask.WhenAny.Generated.cs rename to Assets/Plugins/UniTask/UniTask.WhenAny.Generated.cs index 9178472..72981b1 100644 --- a/Assets/UniRx.Async/UniTask.WhenAny.Generated.cs +++ b/Assets/Plugins/UniTask/UniTask.WhenAny.Generated.cs @@ -3,9 +3,9 @@ using System; using System.Runtime.CompilerServices; using System.Runtime.ExceptionServices; using System.Threading; -using UniRx.Async.Internal; +using Cysharp.Threading.Tasks.Internal; -namespace UniRx.Async +namespace Cysharp.Threading.Tasks { public partial struct UniTask { diff --git a/Assets/UniRx.Async/UniTask.WhenAny.Generated.cs.meta b/Assets/Plugins/UniTask/UniTask.WhenAny.Generated.cs.meta similarity index 100% rename from Assets/UniRx.Async/UniTask.WhenAny.Generated.cs.meta rename to Assets/Plugins/UniTask/UniTask.WhenAny.Generated.cs.meta diff --git a/Assets/UniRx.Async/UniTask.WhenAny.Generated.tt b/Assets/Plugins/UniTask/UniTask.WhenAny.Generated.tt similarity index 98% rename from Assets/UniRx.Async/UniTask.WhenAny.Generated.tt rename to Assets/Plugins/UniTask/UniTask.WhenAny.Generated.tt index ab66053..2165c2c 100644 --- a/Assets/UniRx.Async/UniTask.WhenAny.Generated.tt +++ b/Assets/Plugins/UniTask/UniTask.WhenAny.Generated.tt @@ -9,9 +9,9 @@ using System; using System.Runtime.CompilerServices; using System.Runtime.ExceptionServices; using System.Threading; -using UniRx.Async.Internal; +using Cysharp.Threading.Tasks.Internal; -namespace UniRx.Async +namespace Cysharp.Threading.Tasks { public partial struct UniTask { diff --git a/Assets/UniRx.Async/UniTask.WhenAny.Generated.tt.meta b/Assets/Plugins/UniTask/UniTask.WhenAny.Generated.tt.meta similarity index 100% rename from Assets/UniRx.Async/UniTask.WhenAny.Generated.tt.meta rename to Assets/Plugins/UniTask/UniTask.WhenAny.Generated.tt.meta diff --git a/Assets/UniRx.Async/UniTask.WhenAny.cs b/Assets/Plugins/UniTask/UniTask.WhenAny.cs similarity index 99% rename from Assets/UniRx.Async/UniTask.WhenAny.cs rename to Assets/Plugins/UniTask/UniTask.WhenAny.cs index c025f1b..d604ea8 100644 --- a/Assets/UniRx.Async/UniTask.WhenAny.cs +++ b/Assets/Plugins/UniTask/UniTask.WhenAny.cs @@ -4,9 +4,9 @@ using System; using System.Collections.Generic; using System.Threading; -using UniRx.Async.Internal; +using Cysharp.Threading.Tasks.Internal; -namespace UniRx.Async +namespace Cysharp.Threading.Tasks { public partial struct UniTask { diff --git a/Assets/UniRx.Async/UniTask.WhenAny.cs.meta b/Assets/Plugins/UniTask/UniTask.WhenAny.cs.meta similarity index 100% rename from Assets/UniRx.Async/UniTask.WhenAny.cs.meta rename to Assets/Plugins/UniTask/UniTask.WhenAny.cs.meta diff --git a/Assets/UniRx.Async/UniTask.cs b/Assets/Plugins/UniTask/UniTask.cs similarity index 99% rename from Assets/UniRx.Async/UniTask.cs rename to Assets/Plugins/UniTask/UniTask.cs index bc7fe96..ead3126 100644 --- a/Assets/UniRx.Async/UniTask.cs +++ b/Assets/Plugins/UniTask/UniTask.cs @@ -7,10 +7,10 @@ using System.Collections.Generic; using System.Diagnostics; using System.Runtime.CompilerServices; using System.Runtime.ExceptionServices; -using UniRx.Async.CompilerServices; -using UniRx.Async.Internal; +using Cysharp.Threading.Tasks.CompilerServices; +using Cysharp.Threading.Tasks.Internal; -namespace UniRx.Async +namespace Cysharp.Threading.Tasks { internal static class AwaiterActions { diff --git a/Assets/UniRx.Async/UniTask.cs.meta b/Assets/Plugins/UniTask/UniTask.cs.meta similarity index 100% rename from Assets/UniRx.Async/UniTask.cs.meta rename to Assets/Plugins/UniTask/UniTask.cs.meta diff --git a/Assets/UniRx.Async/UniTaskCompletionSource.cs b/Assets/Plugins/UniTask/UniTaskCompletionSource.cs similarity index 99% rename from Assets/UniRx.Async/UniTaskCompletionSource.cs rename to Assets/Plugins/UniTask/UniTaskCompletionSource.cs index 4a0414f..3141204 100644 --- a/Assets/UniRx.Async/UniTaskCompletionSource.cs +++ b/Assets/Plugins/UniTask/UniTaskCompletionSource.cs @@ -7,9 +7,9 @@ using System.Runtime.CompilerServices; using System.Runtime.ExceptionServices; using System.Runtime.InteropServices; using System.Threading; -using UniRx.Async.Internal; +using Cysharp.Threading.Tasks.Internal; -namespace UniRx.Async +namespace Cysharp.Threading.Tasks { public interface IResolvePromise { diff --git a/Assets/UniRx.Async/UniTaskCompletionSource.cs.meta b/Assets/Plugins/UniTask/UniTaskCompletionSource.cs.meta similarity index 100% rename from Assets/UniRx.Async/UniTaskCompletionSource.cs.meta rename to Assets/Plugins/UniTask/UniTaskCompletionSource.cs.meta diff --git a/Assets/UniRx.Async/UniTaskExtensions.Shorthand.cs b/Assets/Plugins/UniTask/UniTaskExtensions.Shorthand.cs similarity index 99% rename from Assets/UniRx.Async/UniTaskExtensions.Shorthand.cs rename to Assets/Plugins/UniTask/UniTaskExtensions.Shorthand.cs index 37fdd80..0e51a45 100644 --- a/Assets/UniRx.Async/UniTaskExtensions.Shorthand.cs +++ b/Assets/Plugins/UniTask/UniTaskExtensions.Shorthand.cs @@ -1,7 +1,7 @@ #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member using System.Collections.Generic; -namespace UniRx.Async +namespace Cysharp.Threading.Tasks { public static partial class UniTaskExtensions { diff --git a/Assets/UniRx.Async/UniTaskExtensions.Shorthand.cs.meta b/Assets/Plugins/UniTask/UniTaskExtensions.Shorthand.cs.meta similarity index 100% rename from Assets/UniRx.Async/UniTaskExtensions.Shorthand.cs.meta rename to Assets/Plugins/UniTask/UniTaskExtensions.Shorthand.cs.meta diff --git a/Assets/UniRx.Async/UniTaskExtensions.Shorthand.tt b/Assets/Plugins/UniTask/UniTaskExtensions.Shorthand.tt similarity index 98% rename from Assets/UniRx.Async/UniTaskExtensions.Shorthand.tt rename to Assets/Plugins/UniTask/UniTaskExtensions.Shorthand.tt index ecc0767..94f6b9f 100644 --- a/Assets/UniRx.Async/UniTaskExtensions.Shorthand.tt +++ b/Assets/Plugins/UniTask/UniTaskExtensions.Shorthand.tt @@ -7,7 +7,7 @@ #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member using System.Collections.Generic; -namespace UniRx.Async +namespace Cysharp.Threading.Tasks { public static partial class UniTaskExtensions { diff --git a/Assets/UniRx.Async/UniTaskExtensions.Shorthand.tt.meta b/Assets/Plugins/UniTask/UniTaskExtensions.Shorthand.tt.meta similarity index 100% rename from Assets/UniRx.Async/UniTaskExtensions.Shorthand.tt.meta rename to Assets/Plugins/UniTask/UniTaskExtensions.Shorthand.tt.meta diff --git a/Assets/UniRx.Async/UniTaskExtensions.cs b/Assets/Plugins/UniTask/UniTaskExtensions.cs similarity index 99% rename from Assets/UniRx.Async/UniTaskExtensions.cs rename to Assets/Plugins/UniTask/UniTaskExtensions.cs index 795abc1..8f80bbc 100644 --- a/Assets/UniRx.Async/UniTaskExtensions.cs +++ b/Assets/Plugins/UniTask/UniTaskExtensions.cs @@ -6,9 +6,9 @@ using System.Collections; using System.Runtime.ExceptionServices; using System.Threading; using System.Threading.Tasks; -using UniRx.Async.Internal; +using Cysharp.Threading.Tasks.Internal; -namespace UniRx.Async +namespace Cysharp.Threading.Tasks { public static partial class UniTaskExtensions { diff --git a/Assets/UniRx.Async/UniTaskExtensions.cs.meta b/Assets/Plugins/UniTask/UniTaskExtensions.cs.meta similarity index 100% rename from Assets/UniRx.Async/UniTaskExtensions.cs.meta rename to Assets/Plugins/UniTask/UniTaskExtensions.cs.meta diff --git a/Assets/UniRx.Async/UniTaskObservableExtensions.cs b/Assets/Plugins/UniTask/UniTaskObservableExtensions.cs similarity index 98% rename from Assets/UniRx.Async/UniTaskObservableExtensions.cs rename to Assets/Plugins/UniTask/UniTaskObservableExtensions.cs index cb7dc03..888e797 100644 --- a/Assets/UniRx.Async/UniTaskObservableExtensions.cs +++ b/Assets/Plugins/UniTask/UniTaskObservableExtensions.cs @@ -4,9 +4,9 @@ using System; using System.Runtime.ExceptionServices; using System.Threading; -using UniRx.Async.Internal; +using Cysharp.Threading.Tasks.Internal; -namespace UniRx.Async +namespace Cysharp.Threading.Tasks { public static class UniTaskObservableExtensions { @@ -51,7 +51,7 @@ namespace UniRx.Async } /// - /// Ideally returns IObservabl[Unit] is best but UniRx.Async does not have Unit so return AsyncUnit instead. + /// Ideally returns IObservabl[Unit] is best but Cysharp.Threading.Tasks does not have Unit so return AsyncUnit instead. /// public static IObservable ToObservable(this UniTask task) { @@ -280,7 +280,7 @@ namespace UniRx.Async } } -namespace UniRx.Async.Internal +namespace Cysharp.Threading.Tasks.Internal { // Bridges for Rx. diff --git a/Assets/UniRx.Async/UniTaskObservableExtensions.cs.meta b/Assets/Plugins/UniTask/UniTaskObservableExtensions.cs.meta similarity index 100% rename from Assets/UniRx.Async/UniTaskObservableExtensions.cs.meta rename to Assets/Plugins/UniTask/UniTaskObservableExtensions.cs.meta diff --git a/Assets/UniRx.Async/UniTaskScheduler.cs b/Assets/Plugins/UniTask/UniTaskScheduler.cs similarity index 98% rename from Assets/UniRx.Async/UniTaskScheduler.cs rename to Assets/Plugins/UniTask/UniTaskScheduler.cs index e1d8fe1..0cf9797 100644 --- a/Assets/UniRx.Async/UniTaskScheduler.cs +++ b/Assets/Plugins/UniTask/UniTaskScheduler.cs @@ -4,7 +4,7 @@ using System; using System.Threading; -namespace UniRx.Async +namespace Cysharp.Threading.Tasks { // UniTask has no scheduler like TaskScheduler. // Only handle unobserved exception. diff --git a/Assets/UniRx.Async/UniTaskScheduler.cs.meta b/Assets/Plugins/UniTask/UniTaskScheduler.cs.meta similarity index 100% rename from Assets/UniRx.Async/UniTaskScheduler.cs.meta rename to Assets/Plugins/UniTask/UniTaskScheduler.cs.meta diff --git a/Assets/UniRx.Async/UniTaskVoid.cs b/Assets/Plugins/UniTask/UniTaskVoid.cs similarity index 92% rename from Assets/UniRx.Async/UniTaskVoid.cs rename to Assets/Plugins/UniTask/UniTaskVoid.cs index 550a55b..bc17a39 100644 --- a/Assets/UniRx.Async/UniTaskVoid.cs +++ b/Assets/Plugins/UniTask/UniTaskVoid.cs @@ -5,9 +5,9 @@ using System; using System.Diagnostics; using System.Runtime.CompilerServices; -using UniRx.Async.CompilerServices; +using Cysharp.Threading.Tasks.CompilerServices; -namespace UniRx.Async +namespace Cysharp.Threading.Tasks { [AsyncMethodBuilder(typeof(AsyncUniTaskVoidMethodBuilder))] public struct UniTaskVoid diff --git a/Assets/UniRx.Async/UniTaskVoid.cs.meta b/Assets/Plugins/UniTask/UniTaskVoid.cs.meta similarity index 100% rename from Assets/UniRx.Async/UniTaskVoid.cs.meta rename to Assets/Plugins/UniTask/UniTaskVoid.cs.meta diff --git a/Assets/UniRx.Async/UnityAsyncExtensions.Jobs.cs b/Assets/Plugins/UniTask/UnityAsyncExtensions.Jobs.cs similarity index 98% rename from Assets/UniRx.Async/UnityAsyncExtensions.Jobs.cs rename to Assets/Plugins/UniTask/UnityAsyncExtensions.Jobs.cs index fea8b21..6f3ec12 100644 --- a/Assets/UniRx.Async/UnityAsyncExtensions.Jobs.cs +++ b/Assets/Plugins/UniTask/UnityAsyncExtensions.Jobs.cs @@ -5,7 +5,7 @@ using System; using System.Threading; using Unity.Jobs; -namespace UniRx.Async +namespace Cysharp.Threading.Tasks { public static partial class UnityAsyncExtensions { diff --git a/Assets/UniRx.Async/UnityAsyncExtensions.Jobs.cs.meta b/Assets/Plugins/UniTask/UnityAsyncExtensions.Jobs.cs.meta similarity index 100% rename from Assets/UniRx.Async/UnityAsyncExtensions.Jobs.cs.meta rename to Assets/Plugins/UniTask/UnityAsyncExtensions.Jobs.cs.meta diff --git a/Assets/UniRx.Async/UnityAsyncExtensions.MonoBehaviour.cs b/Assets/Plugins/UniTask/UnityAsyncExtensions.MonoBehaviour.cs similarity index 91% rename from Assets/UniRx.Async/UnityAsyncExtensions.MonoBehaviour.cs rename to Assets/Plugins/UniTask/UnityAsyncExtensions.MonoBehaviour.cs index 82e26c8..d7e4300 100644 --- a/Assets/UniRx.Async/UnityAsyncExtensions.MonoBehaviour.cs +++ b/Assets/Plugins/UniTask/UnityAsyncExtensions.MonoBehaviour.cs @@ -1,7 +1,7 @@ using System; using System.Threading; -namespace UniRx.Async +namespace Cysharp.Threading.Tasks { public static partial class UnityAsyncExtensions { diff --git a/Assets/UniRx.Async/UnityAsyncExtensions.MonoBehaviour.cs.meta b/Assets/Plugins/UniTask/UnityAsyncExtensions.MonoBehaviour.cs.meta similarity index 100% rename from Assets/UniRx.Async/UnityAsyncExtensions.MonoBehaviour.cs.meta rename to Assets/Plugins/UniTask/UnityAsyncExtensions.MonoBehaviour.cs.meta diff --git a/Assets/UniRx.Async/UnityAsyncExtensions.cs b/Assets/Plugins/UniTask/UnityAsyncExtensions.cs similarity index 99% rename from Assets/UniRx.Async/UnityAsyncExtensions.cs rename to Assets/Plugins/UniTask/UnityAsyncExtensions.cs index d8d00be..00ba49a 100644 --- a/Assets/UniRx.Async/UnityAsyncExtensions.cs +++ b/Assets/Plugins/UniTask/UnityAsyncExtensions.cs @@ -4,12 +4,12 @@ using System; using System.Runtime.CompilerServices; using System.Threading; using UnityEngine; -using UniRx.Async.Internal; +using Cysharp.Threading.Tasks.Internal; #if ENABLE_UNITYWEBREQUEST using UnityEngine.Networking; #endif -namespace UniRx.Async +namespace Cysharp.Threading.Tasks { public static partial class UnityAsyncExtensions { diff --git a/Assets/UniRx.Async/UnityAsyncExtensions.cs.meta b/Assets/Plugins/UniTask/UnityAsyncExtensions.cs.meta similarity index 100% rename from Assets/UniRx.Async/UnityAsyncExtensions.cs.meta rename to Assets/Plugins/UniTask/UnityAsyncExtensions.cs.meta diff --git a/Assets/UniRx.Async/UnityAsyncExtensions.tt b/Assets/Plugins/UniTask/UnityAsyncExtensions.tt similarity index 99% rename from Assets/UniRx.Async/UnityAsyncExtensions.tt rename to Assets/Plugins/UniTask/UnityAsyncExtensions.tt index 1b2b8ac..5dfaac6 100644 --- a/Assets/UniRx.Async/UnityAsyncExtensions.tt +++ b/Assets/Plugins/UniTask/UnityAsyncExtensions.tt @@ -24,12 +24,12 @@ using System; using System.Runtime.CompilerServices; using System.Threading; using UnityEngine; -using UniRx.Async.Internal; +using Cysharp.Threading.Tasks.Internal; #if ENABLE_UNITYWEBREQUEST using UnityEngine.Networking; #endif -namespace UniRx.Async +namespace Cysharp.Threading.Tasks { public static partial class UnityAsyncExtensions { diff --git a/Assets/UniRx.Async/UnityAsyncExtensions.tt.meta b/Assets/Plugins/UniTask/UnityAsyncExtensions.tt.meta similarity index 100% rename from Assets/UniRx.Async/UnityAsyncExtensions.tt.meta rename to Assets/Plugins/UniTask/UnityAsyncExtensions.tt.meta diff --git a/Assets/UniRx.Async/UnityAsyncExtensions.uGUI.cs b/Assets/Plugins/UniTask/UnityAsyncExtensions.uGUI.cs similarity index 99% rename from Assets/UniRx.Async/UnityAsyncExtensions.uGUI.cs rename to Assets/Plugins/UniTask/UnityAsyncExtensions.uGUI.cs index 24a119c..b90e183 100644 --- a/Assets/UniRx.Async/UnityAsyncExtensions.uGUI.cs +++ b/Assets/Plugins/UniTask/UnityAsyncExtensions.uGUI.cs @@ -2,12 +2,12 @@ using System; using System.Threading; -using UniRx.Async.Internal; +using Cysharp.Threading.Tasks.Internal; using UnityEngine; using UnityEngine.Events; using UnityEngine.UI; -namespace UniRx.Async +namespace Cysharp.Threading.Tasks { public static partial class UnityAsyncExtensions { diff --git a/Assets/UniRx.Async/UnityAsyncExtensions.uGUI.cs.meta b/Assets/Plugins/UniTask/UnityAsyncExtensions.uGUI.cs.meta similarity index 100% rename from Assets/UniRx.Async/UnityAsyncExtensions.uGUI.cs.meta rename to Assets/Plugins/UniTask/UnityAsyncExtensions.uGUI.cs.meta diff --git a/Assets/UniRx.Async/package.json b/Assets/Plugins/UniTask/package.json similarity index 100% rename from Assets/UniRx.Async/package.json rename to Assets/Plugins/UniTask/package.json diff --git a/Assets/UniRx.Async/package.json.meta b/Assets/Plugins/UniTask/package.json.meta similarity index 100% rename from Assets/UniRx.Async/package.json.meta rename to Assets/Plugins/UniTask/package.json.meta diff --git a/Assets/Scenes/SandboxMain.cs b/Assets/Scenes/SandboxMain.cs index f14c761..a9b144c 100644 --- a/Assets/Scenes/SandboxMain.cs +++ b/Assets/Scenes/SandboxMain.cs @@ -5,7 +5,7 @@ using System.IO; using System.Text; using System.Threading; using System.Threading.Tasks; -using UniRx.Async; +using Cysharp.Threading.Tasks; using Unity.Collections; using Unity.Jobs; using UnityEngine; diff --git a/Assets/Tests/AsyncTest.cs b/Assets/Tests/AsyncTest.cs index 12546a8..56a8006 100644 --- a/Assets/Tests/AsyncTest.cs +++ b/Assets/Tests/AsyncTest.cs @@ -9,8 +9,7 @@ using System.Linq; using System.Text; using UnityEngine.UI; using UnityEngine.Scripting; -using UniRx; -using UniRx.Async; +using Cysharp.Threading.Tasks; using UnityEngine.SceneManagement; #if CSHARP_7_OR_LATER || (UNITY_2018_3_OR_NEWER && (NET_STANDARD_2_0 || NET_4_6)) using System.Threading.Tasks; @@ -32,7 +31,7 @@ using NUnit.Framework; using UnityEngine.TestTools; using FluentAssertions; -namespace UniRx.AsyncTests +namespace Cysharp.Threading.TasksTests { public class AsyncTest { diff --git a/Assets/Tests/Editor/AsyncTestEditor.cs b/Assets/Tests/Editor/AsyncTestEditor.cs index 69720f4..12af94d 100644 --- a/Assets/Tests/Editor/AsyncTestEditor.cs +++ b/Assets/Tests/Editor/AsyncTestEditor.cs @@ -9,8 +9,7 @@ using System.Linq; using System.Text; using UnityEngine.UI; using UnityEngine.Scripting; -using UniRx; -using UniRx.Async; +using Cysharp.Threading.Tasks; using UnityEngine.SceneManagement; #if CSHARP_7_OR_LATER || (UNITY_2018_3_OR_NEWER && (NET_STANDARD_2_0 || NET_4_6)) using System.Threading.Tasks; @@ -32,7 +31,7 @@ using NUnit.Framework; using UnityEngine.TestTools; using FluentAssertions; -namespace UniRx.AsyncTests +namespace Cysharp.Threading.TasksTests { public class AsyncTest { diff --git a/Assets/Tests/Editor/RunTestEditor.cs b/Assets/Tests/Editor/RunTestEditor.cs index b6caa46..7397372 100644 --- a/Assets/Tests/Editor/RunTestEditor.cs +++ b/Assets/Tests/Editor/RunTestEditor.cs @@ -9,8 +9,7 @@ using System.Linq; using System.Text; using UnityEngine.UI; using UnityEngine.Scripting; -using UniRx; -using UniRx.Async; +using Cysharp.Threading.Tasks; using UnityEngine.SceneManagement; #if CSHARP_7_OR_LATER || (UNITY_2018_3_OR_NEWER && (NET_STANDARD_2_0 || NET_4_6)) using System.Threading.Tasks; @@ -32,7 +31,7 @@ using NUnit.Framework; using UnityEngine.TestTools; using FluentAssertions; -namespace UniRx.AsyncTests +namespace Cysharp.Threading.TasksTests { public class RunTest { diff --git a/Assets/Tests/Editor/WhenAnyTestEditor.cs b/Assets/Tests/Editor/WhenAnyTestEditor.cs index f78bb4a..3916a28 100644 --- a/Assets/Tests/Editor/WhenAnyTestEditor.cs +++ b/Assets/Tests/Editor/WhenAnyTestEditor.cs @@ -9,15 +9,14 @@ using System.Linq; using System.Text; using UnityEngine.UI; using UnityEngine.Scripting; -using UniRx; -using UniRx.Async; +using Cysharp.Threading.Tasks; using Unity.Collections; using System.Threading; using NUnit.Framework; using UnityEngine.TestTools; using FluentAssertions; -namespace UniRx.AsyncTests +namespace Cysharp.Threading.TasksTests { public class WhenAnyTest { diff --git a/Assets/Tests/RunTest.cs b/Assets/Tests/RunTest.cs index b6caa46..7397372 100644 --- a/Assets/Tests/RunTest.cs +++ b/Assets/Tests/RunTest.cs @@ -9,8 +9,7 @@ using System.Linq; using System.Text; using UnityEngine.UI; using UnityEngine.Scripting; -using UniRx; -using UniRx.Async; +using Cysharp.Threading.Tasks; using UnityEngine.SceneManagement; #if CSHARP_7_OR_LATER || (UNITY_2018_3_OR_NEWER && (NET_STANDARD_2_0 || NET_4_6)) using System.Threading.Tasks; @@ -32,7 +31,7 @@ using NUnit.Framework; using UnityEngine.TestTools; using FluentAssertions; -namespace UniRx.AsyncTests +namespace Cysharp.Threading.TasksTests { public class RunTest { diff --git a/Assets/Tests/WhenAnyTest.cs b/Assets/Tests/WhenAnyTest.cs index f78bb4a..3916a28 100644 --- a/Assets/Tests/WhenAnyTest.cs +++ b/Assets/Tests/WhenAnyTest.cs @@ -9,15 +9,14 @@ using System.Linq; using System.Text; using UnityEngine.UI; using UnityEngine.Scripting; -using UniRx; -using UniRx.Async; +using Cysharp.Threading.Tasks; using Unity.Collections; using System.Threading; using NUnit.Framework; using UnityEngine.TestTools; using FluentAssertions; -namespace UniRx.AsyncTests +namespace Cysharp.Threading.TasksTests { public class WhenAnyTest {