remove ObsoleteComponent, fix for UWP

wodndb · Jul 9, 2018 · 7e397dd · 7e397dd
1 parent 87085b6
commit 7e397dd
Show file tree

Hide file tree

Showing 40 changed files with 19,831 additions and 2,316 deletions.
diff --git a/Assembly-CSharp-firstpass.Player.csproj b/Assembly-CSharp-firstpass.Player.csproj
diff --git a/Assembly-CSharp-firstpass.csproj b/Assembly-CSharp-firstpass.csproj
diff --git a/Assembly-CSharp.Player.csproj b/Assembly-CSharp.Player.csproj
diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj
diff --git a/Assets/Plugins/UniRx/Scripts/Async/Internal/PlayerLoopRunner.cs b/Assets/Plugins/UniRx/Scripts/Async/Internal/PlayerLoopRunner.cs
@@ -1,4 +1,4 @@
-#if CSHARP_7_OR_LATER
+#if UNITY_2018_1_OR_NEWER
 
 using System;
 using System.Collections.Generic;

diff --git a/Assets/Plugins/UniRx/Scripts/Disposables/CancellationDisposable.cs b/Assets/Plugins/UniRx/Scripts/Disposables/CancellationDisposable.cs
@@ -3,7 +3,7 @@
 
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
 
-#if (NET_4_6)
+#if (NETFX_CORE || NET_4_6 || UNITY_WSA_10_0)
 
 using System;
 using System.Threading;

diff --git a/Assets/Plugins/UniRx/Scripts/InternalUtil/ReflectionAccessor.cs b/Assets/Plugins/UniRx/Scripts/InternalUtil/ReflectionAccessor.cs
diff --git a/Assets/Plugins/UniRx/Scripts/InternalUtil/ReflectionAccessor.cs.meta b/Assets/Plugins/UniRx/Scripts/InternalUtil/ReflectionAccessor.cs.meta
diff --git a/Assets/Plugins/UniRx/Scripts/System/IObservable.cs b/Assets/Plugins/UniRx/Scripts/System/IObservable.cs
@@ -2,7 +2,7 @@
 
 using System;
 
-#if !(NETFX_CORE || NET_4_6)
+#if !(NETFX_CORE || NET_4_6 || UNITY_WSA_10_0)
 
 namespace UniRx
 {

diff --git a/Assets/Plugins/UniRx/Scripts/System/IObserver.cs b/Assets/Plugins/UniRx/Scripts/System/IObserver.cs
@@ -1,6 +1,6 @@
 // defined from .NET Framework 4.0 and NETFX_CORE
 
-#if !(NETFX_CORE || NET_4_6)
+#if !(NETFX_CORE || NET_4_6 || UNITY_WSA_10_0)
 
 using System;
 

diff --git a/Assets/Plugins/UniRx/Scripts/System/IProgress.cs b/Assets/Plugins/UniRx/Scripts/System/IProgress.cs
@@ -1,6 +1,6 @@
 // defined from .NET Framework 4.5 and NETFX_CORE
 
-#if !(NETFX_CORE || NET_4_6)
+#if !(NETFX_CORE || NET_4_6 || UNITY_WSA_10_0)
 
 using System;
 

diff --git a/Assets/Plugins/UniRx/Scripts/System/Tuple.cs b/Assets/Plugins/UniRx/Scripts/System/Tuple.cs
@@ -4,7 +4,7 @@
 // 2. implements IEquatable<T1, T2,...>
 
 // note, we need to create ValueTuple or UniRxTuple...
-#if !(NETFX_CORE || NET_4_6)
+#if !(NETFX_CORE || NET_4_6 || UNITY_WSA_10_0)
 
 using System;
 using System.Collections;

diff --git a/Assets/Plugins/UniRx/Scripts/UnityEngineBridge/AotSafeExtensions.cs b/Assets/Plugins/UniRx/Scripts/UnityEngineBridge/AotSafeExtensions.cs
diff --git a/Assets/Plugins/UniRx/Scripts/UnityEngineBridge/AotSafeExtensions.cs.meta b/Assets/Plugins/UniRx/Scripts/UnityEngineBridge/AotSafeExtensions.cs.meta
diff --git a/Assets/Plugins/UniRx/Scripts/UnityEngineBridge/CancellationToken.cs b/Assets/Plugins/UniRx/Scripts/UnityEngineBridge/CancellationToken.cs
@@ -1,4 +1,4 @@
-#if !(NET_4_6)
+#if !(NETFX_CORE || NET_4_6 || UNITY_WSA_10_0)
 
 using System;
 

diff --git a/Assets/Plugins/UniRx/Scripts/UnityEngineBridge/LazyTask.cs b/Assets/Plugins/UniRx/Scripts/UnityEngineBridge/LazyTask.cs
diff --git a/Assets/Plugins/UniRx/Scripts/UnityEngineBridge/LazyTask.cs.meta b/Assets/Plugins/UniRx/Scripts/UnityEngineBridge/LazyTask.cs.meta
diff --git a/Assets/Plugins/UniRx/Scripts/UnityEngineBridge/MainThreadDispatcher.cs b/Assets/Plugins/UniRx/Scripts/UnityEngineBridge/MainThreadDispatcher.cs
@@ -482,13 +482,6 @@ void Awake()
                 mainThreadToken = new object();
                 initialized = true;
 
-#if (NET_4_6)
-                if (UniRxSynchronizationContext.AutoInstall)
-                {
-                    SynchronizationContext.SetSynchronizationContext(new UniRxSynchronizationContext());
-                }
-#endif
-
                 updateMicroCoroutine = new MicroCoroutine(ex => unhandledExceptionCallback(ex));
                 fixedUpdateMicroCoroutine = new MicroCoroutine(ex => unhandledExceptionCallback(ex));
                 endOfFrameMicroCoroutine = new MicroCoroutine(ex => unhandledExceptionCallback(ex));