diff --git a/AtgwInnerCli/AtgwInnerCli.csproj b/AtgwInnerCli/AtgwInnerCli.csproj index 64618ae..474122e 100644 --- a/AtgwInnerCli/AtgwInnerCli.csproj +++ b/AtgwInnerCli/AtgwInnerCli.csproj @@ -2,7 +2,7 @@ - 11.0 + 14.0 Debug AnyCPU {FBC5A92C-167B-4E57-9F3A-2CBAABDC3451} @@ -13,8 +13,9 @@ zh-CN 512 {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Profile111 - v4.5 + + + v5.0 true diff --git a/AtgwInnerCli/atframe/gw/inner/ClientProtocol.cs b/AtgwInnerCli/atframe/gw/inner/ClientProtocol.cs index e657d88..f015a58 100644 --- a/AtgwInnerCli/atframe/gw/inner/ClientProtocol.cs +++ b/AtgwInnerCli/atframe/gw/inner/ClientProtocol.cs @@ -230,16 +230,19 @@ public ClientProtocol() } else { - _binder_manager.Add(NativeProtocol, this); + lock (_binder_manager) { + _binder_manager.Add(NativeProtocol, this); + } } } ~ClientProtocol() { - if (null != _native_protocol) - { + if (null != _native_protocol) { libatgw_inner_v1_c_destroy(_native_protocol); - _binder_manager.Remove(_native_protocol); + lock (_binder_manager) { + _binder_manager.Remove(_native_protocol); + } } } diff --git a/AtgwInnerCli/project.json b/AtgwInnerCli/project.json index d63fbb7..1d719cb 100644 --- a/AtgwInnerCli/project.json +++ b/AtgwInnerCli/project.json @@ -1,7 +1,10 @@ -{ +{ "supports": {}, - "dependencies": {}, + "dependencies": { + "Microsoft.NETCore.Portable.Compatibility": "1.0.1", + "NETStandard.Library": "1.6.0" + }, "frameworks": { - ".NETPortable,Version=v4.5,Profile=Profile111": {} + "netstandard1.3": {} } } \ No newline at end of file diff --git a/LICENSE b/LICENSE index f429c98..bcf4d36 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2016 atframework +Copyright (c) 2017 atframework Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal