Merge pull request #1129 from drewnoakes/review-conditional-code

Review conditional code

Author: drewnoakes

src/Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
 
   <PropertyGroup>
-    <LangVersion>10</LangVersion>
+    <LangVersion>13</LangVersion>
     <Nullable>enable</Nullable>
     <ProduceReferenceAssembly>true</ProduceReferenceAssembly>
     <AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>

src/NetMQ.Tests/ClientServer.cs

@@ -82,10 +82,9 @@ public async Task AsyncWithCancellationToken()
             await Assert.ThrowsAnyAsync<OperationCanceledException>(async () => await server.ReceiveStringAsync(source.Token));
         }
 
-#if NETCOREAPP3_1
-
+#if NETSTANDARD || NET
         [Fact(Timeout = 120)]
-        public async void AsyncEnumerableCanceled()
+        public async Task AsyncEnumerableCanceled()
         {
             using CancellationTokenSource source = new CancellationTokenSource();
             using var server = new ServerSocket();
@@ -100,7 +99,7 @@ await Assert.ThrowsAnyAsync<OperationCanceledException>(async () =>
         }
 
         [Fact(Timeout = 1000)]
-        public void AsyncEnumerable()
+        public async Task AsyncEnumerable()
         {
             using var server = new ServerSocket();
             int port = server.BindRandomPort("tcp://*");
@@ -152,12 +151,10 @@ public void AsyncEnumerable()
             client.Send("1");
             client.Send("1");
 
-            t1.Wait();
-            t2.Wait();
+            await Task.WhenAll(t1, t2);
 
             Assert.Equal(15002, totalCount);
         }
-
 #endif
     }
 }

src/NetMQ.Tests/NetMQPollerTest.cs

@@ -1,4 +1,6 @@
 using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.Net;
 using System.Net.Sockets;
@@ -8,11 +10,6 @@
 using NetMQ.Sockets;
 using Xunit;
 
-#if !NET35
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-#endif
-
 // ReSharper disable AccessToDisposedClosure
 
 namespace NetMQ.Tests
@@ -864,7 +861,6 @@ public void NativeSocket()
 
         #region TaskScheduler tests
 
-#if !NET35
         [Fact]
         public async Task OneTask()
         {
@@ -989,13 +985,11 @@ public async Task TwoThreads()
                 Assert.Equal(100, count2);
             }
         }
-#endif
 
         #endregion
 
         #region ISynchronizeInvoke tests
 
-#if NET451
         [Fact]
         public void ISynchronizeInvokeWorks()
         {
@@ -1017,8 +1011,7 @@ public void ISynchronizeInvokeWorks()
                 Assert.True(isCorrectThread);
             }
         }
-#endif
 
-#endregion
+        #endregion
     }
 }

src/NetMQ.Tests/NetMQQueueTests.cs

@@ -1,6 +1,4 @@
-#if !NET35
-using System;
-using System.Net.Sockets;
+using System;
 using System.Threading;
 using System.Threading.Tasks;
 using NetMQ.Sockets;
@@ -81,4 +79,3 @@ public void WithPoller()
         }
     }
 }
-#endif

src/NetMQ.Tests/RequestWithRetryTests.cs

@@ -1,5 +1,4 @@
-#if !NET35
-using System;
+using System;
 using System.Diagnostics;
 using NetMQ.Sockets;
 using Xunit;
@@ -205,4 +204,3 @@ public void RequestResponseStringWithRetrySucceedsNotOnFirstTry()
         }
     }
 }
-#endif

src/NetMQ.Tests/ThrowingTraceListener.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Diagnostics;
-using System.Runtime.Serialization;
 
 namespace NetMQ.Tests
 {
@@ -19,7 +18,6 @@ public override void WriteLine(string? message)
         {
         }
 
-        [Serializable]
         public class DebugAssertFailureException : Exception
         {
             public DebugAssertFailureException()
@@ -33,10 +31,6 @@ public DebugAssertFailureException(string message) : base(message)
             public DebugAssertFailureException(string message, Exception inner) : base(message, inner)
             {
             }
-
-            protected DebugAssertFailureException(SerializationInfo info, StreamingContext context) : base(info, context)
-            {
-            }
         }
     }
 }

