From f52302d69d60ce15b0d5b100e30082c5a6e9caa1 Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期五, 03 七月 2020 18:38:44 +0800
Subject: [PATCH] merge
---
src/Bro.UI.Device.Winform/Bro.UI.Device.Winform.csproj | 42 ++++++++++++++++++++++++++++++++----------
1 files changed, 32 insertions(+), 10 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..68c7b28 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,23 @@
<Compile Include="CtrlCameraRunBase.Designer.cs">
<DependentUpon>CtrlCameraRunBase.cs</DependentUpon>
</Compile>
- <Compile Include="MotionCard\CtrlMotionCardOperation.cs">
+ <Compile Include="MotionCard\CtrlMotionCardAxisStatus.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Include="MotionCard\CtrlMotionCardOperation.Designer.cs">
- <DependentUpon>CtrlMotionCardOperation.cs</DependentUpon>
+ <Compile Include="MotionCard\CtrlMotionCardAxisStatus.Designer.cs">
+ <DependentUpon>CtrlMotionCardAxisStatus.cs</DependentUpon>
+ </Compile>
+ <Compile Include="MotionCard\CtrlMotionCardIOStatus.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="MotionCard\CtrlMotionCardIOStatus.Designer.cs">
+ <DependentUpon>CtrlMotionCardIOStatus.cs</DependentUpon>
+ </Compile>
+ <Compile Include="MotionCard\CtrlMotionCardOperationBase.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="MotionCard\CtrlMotionCardOperationBase.Designer.cs">
+ <DependentUpon>CtrlMotionCardOperationBase.cs</DependentUpon>
</Compile>
<Compile Include="CtrlPLCRunBase.cs">
<SubType>UserControl</SubType>
@@ -101,11 +113,11 @@
<Compile Include="CtrlPLCRunBase.Designer.cs">
<DependentUpon>CtrlPLCRunBase.cs</DependentUpon>
</Compile>
- <Compile Include="MotionCard\CtrlMotionCardAxisStatus.cs">
+ <Compile Include="MotionCard\CtrlMotionCardRunBase.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Include="MotionCard\CtrlMotionCardAxisStatus.Designer.cs">
- <DependentUpon>CtrlMotionCardAxisStatus.cs</DependentUpon>
+ <Compile Include="MotionCard\CtrlMotionCardRunBase.Designer.cs">
+ <DependentUpon>CtrlMotionCardRunBase.cs</DependentUpon>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Properties\Resources.Designer.cs">
@@ -118,14 +130,20 @@
<EmbeddedResource Include="CtrlCameraRunBase.resx">
<DependentUpon>CtrlCameraRunBase.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="MotionCard\CtrlMotionCardOperation.resx">
- <DependentUpon>CtrlMotionCardOperation.cs</DependentUpon>
+ <EmbeddedResource Include="MotionCard\CtrlMotionCardAxisStatus.resx">
+ <DependentUpon>CtrlMotionCardAxisStatus.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="MotionCard\CtrlMotionCardIOStatus.resx">
+ <DependentUpon>CtrlMotionCardIOStatus.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="MotionCard\CtrlMotionCardOperationBase.resx">
+ <DependentUpon>CtrlMotionCardOperationBase.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="CtrlPLCRunBase.resx">
<DependentUpon>CtrlPLCRunBase.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="MotionCard\CtrlMotionCardAxisStatus.resx">
- <DependentUpon>CtrlMotionCardAxisStatus.cs</DependentUpon>
+ <EmbeddedResource Include="MotionCard\CtrlMotionCardRunBase.resx">
+ <DependentUpon>CtrlMotionCardRunBase.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
@@ -141,6 +159,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