Skip to content

Commit b9f75fc

Browse files
evoskuilevoskuil
authored
Merge pull request #833 from evoskuil/master
Bump ultrafast NuGet to 4.5.0.0
2 parents 868be31 + 61855a1 commit b9f75fc

13 files changed

Lines changed: 10 additions & 34 deletions

File tree

‎builds/gnu/test_runner.sh‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,7 @@
88

99
# Define tests and options.
1010
#==============================================================================
11-
BOOST_UNIT_TEST_OPTIONS=\
12-
"--log_level=warning "\
13-
"--show_progress=no "\
14-
"--detect_memory_leak=0 "\
15-
"--report_level=no "\
16-
"--build-info=yes "\
17-
"--run_tests=*"
11+
BOOST_UNIT_TEST_OPTIONS="--log_level=warning --show_progress=no --detect_memory_leak=0 --report_level=no --build_info=yes --run_test=*"
1812

1913
# Run tests.
2014
#==============================================================================

‎builds/msvc/vs2022/bs/bs.props‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,6 @@
5757
<Linkage-libbitcoin-node>static</Linkage-libbitcoin-node>
5858
<Linkage-libbitcoin-server>static</Linkage-libbitcoin-server>
5959
</PropertyGroup>
60-
<PropertyGroup Condition="'$(Option-ultrafast)' == 'true' And '$(Option-cuda)' == 'true'">
61-
<Linkage-ultrafast>cuda</Linkage-ultrafast>
62-
</PropertyGroup>
6360

6461
<!-- Messages -->
6562

‎builds/msvc/vs2022/libbitcoin-server-test/libbitcoin-server-test.props‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,6 @@
5959
<Linkage-libbitcoin-node>static</Linkage-libbitcoin-node>
6060
<Linkage-libbitcoin-server>static</Linkage-libbitcoin-server>
6161
</PropertyGroup>
62-
<PropertyGroup Condition="'$(Option-ultrafast)' == 'true' And '$(Option-cuda)' == 'true'">
63-
<Linkage-ultrafast>cuda</Linkage-ultrafast>
64-
</PropertyGroup>
6562

6663
<!-- Messages -->
6764

‎builds/msvc/vs2022/libbitcoin-server/libbitcoin-server.props‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,6 @@
6161
<Linkage-libbitcoin-network>static</Linkage-libbitcoin-network>
6262
<Linkage-libbitcoin-node>static</Linkage-libbitcoin-node>
6363
</PropertyGroup>
64-
<PropertyGroup Condition="'$(Option-ultrafast)' == 'true' And '$(Option-cuda)' == 'true'">
65-
<Linkage-ultrafast>cuda</Linkage-ultrafast>
66-
</PropertyGroup>
6764

6865
<!-- Messages -->
6966

‎builds/msvc/vs2026/bs/bs.props‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,6 @@
5757
<Linkage-libbitcoin-node>static</Linkage-libbitcoin-node>
5858
<Linkage-libbitcoin-server>static</Linkage-libbitcoin-server>
5959
</PropertyGroup>
60-
<PropertyGroup Condition="'$(Option-ultrafast)' == 'true' And '$(Option-cuda)' == 'true'">
61-
<Linkage-ultrafast>cuda</Linkage-ultrafast>
62-
</PropertyGroup>
6360

6461
<!-- Messages -->
6562

