Merge pull request #1054 from evoskuil/master

Minor updates to VS build configuration and NuGet packaging.

builds/msvc/resource.rc

 // Microsoft Visual C++ generated resource script.

builds/msvc/vs2010/inproc_lat/inproc_lat.props

@@ -24,11 +24,19 @@
     <Import Project="$(SolutionDir)libzmq.import.props" />
     <Import Project="$(SolutionDir)libsodium.import.props" />
   </ImportGroup>
-
-  <PropertyGroup>
-    <Linkage-libzmq>$(DefaultLinkage)</Linkage-libzmq>
-    <Linkage-libsodium>$(DefaultLinkage)</Linkage-libsodium>
+  
+  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
+    <Linkage-libzmq>dynamic</Linkage-libzmq>
+    <Linkage-libsodium>dynamic</Linkage-libsodium>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
+    <Linkage-libzmq>ltcg</Linkage-libzmq>
+    <Linkage-libsodium>ltcg</Linkage-libsodium>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
+    <Linkage-libzmq>static</Linkage-libzmq>
+    <Linkage-libsodium>static</Linkage-libsodium>
+  </PropertyGroup>  
 
   <!-- Messages -->
 

builds/msvc/vs2010/inproc_thr/inproc_thr.props

@@ -25,10 +25,18 @@
     <Import Project="$(SolutionDir)libsodium.import.props" />
   </ImportGroup>
 
-  <PropertyGroup>
-    <Linkage-libzmq>$(DefaultLinkage)</Linkage-libzmq>
-    <Linkage-libsodium>$(DefaultLinkage)</Linkage-libsodium>
+  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
+    <Linkage-libzmq>dynamic</Linkage-libzmq>
+    <Linkage-libsodium>dynamic</Linkage-libsodium>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
+    <Linkage-libzmq>ltcg</Linkage-libzmq>
+    <Linkage-libsodium>ltcg</Linkage-libsodium>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
+    <Linkage-libzmq>static</Linkage-libzmq>
+    <Linkage-libsodium>static</Linkage-libsodium>
+  </PropertyGroup>  
 
   <!-- Messages -->
 

builds/msvc/vs2010/libzmq/libzmq.props

@@ -47,8 +47,14 @@
     <Import Project="$(SolutionDir)libsodium.import.props" />
   </ImportGroup>
   
-  <PropertyGroup>
-    <Linkage-libsodium>$(DefaultLinkage)</Linkage-libsodium>
+  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
+    <Linkage-libsodium>dynamic</Linkage-libsodium>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
+    <Linkage-libsodium>ltcg</Linkage-libsodium>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
+    <Linkage-libsodium>static</Linkage-libsodium>
   </PropertyGroup>
 
   <!-- Messages -->

builds/msvc/vs2010/local_lat/local_lat.props

@@ -25,10 +25,18 @@
     <Import Project="$(SolutionDir)libsodium.import.props" />
   </ImportGroup>
 
-  <PropertyGroup>
-    <Linkage-libzmq>$(DefaultLinkage)</Linkage-libzmq>
-    <Linkage-libsodium>$(DefaultLinkage)</Linkage-libsodium>
+  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
+    <Linkage-libzmq>dynamic</Linkage-libzmq>
+    <Linkage-libsodium>dynamic</Linkage-libsodium>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
+    <Linkage-libzmq>ltcg</Linkage-libzmq>
+    <Linkage-libsodium>ltcg</Linkage-libsodium>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
+    <Linkage-libzmq>static</Linkage-libzmq>
+    <Linkage-libsodium>static</Linkage-libsodium>
+  </PropertyGroup>  
 
   <!-- Messages -->
 

builds/msvc/vs2010/local_thr/local_thr.props

@@ -25,10 +25,18 @@
     <Import Project="$(SolutionDir)libsodium.import.props" />
   </ImportGroup>
 
