Removing checks for absence of SynchronizationContext

Rx.NET/Source/src/System.Reactive/Concurrency/Synchronization.ObserveOn.cs

@@ -12,43 +12,37 @@ class ObserveOn<TSource> : Producer<TSource>
     {
         private readonly IObservable<TSource> _source;
         private readonly IScheduler _scheduler;
+        private readonly SynchronizationContext _context;
 
         public ObserveOn(IObservable<TSource> source, IScheduler scheduler)
         {
             _source = source;
             _scheduler = scheduler;
         }
 
-#if !NO_SYNCCTX
-        private readonly SynchronizationContext _context;
-
         public ObserveOn(IObservable<TSource> source, SynchronizationContext context)
         {
             _source = source;
             _context = context;
         }
-#endif
 
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "2", Justification = "Visibility restricted to friend assemblies. Those should be correct by inspection.")]
         protected override IDisposable Run(IObserver<TSource> observer, IDisposable cancel, Action<IDisposable> setSink)
         {
-#if !NO_SYNCCTX
             if (_context != null)
             {
                 var sink = new ObserveOnSink(this, observer, cancel);
                 setSink(sink);
                 return sink.Run();
             }
             else
-#endif
             {
                 var sink = new ObserveOnObserver<TSource>(_scheduler, observer, cancel);
                 setSink(sink);
                 return _source.SubscribeSafe(sink);
             }
         }
 
-#if !NO_SYNCCTX
         class ObserveOnSink : Sink<TSource>, IObserver<TSource>
         {
             private readonly ObserveOn<TSource> _parent;
@@ -111,7 +105,6 @@ private void OnCompletedPosted(object ignored)
                 base.Dispose();
             }
         }
-#endif
     }
 }
 #endif

Rx.NET/Source/src/System.Reactive/Concurrency/Synchronization.cs

@@ -50,7 +50,6 @@ public static IObservable<TSource> SubscribeOn<TSource>(IObservable<TSource> sou
             });
         }
 
-#if !NO_SYNCCTX
         /// <summary>
         /// Wraps the source sequence in order to run its subscription and unsubscription logic on the specified synchronization context.
         /// </summary>
@@ -81,7 +80,6 @@ public static IObservable<TSource> SubscribeOn<TSource>(IObservable<TSource> sou
                 return subscription;
             });
         }
-#endif
 
         #endregion
 
@@ -109,7 +107,6 @@ public static IObservable<TSource> ObserveOn<TSource>(IObservable<TSource> sourc
 #endif
         }
 
-#if !NO_SYNCCTX
         /// <summary>
         /// Wraps the source sequence in order to run its observer callbacks on the specified synchronization context.
         /// </summary>
@@ -152,7 +149,6 @@ public static IObservable<TSource> ObserveOn<TSource>(IObservable<TSource> sourc
             });
 #endif
         }
-#endif
 
         #endregion
 

Rx.NET/Source/src/System.Reactive/Concurrency/SynchronizationContextScheduler.cs

@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information. 
 
-#if !NO_SYNCCTX
 using System.Reactive.Disposables;
 using System.Threading;
 
@@ -98,4 +97,3 @@ public override IDisposable Schedule<TState>(TState state, TimeSpan dueTime, Fun
         }
     }
 }
-#endif

Rx.NET/Source/src/System.Reactive/Disposables/ContextDisposable.cs

@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information. 
 
-#if !NO_SYNCCTX
 using System.Reactive.Concurrency;
 using System.Threading;
 
@@ -63,4 +62,3 @@ public void Dispose()
         }
     }
 }
-#endif

Rx.NET/Source/src/System.Reactive/Internal/SynchronizationContextExtensions.cs

@@ -2,7 +2,10 @@
 // The .NET Foundation licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information. 
 
-#if !NO_SYNCCTX
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
 using System.Threading;
 
 namespace System.Reactive.Concurrency
@@ -50,4 +53,3 @@ public static void PostWithStartComplete(this SynchronizationContext context, Ac
         }
     }
 }
-#endif

Rx.NET/Source/src/System.Reactive/Linq/IQueryLanguage.cs

@@ -380,13 +380,11 @@ internal interface IQueryLanguage
         #region * Concurrency *
 
         IObservable<TSource> ObserveOn<TSource>(IObservable<TSource> source, IScheduler scheduler);
-#if !NO_SYNCCTX
         IObservable<TSource> ObserveOn<TSource>(IObservable<TSource> source, SynchronizationContext context);
-#endif
+
         IObservable<TSource> SubscribeOn<TSource>(IObservable<TSource> source, IScheduler scheduler);
-#if !NO_SYNCCTX
         IObservable<TSource> SubscribeOn<TSource>(IObservable<TSource> source, SynchronizationContext context);
-#endif
+
         IObservable<TSource> Synchronize<TSource>(IObservable<TSource> source);
         IObservable<TSource> Synchronize<TSource>(IObservable<TSource> source, object gate);
 

