Merge be0980e into 52258bf

libbitcoin · Jun 7, 2018 · 9f430e6 · 9f430e6
2 parents 52258bf + be0980e
commit 9f430e6
Show file tree

Hide file tree

Showing 17 changed files with 492 additions and 258 deletions.
diff --git a/builds/msvc/vs2013/libbitcoin-examples/libbitcoin-examples.vcxproj b/builds/msvc/vs2013/libbitcoin-examples/libbitcoin-examples.vcxproj
@@ -84,38 +84,38 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="$(NuGetPackageRoot)boost.1.57.0.0\build\native\boost.targets" Condition="Exists('$(NuGetPackageRoot)boost.1.57.0.0\build\native\boost.targets')" />
-    <Import Project="$(NuGetPackageRoot)boost_atomic-vc120.1.57.0.0\build\native\boost_atomic-vc120.targets" Condition="Exists('$(NuGetPackageRoot)boost_atomic-vc120.1.57.0.0\build\native\boost_atomic-vc120.targets')" />
-    <Import Project="$(NuGetPackageRoot)boost_chrono-vc120.1.57.0.0\build\native\boost_chrono-vc120.targets" Condition="Exists('$(NuGetPackageRoot)boost_chrono-vc120.1.57.0.0\build\native\boost_chrono-vc120.targets')" />
-    <Import Project="$(NuGetPackageRoot)boost_date_time-vc120.1.57.0.0\build\native\boost_date_time-vc120.targets" Condition="Exists('$(NuGetPackageRoot)boost_date_time-vc120.1.57.0.0\build\native\boost_date_time-vc120.targets')" />
-    <Import Project="$(NuGetPackageRoot)boost_filesystem-vc120.1.57.0.0\build\native\boost_filesystem-vc120.targets" Condition="Exists('$(NuGetPackageRoot)boost_filesystem-vc120.1.57.0.0\build\native\boost_filesystem-vc120.targets')" />
-    <Import Project="$(NuGetPackageRoot)boost_iostreams-vc120.1.57.0.0\build\native\boost_iostreams-vc120.targets" Condition="Exists('$(NuGetPackageRoot)boost_iostreams-vc120.1.57.0.0\build\native\boost_iostreams-vc120.targets')" />
-    <Import Project="$(NuGetPackageRoot)boost_locale-vc120.1.57.0.0\build\native\boost_locale-vc120.targets" Condition="Exists('$(NuGetPackageRoot)boost_locale-vc120.1.57.0.0\build\native\boost_locale-vc120.targets')" />
-    <Import Project="$(NuGetPackageRoot)boost_log_setup-vc120.1.57.0.0\build\native\boost_log_setup-vc120.targets" Condition="Exists('$(NuGetPackageRoot)boost_log_setup-vc120.1.57.0.0\build\native\boost_log_setup-vc120.targets')" />
-    <Import Project="$(NuGetPackageRoot)boost_log-vc120.1.57.0.0\build\native\boost_log-vc120.targets" Condition="Exists('$(NuGetPackageRoot)boost_log-vc120.1.57.0.0\build\native\boost_log-vc120.targets')" />
-    <Import Project="$(NuGetPackageRoot)boost_program_options-vc120.1.57.0.0\build\native\boost_program_options-vc120.targets" Condition="Exists('$(NuGetPackageRoot)boost_program_options-vc120.1.57.0.0\build\native\boost_program_options-vc120.targets')" />
-    <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)boost.1.62.0.0\build\native\boost.targets" Condition="Exists('$(NuGetPackageRoot)boost.1.62.0.0\build\native\boost.targets')" />
+    <Import Project="$(NuGetPackageRoot)boost_atomic-vc120.1.62.0.0\build\native\boost_atomic-vc120.targets" Condition="Exists('$(NuGetPackageRoot)boost_atomic-vc120.1.62.0.0\build\native\boost_atomic-vc120.targets')" />
+    <Import Project="$(NuGetPackageRoot)boost_chrono-vc120.1.62.0.0\build\native\boost_chrono-vc120.targets" Condition="Exists('$(NuGetPackageRoot)boost_chrono-vc120.1.62.0.0\build\native\boost_chrono-vc120.targets')" />
+    <Import Project="$(NuGetPackageRoot)boost_date_time-vc120.1.62.0.0\build\native\boost_date_time-vc120.targets" Condition="Exists('$(NuGetPackageRoot)boost_date_time-vc120.1.62.0.0\build\native\boost_date_time-vc120.targets')" />
+    <Import Project="$(NuGetPackageRoot)boost_filesystem-vc120.1.62.0.0\build\native\boost_filesystem-vc120.targets" Condition="Exists('$(NuGetPackageRoot)boost_filesystem-vc120.1.62.0.0\build\native\boost_filesystem-vc120.targets')" />
+    <Import Project="$(NuGetPackageRoot)boost_iostreams-vc120.1.62.0.0\build\native\boost_iostreams-vc120.targets" Condition="Exists('$(NuGetPackageRoot)boost_iostreams-vc120.1.62.0.0\build\native\boost_iostreams-vc120.targets')" />
+    <Import Project="$(NuGetPackageRoot)boost_locale-vc120.1.62.0.0\build\native\boost_locale-vc120.targets" Condition="Exists('$(NuGetPackageRoot)boost_locale-vc120.1.62.0.0\build\native\boost_locale-vc120.targets')" />
+    <Import Project="$(NuGetPackageRoot)boost_log_setup-vc120.1.62.0.0\build\native\boost_log_setup-vc120.targets" Condition="Exists('$(NuGetPackageRoot)boost_log_setup-vc120.1.62.0.0\build\native\boost_log_setup-vc120.targets')" />
+    <Import Project="$(NuGetPackageRoot)boost_log-vc120.1.62.0.0\build\native\boost_log-vc120.targets" Condition="Exists('$(NuGetPackageRoot)boost_log-vc120.1.62.0.0\build\native\boost_log-vc120.targets')" />
+    <Import Project="$(NuGetPackageRoot)boost_program_options-vc120.1.62.0.0\build\native\boost_program_options-vc120.targets" Condition="Exists('$(NuGetPackageRoot)boost_program_options-vc120.1.62.0.0\build\native\boost_program_options-vc120.targets')" />
+    <Import Project="$(NuGetPackageRoot)boost_regex-vc120.1.62.0.0\build\native\boost_regex-vc120.targets" Condition="Exists('$(NuGetPackageRoot)boost_regex-vc120.1.62.0.0\build\native\boost_regex-vc120.targets')" />
+    <Import Project="$(NuGetPackageRoot)boost_system-vc120.1.62.0.0\build\native\boost_system-vc120.targets" Condition="Exists('$(NuGetPackageRoot)boost_system-vc120.1.62.0.0\build\native\boost_system-vc120.targets')" />
+    <Import Project="$(NuGetPackageRoot)boost_thread-vc120.1.62.0.0\build\native\boost_thread-vc120.targets" Condition="Exists('$(NuGetPackageRoot)boost_thread-vc120.1.62.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')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('$(NuGetPackageRoot)boost.1.57.0.0\build\native\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost.1.57.0.0\build\native\boost.targets'))" />
-    <Error Condition="!Exists('$(NuGetPackageRoot)boost_atomic-vc120.1.57.0.0\build\native\boost_atomic-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_atomic-vc120.1.57.0.0\build\native\boost_atomic-vc120.targets'))" />
-    <Error Condition="!Exists('$(NuGetPackageRoot)boost_chrono-vc120.1.57.0.0\build\native\boost_chrono-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_chrono-vc120.1.57.0.0\build\native\boost_chrono-vc120.targets'))" />
-    <Error Condition="!Exists('$(NuGetPackageRoot)boost_date_time-vc120.1.57.0.0\build\native\boost_date_time-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_date_time-vc120.1.57.0.0\build\native\boost_date_time-vc120.targets'))" />
-    <Error Condition="!Exists('$(NuGetPackageRoot)boost_filesystem-vc120.1.57.0.0\build\native\boost_filesystem-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_filesystem-vc120.1.57.0.0\build\native\boost_filesystem-vc120.targets'))" />
-    <Error Condition="!Exists('$(NuGetPackageRoot)boost_iostreams-vc120.1.57.0.0\build\native\boost_iostreams-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_iostreams-vc120.1.57.0.0\build\native\boost_iostreams-vc120.targets'))" />
-    <Error Condition="!Exists('$(NuGetPackageRoot)boost_locale-vc120.1.57.0.0\build\native\boost_locale-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_locale-vc120.1.57.0.0\build\native\boost_locale-vc120.targets'))" />
-    <Error Condition="!Exists('$(NuGetPackageRoot)boost_log_setup-vc120.1.57.0.0\build\native\boost_log_setup-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_log_setup-vc120.1.57.0.0\build\native\boost_log_setup-vc120.targets'))" />
-    <Error Condition="!Exists('$(NuGetPackageRoot)boost_log-vc120.1.57.0.0\build\native\boost_log-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_log-vc120.1.57.0.0\build\native\boost_log-vc120.targets'))" />
-    <Error Condition="!Exists('$(NuGetPackageRoot)boost_program_options-vc120.1.57.0.0\build\native\boost_program_options-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_program_options-vc120.1.57.0.0\build\native\boost_program_options-vc120.targets'))" />
-    <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)boost.1.62.0.0\build\native\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost.1.62.0.0\build\native\boost.targets'))" />
+    <Error Condition="!Exists('$(NuGetPackageRoot)boost_atomic-vc120.1.62.0.0\build\native\boost_atomic-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_atomic-vc120.1.62.0.0\build\native\boost_atomic-vc120.targets'))" />
+    <Error Condition="!Exists('$(NuGetPackageRoot)boost_chrono-vc120.1.62.0.0\build\native\boost_chrono-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_chrono-vc120.1.62.0.0\build\native\boost_chrono-vc120.targets'))" />
+    <Error Condition="!Exists('$(NuGetPackageRoot)boost_date_time-vc120.1.62.0.0\build\native\boost_date_time-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_date_time-vc120.1.62.0.0\build\native\boost_date_time-vc120.targets'))" />
+    <Error Condition="!Exists('$(NuGetPackageRoot)boost_filesystem-vc120.1.62.0.0\build\native\boost_filesystem-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_filesystem-vc120.1.62.0.0\build\native\boost_filesystem-vc120.targets'))" />
+    <Error Condition="!Exists('$(NuGetPackageRoot)boost_iostreams-vc120.1.62.0.0\build\native\boost_iostreams-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_iostreams-vc120.1.62.0.0\build\native\boost_iostreams-vc120.targets'))" />
+    <Error Condition="!Exists('$(NuGetPackageRoot)boost_locale-vc120.1.62.0.0\build\native\boost_locale-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_locale-vc120.1.62.0.0\build\native\boost_locale-vc120.targets'))" />
+    <Error Condition="!Exists('$(NuGetPackageRoot)boost_log_setup-vc120.1.62.0.0\build\native\boost_log_setup-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_log_setup-vc120.1.62.0.0\build\native\boost_log_setup-vc120.targets'))" />
+    <Error Condition="!Exists('$(NuGetPackageRoot)boost_log-vc120.1.62.0.0\build\native\boost_log-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_log-vc120.1.62.0.0\build\native\boost_log-vc120.targets'))" />
+    <Error Condition="!Exists('$(NuGetPackageRoot)boost_program_options-vc120.1.62.0.0\build\native\boost_program_options-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_program_options-vc120.1.62.0.0\build\native\boost_program_options-vc120.targets'))" />
+    <Error Condition="!Exists('$(NuGetPackageRoot)boost_regex-vc120.1.62.0.0\build\native\boost_regex-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_regex-vc120.1.62.0.0\build\native\boost_regex-vc120.targets'))" />
+    <Error Condition="!Exists('$(NuGetPackageRoot)boost_system-vc120.1.62.0.0\build\native\boost_system-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_system-vc120.1.62.0.0\build\native\boost_system-vc120.targets'))" />
+    <Error Condition="!Exists('$(NuGetPackageRoot)boost_thread-vc120.1.62.0.0\build\native\boost_thread-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_thread-vc120.1.62.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'))" />
   </Target>
   <ItemGroup>