-  <PropertyGroup>
-    <Linkage-libzmq>$(DefaultLinkage)</Linkage-libzmq>
-    <Linkage-libsodium>$(DefaultLinkage)</Linkage-libsodium>
+  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
+    <Linkage-libzmq>dynamic</Linkage-libzmq>
+    <Linkage-libsodium>dynamic</Linkage-libsodium>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
+    <Linkage-libzmq>ltcg</Linkage-libzmq>
+    <Linkage-libsodium>ltcg</Linkage-libsodium>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
+    <Linkage-libzmq>static</Linkage-libzmq>
+    <Linkage-libsodium>static</Linkage-libsodium>
+  </PropertyGroup>  
 
   <!-- Messages -->
 

builds/msvc/vs2010/remote_lat/remote_lat.props

@@ -25,10 +25,18 @@
     <Import Project="$(SolutionDir)libsodium.import.props" />
   </ImportGroup>
 
-  <PropertyGroup>
-    <Linkage-libzmq>$(DefaultLinkage)</Linkage-libzmq>
-    <Linkage-libsodium>$(DefaultLinkage)</Linkage-libsodium>
+  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
+    <Linkage-libzmq>dynamic</Linkage-libzmq>
+    <Linkage-libsodium>dynamic</Linkage-libsodium>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
+    <Linkage-libzmq>ltcg</Linkage-libzmq>
+    <Linkage-libsodium>ltcg</Linkage-libsodium>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
+    <Linkage-libzmq>static</Linkage-libzmq>
+    <Linkage-libsodium>static</Linkage-libsodium>
+  </PropertyGroup>  
 
   <!-- Messages -->
 

builds/msvc/vs2010/remote_thr/remote_thr.props

@@ -25,10 +25,18 @@
     <Import Project="$(SolutionDir)libsodium.import.props" />
   </ImportGroup>
 
-  <PropertyGroup>
-    <Linkage-libzmq>$(DefaultLinkage)</Linkage-libzmq>
-    <Linkage-libsodium>$(DefaultLinkage)</Linkage-libsodium>
+  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
+    <Linkage-libzmq>dynamic</Linkage-libzmq>
+    <Linkage-libsodium>dynamic</Linkage-libsodium>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
+    <Linkage-libzmq>ltcg</Linkage-libzmq>
+    <Linkage-libsodium>ltcg</Linkage-libsodium>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
+    <Linkage-libzmq>static</Linkage-libzmq>
+    <Linkage-libsodium>static</Linkage-libsodium>
+  </PropertyGroup>  
 
   <!-- Messages -->
 

builds/msvc/vs2012/inproc_lat/inproc_lat.props

@@ -24,11 +24,19 @@
     <Import Project="$(SolutionDir)libzmq.import.props" />
     <Import Project="$(SolutionDir)libsodium.import.props" />
   </ImportGroup>
-
-  <PropertyGroup>
-    <Linkage-libzmq>$(DefaultLinkage)</Linkage-libzmq>
-    <Linkage-libsodium>$(DefaultLinkage)</Linkage-libsodium>
+  
+  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
+    <Linkage-libzmq>dynamic</Linkage-libzmq>
+    <Linkage-libsodium>dynamic</Linkage-libsodium>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
+    <Linkage-libzmq>ltcg</Linkage-libzmq>
+    <Linkage-libsodium>ltcg</Linkage-libsodium>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
+    <Linkage-libzmq>static</Linkage-libzmq>
+    <Linkage-libsodium>static</Linkage-libsodium>
+  </PropertyGroup>  
 
   <!-- Messages -->
 

builds/msvc/vs2012/inproc_thr/inproc_thr.props

@@ -25,10 +25,18 @@
     <Import Project="$(SolutionDir)libsodium.import.props" />
   </ImportGroup>
 
-  <PropertyGroup>
-    <Linkage-libzmq>$(DefaultLinkage)</Linkage-libzmq>
-    <Linkage-libsodium>$(DefaultLinkage)</Linkage-libsodium>
+  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
+    <Linkage-libzmq>dynamic</Linkage-libzmq>
+    <Linkage-libsodium>dynamic</Linkage-libsodium>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
+    <Linkage-libzmq>ltcg</Linkage-libzmq>
+    <Linkage-libsodium>ltcg</Linkage-libsodium>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
+    <Linkage-libzmq>static</Linkage-libzmq>
+    <Linkage-libsodium>static</Linkage-libsodium>
+  </PropertyGroup>  
 
   <!-- Messages -->
 

