冲突

duheng

2025-02-19 a5b25c4f314079d293bf159ed6f0d7dcbadadbb7

 Service/HStation.Service.Xhs.Core/HStation.Service.Xhs.Core.csproj

@@ -7,6 +7,12 @@
  </PropertyGroup>

  <ItemGroup>
    <Compile Remove="05-service\00-core\04-extensions\**" />
    <EmbeddedResource Remove="05-service\00-core\04-extensions\**" />
    <None Remove="05-service\00-core\04-extensions\**" />
  </ItemGroup>

  <ItemGroup>
    <None Remove="paras_xhs_settings.json" />
  </ItemGroup>

@@ -17,32 +23,7 @@
  </ItemGroup>

  <ItemGroup>
    <Content Update="C:\Users\admin\.nuget\packages\yw.service.assets.core\1.0.0\contentFiles\any\net6.0\paras_assets_settings.json">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </Content>
    <Content Update="C:\Users\admin\.nuget\packages\yw.service.basic.core\1.0.0\contentFiles\any\net6.0\paras_basic_settings.json">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </Content>
    <Content Update="C:\Users\admin\.nuget\packages\yw.service.basic.core\1.0.2\contentFiles\any\net6.0\paras_basic_settings.json">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </Content>
    <Content Update="C:\Users\admin\.nuget\packages\yw.service.basic.core\1.1.9\contentFiles\any\net6.0\paras_basic_settings.json">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </Content>
    <Content Update="C:\Users\admin\.nuget\packages\yw.service.dict.core\1.0.0\contentFiles\any\net6.0\paras_dict_settings.json">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </Content>
    <Content Update="C:\Users\admin\.nuget\packages\yw.service.unit.core\1.0.0\contentFiles\any\net6.0\paras_unit_settings.json">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </Content>
  </ItemGroup>

  <ItemGroup>
    <PackageReference Include="Yw.Service.Basic.Core" Version="3.1.2" />
  </ItemGroup>

  <ItemGroup>
    <Folder Include="05-service\00-core\03-extensions\" />
    <PackageReference Include="Yw.Service.Basic.Core" Version="3.3.6" />
  </ItemGroup>

</Project>