Move extensions classes to consistent locations

EFCore.sln.DotSettings

@@ -189,7 +189,9 @@ Licensed under the Apache License, Version 2.0. See License.txt in the project r
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=annotatable/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=keyless/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=navigations/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=remapper/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=requiredness/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=shaper/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=sqlite/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=unignore/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=fixup/@EntryIndexedValue">True</s:Boolean>

src/EFCore.Cosmos/Extensions/CosmosDbContextOptionsExtensions.cs

@@ -8,6 +8,7 @@
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Utilities;
 
+// ReSharper disable once CheckNamespace
 namespace Microsoft.EntityFrameworkCore
 {
     public static class CosmosDbContextOptionsExtensions

src/EFCore.Cosmos/Extensions/CosmosLoggerExtensions.cs

@@ -13,6 +13,7 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
+// ReSharper disable once CheckNamespace
 namespace Microsoft.EntityFrameworkCore
 {
     public static class CosmosLoggerExtensions

src/EFCore.Cosmos/Extensions/CosmosServiceCollectionExtensions.cs

@@ -19,6 +19,7 @@
 using Microsoft.EntityFrameworkCore.Storage;
 using Microsoft.EntityFrameworkCore.Utilities;
 
+// ReSharper disable once CheckNamespace
 namespace Microsoft.Extensions.DependencyInjection
 {
     public static class CosmosServiceCollectionExtensions

src/EFCore.Design/Design/Internal/DbContextOperations.cs

@@ -8,6 +8,7 @@
 using System.Reflection;
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Infrastructure.Internal;
 using Microsoft.EntityFrameworkCore.Internal;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Storage;

src/EFCore.InMemory/Query/Pipeline/InMemoryProjectionBindingExpressionVisitor.cs

@@ -5,7 +5,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
-using Microsoft.EntityFrameworkCore.Extensions.Internal;
+using Microsoft.EntityFrameworkCore.Internal;
 using Microsoft.EntityFrameworkCore.Query.Pipeline;
 using Microsoft.EntityFrameworkCore.Storage;
 

src/EFCore.InMemory/Query/Pipeline/Translator.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Linq.Expressions;
 using System.Reflection;
-using Microsoft.EntityFrameworkCore.Extensions.Internal;
+using Microsoft.EntityFrameworkCore.Internal;
 using Microsoft.EntityFrameworkCore.Query;
 using Microsoft.EntityFrameworkCore.Query.Expressions.Internal;
 using Microsoft.EntityFrameworkCore.Query.Internal;

src/EFCore.Relational/Extensions/RelationalTaskExtensions.cs

@@ -1,6 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+// ReSharper disable once CheckNamespace
 namespace System.Threading.Tasks
 {
     internal static class RelationalTaskExtensions

src/EFCore.Relational/Infrastructure/RelationalPropertyExtensions.cs

@@ -0,0 +1,21 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Linq;
+using JetBrains.Annotations;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+namespace Microsoft.EntityFrameworkCore.Infrastructure
+{
+    public static class RelationalPropertyExtensions
+    {
+        /// <summary>
+        ///     Creates a comma-separated list of property names.
+        /// </summary>
+        /// <param name="properties"> The properties to format. </param>
+        /// <returns> A comma-separated list of property names. </returns>
+        public static string FormatColumns([NotNull] this IEnumerable<IProperty> properties)
+            => "{" + string.Join(", ", properties.Select(p => "'" + p.GetColumnName() + "'")) + "}";
+    }
+}

src/EFCore.Relational/Metadata/Internal/RelationalForeignKeyExtensions.cs

@@ -5,6 +5,7 @@
 using System.Linq;
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore.Diagnostics;
+using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Internal;
 
 namespace Microsoft.EntityFrameworkCore.Metadata.Internal

src/EFCore.Relational/Metadata/Internal/RelationalIndexExtensions.cs

@@ -5,7 +5,7 @@
 using System.Linq;
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore.Diagnostics;
-using Microsoft.EntityFrameworkCore.Internal;
+using Microsoft.EntityFrameworkCore.Infrastructure;
 
 namespace Microsoft.EntityFrameworkCore.Metadata.Internal
 {

src/EFCore.Relational/Metadata/Internal/RelationalPropertyExtensions.cs

@@ -1,6 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using System.Diagnostics;
 using JetBrains.Annotations;
 
 namespace Microsoft.EntityFrameworkCore.Metadata.Internal
@@ -48,5 +49,15 @@ public static IForeignKey FindSharedTableLink([NotNull] this IProperty property)
 
             return null;
         }
+
+        /// <summary>
+        ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
+        ///     the same compatibility standards as public APIs. It may be changed or removed without notice in
+        ///     any release. You should only use it directly in your code with extreme caution and knowing that
+        ///     doing so can result in application failures when updating to a new Entity Framework Core release.
+        /// </summary>
+        [DebuggerStepThrough]
+        public static string GetConfiguredColumnType([NotNull] this IProperty property)
+            => (string)property[RelationalAnnotationNames.ColumnType];
     }
 }

src/EFCore.Relational/Query/Pipeline/RelationalSqlTranslatingExpressionVisitor.cs

@@ -2,13 +2,11 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
-using System.Runtime.InteropServices.ComTypes;
-using Microsoft.EntityFrameworkCore.Extensions.Internal;
+using Microsoft.EntityFrameworkCore.Internal;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Metadata.Internal;
 using Microsoft.EntityFrameworkCore.Query.Expressions.Internal;
@@ -157,10 +155,8 @@ protected override Expression VisitTypeBinary(TypeBinaryExpression typeBinaryExp
                             _sqlExpressionFactory.Constant(concreteEntityTypes.Select(et => et.GetDiscriminatorValue()).ToList()),
                             negated: false);
                 }
-                else
-                {
-                    return _sqlExpressionFactory.Constant(false);
-                }
+
+                return _sqlExpressionFactory.Constant(false);
             }
 
             return null;
