Removing checks for absence of higher arity delegate types.

Rx.NET/Source/src/System.Reactive/Joins/ActivePlan.cs

@@ -193,7 +193,6 @@ namespace System.Reactive.Joins
             }
         }
     }
-#if !NO_LARGEARITY
 
     internal class ActivePlan<T1, T2, T3, T4, T5> : ActivePlan
     {
@@ -1433,5 +1432,4 @@ namespace System.Reactive.Joins
             }
         }
     }
-#endif
 }

Rx.NET/Source/src/System.Reactive/Joins/Pattern.cs

@@ -169,7 +169,6 @@ namespace System.Reactive.Joins
         internal IObservable<TSource3> Third { get; private set; }
         internal IObservable<TSource4> Fourth { get; private set; }
 
-#if !NO_LARGEARITY
         /// <summary>
         /// Creates a pattern that matches when all five observable sequences have an available element.
         /// </summary>
@@ -184,7 +183,6 @@ namespace System.Reactive.Joins
 
             return new Pattern<TSource1, TSource2, TSource3, TSource4, TSource5>(First, Second, Third, Fourth, other);
         }
-#endif
 
         /// <summary>
         /// Matches when all observable sequences have an available element and projects the elements by invoking the selector function.
@@ -203,7 +201,6 @@ namespace System.Reactive.Joins
 
     }
 
-#if !NO_LARGEARITY
     /// <summary>
     /// Represents a join pattern over five observable sequences.
     /// </summary>
@@ -1071,7 +1068,5 @@ namespace System.Reactive.Joins
 
     }
 
-#endif
-
     #endregion
 }

Rx.NET/Source/src/System.Reactive/Joins/Plan.cs

@@ -237,7 +237,6 @@ namespace System.Reactive.Joins
         }
     }
 
-#if !NO_LARGEARITY
     internal class Plan<T1, T2, T3, T4, T5, TResult> : Plan<TResult>
     {
         internal Pattern<T1, T2, T3, T4, T5> Expression { get; private set; }
@@ -1167,5 +1166,4 @@ namespace System.Reactive.Joins
            return activePlan;
        }
    }
-#endif
 }

Rx.NET/Source/src/System.Reactive/Joins/QueryablePattern.cs

@@ -172,7 +172,6 @@ namespace System.Reactive.Joins
         {
         }
 
-#if !NO_LARGEARITY
         /// <summary>
         /// Creates a pattern that matches when all five observable sequences have an available element.
         /// </summary>
@@ -196,7 +195,6 @@ namespace System.Reactive.Joins
             );
 
         }
-#endif
 
         /// <summary>
         /// Matches when all observable sequences have an available element and projects the elements by invoking the selector function.
@@ -224,7 +222,6 @@ namespace System.Reactive.Joins
 
     }
 
-#if !NO_LARGEARITY
     /// <summary>
     /// Represents a join pattern over five observable sequences.
     /// </summary>
@@ -1047,8 +1044,6 @@ namespace System.Reactive.Joins
 
     }
 
-#endif
-
     #endregion
 }
 

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

@@ -167,8 +167,6 @@ namespace System.Reactive.Linq
         Func<IObservable<TResult>> FromAsyncPattern<TResult>(Func<AsyncCallback, object, IAsyncResult> begin, Func<IAsyncResult, TResult> end);
         Func<T1, IObservable<TResult>> FromAsyncPattern<T1, TResult>(Func<T1, AsyncCallback, object, IAsyncResult> begin, Func<IAsyncResult, TResult> end);
         Func<T1, T2, IObservable<TResult>> FromAsyncPattern<T1, T2, TResult>(Func<T1, T2, AsyncCallback, object, IAsyncResult> begin, Func<IAsyncResult, TResult> end);
-
-#if !NO_LARGEARITY
         Func<T1, T2, T3, IObservable<TResult>> FromAsyncPattern<T1, T2, T3, TResult>(Func<T1, T2, T3, AsyncCallback, object, IAsyncResult> begin, Func<IAsyncResult, TResult> end);
         Func<T1, T2, T3, T4, IObservable<TResult>> FromAsyncPattern<T1, T2, T3, T4, TResult>(Func<T1, T2, T3, T4, AsyncCallback, object, IAsyncResult> begin, Func<IAsyncResult, TResult> end);
         Func<T1, T2, T3, T4, T5, IObservable<TResult>> FromAsyncPattern<T1, T2, T3, T4, T5, TResult>(Func<T1, T2, T3, T4, T5, AsyncCallback, object, IAsyncResult> begin, Func<IAsyncResult, TResult> end);
@@ -181,13 +179,10 @@ namespace System.Reactive.Linq
         Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, IObservable<TResult>> FromAsyncPattern<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, TResult>(Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, AsyncCallback, object, IAsyncResult> begin, Func<IAsyncResult, TResult> end);
         Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, IObservable<TResult>> FromAsyncPattern<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, TResult>(Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, AsyncCallback, object, IAsyncResult> begin, Func<IAsyncResult, TResult> end);
         Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, IObservable<TResult>> FromAsyncPattern<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, TResult>(Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, AsyncCallback, object, IAsyncResult> begin, Func<IAsyncResult, TResult> end);
-#endif
 
         Func<IObservable<Unit>> FromAsyncPattern(Func<AsyncCallback, object, IAsyncResult> begin, Action<IAsyncResult> end);
         Func<T1, IObservable<Unit>> FromAsyncPattern<T1>(Func<T1, AsyncCallback, object, IAsyncResult> begin, Action<IAsyncResult> end);
         Func<T1, T2, IObservable<Unit>> FromAsyncPattern<T1, T2>(Func<T1, T2, AsyncCallback, object, IAsyncResult> begin, Action<IAsyncResult> end);
-
-#if !NO_LARGEARITY
         Func<T1, T2, T3, IObservable<Unit>> FromAsyncPattern<T1, T2, T3>(Func<T1, T2, T3, AsyncCallback, object, IAsyncResult> begin, Action<IAsyncResult> end);
         Func<T1, T2, T3, T4, IObservable<Unit>> FromAsyncPattern<T1, T2, T3, T4>(Func<T1, T2, T3, T4, AsyncCallback, object, IAsyncResult> begin, Action<IAsyncResult> end);
         Func<T1, T2, T3, T4, T5, IObservable<Unit>> FromAsyncPattern<T1, T2, T3, T4, T5>(Func<T1, T2, T3, T4, T5, AsyncCallback, object, IAsyncResult> begin, Action<IAsyncResult> end);
@@ -200,7 +195,6 @@ namespace System.Reactive.Linq
         Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, IObservable<Unit>> FromAsyncPattern<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>(Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, AsyncCallback, object, IAsyncResult> begin, Action<IAsyncResult> end);
         Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, IObservable<Unit>> FromAsyncPattern<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>(Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, AsyncCallback, object, IAsyncResult> begin, Action<IAsyncResult> end);
         Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, IObservable<Unit>> FromAsyncPattern<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>(Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, AsyncCallback, object, IAsyncResult> begin, Action<IAsyncResult> end);
-#endif
 
         IObservable<TSource> Start<TSource>(Func<TSource> function);
         IObservable<TSource> Start<TSource>(Func<TSource> function, IScheduler scheduler);
@@ -243,8 +237,6 @@ namespace System.Reactive.Linq
         Func<T1, T2, T3, IObservable<TResult>> ToAsync<T1, T2, T3, TResult>(Func<T1, T2, T3, TResult> function, IScheduler scheduler);
         Func<T1, T2, T3, T4, IObservable<TResult>> ToAsync<T1, T2, T3, T4, TResult>(Func<T1, T2, T3, T4, TResult> function);
         Func<T1, T2, T3, T4, IObservable<TResult>> ToAsync<T1, T2, T3, T4, TResult>(Func<T1, T2, T3, T4, TResult> function, IScheduler scheduler);
-
-#if !NO_LARGEARITY
         Func<T1, T2, T3, T4, T5, IObservable<TResult>> ToAsync<T1, T2, T3, T4, T5, TResult>(Func<T1, T2, T3, T4, T5, TResult> function);
         Func<T1, T2, T3, T4, T5, IObservable<TResult>> ToAsync<T1, T2, T3, T4, T5, TResult>(Func<T1, T2, T3, T4, T5, TResult> function, IScheduler scheduler);
         Func<T1, T2, T3, T4, T5, T6, IObservable<TResult>> ToAsync<T1, T2, T3, T4, T5, T6, TResult>(Func<T1, T2, T3, T4, T5, T6, TResult> function);
@@ -269,7 +261,6 @@ namespace System.Reactive.Linq
         Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, IObservable<TResult>> ToAsync<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, TResult>(Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, TResult> function, IScheduler scheduler);
         Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, IObservable<TResult>> ToAsync<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, TResult>(Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, TResult> function);
         Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, IObservable<TResult>> ToAsync<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, TResult>(Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, TResult> function, IScheduler scheduler);
-#endif
 
         Func<IObservable<Unit>> ToAsync(Action action);
         Func<IObservable<Unit>> ToAsync(Action action, IScheduler scheduler);
@@ -281,8 +272,6 @@ namespace System.Reactive.Linq
         Func<T1, T2, T3, IObservable<Unit>> ToAsync<T1, T2, T3>(Action<T1, T2, T3> action, IScheduler scheduler);
         Func<T1, T2, T3, T4, IObservable<Unit>> ToAsync<T1, T2, T3, T4>(Action<T1, T2, T3, T4> action);
         Func<T1, T2, T3, T4, IObservable<Unit>> ToAsync<T1, T2, T3, T4>(Action<T1, T2, T3, T4> action, IScheduler scheduler);
-
-#if !NO_LARGEARITY
         Func<T1, T2, T3, T4, T5, IObservable<Unit>> ToAsync<T1, T2, T3, T4, T5>(Action<T1, T2, T3, T4, T5> action);
         Func<T1, T2, T3, T4, T5, IObservable<Unit>> ToAsync<T1, T2, T3, T4, T5>(Action<T1, T2, T3, T4, T5> action, IScheduler scheduler);
         Func<T1, T2, T3, T4, T5, T6, IObservable<Unit>> ToAsync<T1, T2, T3, T4, T5, T6>(Action<T1, T2, T3, T4, T5, T6> action);
@@ -307,7 +296,6 @@ namespace System.Reactive.Linq
         Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, IObservable<Unit>> ToAsync<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>(Action<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> action, IScheduler scheduler);
         Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, IObservable<Unit>> ToAsync<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>(Action<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> action);
         Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, IObservable<Unit>> ToAsync<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>(Action<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> action, IScheduler scheduler);
-#endif
 
         #endregion
 
@@ -561,8 +549,6 @@ namespace System.Reactive.Linq
 
         IObservable<TResult> CombineLatest<T1, T2, T3, TResult>(IObservable<T1> source1, IObservable<T2> source2, IObservable<T3> source3, Func<T1, T2, T3, TResult> resultSelector);
         IObservable<TResult> CombineLatest<T1, T2, T3, T4, TResult>(IObservable<T1> source1, IObservable<T2> source2, IObservable<T3> source3, IObservable<T4> source4, Func<T1, T2, T3, T4, TResult> resultSelector);
-
-#if !NO_LARGEARITY
         IObservable<TResult> CombineLatest<T1, T2, T3, T4, T5, TResult>(IObservable<T1> source1, IObservable<T2> source2, IObservable<T3> source3, IObservable<T4> source4, IObservable<T5> source5, Func<T1, T2, T3, T4, T5, TResult> resultSelector);
         IObservable<TResult> CombineLatest<T1, T2, T3, T4, T5, T6, TResult>(IObservable<T1> source1, IObservable<T2> source2, IObservable<T3> source3, IObservable<T4> source4, IObservable<T5> source5, IObservable<T6> source6, Func<T1, T2, T3, T4, T5, T6, TResult> resultSelector);
         IObservable<TResult> CombineLatest<T1, T2, T3, T4, T5, T6, T7, TResult>(IObservable<T1> source1, IObservable<T2> source2, IObservable<T3> source3, IObservable<T4> source4, IObservable<T5> source5, IObservable<T6> source6, IObservable<T7> source7, Func<T1, T2, T3, T4, T5, T6, T7, TResult> resultSelector);
@@ -575,7 +561,6 @@ namespace System.Reactive.Linq
         IObservable<TResult> CombineLatest<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, TResult>(IObservable<T1> source1, IObservable<T2> source2, IObservable<T3> source3, IObservable<T4> source4, IObservable<T5> source5, IObservable<T6> source6, IObservable<T7> source7, IObservable<T8> source8, IObservable<T9> source9, IObservable<T10> source10, IObservable<T11> source11, IObservable<T12> source12, IObservable<T13> source13, IObservable<T14> source14, Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, TResult> resultSelector);
         IObservable<TResult> CombineLatest<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, TResult>(IObservable<T1> source1, IObservable<T2> source2, IObservable<T3> source3, IObservable<T4> source4, IObservable<T5> source5, IObservable<T6> source6, IObservable<T7> source7, IObservable<T8> source8, IObservable<T9> source9, IObservable<T10> source10, IObservable<T11> source11, IObservable<T12> source12, IObservable<T13> source13, IObservable<T14> source14, IObservable<T15> source15, Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, TResult> resultSelector);
         IObservable<TResult> CombineLatest<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, TResult>(IObservable<T1> source1, IObservable<T2> source2, IObservable<T3> source3, IObservable<T4> source4, IObservable<T5> source5, IObservable<T6> source6, IObservable<T7> source7, IObservable<T8> source8, IObservable<T9> source9, IObservable<T10> source10, IObservable<T11> source11, IObservable<T12> source12, IObservable<T13> source13, IObservable<T14> source14, IObservable<T15> source15, IObservable<T16> source16, Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, TResult> resultSelector);
-#endif
 
 #endif
 
@@ -615,8 +600,6 @@ namespace System.Reactive.Linq
 
         IObservable<TResult> Zip<T1, T2, T3, TResult>(IObservable<T1> source1, IObservable<T2> source2, IObservable<T3> source3, Func<T1, T2, T3, TResult> resultSelector);
         IObservable<TResult> Zip<T1, T2, T3, T4, TResult>(IObservable<T1> source1, IObservable<T2> source2, IObservable<T3> source3, IObservable<T4> source4, Func<T1, T2, T3, T4, TResult> resultSelector);
