Eliminate lifting in Queryable extensions to avoid reflecting over private fields.
(port changeset

[tfs-changeset: 1468586]

--- src/System.Linq.Queryable/src/System/Linq/Queryable.cs
+++ src/System.Linq.Queryable/src/System/Linq/Queryable.cs
@@ -40,7 +40,9 @@
             return source.Provider.CreateQuery<TSource>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Where(source, predicate)),
+                    GetMethodInfoOf(() => Queryable.Where(
+                        default(IQueryable<TSource>),
+                        default(Expression<Func<TSource, bool>>))),
                     new Expression[] { source.Expression, Expression.Quote(predicate) }
                     ));
         }
@@ -54,7 +56,9 @@
             return source.Provider.CreateQuery<TSource>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Where(source, predicate)),
+                    GetMethodInfoOf(() => Queryable.Where(
+                        default(IQueryable<TSource>),
+                        default(Expression<Func<TSource, int, bool>>))),
                     new Expression[] { source.Expression, Expression.Quote(predicate) }
                     ));
         }
@@ -66,7 +70,8 @@
             return source.Provider.CreateQuery<TResult>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.OfType<TResult>(source)),
+                    GetMethodInfoOf(() => Queryable.OfType<TResult>(
+                        default(IQueryable))),
                     new Expression[] { source.Expression }
                     ));
         }
@@ -78,7 +83,8 @@
             return source.Provider.CreateQuery<TResult>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Cast<TResult>(source)),
+                    GetMethodInfoOf(() => Queryable.Cast<TResult>(
+                        default(IQueryable))),
                     new Expression[] { source.Expression }
                     ));
         }
@@ -92,7 +98,9 @@
             return source.Provider.CreateQuery<TResult>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Select(source, selector)),
+                    GetMethodInfoOf(() => Queryable.Select(
+                        default(IQueryable<TSource>),
+                        default(Expression<Func<TSource, TResult>>))),
                     new Expression[] { source.Expression, Expression.Quote(selector) }
                     ));
         }
@@ -106,7 +114,9 @@
             return source.Provider.CreateQuery<TResult>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Select(source, selector)),
+                    GetMethodInfoOf(() => Queryable.Select(
+                        default(IQueryable<TSource>),
+                        default(Expression<Func<TSource, int, TResult>>))),
                     new Expression[] { source.Expression, Expression.Quote(selector) }
                     ));
         }
@@ -120,7 +130,9 @@
             return source.Provider.CreateQuery<TResult>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.SelectMany(source, selector)),
+                    GetMethodInfoOf(() => Queryable.SelectMany(
+                        default(IQueryable<TSource>),
+                        default(Expression<Func<TSource, IEnumerable<TResult>>>))),
                     new Expression[] { source.Expression, Expression.Quote(selector) }
                     ));
         }
@@ -134,7 +146,9 @@
             return source.Provider.CreateQuery<TResult>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.SelectMany(source, selector)),
+                    GetMethodInfoOf(() => Queryable.SelectMany(
+                        default(IQueryable<TSource>),
+                        default(Expression<Func<TSource, int, IEnumerable<TResult>>>))),
                     new Expression[] { source.Expression, Expression.Quote(selector) }
                     ));
         }
@@ -150,7 +164,10 @@
             return source.Provider.CreateQuery<TResult>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.SelectMany(source, collectionSelector, resultSelector)),
+                    GetMethodInfoOf(() => Queryable.SelectMany(
+                        default(IQueryable<TSource>),
+                        default(Expression<Func<TSource, int, IEnumerable<TCollection>>>),
+                        default(Expression<Func<TSource, TCollection, TResult>>))),
                     new Expression[] { source.Expression, Expression.Quote(collectionSelector), Expression.Quote(resultSelector) }
                     ));
         }
@@ -166,7 +183,10 @@
             return source.Provider.CreateQuery<TResult>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.SelectMany(source, collectionSelector, resultSelector)),
+                    GetMethodInfoOf(() => Queryable.SelectMany(
+                        default(IQueryable<TSource>),
+                        default(Expression<Func<TSource, IEnumerable<TCollection>>>),
+                        default(Expression<Func<TSource, TCollection, TResult>>))),
                     new Expression[] { source.Expression, Expression.Quote(collectionSelector), Expression.Quote(resultSelector) }
                     ));
         }
@@ -193,7 +213,12 @@
             return outer.Provider.CreateQuery<TResult>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Join(outer, inner, outerKeySelector, innerKeySelector, resultSelector)),
+                    GetMethodInfoOf(() => Queryable.Join(
+                        default(IQueryable<TOuter>),
+                        default(IEnumerable<TInner>),
+                        default(Expression<Func<TOuter, TKey>>),
+                        default(Expression<Func<TInner, TKey>>),
+                        default(Expression<Func<TOuter, TInner, TResult>>))),
                     new Expression[] {
                         outer.Expression,
                         GetSourceExpression(inner),
@@ -219,7 +244,13 @@
             return outer.Provider.CreateQuery<TResult>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Join(outer, inner, outerKeySelector, innerKeySelector, resultSelector, comparer)),
+                    GetMethodInfoOf(() => Queryable.Join(
+                        default(IQueryable<TOuter>),
+                        default(IEnumerable<TInner>),
+                        default(Expression<Func<TOuter, TKey>>),
+                        default(Expression<Func<TInner, TKey>>),
+                        default(Expression<Func<TOuter, TInner, TResult>>),
+                        default(IEqualityComparer<TKey>))),
                     new Expression[] {
                         outer.Expression,
                         GetSourceExpression(inner),
@@ -246,7 +277,12 @@
             return outer.Provider.CreateQuery<TResult>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.GroupJoin(outer, inner, outerKeySelector, innerKeySelector, resultSelector)),
+                    GetMethodInfoOf(() => Queryable.GroupJoin(
+                        default(IQueryable<TOuter>),
+                        default(IEnumerable<TInner>),
+                        default(Expression<Func<TOuter, TKey>>),
+                        default(Expression<Func<TInner, TKey>>),
+                        default(Expression<Func<TOuter, IEnumerable<TInner>, TResult>>))),
                     new Expression[] {
                         outer.Expression,
                         GetSourceExpression(inner),
@@ -271,7 +307,13 @@
             return outer.Provider.CreateQuery<TResult>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.GroupJoin(outer, inner, outerKeySelector, innerKeySelector, resultSelector, comparer)),
+                    GetMethodInfoOf(() => Queryable.GroupJoin(
+                        default(IQueryable<TOuter>),
+                        default(IEnumerable<TInner>),
+                        default(Expression<Func<TOuter, TKey>>),
+                        default(Expression<Func<TInner, TKey>>),
+                        default(Expression<Func<TOuter, IEnumerable<TInner>, TResult>>),
+                        default(IEqualityComparer<TKey>))),
                     new Expression[] {
                         outer.Expression,
                         GetSourceExpression(inner),
@@ -291,7 +333,9 @@
             return (IOrderedQueryable<TSource>)source.Provider.CreateQuery<TSource>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.OrderBy(source, keySelector)),
+                    GetMethodInfoOf(() => Queryable.OrderBy(
+                        default(IQueryable<TSource>),
+                        default(Expression<Func<TSource, TKey>>))),
                     new Expression[] { source.Expression, Expression.Quote(keySelector) }
                     ));
         }
@@ -305,7 +349,10 @@
             return (IOrderedQueryable<TSource>)source.Provider.CreateQuery<TSource>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.OrderBy(source, keySelector, comparer)),
+                    GetMethodInfoOf(() => Queryable.OrderBy(
+                        default(IQueryable<TSource>),
+                        default(Expression<Func<TSource, TKey>>),
+                        default(IComparer<TKey>))),
                     new Expression[] { source.Expression, Expression.Quote(keySelector), Expression.Constant(comparer, typeof(IComparer<TKey>)) }
                     ));
         }
@@ -319,7 +366,9 @@
             return (IOrderedQueryable<TSource>)source.Provider.CreateQuery<TSource>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.OrderByDescending(source, keySelector)),
+                    GetMethodInfoOf(() => Queryable.OrderByDescending(
+                        default(IQueryable<TSource>),
+                        default(Expression<Func<TSource, TKey>>))),
                     new Expression[] { source.Expression, Expression.Quote(keySelector) }
                     ));
         }
@@ -333,7 +382,10 @@
             return (IOrderedQueryable<TSource>)source.Provider.CreateQuery<TSource>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.OrderByDescending(source, keySelector, comparer)),
+                    GetMethodInfoOf(() => Queryable.OrderByDescending(
+                        default(IQueryable<TSource>),
+                        default(Expression<Func<TSource, TKey>>),
+                        default(IComparer<TKey>))),
                     new Expression[] { source.Expression, Expression.Quote(keySelector), Expression.Constant(comparer, typeof(IComparer<TKey>)) }
                     ));
         }
@@ -347,7 +399,9 @@
             return (IOrderedQueryable<TSource>)source.Provider.CreateQuery<TSource>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.ThenBy(source, keySelector)),
+                    GetMethodInfoOf(() => Queryable.ThenBy(
+                        default(IOrderedQueryable<TSource>),
+                        default(Expression<Func<TSource, TKey>>))),
                     new Expression[] { source.Expression, Expression.Quote(keySelector) }
                     ));
         }
@@ -361,7 +415,10 @@
             return (IOrderedQueryable<TSource>)source.Provider.CreateQuery<TSource>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.ThenBy(source, keySelector, comparer)),
+                    GetMethodInfoOf(() => Queryable.ThenBy(
+                        default(IOrderedQueryable<TSource>),
+                        default(Expression<Func<TSource, TKey>>),
+                        default(IComparer<TKey>))),
                     new Expression[] { source.Expression, Expression.Quote(keySelector), Expression.Constant(comparer, typeof(IComparer<TKey>)) }
                     ));
         }
@@ -375,7 +432,9 @@
             return (IOrderedQueryable<TSource>)source.Provider.CreateQuery<TSource>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.ThenByDescending(source, keySelector)),
