Răsfoiți Sursa

Use existing HAS_DISPATCHER feature flag

Oren Novotny 9 ani în urmă
părinte
comite
5a36ec8cb3

+ 1 - 1
Rx.NET/Source/Tests.System.Reactive/DispatcherHelpers.cs

@@ -9,7 +9,7 @@ using System.Windows.Threading;
 
 namespace ReactiveTests
 {
-#if !NO_DISPATCHER
+#if HAS_DISPATCHER
     static class DispatcherHelpers
     {
         public static DispatcherWrapper EnsureDispatcher()

+ 6 - 6
Rx.NET/Source/Tests.System.Reactive/Tests/Linq/QbservableTest.cs

@@ -865,7 +865,7 @@ namespace ReactiveTests.Tests
         {
             ReactiveAssert.Throws<ArgumentNullException>(() => Qbservable.ObserveOn(_qbMy, default(IScheduler)));
             ReactiveAssert.Throws<ArgumentNullException>(() => Qbservable.ObserveOn(_qbMy, default(SynchronizationContext)));
-#if !NO_DISPATCHER
+#if HAS_DISPATCHER
             ReactiveAssert.Throws<ArgumentNullException>(() => Qbservable.ObserveOn(_qbMy, default(DispatcherScheduler)));
 #endif
 #if HAS_WINFORMS
@@ -874,12 +874,12 @@ namespace ReactiveTests.Tests
 #endif
             ReactiveAssert.Throws<ArgumentNullException>(() => Qbservable.ObserveOn(_qbNull, Scheduler.Immediate));
             ReactiveAssert.Throws<ArgumentNullException>(() => Qbservable.ObserveOn(_qbNull, new SynchronizationContext()));
-#if !NO_DISPATCHER
+#if HAS_DISPATCHER
             ReactiveAssert.Throws<ArgumentNullException>(() => Qbservable.ObserveOn(_qbNull, DispatcherScheduler.Instance));
 #endif
         }
 
-#if !NO_DISPATCHER
+#if HAS_DISPATCHER
         [Fact]
         public void ObserveOn()
         {
@@ -1152,12 +1152,12 @@ namespace ReactiveTests.Tests
         {
             ReactiveAssert.Throws<ArgumentNullException>(() => Qbservable.SubscribeOn(_qbMy, default(IScheduler)));
             ReactiveAssert.Throws<ArgumentNullException>(() => Qbservable.SubscribeOn(_qbMy, default(SynchronizationContext)));
-#if !NO_DISPATCHER
+#if HAS_DISPATCHER
             ReactiveAssert.Throws<ArgumentNullException>(() => Qbservable.SubscribeOn(_qbMy, default(DispatcherScheduler)));
 #endif
             ReactiveAssert.Throws<ArgumentNullException>(() => Qbservable.SubscribeOn(_qbNull, Scheduler.Immediate));
             ReactiveAssert.Throws<ArgumentNullException>(() => Qbservable.SubscribeOn(_qbNull, new SynchronizationContext()));
-#if !NO_DISPATCHER
+#if HAS_DISPATCHER
             ReactiveAssert.Throws<ArgumentNullException>(() => Qbservable.SubscribeOn(_qbNull, DispatcherScheduler.Instance));
 #endif
 #if HAS_WINFORMS
@@ -1171,7 +1171,7 @@ namespace ReactiveTests.Tests
         {
             _qbMy.SubscribeOn(Scheduler.Immediate);
             _qbMy.SubscribeOn(new SynchronizationContext());
-#if !NO_DISPATCHER
+#if HAS_DISPATCHER
             Qbservable.SubscribeOn(_qbMy, DispatcherScheduler.Instance);
 #endif
 #if HAS_WINFORMS

+ 0 - 1
Rx.NET/Source/Tests.System.Reactive/project.json

@@ -61,7 +61,6 @@
             "PREFER_ASYNC",
             "HAS_AWAIT",
             "HAS_APTCA",
-            "NO_DISPATCHER",
             "NO_REMOTING",
             "NO_SERIALIZABLE",
             "NO_THREAD",