diff options
author | Atsushi Eno <atsushieno@gmail.com> | 2013-12-16 22:30:39 +0400 |
---|---|---|
committer | Atsushi Eno <atsushieno@gmail.com> | 2013-12-16 22:30:39 +0400 |
commit | d4afca2276672ec761ad2f9f99c6d835d3fa7fd8 (patch) | |
tree | 548a32aeec206d37f71df1d96af79c744493b806 /mcs/class/Mono.Reactive.Testing | |
parent | 2c4d09109c5b9aa6eac9f51f409bce1d2c7dd3ae (diff) |
Updated Rx to 2.2 release.
Diffstat (limited to 'mcs/class/Mono.Reactive.Testing')
3 files changed, 3 insertions, 2 deletions
diff --git a/mcs/class/Mono.Reactive.Testing/Assembly/AssemblyInfo.cs b/mcs/class/Mono.Reactive.Testing/Assembly/AssemblyInfo.cs index 9db583dd8ca..e69de29bb2d 100644 --- a/mcs/class/Mono.Reactive.Testing/Assembly/AssemblyInfo.cs +++ b/mcs/class/Mono.Reactive.Testing/Assembly/AssemblyInfo.cs @@ -1,2 +0,0 @@ -[assembly:System.Reflection.AssemblyVersion ("2.1.30214.0")] -[assembly:System.Reflection.AssemblyFileVersion ("2.1.30214.0")] diff --git a/mcs/class/Mono.Reactive.Testing/Makefile b/mcs/class/Mono.Reactive.Testing/Makefile index 5f1854131d1..ae34470f544 100644 --- a/mcs/class/Mono.Reactive.Testing/Makefile +++ b/mcs/class/Mono.Reactive.Testing/Makefile @@ -16,6 +16,7 @@ LIB_MCS_FLAGS = \ -r:System.Reactive.Experimental.dll \ -r:System.Reactive.Windows.Forms.dll \ -r:System.Reactive.Windows.Threading.dll \ + -r:System.Reactive.Observable.Aliases.dll \ -r:System.Windows.Forms.dll \ -r:WindowsBase.dll \ -r:nunit.framework.dll \ 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 6b9a072f714..2d82a80f82a 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 @@ -3,6 +3,7 @@ ../../../../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/Schedulers/EventLoop.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 @@ -11,6 +12,7 @@ ../../../../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/Aliases.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 |