merge master to development

Author: TylerCarlson1

README.md

@@ -24,7 +24,7 @@ Adding equivalence to objects is done with EqualityComparison extended from the
 	cfg.CreateMap<OrderItemDTO, OrderItem>().EqualityComparison((odto, o) => odto.ID == o.ID);
 Mapping OrderDTO back to Order will compare Order items list based on if their ID's match
 
-	Mapper.Map<OrderDTO[],Order[]>(orderDtos, orders);
+	Mapper.Map<List<OrderDTO>,List<Order>>(orderDtos, orders);
 If ID's match will map OrderDTO to Order
 
 If OrderDTO exists and Order doesn't add to collection
@@ -71,4 +71,4 @@ On Nuget
 	PM> Install-Package AutoMapper.Collection.EntityFramework
 Also have AutoMapper.LinqToSQL
 
-	PM> Install-Package AutoMapper.Collection.LinqToSQL
+	PM> Install-Package AutoMapper.Collection.LinqToSQL

src/AutoMapper.Collection.EntityFramework/AutoMapper.Collection.EntityFramework.csproj

@@ -12,6 +12,7 @@
     <AssemblyOriginatorKeyFile>../Key.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
     <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
+    <Version>3.1.4</Version>
   </PropertyGroup>
 
   <ItemGroup>

src/AutoMapper.Collection.LinqToSQL/AutoMapper.Collection.LinqToSQL.csproj

@@ -12,6 +12,7 @@
     <AssemblyOriginatorKeyFile>../Key.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
     <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
+    <Version>3.1.4</Version>
   </PropertyGroup>
 
   <ItemGroup>

src/AutoMapper.Collection.Tests/MapCollectionWithEqualityThreadSafetyTests.cs

@@ -0,0 +1,28 @@
+using AutoMapper.EquivalencyExpression;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace AutoMapper.Collection
+{
+    public class MapCollectionWithEqualityThreadSafetyTests
+    {
+        public async Task Should_Work_When_Initialized_Concurrently()
+        {
+            Action act = () =>
+            {
+                new MapperConfiguration(cfg =>
+                {
+                    cfg.AddCollectionMappers();
+                });
+            };
+            var tasks = new List<Task>();
+            for (var i = 0; i < 5; i++)
+            {
+                tasks.Add(Task.Run(act));
+            }
+
+            await Task.WhenAll(tasks.ToArray());
+        }
+    }
+}

src/AutoMapper.Collection/AutoMapper.Collection.csproj

@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <Description>Collection Add/Remove/Update support for AutoMapper. AutoMapper.Collection adds EqualityComparison Expressions for TypeMaps to determine if Source and Destination type are equivalent to each other when mapping collections.</Description>
+    <VersionPrefix>3.1.3</VersionPrefix>
     <Authors>Tyler Carlson</Authors>
     <TargetFrameworks>netstandard2.0;netstandard1.3;net45</TargetFrameworks>
     <AssemblyName>AutoMapper.Collection</AssemblyName>
@@ -13,6 +14,7 @@
     <AssemblyOriginatorKeyFile>../Key.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
     <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
+    <Version>3.1.4</Version>
   </PropertyGroup>
 
   <ItemGroup>

src/AutoMapper.Collection/EquivalencyExpression/EquivalentExpressions.cs

@@ -12,13 +12,13 @@ namespace AutoMapper.EquivalencyExpression
     public static class EquivalentExpressions
     {
         private static readonly
-            IDictionary<IConfigurationProvider, ConcurrentDictionary<TypePair, IEquivalentComparer>>
+            ConcurrentDictionary<IConfigurationProvider, ConcurrentDictionary<TypePair, IEquivalentComparer>>
             EquivalentExpressionDictionary =
-                new Dictionary<IConfigurationProvider, ConcurrentDictionary<TypePair, IEquivalentComparer>>();
+                new ConcurrentDictionary<IConfigurationProvider, ConcurrentDictionary<TypePair, IEquivalentComparer>>();
 
         private static ConcurrentDictionary<TypePair, IEquivalentComparer> _equalityComparisonCache = new ConcurrentDictionary<TypePair, IEquivalentComparer>();
 
-        private static readonly IDictionary<IConfigurationProvider, IList<IGeneratePropertyMaps>> GeneratePropertyMapsDictionary = new Dictionary<IConfigurationProvider, IList<IGeneratePropertyMaps>>();
+        private static readonly ConcurrentDictionary<IConfigurationProvider, IList<IGeneratePropertyMaps>> GeneratePropertyMapsDictionary = new ConcurrentDictionary<IConfigurationProvider, IList<IGeneratePropertyMaps>>();
         private static IList<IGeneratePropertyMaps> _generatePropertyMapsCache = new List<IGeneratePropertyMaps>();
 
         public static void AddCollectionMappers(this IMapperConfigurationExpression cfg)
@@ -41,10 +41,10 @@ private static void InsertBefore<TObjectMapper>(this IMapperConfigurationExpress
                 foreach (var configurationObjectMapper in adds)
                     configurationObjectMapper.ConfigurationProvider = c;
 
-                EquivalentExpressionDictionary.Add(c, _equalityComparisonCache);
+                EquivalentExpressionDictionary.AddOrUpdate(c, _equalityComparisonCache, (type, old) => _equalityComparisonCache);
                 _equalityComparisonCache = new ConcurrentDictionary<TypePair, IEquivalentComparer>();
 
-                GeneratePropertyMapsDictionary.Add(c, _generatePropertyMapsCache);
+                GeneratePropertyMapsDictionary.AddOrUpdate(c, _generatePropertyMapsCache, (type, old) => _generatePropertyMapsCache);
                 _generatePropertyMapsCache = new List<IGeneratePropertyMaps>();
             });
         }