Skip to content

Commit 39f88e2

Browse files
authored
Merge pull request #210 from feijie999/dotnet8
Upgrade to. net8 and support Orleans 8.2.0 version
2 parents 32a09d5 + 1da0974 commit 39f88e2

59 files changed

Lines changed: 418 additions & 170 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Setup .NET Core
1919
uses: actions/setup-dotnet@v1
2020
with:
21-
dotnet-version: 6.0.x
21+
dotnet-version: 8.0.x
2222

2323
- name: Install dependencies
2424
run: dotnet restore
@@ -27,7 +27,7 @@ jobs:
2727
- name: Test
2828
run: dotnet test --configuration Release --no-build --verbosity normal --logger:trx
2929
- name: Upload Test Results
30-
uses: actions/upload-artifact@v2.2.0
30+
uses: actions/upload-artifact@v4
3131
with:
3232
# Artifact name
3333
name: Test Results

.github/workflows/prerelease-nuget.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Setup .NET Core
1717
uses: actions/setup-dotnet@v1
1818
with:
19-
dotnet-version: 6.0.x
19+
dotnet-version: 8.0.x
2020

2121
- uses: dotnet/nbgv@master
2222
with:

.github/workflows/release-nuget.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Setup .NET Core
1717
uses: actions/setup-dotnet@v1
1818
with:
19-
dotnet-version: 6.0.x
19+
dotnet-version: 8.0.x
2020

2121
- uses: dotnet/nbgv@master
2222
with:

Directory.Build.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<TargetFramework>net6.0</TargetFramework>
3+
<TargetFramework>net8.0</TargetFramework>
44
<LangVersion>latest</LangVersion>
55
<Version Condition="'$(PackageVersion)' != ''">$(PackageVersion)</Version>
66
<Version Condition="'$(PackageVersion)' == ''">$(Version)</Version>
@@ -38,7 +38,7 @@
3838
</ItemGroup>
3939
<ItemGroup>
4040
<PackageReference Include="Lindhart.Analyser.MissingAwaitWarning" />
41-
<!-- <PackageReference Include="Microsoft.CodeQuality.Analyzers" /> -->
41+
<!-- <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" /> -->
4242
<PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" />
4343
<PackageReference Include="StyleCop.Analyzers" />
4444
</ItemGroup>

Packages.props

Lines changed: 35 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -2,56 +2,58 @@
22

