Make ServiceStack.Redis compilable on .NET Core

Author: xplicit

src/ServiceStack.Redis.NetCore/ServiceStack.Redis/project.json

@@ -20,6 +20,7 @@
     "ServiceStack.Common" : "4.0.*",
   },
   "compile": ["../../ServiceStack.Redis/**/*.cs"],
+  "exclude": ["../../ServiceStack.Redis/RedisPipeline.cs"],
   "frameworks": {
     "netstandard1.3": {
         "dependencies" : {
@@ -37,7 +38,8 @@
 	     "System.Reflection.Emit" : "4.0.1",
 	     "System.Reflection.Emit.Lightweight": "4.0.1",
              "System.Collections.Specialized": "4.0.1",
-             "System.Collections.NonGeneric": "4.0.1"
+             "System.Collections.NonGeneric": "4.0.1",
+	     "System.Security.Cryptography.Algorithms" : "4.2.0"
          }
      }
 

src/ServiceStack.Redis/BufferedStream.cs

@@ -0,0 +1,89 @@
+#if NETSTANDARD
+using System;
+using System.IO;
+using System.Net.Sockets;
+
+namespace ServiceStack.Redis
+{
+    public sealed class BufferedStream : Stream
+    {
+        NetworkStream networkStream;
+
+        public BufferedStream(Stream stream)
+            : this(stream, 0)
+        {
+        }
+
+        public BufferedStream(Stream stream, int bufferSize)
+        {
+            networkStream = stream as NetworkStream;
+
+            if (networkStream == null)
+                throw new ArgumentNullException("stream");
+        }
+
+
+/*        public BufferedStream(Stream stream)
+            : this(stream, 0)
+        {
+        }
+
+        public BufferedStream(Stream stream, int bufferSize) : base (stream)
+        {
+            if (stream == null)
+                throw new ArgumentNullException("stream");
+        }
+        */
+        public override bool CanRead
+        {
+            get { return networkStream.CanRead; }
+        }
+
+        public override bool CanSeek
+        {
+            get { return networkStream.CanSeek; }
+        }
+
+        public override bool CanWrite
+        {
+            get { return networkStream.CanWrite; }
+        }
+
+        public override long Position
+        {
+            get { return networkStream.Position; }
+            set { networkStream.Position = value; }
+        }
+
+        public override long Length
+        {
+            get { return networkStream.Length; }
+        }
+
+        public override int Read(byte[] buffer, int offset, int length)
+        {
+            return networkStream.Read(buffer, offset, length);
+        }
+
+        public override void Write(byte[] buffer, int offset, int length)
+        {
+            networkStream.Write(buffer, offset, length);
+        }
+
+        public override void Flush()
+        {
+            networkStream.Flush();
+        }
+
+        public override void SetLength(long length)
+        {
+            networkStream.SetLength(length);
+        }
+
+        public override long Seek(long position, SeekOrigin origin)
+        {
+            return networkStream.Seek(position, origin);
+        }
+    }
+}
+#endif

src/ServiceStack.Redis/RedisNativeClient.cs

@@ -2480,19 +2480,31 @@ private void SafeConnectionClose()
             {
                 // workaround for a .net bug: http://support.microsoft.com/kb/821625
                 if (Bstream != null)
+#if NETSTANDARD
+                    Bstream.Dispose();
+#else
                     Bstream.Close();
+#endif
             }
             catch { }
             try
             {
                 if (sslStream != null)
+#if NETSTANDARD
+                    sslStream.Dispose();
+#else
                     sslStream.Close();
+#endif
             }
             catch { }
             try
             {
                 if (socket != null)
+#if NETSTANDARD
+                    socket.Dispose();
+#else
                     socket.Close();
+#endif
             }
             catch { }
 

src/ServiceStack.Redis/RedisNativeClient_Utils.cs

@@ -83,6 +83,9 @@ private void Connect()
             };
             try
             {
+#if NETSTANDARD
+                socket.Connect(Host, Port);
+#else
                 if (ConnectTimeout <= 0)
                 {
                     socket.Connect(Host, Port);
@@ -92,10 +95,15 @@ private void Connect()
                     var connectResult = socket.BeginConnect(Host, Port, null, null);
                     connectResult.AsyncWaitHandle.WaitOne(ConnectTimeout, true);
                 }
+#endif
 
                 if (!socket.Connected)
                 {
+#if NETSTANDARD
+                    socket.Dispose();
+#else
                     socket.Close();
+#endif
                     socket = null;
                     DeactivatedAt = DateTime.UtcNow;
                     return;
@@ -115,8 +123,13 @@ private void Connect()
                     }
                     else
                     {
+#if NETSTANDARD
+                        var ctor = typeof(SslStream).GetTypeInfo().DeclaredConstructors
+                            .First(x => x.GetParameters().Length == 5);
+#else
                         var ctor = typeof(SslStream).GetConstructors()
                             .First(x => x.GetParameters().Length == 5);
+#endif
 
                         var policyType = AssemblyUtils.FindType("System.Net.Security.EncryptionPolicy");
                         var policyValue = Enum.Parse(policyType, "RequireEncryption");
@@ -130,7 +143,11 @@ private void Connect()
                         });
                     }
 
