Skip to content

Commit ccfe792

Browse files
alexyakuninalexyakunin
committed
chore: migrate to Fusion v6.8.1.
1 parent ca7e492 commit ccfe792

34 files changed

+221
-171
lines changed

‎docs/tutorial/Part09.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ All these methods take up to 3 arguments:
306306
- `bool isolate = false` - an optional parameter indicating whether
307307
the command should be executed in isolated fashion. If it's true,
308308
the command will be executed inside
309-
[`ExecutionContext.SuppressFlow` block](https://docs.microsoft.com/en-us/dotnet/api/system.threading.executioncontext.suppressflow?view=net-5.0),
309+
[`ExecutionContext.TrySuppressFlow` block](https://docs.microsoft.com/en-us/dotnet/api/system.threading.executioncontext.suppressflow?view=net-5.0),
310310
so it will also be the outermost for sure.
311311
- `CancellationToken cancellationToken = default` -
312312
a usual argument of almost any async method.

‎docs/tutorial/Tutorial.csproj

+6-3
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,19 @@
1818
</ItemGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="Stl.Fusion.Server" Version="6.5.16" />
21+
<PackageReference Include="Stl.Fusion.Server" Version="6.8.1" />
2222
<PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
2323
<PackageReference Include="System.CommandLine.DragonFruit" Version="0.4.0-alpha.22272.1" />
2424
</ItemGroup>
2525

2626

2727
<!-- Roslyn generators/analyzers -->
2828
<ItemGroup>
29-
<PackageReference Include="MemoryPack.Generator" Version="1.9.16" />
30-
<PackageReference Include="Stl.Generators" Version="6.5.16" />
29+
<PackageReference Include="MemoryPack.Generator" Version="1.10.0">
30+
<PrivateAssets>all</PrivateAssets>
31+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
32+
</PackageReference>
33+
<PackageReference Include="Stl.Generators" Version="6.8.1" />
3134
</ItemGroup>
3235

3336
</Project>

‎src/Benchmark/Benchmark.csproj

+8-5
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,21 @@
2424
</ItemGroup>
2525

2626
<ItemGroup>
27-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.0-rc.*" />
27+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.0" />
2828
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0-rc.*" />
2929
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.0-rc.*" />
30-
<PackageReference Include="Stl.Fusion.Server" Version="6.5.16" />
31-
<PackageReference Include="Stl.RestEase" Version="6.5.16" />
30+
<PackageReference Include="Stl.Fusion.Server" Version="6.8.1" />
31+
<PackageReference Include="Stl.RestEase" Version="6.8.1" />
3232
</ItemGroup>
3333

3434
<!-- Roslyn generators/analyzers -->
3535
<ItemGroup>
36-
<PackageReference Include="MemoryPack.Generator" Version="1.9.16" />
36+
<PackageReference Include="MemoryPack.Generator" Version="1.10.0">
37+
<PrivateAssets>all</PrivateAssets>
38+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
39+
</PackageReference>
3740
<PackageReference Include="RestEase.SourceGenerator" Version="1.6.4" />
38-
<PackageReference Include="Stl.Generators" Version="6.5.16" />
41+
<PackageReference Include="Stl.Generators" Version="6.8.1" />
3942
</ItemGroup>
4043

4144
</Project>

‎src/Blazor/Abstractions/Abstractions.csproj

+8-5
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,18 @@
1111

1212
<ItemGroup>
1313
<PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="8.0.0-rc.*" />
14-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0-rc.2.23479.6" />
15-
<PackageReference Include="Stl.Fusion" Version="6.5.16" />
16-
<PackageReference Include="Stl.Fusion.Ext.Contracts" Version="6.5.16" />
14+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
15+
<PackageReference Include="Stl.Fusion" Version="6.8.1" />
16+
<PackageReference Include="Stl.Fusion.Ext.Contracts" Version="6.8.1" />
1717
</ItemGroup>
1818

1919
<!-- Roslyn generators/analyzers -->
2020
<ItemGroup>
21-
<PackageReference Include="MemoryPack.Generator" Version="1.9.16" />
22-
<PackageReference Include="Stl.Generators" Version="6.5.16" />
21+
<PackageReference Include="MemoryPack.Generator" Version="1.10.0">
22+
<PrivateAssets>all</PrivateAssets>
23+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
24+
</PackageReference>
25+
<PackageReference Include="Stl.Generators" Version="6.8.1" />
2326
</ItemGroup>
2427

2528
</Project>

‎src/Blazor/ConsoleClient/ConsoleClient.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Stl.Fusion" Version="6.5.16" />
13+
<PackageReference Include="Stl.Fusion" Version="6.8.1" />
1414
</ItemGroup>
1515

1616
<ItemGroup>

‎src/Blazor/Server/Server.csproj

+8-8
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,17 @@
1919
</ItemGroup>
2020

2121
<ItemGroup>
22-
<PackageReference Include="AspNet.Security.OAuth.GitHub" Version="7.0.4" />
22+
<PackageReference Include="AspNet.Security.OAuth.GitHub" Version="8.0.0" />
2323
<PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="2.2.0" />
24-
<PackageReference Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="8.0.0-rc.2.23480.2" />
25-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.0-rc.2.23480.2" />
24+
<PackageReference Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="8.0.0" />
25+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.0" />
2626
<PackageReference Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="8.0.0-rc.*" />
27-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.0-rc.*" />
27+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.0" />
2828
<PackageReference Include="SixLabors.ImageSharp" Version="3.0.2" />
29-
<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.0.0" />
30-
<PackageReference Include="Stl.Fusion.Server" Version="6.5.16" />
31-
<PackageReference Include="Stl.Fusion.EntityFramework" Version="6.5.16" />
32-
<PackageReference Include="Stl.RestEase" Version="6.5.16" />
29+
<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.0.1" />
30+
<PackageReference Include="Stl.Fusion.Server" Version="6.8.1" />
31+
<PackageReference Include="Stl.Fusion.EntityFramework" Version="6.8.1" />
32+
<PackageReference Include="Stl.RestEase" Version="6.8.1" />
3333
</ItemGroup>
3434

3535
<ItemGroup>

‎src/Blazor/Server/Services/ScreenshotService.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ private DirectBitmap TakeScreenshot()
8686
PointF Wave(double xRate, double yRate, double offset = 0)
8787
{
8888
var (hw, hh) = (w / 2f, h / 2f);
89-
var x = hw + hw * (float) Math.Sin(now * xRate + offset);
90-
var y = hh + hh * (float) Math.Cos(now * yRate + offset);
89+
var x = hw + hw * (float)Math.Sin(now * xRate + offset);
90+
var y = hh + hh * (float)Math.Cos(now * yRate + offset);
9191
return new PointF(x, y);
9292
}
9393

‎src/Blazor/UI/UI.csproj

+11-11
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,17 @@
3030
</ItemGroup>
3131

3232
<ItemGroup>
33-
<PackageReference Include="Blazorise" Version="1.3.1" />
34-
<PackageReference Include="Blazorise.Bootstrap" Version="1.3.1" />
35-
<PackageReference Include="Blazorise.DataGrid" Version="1.3.1" />
36-
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.3.1" />
37-
<PackageReference Include="Blazorise.Sidebar" Version="1.3.1" />
38-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0-rc.2.23480.2" />
39-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0-rc.2.23480.2" PrivateAssets="all" />
40-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0-rc.2.23479.6" />
41-
<PackageReference Include="Stl.Fusion.Blazor" Version="6.5.16" />
42-
<PackageReference Include="Stl.Fusion.Blazor.Authentication" Version="6.5.16" />
43-
<PackageReference Include="Stl.Fusion.Ext.Contracts" Version="6.5.16" />
33+
<PackageReference Include="Blazorise" Version="1.3.3" />
34+
<PackageReference Include="Blazorise.Bootstrap" Version="1.3.3" />
35+
<PackageReference Include="Blazorise.DataGrid" Version="1.3.3" />
36+
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.3.3" />
37+
<PackageReference Include="Blazorise.Sidebar" Version="1.3.3" />
38+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0" />
39+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0" PrivateAssets="all" />
40+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
41+
<PackageReference Include="Stl.Fusion.Blazor" Version="6.8.1" />
42+
<PackageReference Include="Stl.Fusion.Blazor.Authentication" Version="6.8.1" />
43+
<PackageReference Include="Stl.Fusion.Ext.Contracts" Version="6.8.1" />
4444
<PackageReference Include="UAParser" Version="3.1.46" />
4545
</ItemGroup>
4646

‎src/HelloBlazorHybrid/Abstractions/Abstractions.csproj

+6-3
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,16 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Stl.Fusion" Version="6.5.16" />
14+
<PackageReference Include="Stl.Fusion" Version="6.8.1" />
1515
</ItemGroup>
1616

1717
<!-- Roslyn generators/analyzers -->
1818
<ItemGroup>
19-
<PackageReference Include="MemoryPack.Generator" Version="1.9.16" />
20-
<PackageReference Include="Stl.Generators" Version="6.5.16" />
19+
<PackageReference Include="MemoryPack.Generator" Version="1.10.0">
20+
<PrivateAssets>all</PrivateAssets>
21+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
22+
</PackageReference>
23+
<PackageReference Include="Stl.Generators" Version="6.8.1" />
2124
</ItemGroup>
2225

2326
</Project>

‎src/HelloBlazorHybrid/Server/Server.csproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="AspNet.Security.OAuth.GitHub" Version="7.0.4" />
14-
<PackageReference Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="8.0.0-rc.2.23480.2" />
15-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.0-rc.2.23480.2" />
13+
<PackageReference Include="AspNet.Security.OAuth.GitHub" Version="8.0.0" />
14+
<PackageReference Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="8.0.0" />
15+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.0" />
1616
<PackageReference Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="8.0.0-rc.*" />
17-
<PackageReference Include="Stl.Fusion.EntityFramework" Version="6.5.16" />
18-
<PackageReference Include="Stl.Fusion.Server" Version="6.5.16" />
17+
<PackageReference Include="Stl.Fusion.EntityFramework" Version="6.8.1" />
18+
<PackageReference Include="Stl.Fusion.Server" Version="6.8.1" />
1919
</ItemGroup>
2020

2121
<ItemGroup>

‎src/HelloBlazorHybrid/Services/ChatBotService.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ protected virtual async Task OnChatPost(Chat_Post command, CancellationToken can
4141
// Now we need to suppress ExecutionContext flow to ensure
4242
// Reaction runs its commands outside of the current command context,
4343
// outside Computed.Invalidate() block, etc.
44-
using var suppressing = ExecutionContextExt.SuppressFlow();
44+
using var suppressing = ExecutionContextExt.TrySuppressFlow();
4545
_ = Task.Run(() => Reaction(command, default), default);
4646
}
4747
}

‎src/HelloBlazorHybrid/Services/Services.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</ItemGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="Stl.Fusion.EntityFramework" Version="6.5.16" />
17+
<PackageReference Include="Stl.Fusion.EntityFramework" Version="6.8.1" />
1818
</ItemGroup>
1919

2020
</Project>

‎src/HelloBlazorHybrid/UI/UI.csproj

+11-11
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,17 @@
1616
</ItemGroup>
1717

1818
<ItemGroup>
19-
<PackageReference Include="Blazorise" Version="1.3.1" />
20-
<PackageReference Include="Blazorise.Bootstrap" Version="1.3.1" />
21-
<PackageReference Include="Blazorise.DataGrid" Version="1.3.1" />
22-
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.3.1" />
23-
<PackageReference Include="Blazorise.Sidebar" Version="1.3.1" />
24-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0-rc.2.23480.2" />
25-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0-rc.2.23480.2" PrivateAssets="all" />
26-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0-rc.2.23479.6" />
27-
<PackageReference Include="Stl.Fusion.Blazor" Version="6.5.16" />
28-
<PackageReference Include="Stl.Fusion.Blazor.Authentication" Version="6.5.16" />
29-
<PackageReference Include="Stl.Fusion.Ext.Contracts" Version="6.5.16" />
19+
<PackageReference Include="Blazorise" Version="1.3.3" />
20+
<PackageReference Include="Blazorise.Bootstrap" Version="1.3.3" />
21+
<PackageReference Include="Blazorise.DataGrid" Version="1.3.3" />
22+
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.3.3" />
23+
<PackageReference Include="Blazorise.Sidebar" Version="1.3.3" />
24+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0" />
25+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0" PrivateAssets="all" />
26+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
27+
<PackageReference Include="Stl.Fusion.Blazor" Version="6.8.1" />
28+
<PackageReference Include="Stl.Fusion.Blazor.Authentication" Version="6.8.1" />
29+
<PackageReference Include="Stl.Fusion.Ext.Contracts" Version="6.8.1" />
3030
<PackageReference Include="UAParser" Version="3.1.47" />
3131
</ItemGroup>
3232

‎src/HelloBlazorServer/HelloBlazorServer.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Stl.Fusion.Blazor" Version="6.5.16" />
13-
<PackageReference Include="Stl.Fusion.Server" Version="6.5.16" />
12+
<PackageReference Include="Stl.Fusion.Blazor" Version="6.8.1" />
13+
<PackageReference Include="Stl.Fusion.Server" Version="6.8.1" />
1414
</ItemGroup>
1515

1616
<!-- Roslyn generators/analyzers -->
1717
<ItemGroup>
18-
<PackageReference Include="Stl.Generators" Version="6.5.16" />
18+
<PackageReference Include="Stl.Generators" Version="6.8.1" />
1919
</ItemGroup>
2020

2121
</Project>

‎src/HelloBlazorServer/Services/ChatBotService.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ protected virtual async Task OnChatPost(Chat_Post command, CancellationToken can
4040
// Now we need to suppress ExecutionContext flow to ensure
4141
// Reaction runs its commands outside of the current command context,
4242
// outside Computed.Invalidate() block, etc.
43-
using var suppressing = ExecutionContextExt.SuppressFlow();
43+
using var suppressing = ExecutionContextExt.TrySuppressFlow();
4444
_ = Task.Run(() => Reaction(command, default), default);
4545
}
4646
}

