Merge pull request #66 from Tasteful/6.2Compatibility

TylerCarlson1 · web-flow · commit 58b519914adf · 2017-11-27T14:30:03.000-06:00
Work against 6.2.x
diff --git a/src/AutoMapper.Collection.EntityFramework.Tests/AutoMapper.Collection.EntityFramework.Tests.csproj b/src/AutoMapper.Collection.EntityFramework.Tests/AutoMapper.Collection.EntityFramework.Tests.csproj
@@ -30,9 +30,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="AutoMapper, Version=0.0.0.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\AutoMapper.6.0.0\lib\net45\AutoMapper.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="AutoMapper, Version=6.2.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\AutoMapper.6.2.1\lib\net45\AutoMapper.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
       <HintPath>..\..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll</HintPath>
diff --git a/src/AutoMapper.Collection.EntityFramework.Tests/MapCollectionWithEqualityTests.cs b/src/AutoMapper.Collection.EntityFramework.Tests/MapCollectionWithEqualityTests.cs
@@ -12,6 +12,7 @@ public class MapCollectionWithEqualityTests
     {
         public MapCollectionWithEqualityTests()
         {
+            Mapper.Reset();
             Mapper.Initialize(x =>
             {
                 x.AddCollectionMappers();
@@ -68,6 +69,7 @@ public void Should_Work_With_Null_Destination()
 
         public void Should_Be_Instanced_Based()
         {
+            Mapper.Reset();
             Mapper.Initialize(x =>
             {
                 x.AddCollectionMappers();
diff --git a/src/AutoMapper.Collection.EntityFramework.Tests/packages.config b/src/AutoMapper.Collection.EntityFramework.Tests/packages.config
@@ -1,6 +1,6 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AutoMapper" version="6.0.0" targetFramework="net45" />
+  <package id="AutoMapper" version="6.2.1" targetFramework="net45" />
   <package id="EntityFramework" version="6.1.3" targetFramework="net45" />
   <package id="Fixie" version="1.0.2" targetFramework="net45" />
   <package id="FluentAssertions" version="4.15.0" targetFramework="net45" />
diff --git a/src/AutoMapper.Collection.Tests/AutoMapper.Collection.Tests.csproj b/src/AutoMapper.Collection.Tests/AutoMapper.Collection.Tests.csproj
@@ -30,9 +30,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="AutoMapper, Version=0.0.0.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\AutoMapper.6.0.0\lib\net45\AutoMapper.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="AutoMapper, Version=6.2.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\AutoMapper.6.2.1\lib\net45\AutoMapper.dll</HintPath>
     </Reference>
     <Reference Include="Fixie, Version=1.0.2.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Fixie.1.0.2\lib\net45\Fixie.dll</HintPath>
diff --git a/src/AutoMapper.Collection.Tests/MapCollectionWithEqualityTests.cs b/src/AutoMapper.Collection.Tests/MapCollectionWithEqualityTests.cs
@@ -10,6 +10,7 @@ public class MapCollectionWithEqualityTests
     {
         public MapCollectionWithEqualityTests()
         {
+            Mapper.Reset();
             Mapper.Initialize(x =>
             {
                 x.AddCollectionMappers();
@@ -72,6 +73,7 @@ public void Should_Be_Fast_With_Large_Reversed_Lists()
 
         public void Should_Be_Fast_With_Large_Lists_MultiProperty_Mapping()
         {
+            Mapper.Reset();
             Mapper.Initialize(x =>
             {
                 x.AddCollectionMappers();
@@ -87,6 +89,7 @@ public void Should_Be_Fast_With_Large_Lists_MultiProperty_Mapping()
 
         public void Should_Be_Fast_With_Large_Lists_MultiProperty_Mapping_Cant_Extract()
         {
+            Mapper.Reset();
             Mapper.Initialize(x =>
             {
                 x.AddCollectionMappers();
@@ -102,6 +105,7 @@ public void Should_Be_Fast_With_Large_Lists_MultiProperty_Mapping_Cant_Extract()
 
         public void Should_Be_Fast_With_Large_Lists_Cant_Extract_Negative()
         {
+            Mapper.Reset();
             Mapper.Initialize(x =>
             {
                 x.AddCollectionMappers();
@@ -118,6 +122,7 @@ public void Should_Be_Fast_With_Large_Lists_Cant_Extract_Negative()
 
         public void Should_Be_Fast_With_Large_Lists_MultiProperty_Mapping_Cant_Extract_Negative()
         {
+            Mapper.Reset();
             Mapper.Initialize(x =>
             {
                 x.AddCollectionMappers();
@@ -134,6 +139,7 @@ public void Should_Be_Fast_With_Large_Lists_MultiProperty_Mapping_Cant_Extract_N
 
         public void Should_Be_Fast_With_Large_Lists_SubObject()
         {
+            Mapper.Reset();
             Mapper.Initialize(x =>
             {
                 x.AddCollectionMappers();
@@ -149,6 +155,7 @@ public void Should_Be_Fast_With_Large_Lists_SubObject()
 
         public void Should_Be_Fast_With_Large_Lists_SubObject_WrongCollectionType_Should_Throw()
         {
+            Mapper.Reset();
             Mapper.Initialize(x =>
             {
                 x.AddCollectionMappers();
@@ -165,6 +172,7 @@ public void Should_Be_Fast_With_Large_Lists_SubObject_WrongCollectionType_Should
 
         public void Should_Work_With_Conditionals()
         {
+            Mapper.Reset();
             Mapper.Initialize(cfg =>
             {
                 cfg.AddCollectionMappers();
@@ -212,6 +220,7 @@ public void Should_Work_With_Null_Destination()
 
         public void Should_Work_With_Comparing_String_Types()
         {
+            Mapper.Reset();
             Mapper.Initialize(cfg =>
             {
                 cfg.AddCollectionMappers();
@@ -290,6 +299,7 @@ public class SaleCharge
 
         public void Should_Be_Instanced_Based()
         {
+            Mapper.Reset();
             Mapper.Initialize(x =>
             {
                 x.AddCollectionMappers();
diff --git a/src/AutoMapper.Collection.Tests/packages.config b/src/AutoMapper.Collection.Tests/packages.config
@@ -1,6 +1,6 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AutoMapper" version="6.0.0" targetFramework="net45" />
+  <package id="AutoMapper" version="6.2.1" targetFramework="net45" />
   <package id="Fixie" version="1.0.2" targetFramework="net45" />
   <package id="FluentAssertions" version="4.15.0" targetFramework="net45" />
   <package id="System.ValueTuple" version="4.3.0" targetFramework="net45" />
diff --git a/src/AutoMapper.Collection/AutoMapper.Collection.csproj b/src/AutoMapper.Collection/AutoMapper.Collection.csproj
@@ -17,20 +17,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AutoMapper" Version="6.0.0" />
+    <PackageReference Include="AutoMapper" Version="6.2.1" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
     <Reference Include="System" />
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.1' ">
-    <PackageReference Include="System.Threading" Version="4.0.11" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
-    <PackageReference Include="System.Threading" Version="4.0.11" />
-  </ItemGroup>
-
 </Project>
diff --git a/src/AutoMapper.Collection/Mappers/EquivalentExpressionAddRemoveCollectionMapper.cs b/src/AutoMapper.Collection/Mappers/EquivalentExpressionAddRemoveCollectionMapper.cs
@@ -81,7 +81,7 @@ public Expression MapExpression(IConfigurationProvider configurationProvider, Pr
                     sourceExpression, destExpression, contextExpression, Constant(EquivalencyExpression));
             var collectionMap = CollectionMapper.MapExpression(configurationProvider, profileMap, propertyMap, sourceExpression, destExpression, contextExpression);
 
-            return Condition(notNull, map, collectionMap);
+            return Condition(notNull, map, Convert(collectionMap, destExpression.Type));
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ public class MapCollectionWithEqualityTests`
`12`	`12`	`{`
`13`	`13`	`public MapCollectionWithEqualityTests()`
`14`	`14`	`{`
	`15`	`+ Mapper.Reset();`
`15`	`16`	`Mapper.Initialize(x =>`
`16`	`17`	`{`
`17`	`18`	`x.AddCollectionMappers();`
`@@ -68,6 +69,7 @@ public void Should_Work_With_Null_Destination()`
`68`	`69`
`69`	`70`	`public void Should_Be_Instanced_Based()`
`70`	`71`	`{`
	`72`	`+ Mapper.Reset();`
`71`	`73`	`Mapper.Initialize(x =>`
`72`	`74`	`{`
`73`	`75`	`x.AddCollectionMappers();`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ public class MapCollectionWithEqualityTests`
`10`	`10`	`{`
`11`	`11`	`public MapCollectionWithEqualityTests()`
`12`	`12`	`{`
	`13`	`+ Mapper.Reset();`
`13`	`14`	`Mapper.Initialize(x =>`
`14`	`15`	`{`
`15`	`16`	`x.AddCollectionMappers();`
`@@ -72,6 +73,7 @@ public void Should_Be_Fast_With_Large_Reversed_Lists()`
`72`	`73`
`73`	`74`	`public void Should_Be_Fast_With_Large_Lists_MultiProperty_Mapping()`
`74`	`75`	`{`
	`76`	`+ Mapper.Reset();`
`75`	`77`	`Mapper.Initialize(x =>`
`76`	`78`	`{`
`77`	`79`	`x.AddCollectionMappers();`
`@@ -87,6 +89,7 @@ public void Should_Be_Fast_With_Large_Lists_MultiProperty_Mapping()`
`87`	`89`
`88`	`90`	`public void Should_Be_Fast_With_Large_Lists_MultiProperty_Mapping_Cant_Extract()`
`89`	`91`	`{`
	`92`	`+ Mapper.Reset();`
`90`	`93`	`Mapper.Initialize(x =>`
`91`	`94`	`{`
`92`	`95`	`x.AddCollectionMappers();`
`@@ -102,6 +105,7 @@ public void Should_Be_Fast_With_Large_Lists_MultiProperty_Mapping_Cant_Extract()`
`102`	`105`
`103`	`106`	`public void Should_Be_Fast_With_Large_Lists_Cant_Extract_Negative()`
`104`	`107`	`{`
	`108`	`+ Mapper.Reset();`
`105`	`109`	`Mapper.Initialize(x =>`
`106`	`110`	`{`
`107`	`111`	`x.AddCollectionMappers();`
`@@ -118,6 +122,7 @@ public void Should_Be_Fast_With_Large_Lists_Cant_Extract_Negative()`
`118`	`122`
`119`	`123`	`public void Should_Be_Fast_With_Large_Lists_MultiProperty_Mapping_Cant_Extract_Negative()`
`120`	`124`	`{`
	`125`	`+ Mapper.Reset();`
`121`	`126`	`Mapper.Initialize(x =>`
`122`	`127`	`{`
`123`	`128`	`x.AddCollectionMappers();`
`@@ -134,6 +139,7 @@ public void Should_Be_Fast_With_Large_Lists_MultiProperty_Mapping_Cant_Extract_N`
`134`	`139`
`135`	`140`	`public void Should_Be_Fast_With_Large_Lists_SubObject()`
`136`	`141`	`{`
	`142`	`+ Mapper.Reset();`
`137`	`143`	`Mapper.Initialize(x =>`
`138`	`144`	`{`
`139`	`145`	`x.AddCollectionMappers();`
`@@ -149,6 +155,7 @@ public void Should_Be_Fast_With_Large_Lists_SubObject()`
`149`	`155`
`150`	`156`	`public void Should_Be_Fast_With_Large_Lists_SubObject_WrongCollectionType_Should_Throw()`
`151`	`157`	`{`
	`158`	`+ Mapper.Reset();`
`152`	`159`	`Mapper.Initialize(x =>`
`153`	`160`	`{`
`154`	`161`	`x.AddCollectionMappers();`
`@@ -165,6 +172,7 @@ public void Should_Be_Fast_With_Large_Lists_SubObject_WrongCollectionType_Should`
`165`	`172`
`166`	`173`	`public void Should_Work_With_Conditionals()`
`167`	`174`	`{`
	`175`	`+ Mapper.Reset();`
`168`	`176`	`Mapper.Initialize(cfg =>`
`169`	`177`	`{`
`170`	`178`	`cfg.AddCollectionMappers();`
`@@ -212,6 +220,7 @@ public void Should_Work_With_Null_Destination()`
`212`	`220`
`213`	`221`	`public void Should_Work_With_Comparing_String_Types()`
`214`	`222`	`{`
	`223`	`+ Mapper.Reset();`
`215`	`224`	`Mapper.Initialize(cfg =>`
`216`	`225`	`{`
`217`	`226`	`cfg.AddCollectionMappers();`
`@@ -290,6 +299,7 @@ public class SaleCharge`
`290`	`299`
`291`	`300`	`public void Should_Be_Instanced_Based()`
`292`	`301`	`{`
	`302`	`+ Mapper.Reset();`
`293`	`303`	`Mapper.Initialize(x =>`
`294`	`304`	`{`
`295`	`305`	`x.AddCollectionMappers();`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ public Expression MapExpression(IConfigurationProvider configurationProvider, Pr`
`81`	`81`	`sourceExpression, destExpression, contextExpression, Constant(EquivalencyExpression));`
`82`	`82`	`var collectionMap = CollectionMapper.MapExpression(configurationProvider, profileMap, propertyMap, sourceExpression, destExpression, contextExpression);`
`83`	`83`
`84`		`- return Condition(notNull, map, collectionMap);`
	`84`	`+ return Condition(notNull, map, Convert(collectionMap, destExpression.Type));`
`85`	`85`	`}`
`86`	`86`	`}`
`87`	`87`	`}`