Ported MtApi5 to .Net Core

MTApiService/MTApiService.csproj

@@ -44,14 +44,15 @@
     <AssemblyOriginatorKeyFile>MtApiKey.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net, Version=1.2.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\packages\log4net.2.0.5\lib\net40-full\log4net.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="log4net, Version=2.0.12.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\packages\log4net.2.0.12\lib\net40\log4net.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Web" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />

MTApiService/packages.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="ILMerge" version="2.13.0307" targetFramework="net40" />
-  <package id="log4net" version="2.0.10" targetFramework="net40" />
+  <package id="log4net" version="2.0.12" targetFramework="net40" />
   <package id="MSBuild.ILMerge.Task" version="1.0.5" targetFramework="net40" />
 </packages>

MetaTraderApi_2017.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30413.136
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestApiClientUI", "TestClients\TestApiClientUI\TestApiClientUI.csproj", "{663CC515-EAAE-47D4-8933-5008C2DA1160}"
 EndProject
@@ -47,6 +47,8 @@ Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "MtApiBootstrapper", "MtApiB
 		{78B94552-DB17-40EC-B7C6-23D32DB85DC1} = {78B94552-DB17-40EC-B7C6-23D32DB85DC1}
 	EndProjectSection
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MtApiServiceNetCore", "MtApiServiceNetCore\MtApiServiceNetCore.csproj", "{7CAFAAE2-0C15-479A-B16D-C2FCE0A48E11}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -232,6 +234,22 @@ Global
 		{8E63046B-56E5-4623-8808-558AD72A8F2B}.Release|x64.ActiveCfg = Release|x86
 		{8E63046B-56E5-4623-8808-558AD72A8F2B}.Release|x86.ActiveCfg = Release|x86
 		{8E63046B-56E5-4623-8808-558AD72A8F2B}.Release|x86.Build.0 = Release|x86
+		{7CAFAAE2-0C15-479A-B16D-C2FCE0A48E11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7CAFAAE2-0C15-479A-B16D-C2FCE0A48E11}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7CAFAAE2-0C15-479A-B16D-C2FCE0A48E11}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{7CAFAAE2-0C15-479A-B16D-C2FCE0A48E11}.Debug|Win32.Build.0 = Debug|Any CPU
+		{7CAFAAE2-0C15-479A-B16D-C2FCE0A48E11}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7CAFAAE2-0C15-479A-B16D-C2FCE0A48E11}.Debug|x64.Build.0 = Debug|Any CPU
+		{7CAFAAE2-0C15-479A-B16D-C2FCE0A48E11}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7CAFAAE2-0C15-479A-B16D-C2FCE0A48E11}.Debug|x86.Build.0 = Debug|Any CPU
+		{7CAFAAE2-0C15-479A-B16D-C2FCE0A48E11}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7CAFAAE2-0C15-479A-B16D-C2FCE0A48E11}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7CAFAAE2-0C15-479A-B16D-C2FCE0A48E11}.Release|Win32.ActiveCfg = Release|Any CPU
+		{7CAFAAE2-0C15-479A-B16D-C2FCE0A48E11}.Release|Win32.Build.0 = Release|Any CPU
+		{7CAFAAE2-0C15-479A-B16D-C2FCE0A48E11}.Release|x64.ActiveCfg = Release|Any CPU
+		{7CAFAAE2-0C15-479A-B16D-C2FCE0A48E11}.Release|x64.Build.0 = Release|Any CPU
+		{7CAFAAE2-0C15-479A-B16D-C2FCE0A48E11}.Release|x86.ActiveCfg = Release|Any CPU
+		{7CAFAAE2-0C15-479A-B16D-C2FCE0A48E11}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -241,4 +259,7 @@ Global
 		{38B9C657-BC2F-44F0-8824-54B31F2A64F5} = {B91FF338-E05D-4EF1-948B-A2376DB37ECA}
 		{EB7C228D-9494-4985-845E-B8312450DF3D} = {B91FF338-E05D-4EF1-948B-A2376DB37ECA}
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {23C8878C-16A5-47DF-9A57-73CCF847780D}
+	EndGlobalSection
 EndGlobal

MtApi5/MtApi5.csproj

