Skip to content
This repository has been archived by the owner on Nov 8, 2020. It is now read-only.

Commit

Permalink
Upgrade orleans's version to 2.1.3.
Browse files Browse the repository at this point in the history
  • Loading branch information
u-less committed Mar 18, 2020
1 parent 615e6f9 commit 7c8e6f1
Show file tree
Hide file tree
Showing 18 changed files with 28 additions and 28 deletions.
2 changes: 1 addition & 1 deletion Test/RayCore.Tests/RayCore.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
<PackageReference Include="Microsoft.Orleans.TestingHost" Version="3.1.0" />
<PackageReference Include="Microsoft.Orleans.TestingHost" Version="3.1.3" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
<PrivateAssets>all</PrivateAssets>
Expand Down
2 changes: 1 addition & 1 deletion Test/RayTest.Grains/RayTest.Grains.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<ItemGroup>
<PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" Version="3.1.0">
<PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" Version="3.1.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
Expand Down
2 changes: 1 addition & 1 deletion Test/RayTest.IGrains/RayTest.IGrains.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<ItemGroup>
<PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" Version="3.1.0">
<PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" Version="3.1.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" Version="3.1.0">
<PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" Version="3.1.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Orleans.Core.Abstractions" Version="3.1.0" />
<PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" Version="3.1.0">
<PackageReference Include="Microsoft.Orleans.Core.Abstractions" Version="3.1.3" />
<PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" Version="3.1.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.2" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.2" />
<PackageReference Include="Microsoft.Orleans.OrleansProviders" Version="3.1.0" />
<PackageReference Include="Microsoft.Orleans.OrleansRuntime" Version="3.1.0" />
<PackageReference Include="Microsoft.Orleans.OrleansProviders" Version="3.1.3" />
<PackageReference Include="Microsoft.Orleans.OrleansRuntime" Version="3.1.3" />
<PackageReference Include="OrleansDashboard" Version="3.0.8" />
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion examples/Transfer/Transfer.Grains/Transfer.Grains.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" Version="3.1.0">
<PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" Version="3.1.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
Expand Down
4 changes: 2 additions & 2 deletions examples/Transfer/Transfer.IGrains/Transfer.IGrains.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Orleans.Core.Abstractions" Version="3.1.0" />
<PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" Version="3.1.0">
<PackageReference Include="Microsoft.Orleans.Core.Abstractions" Version="3.1.3" />
<PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" Version="3.1.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
Expand Down
4 changes: 2 additions & 2 deletions examples/Transfer/Transfer.Server/Transfer.Server.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.2" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.2" />
<PackageReference Include="Microsoft.Orleans.OrleansProviders" Version="3.1.0" />
<PackageReference Include="Microsoft.Orleans.OrleansRuntime" Version="3.1.0" />
<PackageReference Include="Microsoft.Orleans.OrleansProviders" Version="3.1.3" />
<PackageReference Include="Microsoft.Orleans.OrleansRuntime" Version="3.1.3" />
<PackageReference Include="OrleansDashboard" Version="3.0.8" />
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion examples/TxTransfer/Transfer.Grains/Transfer.Grains.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" Version="3.1.0">
<PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" Version="3.1.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
Expand Down
4 changes: 2 additions & 2 deletions examples/TxTransfer/Transfer.IGrains/Transfer.IGrains.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Orleans.Core.Abstractions" Version="3.1.0" />
<PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" Version="3.1.0">
<PackageReference Include="Microsoft.Orleans.Core.Abstractions" Version="3.1.3" />
<PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" Version="3.1.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
Expand Down
4 changes: 2 additions & 2 deletions examples/TxTransfer/Transfer.Server/Transfer.Server.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
<PackageReference Include="Confluent.Kafka" Version="1.3.0" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.2" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.2" />
<PackageReference Include="Microsoft.Orleans.OrleansProviders" Version="3.1.0" />
<PackageReference Include="Microsoft.Orleans.OrleansRuntime" Version="3.1.0" />
<PackageReference Include="Microsoft.Orleans.OrleansProviders" Version="3.1.3" />
<PackageReference Include="Microsoft.Orleans.OrleansRuntime" Version="3.1.3" />
<PackageReference Include="OrleansDashboard" Version="3.0.8" />
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFrameworks>netcoreapp2.2;netcoreapp3.1</TargetFrameworks>
<LangVersion>latest</LangVersion>
<Version>2.2.0</Version>
<Version>2.3.0</Version>
<PackageProjectUrl>https://github.com/RayTale/Ray</PackageProjectUrl>
<RepositoryUrl>https://github.com/RayTale/Ray.git</RepositoryUrl>
<LICENSE>https://github.com/RayTale/Ray/blob/master/LICENSE</LICENSE>
Expand Down
4 changes: 2 additions & 2 deletions src/Ray.Core.Abstractions/Ray.Core.Abstractions.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<ItemGroup>
<PackageReference Include="Microsoft.Orleans.Runtime.Abstractions" Version="3.1.0" />
<PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" Version="3.1.0">
<PackageReference Include="Microsoft.Orleans.Runtime.Abstractions" Version="3.1.3" />
<PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" Version="3.1.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
Expand Down
6 changes: 3 additions & 3 deletions src/Ray.Core/Ray.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.2" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.2" />
<PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" Version="3.1.0">
<PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" Version="3.1.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Orleans.Core" Version="3.1.0" />
<PackageReference Include="Microsoft.Orleans.Runtime.Abstractions" Version="3.1.0" />
<PackageReference Include="Microsoft.Orleans.Core" Version="3.1.3" />
<PackageReference Include="Microsoft.Orleans.Runtime.Abstractions" Version="3.1.3" />
<PackageReference Include="System.Buffers" Version="4.5.0" />
<PackageReference Include="System.Text.Json" Version="4.7.1" />
<PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.11.0" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<ItemGroup>
<PackageReference Include="Microsoft.Orleans.Runtime.Abstractions" Version="3.1.0" />
<PackageReference Include="Microsoft.Orleans.Runtime.Abstractions" Version="3.1.3" />
</ItemGroup>
<ItemGroup>
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.0.0" />
Expand Down
2 changes: 1 addition & 1 deletion src/Ray.Storage.MySQL/Ray.Storage.MySQL.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<ItemGroup>
<PackageReference Include="Dapper" Version="2.0.30" />
<PackageReference Include="MySqlConnector" Version="0.61.0" />
<PackageReference Include="MySqlConnector" Version="0.62.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Ray.Core\Ray.Core.csproj" />
Expand Down
4 changes: 2 additions & 2 deletions src/Ray.Storage.PostgreSQL/Storage/EventStorage.cs
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public async Task<IList<FullyEvent<PrimaryKey>>> GetListByType(PrimaryKey stateI
{
var type = typeFinder.FindType(typeCode);
var list = new List<FullyEvent<PrimaryKey>>(limit);
await Task.Run((Func<Task>)(async () =>
await Task.Run(async () =>
{
var getTableListTask = config.GetSubTables();
if (!getTableListTask.IsCompletedSuccessfully)
Expand Down Expand Up @@ -107,7 +107,7 @@ await Task.Run((Func<Task>)(async () =>
if (list.Count >= limit)
break;
}
}));
});
return list.OrderBy(e => e.Base.Version).ToList();
}

Expand Down

0 comments on commit 7c8e6f1

Please sign in to comment.