ewide/number_zj
22
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

升级net7

Browse Source
This commit is contained in:
毛财君
2023-07-07 11:23:30 +08:00
parent 197b38ca6f
commit 6083c9476c
10 changed files with 57 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
20220330_Vote/Ewide.Application/Ewide.Application.csproj
View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net5.0</TargetFramework> <TargetFramework>net7.0</TargetFramework>
<NoWarn>1701;1702;1591</NoWarn> <NoWarn>1701;1702;1591</NoWarn>
<DocumentationFile>Ewide.Application.xml</DocumentationFile> <DocumentationFile>Ewide.Application.xml</DocumentationFile>
</PropertyGroup> </PropertyGroup>

28
20220330_Vote/Ewide.Core/Ewide.Core.csproj
View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net5.0</TargetFramework> <TargetFramework>net7.0</TargetFramework>
<NoWarn>1701;1702;1591</NoWarn> <NoWarn>1701;1702;1591</NoWarn>
<DocumentationFile>Ewide.Core.xml</DocumentationFile> <DocumentationFile>Ewide.Core.xml</DocumentationFile>
</PropertyGroup> </PropertyGroup>
@@ -41,19 +41,19 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="aliyun-net-sdk-core" Version="1.5.10" /> <PackageReference Include="aliyun-net-sdk-core" Version="1.5.11" />
<PackageReference Include="CSRedisCore" Version="3.6.6" /> <PackageReference Include="CSRedisCore" Version="3.8.670" />
<PackageReference Include="Furion.Extras.DatabaseAccessor.SqlSugar" Version="4.8.7.6" /> <PackageReference Include="Furion.Extras.DatabaseAccessor.SqlSugar" Version="4.8.8.35" />
<PackageReference Include="MySql.Data" Version="8.0.29" /> <PackageReference Include="MySql.Data" Version="8.0.33" />
<PackageReference Include="Portable.BouncyCastle" Version="1.8.10" /> <PackageReference Include="Portable.BouncyCastle" Version="1.9.0" />
<PackageReference Include="System.Drawing.Common" Version="5.0.2" /> <PackageReference Include="System.Drawing.Common" Version="7.0.0" />
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.2.20" /> <PackageReference Include="System.Linq.Dynamic.Core" Version="1.3.3" />
<PackageReference Include="UAParser" Version="3.1.46" /> <PackageReference Include="UAParser" Version="3.1.47" />
<PackageReference Include="Furion" Version="4.8.7.6" /> <PackageReference Include="Furion" Version="4.8.8.36" />
<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.8.7.6" /> <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.8.8.35" />
<PackageReference Include="Furion.Extras.DatabaseAccessor.Dapper" Version="4.8.7.6" /> <PackageReference Include="Furion.Extras.DatabaseAccessor.Dapper" Version="4.8.8.35" />
<PackageReference Include="Furion.Extras.Logging.Serilog" Version="4.8.7.6" /> <PackageReference Include="Furion.Extras.Logging.Serilog" Version="4.8.8.35" />
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.8.7.6" /> <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.8.8.35" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
20220330_Vote/Ewide.Database.Migrations/Ewide.Database.Migrations.csproj
View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net5.0</TargetFramework> <TargetFramework>net7.0</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

8
20220330_Vote/Ewide.EntityFramework.Core/Ewide.EntityFramework.Core.csproj
View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net5.0</TargetFramework> <TargetFramework>net7.0</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
@@ -20,9 +20,9 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Data.SqlClient" Version="3.0.0" /> <PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.5" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.8" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="5.0.4" /> <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="7.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

14
20220330_Vote/Ewide.Test/Ewide.Test.csproj
View File

@@ -1,20 +1,20 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net5.0</TargetFramework> <TargetFramework>net7.0</TargetFramework>
<IsPackable>false</IsPackable> <IsPackable>false</IsPackable>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="5.0.6" /> <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.8" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
<PackageReference Include="xunit" Version="2.4.1" /> <PackageReference Include="xunit" Version="2.5.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3"> <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
</PackageReference> </PackageReference>
<PackageReference Include="coverlet.collector" Version="1.3.0"> <PackageReference Include="coverlet.collector" Version="6.0.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
</PackageReference> </PackageReference>

8
20220330_Vote/Ewide.Web.Core/Ewide.Web.Core.csproj
View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net5.0</TargetFramework> <TargetFramework>net7.0</TargetFramework>
<NoWarn>1701;1702;1591</NoWarn> <NoWarn>1701;1702;1591</NoWarn>
<DocumentationFile>Ewide.Web.Core.xml</DocumentationFile> <DocumentationFile>Ewide.Web.Core.xml</DocumentationFile>
</PropertyGroup> </PropertyGroup>
@@ -11,9 +11,9 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.17" /> <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.8" />
<PackageReference Include="Microsoft.Data.SqlClient" Version="3.0.0" /> <PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.1" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.0-preview.1.21102.12" /> <PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
<PackageReference Include="OnceMi.AspNetCore.OSS" Version="1.1.9" /> <PackageReference Include="OnceMi.AspNetCore.OSS" Version="1.1.9" />
</ItemGroup> </ItemGroup>

