minor changes for 2.1.0-rc1 release.

Author: craiggwilson

Docs/landing/data/releases.toml

@@ -1,6 +1,6 @@
 current = "2.0.1"
 [[versions]]
-  version = "2.1.0-rc0"
+  version = "2.1.0-rc1"
   status = "rc"
   docs = "http://mongodb.github.io/mongo-csharp-driver/2.1/"
   api = "http://api.mongodb.org/csharp/2.1"
@@ -22,32 +22,32 @@ current = "2.0.1"
   package = "MongoDB.Driver"
   description = "The driver."
   dependencies = ".NET Core Driver,.NET BSON Library"
-  versions = "2.1.0-rc0,2.0.1"
+  versions = "2.1.0-rc1,2.0.1"
 
 [[drivers]]
   name = ".NET GridFS"
   package = "MongoDB.Driver.GridFS"
   description = "The GridFS library."
   dependencies = ".NET Driver,.NET Core Driver,.NET BSON Library"
-  versions = "2.1.0-rc0"
+  versions = "2.1.0-rc1"
 
 [[drivers]]
   name = ".NET Core Driver"
   package = "MongoDB.Driver.Core"
   description = "The core driver."
   dependencies = ".NET BSON Library"
-  versions = "2.1.0-rc0,2.0.1"
+  versions = "2.1.0-rc1,2.0.1"
 
 [[drivers]]
   name = ".NET BSON Library"
   package = "MongoDB.Bson"
   description = "The BSON library."
   dependencies = ""
-  versions = "2.1.0-rc0,2.0.1"
+  versions = "2.1.0-rc1,2.0.1"
 
 [[drivers]]
   name = ".NET Legacy Driver"
   package = "mongocsharpdriver"
   description = "The legacy driver."
   dependencies = ".NET Driver,.NET Core Driver,.NET BSON Library"
-  versions = "2.1.0-rc0,2.0.1,1.10.1"
+  versions = "2.1.0-rc1,2.0.1,1.10.1"

Release Notes/Release Notes v2.1.0.md

@@ -1,4 +1,4 @@
-# .NET Driver Version 2.1.0-rc0 Release Notes
+# .NET Driver Version 2.1.0-rc1 Release Notes
 
 (Preliminary)
 
@@ -21,6 +21,7 @@ http://mongodb.github.io/mongo-csharp-driver/
 
 Notable new features are listed below. For a full list, see the full list of JIRA issues linked above.
 