builds/msvc/vs2012/libzmq/libzmq.props

@@ -47,8 +47,14 @@
     <Import Project="$(SolutionDir)libsodium.import.props" />
   </ImportGroup>
   
-  <PropertyGroup>
-    <Linkage-libsodium>$(DefaultLinkage)</Linkage-libsodium>
+  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
+    <Linkage-libsodium>dynamic</Linkage-libsodium>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
+    <Linkage-libsodium>ltcg</Linkage-libsodium>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
+    <Linkage-libsodium>static</Linkage-libsodium>
   </PropertyGroup>
 
   <!-- Messages -->

builds/msvc/vs2012/local_lat/local_lat.props

@@ -25,10 +25,18 @@
     <Import Project="$(SolutionDir)libsodium.import.props" />
   </ImportGroup>
 
-  <PropertyGroup>
-    <Linkage-libzmq>$(DefaultLinkage)</Linkage-libzmq>
-    <Linkage-libsodium>$(DefaultLinkage)</Linkage-libsodium>
+  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
+    <Linkage-libzmq>dynamic</Linkage-libzmq>
+    <Linkage-libsodium>dynamic</Linkage-libsodium>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
+    <Linkage-libzmq>ltcg</Linkage-libzmq>
+    <Linkage-libsodium>ltcg</Linkage-libsodium>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
+    <Linkage-libzmq>static</Linkage-libzmq>
+    <Linkage-libsodium>static</Linkage-libsodium>
+  </PropertyGroup>  
 
   <!-- Messages -->
 

builds/msvc/vs2012/local_thr/local_thr.props

@@ -25,10 +25,18 @@
     <Import Project="$(SolutionDir)libsodium.import.props" />
   </ImportGroup>
 
-  <PropertyGroup>
-    <Linkage-libzmq>$(DefaultLinkage)</Linkage-libzmq>
-    <Linkage-libsodium>$(DefaultLinkage)</Linkage-libsodium>
+  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
+    <Linkage-libzmq>dynamic</Linkage-libzmq>
+    <Linkage-libsodium>dynamic</Linkage-libsodium>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
+    <Linkage-libzmq>ltcg</Linkage-libzmq>
+    <Linkage-libsodium>ltcg</Linkage-libsodium>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
+    <Linkage-libzmq>static</Linkage-libzmq>
+    <Linkage-libsodium>static</Linkage-libsodium>
+  </PropertyGroup>  
 
   <!-- Messages -->
 

builds/msvc/vs2012/remote_lat/remote_lat.props

@@ -25,10 +25,18 @@
     <Import Project="$(SolutionDir)libsodium.import.props" />
   </ImportGroup>
 
-  <PropertyGroup>
-    <Linkage-libzmq>$(DefaultLinkage)</Linkage-libzmq>
-    <Linkage-libsodium>$(DefaultLinkage)</Linkage-libsodium>
+  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
+    <Linkage-libzmq>dynamic</Linkage-libzmq>
+    <Linkage-libsodium>dynamic</Linkage-libsodium>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
+    <Linkage-libzmq>ltcg</Linkage-libzmq>
+    <Linkage-libsodium>ltcg</Linkage-libsodium>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
+    <Linkage-libzmq>static</Linkage-libzmq>
+    <Linkage-libsodium>static</Linkage-libsodium>
+  </PropertyGroup>  
 
   <!-- Messages -->
 

builds/msvc/vs2012/remote_thr/remote_thr.props

@@ -25,10 +25,18 @@
     <Import Project="$(SolutionDir)libsodium.import.props" />
   </ImportGroup>
 