+                    GetMethodInfoOf(() => Queryable.ThenByDescending(
+                        default(IOrderedQueryable<TSource>),
+                        default(Expression<Func<TSource, TKey>>))),
                     new Expression[] { source.Expression, Expression.Quote(keySelector) }
                     ));
         }
@@ -389,7 +448,10 @@
             return (IOrderedQueryable<TSource>)source.Provider.CreateQuery<TSource>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.ThenByDescending(source, keySelector, comparer)),
+                    GetMethodInfoOf(() => Queryable.ThenByDescending(
+                        default(IOrderedQueryable<TSource>),
+                        default(Expression<Func<TSource, TKey>>),
+                        default(IComparer<TKey>))),
                     new Expression[] { source.Expression, Expression.Quote(keySelector), Expression.Constant(comparer, typeof(IComparer<TKey>)) }
                     ));
         }
@@ -401,7 +463,9 @@
             return source.Provider.CreateQuery<TSource>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Take(source, count)),
+                    GetMethodInfoOf(() => Queryable.Take(
+                        default(IQueryable<TSource>),
+                        default(int))),
                     new Expression[] { source.Expression, Expression.Constant(count) }
                     ));
         }
@@ -415,7 +479,9 @@
             return source.Provider.CreateQuery<TSource>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.TakeWhile(source, predicate)),
+                    GetMethodInfoOf(() => Queryable.TakeWhile(
+                        default(IQueryable<TSource>),
+                        default(Expression<Func<TSource, bool>>))),
                     new Expression[] { source.Expression, Expression.Quote(predicate) }
                     ));
         }
@@ -429,7 +495,9 @@
             return source.Provider.CreateQuery<TSource>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.TakeWhile(source, predicate)),
+                    GetMethodInfoOf(() => Queryable.TakeWhile(
+                        default(IQueryable<TSource>),
+                        default(Expression<Func<TSource, int, bool>>))),
                     new Expression[] { source.Expression, Expression.Quote(predicate) }
                     ));
         }
@@ -441,7 +509,9 @@
             return source.Provider.CreateQuery<TSource>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Skip(source, count)),
+                    GetMethodInfoOf(() => Queryable.Skip(
+                        default(IQueryable<TSource>),
+                        default(int))),
                     new Expression[] { source.Expression, Expression.Constant(count) }
                     ));
         }
@@ -455,7 +525,9 @@
             return source.Provider.CreateQuery<TSource>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.SkipWhile(source, predicate)),
+                    GetMethodInfoOf(() => Queryable.SkipWhile(
+                        default(IQueryable<TSource>),
+                        default(Expression<Func<TSource, bool>>))),
                     new Expression[] { source.Expression, Expression.Quote(predicate) }
                     ));
         }
@@ -469,7 +541,9 @@
             return source.Provider.CreateQuery<TSource>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.SkipWhile(source, predicate)),
+                    GetMethodInfoOf(() => Queryable.SkipWhile(
+                        default(IQueryable<TSource>),
+                        default(Expression<Func<TSource, int, bool>>))),
                     new Expression[] { source.Expression, Expression.Quote(predicate) }
                     ));
         }
@@ -483,7 +557,9 @@
             return source.Provider.CreateQuery<IGrouping<TKey, TSource>>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.GroupBy(source, keySelector)),
+                    GetMethodInfoOf(() => Queryable.GroupBy(
+                        default(IQueryable<TSource>),
+                        default(Expression<Func<TSource, TKey>>))),
                     new Expression[] { source.Expression, Expression.Quote(keySelector) }
                     ));
         }
@@ -499,7 +575,10 @@
             return source.Provider.CreateQuery<IGrouping<TKey, TElement>>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.GroupBy(source, keySelector, elementSelector)),
+                    GetMethodInfoOf(() => Queryable.GroupBy(
+                        default(IQueryable<TSource>),
+                        default(Expression<Func<TSource, TKey>>),
+                        default(Expression<Func<TSource, TElement>>))),
                     new Expression[] { source.Expression, Expression.Quote(keySelector), Expression.Quote(elementSelector) }
                     ));
         }
@@ -513,7 +592,10 @@
             return source.Provider.CreateQuery<IGrouping<TKey, TSource>>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.GroupBy(source, keySelector, comparer)),
+                    GetMethodInfoOf(() => Queryable.GroupBy(
+                        default(IQueryable<TSource>),
+                        default(Expression<Func<TSource, TKey>>),
+                        default(IEqualityComparer<TKey>))),
                     new Expression[] { source.Expression, Expression.Quote(keySelector), Expression.Constant(comparer, typeof(IEqualityComparer<TKey>)) }
                     ));
         }
@@ -529,7 +611,11 @@
             return source.Provider.CreateQuery<IGrouping<TKey, TElement>>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.GroupBy(source, keySelector, elementSelector, comparer)),
+                    GetMethodInfoOf(() => Queryable.GroupBy(
+                        default(IQueryable<TSource>),
+                        default(Expression<Func<TSource, TKey>>),
+                        default(Expression<Func<TSource, TElement>>),
+                        default(IEqualityComparer<TKey>))),
                     new Expression[] { source.Expression, Expression.Quote(keySelector), Expression.Quote(elementSelector), Expression.Constant(comparer, typeof(IEqualityComparer<TKey>)) }
                     ));
         }
@@ -547,7 +633,11 @@
             return source.Provider.CreateQuery<TResult>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.GroupBy(source, keySelector, elementSelector, resultSelector)),
+                    GetMethodInfoOf(() => Queryable.GroupBy(
+                        default(IQueryable<TSource>),
+                        default(Expression<Func<TSource, TKey>>),
+                        default(Expression<Func<TSource, TElement>>),
+                        default(Expression<Func<TKey, IEnumerable<TElement>, TResult>>))),
                     new Expression[] { source.Expression, Expression.Quote(keySelector), Expression.Quote(elementSelector), Expression.Quote(resultSelector) }
                     ));
         }
@@ -563,7 +653,10 @@
             return source.Provider.CreateQuery<TResult>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.GroupBy(source, keySelector, resultSelector)),
+                    GetMethodInfoOf(() => Queryable.GroupBy(
+                        default(IQueryable<TSource>),
+                        default(Expression<Func<TSource, TKey>>),
+                        default(Expression<Func<TKey, IEnumerable<TSource>, TResult>>))),
                     new Expression[] { source.Expression, Expression.Quote(keySelector), Expression.Quote(resultSelector) }
                     ));
         }
@@ -579,7 +672,11 @@
             return source.Provider.CreateQuery<TResult>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.GroupBy(source, keySelector, resultSelector, comparer)),
+                    GetMethodInfoOf(() => Queryable.GroupBy(
+                        default(IQueryable<TSource>),
+                        default(Expression<Func<TSource, TKey>>),
+                        default(Expression<Func<TKey, IEnumerable<TSource>, TResult>>),
+                        default(IEqualityComparer<TKey>))),
                     new Expression[] { source.Expression, Expression.Quote(keySelector), Expression.Quote(resultSelector), Expression.Constant(comparer, typeof(IEqualityComparer<TKey>)) }
                     ));
         }
@@ -597,7 +694,12 @@
             return source.Provider.CreateQuery<TResult>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.GroupBy(source, keySelector, elementSelector, resultSelector, comparer)),
+                    GetMethodInfoOf(() => Queryable.GroupBy(
+                        default(IQueryable<TSource>),
+                        default(Expression<Func<TSource, TKey>>),
+                        default(Expression<Func<TSource, TElement>>),
+                        default(Expression<Func<TKey, IEnumerable<TElement>, TResult>>),
+                        default(IEqualityComparer<TKey>))),
                     new Expression[] { source.Expression, Expression.Quote(keySelector), Expression.Quote(elementSelector), Expression.Quote(resultSelector), Expression.Constant(comparer, typeof(IEqualityComparer<TKey>)) }
                     ));
         }
@@ -609,7 +711,8 @@
             return source.Provider.CreateQuery<TSource>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Distinct(source)),
+                    GetMethodInfoOf(() => Queryable.Distinct(
+                        default(IQueryable<TSource>))),
                     new Expression[] { source.Expression }
                     ));
         }
@@ -621,7 +724,9 @@
             return source.Provider.CreateQuery<TSource>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Distinct(source, comparer)),
+                    GetMethodInfoOf(() => Queryable.Distinct(
+                        default(IQueryable<TSource>),
+                        default(IEqualityComparer<TSource>))),
                     new Expression[] { source.Expression, Expression.Constant(comparer, typeof(IEqualityComparer<TSource>)) }
                     ));
         }
@@ -635,7 +740,9 @@
             return source1.Provider.CreateQuery<TSource>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Concat(source1, source2)),
+                    GetMethodInfoOf(() => Queryable.Concat(
+                        default(IQueryable<TSource>),
+                        default(IQueryable<TSource>))),
                     new Expression[] { source1.Expression, GetSourceExpression(source2) }
                     ));
         }
@@ -651,7 +758,10 @@
             return source1.Provider.CreateQuery<TResult>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Zip(source1, source2, resultSelector)),
+                    GetMethodInfoOf(() => Queryable.Zip(
+                        default(IQueryable<TFirst>),
+                        default(IEnumerable<TSecond>),
+                        default(Expression<Func<TFirst, TSecond, TResult>>))),
                     new Expression[] { source1.Expression, GetSourceExpression(source2), Expression.Quote(resultSelector) }
                     ));
         }
@@ -665,7 +775,9 @@
             return source1.Provider.CreateQuery<TSource>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Union(source1, source2)),
+                    GetMethodInfoOf(() => Queryable.Union(
+                        default(IQueryable<TSource>),
+                        default(IQueryable<TSource>))),
                     new Expression[] { source1.Expression, GetSourceExpression(source2) }
                     ));
         }
@@ -679,7 +791,10 @@
             return source1.Provider.CreateQuery<TSource>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Union(source1, source2, comparer)),
