Target net45+win

Author: bricelam

src/Microsoft.Framework.Caching.Interfaces/project.json

@@ -9,7 +9,7 @@
                 "System.Runtime": "4.0.20-beta-*"
             }
         },
-        "netcore451": {
+        ".NETPortable,Version=v4.5,Profile=Profile7": {
             "frameworkAssemblies": {
                 "System.Runtime": ""
             }

src/Microsoft.Framework.Caching.Memory/CacheEntry.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Threading;
-#if NETCORE451
+#if !NET45 && !DNX451 && !DNXCORE50
 using System.Threading.Tasks;
 #endif
 
@@ -17,7 +17,7 @@ internal class CacheEntry
         private static readonly Action<object> ExpirationCallback = TriggerExpired;
 
         private readonly Action<CacheEntry> _notifyCacheOfExpiration;
-        
+
         internal CacheEntry(CacheSetContext context, object value, Action<CacheEntry> notifyCacheOfExpiration)
         {
             Context = context;
@@ -141,10 +141,10 @@ internal void InvokeEvictionCallbacks()
             Context.PostEvictionCallbacks = null;
             if (callbacks != null)
             {
-#if NETCORE451
-                Task.Run(() => InvokeCallbacks(callbacks));
-#else
+#if NET45 || DNX451 || DNXCORE50
                 ThreadPool.QueueUserWorkItem(InvokeCallbacks, callbacks);
+#else
+                Task.Run(() => InvokeCallbacks(callbacks));
 #endif
             }
         }

src/Microsoft.Framework.Caching.Memory/EntryLinkHelpers.cs

@@ -4,7 +4,7 @@
 using System;
 #if DNXCORE50
 using System.Threading;
-#elif !NETCORE451
+#elif NET45 || DNX451 || DNXCORE50
 using System.Runtime.Remoting;
 using System.Runtime.Remoting.Messaging;
 #endif
@@ -21,13 +21,7 @@ public static IEntryLink ContextLink
             get { return _contextLink.Value; }
             set { _contextLink.Value = value; }
         }
-#elif NETCORE451
-        public static IEntryLink ContextLink
-        {
-            get { return null; }
-            set { throw new NotImplementedException(); }
-        }
-#else
+#elif NET45 || DNX451
         private const string ContextLinkDataName = "klr.host.EntryLinkHelpers.ContextLink";
 
         public static IEntryLink ContextLink
@@ -48,6 +42,12 @@ public static IEntryLink ContextLink
                 CallContext.LogicalSetData(ContextLinkDataName, new ObjectHandle(value));
             }
         }
+#else
+        public static IEntryLink ContextLink
+        {
+            get { return null; }
+            set { throw new NotImplementedException(); }
+        }
 #endif
         public static IDisposable FlowContext(this IEntryLink link)
         {

src/Microsoft.Framework.Caching.Memory/MemoryCache.cs

@@ -8,7 +8,7 @@
 using Microsoft.Framework.Caching.Memory.Infrastructure;
 using Microsoft.Framework.Internal;
 using Microsoft.Framework.OptionsModel;
-#if NETCORE451
+#if !NET45 && !DNX451 && !DNXCORE50
 using System.Threading.Tasks;
 #endif
 
@@ -263,10 +263,10 @@ private void StartScanForExpiredItems()
             if (_expirationScanFrequency < now - _lastExpirationScan)
             {
                 _lastExpirationScan = now;
-#if NETCORE451
-                Task.Run(() => ScanForExpiredItems(state: null));
-#else
+#if NET45 || DNX451 || DNXCORE50
                 ThreadPool.QueueUserWorkItem(ScanForExpiredItems);
+#else
+                Task.Run(() => ScanForExpiredItems(state: null));
 #endif
             }
         }

src/Microsoft.Framework.Caching.Memory/project.json

@@ -15,7 +15,7 @@
                 "System.Threading.ThreadPool": "4.0.10-beta-*"
             }
         },
-        "netcore451": {
+        ".NETPortable,Version=v4.5,Profile=Profile7": {
             "frameworkAssemblies": {
                 "System.Threading.Tasks": ""
             }