@@ -189,15 +185,11 @@ protected override Expression VisitMethodCall(MethodCallExpression methodCallExp
                     {
                         return subquery.Projection[0].Expression;
                     }
-                    else
-                    {
-                        throw new InvalidOperationException();
-                    }
-                }
-                else
-                {
-                    return new SubSelectExpression(subquery);
+
+                    throw new InvalidOperationException();
                 }
+
+                return new SubSelectExpression(subquery);
             }
 
             var @object = Visit(methodCallExpression.Object);
@@ -393,8 +385,6 @@ protected override Expression VisitUnary(UnaryExpression unaryExpression)
 
         [DebuggerStepThrough]
         private bool TranslationFailed(Expression original, Expression translation)
-        {
-            return original == null ? false : !(translation is SqlExpression);
-        }
+            => original != null && !(translation is SqlExpression);
     }
 }

src/EFCore.Relational/Update/ColumnModification.cs

@@ -6,7 +6,7 @@
 using System.Collections.Generic;
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore.Diagnostics;
-using Microsoft.EntityFrameworkCore.Internal;
+using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Utilities;
 

src/EFCore.SqlServer/Extensions/SqlServerDatabaseFacadeExtensions.cs

@@ -7,6 +7,7 @@
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.SqlServer.Infrastructure.Internal;
 
