Revert previous revert to old rx.

Desktop rx should be up to date. mcs and runtime needs to be fixed for mobile.

2 files changed, 96 insertions, 96 deletions

diff --git a/mcs/class/Mono.Reactive.Testing/Mono.Reactive.Testing.dll.sources b/mcs/class/Mono.Reactive.Testing/Mono.Reactive.Testing.dll.sources
index 964a9c5f051..b9f10f90f54 100644
--- a/mcs/class/Mono.Reactive.Testing/Mono.Reactive.Testing.dll.sources
+++ b/mcs/class/Mono.Reactive.Testing/Mono.Reactive.Testing.dll.sources
@@ -1,13 +1,13 @@
-../../../external/rx/Rx.NET/Microsoft.Reactive.Testing/ColdObservable.cs
-../../../external/rx/Rx.NET/Microsoft.Reactive.Testing/GlobalSuppressions.cs
-../../../external/rx/Rx.NET/Microsoft.Reactive.Testing/HotObservable.cs
-../../../external/rx/Rx.NET/Microsoft.Reactive.Testing/ITestObservable.cs
-../../../external/rx/Rx.NET/Microsoft.Reactive.Testing/ITestObserver.cs
-../../../external/rx/Rx.NET/Microsoft.Reactive.Testing/MockObserver.cs
-../../../external/rx/Rx.NET/Microsoft.Reactive.Testing/NamespaceDoc.cs
-../../../external/rx/Rx.NET/Microsoft.Reactive.Testing/Properties/AssemblyInfo.cs
-../../../external/rx/Rx.NET/Microsoft.Reactive.Testing/ReactiveAssert.cs
-../../../external/rx/Rx.NET/Microsoft.Reactive.Testing/ReactiveTest.cs
-../../../external/rx/Rx.NET/Microsoft.Reactive.Testing/Recorded.cs
-../../../external/rx/Rx.NET/Microsoft.Reactive.Testing/Subscription.cs
-../../../external/rx/Rx.NET/Microsoft.Reactive.Testing/TestScheduler.cs
+../../../external/rx/Rx/NET/Source/Microsoft.Reactive.Testing/ColdObservable.cs
+../../../external/rx/Rx/NET/Source/Microsoft.Reactive.Testing/GlobalSuppressions.cs
+../../../external/rx/Rx/NET/Source/Microsoft.Reactive.Testing/HotObservable.cs
+../../../external/rx/Rx/NET/Source/Microsoft.Reactive.Testing/ITestObservable.cs
+../../../external/rx/Rx/NET/Source/Microsoft.Reactive.Testing/ITestObserver.cs
+../../../external/rx/Rx/NET/Source/Microsoft.Reactive.Testing/MockObserver.cs
+../../../external/rx/Rx/NET/Source/Microsoft.Reactive.Testing/NamespaceDoc.cs
+../../../external/rx/Rx/NET/Source/Microsoft.Reactive.Testing/Properties/AssemblyInfo.cs
+../../../external/rx/Rx/NET/Source/Microsoft.Reactive.Testing/ReactiveAssert.cs
+../../../external/rx/Rx/NET/Source/Microsoft.Reactive.Testing/ReactiveTest.cs
+../../../external/rx/Rx/NET/Source/Microsoft.Reactive.Testing/Recorded.cs
+../../../external/rx/Rx/NET/Source/Microsoft.Reactive.Testing/Subscription.cs
+../../../external/rx/Rx/NET/Source/Microsoft.Reactive.Testing/TestScheduler.cs
diff --git a/mcs/class/Mono.Reactive.Testing/Mono.Reactive.Testing_test.dll.sources b/mcs/class/Mono.Reactive.Testing/Mono.Reactive.Testing_test.dll.sources
index 8971bf1a055..f78e0e39f0b 100644
--- a/mcs/class/Mono.Reactive.Testing/Mono.Reactive.Testing_test.dll.sources
+++ b/mcs/class/Mono.Reactive.Testing/Mono.Reactive.Testing_test.dll.sources
@@ -1,83 +1,83 @@
-../../../../external/rx/Rx.NET/Tests.System.Reactive/App.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/DispatcherHelpers.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Semaphore.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Stress/Core/Disposables/Composite.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Stress/Core/Disposables/Serial.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Stress/Core/Disposables/SingleAssignment.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Stress/Core/Disposables/RefCount.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Stress/Linq/Delay.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Stress/Linq/FromEvent.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Stress/Helpers.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Stress/Linq/Replay.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/TestBase.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/TestLongRunningScheduler.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Tests/AnonymousTest.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Tests/AsyncLockTest.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Tests/ConcurrencyTest.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Tests/ConnectableObservable.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Tests/ConnectableObservableTest.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Tests/ControlSchedulerTest.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Tests/ObservableSafetyTest.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Tests/QbservableExTest.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Tests/RogueEnumerable.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Tests/ScheduledItemTest.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Tests/StopwatchTest.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Tests/SystemClockTest.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Tests/DefaultConcurrencyAbstractionLayerTest.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Tests/EventPatternSourceBaseTest.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Tests/SynchronizationTest.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Tests/DefaultSchedulerTest.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Tests/CurrentThreadSchedulerTest.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Tests/DisposableTests.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Tests/EventLoopSchedulerTest.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Tests/HistoricalSchedulerTest.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Tests/ImmediateSchedulerTest.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Tests/MySubject.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Tests/NewThreadSchedulerTest.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Tests/NotificationTest.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Tests/ObservableEventsTest.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Tests/ObservableImperativeTest.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Tests/SchedulerTest.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Tests/SynchronizationContextSchedulerTest.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Tests/TaskObservableExtensionsTest.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Tests/TaskPoolSchedulerTest.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Tests/ThreadPoolSchedulerTest.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Tests/TimeTests.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Tests/UnitTest.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Tests/VirtualSchedulerTest.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Dummies/DummyDisposable.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Dummies/DummyEnumerable.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Dummies/DummyFunc.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Dummies/DummyObservable.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Dummies/DummyObserver.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Dummies/DummyScheduler.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Extensions.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/MockDisposable.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/MockEnumerable.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/NullErrorObservable.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Properties/AssemblyInfo.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Tests/AsyncSubjectTest.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Tests/BehaviorSubjectTest.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Tests/SubjectTest.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Tests/ListObservableTest.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Tests/ObservableAggregateTest.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Tests/ObservableAsyncTest.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Tests/ObservableAwaiterTest.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Tests/ObservableBindingTest.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Tests/ObservableBlockingTest.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Tests/ObservableConversionTests.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Tests/ObservableCreationTest.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Tests/ObservableExtensionsTest.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Tests/ObservableJoinsTest.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Tests/ObservableMultipleTest.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Tests/ObservableRemotingTest.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Tests/ObservableSingleTest.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Tests/ObservableStandardQueryOperatorTest.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Tests/ObservableTimeTest.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Tests/ObserverTest.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Tests/PrivateTypesTest.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Tests/QbservableTest.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Tests/RegressionTest.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Tests/ReplaySubjectTest.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/TestTaskScheduler.cs
-../../../../external/rx/Rx.NET/Tests.System.Reactive/Utils.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/App.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/DispatcherHelpers.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Semaphore.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Stress/Core/Disposables/Composite.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Stress/Core/Disposables/Serial.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Stress/Core/Disposables/SingleAssignment.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Stress/Core/Disposables/RefCount.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Stress/Linq/Delay.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Stress/Linq/FromEvent.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Stress/Helpers.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Stress/Linq/Replay.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/TestBase.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/TestLongRunningScheduler.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/AnonymousTest.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/ConcurrencyTest.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/ScheduledItemTest.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/StopwatchTest.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/SynchronizationTest.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/ConnectableObservable.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/ConnectableObservableTest.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/AsyncLockTest.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/ControlSchedulerTest.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/CurrentThreadSchedulerTest.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/DefaultSchedulerTest.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/EventLoopSchedulerTest.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/HistoricalSchedulerTest.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/ImmediateSchedulerTest.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/NewThreadSchedulerTest.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/SchedulerTest.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/SynchronizationContextSchedulerTest.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/TaskPoolSchedulerTest.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/ThreadPoolSchedulerTest.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/VirtualSchedulerTest.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Disposables/DisposableTests.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableAggregateTest.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableAsyncTest.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableAwaiterTest.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableBindingTest.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableBlockingTest.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableConversionTests.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableCreationTest.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableEventsTest.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableExtensionsTest.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableImperativeTest.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableJoinsTest.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableMultipleTest.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableRemotingTest.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableSafetyTest.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableSingleTest.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableStandardQueryOperatorTest.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableTimeTest.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/QbservableExTest.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/QbservableTest.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/Subjects/AsyncSubjectTest.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/Subjects/BehaviorSubjectTest.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/Subjects/ReplaySubjectTest.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/Subjects/SubjectTest.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/MySubject.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/RogueEnumerable.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/SystemClockTest.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/DefaultConcurrencyAbstractionLayerTest.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/EventPatternSourceBaseTest.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/NotificationTest.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/TaskObservableExtensionsTest.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/TimeTests.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/UnitTest.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Dummies/DummyDisposable.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Dummies/DummyEnumerable.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Dummies/DummyFunc.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Dummies/DummyObservable.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Dummies/DummyObserver.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Dummies/DummyScheduler.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Extensions.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/MockDisposable.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/MockEnumerable.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/NullErrorObservable.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Properties/AssemblyInfo.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/ListObservableTest.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/ObserverTest.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/PrivateTypesTest.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/RegressionTest.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/TestTaskScheduler.cs
+../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Utils.cs