-  <PropertyGroup>
-    <Linkage-libzmq>$(DefaultLinkage)</Linkage-libzmq>
-    <Linkage-libsodium>$(DefaultLinkage)</Linkage-libsodium>
+  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
+    <Linkage-libzmq>dynamic</Linkage-libzmq>
+    <Linkage-libsodium>dynamic</Linkage-libsodium>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
+    <Linkage-libzmq>ltcg</Linkage-libzmq>
+    <Linkage-libsodium>ltcg</Linkage-libsodium>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
+    <Linkage-libzmq>static</Linkage-libzmq>
+    <Linkage-libsodium>static</Linkage-libsodium>
+  </PropertyGroup>  
 
   <!-- Messages -->
 

builds/msvc/vs2013/inproc_lat/inproc_lat.props

@@ -24,11 +24,19 @@
     <Import Project="$(SolutionDir)libzmq.import.props" />
     <Import Project="$(SolutionDir)libsodium.import.props" />
   </ImportGroup>
-
-  <PropertyGroup>
-    <Linkage-libzmq>$(DefaultLinkage)</Linkage-libzmq>
-    <Linkage-libsodium>$(DefaultLinkage)</Linkage-libsodium>
+  
+  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
+    <Linkage-libzmq>dynamic</Linkage-libzmq>
+    <Linkage-libsodium>dynamic</Linkage-libsodium>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
+    <Linkage-libzmq>ltcg</Linkage-libzmq>
+    <Linkage-libsodium>ltcg</Linkage-libsodium>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
+    <Linkage-libzmq>static</Linkage-libzmq>
+    <Linkage-libsodium>static</Linkage-libsodium>
+  </PropertyGroup>  
 
   <!-- Messages -->
 

builds/msvc/vs2013/inproc_thr/inproc_thr.props

@@ -25,10 +25,18 @@
     <Import Project="$(SolutionDir)libsodium.import.props" />
   </ImportGroup>
 
-  <PropertyGroup>
-    <Linkage-libzmq>$(DefaultLinkage)</Linkage-libzmq>
-    <Linkage-libsodium>$(DefaultLinkage)</Linkage-libsodium>
+  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
+    <Linkage-libzmq>dynamic</Linkage-libzmq>
+    <Linkage-libsodium>dynamic</Linkage-libsodium>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
+    <Linkage-libzmq>ltcg</Linkage-libzmq>
+    <Linkage-libsodium>ltcg</Linkage-libsodium>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
+    <Linkage-libzmq>static</Linkage-libzmq>
+    <Linkage-libsodium>static</Linkage-libsodium>
+  </PropertyGroup>  
 
   <!-- Messages -->
 

builds/msvc/vs2013/libzmq/libzmq.props

@@ -47,8 +47,14 @@
     <Import Project="$(SolutionDir)libsodium.import.props" />
   </ImportGroup>
   
-  <PropertyGroup>
-    <Linkage-libsodium>$(DefaultLinkage)</Linkage-libsodium>
+  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
+    <Linkage-libsodium>dynamic</Linkage-libsodium>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
+    <Linkage-libsodium>ltcg</Linkage-libsodium>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
+    <Linkage-libsodium>static</Linkage-libsodium>
   </PropertyGroup>
 
   <!-- Messages -->

builds/msvc/vs2013/local_lat/local_lat.props

@@ -25,10 +25,18 @@
     <Import Project="$(SolutionDir)libsodium.import.props" />
   </ImportGroup>
 
-  <PropertyGroup>
-    <Linkage-libzmq>$(DefaultLinkage)</Linkage-libzmq>
-    <Linkage-libsodium>$(DefaultLinkage)</Linkage-libsodium>
+  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
+    <Linkage-libzmq>dynamic</Linkage-libzmq>
+    <Linkage-libsodium>dynamic</Linkage-libsodium>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
+    <Linkage-libzmq>ltcg</Linkage-libzmq>
+    <Linkage-libsodium>ltcg</Linkage-libsodium>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
+    <Linkage-libzmq>static</Linkage-libzmq>
+    <Linkage-libsodium>static</Linkage-libsodium>
+  </PropertyGroup>  
 
   <!-- Messages -->
 

