Skip to content

Commit 9198fdb

Browse files
committed
.net sdk 升级到 8.0
1 parent 3be3c2e commit 9198fdb

File tree

100 files changed

+344
-323
lines changed

Some content is hidden

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

100 files changed

+344
-323
lines changed

build/Build.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</ItemGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="FlubuCore" Version="7.0.1" />
14+
<PackageReference Include="FlubuCore" Version="8.0.0" />
1515
</ItemGroup>
1616

1717
</Project>

build/BuildScript.cs

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,10 @@ public class BuildScript : DefaultBuildScript {
6262
/// 忽略测试项目文件列表
6363
/// </summary>
6464
public List<FileFullPath> IgnoreTestProjecs { get; set; }
65+
/// <summary>
66+
/// 忽略打包项目文件列表
67+
/// </summary>
68+
public List<FileFullPath> IgnorePackProjecs { get; set; }
6569

6670
/// <summary>
6771
/// 获取集成测试项目文件列表
@@ -70,6 +74,13 @@ protected List<FileFullPath> GetIntegrationTestProjecs() {
7074
return IntegrationTestProjecs.Where( t => IgnoreTestProjecs.Exists( p => p.FileName == t.FileName ) == false ).ToList();
7175
}
7276

77+
/// <summary>
78+
/// 获取打包项目文件列表
79+
/// </summary>
80+
protected List<FileFullPath> GetPackProjecs() {
81+
return Projects.Where( t => IgnorePackProjecs.Exists( p => p.FileName == t.FileName ) == false ).ToList();
82+
}
83+
7384
/// <summary>
7485
/// 构建前操作
7586
/// </summary>
@@ -79,7 +90,9 @@ protected override void BeforeBuildExecution( ITaskContext context ) {
7990
UnitTestProjecs = context.GetFiles( TestDir, "*/*.Tests.csproj" );
8091
IntegrationTestProjecs = context.GetFiles( TestDir, "*/*.Tests.Integration.csproj" );
8192
IgnoreTestProjecs = new List<FileFullPath>();
93+
IgnorePackProjecs = new List<FileFullPath>();
8294
AddIgnoreTestProjecs( context );
95+
AddIgnorePackProjecs( context );
8396
}
8497

8598
/// <summary>
@@ -88,8 +101,16 @@ protected override void BeforeBuildExecution( ITaskContext context ) {
88101
private void AddIgnoreTestProjecs( ITaskContext context ) {
89102
IgnoreTestProjecs.AddRange( context.GetFiles( TestDir, "*/Util.Images.*.Tests.Integration.csproj" ) );
90103
IgnoreTestProjecs.AddRange( context.GetFiles( TestDir, "*/*.Oracle.Tests.Integration.csproj" ) );
91-
IgnoreTestProjecs.AddRange( context.GetFiles( TestDir, "*/*.Dapper.*.Tests.Integration.csproj" ) );
92-
}
104+
IgnoreTestProjecs.AddRange( context.GetFiles( TestDir, "*/Util.Data.Dapper.PostgreSql.Tests.Integration.csproj" ) );
105+
IgnoreTestProjecs.AddRange( context.GetFiles( TestDir, "*/*.Dapr.Tests.Integration.csproj" ) );
106+
}
107+
108+
/// <summary>
109+
/// 添加忽略打包项目文件列表
110+
/// </summary>
111+
private void AddIgnorePackProjecs( ITaskContext context ) {
112+
IgnorePackProjecs.AddRange( context.GetFiles( SourceDir, "*/*.WebApiClient.csproj" ) );
113+
}
93114

94115
/// <summary>
95116
/// 配置构建目标
@@ -175,7 +196,7 @@ private ITarget Pack( ITaskContext context, params ITarget[] dependTargets ) {
175196
return context.CreateTarget( "pack" )
176197
.SetDescription( "Create nuget packages." )
177198
.DependsOn( dependTargets )
178-
.ForEach( Projects, ( project, target ) => {
199+
.ForEach( GetPackProjecs(), ( project, target ) => {
179200
target.AddCoreTask( t => t.Pack()
180201
.Project( project )
181202
.IncludeSymbols()

build/common.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22
<Import Project="version.props" />
33
<PropertyGroup>
4-
<NetTargetFramework>net7.0</NetTargetFramework>
4+
<NetTargetFramework>net8.0</NetTargetFramework>
55
</PropertyGroup>
66
<PropertyGroup>
77
<Product>Util Application Framework</Product>

build/version.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project>
22
<PropertyGroup>
3-
<VersionMajor>7</VersionMajor>
4-
<VersionMinor>1</VersionMinor>
5-
<VersionPatch>131</VersionPatch>
3+
<VersionMajor>8</VersionMajor>
4+
<VersionMinor>0</VersionMinor>
5+
<VersionPatch>0</VersionPatch>
66
<VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)</VersionPrefix>
77
<VersionSuffix></VersionSuffix>
88
</PropertyGroup>

src/Util.Aop.AspectCore/03-Util.Aop.AspectCore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<ItemGroup>
3030
<PackageReference Include="AspectCore.Extensions.AspectScope" Version="2.4.0" />
3131
<PackageReference Include="AspectCore.Extensions.DependencyInjection" Version="2.4.0" />
32-
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0" />
32+
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
3333
</ItemGroup>
3434

3535
<ItemGroup>

src/Util.AspNetCore/08-Util.AspNetCore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
</ItemGroup>
3232

3333
<ItemGroup>
34-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.13" />
34+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.1" />
3535
</ItemGroup>
3636

3737
<ItemGroup>

src/Util.Caching/01-Util.Caching.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
</ItemGroup>
2828

2929
<ItemGroup>
30-
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0" />
30+
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
3131
</ItemGroup>
3232

3333
<ItemGroup>

src/Util.Core/01-Util.Core.csproj

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@
2727
</ItemGroup>
2828

2929
<ItemGroup>
30-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
31-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.4" />
32-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="7.0.0" />
33-
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="7.0.0" />
34-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
35-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
36-
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0" />
37-
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
38-
<PackageReference Include="Microsoft.Extensions.Options" Version="7.0.1" />
30+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
31+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.1" />
32+
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
33+
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="8.0.0" />
34+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
35+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
36+
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
37+
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
38+
<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.1" />
3939
</ItemGroup>
4040

4141
<ItemGroup>

src/Util.Data.Core/01-Util.Data.Core.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
</ItemGroup>
2828

2929
<ItemGroup>
30-
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.3.5" />
30+
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.3.8" />
3131
</ItemGroup>
3232

3333
<ItemGroup>

src/Util.Data.Dapper.Core/01-Util.Data.Dapper.Core.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
</ItemGroup>
2828

2929
<ItemGroup>
30-
<PackageReference Include="Dapper" Version="2.1.21" />
30+
<PackageReference Include="Dapper" Version="2.1.28" />
3131
</ItemGroup>
3232

3333
<ItemGroup>

0 commit comments

Comments
 (0)