src/NetMQ/Core/Mailbox.cs

@@ -19,7 +19,6 @@ You should have received a copy of the GNU Lesser General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-using System;
 using System.Diagnostics;
 using System.Net.Sockets;
 using NetMQ.Core.Utils;

src/NetMQ/Core/Mechanisms/CurveClientMechanism.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Diagnostics;
 using System.Security.Cryptography;
 using System.Text;
 using NaCl;

src/NetMQ/Core/Mechanisms/CurveServerMechanism.cs

@@ -1,7 +1,5 @@
 using System;
-using System.Linq;
 using System.Security.Cryptography;
-using System.Text;
 using NaCl;
 using NetMQ.Core.Utils;
 

src/NetMQ/Core/Mechanisms/Mechanism.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Text;
 using NetMQ.Core.Utils;
@@ -191,7 +190,7 @@ protected void AddBasicProperties(Span<byte> output)
                 }
                 else
                 {
-                    written = AddProperty(output, ZmtpPropertyIdentity, new byte[0]);
+                    written = AddProperty(output, ZmtpPropertyIdentity, []);
                     output = output.Slice(written);
                 }
             }

src/NetMQ/Core/Mechanisms/NullMechanism.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Text;
 using NetMQ.Core.Utils;
 
 namespace NetMQ.Core.Mechanisms

src/NetMQ/Core/Patterns/Client.cs

@@ -1,4 +1,3 @@
-using System.Diagnostics;
 using NetMQ.Core.Patterns.Utils;
 
 namespace NetMQ.Core.Patterns

src/NetMQ/Core/Patterns/Dealer.cs

@@ -19,7 +19,6 @@ You should have received a copy of the GNU Lesser General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-using System.Diagnostics;
 using NetMQ.Core.Patterns.Utils;
 
 namespace NetMQ.Core.Patterns

src/NetMQ/Core/Patterns/Gather.cs

@@ -1,4 +1,3 @@
-using System.Diagnostics;
 using NetMQ.Core.Patterns.Utils;
 
 namespace NetMQ.Core.Patterns

src/NetMQ/Core/Patterns/Pair.cs

