Skip to content

Commit a31dd97

Browse files
author
Filippo Polo
committed
Restored NetMQ 3.3.3.1
1 parent 405adb4 commit a31dd97

File tree

7 files changed

+98
-7
lines changed

7 files changed

+98
-7
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
## Ignore Visual Studio temporary files, build results, and
22
## files generated by popular Visual Studio add-ons.
33

4+
.vs/
5+
46
# User-specific files
57
*.suo
68
*.user

‎paket.dependencies‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ source https://www.nuget.org/api/v2
22

33
nuget FSharp.Compiler.Service 3.0.0 framework: >= net451
44
nuget FSharp.Core.Microsoft.Signed 3.1.1.1 framework: >= net45
5-
nuget NetMQ 3.3.0.11
5+
nuget NetMQ 3.3.3.1
66
nuget Newtonsoft.Json 5.0.8 framework: >= net45
77
nuget FSharp.Charting 0.90.5 framework: >= net45
88
nuget FAKE

‎paket.lock‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
NUGET
22
remote: https://www.nuget.org/api/v2
33
specs:
4+
AsyncIO (0.1.18)
45
FAKE (4.23.6)
56
FSharp.Charting (0.90.5) - framework: >= net45
67
FSharp.Compiler.Service (3.0) - framework: >= net451
78
FSharp.Core.Microsoft.Signed (3.1.1.1) - framework: >= net45
8-
NetMQ (3.3.0.11)
9+
NetMQ (3.3.3.1)
10+
AsyncIO (>= 0.1.18)
911
Newtonsoft.Json (5.0.8) - framework: >= net45
1012
xunit (2.1) - framework: >= net451
1113
xunit.assert (2.1)
@@ -19,4 +21,4 @@ NUGET
1921
xunit.abstractions (2.0)
2022
xunit.extensibility.execution (2.1) - framework: >= net451
2123
xunit.extensibility.core (2.1) - framework: >= net45, dnx451, dnxcore50, monoandroid, monotouch, xamarinios, winv4.5, wpv8.0, wpav8.1
22-
xunit.runner.console (2.1) - framework: >= net451
24+
xunit.runner.console (2.1) - framework: >= net451

‎src/IfSharp.Kernel/IfSharp.Kernel.fsproj‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,26 @@
122122
</Target>
123123
-->
124124
<Import Project="..\..\.paket\paket.targets" />
125+
<Choose>
126+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v3.5'">
127+
<ItemGroup>
128+
<Reference Include="AsyncIO">
129+
<HintPath>..\..\packages\AsyncIO\lib\net35\AsyncIO.dll</HintPath>
130+
<Private>True</Private>
131+
<Paket>True</Paket>
132+
</Reference>
133+
</ItemGroup>
134+
</When>
135+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2')">
136+
<ItemGroup>
137+
<Reference Include="AsyncIO">
138+
<HintPath>..\..\packages\AsyncIO\lib\net40\AsyncIO.dll</HintPath>
139+
<Private>True</Private>
140+
<Paket>True</Paket>
141+
</Reference>
142+
</ItemGroup>
143+
</When>
144+
</Choose>
125145
<Choose>
126146
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2')">
127147
<ItemGroup>
@@ -145,6 +165,15 @@
145165
</When>
146166
</Choose>
147167
<Choose>
168+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v3.5'">
169+
<ItemGroup>
170+
<Reference Include="NetMQ">
171+
<HintPath>..\..\packages\NetMQ\lib\net35\NetMQ.dll</HintPath>
172+
<Private>True</Private>
173+
<Paket>True</Paket>
174+
</Reference>
175+
</ItemGroup>
176+
</When>
148177
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2')">
149178
<ItemGroup>
150179
<Reference Include="NetMQ">

‎src/IfSharp.Kernel/Kernel.fs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ type IfSharpKernel(connectionInformation : ConnectionInformation) =
9999
ignore (hmac.TransformFinalBlock(Array.zeroCreate 0, 0, 0))
100100
BitConverter.ToString(hmac.Hash).Replace("-", "").ToLower()
101101

102-
let recvAll (socket: NetMQSocket) = socket.ReceiveMessages()
102+
let recvAll (socket: NetMQSocket) = socket.ReceiveMultipartBytes()
103103

