From b22f76d1a80169a1b124d86c61c24e8032344e27 Mon Sep 17 00:00:00 2001
From: yangyin <1850366751@qq.com>
Date: 星期五, 21 二月 2025 17:48:28 +0800
Subject: [PATCH] 修复bug

---
 Client/DesktopMain/DPumpHydr.DesktopMain.csproj |   29 ++++++++++++++++++++++++-----
 1 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/Client/DesktopMain/DPumpHydr.DesktopMain.csproj b/Client/DesktopMain/DPumpHydr.DesktopMain.csproj
index 75a4662..760c595 100644
--- a/Client/DesktopMain/DPumpHydr.DesktopMain.csproj
+++ b/Client/DesktopMain/DPumpHydr.DesktopMain.csproj
@@ -2,20 +2,34 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net8.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows7.0</TargetFramework>
     <UseWindowsForms>true</UseWindowsForms>
     <Company>涓婃捣涔夌淮娴佷綋绉戞妧鏈夐檺鍏徃</Company>
+    <ApplicationIcon>AppIcon.ico</ApplicationIcon>
   </PropertyGroup>
 
   <ItemGroup>
     <Compile Remove="MainWindow4Wen 澶囦唤\**" />
+    <Compile Remove="MainWindow\鏂板缓鏂囦欢澶筡**" />
+    <Compile Remove="Resources\123\**" />
+    <Compile Remove="Resources\MainIcon\**" />
     <EmbeddedResource Remove="MainWindow4Wen 澶囦唤\**" />
+    <EmbeddedResource Remove="MainWindow\鏂板缓鏂囦欢澶筡**" />
+    <EmbeddedResource Remove="Resources\123\**" />
+    <EmbeddedResource Remove="Resources\MainIcon\**" />
     <None Remove="MainWindow4Wen 澶囦唤\**" />
+    <None Remove="MainWindow\鏂板缓鏂囦欢澶筡**" />
+    <None Remove="Resources\123\**" />
+    <None Remove="Resources\MainIcon\**" />
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Remove="MainWindow\Form1.cs" />
-    <Compile Remove="MainWindow\Form1.Designer.cs" />
+    <Compile Remove="MainRibbonCmdHelper.cs" />
+    <Compile Remove="MainWindow\frmMainWindow.Designer - 鍓湰.cs" />
+    <Compile Remove="MainWindow\frmMainWindowAntdUI.cs" />
+    <Compile Remove="MainWindow\frmMainWindowAntdUI.Designer.cs" />
+    <Compile Remove="MainWindow\frmMainWindowRLT.cs" />
+    <Compile Remove="MainWindow\frmMainWindowRLT.Designer.cs" />
     <Compile Remove="MainWindow\MainWindowOld.cs" />
     <Compile Remove="MainWindow\MainWindowOld.designer.cs" />
     <Compile Remove="Main\Form1.cs" />
@@ -26,7 +40,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <EmbeddedResource Remove="MainWindow\Form1.resx" />
+    <EmbeddedResource Remove="MainWindow\frmMainWindowAntdUI.resx" />
+    <EmbeddedResource Remove="MainWindow\frmMainWindowRLT.resx" />
     <EmbeddedResource Remove="MainWindow\MainWindowOld.en-US.resx" />
     <EmbeddedResource Remove="MainWindow\MainWindowOld.resx" />
     <EmbeddedResource Remove="Main\Form1.resx" />
@@ -35,11 +50,15 @@
 
   <ItemGroup>
     <None Remove="Resources\Eventech32.png" />
+    <None Remove="Resources\logo - 鍓湰.png" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Include="AppIcon.ico" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\Model\DPumpHydr.Model.Core\DPumpHydr.Model.Core.csproj" />
-    <ProjectReference Include="..\..\WinFrmUI\DPumpHydr.WinFrmUI.AntdUI\AntdUI.csproj" />
     <ProjectReference Include="..\..\WinFrmUI\DPumpHydr.WinFrmUI.Assets\DPumpHydr.WinFrmUI.Assets.csproj" />
     <ProjectReference Include="..\..\WinFrmUI\DPumpHydr.WinFrmUI.Core\DPumpHydr.WinFrmUI.Core.csproj" />
     <ProjectReference Include="..\..\WinFrmUI\DPumpHydr.WinFrmUI.Impeller\DPumpHydr.WinFrmUI.Impeller.csproj" />

--
Gitblit v1.9.3