Skip to content

Commit 6abfd84

Browse files
u-lessu-less
authored
Merge pull request #190 from RayTale/develop
Develop
2 parents 3801c2a + c39418d commit 6abfd84

File tree

9 files changed

+33
-37
lines changed

9 files changed

+33
-37
lines changed

‎Packages.props‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,37 +7,37 @@
77
<PackageReference Update="Microsoft.Extensions.Logging.Debug" Version="6.0.0" />
88
<PackageReference Update="Microsoft.Extensions.DependencyModel" Version="6.0.0" />
99
<PackageReference Update="Microsoft.Extensions.Caching.Abstractions" Version="6.0.0" />
10-
<PackageReference Update="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
11-
<PackageReference Update="Microsoft.Extensions.ObjectPool" Version="6.0.1" />
10+
<PackageReference Update="Microsoft.Extensions.Logging.Abstractions" Version="6.0.1" />
11+
<PackageReference Update="Microsoft.Extensions.ObjectPool" Version="6.0.7" />
1212
<PackageReference Update="Microsoft.Extensions.Options" Version="6.0.0" />
1313
<PackageReference Update="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
1414
<PackageReference Update="BenchmarkDotNet" Version="0.13.1" />
1515

16-
<PackageReference Update="Microsoft.Orleans.CodeGenerator.MSBuild" Version="3.6.0">
16+
<PackageReference Update="Microsoft.Orleans.CodeGenerator.MSBuild" Version="3.6.2">
1717
<PrivateAssets>all</PrivateAssets>
1818
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1919
</PackageReference>
20-
<PackageReference Update="Microsoft.Orleans.OrleansProviders" Version="3.6.0"/>
21-
<PackageReference Update="Microsoft.Orleans.Core" Version="3.6.0" />
22-
<PackageReference Update="Microsoft.Orleans.Core.Abstractions" Version="3.6.0" />
23-
<PackageReference Update="Microsoft.Orleans.Runtime.Abstractions" Version="3.6.0" />
24-
<PackageReference Update="Microsoft.Orleans.OrleansRuntime" Version="3.6.0" />
25-
<PackageReference Update="Microsoft.Orleans.TestingHost" Version="3.6.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" />
2929
<PackageReference Update="System.Text.Json" Version="6.0.1" />
3030
<PackageReference Update="System.Threading.Tasks.Dataflow" Version="6.0.0" />
31-
<PackageReference Update="Confluent.Kafka" Version="1.8.2" />
32-
<PackageReference Update="RabbitMQ.Client" Version="5.2.0" />
31+
<PackageReference Update="Confluent.Kafka" Version="1.9.0" />
32+
<PackageReference Update="RabbitMQ.Client" Version="6.4.0" />
3333
<PackageReference Update="System.Reactive" Version="4.4.1" />
34-
<PackageReference Update="linq2db" Version="3.6.0" />
35-
<PackageReference Update="IdGen" Version="3.0.0" />
34+
<PackageReference Update="linq2db" Version="4.1.1" />
35+
<PackageReference Update="IdGen" Version="3.0.1" />
3636

3737
<PackageReference Update="Lindhart.Analyser.MissingAwaitWarning" Version="2.0.0" PrivateAssets="All" />
3838
<PackageReference Update="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" PrivateAssets="All" />
39-
<PackageReference Update="Microsoft.Data.Sqlite" Version="6.0.1" />
40-
<PackageReference Update="Nerdbank.GitVersioning" Version="3.4.255" PrivateAssets="All" />
39+
<PackageReference Update="Microsoft.Data.Sqlite" Version="6.0.7" />
40+
<PackageReference Update="Nerdbank.GitVersioning" Version="3.5.108" PrivateAssets="All" />
4141
<PackageReference Update="Microsoft.CodeQuality.Analyzers" Version="3.3.2">
4242
<PrivateAssets>all</PrivateAssets>
4343
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -52,13 +52,13 @@
5252
</PackageReference>
5353

5454
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
55-
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.0.0" />
55+
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.2.0" />
5656
<PackageReference Update="xunit" Version="2.4.1" />
57-
<PackageReference Update="xunit.runner.visualstudio" Version="2.4.3">
57+
<PackageReference Update="xunit.runner.visualstudio" Version="2.4.5">
5858
<PrivateAssets>all</PrivateAssets>
5959
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
6060
</PackageReference>
61-
<PackageReference Update="coverlet.collector" Version="3.1.0">
61+
<PackageReference Update="coverlet.collector" Version="3.1.2">
6262
<PrivateAssets>all</PrivateAssets>
6363
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
6464
</PackageReference>

