Update uniRX, selector and sequencer streams and tests added

Assets/Plugins/UniRx/Examples/Sample01_ObservableWWW.cs

@@ -1,5 +1,9 @@
 #if !(UNITY_METRO || UNITY_WP8)
 
+#if UNITY_2018_3_OR_NEWER
+#pragma warning disable CS0618
+#endif
+
 using UnityEngine;
 
 namespace UniRx.Examples
@@ -79,4 +83,8 @@ from bing in ObservableWWW.Get("http://bing.com/")
     }
 }
 
+#endif
+
+#if UNITY_2018_3_OR_NEWER
+#pragma warning restore CS0618
 #endif

Assets/Plugins/UniRx/Examples/Sample05_ConvertFromCoroutine.cs

@@ -2,6 +2,9 @@
 using System.Collections;
 using System.Threading;
 using UnityEngine;
+#if UNITY_2018_3_OR_NEWER
+#pragma warning disable CS0618
+#endif
 
 namespace UniRx.Examples
 {
@@ -36,4 +39,7 @@ static IEnumerator GetWWWCore(string url, IObserver<string> observer, Cancellati
             }
         }
     }
-}
+}
+#if UNITY_2018_3_OR_NEWER
+#pragma warning restore CS0618
+#endif

Assets/Plugins/UniRx/Examples/Sample06_ConvertToCoroutine.cs

@@ -31,6 +31,9 @@ IEnumerator ComplexCoroutineTest()
         // You can use ToYieldInstruction.
 
 #if !(UNITY_4_0 || UNITY_4_1 || UNITY_4_2 || UNITY_4_3 || UNITY_4_4 || UNITY_4_5 || UNITY_4_6 || UNITY_5_0 || UNITY_5_1 || UNITY_5_2)
+#if UNITY_2018_3_OR_NEWER
+#pragma warning disable CS0618
+#endif
 
         IEnumerator TestNewCustomYieldInstruction()
         {
@@ -50,7 +53,9 @@ IEnumerator TestNewCustomYieldInstruction()
             // other sample(wait until transform.position.y >= 100) 
             yield return this.ObserveEveryValueChanged(x => x.transform).FirstOrDefault(x => x.position.y >= 100).ToYieldInstruction();
         }
-
+#if UNITY_2018_3_OR_NEWER
+#pragma warning restore CS0618
+#endif
 #endif
 
     }

Assets/Plugins/UniRx/ReadMe.txt

@@ -1,4 +1,4 @@
-UniRx - Reactive Extensions for Unity / Ver 6.2.0
+UniRx - Reactive Extensions for Unity / Ver 6.2.2
 ===
 Created by Yoshifumi Kawai(neuecc)
 

Assets/Plugins/UniRx/Scripts/Async/AsyncUnit.cs

@@ -1,4 +1,4 @@
-#if CSHARP_7_OR_LATER
+#if CSHARP_7_OR_LATER || (UNITY_2018_3_OR_NEWER && (NET_STANDARD_2_0 || NET_4_6))
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or 
 
 using System;

Assets/Plugins/UniRx/Scripts/Async/CancellationTokenEqualityComparer.cs

@@ -1,5 +1,6 @@
-#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
-#if (CSHARP_7_OR_LATER)
+#if CSHARP_7_OR_LATER || (UNITY_2018_3_OR_NEWER && (NET_STANDARD_2_0 || NET_4_6))
+#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
+
 using System.Collections.Generic;
 using System.Threading;
 

Assets/Plugins/UniRx/Scripts/Async/CancellationTokenExtensions.cs

@@ -1,4 +1,4 @@
-#if CSHARP_7_OR_LATER
+#if CSHARP_7_OR_LATER || (UNITY_2018_3_OR_NEWER && (NET_STANDARD_2_0 || NET_4_6))
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 
 using System;
@@ -18,14 +18,58 @@ public static (UniTask, CancellationTokenRegistration) ToUniTask(this Cancellati
             }
 
             var promise = new UniTaskCompletionSource<AsyncUnit>();
-            return (promise.Task, cts.Register(cancellationTokenCallback, promise, false));
+            return (promise.Task, cts.RegisterWithoutCaptureExecutionContext(cancellationTokenCallback, promise));
         }
 
         static void Callback(object state)
         {
             var promise = (UniTaskCompletionSource<AsyncUnit>)state;
             promise.TrySetResult(AsyncUnit.Default);
         }
