Fix Volatile-related build errors for other non-dnxcore projects.

StackExchange.Redis/StackExchange.Redis.StrongName.csproj

@@ -81,6 +81,7 @@
   <ItemGroup>
     <Compile Include="StackExchange\Redis\Aggregate.cs" />
     <Compile Include="StackExchange\Redis\ClientType.cs" />
+    <Compile Include="StackExchange\Redis\Compat\VolatileWrapper.cs" />
     <Compile Include="StackExchange\Redis\ConcurrentProfileStorageCollection.cs" />
     <Compile Include="StackExchange\Redis\ConnectionMultiplexer.Profiling.cs">
       <DependentUpon>ConnectionMultiplexer.cs</DependentUpon>

StackExchange.Redis/StackExchange.Redis.csproj

@@ -75,6 +75,7 @@
   <ItemGroup>
     <Compile Include="StackExchange\Redis\Aggregate.cs" />
     <Compile Include="StackExchange\Redis\ClientType.cs" />
+    <Compile Include="StackExchange\Redis\Compat\VolatileWrapper.cs" />
     <Compile Include="StackExchange\Redis\ConcurrentProfileStorageCollection.cs" />
     <Compile Include="StackExchange\Redis\ConnectionMultiplexer.Profiling.cs">
       <DependentUpon>ConnectionMultiplexer.cs</DependentUpon>

StackExchange.Redis/StackExchange/Redis/Compat/VolatileWrapper.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace StackExchange.Redis
+{
+    internal static class VolatileWrapper
+    {
+        public static int Read(ref int location)
+        {
+#if !NETCORE
+            return System.Threading.Thread.VolatileRead(ref location);
+#else
+            return System.Threading.Volatile.Read(ref location);
+#endif
+        }
+
+        public static void Write(ref int address, int value)
+        {
+#if !NETCORE
+            System.Threading.Thread.VolatileWrite(ref address, value);
+#else
+            System.Threading.Volatile.Write(ref address, value);
+#endif
+        }
+    }
+}

StackExchange.Redis/StackExchange/Redis/ConnectionMultiplexer.cs

@@ -941,11 +941,11 @@ private void OnHeartbeat()
         internal long LastHeartbeatSecondsAgo {
             get {
                 if (pulse == null) return -1;
-                return unchecked(Environment.TickCount - Volatile.Read(ref lastHeartbeatTicks)) / 1000;
+                return unchecked(Environment.TickCount - VolatileWrapper.Read(ref lastHeartbeatTicks)) / 1000;
             }
         }
         internal static long LastGlobalHeartbeatSecondsAgo
-        { get { return unchecked(Environment.TickCount - Volatile.Read(ref lastGlobalHeartbeatTicks)) / 1000; } }
+        { get { return unchecked(Environment.TickCount - VolatileWrapper.Read(ref lastGlobalHeartbeatTicks)) / 1000; } }
 
         internal CompletionManager UnprocessableCompletionManager { get { return unprocessableCompletionManager; } }
 

StackExchange.Redis/StackExchange/Redis/PhysicalBridge.cs

