ソースを参照

更新nuget包
修复集成测试失败的问题

zhontai 2 年 前
コミット
fdb6c998d9

+ 12 - 0
src/hosts/ZhonTai.Host/ZhonTai.Host.csproj

@@ -16,4 +16,16 @@
 	<ItemGroup>
 		<InternalsVisibleTo Include="ZhonTai.Tests" />
 	</ItemGroup>
+
+	<ItemGroup>
+		<Content Update="wwwroot\*\*">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Content>
+		<Content Update="wwwroot\*\*\*\*">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Content>
+		<Content Update="wwwroot\*\*\*\*\*">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Content>
+	</ItemGroup>
 </Project>

+ 1 - 1
src/platform/ZhonTai.Admin/Core/Startup/HostAppOptions.cs

@@ -38,7 +38,7 @@ namespace ZhonTai.Admin.Core.Startup
         public Action<HostAppMiddlewareContext> ConfigurePostMiddleware { get; set; }
 
         /// <summary>
-        /// 配置数据库库构建器
+        /// 配置FreeSql构建器
         /// </summary>
         public Action<FreeSqlBuilder> ConfigureFreeSqlBuilder { get; set; }
 

+ 14 - 14
src/platform/ZhonTai.Admin/ZhonTai.Admin.csproj

@@ -13,31 +13,31 @@
 		<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="8.0.0" />
 		<PackageReference Include="Autofac.Extras.DynamicProxy" Version="6.0.1" />
 		<PackageReference Include="Castle.Core.AsyncInterceptor" Version="2.1.0" />
-		<PackageReference Include="CSRedisCore" Version="3.8.2" />
-		<PackageReference Include="Caching.CSRedis" Version="3.8.2" />
-		<PackageReference Include="FluentValidation.AspNetCore" Version="11.0.3" />
-		<PackageReference Include="FreeSql" Version="3.2.664" />
-		<PackageReference Include="FreeSql.Provider.MySql" Version="3.2.664" />
-		<PackageReference Include="FreeSql.Provider.Oracle" Version="3.2.664" />
-		<PackageReference Include="FreeSql.Provider.PostgreSQL" Version="3.2.664" />
-		<PackageReference Include="FreeSql.Provider.Sqlite" Version="3.2.664" />
-		<PackageReference Include="FreeSql.Provider.SqlServer" Version="3.2.664" />
-		<PackageReference Include="FreeSql.Repository" Version="3.2.664" />
+		<PackageReference Include="CSRedisCore" Version="3.8.3" />
+		<PackageReference Include="Caching.CSRedis" Version="3.8.3" />
+		<PackageReference Include="FluentValidation.AspNetCore" Version="11.1.2" />
+		<PackageReference Include="FreeSql" Version="3.2.665" />
+		<PackageReference Include="FreeSql.Provider.MySql" Version="3.2.665" />
+		<PackageReference Include="FreeSql.Provider.Oracle" Version="3.2.665" />
+		<PackageReference Include="FreeSql.Provider.PostgreSQL" Version="3.2.665" />
+		<PackageReference Include="FreeSql.Provider.Sqlite" Version="3.2.665" />
+		<PackageReference Include="FreeSql.Provider.SqlServer" Version="3.2.665" />
+		<PackageReference Include="FreeSql.Repository" Version="3.2.665" />
 		<PackageReference Include="IdleBus" Version="1.5.2" />
 		<PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
 		<PackageReference Include="Mapster" Version="7.3.0" />
 		<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="6.0.0" />
-		<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.5" />
+		<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.6" />
 		<PackageReference Include="MiniProfiler.AspNetCore.Mvc" Version="4.2.22" />
 		<PackageReference Include="MiniProfiler.AspNetCore.Mvc" Version="4.2.22" />
 		<PackageReference Include="NLog" Version="5.0.1" />
 		<PackageReference Include="NLog.Web.AspNetCore" Version="5.0.0" />
-		<PackageReference Include="SixLabors.ImageSharp" Version="2.1.2" />
+		<PackageReference Include="SixLabors.ImageSharp" Version="2.1.3" />
 		<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta14" />
-		<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.19.0" />
+		<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.21.0" />
 		<PackageReference Include="Swashbuckle.AspNetCore" Version="6.3.1" />
 		<PackageReference Include="UAParser" Version="3.1.47" />
-		<PackageReference Include="Yitter.IdGenerator" Version="1.0.12" />
+		<PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
 	</ItemGroup>
 
 	<ItemGroup>

+ 1 - 1
src/platform/ZhonTai.Admin/ZhonTai.Admin.xml

@@ -1373,7 +1373,7 @@
         </member>
         <member name="P:ZhonTai.Admin.Core.Startup.HostAppOptions.ConfigureFreeSqlBuilder">
             <summary>
-            配置数据库库构建器
+            配置FreeSql构建器
             </summary>
         </member>
         <member name="P:ZhonTai.Admin.Core.Startup.HostAppOptions.ConfigureEntity">

+ 4 - 4
src/platform/ZhonTai.ApiUI/ZhonTai.ApiUI.csproj

@@ -9,10 +9,10 @@
 	</PropertyGroup>
 
 	<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-		<PackageReference Include="Microsoft.AspNetCore.Routing" Version="2.1.0" />
-		<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.1.0" />
-		<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="2.1.0" />
-		<PackageReference Include="System.Text.Json" Version="4.6.0" />
+		<PackageReference Include="Microsoft.AspNetCore.Routing" Version="2.2.2" />
+		<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.2.0" />
+		<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="6.0.6" />
+		<PackageReference Include="System.Text.Json" Version="6.0.5" />
 	</ItemGroup>
 
 	<ItemGroup Condition=" '$(TargetFramework)' != 'netstandard2.0' ">

+ 2 - 2
src/tests/ZhonTai.Tests/ZhonTai.Tests.csproj

@@ -6,8 +6,8 @@
 	</PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.5" />
-    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="6.0.5" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.6" />
+    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="6.0.6" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">