Merge pull request #4280 from AutoMapper/basic_include

ProjectTo runtime polymorphic mapping with Include/IncludeBase

Author: jbogard

AutoMapper.sln

@@ -26,7 +26,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutoMapper.UnitTests", "src
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutoMapper.IntegrationTests", "src\IntegrationTests\AutoMapper.IntegrationTests.csproj", "{24B47F4C-0035-4F29-AAD9-4C47E1AAD98E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutoMapper.DI.Tests", "src\AutoMapper.Extensions.Microsoft.DependencyInjection.Tests\AutoMapper.DI.Tests.csproj", "{BEBD620A-8BAA-463F-BE0F-8319AD3C1644}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutoMapper.DI.Tests", "src\AutoMapper.DI.Tests\AutoMapper.DI.Tests.csproj", "{BEBD620A-8BAA-463F-BE0F-8319AD3C1644}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestApp", "src\TestApp\TestApp.csproj", "{35CED3AE-B825-4703-992D-A58B5BE646DC}"
 EndProject

README.md

@@ -10,7 +10,6 @@ AutoMapper is a simple little library built to solve a deceptively complex probl
 
 This is the main repository for AutoMapper, but there's more:
 
-* [Microsoft DI Extensions](https://github.com/AutoMapper/AutoMapper.Extensions.Microsoft.DependencyInjection)
 * [Collection Extensions](https://github.com/AutoMapper/AutoMapper.Collection)
 * [Expression Mapping](https://github.com/AutoMapper/AutoMapper.Extensions.ExpressionMapping)
 * [EF6 Extensions](https://github.com/AutoMapper/AutoMapper.EF6)

docs/13.0-Upgrade-Guide.md

@@ -12,4 +12,16 @@ Besides the build-time impact, there is also a behaviour change. Non-generic `Ma
 
 ## `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.
+Be sure to call `CreateMap` once for a source type, destination type pair. If you want to reuse configuration, use mapping inheritance.
+
+## ProjectTo runtime polymorphic mapping with Include/IncludeBase
+
+We consider this an off the beaten path feature and we don't expose it through `CreateProjection`. You can use [an extension method](https://github.com/AutoMapper/AutoMapper/search?l=C%23&q=Advanced) or `CreateMap`.
+
+## `Context.State` similar to `Context.Items`
+
+The same pattern the framework uses to pass state to delegates. Note that `State` and `Items` are mutually exclusive per `Map` call.
+
+## Custom Equals/GetHashCode for source objects
+
+To avoid broken implementations, we no longer call those when checking for identical source objects, we hard code to checking object references.

docs/Before-and-after-map-actions.md

@@ -42,10 +42,10 @@ var configuration = new MapperConfiguration(cfg => {
 });
 ```
 
-### Asp.Net Core and `AutoMapper.Extensions.Microsoft.DependencyInjection`
-If you are using Asp.Net Core and the `AutoMapper.Extensions.Microsoft.DependencyInjection` package, this is also a good way of using Dependency Injection. You can't inject dependencies into `Profile` classes, but you can do it in `IMappingAction` implementations.
+### Dependency Injection
+You can't inject dependencies into `Profile` classes, but you can do it in `IMappingAction` implementations.
 
-The following example shows how to connect an `IMappingAction` accessing the current `HttpContext` to a `Profile` after map action, leveraging Dependency Injection:
+The following example shows how to connect an `IMappingAction` accessing the current `HttpContext` to a `Profile` after map action, leveraging dependency injection:
 
 ``` csharp
 public class SetTraceIdentifierAction : IMappingAction<SomeModel, SomeOtherModel>
@@ -84,6 +84,4 @@ public class Startup
     }
     //..
 }
-```
-
-*See `AutoMapper.Extensions.Microsoft.DependencyInjection` for more info.*
+```

docs/Custom-value-resolvers.md

@@ -127,6 +127,7 @@ This is how to setup the mapping for this custom resolver
 cfg.CreateMap<Source, Dest>()
     .ForMember(dest => dest.Foo, opt => opt.MapFrom((src, dest, destMember, context) => context.Items["Foo"]));
 ```
+Starting with version 13.0, you can use `context.State` instead, in a similar way. Note that `State` and `Items` are mutually exclusive per `Map` call.
 
 ### ForPath
 

docs/Queryable-Extensions.md

@@ -227,6 +227,7 @@ Not all mapping options can be supported, as the expression generated must be in
 * NullSubstitute
 * Value transformers
 * IncludeMembers
+* Runtime polymorphic mapping with Include/IncludeBase
 
 Not supported:
 * Condition
@@ -237,6 +238,5 @@ Not supported:
 * Custom resolvers
 * Custom type converters
 * ForPath
-* Value converters
-* Runtime polymorphic mapping with Include/IncludeBase
+* Value converters
 * **Any calculated property on your domain object**

docs/index.rst

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