Skip to content

Commit e28a6e8

Browse files
feijie999feijie999
authored
Merge branch 'RayTale:main' into main
2 parents b780484 + 32a09d5 commit e28a6e8

95 files changed

Lines changed: 703 additions & 388 deletions

File tree

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: 1 addition & 1 deletion
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: 5.0.100-rc.2.20479.15
21+
dotnet-version: 6.0.x
2222

2323
- name: Install dependencies
2424
run: dotnet restore

.github/workflows/publish-nuget.yml renamed to .github/workflows/prerelease-nuget.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
name: publish nuget
1+
name: prerelease nuget
22

33
on:
4-
push:
5-
types: [published]
4+
release:
5+
types: [prereleased]
66

77
jobs:
88
build:
@@ -16,7 +16,7 @@ jobs:
1616
- name: Setup .NET Core
1717
uses: actions/setup-dotnet@v1
1818
with:
19-
dotnet-version: 5.0.100
19+
dotnet-version: 6.0.x
2020

2121
- uses: dotnet/nbgv@master
2222
with:
@@ -29,7 +29,9 @@ jobs:
2929
run: dotnet build --configuration Release --no-restore
3030

3131
- name: Pack the NuGets
32-
run: dotnet pack --configuration Release --no-build --output nupkgs -p:PackageVersion=$NBGV_NuGetPackageVersion
32+
run: dotnet pack --configuration Release --no-build --include-symbols -o . -p:PackageVersion=$NBGV_NuGetPackageVersion
3333

