From 3c8e996db701f2744af261e876455754ad182b62 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期五, 09 五月 2025 16:19:36 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

---
 Desktop/HStation.Xhs.Hydro.Test.Core/HStation.Xhs.Hydro.Test.Core.csproj |   45 +++++++++++++++++++++++++++++++++++++++------
 1 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/Desktop/HStation.Xhs.Hydro.Test.Core/HStation.Xhs.Hydro.Test.Core.csproj b/Desktop/HStation.Xhs.Hydro.Test.Core/HStation.Xhs.Hydro.Test.Core.csproj
index babce19..fad08b3 100644
--- a/Desktop/HStation.Xhs.Hydro.Test.Core/HStation.Xhs.Hydro.Test.Core.csproj
+++ b/Desktop/HStation.Xhs.Hydro.Test.Core/HStation.Xhs.Hydro.Test.Core.csproj
@@ -1,15 +1,48 @@
 锘�<Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
-    <OutputType>WinExe</OutputType>
     <TargetFramework>net6.0-windows</TargetFramework>
-    <Nullable>enable</Nullable>
+    <OutputType>WinExe</OutputType>
+    <RootNamespace>Hydro.ClientTool</RootNamespace>
+    <AssemblyName>Hydro.ClientTool</AssemblyName>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <UseWindowsForms>true</UseWindowsForms>
-    <ImplicitUsings>enable</ImplicitUsings>
+    <UseWPF>true</UseWPF>
+    <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
+    <IsPublishable>False</IsPublishable>
   </PropertyGroup>
-
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>..\bin\debug\</OutputPath>
+    <WarningLevel>0</WarningLevel>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Optimize>False</Optimize>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>..\bin\release\</OutputPath>
+    <Optimize>True</Optimize>
+  </PropertyGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\Hydro\Yw.EPAnet.Calcu.Core\Yw.EPAnet.Calcu.Core.csproj" />
     <ProjectReference Include="..\..\WinFrmUI\Yw.WinFrmUI.Hydro.Q3d.Core\Yw.WinFrmUI.Hydro.Q3d.Core.csproj" />
   </ItemGroup>
-
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
+    <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
+    <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Remove="Form1.cs" />
+    <Compile Remove="Form1.Designer.cs" />
+    <Compile Remove="Form2.cs" />
+    <Compile Remove="Form2.Designer.cs" />
+    <EmbeddedResource Remove="Form1.resx" />
+    <EmbeddedResource Remove="Form2.resx" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="temp\" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Update="temp\temp.inp">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
 </Project>
\ No newline at end of file

--
Gitblit v1.9.3