Merge pull request #4011 from AutoMapper/source_validation

Consider member value resolvers and value converters for source valid…

Author: jbogard

AutoMapper.sln

@@ -9,6 +9,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.github\workflows\ci.yml = .github\workflows\ci.yml
 		CONTRIBUTING.md = CONTRIBUTING.md
 		Directory.Build.props = Directory.Build.props
+		icon.png = icon.png
 		ISSUE_TEMPLATE.md = ISSUE_TEMPLATE.md
 		nuget.config = nuget.config
 		Push.ps1 = Push.ps1

docs/12.0-Upgrade-Guide.md

@@ -0,0 +1,20 @@
+# 12.0 Upgrade Guide
+
+[Release notes](https://github.com/AutoMapper/AutoMapper/releases/tag/v12.0.0).
+
+## Equivalent settings overwrite each other
+
+That applies per map and also per member. For example, you can have only one type converter per map and only one resolver per member. 
+
+It might not be obvious that some settings are equivalent. For example, a value converter is a special kind of resolver, so a `ConvertUsing` will overwrite a `MapFrom` 
+for the same member. 
+
+You also cannot have for the same map/member separate configurations for `Map` and `ProjectTo`.
+
+Another possible occurence is with `ForAllMaps` and `ForAllPropertyMaps` when it's possible to overwrite things already set in a particular map.
+
+## `ResolutionContext.Options` was removed
+
+You should use `ResolutionContext.Items` to access the items passed in the `Map` call.
+
+Instead of `ServiceCtor` you should use dependency injection or pass the needed objects in the `Map` call.

docs/index.rst

@@ -72,6 +72,7 @@ New to AutoMapper? Check out the :doc:`Getting-started` page first.
    :caption: Upgrading
 
    API-Changes
+   12.0-Upgrade-Guide
    11.0-Upgrade-Guide
    10.0-Upgrade-Guide
    9.0-Upgrade-Guide

src/AutoMapper/PreBuild.ps1 renamed to src/AutoMapper/ApiCompat/PreBuild.ps1

@@ -3,6 +3,8 @@ CannotChangeAttribute : Attribute 'System.AttributeUsageAttribute' on 'AutoMappe
 InterfacesShouldHaveSameMembers : Interface member 'public TMappingExpression AutoMapper.IMappingExpressionBase<TSource, TDestination, TMappingExpression>.AsProxy()' is present in the implementation but not in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'public void AutoMapper.IMappingExpressionBase<TSource, TDestination, TMappingExpression>.AsProxy()' is present in the contract but not in the implementation.
 MembersMustExist : Member 'public void AutoMapper.IMappingExpressionBase<TSource, TDestination, TMappingExpression>.AsProxy()' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'public AutoMapper.IMappingOperationOptions AutoMapper.ResolutionContext.Options.get()' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'AutoMapper.ValueResolverConfiguration' does not exist in the implementation but it does exist in the contract.
 MembersMustExist : Member 'public void AutoMapper.Configuration.MappingExpressionBase<TSource, TDestination, TMappingExpression>.AsProxy()' does not exist in the implementation but it does exist in the contract.
 CannotChangeAttribute : Attribute 'System.AttributeUsageAttribute' on 'AutoMapper.Configuration.Annotations.IgnoreAttribute' changed from '[AttributeUsageAttribute(384)]' in the contract to '[AttributeUsageAttribute(AttributeTargets.Field | AttributeTargets.Property)]' in the implementation.
 CannotChangeAttribute : Attribute 'System.AttributeUsageAttribute' on 'AutoMapper.Configuration.Annotations.MapAtRuntimeAttribute' changed from '[AttributeUsageAttribute(384)]' in the contract to '[AttributeUsageAttribute(AttributeTargets.Field | AttributeTargets.Property)]' in the implementation.
@@ -12,4 +14,7 @@ CannotChangeAttribute : Attribute 'System.AttributeUsageAttribute' on 'AutoMappe
 CannotChangeAttribute : Attribute 'System.AttributeUsageAttribute' on 'AutoMapper.Configuration.Annotations.UseExistingValueAttribute' changed from '[AttributeUsageAttribute(384)]' in the contract to '[AttributeUsageAttribute(AttributeTargets.Field | AttributeTargets.Property)]' in the implementation.
 CannotChangeAttribute : Attribute 'System.AttributeUsageAttribute' on 'AutoMapper.Configuration.Annotations.ValueConverterAttribute' changed from '[AttributeUsageAttribute(384)]' in the contract to '[AttributeUsageAttribute(AttributeTargets.Field | AttributeTargets.Property)]' in the implementation.
 CannotChangeAttribute : Attribute 'System.AttributeUsageAttribute' on 'AutoMapper.Configuration.Annotations.ValueResolverAttribute' changed from '[AttributeUsageAttribute(384)]' in the contract to '[AttributeUsageAttribute(AttributeTargets.Field | AttributeTargets.Property)]' in the implementation.
-Total Issues: 13
+MembersMustExist : Member 'public System.Linq.IQueryable<TDestination> AutoMapper.QueryableExtensions.Extensions.Map<TSource, TDestination>(System.Linq.IQueryable<TSource>, System.Linq.IQueryable<TDestination>, AutoMapper.IConfigurationProvider)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'public System.Collections.Generic.IReadOnlyCollection<System.Reflection.MemberInfo> AutoMapper.QueryableExtensions.MemberVisitor.MemberPath.get()' does not exist in the implementation but it does exist in the contract.
+TypesMustExist : Type 'AutoMapper.QueryableExtensions.Impl.MemberAccessQueryMapperVisitor' does not exist in the implementation but it does exist in the contract.
+Total Issues: 18

src/AutoMapper/PreBuild.sh renamed to src/AutoMapper/ApiCompat/PreBuild.sh

@@ -32,8 +32,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\..\icon.png" Pack="true" PackagePath="" />
-    <None Include="..\..\README.md" Pack="true" PackagePath="" />
+    <None Include="..\..\icon.png" Pack="true" PackagePath="" Visible="False" />
+    <None Include="..\..\README.md" Pack="true" PackagePath="" Visible="False" />
   </ItemGroup>
 
   <ItemGroup>
@@ -44,8 +44,8 @@
   </ItemGroup>
 
   <Target Name="PreBuild" AfterTargets="GetAssemblyVersion">
-    <Exec Condition=" '$(OS)' == 'Windows_NT' " Command="powershell -ExecutionPolicy Unrestricted -File &quot;$(ProjectDir)\PreBuild.ps1&quot; -version $(Version)" />
-    <Exec Condition=" '$(OS)' != 'Windows_NT' " Command="&quot;$(ProjectDir)PreBuild.sh&quot; $(Version)" />
+    <Exec Condition=" '$(OS)' == 'Windows_NT' " Command="powershell -ExecutionPolicy Unrestricted -File &quot;$(ProjectDir)ApiCompat\PreBuild.ps1&quot; -version $(Version)" />
+    <Exec Condition=" '$(OS)' != 'Windows_NT' " Command="&quot;$(ProjectDir)ApiCompat/PreBuild.sh&quot; $(Version)" />
   </Target>
 
 </Project>

src/AutoMapper/ApiCompatBaseline.txt

@@ -1,4 +1,6 @@
-using System;
+using AutoMapper.Internal;
+using System;
+using System.Reflection;
 
 namespace AutoMapper.Configuration.Annotations
 {
@@ -17,6 +19,11 @@ public sealed class SourceMemberAttribute : Attribute, IMemberConfigurationProvi
 
         public void ApplyConfiguration(IMemberConfigurationExpression memberConfigurationExpression)
         {
+            var destinationMember = memberConfigurationExpression.DestinationMember;
+            if (destinationMember.Has<ValueConverterAttribute>() || destinationMember.Has<ValueResolverAttribute>())
+            {
+                return;
+            }
             memberConfigurationExpression.MapFrom(Name);
         }
     }

src/AutoMapper/AutoMapper.csproj

@@ -117,7 +117,6 @@ private void DryRunTypeMap(ICollection<TypeMap> typeMapsChecked, TypePair types,
                 }
 
                 CheckPropertyMaps(typeMapsChecked, typeMap);
-                typeMap.IsValid = true;
             }
             else
             {
@@ -143,7 +142,7 @@ private void CheckPropertyMaps(ICollection<TypeMap> typeMapsChecked, TypeMap typ
         {
             foreach (var memberMap in typeMap.MemberMaps)
             {
-                if(memberMap.Ignored || memberMap.ValueConverterConfig != null || memberMap.ValueResolverConfig != null)
+                if(memberMap.Ignored)
                 {
                     continue;
                 }

src/AutoMapper/Configuration/Annotations/SourceMemberAttribute.cs

@@ -1,4 +1,5 @@
-using AutoMapper.Internal;
+using AutoMapper.Execution;
+using AutoMapper.Internal;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -51,12 +52,12 @@ public CtorParamConfigurationExpression(string ctorParamName, Type sourceType)
         }
 
         public void MapFrom<TMember>(Expression<Func<TSource, TMember>> sourceMember) =>
-            _ctorParamActions.Add(cpm => cpm.CustomMapExpression = sourceMember);
+            _ctorParamActions.Add(cpm => cpm.SetResolver(sourceMember));
 
         public void MapFrom<TMember>(Func<TSource, ResolutionContext, TMember> resolver)
         {
             Expression<Func<TSource, TDestination, TMember, ResolutionContext, TMember>> resolverExpression = (src, dest, destMember, ctxt) => resolver(src, ctxt);
-            _ctorParamActions.Add(cpm => cpm.CustomMapFunction = resolverExpression);
+            _ctorParamActions.Add(cpm => cpm.Resolver = new FuncResolver(resolverExpression));
         }
 
         public void MapFrom(string sourceMembersPath)
@@ -75,13 +76,12 @@ public void Configure(TypeMap typeMap)
             var parameter = ctorMap[CtorParamName];
             if (parameter == null)
             {
-                throw new AutoMapperConfigurationException($"{typeMap.DestinationType.Name} does not have a constructor with a parameter named '{CtorParamName}'.\n{typeMap.DestinationType.FullName}");
+                throw new AutoMapperConfigurationException($"{typeMap.DestinationType.Name} does not have a matching constructor with a parameter named '{CtorParamName}'.\n{typeMap.DestinationType.FullName}");
             }
             foreach (var action in _ctorParamActions)
             {
                 action(parameter);
             }
-            parameter.CanResolveValue = true;
         }
     }
 }