Skip to content

Commit 51af596

Browse files
sahma19sahma19
authored
upgrade-dotnet-and-dependencies (#527)
* Upgrade to dotnet 9
1 parent 263cad9 commit 51af596

File tree

11 files changed

+66
-48
lines changed

11 files changed

+66
-48
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": false,
44
"tools": {
55
"dotnet-grpc": {
6-
"version": "2.66.0",
6+
"version": "2.67.0",
77
"commands": [
88
"dotnet-grpc"
99
]

‎.devcontainer/devcontainer.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
// README at: https://github.com/devcontainers/templates/tree/main/src/dotnet
33
{
44
"name": "C# (.NET)",
5-
"image": "mcr.microsoft.com/devcontainers/dotnet:1.3.6-8.0-jammy",
5+
"image": "mcr.microsoft.com/devcontainers/dotnet:1.3.6-9.0-noble",
66
// Features to add to the dev container. More info: https://containers.dev/features.
77
"features": {
8+
"ghcr.io/devcontainers/features/dotnet:2" : {"additionalVersions": "9.0.102"},
89
"ghcr.io/devcontainers/features/docker-in-docker:2": {},
910
"ghcr.io/mpriscella/features/kind:1": {},
1011
"ghcr.io/devcontainers/features/kubectl-helm-minikube:1": {}

‎Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
3+
<TargetFramework>net9.0</TargetFramework>
44
<Nullable>enable</Nullable>
55
<ImplicitUsings>disable</ImplicitUsings>
66
<WarningsAsErrors>IDE0005</WarningsAsErrors>

‎Vault.Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ARG PROJECT=ProjectOrigin.Vault
22

3-
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0.406 AS build
3+
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:9.0.102 AS build
44
ARG PROJECT
55

66
WORKDIR /builddir
@@ -15,7 +15,7 @@ RUN dotnet tool restore
1515
RUN dotnet publish src/ProjectOrigin.Vault -c Release -p:CustomAssemblyName=Vault -o /app/publish
1616

1717
# ------- production image -------
18-
FROM mcr.microsoft.com/dotnet/aspnet:8.0.13-jammy-chiseled-extra AS production
18+
FROM mcr.microsoft.com/dotnet/aspnet:9.0.1-noble AS production
1919

2020
WORKDIR /app
2121
COPY --from=build /app/publish .

‎global.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"sdk": {
3-
"version": "8.0.404",
4-
"rollForward": "feature"
5-
}
2+
"sdk": {
3+
"version": "9.0.102",
4+
"rollForward": "feature"
5+
}
66
}

‎src/ProjectOrigin.Vault/Database/Postgres/PostgresUpgrader.cs‎

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,19 +103,34 @@ public LoggerWrapper(ILogger logger)
103103
_logger = logger;
104104
}
105105

106-
public void WriteError(string format, params object[] args)
106+
public void LogInformation(string format, params object[] args)
107107
{
108-
_logger.LogError(format, args);
108+
_logger.LogInformation(format, args);
109109
}
110110

111-
public void WriteInformation(string format, params object[] args)
111+
public void LogDebug(string format, params object[] args)
112112
{
113-
_logger.LogInformation(format, args);
113+
_logger.LogDebug(format, args);
114114
}
115115

116-
public void WriteWarning(string format, params object[] args)
116+
public void LogTrace(string format, params object[] args)
117+
{
118+
_logger.LogTrace(format, args);
119+
}
120+
121+
public void LogWarning(string format, params object[] args)
117122
{
118123
_logger.LogWarning(format, args);
119124
}
125+
126+
public void LogError(string format, params object[] args)
127+
{
128+
_logger.LogError(format, args);
129+
}
130+
131+
public void LogError(Exception ex, string format, params object[] args)
132+
{
133+
_logger.LogError(ex, format, args);
134+
}
120135
}
121136
}

‎src/ProjectOrigin.Vault/ProjectOrigin.Vault.csproj‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,31 +6,31 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="ProjectOrigin.ServiceCommon" Version="1.0.0" />
10-
<PackageReference Include="Dapper" Version="2.1.44" />
11-
<PackageReference Include="dbup-postgresql" Version="5.0.40" />
12-
<PackageReference Include="Grpc.AspNetCore" Version="2.66.0" />
13-
<PackageReference Include="MassTransit" Version="8.3.0" />
14-
<PackageReference Include="MassTransit.RabbitMQ" Version="8.3.0" />
15-
<PackageReference Include="Npgsql" Version="8.0.5" />
16-
<PackageReference Include="Npgsql.OpenTelemetry" Version="8.0.5" />
9+
<PackageReference Include="ProjectOrigin.ServiceCommon" Version="2.0.0" />
10+
<PackageReference Include="Dapper" Version="2.1.66" />
11+
<PackageReference Include="dbup-postgresql" Version="6.0.3" />
12+
<PackageReference Include="Grpc.AspNetCore" Version="2.67.0" />
13+
<PackageReference Include="MassTransit" Version="8.3.4" />
14+
<PackageReference Include="MassTransit.RabbitMQ" Version="8.3.4" />
15+
<PackageReference Include="Npgsql" Version="9.0.3" />
16+
<PackageReference Include="Npgsql.OpenTelemetry" Version="9.0.3" />
1717
<PackageReference Include="NSec.Cryptography" Version="24.4.0" />
18-
<PackageReference Include="Microsoft.Identity.Web" Version="3.2.2" />
19-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.10" />
20-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
21-
<PackageReference Include="OpenTelemetry" Version="1.9.0" />
22-
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.9.0" />
23-
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.9.0" />
24-
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.9.0" />
25-
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.9.0" />
26-
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.9.0" />
18+
<PackageReference Include="Microsoft.Identity.Web" Version="3.5.0" />
19+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.1" />
20+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.1" />
21+
<PackageReference Include="OpenTelemetry" Version="1.11.2" />
22+
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.11.2" />
23+
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.11.2" />
24+
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.11.0" />
25+
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.11.0" />
26+
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.11.0" />
2727
<PackageReference Include="ProjectOrigin.PedersenCommitment" Version="1.1.1" />
2828
<PackageReference Include="ProjectOrigin.HierarchicalDeterministicKeys" Version="1.1.0" />
29-
<PackageReference Include="Serilog.AspNetCore" Version="8.0.3" />
29+
<PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
3030
<PackageReference Include="Serilog.Enrichers.Span" Version="3.1.0" />
3131
<PackageReference Include="Serilog.Expressions" Version="5.0.0" />
32-
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.9.0" />
33-
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.9.0" />
32+
<PackageReference Include="Swashbuckle.AspNetCore" Version="7.2.0" />
33+
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="7.2.0" />
3434
</ItemGroup>
3535

3636
<ItemGroup>

‎test/ProjectOrigin.Vault.Tests/CommandHandlers/VerifySliceCommandHandlerTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using AutoFixture;
22
using FluentAssertions;
3-
using Google.Protobuf;
43
using Google.Protobuf.WellKnownTypes;
54
using MassTransit;
65
using MassTransit.Testing;
@@ -24,6 +23,7 @@
2423
using System.Threading.Tasks;
2524
using ProjectOrigin.Vault.Exceptions;
2625
using Xunit;
26+
using ByteString = Google.Protobuf.ByteString;
2727

2828
namespace ProjectOrigin.Vault.Tests.CommandHandlers;
2929

‎test/ProjectOrigin.Vault.Tests/GranularCertificateProjectorTests.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
using ProjectOrigin.PedersenCommitment;
1212
using ProjectOrigin.Vault.Projections;
1313
using Xunit;
14+
using ByteString = Google.Protobuf.ByteString;
1415

1516
namespace ProjectOrigin.Vault.Tests;
1617

‎test/ProjectOrigin.Vault.Tests/ProjectOrigin.Vault.Tests.csproj‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,27 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Microsoft.Extensions.Diagnostics.Testing" Version="8.4.0" />
9+
<PackageReference Include="Microsoft.Extensions.Diagnostics.Testing" Version="9.1.0" />
1010
<PackageReference Include="ProjectOrigin.TestCommon" Version="1.0.0" />
11-
<PackageReference Include="FluentAssertions" Version="6.12.1" />
12-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
13-
<PackageReference Include="Testcontainers.PostgreSql" Version="4.0.0" />
14-
<PackageReference Include="Testcontainers.RabbitMq" Version="4.0.0" />
15-
<PackageReference Include="Verify.Xunit" Version="28.0.0" />
16-
<PackageReference Include="WireMock.Net" Version="1.6.6" />
17-
<PackageReference Include="xunit" Version="2.9.2" />
18-
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
11+
<PackageReference Include="FluentAssertions" Version="[7.0.0]" />
12+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
13+
<PackageReference Include="Testcontainers.PostgreSql" Version="4.1.0" />
14+
<PackageReference Include="Testcontainers.RabbitMq" Version="4.1.0" />
15+
<PackageReference Include="Verify.Xunit" Version="28.9.0" />
16+
<PackageReference Include="WireMock.Net" Version="1.6.11" />
17+
<PackageReference Include="xunit" Version="2.9.3" />
18+
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.1">
1919
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2020
<PrivateAssets>all</PrivateAssets>
2121
</PackageReference>
22-
<PackageReference Include="coverlet.collector" Version="6.0.2">
22+
<PackageReference Include="coverlet.collector" Version="6.0.3">
2323
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2424
<PrivateAssets>all</PrivateAssets>
2525
</PackageReference>
26-
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="8.0.10" />
27-
<PackageReference Include="Grpc.AspNetCore" Version="2.66.0" />
26+
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="9.0.1" />
27+
<PackageReference Include="Grpc.AspNetCore" Version="2.67.0" />
2828
<PackageReference Include="AutoFixture" Version="4.18.1" />
29-
<PackageReference Include="NSubstitute" Version="5.1.0" />
29+
<PackageReference Include="NSubstitute" Version="5.3.0" />
3030
</ItemGroup>
3131

3232
<ItemGroup>

0 commit comments

Comments
 (0)