builds/msvc/vs2013/local_thr/local_thr.props

@@ -25,10 +25,18 @@
     <Import Project="$(SolutionDir)libsodium.import.props" />
   </ImportGroup>
 
-  <PropertyGroup>
-    <Linkage-libzmq>$(DefaultLinkage)</Linkage-libzmq>
-    <Linkage-libsodium>$(DefaultLinkage)</Linkage-libsodium>
+  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
+    <Linkage-libzmq>dynamic</Linkage-libzmq>
+    <Linkage-libsodium>dynamic</Linkage-libsodium>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
+    <Linkage-libzmq>ltcg</Linkage-libzmq>
+    <Linkage-libsodium>ltcg</Linkage-libsodium>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
+    <Linkage-libzmq>static</Linkage-libzmq>
+    <Linkage-libsodium>static</Linkage-libsodium>
+  </PropertyGroup>  
 
   <!-- Messages -->
 

builds/msvc/vs2013/remote_lat/remote_lat.props

@@ -25,10 +25,18 @@
     <Import Project="$(SolutionDir)libsodium.import.props" />
   </ImportGroup>
 
-  <PropertyGroup>
-    <Linkage-libzmq>$(DefaultLinkage)</Linkage-libzmq>
-    <Linkage-libsodium>$(DefaultLinkage)</Linkage-libsodium>
+  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
+    <Linkage-libzmq>dynamic</Linkage-libzmq>
+    <Linkage-libsodium>dynamic</Linkage-libsodium>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
+    <Linkage-libzmq>ltcg</Linkage-libzmq>
+    <Linkage-libsodium>ltcg</Linkage-libsodium>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
+    <Linkage-libzmq>static</Linkage-libzmq>
+    <Linkage-libsodium>static</Linkage-libsodium>
+  </PropertyGroup>  
 
   <!-- Messages -->
 

builds/msvc/vs2013/remote_thr/remote_thr.props

@@ -25,10 +25,18 @@
     <Import Project="$(SolutionDir)libsodium.import.props" />
   </ImportGroup>
 
-  <PropertyGroup>
-    <Linkage-libzmq>$(DefaultLinkage)</Linkage-libzmq>
-    <Linkage-libsodium>$(DefaultLinkage)</Linkage-libsodium>
+  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
+    <Linkage-libzmq>dynamic</Linkage-libzmq>
+    <Linkage-libsodium>dynamic</Linkage-libsodium>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
+    <Linkage-libzmq>ltcg</Linkage-libzmq>
+    <Linkage-libsodium>ltcg</Linkage-libsodium>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
+    <Linkage-libzmq>static</Linkage-libzmq>
+    <Linkage-libsodium>static</Linkage-libsodium>
+  </PropertyGroup>  
 
   <!-- Messages -->
 

packaging/nuget/package.config

 <?xml version="1.0" encoding="utf-8"?>
 <!-- These values are populated into the package.gsl templates by package.bat. -->
 <!-- The target attribute controls path and file name only, id controls package naming. -->
-<package id="libzmq_vc120" target="libzmq" namespace="libzmq12" version = "4.1.0.4" pathversion="4_1_0_4" platformtoolset="v120" />
\ No newline at end of file
+<package id="libzmq_vc120" target="libzmq" version = "4.1.0.5" pathversion="4_1_0_5" platformtoolset="v120">
+  <dependency id="libsodium_vc120" version="0.5.0.0" />
+</package>
\ No newline at end of file

packaging/nuget/package.nuspec

@@ -7,7 +7,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2013/01/nuspec.xsd">
     <metadata minClientVersion="2.5">
         <id>libzmq_vc120</id>
-        <version>4.1.0.4</version>
+        <version>4.1.0.5</version>
         <title>libzmq_vc120</title>
         <authors>libzmq contributors</authors>
         <owners>Eric Voskuil</owners>