+#if NETSTANDARD
+                    sslStream.AuthenticateAsClientAsync(Host).Wait();
+#else
                     sslStream.AuthenticateAsClient(Host);
+#endif
 
                     if (!sslStream.IsEncrypted)
                         throw new Exception("Could not establish an encrypted connection to " + Host);
@@ -243,7 +260,11 @@ internal bool AssertConnectedSocket()
                 log.Error(ErrorConnect.Fmt(Host, Port));
 
                 if (socket != null)
+#if NETSTANDARD
+                    socket.Dispose();
+#else
                     socket.Close();
+#endif
 
                 socket = null;
 
@@ -606,7 +627,11 @@ private Exception GetRetryableException(Exception outerEx)
             lastSocketException = socketEx;
 
             if (socket != null)
+#if NETSTANDARD
+                socket.Dispose();
+#else
                 socket.Close();
+#endif
 
             socket = null;
             return socketEx;
@@ -1206,8 +1231,13 @@ public string CalculateSha1(string luaBody)
                 throw new ArgumentNullException("luaBody");
 
             byte[] buffer = Encoding.UTF8.GetBytes(luaBody);
+#if NETSTANDARD
+            var sha1 = SHA1.Create();
+            return BitConverter.ToString(sha1.ComputeHash(buffer)).Replace("-", "");
+#else
             var cryptoTransformSHA1 = new SHA1CryptoServiceProvider();
             return BitConverter.ToString(cryptoTransformSHA1.ComputeHash(buffer)).Replace("-", "");
+#endif
         }
 
         public byte[] ScriptLoad(string luaBody)

src/ServiceStack.Redis/RedisSentinel.cs

@@ -177,9 +177,13 @@ public IRedisClientsManager Start()
                     .ToArray();
 
                 var sentinelWorker = GetValidSentinelWorker();
+#if NETSTANDARD
+                if (this.RedisManager == null || sentinelWorker == null)
+                    throw new Exception("Unable to resolve sentinels!");
+#else
                 if (this.RedisManager == null || sentinelWorker == null)
                     throw new ApplicationException("Unable to resolve sentinels!");
-
+#endif
                 return this.RedisManager;
             }
         }

src/ServiceStack.Redis/Support/Diagnostic/TrackingRedisClientsManager.cs

@@ -1,4 +1,5 @@
-using System;
+#if !NETSTANDARD
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
@@ -31,12 +32,8 @@ public TrackingRedisClientsManager(IRedisClientsManager redisClientsManager)
             this.redisClientsManager = redisClientsManager;
             Logger.DebugFormat("Constructed");
 
-#if NETSTANDARD
-            var timer = new Timer(state => this.DumpState(), null, TimeSpan.FromSeconds(30), TimeSpan.FromMinutes(1));
-#else
             var timer = new Timer(state => this.DumpState());
             timer.Change(TimeSpan.FromSeconds(30), TimeSpan.FromMinutes(1));
-#endif
         }
 
         public void Dispose()
@@ -138,3 +135,4 @@ private void DumpState()
         }
     }
 }
+#endif

src/ServiceStack.Redis/Support/OptimizedObjectSerializer.cs

@@ -2,6 +2,7 @@
 using System.IO;
 using System.Text;
 using ServiceStack.Text;
+using ServiceStack;
 
 namespace ServiceStack.Redis.Support
 {
@@ -60,7 +61,7 @@ SerializedObjectWrapper SerializeToWrapper(object value)
                 return new SerializedObjectWrapper(RawDataFlag, new ArraySegment<byte>(tmpByteArray));
             }
 
-            TypeCode code = value == null ? TypeCode.DBNull : Type.GetTypeCode(value.GetType());
+            TypeCode code = value == null ? TypeCode.DBNull : value.GetType().GetTypeCode();
 
             byte[] data;
             int length = -1;