解决冲突

lixiaojun

2025-01-13 abf3ceabdd98abd0d955b03732e581a43c4e9fb0

 Yw.Service.Unit.Core/Yw.Service.Unit.Core.csproj

@@ -7,6 +7,8 @@
      <RootNamespace>Yw</RootNamespace>
      <GenerateDocumentationFile>True</GenerateDocumentationFile>
      <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
      <Version>3.1.2</Version>
      <Description>引用升级</Description>
   </PropertyGroup>

   <ItemGroup>
@@ -20,16 +22,16 @@

   <ItemGroup>
      <Content Include="paras_unit_settings.json">
         <CopyToOutputDirectory>Always</CopyToOutputDirectory>
         <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
      </Content>
   </ItemGroup>

   <ItemGroup>
     <PackageReference Include="Yw.DAL.Core" Version="1.0.2" />
     <PackageReference Include="Yw.DynamicExpresso.Core" Version="1.0.0" />
     <PackageReference Include="Yw.MemoryCache.Core" Version="1.1.0" />
     <PackageReference Include="Yw.Service.Core" Version="1.0.3" />
     <PackageReference Include="Yw.SqlSugar.Core" Version="1.0.0" />
     <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>
@@ -42,6 +44,15 @@
      <Content Update="C:\Users\admin\.nuget\packages\yw.service.core\1.0.3\contentFiles\any\net6.0\paras_service_settings.json">
        <CopyToOutputDirectory>Always</CopyToOutputDirectory>
      </Content>
      <Content Update="C:\Users\admin\.nuget\packages\yw.service.core\1.0.6\contentFiles\any\net6.0\paras_service_settings.json">
        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
      </Content>
      <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>