+// ReSharper disable once CheckNamespace
 namespace Microsoft.EntityFrameworkCore
 {
     /// <summary>

src/EFCore.Sqlite.Core/SqliteDatabaseFacadeExtensions.cs → src/EFCore.Sqlite.Core/Extensions/SqliteDatabaseFacadeExtensions.cs

@@ -7,6 +7,7 @@
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Sqlite.Infrastructure.Internal;
 
+// ReSharper disable once CheckNamespace
 namespace Microsoft.EntityFrameworkCore
 {
     /// <summary>

src/EFCore.Sqlite.Core/SqliteDbContextOptionsBuilderExtensions.cs → src/EFCore.Sqlite.Core/Extensions/SqliteDbContextOptionsBuilderExtensions.cs

@@ -9,6 +9,7 @@
 using Microsoft.EntityFrameworkCore.Sqlite.Infrastructure.Internal;
 using Microsoft.EntityFrameworkCore.Utilities;
 
+// ReSharper disable once CheckNamespace
 namespace Microsoft.EntityFrameworkCore
 {
     /// <summary>

src/EFCore.Sqlite.NTS/Extensions/SqliteNetTopologySuiteDbContextOptionsBuilderExtensions.cs

@@ -6,6 +6,7 @@
 using Microsoft.EntityFrameworkCore.Sqlite.Infrastructure.Internal;
 using Microsoft.EntityFrameworkCore.Utilities;
 
+// ReSharper disable once CheckNamespace
 namespace Microsoft.EntityFrameworkCore
 {
     /// <summary>

src/EFCore.Sqlite.NTS/Extensions/SqliteNetTopologySuiteServiceCollectionExtensions.cs

@@ -11,6 +11,7 @@
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using NetTopologySuite;
 
+// ReSharper disable once CheckNamespace
 namespace Microsoft.Extensions.DependencyInjection
 {
     /// <summary>

src/EFCore/ChangeTracking/Internal/IdentityMap.cs

@@ -47,7 +47,7 @@ public IdentityMap(
             {
                 _foreignKeys = key.DeclaringEntityType
                     .GetDerivedTypesInclusive()
-                    .SelectMany(e => e.GetDeclaredForeignKeys())
+                    .SelectMany(EntityTypeExtensions.GetDeclaredForeignKeys)
                     .ToArray();
             }
         }

src/EFCore/Diagnostics/CoreLoggerExtensions.cs

@@ -12,6 +12,7 @@
 using Microsoft.EntityFrameworkCore.ChangeTracking.Internal;
 using Microsoft.EntityFrameworkCore.Diagnostics.Internal;
 using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Infrastructure.Internal;
 using Microsoft.EntityFrameworkCore.Internal;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Metadata.Internal;
@@ -34,8 +35,6 @@ namespace Microsoft.EntityFrameworkCore.Diagnostics
     /// </summary>
     public static class CoreLoggerExtensions
     {
-        private const int QueryModelStringLengthLimit = 100;
-
         /// <summary>
         ///     Logs for the <see cref="CoreEventId.SaveChangesFailed" /> event.
         /// </summary>

src/EFCore/EntityFrameworkQueryableExtensions.cs → src/EFCore/Extensions/EntityFrameworkQueryableExtensions.cs

@@ -12,7 +12,7 @@
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore.ChangeTracking;
 using Microsoft.EntityFrameworkCore.Diagnostics;
-using Microsoft.EntityFrameworkCore.Extensions.Internal;
+using Microsoft.EntityFrameworkCore.Internal;
 using Microsoft.EntityFrameworkCore.Query;
 using Microsoft.EntityFrameworkCore.Query.Internal;
 using Microsoft.EntityFrameworkCore.Utilities;

src/EFCore/EntityFrameworkServiceCollectionExtensions.cs → src/EFCore/Extensions/EntityFrameworkServiceCollectionExtensions.cs

@@ -116,7 +116,7 @@ public static IServiceCollection AddDbContext<TContextService, TContextImplement
                 serviceCollection,
                 optionsAction == null
                     ? (Action<IServiceProvider, DbContextOptionsBuilder>)null
-                    : (p, b) => optionsAction?.Invoke(b), contextLifetime, optionsLifetime);
+                    : (p, b) => optionsAction.Invoke(b), contextLifetime, optionsLifetime);
 
         /// <summary>
         ///     Registers the given context as a service in the <see cref="IServiceCollection" /> and enables DbContext pooling.
@@ -219,7 +219,7 @@ public static IServiceCollection AddDbContextPool<TContext>(
             [NotNull] Action<IServiceProvider, DbContextOptionsBuilder> optionsAction,
             int poolSize = 128)
             where TContext : DbContext
-            => AddDbContextPool<TContext, TContext>(serviceCollection, optionsAction);
+            => AddDbContextPool<TContext, TContext>(serviceCollection, optionsAction, poolSize);
 
         /// <summary>
         ///     <para>

src/EFCore/Extensions/Internal/EFPropertyExtensions.cs

@@ -9,7 +9,8 @@
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore.Metadata;
 
-namespace Microsoft.EntityFrameworkCore.Extensions.Internal
+// ReSharper disable once CheckNamespace
+namespace Microsoft.EntityFrameworkCore.Internal
 {
     /// <summary>
     ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to

src/EFCore/Internal/EnumerableExtensions.cs → src/EFCore/Extensions/Internal/EnumerableExtensions.cs

@@ -8,6 +8,7 @@
 using System.Linq;
 using JetBrains.Annotations;
 
+// ReSharper disable once CheckNamespace
 namespace Microsoft.EntityFrameworkCore.Internal
 {
     /// <summary>