@@ -19,8 +19,6 @@ You should have received a copy of the GNU Lesser General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-using System.Diagnostics;
-
 namespace NetMQ.Core.Patterns
 {
     internal sealed class Pair : SocketBase

src/NetMQ/Core/Patterns/Peer.cs

@@ -23,9 +23,7 @@ You should have received a copy of the GNU Lesser General Public License
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Threading;
 using NetMQ.Core.Patterns.Utils;
-using NetMQ.Core.Utils;
 
 namespace NetMQ.Core.Patterns
 {

src/NetMQ/Core/Patterns/Pull.cs

@@ -19,7 +19,6 @@ You should have received a copy of the GNU Lesser General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-using System.Diagnostics;
 using NetMQ.Core.Patterns.Utils;
 
 namespace NetMQ.Core.Patterns

src/NetMQ/Core/Patterns/Push.cs

@@ -19,7 +19,6 @@ You should have received a copy of the GNU Lesser General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-using System.Diagnostics;
 using NetMQ.Core.Patterns.Utils;
 
 namespace NetMQ.Core.Patterns

src/NetMQ/Core/Patterns/Radio.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
 using System.Text;
 using NetMQ.Core.Patterns.Utils;

src/NetMQ/Core/Patterns/Scatter.cs

@@ -1,4 +1,3 @@
-using System.Diagnostics;
 using NetMQ.Core.Patterns.Utils;
 
 namespace NetMQ.Core.Patterns

src/NetMQ/Core/Patterns/Utils/LoadBalancer.cs

@@ -22,7 +22,6 @@ You should have received a copy of the GNU Lesser General Public License
 
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
 
 namespace NetMQ.Core.Patterns.Utils
 {

src/NetMQ/Core/Patterns/Utils/MultiTrie.cs

@@ -149,7 +149,7 @@ private bool AddHelper(Span<byte> prefix, [NotNull] Pipe pipe)
         /// <returns></returns>
         public bool RemoveHelper([NotNull] Pipe pipe, [NotNull] MultiTrieDelegate func, [CanBeNull] object arg)
         {
-            return RemoveHelper(pipe, EmptyArray<byte>.Instance, 0, 0, func, arg);
+            return RemoveHelper(pipe, [], 0, 0, func, arg);
         }
 
         private bool RemoveHelper([NotNull] Pipe pipe, [NotNull] byte[] buffer, int bufferSize, int maxBufferSize, [NotNull] MultiTrieDelegate func, [CanBeNull] object arg)

src/NetMQ/Core/Patterns/XPub.cs

@@ -21,7 +21,6 @@ You should have received a copy of the GNU Lesser General Public License
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Text;
 using NetMQ.Core.Patterns.Utils;
 

src/NetMQ/Core/Transports/DecoderBase.cs

@@ -20,7 +20,6 @@ You should have received a copy of the GNU Lesser General Public License
 */
 
 using System;
-using System.Diagnostics;
 
 namespace NetMQ.Core.Transports
 {

src/NetMQ/Core/Transports/EncoderBase.cs

@@ -69,7 +69,7 @@ protected EncoderBase(int bufferSize, Endianness endian)
         public void Dispose()
         {
             if (m_inProgress.IsInitialised)
-            m_inProgress.Close();
+                m_inProgress.Close();
         }
 
         /// <summary>
@@ -141,7 +141,7 @@ public int Encode(ref ByteArraySegment? data, int size)
             return pos;
         }
 
-        public void LoadMsg (ref Msg msg)
+        public void LoadMsg(ref Msg msg)
         {
             m_inProgress = msg;
             m_hasMessage = true;

src/NetMQ/Core/Transports/RawDecoder.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Diagnostics;
 
 namespace NetMQ.Core.Transports
 {

src/NetMQ/Core/Transports/StreamEngine.cs

@@ -29,7 +29,6 @@ You should have received a copy of the GNU Lesser General Public License
 using AsyncIO;
 using JetBrains.Annotations;
 using NetMQ.Core.Mechanisms;
-using NetMQ.Core.Patterns;
 using NetMQ.Core.Utils;
 
 namespace NetMQ.Core.Transports

src/NetMQ/Core/Utils/Signaler.cs

@@ -72,22 +72,14 @@ public void Close()
 
             try
             {
-#if NET35
-                m_writeSocket.Close();
-#else
                 m_writeSocket.Dispose();
-#endif
             }
             catch (SocketException)
             {}
 
             try
             {
-#if NET35
-                m_readSocket.Close();
-#else
                 m_readSocket.Dispose();
-#endif
             }
             catch (SocketException)
             {}

src/NetMQ/Core/Utils/SocketUtility.cs

@@ -47,12 +47,6 @@ internal static class SocketUtility
         /// <exception cref="SocketException">an error occurred when attempting to access the socket.</exception>
         public static void Select(IList? checkRead, IList? checkWrite, IList? checkError, int microSeconds)
         {
-#if NET35
-            // .NET 3.5 has a bug, such that -1 is not blocking the select call - therefore we use here instead the maximum integer value.
-            if (microSeconds == -1)
-                microSeconds = int.MaxValue;
-#endif
-
             Socket.Select(checkRead, checkWrite, checkError, microSeconds);
         }
     }

src/NetMQ/Core/Utils/StringLib.cs

@@ -110,7 +110,7 @@ public static string AsString(this Socket socket)
                 {
                     sb.Append("IsBound,");
                 }
-                if (socket.LingerState.Enabled)
+                if (socket.LingerState?.Enabled == true)
                 {
                     sb.Append("LingerTime=");
                     sb.Append(socket.LingerState.LingerTime);

src/NetMQ/Core/Utils/Switch.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Threading;
+using System.Threading;
 
 namespace NetMQ.Core.Utils
 {

src/NetMQ/Core/ZmqSocketOption.cs

@@ -1,6 +1,4 @@
-using System;
-
-namespace NetMQ.Core
+namespace NetMQ.Core
 {
     /// <summary>
     /// This enum-type serves to identity a particular socket-option.