From fe4f0af9de1d89ca2d78da2104856b2abe0295df Mon Sep 17 00:00:00 2001 From: Vyacheslav Demidyuk Date: Thu, 20 Nov 2014 14:01:37 +0200 Subject: [PATCH] Fixed problem with network connections. --- MTApiService/MtClient.cs | 2 +- MTApiService/MtServer.cs | 2 +- MTApiService/Properties/AssemblyInfo.cs | 4 +-- MtApi/Properties/AssemblyInfo.cs | 4 +-- MtApi5/Properties/AssemblyInfo.cs | 4 +-- MtApi5Setup_x64/MtApi5Setup_x64.vdproj | 20 ++++++------ MtApi5Setup_x86/MtApi5Setup_x86.vdproj | 41 +++++-------------------- MtApiInstaller/Product.wxs | 2 +- TestApiClientUI/TestApiClientUI.csproj | 7 ++++- 9 files changed, 33 insertions(+), 53 deletions(-) diff --git a/MTApiService/MtClient.cs b/MTApiService/MtClient.cs index 35aa8bfd..45a13ad4 100755 --- a/MTApiService/MtClient.cs +++ b/MTApiService/MtClient.cs @@ -34,7 +34,7 @@ namespace MTApiService if (mProxy != null) return; - var bind = new NetTcpBinding(); + var bind = new NetTcpBinding(SecurityMode.None); bind.MaxReceivedMessageSize = 2147483647; bind.MaxBufferSize = 2147483647; // Commented next statement since it is not required diff --git a/MTApiService/MtServer.cs b/MTApiService/MtServer.cs index 1aa9dd69..7e7cf7c4 100755 --- a/MTApiService/MtServer.cs +++ b/MTApiService/MtServer.cs @@ -195,7 +195,7 @@ namespace MTApiService else { //by Socket - var bind = new NetTcpBinding(); + var bind = new NetTcpBinding(SecurityMode.None); bind.MaxReceivedMessageSize = 2147483647; bind.MaxBufferSize = 2147483647; diff --git a/MTApiService/Properties/AssemblyInfo.cs b/MTApiService/Properties/AssemblyInfo.cs index d690e00c..ef1be156 100755 --- a/MTApiService/Properties/AssemblyInfo.cs +++ b/MTApiService/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.13.0")] -[assembly: AssemblyFileVersion("1.0.13.0")] +[assembly: AssemblyVersion("1.0.14.0")] +[assembly: AssemblyFileVersion("1.0.14.0")] diff --git a/MtApi/Properties/AssemblyInfo.cs b/MtApi/Properties/AssemblyInfo.cs index 4a9f1239..cf21432a 100755 --- a/MtApi/Properties/AssemblyInfo.cs +++ b/MtApi/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.15.0")] -[assembly: AssemblyFileVersion("1.0.15.0")] +[assembly: AssemblyVersion("1.0.16.0")] +[assembly: AssemblyFileVersion("1.0.16.0")] diff --git a/MtApi5/Properties/AssemblyInfo.cs b/MtApi5/Properties/AssemblyInfo.cs index 4817591c..83334acf 100755 --- a/MtApi5/Properties/AssemblyInfo.cs +++ b/MtApi5/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.6.0")] -[assembly: AssemblyFileVersion("1.0.6.0")] +[assembly: AssemblyVersion("1.0.7.0")] +[assembly: AssemblyFileVersion("1.0.7.0")] diff --git a/MtApi5Setup_x64/MtApi5Setup_x64.vdproj b/MtApi5Setup_x64/MtApi5Setup_x64.vdproj index 32dd5f54..c069a040 100755 --- a/MtApi5Setup_x64/MtApi5Setup_x64.vdproj +++ b/MtApi5Setup_x64/MtApi5Setup_x64.vdproj @@ -13,6 +13,12 @@ "SccProvider" = "8:" "Hierarchy" { + "Entry" + { + "MsmKey" = "8:_0A948AEB88E843A79E449F2694CEAC4A" + "OwnerKey" = "8:_8B9C059CECE541EF9F06C906252E106A" + "MsmSig" = "8:_UNDEFINED" + } "Entry" { "MsmKey" = "8:_26066077D06445DAA7176D267C4A5A5C" @@ -39,12 +45,6 @@ } "Entry" { - "MsmKey" = "8:_ABBDB217243940A29CA1695ECF7EAB6E" - "OwnerKey" = "8:_8B9C059CECE541EF9F06C906252E106A" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_C28BD2D9EC05E0CCB849ABEEA4360539" "OwnerKey" = "8:_324E39D64C4D4ECDA1AAA532677EA0F4" "MsmSig" = "8:_UNDEFINED" @@ -352,15 +352,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:MtApi5" - "ProductCode" = "8:{1B4F0280-F088-4FC6-B877-C7C7031007EA}" - "PackageCode" = "8:{15183A5E-5212-4E5F-A771-0113933E7E5D}" + "ProductCode" = "8:{564F64AB-717A-46FC-AE3A-51139ADF5EE0}" + "PackageCode" = "8:{BEF87E05-9C6D-4CEB-9D91-FBFFA4AE28C1}" "UpgradeCode" = "8:{5673F99F-74B5-4D75-9648-3250C9B492FB}" "AspNetVersion" = "8:4.0.30319.0" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:1.0.6" + "ProductVersion" = "8:1.0.7" "Manufacturer" = "8:DW" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:" @@ -1047,7 +1047,7 @@ } "MergeModule" { - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_ABBDB217243940A29CA1695ECF7EAB6E" + "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_0A948AEB88E843A79E449F2694CEAC4A" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" diff --git a/MtApi5Setup_x86/MtApi5Setup_x86.vdproj b/MtApi5Setup_x86/MtApi5Setup_x86.vdproj index 162c8ed5..8abb48f7 100755 --- a/MtApi5Setup_x86/MtApi5Setup_x86.vdproj +++ b/MtApi5Setup_x86/MtApi5Setup_x86.vdproj @@ -28,13 +28,13 @@ "Entry" { "MsmKey" = "8:_1894B11511EC28CA06BF342E1D467761" - "OwnerKey" = "8:_67B77AB154964269BD0C77F69052517C" + "OwnerKey" = "8:_BC617CC9A43A49E8B6CDC49115E4A3BC" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_1894B11511EC28CA06BF342E1D467761" - "OwnerKey" = "8:_BC617CC9A43A49E8B6CDC49115E4A3BC" + "OwnerKey" = "8:_67B77AB154964269BD0C77F69052517C" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -51,12 +51,6 @@ } "Entry" { - "MsmKey" = "8:_EDD946B02D16440A9AA72453168324B8" - "OwnerKey" = "8:_BC617CC9A43A49E8B6CDC49115E4A3BC" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_EEB0B45EB0DA4A1C8854FBB96C7C1BC1" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -70,7 +64,7 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_67B77AB154964269BD0C77F69052517C" + "OwnerKey" = "8:_1894B11511EC28CA06BF342E1D467761" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -82,7 +76,7 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_1894B11511EC28CA06BF342E1D467761" + "OwnerKey" = "8:_67B77AB154964269BD0C77F69052517C" "MsmSig" = "8:_UNDEFINED" } } @@ -197,11 +191,6 @@ "AssemblyAsmDisplayName" = "8:MTApiService, Version=1.0.13.0, Culture=neutral, PublicKeyToken=704b91b7000ff499, processorArchitecture=MSIL" "ScatterAssemblies" { - "_1894B11511EC28CA06BF342E1D467761" - { - "Name" = "8:MTApiService.dll" - "Attributes" = "3:512" - } } "SourcePath" = "8:MTApiService.dll" "TargetName" = "8:" @@ -352,15 +341,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:MtApi5" - "ProductCode" = "8:{4CBFDF8A-83F0-44FA-B751-DAF09F35F4D8}" - "PackageCode" = "8:{6B397899-8A7F-4F89-B273-1D9651858EBE}" + "ProductCode" = "8:{B374AA70-7936-4A44-AF48-ADF152634A97}" + "PackageCode" = "8:{8BA7181F-7E81-4114-B5AA-F0806596313B}" "UpgradeCode" = "8:{0D37B66D-F57F-4AF8-9AF5-B0EB060D60BE}" "AspNetVersion" = "8:4.0.30319.0" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:1.0.6" + "ProductVersion" = "8:1.0.7" "Manufacturer" = "8:DW" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:" @@ -955,20 +944,6 @@ } "MergeModule" { - "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_EDD946B02D16440A9AA72453168324B8" - { - "UseDynamicProperties" = "11:TRUE" - "IsDependency" = "11:TRUE" - "SourcePath" = "8:Microsoft_VC100_CRT_x86.msm" - "Properties" - { - } - "LanguageId" = "3:0" - "Exclude" = "11:FALSE" - "Folder" = "8:" - "Feature" = "8:" - "IsolateTo" = "8:" - } } "ProjectOutput" { @@ -1030,7 +1005,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_BC617CC9A43A49E8B6CDC49115E4A3BC" { - "SourcePath" = "8:..\\Release\\MT5Connector.dll" + "SourcePath" = "8:..\\x64\\Release\\MT5Connector.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_82290571E7764B168E741604315C2206" diff --git a/MtApiInstaller/Product.wxs b/MtApiInstaller/Product.wxs index 1eb06d88..19a48ac4 100755 --- a/MtApiInstaller/Product.wxs +++ b/MtApiInstaller/Product.wxs @@ -1,7 +1,7 @@ - + true - @@ -149,6 +148,12 @@ true + + + {7A76C388-A8FB-4949-8170-24D4742E934E} + MtApi + +