Skip to content

Commit 2b99d82

Browse files
st0o0st0o0
committed
build: update Akka and pin dependencies
1 parent 1cdf770 commit 2b99d82

11 files changed

Lines changed: 154 additions & 140 deletions

File tree

‎src/Directory.Packages.props‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<Project>
22
<PropertyGroup>
33
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4+
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
45
</PropertyGroup>
56
<ItemGroup Label="Akka.NET">
67
<PackageVersion Include="Akka.Hosting" Version="1.5.67" />
@@ -12,8 +13,6 @@
1213
<PackageVersion Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.1" />
1314
</ItemGroup>
1415
<ItemGroup Label="Testing">
15-
<PackageVersion Include="Akka.Streams.TestKit" Version="1.5.65" />
16-
<PackageVersion Include="Akka.TestKit.Xunit" Version="1.5.65" />
1716
<PackageVersion Include="xunit.v3.mtp-v2" Version="3.2.2" />
1817
<PackageVersion Include="PublicApiGenerator" Version="11.5.4" />
1918
<PackageVersion Include="Verify.DiffPlex" Version="3.1.2" />
@@ -23,6 +22,9 @@
2322
<ItemGroup Label="Benchmarks">
2423
<PackageVersion Include="BenchmarkDotNet" Version="0.15.8" />
2524
</ItemGroup>
26-
<ItemGroup Label="Memory">
25+
<ItemGroup Label="Transitive Pins">
26+
<PackageVersion Include="OpenTelemetry.Api" Version="1.15.3" />
27+
<PackageVersion Include="OpenTelemetry.Api.ProviderBuilderExtensions" Version="1.15.3" />
28+
<PackageVersion Include="OpenTelemetry" Version="1.15.3" />
2729
</ItemGroup>
2830
</Project>

‎src/Servus.Akka.TestKit.Tests/TestConnectionStageBuilderExtensionsSpec.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public async Task OnData_should_invoke_handler_on_TransportData()
3131
})
3232
.Build();
3333

34-
Source.From<ITransportOutbound>([
34+
_ = Source.From<ITransportOutbound>([
3535
new ConnectTransport(new TcpTransportOptions { Host = "localhost", Port = 80 }),
3636
new TransportData(new byte[] { 0xAA })
3737
])
@@ -70,7 +70,7 @@ public async Task OnOpenStream_should_invoke_handler_on_OpenStream()
7070
})
7171
.Build();
7272

73-
Source.From<ITransportOutbound>([
73+
_ = Source.From<ITransportOutbound>([
7474
new ConnectTransport(new TcpTransportOptions { Host = "localhost", Port = 80 }),
7575
new OpenStream(42, StreamDirection.Bidirectional)
7676
])
@@ -111,7 +111,7 @@ public async Task OnMultiplexedData_should_invoke_handler_on_MultiplexedData()
111111
})
112112
.Build();
113113

114-
Source.From<ITransportOutbound>([
114+
_ = Source.From<ITransportOutbound>([
115115
new ConnectTransport(new TcpTransportOptions { Host = "localhost", Port = 80 }),
116116
new MultiplexedData(buf, 7)
117117
])
@@ -138,7 +138,7 @@ public async Task OnDisconnect_should_invoke_handler_on_DisconnectTransport()
138138
})
139139
.Build();
140140

