Merge pull request #150 from luckearth/YiShaAdmin-Net7

更新框架为Net7
liukuo362573 · Apr 6, 2023 · d3f551b · d3f551b
2 parents 1957a35 + c9d574d
commit d3f551b
Show file tree

Hide file tree

Showing 25 changed files with 65 additions and 62 deletions.
diff --git a/README.md b/README.md
@@ -50,7 +50,7 @@
 2. 创建开发分支 (`git checkout -b dev`)
 3. 提交更改 (`git commit -m 'Add something'`)
 4. 推送到分支 (`git push origin dev`)
-5. 提[Pull Request](https://github.com/liukuo362573/YiShaAdmin/compare)
+5. 提[Pull Request](https://github.com/liukuo362573/YiShaAdmin/compare)，建议每一个小功能提一个 PR
 
 ## License
 

diff --git a/YiSha.Business/YiSha.Business.AutoJob/YiSha.Business.AutoJob.csproj b/YiSha.Business/YiSha.Business.AutoJob/YiSha.Business.AutoJob.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+	  <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Quartz" Version="3.0.7" />
+    <PackageReference Include="Quartz" Version="3.6.2" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/YiSha.Business/YiSha.Business.Cache/YiSha.Business.Cache.csproj b/YiSha.Business/YiSha.Business.Cache/YiSha.Business.Cache.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+	  <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/YiSha.Business/YiSha.Business/YiSha.Business.csproj b/YiSha.Business/YiSha.Business/YiSha.Business.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+	  <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/YiSha.Business/YiSha.Service/YiSha.Service.csproj b/YiSha.Business/YiSha.Service/YiSha.Service.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+	  <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/YiSha.Cache/YiSha.Cache.Factory/YiSha.Cache.Factory.csproj b/YiSha.Cache/YiSha.Cache.Factory/YiSha.Cache.Factory.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/YiSha.Cache/YiSha.Cache.Interface/YiSha.Cache.Interface.csproj b/YiSha.Cache/YiSha.Cache.Interface/YiSha.Cache.Interface.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+	  <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
 </Project>
diff --git a/YiSha.Cache/YiSha.MemoryCache/YiSha.MemoryCache.csproj b/YiSha.Cache/YiSha.MemoryCache/YiSha.MemoryCache.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+	  <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="3.1.0" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/YiSha.Cache/YiSha.RedisCache/YiSha.RedisCache.csproj b/YiSha.Cache/YiSha.RedisCache/YiSha.RedisCache.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+	  <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="StackExchange.Redis" Version="2.0.600" />
+    <PackageReference Include="StackExchange.Redis" Version="2.6.104" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/YiSha.Data/YiSha.Data.EF/YiSha.Data.EF.csproj b/YiSha.Data/YiSha.Data.EF/YiSha.Data.EF.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+	  <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
@@ -10,9 +10,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.5" />
-    <PackageReference Include="Oracle.ManagedDataAccess.Core" Version="3.21.1" />
-    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="5.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.4" />
+    <PackageReference Include="Oracle.ManagedDataAccess.Core" Version="3.21.90" />
+    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="7.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/YiSha.Data/YiSha.Data.Repository/YiSha.Data.Repository.csproj b/YiSha.Data/YiSha.Data.Repository/YiSha.Data.Repository.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+	  <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/YiSha.Data/YiSha.Data/DbHelper.cs b/YiSha.Data/YiSha.Data/DbHelper.cs
@@ -101,7 +101,7 @@ public async Task<IDataReader> ExecuteReadeAsync(CommandType cmdType, string str
                            dbContext,
                            Guid.NewGuid(),
                            connection.ConnectionId,
-                           startTime);
+                           startTime,CommandSource.ExecuteSqlRaw);
 
                     var reader = interceptionResult.HasResult
                         ? interceptionResult.Result
@@ -117,7 +117,7 @@ public async Task<IDataReader> ExecuteReadeAsync(CommandType cmdType, string str
                             connection.ConnectionId,
                             reader,
                             startTime,
-                            stopwatch.Elapsed);
+                            stopwatch.Elapsed,CommandSource.ExecuteSqlRaw);
                     }
                     return reader;
                 }
@@ -169,7 +169,7 @@ public async Task<object> ExecuteScalarAsync(CommandType cmdType, string strSql,
                            dbContext,
                            Guid.NewGuid(),
                            connection.ConnectionId,
-                           startTime);
+                           startTime, CommandSource.ExecuteSqlRaw);
 
                     var obj = interceptionResult.HasResult
                         ? interceptionResult.Result
@@ -185,7 +185,7 @@ public async Task<object> ExecuteScalarAsync(CommandType cmdType, string strSql,
                             connection.ConnectionId,
                             obj,
                             startTime,
-                            stopwatch.Elapsed);
+                            stopwatch.Elapsed, CommandSource.ExecuteSqlRaw);
                     }
                     return obj;
                 }