‎builds/msvc/vs2026/bs/bs.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@
171171
<Import Project="$(NuGetPackageRoot)libbitcoin-boost_thread-vc145.1.91.0\build\libbitcoin-boost_thread-vc145.targets" Condition="Exists('$(NuGetPackageRoot)libbitcoin-boost_thread-vc145.1.91.0\build\libbitcoin-boost_thread-vc145.targets')" />
172172
<Import Project="$(NuGetPackageRoot)libbitcoin-boost_url-vc145.1.91.0\build\libbitcoin-boost_url-vc145.targets" Condition="Exists('$(NuGetPackageRoot)libbitcoin-boost_url-vc145.1.91.0\build\libbitcoin-boost_url-vc145.targets')" />
173173
<Import Project="$(NuGetPackageRoot)secp256k1_vc145.0.6.1.2\build\native\secp256k1_vc145.targets" Condition="Exists('$(NuGetPackageRoot)secp256k1_vc145.0.6.1.2\build\native\secp256k1_vc145.targets')" />
174-
<Import Project="$(NuGetPackageRoot)UltrafastSecp256k1-vc145.4.4.0.4\build\native\UltrafastSecp256k1-vc145.targets" Condition="Exists('$(NuGetPackageRoot)UltrafastSecp256k1-vc145.4.4.0.4\build\native\UltrafastSecp256k1-vc145.targets')" />
174+
<Import Project="$(NuGetPackageRoot)UltrafastSecp256k1-vc145.4.5.0.0\build\native\UltrafastSecp256k1-vc145.targets" Condition="Exists('$(NuGetPackageRoot)UltrafastSecp256k1-vc145.4.5.0.0\build\native\UltrafastSecp256k1-vc145.targets')" />
175175
</ImportGroup>
176176
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
177177
<PropertyGroup>
@@ -186,7 +186,7 @@
186186
<Error Condition="!Exists('$(NuGetPackageRoot)libbitcoin-boost_thread-vc145.1.91.0\build\libbitcoin-boost_thread-vc145.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)libbitcoin-boost_thread-vc145.1.91.0\build\libbitcoin-boost_thread-vc145.targets'))" />
187187
<Error Condition="!Exists('$(NuGetPackageRoot)libbitcoin-boost_url-vc145.1.91.0\build\libbitcoin-boost_url-vc145.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)libbitcoin-boost_url-vc145.1.91.0\build\libbitcoin-boost_url-vc145.targets'))" />
188188
<Error Condition="!Exists('$(NuGetPackageRoot)secp256k1_vc145.0.6.1.2\build\native\secp256k1_vc145.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)secp256k1_vc145.0.6.1.2\build\native\secp256k1_vc145.targets'))" />
189-
<Error Condition="!Exists('$(NuGetPackageRoot)UltrafastSecp256k1-vc145.4.4.0.4\build\native\UltrafastSecp256k1-vc145.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)UltrafastSecp256k1-vc145.4.4.0.4\build\native\UltrafastSecp256k1-vc145.targets'))" />
189+
<Error Condition="!Exists('$(NuGetPackageRoot)UltrafastSecp256k1-vc145.4.5.0.0\build\native\UltrafastSecp256k1-vc145.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)UltrafastSecp256k1-vc145.4.5.0.0\build\native\UltrafastSecp256k1-vc145.targets'))" />
190190
</Target>
191191
<ItemGroup>
192192
<ProjectReference Include="..\libbitcoin-server\libbitcoin-server.vcxproj">

‎builds/msvc/vs2026/bs/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
|
77
-->
88
<packages>
9-
<package id="UltrafastSecp256k1-vc145" version="4.4.0.4" targetFramework="Native" />
9+
<package id="UltrafastSecp256k1-vc145" version="4.5.0.0" targetFramework="Native" />
1010
<package id="libbitcoin-boost" version="1.91.0" targetFramework="Native" />
1111
<package id="libbitcoin-boost_container-vc145" version="1.91.0" targetFramework="Native" />
1212
<package id="libbitcoin-boost_iostreams-vc145" version="1.91.0" targetFramework="Native" />

‎builds/msvc/vs2026/libbitcoin-server-test/libbitcoin-server-test.props‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,6 @@
5959
<Linkage-libbitcoin-node>static</Linkage-libbitcoin-node>
6060
<Linkage-libbitcoin-server>static</Linkage-libbitcoin-server>
6161
</PropertyGroup>
62-
<PropertyGroup Condition="'$(Option-ultrafast)' == 'true' And '$(Option-cuda)' == 'true'">
63-
<Linkage-ultrafast>cuda</Linkage-ultrafast>
64-
</PropertyGroup>
6562

6663
<!-- Messages -->
6764

