Skip to content

Commit

Permalink
sdk: 更新.net sdk到.net 6.0.25,.net 7.0.14,.net8.0.0,更新第三方到最新版本,更新版本号到 8…
Browse files Browse the repository at this point in the history
….0.0-preview.1120
  • Loading branch information
gmf520 committed Nov 20, 2023
1 parent 0a421f7 commit 325f253
Show file tree
Hide file tree
Showing 31 changed files with 141 additions and 92 deletions.
2 changes: 1 addition & 1 deletion build/public.props
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<NoWarn>1701;1702;1591;8002</NoWarn>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
</ItemGroup>
<ItemGroup>
<None Include="..\..\build\icon.png" Pack="true" Visible="false" PackagePath=""/>
Expand Down
14 changes: 7 additions & 7 deletions build/version.props
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<Project>
<PropertyGroup>
<VersionMain>7.0</VersionMain>
<VersionPrefix>11</VersionPrefix>
<VersionMain>8.0</VersionMain>
<VersionPrefix>0</VersionPrefix>
<VersionSuffix>-preview.</VersionSuffix>
<VersionSuffixVersion>1001</VersionSuffixVersion>
<!--<Version>$(VersionMain).$(VersionPrefix)$(VersionSuffix)$(VersionSuffixVersion)</Version>
<FileVersion>$(VersionMain).$(VersionPrefix).$(VersionSuffixVersion)</FileVersion>-->
<Version>$(VersionMain).$(VersionPrefix)</Version>
<FileVersion>$(VersionMain).$(VersionPrefix)</FileVersion>
<VersionSuffixVersion>1120</VersionSuffixVersion>
<Version>$(VersionMain).$(VersionPrefix)$(VersionSuffix)$(VersionSuffixVersion)</Version>
<FileVersion>$(VersionMain).$(VersionPrefix).$(VersionSuffixVersion)</FileVersion>
<!--<Version>$(VersionMain).$(VersionPrefix)</Version>
<FileVersion>$(VersionMain).$(VersionPrefix)</FileVersion>-->
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "7.0.100",
"version": "8.0.100",
"rollForward": "latestFeature",
"allowPrerelease": false
}
Expand Down
23 changes: 16 additions & 7 deletions samples/web/Liuliu.Demo.WebApi/Liuliu.Demo.WebApi.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<Import Project="../../../build/version.props" />

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace>Liuliu.Demo.Web</RootNamespace>
<UserSecretsId>38c51dba-31f4-4c29-a3b3-49164e38d32f</UserSecretsId>
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
Expand All @@ -24,17 +24,27 @@
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.5" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="6.0.22" />
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="6.0.25" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.16" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.22">
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.25">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<ProjectReference Include="..\..\..\src\OSharp.EntityFrameworkCore.Oracle\OSharp.EntityFrameworkCore.Oracle.csproj" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="7.0.11" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.10" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.11">
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="7.0.14" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.11" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.14">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<ProjectReference Include="..\..\..\src\OSharp.EntityFrameworkCore.Oracle\OSharp.EntityFrameworkCore.Oracle.csproj" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="8.0.0" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand All @@ -43,7 +53,6 @@
<ItemGroup>
<ProjectReference Include="..\..\..\src\OSharp.AutoMapper\OSharp.AutoMapper.csproj" />
<ProjectReference Include="..\..\..\src\OSharp.EntityFrameworkCore.MySql\OSharp.EntityFrameworkCore.MySql.csproj" />
<ProjectReference Include="..\..\..\src\OSharp.EntityFrameworkCore.Oracle\OSharp.EntityFrameworkCore.Oracle.csproj" />
<ProjectReference Include="..\..\..\src\OSharp.EntityFrameworkCore.PostgreSql\OSharp.EntityFrameworkCore.PostgreSql.csproj" />
<ProjectReference Include="..\..\..\src\OSharp.EntityFrameworkCore.Sqlite\OSharp.EntityFrameworkCore.Sqlite.csproj" />
<ProjectReference Include="..\..\..\src\OSharp.EntityFrameworkCore.SqlServer\OSharp.EntityFrameworkCore.SqlServer.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion samples/web/Liuliu.Demo.WebApi/Startup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -71,4 +71,4 @@ public void Configure(WebApplication app)
app.UseOSharp();
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
// <last-date>2019-04-18 20:57</last-date>
// -----------------------------------------------------------------------


#if !NET8_0_OR_GREATER
using System;
using System.ComponentModel;

Expand Down Expand Up @@ -47,3 +47,4 @@ protected override DefaultDbContext CreateDbContext(IServiceProvider scopedProvi
}
}
}
#endif
20 changes: 12 additions & 8 deletions src/OSharp.AspNetCore/OSharp.AspNetCore.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<Import Project="../../build/version.props" />