+                    GetMethodInfoOf(() => Queryable.Union(
+                        default(IQueryable<TSource>),
+                        default(IQueryable<TSource>),
+                        default(IEqualityComparer<TSource>))),
                     new Expression[] {
                         source1.Expression,
                         GetSourceExpression(source2),
@@ -697,7 +812,9 @@
             return source1.Provider.CreateQuery<TSource>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Intersect(source1, source2)),
+                    GetMethodInfoOf(() => Queryable.Intersect(
+                        default(IQueryable<TSource>),
+                        default(IQueryable<TSource>))),
                     new Expression[] { source1.Expression, GetSourceExpression(source2) }
                     ));
         }
@@ -711,7 +828,10 @@
             return source1.Provider.CreateQuery<TSource>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Intersect(source1, source2, comparer)),
+                    GetMethodInfoOf(() => Queryable.Intersect(
+                        default(IQueryable<TSource>),
+                        default(IEnumerable<TSource>),
+                        default(IEqualityComparer<TSource>))),
                     new Expression[] {
                         source1.Expression,
                         GetSourceExpression(source2),
@@ -729,7 +849,9 @@
             return source1.Provider.CreateQuery<TSource>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Except(source1, source2)),
+                    GetMethodInfoOf(() => Queryable.Except(
+                        default(IQueryable<TSource>),
+                        default(IEnumerable<TSource>))),
                     new Expression[] { source1.Expression, GetSourceExpression(source2) }
                     ));
         }
@@ -743,7 +865,10 @@
             return source1.Provider.CreateQuery<TSource>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Except(source1, source2, comparer)),
+                    GetMethodInfoOf(() => Queryable.Except(
+                        default(IQueryable<TSource>),
+                        default(IEnumerable<TSource>),
+                        default(IEqualityComparer<TSource>))),
                     new Expression[] {
                         source1.Expression,
                         GetSourceExpression(source2),
@@ -759,7 +884,8 @@
             return source.Provider.Execute<TSource>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.First(source)),
+                    GetMethodInfoOf(() => Queryable.First(
+                        default(IQueryable<TSource>))),
                     new Expression[] { source.Expression }
                     ));
         }
@@ -773,7 +899,9 @@
             return source.Provider.Execute<TSource>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.First(source, predicate)),
+                    GetMethodInfoOf(() => Queryable.First(
+                        default(IQueryable<TSource>),
+                        default(Expression<Func<TSource, bool>>))),
                     new Expression[] { source.Expression, Expression.Quote(predicate) }
                     ));
         }
@@ -785,7 +913,8 @@
             return source.Provider.Execute<TSource>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.FirstOrDefault(source)),
+                    GetMethodInfoOf(() => Queryable.FirstOrDefault(
+                        default(IQueryable<TSource>))),
                     new Expression[] { source.Expression }
                     ));
         }
@@ -799,7 +928,9 @@
             return source.Provider.Execute<TSource>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.FirstOrDefault(source, predicate)),
+                    GetMethodInfoOf(() => Queryable.FirstOrDefault(
+                        default(IQueryable<TSource>),
+                        default(Expression<Func<TSource, bool>>))),
                     new Expression[] { source.Expression, Expression.Quote(predicate) }
                     ));
         }
@@ -811,7 +942,8 @@
             return source.Provider.Execute<TSource>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Last(source)),
+                    GetMethodInfoOf(() => Queryable.Last(
+                        default(IQueryable<TSource>))),
                     new Expression[] { source.Expression }
                     ));
         }
@@ -825,7 +957,9 @@
             return source.Provider.Execute<TSource>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Last(source, predicate)),
+                    GetMethodInfoOf(() => Queryable.Last(
+                        default(IQueryable<TSource>),
+                        default(Expression<Func<TSource, bool>>))),
                     new Expression[] { source.Expression, Expression.Quote(predicate) }
                     ));
         }
@@ -837,7 +971,8 @@
             return source.Provider.Execute<TSource>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.LastOrDefault(source)),
+                    GetMethodInfoOf(() => Queryable.LastOrDefault(
+                        default(IQueryable<TSource>))),
                     new Expression[] { source.Expression }
                     ));
         }
@@ -851,7 +986,9 @@
             return source.Provider.Execute<TSource>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.LastOrDefault(source, predicate)),
+                    GetMethodInfoOf(() => Queryable.LastOrDefault(
+                        default(IQueryable<TSource>),
+                        default(Expression<Func<TSource, bool>>))),
                     new Expression[] { source.Expression, Expression.Quote(predicate) }
                     ));
         }
@@ -863,7 +1000,8 @@
             return source.Provider.Execute<TSource>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Single(source)),
+                    GetMethodInfoOf(() => Queryable.Single(
+                        default(IQueryable<TSource>))),
                     new Expression[] { source.Expression }
                     ));
         }
@@ -877,7 +1015,9 @@
             return source.Provider.Execute<TSource>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Single(source, predicate)),
+                    GetMethodInfoOf(() => Queryable.Single(
+                        default(IQueryable<TSource>),
+                        default(Expression<Func<TSource, bool>>))),
                     new Expression[] { source.Expression, Expression.Quote(predicate) }
                     ));
         }
@@ -889,7 +1029,8 @@
             return source.Provider.Execute<TSource>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.SingleOrDefault(source)),
+                    GetMethodInfoOf(() => Queryable.SingleOrDefault(
+                        default(IQueryable<TSource>))),
                     new Expression[] { source.Expression }
                     ));
         }
@@ -903,7 +1044,9 @@
             return source.Provider.Execute<TSource>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.SingleOrDefault(source, predicate)),
+                    GetMethodInfoOf(() => Queryable.SingleOrDefault(
+                        default(IQueryable<TSource>),
+                        default(Expression<Func<TSource, bool>>))),
                     new Expression[] { source.Expression, Expression.Quote(predicate) }
                     ));
         }
@@ -917,7 +1060,9 @@
             return source.Provider.Execute<TSource>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.ElementAt(source, index)),
+                    GetMethodInfoOf(() => Queryable.ElementAt(
+                        default(IQueryable<TSource>),
+                        default(int))),
                     new Expression[] { source.Expression, Expression.Constant(index) }
                     ));
         }
@@ -929,7 +1074,9 @@
             return source.Provider.Execute<TSource>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.ElementAtOrDefault(source, index)),
+                    GetMethodInfoOf(() => Queryable.ElementAtOrDefault(
+                        default(IQueryable<TSource>),
+                        default(int))),
                     new Expression[] { source.Expression, Expression.Constant(index) }
                     ));
         }
@@ -941,7 +1088,8 @@
             return source.Provider.CreateQuery<TSource>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.DefaultIfEmpty(source)),
+                    GetMethodInfoOf(() => Queryable.DefaultIfEmpty(
+                        default(IQueryable<TSource>))),
                     new Expression[] { source.Expression }
                     ));
         }
@@ -953,7 +1101,9 @@
             return source.Provider.CreateQuery<TSource>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.DefaultIfEmpty(source, defaultValue)),
+                    GetMethodInfoOf(() => Queryable.DefaultIfEmpty(
+                        default(IQueryable<TSource>),
+                        default(TSource))),
                     new Expression[] { source.Expression, Expression.Constant(defaultValue, typeof(TSource)) }
                     ));
         }
@@ -965,7 +1115,9 @@
             return source.Provider.Execute<bool>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Contains(source, item)),
+                    GetMethodInfoOf(() => Queryable.Contains(
+                        default(IQueryable<TSource>),
+                        default(TSource))),
                     new Expression[] { source.Expression, Expression.Constant(item, typeof(TSource)) }
                     ));
         }
@@ -977,7 +1129,10 @@
             return source.Provider.Execute<bool>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Contains(source, item, comparer)),
+                    GetMethodInfoOf(() => Queryable.Contains(
+                        default(IQueryable<TSource>),
+                        default(TSource),
+                        default(IEqualityComparer<TSource>))),
                     new Expression[] { source.Expression, Expression.Constant(item, typeof(TSource)), Expression.Constant(comparer, typeof(IEqualityComparer<TSource>)) }
                     ));
         }
@@ -989,7 +1144,8 @@
             return source.Provider.CreateQuery<TSource>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Reverse(source)),
+                    GetMethodInfoOf(() => Queryable.Reverse(
+                        default(IQueryable<TSource>))),
                     new Expression[] { source.Expression }
                     ));
         }
@@ -1003,7 +1159,9 @@
             return source1.Provider.Execute<bool>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.SequenceEqual(source1, source2)),
+                    GetMethodInfoOf(() => Queryable.SequenceEqual(
+                        default(IQueryable<TSource>),
+                        default(IQueryable<TSource>))),
                     new Expression[] { source1.Expression, GetSourceExpression(source2) }
                     ));
         }
@@ -1017,7 +1175,10 @@
             return source1.Provider.Execute<bool>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.SequenceEqual(source1, source2, comparer)),
+                    GetMethodInfoOf(() => Queryable.SequenceEqual(
+                        default(IQueryable<TSource>),
+                        default(IEnumerable<TSource>),
+                        default(IEqualityComparer<TSource>))),
                     new Expression[] {
                         source1.Expression,
                         GetSourceExpression(source2),
@@ -1033,7 +1194,8 @@
             return source.Provider.Execute<bool>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Any(source)),
+                    GetMethodInfoOf(() => Queryable.Any(
+                        default(IQueryable<TSource>))),
                     new Expression[] { source.Expression }
                     ));
         }
@@ -1047,7 +1209,9 @@
             return source.Provider.Execute<bool>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Any(source, predicate)),
+                    GetMethodInfoOf(() => Queryable.Any(
+                        default(IQueryable<TSource>),
+                        default(Expression<Func<TSource, bool>>))),
                     new Expression[] { source.Expression, Expression.Quote(predicate) }
                     ));
         }
@@ -1061,7 +1225,9 @@
             return source.Provider.Execute<bool>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.All(source, predicate)),
