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 @@ + + + + 4.3.0 + + + + + + 4.3.0 + + \ 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 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