‎src/HelloCart/HelloCart.csproj

+9-6
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,19 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.0-rc.*" />
13-
<PackageReference Include="Stl.Fusion.EntityFramework" Version="6.5.16" />
14-
<PackageReference Include="Stl.Fusion.EntityFramework.Redis" Version="6.5.16" />
15-
<PackageReference Include="Stl.Fusion.Server" Version="6.5.16" />
12+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.0" />
13+
<PackageReference Include="Stl.Fusion.EntityFramework" Version="6.8.1" />
14+
<PackageReference Include="Stl.Fusion.EntityFramework.Redis" Version="6.8.1" />
15+
<PackageReference Include="Stl.Fusion.Server" Version="6.8.1" />
1616
</ItemGroup>
1717

1818
<!-- Roslyn generators/analyzers -->
1919
<ItemGroup>
20-
<PackageReference Include="MemoryPack.Generator" Version="1.9.16" />
21-
<PackageReference Include="Stl.Generators" Version="6.5.16" />
20+
<PackageReference Include="MemoryPack.Generator" Version="1.10.0">
21+
<PrivateAssets>all</PrivateAssets>
22+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
23+
</PackageReference>
24+
<PackageReference Include="Stl.Generators" Version="6.8.1" />
2225
</ItemGroup>
2326

