Skip to content

Revert a recent change to Include #3072

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 2 commits into from
May 10, 2019
Merged

Revert a recent change to Include #3072

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b37993d
I removed this line because it seemed unnecessary, the map was alread…
lbargaoanu May 7, 2019
7b99713
rename
lbargaoanu May 8, 2019
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
7 changes: 4 additions & 3 deletions src/AutoMapper/ProfileMap.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,10 +263,11 @@ private void AddMemberMaps(LambdaExpression[] includedMembers, TypeMap mainMap,

private void ApplyDerivedMaps(TypeMap baseMap, TypeMap typeMap, IConfigurationProvider configurationProvider)
{
foreach (var inheritedTypeMap in configurationProvider.GetIncludedTypeMaps(typeMap.IncludedDerivedTypes))
foreach (var derivedMap in configurationProvider.GetIncludedTypeMaps(typeMap.IncludedDerivedTypes))
{
inheritedTypeMap.IncludeBaseTypes(typeMap.SourceType, typeMap.DestinationType);
ApplyDerivedMaps(baseMap, inheritedTypeMap, configurationProvider);
derivedMap.IncludeBaseTypes(typeMap.SourceType, typeMap.DestinationType);
derivedMap.AddInheritedMap(baseMap);
ApplyDerivedMaps(baseMap, derivedMap, configurationProvider);
}
}
}
Expand Down
32 changes: 32 additions & 0 deletions src/UnitTests/MappingInheritance/IgnoreShouldBeInherited.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,38 @@

namespace AutoMapper.UnitTests.Bug
{
public class IgnoreShouldBeInheritedRegardlessOfMapOrder : AutoMapperSpecBase
{
public class BaseDomain
{
}

public class SpecificDomain : BaseDomain
{
public string SpecificProperty { get; set; }
}

public class Dto
{
public string SpecificProperty { get; set; }
}

protected override MapperConfiguration Configuration => new MapperConfiguration(cfg =>
{
cfg.CreateMap<SpecificDomain, Dto>();
cfg.CreateMap<BaseDomain, Dto>()
.ForMember(d => d.SpecificProperty, m => m.Ignore())
.Include<SpecificDomain, Dto>();
});

[Fact]
public void Should_map_ok()
{
var dto = Mapper.Map<Dto>(new SpecificDomain { SpecificProperty = "Test" });
dto.SpecificProperty.ShouldBeNull();
}
}

public class IgnoreShouldBeInherited : AutoMapperSpecBase
{
public class BaseDomain
Expand Down