Remove obsolete #if directives (#1915)

Rx.NET/Source/facades/GlobalAssemblyVersion.cs

@@ -1,24 +1,14 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT License.
 // See the LICENSE file in the project root for more information.
 
 
 using System.Reflection;
 
 
-#if NETSTANDARD1_0 || WP8
-[assembly: AssemblyVersion("3.0.0.0")]
-#elif NETSTANDARD1_1 || WINDOWS8 || NET45 || NETCORE45
-[assembly: AssemblyVersion("3.0.1000.0")]
-#elif NETSTANDARD1_2 || WINDOWS81 || NET451 || NETCORE451 || WPA81
-[assembly: AssemblyVersion("3.0.2000.0")]
-#elif NETSTANDARD1_3 || NET46
-[assembly: AssemblyVersion("3.0.3000.0")]
-#elif NETSTANDARD1_4 || UAP10_0 || WINDOWS_UWP || NETCORE50 || NET461
+#if WINDOWS_UWP
 [assembly: AssemblyVersion("3.0.4000.0")]
-#elif NETSTANDARD1_5 || NET462
-[assembly: AssemblyVersion("3.0.5000.0")]
-#elif NETSTANDARD1_6 || NETCOREAPP1_0 || NET463 || NET472 || NETSTANDARD2_0
+#elif NET472 || NETSTANDARD2_0
 [assembly: AssemblyVersion("3.0.6000.0")]
 #else // this is here to prevent the build system from complaining. It should never be hit
 [assembly: AssemblyVersion("invalid")]

Rx.NET/Source/src/Microsoft.Reactive.Testing/Recorded.cs

@@ -14,9 +14,7 @@ namespace Microsoft.Reactive.Testing
     /// </summary>
     /// <typeparam name="T">Type of the value.</typeparam>
     [DebuggerDisplay("{Value}@{Time}")]
-#if !NO_SERIALIZABLE
     [Serializable]
-#endif
     public readonly struct Recorded<T> : IEquatable<Recorded<T>>
     {
         // NB: Keep these fields for compat with serialized state.

Rx.NET/Source/src/Microsoft.Reactive.Testing/Subscription.cs

@@ -12,9 +12,7 @@ namespace Microsoft.Reactive.Testing
     /// Records information about subscriptions to and unsubscriptions from observable sequences.
     /// </summary>
     [DebuggerDisplay("({Subscribe}, {Unsubscribe})")]
-#if !NO_SERIALIZABLE
     [Serializable]
-#endif
     public readonly struct Subscription : IEquatable<Subscription>
     {
         /// <summary>

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

@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT License.
 // See the LICENSE file in the project root for more information. 
 
-#if !NO_THREAD
 using System.Reactive.Disposables;
 using System.Threading;
 
@@ -251,4 +250,3 @@ private void Loop()
         }
     }
 }
-#endif

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

@@ -86,18 +86,13 @@ public EventLoopScheduler()
         {
         }
 
-#if !NO_THREAD
         /// <summary>
         /// Creates an object that schedules units of work on a designated thread, using the specified factory to control thread creation options.
         /// </summary>
         /// <param name="threadFactory">Factory function for thread creation.</param>
         /// <exception cref="ArgumentNullException"><paramref name="threadFactory"/> is <c>null</c>.</exception>
         public EventLoopScheduler(Func<ThreadStart, Thread> threadFactory)
         {
-#else
-        internal EventLoopScheduler(Func<ThreadStart, Thread> threadFactory)
-        {
-#endif
             _threadFactory = threadFactory ?? throw new ArgumentNullException(nameof(threadFactory));
             _stopwatch = ConcurrencyAbstractionLayer.Current.StartStopwatch();
 

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

@@ -29,18 +29,13 @@ public NewThreadScheduler()
         /// </summary>
         public static NewThreadScheduler Default => Instance.Value;
 
-#if !NO_THREAD
         /// <summary>
         /// Creates an object that schedules each unit of work on a separate thread.
         /// </summary>
         /// <param name="threadFactory">Factory function for thread creation.</param>
         /// <exception cref="ArgumentNullException"><paramref name="threadFactory"/> is <c>null</c>.</exception>
         public NewThreadScheduler(Func<ThreadStart, Thread> threadFactory)
         {
-#else
-        private NewThreadScheduler(Func<ThreadStart, Thread> threadFactory)
-        {
-#endif
             _threadFactory = threadFactory ?? throw new ArgumentNullException(nameof(threadFactory));
         }
 

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

@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT License.
 // See the LICENSE file in the project root for more information. 
 
-#if !LEGACY_WINRT && !NO_THREAD
+#if !LEGACY_WINRT
 using System.Reactive.Disposables;
 using System.Threading;
 

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

@@ -34,12 +34,10 @@ public class CurrentPlatformEnlightenmentProvider : IPlatformEnlightenmentProvid
                 return (T)(object)new ExceptionServicesImpl();
             }
 
-#if !NO_THREAD || LEGACY_WINRT
             if (t == typeof(IConcurrencyAbstractionLayer))
             {
                 return (T)(object)new ConcurrencyAbstractionLayerImpl();
             }
-#endif
 
             if (t == typeof(IScheduler) && args != null)
             {

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

@@ -49,10 +49,8 @@ public static void ForwardOnNext<T>(ISink<T> sink, T item, ref int wip, ref Exce
                     }
                 }
             }
-#if !NO_TRACE
             else if (error == null)
                 Trace.TraceWarning("OnNext called while another OnNext call was in progress on the same Observer.");
-#endif
         }
 
         /// <summary>

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

@@ -114,10 +114,6 @@ public static Delegate CreateDelegate(Type delegateType, object o, MethodInfo me
             }
         }
 
-#if (CRIPPLED_REFLECTION && HAS_WINRT)
-        public static MethodInfo GetMethod(this Type type, string name) => type.GetTypeInfo().GetDeclaredMethod(name);
-#endif
-
         /// <summary>
         /// Determine whether a type represents a WinRT event registration token
         /// (https://learn.microsoft.com/en-us/uwp/api/windows.foundation.eventregistrationtoken).

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

@@ -16,15 +16,9 @@ internal static class Stubs
         public static readonly Action<Exception> Throw = static ex => { ex.Throw(); };
     }
 
-#if !NO_THREAD
     internal static class TimerStubs
     {
-#if NETSTANDARD1_3
-        public static readonly System.Threading.Timer Never = new System.Threading.Timer(static _ => { }, null, System.Threading.Timeout.Infinite, System.Threading.Timeout.Infinite);
-#else
         public static readonly System.Threading.Timer Never = new System.Threading.Timer(static _ => { });
-#endif
     }
-#endif
 }