+                    GetMethodInfoOf(() => Queryable.All(
+                        default(IQueryable<TSource>),
+                        default(Expression<Func<TSource, bool>>))),
                     new Expression[] { source.Expression, Expression.Quote(predicate) }
                     ));
         }
@@ -1073,7 +1239,8 @@
             return source.Provider.Execute<int>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Count(source)),
+                    GetMethodInfoOf(() => Queryable.Count(
+                        default(IQueryable<TSource>))),
                     new Expression[] { source.Expression }
                     ));
         }
@@ -1087,7 +1254,9 @@
             return source.Provider.Execute<int>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Count(source, predicate)),
+                    GetMethodInfoOf(() => Queryable.Count(
+                        default(IQueryable<TSource>),
+                        default(Expression<Func<TSource, bool>>))),
                     new Expression[] { source.Expression, Expression.Quote(predicate) }
                     ));
         }
@@ -1099,7 +1268,8 @@
             return source.Provider.Execute<long>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.LongCount(source)),
+                    GetMethodInfoOf(() => Queryable.LongCount(
+                        default(IQueryable<TSource>))),
                     new Expression[] { source.Expression }
                     ));
         }
@@ -1113,7 +1283,9 @@
             return source.Provider.Execute<long>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.LongCount(source, predicate)),
+                    GetMethodInfoOf(() => Queryable.LongCount(
+                        default(IQueryable<TSource>),
+                        default(Expression<Func<TSource, bool>>))),
                     new Expression[] { source.Expression, Expression.Quote(predicate) }
                     ));
         }
@@ -1125,7 +1297,8 @@
             return source.Provider.Execute<TSource>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Min(source)),
+                    GetMethodInfoOf(() => Queryable.Min(
+                        default(IQueryable<TSource>))),
                     new Expression[] { source.Expression }
                     ));
         }
@@ -1139,7 +1312,9 @@
             return source.Provider.Execute<TResult>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Min(source, selector)),
+                    GetMethodInfoOf(() => Queryable.Min(
+                        default(IQueryable<TSource>),
+                        default(Expression<Func<TSource, TResult>>))),
                     new Expression[] { source.Expression, Expression.Quote(selector) }
                     ));
         }
@@ -1151,7 +1326,8 @@
             return source.Provider.Execute<TSource>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Max(source)),
+                    GetMethodInfoOf(() => Queryable.Max(
+                        default(IQueryable<TSource>))),
                     new Expression[] { source.Expression }
                     ));
         }
@@ -1165,7 +1341,9 @@
             return source.Provider.Execute<TResult>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Max(source, selector)),
+                    GetMethodInfoOf(() => Queryable.Max(
+                        default(IQueryable<TSource>),
+                        default(Expression<Func<TSource, TResult>>))),
                     new Expression[] { source.Expression, Expression.Quote(selector) }
                     ));
         }
@@ -1177,7 +1355,8 @@
             return source.Provider.Execute<int>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Sum(source)),
+                    GetMethodInfoOf(() => Queryable.Sum(
+                        default(IQueryable<int>))),
                     new Expression[] { source.Expression }
                     ));
         }
@@ -1189,7 +1368,8 @@
             return source.Provider.Execute<int?>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Sum(source)),
+                    GetMethodInfoOf(() => Queryable.Sum(
+                        default(IQueryable<int?>))),
                     new Expression[] { source.Expression }
                     ));
         }
@@ -1201,7 +1381,8 @@
             return source.Provider.Execute<long>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Sum(source)),
+                    GetMethodInfoOf(() => Queryable.Sum(
+                        default(IQueryable<long>))),
                     new Expression[] { source.Expression }
                     ));
         }
@@ -1213,7 +1394,8 @@
             return source.Provider.Execute<long?>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Sum(source)),
+                    GetMethodInfoOf(() => Queryable.Sum(
+                        default(IQueryable<long?>))),
                     new Expression[] { source.Expression }
                     ));
         }
@@ -1225,7 +1407,8 @@
             return source.Provider.Execute<float>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Sum(source)),
+                    GetMethodInfoOf(() => Queryable.Sum(
+                        default(IQueryable<float>))),
                     new Expression[] { source.Expression }
                     ));
         }
@@ -1237,7 +1420,8 @@
             return source.Provider.Execute<float?>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Sum(source)),
+                    GetMethodInfoOf(() => Queryable.Sum(
+                        default(IQueryable<float?>))),
                     new Expression[] { source.Expression }
                     ));
         }
@@ -1249,7 +1433,8 @@
             return source.Provider.Execute<double>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Sum(source)),
+                    GetMethodInfoOf(() => Queryable.Sum(
+                        default(IQueryable<double>))),
                     new Expression[] { source.Expression }
                     ));
         }
@@ -1261,7 +1446,8 @@
             return source.Provider.Execute<double?>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Sum(source)),
+                    GetMethodInfoOf(() => Queryable.Sum(
+                        default(IQueryable<double?>))),
                     new Expression[] { source.Expression }
                     ));
         }
@@ -1273,7 +1459,8 @@
             return source.Provider.Execute<decimal>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Sum(source)),
+                    GetMethodInfoOf(() => Queryable.Sum(
+                        default(IQueryable<decimal>))),
                     new Expression[] { source.Expression }
                     ));
         }
@@ -1285,7 +1472,8 @@
             return source.Provider.Execute<decimal?>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Sum(source)),
+                    GetMethodInfoOf(() => Queryable.Sum(
+                        default(IQueryable<decimal?>))),
                     new Expression[] { source.Expression }
                     ));
         }
@@ -1299,7 +1487,9 @@
             return source.Provider.Execute<int>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Sum(source, selector)),
+                    GetMethodInfoOf(() => Queryable.Sum(
+                        default(IQueryable<TSource>),
+                        default(Expression<Func<TSource, int>>))),
                     new Expression[] { source.Expression, Expression.Quote(selector) }
                     ));
         }
@@ -1313,7 +1503,9 @@
             return source.Provider.Execute<int?>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Sum(source, selector)),
+                    GetMethodInfoOf(() => Queryable.Sum(
+                        default(IQueryable<TSource>),
+                        default(Expression<Func<TSource, int?>>))),
                     new Expression[] { source.Expression, Expression.Quote(selector) }
                     ));
         }
@@ -1327,7 +1519,9 @@
             return source.Provider.Execute<long>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Sum(source, selector)),
+                    GetMethodInfoOf(() => Queryable.Sum(
+                        default(IQueryable<TSource>),
+                        default(Expression<Func<TSource, long>>))),
                     new Expression[] { source.Expression, Expression.Quote(selector) }
                     ));
         }
@@ -1341,7 +1535,9 @@
             return source.Provider.Execute<long?>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Sum(source, selector)),
+                    GetMethodInfoOf(() => Queryable.Sum(
+                        default(IQueryable<TSource>),
+                        default(Expression<Func<TSource, long?>>))),
                     new Expression[] { source.Expression, Expression.Quote(selector) }
                     ));
         }
@@ -1355,7 +1551,9 @@
             return source.Provider.Execute<float>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Sum(source, selector)),
+                    GetMethodInfoOf(() => Queryable.Sum(
+                        default(IQueryable<TSource>),
+                        default(Expression<Func<TSource, float>>))),
                     new Expression[] { source.Expression, Expression.Quote(selector) }
                     ));
         }
@@ -1369,7 +1567,9 @@
             return source.Provider.Execute<float?>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Sum(source, selector)),
+                    GetMethodInfoOf(() => Queryable.Sum(
+                        default(IQueryable<TSource>),
+                        default(Expression<Func<TSource, float?>>))),
                     new Expression[] { source.Expression, Expression.Quote(selector) }
                     ));
         }
@@ -1383,7 +1583,9 @@
             return source.Provider.Execute<double>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Sum(source, selector)),
+                    GetMethodInfoOf(() => Queryable.Sum(
+                        default(IQueryable<TSource>),
+                        default(Expression<Func<TSource, double>>))),
                     new Expression[] { source.Expression, Expression.Quote(selector) }
                     ));
         }
@@ -1397,7 +1599,9 @@
             return source.Provider.Execute<double?>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Sum(source, selector)),
+                    GetMethodInfoOf(() => Queryable.Sum(
+                        default(IQueryable<TSource>),
+                        default(Expression<Func<TSource, double?>>))),
                     new Expression[] { source.Expression, Expression.Quote(selector) }
                     ));
         }
@@ -1411,7 +1615,9 @@
             return source.Provider.Execute<decimal>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Sum(source, selector)),
+                    GetMethodInfoOf(() => Queryable.Sum(
+                        default(IQueryable<TSource>),
+                        default(Expression<Func<TSource, decimal>>))),
                     new Expression[] { source.Expression, Expression.Quote(selector) }
                     ));
         }
@@ -1425,7 +1631,9 @@
             return source.Provider.Execute<decimal?>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Sum(source, selector)),
+                    GetMethodInfoOf(() => Queryable.Sum(
+                        default(IQueryable<TSource>),
+                        default(Expression<Func<TSource, decimal?>>))),
                     new Expression[] { source.Expression, Expression.Quote(selector) }
                     ));
         }
@@ -1437,7 +1645,8 @@
             return source.Provider.Execute<double>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Average(source)),
+                    GetMethodInfoOf(() => Queryable.Average(
+                        default(IQueryable<int>))),
                     new Expression[] { source.Expression }
                     ));
         }
@@ -1449,7 +1658,8 @@
             return source.Provider.Execute<double?>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Average(source)),
+                    GetMethodInfoOf(() => Queryable.Average(
+                        default(IQueryable<int?>))),
                     new Expression[] { source.Expression }
                     ));
         }
@@ -1461,7 +1671,8 @@
             return source.Provider.Execute<double>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Average(source)),
+                    GetMethodInfoOf(() => Queryable.Average(
+                        default(IQueryable<long>))),
                     new Expression[] { source.Expression }
                     ));
         }
@@ -1473,7 +1684,8 @@
             return source.Provider.Execute<double?>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Average(source)),
