From a332decd68d6d8bb5678d8ec95e6c65e0ccf9f33 Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期四, 02 七月 2020 17:14:45 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071
---
src/Bro.UI.Device.Winform/Bro.UI.Device.Winform.csproj | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/Bro.UI.Device.Winform/Bro.UI.Device.Winform.csproj b/src/Bro.UI.Device.Winform/Bro.UI.Device.Winform.csproj
index 0931e4a..8f76288 100644
--- a/src/Bro.UI.Device.Winform/Bro.UI.Device.Winform.csproj
+++ b/src/Bro.UI.Device.Winform/Bro.UI.Device.Winform.csproj
@@ -89,11 +89,11 @@
<Compile Include="CtrlCameraRunBase.Designer.cs">
<DependentUpon>CtrlCameraRunBase.cs</DependentUpon>
</Compile>
- <Compile Include="MotionCard\CtrlMotionCardOperation.cs">
+ <Compile Include="MotionCard\CtrlMotionCardOperationBase.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Include="MotionCard\CtrlMotionCardOperation.Designer.cs">
- <DependentUpon>CtrlMotionCardOperation.cs</DependentUpon>
+ <Compile Include="MotionCard\CtrlMotionCardOperationBase.Designer.cs">
+ <DependentUpon>CtrlMotionCardOperationBase.cs</DependentUpon>
</Compile>
<Compile Include="CtrlPLCRunBase.cs">
<SubType>UserControl</SubType>
@@ -118,8 +118,8 @@
<EmbeddedResource Include="CtrlCameraRunBase.resx">
<DependentUpon>CtrlCameraRunBase.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="MotionCard\CtrlMotionCardOperation.resx">
- <DependentUpon>CtrlMotionCardOperation.cs</DependentUpon>
+ <EmbeddedResource Include="MotionCard\CtrlMotionCardOperationBase.resx">
+ <DependentUpon>CtrlMotionCardOperationBase.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="CtrlPLCRunBase.resx">
<DependentUpon>CtrlPLCRunBase.cs</DependentUpon>
@@ -141,6 +141,10 @@
<Project>{1A3CBFE7-3F78-42C3-95C5-10360450DBEA}</Project>
<Name>Bro.Common.Model</Name>
</ProjectReference>
+ <ProjectReference Include="..\Bro.Device.GTSCard\Bro.Device.GTSCard.csproj">
+ <Project>{B536003E-70BA-4701-B8FD-BAFA303AB4E2}</Project>
+ <Name>Bro.Device.GTSCard</Name>
+ </ProjectReference>
<ProjectReference Include="..\Bro.UI.Model.Winform\Bro.UI.Model.Winform.csproj">
<Project>{741f6491-57c7-479a-b391-09bba9fba9dc}</Project>
<Name>Bro.UI.Model.Winform</Name>
--
Gitblit v1.8.0