Skip to content

Commit bfffc18

Browse files
metadingsmetadings
authored
Merge pull request #128 from metadings/master
Updating Version, NuGet Package, .gitignore and .zip.sh
2 parents a4a6e28 + d249e2b commit bfffc18

File tree

6 files changed

+36
-31
lines changed

6 files changed

+36
-31
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
bin/*
22
obj/*
3+
packages/*
34
*.user
45
*.userprefs
56
*.suo

‎AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
// The form "{Major}.{Minor}.*" will automatically update the build and revision,
1818
// and "{Major}.{Minor}.{Build}.*" will update just the revision.
1919

20-
[assembly: AssemblyVersion("4.1.0.23")]
20+
[assembly: AssemblyVersion("4.1.0.25")]
2121

2222
// The following attributes are used to specify the signing key for the assembly,
2323
// if desired. See the Mono documentation for more information about signing.

‎ZeroMQ.nuspec

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
33
<metadata>
44
<id>ZeroMQ</id>
5-
<version>4.1.0.23</version>
5+
<version>4.1.0.25</version>
66

77
<authors>metadings, Pieter Hintjens, Martin Sustrik</authors>
88
<projectUrl>https://github.com/zeromq/clrzmq4/</projectUrl>
@@ -28,9 +28,9 @@
2828
<file src="bin\Release\ZeroMQ.xml" target="lib\net40" />
2929

3030
<!-- native binary files -->
31-
<file src="i386\libzmq.*" target="lib\net40\i386" />
32-
<file src="i386\libsodium.*" target="lib\net40\i386" />
33-
<file src="amd64\libzmq.*" target="lib\net40\amd64" />
34-
<file src="amd64\libsodium.*" target="lib\net40\amd64" />
31+
<file src="i386\libzmq.*" target="build\i386" />
32+
<file src="i386\libsodium.*" target="build\i386" />
33+
<file src="amd64\libzmq.*" target="build\amd64" />
34+
<file src="amd64\libsodium.*" target="build\amd64" />
3535
</files>
3636
</package>

‎ZeroMQ.targets

Lines changed: 26 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,46 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup>
4-
<None Include="$(MSBuildThisFileDirectory)../amd64/libzmq.so">
5-
<Link>amd64/libzmq.so</Link>
6-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
7-
</None>
4+
5+
<!-- Windows -->
86
<None Include="$(MSBuildThisFileDirectory)../amd64/libzmq.dll">
97
<Link>amd64/libzmq.dll</Link>
108
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
119
</None>
12-
<None Include="$(MSBuildThisFileDirectory)../amd64/libsodium.so">
13-
<Link>amd64/libsodium.so</Link>
14-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
15-
</None>
1610
<None Include="$(MSBuildThisFileDirectory)../amd64/libsodium.dll">
1711
<Link>amd64/libsodium.dll</Link>
1812
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
1913
</None>
20-
<None Include="$(MSBuildThisFileDirectory)../i386/libzmq.so">
21-
<Link>i386/libzmq.so</Link>
22-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
23-
</None>
14+
2415
<None Include="$(MSBuildThisFileDirectory)../i386/libzmq.dll">
2516
<Link>i386/libzmq.dll</Link>
2617
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
2718
</None>
28-
<None Include="$(MSBuildThisFileDirectory)../i386/libsodium.so">
29-
<Link>i386/libsodium.so</Link>
30-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
31-
</None>
3219
<None Include="$(MSBuildThisFileDirectory)../i386/libsodium.dll">
3320
<Link>i386/libsodium.dll</Link>
3421
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
3522
</None>
23+
24+
<!-- Linux -->
25+
26+
<None Include="$(MSBuildThisFileDirectory)../amd64/libzmq.so">
27+
<Link>amd64/libzmq.so</Link>
28+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
29+
</None>
30+
<!-- None Include="$(MSBuildThisFileDirectory)../amd64/libsodium.so">
31+
<Link>amd64/libsodium.so</Link>
32+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
33+
</None -->
34+
35+
<None Include="$(MSBuildThisFileDirectory)../i386/libzmq.so">
36+
<Link>i386/libzmq.so</Link>
37+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
38+
</None>
39+
<!-- None Include="$(MSBuildThisFileDirectory)../i386/libsodium.so">
40+
<Link>i386/libsodium.so</Link>
41+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
42+
</None -->
43+
44+
3645
</ItemGroup>
37-
</Project>
46+
</Project>

‎ZeroMQ.zip.Release.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
#!/bin/bash
2-
zip -r ZeroMQ.Release.zip * -x bin/Debug\* obj\* .git\* i386/v\* amd64/v\* *.nupkg ZeroMQ.*.zip
2+
zip -r ZeroMQ.Release.zip * -x bin/Debug\* obj\* .git\* packages\* i386/v\* amd64/v\* *.nupkg ZeroMQ.*.zip ZeroMQ.*.nupkg
3+

‎clrzmq4.mono.sln

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
1+
22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 2012
4-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZeroMQTest.mono", "ZeroMQTest\ZeroMQTest.mono.csproj", "{2640CBE6-23BD-4104-90AC-0DDCDE4D0478}"
5-
EndProject
64
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZeroMQ.mono", "ZeroMQ.mono.csproj", "{6FFD872F-A4A4-4EFA-9B4D-4342BA6CF250}"
75
EndProject
86
Global
@@ -11,10 +9,6 @@ Global
119
Release|Any CPU = Release|Any CPU
1210
EndGlobalSection
1311
GlobalSection(ProjectConfigurationPlatforms) = postSolution
14-
{2640CBE6-23BD-4104-90AC-0DDCDE4D0478}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
15-
{2640CBE6-23BD-4104-90AC-0DDCDE4D0478}.Debug|Any CPU.Build.0 = Debug|Any CPU
16-
{2640CBE6-23BD-4104-90AC-0DDCDE4D0478}.Release|Any CPU.ActiveCfg = Release|Any CPU
17-
{2640CBE6-23BD-4104-90AC-0DDCDE4D0478}.Release|Any CPU.Build.0 = Release|Any CPU
1812
{6FFD872F-A4A4-4EFA-9B4D-4342BA6CF250}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1913
{6FFD872F-A4A4-4EFA-9B4D-4342BA6CF250}.Debug|Any CPU.Build.0 = Debug|Any CPU
2014
{6FFD872F-A4A4-4EFA-9B4D-4342BA6CF250}.Release|Any CPU.ActiveCfg = Release|Any CPU

0 commit comments

Comments
 (0)