gavindiaz/mtapi
1
0
Fork 0
mirror of https://github.com/vdemydiuk/mtapi.git synced 2026-08-20 22:28:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed issue #7: Added Newtonsoft.Json.dll into installer

Browse Source
This commit is contained in:
DW
2016-05-16 15:15:21 +03:00
parent 23db4631f1
commit d01a899aae
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MtApiInstaller/Product.wxs
+6 -2
View File
@@ -72,12 +72,16 @@
Action="createAndRemoveOnUninstall"> Action="createAndRemoveOnUninstall">
<RegistryValue Type="string" Value="[INSTALLFOLDER]"/> <RegistryValue Type="string" Value="[INSTALLFOLDER]"/>
</RegistryKey> </RegistryKey>
</Component> </Component>
<Component Id="MTApiServiceDll" Directory="INSTALLFOLDER"> <!--<Component Id="MTApiServiceDll" Directory="INSTALLFOLDER">
<File Id="GAC_MTApiService.dll" Name="MTApiService.dll" KeyPath="yes" <File Id="GAC_MTApiService.dll" Name="MTApiService.dll" KeyPath="yes"
src="$(var.ProductPath)MTApiService.dll"/> 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>
<Component Id="MtApiExpert" Directory="ExpertFolder"> <Component Id="MtApiExpert" Directory="ExpertFolder">
TestClients/TestApiClientUI/TestApiClientUI.csproj
+8 -6
View File
@@ -86,6 +86,14 @@
<Prefer32Bit>false</Prefer32Bit> <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <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" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" /> <Reference Include="System.Xml.Linq" />
@@ -152,12 +160,6 @@
<Install>true</Install> <Install>true</Install>
</BootstrapperPackage> </BootstrapperPackage>
</ItemGroup> </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" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- 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. Other similar extension points exist, see Microsoft.Common.targets.