From d01a899aaef4a76d27ff57dbe6a59ff59b518ca2 Mon Sep 17 00:00:00 2001
From: DW <vdemydiuk@gmail.com>
Date: Mon, 16 May 2016 15:15:21 +0300
Subject: [PATCH] Fixed issue #7: Added Newtonsoft.Json.dll into installer

---
 MtApiInstaller/Product.wxs                         | 10 +++++++---
 TestClients/TestApiClientUI/TestApiClientUI.csproj | 14 ++++++++------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/MtApiInstaller/Product.wxs b/MtApiInstaller/Product.wxs
index 443dfa54..2c9dc2d0 100755
--- a/MtApiInstaller/Product.wxs
+++ b/MtApiInstaller/Product.wxs
@@ -72,14 +72,18 @@
                     Action="createAndRemoveOnUninstall">
                   <RegistryValue Type="string" Value="[INSTALLFOLDER]"/>
                 </RegistryKey>
-
             </Component>
 
-            <Component Id="MTApiServiceDll" Directory="INSTALLFOLDER">
+            <!--<Component Id="MTApiServiceDll" Directory="INSTALLFOLDER">
                 <File Id="GAC_MTApiService.dll" Name="MTApiService.dll" KeyPath="yes"
                     src="$(var.ProductPath)MTApiService.dll"/>
+            </Component>-->
+          
+            <Component Id="NewtonsoftJsondll" Directory="INSTALLFOLDER">
+                <File Id="Newtonsoft.Json.dll" Name="Newtonsoft.Json.dll" KeyPath="yes"
+                    src="$(var.ProductPath)Newtonsoft.Json.dll"/>
             </Component>
-
+          
             <Component Id="MtApiExpert" Directory="ExpertFolder">
                 <File Id="MtApi.ex4" Name="MtApi.ex4" KeyPath="yes"
                     Source="..\mq4\MtApi.ex4" />
diff --git a/TestClients/TestApiClientUI/TestApiClientUI.csproj b/TestClients/TestApiClientUI/TestApiClientUI.csproj
index 87f2e752..5286c295 100644
--- a/TestClients/TestApiClientUI/TestApiClientUI.csproj
+++ b/TestClients/TestApiClientUI/TestApiClientUI.csproj
@@ -86,6 +86,14 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="MtApi, Version=1.0.27.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>C:\Program Files (x86)\MtApi\MtApi.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>C:\Program Files (x86)\MtApi\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -152,12 +160,6 @@
       <Install>true</Install>
     </BootstrapperPackage>
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\MtApi\MtApi.csproj">
-      <Project>{7a76c388-a8fb-4949-8170-24d4742e934e}</Project>
-      <Name>MtApi</Name>
-    </ProjectReference>
-  </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.