3434
- name: Publish NuGet
35-
run: dotnet nuget push nupkgs/*.*nupkg --api-key ${{ secrets.NUGETKEY }} --skip-duplicate --source https://api.nuget.org/v3/index.json
35+
run: |
36+
dotnet nuget push **/*.nupkg --api-key ${{ secrets.NUGETKEY }} --skip-duplicate --source https://api.nuget.org/v3/index.json
37+
dotnet nuget push **/*.snupkg --api-key ${{ secrets.NUGETKEY }} --skip-duplicate --source https://api.nuget.org/v3/index.json

‎.github/workflows/release-nuget.yml‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: release nuget
2+
3+
on:
4+
release:
5+
types: [released]
6+
7+
jobs:
8+
build:
9+
runs-on: ubuntu-latest
10+
11+
steps:
12+
- uses: actions/checkout@v2
13+
with:
14+
fetch-depth: 0
15+
16+
- name: Setup .NET Core
17+
uses: actions/setup-dotnet@v1
18+
with:
19+
dotnet-version: 6.0.x
20+
21+
- uses: dotnet/nbgv@master
22+
with:
23+
setAllVars: true
24+
- run: echo "NuGetPackageVersion $NBGV_MajorMinorVersion"
25+
26+
- name: Install dependencies
27+
run: dotnet restore
28+
- name: Build
29+
run: dotnet build --configuration Release --no-restore
30+
31+
- name: Pack the NuGets
32+
run: dotnet pack --configuration Release --no-build --include-symbols -o . -p:PackageVersion=$NBGV_MajorMinorVersion
33+
34+
- name: Publish NuGet
35+
run: |
36+
dotnet nuget push **/*.nupkg --api-key ${{ secrets.NUGETKEY }} --skip-duplicate --source https://api.nuget.org/v3/index.json
37+
dotnet nuget push **/*.snupkg --api-key ${{ secrets.NUGETKEY }} --skip-duplicate --source https://api.nuget.org/v3/index.json

‎Directory.Build.props‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
<Project>
22
<PropertyGroup>
3-
<TargetFramework>net5.0</TargetFramework>
3+
<TargetFramework>net6.0</TargetFramework>
44
<LangVersion>latest</LangVersion>
5+
<Version Condition="'$(PackageVersion)' != ''">$(PackageVersion)</Version>
6+
<Version Condition="'$(PackageVersion)' == ''">$(Version)</Version>
57
</PropertyGroup>
68
<PropertyGroup>
79
<PackageId>$(AssemblyName)</PackageId>
10+
<PackageVersion Condition="'$(PackageVersion)' != ''">$(PackageVersion)</PackageVersion>
11+
<PackageVersion Condition="'$(PackageVersion)' == ''">$(Version)</PackageVersion>
812
<PackageLicenseExpression>MIT</PackageLicenseExpression>
913
<PackageProjectUrl>https://github.com/RayTale/Vertex</PackageProjectUrl>
1014
<RepositoryUrl>https://github.com/RayTale/Vertex.git</RepositoryUrl>

‎Packages.props‎

Lines changed: 34 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -2,64 +2,63 @@
22

33
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
44
<ItemGroup>
5-
<PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="5.0.0" />
6-
<PackageReference Update="Microsoft.Extensions.Logging" Version="5.0.0" />
7-
<PackageReference Update="Microsoft.Extensions.Logging.Debug" Version="5.0.0" />
8-
<PackageReference Update="Microsoft.Extensions.DependencyModel" Version="5.0.0" />
9-
<PackageReference Update="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0" />
10-
<PackageReference Update="Microsoft.Extensions.ObjectPool" Version="5.0.0" />
11-
<PackageReference Update="Microsoft.Extensions.Options" Version="5.0.0" />
12-
<PackageReference Update="Microsoft.Extensions.Hosting.Abstractions" Version="5.0.0" />
13-
<PackageReference Update="BenchmarkDotNet" Version="0.12.1" />
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" />
1415

15-
<PackageReference Update="Microsoft.Orleans.CodeGenerator.MSBuild" Version="3.3.0">
16+
<PackageReference Update="Microsoft.Orleans.CodeGenerator.MSBuild" Version="3.6.2">
1617
<PrivateAssets>all</PrivateAssets>
1718
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1819
</PackageReference>
19-
<PackageReference Update="Microsoft.Orleans.OrleansProviders" Version="3.3.0"/>
20-
<PackageReference Update="Microsoft.Orleans.Core" Version="3.3.0" />
21-
<PackageReference Update="Microsoft.Orleans.Core.Abstractions" Version="3.3.0" />
22-
<PackageReference Update="Microsoft.Orleans.Core.OrleansRuntime" Version="3.3.0" />
23-
<PackageReference Update="Microsoft.Orleans.Runtime.Abstractions" Version="3.3.0" />
24-
<PackageReference Update="Microsoft.Orleans.OrleansRuntime" Version="3.3.0" />
25-
<PackageReference Update="Microsoft.Orleans.TestingHost" Version="3.3.0" />
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" />
2626

2727
<PackageReference Update="System.Buffers" Version="4.5.1" />
2828
<PackageReference Update="System.Runtime.Loader" Version="4.3.0" />
29-
<PackageReference Update="System.Text.Json" Version="4.7.2" />
30-
<PackageReference Update="System.Threading.Tasks.Dataflow" Version="4.11.1" />
31-
32-
<PackageReference Update="Confluent.Kafka" Version="1.5.2" />
33-
<PackageReference Update="RabbitMQ.Client" Version="6.2.1" />
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" />
3433
<PackageReference Update="System.Reactive" Version="4.4.1" />
35-
<PackageReference Update="linq2db" Version="3.1.6" />
36-
<PackageReference Update="IdGen" Version="3.0.0" />
34+
<PackageReference Update="linq2db" Version="4.1.1" />
35+
<PackageReference Update="IdGen" Version="3.0.1" />
3736

38-
<PackageReference Update="Lindhart.Analyser.MissingAwaitWarning" Version="2.0.0-beta2" PrivateAssets="All" />
39-
<PackageReference Update="Microsoft.CodeAnalysis.CSharp" Version="3.6.0" PrivateAssets="All" />
40-
<PackageReference Update="Microsoft.Data.Sqlite" Version="5.0.0" />
41-
<PackageReference Update="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" />
42-
<PackageReference Update="Microsoft.CodeQuality.Analyzers" Version="3.3.1">
37+
<PackageReference Update="Lindhart.Analyser.MissingAwaitWarning" Version="2.0.0" PrivateAssets="All" />
38+
<PackageReference Update="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" PrivateAssets="All" />
39+
<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">
4342
<PrivateAssets>all</PrivateAssets>
4443
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4544
</PackageReference>
46-
<PackageReference Update="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.1">
45+
<PackageReference Update="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.3">
4746
<PrivateAssets>all</PrivateAssets>
4847
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4948
</PackageReference>
50-
<PackageReference Update="StyleCop.Analyzers" Version="1.2.0-beta.261">
49+
<PackageReference Update="StyleCop.Analyzers" Version="1.2.0-beta.321">
5150
<PrivateAssets>all</PrivateAssets>
5251
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
5352
</PackageReference>
5453

55-
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.0-beta-20204-02" PrivateAssets="All"/>
56-
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.9.0-preview-20201020-06" />
54+
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
55+
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.2.0" />
5756
<PackageReference Update="xunit" Version="2.4.1" />
58-
<PackageReference Update="xunit.runner.visualstudio" Version="2.4.3">
57+
<PackageReference Update="xunit.runner.visualstudio" Version="2.4.5">
5958
<PrivateAssets>all</PrivateAssets>
6059
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
6160
</PackageReference>
62-
<PackageReference Update="coverlet.collector" Version="1.3.0">
61+
<PackageReference Update="coverlet.collector" Version="3.1.2">
6362
<PrivateAssets>all</PrivateAssets>
6463
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
6564
</PackageReference>

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
---
77
* 框架采用Event sourcing来解决分布式事务问题，除了提供超高吞吐的分布式事务能力之外，还提供状态变化的详细事件日志，易于追踪溯源，在某些领域有着天然的优势。
88

9-
* 基于. Net 5.0和Orleans开发，支持从单个本地服务器扩展到多服务器集群，提供高可用能力。
9+
* 基于. Net 6.0和Orleans开发，支持从单个本地服务器扩展到多服务器集群，提供高可用能力。
1010
---
1111

1212
### 项目起源
1313

1414
Vertex是Ray框架的3.0版本，Ray诞生之初是为虚拟币交易引擎提供一个全内存、高吞吐、低延时、可追溯、分布式的事务框架。
1515

16-
*__虚拟币交易引擎的指标要求比股票交易系统高很多，有一些硬性指标要求：__*
16+
*__虚拟币交易引擎的指标要求有一些硬性指标要求：__*
1717

1818
* 极高吞吐：大量搬砖机器人在下单撤单，对系统的吞吐要求非常高。
1919

‎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="5.0.0" />
6-
<PackageReference Update="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
7-
<PackageReference Update="Microsoft.Data.Sqlite" Version="5.0.0" />
8-
<PackageReference Update="MySqlConnector" Version="1.1.0" />
9-
<PackageReference Update="Npgsql" Version="5.0.0-preview1" />
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" />
1010
</ItemGroup>
1111
</Project>

‎examples/Transfer.Grains/Common/AccountDb.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
using Transfer.Grains.Events;
44
using Transfer.IGrains.Common;
55
using Vertex.Abstractions.Actor;
6+
using Vertex.Abstractions.Event;
67
using Vertex.Runtime.Actor;
78
using Vertex.Storage.Linq2db.Core;
89
using Vertex.Stream.Common;
9-
using Vertext.Abstractions.Event;
1010

1111
namespace Transfer.Grains.Common
1212
{

‎examples/Transfer.Grains/Events/TopupEvent.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using Vertex.Abstractions.Event;
2-
using Vertext.Abstractions.Event;
32

43
namespace Transfer.Grains.Events
54
{

‎examples/Transfer.Grains/Events/TransferArrivedEvent.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using Vertex.Abstractions.Event;
2-
using Vertext.Abstractions.Event;
32

43
namespace Transfer.Grains.Events
54
{

0 commit comments

Comments
 (0)