Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions src/AutoMapper/Mappers/NullableDestinationMapper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ public Expression MapExpression(IConfigurationProvider configurationProvider, Pr
new TypePair(sourceExpression.Type, Nullable.GetUnderlyingType(destExpression.Type)),
sourceExpression,
contextExpression,
propertyMap,
Expression.Property(destExpression, destExpression.Type.GetDeclaredProperty("Value"))
propertyMap
);

public TypePair GetAssociatedTypes(TypePair initialTypes)
Expand Down
35 changes: 35 additions & 0 deletions src/UnitTests/Bug/NullableUntypedMapFrom.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
using Xunit;
using Shouldly;

namespace AutoMapper.UnitTests.Bug
{
public class NullableUntypedMapFrom : AutoMapperSpecBase
{
private Destination _destination;

class Source
{
public decimal? Number { get; set; }
}
class Destination
{
public decimal? OddNumber { get; set; }
}

protected override MapperConfiguration Configuration { get; } = new MapperConfiguration(cfg =>
{
cfg.CreateMap<Source, Destination>().ForMember(d => d.OddNumber, o => o.MapFrom(s => (object)s.Number));
});

protected override void Because_of()
{
_destination = Mapper.Map<Destination>(new Source { Number = 12 });
}

[Fact]
public void Should_map_nullable_decimal()
{
_destination.OddNumber.ShouldBe(12);
}
}
}