Skip to content

Commit dd31163

Browse files
somdoronsomdoron
authored
Merge pull request #583 from masaeedu/relaxnetstandard
Relax netstandard platform requirement
2 parents 68d8c2e + 4d6b5b5 commit dd31163

File tree

9 files changed

+30
-30
lines changed

9 files changed

+30
-30
lines changed

‎src/NetMQ/Core/MonitorEvent.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ internal class MonitorEvent
2020

2121
static MonitorEvent()
2222
{
23-
#if NETSTANDARD1_6
23+
#if NETSTANDARD1_3
2424
s_sizeOfIntPtr = Marshal.SizeOf<IntPtr>();
2525
#else
2626
s_sizeOfIntPtr = Marshal.SizeOf(typeof(IntPtr));

‎src/NetMQ/Core/Transports/Pgm/PgmSocket.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ internal void Init()
9898
Debug.WriteLine(xMsg);
9999
// If running on Microsoft Windows, suggest to the developer that he may need to install MSMQ in order to get PGM socket support.
100100

101-
#if NETSTANDARD1_6
101+
#if NETSTANDARD1_3
102102
bool isWindows = RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
103103
#else
104104
PlatformID p = Environment.OSVersion.Platform;

‎src/NetMQ/Core/Transports/Tcp/TcpAddress.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public void Resolve(string name, bool ip4Only)
102102
}
103103
else if (!IPAddress.TryParse(addrStr, out ipAddress))
104104
{
105-
#if NETSTANDARD1_6
105+
#if NETSTANDARD1_3
106106
var availableAddresses = Dns.GetHostEntryAsync(addrStr).Result.AddressList;
107107
#else
108108
var availableAddresses = Dns.GetHostEntry(addrStr).AddressList;

‎src/NetMQ/Core/Utils/Clock.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ internal static class Clock
4747

4848
static Clock()
4949
{
50-
#if !NETSTANDARD1_6
50+
#if !NETSTANDARD1_3
5151
try
5252
{
5353

@@ -110,7 +110,7 @@ public static long NowMs()
110110
/// </summary>
111111
public static long Rdtsc()
112112
{
113-
#if NETSTANDARD1_6
113+
#if NETSTANDARD1_3
114114
return 0;
115115
#else
116116
return s_rdtscSupported ? (long)Opcode.Rdtsc() : 0;

‎src/NetMQ/Core/Utils/OpCode.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if !NETSTANDARD1_6
1+
#if !NETSTANDARD1_3
22
using System;
33
using System.Reflection;
44
using System.Runtime.InteropServices;

‎src/NetMQ/Core/Utils/PollerBase.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public int Load
8888
{
8989
get
9090
{
91-
#if NETSTANDARD1_6
91+
#if NETSTANDARD1_3
9292
return Volatile.Read(ref m_load);
9393
#else
9494
Thread.MemoryBarrier();

‎src/NetMQ/NetMQBeacon.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ public string HostName
299299

300300
try
301301
{
302-
#if NETSTANDARD1_6
302+
#if NETSTANDARD1_3
303303
return m_hostName = Dns.GetHostEntryAsync(boundTo).Result.HostName;
304304
#else
305305
return m_hostName = Dns.GetHostEntry(boundTo).HostName;

‎src/NetMQ/NetMQException.cs

+19-19
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using System.Net.Sockets;
33
using System.Runtime.Serialization;
44

5-
#if !NETSTANDARD1_6
5+
#if !NETSTANDARD1_3
66
using System.Security.Permissions;
77
#endif
88

@@ -14,7 +14,7 @@ namespace NetMQ
1414
/// <summary>
1515
/// Base class for custom exceptions within the NetMQ library.
1616
/// </summary>
17-
#if !NETSTANDARD1_6
17+
#if !NETSTANDARD1_3
1818
[Serializable]
1919
#endif
2020
public class NetMQException : Exception
@@ -44,7 +44,7 @@ public NetMQException(string message, Exception innerException)
4444
: base(message, innerException)
4545
{}
4646

47-
#if !NETSTANDARD1_6
47+
#if !NETSTANDARD1_3
4848

4949
/// <summary>Constructor for serialisation.</summary>
5050
protected NetMQException(SerializationInfo info, StreamingContext context)
@@ -183,7 +183,7 @@ private static NetMQException Create(ErrorCode errorCode, [CanBeNull] string mes
183183
/// <summary>
184184
/// AddressAlreadyInUseException is a NetMQException that is used within SocketBase.Bind to signal an address-conflict.
185185
/// </summary>
186-
#if !NETSTANDARD1_6
186+
#if !NETSTANDARD1_3
187187
[Serializable]
188188
#endif
189189
public class AddressAlreadyInUseException : NetMQException
@@ -207,7 +207,7 @@ public AddressAlreadyInUseException([CanBeNull] string message)
207207
{
208208
}
209209

210-
#if !NETSTANDARD1_6
210+
#if !NETSTANDARD1_3
211211
/// <summary>Constructor for serialisation.</summary>
212212
protected AddressAlreadyInUseException(SerializationInfo info, StreamingContext context)
213213
: base(info, context)
@@ -219,7 +219,7 @@ protected AddressAlreadyInUseException(SerializationInfo info, StreamingContext
219219
/// <summary>
220220
/// EndpointNotFoundException is a NetMQException that is used within Ctx.FindEndpoint to signal a failure to find a specified address.
221221
/// </summary>
222-
#if !NETSTANDARD1_6
222+
#if !NETSTANDARD1_3
223223
[Serializable]
224224
#endif
225225
public class EndpointNotFoundException : NetMQException
@@ -251,7 +251,7 @@ public EndpointNotFoundException()
251251
{
252252
}
253253

254-
#if !NETSTANDARD1_6
254+
#if !NETSTANDARD1_3
255255
/// <summary>Constructor for serialisation.</summary>
256256
protected EndpointNotFoundException(SerializationInfo info, StreamingContext context)
257257
: base(info, context)
@@ -264,7 +264,7 @@ protected EndpointNotFoundException(SerializationInfo info, StreamingContext con
264264
/// TerminatingException is a NetMQException that is used within SocketBase and Ctx to signal
265265
/// that you're making the mistake of trying to do further work after terminating the message-queueing system.
266266
/// </summary>
267-
#if !NETSTANDARD1_6
267+
#if !NETSTANDARD1_3
268268
[Serializable]
269269
#endif
270270
public class TerminatingException : NetMQException
@@ -293,7 +293,7 @@ internal TerminatingException()
293293
: this(null, null)
294294
{
295295
}
296-
#if !NETSTANDARD1_6
296+
#if !NETSTANDARD1_3
297297
/// <summary>Constructor for serialisation.</summary>
298298
protected TerminatingException(SerializationInfo info, StreamingContext context)
299299
: base(info, context)
@@ -305,7 +305,7 @@ protected TerminatingException(SerializationInfo info, StreamingContext context)
305305
/// <summary>
306306
/// InvalidException is a NetMQException that is used within the message-queueing system to signal invalid value errors.
307307
/// </summary>
308-
#if !NETSTANDARD1_6
308+
#if !NETSTANDARD1_3
309309
[Serializable]
310310
#endif
311311
public class InvalidException : NetMQException
@@ -336,7 +336,7 @@ public InvalidException()
336336
: this(null, null)
337337
{
338338
}
339-
#if !NETSTANDARD1_6
339+
#if !NETSTANDARD1_3
340340
/// <summary>Constructor for serialisation.</summary>
341341
protected InvalidException(SerializationInfo info, StreamingContext context)
342342
: base(info, context)
@@ -348,7 +348,7 @@ protected InvalidException(SerializationInfo info, StreamingContext context)
348348
/// <summary>
349349
/// FaultException is a NetMQException that is used within the message-queueing system to signal general fault conditions.
350350
/// </summary>
351-
#if !NETSTANDARD1_6
351+
#if !NETSTANDARD1_3
352352
[Serializable]
353353
#endif
354354
public class FaultException : NetMQException
@@ -379,7 +379,7 @@ public FaultException()
379379
: this(null, null)
380380
{
381381
}
382-
#if !NETSTANDARD1_6
382+
#if !NETSTANDARD1_3
383383
/// <summary>Constructor for serialisation.</summary>
384384
protected FaultException(SerializationInfo info, StreamingContext context)
385385
: base(info, context)
@@ -392,7 +392,7 @@ protected FaultException(SerializationInfo info, StreamingContext context)
392392
/// ProtocolNotSupportedException is a NetMQException that is used within the message-queueing system to signal
393393
/// mistakes in properly utilizing the communications protocols.
394394
/// </summary>
395-
#if !NETSTANDARD1_6
395+
#if !NETSTANDARD1_3
396396
[Serializable]
397397
#endif
398398
public class ProtocolNotSupportedException : NetMQException
@@ -423,7 +423,7 @@ public ProtocolNotSupportedException()
423423
: this(null, null)
424424
{
425425
}
426-
#if !NETSTANDARD1_6
426+
#if !NETSTANDARD1_3
427427
/// <summary>Constructor for serialisation.</summary>
428428
protected ProtocolNotSupportedException(SerializationInfo info, StreamingContext context)
429429
: base(info, context)
@@ -436,7 +436,7 @@ protected ProtocolNotSupportedException(SerializationInfo info, StreamingContext
436436
/// HostUnreachableException is an Exception that is used within the message-queueing system
437437
/// to signal failures to communicate with a host.
438438
/// </summary>
439-
#if !NETSTANDARD1_6
439+
#if !NETSTANDARD1_3
440440
[Serializable]
441441
#endif
442442
public class HostUnreachableException : NetMQException
@@ -467,7 +467,7 @@ public HostUnreachableException()
467467
: this(null, null)
468468
{
469469
}
470-
#if !NETSTANDARD1_6
470+
#if !NETSTANDARD1_3
471471
/// <summary>Constructor for serialisation.</summary>
472472
protected HostUnreachableException(SerializationInfo info, StreamingContext context)
473473
: base(info, context)
@@ -480,7 +480,7 @@ protected HostUnreachableException(SerializationInfo info, StreamingContext cont
480480
/// FiniteStateMachineException is an Exception that is used within the message-queueing system
481481
/// to signal errors in the send/receive order with request/response sockets.
482482
/// </summary>
483-
#if !NETSTANDARD1_6
483+
#if !NETSTANDARD1_3
484484
[Serializable]
485485
#endif
486486
public class FiniteStateMachineException : NetMQException
@@ -511,7 +511,7 @@ public FiniteStateMachineException()
511511
: this(null, null)
512512
{
513513
}
514-
#if !NETSTANDARD1_6
514+
#if !NETSTANDARD1_3
515515
/// <summary>Constructor for serialisation.</summary>
516516
protected FiniteStateMachineException(SerializationInfo info, StreamingContext context)
517517
: base(info, context)

‎src/NetMQ/project.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"version": "4.0.0.0",
3-
"projectUrl": "https://github.com/zeromq/netmq",
43
"title": "NetMQ",
54
"description": "A 100% native C# port of the lightweight high performance messaging library ZeroMQ",
65
"packOptions": {
76
"summary": "A 100% native C# port of the lightweight high performance messaging library ZeroMQ",
87
"licenseUrl": "https://github.com/zeromq/netmq/blob/master/COPYING.LESSER",
98
"iconUrl": "https://raw.githubusercontent.com/zeromq/netmq/master/img/NetMQ.ico",
9+
"projectUrl": "https://github.com/zeromq/netmq",
1010
"repository": {
1111
"type": "git",
1212
"url": "https://github.com/zeromq/netmq"
@@ -19,14 +19,14 @@
1919
"keyFile": "./NetMQ.snk"
2020
},
2121
"dependencies": {
22-
"AsyncIO": "0.1.20.0",
22+
"AsyncIO": "0.1.21",
2323
"JetBrains.Annotations": {
2424
"version": "10.1.5",
2525
"type": "build"
2626
}
2727
},
2828
"frameworks": {
29-
"netstandard1.6": {
29+
"netstandard1.3": {
3030
"dependencies": {
3131
"NETStandard.Library": "1.6.0",
3232
"System.ServiceModel.Primitives": "4.1.0",

0 commit comments

Comments
 (0)