<PropertyGroup>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<PackageId>OSharp.AspNetCore</PackageId>
<Summary>OSharp AspNetCore组件</Summary>
<Description>OSharp AspNetCore组件,提供AspNetCore的服务端功能的封装</Description>
Expand All @@ -16,15 +16,19 @@
<FrameworkReference Include="Microsoft.AspNetCore.App" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="[6.0.22, 7.0.0)" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="[6.0.22, 7.0.0)" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="[6.0.22, 7.0.0)" />
<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="[6.0.25, 7.0.0)" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="[6.0.25, 7.0.0)" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="[6.0.25, 7.0.0)" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="[7.0.11, 8.0.0)" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="[7.0.11, 8.0.0)" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="[7.0.11, 8.0.0)" />
<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="[7.0.14, 8.0.0)" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="[7.0.14, 8.0.0)" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="[7.0.14, 8.0.0)" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="[8.0.0, 9.0.0)" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="[8.0.0, 9.0.0)" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="[8.0.0, 9.0.0)" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\OSharp\OSharp.csproj" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<Import Project="../../build/public.props" />
<Import Project="../../build/version.props" />

<PropertyGroup>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<PackageId>OSharp.Authorization.Datas</PackageId>
<Summary>OSharp 数据权限组件</Summary>
<Description>OSharp 数据权限组件,对应用中数据权限进行授权的设计实现</Description>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<Import Project="../../build/public.props" />
<Import Project="../../build/version.props" />

<PropertyGroup>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<PackageId>OSharp.Authorization.Functions</PackageId>
<Summary>OSharp 功能权限组件</Summary>
<Description>OSharp 功能权限组件,API功能权限授权的设计实现</Description>
Expand Down
2 changes: 1 addition & 1 deletion src/OSharp.AutoMapper/OSharp.AutoMapper.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<Import Project="../../build/version.props" />

<PropertyGroup>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<PackageId>OSharp.AutoMapper</PackageId>
<Summary>OSharp AutoMapper 对象映射组件</Summary>
<Description>OSharp AutoMapper 对象映射组件,封装基于AutoMapper的对象映射实现</Description>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<Import Project="../../build/version.props" />

<PropertyGroup>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<PackageId>OSharp.EntityFrameworkCore.MySql</PackageId>
<Description>OSharp 数据访问组件,封装EntityFrameworkCore的MySql数据访问功能的实现</Description>
<Summary>OSharp 数据访问组件MySql</Summary>
Expand All @@ -17,6 +17,9 @@
<ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="[7.0.0, 8.0.0)" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="[8.0.0-beta.2, 9.0.0)" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\OSharp.EntityFrameworkCore\OSharp.EntityFrameworkCore.csproj" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
</PropertyGroup>

<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
<PackageReference Include="Oracle.EntityFrameworkCore" Version="[6.21.110, 7.0.0)" />
<PackageReference Include="Oracle.EntityFrameworkCore" Version="[6.21.120, 7.0.0)" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
<PackageReference Include="Oracle.EntityFrameworkCore" Version="[7.21.11, 8.0.0)" />
<PackageReference Include="Oracle.EntityFrameworkCore" Version="[7.21.12, 8.0.0)" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\OSharp.EntityFrameworkCore\OSharp.EntityFrameworkCore.csproj" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<Import Project="../../build/version.props" />

<PropertyGroup>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<PackageId>OSharp.EntityFrameworkCore.PostgreSql</PackageId>
<Description>OSharp 数据访问组件,封装EntityFrameworkCore的PostgreSql数据访问功能的实现</Description>
<Summary>OSharp 数据访问组件PostgreSql</Summary>
Expand All @@ -17,6 +17,9 @@
<ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="[7.0.11, 8.0.0)" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="[8.0.0-rc.2, 9.0.0)" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\OSharp.EntityFrameworkCore\OSharp.EntityFrameworkCore.csproj" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,21 @@
<Import Project="../../build/version.props" />

<PropertyGroup>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<PackageId>OSharp.EntityFrameworkCore.SqlServer</PackageId>
<Description>OSharp 数据访问组件,封装EntityFrameworkCore的SqlServer数据访问功能的实现</Description>
<Summary>OSharp 数据访问组件SqlServer</Summary>
<RootNamespace>OSharp.Entity.SqlServer</RootNamespace>
</PropertyGroup>

<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="[6.0.22, 7.0.0)" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="[6.0.25, 7.0.0)" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="[7.0.11, 8.0.0)" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="[7.0.14, 8.0.0)" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="[8.0.0, 9.0.0)" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,21 @@
<Import Project="../../build/version.props" />

