summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorevoskuil <eric@voskuil.org>2014-12-02 08:52:44 (GMT)
committer evoskuil <eric@voskuil.org>2014-12-02 08:52:44 (GMT)
commit9a3ef16793bf613d1ad3d558c4628e97f6222767 (patch)
tree76c8e9393e3a0beb22b3a4cf8183abdb4f48bab9
parent69454e765c1a0fb0799f8981753098f07895ebe6 (diff)
Update NUGet dependencies for version1.HEADversion1master
-rw-r--r--builds/msvc/vs2013/obelisk/obelisk.props4
-rw-r--r--builds/msvc/vs2013/obelisk/obelisk.vcxproj18
-rw-r--r--builds/msvc/vs2013/obelisk/packages.config7
3 files changed, 7 insertions, 22 deletions
diff --git a/builds/msvc/vs2013/obelisk/obelisk.props b/builds/msvc/vs2013/obelisk/obelisk.props
index caa0655..38340b6 100644
--- a/builds/msvc/vs2013/obelisk/obelisk.props
+++ b/builds/msvc/vs2013/obelisk/obelisk.props
@@ -31,7 +31,6 @@
</PropertyGroup>
<PropertyGroup Condition="$(Configuration.IndexOf('DLL')) != -1">
- <Linkage-zlib>dynamic</Linkage-zlib>
<Linkage-openssl>dynamic</Linkage-openssl>
<Linkage-czmqpp>dynamic</Linkage-czmqpp>
<Linkage-czmq>dynamic</Linkage-czmq>
@@ -41,7 +40,6 @@
<Linkage-libbitcoin>dynamic</Linkage-libbitcoin>
</PropertyGroup>
<PropertyGroup Condition="$(Configuration.IndexOf('LTCG')) != -1">
- <Linkage-zlib>ltcg</Linkage-zlib>
<Linkage-openssl>ltcg</Linkage-openssl>
<Linkage-czmqpp>ltcg</Linkage-czmqpp>
<Linkage-czmq>ltcg</Linkage-czmq>
@@ -51,7 +49,6 @@
<Linkage-libbitcoin>ltcg</Linkage-libbitcoin>
</PropertyGroup>
<PropertyGroup Condition="$(Configuration.IndexOf('LIB')) != -1">
- <Linkage-zlib>static</Linkage-zlib>
<Linkage-openssl>static</Linkage-openssl>
<Linkage-czmqpp>static</Linkage-czmqpp>
<Linkage-czmq>static</Linkage-czmq>
@@ -69,7 +66,6 @@
<Message Text="Linkage-czmq : $(Linkage-czmq)" Importance="high"/>
<Message Text="Linkage-libzmq : $(Linkage-libzmq)" Importance="high"/>
<Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high"/>
- <Message Text="Linkage-zlib : $(Linkage-zlib)" Importance="high"/>
<Message Text="Linkage-openssl : $(Linkage-openssl)" Importance="high"/>
<Message Text="Linkage-libbitcoin: $(Linkage-libbitcoin)" Importance="high"/>
</Target>
diff --git a/builds/msvc/vs2013/obelisk/obelisk.vcxproj b/builds/msvc/vs2013/obelisk/obelisk.vcxproj
index 6d8f04d..c521851 100644
--- a/builds/msvc/vs2013/obelisk/obelisk.vcxproj
+++ b/builds/msvc/vs2013/obelisk/obelisk.vcxproj
@@ -57,7 +57,7 @@
</ItemGroup>
<PropertyGroup Label="Configuration">
<PlatformToolset>CTP_Nov2013</PlatformToolset>
- <NuGetPackageImportStamp>410c971f</NuGetPackageImportStamp>
+ <NuGetPackageImportStamp>8bb915d3</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -219,38 +219,30 @@
<Import Project="..\..\..\..\..\..\nuget\LevelDB.1.16.0.5\build\native\LevelDB.props" Condition="Exists('..\..\..\..\..\..\nuget\LevelDB.1.16.0.5\build\native\LevelDB.props')" />
<Import Project="..\..\..\..\..\..\nuget\Snappy.1.1.1.7\build\native\Snappy.props" Condition="Exists('..\..\..\..\..\..\nuget\Snappy.1.1.1.7\build\native\Snappy.props')" />
<Import Project="..\..\..\..\..\..\nuget\Crc32C.1.0.4\build\native\Crc32C.props" Condition="Exists('..\..\..\..\..\..\nuget\Crc32C.1.0.4\build\native\Crc32C.props')" />
- <Import Project="..\..\..\..\..\..\nuget\openssl.1.0.1.24\build\native\openssl.props" Condition="Exists('..\..\..\..\..\..\nuget\openssl.1.0.1.24\build\native\openssl.props')" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets" />
<ImportGroup Label="ExtensionSettings">
- <Import Project="..\..\..\..\..\..\nuget\boost.1.55.0.16\build\native\boost.targets" Condition="Exists('..\..\..\..\..\..\nuget\boost.1.55.0.16\build\native\boost.targets')" />
- <Import Project="..\..\..\..\..\..\nuget\openssl.redist.1.0.1.24\build\native\openssl.redist.targets" Condition="Exists('..\..\..\..\..\..\nuget\openssl.redist.1.0.1.24\build\native\openssl.redist.targets')" />
- <Import Project="..\..\..\..\..\..\nuget\openssl.1.0.1.24\build\native\openssl.targets" Condition="Exists('..\..\..\..\..\..\nuget\openssl.1.0.1.24\build\native\openssl.targets')" />
- <Import Project="..\..\..\..\..\..\nuget\zlib.redist.1.2.8.6\build\native\zlib.redist.targets" Condition="Exists('..\..\..\..\..\..\nuget\zlib.redist.1.2.8.6\build\native\zlib.redist.targets')" />
- <Import Project="..\..\..\..\..\..\nuget\zlib.1.2.8.6\build\native\zlib.targets" Condition="Exists('..\..\..\..\..\..\nuget\zlib.1.2.8.6\build\native\zlib.targets')" />
+ <Import Project="..\..\..\..\..\..\nuget\boost.1.56.0.0\build\native\boost.targets" Condition="Exists('..\..\..\..\..\..\nuget\boost.1.56.0.0\build\native\boost.targets')" />
<Import Project="..\..\..\..\..\..\nuget\libconfig_vc120.1.4.9.4\build\native\libconfig_vc120.targets" Condition="Exists('..\..\..\..\..\..\nuget\libconfig_vc120.1.4.9.4\build\native\libconfig_vc120.targets')" />
<Import Project="..\..\..\..\..\..\nuget\libzmq_vc120.4.1.0.7\build\native\libzmq_vc120.targets" Condition="Exists('..\..\..\..\..\..\nuget\libzmq_vc120.4.1.0.7\build\native\libzmq_vc120.targets')" />
<Import Project="..\..\..\..\..\..\nuget\czmq_vc120.2.2.0.8\build\native\czmq_vc120.targets" Condition="Exists('..\..\..\..\..\..\nuget\czmq_vc120.2.2.0.8\build\native\czmq_vc120.targets')" />
<Import Project="..\..\..\..\..\..\nuget\czmqpp_vc120.1.0.0.10\build\native\czmqpp_vc120.targets" Condition="Exists('..\..\..\..\..\..\nuget\czmqpp_vc120.1.0.0.10\build\native\czmqpp_vc120.targets')" />
<Import Project="..\..\..\..\..\..\nuget\libsodium_vc120.0.6.0.1\build\native\libsodium_vc120.targets" Condition="Exists('..\..\..\..\..\..\nuget\libsodium_vc120.0.6.0.1\build\native\libsodium_vc120.targets')" />
+ <Import Project="..\..\..\..\..\..\nuget\openssl_no-asm_vc120.1.0.1.800\build\native\openssl_no-asm_vc120.targets" Condition="Exists('..\..\..\..\..\..\nuget\openssl_no-asm_vc120.1.0.1.800\build\native\openssl_no-asm_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('..\..\..\..\..\..\nuget\boost.1.55.0.16\build\native\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\boost.1.55.0.16\build\native\boost.targets'))" />
- <Error Condition="!Exists('..\..\..\..\..\..\nuget\openssl.redist.1.0.1.24\build\native\openssl.redist.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\openssl.redist.1.0.1.24\build\native\openssl.redist.targets'))" />
- <Error Condition="!Exists('..\..\..\..\..\..\nuget\openssl.1.0.1.24\build\native\openssl.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\openssl.1.0.1.24\build\native\openssl.props'))" />
- <Error Condition="!Exists('..\..\..\..\..\..\nuget\openssl.1.0.1.24\build\native\openssl.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\openssl.1.0.1.24\build\native\openssl.targets'))" />
+ <Error Condition="!Exists('..\..\..\..\..\..\nuget\boost.1.56.0.0\build\native\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\boost.1.56.0.0\build\native\boost.targets'))" />
<Error Condition="!Exists('..\..\..\..\..\..\nuget\Crc32C.1.0.4\build\native\Crc32C.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\Crc32C.1.0.4\build\native\Crc32C.props'))" />
<Error Condition="!Exists('..\..\..\..\..\..\nuget\Snappy.1.1.1.7\build\native\Snappy.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\Snappy.1.1.1.7\build\native\Snappy.props'))" />
<Error Condition="!Exists('..\..\..\..\..\..\nuget\LevelDB.1.16.0.5\build\native\LevelDB.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\LevelDB.1.16.0.5\build\native\LevelDB.props'))" />
- <Error Condition="!Exists('..\..\..\..\..\..\nuget\zlib.redist.1.2.8.6\build\native\zlib.redist.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\zlib.redist.1.2.8.6\build\native\zlib.redist.targets'))" />
- <Error Condition="!Exists('..\..\..\..\..\..\nuget\zlib.1.2.8.6\build\native\zlib.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\zlib.1.2.8.6\build\native\zlib.targets'))" />
<Error Condition="!Exists('..\..\..\..\..\..\nuget\libconfig_vc120.1.4.9.4\build\native\libconfig_vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\libconfig_vc120.1.4.9.4\build\native\libconfig_vc120.targets'))" />
<Error Condition="!Exists('..\..\..\..\..\..\nuget\libzmq_vc120.4.1.0.7\build\native\libzmq_vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\libzmq_vc120.4.1.0.7\build\native\libzmq_vc120.targets'))" />
<Error Condition="!Exists('..\..\..\..\..\..\nuget\czmq_vc120.2.2.0.8\build\native\czmq_vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\czmq_vc120.2.2.0.8\build\native\czmq_vc120.targets'))" />
<Error Condition="!Exists('..\..\..\..\..\..\nuget\czmqpp_vc120.1.0.0.10\build\native\czmqpp_vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\czmqpp_vc120.1.0.0.10\build\native\czmqpp_vc120.targets'))" />
<Error Condition="!Exists('..\..\..\..\..\..\nuget\libsodium_vc120.0.6.0.1\build\native\libsodium_vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\libsodium_vc120.0.6.0.1\build\native\libsodium_vc120.targets'))" />
+ <Error Condition="!Exists('..\..\..\..\..\..\nuget\openssl_no-asm_vc120.1.0.1.800\build\native\openssl_no-asm_vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\openssl_no-asm_vc120.1.0.1.800\build\native\openssl_no-asm_vc120.targets'))" />
</Target>
</Project> \ No newline at end of file
diff --git a/builds/msvc/vs2013/obelisk/packages.config b/builds/msvc/vs2013/obelisk/packages.config
index 999c52a..dbf89ec 100644
--- a/builds/msvc/vs2013/obelisk/packages.config
+++ b/builds/msvc/vs2013/obelisk/packages.config
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="boost" version="1.55.0.16" targetFramework="Native" />
+ <package id="boost" version="1.56.0.0" targetFramework="Native" />
<package id="Crc32C" version="1.0.4" targetFramework="Native" />
<package id="czmq_vc120" version="2.2.0.8" targetFramework="Native" developmentDependency="true" />
<package id="czmqpp_vc120" version="1.0.0.10" targetFramework="Native" developmentDependency="true" />
@@ -8,9 +8,6 @@
<package id="libconfig_vc120" version="1.4.9.4" targetFramework="Native" developmentDependency="true" />
<package id="libsodium_vc120" version="0.6.0.1" targetFramework="Native" developmentDependency="true" />
<package id="libzmq_vc120" version="4.1.0.7" targetFramework="Native" developmentDependency="true" />
- <package id="openssl" version="1.0.1.24" targetFramework="Native" />
- <package id="openssl.redist" version="1.0.1.24" targetFramework="Native" />
+ <package id="openssl_no-asm_vc120" version="1.0.1.800" targetFramework="Native" />
<package id="Snappy" version="1.1.1.7" targetFramework="Native" />
- <package id="zlib" version="1.2.8.6" targetFramework="Native" />
- <package id="zlib.redist" version="1.2.8.6" targetFramework="Native" />
</packages> \ No newline at end of file