From 9211ec11c112e18cd99e77f889a01110a70031ce Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期一, 24 十一月 2025 17:47:15 +0800
Subject: [PATCH] 优化项目结构
---
WPFProject/WPFProject.csproj | 102 ++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 89 insertions(+), 13 deletions(-)
diff --git a/WPFProject/WPFProject.csproj b/WPFProject/WPFProject.csproj
index 89e92ba..7880d4c 100644
--- a/WPFProject/WPFProject.csproj
+++ b/WPFProject/WPFProject.csproj
@@ -97,6 +97,26 @@
<PropertyGroup>
<ApplicationManifest>Properties\app.manifest</ApplicationManifest>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+ <DebugSymbols>true</DebugSymbols>
+ <OutputPath>bin\x86\Debug\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <DebugType>full</DebugType>
+ <PlatformTarget>x86</PlatformTarget>
+ <LangVersion>latest</LangVersion>
+ <ErrorReport>prompt</ErrorReport>
+ <Prefer32Bit>true</Prefer32Bit>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+ <OutputPath>bin\x86\Release\</OutputPath>
+ <DefineConstants>TRACE</DefineConstants>
+ <Optimize>true</Optimize>
+ <DebugType>pdbonly</DebugType>
+ <PlatformTarget>x86</PlatformTarget>
+ <LangVersion>latest</LangVersion>
+ <ErrorReport>prompt</ErrorReport>
+ <Prefer32Bit>true</Prefer32Bit>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="log4net, Version=3.0.4.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>packages\log4net.3.0.4\lib\net462\log4net.dll</HintPath>
@@ -106,6 +126,9 @@
</Reference>
<Reference Include="Microsoft.DwayneNeed.Win32">
<HintPath>..\Libs\Microsoft.DwayneNeed.Win32.dll</HintPath>
+ </Reference>
+ <Reference Include="Microsoft.Xaml.Behaviors, Version=1.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+ <HintPath>packages\Microsoft.Xaml.Behaviors.Wpf.1.1.135\lib\net462\Microsoft.Xaml.Behaviors.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -276,7 +299,7 @@
<DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile>
- <Content Include="Api\Api.txt">
+ <Content Include="Api\SQLite.Interop.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Config\Put Your Config Here.txt">
@@ -289,6 +312,9 @@
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="SuperSocket.SocketEngine.dll">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="瀹夎MSMQ.bat">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Resource Include="Icon\b1.jpg" />
@@ -395,6 +421,18 @@
<Content Include="Lang\en-US\DataBoard.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
+ <Content Include="Lang\zh-CN\SeqEditor.json">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Lang\en-US\SeqEditor.json">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Lang\zh-CN\ChangeModel.json">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Lang\en-US\ChangeModel.json">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
<None Include="packages.config" />
<None Include="Properties\app.manifest" />
<None Include="Properties\Settings.settings">
@@ -406,6 +444,14 @@
<None Include="App.config" />
</ItemGroup>
<ItemGroup>
+ <ProjectReference Include="..\..\HMI.Old\Plugin_TestResult\CellStepSender\CellStepSender.csproj">
+ <Project>{84edeac7-6763-46cd-b098-0b508aaa705f}</Project>
+ <Name>CellStepSender</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\S7Driver\S7Driver.csproj">
+ <Project>{628ef12b-9ed2-4b20-950f-dc3ecc3fd15f}</Project>
+ <Name>S7Driver</Name>
+ </ProjectReference>
<ProjectReference Include="..\HMI.AlermInfoManage\HMI.AlarmInfoManage.csproj">
<Project>{945c2577-4558-45e3-891a-096cb3047304}</Project>
<Name>HMI.AlarmInfoManage</Name>
@@ -417,10 +463,6 @@
<ProjectReference Include="..\HMI.DataViewer\HMI.DataViewer.csproj">
<Project>{a580de4a-34e7-4efe-ad2c-0871396000e9}</Project>
<Name>HMI.DataViewer</Name>
- </ProjectReference>
- <ProjectReference Include="..\HMI.IOMonitor\HMI.IOMonitor.csproj">
- <Project>{f7663c79-7047-42f3-b129-73a2575ee7c6}</Project>
- <Name>HMI.IOMonitor</Name>
</ProjectReference>
<ProjectReference Include="..\HMI.LogViewer\HMI.LogViewer.csproj">
<Project>{20c23602-b029-4e21-8c11-b9e5f2223237}</Project>
@@ -446,6 +488,10 @@
<Project>{de4205c6-5923-46fd-a4b9-65169bf61c75}</Project>
<Name>HMI.MenuManage</Name>
</ProjectReference>
+ <ProjectReference Include="..\Plugin.CurrentSensorControl\Plugin.CurrentSensorControl.csproj">
+ <Project>{e4505d51-248b-4c21-b0e3-a4b2a7551d6a}</Project>
+ <Name>Plugin.CurrentSensorControl</Name>
+ </ProjectReference>
<ProjectReference Include="..\Plugin.DataBoard\Plugin.DataBoard.csproj">
<Project>{be42ab26-3270-43e1-84b8-6929d862ff8d}</Project>
<Name>Plugin.DataBoard</Name>
@@ -454,17 +500,21 @@
<Project>{306a83dc-a7db-4057-baa7-477d8756f5d9}</Project>
<Name>Plugin.DOControl</Name>
</ProjectReference>
+ <ProjectReference Include="..\Plugin.DODriverControl\Plugin.DODriverControl.csproj">
+ <Project>{61df853d-829a-4426-bef8-0135586005b6}</Project>
+ <Name>Plugin.DODriverControl</Name>
+ </ProjectReference>
<ProjectReference Include="..\Plugin.JarUI\Plugin.JarUI.csproj">
<Project>{968fe602-22d6-42bd-981c-601ad518a896}</Project>
<Name>Plugin.JarUI</Name>
</ProjectReference>
- <ProjectReference Include="..\Plugin.ServoManage\Plugin.ServoManage.csproj">
- <Project>{1853e00f-6865-4bc6-974b-6a5e1c00bafe}</Project>
- <Name>Plugin.ServoManage</Name>
+ <ProjectReference Include="..\Plugin.ModelManage\Plugin.ModelManage.csproj">
+ <Project>{76ce4d21-702c-416f-95b4-f4f4c5b2d162}</Project>
+ <Name>Plugin.ModelManage</Name>
</ProjectReference>
- <ProjectReference Include="..\Plugin.TestBuilder\Plugin.TestBuilder.csproj">
- <Project>{30201ec1-9a82-48db-94b9-bd5c1190228b}</Project>
- <Name>Plugin.TestBuilder</Name>
+ <ProjectReference Include="..\Plugin.SeqEditor\Plugin.SeqEditor.csproj">
+ <Project>{717fd815-ff95-4f30-b4d9-9cea978ca40e}</Project>
+ <Name>Plugin.SeqEditor</Name>
</ProjectReference>
<ProjectReference Include="..\Plugin.TestResult\Plugin.TestResult.csproj">
<Project>{7375b74c-b6bf-4814-9838-e1caacad1897}</Project>
@@ -485,6 +535,10 @@
<ProjectReference Include="..\SimpleUtil\HMI.Simple.Util\HMI.Simple.Util.csproj">
<Project>{cf5bebe9-2803-49c3-b773-73d082e0984a}</Project>
<Name>HMI.Simple.Util</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\SimpleUtil\HMI.Util.Base\HMI.Util.Base.csproj">
+ <Project>{d59e25d1-9b27-46a1-8438-92661dd23fae}</Project>
+ <Name>HMI.Util.Base</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
@@ -507,11 +561,21 @@
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
- <PostBuildEvent>move /y "$(TargeDir)HMI.Core.dll" $(TargeDir)Libs\HMI.Core.dll"
+ <PostBuildEvent>IF "$(ConfigurationName)"=="Release" Confuser.CLI.exe $(TargeDir)..\ConfuserEx\$(TargetFileName).crproj
+
+move /y "$(TargeDir)HMI.Core.dll" $(TargeDir)Libs\HMI.Core.dll"
move /y "$(TargeDir)HMI.Base.dll" $(TargeDir)Libs\HMI.Base.dll"
move /y "$(TargeDir)HMI.UI.dll" $(TargeDir)Libs\HMI.UI.dll"
move /y "$(TargeDir)HMI.Util.dll" $(TargeDir)Libs\HMI.Util.dll"
move /y "$(TargeDir)ConnectionUtil.dll" $(TargeDir)Libs\ConnectionUtil.dll"
+move /y "$(TargeDir)HMI.StdControl.dll" $(TargeDir)Libs\HMI.StdControl.dll"
+move /y "$(TargeDir)S7Driver.dll" $(TargeDir)Libs\S7Driver.dll"
+
+move /y "$(TargeDir)HMI.LogUtil.dll" $(TargeDir)Api\HMI.LogUtil.dll"
+move /y "$(TargeDir)HMI.SerialData.Util.dll" $(TargeDir)Api\HMI.SerialData.Util.dll"
+move /y "$(TargeDir)HMI.Simple.Util.dll" $(TargeDir)Api\HMI.Simple.Util.dll"
+move /y "$(TargeDir)HMI.Util.Base.dll" $(TargeDir)Api\HMI.Util.Base.dll"
+move /y "$(TargeDir)CellStepSender.dll" $(TargeDir)Api\CellStepSender.dll"
move /y "$(TargeDir)HMI.AlarmInfoManage.dll" $(TargeDir)Plugin\HMI.AlarmInfoManage.dll"
move /y "$(TargeDir)HMI.DataViewer.dll" $(TargeDir)Plugin\HMI.DataViewer.dll"
@@ -527,6 +591,12 @@
move /y "$(TargeDir)Plugin.TestBuilder.dll" $(TargeDir)Plugin\Plugin.TestBuilder.dll"
move /y "$(TargeDir)Plugin.DataBoard.dll" $(TargeDir)Plugin\Plugin.DataBoard.dll"
move /y "$(TargeDir)Plugin.JarUI.dll" $(TargeDir)Plugin\Plugin.JarUI.dll"
+move /y "$(TargeDir)Plugin.SeqEditor.dll" $(TargeDir)Plugin\Plugin.SeqEditor.dll"
+move /y "$(TargeDir)Plugin.ChangeModel.dll" $(TargeDir)Plugin\Plugin.ChangeModel.dll"
+move /y "$(TargeDir)Plugin.MaterialOpt.dll" $(TargeDir)Plugin\Plugin.MaterialOpt.dll"
+move /y "$(TargeDir)Plugin.DODriverControl.dll" $(TargeDir)Plugin\Plugin.DODriverControl.dll"
+move /y "$(TargeDir)Plugin.ModelManage.dll" $(TargeDir)Plugin\Plugin.ModelManage.dll"
+move /y "$(TargeDir)Plugin.CurrentSensorControl.dll" $(TargeDir)Plugin\Plugin.CurrentSensorControl.dll"
setlocal enabledelayedexpansion
@@ -536,6 +606,12 @@
rmdir /S /Q "%25destination_folder%25"
mkdir "%25destination_folder%25"
+for %25%25F in ("%25source_folder%25\*") do (
+ if /I "%25%25~nxF"=="System.Data.SQLite.dll" (
+ xcopy "%25source_folder%25\%25%25F" "%25source_folder%25\Api\%25%25F" /Y
+ )
+)
+
for /d %25%25D in ("%25source_folder%25\*") do (
if /I not "%25%25~nxD"=="Api" if /I not "%25%25~nxD"=="Config" if /I not "%25%25~nxD"=="Icon" if /I not "%25%25~nxD"=="Lang" if /I not "%25%25~nxD"=="Libs" if /I not "%25%25~nxD"=="Log" if /I not "%25%25~nxD"=="Plugin" if /I not "%25%25~nxD"=="TestPlatform.exe.WebView2" (
move /Y "%25%25D" "%25destination_folder%25"
@@ -543,7 +619,7 @@
)
for %25%25F in ("%25source_folder%25\*") do (
- if /I not "%25%25~nxF"=="$(TargetFileName)" if /I not "%25%25~nxF"=="$(TargetFileName).config" if /I not "%25%25~nxF"=="$(TargetName).pdb" if /I not "%25%25~nxF"=="clear.bat" (
+ if /I not "%25%25~nxF"=="$(TargetFileName)" if /I not "%25%25~nxF"=="$(TargetFileName).config" if /I not "%25%25~nxF"=="$(TargetName).pdb" if /I not "%25%25~nxF"=="clear.bat" if /I not "%25%25~nxF"=="瀹夎MSMQ.bat" (
move /Y "%25%25F" "%25destination_folder%25"
)
)
--
Gitblit v1.9.1