Skip to content

Commit

Permalink
Merge pull request libbitcoin#647 from evoskuil/master
Browse files Browse the repository at this point in the history
Update secp256k1 and libzmq nuget dependency versions.
  • Loading branch information
evoskuil authored Oct 29, 2019
2 parents 981bd24 + 0b0e8dd commit 91a8729
Show file tree
Hide file tree
Showing 21 changed files with 63 additions and 62 deletions.
8 changes: 4 additions & 4 deletions builds/msvc/vs2013/bx/bx.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@
<Import Project="$(NuGetPackageRoot)boost_regex-vc120.1.57.0.0\build\native\boost_regex-vc120.targets" Condition="Exists('$(NuGetPackageRoot)boost_regex-vc120.1.57.0.0\build\native\boost_regex-vc120.targets')" />
<Import Project="$(NuGetPackageRoot)boost_system-vc120.1.57.0.0\build\native\boost_system-vc120.targets" Condition="Exists('$(NuGetPackageRoot)boost_system-vc120.1.57.0.0\build\native\boost_system-vc120.targets')" />
<Import Project="$(NuGetPackageRoot)boost_thread-vc120.1.57.0.0\build\native\boost_thread-vc120.targets" Condition="Exists('$(NuGetPackageRoot)boost_thread-vc120.1.57.0.0\build\native\boost_thread-vc120.targets')" />
<Import Project="$(NuGetPackageRoot)secp256k1_vc120.0.1.0.16\build\native\secp256k1_vc120.targets" Condition="Exists('$(NuGetPackageRoot)secp256k1_vc120.0.1.0.16\build\native\secp256k1_vc120.targets')" />
<Import Project="$(NuGetPackageRoot)libzmq_vc120.4.2.30\build\native\libzmq_vc120.targets" Condition="Exists('$(NuGetPackageRoot)libzmq_vc120.4.2.30\build\native\libzmq_vc120.targets')" />
<Import Project="$(NuGetPackageRoot)secp256k1_vc120.0.1.0.17\build\native\secp256k1_vc120.targets" Condition="Exists('$(NuGetPackageRoot)secp256k1_vc120.0.1.0.17\build\native\secp256k1_vc120.targets')" />
<Import Project="$(NuGetPackageRoot)libzmq_vc120.4.3.2\build\native\libzmq_vc120.targets" Condition="Exists('$(NuGetPackageRoot)libzmq_vc120.4.3.2\build\native\libzmq_vc120.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
Expand All @@ -117,8 +117,8 @@
<Error Condition="!Exists('$(NuGetPackageRoot)boost_regex-vc120.1.57.0.0\build\native\boost_regex-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_regex-vc120.1.57.0.0\build\native\boost_regex-vc120.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_system-vc120.1.57.0.0\build\native\boost_system-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_system-vc120.1.57.0.0\build\native\boost_system-vc120.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_thread-vc120.1.57.0.0\build\native\boost_thread-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_thread-vc120.1.57.0.0\build\native\boost_thread-vc120.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)secp256k1_vc120.0.1.0.16\build\native\secp256k1_vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)secp256k1_vc120.0.1.0.16\build\native\secp256k1_vc120.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)libzmq_vc120.4.2.30\build\native\libzmq_vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)libzmq_vc120.4.2.30\build\native\libzmq_vc120.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)secp256k1_vc120.0.1.0.17\build\native\secp256k1_vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)secp256k1_vc120.0.1.0.17\build\native\secp256k1_vc120.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)libzmq_vc120.4.3.2\build\native\libzmq_vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)libzmq_vc120.4.3.2\build\native\libzmq_vc120.targets'))" />
</Target>
<ItemGroup>
<ProjectReference Include="..\libbitcoin-explorer\libbitcoin-explorer.vcxproj">
Expand Down
4 changes: 2 additions & 2 deletions builds/msvc/vs2013/bx/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
<package id="boost_regex-vc120" version="1.57.0.0" targetFramework="Native" />
<package id="boost_system-vc120" version="1.57.0.0" targetFramework="Native" />
<package id="boost_thread-vc120" version="1.57.0.0" targetFramework="Native" />
<package id="secp256k1_vc120" version="0.1.0.16" targetFramework="Native" />
<package id="libzmq_vc120" version="4.2.30" targetFramework="Native" />
<package id="secp256k1_vc120" version="0.1.0.17" targetFramework="Native" />
<package id="libzmq_vc120" version="4.3.2" targetFramework="Native" />
</packages>
Original file line number Diff line number Diff line change
Expand Up @@ -205,8 +205,8 @@
<Import Project="$(NuGetPackageRoot)boost_regex-vc120.1.57.0.0\build\native\boost_regex-vc120.targets" Condition="Exists('$(NuGetPackageRoot)boost_regex-vc120.1.57.0.0\build\native\boost_regex-vc120.targets')" />
<Import Project="$(NuGetPackageRoot)boost_system-vc120.1.57.0.0\build\native\boost_system-vc120.targets" Condition="Exists('$(NuGetPackageRoot)boost_system-vc120.1.57.0.0\build\native\boost_system-vc120.targets')" />
<Import Project="$(NuGetPackageRoot)boost_thread-vc120.1.57.0.0\build\native\boost_thread-vc120.targets" Condition="Exists('$(NuGetPackageRoot)boost_thread-vc120.1.57.0.0\build\native\boost_thread-vc120.targets')" />
<Import Project="$(NuGetPackageRoot)secp256k1_vc120.0.1.0.16\build\native\secp256k1_vc120.targets" Condition="Exists('$(NuGetPackageRoot)secp256k1_vc120.0.1.0.16\build\native\secp256k1_vc120.targets')" />
<Import Project="$(NuGetPackageRoot)libzmq_vc120.4.2.30\build\native\libzmq_vc120.targets" Condition="Exists('$(NuGetPackageRoot)libzmq_vc120.4.2.30\build\native\libzmq_vc120.targets')" />
<Import Project="$(NuGetPackageRoot)secp256k1_vc120.0.1.0.17\build\native\secp256k1_vc120.targets" Condition="Exists('$(NuGetPackageRoot)secp256k1_vc120.0.1.0.17\build\native\secp256k1_vc120.targets')" />
<Import Project="$(NuGetPackageRoot)libzmq_vc120.4.3.2\build\native\libzmq_vc120.targets" Condition="Exists('$(NuGetPackageRoot)libzmq_vc120.4.3.2\build\native\libzmq_vc120.targets')" />
<Import Project="$(NuGetPackageRoot)boost_unit_test_framework-vc120.1.57.0.0\build\native\boost_unit_test_framework-vc120.targets" Condition="Exists('$(NuGetPackageRoot)boost_unit_test_framework-vc120.1.57.0.0\build\native\boost_unit_test_framework-vc120.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
Expand All @@ -226,8 +226,8 @@
<Error Condition="!Exists('$(NuGetPackageRoot)boost_regex-vc120.1.57.0.0\build\native\boost_regex-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_regex-vc120.1.57.0.0\build\native\boost_regex-vc120.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_system-vc120.1.57.0.0\build\native\boost_system-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_system-vc120.1.57.0.0\build\native\boost_system-vc120.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_thread-vc120.1.57.0.0\build\native\boost_thread-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_thread-vc120.1.57.0.0\build\native\boost_thread-vc120.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)secp256k1_vc120.0.1.0.16\build\native\secp256k1_vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)secp256k1_vc120.0.1.0.16\build\native\secp256k1_vc120.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)libzmq_vc120.4.2.30\build\native\libzmq_vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)libzmq_vc120.4.2.30\build\native\libzmq_vc120.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)secp256k1_vc120.0.1.0.17\build\native\secp256k1_vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)secp256k1_vc120.0.1.0.17\build\native\secp256k1_vc120.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)libzmq_vc120.4.3.2\build\native\libzmq_vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)libzmq_vc120.4.3.2\build\native\libzmq_vc120.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_unit_test_framework-vc120.1.57.0.0\build\native\boost_unit_test_framework-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_unit_test_framework-vc120.1.57.0.0\build\native\boost_unit_test_framework-vc120.targets'))" />
</Target>
<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions builds/msvc/vs2013/libbitcoin-explorer-test/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<package id="boost_regex-vc120" version="1.57.0.0" targetFramework="Native" />
<package id="boost_system-vc120" version="1.57.0.0" targetFramework="Native" />
<package id="boost_thread-vc120" version="1.57.0.0" targetFramework="Native" />
<package id="secp256k1_vc120" version="0.1.0.16" targetFramework="Native" />
<package id="libzmq_vc120" version="4.2.30" targetFramework="Native" />
<package id="secp256k1_vc120" version="0.1.0.17" targetFramework="Native" />
<package id="libzmq_vc120" version="4.3.2" targetFramework="Native" />
<package id="boost_unit_test_framework-vc120" version="1.57.0.0" targetFramework="Native" />
</packages>
Original file line number Diff line number Diff line change
Expand Up @@ -370,8 +370,8 @@
<Import Project="$(NuGetPackageRoot)boost_regex-vc120.1.57.0.0\build\native\boost_regex-vc120.targets" Condition="Exists('$(NuGetPackageRoot)boost_regex-vc120.1.57.0.0\build\native\boost_regex-vc120.targets')" />
<Import Project="$(NuGetPackageRoot)boost_system-vc120.1.57.0.0\build\native\boost_system-vc120.targets" Condition="Exists('$(NuGetPackageRoot)boost_system-vc120.1.57.0.0\build\native\boost_system-vc120.targets')" />
<Import Project="$(NuGetPackageRoot)boost_thread-vc120.1.57.0.0\build\native\boost_thread-vc120.targets" Condition="Exists('$(NuGetPackageRoot)boost_thread-vc120.1.57.0.0\build\native\boost_thread-vc120.targets')" />
<Import Project="$(NuGetPackageRoot)secp256k1_vc120.0.1.0.16\build\native\secp256k1_vc120.targets" Condition="Exists('$(NuGetPackageRoot)secp256k1_vc120.0.1.0.16\build\native\secp256k1_vc120.targets')" />
<Import Project="$(NuGetPackageRoot)libzmq_vc120.4.2.30\build\native\libzmq_vc120.targets" Condition="Exists('$(NuGetPackageRoot)libzmq_vc120.4.2.30\build\native\libzmq_vc120.targets')" />
<Import Project="$(NuGetPackageRoot)secp256k1_vc120.0.1.0.17\build\native\secp256k1_vc120.targets" Condition="Exists('$(NuGetPackageRoot)secp256k1_vc120.0.1.0.17\build\native\secp256k1_vc120.targets')" />
<Import Project="$(NuGetPackageRoot)libzmq_vc120.4.3.2\build\native\libzmq_vc120.targets" Condition="Exists('$(NuGetPackageRoot)libzmq_vc120.4.3.2\build\native\libzmq_vc120.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
Expand All @@ -390,7 +390,7 @@
<Error Condition="!Exists('$(NuGetPackageRoot)boost_regex-vc120.1.57.0.0\build\native\boost_regex-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_regex-vc120.1.57.0.0\build\native\boost_regex-vc120.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_system-vc120.1.57.0.0\build\native\boost_system-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_system-vc120.1.57.0.0\build\native\boost_system-vc120.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_thread-vc120.1.57.0.0\build\native\boost_thread-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_thread-vc120.1.57.0.0\build\native\boost_thread-vc120.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)secp256k1_vc120.0.1.0.16\build\native\secp256k1_vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)secp256k1_vc120.0.1.0.16\build\native\secp256k1_vc120.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)libzmq_vc120.4.2.30\build\native\libzmq_vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)libzmq_vc120.4.2.30\build\native\libzmq_vc120.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)secp256k1_vc120.0.1.0.17\build\native\secp256k1_vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)secp256k1_vc120.0.1.0.17\build\native\secp256k1_vc120.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)libzmq_vc120.4.3.2\build\native\libzmq_vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)libzmq_vc120.4.3.2\build\native\libzmq_vc120.targets'))" />
</Target>
</Project>
4 changes: 2 additions & 2 deletions builds/msvc/vs2013/libbitcoin-explorer/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
<package id="boost_regex-vc120" version="1.57.0.0" targetFramework="Native" />
<package id="boost_system-vc120" version="1.57.0.0" targetFramework="Native" />
<package id="boost_thread-vc120" version="1.57.0.0" targetFramework="Native" />
<package id="secp256k1_vc120" version="0.1.0.16" targetFramework="Native" />
<package id="libzmq_vc120" version="4.2.30" targetFramework="Native" />
<package id="secp256k1_vc120" version="0.1.0.17" targetFramework="Native" />
<package id="libzmq_vc120" version="4.3.2" targetFramework="Native" />
</packages>
8 changes: 4 additions & 4 deletions builds/msvc/vs2015/bx/bx.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@
<Import Project="$(NuGetPackageRoot)boost_regex-vc140.1.64.0.0\build\native\boost_regex-vc140.targets" Condition="Exists('$(NuGetPackageRoot)boost_regex-vc140.1.64.0.0\build\native\boost_regex-vc140.targets')" />
<Import Project="$(NuGetPackageRoot)boost_system-vc140.1.64.0.0\build\native\boost_system-vc140.targets" Condition="Exists('$(NuGetPackageRoot)boost_system-vc140.1.64.0.0\build\native\boost_system-vc140.targets')" />
<Import Project="$(NuGetPackageRoot)boost_thread-vc140.1.64.0.0\build\native\boost_thread-vc140.targets" Condition="Exists('$(NuGetPackageRoot)boost_thread-vc140.1.64.0.0\build\native\boost_thread-vc140.targets')" />
<Import Project="$(NuGetPackageRoot)secp256k1-vc140.0.1.0.16\build\native\secp256k1-vc140.targets" Condition="Exists('$(NuGetPackageRoot)secp256k1-vc140.0.1.0.16\build\native\secp256k1-vc140.targets')" />
<Import Project="$(NuGetPackageRoot)libzmq_vc140.4.2.30\build\native\libzmq_vc140.targets" Condition="Exists('$(NuGetPackageRoot)libzmq_vc140.4.2.30\build\native\libzmq_vc140.targets')" />
<Import Project="$(NuGetPackageRoot)secp256k1-vc140.0.1.0.17\build\native\secp256k1-vc140.targets" Condition="Exists('$(NuGetPackageRoot)secp256k1-vc140.0.1.0.17\build\native\secp256k1-vc140.targets')" />
<Import Project="$(NuGetPackageRoot)libzmq_vc140.4.3.2\build\native\libzmq_vc140.targets" Condition="Exists('$(NuGetPackageRoot)libzmq_vc140.4.3.2\build\native\libzmq_vc140.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
Expand All @@ -117,8 +117,8 @@
<Error Condition="!Exists('$(NuGetPackageRoot)boost_regex-vc140.1.64.0.0\build\native\boost_regex-vc140.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_regex-vc140.1.64.0.0\build\native\boost_regex-vc140.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_system-vc140.1.64.0.0\build\native\boost_system-vc140.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_system-vc140.1.64.0.0\build\native\boost_system-vc140.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_thread-vc140.1.64.0.0\build\native\boost_thread-vc140.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_thread-vc140.1.64.0.0\build\native\boost_thread-vc140.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)secp256k1-vc140.0.1.0.16\build\native\secp256k1-vc140.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)secp256k1-vc140.0.1.0.16\build\native\secp256k1-vc140.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)libzmq_vc140.4.2.30\build\native\libzmq_vc140.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)libzmq_vc140.4.2.30\build\native\libzmq_vc140.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)secp256k1-vc140.0.1.0.17\build\native\secp256k1-vc140.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)secp256k1-vc140.0.1.0.17\build\native\secp256k1-vc140.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)libzmq_vc140.4.3.2\build\native\libzmq_vc140.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)libzmq_vc140.4.3.2\build\native\libzmq_vc140.targets'))" />
</Target>
<ItemGroup>
<ProjectReference Include="..\libbitcoin-explorer\libbitcoin-explorer.vcxproj">
Expand Down
4 changes: 2 additions & 2 deletions builds/msvc/vs2015/bx/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
<package id="boost_regex-vc140" version="1.64.0.0" targetFramework="Native" />
<package id="boost_system-vc140" version="1.64.0.0" targetFramework="Native" />
<package id="boost_thread-vc140" version="1.64.0.0" targetFramework="Native" />
<package id="secp256k1-vc140" version="0.1.0.16" targetFramework="Native" />
<package id="libzmq_vc140" version="4.2.30" targetFramework="Native" />
<package id="secp256k1-vc140" version="0.1.0.17" targetFramework="Native" />
<package id="libzmq_vc140" version="4.3.2" targetFramework="Native" />
</packages>
Loading

0 comments on commit 91a8729

Please sign in to comment.