Skip to content

Commit

Permalink
sdk: 更新.net sdk到.net 6.0.26, .net7.0.15, .net8.0.1,更新第三方库到最新版本
Browse files Browse the repository at this point in the history
  • Loading branch information
gmf520 committed Jan 12, 2024
1 parent 5e32460 commit 58cd226
Show file tree
Hide file tree
Showing 16 changed files with 61 additions and 58 deletions.
4 changes: 2 additions & 2 deletions build/version.props
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<Project>
<PropertyGroup>
<VersionMain>8.0</VersionMain>
<VersionPrefix>0</VersionPrefix>
<VersionPrefix>1</VersionPrefix>
<VersionSuffix>-preview.</VersionSuffix>
<VersionSuffixVersion>1120</VersionSuffixVersion>
<VersionSuffixVersion>113</VersionSuffixVersion>
<Version>$(VersionMain).$(VersionPrefix)$(VersionSuffix)$(VersionSuffixVersion)</Version>
<FileVersion>$(VersionMain).$(VersionPrefix).$(VersionSuffixVersion)</FileVersion>
<!--<Version>$(VersionMain).$(VersionPrefix)</Version>
Expand Down
4 changes: 2 additions & 2 deletions samples/web/Liuliu.Demo.Web/Liuliu.Demo.Web.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
<PackageReference Include="AspectCore.Extensions.Hosting" Version="2.4.0" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net6'">
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="[6.0.22, 7.0.0)" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="[6.0.22, 7.0.0)">
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="[6.0.26, 7.0.0)" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="[6.0.26, 7.0.0)">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
13 changes: 7 additions & 6 deletions samples/web/Liuliu.Demo.WebApi/Liuliu.Demo.WebApi.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -24,30 +24,31 @@
<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.25" />
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="6.0.26" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.16" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.25">
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.26">
<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.14" />
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="7.0.15" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.11" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.14">
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.15">
<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.AspNetCore.Diagnostics.EntityFrameworkCore" Version="8.0.1" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.0">
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<ProjectReference Include="..\..\..\src\OSharp.EntityFrameworkCore.Oracle\OSharp.EntityFrameworkCore.Oracle.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
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,4 +47,3 @@ protected override DefaultDbContext CreateDbContext(IServiceProvider scopedProvi
}
}
}
#endif
18 changes: 9 additions & 9 deletions src/OSharp.AspNetCore/OSharp.AspNetCore.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,19 @@
<FrameworkReference Include="Microsoft.AspNetCore.App" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net6.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)" />
<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="[6.0.26, 7.0.0)" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="[6.0.26, 7.0.0)" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="[6.0.26, 7.0.0)" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net7.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)" />
<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="[7.0.15, 8.0.0)" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="[7.0.15, 8.0.0)" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="[7.0.15, 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)" />
<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="[8.0.1, 9.0.0)" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="[8.0.1, 9.0.0)" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="[8.0.1, 9.0.0)" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\OSharp\OSharp.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.Oracle</PackageId>
<Description>OSharp 数据访问组件,封装EntityFrameworkCore的Oracle数据访问功能的实现</Description>
<Summary>OSharp 数据访问组件Oracle</Summary>
<RootNamespace>OSharp.Entity.Oracle</RootNamespace>
</PropertyGroup>

<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
<PackageReference Include="Oracle.EntityFrameworkCore" Version="[6.21.120, 7.0.0)" />
<PackageReference Include="Oracle.EntityFrameworkCore" Version="[6.21.130, 7.0.0)" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
<PackageReference Include="Oracle.EntityFrameworkCore" Version="[7.21.12, 8.0.0)" />
<PackageReference Include="Oracle.EntityFrameworkCore" Version="[7.21.13, 8.0.0)" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
<PackageReference Include="Oracle.EntityFrameworkCore" Version="[8.21.121, 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 @@ -18,7 +18,7 @@
<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)" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="[8.0.0, 9.0.0)" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
</PropertyGroup>

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

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
</PropertyGroup>

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

<ItemGroup>
Expand Down
20 changes: 10 additions & 10 deletions src/OSharp.EntityFrameworkCore/OSharp.EntityFrameworkCore.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,22 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Dapper" Version="2.1.21" />
<PackageReference Include="Dapper" Version="2.1.28" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net6.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)" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="[6.0.26, 7.0.0)" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="[6.0.26, 7.0.0)" />
<PackageReference Include="Z.EntityFramework.Plus.EFCore" Version="[6.101.1.3, 7.0.0)" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net7.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)" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="[7.0.15, 8.0.0)" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="[7.0.15, 8.0.0)" />
<PackageReference Include="Z.EntityFramework.Plus.EFCore" Version="[7.101.1.3, 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)" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="[8.0.1, 9.0.0)" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="[8.0.1, 9.0.0)" />
<PackageReference Include="Z.EntityFramework.Plus.EFCore" Version="[8.101.1.3, 9.0.0)" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/OSharp.Hangfire/OSharp.Hangfire.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</PropertyGroup>

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

Expand Down
2 changes: 1 addition & 1 deletion src/OSharp.Hosting.Core/OSharp.Hosting.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

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

<ItemGroup>
Expand Down
12 changes: 6 additions & 6 deletions src/OSharp.Identity/OSharp.Identity.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,16 @@
<PackageReference Include="Authentication.GitHub.Core" Version="1.0.0" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="[6.0.25, 7.0.0)" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="[6.0.25, 7.0.0)" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="[6.0.26, 7.0.0)" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="[6.0.26, 7.0.0)" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="[7.0.14, 8.0.0)" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="[7.0.14, 8.0.0)" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="[7.0.15, 8.0.0)" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="[7.0.15, 8.0.0)" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="[8.0.0, 9.0.0)" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="[8.0.0, 9.0.0)" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="[8.0.1, 9.0.0)" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="[8.0.1, 9.0.0)" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions src/OSharp.Redis/OSharp.Redis.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
</PropertyGroup>

<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="[6.0.25, 7.0.0)" />
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="[6.0.26, 7.0.0)" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="[7.0.14, 8.0.0)" />
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="[7.0.15, 8.0.0)" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="[8.0.0, 9.0.0)" />
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="[8.0.1, 9.0.0)" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/OSharp.Utils/OSharp.Utils.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@
<PackageReference Include="System.ComponentModel" Version=" 4.3.0" />
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
<PackageReference Include="System.DirectoryServices.Protocols" Version="[7.0.1, 8.0.0)" />
<PackageReference Include="System.Drawing.Common" Version="8.0.0" />
<PackageReference Include="System.Drawing.Common" Version="8.0.1" />
<PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.7.0" />
<PackageReference Include="System.Security.Cryptography.Algorithms" Version="4.3.1" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
Expand Down
8 changes: 4 additions & 4 deletions src/OSharp.Wpf/OSharp.Wpf.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,18 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="FluentValidation" Version="11.8.0" />
<PackageReference Include="FluentValidation" Version="11.9.0" />
<PackageReference Include="Stylet" Version="1.3.6" />
<PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net6.0-windows'">
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="[6.0.25, 7.0.0)" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="[6.0.26, 7.0.0)" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net7.0-windows'">
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="[7.0.14, 8.0.0)" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="[7.0.15, 8.0.0)" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net8.0-windows'">
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="[8.0.0, 9.0.0)" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="[8.0.1, 9.0.0)" />
</ItemGroup>

<ItemGroup>
Expand Down

0 comments on commit 58cd226

Please sign in to comment.