From 9b40712c9c9e84cbd4a86e64d3da5a4d08dfdb81 Mon Sep 17 00:00:00 2001 From: vdemydiuk Date: Sat, 9 Apr 2016 17:29:15 +0300 Subject: [PATCH] Update solution to support Visual Studio 2013. Fix problems with async quote events --- MT5Connector/MT5Connector.vcxproj | 8 +- MTApiService/MTApiService.csproj | 4 +- MTApiService/MetaTraderApiKey.pfx | Bin 1764 -> 0 bytes MTApiService/MtApiKey.pfx | Bin 0 -> 1764 bytes MTConnector/MTConnector.vcxproj | 8 +- MetaTraderApi_2013.sln | 115 ++++++++++++++++++ MtApi/ExtensionMethods.cs | 29 ++++- MtApi/MtApi.csproj | 4 +- MtApi/MtApiClient.cs | 5 +- .../Properties/Resources.Designer.cs | 2 +- .../Properties/Settings.Designer.cs | 4 +- TestApiClientUI/TestApiClientUI.csproj | 16 ++- TestApiClientUI/app.config | 2 +- 13 files changed, 172 insertions(+), 25 deletions(-) delete mode 100755 MTApiService/MetaTraderApiKey.pfx create mode 100755 MTApiService/MtApiKey.pfx create mode 100755 MetaTraderApi_2013.sln diff --git a/MT5Connector/MT5Connector.vcxproj b/MT5Connector/MT5Connector.vcxproj index fadb5b89..f877e50e 100755 --- a/MT5Connector/MT5Connector.vcxproj +++ b/MT5Connector/MT5Connector.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -20,7 +20,7 @@ {CB6D4A3E-2F2E-4C67-929D-3C2A8FD1C556} - v4.0 + v4.5 ManagedCProj MT5Connector @@ -30,24 +30,28 @@ true true MultiByte + v120 DynamicLibrary true true Unicode + v120 DynamicLibrary false true Unicode + v120 DynamicLibrary false true Unicode + v120 diff --git a/MTApiService/MTApiService.csproj b/MTApiService/MTApiService.csproj index c1ceebdf..7e85c90d 100755 --- a/MTApiService/MTApiService.csproj +++ b/MTApiService/MTApiService.csproj @@ -38,7 +38,7 @@ true - MetaTraderApiKey.pfx + MtApiKey.pfx @@ -76,7 +76,7 @@ - + diff --git a/MTApiService/MetaTraderApiKey.pfx b/MTApiService/MetaTraderApiKey.pfx deleted file mode 100755 index 54eab36e00be273267f524b64b44d2fbd9b7afb5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1764 zcmY*YdpOi-8-C~T{f2QE70FO!og(>-RHIdc8AF2^p^!n&r)Dt9IP5wMF-o%2I`ko} zV-9VlmX9ovu!!{GONCLyzyugaissG9=l3RVE6BJ@RAfT{Ug3sZ&_V2TjB0Et{k>VH$xcoh1k09^wM(ABUC zg#SN{JT8lsQ0YB@i){F(DjJP@h83VQekdSk#5&Mf`4PP&>y~WVc*OaKMbV4?^+Cta zs)^h&Jx{b>8{ONpjoozNLYPQLqMB!Tm-|!D+|th{WDC`P=V^qM*UC{hbY0|K4yl%8 z-9IE`n|72r%BOl*O}3m^FAa>DgA&8K9(WPDJewcqM*P~?MwLInIW?^GGB21?9g^wn zR?H;+z6081hgj|oc-mrfIg4Q*KW^PLX07r0C1>=~(dl_En-Y^~@XHl*=5Fb+EZ=G2 zSUF)G=Ir~Xaze9a z@2VKysNZtLbcRPL>g;p7?m;cOm!%_2%-+8i&12?EKk>R-D~O+RFJ)tB7PriI4_=1s>7#4mPc`duia>IGCN#)IYrAJ9JqrcoW zU~Amd&4R0?*4G!Ow(f~;t)*-c&G~2P>*+VWI@IHHP10%VTIk7$(Wc8zWzZY(?$+&sYzIdH2&igQEW^;vX?0S$t zQ$g4FddZ4m8;M?|Nll1#a{}?7q8^RnTpb0kdOTMo-i3ORbLl8o^mdZIUCqTfQcUi` z$tWAUm7EFt173IL`}b;;c?|1RYNbu)r#(qeGjUoS@<~moSWBDSt5MM+)TFs*EIZWM zQu1f0Ubsu7gg$u3pKC6uK!UJX6aWBr{fm?*G56Sj7+?X6z#(9W92%e_NFN*l2ayaT z$OupY2^b@Yj2uIx(ns_(a2V;DA!-t$q<@_}1ipveAW1z4g+&RDY(tUk_Ar4h2n61M z2SPwN5`N%3Py-Ig{e|HIf25)!I0}R!TnJM0fG2_jzD}tDyRW(kr1Am2fQLA-{mr1^LYUopl4^=z;TO zJf4uPFP|?uyrQ{_5!b35TJfA>#yu6brWGf0D4lW+&Q#_*piDu4caGAT;lY#uC!XcK zaW}&LdEVsAg6%sO-tFG@bthw!8HSwkknbgryq{XDGCoU{bBn}N>8|CDzrbIP1S3B*NukJY( z`G%62rt+a#!Sz;=-})jiamEt(WeZhWKh{nKU8 z-D+>zxrWx;o7U>I�*IWhHJyY@rOvY|z@o^TVAmry^3w#L|rBWqu>SwpAPbV>+R* zD7Z|>!7E+k!csXFu`O=UNUCZuYh@t3@aliwac1p8SJ@J;rd>&o9Tf;tC*f~lRTu~T zLr)fiCSv8)YqNumEdR^TdDu2Y79Q~79GOhO%G(bl2^yIVGYL+m5dM9-qci<^%9jQH E19K1QtpET3 diff --git a/MTApiService/MtApiKey.pfx b/MTApiService/MtApiKey.pfx new file mode 100755 index 0000000000000000000000000000000000000000..92568c254ce21ef482fc4e32451e0d1cb51396e7 GIT binary patch literal 1764 zcmY*YdpOi-8-8bu874EI%3;mOkV6=U8K)dZF@(^NHezBE6Xh@rODxS8Cg)H}n>1vJ z*04F05!x{IVSP@sR5rF!D>OETaY%N5b?vu%?e$*I``q{aJkNW*e>^vdi~JQ1lOb`D z*OBsu=iSb)Vqhp(ITx9a;3BgjnMdNv-2GQc<`#l0Qwhm@C`ysr{+d!i!{Fsy_+1hg z-bhkMqW>>Lk7E&Xv2J1TDwbm@9F7`7aN&jd+ZIptyrI#KP381*-i=WyfL*VOD&B8Z ze@F9hxm~o-)v_YE7q2A=eRwUF_Zu@joD!c=vo79+#@nxOBm=#gvz30PQ)kU$pJYzP z1u+(Ixpw)TX-;dynY9{5|LvOIrb`zaU)-)J$OxHRJ=wSxcdX1NyfCrfg*TYcILevJ z&9ghKWu_d!sP(FBc>Qe)rc-Rt)HVE|p*c7b%fcwFv45yb$Gpu;!OZSh%r;Fj@4rT8 zS%xwjU*e+lbr-Nvv$nItp^g(mX*D%s>&{ahLe9>XzQv4)sFgMgV#$8~B2!cNHsXv< z8lwq+E$Jjb!FGaba_{?fvsYV!uf;wWgAz~Z=#_d0&Wjbk!?^#V9zCKi@roBGqvcDRe|YR!(i-p1y)+%LP_f$JHt{Mo#DfFWGd7pre3z(M6nkn^Y>F|j zxO8}z{nM5~^60|9Nd_wDIw^IX*Kls7RWzV&`@-sO7wAqk6WV&oBX|?OQ*gB?% z*^rWq6cw!TYF#;b+_R&n$!;x8A4HGO)ihhcjbRAlJ6BkzIi}uK{%nCF-NLdHWSWL2_y)KDN8k)BfF*>;P&Nis=#anx2w4DY z2)TUL%%Kiv2$6sjRHFiOuontTh?#$8siZ)pJP`>)z_@$2!^qwmG;j!<1|fh2m>>>{ zQy?B_f+NuVNr?tw5OacX5{Q8`Cd64F7{cM7r!;~0=e`7pg#rd(K~8-9_wP|i$egW^ z)C`9KC<*?l!2V@dZ!g+IXEOO z2o9>sAFfFhsCE{o`Yw0k3H9u1e_J_z`3~#p4T`hs8YbRUpg@U!$emIBT21;E?iIh4 zP?@jdqJd&{UZ#AbtWk_<>YW3X4+rhANOPA`}fSsnGDr+VP>dEjH#pQ+}b4EVJ?P9 zuZg@Ud9`x!jh3^XbHvsjwMbNo&w}oSt-#m4Js(?e&${SIiY8m|SZozS9bMIN#~622 z8*V2&kcQ9nO9QuatYL1-t0MZS&{^Z2BKyo(d-=`2XIC+VxV%GE1q((OV#fLWZ2J;Z z9wH>dtM5thp`&a$LI$pV+wS+dA=|6^FDh?#zuFuxk$CtL!_DwI+1ggmZV&HcIM)c< zn#mE?eGMK*S}|}0DFVG{WshR)kzO#9^Pl#vPV}C2P{BPpQN3b|LZ*xOR}B)b-?$v+ z-rg9b`@N6E9B&#`8Pu(PlfREjm9gc$NWQ<%rLz>9vCPY|wve4_%$A~` z5^v~zX%wHoRq;x3y%V#6={`R8Qqa!6*Ev}dK;zb+R3|3rX4Fy9sU!}N*xj))hUvgqH_EBK;J)X)8>06794pxPi z{}&3L#_3urgOz^EvCHwcrW4C$>v#1h2UIj$KO~ssBPj(_u7W*-zpvAJACc@x1QH4< zOT@~+aR{XYImtDLv&h6`vFw$y^_ - + Debug @@ -20,7 +20,7 @@ {2BE5FAC1-7FB7-45C3-9215-31A5BC4B964F} - v4.0 + v4.5 ManagedCProj MTConnector MTConnector @@ -31,24 +31,28 @@ true true NotSet + v120 DynamicLibrary true true Unicode + v120 DynamicLibrary false true NotSet + v120 DynamicLibrary false true MultiByte + v120 diff --git a/MetaTraderApi_2013.sln b/MetaTraderApi_2013.sln new file mode 100755 index 00000000..7f2e8b40 --- /dev/null +++ b/MetaTraderApi_2013.sln @@ -0,0 +1,115 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.31101.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestServer", "TestServer\TestServer.csproj", "{220F01DF-8489-44F3-9C79-D5AFFCE94D6B}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestApiClientUI", "TestApiClientUI\TestApiClientUI.csproj", "{663CC515-EAAE-47D4-8933-5008C2DA1160}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MTApiService", "MTApiService\MTApiService.csproj", "{DE76D5C7-B99C-4467-8408-78173BDD84E0}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MTConnector", "MTConnector\MTConnector.vcxproj", "{2BE5FAC1-7FB7-45C3-9215-31A5BC4B964F}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MtApi", "MtApi\MtApi.csproj", "{7A76C388-A8FB-4949-8170-24D4742E934E}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MtApi5", "MtApi5\MtApi5.csproj", "{AC8B5010-DA75-477E-9CA5-547C649E12D8}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MT5Connector", "MT5Connector\MT5Connector.vcxproj", "{CB6D4A3E-2F2E-4C67-929D-3C2A8FD1C556}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MtApi5TestClient", "MtApi5TestClient\MtApi5TestClient.csproj", "{38B9C657-BC2F-44F0-8824-54B31F2A64F5}" +EndProject +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "TestMtApi", "TestMtApi\TestMtApi\TestMtApi.vbproj", "{EB7C228D-9494-4985-845E-B8312450DF3D}" +EndProject +Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "MtApiInstaller", "MtApiInstaller\MtApiInstaller.wixproj", "{78B94552-DB17-40EC-B7C6-23D32DB85DC1}" + ProjectSection(ProjectDependencies) = postProject + {7A76C388-A8FB-4949-8170-24D4742E934E} = {7A76C388-A8FB-4949-8170-24D4742E934E} + {2BE5FAC1-7FB7-45C3-9215-31A5BC4B964F} = {2BE5FAC1-7FB7-45C3-9215-31A5BC4B964F} + {DE76D5C7-B99C-4467-8408-78173BDD84E0} = {DE76D5C7-B99C-4467-8408-78173BDD84E0} + EndProjectSection +EndProject +Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "MtApi5Installer", "MtApi5Installer\MtApi5Installer.wixproj", "{A9ED070F-AB4D-4380-9DDE-5D931AC71333}" + ProjectSection(ProjectDependencies) = postProject + {AC8B5010-DA75-477E-9CA5-547C649E12D8} = {AC8B5010-DA75-477E-9CA5-547C649E12D8} + {CB6D4A3E-2F2E-4C67-929D-3C2A8FD1C556} = {CB6D4A3E-2F2E-4C67-929D-3C2A8FD1C556} + {DE76D5C7-B99C-4467-8408-78173BDD84E0} = {DE76D5C7-B99C-4467-8408-78173BDD84E0} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {220F01DF-8489-44F3-9C79-D5AFFCE94D6B}.Debug|Win32.ActiveCfg = Debug|x86 + {220F01DF-8489-44F3-9C79-D5AFFCE94D6B}.Debug|x64.ActiveCfg = Debug|x86 + {220F01DF-8489-44F3-9C79-D5AFFCE94D6B}.Release|Win32.ActiveCfg = Release|x86 + {220F01DF-8489-44F3-9C79-D5AFFCE94D6B}.Release|x64.ActiveCfg = Release|x86 + {663CC515-EAAE-47D4-8933-5008C2DA1160}.Debug|Win32.ActiveCfg = Debug|x86 + {663CC515-EAAE-47D4-8933-5008C2DA1160}.Debug|x64.ActiveCfg = Debug|Any CPU + {663CC515-EAAE-47D4-8933-5008C2DA1160}.Release|Win32.ActiveCfg = Release|x86 + {663CC515-EAAE-47D4-8933-5008C2DA1160}.Release|x64.ActiveCfg = Release|Any CPU + {DE76D5C7-B99C-4467-8408-78173BDD84E0}.Debug|Win32.ActiveCfg = Debug|Any CPU + {DE76D5C7-B99C-4467-8408-78173BDD84E0}.Debug|Win32.Build.0 = Debug|Any CPU + {DE76D5C7-B99C-4467-8408-78173BDD84E0}.Debug|x64.ActiveCfg = Debug|Any CPU + {DE76D5C7-B99C-4467-8408-78173BDD84E0}.Debug|x64.Build.0 = Debug|Any CPU + {DE76D5C7-B99C-4467-8408-78173BDD84E0}.Release|Win32.ActiveCfg = Release|Any CPU + {DE76D5C7-B99C-4467-8408-78173BDD84E0}.Release|Win32.Build.0 = Release|Any CPU + {DE76D5C7-B99C-4467-8408-78173BDD84E0}.Release|x64.ActiveCfg = Release|Any CPU + {DE76D5C7-B99C-4467-8408-78173BDD84E0}.Release|x64.Build.0 = Release|Any CPU + {2BE5FAC1-7FB7-45C3-9215-31A5BC4B964F}.Debug|Win32.ActiveCfg = Debug|Win32 + {2BE5FAC1-7FB7-45C3-9215-31A5BC4B964F}.Debug|Win32.Build.0 = Debug|Win32 + {2BE5FAC1-7FB7-45C3-9215-31A5BC4B964F}.Debug|x64.ActiveCfg = Debug|Win32 + {2BE5FAC1-7FB7-45C3-9215-31A5BC4B964F}.Release|Win32.ActiveCfg = Release|Win32 + {2BE5FAC1-7FB7-45C3-9215-31A5BC4B964F}.Release|Win32.Build.0 = Release|Win32 + {2BE5FAC1-7FB7-45C3-9215-31A5BC4B964F}.Release|x64.ActiveCfg = Release|Win32 + {7A76C388-A8FB-4949-8170-24D4742E934E}.Debug|Win32.ActiveCfg = Debug|Any CPU + {7A76C388-A8FB-4949-8170-24D4742E934E}.Debug|Win32.Build.0 = Debug|Any CPU + {7A76C388-A8FB-4949-8170-24D4742E934E}.Debug|x64.ActiveCfg = Debug|Any CPU + {7A76C388-A8FB-4949-8170-24D4742E934E}.Release|Win32.ActiveCfg = Release|Any CPU + {7A76C388-A8FB-4949-8170-24D4742E934E}.Release|Win32.Build.0 = Release|Any CPU + {7A76C388-A8FB-4949-8170-24D4742E934E}.Release|x64.ActiveCfg = Release|Any CPU + {AC8B5010-DA75-477E-9CA5-547C649E12D8}.Debug|Win32.ActiveCfg = Debug|Any CPU + {AC8B5010-DA75-477E-9CA5-547C649E12D8}.Debug|Win32.Build.0 = Debug|Any CPU + {AC8B5010-DA75-477E-9CA5-547C649E12D8}.Debug|x64.ActiveCfg = Debug|Any CPU + {AC8B5010-DA75-477E-9CA5-547C649E12D8}.Debug|x64.Build.0 = Debug|Any CPU + {AC8B5010-DA75-477E-9CA5-547C649E12D8}.Release|Win32.ActiveCfg = Release|Any CPU + {AC8B5010-DA75-477E-9CA5-547C649E12D8}.Release|Win32.Build.0 = Release|Any CPU + {AC8B5010-DA75-477E-9CA5-547C649E12D8}.Release|x64.ActiveCfg = Release|Any CPU + {AC8B5010-DA75-477E-9CA5-547C649E12D8}.Release|x64.Build.0 = Release|Any CPU + {CB6D4A3E-2F2E-4C67-929D-3C2A8FD1C556}.Debug|Win32.ActiveCfg = Debug|Win32 + {CB6D4A3E-2F2E-4C67-929D-3C2A8FD1C556}.Debug|Win32.Build.0 = Debug|Win32 + {CB6D4A3E-2F2E-4C67-929D-3C2A8FD1C556}.Debug|x64.ActiveCfg = Debug|x64 + {CB6D4A3E-2F2E-4C67-929D-3C2A8FD1C556}.Debug|x64.Build.0 = Debug|x64 + {CB6D4A3E-2F2E-4C67-929D-3C2A8FD1C556}.Release|Win32.ActiveCfg = Release|Win32 + {CB6D4A3E-2F2E-4C67-929D-3C2A8FD1C556}.Release|Win32.Build.0 = Release|Win32 + {CB6D4A3E-2F2E-4C67-929D-3C2A8FD1C556}.Release|x64.ActiveCfg = Release|x64 + {CB6D4A3E-2F2E-4C67-929D-3C2A8FD1C556}.Release|x64.Build.0 = Release|x64 + {38B9C657-BC2F-44F0-8824-54B31F2A64F5}.Debug|Win32.ActiveCfg = Debug|x86 + {38B9C657-BC2F-44F0-8824-54B31F2A64F5}.Debug|x64.ActiveCfg = Debug|Any CPU + {38B9C657-BC2F-44F0-8824-54B31F2A64F5}.Debug|x64.Build.0 = Debug|Any CPU + {38B9C657-BC2F-44F0-8824-54B31F2A64F5}.Release|Win32.ActiveCfg = Release|x86 + {38B9C657-BC2F-44F0-8824-54B31F2A64F5}.Release|x64.ActiveCfg = Release|Any CPU + {EB7C228D-9494-4985-845E-B8312450DF3D}.Debug|Win32.ActiveCfg = Debug|x86 + {EB7C228D-9494-4985-845E-B8312450DF3D}.Debug|x64.ActiveCfg = Debug|x86 + {EB7C228D-9494-4985-845E-B8312450DF3D}.Release|Win32.ActiveCfg = Release|x86 + {EB7C228D-9494-4985-845E-B8312450DF3D}.Release|x64.ActiveCfg = Release|x86 + {78B94552-DB17-40EC-B7C6-23D32DB85DC1}.Debug|Win32.ActiveCfg = Debug|x86 + {78B94552-DB17-40EC-B7C6-23D32DB85DC1}.Debug|Win32.Build.0 = Debug|x86 + {78B94552-DB17-40EC-B7C6-23D32DB85DC1}.Debug|x64.ActiveCfg = Debug|x86 + {78B94552-DB17-40EC-B7C6-23D32DB85DC1}.Release|Win32.ActiveCfg = Release|x86 + {78B94552-DB17-40EC-B7C6-23D32DB85DC1}.Release|Win32.Build.0 = Release|x86 + {78B94552-DB17-40EC-B7C6-23D32DB85DC1}.Release|x64.ActiveCfg = Release|x86 + {A9ED070F-AB4D-4380-9DDE-5D931AC71333}.Debug|Win32.ActiveCfg = Debug|x86 + {A9ED070F-AB4D-4380-9DDE-5D931AC71333}.Debug|Win32.Build.0 = Debug|x86 + {A9ED070F-AB4D-4380-9DDE-5D931AC71333}.Debug|x64.ActiveCfg = Debug|x86 + {A9ED070F-AB4D-4380-9DDE-5D931AC71333}.Release|Win32.ActiveCfg = Release|x86 + {A9ED070F-AB4D-4380-9DDE-5D931AC71333}.Release|Win32.Build.0 = Release|x86 + {A9ED070F-AB4D-4380-9DDE-5D931AC71333}.Release|x64.ActiveCfg = Release|x86 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/MtApi/ExtensionMethods.cs b/MtApi/ExtensionMethods.cs index 3651de34..b59af497 100755 --- a/MtApi/ExtensionMethods.cs +++ b/MtApi/ExtensionMethods.cs @@ -2,26 +2,45 @@ using System.Collections.Generic; using System.Linq; using System.Text; +using System.Threading.Tasks; namespace MtApi { static class ExtensionMethods { #region Event Methods - public static void FireEvent(this EventHandler eventHandler, object sender) + + public static async void FireEvent(this MtApiQuoteHandler evenHandler, object sender, string symbol, double bid, double ask) { - if (eventHandler != null) + if (evenHandler != null) { - eventHandler(sender, EventArgs.Empty); + await Task.Factory.StartNew(() => + { + evenHandler(sender, symbol, bid, ask); + }); } } - public static void FireEvent(this EventHandler eventHandler, object sender, T e) + public static async void FireEvent(this EventHandler eventHandler, object sender) + { + if (eventHandler != null) + { + await Task.Factory.StartNew(() => + { + eventHandler(sender, EventArgs.Empty); + }); + } + } + + public static async void FireEvent(this EventHandler eventHandler, object sender, T e) where T : EventArgs { if (eventHandler != null) { - eventHandler(sender, e); + await Task.Factory.StartNew(() => + { + eventHandler(sender, e); + }); } } diff --git a/MtApi/MtApi.csproj b/MtApi/MtApi.csproj index 0b3993a9..6cad83ce 100755 --- a/MtApi/MtApi.csproj +++ b/MtApi/MtApi.csproj @@ -10,7 +10,7 @@ Properties MtApi MtApi - v4.0 + v4.5 512 @@ -23,6 +23,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -32,6 +33,7 @@ prompt 4 AnyCPU + false false diff --git a/MtApi/MtApiClient.cs b/MtApi/MtApiClient.cs index f31c57eb..8e6eb504 100755 --- a/MtApi/MtApiClient.cs +++ b/MtApi/MtApiClient.cs @@ -1314,10 +1314,7 @@ namespace MtApi { if (quote != null) { - if (QuoteUpdated != null) - { - QuoteUpdated(this, quote.Instrument, quote.Bid, quote.Ask); - } + QuoteUpdated.FireEvent(this, quote.Instrument, quote.Bid, quote.Ask); } } diff --git a/TestApiClientUI/Properties/Resources.Designer.cs b/TestApiClientUI/Properties/Resources.Designer.cs index 3dae950e..06f334dc 100755 --- a/TestApiClientUI/Properties/Resources.Designer.cs +++ b/TestApiClientUI/Properties/Resources.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.235 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. diff --git a/TestApiClientUI/Properties/Settings.Designer.cs b/TestApiClientUI/Properties/Settings.Designer.cs index 29700001..2bace71a 100755 --- a/TestApiClientUI/Properties/Settings.Designer.cs +++ b/TestApiClientUI/Properties/Settings.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.235 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -12,7 +12,7 @@ namespace TestApiClientUI.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/TestApiClientUI/TestApiClientUI.csproj b/TestApiClientUI/TestApiClientUI.csproj index 9c1d3860..684972b7 100755 --- a/TestApiClientUI/TestApiClientUI.csproj +++ b/TestApiClientUI/TestApiClientUI.csproj @@ -10,7 +10,7 @@ Properties TestApiClientUI TestApiClientUI - v4.0 + v4.5 512 @@ -39,6 +39,7 @@ DEBUG;TRACE prompt 4 + false x86 @@ -48,6 +49,7 @@ TRACE prompt 4 + false true @@ -64,6 +66,7 @@ true ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules true + false bin\Release\ @@ -80,12 +83,9 @@ true ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules true + false - - False - C:\Program Files (x86)\MtApi\MtApi.dll - @@ -152,6 +152,12 @@ true + + + {7a76c388-a8fb-4949-8170-24d4742e934e} + MtApi + +