+                    GetMethodInfoOf(() => Queryable.Average(
+                        default(IQueryable<long?>))),
                     new Expression[] { source.Expression }
                     ));
         }
@@ -1485,7 +1697,8 @@
             return source.Provider.Execute<float>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Average(source)),
+                    GetMethodInfoOf(() => Queryable.Average(
+                        default(IQueryable<float>))),
                     new Expression[] { source.Expression }
                     ));
         }
@@ -1497,7 +1710,8 @@
             return source.Provider.Execute<float?>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Average(source)),
+                    GetMethodInfoOf(() => Queryable.Average(
+                        default(IQueryable<float?>))),
                     new Expression[] { source.Expression }
                     ));
         }
@@ -1509,7 +1723,8 @@
             return source.Provider.Execute<double>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Average(source)),
+                    GetMethodInfoOf(() => Queryable.Average(
+                        default(IQueryable<double>))),
                     new Expression[] { source.Expression }
                     ));
         }
@@ -1521,7 +1736,8 @@
             return source.Provider.Execute<double?>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Average(source)),
+                    GetMethodInfoOf(() => Queryable.Average(
+                        default(IQueryable<double?>))),
                     new Expression[] { source.Expression }
                     ));
         }
@@ -1533,7 +1749,8 @@
             return source.Provider.Execute<decimal>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Average(source)),
+                    GetMethodInfoOf(() => Queryable.Average(
+                        default(IQueryable<decimal>))),
                     new Expression[] { source.Expression }
                     ));
         }
@@ -1545,7 +1762,8 @@
             return source.Provider.Execute<decimal?>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Average(source)),
+                    GetMethodInfoOf(() => Queryable.Average(
+                        default(IQueryable<decimal?>))),
                     new Expression[] { source.Expression }
                     ));
         }
@@ -1559,7 +1777,9 @@
             return source.Provider.Execute<double>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Average(source, selector)),
+                    GetMethodInfoOf(() => Queryable.Average(
+                        default(IQueryable<TSource>),
+                        default(Expression<Func<TSource, int>>))),
                     new Expression[] { source.Expression, Expression.Quote(selector) }
                     ));
         }
@@ -1573,7 +1793,9 @@
             return source.Provider.Execute<double?>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Average(source, selector)),
+                    GetMethodInfoOf(() => Queryable.Average(
+                        default(IQueryable<TSource>),
+                        default(Expression<Func<TSource, int?>>))),
                     new Expression[] { source.Expression, Expression.Quote(selector) }
                     ));
         }
@@ -1587,7 +1809,9 @@
             return source.Provider.Execute<float>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Average(source, selector)),
+                    GetMethodInfoOf(() => Queryable.Average(
+                        default(IQueryable<TSource>),
+                        default(Expression<Func<TSource, float>>))),
                     new Expression[] { source.Expression, Expression.Quote(selector) }
                     ));
         }
@@ -1601,7 +1825,9 @@
             return source.Provider.Execute<float?>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Average(source, selector)),
+                    GetMethodInfoOf(() => Queryable.Average(
+                        default(IQueryable<TSource>),
+                        default(Expression<Func<TSource, float?>>))),
                     new Expression[] { source.Expression, Expression.Quote(selector) }
                     ));
         }
@@ -1615,7 +1841,9 @@
             return source.Provider.Execute<double>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Average(source, selector)),
+                    GetMethodInfoOf(() => Queryable.Average(
+                        default(IQueryable<TSource>),
+                        default(Expression<Func<TSource, long>>))),
                     new Expression[] { source.Expression, Expression.Quote(selector) }
                     ));
         }
@@ -1629,7 +1857,9 @@
             return source.Provider.Execute<double?>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Average(source, selector)),
+                    GetMethodInfoOf(() => Queryable.Average(
+                        default(IQueryable<TSource>),
+                        default(Expression<Func<TSource, long?>>))),
                     new Expression[] { source.Expression, Expression.Quote(selector) }
                     ));
         }
@@ -1643,7 +1873,9 @@
             return source.Provider.Execute<double>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Average(source, selector)),
+                    GetMethodInfoOf(() => Queryable.Average(
+                        default(IQueryable<TSource>),
+                        default(Expression<Func<TSource, double>>))),
                     new Expression[] { source.Expression, Expression.Quote(selector) }
                     ));
         }
@@ -1657,7 +1889,9 @@
             return source.Provider.Execute<double?>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Average(source, selector)),
+                    GetMethodInfoOf(() => Queryable.Average(
+                        default(IQueryable<TSource>),
+                        default(Expression<Func<TSource, double?>>))),
                     new Expression[] { source.Expression, Expression.Quote(selector) }
                     ));
         }
@@ -1671,7 +1905,9 @@
             return source.Provider.Execute<decimal>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Average(source, selector)),
+                    GetMethodInfoOf(() => Queryable.Average(
+                        default(IQueryable<TSource>),
+                        default(Expression<Func<TSource, decimal>>))),
                     new Expression[] { source.Expression, Expression.Quote(selector) }
                     ));
         }
@@ -1685,7 +1921,9 @@
             return source.Provider.Execute<decimal?>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Average(source, selector)),
+                    GetMethodInfoOf(() => Queryable.Average(
+                        default(IQueryable<TSource>),
+                        default(Expression<Func<TSource, decimal?>>))),
                     new Expression[] { source.Expression, Expression.Quote(selector) }
                     ));
         }
@@ -1699,7 +1937,9 @@
             return source.Provider.Execute<TSource>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Aggregate(source, func)),
+                    GetMethodInfoOf(() => Queryable.Aggregate(
+                        default(IQueryable<TSource>),
+                        default(Expression<Func<TSource, TSource, TSource>>))),
                     new Expression[] { source.Expression, Expression.Quote(func) }
                     ));
         }
@@ -1713,7 +1953,10 @@
             return source.Provider.Execute<TAccumulate>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Aggregate(source, seed, func)),
+                    GetMethodInfoOf(() => Queryable.Aggregate(
+                        default(IQueryable<TSource>),
+                        default(TAccumulate),
+                        default(Expression<Func<TAccumulate, TSource, TAccumulate>>))),
                     new Expression[] { source.Expression, Expression.Constant(seed), Expression.Quote(func) }
                     ));
         }
@@ -1729,7 +1972,11 @@
             return source.Provider.Execute<TResult>(
                 Expression.Call(
                     null,
-                    GetMethodInfoOf(() => Queryable.Aggregate(source, seed, func, selector)),
+                    GetMethodInfoOf(() => Queryable.Aggregate(
+                        default(IQueryable<TSource>),
+                        default(TAccumulate),
+                        default(Expression<Func<TAccumulate, TSource, TAccumulate>>),
+                        default(Expression<Func<TAccumulate, TResult>>))),
                     new Expression[] { source.Expression, Expression.Constant(seed), Expression.Quote(func), Expression.Quote(selector) }
                     ));
         }


rest methods are replaced to RESTController


player win if score inferior of 21

player win if score inferior of 21


Turned off Debug DirectX mode in Release build

--- Brofiler/DirectX/DirectXCanvas.xaml.cs
+++ Brofiler/DirectX/DirectXCanvas.xaml.cs
@@ -154,7 +154,13 @@
             SharpDX.Direct3D11.Device device;
             SwapChain swapChain;

-            SharpDX.Direct3D11.Device.CreateWithSwapChain(DriverType.Hardware, DeviceCreationFlags.Debug, SwapChainDesc, out device, out swapChain);
+            DeviceCreationFlags flags = DeviceCreationFlags.None;
+
+        #if DEBUG
+            flags |= DeviceCreationFlags.Debug;
+        #endif
+
+            SharpDX.Direct3D11.Device.CreateWithSwapChain(DriverType.Hardware, flags, SwapChainDesc, out device, out swapChain);

             SwapChain = swapChain;
             RenderDevice = device;


AuditNotificationsHandler updated to use IOptionsMonitor

--- src/Umbraco.Core/Handlers/AuditNotificationsHandler.cs
+++ src/Umbraco.Core/Handlers/AuditNotificationsHandler.cs
@@ -30,7 +30,7 @@
         private readonly IEntityService _entityService;
         private readonly IIpResolver _ipResolver;
         private readonly IBackOfficeSecurityAccessor _backOfficeSecurityAccessor;
-        private readonly GlobalSettings _globalSettings;
+        private GlobalSettings _globalSettings;
         private readonly IMemberService _memberService;

         public AuditNotificationsHandler(
@@ -38,7 +38,7 @@
             IUserService userService,
             IEntityService entityService,
             IIpResolver ipResolver,
-            IOptions<GlobalSettings> globalSettings,
+            IOptionsMonitor<GlobalSettings> globalSettings,
             IBackOfficeSecurityAccessor backOfficeSecurityAccessor,
             IMemberService memberService)
         {
@@ -48,7 +48,8 @@
             _ipResolver = ipResolver;
             _backOfficeSecurityAccessor = backOfficeSecurityAccessor;
             _memberService = memberService;
-            _globalSettings = globalSettings.Value;
+            _globalSettings = globalSettings.CurrentValue;
+            globalSettings.OnChange(x => _globalSettings = x);
         }

         private IUser CurrentPerformingUser


Updated total marks scored.

Updated total marks scored.

--- Trappist/src/Promact.Trappist.Repository/TestConduct/TestConductRepository.cs
+++ Trappist/src/Promact.Trappist.Repository/TestConduct/TestConductRepository.cs
@@ -338,9 +338,11 @@

             var report = new Report()
             {
+                TestAttendeeId = testAttendeeId,
                 TotalMarksScored = (double)marks
             };
-            await _dbContext.Report.AddAsync(report);
+            _dbContext.Report.Update(report);
+            await _dbContext.SaveChangesAsync();
         }
         #endregion
     }


U4-10794 - revert PEtaPocoMapper changes