@@ -1,123 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{AC8B5010-DA75-477E-9CA5-547C649E12D8}</ProjectGuid>
+    <TargetFramework>net5.0</TargetFramework>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>MtApi5</RootNamespace>
-    <AssemblyName>MtApi5</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
     <OutputPath>..\build\products\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
     <UseVSHostingProcess>false</UseVSHostingProcess>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
     <OutputPath>..\build\products\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net40\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Configuration.Install" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.ServiceModel" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
+    <ProjectReference Include="..\MtApiServiceNetCore\MtApiServiceNetCore.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="CopyTicksFlag.cs" />
-    <Compile Include="Events\OnBookEvent.cs" />
-    <Compile Include="Events\OnLastTimeBarEvent.cs" />
-    <Compile Include="Events\OnLockTicksEvent.cs" />
-    <Compile Include="Events\OnTickEvent.cs" />
-    <Compile Include="Events\OnTradeTransactionEvent.cs" />
-    <Compile Include="Mt5LockTicksEventArgs.cs" />
-    <Compile Include="Mt5TimeBarArgs.cs" />
-    <Compile Include="MqlBookInfo.cs" />
-    <Compile Include="MqlParam.cs" />
-    <Compile Include="MqlRates.cs" />
-    <Compile Include="MqlTick.cs" />
-    <Compile Include="MqlTradeCheckResult.cs" />
-    <Compile Include="MqlTradeTransaction.cs" />
-    <Compile Include="Mt5BookEventArgs.cs" />
-    <Compile Include="Mt5TimeConverter.cs" />
-    <Compile Include="Mt5Enums.cs" />
-    <Compile Include="Mt5ConnectionEventArgs.cs" />
-    <Compile Include="Mt5ConnectionState.cs" />
-    <Compile Include="MqlTradeRequest.cs" />
-    <Compile Include="MqlTradeResult.cs" />
-    <Compile Include="Mt5QuoteEventArgs.cs" />
-    <Compile Include="Mt5TradeTransactionEventArgs.cs" />
-    <Compile Include="MtApi5Client.cs" />
-    <Compile Include="Mt5CommandType.cs" />
-    <Compile Include="MtConverters.cs" />
-    <Compile Include="ErrorCode.cs" />
-    <Compile Include="ExecutionException.cs" />
-    <Compile Include="Events\Mt5EventTypes.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Mt5Quote.cs" />
-    <Compile Include="Requests\BuyRequest.cs" />
-    <Compile Include="Requests\ChartTimePriceToXyRequest.cs" />
-    <Compile Include="Requests\ChartTimePriceToXyResult.cs" />
-    <Compile Include="Requests\ChartXyToTimePriceRequest.cs" />
-    <Compile Include="Requests\ChartXyToTimePriceResult.cs" />
-    <Compile Include="Requests\CopyTicksRequest.cs" />
-    <Compile Include="Requests\ICustomRequest.cs" />
-    <Compile Include="Requests\IndicatorCreateRequest.cs" />
-    <Compile Include="Requests\MarketBookGetRequest.cs" />
-    <Compile Include="Requests\OrderCheckRequest.cs" />
-    <Compile Include="Requests\OrderCheckResult.cs" />
-    <Compile Include="Requests\OrderSendAsyncRequest.cs" />
-    <Compile Include="Requests\OrderSendRequest.cs" />
-    <Compile Include="Requests\PositionCloseRequest.cs" />
-    <Compile Include="Requests\PositionCloseResult.cs" />
-    <Compile Include="Requests\PositionOpenRequest.cs" />
-    <Compile Include="Requests\RequestBase.cs" />
-    <Compile Include="Requests\RequestType.cs" />
-    <Compile Include="Requests\OrderSendResult.cs" />
-    <Compile Include="Requests\Response.cs" />
-    <Compile Include="Requests\SellRequest.cs" />
-    <Compile Include="Requests\SymbolInfoStringRequest.cs" />
-    <Compile Include="Requests\SymbolInfoStringResult.cs" />
-    <Compile Include="Requests\SymbolInfoTickRequest.cs" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\MTApiService\MTApiService.csproj">
-      <Project>{DE76D5C7-B99C-4467-8408-78173BDD84E0}</Project>
-      <Name>MTApiService</Name>
-    </ProjectReference>
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>

