Skip to content

Commit 6302fd3

Browse files
authored
[upgrade] MongoDB.Driver from 2.18.0 to 2.19.0 (#308)
* [upgrade] MongoDB.Driver from 2.18.0 to 2.19.0 * Update SDK Azure Pipeline * updates
1 parent 25a00a9 commit 6302fd3

File tree

9 files changed

+30
-16
lines changed

9 files changed

+30
-16
lines changed

build-system/azure-pipeline.template.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ jobs:
1818
submodules: recursive # set to 'true' for a single level of submodules or 'recursive' to get submodules of submodules
1919
persistCredentials: true
2020
- task: UseDotNet@2
21-
displayName: 'Use .NET 6 SDK 6.0.100'
21+
displayName: 'Use .NET 6 SDK 6.0.407'
2222
inputs:
23-
version: 6.0.100
23+
version: 6.0.407
2424
- task: UseDotNet@2
25-
displayName: 'Use .NET Core Runtime 3.1.10'
25+
displayName: 'Use .NET Core Runtime 3.1.32'
2626
inputs:
2727
packageType: runtime
28-
version: 3.1.10
28+
version: 3.1.32
2929
# Linux or macOS
3030
- task: Bash@3
3131
displayName: Linux / OSX Build

build-system/linux-pr-validation.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ jobs:
2424

2525
- template: azure-pipeline.template.yaml
2626
parameters:
27-
name: 'net_5_tests_linux'
28-
displayName: '.NET 5 Unit Tests (Linux)'
27+
name: 'net_6_tests_linux'
28+
displayName: '.NET 6 Unit Tests (Linux)'
2929
vmImage: 'ubuntu-latest'
3030
scriptFileName: ./build.sh
3131
scriptArgs: runTestsNet

build-system/windows-pr-validation.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ jobs:
3232

3333
- template: azure-pipeline.template.yaml
3434
parameters:
35-
name: 'net_5_tests_windows'
36-
displayName: '.NET 5 Unit Tests (Windows)'
35+
name: 'net_6_tests_windows'
36+
displayName: '.NET 6 Unit Tests (Windows)'
3737
vmImage: 'windows-latest'
3838
scriptFileName: build.cmd
3939
scriptArgs: runTestsNet

build-system/windows-release.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ variables:
2323
value: akkadotnet/Akka.Persistence.MongoDB
2424
steps:
2525
- task: UseDotNet@2
26-
displayName: 'Use .NET 6 SDK 6.0.100'
26+
displayName: 'Use .NET 6 SDK 6.0.407'
2727
inputs:
28-
version: 6.0.100
28+
version: 6.0.407
2929
- task: BatchScript@1
3030
displayName: 'FAKE Build'
3131
inputs:

src/Akka.Persistence.MongoDb.Tests/MongoDbJournalSetupSpec.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
using Akka.Persistence.TCK.Serialization;
1111
using Akka.TestKit;
1212
using MongoDB.Driver;
13+
using MongoDB.Driver.Linq;
1314
using Xunit;
1415
using Xunit.Abstractions;
1516

@@ -30,8 +31,11 @@ public MongoDbJournalSetupSpec(
3031

3132
private static ActorSystemSetup CreateBootstrapSetup(DatabaseFixture fixture)
3233
{
34+
//Default LinqProvider has been changed to LINQ3.LinqProvider can be changed back to LINQ2 in the following way:
3335
var connectionString = new MongoUrl(fixture.ConnectionString);
34-
var client = new MongoClient(connectionString);
36+
var clientSettings = MongoClientSettings.FromUrl(connectionString);
37+
clientSettings.LinqProvider = LinqProvider.V2;
38+
var client = new MongoClient(clientSettings);
3539
var databaseName = connectionString.DatabaseName;
3640
var settings = client.Settings;
3741

src/Akka.Persistence.MongoDb.Tests/MongoDbSnapshotStoreSetupSpec.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using Akka.Persistence.TCK.Journal;
55
using Akka.Persistence.TCK.Snapshot;
66
using MongoDB.Driver;
7+
using MongoDB.Driver.Linq;
78
using Xunit;
89
using Xunit.Abstractions;
910

@@ -24,8 +25,11 @@ public MongoDbSnapshotStoreSetupSpec(
2425

2526
private static ActorSystemSetup CreateBootstrapSetup(DatabaseFixture fixture)
2627
{
28+
//Default LinqProvider has been changed to LINQ3.LinqProvider can be changed back to LINQ2 in the following way:
2729
var connectionString = new MongoUrl(fixture.ConnectionString);
28-
var client = new MongoClient(connectionString);
30+
var clientSettings = MongoClientSettings.FromUrl(connectionString);
31+
clientSettings.LinqProvider = LinqProvider.V2;
32+
var client = new MongoClient(clientSettings);
2933
var databaseName = connectionString.DatabaseName;
3034
var settings = client.Settings;
3135

src/Akka.Persistence.MongoDb/Akka.Persistence.MongoDb.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111
<ItemGroup>
1212
<PackageReference Include="Akka.Persistence.Query" Version="$(AkkaVersion)" />
1313
<PackageReference Include="akka.streams" Version="$(AkkaVersion)" />
14-
<PackageReference Include="MongoDB.Driver" Version="2.18.0" />
14+
<PackageReference Include="MongoDB.Driver" Version="2.19.0" />
1515
</ItemGroup>
1616
</Project>

src/Akka.Persistence.MongoDb/Journal/MongoDbJournal.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,11 @@ protected override void PreStart()
6868
client = new MongoClient(setupOption.Value.JournalConnectionSettings);
6969
return client.GetDatabase(setupOption.Value.JournalDatabaseName);
7070
}
71-
71+
//Default LinqProvider has been changed to LINQ3.LinqProvider can be changed back to LINQ2 in the following way:
7272
var connectionString = new MongoUrl(_settings.ConnectionString);
73-
client = new MongoClient(connectionString);
73+
var clientSettings = MongoClientSettings.FromUrl(connectionString);
74+
clientSettings.LinqProvider = LinqProvider.V2;
75+
client = new MongoClient(clientSettings);
7476
return client.GetDatabase(connectionString.DatabaseName);
7577
});
7678
_journalCollection = new Lazy<IMongoCollection<JournalEntry>>(() =>

src/Akka.Persistence.MongoDb/Snapshot/MongoDbSnapshotStore.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
using Akka.Persistence.Snapshot;
1313
using Akka.Util;
1414
using MongoDB.Driver;
15+
using MongoDB.Driver.Linq;
1516

1617
namespace Akka.Persistence.MongoDb.Snapshot
1718
{
@@ -47,8 +48,11 @@ protected override void PreStart()
4748
var setupOption = Context.System.Settings.Setup.Get<MongoDbPersistenceSetup>();
4849
if (!setupOption.HasValue || setupOption.Value.SnapshotConnectionSettings == null)
4950
{
51+
//Default LinqProvider has been changed to LINQ3.LinqProvider can be changed back to LINQ2 in the following way:
5052
var connectionString = new MongoUrl(_settings.ConnectionString);
51-
client = new MongoClient(connectionString);
53+
var clientSettings = MongoClientSettings.FromUrl(connectionString);
54+
clientSettings.LinqProvider = LinqProvider.V2;
55+
client = new MongoClient(clientSettings);
5256
snapshot = client.GetDatabase(connectionString.DatabaseName);
5357
}
5458
else

0 commit comments

Comments
 (0)