@@ -15,21 +15,20 @@
         <projectUrl>https://github.com/zeromq/libzmq</projectUrl>
         <iconUrl>https://avatars1.githubusercontent.com/u/109777?s=32</iconUrl>
         <requireLicenseAcceptance>true</requireLicenseAcceptance>
-        <developmentDependency>true</developmentDependency>
+        <developmentDependency>false</developmentDependency>
         <description>The 0MQ lightweight messaging kernel is a library which extends the standard socket interfaces with features traditionally provided by specialised messaging middleware products. 0MQ sockets provide an abstraction of asynchronous message queues, multiple messaging patterns, message filtering (subscriptions), seamless access to multiple transport protocols and more.</description>
         <summary>The 0MQ lightweight messaging kernel, with libsodium integrated, packaged for Visual Studio 2013 (v120) and CTP_Nov2013 compilers.</summary>
         <releaseNotes>https://raw.github.com/zeromq/libzmq/master/NEWS</releaseNotes>
         <copyright>GNU Lesser GPL v3</copyright>
         <tags>native, libzmq, zmq, 0MQ, messaging, sockets, C++</tags>
         <dependencies>
-            <dependency id="libsodium_vc120" version="0.4.5.1" />
-        </dependencies>
+            <dependency id="libsodium_vc120" version="0.5.0.0" />
+        </dependencies>        
     </metadata>
     <files>
         <!-- include -->
         
-        <file src="..\..\include\zmq.h" target="build\native\include" />
-        <file src="..\..\include\zmq_utils.h" target="build\native\include" />
+        <file src="..\..\include\*.h" target="build\native\include" />
 
         <!-- targets -->
       
@@ -44,52 +43,52 @@
         <!-- libraries -->
 
         <!-- x86 Dynamic libraries (.dll) -->
-        <file src="..\..\bin\Win32\Release\libzmq12\libzmq.dll" target="build\native\bin\libzmq-x86-v120-mt-4_1_0_4.dll" />
-        <file src="..\..\bin\Win32\Debug\libzmq12\libzmq.dll" target="build\native\bin\libzmq-x86-v120-mt-gd-4_1_0_4.dll" />
+        <file src="..\..\bin\Win32\Release\v120\dynamic\libzmq.dll" target="build\native\bin\libzmq-x86-v120-mt-4_1_0_5.dll" />
+        <file src="..\..\bin\Win32\Debug\v120\dynamic\libzmq.dll" target="build\native\bin\libzmq-x86-v120-mt-gd-4_1_0_5.dll" />
 
         <!-- x86 Debugging symbols (.pdb) -->
-        <!--<file src="..\..\bin\Win32\Release\libzmq12\libzmq.pdb" target="build\native\bin\libzmq-x86-v120-mt-4_1_0_4.pdb" />-->
-        <file src="..\..\bin\Win32\Debug\libzmq12\libzmq.pdb" target="build\native\bin\libzmq-x86-v120-mt-gd-4_1_0_4.pdb" />
-
-        <!-- x86 Static libraries (.lib) -->
-        <file src="..\..\bin\Win32\Release\libzmq12\libzmq.lib" target="build\native\bin\libzmq-x86-v120-mt-s-4_1_0_4.lib" />
-        <file src="..\..\bin\Win32\Debug\libzmq12\libzmq.lib" target="build\native\bin\libzmq-x86-v120-mt-sgd-4_1_0_4.lib" />
-
-        <!-- x86 Static link time code generation libraries (.ltcg.lib) -->
-        <file src="..\..\bin\Win32\Release\libzmq12\libzmq.ltcg.lib" target="build\native\bin\libzmq-x86-v120-mt-s-4_1_0_4.ltcg.lib" />
-        <file src="..\..\bin\Win32\Debug\libzmq12\libzmq.ltcg.lib" target="build\native\bin\libzmq-x86-v120-mt-sgd-4_1_0_4.ltcg.lib" />
+        <!--<file src="..\..\bin\Win32\Release\v120\dynamic\libzmq.pdb" target="build\native\bin\libzmq-x86-v120-mt-4_1_0_5.pdb" />-->
+        <file src="..\..\bin\Win32\Debug\v120\dynamic\libzmq.pdb" target="build\native\bin\libzmq-x86-v120-mt-gd-4_1_0_5.pdb" />
 
         <!-- x86 Import libraries (.imp.lib) -->