<PropertyGroup>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<PackageId>OSharp.EntityFrameworkCore.Sqlite</PackageId>
<Description>OSharp 数据访问组件,封装EntityFrameworkCore的Sqlite数据访问功能的实现</Description>
<Summary>OSharp 数据访问组件Sqlite</Summary>
<RootNamespace>OSharp.Entity.Sqlite</RootNamespace>
</PropertyGroup>

<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="[6.0.22, 7.0.0)" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="[6.0.25, 7.0.0)" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="[7.0.11, 8.0.0)" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="[7.0.14, 8.0.0)" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="[8.0.0, 9.0.0)" />
</ItemGroup>

<ItemGroup>
Expand Down
21 changes: 13 additions & 8 deletions src/OSharp.EntityFrameworkCore/OSharp.EntityFrameworkCore.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<Import Project="../../build/version.props" />

<PropertyGroup>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<PackageId>OSharp.EntityFrameworkCore</PackageId>
<Description>OSharp数据访问组件,封装EntityFrameworkCore数据访问功能的实现</Description>
<Summary>OSharp数据访问组件</Summary>
Expand All @@ -13,17 +13,22 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Dapper" Version="2.0.151" />
<PackageReference Include="Dapper" Version="2.1.21" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="[6.0.22, 7.0.0)" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="[6.0.22, 7.0.0)" />
<PackageReference Include="Z.EntityFramework.Plus.EFCore" Version="[6.100.0.2, 7.0.0)" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="[6.0.25, 7.0.0)" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="[6.0.25, 7.0.0)" />
<PackageReference Include="Z.EntityFramework.Plus.EFCore" Version="[6.101.0, 7.0.0)" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="[7.0.11, 8.0.0)" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="[7.0.11, 8.0.0)" />
<PackageReference Include="Z.EntityFramework.Plus.EFCore" Version="[7.100.0.2, 8.0.0)" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="[7.0.14, 8.0.0)" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="[7.0.14, 8.0.0)" />
<PackageReference Include="Z.EntityFramework.Plus.EFCore" Version="[7.101.0, 8.0.0)" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="[8.0.0, 9.0.0)" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="[8.0.0, 9.0.0)" />
<PackageReference Include="Z.EntityFramework.Plus.EFCore" Version="[8.101.0, 9.0.0)" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/OSharp.Exceptionless/OSharp.Exceptionless.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
<Import Project="../../build/version.props" />

<PropertyGroup>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<PackageId>OSharp.Exceptionless</PackageId>
<Summary>OSharp Exceptionless 分布式日志组件</Summary>
<Description>OSharp Exceptionless 分布式日志组件,封装基于Exceptionless 分布式日志记录实现</Description>
<RootNamespace>OSharp.Exceptionless</RootNamespace>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Exceptionless.AspNetCore" Version="6.0.2" />
<PackageReference Include="Exceptionless.AspNetCore" Version="6.0.3" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/OSharp.Hangfire/OSharp.Hangfire.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
<Import Project="../../build/version.props" />

<PropertyGroup>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<PackageId>OSharp.Hangfire</PackageId>
<Summary>OSharp Hangfire 后台任务组件</Summary>
<Description>OSharp Hangfire 后台任务组件,封装基于Hangfire后台任务的服务端实现</Description>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Hangfire" Version="1.8.5" />
<PackageReference Include="Hangfire" Version="1.8.6" />
<PackageReference Include="Hangfire.MemoryStorage" Version="1.8.0" />
</ItemGroup>

Expand Down
7 changes: 5 additions & 2 deletions src/OSharp.Hosting.Apis/OSharp.Hosting.Apis.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<Import Project="../../build/version.props" />

<PropertyGroup>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<PackageId>OSharp.Hosting.Apis</PackageId>
<OutputType>Library</OutputType>
<Summary>OSharp框架非业务WebAPI实现</Summary>
Expand All @@ -23,7 +23,10 @@
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="[6.0.16, 7.0.0)" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="[7.0.10, 8.0.0)" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="[7.0.11, 8.0.0)" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="[8.0.0, 9.0.0)" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions src/OSharp.Hosting.Core/OSharp.Hosting.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
<Import Project="../../build/version.props" />

<PropertyGroup>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<PackageId>OSharp.Hosting.Core</PackageId>
<Summary>OSharp框架非业务核心</Summary>
<Description>OSharp框架业务核心,封装框架非业务如认证,权限,系统,消息等模块的接口与业务实现</Description>
<RootNamespace>OSharp.Hosting</RootNamespace>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="MailKit" Version="4.2.0" />
<PackageReference Include="MailKit" Version="4.3.0" />
<PackageReference Include="Lazy.Captcha.Core" Version="2.0.6" />
</ItemGroup>

Expand Down
Loading

0 comments on commit 325f253

Please sign in to comment.