33
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
44
<ItemGroup>
5-
<PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
6-
<PackageReference Update="Microsoft.Extensions.Logging" Version="6.0.0" />
7-
<PackageReference Update="Microsoft.Extensions.Logging.Debug" Version="6.0.0" />
8-
<PackageReference Update="Microsoft.Extensions.DependencyModel" Version="6.0.0" />
9-
<PackageReference Update="Microsoft.Extensions.Caching.Abstractions" Version="6.0.0" />
10-
<PackageReference Update="Microsoft.Extensions.Logging.Abstractions" Version="6.0.1" />
11-
<PackageReference Update="Microsoft.Extensions.ObjectPool" Version="6.0.7" />
12-
<PackageReference Update="Microsoft.Extensions.Options" Version="6.0.0" />
13-
<PackageReference Update="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
14-
<PackageReference Update="BenchmarkDotNet" Version="0.13.1" />
15-
16-
<PackageReference Update="Microsoft.Orleans.CodeGenerator.MSBuild" Version="3.6.2">
17-
<PrivateAssets>all</PrivateAssets>
18-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
19-
</PackageReference>
20-
<PackageReference Update="Microsoft.Orleans.OrleansProviders" Version="3.6.2"/>
21-
<PackageReference Update="Microsoft.Orleans.Core" Version="3.6.2" />
22-
<PackageReference Update="Microsoft.Orleans.Core.Abstractions" Version="3.6.2" />
23-
<PackageReference Update="Microsoft.Orleans.Runtime.Abstractions" Version="3.6.2" />
24-
<PackageReference Update="Microsoft.Orleans.OrleansRuntime" Version="3.6.2" />
25-
<PackageReference Update="Microsoft.Orleans.TestingHost" Version="3.6.2" />
5+
<PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
6+
<PackageReference Update="Microsoft.Extensions.Logging" Version="8.0.1" />
7+
<PackageReference Update="Microsoft.Extensions.Logging.Debug" Version="8.0.1" />
8+
<PackageReference Update="Microsoft.Extensions.DependencyModel" Version="8.0.2" />
9+
<PackageReference Update="Microsoft.Extensions.Caching.Abstractions" Version="8.0.0" />
10+
<PackageReference Update="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
11+
<PackageReference Update="Microsoft.Extensions.ObjectPool" Version="8.0.10" />
12+
<PackageReference Update="Microsoft.Extensions.Options" Version="8.0.2" />
13+
<PackageReference Update="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1" />
14+
<PackageReference Update="BenchmarkDotNet" Version="0.14.0" />
15+
16+
<PackageReference Update="Microsoft.Orleans.Core" Version="8.2.0" />
17+
<PackageReference Update="Microsoft.Orleans.Sdk" Version="8.2.0" />
18+
<PackageReference Update="Microsoft.Orleans.CodeGenerator" Version="8.2.0" />
19+
<PackageReference Update="Microsoft.Orleans.Streaming" Version="8.2.0" />
20+
<PackageReference Update="Microsoft.Orleans.Core.Abstractions" Version="8.2.0" />
21+
<PackageReference Update="Microsoft.Orleans.Runtime.Abstractions" Version="8.2.0" />
22+
<PackageReference Update="Microsoft.Orleans.OrleansRuntime" Version="8.2.0" />
23+
<PackageReference Update="Microsoft.Orleans.TestingHost" Version="8.2.0" />
24+
<PackageReference Update="Microsoft.Orleans.Reminders" Version="8.2.0" />
25+
<PackageReference Update="Microsoft.Orleans.Persistence.Memory" Version="8.2.0" />
26+
<PackageReference Update="Microsoft.Orleans.Server" Version="8.2.0" />
2627

2728
<PackageReference Update="System.Buffers" Version="4.5.1" />
2829
<PackageReference Update="System.Runtime.Loader" Version="4.3.0" />
29-
<PackageReference Update="System.Text.Json" Version="6.0.1" />
30-
<PackageReference Update="System.Threading.Tasks.Dataflow" Version="6.0.0" />
31-
<PackageReference Update="Confluent.Kafka" Version="1.9.0" />
32-
<PackageReference Update="RabbitMQ.Client" Version="6.4.0" />
33-
<PackageReference Update="System.Reactive" Version="4.4.1" />
30+
<PackageReference Update="System.Text.Json" Version="8.0.5" />
31+
<PackageReference Update="System.Threading.Tasks.Dataflow" Version="8.0.1" />
32+
<PackageReference Update="Confluent.Kafka" Version="2.6.0" />
33+
<PackageReference Update="RabbitMQ.Client" Version="6.8.1" />
34+
<PackageReference Update="System.Reactive" Version="6.0.1" />
3435
<PackageReference Update="linq2db" Version="4.1.1" />
35-
<PackageReference Update="IdGen" Version="3.0.1" />
36+
<PackageReference Update="IdGen" Version="3.0.7" />
3637