diff --git a/builds/msvc/vs2013/libbitcoin-examples/libbitcoin-examples.vcxproj.filters b/builds/msvc/vs2013/libbitcoin-examples/libbitcoin-examples.vcxproj.filters
@@ -8,11 +8,17 @@
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="resource">
-      <UniqueIdentifier>{B726DF7D-6D1D-48FB-0000-000000000001}</UniqueIdentifier>
+      <UniqueIdentifier>{B726DF7D-6D1D-48FB-0000-000000000003}</UniqueIdentifier>
     </Filter>
     <Filter Include="src">
       <UniqueIdentifier>{B726DF7D-6D1D-48FB-0000-000000000000}</UniqueIdentifier>
     </Filter>
+    <Filter Include="src\.deps">
+      <UniqueIdentifier>{B726DF7D-6D1D-48FB-0000-000000000001}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\.libs">
+      <UniqueIdentifier>{B726DF7D-6D1D-48FB-0000-000000000002}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\..\examples\main.cpp">

diff --git a/builds/msvc/vs2013/libbitcoin-examples/packages.config b/builds/msvc/vs2013/libbitcoin-examples/packages.config
@@ -6,18 +6,18 @@
  |
  -->
 <packages>
-  <package id="boost" version="1.57.0.0" targetFramework="Native" />
-  <package id="boost_atomic-vc120" version="1.57.0.0" targetFramework="Native" />
-  <package id="boost_chrono-vc120" version="1.57.0.0" targetFramework="Native" />
-  <package id="boost_date_time-vc120" version="1.57.0.0" targetFramework="Native" />
-  <package id="boost_filesystem-vc120" version="1.57.0.0" targetFramework="Native" />
-  <package id="boost_iostreams-vc120" version="1.57.0.0" targetFramework="Native" />
-  <package id="boost_locale-vc120" version="1.57.0.0" targetFramework="Native" />
-  <package id="boost_log_setup-vc120" version="1.57.0.0" targetFramework="Native" />
-  <package id="boost_log-vc120" version="1.57.0.0" targetFramework="Native" />
-  <package id="boost_program_options-vc120" version="1.57.0.0" targetFramework="Native" />
-  <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="boost" version="1.62.0.0" targetFramework="Native" />
+  <package id="boost_atomic-vc120" version="1.62.0.0" targetFramework="Native" />
+  <package id="boost_chrono-vc120" version="1.62.0.0" targetFramework="Native" />
+  <package id="boost_date_time-vc120" version="1.62.0.0" targetFramework="Native" />
+  <package id="boost_filesystem-vc120" version="1.62.0.0" targetFramework="Native" />
+  <package id="boost_iostreams-vc120" version="1.62.0.0" targetFramework="Native" />
+  <package id="boost_locale-vc120" version="1.62.0.0" targetFramework="Native" />
+  <package id="boost_log_setup-vc120" version="1.62.0.0" targetFramework="Native" />
+  <package id="boost_log-vc120" version="1.62.0.0" targetFramework="Native" />
+  <package id="boost_program_options-vc120" version="1.62.0.0" targetFramework="Native" />
+  <package id="boost_regex-vc120" version="1.62.0.0" targetFramework="Native" />
+  <package id="boost_system-vc120" version="1.62.0.0" targetFramework="Native" />
+  <package id="boost_thread-vc120" version="1.62.0.0" targetFramework="Native" />
   <package id="secp256k1_vc120" version="0.1.0.16" targetFramework="Native" />
 </packages>