renaming namspeac to Cysharp.Threading.Tasks and move to under Plugins/UniTask

Assets/Editor/PackageExporter.cs

@@ -12,8 +12,8 @@ public static class PackageExporter
     public static void Export()
     {
         // configure
-        var root = "UniRx.Async";
+        var root = "UniTask";
-        var exportPath = "./UniRx.Async.unitypackage";
+        var exportPath = "./UniTask.unitypackage";
 
         var path = Path.Combine(Application.dataPath, root);
         var assets = Directory.EnumerateFiles(path, "*", SearchOption.AllDirectories)

Assets/Plugins.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 14eb6ba721535664b9d31e3a2d7664f9
+guid: b42c9a22c4f7bc7448ed60496a4dc359
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Assets/Plugins/System.Runtime.CompilerServices.Unsafe.dll.meta

@@ -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: 

Assets/Plugins/System.Threading.Tasks.Extensions.dll.meta

@@ -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: 

Assets/Plugins/UniTask.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 38249c6f05d584f44a219b4c97790f99
+guid: 4929ac1f6fcfe944a99529b6fb5bd9ef
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Assets/Plugins/UniTask/AsyncLazy.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Threading;
 
-namespace UniRx.Async
+namespace Cysharp.Threading.Tasks
 {
     public class AsyncLazy
     {

Assets/Plugins/UniTask/AsyncUnit.cs

@@ -3,7 +3,7 @@
 
 using System;
 
-namespace UniRx.Async
+namespace Cysharp.Threading.Tasks
 {
     public struct AsyncUnit : IEquatable<AsyncUnit>
     {

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<CancellationToken>
     {

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
     {

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
     {

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

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
     {

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
     {

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

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
     {

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
     {

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
     {

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
     {

Assets/Plugins/UniTask/ExceptionExtensions.cs

@@ -2,7 +2,7 @@
 
 using System;
 
-namespace UniRx.Async
+namespace Cysharp.Threading.Tasks
 {
     public static class ExceptionExtensions
     {

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
     {

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<T> but only provides Shared.
 

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
     {

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
     {

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
     {

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;
             }

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
     {

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
     {

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<T>.
     internal class MinimumQueue<T>

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
     {

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
     {

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
     {

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
     {

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.
 

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
     {

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<TKey, TValue>

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
     {

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
 {
     /// <summary>
     /// Lightweight IProgress[T] factory.

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
     {

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
     {

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
     {

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
     {

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
     {

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
 

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 #>

Assets/Plugins/UniTask/UniTask.Bridge.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Collections;
 
-namespace UniRx.Async
+namespace Cysharp.Threading.Tasks
 {
     // UnityEngine Bridges.
 

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
     {

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> AsyncUnit = UniTask.FromResult(UniRx.Async.AsyncUnit.Default);
+        public static readonly UniTask<AsyncUnit> AsyncUnit = UniTask.FromResult(Cysharp.Threading.Tasks.AsyncUnit.Default);
         public static readonly UniTask<bool> True = UniTask.FromResult(true);
         public static readonly UniTask<bool> False = UniTask.FromResult(false);
         public static readonly UniTask<int> Zero = UniTask.FromResult(0);