+
 ### GridFS
 
 [CSHARP-1191](https://jira.mongodb.org/browse/CSHARP-1191) - GridFS support has been implemented.
@@ -33,6 +34,11 @@ Notable new features are listed below. For a full list, see the full list of JIR
 Simply use the new [`AsQueryable`]({{< apiref "M_MongoDB_Driver_IMongoCollectionExtensions_AsQueryable__1" >}}) method to work with LINQ.
 
 
+### Eventing
+
+[CSHARP-1374](https://jira.mongodb.org/browse/CSHARP-1374) - An eventing API has been added allowing a user to subscribe to one or more events from the core driver for insight into server discovery, server selection, connection pooling, and commands.
+
+
 ## Upgrading
 
 There are no known backwards breaking changes in this release.

appveyor.yml

@@ -1,4 +1,4 @@
-version: 2.0.0.{build}
+version: 2.1.0.{build}
 
 branches:
   only:
@@ -12,7 +12,7 @@ test: off
 
 build_script: 
   - build.cmd Build
-  - ps: Start-FileDownload 'https://fastdl.mongodb.org/win32/mongodb-win32-x86_64-2008plus-2.6.3-signed.msi' -FileName 'C:\build\mongodb.msi'
+  - ps: Start-FileDownload 'https://fastdl.mongodb.org/win32/mongodb-win32-x86_64-2008plus-ssl-3.0.6-signed.msi' -FileName 'C:\build\mongodb.msi'
   - msiexec /i C:\build\mongodb.msi /qn /log c:\build\mongodb-install.log INSTALLLOCATION=C:\MongoDB
   - ps: mkdir c:\build\data
   - ps: Start-Process -NoNewWindow C:\MongoDB\bin\mongod.exe -ArgumentList "-dbpath c:\build\data -smallfiles -oplogSize 100 -setParameter enableTestCommands=1"

src/MongoDB.Driver/AggregateFluent.cs

@@ -21,6 +21,7 @@
 using System.Threading.Tasks;
 using MongoDB.Bson;
 using MongoDB.Bson.Serialization;
+using MongoDB.Bson.Serialization.Serializers;
 using MongoDB.Driver.Core.Misc;
 
 namespace MongoDB.Driver
@@ -85,6 +86,29 @@ public override IAggregateFluent<TResult> Limit(int limit)
             return AppendStage<TResult>(new BsonDocument("$limit", limit));
         }
 
+        public override IAggregateFluent<TNewResult> Lookup<TNewResult>(string from, FieldDefinition<TResult> localField, FieldDefinition<BsonDocument> foreignField, FieldDefinition<TNewResult> @as, IBsonSerializer<TNewResult> newResultSerializer = null)
+        {
+            const string operatorName = "$lookup";
+            var stage = new DelegatedPipelineStageDefinition<TResult, TNewResult>(
+                operatorName,
+                (s, sr) =>
+                {
+                    newResultSerializer = newResultSerializer ?? (s as IBsonSerializer<TNewResult>) ?? sr.GetSerializer<TNewResult>();
+                    return new RenderedPipelineStageDefinition<TNewResult>(
+                        operatorName,
+                        new BsonDocument(operatorName, new BsonDocument
+                        {
+                            { "from", from },
+                            { "localField", localField.Render(s, sr).FieldName },
+                            { "foreignField", foreignField.Render(BsonDocumentSerializer.Instance, sr).FieldName },
+                            { "as", @as.Render(newResultSerializer, sr).FieldName },
+                        }),
+                        newResultSerializer);
+                });
+
+            return AppendStage<TNewResult>(stage);
+        }
+
         public override IAggregateFluent<TResult> Match(FilterDefinition<TResult> filter)
         {
             const string operatorName = "$match";

src/MongoDB.Driver/AggregateFluentBase.cs

@@ -13,6 +13,7 @@
 * limitations under the License.
 */
 
+using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
@@ -45,6 +46,12 @@ public abstract class AggregateFluentBase<TResult> : IOrderedAggregateFluent<TRe
         /// <inheritdoc />
         public abstract IAggregateFluent<TResult> Limit(int limit);
 
+        /// <inheritdoc />
+        public virtual IAggregateFluent<TNewResult> Lookup<TNewResult>(string from, FieldDefinition<TResult> localField, FieldDefinition<BsonDocument> foreignField, FieldDefinition<TNewResult> @as, IBsonSerializer<TNewResult> newResultSerializer = null)
+        {
+            throw new NotImplementedException();
+        }
+
         /// <inheritdoc />
         public abstract IAggregateFluent<TResult> Match(FilterDefinition<TResult> filter);
 
@@ -68,5 +75,6 @@ public abstract class AggregateFluentBase<TResult> : IOrderedAggregateFluent<TRe
 
         /// <inheritdoc />
         public abstract Task<IAsyncCursor<TResult>> ToCursorAsync(CancellationToken cancellationToken);
+
     }
 }

src/MongoDB.Driver/IAggregateFluent.cs

@@ -50,15 +50,15 @@ public interface IAggregateFluent<TResult> : IAsyncCursorSource<TResult>
         IAggregateFluent<TNewResult> AppendStage<TNewResult>(PipelineStageDefinition<TResult, TNewResult> stage);
 
         /// <summary>
-        /// Adds a project stage to the pipeline to project the result to a new type.
+        /// Appends a project stage to the pipeline.
         /// </summary>
         /// <typeparam name="TNewResult">The type of the new result.</typeparam>
         /// <param name="newResultSerializer">The new result serializer.</param>
         /// <returns>The fluent aggregate interface.</returns>
         IAggregateFluent<TNewResult> As<TNewResult>(IBsonSerializer<TNewResult> newResultSerializer = null);
 
         /// <summary>
-        /// Appends a group stage to the stages.
+        /// Appends a group stage to the pipeline.
         /// </summary>
         /// <typeparam name="TNewResult">The type of the result of the stage.</typeparam>
         /// <param name="group">The group projection.</param>
@@ -72,6 +72,18 @@ public interface IAggregateFluent<TResult> : IAsyncCursorSource<TResult>
         /// <returns>The fluent aggregate interface.</returns>
         IAggregateFluent<TResult> Limit(int limit);
 
+        /// <summary>
+        /// Appens a lookup stage to the pipeline.
+        /// </summary>
+        /// <typeparam name="TNewResult">The type of the new result.</typeparam>
+        /// <param name="from">From.</param>
+        /// <param name="localField">The local field.</param>
+        /// <param name="foreignField">The foreign field.</param>
+        /// <param name="as">As.</param>
+        /// <param name="newResultSerializer">The new result serializer.</param>
+        /// <returns></returns>
+        IAggregateFluent<TNewResult> Lookup<TNewResult>(string from, FieldDefinition<TResult> localField, FieldDefinition<BsonDocument> foreignField, FieldDefinition<TNewResult> @as, IBsonSerializer<TNewResult> newResultSerializer = null);
+
         /// <summary>
         /// Appends a match stage to the pipeline.
         /// </summary>