冲突

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,11 +23,7 @@
  </ItemGroup>

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

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

</Project>