Merge pull request #354 from Reactive-Extensions/NoEventArgsConstraints

Removing checks for EventArgs constraints
dotnet · Apr 13, 2017 · f9d7314 · f9d7314
2 parents 0833f4d + 2c2a174
commit f9d7314
Show file tree

Hide file tree

Showing 15 changed files with 6 additions and 761 deletions.
diff --git a/Rx.NET/Source/Directory.build.targets b/Rx.NET/Source/Directory.build.targets
@@ -6,19 +6,19 @@
 
   <!-- This props all need to be set in targets as they depend on the values set earlier -->
   <PropertyGroup Condition="'$(TargetFramework)' == 'netstandard1.3'">
-    <DefineConstants>$(DefineConstants);NO_EVENTARGS_CONSTRAINT;NO_CODE_COVERAGE_ATTRIBUTE;HAS_WINRT;PREFER_ASYNC;USE_TIMER_SELF_ROOT;HAS_TPL46;NO_REMOTING;NO_SERIALIZABLE;CRIPPLED_REFLECTION</DefineConstants>
+    <DefineConstants>$(DefineConstants);NO_CODE_COVERAGE_ATTRIBUTE;HAS_WINRT;PREFER_ASYNC;USE_TIMER_SELF_ROOT;HAS_TPL46;NO_REMOTING;NO_SERIALIZABLE;CRIPPLED_REFLECTION</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)' == 'net45'">
-    <DefineConstants>$(DefineConstants);NO_EVENTARGS_CONSTRAINT;HAS_WINRT;PREFER_ASYNC;USE_TIMER_SELF_ROOT;DESKTOPCLR</DefineConstants>
+    <DefineConstants>$(DefineConstants);HAS_WINRT;PREFER_ASYNC;USE_TIMER_SELF_ROOT;DESKTOPCLR</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)' == 'net46'">
-    <DefineConstants>$(DefineConstants);NO_EVENTARGS_CONSTRAINT;HAS_WINRT;PREFER_ASYNC;USE_TIMER_SELF_ROOT;HAS_TPL46;DESKTOPCLR</DefineConstants>
+    <DefineConstants>$(DefineConstants);HAS_WINRT;PREFER_ASYNC;USE_TIMER_SELF_ROOT;HAS_TPL46;DESKTOPCLR</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0'">
-    <DefineConstants>$(DefineConstants);NO_EVENTARGS_CONSTRAINT;NO_CODE_COVERAGE_ATTRIBUTE;HAS_WINRT;PREFER_ASYNC;USE_TIMER_SELF_ROOT;HAS_TPL46;NO_REMOTING;NO_SERIALIZABLE;CRIPPLED_REFLECTION;NO_THREAD;WINDOWS</DefineConstants>
+    <DefineConstants>$(DefineConstants);NO_CODE_COVERAGE_ATTRIBUTE;HAS_WINRT;PREFER_ASYNC;USE_TIMER_SELF_ROOT;HAS_TPL46;NO_REMOTING;NO_SERIALIZABLE;CRIPPLED_REFLECTION;NO_THREAD;WINDOWS</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp1.0' or '$(TargetFramework)' == 'netcoreapp1.1'">
-    <DefineConstants>$(DefineConstants);NO_EVENTARGS_CONSTRAINT;HAS_WINRT;PREFER_ASYNC;USE_TIMER_SELF_ROOT;HAS_TPL46;NO_REMOTING;NO_SERIALIZABLE;CRIPPLED_REFLECTION</DefineConstants>    
+    <DefineConstants>$(DefineConstants);HAS_WINRT;PREFER_ASYNC;USE_TIMER_SELF_ROOT;HAS_TPL46;NO_REMOTING;NO_SERIALIZABLE;CRIPPLED_REFLECTION</DefineConstants>    
   </PropertyGroup>
 
   <!-- UWP -->

diff --git a/Rx.NET/Source/src/System.Reactive/EventPattern.cs b/Rx.NET/Source/src/System.Reactive/EventPattern.cs
@@ -11,9 +11,6 @@ namespace System.Reactive
     /// </summary>
     /// <typeparam name="TEventArgs">The type of the event data generated by the event.</typeparam>
     public class EventPattern<TEventArgs> : EventPattern<object, TEventArgs>