-
-#if !NO_LARGEARITY
         IObservable<TResult> Zip<T1, T2, T3, T4, T5, TResult>(IObservable<T1> source1, IObservable<T2> source2, IObservable<T3> source3, IObservable<T4> source4, IObservable<T5> source5, Func<T1, T2, T3, T4, T5, TResult> resultSelector);
         IObservable<TResult> Zip<T1, T2, T3, T4, T5, T6, TResult>(IObservable<T1> source1, IObservable<T2> source2, IObservable<T3> source3, IObservable<T4> source4, IObservable<T5> source5, IObservable<T6> source6, Func<T1, T2, T3, T4, T5, T6, TResult> resultSelector);
         IObservable<TResult> Zip<T1, T2, T3, T4, T5, T6, T7, TResult>(IObservable<T1> source1, IObservable<T2> source2, IObservable<T3> source3, IObservable<T4> source4, IObservable<T5> source5, IObservable<T6> source6, IObservable<T7> source7, Func<T1, T2, T3, T4, T5, T6, T7, TResult> resultSelector);
@@ -629,7 +612,6 @@ namespace System.Reactive.Linq
         IObservable<TResult> Zip<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, TResult>(IObservable<T1> source1, IObservable<T2> source2, IObservable<T3> source3, IObservable<T4> source4, IObservable<T5> source5, IObservable<T6> source6, IObservable<T7> source7, IObservable<T8> source8, IObservable<T9> source9, IObservable<T10> source10, IObservable<T11> source11, IObservable<T12> source12, IObservable<T13> source13, IObservable<T14> source14, Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, TResult> resultSelector);
         IObservable<TResult> Zip<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, TResult>(IObservable<T1> source1, IObservable<T2> source2, IObservable<T3> source3, IObservable<T4> source4, IObservable<T5> source5, IObservable<T6> source6, IObservable<T7> source7, IObservable<T8> source8, IObservable<T9> source9, IObservable<T10> source10, IObservable<T11> source11, IObservable<T12> source12, IObservable<T13> source13, IObservable<T14> source14, IObservable<T15> source15, Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, TResult> resultSelector);
         IObservable<TResult> Zip<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, TResult>(IObservable<T1> source1, IObservable<T2> source2, IObservable<T3> source3, IObservable<T4> source4, IObservable<T5> source5, IObservable<T6> source6, IObservable<T7> source7, IObservable<T8> source8, IObservable<T9> source9, IObservable<T10> source10, IObservable<T11> source11, IObservable<T12> source12, IObservable<T13> source13, IObservable<T14> source14, IObservable<T15> source15, IObservable<T16> source16, Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, TResult> resultSelector);
-#endif
 
 #endif
 

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

@@ -84,7 +84,6 @@ namespace System.Reactive.Linq
             return s_impl.FromAsyncPattern<TArg1, TArg2, TResult>(begin, end);
         }
 
-#if !NO_LARGEARITY
         /// <summary>
         /// Converts a Begin/End invoke function pair into an asynchronous function.
         /// </summary>
@@ -450,7 +449,6 @@ namespace System.Reactive.Linq
 
             return s_impl.FromAsyncPattern<TArg1, TArg2, TArg3, TArg4, TArg5, TArg6, TArg7, TArg8, TArg9, TArg10, TArg11, TArg12, TArg13, TArg14, TResult>(begin, end);
         }
-#endif
 
         #endregion
 
@@ -522,7 +520,6 @@ namespace System.Reactive.Linq
             return s_impl.FromAsyncPattern<TArg1, TArg2>(begin, end);
         }
 
-#if !NO_LARGEARITY
         /// <summary>
         /// Converts a Begin/End invoke function pair into an asynchronous function.
         /// </summary>
@@ -876,7 +873,6 @@ namespace System.Reactive.Linq
 
             return s_impl.FromAsyncPattern<TArg1, TArg2, TArg3, TArg4, TArg5, TArg6, TArg7, TArg8, TArg9, TArg10, TArg11, TArg12, TArg13, TArg14>(begin, end);
         }
-#endif
 
         #endregion
 
@@ -1534,7 +1530,6 @@ namespace System.Reactive.Linq
             return s_impl.ToAsync<TArg1, TArg2, TArg3, TArg4, TResult>(function, scheduler);
         }
 
-#if !NO_LARGEARITY
         /// <summary>
         /// Converts the function into an asynchronous function. Each invocation of the resulting asynchronous function causes an invocation of the original synchronous function.
         /// </summary>
@@ -2182,7 +2177,6 @@ namespace System.Reactive.Linq
 
             return s_impl.ToAsync<TArg1, TArg2, TArg3, TArg4, TArg5, TArg6, TArg7, TArg8, TArg9, TArg10, TArg11, TArg12, TArg13, TArg14, TArg15, TArg16, TResult>(function, scheduler);
         }
-#endif
 
         #endregion
 
@@ -2363,8 +2357,6 @@ namespace System.Reactive.Linq
             return s_impl.ToAsync<TArg1, TArg2, TArg3, TArg4>(action, scheduler);
         }
 
-#if !NO_LARGEARITY
-
         /// <summary>
         /// Converts the function into an asynchronous action. Each invocation of the resulting asynchronous action causes an invocation of the original synchronous action on the default scheduler.
         /// </summary>
@@ -2988,7 +2980,6 @@ namespace System.Reactive.Linq
 
             return s_impl.ToAsync<TArg1, TArg2, TArg3, TArg4, TArg5, TArg6, TArg7, TArg8, TArg9, TArg10, TArg11, TArg12, TArg13, TArg14, TArg15, TArg16>(action, scheduler);
         }
-#endif
 
         #endregion
 

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

@@ -294,7 +294,6 @@ namespace System.Reactive.Linq
             return s_impl.CombineLatest<TSource1, TSource2, TSource3, TSource4, TResult>(source1, source2, source3, source4, resultSelector);
         }
 
-#if !NO_LARGEARITY
         /// <summary>
         /// Merges the specified observable sequences into one observable sequence by using the selector function whenever any of the observable sequences produces an element.
         /// </summary>
@@ -979,8 +978,6 @@ namespace System.Reactive.Linq
             return s_impl.CombineLatest<TSource1, TSource2, TSource3, TSource4, TSource5, TSource6, TSource7, TSource8, TSource9, TSource10, TSource11, TSource12, TSource13, TSource14, TSource15, TSource16, TResult>(source1, source2, source3, source4, source5, source6, source7, source8, source9, source10, source11, source12, source13, source14, source15, source16, resultSelector);
         }
 
-#endif
-
         #endregion
 
 #endif
@@ -1650,7 +1647,6 @@ namespace System.Reactive.Linq
             return s_impl.Zip<TSource1, TSource2, TSource3, TSource4, TResult>(source1, source2, source3, source4, resultSelector);
         }
 
-#if !NO_LARGEARITY
         /// <summary>
         /// Merges the specified observable sequences into one observable sequence by using the selector function whenever all of the observable sequences have produced an element at a corresponding index.
         /// </summary>
@@ -2335,8 +2331,6 @@ namespace System.Reactive.Linq
             return s_impl.Zip<TSource1, TSource2, TSource3, TSource4, TSource5, TSource6, TSource7, TSource8, TSource9, TSource10, TSource11, TSource12, TSource13, TSource14, TSource15, TSource16, TResult>(source1, source2, source3, source4, source5, source6, source7, source8, source9, source10, source11, source12, source13, source14, source15, source16, resultSelector);
         }
 
-#endif
-
         #endregion
 
 #endif

Rx.NET/Source/src/System.Reactive/Linq/Observable/CombineLatest.Generated.cs

@@ -11,13 +11,13 @@ using System.Reactive.Disposables;
 
 namespace System.Reactive.Linq.ObservableImpl
 {
-	#region [3,16]-ary
+    #region [3,16]-ary
 
     /* The following code is generated by a T4 template. */
 
-    #region CombineLatest auto-generated code (3/8/2017 9:31:03 PM)
+    #region CombineLatest auto-generated code (4/13/2017 1:42:05 PM)
 
-	class CombineLatest<T1, T2, T3, TResult> : Producer<TResult>
+    class CombineLatest<T1, T2, T3, TResult> : Producer<TResult>
     {
         private readonly IObservable<T1> _source1;
         private readonly IObservable<T2> _source2;
@@ -59,9 +59,9 @@ namespace System.Reactive.Linq.ObservableImpl
                 for (int i = 0; i < 3; i++)
                     subscriptions[i] = new SingleAssignmentDisposable();
 
-				_observer1 = new CombineLatestObserver<T1>(_gate, this, 0, subscriptions[0]);
-				_observer2 = new CombineLatestObserver<T2>(_gate, this, 1, subscriptions[1]);
-				_observer3 = new CombineLatestObserver<T3>(_gate, this, 2, subscriptions[2]);
+                _observer1 = new CombineLatestObserver<T1>(_gate, this, 0, subscriptions[0]);
+                _observer2 = new CombineLatestObserver<T2>(_gate, this, 1, subscriptions[1]);
+                _observer3 = new CombineLatestObserver<T3>(_gate, this, 2, subscriptions[2]);
                 
                 subscriptions[0].Disposable = _parent._source1.SubscribeSafe(_observer1);
                 subscriptions[1].Disposable = _parent._source2.SubscribeSafe(_observer2);
@@ -77,7 +77,7 @@ namespace System.Reactive.Linq.ObservableImpl
         }
     }
 
-	class CombineLatest<T1, T2, T3, T4, TResult> : Producer<TResult>
+    class CombineLatest<T1, T2, T3, T4, TResult> : Producer<TResult>
     {
         private readonly IObservable<T1> _source1;
         private readonly IObservable<T2> _source2;
@@ -122,10 +122,10 @@ namespace System.Reactive.Linq.ObservableImpl
                 for (int i = 0; i < 4; i++)
                     subscriptions[i] = new SingleAssignmentDisposable();
 
-				_observer1 = new CombineLatestObserver<T1>(_gate, this, 0, subscriptions[0]);
-				_observer2 = new CombineLatestObserver<T2>(_gate, this, 1, subscriptions[1]);
-				_observer3 = new CombineLatestObserver<T3>(_gate, this, 2, subscriptions[2]);
-				_observer4 = new CombineLatestObserver<T4>(_gate, this, 3, subscriptions[3]);
+                _observer1 = new CombineLatestObserver<T1>(_gate, this, 0, subscriptions[0]);
+                _observer2 = new CombineLatestObserver<T2>(_gate, this, 1, subscriptions[1]);
+                _observer3 = new CombineLatestObserver<T3>(_gate, this, 2, subscriptions[2]);
+                _observer4 = new CombineLatestObserver<T4>(_gate, this, 3, subscriptions[3]);
                 
                 subscriptions[0].Disposable = _parent._source1.SubscribeSafe(_observer1);
                 subscriptions[1].Disposable = _parent._source2.SubscribeSafe(_observer2);
@@ -142,9 +142,7 @@ namespace System.Reactive.Linq.ObservableImpl
         }
     }
 
-#if !NO_LARGEARITY
-
-	class CombineLatest<T1, T2, T3, T4, T5, TResult> : Producer<TResult>
+    class CombineLatest<T1, T2, T3, T4, T5, TResult> : Producer<TResult>
     {
         private readonly IObservable<T1> _source1;
         private readonly IObservable<T2> _source2;
@@ -192,11 +190,11 @@ namespace System.Reactive.Linq.ObservableImpl
                 for (int i = 0; i < 5; i++)
                     subscriptions[i] = new SingleAssignmentDisposable();
 
-				_observer1 = new CombineLatestObserver<T1>(_gate, this, 0, subscriptions[0]);
-				_observer2 = new CombineLatestObserver<T2>(_gate, this, 1, subscriptions[1]);
-				_observer3 = new CombineLatestObserver<T3>(_gate, this, 2, subscriptions[2]);
-				_observer4 = new CombineLatestObserver<T4>(_gate, this, 3, subscriptions[3]);
-				_observer5 = new CombineLatestObserver<T5>(_gate, this, 4, subscriptions[4]);
+                _observer1 = new CombineLatestObserver<T1>(_gate, this, 0, subscriptions[0]);
+                _observer2 = new CombineLatestObserver<T2>(_gate, this, 1, subscriptions[1]);
+                _observer3 = new CombineLatestObserver<T3>(_gate, this, 2, subscriptions[2]);
+                _observer4 = new CombineLatestObserver<T4>(_gate, this, 3, subscriptions[3]);
+                _observer5 = new CombineLatestObserver<T5>(_gate, this, 4, subscriptions[4]);
                 
                 subscriptions[0].Disposable = _parent._source1.SubscribeSafe(_observer1);
                 subscriptions[1].Disposable = _parent._source2.SubscribeSafe(_observer2);
@@ -214,7 +212,7 @@ namespace System.Reactive.Linq.ObservableImpl
         }
     }
 
-	class CombineLatest<T1, T2, T3, T4, T5, T6, TResult> : Producer<TResult>
+    class CombineLatest<T1, T2, T3, T4, T5, T6, TResult> : Producer<TResult>
     {
         private readonly IObservable<T1> _source1;
         private readonly IObservable<T2> _source2;
@@ -265,12 +263,12 @@ namespace System.Reactive.Linq.ObservableImpl
                 for (int i = 0; i < 6; i++)
                     subscriptions[i] = new SingleAssignmentDisposable();
 
-				_observer1 = new CombineLatestObserver<T1>(_gate, this, 0, subscriptions[0]);
-				_observer2 = new CombineLatestObserver<T2>(_gate, this, 1, subscriptions[1]);
-				_observer3 = new CombineLatestObserver<T3>(_gate, this, 2, subscriptions[2]);
-				_observer4 = new CombineLatestObserver<T4>(_gate, this, 3, subscriptions[3]);
-				_observer5 = new CombineLatestObserver<T5>(_gate, this, 4, subscriptions[4]);
-				_observer6 = new CombineLatestObserver<T6>(_gate, this, 5, subscriptions[5]);
+                _observer1 = new CombineLatestObserver<T1>(_gate, this, 0, subscriptions[0]);
+                _observer2 = new CombineLatestObserver<T2>(_gate, this, 1, subscriptions[1]);
+                _observer3 = new CombineLatestObserver<T3>(_gate, this, 2, subscriptions[2]);
+                _observer4 = new CombineLatestObserver<T4>(_gate, this, 3, subscriptions[3]);
+                _observer5 = new CombineLatestObserver<T5>(_gate, this, 4, subscriptions[4]);
+                _observer6 = new CombineLatestObserver<T6>(_gate, this, 5, subscriptions[5]);
                 
                 subscriptions[0].Disposable = _parent._source1.SubscribeSafe(_observer1);
                 subscriptions[1].Disposable = _parent._source2.SubscribeSafe(_observer2);
@@ -289,7 +287,7 @@ namespace System.Reactive.Linq.ObservableImpl
         }
     }
 
