Skip to content

Commit 081da26

Browse files
feijie999feijie999
committed
🎉 更新(release): 升级 .NET 版本至 8.0，清理依赖项并更新包引用至最新版本
1 parent ee932df commit 081da26

11 files changed

Lines changed: 57 additions & 63 deletions

File tree

‎.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: 6.0.x
21+
dotnet-version: 8.0.x
2222

2323
- name: Install dependencies
2424
run: dotnet restore

‎.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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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: 29 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -2,56 +2,53 @@
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.OrleansProviders" Version="8.2.0"/>
17+
<PackageReference Update="Microsoft.Orleans.Core" Version="8.2.0" />
18+
<PackageReference Update="Microsoft.Orleans.Core.Abstractions" Version="8.2.0" />
19+
<PackageReference Update="Microsoft.Orleans.Runtime.Abstractions" Version="8.2.0" />
20+
<PackageReference Update="Microsoft.Orleans.OrleansRuntime" Version="8.2.0" />
21+
<PackageReference Update="Microsoft.Orleans.TestingHost" Version="8.2.0" />
2622

2723
<PackageReference Update="System.Buffers" Version="4.5.1" />
2824
<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" />
25+
<PackageReference Update="System.Text.Json" Version="8.0.5" />
26+
<PackageReference Update="System.Threading.Tasks.Dataflow" Version="8.0.1" />
27+
<PackageReference Update="Confluent.Kafka" Version="2.6.0" />
28+
<PackageReference Update="RabbitMQ.Client" Version="6.8.1" />
29+
<PackageReference Update="System.Reactive" Version="6.0.1" />
3430
<PackageReference Update="linq2db" Version="4.1.1" />
3531
<PackageReference Update="IdGen" Version="3.0.1" />
3632

3733
<PackageReference Update="Lindhart.Analyser.MissingAwaitWarning" Version="2.0.0" PrivateAssets="All" />
3834
<PackageReference Update="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" PrivateAssets="All" />
3935
<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">
36+
<PackageReference Update="Nerdbank.GitVersioning" Version="3.6.143" PrivateAssets="All" />
37+
<PackageReference Update="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.4">
4238
<PrivateAssets>all</PrivateAssets>
4339
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4440
</PackageReference>
45-
<PackageReference Update="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.3">
41+
<PackageReference Update="StyleCop.Analyzers" Version="1.2.0-beta.321">
4642
<PrivateAssets>all</PrivateAssets>
4743
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4844
</PackageReference>
49-
<PackageReference Update="StyleCop.Analyzers" Version="1.2.0-beta.321">
45+
46+
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0">
5047
<PrivateAssets>all</PrivateAssets>
5148
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
5249
</PackageReference>
5350

54-
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
51+
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
5552
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.2.0" />
5653
<PackageReference Update="xunit" Version="2.4.1" />
5754
<PackageReference Update="xunit.runner.visualstudio" Version="2.4.5">
@@ -64,4 +61,4 @@
6461
</PackageReference>
6562
</ItemGroup>
6663

67-
</Project>
64+
</Project>

‎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/Transfer.Client.csproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
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>
65
</PropertyGroup>
7-
86
<ItemGroup>
9-
<PackageReference Include="IdGen" />
10-
<PackageReference Include="Microsoft.Extensions.Logging.Console" />
11-
<PackageReference Include="Microsoft.Orleans.Core" />
7+
<PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" />
128
</ItemGroup>
139

1410
<ItemGroup>
11+
<ProjectReference Include="..\..\src\Storage\Vertex.Storage.Linq2db\Vertex.Storage.Linq2db.csproj" />
12+
<ProjectReference Include="..\..\src\Stream\Vertex.Stream.Common\Vertex.Stream.Common.csproj" />
13+
<ProjectReference Include="..\..\src\Vertex.Runtime\Vertex.Runtime.csproj" />
14+
<ProjectReference Include="..\..\src\Vertex.Transaction\Vertex.Transaction.csproj" />
1515
<ProjectReference Include="..\Transfer.IGrains\Transfer.IGrains.csproj" />
1616
</ItemGroup>
1717

‎examples/Transfer.Grains/Transfer.Grains.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<Sdk Name="Microsoft.Build.CentralPackageVersions" />
33
<PropertyGroup>
44
<IsPackable>false</IsPackable>

‎examples/Transfer.IGrains/Transfer.IGrains.csproj‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
2-
<Sdk Name="Microsoft.Build.CentralPackageVersions" />
3-
<PropertyGroup>
4-
<IsPackable>false</IsPackable>
5-
</PropertyGroup>
6-
7-
<ItemGroup>
8-
<PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" />
9-
<ProjectReference Include="..\..\src\Vertex.Abstractions\Vertex.Abstractions.csproj" />
10-
<ProjectReference Include="..\..\src\Vertex.Transaction.Abstractions\Vertex.Transaction.Abstractions.csproj" />
11-
</ItemGroup>
12-
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\Packages.props" />
4+
<ItemGroup>
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" />
10+
</ItemGroup>
1311
</Project>

‎src/Vertex.Abstractions/Event/EventMeta.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ namespace Vertex.Abstractions.Event
55
/// <summary>
66
/// Record the meta information of the event
77
/// </summary>
8-
[Immutable]
8+
[Orleans.Immutable]
99
public record EventMeta
1010
{
1111
public string FlowId { get; set; }

0 commit comments

Comments
 (0)