-        <file src="..\..\bin\Win32\Release\libzmq12\libzmq.imp.lib" target="build\native\bin\libzmq-x86-v120-mt-4_1_0_4.imp.lib" />
-        <file src="..\..\bin\Win32\Debug\libzmq12\libzmq.imp.lib" target="build\native\bin\libzmq-x86-v120-mt-gd-4_1_0_4.imp.lib" />
+        <file src="..\..\bin\Win32\Release\v120\dynamic\libzmq.lib" target="build\native\bin\libzmq-x86-v120-mt-4_1_0_5.imp.lib" />
+        <file src="..\..\bin\Win32\Debug\v120\dynamic\libzmq.lib" target="build\native\bin\libzmq-x86-v120-mt-gd-4_1_0_5.imp.lib" />
 
         <!-- x86 Export libraries (.exp) -->
-        <file src="..\..\bin\Win32\Release\libzmq12\libzmq.imp.exp" target="build\native\bin\libzmq-x86-v120-mt-4_1_0_4.exp" />
-        <file src="..\..\bin\Win32\Debug\libzmq12\libzmq.imp.exp" target="build\native\bin\libzmq-x86-v120-mt-gd-4_1_0_4.exp" />
+        <file src="..\..\bin\Win32\Release\v120\dynamic\libzmq.exp" target="build\native\bin\libzmq-x86-v120-mt-4_1_0_5.exp" />
+        <file src="..\..\bin\Win32\Debug\v120\dynamic\libzmq.exp" target="build\native\bin\libzmq-x86-v120-mt-gd-4_1_0_5.exp" />
 
-        <!-- x64 Dynamic libraries (.dll) -->
-        <file src="..\..\bin\x64\Release\libzmq12\libzmq.dll" target="build\native\bin\libzmq-x64-v120-mt-4_1_0_4.dll" />
-        <file src="..\..\bin\x64\Debug\libzmq12\libzmq.dll" target="build\native\bin\libzmq-x64-v120-mt-gd-4_1_0_4.dll" />
+        <!-- x86 Static libraries (.lib) -->
+        <file src="..\..\bin\Win32\Release\v120\static\libzmq.lib" target="build\native\bin\libzmq-x86-v120-mt-s-4_1_0_5.lib" />
+        <file src="..\..\bin\Win32\Debug\v120\static\libzmq.lib" target="build\native\bin\libzmq-x86-v120-mt-sgd-4_1_0_5.lib" />
 
-        <!-- x64 Debugging symbols (.pdb) -->
-        <!--<file src="..\..\bin\x64\Release\libzmq12\libzmq.pdb" target="build\native\bin\libzmq-x64-v120-mt-4_1_0_4.pdb" />-->
-        <file src="..\..\bin\x64\Debug\libzmq12\libzmq.pdb" target="build\native\bin\libzmq-x64-v120-mt-gd-4_1_0_4.pdb" />
+        <!-- x86 Static link time code generation libraries (.ltcg.lib) -->
+        <file src="..\..\bin\Win32\Release\v120\ltcg\libzmq.lib" target="build\native\bin\libzmq-x86-v120-mt-s-4_1_0_5.ltcg.lib" />
+        <file src="..\..\bin\Win32\Debug\v120\ltcg\libzmq.lib" target="build\native\bin\libzmq-x86-v120-mt-sgd-4_1_0_5.ltcg.lib" />
 
