From c4a3f8db90530a727ffab77c3bb5bb7d782792bf Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期一, 25 八月 2025 15:50:27 +0800
Subject: [PATCH] 上传代码；
---
HMI.AlermInfoManage/HMI.AlarmInfoManage.csproj | 39 +++++++++++++++++++++++++++++----------
1 files changed, 29 insertions(+), 10 deletions(-)
diff --git a/HMI.AlermInfoManage/HMI.AlarmInfoManage.csproj b/HMI.AlermInfoManage/HMI.AlarmInfoManage.csproj
index 01f1a03..c888b53 100644
--- a/HMI.AlermInfoManage/HMI.AlarmInfoManage.csproj
+++ b/HMI.AlermInfoManage/HMI.AlarmInfoManage.csproj
@@ -53,8 +53,8 @@
<Reference Include="ICSharpCode.SharpZipLib, Version=1.0.0.999, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
<HintPath>..\WPFProject\packages\SharpZipLib.1.0.0\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath>
</Reference>
- <Reference Include="log4net, Version=3.0.3.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
- <HintPath>..\WPFProject\packages\log4net.3.0.3\lib\net462\log4net.dll</HintPath>
+ <Reference Include="log4net, Version=3.0.4.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+ <HintPath>..\WPFProject\packages\log4net.3.0.4\lib\net462\log4net.dll</HintPath>
</Reference>
<Reference Include="NPOI, Version=2.4.1.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
<HintPath>..\WPFProject\packages\NPOI.2.4.1\lib\net45\NPOI.dll</HintPath>
@@ -69,10 +69,10 @@
<HintPath>..\WPFProject\packages\NPOI.2.4.1\lib\net45\NPOI.OpenXmlFormats.dll</HintPath>
</Reference>
<Reference Include="Panuon.WPF, Version=1.1.2.2, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\WPFProject\packages\Panuon.WPF.1.1.2.2\lib\net472\Panuon.WPF.dll</HintPath>
+ <HintPath>..\WPFProject\packages\Panuon.WPF.1.1.3\lib\net472\Panuon.WPF.dll</HintPath>
</Reference>
- <Reference Include="Panuon.WPF.UI, Version=1.2.4.8, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\WPFProject\packages\Panuon.WPF.UI.1.2.4.9\lib\net472\Panuon.WPF.UI.dll</HintPath>
+ <Reference Include="Panuon.WPF.UI, Version=1.3.0.2, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\WPFProject\packages\Panuon.WPF.UI.1.3.0.2\lib\net472\Panuon.WPF.UI.dll</HintPath>
</Reference>
<Reference Include="SimensDriver">
<HintPath>..\Libs\SimensDriver.dll</HintPath>
@@ -95,15 +95,22 @@
<Reference Include="PresentationFramework" />
</ItemGroup>
<ItemGroup>
+ <Page Include="SimpleAlarm.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
+ </Page>
<Page Include="AlarmInfoManage.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
+ <Compile Include="SimpleAlarm.xaml.cs">
+ <DependentUpon>SimpleAlarm.xaml</DependentUpon>
+ </Compile>
<Compile Include="AlarmInfoManage.xaml.cs">
<DependentUpon>AlarmInfoManage.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
- <Page Include="AlarmInfoManage_Setting.xaml">
+ <Page Include="AlarmInfoManage_SettingA.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
@@ -117,8 +124,8 @@
</Page>
</ItemGroup>
<ItemGroup>
- <Compile Include="AlarmInfoManage_Setting.xaml.cs">
- <DependentUpon>AlarmInfoManage_Setting.xaml</DependentUpon>
+ <Compile Include="AlarmInfoManage_SettingA.xaml.cs">
+ <DependentUpon>AlarmInfoManage_SettingA.xaml</DependentUpon>
</Compile>
<Compile Include="AlarmSettingList.xaml.cs">
<DependentUpon>AlarmSettingList.xaml</DependentUpon>
@@ -155,6 +162,10 @@
</None>
</ItemGroup>
<ItemGroup>
+ <ProjectReference Include="..\..\ConnectionUtil\ConnectionUtil\ConnectionUtil.csproj">
+ <Project>{D0806FA6-3F6D-4304-81B8-EAD9DA7CB5B2}</Project>
+ <Name>ConnectionUtil</Name>
+ </ProjectReference>
<ProjectReference Include="..\HMI.Base\HMI.Base.csproj">
<Project>{2a6f9720-a890-4036-9d73-41a0dae28341}</Project>
<Name>HMI.Base</Name>
@@ -167,11 +178,19 @@
<Project>{f17de6b5-af1d-48c6-94a0-6b763a6546a6}</Project>
<Name>HMI.UI</Name>
</ProjectReference>
+ <ProjectReference Include="..\HMI.Util\HMI.Util.csproj">
+ <Project>{AFEA100A-9223-448D-AB10-3015D93DD98C}</Project>
+ <Name>HMI.Util</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\OPCClient\OPCClient.csproj">
+ <Project>{E5740BB5-9FC6-4A20-B7C2-CC90C281ED05}</Project>
+ <Name>OPCClient</Name>
+ </ProjectReference>
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
- <PostBuildEvent>copy /Y "$(TargetPath)" "$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)\Plugin\$(TargetFileName)"
-copy /Y "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)\Plugin\$(TargetName).pdb"</PostBuildEvent>
+ <PostBuildEvent>
+ </PostBuildEvent>
</PropertyGroup>
</Project>
\ No newline at end of file
--
Gitblit v1.9.1