Replaced Dictionary with ConcurrentDictionary in HierarchicalLifetime…

…Manager
unitycontainer · Dec 30, 2017 · d69ba1d · d69ba1d
1 parent 6f26e9d
commit d69ba1d
Show file tree

Hide file tree

Showing 3 changed files with 1,953 additions and 4 deletions.
diff --git a/src/Lifetime/HierarchicalLifetimeManager.cs b/src/Lifetime/HierarchicalLifetimeManager.cs
@@ -1,6 +1,5 @@
-// Copyright (c) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information.
-
-using System;
+using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
 
@@ -16,7 +15,8 @@ public class HierarchicalLifetimeManager : SynchronizedLifetimeManager,
     {
         #region Fields
 
-        private readonly IDictionary<ILifetimeContainer, object> _values = new Dictionary<ILifetimeContainer, object>();
+        private readonly IDictionary<ILifetimeContainer, object> _values = 
+            new ConcurrentDictionary<ILifetimeContainer, object>();
 
         #endregion
 

diff --git a/src/Unity.Abstractions.csproj b/src/Unity.Abstractions.csproj
@@ -22,6 +22,10 @@
     <RootNamespace>Unity</RootNamespace>
   </PropertyGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)' != '' AND '$(TargetFramework)' != 'netstandard1.0' ">
+    <Compile Remove="Utility\ConcurrentDictionary.cs" />
+  </ItemGroup>
+
   <ItemGroup Condition="'$(TargetFramework)' != '' AND $(TargetFramework.StartsWith('netcoreapp'))">
     <Compile Remove="Exceptions\ResolutionFailedException.Desktop.cs" />
     <Compile Remove="Exceptions\IllegalInjectionMethodException.Desktop.cs" />