--- src/Umbraco.Core/Persistence/Mappers/PetaPocoMapper.cs
+++ src/Umbraco.Core/Persistence/Mappers/PetaPocoMapper.cs
@@ -20,12 +20,6 @@

         public Func<object, object> GetFromDbConverter(PropertyInfo pi, Type sourceType)
         {
-            // Udi is handled as string
-            if (typeof(Udi).IsAssignableFrom(pi.PropertyType) && sourceType == typeof(string))
-                return value => value is string stringValue
-                    ? (string.IsNullOrWhiteSpace(stringValue) ? null : Udi.Parse(stringValue))
-                    : null;
-
             return null;
         }

@@ -45,11 +39,7 @@
                 };
             }

-            // Udi is handled as string
-            if (typeof(Udi).IsAssignableFrom(sourceType))
-                return value => value?.ToString();
-
             return null;
         }
     }
-}
+}


serialization: strings in dictionaries

serialization: strings in dictionaries

--- Unity/Assets/GameFramework/Services/SerializerService/FlatbufferSerializer.cs
+++ Unity/Assets/GameFramework/Services/SerializerService/FlatbufferSerializer.cs
@@ -117,9 +117,15 @@
             else if (typeof(TKey).IsPrimitive && !typeof(TValue).IsPrimitive) {
                 for (int i = 0; i < amount; i++) {
                     var dictElem = dict.ElementAt(i);
-                    var valueElemOffset = FlatbufferSerializer.GetOrCreateSerialize(builder, (IFBSerializable)dictElem.Value);
-                    var offset = (FBValue)Activator.CreateInstance(typeof(FBValue), valueElemOffset);
-                    tempArray[i] = fbCreateElement(builder, (FBKey)((object)dictElem.Key), offset);
+
+                    FBValue valueElemOffset;
+                    if (typeof(TValue) == typeof(string)) {
+                        valueElemOffset = (FBValue)(object)builder.CreateString((string)(object)dictElem.Value);
+                    } else {
+                        var offset = FlatbufferSerializer.GetOrCreateSerialize(builder, (IFBSerializable)dictElem.Value);
+                        valueElemOffset = (FBValue)Activator.CreateInstance(typeof(FBValue), offset);
+                    }
+                    tempArray[i] = fbCreateElement(builder, (FBKey)((object)dictElem.Key), valueElemOffset);
                 }
                 var result = fbCreateList(builder, tempArray);
                 PutInSerializeCache(dict, result.Value);
@@ -129,8 +135,13 @@
                 for (int i = 0; i < amount; i++) {
                     var dictElem = dict.ElementAt(i);

-                    var keyElemOffset = FlatbufferSerializer.GetOrCreateSerialize(builder, (IFBSerializable)dictElem.Key);
-                    var offsetKey = (FBKey)Activator.CreateInstance(typeof(FBKey), keyElemOffset);
+                    FBKey offsetKey;
+                    if (typeof(TKey) == typeof(string)) {
+                        offsetKey = (FBKey)(object)builder.CreateString((string)(object)dictElem.Key);
+                    }else {
+                        var keyElemOffset = FlatbufferSerializer.GetOrCreateSerialize(builder, (IFBSerializable)dictElem.Key);
+                        offsetKey = (FBKey)Activator.CreateInstance(typeof(FBKey), keyElemOffset);
+                    }

                     tempArray[i] = fbCreateElement(builder, offsetKey, (FBValue)((object)dictElem.Value));
                 }
@@ -142,12 +153,24 @@
                 for (int i = 0; i < amount; i++) {
                     var dictElem = dict.ElementAt(i);

-                    var keyElemOffset = FlatbufferSerializer.GetOrCreateSerialize(builder, (IFBSerializable)dictElem.Key);
-                    var offsetKey = (FBKey)Activator.CreateInstance(typeof(FBKey), keyElemOffset);
-
-                    var valueElemOffset = FlatbufferSerializer.GetOrCreateSerialize(builder, (IFBSerializable)dictElem.Value);
-                    var valueOffset = (FBValue)Activator.CreateInstance(typeof(FBValue), valueElemOffset);
-                    tempArray[i] = fbCreateElement(builder, offsetKey, valueOffset);
+
+
+                    FBKey offsetKey;
+                    if (typeof(TKey) == typeof(string)) {
+                        offsetKey = (FBKey)(object)builder.CreateString((string)(object)dictElem.Key);
+                    } else {
+                        var keyElemOffset = FlatbufferSerializer.GetOrCreateSerialize(builder, (IFBSerializable)dictElem.Key);
+                        offsetKey = (FBKey)Activator.CreateInstance(typeof(FBKey), keyElemOffset);
+                    }
+
+                    FBValue valueElemOffset;
+                    if (typeof(TValue) == typeof(string)) {
+                        valueElemOffset = (FBValue)(object)builder.CreateString((string)(object)dictElem.Key);
+                    } else {
+                        var offset = FlatbufferSerializer.GetOrCreateSerialize(builder, (IFBSerializable)dictElem.Value);
+                        valueElemOffset = (FBValue)Activator.CreateInstance(typeof(FBValue), offset);
+                    }
+                    tempArray[i] = fbCreateElement(builder, offsetKey, valueElemOffset);
                 }
                 var result = fbCreateList(builder, tempArray);
                 PutInSerializeCache(dict, result.Value);


Do not login after install. This currently leads to issues due to the restart.

--- src/Umbraco.Web.Common/Install/InstallApiController.cs
+++ src/Umbraco.Web.Common/Install/InstallApiController.cs
@@ -30,21 +30,19 @@
         private readonly DatabaseBuilder _databaseBuilder;
         private readonly InstallStatusTracker _installStatusTracker;
         private readonly IUmbracoApplicationLifetime _umbracoApplicationLifetime;
-        private readonly BackOfficeSignInManager _backOfficeSignInManager;
         private readonly InstallStepCollection _installSteps;
         private readonly ILogger _logger;
         private readonly IProfilingLogger _proflog;

         public InstallApiController(DatabaseBuilder databaseBuilder, IProfilingLogger proflog,
             InstallHelper installHelper, InstallStepCollection installSteps, InstallStatusTracker installStatusTracker,
-            IUmbracoApplicationLifetime umbracoApplicationLifetime, BackOfficeSignInManager backOfficeSignInManager)
+            IUmbracoApplicationLifetime umbracoApplicationLifetime)
         {
             _databaseBuilder = databaseBuilder ?? throw new ArgumentNullException(nameof(databaseBuilder));
             _proflog = proflog ?? throw new ArgumentNullException(nameof(proflog));
             _installSteps = installSteps;
             _installStatusTracker = installStatusTracker;
             _umbracoApplicationLifetime = umbracoApplicationLifetime;
-            _backOfficeSignInManager = backOfficeSignInManager;
             InstallHelper = installHelper;
             _logger = _proflog;
         }
@@ -90,14 +88,6 @@
         [HttpPost]
         public async Task<ActionResult> CompleteInstall()
         {
-            // log the super user in if it's a new install
-            var installType = InstallHelper.GetInstallationType();
-            if (installType == InstallationType.NewInstall)
-            {
-                var user = await _backOfficeSignInManager.UserManager.FindByIdAsync(Constants.Security.SuperUserId.ToString());
-                await _backOfficeSignInManager.SignInAsync(user, false);
-            }
-
             _umbracoApplicationLifetime.Restart();
             return NoContent();
         }


Fixed build warning. Removed use of obsolete NUnit assert

--- src/UnityAutoMoq.Tests/UnityAutoMoqContainerFixture.cs
+++ src/UnityAutoMoq.Tests/UnityAutoMoqContainerFixture.cs
@@ -116,7 +116,7 @@
         {
             var service = container.Resolve<LazyService>();

-            Assert.That(service.ServiceFunc(), Is.InstanceOfType(typeof(IService)));
+            Assert.That(service.ServiceFunc(), Is.InstanceOf(typeof(IService)));
         }
     }
 }


no message

no message

--- src/Views/WatchThis.Cocoa/SlideshowWindowController.cs
+++ src/Views/WatchThis.Cocoa/SlideshowWindowController.cs
@@ -450,4 +450,3 @@
 			IntPtr id);		// IOPMAssertionID *AssertionID
 	}
 }
-


Control+k+d one non-standard-compliant file.

--HG--
branch : 1.1

--- src/VsConsole/PowerShellHost/MyHostRawUserInterface.cs
+++ src/VsConsole/PowerShellHost/MyHostRawUserInterface.cs
@@ -1,156 +1,120 @@
 using System;
 using System.Management.Automation.Host;

