Merge pull request #128 from metadings/master

Updating Version, NuGet Package, .gitignore and .zip.sh
zeromq · Sep 9, 2017 · bfffc18 · bfffc18
2 parents a4a6e28 + d249e2b
commit bfffc18
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 31 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 bin/*
 obj/*
+packages/*
 *.user
 *.userprefs
 *.suo

diff --git a/AssemblyInfo.cs b/AssemblyInfo.cs
@@ -17,7 +17,7 @@
 // The form "{Major}.{Minor}.*" will automatically update the build and revision,
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
 
-[assembly: AssemblyVersion("4.1.0.23")]
+[assembly: AssemblyVersion("4.1.0.25")]
 
 // The following attributes are used to specify the signing key for the assembly,
 // if desired. See the Mono documentation for more information about signing.

diff --git a/ZeroMQ.nuspec b/ZeroMQ.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
 	<metadata>
 		<id>ZeroMQ</id>
-		<version>4.1.0.23</version>
+		<version>4.1.0.25</version>
 
 		<authors>metadings, Pieter Hintjens, Martin Sustrik</authors>
 		<projectUrl>https://github.com/zeromq/clrzmq4/</projectUrl>
@@ -28,9 +28,9 @@
 		<file src="bin\Release\ZeroMQ.xml" target="lib\net40" />
 
 		<!-- native binary files -->
-		<file src="i386\libzmq.*" target="lib\net40\i386" />
-		<file src="i386\libsodium.*" target="lib\net40\i386" />
-		<file src="amd64\libzmq.*" target="lib\net40\amd64" />
-		<file src="amd64\libsodium.*" target="lib\net40\amd64" />
+		<file src="i386\libzmq.*" target="build\i386" />
+		<file src="i386\libsodium.*" target="build\i386" />
+		<file src="amd64\libzmq.*" target="build\amd64" />
+		<file src="amd64\libsodium.*" target="build\amd64" />
 	</files>
 </package>
diff --git a/ZeroMQ.targets b/ZeroMQ.targets
@@ -1,37 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <ItemGroup>
-        <None Include="$(MSBuildThisFileDirectory)../amd64/libzmq.so">
-            <Link>amd64/libzmq.so</Link>
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
+
+<!-- Windows -->
         <None Include="$(MSBuildThisFileDirectory)../amd64/libzmq.dll">
             <Link>amd64/libzmq.dll</Link>
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
-        <None Include="$(MSBuildThisFileDirectory)../amd64/libsodium.so">
-            <Link>amd64/libsodium.so</Link>
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
         <None Include="$(MSBuildThisFileDirectory)../amd64/libsodium.dll">
             <Link>amd64/libsodium.dll</Link>
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
-        <None Include="$(MSBuildThisFileDirectory)../i386/libzmq.so">
-            <Link>i386/libzmq.so</Link>
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
+
         <None Include="$(MSBuildThisFileDirectory)../i386/libzmq.dll">
             <Link>i386/libzmq.dll</Link>
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
-        <None Include="$(MSBuildThisFileDirectory)../i386/libsodium.so">
-            <Link>i386/libsodium.so</Link>
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
         <None Include="$(MSBuildThisFileDirectory)../i386/libsodium.dll">
             <Link>i386/libsodium.dll</Link>
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
+
+<!-- Linux -->
+
+        <None Include="$(MSBuildThisFileDirectory)../amd64/libzmq.so">
+            <Link>amd64/libzmq.so</Link>
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <!-- None Include="$(MSBuildThisFileDirectory)../amd64/libsodium.so">
+            <Link>amd64/libsodium.so</Link>
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None -->
+
+        <None Include="$(MSBuildThisFileDirectory)../i386/libzmq.so">
+            <Link>i386/libzmq.so</Link>
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <!-- None Include="$(MSBuildThisFileDirectory)../i386/libsodium.so">
+            <Link>i386/libsodium.so</Link>
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None -->
+
+
     </ItemGroup>
-</Project>
+</Project>
diff --git a/ZeroMQ.zip.Release.sh b/ZeroMQ.zip.Release.sh
@@ -1,2 +1,3 @@
 #!/bin/bash
-zip -r ZeroMQ.Release.zip * -x bin/Debug\* obj\* .git\* i386/v\* amd64/v\* *.nupkg ZeroMQ.*.zip 
+zip -r ZeroMQ.Release.zip * -x bin/Debug\* obj\* .git\* packages\* i386/v\* amd64/v\* *.nupkg ZeroMQ.*.zip ZeroMQ.*.nupkg
+
diff --git a/clrzmq4.mono.sln b/clrzmq4.mono.sln
@@ -1,8 +1,6 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2012
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZeroMQTest.mono", "ZeroMQTest\ZeroMQTest.mono.csproj", "{2640CBE6-23BD-4104-90AC-0DDCDE4D0478}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZeroMQ.mono", "ZeroMQ.mono.csproj", "{6FFD872F-A4A4-4EFA-9B4D-4342BA6CF250}"
 EndProject
 Global
@@ -11,10 +9,6 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{2640CBE6-23BD-4104-90AC-0DDCDE4D0478}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2640CBE6-23BD-4104-90AC-0DDCDE4D0478}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2640CBE6-23BD-4104-90AC-0DDCDE4D0478}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2640CBE6-23BD-4104-90AC-0DDCDE4D0478}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6FFD872F-A4A4-4EFA-9B4D-4342BA6CF250}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6FFD872F-A4A4-4EFA-9B4D-4342BA6CF250}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6FFD872F-A4A4-4EFA-9B4D-4342BA6CF250}.Release|Any CPU.ActiveCfg = Release|Any CPU