-	class CombineLatest<T1, T2, T3, T4, T5, T6, T7, TResult> : Producer<TResult>
+    class CombineLatest<T1, T2, T3, T4, T5, T6, T7, TResult> : Producer<TResult>
     {
         private readonly IObservable<T1> _source1;
         private readonly IObservable<T2> _source2;
@@ -343,13 +341,13 @@ namespace System.Reactive.Linq.ObservableImpl
                 for (int i = 0; i < 7; i++)
                     subscriptions[i] = new SingleAssignmentDisposable();
 
-				_observer1 = new CombineLatestObserver<T1>(_gate, this, 0, subscriptions[0]);
-				_observer2 = new CombineLatestObserver<T2>(_gate, this, 1, subscriptions[1]);
-				_observer3 = new CombineLatestObserver<T3>(_gate, this, 2, subscriptions[2]);
-				_observer4 = new CombineLatestObserver<T4>(_gate, this, 3, subscriptions[3]);
-				_observer5 = new CombineLatestObserver<T5>(_gate, this, 4, subscriptions[4]);
-				_observer6 = new CombineLatestObserver<T6>(_gate, this, 5, subscriptions[5]);
-				_observer7 = new CombineLatestObserver<T7>(_gate, this, 6, subscriptions[6]);
+                _observer1 = new CombineLatestObserver<T1>(_gate, this, 0, subscriptions[0]);
+                _observer2 = new CombineLatestObserver<T2>(_gate, this, 1, subscriptions[1]);
+                _observer3 = new CombineLatestObserver<T3>(_gate, this, 2, subscriptions[2]);
+                _observer4 = new CombineLatestObserver<T4>(_gate, this, 3, subscriptions[3]);
+                _observer5 = new CombineLatestObserver<T5>(_gate, this, 4, subscriptions[4]);
+                _observer6 = new CombineLatestObserver<T6>(_gate, this, 5, subscriptions[5]);
+                _observer7 = new CombineLatestObserver<T7>(_gate, this, 6, subscriptions[6]);
                 
                 subscriptions[0].Disposable = _parent._source1.SubscribeSafe(_observer1);
                 subscriptions[1].Disposable = _parent._source2.SubscribeSafe(_observer2);
@@ -369,7 +367,7 @@ namespace System.Reactive.Linq.ObservableImpl
         }
     }
 
-	class CombineLatest<T1, T2, T3, T4, T5, T6, T7, T8, TResult> : Producer<TResult>
+    class CombineLatest<T1, T2, T3, T4, T5, T6, T7, T8, TResult> : Producer<TResult>
     {
         private readonly IObservable<T1> _source1;
         private readonly IObservable<T2> _source2;
@@ -426,14 +424,14 @@ namespace System.Reactive.Linq.ObservableImpl
                 for (int i = 0; i < 8; i++)
                     subscriptions[i] = new SingleAssignmentDisposable();
 
-				_observer1 = new CombineLatestObserver<T1>(_gate, this, 0, subscriptions[0]);
-				_observer2 = new CombineLatestObserver<T2>(_gate, this, 1, subscriptions[1]);
-				_observer3 = new CombineLatestObserver<T3>(_gate, this, 2, subscriptions[2]);
-				_observer4 = new CombineLatestObserver<T4>(_gate, this, 3, subscriptions[3]);
-				_observer5 = new CombineLatestObserver<T5>(_gate, this, 4, subscriptions[4]);
-				_observer6 = new CombineLatestObserver<T6>(_gate, this, 5, subscriptions[5]);
-				_observer7 = new CombineLatestObserver<T7>(_gate, this, 6, subscriptions[6]);
-				_observer8 = new CombineLatestObserver<T8>(_gate, this, 7, subscriptions[7]);
+                _observer1 = new CombineLatestObserver<T1>(_gate, this, 0, subscriptions[0]);
+                _observer2 = new CombineLatestObserver<T2>(_gate, this, 1, subscriptions[1]);
+                _observer3 = new CombineLatestObserver<T3>(_gate, this, 2, subscriptions[2]);
+                _observer4 = new CombineLatestObserver<T4>(_gate, this, 3, subscriptions[3]);
+                _observer5 = new CombineLatestObserver<T5>(_gate, this, 4, subscriptions[4]);
+                _observer6 = new CombineLatestObserver<T6>(_gate, this, 5, subscriptions[5]);
+                _observer7 = new CombineLatestObserver<T7>(_gate, this, 6, subscriptions[6]);
+                _observer8 = new CombineLatestObserver<T8>(_gate, this, 7, subscriptions[7]);
                 
                 subscriptions[0].Disposable = _parent._source1.SubscribeSafe(_observer1);
                 subscriptions[1].Disposable = _parent._source2.SubscribeSafe(_observer2);
@@ -454,7 +452,7 @@ namespace System.Reactive.Linq.ObservableImpl
         }
     }
 
-	class CombineLatest<T1, T2, T3, T4, T5, T6, T7, T8, T9, TResult> : Producer<TResult>
+    class CombineLatest<T1, T2, T3, T4, T5, T6, T7, T8, T9, TResult> : Producer<TResult>
     {
         private readonly IObservable<T1> _source1;
         private readonly IObservable<T2> _source2;
@@ -514,15 +512,15 @@ namespace System.Reactive.Linq.ObservableImpl
                 for (int i = 0; i < 9; i++)
                     subscriptions[i] = new SingleAssignmentDisposable();
 
-				_observer1 = new CombineLatestObserver<T1>(_gate, this, 0, subscriptions[0]);
-				_observer2 = new CombineLatestObserver<T2>(_gate, this, 1, subscriptions[1]);
-				_observer3 = new CombineLatestObserver<T3>(_gate, this, 2, subscriptions[2]);
-				_observer4 = new CombineLatestObserver<T4>(_gate, this, 3, subscriptions[3]);
-				_observer5 = new CombineLatestObserver<T5>(_gate, this, 4, subscriptions[4]);
-				_observer6 = new CombineLatestObserver<T6>(_gate, this, 5, subscriptions[5]);
-				_observer7 = new CombineLatestObserver<T7>(_gate, this, 6, subscriptions[6]);
-				_observer8 = new CombineLatestObserver<T8>(_gate, this, 7, subscriptions[7]);
-				_observer9 = new CombineLatestObserver<T9>(_gate, this, 8, subscriptions[8]);
+                _observer1 = new CombineLatestObserver<T1>(_gate, this, 0, subscriptions[0]);
+                _observer2 = new CombineLatestObserver<T2>(_gate, this, 1, subscriptions[1]);
+                _observer3 = new CombineLatestObserver<T3>(_gate, this, 2, subscriptions[2]);
+                _observer4 = new CombineLatestObserver<T4>(_gate, this, 3, subscriptions[3]);
+                _observer5 = new CombineLatestObserver<T5>(_gate, this, 4, subscriptions[4]);
+                _observer6 = new CombineLatestObserver<T6>(_gate, this, 5, subscriptions[5]);
+                _observer7 = new CombineLatestObserver<T7>(_gate, this, 6, subscriptions[6]);
+                _observer8 = new CombineLatestObserver<T8>(_gate, this, 7, subscriptions[7]);
+                _observer9 = new CombineLatestObserver<T9>(_gate, this, 8, subscriptions[8]);
                 
                 subscriptions[0].Disposable = _parent._source1.SubscribeSafe(_observer1);
                 subscriptions[1].Disposable = _parent._source2.SubscribeSafe(_observer2);
@@ -544,7 +542,7 @@ namespace System.Reactive.Linq.ObservableImpl
         }
     }
 
-	class CombineLatest<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, TResult> : Producer<TResult>
+    class CombineLatest<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, TResult> : Producer<TResult>
     {
         private readonly IObservable<T1> _source1;
         private readonly IObservable<T2> _source2;
@@ -607,16 +605,16 @@ namespace System.Reactive.Linq.ObservableImpl
                 for (int i = 0; i < 10; i++)
                     subscriptions[i] = new SingleAssignmentDisposable();
 
-				_observer1 = new CombineLatestObserver<T1>(_gate, this, 0, subscriptions[0]);
-				_observer2 = new CombineLatestObserver<T2>(_gate, this, 1, subscriptions[1]);
-				_observer3 = new CombineLatestObserver<T3>(_gate, this, 2, subscriptions[2]);
-				_observer4 = new CombineLatestObserver<T4>(_gate, this, 3, subscriptions[3]);
-				_observer5 = new CombineLatestObserver<T5>(_gate, this, 4, subscriptions[4]);
-				_observer6 = new CombineLatestObserver<T6>(_gate, this, 5, subscriptions[5]);
-				_observer7 = new CombineLatestObserver<T7>(_gate, this, 6, subscriptions[6]);
-				_observer8 = new CombineLatestObserver<T8>(_gate, this, 7, subscriptions[7]);
-				_observer9 = new CombineLatestObserver<T9>(_gate, this, 8, subscriptions[8]);
-				_observer10 = new CombineLatestObserver<T10>(_gate, this, 9, subscriptions[9]);
+                _observer1 = new CombineLatestObserver<T1>(_gate, this, 0, subscriptions[0]);
+                _observer2 = new CombineLatestObserver<T2>(_gate, this, 1, subscriptions[1]);
+                _observer3 = new CombineLatestObserver<T3>(_gate, this, 2, subscriptions[2]);
+                _observer4 = new CombineLatestObserver<T4>(_gate, this, 3, subscriptions[3]);
+                _observer5 = new CombineLatestObserver<T5>(_gate, this, 4, subscriptions[4]);
+                _observer6 = new CombineLatestObserver<T6>(_gate, this, 5, subscriptions[5]);
+                _observer7 = new CombineLatestObserver<T7>(_gate, this, 6, subscriptions[6]);
+                _observer8 = new CombineLatestObserver<T8>(_gate, this, 7, subscriptions[7]);
+                _observer9 = new CombineLatestObserver<T9>(_gate, this, 8, subscriptions[8]);
+                _observer10 = new CombineLatestObserver<T10>(_gate, this, 9, subscriptions[9]);
                 
                 subscriptions[0].Disposable = _parent._source1.SubscribeSafe(_observer1);
                 subscriptions[1].Disposable = _parent._source2.SubscribeSafe(_observer2);
@@ -639,7 +637,7 @@ namespace System.Reactive.Linq.ObservableImpl
         }
     }
 
-	class CombineLatest<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, TResult> : Producer<TResult>
+    class CombineLatest<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, TResult> : Producer<TResult>
     {
         private readonly IObservable<T1> _source1;
         private readonly IObservable<T2> _source2;
@@ -705,17 +703,17 @@ namespace System.Reactive.Linq.ObservableImpl
                 for (int i = 0; i < 11; i++)
                     subscriptions[i] = new SingleAssignmentDisposable();
 
-				_observer1 = new CombineLatestObserver<T1>(_gate, this, 0, subscriptions[0]);
-				_observer2 = new CombineLatestObserver<T2>(_gate, this, 1, subscriptions[1]);
-				_observer3 = new CombineLatestObserver<T3>(_gate, this, 2, subscriptions[2]);
-				_observer4 = new CombineLatestObserver<T4>(_gate, this, 3, subscriptions[3]);
-				_observer5 = new CombineLatestObserver<T5>(_gate, this, 4, subscriptions[4]);
-				_observer6 = new CombineLatestObserver<T6>(_gate, this, 5, subscriptions[5]);
-				_observer7 = new CombineLatestObserver<T7>(_gate, this, 6, subscriptions[6]);
-				_observer8 = new CombineLatestObserver<T8>(_gate, this, 7, subscriptions[7]);
-				_observer9 = new CombineLatestObserver<T9>(_gate, this, 8, subscriptions[8]);
-				_observer10 = new CombineLatestObserver<T10>(_gate, this, 9, subscriptions[9]);
-				_observer11 = new CombineLatestObserver<T11>(_gate, this, 10, subscriptions[10]);
+                _observer1 = new CombineLatestObserver<T1>(_gate, this, 0, subscriptions[0]);
+                _observer2 = new CombineLatestObserver<T2>(_gate, this, 1, subscriptions[1]);
+                _observer3 = new CombineLatestObserver<T3>(_gate, this, 2, subscriptions[2]);
+                _observer4 = new CombineLatestObserver<T4>(_gate, this, 3, subscriptions[3]);
+                _observer5 = new CombineLatestObserver<T5>(_gate, this, 4, subscriptions[4]);
+                _observer6 = new CombineLatestObserver<T6>(_gate, this, 5, subscriptions[5]);
+                _observer7 = new CombineLatestObserver<T7>(_gate, this, 6, subscriptions[6]);
+                _observer8 = new CombineLatestObserver<T8>(_gate, this, 7, subscriptions[7]);
+                _observer9 = new CombineLatestObserver<T9>(_gate, this, 8, subscriptions[8]);
+                _observer10 = new CombineLatestObserver<T10>(_gate, this, 9, subscriptions[9]);
+                _observer11 = new CombineLatestObserver<T11>(_gate, this, 10, subscriptions[10]);
                 
                 subscriptions[0].Disposable = _parent._source1.SubscribeSafe(_observer1);
                 subscriptions[1].Disposable = _parent._source2.SubscribeSafe(_observer2);
@@ -739,7 +737,7 @@ namespace System.Reactive.Linq.ObservableImpl
         }
     }
 