‎builds/msvc/vs2026/libbitcoin-server-test/libbitcoin-server-test.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@
187187
<Import Project="$(NuGetPackageRoot)libbitcoin-boost_unit_test_framework-vc145.1.91.0\build\libbitcoin-boost_unit_test_framework-vc145.targets" Condition="Exists('$(NuGetPackageRoot)libbitcoin-boost_unit_test_framework-vc145.1.91.0\build\libbitcoin-boost_unit_test_framework-vc145.targets')" />
188188
<Import Project="$(NuGetPackageRoot)libbitcoin-boost_url-vc145.1.91.0\build\libbitcoin-boost_url-vc145.targets" Condition="Exists('$(NuGetPackageRoot)libbitcoin-boost_url-vc145.1.91.0\build\libbitcoin-boost_url-vc145.targets')" />
189189
<Import Project="$(NuGetPackageRoot)secp256k1_vc145.0.6.1.2\build\native\secp256k1_vc145.targets" Condition="Exists('$(NuGetPackageRoot)secp256k1_vc145.0.6.1.2\build\native\secp256k1_vc145.targets')" />
190-
<Import Project="$(NuGetPackageRoot)UltrafastSecp256k1-vc145.4.4.0.4\build\native\UltrafastSecp256k1-vc145.targets" Condition="Exists('$(NuGetPackageRoot)UltrafastSecp256k1-vc145.4.4.0.4\build\native\UltrafastSecp256k1-vc145.targets')" />
190+
<Import Project="$(NuGetPackageRoot)UltrafastSecp256k1-vc145.4.5.0.0\build\native\UltrafastSecp256k1-vc145.targets" Condition="Exists('$(NuGetPackageRoot)UltrafastSecp256k1-vc145.4.5.0.0\build\native\UltrafastSecp256k1-vc145.targets')" />
191191
</ImportGroup>
192192
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
193193
<PropertyGroup>
@@ -203,7 +203,7 @@
203203
<Error Condition="!Exists('$(NuGetPackageRoot)libbitcoin-boost_unit_test_framework-vc145.1.91.0\build\libbitcoin-boost_unit_test_framework-vc145.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)libbitcoin-boost_unit_test_framework-vc145.1.91.0\build\libbitcoin-boost_unit_test_framework-vc145.targets'))" />
204204
<Error Condition="!Exists('$(NuGetPackageRoot)libbitcoin-boost_url-vc145.1.91.0\build\libbitcoin-boost_url-vc145.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)libbitcoin-boost_url-vc145.1.91.0\build\libbitcoin-boost_url-vc145.targets'))" />
205205
<Error Condition="!Exists('$(NuGetPackageRoot)secp256k1_vc145.0.6.1.2\build\native\secp256k1_vc145.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)secp256k1_vc145.0.6.1.2\build\native\secp256k1_vc145.targets'))" />
206-
<Error Condition="!Exists('$(NuGetPackageRoot)UltrafastSecp256k1-vc145.4.4.0.4\build\native\UltrafastSecp256k1-vc145.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)UltrafastSecp256k1-vc145.4.4.0.4\build\native\UltrafastSecp256k1-vc145.targets'))" />
206+
<Error Condition="!Exists('$(NuGetPackageRoot)UltrafastSecp256k1-vc145.4.5.0.0\build\native\UltrafastSecp256k1-vc145.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)UltrafastSecp256k1-vc145.4.5.0.0\build\native\UltrafastSecp256k1-vc145.targets'))" />
207207
</Target>
208208
<ItemGroup>
209209
<ProjectReference Include="..\libbitcoin-server\libbitcoin-server.vcxproj">

‎builds/msvc/vs2026/libbitcoin-server-test/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
|
77
-->
88
<packages>
9-
<package id="UltrafastSecp256k1-vc145" version="4.4.0.4" targetFramework="Native" />
9+
<package id="UltrafastSecp256k1-vc145" version="4.5.0.0" targetFramework="Native" />
1010
<package id="libbitcoin-boost" version="1.91.0" targetFramework="Native" />
1111
<package id="libbitcoin-boost_container-vc145" version="1.91.0" targetFramework="Native" />
1212
<package id="libbitcoin-boost_iostreams-vc145" version="1.91.0" targetFramework="Native" />

0 commit comments

Comments
 (0)