3738
<PackageReference Update="Lindhart.Analyser.MissingAwaitWarning" Version="2.0.0" PrivateAssets="All" />
3839
<PackageReference Update="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" PrivateAssets="All" />
3940
<PackageReference Update="Microsoft.Data.Sqlite" Version="6.0.7" />
40-
<PackageReference Update="Nerdbank.GitVersioning" Version="3.5.108" PrivateAssets="All" />
41-
<PackageReference Update="Microsoft.CodeQuality.Analyzers" Version="3.3.2">
41+
<PackageReference Update="Nerdbank.GitVersioning" Version="3.6.143" PrivateAssets="All" />
42+
<PackageReference Update="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.4">
4243
<PrivateAssets>all</PrivateAssets>
4344
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4445
</PackageReference>
45-
<PackageReference Update="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.3">
46+
<PackageReference Update="StyleCop.Analyzers" Version="1.2.0-beta.321">
4647
<PrivateAssets>all</PrivateAssets>
4748
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4849
</PackageReference>
49-
<PackageReference Update="StyleCop.Analyzers" Version="1.2.0-beta.321">
50+
51+
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0">
5052
<PrivateAssets>all</PrivateAssets>
5153
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
5254
</PackageReference>
5355

54-
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
56+
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
5557
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.2.0" />
5658
<PackageReference Update="xunit" Version="2.4.1" />
5759
<PackageReference Update="xunit.runner.visualstudio" Version="2.4.5">
@@ -64,4 +66,4 @@
6466
</PackageReference>
6567
</ItemGroup>
6668

67-
</Project>
69+
</Project>

Vertex.sln

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ EndProject
5858
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{69B221ED-2A00-494F-AC36-C08025BBD2E6}"
5959
ProjectSection(SolutionItems) = preProject
6060
.editorconfig = .editorconfig
61+
Packages.props = Packages.props
6162
EndProjectSection
6263
EndProject
6364
Global

examples/Packages.props

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="..\Packages.props" />
44
<ItemGroup>
5-
<PackageReference Update="Microsoft.Extensions.Hosting" Version="6.0.1" />
6-
<PackageReference Update="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
7-
<PackageReference Update="MySqlConnector" Version="2.1.11" />
8-
<PackageReference Update="Npgsql" Version="6.0.5" />
9-
<PackageReference Update="Microsoft.Data.SqlClient" Version="4.1.0" />
5+
<PackageReference Update="Microsoft.Extensions.Hosting" Version="8.0.1" />
6+
<PackageReference Update="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
7+
<PackageReference Update="MySqlConnector" Version="2.2.0" />
8+
<PackageReference Update="Npgsql" Version="7.0.0" />
9+
<PackageReference Update="Microsoft.Data.SqlClient" Version="5.0.0" />
1010
</ItemGroup>
1111
</Project>

examples/Transfer.Client/Program.cs

Lines changed: 49 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,12 @@
44
using System.Linq;
55
using System.Threading.Tasks;
66
using IdGen;
7+
using Microsoft.Extensions.DependencyInjection;
8+
using Microsoft.Extensions.Hosting;
79
using Microsoft.Extensions.Logging;
810
using Orleans;
11+
using Orleans.Configuration;
12+
using Orleans.Hosting;
913
using Transfer.IGrains.Common;
1014
using Transfer.IGrains.DTx;
1115

