From 8cbf4a6b9f334246d88c8101ae3db9a21f1bab3f Mon Sep 17 00:00:00 2001 From: patrick.xu <patrick.xu@broconcentric.com> Date: 星期三, 28 四月 2021 11:40:08 +0800 Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071 --- src/Bro.Common.Model/Bro.Common.Model.csproj | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/Bro.Common.Model/Bro.Common.Model.csproj b/src/Bro.Common.Model/Bro.Common.Model.csproj index a66632a..74fedf2 100644 --- a/src/Bro.Common.Model/Bro.Common.Model.csproj +++ b/src/Bro.Common.Model/Bro.Common.Model.csproj @@ -76,9 +76,8 @@ <Reference Include="Autofac, Version=4.9.4.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL"> <HintPath>..\..\packages\Autofac.4.9.4\lib\net45\Autofac.dll</HintPath> </Reference> - <Reference Include="dog_net_windows, Version=1.0.1.28668, Culture=neutral, PublicKeyToken=56120be447701319, processorArchitecture=MSIL"> - <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\..\T047\libs\SafetyDog\dog_net_windows.dll</HintPath> + <Reference Include="dog_net_windows"> + <HintPath>..\..\libs\SafetyDog\dog_net_windows.dll</HintPath> </Reference> <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"> <HintPath>..\..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath> @@ -89,6 +88,8 @@ <Reference Include="System.Core" /> <Reference Include="System.Design" /> <Reference Include="System.Drawing" /> + <Reference Include="System.Web" /> + <Reference Include="System.Web.Services" /> <Reference Include="System.Windows.Forms" /> <Reference Include="System.Xml.Linq" /> <Reference Include="System.Data.DataSetExtensions" /> @@ -131,6 +132,7 @@ <Compile Include="Helper\TimeOutHelper.cs" /> <Compile Include="Helper\UIHelper.cs" /> <Compile Include="Helper\WebApiHelper.cs" /> + <Compile Include="Helper\WebServiceHelper.cs" /> <Compile Include="Interface\IMenuNode.cs" /> <Compile Include="Interface\IConfigCtrl.cs" /> <Compile Include="Interface\ICSVOutput.cs" /> @@ -151,6 +153,7 @@ <Compile Include="Model\CustomizedPoint.cs" /> <Compile Include="Model\CustomizedRectangle.cs" /> <Compile Include="Model\DeviceOpBind.cs" /> + <Compile Include="Model\LaserScanParam.cs" /> <Compile Include="Model\ModbusFrame.cs" /> <Compile Include="Model\MonitorSet.cs" /> <Compile Include="Model\MotionCardRelated.cs" /> -- Gitblit v1.8.0