-	class CombineLatest<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, TResult> : Producer<TResult>
+    class CombineLatest<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, TResult> : Producer<TResult>
     {
         private readonly IObservable<T1> _source1;
         private readonly IObservable<T2> _source2;
@@ -808,18 +806,18 @@ namespace System.Reactive.Linq.ObservableImpl
                 for (int i = 0; i < 12; i++)
                     subscriptions[i] = new SingleAssignmentDisposable();
 
-				_observer1 = new CombineLatestObserver<T1>(_gate, this, 0, subscriptions[0]);
-				_observer2 = new CombineLatestObserver<T2>(_gate, this, 1, subscriptions[1]);
-				_observer3 = new CombineLatestObserver<T3>(_gate, this, 2, subscriptions[2]);
-				_observer4 = new CombineLatestObserver<T4>(_gate, this, 3, subscriptions[3]);
-				_observer5 = new CombineLatestObserver<T5>(_gate, this, 4, subscriptions[4]);
-				_observer6 = new CombineLatestObserver<T6>(_gate, this, 5, subscriptions[5]);
-				_observer7 = new CombineLatestObserver<T7>(_gate, this, 6, subscriptions[6]);
-				_observer8 = new CombineLatestObserver<T8>(_gate, this, 7, subscriptions[7]);
-				_observer9 = new CombineLatestObserver<T9>(_gate, this, 8, subscriptions[8]);
-				_observer10 = new CombineLatestObserver<T10>(_gate, this, 9, subscriptions[9]);
-				_observer11 = new CombineLatestObserver<T11>(_gate, this, 10, subscriptions[10]);
-				_observer12 = new CombineLatestObserver<T12>(_gate, this, 11, subscriptions[11]);
+                _observer1 = new CombineLatestObserver<T1>(_gate, this, 0, subscriptions[0]);
+                _observer2 = new CombineLatestObserver<T2>(_gate, this, 1, subscriptions[1]);
+                _observer3 = new CombineLatestObserver<T3>(_gate, this, 2, subscriptions[2]);
+                _observer4 = new CombineLatestObserver<T4>(_gate, this, 3, subscriptions[3]);
+                _observer5 = new CombineLatestObserver<T5>(_gate, this, 4, subscriptions[4]);
+                _observer6 = new CombineLatestObserver<T6>(_gate, this, 5, subscriptions[5]);
+                _observer7 = new CombineLatestObserver<T7>(_gate, this, 6, subscriptions[6]);
+                _observer8 = new CombineLatestObserver<T8>(_gate, this, 7, subscriptions[7]);
+                _observer9 = new CombineLatestObserver<T9>(_gate, this, 8, subscriptions[8]);
+                _observer10 = new CombineLatestObserver<T10>(_gate, this, 9, subscriptions[9]);
+                _observer11 = new CombineLatestObserver<T11>(_gate, this, 10, subscriptions[10]);
+                _observer12 = new CombineLatestObserver<T12>(_gate, this, 11, subscriptions[11]);
                 
                 subscriptions[0].Disposable = _parent._source1.SubscribeSafe(_observer1);
                 subscriptions[1].Disposable = _parent._source2.SubscribeSafe(_observer2);
@@ -844,7 +842,7 @@ namespace System.Reactive.Linq.ObservableImpl
         }
     }
 
-	class CombineLatest<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, TResult> : Producer<TResult>
+    class CombineLatest<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, TResult> : Producer<TResult>
     {
         private readonly IObservable<T1> _source1;
         private readonly IObservable<T2> _source2;
@@ -916,19 +914,19 @@ namespace System.Reactive.Linq.ObservableImpl
                 for (int i = 0; i < 13; i++)
                     subscriptions[i] = new SingleAssignmentDisposable();
 
-				_observer1 = new CombineLatestObserver<T1>(_gate, this, 0, subscriptions[0]);
-				_observer2 = new CombineLatestObserver<T2>(_gate, this, 1, subscriptions[1]);
-				_observer3 = new CombineLatestObserver<T3>(_gate, this, 2, subscriptions[2]);
-				_observer4 = new CombineLatestObserver<T4>(_gate, this, 3, subscriptions[3]);
-				_observer5 = new CombineLatestObserver<T5>(_gate, this, 4, subscriptions[4]);
-				_observer6 = new CombineLatestObserver<T6>(_gate, this, 5, subscriptions[5]);
-				_observer7 = new CombineLatestObserver<T7>(_gate, this, 6, subscriptions[6]);
-				_observer8 = new CombineLatestObserver<T8>(_gate, this, 7, subscriptions[7]);
-				_observer9 = new CombineLatestObserver<T9>(_gate, this, 8, subscriptions[8]);
-				_observer10 = new CombineLatestObserver<T10>(_gate, this, 9, subscriptions[9]);
-				_observer11 = new CombineLatestObserver<T11>(_gate, this, 10, subscriptions[10]);
-				_observer12 = new CombineLatestObserver<T12>(_gate, this, 11, subscriptions[11]);
-				_observer13 = new CombineLatestObserver<T13>(_gate, this, 12, subscriptions[12]);
+                _observer1 = new CombineLatestObserver<T1>(_gate, this, 0, subscriptions[0]);
+                _observer2 = new CombineLatestObserver<T2>(_gate, this, 1, subscriptions[1]);
+                _observer3 = new CombineLatestObserver<T3>(_gate, this, 2, subscriptions[2]);
+                _observer4 = new CombineLatestObserver<T4>(_gate, this, 3, subscriptions[3]);
+                _observer5 = new CombineLatestObserver<T5>(_gate, this, 4, subscriptions[4]);
+                _observer6 = new CombineLatestObserver<T6>(_gate, this, 5, subscriptions[5]);
+                _observer7 = new CombineLatestObserver<T7>(_gate, this, 6, subscriptions[6]);
+                _observer8 = new CombineLatestObserver<T8>(_gate, this, 7, subscriptions[7]);
+                _observer9 = new CombineLatestObserver<T9>(_gate, this, 8, subscriptions[8]);
+                _observer10 = new CombineLatestObserver<T10>(_gate, this, 9, subscriptions[9]);
+                _observer11 = new CombineLatestObserver<T11>(_gate, this, 10, subscriptions[10]);
+                _observer12 = new CombineLatestObserver<T12>(_gate, this, 11, subscriptions[11]);
+                _observer13 = new CombineLatestObserver<T13>(_gate, this, 12, subscriptions[12]);
                 
                 subscriptions[0].Disposable = _parent._source1.SubscribeSafe(_observer1);
                 subscriptions[1].Disposable = _parent._source2.SubscribeSafe(_observer2);
@@ -954,7 +952,7 @@ namespace System.Reactive.Linq.ObservableImpl
         }
     }
 
-	class CombineLatest<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, TResult> : Producer<TResult>
+    class CombineLatest<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, TResult> : Producer<TResult>
     {
         private readonly IObservable<T1> _source1;
         private readonly IObservable<T2> _source2;
@@ -1029,20 +1027,20 @@ namespace System.Reactive.Linq.ObservableImpl
                 for (int i = 0; i < 14; i++)
                     subscriptions[i] = new SingleAssignmentDisposable();
 
-				_observer1 = new CombineLatestObserver<T1>(_gate, this, 0, subscriptions[0]);
-				_observer2 = new CombineLatestObserver<T2>(_gate, this, 1, subscriptions[1]);
-				_observer3 = new CombineLatestObserver<T3>(_gate, this, 2, subscriptions[2]);
-				_observer4 = new CombineLatestObserver<T4>(_gate, this, 3, subscriptions[3]);
-				_observer5 = new CombineLatestObserver<T5>(_gate, this, 4, subscriptions[4]);
-				_observer6 = new CombineLatestObserver<T6>(_gate, this, 5, subscriptions[5]);
-				_observer7 = new CombineLatestObserver<T7>(_gate, this, 6, subscriptions[6]);
-				_observer8 = new CombineLatestObserver<T8>(_gate, this, 7, subscriptions[7]);
-				_observer9 = new CombineLatestObserver<T9>(_gate, this, 8, subscriptions[8]);
-				_observer10 = new CombineLatestObserver<T10>(_gate, this, 9, subscriptions[9]);
-				_observer11 = new CombineLatestObserver<T11>(_gate, this, 10, subscriptions[10]);
-				_observer12 = new CombineLatestObserver<T12>(_gate, this, 11, subscriptions[11]);
-				_observer13 = new CombineLatestObserver<T13>(_gate, this, 12, subscriptions[12]);
-				_observer14 = new CombineLatestObserver<T14>(_gate, this, 13, subscriptions[13]);
+                _observer1 = new CombineLatestObserver<T1>(_gate, this, 0, subscriptions[0]);
+                _observer2 = new CombineLatestObserver<T2>(_gate, this, 1, subscriptions[1]);
+                _observer3 = new CombineLatestObserver<T3>(_gate, this, 2, subscriptions[2]);
+                _observer4 = new CombineLatestObserver<T4>(_gate, this, 3, subscriptions[3]);
+                _observer5 = new CombineLatestObserver<T5>(_gate, this, 4, subscriptions[4]);
+                _observer6 = new CombineLatestObserver<T6>(_gate, this, 5, subscriptions[5]);
+                _observer7 = new CombineLatestObserver<T7>(_gate, this, 6, subscriptions[6]);
+                _observer8 = new CombineLatestObserver<T8>(_gate, this, 7, subscriptions[7]);
+                _observer9 = new CombineLatestObserver<T9>(_gate, this, 8, subscriptions[8]);
+                _observer10 = new CombineLatestObserver<T10>(_gate, this, 9, subscriptions[9]);
+                _observer11 = new CombineLatestObserver<T11>(_gate, this, 10, subscriptions[10]);
+                _observer12 = new CombineLatestObserver<T12>(_gate, this, 11, subscriptions[11]);
+                _observer13 = new CombineLatestObserver<T13>(_gate, this, 12, subscriptions[12]);
+                _observer14 = new CombineLatestObserver<T14>(_gate, this, 13, subscriptions[13]);
                 
                 subscriptions[0].Disposable = _parent._source1.SubscribeSafe(_observer1);
                 subscriptions[1].Disposable = _parent._source2.SubscribeSafe(_observer2);
@@ -1069,7 +1067,7 @@ namespace System.Reactive.Linq.ObservableImpl
         }
     }
 
-	class CombineLatest<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, TResult> : Producer<TResult>
+    class CombineLatest<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, TResult> : Producer<TResult>
     {
         private readonly IObservable<T1> _source1;
         private readonly IObservable<T2> _source2;
@@ -1147,21 +1145,21 @@ namespace System.Reactive.Linq.ObservableImpl
                 for (int i = 0; i < 15; i++)
                     subscriptions[i] = new SingleAssignmentDisposable();
 
-				_observer1 = new CombineLatestObserver<T1>(_gate, this, 0, subscriptions[0]);
-				_observer2 = new CombineLatestObserver<T2>(_gate, this, 1, subscriptions[1]);
-				_observer3 = new CombineLatestObserver<T3>(_gate, this, 2, subscriptions[2]);
-				_observer4 = new CombineLatestObserver<T4>(_gate, this, 3, subscriptions[3]);
-				_observer5 = new CombineLatestObserver<T5>(_gate, this, 4, subscriptions[4]);
-				_observer6 = new CombineLatestObserver<T6>(_gate, this, 5, subscriptions[5]);
-				_observer7 = new CombineLatestObserver<T7>(_gate, this, 6, subscriptions[6]);
-				_observer8 = new CombineLatestObserver<T8>(_gate, this, 7, subscriptions[7]);
-				_observer9 = new CombineLatestObserver<T9>(_gate, this, 8, subscriptions[8]);
-				_observer10 = new CombineLatestObserver<T10>(_gate, this, 9, subscriptions[9]);
-				_observer11 = new CombineLatestObserver<T11>(_gate, this, 10, subscriptions[10]);
-				_observer12 = new CombineLatestObserver<T12>(_gate, this, 11, subscriptions[11]);
-				_observer13 = new CombineLatestObserver<T13>(_gate, this, 12, subscriptions[12]);
-				_observer14 = new CombineLatestObserver<T14>(_gate, this, 13, subscriptions[13]);
-				_observer15 = new CombineLatestObserver<T15>(_gate, this, 14, subscriptions[14]);
+                _observer1 = new CombineLatestObserver<T1>(_gate, this, 0, subscriptions[0]);
+                _observer2 = new CombineLatestObserver<T2>(_gate, this, 1, subscriptions[1]);
+                _observer3 = new CombineLatestObserver<T3>(_gate, this, 2, subscriptions[2]);
+                _observer4 = new CombineLatestObserver<T4>(_gate, this, 3, subscriptions[3]);
+                _observer5 = new CombineLatestObserver<T5>(_gate, this, 4, subscriptions[4]);
+                _observer6 = new CombineLatestObserver<T6>(_gate, this, 5, subscriptions[5]);
+                _observer7 = new CombineLatestObserver<T7>(_gate, this, 6, subscriptions[6]);
+                _observer8 = new CombineLatestObserver<T8>(_gate, this, 7, subscriptions[7]);
+                _observer9 = new CombineLatestObserver<T9>(_gate, this, 8, subscriptions[8]);
+                _observer10 = new CombineLatestObserver<T10>(_gate, this, 9, subscriptions[9]);
+                _observer11 = new CombineLatestObserver<T11>(_gate, this, 10, subscriptions[10]);
+                _observer12 = new CombineLatestObserver<T12>(_gate, this, 11, subscriptions[11]);
+                _observer13 = new CombineLatestObserver<T13>(_gate, this, 12, subscriptions[12]);
+                _observer14 = new CombineLatestObserver<T14>(_gate, this, 13, subscriptions[13]);
+                _observer15 = new CombineLatestObserver<T15>(_gate, this, 14, subscriptions[14]);
                 
                 subscriptions[0].Disposable = _parent._source1.SubscribeSafe(_observer1);
                 subscriptions[1].Disposable = _parent._source2.SubscribeSafe(_observer2);
@@ -1189,7 +1187,7 @@ namespace System.Reactive.Linq.ObservableImpl
         }
     }
 