Rx.NET/Source/src/System.Reactive/Linq/Observable.Concurrency.cs

@@ -33,7 +33,6 @@ public static IObservable<TSource> ObserveOn<TSource>(this IObservable<TSource>
             return s_impl.ObserveOn<TSource>(source, scheduler);
         }
 
-#if !NO_SYNCCTX
         /// <summary>
         /// Wraps the source sequence in order to run its observer callbacks on the specified synchronization context.
         /// </summary>
@@ -55,7 +54,6 @@ public static IObservable<TSource> ObserveOn<TSource>(this IObservable<TSource>
 
             return s_impl.ObserveOn<TSource>(source, context);
         }
-#endif
 
         #endregion
 
@@ -84,7 +82,6 @@ public static IObservable<TSource> SubscribeOn<TSource>(this IObservable<TSource
             return s_impl.SubscribeOn<TSource>(source, scheduler);
         }
 
-#if !NO_SYNCCTX
         /// <summary>
         /// Wraps the source sequence in order to run its subscription and unsubscription logic on the specified synchronization context. This operation is not commonly used;
         /// see the remarks section for more information on the distinction between SubscribeOn and ObserveOn.
@@ -107,7 +104,6 @@ public static IObservable<TSource> SubscribeOn<TSource>(this IObservable<TSource
 
             return s_impl.SubscribeOn<TSource>(source, context);
         }
-#endif
 
         #endregion
 

Rx.NET/Source/src/System.Reactive/Linq/Observable/ObserveOn.cs

@@ -13,42 +13,36 @@ class ObserveOn<TSource> : Producer<TSource>
     {
         private readonly IObservable<TSource> _source;
         private readonly IScheduler _scheduler;
+        private readonly SynchronizationContext _context;
 
         public ObserveOn(IObservable<TSource> source, IScheduler scheduler)
         {
             _source = source;
             _scheduler = scheduler;
         }
 
-#if !NO_SYNCCTX
-        private readonly SynchronizationContext _context;
-
         public ObserveOn(IObservable<TSource> source, SynchronizationContext context)
         {
             _source = source;
             _context = context;
         }
-#endif
 
         protected override IDisposable Run(IObserver<TSource> observer, IDisposable cancel, Action<IDisposable> setSink)
         {
-#if !NO_SYNCCTX
             if (_context != null)
             {
                 var sink = new ObserveOnImpl(this, observer, cancel);
                 setSink(sink);
                 return _source.Subscribe(sink);
             }
             else
-#endif
             {
                 var sink = new ObserveOnObserver<TSource>(_scheduler, observer, cancel);
                 setSink(sink);
                 return _source.Subscribe(sink);
             }
         }
 
-#if !NO_SYNCCTX
         class ObserveOnImpl : Sink<TSource>, IObserver<TSource>
         {
             private readonly ObserveOn<TSource> _parent;
@@ -85,7 +79,6 @@ public void OnCompleted()
                 });
             }
         }
-#endif
     }
 }
 #endif

Rx.NET/Source/src/System.Reactive/Linq/QueryLanguage.Concurrency.cs

@@ -21,12 +21,10 @@ public virtual IObservable<TSource> ObserveOn<TSource>(IObservable<TSource> sour
             return Synchronization.ObserveOn<TSource>(source, scheduler);
         }
 
-#if !NO_SYNCCTX
         public virtual IObservable<TSource> ObserveOn<TSource>(IObservable<TSource> source, SynchronizationContext context)
         {
             return Synchronization.ObserveOn<TSource>(source, context);
         }
-#endif
 
         #endregion
 
@@ -37,12 +35,10 @@ public virtual IObservable<TSource> SubscribeOn<TSource>(IObservable<TSource> so
             return Synchronization.SubscribeOn<TSource>(source, scheduler);
         }
 
-#if !NO_SYNCCTX
         public virtual IObservable<TSource> SubscribeOn<TSource>(IObservable<TSource> source, SynchronizationContext context)
         {
             return Synchronization.SubscribeOn<TSource>(source, context);
         }
-#endif
 
         #endregion
 

Rx.NET/Source/src/System.Reactive/Observer.Extensions.cs

@@ -258,7 +258,6 @@ public static IObserver<T> NotifyOn<T>(this IObserver<T> observer, IScheduler sc
             return new ObserveOnObserver<T>(scheduler, observer, null);
         }
 
-#if !NO_SYNCCTX
         /// <summary>
         /// Schedules the invocation of observer methods on the given synchonization context.
         /// </summary>
@@ -276,8 +275,7 @@ public static IObserver<T> NotifyOn<T>(this IObserver<T> observer, Synchronizati
 
             return new ObserveOnObserver<T>(new SynchronizationContextScheduler(context), observer, null);
         }
-#endif
-
+
         /// <summary>
         /// Converts an observer to a progress object.
         /// </summary>