Merge master branch into netcore

Author: xplicit

.gitignore

@@ -35,8 +35,10 @@ _ReSharper*/
 [Tt]est[Rr]esult*
 App_Data/
 .vs/
-.vscode/
-*.lock.json
+.vscode/
+*.lock.json
+*.nuget.props
+*.nuget.targets
 
 NuGet/
 NuGet.Signed/

README.md

@@ -258,10 +258,10 @@ The [Redis Stats wiki](https://github.com/ServiceStack/ServiceStack.Redis/wiki/R
 
 To improve the resilience of client connections, `RedisClient` will transparently retry failed 
 Redis operations due to Socket and I/O Exceptions in an exponential backoff starting from 
-**10ms** up until the `RetryTimeout` of **3000ms**. These defaults can be tweaked with:
+**10ms** up until the `RetryTimeout` of **10000ms**. These defaults can be tweaked with:
 
 ```csharp
-RedisConfig.DefaultRetryTimeout = 3000;
+RedisConfig.DefaultRetryTimeout = 10000;
 RedisConfig.BackOffMultiplier = 10;
 ```
 

lib/ServiceStack.Client.dll

@@ -0,0 +1,8 @@
+SET BUILD=Debug
+REM SET BUILD=Release
+
+COPY ..\..\..\ServiceStack.Text\src\ServiceStack.Text\bin\%BUILD%\netstandard1.1\ServiceStack.Text.* .\
+COPY ..\..\..\ServiceStack.Text\src\ServiceStack.Text\bin\%BUILD%\netstandard1.3\ServiceStack.Text.* ..\netstandard1.3\
+COPY ..\..\..\ServiceStack\src\ServiceStack.Common\bin\%BUILD%\netstandard1.3\ServiceStack.Common.* ..\netstandard1.3
+COPY ..\..\..\ServiceStack\src\ServiceStack.Interfaces\bin\%BUILD%\netstandard1.1\ServiceStack.Interfaces.* .\
+

lib/ServiceStack.Common.dll

@@ -0,0 +1,8 @@
+SET BUILD=Debug
+REM SET BUILD=Release
+
+COPY ..\..\..\ServiceStack.Text\src\ServiceStack.Text\bin\%BUILD%\netstandard1.1\ServiceStack.Text.* ..\netstandard1.1\
+COPY ..\..\..\ServiceStack.Text\src\ServiceStack.Text\bin\%BUILD%\netstandard1.3\ServiceStack.Text.* .
+COPY ..\..\..\ServiceStack\src\ServiceStack.Common\bin\%BUILD%\netstandard1.3\ServiceStack.Common.* .
+COPY ..\..\..\ServiceStack\src\ServiceStack.Interfaces\bin\%BUILD%\netstandard1.1\ServiceStack.Interfaces.* ..\netstandard1.1\
+

lib/ServiceStack.Interfaces.dll

@@ -10,80 +10,35 @@ public sealed class BufferedStream : Stream
         NetworkStream networkStream;
 
         public BufferedStream(Stream stream)
-            : this(stream, 0)
-        {
-        }
+            : 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)
-        {
+            networkStream = (NetworkStream)stream;
         }
+        public override bool CanRead => networkStream.CanRead;
 
-        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 CanSeek => networkStream.CanSeek;
 
-        public override bool CanWrite
-        {
-            get { return networkStream.CanWrite; }
-        }
+        public override bool CanWrite => networkStream.CanWrite;
 
         public override long Position
         {
             get { return networkStream.Position; }
             set { networkStream.Position = value; }
         }
 
-        public override long Length
-        {
-            get { return networkStream.Length; }
-        }
+        public override long Length => networkStream.Length;
 
-        public override int Read(byte[] buffer, int offset, int length)
-        {
-            return networkStream.Read(buffer, offset, length);
-        }
+        public override int Read(byte[] buffer, int offset, int length) => networkStream.Read(buffer, offset, length);
 
-        public override void Write(byte[] buffer, int offset, int length)
-        {
-            networkStream.Write(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 Flush() => networkStream.Flush();
 
-        public override void SetLength(long length)
-        {
-            networkStream.SetLength(length);
-        }
+        public override void SetLength(long length) => networkStream.SetLength(length);
 
-        public override long Seek(long position, SeekOrigin origin)
-        {
-            return networkStream.Seek(position, origin);
-        }
+        public override long Seek(long position, SeekOrigin origin) => networkStream.Seek(position, origin);
     }
 }
 #endif