-	class CombineLatest<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, TResult> : Producer<TResult>
+    class CombineLatest<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, TResult> : Producer<TResult>
     {
         private readonly IObservable<T1> _source1;
         private readonly IObservable<T2> _source2;
@@ -1270,22 +1268,22 @@ namespace System.Reactive.Linq.ObservableImpl
                 for (int i = 0; i < 16; i++)
                     subscriptions[i] = new SingleAssignmentDisposable();
 
-				_observer1 = new CombineLatestObserver<T1>(_gate, this, 0, subscriptions[0]);
-				_observer2 = new CombineLatestObserver<T2>(_gate, this, 1, subscriptions[1]);
-				_observer3 = new CombineLatestObserver<T3>(_gate, this, 2, subscriptions[2]);
-				_observer4 = new CombineLatestObserver<T4>(_gate, this, 3, subscriptions[3]);
-				_observer5 = new CombineLatestObserver<T5>(_gate, this, 4, subscriptions[4]);
-				_observer6 = new CombineLatestObserver<T6>(_gate, this, 5, subscriptions[5]);
-				_observer7 = new CombineLatestObserver<T7>(_gate, this, 6, subscriptions[6]);
-				_observer8 = new CombineLatestObserver<T8>(_gate, this, 7, subscriptions[7]);
-				_observer9 = new CombineLatestObserver<T9>(_gate, this, 8, subscriptions[8]);
-				_observer10 = new CombineLatestObserver<T10>(_gate, this, 9, subscriptions[9]);
-				_observer11 = new CombineLatestObserver<T11>(_gate, this, 10, subscriptions[10]);
-				_observer12 = new CombineLatestObserver<T12>(_gate, this, 11, subscriptions[11]);
-				_observer13 = new CombineLatestObserver<T13>(_gate, this, 12, subscriptions[12]);
-				_observer14 = new CombineLatestObserver<T14>(_gate, this, 13, subscriptions[13]);
-				_observer15 = new CombineLatestObserver<T15>(_gate, this, 14, subscriptions[14]);
-				_observer16 = new CombineLatestObserver<T16>(_gate, this, 15, subscriptions[15]);
+                _observer1 = new CombineLatestObserver<T1>(_gate, this, 0, subscriptions[0]);
+                _observer2 = new CombineLatestObserver<T2>(_gate, this, 1, subscriptions[1]);
+                _observer3 = new CombineLatestObserver<T3>(_gate, this, 2, subscriptions[2]);
+                _observer4 = new CombineLatestObserver<T4>(_gate, this, 3, subscriptions[3]);
+                _observer5 = new CombineLatestObserver<T5>(_gate, this, 4, subscriptions[4]);
+                _observer6 = new CombineLatestObserver<T6>(_gate, this, 5, subscriptions[5]);
+                _observer7 = new CombineLatestObserver<T7>(_gate, this, 6, subscriptions[6]);
+                _observer8 = new CombineLatestObserver<T8>(_gate, this, 7, subscriptions[7]);
+                _observer9 = new CombineLatestObserver<T9>(_gate, this, 8, subscriptions[8]);
+                _observer10 = new CombineLatestObserver<T10>(_gate, this, 9, subscriptions[9]);
+                _observer11 = new CombineLatestObserver<T11>(_gate, this, 10, subscriptions[10]);
+                _observer12 = new CombineLatestObserver<T12>(_gate, this, 11, subscriptions[11]);
+                _observer13 = new CombineLatestObserver<T13>(_gate, this, 12, subscriptions[12]);
+                _observer14 = new CombineLatestObserver<T14>(_gate, this, 13, subscriptions[13]);
+                _observer15 = new CombineLatestObserver<T15>(_gate, this, 14, subscriptions[14]);
+                _observer16 = new CombineLatestObserver<T16>(_gate, this, 15, subscriptions[15]);
                 
                 subscriptions[0].Disposable = _parent._source1.SubscribeSafe(_observer1);
                 subscriptions[1].Disposable = _parent._source2.SubscribeSafe(_observer2);
@@ -1315,10 +1313,8 @@ namespace System.Reactive.Linq.ObservableImpl
     }
 
 
-#endif
-
-	#endregion
+    #endregion
 
-	#endregion
+    #endregion
 }
 #endif

Rx.NET/Source/src/System.Reactive/Linq/Observable/CombineLatest.Generated.tt

@@ -17,7 +17,7 @@ using System.Reactive.Disposables;
 
 namespace System.Reactive.Linq.ObservableImpl
 {
-	#region [3,16]-ary
+    #region [3,16]-ary
 
     /* The following code is generated by a T4 template. */
 
@@ -26,19 +26,11 @@ namespace System.Reactive.Linq.ObservableImpl
 <#
 for (var i = 3; i <= 16; i++)
 {
-	var ts = string.Join(", ", Enumerable.Range(1, i).Select(j => "T" + j));
-	var os = string.Join(", ", Enumerable.Range(1, i).Select(j => "IObservable<T" + j + "> source" + j));
-	var vs = string.Join(", ", Enumerable.Range(1, i).Select(j => "_observer" + j + ".Value"));
-
-	if (i == 5)
-	{
+    var ts = string.Join(", ", Enumerable.Range(1, i).Select(j => "T" + j));
+    var os = string.Join(", ", Enumerable.Range(1, i).Select(j => "IObservable<T" + j + "> source" + j));
+    var vs = string.Join(", ", Enumerable.Range(1, i).Select(j => "_observer" + j + ".Value"));
 #>
-#if !NO_LARGEARITY
-
-<#
-	}
-#>
-	class CombineLatest<<#=ts#>, TResult> : Producer<TResult>
+    class CombineLatest<<#=ts#>, TResult> : Producer<TResult>
     {
 <#
 for (var j = 1; j <= i; j++)
@@ -99,7 +91,7 @@ for (var j = 1; j <= i; j++)
 for (var j = 1; j <= i; j++)
 {
 #>
-				_observer<#=j#> = new CombineLatestObserver<T<#=j#>>(_gate, this, <#=j - 1#>, subscriptions[<#=j - 1#>]);
+                _observer<#=j#> = new CombineLatestObserver<T<#=j#>>(_gate, this, <#=j - 1#>, subscriptions[<#=j - 1#>]);
 <#
 }
 #>
@@ -127,10 +119,8 @@ for (var j = 1; j <= i; j++)
 }
 #>
 
-#endif
-
-	#endregion
+    #endregion
 
-	#endregion
+    #endregion
 }
 #endif

Rx.NET/Source/src/System.Reactive/Linq/Observable/Zip.Generated.tt

@@ -17,28 +17,20 @@ using System.Reactive.Disposables;
 
 namespace System.Reactive.Linq.ObservableImpl
 {
-	#region [3,16]-ary
+    #region [3,16]-ary
 
     /* The following code is generated by a T4 template. */
 
-    #region CombineLatest auto-generated code (<#=DateTime.Now.ToString()#>)
+    #region Zip auto-generated code (<#=DateTime.Now.ToString()#>)
 
 <#
 for (var i = 3; i <= 16; i++)
 {
-	var ts = string.Join(", ", Enumerable.Range(1, i).Select(j => "T" + j));
-	var os = string.Join(", ", Enumerable.Range(1, i).Select(j => "IObservable<T" + j + "> source" + j));
-	var vs = string.Join(", ", Enumerable.Range(1, i).Select(j => "_observer" + j + ".Values.Dequeue()"));
-
-	if (i == 5)
-	{
+    var ts = string.Join(", ", Enumerable.Range(1, i).Select(j => "T" + j));
+    var os = string.Join(", ", Enumerable.Range(1, i).Select(j => "IObservable<T" + j + "> source" + j));
+    var vs = string.Join(", ", Enumerable.Range(1, i).Select(j => "_observer" + j + ".Values.Dequeue()"));
 #>
-#if !NO_LARGEARITY
-
-<#
-	}
-#>
-	class Zip<<#=ts#>, TResult> : Producer<TResult>
+    class Zip<<#=ts#>, TResult> : Producer<TResult>
     {
 <#
 for (var j = 1; j <= i; j++)
@@ -91,16 +83,16 @@ for (var j = 1; j <= i; j++)
 
             public IDisposable Run()
             {
-				var disposables = new IDisposable[<#=i + 1#>];
+                var disposables = new IDisposable[<#=i + 1#>];
 
 <#
 for (var j = 1; j <= i; j++)
 {
 #>
-				var d<#=j#> = new SingleAssignmentDisposable();
-				disposables[<#=j - 1#>] = d<#=j#>;
-				_observer<#=j#> = new ZipObserver<T<#=j#>>(_gate, this, <#=j - 1#>, d<#=j#>);
-				base.Queues[<#= j - 1#>] = _observer<#=j#>.Values;
+                var d<#=j#> = new SingleAssignmentDisposable();
+                disposables[<#=j - 1#>] = d<#=j#>;
+                _observer<#=j#> = new ZipObserver<T<#=j#>>(_gate, this, <#=j - 1#>, d<#=j#>);
+                base.Queues[<#= j - 1#>] = _observer<#=j#>.Values;
 
 <#
 }
@@ -113,7 +105,7 @@ for (var j = 1; j <= i; j++)
 }
 #>
 
-				disposables[<#=i#>] = Disposable.Create(() =>
+                disposables[<#=i#>] = Disposable.Create(() =>
                 {
 <#
 for (var j = 1; j <= i; j++)
@@ -139,10 +131,8 @@ for (var j = 1; j <= i; j++)
 }
 #>
 
-#endif
-
-	#endregion
+    #endregion
 
-	#endregion
+    #endregion
 }
 #endif

Rx.NET/Source/src/System.Reactive/Linq/Qbservable.Generated.cs

@@ -1907,7 +1907,6 @@ namespace System.Reactive.Linq
             );
         }
         
-#if !NO_LARGEARITY
         /// <summary>
         /// Merges the specified observable sequences into one observable sequence by using the selector function whenever any of the observable sequences produces an element.
         /// </summary>
@@ -1958,9 +1957,7 @@ namespace System.Reactive.Linq
                 )
             );
         }
-#endif
         
-#if !NO_LARGEARITY
         /// <summary>
         /// Merges the specified observable sequences into one observable sequence by using the selector function whenever any of the observable sequences produces an element.
         /// </summary>
@@ -2016,9 +2013,7 @@ namespace System.Reactive.Linq
                 )
             );
         }
-#endif
         
-#if !NO_LARGEARITY
         /// <summary>
         /// Merges the specified observable sequences into one observable sequence by using the selector function whenever any of the observable sequences produces an element.
         /// </summary>
@@ -2079,9 +2074,7 @@ namespace System.Reactive.Linq
                 )
             );
         }
-#endif
         
-#if !NO_LARGEARITY
         /// <summary>
         /// Merges the specified observable sequences into one observable sequence by using the selector function whenever any of the observable sequences produces an element.
         /// </summary>
@@ -2147,9 +2140,7 @@ namespace System.Reactive.Linq
                 )
             );
         }
-#endif
         
-#if !NO_LARGEARITY
         /// <summary>
         /// Merges the specified observable sequences into one observable sequence by using the selector function whenever any of the observable sequences produces an element.
         /// </summary>
@@ -2220,9 +2211,7 @@ namespace System.Reactive.Linq
                 )
             );
         }
-#endif
         
-#if !NO_LARGEARITY
         /// <summary>
         /// Merges the specified observable sequences into one observable sequence by using the selector function whenever any of the observable sequences produces an element.
         /// </summary>
@@ -2298,9 +2287,7 @@ namespace System.Reactive.Linq
                 )
             );
         }
-#endif
         
-#if !NO_LARGEARITY
         /// <summary>
         /// Merges the specified observable sequences into one observable sequence by using the selector function whenever any of the observable sequences produces an element.
         /// </summary>
@@ -2381,9 +2368,7 @@ namespace System.Reactive.Linq
                 )
             );
         }
-#endif
         
-#if !NO_LARGEARITY
         /// <summary>
         /// Merges the specified observable sequences into one observable sequence by using the selector function whenever any of the observable sequences produces an element.
         /// </summary>
@@ -2469,9 +2454,7 @@ namespace System.Reactive.Linq
                 )
             );
         }
-#endif
         
-#if !NO_LARGEARITY
         /// <summary>
         /// Merges the specified observable sequences into one observable sequence by using the selector function whenever any of the observable sequences produces an element.
         /// </summary>
@@ -2562,9 +2545,7 @@ namespace System.Reactive.Linq
                 )
             );
         }
-#endif
         
-#if !NO_LARGEARITY
         /// <summary>
         /// Merges the specified observable sequences into one observable sequence by using the selector function whenever any of the observable sequences produces an element.
         /// </summary>
@@ -2660,9 +2641,7 @@ namespace System.Reactive.Linq
                 )
             );
         }
-#endif
         
-#if !NO_LARGEARITY
         /// <summary>
         /// Merges the specified observable sequences into one observable sequence by using the selector function whenever any of the observable sequences produces an element.
         /// </summary>
@@ -2763,9 +2742,7 @@ namespace System.Reactive.Linq
                 )
             );
         }
-#endif
         
-#if !NO_LARGEARITY
         /// <summary>
         /// Merges the specified observable sequences into one observable sequence by using the selector function whenever any of the observable sequences produces an element.
         /// </summary>
@@ -2871,7 +2848,6 @@ namespace System.Reactive.Linq
                 )
             );
         }
-#endif
         
         /// <summary>
         /// Concatenates the second observable sequence to the first observable sequence upon successful termination of the first.
@@ -17686,7 +17662,6 @@ namespace System.Reactive.Linq
             );
         }
         
-#if !NO_LARGEARITY
         /// <summary>
         /// Merges the specified observable sequences into one observable sequence by using the selector function whenever all of the observable sequences have produced an element at a corresponding index.
         /// </summary>
@@ -17737,9 +17712,7 @@ namespace System.Reactive.Linq
                 )
             );
         }
-#endif
         
-#if !NO_LARGEARITY
         /// <summary>
         /// Merges the specified observable sequences into one observable sequence by using the selector function whenever all of the observable sequences have produced an element at a corresponding index.
         /// </summary>
@@ -17795,9 +17768,7 @@ namespace System.Reactive.Linq
                 )
             );
         }
-#endif
         
-#if !NO_LARGEARITY
         /// <summary>
         /// Merges the specified observable sequences into one observable sequence by using the selector function whenever all of the observable sequences have produced an element at a corresponding index.
         /// </summary>
@@ -17858,9 +17829,7 @@ namespace System.Reactive.Linq
                 )
             );
         }
-#endif
         
-#if !NO_LARGEARITY
         /// <summary>
         /// Merges the specified observable sequences into one observable sequence by using the selector function whenever all of the observable sequences have produced an element at a corresponding index.
         /// </summary>
@@ -17926,9 +17895,7 @@ namespace System.Reactive.Linq
                 )
             );
         }
