diff --git a/build/public.props b/build/public.props index 3ff88561..8b5b2376 100644 --- a/build/public.props +++ b/build/public.props @@ -24,7 +24,7 @@ 1701;1702;1591;8002 - + diff --git a/build/version.props b/build/version.props index 28c135ee..447845ee 100644 --- a/build/version.props +++ b/build/version.props @@ -1,12 +1,12 @@ - 7.0 - 11 + 8.0 + 0 -preview. - 1001 - - $(VersionMain).$(VersionPrefix) - $(VersionMain).$(VersionPrefix) + 1120 + $(VersionMain).$(VersionPrefix)$(VersionSuffix)$(VersionSuffixVersion) + $(VersionMain).$(VersionPrefix).$(VersionSuffixVersion) + diff --git a/global.json b/global.json index 8cce0fe1..789bff3b 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "7.0.100", + "version": "8.0.100", "rollForward": "latestFeature", "allowPrerelease": false } diff --git a/samples/web/Liuliu.Demo.WebApi/Liuliu.Demo.WebApi.csproj b/samples/web/Liuliu.Demo.WebApi/Liuliu.Demo.WebApi.csproj index 05c930d4..f758fb86 100644 --- a/samples/web/Liuliu.Demo.WebApi/Liuliu.Demo.WebApi.csproj +++ b/samples/web/Liuliu.Demo.WebApi/Liuliu.Demo.WebApi.csproj @@ -4,7 +4,7 @@ - net7.0 + net8.0 Liuliu.Demo.Web 38c51dba-31f4-4c29-a3b3-49164e38d32f Linux @@ -24,17 +24,27 @@ - + - + all runtime; build; native; contentfiles; analyzers; buildtransitive + - - - + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -43,7 +53,6 @@ - diff --git a/samples/web/Liuliu.Demo.WebApi/Startup.cs b/samples/web/Liuliu.Demo.WebApi/Startup.cs index 218346e7..ed8ee942 100644 --- a/samples/web/Liuliu.Demo.WebApi/Startup.cs +++ b/samples/web/Liuliu.Demo.WebApi/Startup.cs @@ -71,4 +71,4 @@ public void Configure(WebApplication app) app.UseOSharp(); } } -} \ No newline at end of file +} diff --git a/samples/web/Liuliu.Demo.WebApi/Startups/OracleDefaultDbContextMigrationPack.cs b/samples/web/Liuliu.Demo.WebApi/Startups/OracleDefaultDbContextMigrationPack.cs index c2ed8b86..b89e1c8d 100644 --- a/samples/web/Liuliu.Demo.WebApi/Startups/OracleDefaultDbContextMigrationPack.cs +++ b/samples/web/Liuliu.Demo.WebApi/Startups/OracleDefaultDbContextMigrationPack.cs @@ -7,7 +7,7 @@ // 2019-04-18 20:57 // ----------------------------------------------------------------------- - +#if !NET8_0_OR_GREATER using System; using System.ComponentModel; @@ -47,3 +47,4 @@ protected override DefaultDbContext CreateDbContext(IServiceProvider scopedProvi } } } +#endif \ No newline at end of file diff --git a/src/OSharp.AspNetCore/OSharp.AspNetCore.csproj b/src/OSharp.AspNetCore/OSharp.AspNetCore.csproj index cbbd0f8a..f7dc2d64 100644 --- a/src/OSharp.AspNetCore/OSharp.AspNetCore.csproj +++ b/src/OSharp.AspNetCore/OSharp.AspNetCore.csproj @@ -4,7 +4,7 @@ - net6.0;net7.0 + net6.0;net7.0;net8.0 OSharp.AspNetCore OSharp AspNetCore组件 OSharp AspNetCore组件，提供AspNetCore的服务端功能的封装 @@ -16,15 +16,19 @@ - - - + + + - - - - + + + + + + + + diff --git a/src/OSharp.Authorization.Datas/OSharp.Authorization.Datas.csproj b/src/OSharp.Authorization.Datas/OSharp.Authorization.Datas.csproj index d083853c..70d7589e 100644 --- a/src/OSharp.Authorization.Datas/OSharp.Authorization.Datas.csproj +++ b/src/OSharp.Authorization.Datas/OSharp.Authorization.Datas.csproj @@ -1,10 +1,10 @@ - + - net6.0;net7.0 + net6.0;net7.0;net8.0 OSharp.Authorization.Datas OSharp 数据权限组件 OSharp 数据权限组件，对应用中数据权限进行授权的设计实现 diff --git a/src/OSharp.Authorization.Functions/OSharp.Authorization.Functions.csproj b/src/OSharp.Authorization.Functions/OSharp.Authorization.Functions.csproj index 63f8ba7d..8b9d6833 100644 --- a/src/OSharp.Authorization.Functions/OSharp.Authorization.Functions.csproj +++ b/src/OSharp.Authorization.Functions/OSharp.Authorization.Functions.csproj @@ -1,10 +1,10 @@ - + - net6.0;net7.0 + net6.0;net7.0;net8.0 OSharp.Authorization.Functions OSharp 功能权限组件 OSharp 功能权限组件，API功能权限授权的设计实现 diff --git a/src/OSharp.AutoMapper/OSharp.AutoMapper.csproj b/src/OSharp.AutoMapper/OSharp.AutoMapper.csproj index 05275afb..e9fd8129 100644 --- a/src/OSharp.AutoMapper/OSharp.AutoMapper.csproj +++ b/src/OSharp.AutoMapper/OSharp.AutoMapper.csproj @@ -4,7 +4,7 @@ - net6.0;net7.0 + net6.0;net7.0;net8.0 OSharp.AutoMapper OSharp AutoMapper 对象映射组件 OSharp AutoMapper 对象映射组件，封装基于AutoMapper的对象映射实现 diff --git a/src/OSharp.EntityFrameworkCore.MySql/OSharp.EntityFrameworkCore.MySql.csproj b/src/OSharp.EntityFrameworkCore.MySql/OSharp.EntityFrameworkCore.MySql.csproj index be610abb..e0823f1b 100644 --- a/src/OSharp.EntityFrameworkCore.MySql/OSharp.EntityFrameworkCore.MySql.csproj +++ b/src/OSharp.EntityFrameworkCore.MySql/OSharp.EntityFrameworkCore.MySql.csproj @@ -4,7 +4,7 @@ - net6.0;net7.0 + net6.0;net7.0;net8.0 OSharp.EntityFrameworkCore.MySql OSharp 数据访问组件，封装EntityFrameworkCore的MySql数据访问功能的实现 OSharp 数据访问组件MySql @@ -17,6 +17,9 @@ + + + diff --git a/src/OSharp.EntityFrameworkCore.Oracle/OSharp.EntityFrameworkCore.Oracle.csproj b/src/OSharp.EntityFrameworkCore.Oracle/OSharp.EntityFrameworkCore.Oracle.csproj index 200c4dca..45556aa9 100644 --- a/src/OSharp.EntityFrameworkCore.Oracle/OSharp.EntityFrameworkCore.Oracle.csproj +++ b/src/OSharp.EntityFrameworkCore.Oracle/OSharp.EntityFrameworkCore.Oracle.csproj @@ -12,10 +12,10 @@ - + - + diff --git a/src/OSharp.EntityFrameworkCore.PostgreSql/OSharp.EntityFrameworkCore.PostgreSql.csproj b/src/OSharp.EntityFrameworkCore.PostgreSql/OSharp.EntityFrameworkCore.PostgreSql.csproj index a2644ec4..3d9887c6 100644 --- a/src/OSharp.EntityFrameworkCore.PostgreSql/OSharp.EntityFrameworkCore.PostgreSql.csproj +++ b/src/OSharp.EntityFrameworkCore.PostgreSql/OSharp.EntityFrameworkCore.PostgreSql.csproj @@ -4,7 +4,7 @@ - net6.0;net7.0 + net6.0;net7.0;net8.0 OSharp.EntityFrameworkCore.PostgreSql OSharp 数据访问组件，封装EntityFrameworkCore的PostgreSql数据访问功能的实现 OSharp 数据访问组件PostgreSql @@ -17,6 +17,9 @@ + + + diff --git a/src/OSharp.EntityFrameworkCore.SqlServer/OSharp.EntityFrameworkCore.SqlServer.csproj b/src/OSharp.EntityFrameworkCore.SqlServer/OSharp.EntityFrameworkCore.SqlServer.csproj index 9a9cdeba..7d46cf0e 100644 --- a/src/OSharp.EntityFrameworkCore.SqlServer/OSharp.EntityFrameworkCore.SqlServer.csproj +++ b/src/OSharp.EntityFrameworkCore.SqlServer/OSharp.EntityFrameworkCore.SqlServer.csproj @@ -4,7 +4,7 @@ - net6.0;net7.0 + net6.0;net7.0;net8.0 OSharp.EntityFrameworkCore.SqlServer OSharp 数据访问组件，封装EntityFrameworkCore的SqlServer数据访问功能的实现 OSharp 数据访问组件SqlServer @@ -12,10 +12,13 @@ - + - + + + + diff --git a/src/OSharp.EntityFrameworkCore.Sqlite/OSharp.EntityFrameworkCore.Sqlite.csproj b/src/OSharp.EntityFrameworkCore.Sqlite/OSharp.EntityFrameworkCore.Sqlite.csproj index a859b3ec..b2082979 100644 --- a/src/OSharp.EntityFrameworkCore.Sqlite/OSharp.EntityFrameworkCore.Sqlite.csproj +++ b/src/OSharp.EntityFrameworkCore.Sqlite/OSharp.EntityFrameworkCore.Sqlite.csproj @@ -4,7 +4,7 @@ - net6.0;net7.0 + net6.0;net7.0;net8.0 OSharp.EntityFrameworkCore.Sqlite OSharp 数据访问组件，封装EntityFrameworkCore的Sqlite数据访问功能的实现 OSharp 数据访问组件Sqlite @@ -12,10 +12,13 @@ - + - + + + + diff --git a/src/OSharp.EntityFrameworkCore/OSharp.EntityFrameworkCore.csproj b/src/OSharp.EntityFrameworkCore/OSharp.EntityFrameworkCore.csproj index 777f731f..d7d4f71b 100644 --- a/src/OSharp.EntityFrameworkCore/OSharp.EntityFrameworkCore.csproj +++ b/src/OSharp.EntityFrameworkCore/OSharp.EntityFrameworkCore.csproj @@ -4,7 +4,7 @@ - net6.0;net7.0 + net6.0;net7.0;net8.0 OSharp.EntityFrameworkCore OSharp数据访问组件，封装EntityFrameworkCore数据访问功能的实现 OSharp数据访问组件 @@ -13,17 +13,22 @@ - + - - - + + + - - - + + + + + + + + diff --git a/src/OSharp.Exceptionless/OSharp.Exceptionless.csproj b/src/OSharp.Exceptionless/OSharp.Exceptionless.csproj index 98028443..7b1c1960 100644 --- a/src/OSharp.Exceptionless/OSharp.Exceptionless.csproj +++ b/src/OSharp.Exceptionless/OSharp.Exceptionless.csproj @@ -4,7 +4,7 @@ - net6.0;net7.0 + net6.0;net7.0;net8.0 OSharp.Exceptionless OSharp Exceptionless 分布式日志组件 OSharp Exceptionless 分布式日志组件，封装基于Exceptionless 分布式日志记录实现 @@ -12,7 +12,7 @@ - + diff --git a/src/OSharp.Hangfire/OSharp.Hangfire.csproj b/src/OSharp.Hangfire/OSharp.Hangfire.csproj index 7245f74d..bb178f56 100644 --- a/src/OSharp.Hangfire/OSharp.Hangfire.csproj +++ b/src/OSharp.Hangfire/OSharp.Hangfire.csproj @@ -4,14 +4,14 @@ - net6.0;net7.0 + net6.0;net7.0;net8.0 OSharp.Hangfire OSharp Hangfire 后台任务组件 OSharp Hangfire 后台任务组件，封装基于Hangfire后台任务的服务端实现 - + diff --git a/src/OSharp.Hosting.Apis/OSharp.Hosting.Apis.csproj b/src/OSharp.Hosting.Apis/OSharp.Hosting.Apis.csproj index d4e14a64..f4ae4fda 100644 --- a/src/OSharp.Hosting.Apis/OSharp.Hosting.Apis.csproj +++ b/src/OSharp.Hosting.Apis/OSharp.Hosting.Apis.csproj @@ -4,7 +4,7 @@ - net6.0;net7.0 + net6.0;net7.0;net8.0 OSharp.Hosting.Apis Library OSharp框架非业务WebAPI实现 @@ -23,7 +23,10 @@ - + + + + diff --git a/src/OSharp.Hosting.Core/OSharp.Hosting.Core.csproj b/src/OSharp.Hosting.Core/OSharp.Hosting.Core.csproj index 087377d0..be22ebf0 100644 --- a/src/OSharp.Hosting.Core/OSharp.Hosting.Core.csproj +++ b/src/OSharp.Hosting.Core/OSharp.Hosting.Core.csproj @@ -4,7 +4,7 @@ - net6.0;net7.0 + net6.0;net7.0;net8.0 OSharp.Hosting.Core OSharp框架非业务核心 OSharp框架业务核心，封装框架非业务如认证，权限，系统，消息等模块的接口与业务实现 @@ -12,7 +12,7 @@ - + diff --git a/src/OSharp.Hosting.EntityConfiguration/OSharp.Hosting.EntityConfiguration.csproj b/src/OSharp.Hosting.EntityConfiguration/OSharp.Hosting.EntityConfiguration.csproj index 7f29283a..66674f1b 100644 --- a/src/OSharp.Hosting.EntityConfiguration/OSharp.Hosting.EntityConfiguration.csproj +++ b/src/OSharp.Hosting.EntityConfiguration/OSharp.Hosting.EntityConfiguration.csproj @@ -4,7 +4,7 @@ - net6.0;net7.0 + net6.0;net7.0;net8.0 OSharp.Hosting.EntityConfiguration OSharp框架非业务实体映射 OSharp框架非业务实体映射，封装框架非业务如认证，权限，系统，消息等模块的EFCore实体映射 diff --git a/src/OSharp.Identity/OSharp.Identity.csproj b/src/OSharp.Identity/OSharp.Identity.csproj index 44038a65..46d36f9f 100644 --- a/src/OSharp.Identity/OSharp.Identity.csproj +++ b/src/OSharp.Identity/OSharp.Identity.csproj @@ -4,7 +4,7 @@ - net6.0;net7.0 + net6.0;net7.0;net8.0 OSharp.Identity OSharp 身份认证组件 OSharp 身份认证组件，基于AspNetCore.Identity和Osharp仓储系统的身份认证实现 @@ -21,12 +21,16 @@ - - + + - - + + + + + + diff --git a/src/OSharp.Log4Net/OSharp.Log4Net.csproj b/src/OSharp.Log4Net/OSharp.Log4Net.csproj index 203dea73..8d84f50f 100644 --- a/src/OSharp.Log4Net/OSharp.Log4Net.csproj +++ b/src/OSharp.Log4Net/OSharp.Log4Net.csproj @@ -4,7 +4,7 @@ - net6.0;net7.0 + net6.0;net7.0;net8.0 OSharp.Log4Net OSharp Log4Net组件 OSharp Log4Net组件，封装使用log4net组件来实现框架的日志输出功能 diff --git a/src/OSharp.MiniProfiler/OSharp.MiniProfiler.csproj b/src/OSharp.MiniProfiler/OSharp.MiniProfiler.csproj index e6126663..f696a267 100644 --- a/src/OSharp.MiniProfiler/OSharp.MiniProfiler.csproj +++ b/src/OSharp.MiniProfiler/OSharp.MiniProfiler.csproj @@ -4,7 +4,7 @@ - net6.0;net7.0 + net6.0;net7.0;net8.0 OSharp.MiniProfiler OSharp MiniProfiler 性能监测组件 OSharp MiniProfiler 性能监测组件，基于MiniProfiler实现的性能监测组件 diff --git a/src/OSharp.NLog/OSharp.NLog.csproj b/src/OSharp.NLog/OSharp.NLog.csproj index d077e13d..c9d3f7b5 100644 --- a/src/OSharp.NLog/OSharp.NLog.csproj +++ b/src/OSharp.NLog/OSharp.NLog.csproj @@ -4,7 +4,7 @@ - net6.0;net7.0 + net6.0;net7.0;net8.0 OSharp.NLog OSharp NLog组件，封装使用nlog组件来实现框架的日志输出功能 OSharp NLog组件 diff --git a/src/OSharp.Redis/OSharp.Redis.csproj b/src/OSharp.Redis/OSharp.Redis.csproj index 29f80b42..03aeb0bc 100644 --- a/src/OSharp.Redis/OSharp.Redis.csproj +++ b/src/OSharp.Redis/OSharp.Redis.csproj @@ -4,17 +4,20 @@ - net6.0;net7.0 + net6.0;net7.0;net8.0 OSharp.Redis OSharp Redis 缓存组件 OSharp Redis 缓存组件，封装基于Redis客户端的缓存实现 - + - + + + + diff --git a/src/OSharp.Swagger/OSharp.Swagger.csproj b/src/OSharp.Swagger/OSharp.Swagger.csproj index fab35c9f..910342da 100644 --- a/src/OSharp.Swagger/OSharp.Swagger.csproj +++ b/src/OSharp.Swagger/OSharp.Swagger.csproj @@ -4,7 +4,7 @@ - net6.0;net7.0 + net6.0;net7.0;net8.0 OSharp.Swagger OSharp Swagger 客户端组件 OSharp Swagger 客户端组件，封装基于Redis客户端实现 diff --git a/src/OSharp.Utils/Exceptions/OSharpException.cs b/src/OSharp.Utils/Exceptions/OSharpException.cs index cf4541d3..236f2195 100644 --- a/src/OSharp.Utils/Exceptions/OSharpException.cs +++ b/src/OSharp.Utils/Exceptions/OSharpException.cs @@ -1,4 +1,4 @@ -// ----------------------------------------------------------------------- +// ----------------------------------------------------------------------- // // Copyright (c) 2014 OSharp. All rights reserved. // @@ -7,7 +7,9 @@ // ----------------------------------------------------------------------- using System; +#if !NET8_0_OR_GREATER using System.Runtime.Serialization; +#endif namespace OSharp.Exceptions @@ -41,6 +43,7 @@ public OsharpException(string message, Exception inner) : base(message, inner) { } +#if !NET8_0_OR_GREATER /// /// 使用可序列化数据实例化一个类的新实例 /// @@ -49,5 +52,6 @@ public OsharpException(string message, Exception inner) protected OsharpException(SerializationInfo info, StreamingContext context) : base(info, context) { } +#endif } -} \ No newline at end of file +} diff --git a/src/OSharp.Utils/OSharp.Utils.csproj b/src/OSharp.Utils/OSharp.Utils.csproj index 5fab413b..6804c2a0 100644 --- a/src/OSharp.Utils/OSharp.Utils.csproj +++ b/src/OSharp.Utils/OSharp.Utils.csproj @@ -4,7 +4,7 @@ - netstandard2.0;net6.0;net7.0 + netstandard2.0;net6.0;net7.0;net8.0 OSharp.Utils OSharp工具组件，封装着框架常用的工具类 OSharp工具组件 @@ -15,27 +15,27 @@ - - + + - + - + - - - - - - - - - - + + + + + + + + + + diff --git a/src/OSharp.Wpf/OSharp.Wpf.csproj b/src/OSharp.Wpf/OSharp.Wpf.csproj index 3930625c..c64a2f29 100644 --- a/src/OSharp.Wpf/OSharp.Wpf.csproj +++ b/src/OSharp.Wpf/OSharp.Wpf.csproj @@ -4,7 +4,7 @@ - net6.0-windows;net7.0-windows + net6.0-windows;net7.0-windows;net8.0-windows OSharp.Wpf OSharp Wpf 客户端组件 OSharp Wpf 客户端组件，封装Wpf客户端的辅助操作 @@ -17,16 +17,20 @@ - + - + - + + + + + diff --git a/src/OSharp/OSharp.csproj b/src/OSharp/OSharp.csproj index fc6e63e8..96064968 100644 --- a/src/OSharp/OSharp.csproj +++ b/src/OSharp/OSharp.csproj @@ -4,7 +4,7 @@ - net6.0;net7.0 + net6.0;net7.0;net8.0 OSharp.Core OSharp核心组件，封装着框架核心及数据存储，缓存，辅助操作等功能 OSharp核心组件