From 18226cc9e83bb497bbcb5988459bc28f4723fa0b Mon Sep 17 00:00:00 2001 From: DW Date: Tue, 10 May 2016 17:47:51 +0300 Subject: [PATCH] Moved test applications to folder TestClients. Fixed build of installers --- MT5Connector/MT5Connector.vcxproj | 12 +- MTApiService/MtApiKey.pfx | Bin 1764 -> 1764 bytes MTApiService/Properties/AssemblyInfo.cs | 4 +- MTConnector/MTConnector.vcxproj | 12 +- MtApi5Installer/Product.wxs | 4 +- MtApi5TestClient/App.xaml | 8 - MtApi5TestClient/App.xaml.cs | 16 - MtApi5TestClient/DelegateCommand.cs | 51 - MtApi5TestClient/MainWindow.xaml | 391 ----- MtApi5TestClient/MainWindow.xaml.cs | 37 - MtApi5TestClient/MqlTradeRequestViewModel.cs | 187 --- MtApi5TestClient/MtApi5TestClient.csproj | 147 -- MtApi5TestClient/Properties/AssemblyInfo.cs | 55 - .../Properties/Resources.Designer.cs | 71 - MtApi5TestClient/Properties/Resources.resx | 117 -- .../Properties/Settings.Designer.cs | 30 - MtApi5TestClient/Properties/Settings.settings | 7 - MtApi5TestClient/QuoteViewModel.cs | 67 - MtApi5TestClient/TimeSeriesValueViewModel.cs | 37 - MtApi5TestClient/ViewModel.cs | 765 --------- TestApiClientUI/Form1.Designer.cs | 1386 ----------------- TestApiClientUI/Form1.cs | 1006 ------------ TestApiClientUI/Form1.resx | 126 -- TestApiClientUI/Program.cs | 21 - TestApiClientUI/Properties/AssemblyInfo.cs | 36 - .../Properties/Resources.Designer.cs | 63 - TestApiClientUI/Properties/Resources.resx | 117 -- .../Properties/Settings.Designer.cs | 26 - TestApiClientUI/Properties/Settings.settings | 7 - TestApiClientUI/TestApiClientUI.csproj | 169 -- TestApiClientUI/app.config | 3 - TestMtApi/TestMtApi.sln | 20 - TestMtApi/TestMtApi/App.config | 6 - TestMtApi/TestMtApi/Form1.Designer.vb | 97 -- TestMtApi/TestMtApi/Form1.resx | 120 -- TestMtApi/TestMtApi/Form1.vb | 38 - .../My Project/Application.Designer.vb | 38 - .../TestMtApi/My Project/Application.myapp | 11 - .../TestMtApi/My Project/AssemblyInfo.vb | 35 - .../My Project/Resources.Designer.vb | 62 - TestMtApi/TestMtApi/My Project/Resources.resx | 117 -- .../TestMtApi/My Project/Settings.Designer.vb | 73 - .../TestMtApi/My Project/Settings.settings | 7 - TestMtApi/TestMtApi/My Project/app.manifest | 48 - TestMtApi/TestMtApi/TestMtApi.vbproj | 170 -- TestServer/CodeErrorTypes.cs | 43 - TestServer/IMetaTrader.cs | 22 - TestServer/MetaTrader.cs | 229 --- TestServer/MtExpert.cs | 145 -- TestServer/MtInstrument.cs | 129 -- TestServer/MtInstrumentChart.cs | 94 -- TestServer/MtQuoteExpert.cs.cs | 433 ----- TestServer/Program.cs | 243 --- TestServer/Properties/AssemblyInfo.cs | 36 - TestServer/TestServer.csproj | 73 - TestServer/app.config | 3 - 56 files changed, 16 insertions(+), 7254 deletions(-) delete mode 100755 MtApi5TestClient/App.xaml delete mode 100755 MtApi5TestClient/App.xaml.cs delete mode 100755 MtApi5TestClient/DelegateCommand.cs delete mode 100755 MtApi5TestClient/MainWindow.xaml delete mode 100755 MtApi5TestClient/MainWindow.xaml.cs delete mode 100755 MtApi5TestClient/MqlTradeRequestViewModel.cs delete mode 100755 MtApi5TestClient/MtApi5TestClient.csproj delete mode 100755 MtApi5TestClient/Properties/AssemblyInfo.cs delete mode 100755 MtApi5TestClient/Properties/Resources.Designer.cs delete mode 100755 MtApi5TestClient/Properties/Resources.resx delete mode 100755 MtApi5TestClient/Properties/Settings.Designer.cs delete mode 100755 MtApi5TestClient/Properties/Settings.settings delete mode 100755 MtApi5TestClient/QuoteViewModel.cs delete mode 100755 MtApi5TestClient/TimeSeriesValueViewModel.cs delete mode 100755 MtApi5TestClient/ViewModel.cs delete mode 100755 TestApiClientUI/Form1.Designer.cs delete mode 100755 TestApiClientUI/Form1.cs delete mode 100755 TestApiClientUI/Form1.resx delete mode 100755 TestApiClientUI/Program.cs delete mode 100755 TestApiClientUI/Properties/AssemblyInfo.cs delete mode 100755 TestApiClientUI/Properties/Resources.Designer.cs delete mode 100755 TestApiClientUI/Properties/Resources.resx delete mode 100755 TestApiClientUI/Properties/Settings.Designer.cs delete mode 100755 TestApiClientUI/Properties/Settings.settings delete mode 100755 TestApiClientUI/TestApiClientUI.csproj delete mode 100755 TestApiClientUI/app.config delete mode 100755 TestMtApi/TestMtApi.sln delete mode 100755 TestMtApi/TestMtApi/App.config delete mode 100755 TestMtApi/TestMtApi/Form1.Designer.vb delete mode 100755 TestMtApi/TestMtApi/Form1.resx delete mode 100755 TestMtApi/TestMtApi/Form1.vb delete mode 100755 TestMtApi/TestMtApi/My Project/Application.Designer.vb delete mode 100755 TestMtApi/TestMtApi/My Project/Application.myapp delete mode 100755 TestMtApi/TestMtApi/My Project/AssemblyInfo.vb delete mode 100755 TestMtApi/TestMtApi/My Project/Resources.Designer.vb delete mode 100755 TestMtApi/TestMtApi/My Project/Resources.resx delete mode 100755 TestMtApi/TestMtApi/My Project/Settings.Designer.vb delete mode 100755 TestMtApi/TestMtApi/My Project/Settings.settings delete mode 100755 TestMtApi/TestMtApi/My Project/app.manifest delete mode 100755 TestMtApi/TestMtApi/TestMtApi.vbproj delete mode 100755 TestServer/CodeErrorTypes.cs delete mode 100755 TestServer/IMetaTrader.cs delete mode 100755 TestServer/MetaTrader.cs delete mode 100755 TestServer/MtExpert.cs delete mode 100755 TestServer/MtInstrument.cs delete mode 100755 TestServer/MtInstrumentChart.cs delete mode 100755 TestServer/MtQuoteExpert.cs.cs delete mode 100755 TestServer/Program.cs delete mode 100755 TestServer/Properties/AssemblyInfo.cs delete mode 100755 TestServer/TestServer.csproj delete mode 100755 TestServer/app.config diff --git a/MT5Connector/MT5Connector.vcxproj b/MT5Connector/MT5Connector.vcxproj index 13c3ed5c..8dd0d20a 100755 --- a/MT5Connector/MT5Connector.vcxproj +++ b/MT5Connector/MT5Connector.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -20,7 +20,7 @@ {CB6D4A3E-2F2E-4C67-929D-3C2A8FD1C556} - v4.5 + v4.5.2 ManagedCProj MT5Connector @@ -30,28 +30,28 @@ true true MultiByte - v120 + v140 DynamicLibrary true true Unicode - v120 + v140 DynamicLibrary false true Unicode - v120 + v140 DynamicLibrary false true Unicode - v120 + v140 diff --git a/MTApiService/MtApiKey.pfx b/MTApiService/MtApiKey.pfx index 92568c254ce21ef482fc4e32451e0d1cb51396e7..34f41a82ea50582c7f65e0170f389b35850336d2 100755 GIT binary patch delta 1487 zcmV;=1u**L4de}wXn$QL%THz2LJ{s9(4CPy4Le&sUQ&}ToXapNK$l2U^ZIeJd`1Y2o4fHi8|{F=H@)Km!Ko!pl1}Fn`C!c(A-F&r6^#BHr@l zgG$I8I+-Ms1D^s@o?Un{QGI_EMok7E{M-vUx1_Y_@bi==oZ8QVCe5|ym_VLr@9hut7Y@YO_t|=Efxm*NJL_#^s;Hp=9Alv(@8gnMNvu`noTMl%YVzF8 zEDFs}fgKQ)#M4wjF_B)tho5DiO3TiK;1R>~iXm=#0DqwoaDK&Q2YoszqCDpo{WX2& zi5>$OFzuHKWzk!~BND~5&;~yCEwr{wH1>t(> zeBk*+KwV)RaMjXdgL3L?CJ7zd6q$%wRP0J#^dOrQXuUX@^n*zY=4UEd=iurfIRG{QMgTAXMF21WH2_2aEdV$GIRH2SGyp9CGypRI zMF2zqEdV$GGXOLIL;x)SMF21WF#s|EGXO9EL;y7aFaR?EH~=-1djp(*T&&dG_Jx&m z0s;rnfPw;m+sUY!rLr93{_*ivyN)&BR#BpyoH&SXQghCa6h>Cu`~Z!-A+qI+MP1Qm z2pJjl*{sZe8b2mgpEyTDZScT%$wsS8R@myob$IwTGkjU;FM{LefsF zsnpMuWzz|~dw0=FVAAXeGyYd(!9f1DC|PPG9ogGM=4*fy_3lm+w)!1LB0RM{WDg}9 z=6jPM;F#1TFXrKUlS6_xS2kvIEgA0ng&-Ga8fSO8YwthLo8ne~cFn2es}xK5qM;@v zmDLS^TqazYI}I~Z#rH}0O4K&{nhiTwIx?6Khps&}xKbgYg9|WcA}R51gfSz8_Ei%@ zA+~Set&6U{72CSK-WlyH?d~YMG6hj#d|kVwV?ffq@Z!(1X$$E$h2cig{-Cx ztI9_zU0nGQ_UB;MecRecQyf)HBd9OMZrTNX4Q(r3XL13V)!i<~W$t_$f(|OsbHm6@ zogpv(+Ml)ic6a|(Q@Wf4W#0GV`oar1_=4-AU<=n6{aO?sCUVbHk;a7f5dM=61o?{) zH)&%&AOJy9Iu;kr>*&QdZnh2d%=eSE>M%PnA20_71uG5%0vZGqk5%wEXxFaC p`FTWXj>%zVb|-!Y1Qbw+w7TdQ6Z{Lbv@1__>`Yo)gM$JB2hfJBzvKV_ delta 1487 zcmV;=1u**L4de}wXn%1?X9A^iL7M^s2haq90+5Xh@@B;5PEJ_giphZO)^PJ8rp0HKAe28zJsw!J2V}=Wl3eJamMp`P3Z>8$I=a?#;;{>Z4aL-*_@{ z*oWS8US;nZi#v_JfkXJwhp8Sc$in0cC0o=jk`WNCgk$UXVt=yub6A}@XpncyMupFI zveSU;i;O!_Au<(OWvNf2ujQGw4ZhSVv%=B8ue4!o4ss0?_(TC?)R>ZR$Ge(PTl}x%Q?)YyPp>Bp-?swaW5@Yi;$qG%J@spYm@Y zx#??aB!OkK8-JR4VxM+8+d?k4tNAkH{;hS?Qj%VGU?e7+P+jcQ45ST8+#GJw9PUqa z)OrdD<(DI$8(O{A8WlhV6ULN(#ZmynwK)2D8;FLexlSfbG#}RFbGiML=nZNs?#sM> zTL&hQ-njhVdmvj(l~rxW*3^LiODFRo*TajGOMn0zg#7d7q<0{Z zac0xhFAX!HlTjT#*@(0AIsIZG>HM^ILreB90gyZ&WxD!69?Qks+GuycENhmz7X^@g zXZ89(xEVcGBlfk{`yX;>YXDkbg%0K2T{5Ru!$<5JkY^^vek-++e@e}C4d^Z@Hnf#1 zPN-X0;(zu*a?yj~yYB3G(sR@mD((s|0@vFi)ktQ|W&fXH^qt)y!i|K0%TDTJj0S@R zeK7aJ-PAa6#BZ;BdIrUh_=TxQfQ*88(`hk8fA=J*s8WRjaI6V@amwpbS`Kc{EA1o8 zy+0D{v}ADYi15K|DTvLu82}_N*}S4kb?Z3fT?bN6_--b7!4a3QL4Fh+QgG zLR`2X!<-4r2gHM|IY@?+2m>rfMgTzoL;y4ZH2_8cF#t3GEdW9QLI5xTMF1@TGypgN zFaSmXEdW9QGXOOJL;x)SFaSdUMF2toGXOULGXOOJLjW@XLI5+9djp(*6oU3hxrr9d z0s;rnfPw;m0KzDdh1aNdv-9}0yiPkgVP2(;(WrN=7rvBzR`k9bAFh9< zSvm-xpb|Lb`aDDz_ziS_FRctbZoz`+7j+r-=>ku5{&u5{7Dgc(&4(WyyqhM)11AJY zOtT!WX&2m&op30^y}y(-`-jX^S3^T3CiTt1lp^mBmwEw2Hcb3^C{txX`EM|Nd}7h8 z4dhuUSsK7>@$qk?=!6&fxrb!M)D5gcB&Ylzv2XHY_L{{{JdCM-2z0VF>P+h^xWpN3 z2YgcRC64}G<;leTwHn&OTX_&J{sM6hr34%brM{*ge`?meprXp!m<=Cuj7_DF?<|gR*Pow>J(n+q1Y>JY%GhB|ReuN{gc`gH zBJqo35v9wL75u}04Ko%Ox?>X=Z?%zs%y*t9R4jCj{-NU#`MwSM z4Z~d4;;p=Yx4zz&T3dkYaBtr^T+XOLNsE(3J&_z&DL2wCM(Bk*ryL3^%ZJm@p3?F2 zDfLEiDy`5tUwleuO2$5}mtfv;#$9f=g%;>AnKb&na-mOI7z|7;gCQ2rqgV8C^mIBe z+w`6JwkY0G%@!cI`*tpk20V}7N3AE%@cB;3#xOfDA20_71uG5%0vZGqMT&Z;QHU`s pdejA$o%xFDn7Qv=1QdP0v#O%}C=N?aJe+*^tc-pG42}W<2hhJ9vUUIf diff --git a/MTApiService/Properties/AssemblyInfo.cs b/MTApiService/Properties/AssemblyInfo.cs index 7e6cc793..5c7a67ad 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.19.0")] -[assembly: AssemblyFileVersion("1.0.19.0")] +[assembly: AssemblyVersion("1.0.20.0")] +[assembly: AssemblyFileVersion("1.0.20.0")] diff --git a/MTConnector/MTConnector.vcxproj b/MTConnector/MTConnector.vcxproj index 2fb94464..c2a75723 100755 --- a/MTConnector/MTConnector.vcxproj +++ b/MTConnector/MTConnector.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -20,7 +20,7 @@ {2BE5FAC1-7FB7-45C3-9215-31A5BC4B964F} - v4.5 + v4.5.2 ManagedCProj MTConnector MTConnector @@ -31,28 +31,28 @@ true true NotSet - v120 + v140 DynamicLibrary true true Unicode - v120 + v140 DynamicLibrary false true NotSet - v120 + v140 DynamicLibrary false true MultiByte - v120 + v140 diff --git a/MtApi5Installer/Product.wxs b/MtApi5Installer/Product.wxs index f412c8a5..979123bc 100755 --- a/MtApi5Installer/Product.wxs +++ b/MtApi5Installer/Product.wxs @@ -2,12 +2,12 @@ - + - + diff --git a/MtApi5TestClient/App.xaml b/MtApi5TestClient/App.xaml deleted file mode 100755 index b34ae96d..00000000 --- a/MtApi5TestClient/App.xaml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - diff --git a/MtApi5TestClient/App.xaml.cs b/MtApi5TestClient/App.xaml.cs deleted file mode 100755 index 25259dee..00000000 --- a/MtApi5TestClient/App.xaml.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Configuration; -using System.Data; -using System.Linq; -using System.Windows; - -namespace MtApi5TestClient -{ - /// - /// Interaction logic for App.xaml - /// - public partial class App : Application - { - } -} diff --git a/MtApi5TestClient/DelegateCommand.cs b/MtApi5TestClient/DelegateCommand.cs deleted file mode 100755 index d133c3e2..00000000 --- a/MtApi5TestClient/DelegateCommand.cs +++ /dev/null @@ -1,51 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Windows.Input; - -namespace MtApi5TestClient -{ - public class DelegateCommand : ICommand - { - private readonly Predicate _canExecute; - private readonly Action _execute; - - public event EventHandler CanExecuteChanged; - - public DelegateCommand(Action execute) - : this(execute, null) - { - } - - public DelegateCommand(Action execute, - Predicate canExecute) - { - _execute = execute; - _canExecute = canExecute; - } - - public bool CanExecute(object parameter) - { - if (_canExecute == null) - { - return true; - } - - return _canExecute(parameter); - } - - public void Execute(object parameter) - { - _execute(parameter); - } - - public void RaiseCanExecuteChanged() - { - if (CanExecuteChanged != null) - { - CanExecuteChanged(this, EventArgs.Empty); - } - } - } -} diff --git a/MtApi5TestClient/MainWindow.xaml b/MtApi5TestClient/MainWindow.xaml deleted file mode 100755 index 34cec869..00000000 --- a/MtApi5TestClient/MainWindow.xaml +++ /dev/null @@ -1,391 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -