Merge pull request #81 from BlaiseD/master

cleanup.
AutoMapper · Jul 6, 2020 · 170294c · 170294c
2 parents 1ae8507 + 50e29a4
commit 170294c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 16 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Authors>Jimmy Bogard</Authors>
     <LangVersion>latest</LangVersion>
-    <VersionPrefix>4.0.0-preview01</VersionPrefix>
+    <VersionPrefix>4.0.0</VersionPrefix>
     <WarningsAsErrors>true</WarningsAsErrors>
     <NoWarn>$(NoWarn);1701;1702;1591</NoWarn>
   </PropertyGroup>

diff --git a/src/AutoMapper.Extensions.ExpressionMapping/XpressionMapperVisitor.cs b/src/AutoMapper.Extensions.ExpressionMapping/XpressionMapperVisitor.cs
@@ -174,32 +174,22 @@ protected override Expression VisitMemberInit(MemberInitExpression node)
                 //The destination becomes the source because to map a source expression to a destination expression,
                 //we need the expressions used to create the source from the destination
 
-                //IEnumerable<MemberBinding> bindings = node.Bindings.Select
-                //(
-                //    binding =>
-                //    {
-                //        Expression bindingExpression = ((MemberAssignment)binding).Expression;
-                //        return DoBind
-                //        (
-                //            GetSourceMember(typeMap.GetPropertyMapByDestinationProperty(binding.Member.Name)),
-                //            bindingExpression,
-                //            this.Visit(bindingExpression)
-                //        );
-                //    }
-                //);
-
                 IEnumerable<MemberBinding> bindings = node.Bindings.Aggregate(new List<MemberBinding>(), (list, binding) =>
                 {
                     var propertyMap = typeMap.PropertyMaps.SingleOrDefault(item => item.DestinationName == binding.Member.Name);
                     if (propertyMap == null)
                         return list;
 
+                    var sourceMember = GetSourceMember(propertyMap);
+                    if (sourceMember == null)
+                        return list;
+
                     Expression bindingExpression = ((MemberAssignment)binding).Expression;
                     list.Add
                     (
                         DoBind
                         (
-                            GetSourceMember(propertyMap),
+                            sourceMember,
                             bindingExpression,
                             this.Visit(bindingExpression)
                         )