2427
</Project>

‎src/HelloCommandR/HelloCommandR.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Stl.Fusion" Version="6.5.16" />
12+
<PackageReference Include="Stl.Fusion" Version="6.8.1" />
1313
</ItemGroup>
1414

1515
<!-- Roslyn generators/analyzers -->
1616
<ItemGroup>
17-
<PackageReference Include="Stl.Generators" Version="6.5.16" />
17+
<PackageReference Include="Stl.Generators" Version="6.8.1" />
1818
</ItemGroup>
1919

2020
</Project>

‎src/HelloWorld/HelloWorld.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Stl.Fusion" Version="6.5.16" />
12+
<PackageReference Include="Stl.Fusion" Version="6.8.1" />
1313
</ItemGroup>
1414

1515
<!-- Roslyn generators/analyzers -->
1616
<ItemGroup>
17-
<PackageReference Include="Stl.Generators" Version="6.5.16" />
17+
<PackageReference Include="Stl.Generators" Version="6.8.1" />
1818
</ItemGroup>
1919

2020
</Project>

‎src/MiniRpc/MiniRpc.csproj

+6-3
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,16 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Stl.Fusion.Server" Version="6.5.16" />
12+
<PackageReference Include="Stl.Fusion.Server" Version="6.8.1" />
1313
</ItemGroup>
1414