-#endif
         
-#if !NO_LARGEARITY
         /// <summary>
         /// Merges the specified observable sequences into one observable sequence by using the selector function whenever all of the observable sequences have produced an element at a corresponding index.
         /// </summary>
@@ -17999,9 +17966,7 @@ namespace System.Reactive.Linq
                 )
             );
         }
-#endif
         
-#if !NO_LARGEARITY
         /// <summary>
         /// Merges the specified observable sequences into one observable sequence by using the selector function whenever all of the observable sequences have produced an element at a corresponding index.
         /// </summary>
@@ -18077,9 +18042,7 @@ namespace System.Reactive.Linq
                 )
             );
         }
-#endif
         
-#if !NO_LARGEARITY
         /// <summary>
         /// Merges the specified observable sequences into one observable sequence by using the selector function whenever all of the observable sequences have produced an element at a corresponding index.
         /// </summary>
@@ -18160,9 +18123,7 @@ namespace System.Reactive.Linq
                 )
             );
         }
-#endif
         
-#if !NO_LARGEARITY
         /// <summary>
         /// Merges the specified observable sequences into one observable sequence by using the selector function whenever all of the observable sequences have produced an element at a corresponding index.
         /// </summary>
@@ -18248,9 +18209,7 @@ namespace System.Reactive.Linq
                 )
             );
         }
-#endif
         
-#if !NO_LARGEARITY
         /// <summary>
         /// Merges the specified observable sequences into one observable sequence by using the selector function whenever all of the observable sequences have produced an element at a corresponding index.
         /// </summary>
@@ -18341,9 +18300,7 @@ namespace System.Reactive.Linq
                 )
             );
         }
-#endif
         
-#if !NO_LARGEARITY
         /// <summary>
         /// Merges the specified observable sequences into one observable sequence by using the selector function whenever all of the observable sequences have produced an element at a corresponding index.
         /// </summary>
@@ -18439,9 +18396,7 @@ namespace System.Reactive.Linq
                 )
             );
         }
-#endif
         
-#if !NO_LARGEARITY
         /// <summary>
         /// Merges the specified observable sequences into one observable sequence by using the selector function whenever all of the observable sequences have produced an element at a corresponding index.
         /// </summary>
@@ -18542,9 +18497,7 @@ namespace System.Reactive.Linq
                 )
             );
         }
-#endif
         
-#if !NO_LARGEARITY
         /// <summary>
         /// Merges the specified observable sequences into one observable sequence by using the selector function whenever all of the observable sequences have produced an element at a corresponding index.
         /// </summary>
@@ -18650,7 +18603,6 @@ namespace System.Reactive.Linq
                 )
             );
         }
-#endif
         
         /// <summary>
         /// Converts the function into an asynchronous action. Each invocation of the resulting asynchronous action causes an invocation of the original synchronous action on the specified scheduler.
@@ -19032,7 +18984,6 @@ namespace System.Reactive.Linq
             );
         }
         
-#if !NO_LARGEARITY
         /// <summary>
         /// Converts the function into an asynchronous action. Each invocation of the resulting asynchronous action causes an invocation of the original synchronous action on the default scheduler.
         /// </summary>
@@ -20353,7 +20304,6 @@ namespace System.Reactive.Linq
             );
         }
         
-#endif
         /// <summary>
         /// Converts the function into an asynchronous function. Each invocation of the resulting asynchronous function causes an invocation of the original synchronous function.
         /// </summary>
@@ -20744,7 +20694,6 @@ namespace System.Reactive.Linq
             );
         }
         
-#if !NO_LARGEARITY
         /// <summary>
         /// Converts the function into an asynchronous function. Each invocation of the resulting asynchronous function causes an invocation of the original synchronous function.
         /// </summary>
@@ -22089,7 +22038,6 @@ namespace System.Reactive.Linq
             );
         }
         
-#endif
         
         /// <summary>
         /// Converts a Begin/End invoke function pair into an asynchronous function.
@@ -22217,7 +22165,6 @@ namespace System.Reactive.Linq
             );
         }
         
-#if !NO_LARGEARITY
         /// <summary>
         /// Converts a Begin/End invoke function pair into an asynchronous function.
         /// </summary>
@@ -22902,7 +22849,6 @@ namespace System.Reactive.Linq
             );
         }
         
-#endif
         /// <summary>
         /// Converts a Begin/End invoke function pair into an asynchronous function.
         /// </summary>
@@ -23032,7 +22978,6 @@ namespace System.Reactive.Linq
             );
         }
         
-#if !NO_LARGEARITY
         /// <summary>
         /// Converts a Begin/End invoke function pair into an asynchronous function.
         /// </summary>
@@ -23729,7 +23674,6 @@ namespace System.Reactive.Linq
             );
         }
         
-#endif
     }
 }
 

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

@@ -120,7 +120,6 @@ namespace System.Reactive.Linq
             };
         }
 
-#if !NO_LARGEARITY
         public virtual Func<T1, T2, T3, IObservable<TResult>> FromAsyncPattern<T1, T2, T3, TResult>(Func<T1, T2, T3, AsyncCallback, object, IAsyncResult> begin, Func<IAsyncResult, TResult> end)
         {
             return (x, y, z) =>
@@ -504,7 +503,6 @@ namespace System.Reactive.Linq
                 return subject.AsObservable();
             };
         }
-#endif
 
         #endregion
 
@@ -537,7 +535,6 @@ namespace System.Reactive.Linq
             });
         }
 
-#if !NO_LARGEARITY
         public virtual Func<T1, T2, T3, IObservable<Unit>> FromAsyncPattern<T1, T2, T3>(Func<T1, T2, T3, AsyncCallback, object, IAsyncResult> begin, Action<IAsyncResult> end)
         {
             return FromAsyncPattern(begin, iar =>
@@ -645,7 +642,6 @@ namespace System.Reactive.Linq
                 return Unit.Default;
             });
         }
-#endif
 
         #endregion
 
@@ -1046,8 +1042,6 @@ namespace System.Reactive.Linq
             };
         }
 
-#if !NO_LARGEARITY
-
         public virtual Func<T1, T2, T3, T4, T5, IObservable<TResult>> ToAsync<T1, T2, T3, T4, T5, TResult>(Func<T1, T2, T3, T4, T5, TResult> function)
         {
             return ToAsync(function, SchedulerDefaults.AsyncConversions);
@@ -1396,8 +1390,6 @@ namespace System.Reactive.Linq
             };
         }
 
-#endif
-
         #endregion
 
         #region Action
@@ -1543,8 +1535,6 @@ namespace System.Reactive.Linq
             };
         }
 
-#if !NO_LARGEARITY
-
         public virtual Func<T1, T2, T3, T4, T5, IObservable<Unit>> ToAsync<T1, T2, T3, T4, T5>(Action<T1, T2, T3, T4, T5> action)
         {
             return ToAsync(action, SchedulerDefaults.AsyncConversions);
@@ -1881,8 +1871,6 @@ namespace System.Reactive.Linq
             };
         }
 
-#endif
-
         #endregion
 
         #endregion

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

@@ -461,7 +461,6 @@ namespace System.Reactive.Linq
             return new CombineLatest<TSource1, TSource2, TSource3, TSource4, TResult>(source1, source2, source3, source4, resultSelector);
         }
 
-#if !NO_LARGEARITY
         public virtual IObservable<TResult> CombineLatest<TSource1, TSource2, TSource3, TSource4, TSource5, TResult>(IObservable<TSource1> source1, IObservable<TSource2> source2, IObservable<TSource3> source3, IObservable<TSource4> source4, IObservable<TSource5> source5, Func<TSource1, TSource2, TSource3, TSource4, TSource5, TResult> resultSelector)
         {
             return new CombineLatest<TSource1, TSource2, TSource3, TSource4, TSource5, TResult>(source1, source2, source3, source4, source5, resultSelector);
@@ -522,8 +521,6 @@ namespace System.Reactive.Linq
             return new CombineLatest<TSource1, TSource2, TSource3, TSource4, TSource5, TSource6, TSource7, TSource8, TSource9, TSource10, TSource11, TSource12, TSource13, TSource14, TSource15, TSource16, TResult>(source1, source2, source3, source4, source5, source6, source7, source8, source9, source10, source11, source12, source13, source14, source15, source16, resultSelector);
         }
 
-#endif
-
         #endregion
 
 #endif
@@ -1580,8 +1577,6 @@ namespace System.Reactive.Linq
             return new Zip<TSource1, TSource2, TSource3, TSource4, TResult>(source1, source2, source3, source4, resultSelector);
         }
 
-#if !NO_LARGEARITY
-
         public virtual IObservable<TResult> Zip<TSource1, TSource2, TSource3, TSource4, TSource5, TResult>(IObservable<TSource1> source1, IObservable<TSource2> source2, IObservable<TSource3> source3, IObservable<TSource4> source4, IObservable<TSource5> source5, Func<TSource1, TSource2, TSource3, TSource4, TSource5, TResult> resultSelector)
         {
             return new Zip<TSource1, TSource2, TSource3, TSource4, TSource5, TResult>(source1, source2, source3, source4, source5, resultSelector);
@@ -1642,8 +1637,6 @@ namespace System.Reactive.Linq
             return new Zip<TSource1, TSource2, TSource3, TSource4, TSource5, TSource6, TSource7, TSource8, TSource9, TSource10, TSource11, TSource12, TSource13, TSource14, TSource15, TSource16, TResult>(source1, source2, source3, source4, source5, source6, source7, source8, source9, source10, source11, source12, source13, source14, source15, source16, resultSelector);
         }
 
-#endif
-
         #endregion
 
 #endif

Rx.NET/Source/src/System.Reactive/System.Reactive.csproj

@@ -52,9 +52,9 @@
   <!-- Designer support -->
   <ItemGroup>
     <None Update="Linq\Observable\CombineLatest.Generated.tt" Generator="TextTemplatingFileGenerator" LastGenOutput="CombineLatest.Generated.cs" />
-    <Compile Update="Linq\Observable\CombineLatest.Generated.cs" DesignTime="true" AutoGen="true" DependentUpon="CombineLatest.Generated.tt" />
+    <Compile Update="Linq\Observable\CombineLatest.Generated.cs" DesignTime="True" AutoGen="True" DependentUpon="CombineLatest.Generated.tt" />
     <None Update="Linq\Observable\Zip.Generated.tt" Generator="TextTemplatingFileGenerator" LastGenOutput="Zip.Generated.cs" />
-    <Compile Update="Linq\Observable\Zip.Generated.cs" DesignTime="true" AutoGen="true" DependentUpon="Zip.Generated.tt" />
+    <Compile Update="Linq\Observable\Zip.Generated.cs" DesignTime="True" AutoGen="True" DependentUpon="Zip.Generated.tt" />
     <Compile Update="Strings_Core.Designer.cs" DesignTime="true" AutoGen="true" DependentUpon="Strings_Core.resx" />
     <Compile Update="Strings_Linq.Designer.cs" DesignTime="true" AutoGen="true" DependentUpon="Strings_Linq.resx" />
     <Compile Update="Strings_PlatformServices.Designer.cs" DesignTime="true" AutoGen="true" DependentUpon="Strings_PlatformServices.resx" />
@@ -64,6 +64,9 @@
     <EmbeddedResource Update="Strings_PlatformServices.resx" Generator="ResXFileCodeGenerator" LastGenOutput="Strings_PlatformServices.Designer.cs" />
     <EmbeddedResource Update="Strings_Providers.resx" Generator="ResXFileCodeGenerator" LastGenOutput="Strings_Providers.Designer.cs" />    
   </ItemGroup>
+  <ItemGroup>
+    <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
+  </ItemGroup>
 
   <Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
   

Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/ObservableAsyncTest.cs

@@ -17,7 +17,7 @@ using System.Threading.Tasks;
 
 namespace ReactiveTests.Tests
 {
-    
+
     public partial class ObservableAsyncTest : ReactiveTest
     {
 #if !NO_TPL
@@ -42,7 +42,6 @@ namespace ReactiveTests.Tests
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.FromAsyncPattern<int, int>(null, iar => 0));
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.FromAsyncPattern<int, int>(null, iar => { }));
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.FromAsyncPattern<int, int, int>(null, iar => 0));
-#if !NO_LARGEARITY
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.FromAsyncPattern<int, int, int>(null, iar => { }));
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.FromAsyncPattern<int, int, int, int>(null, iar => 0));
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.FromAsyncPattern<int, int, int, int>(null, iar => { }));
@@ -67,14 +66,12 @@ namespace ReactiveTests.Tests
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.FromAsyncPattern<int, int, int, int, int, int, int, int, int, int, int, int, int, int>(null, iar => 0));
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.FromAsyncPattern<int, int, int, int, int, int, int, int, int, int, int, int, int, int>(null, iar => { }));
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.FromAsyncPattern<int, int, int, int, int, int, int, int, int, int, int, int, int, int, int>(null, iar => 0));
-#endif
 
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.FromAsyncPattern((cb, o) => null, default(Action<IAsyncResult>)));
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.FromAsyncPattern<int>((cb, o) => null, default(Func<IAsyncResult, int>)));
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.FromAsyncPattern<int>((a, cb, o) => null, default(Action<IAsyncResult>)));
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.FromAsyncPattern<int, int>((a, cb, o) => null, default(Func<IAsyncResult, int>)));
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.FromAsyncPattern<int, int>((a, b, cb, o) => null, default(Action<IAsyncResult>)));
-#if !NO_LARGEARITY
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.FromAsyncPattern<int, int, int>((a, b, cb, o) => null, default(Func<IAsyncResult, int>)));
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.FromAsyncPattern<int, int, int>((a, b, c, cb, o) => null, default(Action<IAsyncResult>)));
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.FromAsyncPattern<int, int, int, int>((a, b, c, cb, o) => null, default(Func<IAsyncResult, int>)));
@@ -100,7 +97,6 @@ namespace ReactiveTests.Tests
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.FromAsyncPattern<int, int, int, int, int, int, int, int, int, int, int, int, int, int>((a, b, c, d, e, f, g, h, i, j, k, l, m, cb, o) => null, default(Func<IAsyncResult, int>)));
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.FromAsyncPattern<int, int, int, int, int, int, int, int, int, int, int, int, int, int>((a, b, c, d, e, f, g, h, i, j, k, l, m, n, cb, o) => null, default(Action<IAsyncResult>)));
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.FromAsyncPattern<int, int, int, int, int, int, int, int, int, int, int, int, int, int, int>((a, b, c, d, e, f, g, h, i, j, k, l, m, n, cb, o) => null, default(Func<IAsyncResult, int>)));
-#endif
         }
 
         [Fact]