-        <!-- x64 Static libraries (.lib) -->
-        <file src="..\..\bin\x64\Release\libzmq12\libzmq.lib" target="build\native\bin\libzmq-x64-v120-mt-s-4_1_0_4.lib" />
-        <file src="..\..\bin\x64\Debug\libzmq12\libzmq.lib" target="build\native\bin\libzmq-x64-v120-mt-sgd-4_1_0_4.lib" />
+        <!-- x64 Dynamic libraries (.dll) -->
+        <file src="..\..\bin\x64\Release\v120\dynamic\libzmq.dll" target="build\native\bin\libzmq-x64-v120-mt-4_1_0_5.dll" />
+        <file src="..\..\bin\x64\Debug\v120\dynamic\libzmq.dll" target="build\native\bin\libzmq-x64-v120-mt-gd-4_1_0_5.dll" />
 
-        <!-- x64 Static link time code generation libraries (.ltcg.lib) -->
-        <file src="..\..\bin\Win32\Release\libzmq12\libzmq.ltcg.lib" target="build\native\bin\libzmq-x64-v120-mt-s-4_1_0_4.ltcg.lib" />
-        <file src="..\..\bin\Win32\Debug\libzmq12\libzmq.ltcg.lib" target="build\native\bin\libzmq-x64-v120-mt-sgd-4_1_0_4.ltcg.lib" />
+        <!-- x64 Debugging symbols (.pdb) -->
+        <!--<file src="..\..\bin\x64\Release\v120\dynamic\libzmq.pdb" target="build\native\bin\libzmq-x64-v120-mt-4_1_0_5.pdb" />-->
+        <file src="..\..\bin\x64\Debug\v120\dynamic\libzmq.pdb" target="build\native\bin\libzmq-x64-v120-mt-gd-4_1_0_5.pdb" />
 
         <!-- x64 Import libraries (.imp.lib) -->
-        <file src="..\..\bin\x64\Release\libzmq12\libzmq.imp.lib" target="build\native\bin\libzmq-x64-v120-mt-4_1_0_4.imp.lib" />
-        <file src="..\..\bin\x64\Debug\libzmq12\libzmq.imp.lib" target="build\native\bin\libzmq-x64-v120-mt-gd-4_1_0_4.imp.lib" />
+        <file src="..\..\bin\x64\Release\v120\dynamic\libzmq.lib" target="build\native\bin\libzmq-x64-v120-mt-4_1_0_5.imp.lib" />
+        <file src="..\..\bin\x64\Debug\v120\dynamic\libzmq.lib" target="build\native\bin\libzmq-x64-v120-mt-gd-4_1_0_5.imp.lib" />
 
         <!-- x64 Export libraries (.exp) -->
-        <file src="..\..\bin\x64\Release\libzmq12\libzmq.imp.exp" target="build\native\bin\libzmq-x64-v120-mt-4_1_0_4.exp" />
-        <file src="..\..\bin\x64\Debug\libzmq12\libzmq.imp.exp" target="build\native\bin\libzmq-x64-v120-mt-gd-4_1_0_4.exp" />
+        <file src="..\..\bin\x64\Release\v120\dynamic\libzmq.exp" target="build\native\bin\libzmq-x64-v120-mt-4_1_0_5.exp" />
+        <file src="..\..\bin\x64\Debug\v120\dynamic\libzmq.exp" target="build\native\bin\libzmq-x64-v120-mt-gd-4_1_0_5.exp" />
+
+        <!-- x64 Static libraries (.lib) -->
+        <file src="..\..\bin\x64\Release\v120\static\libzmq.lib" target="build\native\bin\libzmq-x64-v120-mt-s-4_1_0_5.lib" />
+        <file src="..\..\bin\x64\Debug\v120\static\libzmq.lib" target="build\native\bin\libzmq-x64-v120-mt-sgd-4_1_0_5.lib" />
+
+        <!-- x64 Static link time code generation libraries (.ltcg.lib) -->
+        <file src="..\..\bin\Win32\Release\v120\ltcg\libzmq.lib" target="build\native\bin\libzmq-x64-v120-mt-s-4_1_0_5.ltcg.lib" />
+        <file src="..\..\bin\Win32\Debug\v120\ltcg\libzmq.lib" target="build\native\bin\libzmq-x64-v120-mt-sgd-4_1_0_5.ltcg.lib" />
     </files>
 <!--
 #################################################################