Merge branch 'develop'

Author: jbogard

src/AutoMapper.targets

@@ -13,9 +13,9 @@
     <Message Importance="low" Text="AutoMapper Platform Extension Assembly: %(_AutoMapperReference.FullPath)"/>
 
     <ItemGroup>
-      <Content Include="$([MSBuild]::MakeRelative($(MSBuildProjectDirectory), %(_AutoMapperReference.FullPath)))" Condition="'%(_AutoMapperReference.FullPath)' != ''">
+      <None Include="$([MSBuild]::MakeRelative($(MSBuildProjectDirectory), %(_AutoMapperReference.FullPath)))" Condition="'%(_AutoMapperReference.FullPath)' != ''">
         <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      </Content>
+      </None>
     </ItemGroup>
   </Target>
 </Project>

src/AutoMapper/AutoMapper.csproj

@@ -81,6 +81,7 @@
     <Compile Include="Internal\AliasedMember.cs" />
     <Compile Include="Internal\IAdapterResolver.cs" />
     <Compile Include="Internal\ManualNullableConverterFactory.cs" />
+    <Compile Include="Internal\MemberNameReplacer.cs" />
     <Compile Include="Internal\NoOpReaderWriterLockFactory.cs" />
     <Compile Include="Internal\NotSupportedEnumNameValueMappingFactory.cs" />
     <Compile Include="Internal\NotSupportedProxyGeneratorFactory.cs" />
@@ -90,6 +91,7 @@
     <Compile Include="Mapper.cs" />
     <Compile Include="Mappers\AssignableArrayMapper.cs" />
     <Compile Include="Mappers\ExplicitConversionOperatorMapper.cs" />
+    <Compile Include="Mappers\ExpressionMapper.cs" />
     <Compile Include="Mappers\ImplicitConversionOperatorMapper.cs" />
     <Compile Include="Mappers\IPlatformSpecificMapperRegistry.cs" />
     <Compile Include="Mappers\MapperRegistry.cs" />
@@ -153,11 +155,28 @@
     <Compile Include="Internal\DelegateBasedResolver.cs" />
     <Compile Include="Internal\NullReplacementMethod.cs" />
     <Compile Include="Internal\PrimitiveExtensions.cs" />
+    <Compile Include="Configuration\CreateTypeMapExpression.cs" />
     <Compile Include="Profile.cs" />
     <Compile Include="PropertyMap.cs" />
     <Compile Include="Internal\ReflectionHelper.cs" />
     <Compile Include="Internal\ProxyBase.cs" />
-    <Compile Include="QueryableExtensions.cs" />
+    <Compile Include="QueryableExtensions\ExpressionRequest.cs" />
+    <Compile Include="QueryableExtensions\ExpressionResolutionResult.cs" />
+    <Compile Include="QueryableExtensions\Extensions.cs" />
+    <Compile Include="QueryableExtensions\IExpressionBinder.cs" />
+    <Compile Include="QueryableExtensions\IExpressionResultConverter.cs" />
+    <Compile Include="QueryableExtensions\Impl\AssignableExpressionBinder.cs" />
+    <Compile Include="QueryableExtensions\Impl\CustomProjectionExpressionBinder.cs" />
+    <Compile Include="QueryableExtensions\Impl\EnumerableExpressionBinder.cs" />
+    <Compile Include="QueryableExtensions\Impl\MappedTypeExpressionBinder.cs" />
+    <Compile Include="QueryableExtensions\Impl\MemberGetterExpressionResultConverter.cs" />
+    <Compile Include="QueryableExtensions\Impl\MemberResolverExpressionResultConverter.cs" />
+    <Compile Include="QueryableExtensions\Impl\NullableExpressionBinder.cs" />
+    <Compile Include="QueryableExtensions\Impl\NullSubstitutionExpressionResultConverter.cs" />
+    <Compile Include="QueryableExtensions\Impl\ParameterReplacementVisitor.cs" />
+    <Compile Include="QueryableExtensions\Impl\StringExpressionBinder.cs" />
+    <Compile Include="QueryableExtensions\IProjectionExpression.cs" />
+    <Compile Include="QueryableExtensions\ProjectionExpression.cs" />
     <Compile Include="ResolutionContext.cs" />
     <Compile Include="Internal\ResolutionExpression.cs" />
     <Compile Include="ResolutionResult.cs" />
@@ -175,6 +194,7 @@
     </None>
     <None Include="SemanticModel.cd" />
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

src/AutoMapper/AutoMapperConfigurationException.cs

@@ -78,7 +78,8 @@ public override string Message
                         message.AppendLine(error.TypeMap.SourceType.FullName + " -> " +
                                            error.TypeMap.DestinationType.FullName + " (" + 
                                            error.TypeMap.ConfiguredMemberList + " member list)");
-                        message.AppendLine(new string('-', len));
+                        message.AppendLine();
+                        message.AppendLine("Unmapped properties:");
                         foreach (var name in error.UnmappedPropertyNames)
                         {
                             message.AppendLine(name);

src/AutoMapper/Configuration/CreateTypeMapExpression.cs

@@ -0,0 +1,67 @@
+namespace AutoMapper.Configuration
+{
+    using System;
+    using System.Collections.Generic;
+    using Impl;
+
+    public class CreateTypeMapExpression : IMappingExpression
+    {
+        private readonly List<Action<IMappingExpression>> _actions = new List<Action<IMappingExpression>>();
+
+        public TypePair TypePair { get; private set; }
+        public MemberList MemberList { get; private set; }
+        public string ProfileName { get; private set; }
+        
+
+        public CreateTypeMapExpression(TypePair typePair, MemberList memberList, string profileName)
+        {
+            TypePair = typePair;
+            MemberList = memberList;
+            ProfileName = profileName;
+        }
+
+        public void ConvertUsing<TTypeConverter>()
+        {
+            _actions.Add(me => me.ConvertUsing<TTypeConverter>());
+        }
+
+        public void ConvertUsing(Type typeConverterType)
+        {
+            _actions.Add(me => me.ConvertUsing(typeConverterType));
+        }
+
+        public void As(Type typeOverride)
+        {
+            _actions.Add((me => me.As(typeOverride)));
+        }
+
+        public IMappingExpression WithProfile(string profileName)
+        {
+            _actions.Add(me => me.WithProfile(profileName));
+            
+            return this;
+        }
+
+        public IMappingExpression ForMember(string name, Action<IMemberConfigurationExpression> memberOptions)
+        {
+            _actions.Add(me => me.ForMember(name, memberOptions));
+
+            return this;
+        }
+
+        public IMappingExpression ForSourceMember(string sourceMemberName, Action<ISourceMemberConfigurationExpression> memberOptions)
+        {
+            _actions.Add(me => me.ForSourceMember(sourceMemberName, memberOptions));
+
+            return this;
+        }
+
+        public void Accept(IMappingExpression mappingExpression)
+        {
+            foreach (var action in _actions)
+            {
+                action(mappingExpression);
+            }
+        }
+    }
+}