更新NuGet包到4.0.0,并完成相关的修改适配工作,v1.7.8

This commit is contained in:
dathlin
2017-11-22 14:18:35 +08:00
parent b1f123366d
commit 9c4f98a66f
38 changed files with 62 additions and 65 deletions

View File

@@ -251,7 +251,7 @@ namespace 软件系统客户端模版
{
FormAccountManage fam = new FormAccountManage(() =>
{
OperateResultString result = UserClient.Net_simplify_client.ReadFromServer(CommonHeadCode.SimplifyHeadCode.);
OperateResult<string> result = UserClient.Net_simplify_client.ReadFromServer(CommonHeadCode.SimplifyHeadCode.);
if (result.IsSuccess) return result.Content;
else return result.ToMessageShowString();
}, m => UserClient.Net_simplify_client.ReadFromServer(CommonHeadCode.SimplifyHeadCode., m).IsSuccess);
@@ -309,7 +309,7 @@ namespace 软件系统客户端模版
{
using (FormSuper fs = new FormSuper(() =>
{
OperateResultBytes result = UserClient.Net_simplify_client.ReadFromServer(CommonHeadCode.SimplifyHeadCode., new byte[0]);
OperateResult<byte[]> result = UserClient.Net_simplify_client.ReadFromServer(CommonHeadCode.SimplifyHeadCode., new byte[0]);
//解析
if (result.IsSuccess)
{

View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="HslCommunication" version="3.17.15" targetFramework="net35" />
<package id="HslCommunication" version="4.0.0" targetFramework="net35" />
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net35" />
</packages>

View File

@@ -39,8 +39,8 @@
<Reference Include="CommonLibrary">
<HintPath>..\CommonLibrary\bin\Debug\CommonLibrary.dll</HintPath>
</Reference>
<Reference Include="HslCommunication, Version=3.17.15.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\HslCommunication.3.17.15\lib\HslCommunication.dll</HintPath>
<Reference Include="HslCommunication, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\HslCommunication.4.0.0\lib\HslCommunication.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net35\Newtonsoft.Json.dll</HintPath>