Merge pull request #4202 from AutoMapper/net6

Target .NET 6

Author: jbogard

Build.ps1

@@ -26,6 +26,6 @@ $artifacts = ".\artifacts"
 
 if(Test-Path $artifacts) { Remove-Item $artifacts -Force -Recurse }
 
-exec { & dotnet test -c Release --results-directory $artifacts -l trx --verbosity=normal }
+exec { & dotnet test -c Release --results-directory $artifacts -l trx }
 
 exec { & dotnet pack .\src\AutoMapper\AutoMapper.csproj -c Release -o $artifacts --no-build }

docs/13.0-Upgrade-Guide.md

@@ -0,0 +1,13 @@
+# 13.0 Upgrade Guide
+
+[Release notes](https://github.com/AutoMapper/AutoMapper/releases/tag/v13.0.0).
+
+## AutoMapper now targets .Net 6
+
+## `IMapper` has nullable annotations
+
+Besides the build-time impact, there is also a behaviour change. Non-generic `Map` overloads require now either a destination type or a non-null destination object.
+
+## `AllowAdditiveTypeMapCreation` was removed
+
+Be sure to call `CreateMap` once for a source type, destination type pair. If you want to reuse configuration, use mapping inheritance.

docs/Configuration-validation.md

@@ -50,7 +50,7 @@ var configuration = new MapperConfiguration(cfg =>
 );
 ```
 
-To skip validation altogether for this map, use `MemberList.None`.
+To skip validation altogether for this map, use `MemberList.None`. That's the default for `ReverseMap`.
 
 
 ## Custom validations

docs/Queryable-Extensions.md

@@ -208,7 +208,15 @@ You may also use a dictionary to build the projection values:
 dbContext.Courses.ProjectTo<CourseModel>(Config, new Dictionary<string, object> { {"currentUserName", Request.User.Name} });
 ```
 
-However, using a dictionary will result in hard-coded values in the query instead of a parameterized query, so use with caution.
+However, using a dictionary will result in hard-coded values in the query instead of a parameterized query, so use with caution.
+
+### Recursive models
+
+Ideally, you would avoid models that reference themselves (do some research). But if you must, you need to enable them:
+
+```c#
+configuration.Internal().RecursiveQueriesMaxDepth = someRandomNumber;
+```
 
 ### Supported mapping options
 

docs/index.rst

@@ -11,10 +11,6 @@ other simple objects, whose design is better suited for serialization,
 communication, messaging, or simply an anti-corruption layer between the
 domain and application layer.
 
-AutoMapper supports the following platforms:
-
-* `.NET Standard 2.1+ <https://docs.microsoft.com/en-us/dotnet/standard/net-standard>`_
-
 New to AutoMapper? Check out the :doc:`Getting-started` page first.
 
 .. _user-docs:

src/AutoMapper/ApiCompatBaseline.txt

@@ -1,5 +1,8 @@
 Compat issues with assembly AutoMapper:
 CannotChangeAttribute : Attribute 'System.AttributeUsageAttribute' on 'AutoMapper.AutoMapAttribute' changed from '[AttributeUsageAttribute(1036, AllowMultiple=true)]' in the contract to '[AttributeUsageAttribute(AttributeTargets.Class | AttributeTargets.Interface | AttributeTargets.Struct, AllowMultiple=true)]' in the implementation.
+InterfacesShouldHaveSameMembers : Interface member 'public System.Collections.Generic.IReadOnlyCollection<AutoMapper.PropertyMapAction> AutoMapper.IProfileConfiguration.AllPropertyMapActions.get()' is present in the implementation but not in the contract.
+InterfacesShouldHaveSameMembers : Interface member 'public System.Collections.Generic.IReadOnlyCollection<System.Action<AutoMapper.PropertyMap, AutoMapper.IMemberConfigurationExpression>> AutoMapper.IProfileConfiguration.AllPropertyMapActions.get()' is present in the contract but not in the implementation.
+MembersMustExist : Member 'public System.Collections.Generic.IReadOnlyCollection<System.Action<AutoMapper.PropertyMap, AutoMapper.IMemberConfigurationExpression>> AutoMapper.IProfileConfiguration.AllPropertyMapActions.get()' does not exist in the implementation but it does exist in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'public void AutoMapper.Configuration.ICtorParamConfigurationExpression.ExplicitExpansion()' is present in the implementation but not 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.
@@ -10,4 +13,4 @@ CannotChangeAttribute : Attribute 'System.AttributeUsageAttribute' on 'AutoMappe
 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.
 TypeCannotChangeClassification : Type 'AutoMapper.Execution.TypeMapPlanBuilder' is a 'ref struct' in the implementation but is a 'struct' in the contract.
-Total Issues: 11
+Total Issues: 14

src/AutoMapper/AutoMapper.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Summary>A convention-based object-object mapper.</Summary>
     <Description>A convention-based object-object mapper.</Description>
-    <TargetFrameworks>netstandard2.1</TargetFrameworks>
+    <TargetFrameworks>net6.0</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyName>AutoMapper</AssemblyName>
     <AssemblyOriginatorKeyFile>..\..\AutoMapper.snk</AssemblyOriginatorKeyFile>

src/AutoMapper/AutoMapperMappingException.cs

@@ -81,15 +81,13 @@ public DuplicateTypeMapConfigurationException(TypeMapConfigErrors[] errors)
     {
         Errors = errors;
         var builder = new StringBuilder();
-        builder.AppendLine("The following type maps were found in multiple profiles:");
+        builder.AppendLine("Duplicate CreateMap calls:");
         foreach (var error in Errors)
         {
             builder.AppendLine($"{error.Types.SourceType.FullName} to {error.Types.DestinationType.FullName} defined in profiles:");
             builder.AppendLine(string.Join(Environment.NewLine, error.ProfileNames));
         }
-        builder.AppendLine("This can cause configuration collisions and inconsistent mapping.");
-        builder.AppendLine("Consolidate the CreateMap calls into one profile, or set the root Internal().AllowAdditiveTypeMapCreation configuration value to 'true'.");
-
+        builder.AppendLine("This can cause configuration collisions and inconsistent mappings. Use a single CreateMap call per type pair.");
         Message = builder.ToString();
     }
 

src/AutoMapper/Configuration/ConfigurationValidator.cs

@@ -13,19 +13,16 @@ private void Validate(ValidationContext context)
     }
     public void AssertConfigurationExpressionIsValid(IGlobalConfiguration config, IEnumerable<TypeMap> typeMaps)
     {
-        if (!Expression.AllowAdditiveTypeMapCreation)
+        var duplicateTypeMapConfigs = Expression.Profiles.Append((Profile)Expression)
+            .SelectMany(p => p.TypeMapConfigs, (profile, typeMap) => (profile, typeMap))
+            .GroupBy(x => x.typeMap.Types)
+            .Where(g => g.Count() > 1)
+            .Select(g => (TypePair : g.Key, ProfileNames : g.Select(tmc => tmc.profile.ProfileName).ToArray()))
+            .Select(g => new DuplicateTypeMapConfigurationException.TypeMapConfigErrors(g.TypePair, g.ProfileNames))
+            .ToArray();
+        if (duplicateTypeMapConfigs.Any())
         {
-            var duplicateTypeMapConfigs = Expression.Profiles.Append((Profile)Expression)
-                .SelectMany(p => p.TypeMapConfigs, (profile, typeMap) => (profile, typeMap))
-                .GroupBy(x => x.typeMap.Types)
-                .Where(g => g.Count() > 1)
-                .Select(g => (TypePair : g.Key, ProfileNames : g.Select(tmc => tmc.profile.ProfileName).ToArray()))
-                .Select(g => new DuplicateTypeMapConfigurationException.TypeMapConfigErrors(g.TypePair, g.ProfileNames))
-                .ToArray();
-            if (duplicateTypeMapConfigs.Any())
-            {
-                throw new DuplicateTypeMapConfigurationException(duplicateTypeMapConfigs);
-            }
+            throw new DuplicateTypeMapConfigurationException(duplicateTypeMapConfigs);
         }
         AssertConfigurationIsValid(config, typeMaps);
     }