1515
<!-- Roslyn generators/analyzers -->
1616
<ItemGroup>
17-
<PackageReference Include="MemoryPack.Generator" Version="1.9.16" />
18-
<PackageReference Include="Stl.Generators" Version="6.5.16" />
17+
<PackageReference Include="MemoryPack.Generator" Version="1.10.0">
18+
<PrivateAssets>all</PrivateAssets>
19+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
20+
</PackageReference>
21+
<PackageReference Include="Stl.Generators" Version="6.8.1" />
1922
</ItemGroup>
2023

2124
</Project>

‎src/MultiServerRpc/MultiServerRpc.csproj

+6-3
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,16 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Stl.Fusion.Server" Version="6.5.16" />
12+
<PackageReference Include="Stl.Fusion.Server" Version="6.8.1" />
1313
</ItemGroup>
1414

1515
<!-- Roslyn generators/analyzers -->
1616
<ItemGroup>
17-
<PackageReference Include="MemoryPack.Generator" Version="1.9.16" />
18-
<PackageReference Include="Stl.Generators" Version="6.5.16" />
17+
<PackageReference Include="MemoryPack.Generator" Version="1.10.0">
18+
<PrivateAssets>all</PrivateAssets>
19+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
20+
</PackageReference>
21+
<PackageReference Include="Stl.Generators" Version="6.8.1" />
1922
</ItemGroup>
2023

