gavindiaz/mtapi
1
0
Fork 0
mirror of https://github.com/vdemydiuk/mtapi.git synced 2026-08-19 05:38:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated MtApi5 installer to use new libraries ver 2.0.0

Browse Source
This commit is contained in:
Viacheslav Demydiuk
2024-03-03 22:24:58 +02:00
parent 35812084d5
commit 2d3e36ec8c
2 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MetaTraderApi_2022.sln
+20 -2
View File
@@ -9,11 +9,17 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MtService", "MtService\MtSe
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MT5Connector", "MT5Connector\MT5Connector.vcxproj", "{CB6D4A3E-2F2E-4C67-929D-3C2A8FD1C556}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MT5Connector", "MT5Connector\MT5Connector.vcxproj", "{CB6D4A3E-2F2E-4C67-929D-3C2A8FD1C556}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MtApi5", "MtApi5\MtApi5.csproj", "{AC8B5010-DA75-477E-9CA5-547C649E12D8}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MtApi5", "MtApi5\MtApi5.csproj", "{AC8B5010-DA75-477E-9CA5-547C649E12D8}"
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestClients", "TestClients", "{0C166554-D20F-4996-AA33-436997058FA1}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestClients", "TestClients", "{0C166554-D20F-4996-AA33-436997058FA1}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MtApi5TestClient", "TestClients\MtApi5TestClient\MtApi5TestClient.csproj", "{38B9C657-BC2F-44F0-8824-54B31F2A64F5}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MtApi5TestClient", "TestClients\MtApi5TestClient\MtApi5TestClient.csproj", "{38B9C657-BC2F-44F0-8824-54B31F2A64F5}"
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}
EndProjectSection
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -85,6 +91,18 @@ Global
{38B9C657-BC2F-44F0-8824-54B31F2A64F5}.Release|x64.Build.0 = Release|Any CPU {38B9C657-BC2F-44F0-8824-54B31F2A64F5}.Release|x64.Build.0 = Release|Any CPU
{38B9C657-BC2F-44F0-8824-54B31F2A64F5}.Release|x86.ActiveCfg = Release|x86 {38B9C657-BC2F-44F0-8824-54B31F2A64F5}.Release|x86.ActiveCfg = Release|x86
{38B9C657-BC2F-44F0-8824-54B31F2A64F5}.Release|x86.Build.0 = Release|x86 {38B9C657-BC2F-44F0-8824-54B31F2A64F5}.Release|x86.Build.0 = Release|x86
{A9ED070F-AB4D-4380-9DDE-5D931AC71333}.Debug|Any CPU.ActiveCfg = Debug|x64
{A9ED070F-AB4D-4380-9DDE-5D931AC71333}.Debug|Any CPU.Build.0 = Debug|x64
{A9ED070F-AB4D-4380-9DDE-5D931AC71333}.Debug|x64.ActiveCfg = Debug|x64
{A9ED070F-AB4D-4380-9DDE-5D931AC71333}.Debug|x64.Build.0 = Debug|x64
{A9ED070F-AB4D-4380-9DDE-5D931AC71333}.Debug|x86.ActiveCfg = Debug|x86
{A9ED070F-AB4D-4380-9DDE-5D931AC71333}.Debug|x86.Build.0 = Debug|x86
{A9ED070F-AB4D-4380-9DDE-5D931AC71333}.Release|Any CPU.ActiveCfg = Release|x64
{A9ED070F-AB4D-4380-9DDE-5D931AC71333}.Release|Any CPU.Build.0 = Release|x64
{A9ED070F-AB4D-4380-9DDE-5D931AC71333}.Release|x64.ActiveCfg = Release|x64
{A9ED070F-AB4D-4380-9DDE-5D931AC71333}.Release|x64.Build.0 = Release|x64
{A9ED070F-AB4D-4380-9DDE-5D931AC71333}.Release|x86.ActiveCfg = Release|x86
{A9ED070F-AB4D-4380-9DDE-5D931AC71333}.Release|x86.Build.0 = Release|x86
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
MtApi5Installer/Product.wxs
+4 -18
View File
@@ -14,7 +14,7 @@
<?define ProductVersion=!(bind.FileVersion.MtApi5.dll) ?> <?define ProductVersion=!(bind.FileVersion.MtApi5.dll) ?>
<?define Manufacturer="DW"?> <?define Manufacturer="DW"?>
<?define ProductPath="..\build\products\$(var.Configuration)\"?> <?define ProductPath="..\build\products\$(var.Configuration)\net8.0\"?>
<Product Id="*" <Product Id="*"
Name="$(var.ProductName) $(var.ProductVersion)" Name="$(var.ProductName) $(var.ProductVersion)"
@@ -49,9 +49,6 @@
<Directory Id="ExpertFolder" Name="Experts"> <Directory Id="ExpertFolder" Name="Experts">
</Directory> </Directory>
<Directory Id="GAC" Name="GAC">
</Directory>
</Directory> </Directory>
</Directory> </Directory>
@@ -81,14 +78,9 @@
</Component> </Component>
<Component Id="NewtonsoftJsondll" Directory="INSTALLFOLDER"> <Component Id="MtClientDll" Directory="INSTALLFOLDER">
<File Id="Newtonsoft.Json.dll" Name="Newtonsoft.Json.dll" KeyPath="yes" <File Id="MtClient.dll" Name="MtClient.dll" KeyPath="yes"
src="$(var.ProductPath)Newtonsoft.Json.dll"/> src="$(var.ProductPath)MtClient.dll"/>
</Component>
<Component Id="MTApiServiceDll" Directory="INSTALLFOLDER">
<File Id="GAC_MTApiService.dll" Name="MTApiService.dll" KeyPath="yes"
src="$(var.ProductPath)MTApiService.dll"/>
</Component> </Component>
<Component Id="MtApi5Expert" Directory="ExpertFolder"> <Component Id="MtApi5Expert" Directory="ExpertFolder">
@@ -114,12 +106,6 @@
</RegistryKey> </RegistryKey>
</Component> </Component>
<Component Id="MTApiServiceDllGAC" Guid="6CD24D64-7DA1-4015-A5B3-B17C2488998C" Directory="GAC">
<File Id="MTApiService.dll" Name="MTApiService.dll" KeyPath="yes"
src="$(var.ProductPath)MTApiService.dll" Checksum="yes"
Assembly=".net" AssemblyManifest="MTApiService.dll" Vital="yes" />
</Component>
<Component Id="MT5ConnectorDll" Directory="$(var.PlatformSystemFolder)"> <Component Id="MT5ConnectorDll" Directory="$(var.PlatformSystemFolder)">
<File Id="MT5Connector5.dll" Name="MT5Connector.dll" KeyPath="yes" <File Id="MT5Connector5.dll" Name="MT5Connector.dll" KeyPath="yes"
Source="$(var.ProductPathNative)MT5Connector.dll" /> Source="$(var.ProductPathNative)MT5Connector.dll" />