141-
Source.From<ITransportOutbound>([
141+
_ = Source.From<ITransportOutbound>([
142142
new ConnectTransport(new TcpTransportOptions { Host = "localhost", Port = 80 }),
143143
new DisconnectTransport(DisconnectReason.Timeout)
144144
])
@@ -172,7 +172,7 @@ public async Task AutoStreamOpened_should_respond_with_StreamOpened_for_matching
172172
.AutoStreamOpened(42, StreamDirection.Bidirectional)
173173
.Build();
174174

175-
Source.From<ITransportOutbound>([
175+
_ = Source.From<ITransportOutbound>([
176176
new ConnectTransport(new TcpTransportOptions { Host = "localhost", Port = 80 }),
177177
new OpenStream(42, StreamDirection.Bidirectional)
178178
])
@@ -207,7 +207,7 @@ public async Task AutoStreamOpened_should_not_respond_for_different_streamId()
207207
.AutoStreamOpened(42)
208208
.Build();
209209

210-
Source.From<ITransportOutbound>([
210+
_ = Source.From<ITransportOutbound>([
211211
new ConnectTransport(new TcpTransportOptions { Host = "localhost", Port = 80 }),
212212
new OpenStream(99, StreamDirection.Bidirectional)
213213
])
@@ -253,7 +253,7 @@ public async Task EchoMultiplexedData_should_echo_back_data()
253253
originalData.CopyTo(originalBuf.FullMemory.Span);
254254
originalBuf.Length = originalData.Length;
255255

256-
Source.From<ITransportOutbound>([
256+
_ = Source.From<ITransportOutbound>([
257257
new ConnectTransport(new TcpTransportOptions { Host = "localhost", Port = 80 }),
258258
new MultiplexedData(originalBuf, 7)
259259
])
@@ -295,7 +295,7 @@ public async Task OnCompleteWrites_should_invoke_handler_on_CompleteWrites()
295295
})
296296
.Build();
297297

298-
Source.From<ITransportOutbound>([
298+
_ = Source.From<ITransportOutbound>([
299299
new ConnectTransport(new TcpTransportOptions { Host = "localhost", Port = 80 }),
300300
new CompleteWrites(0)
301301
])
@@ -334,7 +334,7 @@ public async Task OnResetStream_should_invoke_handler_on_ResetStream()
334334
})
335335
.Build();
336336

337-
Source.From<ITransportOutbound>([
337+
_ = Source.From<ITransportOutbound>([
338338
new ConnectTransport(new TcpTransportOptions { Host = "localhost", Port = 80 }),
339339
new ResetStream(99, 0)
340340
])

‎src/Servus.Akka.TestKit.Tests/TestConnectionStageExtensionsSpec.cs‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public async Task PushData_bytes_should_deliver_TransportData_inbound()
2525
.AutoConnect()
2626
.Build();
2727

28-
Source.Single<ITransportOutbound>(new ConnectTransport(new TcpTransportOptions { Host = "localhost", Port = 80 }))
28+
_ = Source.Single<ITransportOutbound>(new ConnectTransport(new TcpTransportOptions { Host = "localhost", Port = 80 }))
2929
.Via(stage.AsFlow())
3030
.RunWith(Sink.ForEach<ITransportInbound>(msg =>
3131
{
@@ -57,7 +57,7 @@ public async Task PushData_string_should_deliver_TransportData_inbound()
5757
.AutoConnect()
5858
.Build();
5959

60-
Source.Single<ITransportOutbound>(new ConnectTransport(new TcpTransportOptions { Host = "localhost", Port = 80 }))
60+
_ = Source.Single<ITransportOutbound>(new ConnectTransport(new TcpTransportOptions { Host = "localhost", Port = 80 }))
6161
.Via(stage.AsFlow())
6262
.RunWith(Sink.ForEach<ITransportInbound>(msg =>
6363
{
@@ -88,7 +88,7 @@ public async Task PushStreamOpened_should_deliver_StreamOpened_inbound()
8888
.AutoConnect()
8989
.Build();
9090

91-
Source.Single<ITransportOutbound>(new ConnectTransport(new TcpTransportOptions { Host = "localhost", Port = 80 }))
91+
_ = Source.Single<ITransportOutbound>(new ConnectTransport(new TcpTransportOptions { Host = "localhost", Port = 80 }))
9292
.Via(stage.AsFlow())
9393
.RunWith(Sink.ForEach<ITransportInbound>(msg =>
9494
{
@@ -121,7 +121,7 @@ public async Task PushMultiplexedData_should_deliver_MultiplexedData_inbound()
121121
.AutoConnect()
122122
.Build();
123123

124-
Source.Single<ITransportOutbound>(new ConnectTransport(new TcpTransportOptions { Host = "localhost", Port = 80 }))
124+
_ = Source.Single<ITransportOutbound>(new ConnectTransport(new TcpTransportOptions { Host = "localhost", Port = 80 }))
125125
.Via(stage.AsFlow())
126126
.RunWith(Sink.ForEach<ITransportInbound>(msg =>
127127
{
@@ -154,7 +154,7 @@ public async Task SimulateInboundStream_should_push_full_lifecycle()
154154
.AutoConnect()
155155
.Build();
156156

157-
Source.Single<ITransportOutbound>(new ConnectTransport(new TcpTransportOptions { Host = "localhost", Port = 80 }))
157+
_ = Source.Single<ITransportOutbound>(new ConnectTransport(new TcpTransportOptions { Host = "localhost", Port = 80 }))
158158
.Via(stage.AsFlow())
159159
.RunWith(Sink.ForEach<ITransportInbound>(msg =>
160160
{
@@ -190,7 +190,7 @@ public async Task PushDisconnected_should_push_TransportDisconnected()
190190
.AutoConnect()
191191
.Build();
192192

193-
Source.Single<ITransportOutbound>(new ConnectTransport(new TcpTransportOptions { Host = "localhost", Port = 80 }))
193+
_ = Source.Single<ITransportOutbound>(new ConnectTransport(new TcpTransportOptions { Host = "localhost", Port = 80 }))
194194
.Via(stage.AsFlow())
195195
.RunWith(Sink.ForEach<ITransportInbound>(msg =>
196196
{
@@ -219,7 +219,7 @@ public async Task WaitForDataAsync_should_skip_non_data_messages()
219219
.AutoConnect()
220220
.Build();
221221

222-
Source.From<ITransportOutbound>([
222+
_ = Source.From<ITransportOutbound>([
223223
new ConnectTransport(new TcpTransportOptions { Host = "localhost", Port = 80 }),
224224
new TransportData(new byte[] { 0xAA })
225225
])
@@ -238,7 +238,7 @@ public async Task WaitForOpenStreamAsync_should_skip_non_open_messages()
238238
.AutoConnect()
239239
.Build();
240240

241-
Source.From<ITransportOutbound>([
241+
_ = Source.From<ITransportOutbound>([
242242
new ConnectTransport(new TcpTransportOptions { Host = "localhost", Port = 80 }),
243243
new OpenStream(1, StreamDirection.Bidirectional)
244244
])
@@ -261,7 +261,7 @@ public async Task PushStreamClosed_should_deliver_StreamClosed_inbound()
261261
.AutoConnect()
262262
.Build();
263263

264-
Source.Single<ITransportOutbound>(new ConnectTransport(new TcpTransportOptions { Host = "localhost", Port = 80 }))
264+
_ = Source.Single<ITransportOutbound>(new ConnectTransport(new TcpTransportOptions { Host = "localhost", Port = 80 }))
265265
.Via(stage.AsFlow())
266266
.RunWith(Sink.ForEach<ITransportInbound>(msg =>
267267
{
@@ -294,7 +294,7 @@ public async Task PushConnectionMigration_should_deliver_ConnectionMigrationDete
294294
.AutoConnect()
295295
.Build();
296296

297-
Source.Single<ITransportOutbound>(new ConnectTransport(new TcpTransportOptions { Host = "localhost", Port = 80 }))
297+
_ = Source.Single<ITransportOutbound>(new ConnectTransport(new TcpTransportOptions { Host = "localhost", Port = 80 }))
298298
.Via(stage.AsFlow())
299299
.RunWith(Sink.ForEach<ITransportInbound>(msg =>
300300
{
@@ -326,7 +326,7 @@ public async Task WaitForMultiplexedDataAsync_should_skip_non_multiplexed_messag
326326
.AutoConnect()
327327
.Build();
328328

329-
Source.From<ITransportOutbound>([
329+
_ = Source.From<ITransportOutbound>([
330330
new ConnectTransport(new TcpTransportOptions { Host = "localhost", Port = 80 }),
331331
new OpenStream(1, StreamDirection.Bidirectional),
332332
new MultiplexedData(TransportBuffer.Rent(0), 1)
@@ -349,7 +349,7 @@ public async Task PushStreamReadCompleted_should_deliver_StreamReadCompleted_inb
349349
.AutoConnect()
350350
.Build();
351351

352-
Source.Single<ITransportOutbound>(new ConnectTransport(new TcpTransportOptions { Host = "localhost", Port = 80 }))
352+
_ = Source.Single<ITransportOutbound>(new ConnectTransport(new TcpTransportOptions { Host = "localhost", Port = 80 }))
353353
.Via(stage.AsFlow())
354354
.RunWith(Sink.ForEach<ITransportInbound>(msg =>
355355
{
@@ -381,7 +381,7 @@ public async Task PushStreamClosed_with_error_reason_should_deliver_error()
381381
.AutoConnect()
382382
.Build();
383383

384-
Source.Single<ITransportOutbound>(new ConnectTransport(new TcpTransportOptions { Host = "localhost", Port = 80 }))
384+
_ = Source.Single<ITransportOutbound>(new ConnectTransport(new TcpTransportOptions { Host = "localhost", Port = 80 }))
385385
.Via(stage.AsFlow())
386386
.RunWith(Sink.ForEach<ITransportInbound>(msg =>
387387
{
@@ -414,7 +414,7 @@ public async Task PushDisconnected_default_reason_should_be_graceful()
414414
.AutoConnect()
415415
.Build();
416416

417-
Source.Single<ITransportOutbound>(new ConnectTransport(new TcpTransportOptions { Host = "localhost", Port = 80 }))
417+
_ = Source.Single<ITransportOutbound>(new ConnectTransport(new TcpTransportOptions { Host = "localhost", Port = 80 }))
418418
.Via(stage.AsFlow())
419419
.RunWith(Sink.ForEach<ITransportInbound>(msg =>
420420
{

‎src/Servus.Akka.TestKit.Tests/TestConnectionStageSpec.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public async Task Stage_should_materialize_and_deliver_TransportConnected_via_Au
2424

2525
var tcs = new TaskCompletionSource<ITransportInbound>();
2626

27-
Source.Single<ITransportOutbound>(new ConnectTransport(new TcpTransportOptions { Host = "localhost", Port = 80 }))
27+
_ = Source.Single<ITransportOutbound>(new ConnectTransport(new TcpTransportOptions { Host = "localhost", Port = 80 }))
2828
.Via(stage.AsFlow())
2929
.RunWith(Sink.ForEach<ITransportInbound>(msg => tcs.TrySetResult(msg)), _materializer);
3030

@@ -40,7 +40,7 @@ public async Task Stage_should_capture_outbound_messages()
4040
.AutoConnect()
4141
.Build();
4242

43-
Source.Single<ITransportOutbound>(new ConnectTransport(new TcpTransportOptions { Host = "localhost", Port = 80 }))
43+
_ = Source.Single<ITransportOutbound>(new ConnectTransport(new TcpTransportOptions { Host = "localhost", Port = 80 }))
4444
.Via(stage.AsFlow())
4545
.RunWith(Sink.Ignore<ITransportInbound>().MapMaterializedValue(_ => NotUsed.Instance), _materializer);
4646

@@ -61,7 +61,7 @@ public async Task Stage_should_deliver_PushOnce_messages()
6161
var results = new List<ITransportInbound>();
6262
var tcs = new TaskCompletionSource();
6363

64-
Source.Single<ITransportOutbound>(new ConnectTransport(new TcpTransportOptions { Host = "localhost", Port = 80 }))
64+
_ = Source.Single<ITransportOutbound>(new ConnectTransport(new TcpTransportOptions { Host = "localhost", Port = 80 }))
6565
.Via(stage.AsFlow())
6666
.RunWith(Sink.ForEach<ITransportInbound>(msg =>
6767
{
@@ -88,7 +88,7 @@ public async Task Stage_should_support_bidirectional_control()
8888
var inboundResults = new List<ITransportInbound>();
8989
var tcs = new TaskCompletionSource();
9090

91-
Source.From<ITransportOutbound>([
91+
_ = Source.From<ITransportOutbound>([
9292
new ConnectTransport(new TcpTransportOptions { Host = "localhost", Port = 80 }),
9393
new TransportData(new byte[] { 1, 2, 3 })
9494
])
@@ -128,7 +128,7 @@ public async Task Stage_should_record_activity_log()
128128

129129
var tcs = new TaskCompletionSource<ITransportInbound>();
130130

131-
Source.Single<ITransportOutbound>(new ConnectTransport(new TcpTransportOptions { Host = "localhost", Port = 80 }))
131+
_ = Source.Single<ITransportOutbound>(new ConnectTransport(new TcpTransportOptions { Host = "localhost", Port = 80 }))
132132
.Via(stage.AsFlow())
133133
.RunWith(Sink.ForEach<ITransportInbound>(msg => tcs.TrySetResult(msg)), _materializer);
134134

@@ -153,7 +153,7 @@ public async Task Stage_should_invoke_typed_OnOutbound_handlers()
153153
var results = new List<ITransportInbound>();
154154
var tcs = new TaskCompletionSource();
155155

156-
Source.From<ITransportOutbound>([
156+
_ = Source.From<ITransportOutbound>([
157157
new ConnectTransport(new TcpTransportOptions { Host = "localhost", Port = 80 }),
158158
new TransportData(new byte[] { 1, 2, 3 })
159159
])
@@ -185,7 +185,7 @@ public async Task Stage_should_support_implicit_flow_conversion()
185185

186186
var tcs = new TaskCompletionSource<ITransportInbound>();
187187

188-
Source.Single<ITransportOutbound>(new ConnectTransport(new TcpTransportOptions { Host = "localhost", Port = 80 }))
188+
_ = Source.Single<ITransportOutbound>(new ConnectTransport(new TcpTransportOptions { Host = "localhost", Port = 80 }))
189189
.Via(flow)
190190
.RunWith(Sink.ForEach<ITransportInbound>(msg => tcs.TrySetResult(msg)), _materializer);
191191

@@ -208,7 +208,7 @@ public async Task Stage_should_auto_respond_via_PushResponse()
208208
var results = new List<ITransportInbound>();
209209
var tcs = new TaskCompletionSource();
210210

211-
Source.From<ITransportOutbound>([
211+
_ = Source.From<ITransportOutbound>([
212212
new ConnectTransport(new TcpTransportOptions { Host = "localhost", Port = 80 }),
213213
new TransportData(new byte[] { 1, 2, 3 })
214214
])
@@ -241,7 +241,7 @@ public async Task Stage_should_support_PushResponseOnce_for_single_shot()
241241
var results = new List<ITransportInbound>();
242242
var tcs = new TaskCompletionSource();
243243

244-
Source.From<ITransportOutbound>([
244+
_ = Source.From<ITransportOutbound>([
245245
new ConnectTransport(new TcpTransportOptions { Host = "localhost", Port = 80 }),
246246
new TransportData(new byte[] { 1 }),
247247
new TransportData(new byte[] { 2 })

‎src/Servus.Akka.TestKit.Tests/TestListenerStageSpec.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public async Task WithDefaultConnection_should_configure_emitted_connections()
4646
.RunWith(Sink.Seq<Flow<ITransportOutbound, ITransportInbound, NotUsed>>(), _materializer)
4747
.WaitAsync(TimeSpan.FromSeconds(5), ct);
4848

49-
Source.Single<ITransportOutbound>(new ConnectTransport(new TcpTransportOptions { Host = "localhost", Port = 80 }))
49+
_ = Source.Single<ITransportOutbound>(new ConnectTransport(new TcpTransportOptions { Host = "localhost", Port = 80 }))
5050
.Via(flows[0])
5151
.RunWith(Sink.ForEach<ITransportInbound>(msg => tcs.TrySetResult(msg)), _materializer);
5252

@@ -165,7 +165,7 @@ public async Task Emitted_connection_should_be_fully_functional_TestConnectionSt
165165
.RunWith(Sink.Seq<Flow<ITransportOutbound, ITransportInbound, NotUsed>>(), _materializer)
166166
.WaitAsync(TimeSpan.FromSeconds(5), ct);
167167

168-
Source.Single<ITransportOutbound>(new ConnectTransport(new TcpTransportOptions { Host = "localhost", Port = 80 }))
168+
_ = Source.Single<ITransportOutbound>(new ConnectTransport(new TcpTransportOptions { Host = "localhost", Port = 80 }))
169169
.Via(connectionFlows[0])
170170
.RunWith(Sink.ForEach<ITransportInbound>(msg => tcs.TrySetResult(msg)), _materializer);
171171

@@ -232,7 +232,7 @@ public async Task Builder_with_no_config_should_use_AutoConnect_default()
232232
.RunWith(Sink.Seq<Flow<ITransportOutbound, ITransportInbound, NotUsed>>(), _materializer)
233233
.WaitAsync(TimeSpan.FromSeconds(5), ct);
234234

235-
Source.Single<ITransportOutbound>(new ConnectTransport(new TcpTransportOptions { Host = "localhost", Port = 80 }))
235+
_ = Source.Single<ITransportOutbound>(new ConnectTransport(new TcpTransportOptions { Host = "localhost", Port = 80 }))
236236
.Via(connectionFlows[0])
237237
.RunWith(Sink.ForEach<ITransportInbound>(msg =>
238238
{

‎src/Servus.Akka.TestKit/Servus.Akka.TestKit.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-
<IsPackable>true</IsPackable>
4+
<IsPackable>false</IsPackable>
55
</PropertyGroup>
66

77
<ItemGroup>

‎src/Servus.Akka.TestKit/TestConnectionStage.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ private sealed class Logic : TimerGraphStageLogic, IStageContext
9494
private readonly TestConnectionStage _stage;
9595
private readonly Queue<ITransportInbound> _pendingInbound = new();
9696
private bool _downstreamWaiting;
97-
private bool _upstreamFinished;
9897
private Action<ITransportInbound>? _onInboundCallback;
9998

10099
public Logic(TestConnectionStage stage) : base(stage.Shape)
@@ -122,7 +121,6 @@ public Logic(TestConnectionStage stage) : base(stage.Shape)
122121
},
123122
onUpstreamFinish: () =>
124123
{
125-
_upstreamFinished = true;
126124
_stage._outboundChannel.Writer.TryComplete();
127125
},
128126
onUpstreamFailure: ex =>

0 commit comments

Comments
 (0)