Skip to content

Commit 76fb3e3

Browse files
Update for .net10
1 parent e7a5707 commit 76fb3e3

5 files changed

Lines changed: 11 additions & 26 deletions

File tree

src/Directory.Packages.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<PackageVersion Include="Autofac" Version="9.0.0" />
88
<PackageVersion Include="AWSSDK.CloudWatch" Version="4.0.7" />
99
<PackageVersion Include="Azure.Identity" Version="1.17.1" />
10-
<PackageVersion Include="Azure.Storage.Blobs" Version="12.23.0" />
10+
<PackageVersion Include="Azure.Storage.Blobs" Version="12.27.0" />
1111
<PackageVersion Include="Azure.Monitor.Query.Metrics" Version="1.0.0" />
1212
<PackageVersion Include="Azure.ResourceManager.ServiceBus" Version="1.1.0" />
1313
<PackageVersion Include="ByteSize" Version="2.1.2" />

src/ServiceControl.Audit.Persistence.MongoDB/MongoClientProvider.cs

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,7 @@ namespace ServiceControl.Audit.Persistence.MongoDB
1414
/// </summary>
1515
class MongoClientProvider(MongoSettings settings) : IMongoClientProvider, IAsyncDisposable
1616
{
17-
readonly MongoSettings settings = settings;
1817
IMongoClient? client;
19-
IMongoDatabase? database;
20-
IMongoProductCapabilities? productCapabilities;
2118
bool initialized;
2219

2320
public IMongoClient Client
@@ -29,23 +26,9 @@ public IMongoClient Client
2926
}
3027
}
3128

32-
public IMongoDatabase Database
33-
{
34-
get
35-
{
36-
EnsureInitialized();
37-
return database!;
38-
}
39-
}
29+
public IMongoDatabase Database { get; private set; } = null!;
4030

41-
public IMongoProductCapabilities ProductCapabilities
42-
{
43-
get
44-
{
45-
EnsureInitialized();
46-
return productCapabilities!;
47-
}
48-
}
31+
public IMongoProductCapabilities ProductCapabilities { get; private set; } = null!;
4932

5033
public async Task InitializeAsync(CancellationToken cancellationToken = default)
5134
{
@@ -61,10 +44,10 @@ public async Task InitializeAsync(CancellationToken cancellationToken = default)
6144
clientSettings.ApplicationName = "ServiceControl.Audit";
6245

6346
client = new MongoClient(clientSettings);
64-
database = client.GetDatabase(settings.DatabaseName);
47+
Database = client.GetDatabase(settings.DatabaseName);
6548

6649
// Detect product capabilities
67-
productCapabilities = await MongoProductDetector.DetectAsync(client, settings.ConnectionString, cancellationToken).ConfigureAwait(false);
50+
ProductCapabilities = await MongoProductDetector.DetectAsync(client, settings.ConnectionString, cancellationToken).ConfigureAwait(false);
6851

6952
initialized = true;
7053
}
@@ -74,8 +57,8 @@ public ValueTask DisposeAsync()
7457
// MongoClient doesn't need explicit disposal in MongoDB.Driver 3.x
7558
// but we implement IAsyncDisposable for future-proofing
7659
client = null;
77-
database = null;
78-
productCapabilities = null;
60+
Database = null!;
61+
ProductCapabilities = null!;
7962
initialized = false;
8063

8164
return ValueTask.CompletedTask;

src/ServiceControl.Audit.Persistence.MongoDB/ServiceControl.Audit.Persistence.MongoDB.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
66
<DisableTransitiveProjectReferences>true</DisableTransitiveProjectReferences>
77
</PropertyGroup>

src/ServiceControl.Audit.Persistence.Tests.MongoDB/ServiceControl.Audit.Persistence.Tests.MongoDB.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>

src/ServiceControl.slnx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,15 @@
1818
</Folder>
1919
<Folder Name="/Instances/Audit/Persistence/">
2020
<Project Path="ServiceControl.Audit.Persistence.InMemory/ServiceControl.Audit.Persistence.InMemory.csproj" />
21+
<Project Path="ServiceControl.Audit.Persistence.MongoDB/ServiceControl.Audit.Persistence.MongoDB.csproj" />
2122
<Project Path="ServiceControl.Audit.Persistence.RavenDB/ServiceControl.Audit.Persistence.RavenDB.csproj" />
2223
<Project Path="ServiceControl.Audit.Persistence.SagaAudit/ServiceControl.Audit.Persistence.SagaAudit.csproj" />
2324
<Project Path="ServiceControl.Audit.Persistence/ServiceControl.Audit.Persistence.csproj" />
2425
</Folder>
2526
<Folder Name="/Instances/Audit/Testing/">
2627
<Project Path="ServiceControl.Audit.AcceptanceTests.RavenDB/ServiceControl.Audit.AcceptanceTests.RavenDB.csproj" />
2728
<Project Path="ServiceControl.Audit.AcceptanceTests/ServiceControl.Audit.AcceptanceTests.csproj" />
29+
<Project Path="ServiceControl.Audit.Persistence.Tests.MongoDB/ServiceControl.Audit.Persistence.Tests.MongoDB.csproj" />
2830
<Project Path="ServiceControl.Audit.Persistence.Tests.RavenDB/ServiceControl.Audit.Persistence.Tests.RavenDB.csproj" />
2931
<Project Path="ServiceControl.Audit.Persistence.Tests/ServiceControl.Audit.Persistence.Tests.csproj" />
3032
<Project Path="ServiceControl.Audit.UnitTests/ServiceControl.Audit.UnitTests.csproj" />

0 commit comments

Comments
 (0)