‎examples/Packages.props‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +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.0" />
5+
<PackageReference Update="Microsoft.Extensions.Hosting" Version="6.0.1" />
66
<PackageReference Update="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
7-
<PackageReference Update="Microsoft.Data.Sqlite" Version="6.0.1" />
8-
<PackageReference Update="MySqlConnector" Version="2.1.4" />
9-
<PackageReference Update="Npgsql" Version="6.0.2" />
10-
<PackageReference Update="Microsoft.Data.SqlClient" Version="4.0.1" />
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" />
1110
</ItemGroup>
1211
</Project>

‎examples/Transfer.Server/Transfer.Server.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<PackageReference Include="Microsoft.Orleans.OrleansRuntime" />
1313
<PackageReference Include="MySqlConnector" />
1414
<PackageReference Include="Npgsql" />
15-
<PackageReference Include="Microsoft.Data.SqlClient"/>
15+
<PackageReference Include="Microsoft.Data.SqlClient" />
1616
</ItemGroup>
1717

1818
<ItemGroup>

‎src/Storage/Vertex.Storage.Linq2db/Entities/EventEntity.cs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,16 @@ namespace Vertex.Storage.Linq2db.Entities
66
[Table]
77
public class EventEntity<TPrimaryKey>
88
{
9-
[Column]
10-
[Column(DataType = DataType.VarChar, Length = 200)]
9+
[Column(Length = 200, CanBeNull = false)]
1110
public TPrimaryKey ActorId { get; set; }
1211

13-
[Column(DataType = DataType.VarChar, Length = 200)]
12+
[Column(DataType = DataType.VarChar, CanBeNull = false, Length = 200)]
1413
public string Name { get; set; }
1514

1615
[Column(DataType = DataType.Text)]
1716
public string Data { get; set; }
1817

19-
[Column(DataType = DataType.VarChar, Length = 200)]
18+
[Column(DataType = DataType.VarChar, CanBeNull = false, Length = 200)]
2019
public string FlowId { get; set; }
2120

2221
[Column]

‎src/Storage/Vertex.Storage.Linq2db/Entities/SnapshotEntity.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ namespace Vertex.Storage.Linq2db.Entities
77
public class SnapshotEntity<TPrimaryKey>
88
{
99
[PrimaryKey]
10-
[Column]
11-
[Column(DataType = DataType.VarChar, Length = 200)]
10+
[Column(Length = 200, CanBeNull = false)]
1211
public TPrimaryKey Id { get; set; }
1312

1413
[Column(DataType = DataType.Text)]

‎src/Storage/Vertex.Storage.Linq2db/Entities/SubSnapshotEntity.cs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
1-
using LinqToDB;
2-
using LinqToDB.Mapping;
1+
using LinqToDB.Mapping;
32

43
namespace Vertex.Storage.Linq2db.Entities
54
{
65
[Table]
76
public class SubSnapshotEntity<TPrimaryKey>
87
{
98
[PrimaryKey]
10-
[Column]
11-
[Column(DataType = DataType.VarChar, Length = 200)]
9+
[Column(Length = 200, CanBeNull = false)]
1210
public TPrimaryKey Id { get; set; }
1311

1412
[Column]

‎src/Stream/Vertex.Stream.RabbitMQ/Consumer/ConsumerRunner.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public Task Run()
7272
}
7373
else
7474
{
75-
list.Add(new BytesBox(whileResult.Body, whileResult));
75+
list.Add(new BytesBox(whileResult.Body.ToArray(), whileResult));
7676
}
7777

7878
if ((DateTimeOffset.UtcNow - batchStartTime).TotalMilliseconds >
@@ -98,7 +98,7 @@ public Task Run()
9898
$"An error occurred in {this.Queue}");
9999
foreach (var item in list.Where(o => !o.Success))
100100
{
101-
this.Model.Model.BasicReject(((BasicGetResult) item.Origin).DeliveryTag, true);
101+
this.Model.Model.BasicReject(((BasicGetResult)item.Origin).DeliveryTag, true);
102102
}
103103
}
104104
finally

‎src/Vertex.Abstractions/Snapshot/SnapshotMeta.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ public record SnapshotMeta<TPrimaryKey>
77
public long DoingVersion { get; set; }
88

99
public long Version { get; set; }
10+
1011
public long MinEventTimestamp { get; set; }
12+
1113
public long MinEventVersion { get; set; }
1214

1315
public bool IsLatest { get; set; }

‎src/Vertex.Runtime/Actor/FlowActor.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
using Vertex.Runtime.Exceptions;
2626
using Vertex.Runtime.Options;
2727
using Vertex.Utils.Emit;
28-
using Vertex.Abstractions.Event;
2928

3029
namespace Vertex.Runtime.Actor
3130
{

0 commit comments

Comments
 (0)