Merge branch 'main' into dev/bartde/static_lambdas

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

@@ -322,11 +322,7 @@ namespace System.Reactive.Linq
 
             public void Dispose()
             {
-#if HAS_MREEXPLICITDISPOSABLE
-                ((IDisposable)_evt).Dispose();
-#else
                 _evt.Dispose();
-#endif
             }
         }
 

Rx.NET/Source/src/System.Reactive/Notification.cs

@@ -73,9 +73,7 @@ namespace System.Reactive
         /// <summary>
         /// Represents an OnNext notification to an observer.
         /// </summary>
-#if !NO_DEBUGGER_ATTRIBUTES
         [DebuggerDisplay("OnNext({Value})")]
-#endif
 #if !NO_SERIALIZABLE
         [Serializable]
 #endif
@@ -228,9 +226,7 @@ namespace System.Reactive
         /// <summary>
         /// Represents an OnError notification to an observer.
         /// </summary>
-#if !NO_DEBUGGER_ATTRIBUTES
         [DebuggerDisplay("OnError({Exception})")]
-#endif
 #if !NO_SERIALIZABLE
         [Serializable]
 #endif

Rx.NET/Source/src/System.Reactive/ObservableQuery.cs

@@ -301,11 +301,7 @@ namespace System.Reactive
                 return base.VisitMethodCall(node);
             }
 
-#if NO_VISITLAMBDAOFT
-            protected override Expression VisitLambda(LambdaExpression node)
-#else
             protected override Expression VisitLambda<T>(Expression<T> node)
-#endif
             {
                 return node;
             }

Rx.NET/Source/tests/Tests.System.Reactive/DispatcherHelpers.cs

@@ -49,9 +49,7 @@ namespace ReactiveTests
 
         public void InvokeShutdown()
         {
-#if !USE_SL_DISPATCHER
             _dispatcher.InvokeShutdown();
-#endif
         }
 
         public static implicit operator Dispatcher(DispatcherWrapper wrapper)
@@ -59,13 +57,11 @@ namespace ReactiveTests
             return wrapper._dispatcher;
         }
 
-#if !USE_SL_DISPATCHER
         public event DispatcherUnhandledExceptionEventHandler UnhandledException
         {
             add { _dispatcher.UnhandledException += value; }
             remove { _dispatcher.UnhandledException -= value; }
         }
-#endif
 
         public void BeginInvoke(Action action)
         {

Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/ObserveOnTest.cs

@@ -44,18 +44,10 @@ namespace ReactiveTests.Tests
 #endif
 
 #if HAS_DISPATCHER
-#if USE_SL_DISPATCHER
-            ReactiveAssert.Throws<ArgumentNullException>(() => Observable.ObserveOn<int>(default(IObservable<int>), new DispatcherScheduler(System.Windows.Deployment.Current.Dispatcher)));
-#else
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.ObserveOn<int>(default(IObservable<int>), new DispatcherScheduler(Dispatcher.CurrentDispatcher)));
-#endif
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.ObserveOn<int>(someObservable, default(DispatcherScheduler)));
 
-#if USE_SL_DISPATCHER
-            ReactiveAssert.Throws<ArgumentNullException>(() => DispatcherObservable.ObserveOn<int>(default(IObservable<int>), System.Windows.Deployment.Current.Dispatcher));
-#else
             ReactiveAssert.Throws<ArgumentNullException>(() => DispatcherObservable.ObserveOn<int>(default(IObservable<int>), Dispatcher.CurrentDispatcher));
-#endif
             ReactiveAssert.Throws<ArgumentNullException>(() => DispatcherObservable.ObserveOn<int>(someObservable, default(Dispatcher)));
             ReactiveAssert.Throws<ArgumentNullException>(() => DispatcherObservable.ObserveOnDispatcher<int>(default(IObservable<int>)));
 #endif

Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/SubscribeOnTest.cs

@@ -42,18 +42,10 @@ namespace ReactiveTests.Tests
             ReactiveAssert.Throws<ArgumentNullException>(() => ControlObservable.SubscribeOn<int>(someObservable, default(Label)));
 #endif
 #if HAS_DISPATCHER
-#if USE_SL_DISPATCHER
-            ReactiveAssert.Throws<ArgumentNullException>(() => Observable.SubscribeOn<int>(default(IObservable<int>), new DispatcherScheduler(System.Windows.Deployment.Current.Dispatcher)));
-#else
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.SubscribeOn<int>(default(IObservable<int>), new DispatcherScheduler(Dispatcher.CurrentDispatcher)));
-#endif
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.SubscribeOn<int>(someObservable, default(DispatcherScheduler)));
 
-#if USE_SL_DISPATCHER
-            ReactiveAssert.Throws<ArgumentNullException>(() => DispatcherObservable.SubscribeOn<int>(default(IObservable<int>), System.Windows.Deployment.Current.Dispatcher));
-#else
             ReactiveAssert.Throws<ArgumentNullException>(() => DispatcherObservable.SubscribeOn<int>(default(IObservable<int>), Dispatcher.CurrentDispatcher));
-#endif
             ReactiveAssert.Throws<ArgumentNullException>(() => DispatcherObservable.SubscribeOn<int>(someObservable, default(Dispatcher)));
             ReactiveAssert.Throws<ArgumentNullException>(() => DispatcherObservable.SubscribeOnDispatcher<int>(default(IObservable<int>)));
 #endif