2
20220330_Vote/Ewide.Web.Entry/Ewide.Web.Entry.csproj
View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web"> <Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net5.0</TargetFramework> <TargetFramework>net7.0</TargetFramework>
<UserSecretsId>aa1cd362-1bdb-4ac9-ad5c-461b3b5b1003</UserSecretsId> <UserSecretsId>aa1cd362-1bdb-4ac9-ad5c-461b3b5b1003</UserSecretsId>
</PropertyGroup> </PropertyGroup>

2
20220330_Vote/RoadFlow.Pinyin/RoadFlow.Pinyin.csproj
View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net5.0</TargetFramework> <TargetFramework>net7.0</TargetFramework>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

8
20220330_Vote/Vote.Services/Vote.Services.csproj
View File

@@ -1,16 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net5.0</TargetFramework> <TargetFramework>net7.0</TargetFramework>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<DocumentationFile>D:\temp_task\20220313\gitcode\number_zj\20220330_Vote\Vote.Services\Vote.Services.xml</DocumentationFile> <DocumentationFile>Vote.Services.xml</DocumentationFile>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Aspose.Words" Version="23.1.0" /> <PackageReference Include="Aspose.Words" Version="23.6.0" />
<PackageReference Include="HtmlAgilityPack" Version="1.11.46" /> <PackageReference Include="HtmlAgilityPack" Version="1.11.49" />
<PackageReference Include="NPOI" Version="2.6.0" /> <PackageReference Include="NPOI" Version="2.6.0" />
<PackageReference Include="OnceMi.AspNetCore.OSS" Version="1.1.9" /> <PackageReference Include="OnceMi.AspNetCore.OSS" Version="1.1.9" />
<PackageReference Include="SharpZipLib" Version="1.4.2" /> <PackageReference Include="SharpZipLib" Version="1.4.2" />

34
20220330_Vote/Vote.Services/Vote.Services.xml
View File

@@ -103,7 +103,7 @@
外墙调查问卷 外墙调查问卷
</summary> </summary>
</member> </member>
<member name="M:Vote.Services.ApiController.OutsideWallService.#ctor(Ewide.Core.SqlSugarRepository{Vote.Services.Entities.outside_wall},Ewide.Core.SqlSugarRepository{Vote.Services.Entities.outside_wall_building},Ewide.Core.SqlSugarRepository{Vote.Services.Entities.outside_wall_building_photo},Ewide.Core.SqlSugarRepository{Vote.Services.Entities.outside_wall_photo},Microsoft.Extensions.Caching.Memory.IMemoryCache,Ewide.Core.SqlSugarRepository{Ewide.Core.SysFile},Microsoft.Extensions.Options.IOptions{Ewide.Core.UploadFileOptions})"> <member name="M:Vote.Services.ApiController.OutsideWallService.#ctor(Ewide.Core.SqlSugarRepository{Vote.Services.Entities.Experts},Ewide.Core.SqlSugarRepository{Vote.Services.Entities.outside_wall},Ewide.Core.SqlSugarRepository{Vote.Services.Entities.outside_wall_building},Ewide.Core.SqlSugarRepository{Vote.Services.Entities.outside_wall_building_photo},Ewide.Core.SqlSugarRepository{Vote.Services.Entities.outside_wall_photo},Microsoft.Extensions.Caching.Memory.IMemoryCache,Ewide.Core.SqlSugarRepository{Ewide.Core.SysFile},Microsoft.Extensions.Options.IOptions{Ewide.Core.UploadFileOptions})">
<summary> <summary>
</summary> </summary>
@@ -119,18 +119,6 @@
</summary> </summary>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Vote.Services.ApiController.OutsideWallService.GetCommunitys(System.String)">
<summary>
获取三居系统中的社区
</summary>
<returns></returns>
</member>
<member name="M:Vote.Services.ApiController.OutsideWallService.GetCommunityInfo(System.String)">
<summary>
获取三居系统中的社区
</summary>
<returns></returns>
</member>
<member name="M:Vote.Services.ApiController.OutsideWallService.GetTimeStamp"> <member name="M:Vote.Services.ApiController.OutsideWallService.GetTimeStamp">
<summary> <summary>
获取时间戳 获取时间戳
@@ -173,7 +161,25 @@
<param name="Length">生成长度</param> <param name="Length">生成长度</param>
<param name="Sleep">是否要在生成前将当前线程阻止以避免重复</param> <param name="Sleep">是否要在生成前将当前线程阻止以避免重复</param>
</member> </member>
<member name="M:Vote.Services.ApiController.OutsideWallService.Submit(Vote.Services.Dto.OutsideWallInput)"> <member name="M:Vote.Services.ApiController.OutsideWallService.VerifyKey(System.String)">
<summary>
授权验证
</summary>
<returns></returns>
</member>
<member name="M:Vote.Services.ApiController.OutsideWallService.GetCommunitys(System.String)">
<summary>
获取三居系统中的社区
</summary>
<returns></returns>
</member>
<member name="M:Vote.Services.ApiController.OutsideWallService.GetCommunityInfo(System.String)">
<summary>
获取三居系统中的社区
</summary>
<returns></returns>
</member>
<member name="M:Vote.Services.ApiController.OutsideWallService.Submit(Vote.Services.Dto.OutsideWallInput,System.String)">
<summary> <summary>
提交 提交
</summary> </summary>