Skip to content

Commit b7d04bd

Browse files
alexeyzimarevalexeyzimarev
committed
Update packages and .NET version
1 parent 7029b05 commit b7d04bd

File tree

13 files changed

+37
-24
lines changed

13 files changed

+37
-24
lines changed

‎Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
ARG RUNNER_IMG=
1+
ARG RUNNER_IMG
22

3-
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/nightly/sdk:8.0-preview AS builder
3+
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/nightly/sdk:8.0 AS builder
44
ARG TARGETARCH
55

66
WORKDIR /app
@@ -23,7 +23,7 @@ ARG TARGETARCH
2323
COPY ./src ./src
2424
RUN dotnet publish ./src/es-replicator -c Release -a $TARGETARCH -clp:NoSummary --no-self-contained -o /app/publish
2525

26-
FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS runner
26+
FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS runner
2727

2828
WORKDIR /app
2929
COPY --from=publish /app/publish .

‎src/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>net7.0</TargetFramework>
3+
<TargetFramework>net8.0</TargetFramework>
44
<LangVersion>11</LangVersion>
55
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
66
<NoWarn>$(NoWarn);CS1591;CS0618;</NoWarn>

‎src/EventStore.Replicator.Esdb.Grpc/EventStore.Replicator.Esdb.Grpc.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<ItemGroup>
3-
<PackageReference Include="EventStore.Client.Grpc.Streams" Version="23.0.0" />
3+
<PackageReference Include="EventStore.Client.Grpc.Streams" Version="23.1.0" />
4+
<PackageReference Include="Grpc.Net.Client" Version="2.60.0" />
45
<Using Include="EventStore.Client" />
6+
<PackageReference Update="JetBrains.Annotations" Version="2023.3.0" />
57
</ItemGroup>
68
<ItemGroup>
79
<ProjectReference Include="..\EventStore.Replicator.Shared\EventStore.Replicator.Shared.csproj" />

‎src/EventStore.Replicator.Esdb.Tcp/EventStore.Replicator.Esdb.Tcp.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<ItemGroup>
33
<PackageReference Include="EventStore.Client" Version="22.0.0" />
4-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
5-
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0" />
4+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
5+
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
66
<Using Include="EventStore.ClientAPI" />
7+
<PackageReference Update="JetBrains.Annotations" Version="2023.3.0" />
78
</ItemGroup>
89

910
<ItemGroup>

‎src/EventStore.Replicator.Http/EventStore.Replicator.Http.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,7 @@
22
<ItemGroup>
33
<ProjectReference Include="..\EventStore.Replicator.Shared\EventStore.Replicator.Shared.csproj" />
44
</ItemGroup>
5+
<ItemGroup>
6+
<PackageReference Update="JetBrains.Annotations" Version="2023.3.0" />
7+
</ItemGroup>
58
</Project>

‎src/EventStore.Replicator.JavaScript/EventStore.Replicator.JavaScript.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@
44
</ItemGroup>
55
<ItemGroup>
66
<PackageReference Include="Jint" Version="3.0.0-beta-2049" />
7+
<PackageReference Update="JetBrains.Annotations" Version="2023.3.0" />
78
</ItemGroup>
89
</Project>

‎src/EventStore.Replicator.Kafka/EventStore.Replicator.Kafka.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<ItemGroup>
3-
<PackageReference Include="Confluent.Kafka" Version="2.1.0" />
3+
<PackageReference Include="Confluent.Kafka" Version="2.3.0" />
44
<Using Include="Confluent.Kafka" />
5+
<PackageReference Update="JetBrains.Annotations" Version="2023.3.0" />
56
</ItemGroup>
67

78
<ItemGroup>

‎src/EventStore.Replicator.Kafka/KafkaJsMessageRouter.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using Jint;
44
using Jint.Native;
55
using Jint.Native.Json;
6+
// ReSharper disable NotAccessedPositionalProperty.Global
67

78
namespace EventStore.Replicator.Kafka;
89

@@ -16,7 +17,7 @@ public KafkaJsMessageRouter(string routingFunction) {
1617
AsRoute
1718
);
1819

