From 9d1660270272180cd71147d6ddd53d1382643d2e Mon Sep 17 00:00:00 2001
From: wenxiangchao <wenxiangchao@ihengxin.com.cn>
Date: 星期一, 02 十一月 2026 18:00:14 +0800
Subject: [PATCH] merge: 并入远程 Initial commit 作为历史根节点
---
WPFProject/TapProject.csproj | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 50 insertions(+), 7 deletions(-)
diff --git a/WPFProject/WPFProject.csproj b/WPFProject/TapProject.csproj
similarity index 90%
rename from WPFProject/WPFProject.csproj
rename to WPFProject/TapProject.csproj
index 4260917..1c22b60 100644
--- a/WPFProject/WPFProject.csproj
+++ b/WPFProject/TapProject.csproj
@@ -6,7 +6,7 @@
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{D47D2314-5DD5-4899-ADF9-15ED057289D3}</ProjectGuid>
<OutputType>WinExe</OutputType>
- <RootNamespace>WPFProject</RootNamespace>
+ <RootNamespace>TapProject</RootNamespace>
<AssemblyName>TestPlatform</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
@@ -83,7 +83,7 @@
<ManifestCertificateThumbprint>EEB12C457268F9D6367680E983B284A2555FF73A</ManifestCertificateThumbprint>
</PropertyGroup>
<PropertyGroup>
- <ManifestKeyFile>WPFProject_TemporaryKey.pfx</ManifestKeyFile>
+ <ManifestKeyFile>TapProject_TemporaryKey.pfx</ManifestKeyFile>
</PropertyGroup>
<PropertyGroup>
<GenerateManifests>false</GenerateManifests>
@@ -147,6 +147,9 @@
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
<Reference Include="System.Management" />
+ <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+ <HintPath>packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+ </Reference>
<Reference Include="System.Web" />
<Reference Include="System.Web.Extensions" />
<Reference Include="System.Windows.Forms" />
@@ -434,6 +437,10 @@
<None Include="App.config" />
</ItemGroup>
<ItemGroup>
+ <ProjectReference Include="..\..\OpenTapEditor\OpenTap\Engine\Tap.Engine.csproj">
+ <Project>{EFBD516D-3DC9-9D75-F082-48FBC76715F7}</Project>
+ <Name>Tap.Engine</Name>
+ </ProjectReference>
<ProjectReference Include="..\CellStepSender\CellStepSender.csproj">
<Project>{84edeac7-6763-46cd-b098-0b508aaa705f}</Project>
<Name>CellStepSender</Name>
@@ -462,6 +469,14 @@
<Project>{1260f995-1ae9-17b6-feb5-c430c1416bec}</Project>
<Name>Plugin.SeqEditor</Name>
</ProjectReference>
+ <ProjectReference Include="..\Plugin.StandardTest\Plugin.StandardTest.csproj">
+ <Project>{81de6955-406a-45d5-8c47-e02b4db23eb0}</Project>
+ <Name>Plugin.StandardTest</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\Plugin.TestPlanEditor\Plugin.TestPlanEditor.csproj">
+ <Project>{ac7cc8ed-17b0-49b1-9ab8-90f72d62275f}</Project>
+ <Name>Plugin.TestPlanEditor</Name>
+ </ProjectReference>
<ProjectReference Include="..\Plugin.TestResult\Plugin.TestResult.csproj">
<Project>{7375b74c-b6bf-4814-9838-e1caacad1897}</Project>
<Name>Plugin.TestResult</Name>
@@ -469,6 +484,10 @@
<ProjectReference Include="..\Plugin.TsExecution\Plugin.TsExecution.csproj">
<Project>{202d9a7b-96b3-4ad4-9977-fc4263207a02}</Project>
<Name>Plugin.TsExecution</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\Plugin.TsSupport\Plugin.TsSupport.csproj">
+ <Project>{3068124E-F12B-473E-99A0-2DA5A0385D05}</Project>
+ <Name>Plugin.TsSupport</Name>
</ProjectReference>
<ProjectReference Include="..\S7Driver\S7Driver.csproj">
<Project>{628ef12b-9ed2-4b20-950f-dc3ecc3fd15f}</Project>
@@ -542,9 +561,25 @@
<Project>{cf5bebe9-2803-49c3-b773-73d082e0984a}</Project>
<Name>HMI.Simple.Util</Name>
</ProjectReference>
+ <ProjectReference Include="..\SimpleUtil\HMI.TapApi\HMI.TapApi.csproj">
+ <Project>{eefdf6fe-41ad-4eb0-9ce6-87a07b88f9d7}</Project>
+ <Name>HMI.TapApi</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>
+ <ProjectReference Include="..\Aging.Infrastructure\Aging.Infrastructure.csproj">
+ <Project>{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}</Project>
+ <Name>Aging.Infrastructure</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\Plugin.DeviceConfig\Plugin.DeviceConfig.csproj">
+ <Project>{B2C3D4E5-F6A7-8901-BCDE-F12345678901}</Project>
+ <Name>Plugin.DeviceConfig</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\Plugin.DeviceDebug\Plugin.DeviceDebug.csproj">
+ <Project>{C3D4E5F6-A7B8-9012-CDEF-123456789012}</Project>
+ <Name>Plugin.DeviceDebug</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
@@ -567,9 +602,7 @@
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
- <PostBuildEvent>IF "$(ConfigurationName)"=="Release" Confuser.CLI.exe $(TargeDir)..\ConfuserEx\$(TargetFileName).crproj
-
-
+ <PostBuildEvent>
mkdir "$(TargetDir)OpenTap"
copy "$(TargeDir)HMI.Core.dll" "$(TargetDir)OpenTap"
@@ -620,11 +653,19 @@
move /y "$(TargeDir)Util.ManualDebug.dll" $(TargeDir)Plugin\Util.ManualDebug.dll"
move /y "$(TargeDir)Plugin.QualityReport.dll" $(TargeDir)Plugin\Plugin.QualityReport.dll"
move /y "$(TargeDir)Plugin.BurnIn.dll" $(TargeDir)Plugin\Plugin.BurnIn.dll"
+move /y "$(TargeDir)Plugin.StandardTest.dll" $(TargeDir)Plugin\Plugin.StandardTest.dll"
+move /y "$(TargeDir)Plugin.TestPlanEditor.dll" $(TargeDir)Plugin\Plugin.TestPlanEditor.dll"
+move /y "$(TargeDir)Plugin.DeviceConfig.dll" $(TargeDir)Plugin\Plugin.DeviceConfig.dll"
+move /y "$(TargeDir)Plugin.DeviceDebug.dll" $(TargeDir)Plugin\Plugin.DeviceDebug.dll"
+move /y "$(TargeDir)Aging.Infrastructure.dll" $(TargeDir)Plugin\Aging.Infrastructure.dll"
move /y "$(TargeDir)AddInPlugin.dll" "$(TargetDir)OpenTap\AddInPlugin.dll"
move /y "$(TargeDir)OpenTap.dll" "$(TargetDir)OpenTap\OpenTap.dll"
move /y "$(TargeDir)OpenTap.Plugins.BasicSteps.dll" "$(TargetDir)OpenTap\OpenTap.Plugins.BasicSteps.dll"
move /y "$(TargeDir)HMI.TapApi.dll" "$(TargetDir)OpenTap\HMI.TapApi.dll"
+move /y "$(TargeDir)ViHelper.dll" "$(TargetDir)OpenTap\ViHelper.dll"
+move /y "$(TargeDir)UtilLib.dll" "$(TargetDir)OpenTap\UtilLib.dll"
+move /y "$(TargeDir)LabViewRunner.dll" "$(TargetDir)OpenTap\LabViewRunner.dll"
setlocal enabledelayedexpansion
@@ -641,7 +682,7 @@
)
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" if /I not "%25%25~nxD"=="OpenTap" (
+ 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" if /I not "%25%25~nxD"=="OpenTap" if /I not "%25%25~nxD"=="Settings" if /I not "%25%25~nxD"=="Report" (
move /Y "%25%25D" "%25destination_folder%25"
)
)
@@ -652,7 +693,9 @@
)
)
-del /s /q "%25source_folder%25\*.pdb"</PostBuildEvent>
+del /s /q "%25source_folder%25\*.pdb"
+del /s /q "%25destination_folder%25\*.txt"
+del /s /q "%25destination_folder%25\*.xml"</PostBuildEvent>
</PropertyGroup>
<ProjectExtensions>
<VisualStudio>
--
Gitblit v1.9.1