diff --git a/YiSha.Data/YiSha.Data/YiSha.Data.csproj b/YiSha.Data/YiSha.Data/YiSha.Data.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+	  <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="5.0.5" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.5" />
-    <PackageReference Include="MySqlConnector" Version="1.3.8" />
-    <PackageReference Include="Oracle.ManagedDataAccess.Core" Version="3.21.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.4" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.4" />
+    <PackageReference Include="MySqlConnector" Version="2.2.5" />
+    <PackageReference Include="Oracle.ManagedDataAccess.Core" Version="3.21.90" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/YiSha.Entity/YiSha.Entity/YiSha.Entity.csproj b/YiSha.Entity/YiSha.Entity/YiSha.Entity.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+	  <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/YiSha.Entity/YiSha.Enum/YiSha.Enum.csproj b/YiSha.Entity/YiSha.Enum/YiSha.Enum.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+	  <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
 </Project>
diff --git a/YiSha.Entity/YiSha.Model/YiSha.Model.csproj b/YiSha.Entity/YiSha.Model/YiSha.Model.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+	  <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/YiSha.Test/YiSha.CacheTest/YiSha.CacheTest.csproj b/YiSha.Test/YiSha.CacheTest/YiSha.CacheTest.csproj
@@ -1,18 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+	<TargetFramework>net7.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="nunit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1">
+    <PackageReference Include="nunit" Version="3.13.3" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.4.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/YiSha.Test/YiSha.DataTest/YiSha.DataTest.csproj b/YiSha.Test/YiSha.DataTest/YiSha.DataTest.csproj
@@ -1,15 +1,18 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="nunit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
+    <PackageReference Include="nunit" Version="3.13.3" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.4.2">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/YiSha.Test/YiSha.UtilTest/YiSha.UtilTest.csproj b/YiSha.Test/YiSha.UtilTest/YiSha.UtilTest.csproj
@@ -1,18 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="nunit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1">
+    <PackageReference Include="nunit" Version="3.13.3" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.4.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/YiSha.Util/YiSha.CodeGenerator/YiSha.CodeGenerator.csproj b/YiSha.Util/YiSha.CodeGenerator/YiSha.CodeGenerator.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+	  <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.4" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/YiSha.Util/YiSha.IdGenerator/YiSha.IdGenerator.csproj b/YiSha.Util/YiSha.IdGenerator/YiSha.IdGenerator.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+	  <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/YiSha.Util/YiSha.Util/YiSha.Util.csproj b/YiSha.Util/YiSha.Util/YiSha.Util.csproj
@@ -1,19 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+	  <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8">
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.4" />
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="NLog.Web.AspNetCore" Version="4.9.2" />
-    <PackageReference Include="NPOI" Version="2.4.1" />
-    <PackageReference Include="System.Drawing.Common" Version="4.7.0" />
+    <PackageReference Include="NLog.Web.AspNetCore" Version="5.2.3" />
+    <PackageReference Include="NPOI" Version="2.6.0" />
+    <PackageReference Include="System.Drawing.Common" Version="7.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/YiSha.Web/YiSha.Admin.Web/YiSha.Admin.Web.csproj b/YiSha.Web/YiSha.Admin.Web/YiSha.Admin.Web.csproj
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <AssemblyVersion>3.1.0.0</AssemblyVersion>
-    <FileVersion>3.1.0.0</FileVersion>
+	<TargetFramework>net7.0</TargetFramework>
+    <AssemblyVersion>7.0.0.0</AssemblyVersion>
+    <FileVersion>7.0.0.0</FileVersion>
     <Company>YiSha.Admin.Web</Company>
     <Authors>YiSha.Admin.Web</Authors>
     <Product>YiShaAdmin</Product>
@@ -18,9 +18,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BuildBundlerMinifier" Version="3.2.435" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="3.1.0" />
+    <PackageReference Include="BuildBundlerMinifier" Version="3.2.449" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.4" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="7.0.4" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/YiSha.Web/YiSha.Admin.WebApi/YiSha.Admin.WebApi.csproj b/YiSha.Web/YiSha.Admin.WebApi/YiSha.Admin.WebApi.csproj
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <AssemblyVersion>3.1.0.0</AssemblyVersion>
-    <FileVersion>3.1.0.0</FileVersion>
+	<TargetFramework>net7.0</TargetFramework>
+    <AssemblyVersion>7.0.0.0</AssemblyVersion>
+    <FileVersion>7.0.0.0</FileVersion>
     <Copyright>YiShaAdmin</Copyright>
   </PropertyGroup>
 
@@ -18,7 +18,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.1.4" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/YiSha.Web/YiSha.Web.Code/YiSha.Web.Code.csproj b/YiSha.Web/YiSha.Web.Code/YiSha.Web.Code.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+	<TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>