2124
</Project>

‎src/RpcBenchmark/CommandLine/ClientCommand.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,9 @@ public override async Task<int> RunAsync()
7878
WriteLine("Client settings:");
7979
WriteLine($" Server URL: {Url}");
8080
WriteLine($" Test plan: {WarmupDuration:N}s warmup, {TryCount} x {Duration:N}s runs");
81-
WriteLine($" Total worker count: {WorkersValue}");
82-
WriteLine($" Client concurrency: {ClientConcurrencyValue}");
8381
WriteLine($" Client count: {(WorkersValue + ClientConcurrencyValue - 1) / ClientConcurrencyValue}");
82+
WriteLine($" Client concurrency: {ClientConcurrencyValue}");
83+
WriteLine($" Total worker count: {WorkersValue}");
8484
await Task.Delay(TimeSpan.FromSeconds(1), cancellationToken).ConfigureAwait(false);
8585

8686
// Run
@@ -94,7 +94,7 @@ public override async Task<int> RunAsync()
9494

9595
if (Wait)
9696
ReadKey();
97-
await StopTokenSource.CancelAsync(); // Stops the server if it's running
97+
StopTokenSource.Cancel(); // Stops the server if it's running
9898
return 0;
9999
}
100100
}

‎src/RpcBenchmark/CommandLine/RootCommand.cs

-7
This file was deleted.

0 commit comments

Comments
 (0)