@@ -275,7 +271,6 @@ namespace ReactiveTests.Tests
             Assert.True(res.SequenceEqual(new Notification<int>[] { Notification.CreateOnError<int>(ex) }));
         }
 
-#if !NO_LARGEARITY
         [Fact]
         public void FromAsyncPattern3()
         {
@@ -1175,7 +1170,6 @@ namespace ReactiveTests.Tests
             Assert.True(res.SequenceEqual(new Notification<int>[] { Notification.CreateOnError<int>(ex) }));
         }
 
-#endif
         class Result : IAsyncResult
         {
             public object AsyncState
@@ -1199,9 +1193,9 @@ namespace ReactiveTests.Tests
             }
         }
 
-#endregion
+        #endregion
 
-#region Start
+        #region Start
 
         [Fact]
         public void Start_ArgumentChecking()
@@ -1293,13 +1287,13 @@ namespace ReactiveTests.Tests
             }));
         }
 
-#endregion
+        #endregion
 
-#region StartAsync
+        #region StartAsync
 
 #if !NO_TPL
 
-#region Func
+        #region Func
 
         [Fact]
         public void StartAsync_Func_ArgumentChecking()
@@ -1500,9 +1494,9 @@ namespace ReactiveTests.Tests
         }
 #endif
 
-#endregion
+        #endregion
 
-#region Action
+        #region Action
 
         [Fact]
         public void StartAsync_Action_ArgumentChecking()
@@ -1688,17 +1682,17 @@ namespace ReactiveTests.Tests
         }
 #endif
 
-#endregion
+        #endregion
 
 #endif
 
-#endregion
+        #endregion
 
-#region FromAsync
+        #region FromAsync
 
 #if !NO_TPL
 
-#region Func
+        #region Func
 
         [Fact]
         public void FromAsync_Func_ArgumentChecking()
@@ -1886,9 +1880,9 @@ namespace ReactiveTests.Tests
         }
 #endif
 
-#endregion
+        #endregion
 
-#region Action
+        #region Action
 
         [Fact]
         public void FromAsync_Action_ArgumentChecking()
@@ -2066,13 +2060,13 @@ namespace ReactiveTests.Tests
         }
 #endif
 
-#endregion
+        #endregion
 
 #endif
 
-#endregion
+        #endregion
 
-#region ToAsync
+        #region ToAsync
 
         [Fact]
         public void ToAsync_ArgumentChecking()
@@ -2087,7 +2081,6 @@ namespace ReactiveTests.Tests
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.ToAsync<int, int, int, int>(default(Action<int, int, int, int>)));
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.ToAsync<int, int, int, int>(default(Func<int, int, int, int>)));
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.ToAsync<int, int, int, int, int>(default(Func<int, int, int, int, int>)));
-#if !NO_LARGEARITY
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.ToAsync<int, int, int, int, int>(default(Action<int, int, int, int, int>)));
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.ToAsync<int, int, int, int, int, int>(default(Action<int, int, int, int, int, int>)));
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.ToAsync<int, int, int, int, int, int>(default(Func<int, int, int, int, int, int>)));
@@ -2112,7 +2105,7 @@ namespace ReactiveTests.Tests
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.ToAsync<int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int>(default(Action<int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int>)));
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.ToAsync<int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int>(default(Func<int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int>)));
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.ToAsync<int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int>(default(Func<int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int>)));
-#endif
+
             var someScheduler = new TestScheduler();
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.ToAsync(default(Action), someScheduler));
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.ToAsync<int>(default(Action<int>), someScheduler));
@@ -2123,7 +2116,6 @@ namespace ReactiveTests.Tests
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.ToAsync<int, int, int>(default(Func<int, int, int>), someScheduler));
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.ToAsync<int, int, int, int>(default(Action<int, int, int, int>), someScheduler));
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.ToAsync<int, int, int, int>(default(Func<int, int, int, int>), someScheduler));
-#if !NO_LARGEARITY
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.ToAsync<int, int, int, int, int>(default(Func<int, int, int, int, int>), someScheduler));
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.ToAsync<int, int, int, int, int>(default(Action<int, int, int, int, int>), someScheduler));
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.ToAsync<int, int, int, int, int, int>(default(Action<int, int, int, int, int, int>), someScheduler));
@@ -2149,7 +2141,7 @@ namespace ReactiveTests.Tests
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.ToAsync<int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int>(default(Action<int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int>), someScheduler));
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.ToAsync<int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int>(default(Func<int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int>), someScheduler));
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.ToAsync<int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int>(default(Func<int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int>), someScheduler));
-#endif
+
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.ToAsync(() => { }, null));
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.ToAsync<int>(a => { }, null));
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.ToAsync<int>(() => 1, null));
@@ -2160,7 +2152,6 @@ namespace ReactiveTests.Tests
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.ToAsync<int, int, int, int>((a, b, c, d) => { }, null));
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.ToAsync<int, int, int, int>((a, b, c) => 1, null));
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.ToAsync<int, int, int, int, int>((a, b, c, d) => 1, null));
-#if !NO_LARGEARITY
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.ToAsync<int, int, int, int, int>((a, b, c, d, e) => { }, null));
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.ToAsync<int, int, int, int, int, int>((a, b, c, d, e, f) => { }, null));
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.ToAsync<int, int, int, int, int, int>((a, b, c, d, e) => 1, null));
@@ -2185,7 +2176,6 @@ namespace ReactiveTests.Tests
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.ToAsync<int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int>((a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p) => { }, null));
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.ToAsync<int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int>((a, b, c, d, e, f, g, h, i, j, k, l, m, n, o) => 1, null));
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.ToAsync<int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int>((a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p) => 1, null));
-#endif
         }
 
         [Fact]
@@ -2223,8 +2213,6 @@ namespace ReactiveTests.Tests
             Assert.True(Observable.ToAsync<int, int, int, int, int>((a, b, c, d) => a + b + c + d, Scheduler.Default)(1, 2, 3, 4).ToEnumerable().SequenceEqual(new[] { 1 + 2 + 3 + 4 }));
         }
 
-#if !NO_LARGEARITY
-
         [Fact]
         public void ToAsync5()
         {
@@ -2308,7 +2296,6 @@ namespace ReactiveTests.Tests
             Assert.True(Observable.ToAsync<int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int>((a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p) => a + b + c + d + e + f + g + h + i + j + k + l + m + n + o + p)(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16).ToEnumerable().SequenceEqual(new[] { 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 }));
             Assert.True(Observable.ToAsync<int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int>((a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p) => a + b + c + d + e + f + g + h + i + j + k + l + m + n + o + p, Scheduler.Default)(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16).ToEnumerable().SequenceEqual(new[] { 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 }));
         }
-#endif
 
         [Fact]
         public void ToAsync_Error0()
@@ -2345,8 +2332,6 @@ namespace ReactiveTests.Tests
             Assert.True(Observable.ToAsync<int, int, int, int, int>((a, b, c, d) => { throw ex; })(1, 2, 3, 4).Materialize().ToEnumerable().SequenceEqual(new Notification<int>[] { Notification.CreateOnError<int>(ex) }));
         }
 
-#if !NO_LARGEARITY
-
         [Fact]
         public void ToAsync_Error5()
         {
@@ -2430,7 +2415,6 @@ namespace ReactiveTests.Tests
             var ex = new Exception();
             Assert.True(Observable.ToAsync<int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int>((a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p) => { throw ex; })(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16).Materialize().ToEnumerable().SequenceEqual(new Notification<int>[] { Notification.CreateOnError<int>(ex) }));
         }
-#endif
 
         [Fact]
         public void ToAsyncAction0()
@@ -2512,8 +2496,6 @@ namespace ReactiveTests.Tests
             Assert.True(Observable.ToAsync<int, int, int, int>((a, b, c, d) => { Assert.Equal(1, a); Assert.Equal(2, b); Assert.Equal(3, c); Assert.Equal(4, d); throw ex; })(1, 2, 3, 4).Materialize().ToEnumerable().SequenceEqual(new[] { Notification.CreateOnError<Unit>(ex) }));
         }
 
-#if !NO_LARGEARITY
-
         [Fact]
         public void ToAsyncAction5()
         {
@@ -2705,8 +2687,7 @@ namespace ReactiveTests.Tests
             var ex = new Exception();
             Assert.True(Observable.ToAsync<int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int>((a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p) => { Assert.Equal(1, a); Assert.Equal(2, b); Assert.Equal(3, c); Assert.Equal(4, d); Assert.Equal(5, e); Assert.Equal(6, f); Assert.Equal(7, g); Assert.Equal(8, h); Assert.Equal(9, i); Assert.Equal(10, j); Assert.Equal(11, k); Assert.Equal(12, l); Assert.Equal(13, m); Assert.Equal(14, n); Assert.Equal(15, o); Assert.Equal(16, p); throw ex; })(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16).Materialize().ToEnumerable().SequenceEqual(new[] { Notification.CreateOnError<Unit>(ex) }));
         }
-#endif
 
-#endregion
+        #endregion
     }
 }

Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/ObservableJoinsTest.cs

@@ -25,8 +25,6 @@ namespace ReactiveTests.Tests
 
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.And<int, int>(someObservable, someObservable).And<int>(null));
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.And<int, int>(someObservable, someObservable).And(someObservable).And<int>(null));
-
-#if !NO_LARGEARITY
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.And<int, int>(someObservable, someObservable).And(someObservable).And(someObservable).And<int>(null));
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.And<int, int>(someObservable, someObservable).And(someObservable).And(someObservable).And(someObservable).And<int>(null));
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.And<int, int>(someObservable, someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And<int>(null));
@@ -39,7 +37,6 @@ namespace ReactiveTests.Tests
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.And<int, int>(someObservable, someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And<int>(null));
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.And<int, int>(someObservable, someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And<int>(null));
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.And<int, int>(someObservable, someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And<int>(null));
-#endif
         }
 
         [Fact]
@@ -237,7 +234,6 @@ namespace ReactiveTests.Tests
             }
         }
 
-#if !NO_LARGEARITY
         [Fact]
         public void And5()
         {
@@ -1017,7 +1013,6 @@ namespace ReactiveTests.Tests
                 );
             }
         }
-#endif
 
         #endregion
 
@@ -1033,8 +1028,6 @@ namespace ReactiveTests.Tests
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.And<int, int>(someObservable, someObservable).Then<int>(null));
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.And<int, int>(someObservable, someObservable).And(someObservable).Then<int>(null));
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.And<int, int>(someObservable, someObservable).And(someObservable).And(someObservable).Then<int>(null));
-
-#if !NO_LARGEARITY
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.And<int, int>(someObservable, someObservable).And(someObservable).And(someObservable).And(someObservable).Then<int>(null));
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.And<int, int>(someObservable, someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).Then<int>(null));
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.And<int, int>(someObservable, someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).Then<int>(null));
@@ -1047,7 +1040,6 @@ namespace ReactiveTests.Tests
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.And<int, int>(someObservable, someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).Then<int>(null));
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.And<int, int>(someObservable, someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).Then<int>(null));
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.And<int, int>(someObservable, someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).And(someObservable).Then<int>(null));
-#endif
         }
 
         [Fact]
@@ -1189,7 +1181,6 @@ namespace ReactiveTests.Tests
             );
         }
 
-#if !NO_LARGEARITY
         [Fact]
         public void Then5Throws()
         {
@@ -1501,7 +1492,6 @@ namespace ReactiveTests.Tests
                 OnError<int>(210, ex)
             );
         }
-#endif
 
         #endregion
 

Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/ObservableMultipleTest.cs

@@ -1945,7 +1945,6 @@ namespace ReactiveTests.Tests
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.CombineLatest(xs, xs, default(IObservable<int>), xs, (_0, _1, _2, _3) => _0 + _1 + _2 + _3));
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.CombineLatest(xs, xs, xs, default(IObservable<int>), (_0, _1, _2, _3) => _0 + _1 + _2 + _3));
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.CombineLatest(xs, xs, xs, xs, default(Func<int, int, int, int, int>)));
-#if !NO_LARGEARITY
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.CombineLatest(default(IObservable<int>), xs, xs, xs, xs, (_0, _1, _2, _3, _4) => _0 + _1 + _2 + _3 + _4));
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.CombineLatest(xs, default(IObservable<int>), xs, xs, xs, (_0, _1, _2, _3, _4) => _0 + _1 + _2 + _3 + _4));
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.CombineLatest(xs, xs, default(IObservable<int>), xs, xs, (_0, _1, _2, _3, _4) => _0 + _1 + _2 + _3 + _4));
@@ -2084,7 +2083,6 @@ namespace ReactiveTests.Tests
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.CombineLatest(xs, xs, xs, xs, xs, xs, xs, xs, xs, xs, xs, xs, xs, xs, default(IObservable<int>), xs, (_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15) => _0 + _1 + _2 + _3 + _4 + _5 + _6 + _7 + _8 + _9 + _10 + _11 + _12 + _13 + _14 + _15));
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.CombineLatest(xs, xs, xs, xs, xs, xs, xs, xs, xs, xs, xs, xs, xs, xs, xs, default(IObservable<int>), (_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15) => _0 + _1 + _2 + _3 + _4 + _5 + _6 + _7 + _8 + _9 + _10 + _11 + _12 + _13 + _14 + _15));
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.CombineLatest(xs, xs, xs, xs, xs, xs, xs, xs, xs, xs, xs, xs, xs, xs, xs, xs, default(Func<int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int>)));
-#endif
         }
 
         #endregion
@@ -2171,7 +2169,6 @@ namespace ReactiveTests.Tests
                 e.Subscriptions.AssertEqual(Subscribe(200, 1000));
         }
 
-#if !NO_LARGEARITY
         [Fact]
         public void CombineLatest_Never5()
         {
@@ -2501,7 +2498,6 @@ namespace ReactiveTests.Tests
             foreach (var e in new[] { e0, e1, e2, e3, e4, e5, e6, e7, e8, e9, e10, e11, e12, e13, e14, e15 })
                 e.Subscriptions.AssertEqual(Subscribe(200, 1000));
         }