19-
static MessageRoute AsRoute(JsValue result, RouteEvent evt) {
20+
static MessageRoute AsRoute(JsValue? result, RouteEvent evt) {
2021
if (result == null || result.IsUndefined() || !result.IsObject())
2122
return DefaultRouters.RouteByCategory(evt.Stream);
2223

@@ -36,7 +37,7 @@ public MessageRoute Route(ProposedEvent evt) {
3637
evt.EventDetails.Stream,
3738
evt.EventDetails.EventType,
3839
parser.Parse(evt.Data.AsUtf8String()),
39-
parser.Parse(evt.Metadata?.AsUtf8String())
40+
evt.Metadata == null ? null : parser.Parse(evt.Metadata.AsUtf8String())
4041
)
4142
);
4243
}

‎src/EventStore.Replicator.Mongo/EventStore.Replicator.Mongo.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<ItemGroup>
3-
<PackageReference Include="MongoDB.Driver" Version="2.19.1" />
3+
<PackageReference Include="MongoDB.Driver" Version="2.23.1" />
4+
<PackageReference Update="JetBrains.Annotations" Version="2023.3.0" />
45
</ItemGroup>
56
<ItemGroup>
67
<ProjectReference Include="..\EventStore.Replicator.Shared\EventStore.Replicator.Shared.csproj" />

‎src/EventStore.Replicator.Shared/EventStore.Replicator.Shared.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<ItemGroup>
77
<PackageReference Include="LibLog" Version="5.0.8" PrivateAssets="All" />
88
<PackageReference Include="Ubiquitous.Metrics" Version="0.4.0" />
9-
<PackageReference Include="YamlDotNet" Version="13.1.0" />
9+
<PackageReference Include="YamlDotNet" Version="15.1.1" />
10+
<PackageReference Update="JetBrains.Annotations" Version="2023.3.0" />
1011
</ItemGroup>
1112
</Project>

‎src/EventStore.Replicator/EventStore.Replicator.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<ItemGroup>
33
<PackageReference Include="GreenPipes" Version="4.0.1" />
4+
<PackageReference Update="JetBrains.Annotations" Version="2023.3.0" />
45
</ItemGroup>
56

67
<ItemGroup>

‎src/es-replicator/es-replicator.csproj

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,14 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Serilog" Version="2.12.0" />
11-
<PackageReference Include="Serilog.AspNetCore" Version="6.1.0" />
12-
<PackageReference Include="prometheus-net.AspNetCore" Version="8.0.0" />
10+
<PackageReference Include="Serilog" Version="3.1.1" />
11+
<PackageReference Include="Serilog.AspNetCore" Version="8.0.1" />
12+
<PackageReference Include="prometheus-net.AspNetCore" Version="8.2.1" />
1313
<PackageReference Include="NetEscapades.Configuration.Yaml" Version="3.1.0" />
1414
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
15-
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="7.0.5" />
15+
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="8.0.1" />
1616
<PackageReference Include="Ubiquitous.Metrics.Prometheus" Version="0.4.0" />
17+
<PackageReference Update="JetBrains.Annotations" Version="2023.3.0" />
1718
</ItemGroup>
1819

1920
<ItemGroup>

‎test/EventStore.Replicator.Tests/EventStore.Replicator.Tests.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<LangVersion>11</LangVersion>
66
<IsPackable>false</IsPackable>
77
<ImplicitUsings>enable</ImplicitUsings>
@@ -10,14 +10,14 @@
1010
<ItemGroup>
1111
<PackageReference Include="DockerComposeFixture" Version="1.1.0" />
1212
<PackageReference Include="EventStore.Client" Version="22.0.0" />
13-
<PackageReference Include="EventStore.Client.Grpc.Streams" Version="23.0.0" />
14-
<PackageReference Include="FluentAssertions" Version="6.11.0" />
15-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
16-
<PackageReference Include="Serilog" Version="2.12.0" />
13+
<PackageReference Include="EventStore.Client.Grpc.Streams" Version="23.1.0" />
14+
<PackageReference Include="FluentAssertions" Version="6.12.0" />
15+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
16+
<PackageReference Include="Serilog" Version="3.1.1" />
1717
<PackageReference Include="Serilog.Sinks.XUnit" Version="3.0.5" />
18-
<PackageReference Include="xunit" Version="2.4.2" />
19-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" PrivateAssets="All" />
20-
<PackageReference Include="coverlet.collector" Version="3.2.0" PrivateAssets="All" />
18+
<PackageReference Include="xunit" Version="2.6.6" />
19+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6" PrivateAssets="All" />
20+
<PackageReference Include="coverlet.collector" Version="6.0.0" PrivateAssets="All" />
2121
</ItemGroup>
2222

2323
<ItemGroup>

0 commit comments

Comments
 (0)