MtApi5/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net40" />
+  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net472" />
 </packages>

MtApiServiceNetCore/MtApiProxy.cs

@@ -0,0 +1,78 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.ServiceModel;
+using System.ServiceModel.Channels;
+
+namespace MTApiService
+{
+    internal class MtApiProxy : IMtApi, IDisposable
+    {
+        private IMtApi InnerChannel;
+
+        public CommunicationState State => ((ICommunicationObject)InnerChannel).State;
+
+        public MtApiProxy(InstanceContext callbackContext, Binding binding, EndpointAddress remoteAddress)
+        {
+            var channel = new DuplexChannelFactory<IMtApi>(callbackContext, binding, remoteAddress);
+            channel.Faulted += InnerDuplexChannel_Faulted;
+
+            // configure endpoint programmatically instead via an attribute which will lead to a PlatformNotSupportedException
+            (channel.Endpoint.EndpointBehaviors.Single(b => b is CallbackBehaviorAttribute) as CallbackBehaviorAttribute).UseSynchronizationContext = false;
+
+            InnerChannel = channel.CreateChannel();
+        }
+
+        #region IMtApi Members
+
+        public bool Connect()
+        {
+            return InnerChannel.Connect();
+        }
+
+        public void Disconnect()
+        {
+            InnerChannel.Disconnect();
+        }
+
+        public MtResponse SendCommand(MtCommand command)
+        {
+            return InnerChannel.SendCommand(command);
+        }
+
+        public List<MtQuote> GetQuotes()
+        {
+            return InnerChannel.GetQuotes();
+        }
+
+        #endregion
+
+        #region IDisposable Members
+
+        public void Dispose()
+        {
+            try
+            {
+                Disconnect();
+            }
+            catch (Exception)
+            {
+
+            }
+        }
+
+        #endregion
+
+        #region Private Methods
+        private void InnerDuplexChannel_Faulted(object sender, EventArgs e)
+        {
+            Faulted?.Invoke(this, e);
+        }
+
+        #endregion
+
+        #region Events
+        public event EventHandler Faulted;
+        #endregion
+    }
+}

MtApiServiceNetCore/MtApiServiceNetCore.csproj

@@ -0,0 +1,39 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net5.0</TargetFramework>
+    <OutputType>Library</OutputType>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>..\build\products\Debug\</OutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>..\build\products\Release\</OutputPath>
+    <DefineConstants></DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile></AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\MTApiService\IMetaTraderHandler.cs" Link="IMetaTraderHandler.cs" />
+    <Compile Include="..\MTApiService\ITaskExecutor.cs" Link="ITaskExecutor.cs" />
+    <Compile Include="..\MTApiService\LogConfigurator.cs" Link="LogConfigurator.cs" />
+    <Compile Include="..\MTApiService\Mt5Expert.cs" Link="Mt5Expert.cs" />
+    <Compile Include="..\MTApiService\MtCommand.cs" Link="MtCommand.cs" />
+    <Compile Include="..\MTApiService\MtCommandEventArgs.cs" Link="MtCommandEventArgs.cs" />
+    <Compile Include="..\MTApiService\MtCommandTask.cs" Link="MtCommandTask.cs" />
+    <Compile Include="..\MTApiService\MtEvent.cs" Link="MtEvent.cs" />
+    <Compile Include="..\MTApiService\MtExpert.cs" Link="MtExpert.cs" />
+    <Compile Include="..\MTApiService\MtMqlRates.cs" Link="MtMqlRates.cs" />
+    <Compile Include="..\MTApiService\MtMqlTradeRequest.cs" Link="MtMqlTradeRequest.cs" />
+    <Compile Include="..\MTApiService\MtQuote.cs" Link="MtQuote.cs" />
+    <Compile Include="..\MTApiService\MtResponse.cs" Link="MtResponse.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="log4net" Version="2.0.12" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
+    <PackageReference Include="System.ServiceModel.Duplex" Version="4.8.0" />
+    <PackageReference Include="System.ServiceModel.NetTcp" Version="4.8.0" />
+  </ItemGroup>
+  <PropertyGroup />
+</Project>