src/AutoMapper/Configuration/MapperConfigurationExpression.cs

@@ -101,13 +101,6 @@ public class MapperConfigurationExpression : Profile, IGlobalConfigurationExpres
     /// <param name="validator">the validation callback</param>
     void IGlobalConfigurationExpression.Validator(Validator validator) => 
         _validators.Add(validator ?? throw new ArgumentNullException(nameof(validator)));
-
-    /// <summary>
-    /// Allow the same map to exist in different profiles.
-    /// The default is to throw an exception, true means the maps are merged.
-    /// </summary>
-    bool IGlobalConfigurationExpression.AllowAdditiveTypeMapCreation { get; set; }
-
     /// <summary>
     /// How many levels deep should AutoMapper try to inline the execution plan for child classes.
     /// See <a href="https://automapper.readthedocs.io/en/latest/Understanding-your-mapping.html">the docs</a> for details.
@@ -184,7 +177,7 @@ private void AddMapsCore(IEnumerable<Assembly> assembliesToScan)
                 {
                     foreach (var memberConfigurationProvider in memberInfo.GetCustomAttributes().OfType<IMemberConfigurationProvider>())
                     {
-                        mappingExpression.ForMember(memberInfo, cfg => memberConfigurationProvider.ApplyConfiguration(cfg));
+                        mappingExpression.ForMember(memberInfo, memberConfigurationProvider.ApplyConfiguration);
                     }
                 }
 
@@ -195,5 +188,5 @@ private void AddMapsCore(IEnumerable<Assembly> assembliesToScan)
         AddProfile(autoMapAttributeProfile);
     }
 
-    public void ConstructServicesUsing(Func<Type, object> constructor) => _serviceCtor = constructor;
+    public void ConstructServicesUsing(Func<Type, object> constructor) => _serviceCtor = constructor ?? throw new ArgumentNullException(nameof(constructor));
 }