From dd973f741617e3bbf5ecf11747ff71960991549c Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期二, 15 十月 2024 10:21:19 +0800
Subject: [PATCH] Merge branch 'master' into liudl
---
Admin.NET/WCS.Application/WCS.Application.csproj | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/Admin.NET/WCS.Application/WCS.Application.csproj b/Admin.NET/WCS.Application/WCS.Application.csproj
index a46c333..5d4d149 100644
--- a/Admin.NET/WCS.Application/WCS.Application.csproj
+++ b/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,13 +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" />
- <ProjectReference Include="..\Plugins\Admin.NET.Plugin.ApprovalFlow\Admin.NET.Plugin.ApprovalFlow.csproj" />
- <ProjectReference Include="..\Plugins\Admin.NET.Plugin.DingTalk\Admin.NET.Plugin.DingTalk.csproj" />
- <ProjectReference Include="..\Plugins\Admin.NET.Plugin.GoView\Admin.NET.Plugin.GoView.csproj" />
+ </ItemGroup>
+
+ <ItemGroup>
+ <Folder Include="OpenApi\Dto\" />
</ItemGroup>
</Project>
--
Gitblit v1.8.0