wgh/coreshoppro
1
0
Fork 0
mirror of http://git.coreshop.cn/jianweie/coreshoppro.git synced 2025-12-06 19:03:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

【升级】升级Asp.Net 6.0.11 到 Asp.Net 7.0.0

Browse Source 
【升级】升级所有组建包，移除一些不用或者版本弃用的组建。
【优化】优化升级npoi最新版后，出现导出数据兼容性的问题。
【优化】使用新的【NLog.Database】nlog数据库链接组件,解决nlog升级到5.x以后版本记录到数据库日志失败的问题。
This commit is contained in:
大灰灰
2022-11-09 19:06:05 +08:00
parent 543bb281f4
commit 2313bf6ac9
58 changed files with 154 additions and 832 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CoreCms.Net.Repository/CoreCms.Net.Repository.csproj
View File

@@ -1,12 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="DotLiquid" Version="2.2.656" />
<PackageReference Include="Essensoft.Paylink.WeChatPay" Version="4.0.12" />
<PackageReference Include="Essensoft.Paylink.WeChatPay" Version="4.0.14" />
</ItemGroup>
<ItemGroup>

4
CoreCms.Net.Repository/Distribution/CoreCmsDistributionRepository.cs
View File

@@ -155,7 +155,7 @@ namespace CoreCms.Net.Repository
updateTime = p.updateTime,
verifyTime = p.verifyTime,
isDelete = p.isDelete,
UserGradeId = SqlFunc.Subqueryable<CoreCmsUser>().Where(o => o.id == p.userId).Select(p => p.grade)
UserGradeId = SqlFunc.Subqueryable<CoreCmsUser>().Where(o => o.id == p.userId).Select(o => o.grade)
})
.MergeTable()
@@ -184,7 +184,7 @@ namespace CoreCms.Net.Repository
updateTime = p.updateTime,
verifyTime = p.verifyTime,
isDelete = p.isDelete,
UserGradeId = SqlFunc.Subqueryable<CoreCmsUser>().Where(o => o.id == p.userId).Select(p => p.grade)
UserGradeId = SqlFunc.Subqueryable<CoreCmsUser>().Where(o => o.id == p.userId).Select(o => o.grade)
})
.MergeTable()
.OrderByIF(orderByExpression != null, orderByExpression, orderByType)