From d1c26072479e4e9701865488ed30b31f558bd7ea Mon Sep 17 00:00:00 2001
From: ULiiAn <chenshenyuan@gznb.com>
Date: Fri, 30 Jun 2017 10:54:21 +0800
Subject: [PATCH] Add System.Threading.Timer package refrence,support Timer for
 .NET Standard 1.0

---
 .../CodeProject.ObjectPool.csproj                    | 12 ++++++++++++
 src/CodeProject.ObjectPool/EvictorTimer.cs           |  4 ++--
 src/CodeProject.ObjectPool/ObjectPool.cs             |  6 ++----
 src/CodeProject.ObjectPool/TimedObjectPool.cs        |  5 +----
 4 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/CodeProject.ObjectPool/CodeProject.ObjectPool.csproj b/src/CodeProject.ObjectPool/CodeProject.ObjectPool.csproj
index 93f9b05..f3925df 100644
--- a/src/CodeProject.ObjectPool/CodeProject.ObjectPool.csproj
+++ b/src/CodeProject.ObjectPool/CodeProject.ObjectPool.csproj
@@ -77,4 +77,16 @@
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System" />
   </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.0'">
+    <PackageReference Include="System.Threading.Timer">
+      <Version>4.3.0</Version>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.3'">
+    <PackageReference Include="System.Threading.Timer">
+      <Version>4.3.0</Version>
+    </PackageReference>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/CodeProject.ObjectPool/EvictorTimer.cs b/src/CodeProject.ObjectPool/EvictorTimer.cs
index 6125512..217a80a 100644
--- a/src/CodeProject.ObjectPool/EvictorTimer.cs
+++ b/src/CodeProject.ObjectPool/EvictorTimer.cs
@@ -12,7 +12,7 @@
 
 namespace CodeProject.ObjectPool
 {
-#if !NETSTD10
+
     public class EvictorTimer : IEvictionTimer, IDisposable
     {
 #if !NET35
@@ -114,5 +114,5 @@ protected virtual void Dispose(bool disposing)
             }
         }
     }
-#endif
+
 }
\ No newline at end of file
diff --git a/src/CodeProject.ObjectPool/ObjectPool.cs b/src/CodeProject.ObjectPool/ObjectPool.cs
index 020e077..d2ea149 100644
--- a/src/CodeProject.ObjectPool/ObjectPool.cs
+++ b/src/CodeProject.ObjectPool/ObjectPool.cs
@@ -90,12 +90,10 @@ public ObjectPool(int maximumPoolSize, Func<T> factoryMethod, IEvictionTimer tim
 
             // Creating a new instance for the Diagnostics class.
             Diagnostics = new ObjectPoolDiagnostics();
-
-
-#if !NETSTD10
+            
             // Creating a new instance for the EvictorTimer class.
             this._timer = timer ?? new EvictorTimer();
-#endif
+
             this.StartEvictor(evictionConfig);
         }
 
diff --git a/src/CodeProject.ObjectPool/TimedObjectPool.cs b/src/CodeProject.ObjectPool/TimedObjectPool.cs
index 05d5ddd..57618f9 100644
--- a/src/CodeProject.ObjectPool/TimedObjectPool.cs
+++ b/src/CodeProject.ObjectPool/TimedObjectPool.cs
@@ -21,7 +21,6 @@
 // DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT
 // OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#if !NETSTD10
 
 using CodeProject.ObjectPool.Core;
 using System;
@@ -188,6 +187,4 @@ private void UpdateTimeout()
 
         #endregion Core Methods
     }
-}
-
-#endif
\ No newline at end of file
+}
\ No newline at end of file