CSHARP-1583: Resolve ambiguous overloads in MongoQueryable.

Author: rstam

src/MongoDB.Driver.Tests/Linq/MongoQueryableTests.cs

@@ -1,4 +1,4 @@
-/* Copyright 2010-2015 MongoDB Inc.
+/* Copyright 2010-2016 MongoDB Inc.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -19,11 +19,13 @@
 using System.Threading.Tasks;
 using FluentAssertions;
 using MongoDB.Bson;
+using MongoDB.Driver;
 using MongoDB.Driver.Core;
 using MongoDB.Driver.Linq;
+using MongoDB.Driver.Tests.Linq;
 using NUnit.Framework;
 
-namespace MongoDB.Driver.Tests.Linq
+namespace Tests.MongoDB.Driver.Linq
 {
     [TestFixture]
     public class MongoQueryableTests : IntegrationTestBase

src/MongoDB.Driver.Tests/MongoDB.Driver.Tests.csproj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

src/MongoDB.Driver/Linq/MongoQueryable.cs

@@ -486,7 +486,7 @@ public static IMongoQueryable<TSource> Distinct<TSource>(this IMongoQueryable<TS
         /// <returns>
         /// The first element in <paramref name="source" />.
         /// </returns>
-        public static Task<TSource> FirstAsync<TSource>(this IQueryable<TSource> source, CancellationToken cancellationToken = default(CancellationToken))
+        public static Task<TSource> FirstAsync<TSource>(this IMongoQueryable<TSource> source, CancellationToken cancellationToken = default(CancellationToken))
         {
             return ((IMongoQueryProvider)source.Provider).ExecuteAsync<TSource>(
                 Expression.Call(
@@ -505,7 +505,7 @@ public static IMongoQueryable<TSource> Distinct<TSource>(this IMongoQueryable<TS
         /// <returns>
         /// The first element in <paramref name="source" /> that passes the test in <paramref name="predicate" />.
         /// </returns>
-        public static Task<TSource> FirstAsync<TSource>(this IQueryable<TSource> source, Expression<Func<TSource, bool>> predicate, CancellationToken cancellationToken = default(CancellationToken))
+        public static Task<TSource> FirstAsync<TSource>(this IMongoQueryable<TSource> source, Expression<Func<TSource, bool>> predicate, CancellationToken cancellationToken = default(CancellationToken))
         {
             return ((IMongoQueryProvider)source.Provider).ExecuteAsync<TSource>(
                 Expression.Call(
@@ -524,7 +524,7 @@ public static IMongoQueryable<TSource> Distinct<TSource>(this IMongoQueryable<TS
         /// <returns>
         /// default(<typeparamref name="TSource" />) if <paramref name="source" /> is empty; otherwise, the first element in <paramref name="source" />.
         /// </returns>
-        public static Task<TSource> FirstOrDefaultAsync<TSource>(this IQueryable<TSource> source, CancellationToken cancellationToken = default(CancellationToken))
+        public static Task<TSource> FirstOrDefaultAsync<TSource>(this IMongoQueryable<TSource> source, CancellationToken cancellationToken = default(CancellationToken))
         {
             return ((IMongoQueryProvider)source.Provider).ExecuteAsync<TSource>(
                 Expression.Call(
@@ -543,7 +543,7 @@ public static IMongoQueryable<TSource> Distinct<TSource>(this IMongoQueryable<TS
         /// <returns>
         /// default(<typeparamref name="TSource" />) if <paramref name="source" /> is empty or if no element passes the test specified by <paramref name="predicate" />; otherwise, the first element in <paramref name="source" /> that passes the test specified by <paramref name="predicate" />.
         /// </returns>
-        public static Task<TSource> FirstOrDefaultAsync<TSource>(this IQueryable<TSource> source, Expression<Func<TSource, bool>> predicate, CancellationToken cancellationToken = default(CancellationToken))
+        public static Task<TSource> FirstOrDefaultAsync<TSource>(this IMongoQueryable<TSource> source, Expression<Func<TSource, bool>> predicate, CancellationToken cancellationToken = default(CancellationToken))
         {
             return ((IMongoQueryProvider)source.Provider).ExecuteAsync<TSource>(
                 Expression.Call(
@@ -837,7 +837,7 @@ public static IOrderedMongoQueryable<TSource> OrderByDescending<TSource, TKey>(t
         /// <returns>
         /// A sample of the elements in the <paramref name="source"/>.
         /// </returns>
-        public static IMongoQueryable<TSource> Sample<TSource>(this IQueryable<TSource> source, long count)
+        public static IMongoQueryable<TSource> Sample<TSource>(this IMongoQueryable<TSource> source, long count)
         {
             return (IMongoQueryable<TSource>)source.Provider.CreateQuery<TSource>(
                 Expression.Call(
@@ -907,7 +907,7 @@ public static IMongoQueryable<TResult> SelectMany<TSource, TCollection, TResult>
         /// <returns>
         /// The single element of the input sequence.
         /// </returns>
-        public static Task<TSource> SingleAsync<TSource>(this IQueryable<TSource> source, CancellationToken cancellationToken = default(CancellationToken))
+        public static Task<TSource> SingleAsync<TSource>(this IMongoQueryable<TSource> source, CancellationToken cancellationToken = default(CancellationToken))
         {
             return ((IMongoQueryProvider)source.Provider).ExecuteAsync<TSource>(
                 Expression.Call(
@@ -926,7 +926,7 @@ public static IMongoQueryable<TResult> SelectMany<TSource, TCollection, TResult>
         /// <returns>
         /// The single element of the input sequence that satisfies the condition in <paramref name="predicate" />.
         /// </returns>
-        public static Task<TSource> SingleAsync<TSource>(this IQueryable<TSource> source, Expression<Func<TSource, bool>> predicate, CancellationToken cancellationToken = default(CancellationToken))
+        public static Task<TSource> SingleAsync<TSource>(this IMongoQueryable<TSource> source, Expression<Func<TSource, bool>> predicate, CancellationToken cancellationToken = default(CancellationToken))
         {
             return ((IMongoQueryProvider)source.Provider).ExecuteAsync<TSource>(
                 Expression.Call(
@@ -945,7 +945,7 @@ public static IMongoQueryable<TResult> SelectMany<TSource, TCollection, TResult>
         /// <returns>
         /// The single element of the input sequence, or default(<typeparamref name="TSource" />) if the sequence contains no elements.
         /// </returns>
-        public static Task<TSource> SingleOrDefaultAsync<TSource>(this IQueryable<TSource> source, CancellationToken cancellationToken = default(CancellationToken))
+        public static Task<TSource> SingleOrDefaultAsync<TSource>(this IMongoQueryable<TSource> source, CancellationToken cancellationToken = default(CancellationToken))
         {
             return ((IMongoQueryProvider)source.Provider).ExecuteAsync<TSource>(
                 Expression.Call(
@@ -964,7 +964,7 @@ public static IMongoQueryable<TResult> SelectMany<TSource, TCollection, TResult>
         /// <returns>
         /// The single element of the input sequence that satisfies the condition in <paramref name="predicate" />, or default(<typeparamref name="TSource" />) if no such element is found.
         /// </returns>
-        public static Task<TSource> SingleOrDefaultAsync<TSource>(this IQueryable<TSource> source, Expression<Func<TSource, bool>> predicate, CancellationToken cancellationToken = default(CancellationToken))
+        public static Task<TSource> SingleOrDefaultAsync<TSource>(this IMongoQueryable<TSource> source, Expression<Func<TSource, bool>> predicate, CancellationToken cancellationToken = default(CancellationToken))
         {
             return ((IMongoQueryProvider)source.Provider).ExecuteAsync<TSource>(
                 Expression.Call(