Merge branch 'master' into liudl

bklLiudl

2024-10-15 dd973f741617e3bbf5ecf11747ff71960991549c

 Admin.NET/WCS.Application/WCS.Application.csproj

@@ -2,7 +2,7 @@

  <PropertyGroup>
     <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <NoWarn>1701;1702;1591;8632</NoWarn>
     <NoWarn>1701;1702;1591;8632;4014</NoWarn>
     <DocumentationFile></DocumentationFile>
     <ImplicitUsings>enable</ImplicitUsings>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
@@ -119,10 +119,15 @@

  <ItemGroup>
    <PackageReference Include="IoTClient" Version="1.0.40" />
    <PackageReference Include="NLog" Version="5.3.4" />
  </ItemGroup>

  <ItemGroup>
    <ProjectReference Include="..\Admin.NET.Core\Admin.NET.Core.csproj" />
  </ItemGroup>

  <ItemGroup>
    <Folder Include="OpenApi\Dto\" />
  </ItemGroup>

</Project>