Rename NETSTANDARD->NETSTANDARD1_3 according to MS specs

xplicit · xplicit · commit 61a422649262 · 2016-09-01T20:37:20.000+07:00
diff --git a/src/ServiceStack.Redis.NetCore/ServiceStack.Common/project.json b/src/ServiceStack.Redis.NetCore/ServiceStack.Common/project.json
@@ -18,7 +18,7 @@
     "ServiceStack.Text" : "1.0.*"	
   },
   "frameworks": {
-    "netstandard1.2": { 
+    "netstandard1.3": { 
 	"buildOptions" : {
 	    "define": ["NETSTANDARD1_1"]
 	},
diff --git a/src/ServiceStack.Redis.NetCore/ServiceStack.Redis/project.json b/src/ServiceStack.Redis.NetCore/ServiceStack.Redis/project.json
@@ -2,12 +2,12 @@
   "configurations": {
     "Debug": {
       "buildOptions": {
-        "define": ["NETSTANDARD", "DEBUG", "TRACE"]
+        "define": ["DEBUG", "TRACE"]
       }
     },
     "Release": {
       "buildOptions": {
-        "define": ["NETSTANDARD", "TRACE"],
+        "define": ["TRACE"],
         "optimize": true
       }
     }
diff --git a/src/ServiceStack.Redis/BufferedStream.cs b/src/ServiceStack.Redis/BufferedStream.cs
@@ -1,4 +1,4 @@
-#if NETSTANDARD
+#if NETSTANDARD1_3
 using System;
 using System.IO;
 using System.Net.Sockets;
diff --git a/src/ServiceStack.Redis/RedisNativeClient.cs b/src/ServiceStack.Redis/RedisNativeClient.cs
@@ -2455,7 +2455,7 @@ private void SafeConnectionClose()
             {
                 // workaround for a .net bug: http://support.microsoft.com/kb/821625
                 if (Bstream != null)
-#if NETSTANDARD
+#if NETSTANDARD1_3
                     Bstream.Dispose();
 #else
                     Bstream.Close();
@@ -2465,7 +2465,7 @@ private void SafeConnectionClose()
             try
             {
                 if (sslStream != null)
-#if NETSTANDARD
+#if NETSTANDARD1_3
                     sslStream.Dispose();
 #else
                     sslStream.Close();
@@ -2475,7 +2475,7 @@ private void SafeConnectionClose()
             try
             {
                 if (socket != null)
-#if NETSTANDARD
+#if NETSTANDARD1_3
                     socket.Dispose();
 #else
                     socket.Close();
diff --git a/src/ServiceStack.Redis/RedisNativeClient_Utils.cs b/src/ServiceStack.Redis/RedisNativeClient_Utils.cs
@@ -83,7 +83,7 @@ private void Connect()
             };
             try
             {
-#if NETSTANDARD
+#if NETSTANDARD1_3
                 var addresses = Dns.GetHostAddressesAsync(Host).Result;
                 socket.Connect(addresses.FirstOrDefault(a => a.AddressFamily == AddressFamily.InterNetwork), Port);
 #else
@@ -100,7 +100,7 @@ private void Connect()
 
                 if (!socket.Connected)
                 {
-#if NETSTANDARD
+#if NETSTANDARD1_3
                     socket.Dispose();
 #else
                     socket.Close();
@@ -124,7 +124,7 @@ private void Connect()
                     }
                     else
                     {
-#if NETSTANDARD
+#if NETSTANDARD1_3
                         var ctor = typeof(SslStream).GetTypeInfo().DeclaredConstructors
                             .First(x => x.GetParameters().Length == 5);
 #else
@@ -144,7 +144,7 @@ private void Connect()
                         });
                     }
 
-#if NETSTANDARD
+#if NETSTANDARD1_3
                     sslStream.AuthenticateAsClientAsync(Host).Wait();
 #else
                     sslStream.AuthenticateAsClient(Host);
@@ -261,7 +261,7 @@ internal bool AssertConnectedSocket()
                 log.Error(ErrorConnect.Fmt(Host, Port));
 
                 if (socket != null)
-#if NETSTANDARD
+#if NETSTANDARD1_3
                     socket.Dispose();
 #else
                     socket.Close();
@@ -603,7 +603,7 @@ protected T SendReceive<T>(byte[][] cmdWithBinaryArgs,
                     }
 
                     Interlocked.Increment(ref RedisState.TotalRetryCount);
-#if NETSTANDARD
+#if NETSTANDARD1_3
                     Task.Delay(GetBackOffMultiplier(++i)).Wait();
 #else
                     Thread.Sleep(GetBackOffMultiplier(++i));
@@ -633,7 +633,7 @@ private Exception GetRetryableException(Exception outerEx)
             lastSocketException = socketEx;
 
             if (socket != null)
-#if NETSTANDARD
+#if NETSTANDARD1_3
                 socket.Dispose();
 #else
                 socket.Close();
@@ -1279,7 +1279,7 @@ public string CalculateSha1(string luaBody)
                 throw new ArgumentNullException("luaBody");
 
             byte[] buffer = Encoding.UTF8.GetBytes(luaBody);
-#if NETSTANDARD
+#if NETSTANDARD1_3
             var sha1 = SHA1.Create();
             return BitConverter.ToString(sha1.ComputeHash(buffer)).Replace("-", "");
 #else
diff --git a/src/ServiceStack.Redis/RedisPubSubServer.cs b/src/ServiceStack.Redis/RedisPubSubServer.cs
@@ -41,7 +41,7 @@ public class RedisPubSubServer : IRedisPubSubServer
         private int noOfContinuousErrors = 0;
         private string lastExMsg = null;
         private int status;
-#if !NETSTANDARD
+#if !NETSTANDARD1_3
         private Thread bgThread; //Subscription controller thread
 #endif
         private long bgThreadCount = 0;
@@ -111,7 +111,7 @@ public IRedisPubSubServer Start()
                     if (OnStart != null)
                         OnStart();
 
-#if NETSTANDARD
+#if NETSTANDARD1_3
                     RunLoop();
 #else
                     //Don't kill us if we're the thread that's retrying to Start() after a failure.
@@ -336,7 +336,7 @@ private void RunLoop()
             if (AutoRestart && Interlocked.CompareExchange(ref status, 0, 0) != Status.Disposed)
             {
                 if (WaitBeforeNextRestart != null)
-#if NETSTANDARD
+#if NETSTANDARD1_3
                     Task.Delay(WaitBeforeNextRestart.Value).Wait();
 #else
                     Thread.Sleep(WaitBeforeNextRestart.Value);
@@ -442,7 +442,7 @@ public void Restart()
             Stop(shouldRestart:true);
         }
 
-#if !NETSTANDARD
+#if !NETSTANDARD1_3
         private void KillBgThreadIfExists()
         {
             if (bgThread != null && bgThread.IsAlive)
@@ -477,7 +477,7 @@ private void SleepBackOffMultiplier(int continuousErrorsCount)
             if (Log.IsDebugEnabled)
                 Log.Debug("Sleeping for {0}ms after {1} continuous errors".Fmt(nextTry, continuousErrorsCount));
 
-#if NETSTANDARD
+#if NETSTANDARD1_3
             Task.Delay(nextTry).Wait();
 #else
             Thread.Sleep(nextTry);
@@ -575,7 +575,7 @@ public virtual void Dispose()
                 Log.Error("Error OnDispose(): ", ex);
             }
 
-#if !NETSTANDARD
+#if !NETSTANDARD1_3
             try
             {
                 Thread.Sleep(100); //give it a small chance to die gracefully
diff --git a/src/ServiceStack.Redis/RedisSentinel.cs b/src/ServiceStack.Redis/RedisSentinel.cs
@@ -177,7 +177,7 @@ public IRedisClientsManager Start()
                     .ToArray();
 
                 var sentinelWorker = GetValidSentinelWorker();
-#if NETSTANDARD
+#if NETSTANDARD1_3
                 if (this.RedisManager == null || sentinelWorker == null)
                     throw new Exception("Unable to resolve sentinels!");
 #else
@@ -334,7 +334,7 @@ private RedisSentinelWorker GetValidSentinelWorker()
             }
 
             this.failures = 0; //reset
-#if NETSTANDARD
+#if NETSTANDARD1_3
             Task.Delay(WaitBetweenFailedHosts).Wait();
 #else
             Thread.Sleep(WaitBetweenFailedHosts);
diff --git a/src/ServiceStack.Redis/RedisSentinelResolver.cs b/src/ServiceStack.Redis/RedisSentinelResolver.cs
@@ -151,7 +151,7 @@ public virtual RedisClient CreateRedisClient(RedisEndpoint config, bool master)
                                 Interlocked.Increment(ref RedisState.TotalForcedMasterFailovers);
 
                                 sentinel.ForceMasterFailover();
-#if NETSTANDARD
+#if NETSTANDARD1_3
                                 Task.Delay(sentinel.WaitBetweenFailedHosts).Wait();
 #else
                                 Thread.Sleep(sentinel.WaitBetweenFailedHosts);
@@ -196,7 +196,7 @@ public virtual RedisClient CreateRedisClient(RedisEndpoint config, bool master)
                                 throw new TimeoutException("Max Wait Between Sentinel Lookups Elapsed: {0}"
                                     .Fmt(sentinel.MaxWaitBetweenFailedHosts.ToString()));
 
-#if NETSTANDARD
+#if NETSTANDARD1_3
                             Task.Delay(sentinel.WaitBetweenFailedHosts);
 #else
                             Thread.Sleep(sentinel.WaitBetweenFailedHosts);
diff --git a/src/ServiceStack.Redis/Support/Diagnostic/TrackingRedisClientProxy.cs b/src/ServiceStack.Redis/Support/Diagnostic/TrackingRedisClientProxy.cs
@@ -1,4 +1,4 @@
-#if !NETSTANDARD
+#if !NETSTANDARD1_3
 using System;
 using System.Reflection;
 using System.Runtime.Remoting.Messaging;
diff --git a/src/ServiceStack.Redis/Support/Diagnostic/TrackingRedisClientsManager.cs b/src/ServiceStack.Redis/Support/Diagnostic/TrackingRedisClientsManager.cs
@@ -1,4 +1,4 @@
-﻿#if !NETSTANDARD
+﻿#if !NETSTANDARD1_3
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
diff --git a/src/ServiceStack.Redis/Support/Locking/DistributedLock.cs b/src/ServiceStack.Redis/Support/Locking/DistributedLock.cs
@@ -40,7 +40,7 @@ public virtual long Lock(string key, int acquisitionTimeout, int lockTimeout, ou
 				int count = 0;
 				while (wasSet == 0 && count < tryCount && totalTime < acquisitionTimeout)
 				{
-#if NETSTANDARD
+#if NETSTANDARD1_3
 					System.Threading.Tasks.Task.Delay(sleepIfLockSet).Wait();
 #else
 					System.Threading.Thread.Sleep(sleepIfLockSet);
@@ -82,7 +82,7 @@ public virtual long Lock(string key, int acquisitionTimeout, int lockTimeout, ou
 					}
 				}
                 if (wasSet != LOCK_NOT_ACQUIRED) break;
-#if NETSTANDARD
+#if NETSTANDARD1_3
 				System.Threading.Tasks.Task.Delay(sleepIfLockSet).Wait();
 #else
 				System.Threading.Thread.Sleep(sleepIfLockSet);
diff --git a/src/ServiceStack.Redis/Support/ObjectSerializer.cs b/src/ServiceStack.Redis/Support/ObjectSerializer.cs
@@ -1,5 +1,5 @@
 ﻿using System.IO;
-#if !NETSTANDARD
+#if !NETSTANDARD1_3
 using System.Runtime.Serialization.Formatters.Binary;
 #endif
 
@@ -11,7 +11,7 @@ namespace ServiceStack.Redis.Support
 	/// </summary>
 	public class ObjectSerializer : ISerializer
 	{
-#if !NETSTANDARD
+#if !NETSTANDARD1_3
 		protected readonly BinaryFormatter bf = new BinaryFormatter();
 #endif 
 
@@ -23,7 +23,7 @@ public class ObjectSerializer : ISerializer
 		/// <returns></returns>
 		public virtual byte[] Serialize(object value)
 		{
-#if NETSTANDARD
+#if NETSTANDARD1_3
 			return null;
 #else
 			if (value == null)
@@ -42,7 +42,7 @@ public virtual byte[] Serialize(object value)
 		/// <returns></returns>
 		public virtual object Deserialize(byte[] someBytes)
 		{
-#if NETSTANDARD
+#if NETSTANDARD1_3
 			return null;
 #else
 			if (someBytes == null)
diff --git a/src/ServiceStack.Redis/Support/OptimizedObjectSerializer.cs b/src/ServiceStack.Redis/Support/OptimizedObjectSerializer.cs
@@ -122,7 +122,7 @@ SerializedObjectWrapper SerializeToWrapper(object value)
                     break;
 
                 default:
-#if NETSTANDARD
+#if NETSTANDARD1_3
 		    data = new byte[0];
                     length = 0;
 #else
@@ -231,7 +231,7 @@ object Unwrap(SerializedObjectWrapper item)
                 case TypeCode.Object:
                     using (var ms = new MemoryStream(data, offset, count))
                     {
-#if NETSTANDARD
+#if NETSTANDARD1_3
 			return null;
 #else
                         return bf.Deserialize(ms);
diff --git a/src/ServiceStack.Redis/Support/OrderedDictionary.cs b/src/ServiceStack.Redis/Support/OrderedDictionary.cs
@@ -17,7 +17,7 @@ public class OrderedDictionary<TKey, TValue> : IOrderedDictionary<TKey, TValue>
 		private static readonly string KeyTypeName = typeof(TKey).FullName;
 		private static readonly string ValueTypeName = typeof(TValue).FullName;
 		private static readonly bool ValueTypeIsReferenceType =
-#if NETSTANDARD
+#if NETSTANDARD1_3
 	!typeof(ValueType).GetTypeInfo().IsAssignableFrom(typeof(TValue).GetTypeInfo());
 #else
 	!typeof(ValueType).IsAssignableFrom(typeof(TValue));
diff --git a/src/ServiceStack.Redis/Support/SerializedObjectWrapper.cs b/src/ServiceStack.Redis/Support/SerializedObjectWrapper.cs
@@ -6,7 +6,7 @@ namespace ServiceStack.Redis.Support
 	/// wraps a serialized representation of an object
 	/// </summary>
 	///
-#if !NETSTANDARD 
+#if !NETSTANDARD1_3 
 	[Serializable]
 #endif
 	public struct SerializedObjectWrapper

Original file line number	Diff line number	Diff line change
`@@ -2,12 +2,12 @@`
`2`	`2`	`"configurations": {`
`3`	`3`	`"Debug": {`
`4`	`4`	`"buildOptions": {`
`5`		`- "define": ["NETSTANDARD", "DEBUG", "TRACE"]`
	`5`	`+ "define": ["DEBUG", "TRACE"]`
`6`	`6`	`}`
`7`	`7`	`},`
`8`	`8`	`"Release": {`
`9`	`9`	`"buildOptions": {`
`10`		`- "define": ["NETSTANDARD", "TRACE"],`
	`10`	`+ "define": ["TRACE"],`
`11`	`11`	`"optimize": true`
`12`	`12`	`}`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#if NETSTANDARD`
	`1`	`+#if NETSTANDARD1_3`
`2`	`2`	`using System;`
`3`	`3`	`using System.IO;`
`4`	`4`	`using System.Net.Sockets;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#if !NETSTANDARD`
	`1`	`+#if !NETSTANDARD1_3`
`2`	`2`	`using System;`
`3`	`3`	`using System.Reflection;`
`4`	`4`	`using System.Runtime.Remoting.Messaging;`