104104
/// Constructs an 'envelope' from the specified socket
105105
let recvMessage (socket: NetMQSocket) =
@@ -174,7 +174,7 @@ type IfSharpKernel(connectionInformation : ConnectionInformation) =
174174
msg.Append(encode parent_header)
175175
msg.Append(encode "{}")
176176
msg.Append(encode content)
177-
socket.SendMessage(msg)
177+
socket.SendMultipartMessage(msg)
178178

179179

180180
/// Convenience method for sending the state of the kernel
@@ -486,8 +486,8 @@ type IfSharpKernel(connectionInformation : ConnectionInformation) =
486486

487487
try
488488
while true do
489-
let hb = hbSocket.Receive() in
490-
hbSocket.Send hb
489+
let hb = hbSocket.ReceiveMultipartBytes() in
490+
hbSocket.SendMultipartBytes hb
491491
with
492492
| ex -> handleException ex
493493

‎src/IfSharpConsole/IfSharpConsole.csproj‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,26 @@
113113
<Copy SourceFiles="@(CopyHelpers)" DestinationFolder="$(OutDir)" />
114114
</Target>
115115
<Import Project="..\..\.paket\paket.targets" />
116+
<Choose>
117+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v3.5'">
118+
<ItemGroup>
119+
<Reference Include="AsyncIO">
120+
<HintPath>..\..\packages\AsyncIO\lib\net35\AsyncIO.dll</HintPath>
121+
<Private>True</Private>
122+
<Paket>True</Paket>
123+
</Reference>
124+
</ItemGroup>
125+
</When>
126+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2')">
127+
<ItemGroup>
128+
<Reference Include="AsyncIO">
129+
<HintPath>..\..\packages\AsyncIO\lib\net40\AsyncIO.dll</HintPath>
130+
<Private>True</Private>
131+
<Paket>True</Paket>
132+
</Reference>
133+
</ItemGroup>
134+
</When>
135+
</Choose>
116136
<Choose>
117137
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2')">
118138
<ItemGroup>
@@ -125,6 +145,15 @@
125145
</When>
126146
</Choose>
127147
<Choose>
148+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v3.5'">
149+
<ItemGroup>
150+
<Reference Include="NetMQ">
151+
<HintPath>..\..\packages\NetMQ\lib\net35\NetMQ.dll</HintPath>
152+
<Private>True</Private>
153+
<Paket>True</Paket>
154+
</Reference>
155+
</ItemGroup>
156+
</When>
128157
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2')">
129158
<ItemGroup>
130159
<Reference Include="NetMQ">

‎tests/IfSharp.Kernel.Tests/IfSharp.Kernel.Tests.fsproj‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,26 @@
9898
<Private>True</Private>
9999
</ProjectReference>
100100
</ItemGroup>
101+
<Choose>
102+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v3.5'">
103+
<ItemGroup>
104+
<Reference Include="AsyncIO">
105+
<HintPath>..\..\packages\AsyncIO\lib\net35\AsyncIO.dll</HintPath>
106+
<Private>True</Private>
107+
<Paket>True</Paket>
108+
</Reference>
109+
</ItemGroup>
110+
</When>
111+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2')">
112+
<ItemGroup>
113+
<Reference Include="AsyncIO">
114+
<HintPath>..\..\packages\AsyncIO\lib\net40\AsyncIO.dll</HintPath>
115+
<Private>True</Private>
116+
<Paket>True</Paket>
117+
</Reference>
118+
</ItemGroup>
119+
</When>
120+
</Choose>
101121
<Choose>
102122
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2')">
103123
<ItemGroup>
@@ -121,6 +141,15 @@
121141
</When>
122142
</Choose>
123143
<Choose>
144+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v3.5'">
145+
<ItemGroup>
146+
<Reference Include="NetMQ">
147+
<HintPath>..\..\packages\NetMQ\lib\net35\NetMQ.dll</HintPath>
148+
<Private>True</Private>
149+
<Paket>True</Paket>
150+
</Reference>
151+
</ItemGroup>
152+
</When>
124153
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2')">
125154
<ItemGroup>
126155
<Reference Include="NetMQ">

0 commit comments

Comments
 (0)