-#if !NO_EVENTARGS_CONSTRAINT
-        where TEventArgs : EventArgs
-#endif
     {
         /// <summary>
         /// Creates a new data representation instance of a .NET event invocation with the given sender and event data.
@@ -32,9 +29,6 @@ public EventPattern(object sender, TEventArgs e)
     /// <typeparam name="TSender">The type of the sender that raised the event.</typeparam>
     /// <typeparam name="TEventArgs">The type of the event data generated by the event.</typeparam>
     public class EventPattern<TSender, TEventArgs> : IEquatable<EventPattern<TSender, TEventArgs>>, IEventPattern<TSender, TEventArgs>
-#if !NO_EVENTARGS_CONSTRAINT
-        where TEventArgs : EventArgs
-#endif
     {
         /// <summary>
         /// Creates a new data representation instance of a .NET event invocation with the given sender and event data.

diff --git a/Rx.NET/Source/src/System.Reactive/EventPatternSource.cs b/Rx.NET/Source/src/System.Reactive/EventPatternSource.cs
@@ -5,9 +5,6 @@
 namespace System.Reactive
 {
     class EventPatternSource<TEventArgs> : EventPatternSourceBase<object, TEventArgs>, IEventPatternSource<TEventArgs>
-#if !NO_EVENTARGS_CONSTRAINT
-        where TEventArgs : EventArgs
-#endif
     {
         public EventPatternSource(IObservable<EventPattern<object, TEventArgs>> source, Action<Action<object, TEventArgs>, /*object,*/ EventPattern<object, TEventArgs>> invokeHandler)
             : base(source, invokeHandler)

diff --git a/Rx.NET/Source/src/System.Reactive/EventPatternSourceBase.cs b/Rx.NET/Source/src/System.Reactive/EventPatternSourceBase.cs
@@ -14,9 +14,6 @@ namespace System.Reactive
     /// <typeparam name="TSender">The type of the sender that raises the event.</typeparam>
     /// <typeparam name="TEventArgs">The type of the event data generated by the event.</typeparam>
     public abstract class EventPatternSourceBase<TSender, TEventArgs>
-#if !NO_EVENTARGS_CONSTRAINT
-        where TEventArgs : EventArgs
-#endif
     {
         private readonly IObservable<EventPattern<TSender, TEventArgs>> _source;
         private readonly Dictionary<Delegate, Stack<IDisposable>> _subscriptions;

diff --git a/Rx.NET/Source/src/System.Reactive/IEventPattern.cs b/Rx.NET/Source/src/System.Reactive/IEventPattern.cs
@@ -16,9 +16,6 @@ namespace System.Reactive
     /// This type parameter is covariant. That is, you can use either the type you specified or any type that is more derived. For more information about covariance and contravariance, see Covariance and Contravariance in Generics.
     /// </typeparam>
     public interface IEventPattern<out TSender, out TEventArgs>
-#if !NO_EVENTARGS_CONSTRAINT
-        where TEventArgs : EventArgs
-#endif
     {
         /// <summary>
         /// Gets the sender object that raised the event.

diff --git a/Rx.NET/Source/src/System.Reactive/IEventPatternSource.cs b/Rx.NET/Source/src/System.Reactive/IEventPatternSource.cs
@@ -9,9 +9,6 @@ namespace System.Reactive
     /// </summary>
     /// <typeparam name="TEventArgs">The type of the event data generated by the event.</typeparam>
     public interface IEventPatternSource<TEventArgs>
-#if !NO_EVENTARGS_CONSTRAINT
-        where TEventArgs : EventArgs
-#endif
     {
         /// <summary>
         /// Event signaling the next element in the data stream.

diff --git a/Rx.NET/Source/src/System.Reactive/Internal/ReflectionUtils.cs b/Rx.NET/Source/src/System.Reactive/Internal/ReflectionUtils.cs
@@ -34,9 +34,6 @@ public static Delegate CreateDelegate(Type delegateType, object o, MethodInfo me
         }
 
         public static void GetEventMethods<TSender, TEventArgs>(Type targetType, object target, string eventName, out MethodInfo addMethod, out MethodInfo removeMethod, out Type delegateType, out bool isWinRT)
-#if !NO_EVENTARGS_CONSTRAINT
-            where TEventArgs : EventArgs
-#endif
         {
             var e = default(EventInfo);
 

diff --git a/Rx.NET/Source/src/System.Reactive/Linq/IQueryLanguage.cs b/Rx.NET/Source/src/System.Reactive/Linq/IQueryLanguage.cs
@@ -397,11 +397,7 @@ internal interface IQueryLanguage
         IEnumerable<TSource> ToEnumerable<TSource>(IObservable<TSource> source);
         IEventSource<Unit> ToEvent(IObservable<Unit> source);
         IEventSource<TSource> ToEvent<TSource>(IObservable<TSource> source);
-#if !NO_EVENTARGS_CONSTRAINT
-        IEventPatternSource<TEventArgs> ToEventPattern<TEventArgs>(IObservable<EventPattern<TEventArgs>> source) where TEventArgs : EventArgs;
-#else
         IEventPatternSource<TEventArgs> ToEventPattern<TEventArgs>(IObservable<EventPattern<TEventArgs>> source);
-#endif
         IObservable<TSource> ToObservable<TSource>(IEnumerable<TSource> source);
         IObservable<TSource> ToObservable<TSource>(IEnumerable<TSource> source, IScheduler scheduler);
 
@@ -453,30 +449,6 @@ internal interface IQueryLanguage
 
         #region * Events *
 
-#if !NO_EVENTARGS_CONSTRAINT
-        IObservable<EventPattern<EventArgs>> FromEventPattern(Action<EventHandler> addHandler, Action<EventHandler> removeHandler);
-        IObservable<EventPattern<EventArgs>> FromEventPattern(Action<EventHandler> addHandler, Action<EventHandler> removeHandler, IScheduler scheduler);
-        IObservable<EventPattern<TEventArgs>> FromEventPattern<TDelegate, TEventArgs>(Action<TDelegate> addHandler, Action<TDelegate> removeHandler) where TEventArgs : EventArgs;
-        IObservable<EventPattern<TEventArgs>> FromEventPattern<TDelegate, TEventArgs>(Action<TDelegate> addHandler, Action<TDelegate> removeHandler, IScheduler scheduler) where TEventArgs : EventArgs;
-        IObservable<EventPattern<TEventArgs>> FromEventPattern<TDelegate, TEventArgs>(Func<EventHandler<TEventArgs>, TDelegate> conversion, Action<TDelegate> addHandler, Action<TDelegate> removeHandler) where TEventArgs : EventArgs;
-        IObservable<EventPattern<TEventArgs>> FromEventPattern<TDelegate, TEventArgs>(Func<EventHandler<TEventArgs>, TDelegate> conversion, Action<TDelegate> addHandler, Action<TDelegate> removeHandler, IScheduler scheduler) where TEventArgs : EventArgs;
-        IObservable<EventPattern<TEventArgs>> FromEventPattern<TEventArgs>(Action<EventHandler<TEventArgs>> addHandler, Action<EventHandler<TEventArgs>> removeHandler) where TEventArgs : EventArgs;
-        IObservable<EventPattern<TEventArgs>> FromEventPattern<TEventArgs>(Action<EventHandler<TEventArgs>> addHandler, Action<EventHandler<TEventArgs>> removeHandler, IScheduler scheduler) where TEventArgs : EventArgs;
-        IObservable<EventPattern<TSender, TEventArgs>> FromEventPattern<TDelegate, TSender, TEventArgs>(Action<TDelegate> addHandler, Action<TDelegate> removeHandler) where TEventArgs : EventArgs;
-        IObservable<EventPattern<TSender, TEventArgs>> FromEventPattern<TDelegate, TSender, TEventArgs>(Action<TDelegate> addHandler, Action<TDelegate> removeHandler, IScheduler scheduler) where TEventArgs : EventArgs;
-        IObservable<EventPattern<EventArgs>> FromEventPattern(object target, string eventName);
-        IObservable<EventPattern<EventArgs>> FromEventPattern(object target, string eventName, IScheduler scheduler);
-        IObservable<EventPattern<TEventArgs>> FromEventPattern<TEventArgs>(object target, string eventName) where TEventArgs : EventArgs;
-        IObservable<EventPattern<TEventArgs>> FromEventPattern<TEventArgs>(object target, string eventName, IScheduler scheduler) where TEventArgs : EventArgs;
-        IObservable<EventPattern<TSender, TEventArgs>> FromEventPattern<TSender, TEventArgs>(object target, string eventName) where TEventArgs : EventArgs;
-        IObservable<EventPattern<TSender, TEventArgs>> FromEventPattern<TSender, TEventArgs>(object target, string eventName, IScheduler scheduler) where TEventArgs : EventArgs;
-        IObservable<EventPattern<EventArgs>> FromEventPattern(Type type, string eventName);
-        IObservable<EventPattern<EventArgs>> FromEventPattern(Type type, string eventName, IScheduler scheduler);
-        IObservable<EventPattern<TEventArgs>> FromEventPattern<TEventArgs>(Type type, string eventName) where TEventArgs : EventArgs;
-        IObservable<EventPattern<TEventArgs>> FromEventPattern<TEventArgs>(Type type, string eventName, IScheduler scheduler) where TEventArgs : EventArgs;
-        IObservable<EventPattern<TSender, TEventArgs>> FromEventPattern<TSender, TEventArgs>(Type type, string eventName) where TEventArgs : EventArgs;
-        IObservable<EventPattern<TSender, TEventArgs>> FromEventPattern<TSender, TEventArgs>(Type type, string eventName, IScheduler scheduler) where TEventArgs : EventArgs;
-#else
         IObservable<EventPattern<object>> FromEventPattern(Action<EventHandler> addHandler, Action<EventHandler> removeHandler);
         IObservable<EventPattern<object>> FromEventPattern(Action<EventHandler> addHandler, Action<EventHandler> removeHandler, IScheduler scheduler);
         IObservable<EventPattern<TEventArgs>> FromEventPattern<TDelegate, TEventArgs>(Action<TDelegate> addHandler, Action<TDelegate> removeHandler);
@@ -499,7 +471,7 @@ internal interface IQueryLanguage
         IObservable<EventPattern<TEventArgs>> FromEventPattern<TEventArgs>(Type type, string eventName, IScheduler scheduler);
         IObservable<EventPattern<TSender, TEventArgs>> FromEventPattern<TSender, TEventArgs>(Type type, string eventName);
         IObservable<EventPattern<TSender, TEventArgs>> FromEventPattern<TSender, TEventArgs>(Type type, string eventName, IScheduler scheduler);
-#endif
+
         IObservable<TEventArgs> FromEvent<TDelegate, TEventArgs>(Func<Action<TEventArgs>, TDelegate> conversion, Action<TDelegate> addHandler, Action<TDelegate> removeHandler);
         IObservable<TEventArgs> FromEvent<TDelegate, TEventArgs>(Func<Action<TEventArgs>, TDelegate> conversion, Action<TDelegate> addHandler, Action<TDelegate> removeHandler, IScheduler scheduler);
         IObservable<TEventArgs> FromEvent<TDelegate, TEventArgs>(Action<TDelegate> addHandler, Action<TDelegate> removeHandler);

diff --git a/Rx.NET/Source/src/System.Reactive/Linq/Observable.Conversions.cs b/Rx.NET/Source/src/System.Reactive/Linq/Observable.Conversions.cs
@@ -114,9 +114,6 @@ public static IEventSource<TSource> ToEvent<TSource>(this IObservable<TSource> s
         /// <returns>The event source object.</returns>
         /// <exception cref="ArgumentNullException"><paramref name="source"/> is null.</exception>
         public static IEventPatternSource<TEventArgs> ToEventPattern<TEventArgs>(this IObservable<EventPattern<TEventArgs>> source)
-#if !NO_EVENTARGS_CONSTRAINT
-            where TEventArgs : EventArgs
-#endif
         {
             if (source == null)
                 throw new ArgumentNullException(nameof(source));