From 89c31eb6a7a29869787c7034b3ee9c4e638469f7 Mon Sep 17 00:00:00 2001
From: Jimmy Bogard <jimmy.bogard@gmail.com>
Date: Wed, 24 Feb 2016 11:25:59 -0600
Subject: [PATCH 1/2] Removing obsolete on some of the static API

---
 src/AutoMapper/Mapper.cs | 47 +++++++++++++---------------------------
 1 file changed, 15 insertions(+), 32 deletions(-)

diff --git a/src/AutoMapper/Mapper.cs b/src/AutoMapper/Mapper.cs
index 127f903200..9252c2a1ac 100644
--- a/src/AutoMapper/Mapper.cs
+++ b/src/AutoMapper/Mapper.cs
@@ -37,7 +37,6 @@ public static bool AllowNullDestinationValues
         /// <typeparam name="TDestination">Destination type to create</typeparam>
         /// <param name="source">Source object to map from</param>
         /// <returns>Mapped destination object</returns>
-        [Obsolete("The static API will be removed in version 5.0. Use a MapperConfiguration instance and store statically as needed. Use CreateMapper to create a mapper instance.")]
         public static TDestination Map<TDestination>(object source)
         {
             return Instance.Map<TDestination>(source);
@@ -50,7 +49,6 @@ public static TDestination Map<TDestination>(object source)
         /// <param name="source">Source object to map from</param>
         /// <param name="opts">Mapping options</param>
         /// <returns>Mapped destination object</returns>
-        [Obsolete("The static API will be removed in version 5.0. Use a MapperConfiguration instance and store statically as needed. Use CreateMapper to create a mapper instance.")]
         public static TDestination Map<TDestination>(object source, Action<IMappingOperationOptions> opts)
         {
             return Instance.Map<TDestination>(source, opts);
@@ -63,7 +61,6 @@ public static TDestination Map<TDestination>(object source, Action<IMappingOpera
         /// <typeparam name="TDestination">Destination type to create</typeparam>
         /// <param name="source">Source object to map from</param>
         /// <returns>Mapped destination object</returns>
-        [Obsolete("The static API will be removed in version 5.0. Use a MapperConfiguration instance and store statically as needed. Use CreateMapper to create a mapper instance.")]
         public static TDestination Map<TSource, TDestination>(TSource source)
         {
             return Instance.Map<TSource, TDestination>(source);
@@ -77,7 +74,6 @@ public static TDestination Map<TDestination>(object source, Action<IMappingOpera
         /// <param name="source">Source object to map from</param>
         /// <param name="destination">Destination object to map into</param>
         /// <returns>The mapped destination object, same instance as the <paramref name="destination"/> object</returns>
-        [Obsolete("The static API will be removed in version 5.0. Use a MapperConfiguration instance and store statically as needed. Use CreateMapper to create a mapper instance.")]
         public static TDestination Map<TSource, TDestination>(TSource source, TDestination destination)
         {
             return Instance.Map(source, destination);
@@ -92,7 +88,6 @@ public static TDestination Map<TDestination>(object source, Action<IMappingOpera
         /// <param name="destination">Destination object to map into</param>
         /// <param name="opts">Mapping options</param>
         /// <returns>The mapped destination object, same instance as the <paramref name="destination"/> object</returns>
-        [Obsolete("The static API will be removed in version 5.0. Use a MapperConfiguration instance and store statically as needed. Use CreateMapper to create a mapper instance.")]
         public static TDestination Map<TSource, TDestination>(TSource source, TDestination destination,
             Action<IMappingOperationOptions<TSource, TDestination>> opts)
         {
@@ -107,7 +102,6 @@ public static TDestination Map<TDestination>(object source, Action<IMappingOpera
         /// <param name="source">Source object to map from</param>
         /// <param name="opts">Mapping options</param>
         /// <returns>Mapped destination object</returns>
-        [Obsolete("The static API will be removed in version 5.0. Use a MapperConfiguration instance and store statically as needed. Use CreateMapper to create a mapper instance.")]
         public static TDestination Map<TSource, TDestination>(TSource source,
             Action<IMappingOperationOptions<TSource, TDestination>> opts)
         {
@@ -121,7 +115,6 @@ public static TDestination Map<TDestination>(object source, Action<IMappingOpera
         /// <param name="sourceType">Source type to use</param>
         /// <param name="destinationType">Destination type to create</param>
         /// <returns>Mapped destination object</returns>
-        [Obsolete("The static API will be removed in version 5.0. Use a MapperConfiguration instance and store statically as needed. Use CreateMapper to create a mapper instance.")]
         public static object Map(object source, Type sourceType, Type destinationType)
         {
             return Instance.Map(source, sourceType, destinationType);
@@ -135,7 +128,6 @@ public static object Map(object source, Type sourceType, Type destinationType)
         /// <param name="destinationType">Destination type to create</param>
         /// <param name="opts">Mapping options</param>
         /// <returns>Mapped destination object</returns>
-        [Obsolete("The static API will be removed in version 5.0. Use a MapperConfiguration instance and store statically as needed. Use CreateMapper to create a mapper instance.")]
         public static object Map(object source, Type sourceType, Type destinationType,
             Action<IMappingOperationOptions> opts)
         {
@@ -150,7 +142,6 @@ public static object Map(object source, Type sourceType, Type destinationType)
         /// <param name="sourceType">Source type to use</param>
         /// <param name="destinationType">Destination type to use</param>
         /// <returns>Mapped destination object, same instance as the <paramref name="destination"/> object</returns>
-        [Obsolete("The static API will be removed in version 5.0. Use a MapperConfiguration instance and store statically as needed. Use CreateMapper to create a mapper instance.")]
         public static object Map(object source, object destination, Type sourceType, Type destinationType)
         {
             return Instance.Map(source, destination, sourceType, destinationType);
@@ -165,7 +156,6 @@ public static object Map(object source, object destination, Type sourceType, Typ
         /// <param name="destinationType">Destination type to use</param>
         /// <param name="opts">Mapping options</param>
         /// <returns>Mapped destination object, same instance as the <paramref name="destination"/> object</returns>
-        [Obsolete("The static API will be removed in version 5.0. Use a MapperConfiguration instance and store statically as needed. Use CreateMapper to create a mapper instance.")]
         public static object Map(object source, object destination, Type sourceType, Type destinationType,
             Action<IMappingOperationOptions> opts)
         {
@@ -244,7 +234,6 @@ public static void DynamicMap(object source, object destination, Type sourceType
         /// This is the preferred means to configure AutoMapper.
         /// </summary>
         /// <param name="action">Initialization callback</param>
-        [Obsolete("Construct a MapperConfiguration instance and call CreateMapper instead. Store the instances statically as needed.")]
         public static void Initialize(Action<IMapperConfiguration> action)
         {
             Reset();
@@ -260,7 +249,7 @@ public static void Initialize(Action<IMapperConfiguration> action)
         /// <typeparam name="TSource">Source type</typeparam>
         /// <typeparam name="TDestination">Destination type</typeparam>
         /// <returns>Mapping expression for more configuration options</returns>
-        [Obsolete("The static API will be removed in version 5.0. Use a MapperConfiguration instance and store statically as needed. Use CreateMapper to create a mapper instance.")]
+        [Obsolete("Dynamically creating maps will be removed in version 5.0. Use a MapperConfiguration instance and store statically as needed, or Mapper.Initialize. Use CreateMapper to create a mapper instance.")]
         public static IMappingExpression<TSource, TDestination> CreateMap<TSource, TDestination>()
         {
             return Configuration.CreateMap<TSource, TDestination>();
@@ -274,7 +263,7 @@ public static void Initialize(Action<IMapperConfiguration> action)
         /// <typeparam name="TDestination">Destination type</typeparam>
         /// <param name="memberList">Member list to validate</param>
         /// <returns>Mapping expression for more configuration options</returns>
-        [Obsolete("The static API will be removed in version 5.0. Use a MapperConfiguration instance and store statically as needed. Use CreateMapper to create a mapper instance.")]
+        [Obsolete("Dynamically creating maps will be removed in version 5.0. Use a MapperConfiguration instance and store statically as needed, or Mapper.Initialize. Use CreateMapper to create a mapper instance.")]
         public static IMappingExpression<TSource, TDestination> CreateMap<TSource, TDestination>(MemberList memberList)
         {
             return Configuration.CreateMap<TSource, TDestination>(memberList);
@@ -287,7 +276,7 @@ public static void Initialize(Action<IMapperConfiguration> action)
         /// <param name="sourceType">Source type</param>
         /// <param name="destinationType">Destination type</param>
         /// <returns>Mapping expression for more configuration options</returns>
-        [Obsolete("The static API will be removed in version 5.0. Use a MapperConfiguration instance and store statically as needed. Use CreateMapper to create a mapper instance.")]
+        [Obsolete("Dynamically creating maps will be removed in version 5.0. Use a MapperConfiguration instance and store statically as needed, or Mapper.Initialize. Use CreateMapper to create a mapper instance.")]
         public static IMappingExpression CreateMap(Type sourceType, Type destinationType)
         {
             return Configuration.CreateMap(sourceType, destinationType);
@@ -301,7 +290,7 @@ public static IMappingExpression CreateMap(Type sourceType, Type destinationType
         /// <param name="destinationType">Destination type</param>
         /// <param name="memberList">Member list to validate</param>
         /// <returns>Mapping expression for more configuration options</returns>
-        [Obsolete("The static API will be removed in version 5.0. Use a MapperConfiguration instance and store statically as needed. Use CreateMapper to create a mapper instance.")]
+        [Obsolete("Dynamically creating maps will be removed in version 5.0. Use a MapperConfiguration instance and store statically as needed, or Mapper.Initialize. Use CreateMapper to create a mapper instance.")]
         public static IMappingExpression CreateMap(Type sourceType, Type destinationType, MemberList memberList)
         {
             return Configuration.CreateMap(sourceType, destinationType, memberList);
@@ -312,7 +301,7 @@ public static IMappingExpression CreateMap(Type sourceType, Type destinationType
         /// </summary>
         /// <param name="profileName">Profile name</param>
         /// <returns>Profile configuration options</returns>
-        [Obsolete("The static API will be removed in version 5.0. Use a MapperConfiguration instance and store statically as needed. Use CreateMapper to create a mapper instance.")]
+        [Obsolete("Dynamically creating maps will be removed in version 5.0. Use a MapperConfiguration instance and store statically as needed, or Mapper.Initialize. Use CreateMapper to create a mapper instance.")]
         public static IProfileExpression CreateProfile(string profileName)
         {
             return Configuration.CreateProfile(profileName);
@@ -323,7 +312,7 @@ public static IProfileExpression CreateProfile(string profileName)
         /// </summary>
         /// <param name="profileName">Profile name</param>
         /// <param name="profileConfiguration">Profile configuration callback</param>
-        [Obsolete("The static API will be removed in version 5.0. Use a MapperConfiguration instance and store statically as needed. Use CreateMapper to create a mapper instance.")]
+        [Obsolete("Dynamically creating maps will be removed in version 5.0. Use a MapperConfiguration instance and store statically as needed, or Mapper.Initialize. Use CreateMapper to create a mapper instance.")]
         public static void CreateProfile(string profileName, Action<IProfileExpression> profileConfiguration)
         {
             Configuration.CreateProfile(profileName, profileConfiguration);
@@ -333,7 +322,7 @@ public static void CreateProfile(string profileName, Action<IProfileExpression>
         /// Add an existing profile
         /// </summary>
         /// <param name="profile">Profile to add</param>
-        [Obsolete("The static API will be removed in version 5.0. Use a MapperConfiguration instance and store statically as needed. Use CreateMapper to create a mapper instance.")]
+        [Obsolete("Dynamically creating maps will be removed in version 5.0. Use a MapperConfiguration instance and store statically as needed, or Mapper.Initialize. Use CreateMapper to create a mapper instance.")]
         public static void AddProfile(Profile profile)
         {
             Configuration.AddProfile(profile);
@@ -343,7 +332,7 @@ public static void AddProfile(Profile profile)
         /// Add an existing profile type. Profile will be instantiated and added to the configuration.
         /// </summary>
         /// <typeparam name="TProfile">Profile type</typeparam>
-        [Obsolete("The static API will be removed in version 5.0. Use a MapperConfiguration instance and store statically as needed. Use CreateMapper to create a mapper instance.")]
+        [Obsolete("Dynamically creating maps will be removed in version 5.0. Use a MapperConfiguration instance and store statically as needed, or Mapper.Initialize. Use CreateMapper to create a mapper instance.")]
         public static void AddProfile<TProfile>() where TProfile : Profile, new()
         {
             Configuration.AddProfile<TProfile>();
@@ -355,7 +344,7 @@ public static void AddProfile<TProfile>() where TProfile : Profile, new()
         /// <param name="sourceType">Configured source type</param>
         /// <param name="destinationType">Configured destination type</param>
         /// <returns>Type map configuration</returns>
-        [Obsolete("The static API will be removed in version 5.0. Use a MapperConfiguration instance and store statically as needed. Use CreateMapper to create a mapper instance.")]
+        [Obsolete("Dynamically creating maps will be removed in version 5.0. Use a MapperConfiguration instance and store statically as needed, or Mapper.Initialize. Use CreateMapper to create a mapper instance.")]
         public static TypeMap FindTypeMapFor(Type sourceType, Type destinationType)
         {
             return ConfigurationProvider.FindTypeMapFor(sourceType, destinationType);
@@ -367,7 +356,7 @@ public static TypeMap FindTypeMapFor(Type sourceType, Type destinationType)
         /// <typeparam name="TSource">Configured source type</typeparam>
         /// <typeparam name="TDestination">Configured destination type</typeparam>
         /// <returns>Type map configuration</returns>
-        [Obsolete("The static API will be removed in version 5.0. Use a MapperConfiguration instance and store statically as needed. Use CreateMapper to create a mapper instance.")]
+        [Obsolete("Dynamically creating maps will be removed in version 5.0. Use a MapperConfiguration instance and store statically as needed, or Mapper.Initialize. Use CreateMapper to create a mapper instance.")]
         public static TypeMap FindTypeMapFor<TSource, TDestination>()
         {
             return ConfigurationProvider.FindTypeMapFor(typeof (TSource), typeof (TDestination));
@@ -377,7 +366,7 @@ public static TypeMap FindTypeMapFor(Type sourceType, Type destinationType)
         /// Get all configured type maps created
         /// </summary>
         /// <returns>All configured type maps</returns>
-        [Obsolete("The static API will be removed in version 5.0. Use a MapperConfiguration instance and store statically as needed. Use CreateMapper to create a mapper instance.")]
+        [Obsolete("Dynamically creating maps will be removed in version 5.0. Use a MapperConfiguration instance and store statically as needed, or Mapper.Initialize. Use CreateMapper to create a mapper instance.")]
         public static TypeMap[] GetAllTypeMaps()
         {
             return ConfigurationProvider.GetAllTypeMaps();
@@ -386,7 +375,6 @@ public static TypeMap[] GetAllTypeMaps()
         /// <summary>
         /// Dry run all configured type maps and throw <see cref="AutoMapperConfigurationException"/> for each problem
         /// </summary>
-        [Obsolete("The static API will be removed in version 5.0. Use a MapperConfiguration instance and store statically as needed. Use CreateMapper to create a mapper instance.")]
         public static void AssertConfigurationIsValid()
         {
             ConfigurationProvider.AssertConfigurationIsValid();
@@ -396,7 +384,6 @@ public static void AssertConfigurationIsValid()
         /// Dry run single type map
         /// </summary>
         /// <param name="typeMap">Type map to check</param>
-        [Obsolete("The static API will be removed in version 5.0. Use a MapperConfiguration instance and store statically as needed. Use CreateMapper to create a mapper instance.")]
         public static void AssertConfigurationIsValid(TypeMap typeMap)
         {
             ConfigurationProvider.AssertConfigurationIsValid(typeMap);
@@ -406,7 +393,6 @@ public static void AssertConfigurationIsValid(TypeMap typeMap)
         /// Dry run all type maps in given profile
         /// </summary>
         /// <param name="profileName">Profile name of type maps to test</param>
-        [Obsolete("The static API will be removed in version 5.0. Use a MapperConfiguration instance and store statically as needed. Use CreateMapper to create a mapper instance.")]
         public static void AssertConfigurationIsValid(string profileName)
         {
             ConfigurationProvider.AssertConfigurationIsValid(profileName);
@@ -416,7 +402,6 @@ public static void AssertConfigurationIsValid(string profileName)
         /// Dry run all type maps in given profile
         /// </summary>
         /// <typeparam name="TProfile">Profile type</typeparam>
-        [Obsolete("The static API will be removed in version 5.0. Use a MapperConfiguration instance and store statically as needed. Use CreateMapper to create a mapper instance.")]
         public static void AssertConfigurationIsValid<TProfile>() where TProfile : Profile, new()
         {
             ConfigurationProvider.AssertConfigurationIsValid<TProfile>();
@@ -425,7 +410,7 @@ public static void AssertConfigurationIsValid<TProfile>() where TProfile : Profi
         /// <summary>
         /// Clear out all existing configuration
         /// </summary>
-        [Obsolete("The static API will be removed in version 5.0. Use a MapperConfiguration instance and store statically as needed. Use CreateMapper to create a mapper instance.")]
+        [Obsolete("Dynamically creating maps will be removed in version 5.0. Use a MapperConfiguration instance and store statically as needed, or Mapper.Initialize. Use CreateMapper to create a mapper instance.")]
         public static void Reset()
         {
             MapperRegistry.Reset();
@@ -436,16 +421,14 @@ public static void Reset()
         /// <summary>
         /// Mapping engine used to perform mappings
         /// </summary>
-        [Obsolete("The static API will be removed in version 5.0. Use a MapperConfiguration instance and store statically as needed. Use CreateMapper to create a mapper instance.")]
         public static IMappingEngine Engine => _mappingEngine.Value._engine;
-        private static IMapper Instance => _mappingEngine.Value;
-        internal static IConfigurationProvider ConfigurationProvider => _configuration.Value;
+        public static IMapper Instance => _mappingEngine.Value;
+        public static IConfigurationProvider ConfigurationProvider => _configuration.Value;
         private static IDynamicMapper DynamicInstance => _mappingEngine.Value;
 
         /// <summary>
         /// Store for all configuration
         /// </summary>
-        [Obsolete("The static API will be removed in version 5.0. Use a MapperConfiguration instance and store statically as needed. Use CreateMapper to create a mapper instance.")]
         public static IMapperConfiguration Configuration => _configuration.Value;
 
 
@@ -453,7 +436,7 @@ public static void Reset()
         /// Globally ignore all members starting with a prefix
         /// </summary>
         /// <param name="startingwith">Prefix of members to ignore. Call this before all other maps created.</param>
-        [Obsolete("The static API will be removed in version 5.0. Use a MapperConfiguration instance and store statically as needed. Use CreateMapper to create a mapper instance.")]
+        [Obsolete("Dynamically creating maps will be removed in version 5.0. Use a MapperConfiguration instance and store statically as needed, or Mapper.Initialize. Use CreateMapper to create a mapper instance.")]
         public static void AddGlobalIgnore(string startingwith)
         {
             Configuration.AddGlobalIgnore(startingwith);

From 8638e9c46f463506a620fc6311fa4f9344fc37f0 Mon Sep 17 00:00:00 2001
From: Jimmy Bogard <jimmy.bogard@gmail.com>
Date: Wed, 24 Feb 2016 13:13:55 -0600
Subject: [PATCH 2/2] Restoring queryable extensions

---
 src/AutoMapper/Mapper.cs                      |  3 +-
 .../QueryableExtensions/Extensions.cs         | 75 +++++++++++++------
 src/UnitTests/StaticMapping.cs                | 52 +++++++++++++
 src/UnitTests/UnitTests.Net4.csproj           |  1 +
 4 files changed, 106 insertions(+), 25 deletions(-)
 create mode 100644 src/UnitTests/StaticMapping.cs

diff --git a/src/AutoMapper/Mapper.cs b/src/AutoMapper/Mapper.cs
index 9252c2a1ac..8a523283c1 100644
--- a/src/AutoMapper/Mapper.cs
+++ b/src/AutoMapper/Mapper.cs
@@ -423,12 +423,13 @@ public static void Reset()
         /// </summary>
         public static IMappingEngine Engine => _mappingEngine.Value._engine;
         public static IMapper Instance => _mappingEngine.Value;
-        public static IConfigurationProvider ConfigurationProvider => _configuration.Value;
+        internal static IConfigurationProvider ConfigurationProvider => _configuration.Value;
         private static IDynamicMapper DynamicInstance => _mappingEngine.Value;
 
         /// <summary>
         /// Store for all configuration
         /// </summary>
+        [Obsolete("Dynamically creating maps will be removed in version 5.0. Use a MapperConfiguration instance and store statically as needed, or Mapper.Initialize. Use CreateMapper to create a mapper instance.")]
         public static IMapperConfiguration Configuration => _configuration.Value;
 
 
diff --git a/src/AutoMapper/QueryableExtensions/Extensions.cs b/src/AutoMapper/QueryableExtensions/Extensions.cs
index 4690763f1b..7e3119a9ca 100644
--- a/src/AutoMapper/QueryableExtensions/Extensions.cs
+++ b/src/AutoMapper/QueryableExtensions/Extensions.cs
@@ -12,8 +12,16 @@ namespace AutoMapper.QueryableExtensions
     /// </summary>
     public static class Extensions
     {
-        [Obsolete("The static API will be removed in version 5.0. Use a MapperConfiguration instance and store statically as needed, passing in to the overload that accepts an instance")]
-        public static Func<IConfigurationProvider> ConfigurationFactory = () => Mapper.ConfigurationProvider;
+        /// <summary>
+        /// Maps a queryable expression of a source type to a queryable expression of a destination type
+        /// </summary>
+        /// <typeparam name="TSource">Source type</typeparam>
+        /// <typeparam name="TDestination">Destination type</typeparam>
+        /// <param name="sourceQuery">Source queryable</param>
+        /// <param name="destQuery">Destination queryable</param>
+        /// <returns>Mapped destination queryable</returns>
+        public static IQueryable<TDestination> Map<TSource, TDestination>(this IQueryable<TSource> sourceQuery, IQueryable<TDestination> destQuery)
+            => sourceQuery.Map(destQuery, Mapper.ConfigurationProvider);
 
         /// <summary>
         /// Maps a queryable expression of a source type to a queryable expression of a destination type
@@ -26,9 +34,12 @@ public static class Extensions
         /// <returns>Mapped destination queryable</returns>
         public static IQueryable<TDestination> Map<TSource, TDestination>(this IQueryable<TSource> sourceQuery, IQueryable<TDestination> destQuery, IConfigurationProvider config)
         {
-            return QueryMapperVisitor.Map<TSource, TDestination>(sourceQuery, destQuery, config);
+            return QueryMapperVisitor.Map(sourceQuery, destQuery, config);
         }
 
+        public static IQueryDataSourceInjection<TSource> UseAsDataSource<TSource>(this IQueryable<TSource> dataSource)
+            => dataSource.UseAsDataSource(Mapper.Instance);
+
         public static IQueryDataSourceInjection<TSource> UseAsDataSource<TSource>(this IQueryable<TSource> dataSource, IMapper mapper)
         {
             return new QueryDataSourceInjection<TSource>(dataSource, mapper);
@@ -40,7 +51,19 @@ public static IQueryDataSourceInjection<TSource> UseAsDataSource<TSource>(this I
         /// <remarks>Projections are only calculated once and cached</remarks>
         /// <typeparam name="TDestination">Destination type</typeparam>
         /// <param name="source">Queryable source</param>
-        /// <param name="configuration">Maper configuration</param>
+        /// <param name="parameters">Optional parameter object for parameterized mapping expressions</param>
+        /// <param name="membersToExpand">Explicit members to expand</param>
+        /// <returns>Expression to project into</returns>
+        public static IQueryable<TDestination> ProjectTo<TDestination>(this IQueryable source, object parameters, params Expression<Func<TDestination, object>>[] membersToExpand)
+            => source.ProjectTo(Mapper.ConfigurationProvider, parameters, membersToExpand);
+
+        /// <summary>
+        /// Extension method to project from a queryable using the provided mapping engine
+        /// </summary>
+        /// <remarks>Projections are only calculated once and cached</remarks>
+        /// <typeparam name="TDestination">Destination type</typeparam>
+        /// <param name="source">Queryable source</param>
+        /// <param name="configuration">Mapper configuration</param>
         /// <param name="parameters">Optional parameter object for parameterized mapping expressions</param>
         /// <param name="membersToExpand">Explicit members to expand</param>
         /// <returns>Expression to project into</returns>
@@ -49,12 +72,6 @@ public static IQueryable<TDestination> ProjectTo<TDestination>(this IQueryable s
             return new ProjectionExpression(source, configuration.ExpressionBuilder).To(parameters, membersToExpand);
         }
 
-        [Obsolete("The static API will be removed in version 5.0. Use a MapperConfiguration instance and store statically as needed, passing in to the overload that accepts an instance")]
-        public static IQueryable<TDestination> ProjectTo<TDestination>(this IQueryable source, object parameters, params Expression<Func<TDestination, object>>[] membersToExpand)
-        {
-            return new ProjectionExpression(source, ConfigurationFactory().ExpressionBuilder).To(parameters, membersToExpand);
-        }
-
         /// <summary>
         /// Extension method to project from a queryable using the provided mapping engine
         /// </summary>
@@ -69,18 +86,34 @@ public static IQueryable<TDestination> ProjectTo<TDestination>(this IQueryable s
             IConfigurationProvider configuration,
             params Expression<Func<TDestination, object>>[] membersToExpand
             )
-        {
-            return source.ProjectTo(configuration, null, membersToExpand);
-        }
+            => source.ProjectTo(configuration, null, membersToExpand);
 
-        [Obsolete("The static API will be removed in version 5.0. Use a MapperConfiguration instance and store statically as needed, passing in to the overload that accepts an instance")]
+        /// <summary>
+        /// Extension method to project from a queryable using the provided mapping engine
+        /// </summary>
+        /// <remarks>Projections are only calculated once and cached</remarks>
+        /// <typeparam name="TDestination">Destination type</typeparam>
+        /// <param name="source">Queryable source</param>
+        /// <param name="membersToExpand">Explicit members to expand</param>
+        /// <returns>Expression to project into</returns>
         public static IQueryable<TDestination> ProjectTo<TDestination>(
             this IQueryable source,
             params Expression<Func<TDestination, object>>[] membersToExpand
             )
-        {
-            return source.ProjectTo(ConfigurationFactory(), null, membersToExpand);
-        }
+            => source.ProjectTo(Mapper.ConfigurationProvider, null, membersToExpand);
+
+        /// <summary>
+        /// Projects the source type to the destination type given the mapping configuration
+        /// </summary>
+        /// <typeparam name="TDestination">Destination type to map to</typeparam>
+        /// <param name="source">Queryable source</param>
+        /// <param name="configuration">Mapper configuration</param>
+        /// <param name="parameters">Optional parameter object for parameterized mapping expressions</param>
+        /// <param name="membersToExpand">Explicit members to expand</param>
+        /// <returns>Queryable result, use queryable extension methods to project and execute result</returns>
+        public static IQueryable<TDestination> ProjectTo<TDestination>(this IQueryable source,
+            IDictionary<string, object> parameters, params string[] membersToExpand)
+            => source.ProjectTo<TDestination>(Mapper.ConfigurationProvider, parameters, membersToExpand);
 
         /// <summary>
         /// Projects the source type to the destination type given the mapping configuration
@@ -95,11 +128,5 @@ public static IQueryable<TDestination> ProjectTo<TDestination>(this IQueryable s
         {
             return new ProjectionExpression(source, configuration.ExpressionBuilder).To<TDestination>(parameters, membersToExpand);
         }
-
-        [Obsolete("The static API will be removed in version 5.0. Use a MapperConfiguration instance and store statically as needed, passing in to the overload that accepts an instance")]
-        public static IQueryable<TDestination> ProjectTo<TDestination>(this IQueryable source, IDictionary<string, object> parameters, params string[] membersToExpand)
-        {
-            return new ProjectionExpression(source, ConfigurationFactory().ExpressionBuilder).To<TDestination>(parameters, membersToExpand);
-        }
     }
-}
+}
\ No newline at end of file
diff --git a/src/UnitTests/StaticMapping.cs b/src/UnitTests/StaticMapping.cs
new file mode 100644
index 0000000000..165060c0d0
--- /dev/null
+++ b/src/UnitTests/StaticMapping.cs
@@ -0,0 +1,52 @@
+namespace AutoMapper.UnitTests
+{
+    using System.Linq;
+    using Should;
+    using Xunit;
+    using QueryableExtensions;
+
+    public class StaticMapping
+    {
+        public class Source
+        {
+            public int Value { get; set; }
+        }
+
+        public class Dest
+        {
+            public int Value { get; set; }
+        }
+
+        [Fact]
+        public void Can_map_statically()
+        {
+            Mapper.Initialize(cfg =>
+            {
+                cfg.CreateMap<Source, Dest>();
+            });
+
+            var source = new Source { Value = 5 };
+
+            var dest = Mapper.Map<Source, Dest>(source);
+
+            dest.Value.ShouldEqual(source.Value);
+        }
+
+        [Fact]
+        public void Can_project_statically()
+        {
+            Mapper.Initialize(cfg =>
+            {
+                cfg.CreateMap<Source, Dest>();
+            });
+
+            var source = new Source { Value = 5 };
+            var sources = new[] { source }.AsQueryable();
+
+            var dests = sources.ProjectTo<Dest>().ToArray();
+
+            dests.Length.ShouldEqual(1);
+            dests[0].Value.ShouldEqual(source.Value);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/UnitTests/UnitTests.Net4.csproj b/src/UnitTests/UnitTests.Net4.csproj
index e8ee53aa24..61de5a965f 100644
--- a/src/UnitTests/UnitTests.Net4.csproj
+++ b/src/UnitTests/UnitTests.Net4.csproj
@@ -298,6 +298,7 @@
     <Compile Include="Should\should\DoubleAssertionExtensions.cs" />
     <Compile Include="Should\should\ObjectAssertExtensions.cs" />
     <Compile Include="Should\should\StringAssertionExtensions.cs" />
+    <Compile Include="StaticMapping.cs" />
     <Compile Include="TesterExtensions.cs" />
     <Compile Include="ConfigurationValidation.cs" />
     <Compile Include="Bug\ProjectConstructorParameters.cs" />