From abf3ceabdd98abd0d955b03732e581a43c4e9fb0 Mon Sep 17 00:00:00 2001 From: lixiaojun <1287241240@qq.com> Date: 星期一, 13 一月 2025 15:01:31 +0800 Subject: [PATCH] 解决冲突 --- Yw.Service.Unit.Core/Yw.Service.Unit.Core.csproj | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Yw.Service.Unit.Core/Yw.Service.Unit.Core.csproj b/Yw.Service.Unit.Core/Yw.Service.Unit.Core.csproj index 8090bc4..b855f50 100644 --- a/Yw.Service.Unit.Core/Yw.Service.Unit.Core.csproj +++ b/Yw.Service.Unit.Core/Yw.Service.Unit.Core.csproj @@ -7,7 +7,7 @@ <RootNamespace>Yw</RootNamespace> <GenerateDocumentationFile>True</GenerateDocumentationFile> <GeneratePackageOnBuild>True</GeneratePackageOnBuild> - <Version>1.0.9</Version> + <Version>3.1.2</Version> <Description>寮曠敤鍗囩骇</Description> </PropertyGroup> @@ -27,8 +27,11 @@ </ItemGroup> <ItemGroup> - <PackageReference Include="Yw.DynamicExpresso.Core" Version="1.0.0" /> - <PackageReference Include="Yw.Service.Core" Version="1.1.4" /> + <PackageReference Include="Yw.DAL.PostgreSql.Core" Version="3.1.1" /> + <PackageReference Include="Yw.DAL.SQLite.Core" Version="3.1.1" /> + <PackageReference Include="Yw.DALFactory.Core" Version="3.0.5" /> + <PackageReference Include="Yw.DynamicExpresso.Core" Version="3.0.0" /> + <PackageReference Include="Yw.Service.Core" Version="3.1.0" /> </ItemGroup> <ItemGroup> @@ -47,6 +50,9 @@ <Content Update="C:\Users\admin\.nuget\packages\yw.service.core\1.1.4\contentFiles\any\net6.0\paras_service_settings.json"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Content> + <Content Update="C:\Users\admin\.nuget\packages\yw.service.core\1.1.5\contentFiles\any\net6.0\paras_service_settings.json"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </Content> <Content Update="C:\Users\admin\.nuget\packages\yw.sqlsugar.core\1.0.0\contentFiles\any\net6.0\paras_sqlsugar_settings.json"> <CopyToOutputDirectory>Always</CopyToOutputDirectory> </Content> -- Gitblit v1.9.3