From 9cedbf3a4e9cc7c18df0b5424891f77c9dcb2988 Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期四, 02 七月 2020 11:21:43 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071
---
src/Bro.UI.Device.Winform/Bro.UI.Device.Winform.csproj | 19 ++++++++++++++-----
1 files changed, 14 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 2eba9b1..0931e4a 100644
--- a/src/Bro.UI.Device.Winform/Bro.UI.Device.Winform.csproj
+++ b/src/Bro.UI.Device.Winform/Bro.UI.Device.Winform.csproj
@@ -89,17 +89,23 @@
<Compile Include="CtrlCameraRunBase.Designer.cs">
<DependentUpon>CtrlCameraRunBase.cs</DependentUpon>
</Compile>
- <Compile Include="CtrlMotionCardRunBase.cs">
+ <Compile Include="MotionCard\CtrlMotionCardOperation.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Include="CtrlMotionCardRunBase.Designer.cs">
- <DependentUpon>CtrlMotionCardRunBase.cs</DependentUpon>
+ <Compile Include="MotionCard\CtrlMotionCardOperation.Designer.cs">
+ <DependentUpon>CtrlMotionCardOperation.cs</DependentUpon>
</Compile>
<Compile Include="CtrlPLCRunBase.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="CtrlPLCRunBase.Designer.cs">
<DependentUpon>CtrlPLCRunBase.cs</DependentUpon>
+ </Compile>
+ <Compile Include="MotionCard\CtrlMotionCardAxisStatus.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="MotionCard\CtrlMotionCardAxisStatus.Designer.cs">
+ <DependentUpon>CtrlMotionCardAxisStatus.cs</DependentUpon>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Properties\Resources.Designer.cs">
@@ -112,12 +118,15 @@
<EmbeddedResource Include="CtrlCameraRunBase.resx">
<DependentUpon>CtrlCameraRunBase.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="CtrlMotionCardRunBase.resx">
- <DependentUpon>CtrlMotionCardRunBase.cs</DependentUpon>
+ <EmbeddedResource Include="MotionCard\CtrlMotionCardOperation.resx">
+ <DependentUpon>CtrlMotionCardOperation.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="CtrlPLCRunBase.resx">
<DependentUpon>CtrlPLCRunBase.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="MotionCard\CtrlMotionCardAxisStatus.resx">
+ <DependentUpon>CtrlMotionCardAxisStatus.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
--
Gitblit v1.8.0