-#endif
 
         #endregion
 
@@ -2659,7 +2655,6 @@ namespace ReactiveTests.Tests
                 e.Subscriptions.AssertEqual(Subscribe(200, 200 + (++i * 10)));
         }
 
-#if !NO_LARGEARITY
         [Fact]
         public void CombineLatest_Empty5()
         {
@@ -3013,7 +3008,6 @@ namespace ReactiveTests.Tests
             foreach (var e in new[] { e0, e1, e2, e3, e4, e5, e6, e7, e8, e9, e10, e11, e12, e13, e14, e15 })
                 e.Subscriptions.AssertEqual(Subscribe(200, 200 + (++i * 10)));
         }
-#endif
 
         #endregion
 
@@ -3968,7 +3962,6 @@ namespace ReactiveTests.Tests
                 e.Subscriptions.AssertEqual(Subscribe(200, 200 + 10 * es.Length));
         }
 
-#if !NO_LARGEARITY
         [Fact]
         public void CombineLatest_SelectorThrows5()
         {
@@ -4358,7 +4351,6 @@ namespace ReactiveTests.Tests
             foreach (var e in es)
                 e.Subscriptions.AssertEqual(Subscribe(200, 200 + 10 * es.Length));
         }
-#endif
 
         #endregion
 
@@ -4464,7 +4456,6 @@ namespace ReactiveTests.Tests
             es.Last().Subscriptions.AssertEqual(Subscribe(200, 500));
         }
 
-#if !NO_LARGEARITY
         [Fact]
         public void CombineLatest_WillNeverBeAbleToCombine5()
         {
@@ -4854,7 +4845,6 @@ namespace ReactiveTests.Tests
 
             es.Last().Subscriptions.AssertEqual(Subscribe(200, 500));
         }
-#endif
 
         #endregion
 
@@ -4960,7 +4950,6 @@ namespace ReactiveTests.Tests
                 e.Subscriptions.AssertEqual(Subscribe(200, 800));
         }
 
-#if !NO_LARGEARITY
         [Fact]
         public void CombineLatest_Typical5()
         {
@@ -5440,7 +5429,6 @@ namespace ReactiveTests.Tests
             foreach (var e in new[] { e0, e1, e2, e3, e4, e5, e6, e7, e8, e9, e10, e11, e12, e13, e14, e15 })
                 e.Subscriptions.AssertEqual(Subscribe(200, 800));
         }
-#endif
 
         #endregion
 
@@ -11574,7 +11562,6 @@ namespace ReactiveTests.Tests
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.Zip(xs, xs, default(IObservable<int>), xs, (_0, _1, _2, _3) => _0 + _1 + _2 + _3));
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.Zip(xs, xs, xs, default(IObservable<int>), (_0, _1, _2, _3) => _0 + _1 + _2 + _3));
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.Zip(xs, xs, xs, xs, default(Func<int, int, int, int, int>)));
-#if !NO_LARGEARITY
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.Zip(default(IObservable<int>), xs, xs, xs, xs, (_0, _1, _2, _3, _4) => _0 + _1 + _2 + _3 + _4));
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.Zip(xs, default(IObservable<int>), xs, xs, xs, (_0, _1, _2, _3, _4) => _0 + _1 + _2 + _3 + _4));
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.Zip(xs, xs, default(IObservable<int>), xs, xs, (_0, _1, _2, _3, _4) => _0 + _1 + _2 + _3 + _4));
@@ -11713,7 +11700,6 @@ namespace ReactiveTests.Tests
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.Zip(xs, xs, xs, xs, xs, xs, xs, xs, xs, xs, xs, xs, xs, xs, default(IObservable<int>), xs, (_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15) => _0 + _1 + _2 + _3 + _4 + _5 + _6 + _7 + _8 + _9 + _10 + _11 + _12 + _13 + _14 + _15));
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.Zip(xs, xs, xs, xs, xs, xs, xs, xs, xs, xs, xs, xs, xs, xs, xs, default(IObservable<int>), (_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15) => _0 + _1 + _2 + _3 + _4 + _5 + _6 + _7 + _8 + _9 + _10 + _11 + _12 + _13 + _14 + _15));
             ReactiveAssert.Throws<ArgumentNullException>(() => Observable.Zip(xs, xs, xs, xs, xs, xs, xs, xs, xs, xs, xs, xs, xs, xs, xs, xs, default(Func<int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int>)));
-#endif
         }
 
         #endregion
@@ -11780,7 +11766,6 @@ namespace ReactiveTests.Tests
                 e.Subscriptions.AssertEqual(Subscribe(200, 1000));
         }
 
-#if !NO_LARGEARITY
         [Fact]
         public void Zip_Never5()
         {
@@ -12110,7 +12095,6 @@ namespace ReactiveTests.Tests
             foreach (var e in new[] { e0, e1, e2, e3, e4, e5, e6, e7, e8, e9, e10, e11, e12, e13, e14, e15 })
                 e.Subscriptions.AssertEqual(Subscribe(200, 1000));
         }
-#endif
 
         #endregion
 
@@ -12278,7 +12262,6 @@ namespace ReactiveTests.Tests
                 e.Subscriptions.AssertEqual(Subscribe(200, 200 + (++i * 10)));
         }
 
-#if !NO_LARGEARITY
         [Fact]
         public void Zip_Empty5()
         {
@@ -12632,7 +12615,6 @@ namespace ReactiveTests.Tests
             foreach (var e in new[] { e0, e1, e2, e3, e4, e5, e6, e7, e8, e9, e10, e11, e12, e13, e14, e15 })
                 e.Subscriptions.AssertEqual(Subscribe(200, 200 + (++i * 10)));
         }
-#endif
 
         #endregion
 
@@ -13276,7 +13258,6 @@ namespace ReactiveTests.Tests
                 e.Subscriptions.AssertEqual(Subscribe(200, 400));
         }
 
-#if !NO_LARGEARITY
         [Fact]
         public void Zip_SymmetricReturn5()
         {
@@ -13630,7 +13611,6 @@ namespace ReactiveTests.Tests
             foreach (var e in new[] { e0, e1, e2, e3, e4, e5, e6, e7, e8, e9, e10, e11, e12, e13, e14, e15 })
                 e.Subscriptions.AssertEqual(Subscribe(200, 400));
         }
-#endif
 
         #endregion
 
@@ -13838,7 +13818,6 @@ namespace ReactiveTests.Tests
                 e.Subscriptions.AssertEqual(Subscribe(200, 200 + es.Length * 10));
         }
 
-#if !NO_LARGEARITY
         [Fact]
         public void Zip_SelectorThrows5()
         {
@@ -14228,7 +14207,6 @@ namespace ReactiveTests.Tests
             foreach (var e in es)
                 e.Subscriptions.AssertEqual(Subscribe(200, 200 + es.Length * 10));
         }
-#endif
 
         #endregion
 
@@ -14352,7 +14330,6 @@ namespace ReactiveTests.Tests
             );
         }
 
-#if !NO_LARGEARITY
         [Fact]
         public void Zip_AllCompleted5()
         {
@@ -14790,7 +14767,6 @@ namespace ReactiveTests.Tests
                 Subscribe(200, 220 + (i - 1) * 10)
             );
         }
-#endif
 
         #endregion
 

Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/QbservableTest.cs

@@ -95,7 +95,6 @@ namespace ReactiveTests.Tests
             ReactiveAssert.Throws<ArgumentNullException>(() => _qbMy.And(_qbNull));
             ReactiveAssert.Throws<ArgumentNullException>(() => _qbMy.And(_qbMy).And(_qbNull));
             ReactiveAssert.Throws<ArgumentNullException>(() => _qbMy.And(_qbMy).And(_qbMy).And(_qbNull));
-#if !NO_LARGEARITY
             ReactiveAssert.Throws<ArgumentNullException>(() => _qbMy.And(_qbMy).And(_qbMy).And(_qbMy).And(_qbNull));
             ReactiveAssert.Throws<ArgumentNullException>(() => _qbMy.And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbNull));
             ReactiveAssert.Throws<ArgumentNullException>(() => _qbMy.And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbNull));
@@ -108,7 +107,6 @@ namespace ReactiveTests.Tests
             ReactiveAssert.Throws<ArgumentNullException>(() => _qbMy.And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbNull));
             ReactiveAssert.Throws<ArgumentNullException>(() => _qbMy.And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbNull));
             ReactiveAssert.Throws<ArgumentNullException>(() => _qbMy.And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbNull));
-#endif
         }
 
         [Fact]
@@ -1577,9 +1575,7 @@ namespace ReactiveTests.Tests
                 _qbMy.Then((t0) => 1),
                 _qbMy.And(_qbMy).Then((t0, t1) => 1),
                 _qbMy.And(_qbMy).And(_qbMy).Then((t0, t1, t2) => 1),
-                _qbMy.And(_qbMy).And(_qbMy).And(_qbMy).Then((t0, t1, t2, t3) => 1)
-#if !NO_LARGEARITY
-                ,
+                _qbMy.And(_qbMy).And(_qbMy).And(_qbMy).Then((t0, t1, t2, t3) => 1),
                 _qbMy.And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).Then((t0, t1, t2, t3, t4) => 1),
                 _qbMy.And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).Then((t0, t1, t2, t3, t4, t5) => 1),
                 _qbMy.And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).Then((t0, t1, t2, t3, t4, t5, t6) => 1),
@@ -1592,8 +1588,7 @@ namespace ReactiveTests.Tests
                 _qbMy.And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).Then((t0, t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13) => 1),
                 _qbMy.And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).Then((t0, t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14) => 1),
                 _qbMy.And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).Then((t0, t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15) => 1)
-#endif
-);
+            );
         }
 
         [Fact]
@@ -1604,7 +1599,6 @@ namespace ReactiveTests.Tests
             ReactiveAssert.Throws<ArgumentNullException>(() => _qbMy.And(_qbMy).Then(default(Expression<Func<int, int, int>>)));
             ReactiveAssert.Throws<ArgumentNullException>(() => _qbMy.And(_qbMy).And(_qbMy).Then(default(Expression<Func<int, int, int, int>>)));
             ReactiveAssert.Throws<ArgumentNullException>(() => _qbMy.And(_qbMy).And(_qbMy).And(_qbMy).Then(default(Expression<Func<int, int, int, int, int>>)));
-#if !NO_LARGEARITY
             ReactiveAssert.Throws<ArgumentNullException>(() => _qbMy.And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).Then(default(Expression<Func<int, int, int, int, int, int>>)));
             ReactiveAssert.Throws<ArgumentNullException>(() => _qbMy.And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).Then(default(Expression<Func<int, int, int, int, int, int, int>>)));
             ReactiveAssert.Throws<ArgumentNullException>(() => _qbMy.And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).Then(default(Expression<Func<int, int, int, int, int, int, int, int>>)));
@@ -1617,7 +1611,6 @@ namespace ReactiveTests.Tests
             ReactiveAssert.Throws<ArgumentNullException>(() => _qbMy.And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).Then(default(Expression<Func<int, int, int, int, int, int, int, int, int, int, int, int, int, int, int>>)));
             ReactiveAssert.Throws<ArgumentNullException>(() => _qbMy.And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).Then(default(Expression<Func<int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int>>)));
             ReactiveAssert.Throws<ArgumentNullException>(() => _qbMy.And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).And(_qbMy).Then(default(Expression<Func<int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int>>)));
-#endif
         }
 
         [Fact]

Rx.NET/tools/HomoIcon/Program.cs

@@ -222,7 +222,7 @@ using System.Runtime.Remoting.Lifetime;
                             where ptgtd.GetGenericArguments().Count() > 5
                             select pi;
 
-                var isLargeArity = funky.Any();
+                //var isLargeArity = funky.Any();
 
                 var hasTask = p.Any(pa => ContainsTask(pa.ParameterType));
 
@@ -353,10 +353,10 @@ using System.Runtime.Remoting.Lifetime;
                 //    if (nulls.Contains("lease"))
                 //        nulls.Remove("lease");
                 //}
-                if (isLargeArity)
-                {
-                    WriteLine("#if !NO_LARGEARITY", true);
-                }
+                //if (isLargeArity)
+                //{
+                //    WriteLine("#if !NO_LARGEARITY", true);
+                //}
 
                 var isFep = m.Name == "FromEventPattern";
                 var isGenFep = isFep && m.GetGenericArguments().Any(a => a.Name == "TEventArgs");
@@ -498,8 +498,8 @@ using System.Runtime.Remoting.Lifetime;
                     WriteLine("#endif", true);
                 if (isExp)
                     WriteLine("#endif", true);
-                if (isLargeArity)
-                    WriteLine("#endif", true);
+                //if (isLargeArity)
+                //    WriteLine("#endif", true);
                 WriteLine("");
             }
 
@@ -552,8 +552,8 @@ using System.Runtime.Remoting.Lifetime;
             {
                 for (int i = 0; i <= 16; i++)
                 {
-                    if (i == 5)
-                        WriteLine("#if !NO_LARGEARITY", true);
+                    //if (i == 5)
+                    //    WriteLine("#if !NO_LARGEARITY", true);
 
                     foreach (var withScheduler in new[] { false, true })
                     {
@@ -683,8 +683,8 @@ using System.Runtime.Remoting.Lifetime;
                         WriteLine("");
                     }
 
-                    if (i == 16)
-                        WriteLine("#endif", true);
+                    //if (i == 16)
+                    //    WriteLine("#endif", true);
                 }
             }
 
@@ -694,8 +694,8 @@ using System.Runtime.Remoting.Lifetime;
             {
                 for (int i = 0; i < 15; i++)
                 {
-                    if (i == 3)
-                        WriteLine("#if !NO_LARGEARITY", true);
+                    //if (i == 3)
+                    //    WriteLine("#if !NO_LARGEARITY", true);
 
                     var genArgs = default(string[]);
                     var lamPars = default(string[]);
@@ -823,8 +823,8 @@ using System.Runtime.Remoting.Lifetime;
                     WriteLine("}");
                     WriteLine("");
 
-                    if (i == 14)
-                        WriteLine("#endif", true);
+                    //if (i == 14)
+                    //    WriteLine("#endif", true);
                 }
             }
         }