+
+        public static CancellationTokenRegistration RegisterWithoutCaptureExecutionContext(this CancellationToken cancellationToken, Action callback)
+        {
+            var restoreFlow = false;
+            if (!ExecutionContext.IsFlowSuppressed())
+            {
+                ExecutionContext.SuppressFlow();
+                restoreFlow = true;
+            }
+
+            try
+            {
+                return cancellationToken.Register(callback, false);
+            }
+            finally
+            {
+                if (restoreFlow)
+                {
+                    ExecutionContext.RestoreFlow();
+                }
+            }
+        }
+
+        public static CancellationTokenRegistration RegisterWithoutCaptureExecutionContext(this CancellationToken cancellationToken, Action<object> callback, object state)
+        {
+            var restoreFlow = false;
+            if (!ExecutionContext.IsFlowSuppressed())
+            {
+                ExecutionContext.SuppressFlow();
+                restoreFlow = true;
+            }
+
+            try
+            {
+                return cancellationToken.Register(callback, state, false);
+            }
+            finally
+            {
+                if (restoreFlow)
+                {
+                    ExecutionContext.RestoreFlow();
+                }
+            }
+        }
     }
 }
 

Assets/Plugins/UniRx/Scripts/Async/CancellationTokenSourceExtensions.cs

@@ -1,4 +1,4 @@
-#if CSHARP_7_OR_LATER
+#if CSHARP_7_OR_LATER || (UNITY_2018_3_OR_NEWER && (NET_STANDARD_2_0 || NET_4_6))
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 
 using System.Threading;
@@ -12,20 +12,24 @@ public static class CancellationTokenSourceExtensions
     {
         public static void CancelAfterSlim(this CancellationTokenSource cts, int millisecondsDelay, bool ignoreTimeScale = false, PlayerLoopTiming delayTiming = PlayerLoopTiming.Update)
         {
-            var delay = UniTask.Delay(millisecondsDelay, ignoreTimeScale, delayTiming);
+            var delay = UniTask.Delay(millisecondsDelay, ignoreTimeScale, delayTiming, cts.Token);
             CancelAfterCore(cts, delay).Forget();
         }
 
         public static void CancelAfterSlim(this CancellationTokenSource cts, TimeSpan delayTimeSpan, bool ignoreTimeScale = false, PlayerLoopTiming delayTiming = PlayerLoopTiming.Update)
         {
-            var delay = UniTask.Delay(delayTimeSpan, ignoreTimeScale, delayTiming);
+            var delay = UniTask.Delay(delayTimeSpan, ignoreTimeScale, delayTiming, cts.Token);
             CancelAfterCore(cts, delay).Forget();
         }
 
         static async UniTaskVoid CancelAfterCore(CancellationTokenSource cts, UniTask delayTask)
         {
-            await delayTask;
-            cts.Cancel();
+            var alreadyCanceled = await delayTask.SuppressCancellationThrow();
+            if (!alreadyCanceled)
+            {
+                cts.Cancel();
+                cts.Dispose();
+            }
         }
 
         public static void RegisterRaiseCancelOnDestroy(this CancellationTokenSource cts, Component component)

Assets/Plugins/UniRx/Scripts/Async/CompilerServices/AsyncMethodBuilderAttribute.cs

@@ -1,4 +1,4 @@
-#if CSHARP_7_OR_LATER
+#if CSHARP_7_OR_LATER || (UNITY_2018_3_OR_NEWER && (NET_STANDARD_2_0 || NET_4_6))
 
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 

Assets/Plugins/UniRx/Scripts/Async/CompilerServices/AsyncUniTaskMethodBuilder.cs

@@ -1,4 +1,4 @@
-#if CSHARP_7_OR_LATER
+#if CSHARP_7_OR_LATER || (UNITY_2018_3_OR_NEWER && (NET_STANDARD_2_0 || NET_4_6))
 
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 

Assets/Plugins/UniRx/Scripts/Async/CompilerServices/AsyncUniTaskVoidMethodBuilder.cs

@@ -1,4 +1,4 @@
-#if CSHARP_7_OR_LATER
+#if CSHARP_7_OR_LATER || (UNITY_2018_3_OR_NEWER && (NET_STANDARD_2_0 || NET_4_6))
 
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member