@@ -14,10 +18,11 @@ namespace Transfer.Client
1418
internal class Program
1519
{
1620
private static readonly IdGenerator IdGen = new IdGenerator(0);
21+
private static IHost host;
1722

1823
private static async Task Main(string[] args)
1924
{
20-
using var client = await StartClientWithRetries();
25+
var client = await StartClientWithRetries();
2126

2227
while (true)
2328
{
@@ -31,7 +36,13 @@ private static async Task Main(string[] args)
3136
{
3237
await DTx(client);
3338
}
39+
else
40+
{
41+
break;
42+
}
3443
}
44+
45+
host.Dispose();
3546
}
3647

3748
private static async Task Normal(IClusterClient client)
@@ -46,23 +57,28 @@ private static async Task Normal(IClusterClient client)
4657
var topupTaskList = new List<Task>();
4758
foreach (var account in Enumerable.Range(0, accountCount))
4859
{
49-
topupTaskList.AddRange(Enumerable.Range(0, times).Select(x => client.GetGrain<IAccount>(account).TopUp(100, IdGen.CreateId().ToString())));
60+
topupTaskList.AddRange(Enumerable.Range(0, times).Select(x =>
61+
client.GetGrain<IAccount>(account).TopUp(100, IdGen.CreateId().ToString())));
5062
}
5163

5264
topupWatch.Start();
5365
await Task.WhenAll(topupTaskList);
5466
topupWatch.Stop();
55-
Console.WriteLine($"{times * accountCount} Recharge completed, taking: {topupWatch.ElapsedMilliseconds}ms");
67+
Console.WriteLine(
68+
$"{times * accountCount} Recharge completed, taking: {topupWatch.ElapsedMilliseconds}ms");
5669
foreach (var account in Enumerable.Range(0, accountCount))
5770
{
58-
Console.WriteLine($"The balance of account {account} is{await client.GetGrain<IAccount>(account).GetBalance()}");
71+
Console.WriteLine(
72+
$"The balance of account {account} is{await client.GetGrain<IAccount>(account).GetBalance()}");
5973
}
6074

6175
var transferWatch = new Stopwatch();
6276
var transferTaskList = new List<Task>();
6377
foreach (var account in Enumerable.Range(0, accountCount))
6478
{
65-
transferTaskList.AddRange(Enumerable.Range(0, times).Select(x => client.GetGrain<IAccount>(account).Transfer(account + accountCount, 50, IdGen.CreateId().ToString())));
79+
transferTaskList.AddRange(Enumerable.Range(0, times).Select(x =>
80+
client.GetGrain<IAccount>(account)
81+
.Transfer(account + accountCount, 50, IdGen.CreateId().ToString())));
6682
}
6783

6884
transferWatch.Start();
@@ -72,12 +88,14 @@ private static async Task Normal(IClusterClient client)
7288
$"{times * accountCount}The transfer is completed, taking: {transferWatch.ElapsedMilliseconds}ms");
7389
foreach (var account in Enumerable.Range(0, accountCount))
7490
{
75-
Console.WriteLine($"The balance of account {account} is{await client.GetGrain<IAccount>(account).GetBalance()}");
91+
Console.WriteLine(
92+
$"The balance of account {account} is{await client.GetGrain<IAccount>(account).GetBalance()}");
7693
}
7794

7895
foreach (var account in Enumerable.Range(0, accountCount))
7996
{
80-
Console.WriteLine($"The balance of account {account} is{await client.GetGrain<IAccount>(account + accountCount).GetBalance()}");
97+
Console.WriteLine(
98+
$"The balance of account {account} is{await client.GetGrain<IAccount>(account + accountCount).GetBalance()}");
8199
}
82100
}
83101
catch (Exception e)
@@ -98,16 +116,19 @@ private static async Task DTx(IClusterClient client)
98116
var topupTaskList = new List<Task>();
99117
foreach (var account in Enumerable.Range(0, accountCount))
100118
{
101-
topupTaskList.AddRange(Enumerable.Range(0, times).Select(x => client.GetGrain<IDTxAccount>(account).TopUp(100, IdGen.CreateId().ToString())));
119+
topupTaskList.AddRange(Enumerable.Range(0, times).Select(x =>
120+
client.GetGrain<IDTxAccount>(account).TopUp(100, IdGen.CreateId().ToString())));
102121
}
103122

104123
topupWatch.Start();
105124
await Task.WhenAll(topupTaskList);
106125
topupWatch.Stop();
107-
Console.WriteLine($"{times * accountCount} Recharge completed, taking: {topupWatch.ElapsedMilliseconds}ms");
126+
Console.WriteLine(
127+
$"{times * accountCount} Recharge completed, taking: {topupWatch.ElapsedMilliseconds}ms");
108128
foreach (var account in Enumerable.Range(0, accountCount))
109129
{
110-
Console.WriteLine($"The balance of account {account} is{await client.GetGrain<IDTxAccount>(account).GetBalance()}");
130+
Console.WriteLine(
131+
$"The balance of account {account} is{await client.GetGrain<IDTxAccount>(account).GetBalance()}");
111132
}
112133