-namespace NuGetConsole.Host.PowerShell.Implementation
-{
-    class MyHostRawUserInterface : PSHostRawUserInterface
-    {
+namespace NuGetConsole.Host.PowerShell.Implementation {
+    class MyHostRawUserInterface : PSHostRawUserInterface {
         IConsole Console { get; set; }

-        public MyHostRawUserInterface(IConsole console)
-        {
+        public MyHostRawUserInterface(IConsole console) {
             this.Console = console;
         }

-        public override ConsoleColor BackgroundColor
-        {
-            get
-            {
+        public override ConsoleColor BackgroundColor {
+            get {
                 // default color controlled by Visual Studio
                 return MyHostUI.NoColor;
             }
-            set
-            {
+            set {
             }
         }

-        public override Size BufferSize
-        {
-            get
-            {
+        public override Size BufferSize {
+            get {
                 return new Size(Console.ConsoleWidth, 0);
             }
-            set
-            {
+            set {
                 throw new NotImplementedException();
             }
         }

-        public override Coordinates CursorPosition
-        {
-            get
-            {
+        public override Coordinates CursorPosition {
+            get {
                 throw new NotImplementedException();
             }
-            set
-            {
+            set {
                 throw new NotImplementedException();
             }
         }

-        public override int CursorSize
-        {
-            get
-            {
+        public override int CursorSize {
+            get {
                 throw new NotImplementedException();
             }
-            set
-            {
+            set {
                 throw new NotImplementedException();
             }
         }

-        public override void FlushInputBuffer()
-        {
+        public override void FlushInputBuffer() {
             throw new NotImplementedException();
         }

-        public override ConsoleColor ForegroundColor
-        {
-            get
-            {
+        public override ConsoleColor ForegroundColor {
+            get {
                 // default color controlled by Visual Studio
                 return MyHostUI.NoColor;
             }
-            set
-            {
+            set {
             }
         }

-        public override BufferCell[,] GetBufferContents(Rectangle rectangle)
-        {
+        public override BufferCell[,] GetBufferContents(Rectangle rectangle) {
             throw new NotImplementedException();
         }

-        public override bool KeyAvailable
-        {
+        public override bool KeyAvailable {
             get { throw new NotImplementedException(); }
         }

-        public override Size MaxPhysicalWindowSize
-        {
+        public override Size MaxPhysicalWindowSize {
             get { throw new NotImplementedException(); }
         }

-        public override Size MaxWindowSize
-        {
+        public override Size MaxWindowSize {
             get { throw new NotImplementedException(); }
         }

-        public override KeyInfo ReadKey(ReadKeyOptions options)
-        {
+        public override KeyInfo ReadKey(ReadKeyOptions options) {
             throw new NotImplementedException();
         }

-        public override void ScrollBufferContents(Rectangle source, Coordinates destination, Rectangle clip, BufferCell fill)
-        {
+        public override void ScrollBufferContents(Rectangle source, Coordinates destination, Rectangle clip, BufferCell fill) {
             throw new NotImplementedException();
         }

-        public override void SetBufferContents(Rectangle rectangle, BufferCell fill)
-        {
+        public override void SetBufferContents(Rectangle rectangle, BufferCell fill) {
             throw new NotImplementedException();
         }

-        public override void SetBufferContents(Coordinates origin, BufferCell[,] contents)
-        {
+        public override void SetBufferContents(Coordinates origin, BufferCell[,] contents) {
             throw new NotImplementedException();
         }

-        public override Coordinates WindowPosition
-        {
-            get
-            {
+        public override Coordinates WindowPosition {
+            get {
                 throw new NotImplementedException();
             }
-            set
-            {
+            set {
                 throw new NotImplementedException();
             }
         }

-        public override Size WindowSize
-        {
-            get
-            {
+        public override Size WindowSize {
+            get {
                 return new Size(Console.ConsoleWidth, 0);
             }
-            set
-            {
+            set {
                 throw new NotImplementedException();
             }
         }

-        public override string WindowTitle
-        {
-            get
-            {
+        public override string WindowTitle {
+            get {
                 throw new NotImplementedException();
             }
-            set
-            {
+            set {
                 throw new NotImplementedException();
             }
         }
     }
-}
+}


Fix tabs/spaces.

Fix tabs/spaces.

--- src/WebApiContrib.IoC.CastleWindsor/WindsorResolver.cs
+++ src/WebApiContrib.IoC.CastleWindsor/WindsorResolver.cs
@@ -6,8 +6,8 @@

 namespace WebApiContrib.IoC.CastleWindsor
 {
-	public class WindsorDependencyScope : IDependencyScope
-	{
+    public class WindsorDependencyScope : IDependencyScope
+    {
         private IWindsorContainer container;

         public WindsorDependencyScope(IWindsorContainer container)
@@ -18,8 +18,8 @@

         public object GetService(Type serviceType)
         {
-			if (container == null)
-				throw new ObjectDisposedException("this", "This scope has already been disposed.");
+            if (container == null)
+                throw new ObjectDisposedException("this", "This scope has already been disposed.");

             if (!container.Kernel.HasComponent(serviceType))
                 return null;
@@ -29,8 +29,8 @@

         public IEnumerable<object> GetServices(Type serviceType)
         {
-			if (container == null)
-				throw new ObjectDisposedException("this", "This scope has already been disposed.");
+            if (container == null)
+                throw new ObjectDisposedException("this", "This scope has already been disposed.");

             if (!container.Kernel.HasComponent(serviceType))
                 return Enumerable.Empty<object>();
@@ -38,31 +38,31 @@
             return container.ResolveAll(serviceType).Cast<object>();
         }

-		public void Dispose()
-		{
-			container.Dispose();
-			container = null;
-		}
-	}
+        public void Dispose()
+        {
+            container.Dispose();
+            container = null;
+        }
+    }

     public class WindsorResolver : WindsorDependencyScope, IDependencyResolver
     {
         private readonly IWindsorContainer container;

         public WindsorResolver(IWindsorContainer container)
-			: base(container)
+            : base(container)
         {
             if (container == null)
-				throw new ArgumentNullException("container");
+                throw new ArgumentNullException("container");

             this.container = container;
         }

-    	public IDependencyScope BeginScope()
-    	{
-    		var scope = new WindsorContainer();
-			container.AddChildContainer(container);
-			return new WindsorDependencyScope(scope);
-    	}
+        public IDependencyScope BeginScope()
+        {
+            var scope = new WindsorContainer();
+            container.AddChildContainer(container);
+            return new WindsorDependencyScope(scope);
+        }
     }
 }


The about dialog will be shown once simultaneously

--- redshift-tray/TrayIcon.cs
+++ redshift-tray/TrayIcon.cs
@@ -155,8 +155,16 @@

     private void menuItemAbout_Click(object sender, RoutedEventArgs e)
     {
-      About aboutDialog = new About();
-      aboutDialog.ShowDialog();
+      About aboutDialog;
+      if(Common.WindowExists<About>(out aboutDialog))
+      {
+        aboutDialog.Focus();
+      }
+      else
+      {
+        aboutDialog = new About();
+        aboutDialog.ShowDialog();
+      }
     }

     private void menuItemExit_Click(object sender, RoutedEventArgs e)


fixed quest saving error when backend is not available

--- Frontend/GaMR/Assets/Scripts/Gamification/GamificationManager.cs
+++ Frontend/GaMR/Assets/Scripts/Gamification/GamificationManager.cs
@@ -59,6 +59,9 @@

     public void CommitQuest()
     {
-        GamificationFramework.Instance.UpdateQuest(gameId, Quest);
+        if (Quest != null)
+        {
+            GamificationFramework.Instance.UpdateQuest(gameId, Quest);
+        }
     }
 }


auto missing

auto missing

--- GPConnect.Provider.AcceptanceTests/PractitionerSearch.feature.cs
+++ GPConnect.Provider.AcceptanceTests/PractitionerSearch.feature.cs
@@ -617,19 +617,47 @@
         }

         [NUnit.Framework.TestAttribute()]
+        [NUnit.Framework.DescriptionAttribute("Practitioner search include count and sort parameters")]
+        public virtual void PractitionerSearchIncludeCountAndSortParameters()
+        {
+            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Practitioner search include count and sort parameters", ((string[])(null)));
+#line 234
+this.ScenarioSetup(scenarioInfo);
+#line 235
+ testRunner.Given("I configure the default \"PractitionerSearch\" request", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Given ");
+#line 236
+  testRunner.And("I add a Practitioner Identifier parameter with SDS User Id System and Value \"prac" +
+                    "titioner1\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+#line 237
+  testRunner.And("I add the parameter \"_count\" with the value \"1\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+#line 238
+  testRunner.And("I add the parameter \"_sort\" with the value \"status\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+#line 239
+ testRunner.When("I make the \"PractitionerSearch\" request", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+#line 240
+ testRunner.Then("the response status code should indicate success", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+#line 241
+  testRunner.And("the response bundle should contain \"1\" entries", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+#line 242
+  testRunner.And("the response should be a Bundle resource of type \"searchset\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+#line hidden
+            this.ScenarioCleanup();
+        }
+
+        [NUnit.Framework.TestAttribute()]
         [NUnit.Framework.DescriptionAttribute("Conformance profile supports the Practitioner search operation")]
         public virtual void ConformanceProfileSupportsThePractitionerSearchOperation()
         {
             TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Conformance profile supports the Practitioner search operation", ((string[])(null)));
-#line 234
-this.ScenarioSetup(scenarioInfo);
-#line 235
+#line 244
+this.ScenarioSetup(scenarioInfo);
+#line 245
  testRunner.Given("I configure the default \"MetadataRead\" request", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Given ");
-#line 236
+#line 246
  testRunner.When("I make the \"MetadataRead\" request", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
-#line 237
- testRunner.Then("the response status code should indicate success", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
-#line 238
+#line 247
+ testRunner.Then("the response status code should indicate success", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+#line 248
   testRunner.And("the Conformance REST Resources should contain the \"Practitioner\" Resource with th" +
                     "e \"SearchType\" Interaction", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
 #line hidden


Fixup Add root/node object model

Fixup Add root/node object model

--- Agiil.Domain/TicketSearch/NodeDecorator.cs
+++ Agiil.Domain/TicketSearch/NodeDecorator.cs
@@ -6,6 +6,8 @@
   public abstract class NodeDecorator : ISearchNode, IHasReplacableParent
   {
     readonly IHasReplacableParent decoratedNode;
+
+    public virtual ISearchNode DecoratedNode => decoratedNode;

     public virtual IHasChildNodes Parent => decoratedNode.Parent;


Changes generated by 14ded4af56207a8dc41677f03ee1e35415c763a4


Add throw if string empty

Add throw if string empty

--- source/Cosmos.Core/CPU.cs
+++ source/Cosmos.Core/CPU.cs
@@ -296,9 +296,15 @@
                     }
                     rs += (char)s[i];
                 }
-                return rs;
+
+                if (!(rs == ""))
+                {
+                    return rs;
+                } else
+                {
+                    throw new NotSupportedException();
+                }
             }
-
             throw new NotSupportedException();
         }


Fix #822 - Parse with CultureInvariant

Fix #822 - Parse with CultureInvariant

--- Assets/Fungus/Scripts/Components/Writer.cs
+++ Assets/Fungus/Scripts/Components/Writer.cs
@@ -8,6 +8,7 @@
 using System.Linq;
 using System.Reflection;
 using System.Text;
+using System.Globalization;

 namespace Fungus
 {
@@ -245,9 +246,9 @@
         protected virtual bool TryGetSingleParam(List<string> paramList, int index, float defaultValue, out float value)
         {
             value = defaultValue;
-            if (paramList.Count > index)
-            {
-                float.TryParse(paramList[index], out value);
+            if (paramList.Count > index)
+            {
+                float.TryParse(paramList[index], NumberStyles.Any, CultureInfo.InvariantCulture, out value);
                 return true;
             }
             return false;
@@ -723,7 +724,7 @@
             }

             float duration = 1f;
-            if (!float.TryParse(param, out duration))
+            if (!float.TryParse(param, NumberStyles.Any, CultureInfo.InvariantCulture, out duration))
             {
                 duration = 1f;
             }


fixed material tag recognition when names have dashes

--- Assets/MapGen/MaterialStore/MaterialTag.cs
+++ Assets/MapGen/MaterialStore/MaterialTag.cs
@@ -78,15 +78,25 @@
                         return false;
                     }
                 }
-                if (values.Length > 1)
-                {
-                    if (values[1] != "_")
-                        result.tag1 = values[1];
-                }
-                if (values.Length > 2)
-                {
-                    if (values[2] != "_")
-                        result.tag2 = values[2];
+                if (value.Length == 4)
+                {
+                    string tag1 = values[1] + "-" + values[2];
+                        result.tag1 = tag1;
+                    if (values[3] != "_")
+                        result.tag2 = values[3];
+                }
+                else
+                {
+                    if (values.Length > 1)
+                    {
+                        if (values[1] != "_")
+                            result.tag1 = values[1];
+                    }
+                    if (values.Length > 2)
+                    {
+                        if (values[2] != "_")
+                            result.tag2 = values[2];
+                    }
                 }
                 return true;
             }


fix allocID return wrong value on finding cached ud

--- Assets/Plugins/Slua_Managed/ObjectCache.cs
+++ Assets/Plugins/Slua_Managed/ObjectCache.cs
@@ -329,7 +329,7 @@
 			if (found)
 			{
 				if (LuaDLL.luaS_getcacheud(l, index, udCacheRef) == 1)
-					return index;
+					return -1;
 			}

 			index = add(o);


log score

log score

--- Assets/Scenes/InGame/Scripts/GamePlayer.cs
+++ Assets/Scenes/InGame/Scripts/GamePlayer.cs
@@ -21,9 +21,9 @@
 	public Button StopButton;
 	public Text StopButtonText;

-	public long ScoreCounter;
+	public int ScoreCounter;
 	public int ComboCounter;
-	public long ScoreNow;
+	public int ScoreNow;
 	public int PerfectCount;
 	public int GoodCount;
 	public int BadCount;
@@ -31,8 +31,10 @@
 	public bool pause;	// status of music
 	public bool stop;	// status of music
 	public bool[] trackbusy = {false, false, false, false};
-
+
 	bool loadFail;
+	bool gameover;
+	float gameoverTimer;
 	AudioSource music;
 	MovieTexture mov;
 	NoteGenerator NGDL;
@@ -193,7 +195,7 @@
 		music.Play ();
 		if (enableBG)
 			mov.Play ();
-		pause = stop = false;
+		pause = stop = gameover = false;
 		ScoreCounter = ComboCounter = PerfectCount = GoodCount = BadCount = MissCount = 0;
 		ScoreNow = 0;
 		ScoreText.text = "Score: " + ScoreCounter.ToString ();
@@ -219,8 +221,25 @@
 			ScoreText.text = "Score: " + ScoreNow.ToString ();
 		}

-		if (HitObjects.Count <= i)
-			return;
+		if (HitObjects.Count <= i) {
+			if (!gameover) {
+				gameover = true;
+				gameoverTimer = 5f;
+				PlayerPrefs.SetInt("ScoreCount", ScoreCounter);
+				PlayerPrefs.SetInt("ComboCount", ComboCounter);
+				PlayerPrefs.SetInt("PerfectCount", PerfectCount);
+				PlayerPrefs.SetInt("GoodCount", GoodCount);
+				PlayerPrefs.SetInt("BadCount", BadCount);
+				PlayerPrefs.SetInt("MissCount", MissCount);
+			}
+
+			gameoverTimer -= Time.deltaTime;
+			music.volume -= Time.deltaTime / 5f;
+
+			if (gameoverTimer < 0)
+				Application.LoadLevel("GameOver");
+			return;
+		}

 		if (!music.isPlaying)
 			return;


adding next stage listener and fixing climbing up a tile

--- Assets/Scripts/Character/PlayerMovement.cs
+++ Assets/Scripts/Character/PlayerMovement.cs
@@ -32,11 +32,13 @@
 	protected void OnEnable ()
 	{
 		EventManager.AddListener (StaticEventNames.NEXTSTAGE, NextStage);
+		EventManager.AddListener(StaticEventNames.RESTART, NextStage);
 	}

 	protected void OnDisable ()
 	{
 		EventManager.RemoveListener(StaticEventNames.NEXTSTAGE, NextStage);
+		EventManager.RemoveListener(StaticEventNames.RESTART, NextStage);
 	}

 	protected void FixedUpdate()
@@ -57,7 +59,7 @@
 			{
 				if (Physics2D.Raycast(new Vector2(transform.position.x + (Input.GetAxis("Horizontal") / 2), transform.position.y + 1), new Vector2(Input.GetAxis("Horizontal"), 0), 0.1f).collider == null)
 				{
-					rigid.velocity = new Vector2(0, 2);
+					rigid.velocity = new Vector2(0, 20);
 					canClimb = false;
 					StartCoroutine(ClimbTimer());
 				}


Ttests updated! (#112)

Ttests updated! (#112)

--- Assets/Tests/PlayModeTests/ConsentTests.cs
+++ Assets/Tests/PlayModeTests/ConsentTests.cs
@@ -147,7 +147,7 @@
             Assert.IsFalse(json.GetValue("crashes").ToObject<bool>());
             Assert.IsFalse(json.GetValue("views").ToObject<bool>());

-            Countly.Instance.Consents.RemoveConsent(new Consents[] { Consents.Crashes});
+            Countly.Instance.Consents.RemoveConsent(new Consents[] { Consents.Crashes });
             Assert.AreEqual(0, Countly.Instance.CrashReports._requestCountlyHelper._requestRepo.Count);

         }
@@ -189,9 +189,9 @@
             Assert.AreEqual(1, json.Count);
             Assert.IsTrue(json.GetValue("views").ToObject<bool>());

-            Countly.Instance.Consents.GiveConsent(new Consents[] {Consents.Views });
+            Countly.Instance.Consents.GiveConsent(new Consents[] { Consents.Views });
             Assert.AreEqual(0, Countly.Instance.CrashReports._requestCountlyHelper._requestRepo.Count);
-
+
             Countly.Instance.Consents.RemoveConsent(new Consents[] { Consents.Crashes, Consents.Views });
             requestModel = Countly.Instance.Consents._requestCountlyHelper._requestRepo.Dequeue();
             myUri = requestModel.RequestUrl;
@@ -549,7 +549,7 @@
             ConsentTestHelperClass listener = new ConsentTestHelperClass();
             CountlyLogHelper logHelper = new CountlyLogHelper(configuration);
             ConsentCountlyService consentCountlyService = new ConsentCountlyService(configuration, logHelper, null, null);
-
+            consentCountlyService.LockObj = new object();
             consentCountlyService.Listeners = new List<AbstractBaseService> { listener };

             consentCountlyService.GiveConsent(new Consents[] { Consents.Location, Consents.RemoteConfig, Consents.RemoteConfig, Consents.Events });
@@ -577,7 +577,7 @@
             ConsentTestHelperClass listener = new ConsentTestHelperClass();
             CountlyLogHelper logHelper = new CountlyLogHelper(configuration);
             ConsentCountlyService consentCountlyService = new ConsentCountlyService(configuration, logHelper, null, null);
-
+            consentCountlyService.LockObj = new object();
             consentCountlyService.Listeners = new List<AbstractBaseService> { listener };

             consentCountlyService.GiveConsent(new Consents[] { Consents.Location, Consents.RemoteConfig, Consents.Events });
@@ -614,7 +614,7 @@
             ConsentTestHelperClass listener = new ConsentTestHelperClass();
             CountlyLogHelper logHelper = new CountlyLogHelper(configuration);
             ConsentCountlyService consentCountlyService = new ConsentCountlyService(configuration, logHelper, null, null);
-
+            consentCountlyService.LockObj = new object();
             consentCountlyService.Listeners = new List<AbstractBaseService> { listener };

             consentCountlyService.GiveConsentToGroup(new string[] { groupA });
@@ -659,6 +659,7 @@
             ConsentTestHelperClass listener = new ConsentTestHelperClass();
             CountlyLogHelper logHelper = new CountlyLogHelper(configuration);
             ConsentCountlyService consentCountlyService = new ConsentCountlyService(configuration, logHelper, null, null);
+            consentCountlyService.LockObj = new object();

             consentCountlyService.Listeners = new List<AbstractBaseService> { listener };


 r54@realmforge.tigris.org (orig r66):  DapperDanH | 2005-10-15 21:28:30 -0400

git-svn-id: 53f2a8ff3606f182ef4420064c1f4a5cdcbe6bb1@657 bb9bf1cf-960d-0410-9a3a-baeba60cf407

--- Axiom3D/Axiom/Engine/Animating/Skeleton.cs
+++ Axiom3D/Axiom/Engine/Animating/Skeleton.cs
@@ -30,7 +30,12 @@
 using System.IO;

 using Axiom.MathLib;
-
+#region Ogre Synchronization Information
+/// <ogresynchronization>
+///     <file name="Skeleton.h"   revision="" lastUpdated="10/15/2005" lastUpdatedBy="DanielH" />
+///     <file name="Skeleton.cpp" revision="" lastUpdated="10/15/2005" lastUpdatedBy="DanielH" />
+/// </ogresynchronization>
+#endregion
 namespace Axiom
 {
     /// <summary>