Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071

wells.liu

2020-07-04 441af1b1ba6f0bc5e94e678029918f354838e9a5

 src/Bro.UI.Device.Winform/Bro.UI.Device.Winform.csproj

@@ -89,17 +89,35 @@
    <Compile Include="CtrlCameraRunBase.Designer.cs">
      <DependentUpon>CtrlCameraRunBase.cs</DependentUpon>
    </Compile>
    <Compile Include="CtrlMotionCardRunBase.cs">
    <Compile Include="MotionCard\CtrlMotionCardAxisStatus.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Include="CtrlMotionCardRunBase.Designer.cs">
      <DependentUpon>CtrlMotionCardRunBase.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>
    </Compile>
    <Compile Include="CtrlPLCRunBase.Designer.cs">
      <DependentUpon>CtrlPLCRunBase.cs</DependentUpon>
    </Compile>
    <Compile Include="MotionCard\CtrlMotionCardRunBase.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Include="MotionCard\CtrlMotionCardRunBase.Designer.cs">
      <DependentUpon>CtrlMotionCardRunBase.cs</DependentUpon>
    </Compile>
    <Compile Include="Properties\AssemblyInfo.cs" />
    <Compile Include="Properties\Resources.Designer.cs">
@@ -112,11 +130,20 @@
    <EmbeddedResource Include="CtrlCameraRunBase.resx">
      <DependentUpon>CtrlCameraRunBase.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="CtrlMotionCardRunBase.resx">
      <DependentUpon>CtrlMotionCardRunBase.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\CtrlMotionCardRunBase.resx">
      <DependentUpon>CtrlMotionCardRunBase.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="Properties\Resources.resx">
      <Generator>ResXFileCodeGenerator</Generator>
@@ -132,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>