Update to latest version of MongoDB.Driver

Author: bkoelman

package-versions.props

@@ -2,16 +2,16 @@
   <PropertyGroup>
     <!-- Published dependencies (only update on major version change) -->
     <JsonApiDotNetCoreFrozenVersion>5.6.0</JsonApiDotNetCoreFrozenVersion>
-    <MongoDBDriverFrozenVersion>2.28.0</MongoDBDriverFrozenVersion>
+    <MongoDBDriverFrozenVersion>3.3.0</MongoDBDriverFrozenVersion>
 
     <!-- Non-published dependencies (these are safe to update, won't cause a breaking change) -->
     <BogusVersion>35.6.*</BogusVersion>
     <CoverletVersion>6.0.*</CoverletVersion>
-    <EphemeralMongoVersion>2.0.*</EphemeralMongoVersion>
+    <EphemeralMongoVersion>3.0.*</EphemeralMongoVersion>
     <FluentAssertionsVersion>7.2.*</FluentAssertionsVersion>
     <GitHubActionsTestLoggerVersion>2.4.*</GitHubActionsTestLoggerVersion>
     <InheritDocVersion>2.0.*</InheritDocVersion>
-    <MongoDBDriverVersion>2.28.*</MongoDBDriverVersion>
+    <MongoDBDriverVersion>3.3.*</MongoDBDriverVersion>
     <TestSdkVersion>17.13.*</TestSdkVersion>
     <XunitVersion>2.9.*</XunitVersion>
     <XunitVisualStudioVersion>2.8.*</XunitVisualStudioVersion>

src/JsonApiDotNetCore.MongoDb/Repositories/MongoRepository.cs

@@ -74,7 +74,7 @@ public virtual async Task<IReadOnlyCollection<TResource>> GetAsync(QueryLayer qu
     {
         ArgumentNullException.ThrowIfNull(queryLayer);
 
-        IMongoQueryable<TResource> query = ApplyQueryLayer(queryLayer);
+        IQueryable<TResource> query = ApplyQueryLayer(queryLayer);
         List<TResource>? resources = await query.ToListAsync(cancellationToken);
         return resources.AsReadOnly();
     }
@@ -89,12 +89,12 @@ public virtual Task<int> CountAsync(FilterExpression? topFilter, CancellationTok
             Filter = topFilter
         };
 
-        IMongoQueryable<TResource> query = ApplyQueryLayer(layer);
+        IQueryable<TResource> query = ApplyQueryLayer(layer);
         return query.CountAsync(cancellationToken);
     }
 
 #pragma warning disable AV1130 // Return type in method signature should be an interface to an unchangeable collection
-    protected virtual IMongoQueryable<TResource> ApplyQueryLayer(QueryLayer queryLayer)
+    protected virtual IQueryable<TResource> ApplyQueryLayer(QueryLayer queryLayer)
 #pragma warning restore AV1130 // Return type in method signature should be an interface to an unchangeable collection
     {
         ArgumentNullException.ThrowIfNull(queryLayer);
@@ -127,7 +127,7 @@ protected virtual IMongoQueryable<TResource> ApplyQueryLayer(QueryLayer queryLay
         var context = QueryableBuilderContext.CreateRoot(source, typeof(Queryable), _mongoDataAccess.EntityModel, null);
         Expression expression = _queryableBuilder.ApplyQuery(queryLayer, context);
 
-        return (IMongoQueryable<TResource>)source.Provider.CreateQuery<TResource>(expression);
+        return source.Provider.CreateQuery<TResource>(expression);
     }
 
     protected virtual IQueryable<TResource> GetAll()

test/TestBuildingBlocks/MongoRunnerProvider.cs

@@ -1,4 +1,7 @@
 using EphemeralMongo;
+using MongoDB.Bson;
+using MongoDB.Bson.Serialization;
+using MongoDB.Bson.Serialization.Serializers;
 
 namespace TestBuildingBlocks;
 
@@ -26,11 +29,13 @@ public IMongoRunner Get()
         {
             if (_runner == null)
             {
+                BsonSerializer.RegisterSerializer(new GuidSerializer(GuidRepresentation.Standard));
+
                 var runnerOptions = new MongoRunnerOptions
                 {
                     // Single-node replica set mode is required for transaction support in MongoDB.
                     UseSingleNodeReplicaSet = true,
-                    AdditionalArguments = "--quiet"
+                    AdditionalArguments = ["--quiet"]
                 };
 
                 _runner = MongoRunner.Run(runnerOptions);
@@ -65,18 +70,36 @@ private sealed class MongoRunnerWrapper(MongoRunnerProvider owner, IMongoRunner
 
         public string ConnectionString => _underlyingMongoRunner?.ConnectionString ?? throw new ObjectDisposedException(nameof(IMongoRunner));
 
-        public void Import(string database, string collection, string inputFilePath, string? additionalArguments = null, bool drop = false)
+        public void Import(string database, string collection, string inputFilePath, string[]? additionalArguments = null, bool drop = false,
+            CancellationToken cancellationToken = default)
+        {
+            ObjectDisposedException.ThrowIf(_underlyingMongoRunner == null, this);
+
+            _underlyingMongoRunner.Import(database, collection, inputFilePath, additionalArguments, drop, cancellationToken);
+        }
+
+        public async Task ImportAsync(string database, string collection, string inputFilePath, string[]? additionalArguments = null, bool drop = false,
+            CancellationToken cancellationToken = default)
+        {
+            ObjectDisposedException.ThrowIf(_underlyingMongoRunner == null, this);
+
+            await _underlyingMongoRunner.ImportAsync(database, collection, inputFilePath, additionalArguments, drop, cancellationToken);
+        }
+
+        public void Export(string database, string collection, string outputFilePath, string[]? additionalArguments = null,
+            CancellationToken cancellationToken = default)
         {
             ObjectDisposedException.ThrowIf(_underlyingMongoRunner == null, this);
 
-            _underlyingMongoRunner.Import(database, collection, inputFilePath, additionalArguments, drop);
+            _underlyingMongoRunner.Export(database, collection, outputFilePath, additionalArguments, cancellationToken);
         }
 
-        public void Export(string database, string collection, string outputFilePath, string? additionalArguments = null)
+        public async Task ExportAsync(string database, string collection, string outputFilePath, string[]? additionalArguments = null,
+            CancellationToken cancellationToken = default)
         {
             ObjectDisposedException.ThrowIf(_underlyingMongoRunner == null, this);
 
-            _underlyingMongoRunner.Export(database, collection, outputFilePath, additionalArguments);
+            await _underlyingMongoRunner.ExportAsync(database, collection, outputFilePath, additionalArguments, cancellationToken);
         }
 
         public void Dispose()

test/TestBuildingBlocks/TestBuildingBlocks.csproj

@@ -12,10 +12,7 @@
   <ItemGroup>
     <PackageReference Include="Bogus" Version="$(BogusVersion)" />
     <PackageReference Include="coverlet.collector" Version="$(CoverletVersion)" PrivateAssets="All" />
-    <PackageReference Include="EphemeralMongo.Core" Version="$(EphemeralMongoVersion)" />
-    <PackageReference Include="EphemeralMongo8.runtime.linux-x64" Version="$(EphemeralMongoVersion)" Condition="$([MSBuild]::IsOSPlatform('Linux'))" />
-    <PackageReference Include="EphemeralMongo8.runtime.osx-arm64" Version="$(EphemeralMongoVersion)" Condition="$([MSBuild]::IsOSPlatform('OSX'))" />
-    <PackageReference Include="EphemeralMongo8.runtime.win-x64" Version="$(EphemeralMongoVersion)" Condition="$([MSBuild]::IsOSPlatform('Windows'))" />
+    <PackageReference Include="EphemeralMongo" Version="$(EphemeralMongoVersion)" />
     <PackageReference Include="GitHubActionsTestLogger" Version="$(GitHubActionsTestLoggerVersion)" PrivateAssets="All" />
     <PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(AspNetCoreVersion)" />