Skip to content

Work against 6.2.x #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 27, 2017
Merged

Work against 6.2.x #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e4224c9
Work against 6.2.x
TylerCarlson1 Nov 22, 2017
26ec848
remove refs
TylerCarlson1 Nov 22, 2017
3e34703
Remove directly reference to System.Threading
Tasteful Nov 27, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions ...apper.Collection.EntityFramework.Tests/AutoMapper.Collection.EntityFramework.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 2 additions & 0 deletions src/AutoMapper.Collection.EntityFramework.Tests/MapCollectionWithEqualityTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ public class MapCollectionWithEqualityTests
{
public MapCollectionWithEqualityTests()
{
Mapper.Reset();
Mapper.Initialize(x =>
{
x.AddCollectionMappers();
Expand Down Expand Up @@ -68,6 +69,7 @@ public void Should_Work_With_Null_Destination()

public void Should_Be_Instanced_Based()
{
Mapper.Reset();
Mapper.Initialize(x =>
{
x.AddCollectionMappers();
Expand Down
2 changes: 1 addition & 1 deletion src/AutoMapper.Collection.EntityFramework.Tests/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" />
Expand Down
5 changes: 2 additions & 3 deletions src/AutoMapper.Collection.Tests/AutoMapper.Collection.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
10 changes: 10 additions & 0 deletions src/AutoMapper.Collection.Tests/MapCollectionWithEqualityTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ public class MapCollectionWithEqualityTests
{
public MapCollectionWithEqualityTests()
{
Mapper.Reset();
Mapper.Initialize(x =>
{
x.AddCollectionMappers();
Expand Down Expand Up @@ -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();
Expand All @@ -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();
Expand All @@ -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();
Expand All @@ -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();
Expand All @@ -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();
Expand All @@ -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();
Expand All @@ -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();
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -290,6 +299,7 @@ public class SaleCharge

public void Should_Be_Instanced_Based()
{
Mapper.Reset();
Mapper.Initialize(x =>
{
x.AddCollectionMappers();
Expand Down
2 changes: 1 addition & 1 deletion src/AutoMapper.Collection.Tests/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" />
Expand Down
10 changes: 1 addition & 9 deletions src/AutoMapper.Collection/AutoMapper.Collection.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion src/AutoMapper.Collection/Mappers/EquivalentExpressionAddRemoveCollectionMapper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
}
}