From ebd031e3bed6c1cfddce8fc9b98f7f9e95fb9e32 Mon Sep 17 00:00:00 2001
From: tangxu <tangxu76880903>
Date: 星期一, 04 十一月 2024 17:33:38 +0800
Subject: [PATCH] 添加OCC融合

---
 Client/DesktopMain/DPumpHydr.DesktopMain.csproj |   33 ++++++++++++++++++++++++++++++++-
 1 files changed, 32 insertions(+), 1 deletions(-)

diff --git a/Client/DesktopMain/DPumpHydr.DesktopMain.csproj b/Client/DesktopMain/DPumpHydr.DesktopMain.csproj
index 57e76ce..ef45a0d 100644
--- a/Client/DesktopMain/DPumpHydr.DesktopMain.csproj
+++ b/Client/DesktopMain/DPumpHydr.DesktopMain.csproj
@@ -2,13 +2,44 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net8.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows7.0</TargetFramework>
     <UseWindowsForms>true</UseWindowsForms>
     <Company>涓婃捣涔夌淮娴佷綋绉戞妧鏈夐檺鍏徃</Company>
   </PropertyGroup>
 
   <ItemGroup>
+    <Compile Remove="MainWindow4Wen 澶囦唤\**" />
+    <EmbeddedResource Remove="MainWindow4Wen 澶囦唤\**" />
+    <None Remove="MainWindow4Wen 澶囦唤\**" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Remove="MainWindow\Form1.cs" />
+    <Compile Remove="MainWindow\Form1.Designer.cs" />
+    <Compile Remove="MainWindow\MainWindowOld.cs" />
+    <Compile Remove="MainWindow\MainWindowOld.designer.cs" />
+    <Compile Remove="Main\Form1.cs" />
+    <Compile Remove="Main\Form1.Designer.cs" />
+    <Compile Remove="RibbonTestForm.cs" />
+    <Compile Remove="RibbonTestForm.Designer.cs" />
+    <Compile Remove="RibbonTestForm_InitialRibbon.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Remove="MainWindow\Form1.resx" />
+    <EmbeddedResource Remove="MainWindow\MainWindowOld.en-US.resx" />
+    <EmbeddedResource Remove="MainWindow\MainWindowOld.resx" />
+    <EmbeddedResource Remove="Main\Form1.resx" />
+    <EmbeddedResource Remove="RibbonTestForm.resx" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Remove="Resources\Eventech32.png" />
+  </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