@@ -394,7 +394,7 @@ internal void OnHeartbeat(bool ifConnectedOnly)
                 switch (state)
                 {
                     case (int)State.Connecting:
-                        int connectTimeMilliseconds = unchecked(Environment.TickCount - Volatile.Read(ref connectStartTicks));
+                        int connectTimeMilliseconds = unchecked(Environment.TickCount - VolatileWrapper.Read(ref connectStartTicks));
                         if (connectTimeMilliseconds >= multiplexer.RawConfig.ConnectTimeout)
                         {
                             Trace("Aborting connect");

StackExchange.Redis/StackExchange/Redis/PhysicalConnection.cs

@@ -94,7 +94,7 @@ public PhysicalConnection(PhysicalBridge bridge)
 
         public void BeginConnect(TextWriter log)
         {
-            Volatile.Write(ref firstUnansweredWriteTickCount, 0);
+            VolatileWrapper.Write(ref firstUnansweredWriteTickCount, 0);
             var endpoint = this.bridge.ServerEndPoint.EndPoint;
 
             multiplexer.Trace("Connecting...", physicalName);
@@ -114,7 +114,7 @@ public long LastWriteSecondsAgo
         {
             get
             {
-                return unchecked(Environment.TickCount - Volatile.Read(ref lastWriteTickCount)) / 1000;
+                return unchecked(Environment.TickCount - VolatileWrapper.Read(ref lastWriteTickCount)) / 1000;
             }
         }
 
@@ -194,9 +194,9 @@ public void RecordConnectionFailed(ConnectionFailureType failureType, ref Socket
             if (isCurrent && Interlocked.CompareExchange(ref failureReported, 1, 0) == 0)
             {
                 managerState = SocketManager.ManagerState.RecordConnectionFailed_ReportFailure;
-                int now = Environment.TickCount, lastRead = Volatile.Read(ref lastReadTickCount), lastWrite = Volatile.Read(ref lastWriteTickCount),
-                    lastBeat = Volatile.Read(ref lastBeatTickCount);
-                int unansweredRead = Volatile.Read(ref firstUnansweredWriteTickCount);
+                int now = Environment.TickCount, lastRead = VolatileWrapper.Read(ref lastReadTickCount), lastWrite = VolatileWrapper.Read(ref lastWriteTickCount),
+                    lastBeat = VolatileWrapper.Read(ref lastBeatTickCount);
+                int unansweredRead = VolatileWrapper.Read(ref firstUnansweredWriteTickCount);
 
                 var exMessage = new StringBuilder(failureType + " on " + Format.ToString(bridge.ServerEndPoint.EndPoint) + "/" + connectionType);
                 var data = new List<Tuple<string, string>>
@@ -904,7 +904,7 @@ private bool ProcessReadBytes(int bytesRead)
             Interlocked.Exchange(ref lastReadTickCount, Environment.TickCount);
 
             // reset unanswered write timestamp
-            Volatile.Write(ref firstUnansweredWriteTickCount, 0);
+            VolatileWrapper.Write(ref firstUnansweredWriteTickCount, 0);
 
             ioBufferBytes += bytesRead;
             multiplexer.Trace("More bytes available: " + bytesRead + " (" + ioBufferBytes + ")", physicalName);
@@ -1067,7 +1067,7 @@ RawResult TryParseResult(byte[] buffer, ref int offset, ref int count)
         public void CheckForStaleConnection(ref SocketManager.ManagerState managerState)
         {
             int firstUnansweredWrite;
-            firstUnansweredWrite = Volatile.Read(ref firstUnansweredWriteTickCount);
+            firstUnansweredWrite = VolatileWrapper.Read(ref firstUnansweredWriteTickCount);
 
             DebugEmulateStaleConnection(ref firstUnansweredWrite);
 

StackExchange.Redis/StackExchange/Redis/RedisValue.cs

@@ -714,9 +714,9 @@ public bool TryParse(out double val)
         }
     }
 
-#if DNXCORE50
     internal static class ReflectionExtensions
     {
+#if DNXCORE50
         internal static TypeCode GetTypeCode(this Type type)
         {
             if (type == null) return TypeCode.Empty;
@@ -750,11 +750,11 @@ internal static TypeCode GetTypeCode(this Type type)
             {typeof(uint), TypeCode.UInt32 },
             {typeof(ulong), TypeCode.UInt64 },
         };
-    }
 #else
-    internal static TypeCode GetTypeCode(this Type type)
-    {
-        return type.GetTypeCode();
-    }
+        internal static TypeCode GetTypeCode(this Type type)
+        {
+            return type.GetTypeCode();
+        }
 #endif
+    }
 }

StackExchange.Redis/StackExchange/Redis/ServerEndPoint.cs

@@ -484,7 +484,7 @@ internal void OnFullyEstablished(PhysicalConnection connection)
         
         internal int LastInfoReplicationCheckSecondsAgo
         {
-            get { return unchecked(Environment.TickCount - Volatile.Read(ref lastInfoReplicationCheckTicks)) / 1000; }
+            get { return unchecked(Environment.TickCount - VolatileWrapper.Read(ref lastInfoReplicationCheckTicks)) / 1000; }
         }
 
         private EndPoint masterEndPoint;

StackExchange.Redis_Net40/StackExchange.Redis_Net40.StrongName.csproj

@@ -85,6 +85,9 @@
     <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ClientType.cs">
       <Link>ClientType.cs</Link>
     </Compile>
+    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\Compat\VolatileWrapper.cs">
+      <Link>VolatileWrapper.cs</Link>
+    </Compile>
     <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ConcurrentProfileStorageCollection.cs" />
     <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ConnectionMultiplexer.Profiling.cs">
       <DependentUpon>ConnectionMultiplexer.cs</DependentUpon>

StackExchange.Redis_Net40/StackExchange.Redis_Net40.csproj

@@ -82,6 +82,9 @@
     <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ClientType.cs">
       <Link>ClientType.cs</Link>
     </Compile>
+    <Compile Include="..\StackExchange.Redis\StackExchange\Redis\Compat\VolatileWrapper.cs">
+      <Link>VolatileWrapper.cs</Link>
+    </Compile>
     <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ConcurrentProfileStorageCollection.cs" />
     <Compile Include="..\StackExchange.Redis\StackExchange\Redis\ConnectionMultiplexer.Profiling.cs">
       <DependentUpon>ConnectionMultiplexer.cs</DependentUpon>