113134
var transferWatch = new Stopwatch();
@@ -132,12 +153,14 @@ private static async Task DTx(IClusterClient client)
132153
$"{times * accountCount}The transfer is completed, taking: {transferWatch.ElapsedMilliseconds}ms");
133154
foreach (var account in Enumerable.Range(0, accountCount))
134155
{
135-
Console.WriteLine($"The balance of account {account} is{await client.GetGrain<IDTxAccount>(account).GetBalance()}");
156+
Console.WriteLine(
157+
$"The balance of account {account} is{await client.GetGrain<IDTxAccount>(account).GetBalance()}");
136158
}
137159

138160
foreach (var account in Enumerable.Range(0, accountCount))
139161
{
140-
Console.WriteLine($"The balance of account {account} is{await client.GetGrain<IDTxAccount>(account + accountCount).GetBalance()}");
162+
Console.WriteLine(
163+
$"The balance of account {account} is{await client.GetGrain<IDTxAccount>(account + accountCount).GetBalance()}");
141164
}
142165
}
143166
catch (Exception e)
@@ -154,13 +177,20 @@ private static async Task<IClusterClient> StartClientWithRetries(int initializeA
154177
{
155178
try
156179
{
157-
var builder = new ClientBuilder()
158-
.UseLocalhostClustering()
159-
.ConfigureApplicationParts(parts =>
160-
parts.AddApplicationPart(typeof(IAccount).Assembly).WithReferences())
180+
var builder = new HostBuilder()
181+
.UseOrleansClient(clientBuilder =>
182+
{
183+
clientBuilder.UseLocalhostClustering();
184+
clientBuilder.Configure<ClusterOptions>(options =>
185+
{
186+
options.ClusterId = "dev";
187+
options.ServiceId = "Transfer";
188+
});
189+
})
161190
.ConfigureLogging(logging => logging.AddConsole());
162-
client = builder.Build();
163-
await client.Connect();
191+
host = builder.Build();
192+
await host.StartAsync();
193+
client = host.Services.GetService<IClusterClient>();
164194
Console.WriteLine("Client successfully connect to silo host");
165195
break;
166196
}
@@ -181,4 +211,4 @@ private static async Task<IClusterClient> StartClientWithRetries(int initializeA
181211
return client;
182212
}
183213
}
184-
}
214+
}

examples/Transfer.Client/Transfer.Client.csproj

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<Sdk Name="Microsoft.Build.CentralPackageVersions" />
33
<PropertyGroup>
4-
<OutputType>Exe</OutputType>
5-
<IsPackable>false</IsPackable>
4+
<IsPackable>false</IsPackable>
5+
<OutputType>Exe</OutputType>
66
</PropertyGroup>
7-
87
<ItemGroup>
9-
<PackageReference Include="IdGen" />
10-
<PackageReference Include="Microsoft.Extensions.Logging.Console" />
11-
<PackageReference Include="Microsoft.Orleans.Core" />
8+
<PackageReference Include="Microsoft.Orleans.CodeGenerator" />
129
</ItemGroup>
1310

1411
<ItemGroup>
12+
<ProjectReference Include="..\..\src\Storage\Vertex.Storage.Linq2db\Vertex.Storage.Linq2db.csproj" />
13+
<ProjectReference Include="..\..\src\Stream\Vertex.Stream.Common\Vertex.Stream.Common.csproj" />
14+
<ProjectReference Include="..\..\src\Vertex.Runtime\Vertex.Runtime.csproj" />
15+
<ProjectReference Include="..\..\src\Vertex.Transaction\Vertex.Transaction.csproj" />
1516
<ProjectReference Include="..\Transfer.IGrains\Transfer.IGrains.csproj" />
1617
</ItemGroup>
1718

0 commit comments

Comments
 (0)