Fix for 9723. Allow namespaces to be specified.

src/EFCore.Design/Design/Internal/DatabaseOperations.cs

@@ -69,6 +69,8 @@ public virtual SavedModelFiles ScaffoldContext(
             [CanBeNull] string dbContextClassName,
             [NotNull] IEnumerable<string> schemas,
             [NotNull] IEnumerable<string> tables,
+            [CanBeNull] string modelNamespace,
+            [CanBeNull] string contextNamespace,
             bool useDataAnnotations,
             bool overwriteFiles,
             bool useDatabaseNames)
@@ -90,8 +92,11 @@ public virtual SavedModelFiles ScaffoldContext(
 
             var scaffolder = services.GetRequiredService<IReverseEngineerScaffolder>();
 
-            var modelNamespace = GetNamespaceFromOutputPath(outputDir);
-            var contextNamespace = GetNamespaceFromOutputPath(outputContextDir);
+            var finalModelNamespace = modelNamespace ?? GetNamespaceFromOutputPath(outputDir);
+            var finalContextNamespace =
+                contextNamespace ??
+                modelNamespace ??
+                GetNamespaceFromOutputPath(outputContextDir);
 
             var scaffoldedModel = scaffolder.ScaffoldModel(
                 connectionString,
@@ -101,8 +106,8 @@ public virtual SavedModelFiles ScaffoldContext(
                 {
                     UseDataAnnotations = useDataAnnotations,
                     RootNamespace = _rootNamespace,
-                    ModelNamespace = modelNamespace,
-                    ContextNamespace = contextNamespace,
+                    ModelNamespace = finalModelNamespace,
+                    ContextNamespace = finalContextNamespace,
                     Language = _language,
                     ContextDir = MakeDirRelative(outputDir, outputContextDir),
                     ContextName = dbContextClassName

src/EFCore.Design/Design/Internal/MigrationsOperations.cs

@@ -78,7 +78,8 @@ public MigrationsOperations(
         public virtual MigrationFiles AddMigration(
             [NotNull] string name,
             [CanBeNull] string outputDir,
-            [CanBeNull] string contextType)
+            [CanBeNull] string contextType,
+            [CanBeNull] string @namespace)
         {
             Check.NotEmpty(name, nameof(name));
 
@@ -102,7 +103,10 @@ public virtual MigrationFiles AddMigration(
             EnsureMigrationsAssembly(services);
 
             var scaffolder = services.GetRequiredService<IMigrationsScaffolder>();
-            var migration = scaffolder.ScaffoldMigration(name, _rootNamespace, subNamespace, _language);
+            var migration =
+                string.IsNullOrEmpty(@namespace)
+                ? scaffolder.ScaffoldMigration(name, _rootNamespace, subNamespace, _language)
+                : scaffolder.ScaffoldMigration(name, null, @namespace, _language);
             var files = scaffolder.Save(_projectDir, migration, outputDir);
 
             return files;

src/EFCore.Design/Design/OperationExecutor.cs

@@ -160,22 +160,25 @@ public AddMigration(
                 var name = (string)args["name"];
                 var outputDir = (string)args["outputDir"];
                 var contextType = (string)args["contextType"];
+                var @namespace = (string)args["namespace"];
 
-                Execute(() => executor.AddMigrationImpl(name, outputDir, contextType));
+                Execute(() => executor.AddMigrationImpl(name, outputDir, contextType, @namespace));
             }
         }
 
         private IDictionary AddMigrationImpl(
             [NotNull] string name,
             [CanBeNull] string outputDir,
-            [CanBeNull] string contextType)
+            [CanBeNull] string contextType,
+            [CanBeNull] string @namespace)
         {
             Check.NotEmpty(name, nameof(name));
 
             var files = MigrationsOperations.AddMigration(
                 name,
                 outputDir,
-                contextType);
+                contextType,
+                @namespace);
 
             return new Hashtable
             {
@@ -443,6 +446,8 @@ public class ScaffoldContext : OperationBase
             ///     <para><c>useDataAnnotations</c>--Use attributes to configure the model (where possible). If false, only the fluent API is used.</para>
             ///     <para><c>overwriteFiles</c>--Overwrite existing files.</para>
             ///     <para><c>useDatabaseNames</c>--Use table and column names directly from the database.</para>
+            ///     <para><c>modelNamespace</c>--Specify to override the namespace of the generated entity types.</para>
+            ///     <para><c>contextNamespace</c>--Specify to override the namespace of the generated DbContext class.</para>
             /// </summary>
             /// <param name="executor"> The operation executor. </param>
             /// <param name="resultHandler"> The <see cref="IOperationResultHandler" />. </param>
@@ -461,14 +466,17 @@ public ScaffoldContext(
                 var dbContextClassName = (string)args["dbContextClassName"];
                 var schemaFilters = (IEnumerable<string>)args["schemaFilters"];
                 var tableFilters = (IEnumerable<string>)args["tableFilters"];
+                var modelNamespace = (string)args["modelNamespace"];
+                var contextNamespace = (string)args["contextNamespace"];
                 var useDataAnnotations = (bool)args["useDataAnnotations"];
                 var overwriteFiles = (bool)args["overwriteFiles"];
                 var useDatabaseNames = (bool)args["useDatabaseNames"];
 
                 Execute(
                     () => executor.ScaffoldContextImpl(
                         provider, connectionString, outputDir, outputDbContextDir, dbContextClassName,
-                        schemaFilters, tableFilters, useDataAnnotations, overwriteFiles, useDatabaseNames));
+                        schemaFilters, tableFilters, modelNamespace, contextNamespace, useDataAnnotations,
+                        overwriteFiles, useDatabaseNames));
             }
         }
 
@@ -480,6 +488,8 @@ private IDictionary ScaffoldContextImpl(
             [CanBeNull] string dbContextClassName,
             [NotNull] IEnumerable<string> schemaFilters,
             [NotNull] IEnumerable<string> tableFilters,
+            [CanBeNull] string modelNamespace,
+            [CanBeNull] string contextNamespace,
             bool useDataAnnotations,
             bool overwriteFiles,
             bool useDatabaseNames)
@@ -491,7 +501,8 @@ private IDictionary ScaffoldContextImpl(
 
             var files = DatabaseOperations.ScaffoldContext(
                 provider, connectionString, outputDir, outputDbContextDir, dbContextClassName,
-                schemaFilters, tableFilters, useDataAnnotations, overwriteFiles, useDatabaseNames);
+                schemaFilters, tableFilters, modelNamespace, contextNamespace, useDataAnnotations,
+                overwriteFiles, useDatabaseNames);
 
             return new Hashtable { ["ContextFile"] = files.ContextFile, ["EntityTypeFiles"] = files.AdditionalFiles.ToArray() };
         }

src/EFCore.Design/Migrations/Design/IMigrationsScaffolder.cs

@@ -20,7 +20,7 @@ public interface IMigrationsScaffolder
         /// <returns> The scaffolded migration. </returns>
         ScaffoldedMigration ScaffoldMigration(
             [NotNull] string migrationName,
-            [NotNull] string rootNamespace,
+            [CanBeNull] string rootNamespace,
             [CanBeNull] string subNamespace = null,
             [CanBeNull] string language = null);
 

src/EFCore.Design/Migrations/Design/MigrationsScaffolder.cs

@@ -53,16 +53,22 @@ public MigrationsScaffolder([NotNull] MigrationsScaffolderDependencies dependenc
         /// <returns> The scaffolded migration. </returns>
         public virtual ScaffoldedMigration ScaffoldMigration(
             [NotNull] string migrationName,
-            [NotNull] string rootNamespace,
+            [CanBeNull] string rootNamespace,
             [CanBeNull] string subNamespace)
             => ScaffoldMigration(migrationName, rootNamespace, subNamespace, language: null);
 
         /// <summary>
         ///     Scaffolds a new migration.
         /// </summary>
         /// <param name="migrationName"> The migration's name. </param>
-        /// <param name="rootNamespace"> The project's root namespace. </param>
-        /// <param name="subNamespace"> The migration's sub-namespace. </param>
+        /// <param name="rootNamespace">
+        ///     The project's root namespace, <c>null</c> to indicate no automatic
+        ///     namespace generation, just use sub-namespace as is.
+        /// </param>
+        /// <param name="subNamespace">
+        ///     The migration's sub-namespace. Note: the root-namespace and
+        ///     the sub-namespace should not both be empty.
+        /// </param>
         /// <param name="language"> The project's language. </param>
         /// <returns> The scaffolded migration. </returns>
         public virtual ScaffoldedMigration ScaffoldMigration(
@@ -72,23 +78,30 @@ public virtual ScaffoldedMigration ScaffoldMigration(
             string language = null)
         {
             Check.NotEmpty(migrationName, nameof(migrationName));
-            Check.NotEmpty(rootNamespace, nameof(rootNamespace));
 
             if (Dependencies.MigrationsAssembly.FindMigrationId(migrationName) != null)
             {
                 throw new OperationException(DesignStrings.DuplicateMigrationName(migrationName));
             }
 
+            var overrideNamespace = rootNamespace == null;
             var subNamespaceDefaulted = false;
-            if (string.IsNullOrEmpty(subNamespace))
+            if (string.IsNullOrEmpty(subNamespace) && !overrideNamespace)
             {
                 subNamespaceDefaulted = true;
                 subNamespace = "Migrations";
             }
 
             var lastMigration = Dependencies.MigrationsAssembly.Migrations.LastOrDefault();
 
-            var migrationNamespace = rootNamespace + "." + subNamespace;
+            var migrationNamespace =
+                (!string.IsNullOrEmpty(rootNamespace)
+                    && !string.IsNullOrEmpty(subNamespace))
+                ? rootNamespace + "." + subNamespace
+                : !string.IsNullOrEmpty(rootNamespace)
+                    ? rootNamespace
+                    : subNamespace;
+
             if (subNamespaceDefaulted)
             {
                 migrationNamespace = GetNamespace(lastMigration.Value?.AsType(), migrationNamespace);
@@ -105,9 +118,14 @@ public virtual ScaffoldedMigration ScaffoldMigration(
             {
                 if (subNamespaceDefaulted)
                 {
-                    var builder = new StringBuilder()
-                        .Append(rootNamespace)
-                        .Append(".Migrations.");
+                    var builder = new StringBuilder();
+                    if (!string.IsNullOrEmpty(rootNamespace))
+                    {
+                        builder.Append(rootNamespace);
+                        builder.Append(".");
+                    }
+
+                    builder.Append("Migrations.");
 
                     if (sanitizedContextName.EndsWith("Context", StringComparison.Ordinal))
                     {
@@ -136,7 +154,9 @@ public virtual ScaffoldedMigration ScaffoldMigration(
                 ? Dependencies.MigrationsModelDiffer.GetDifferences(Dependencies.Model.GetRelationalModel(), lastModel)
                 : new List<MigrationOperation>();
             var migrationId = Dependencies.MigrationsIdGenerator.GenerateId(migrationName);
-            var modelSnapshotNamespace = GetNamespace(modelSnapshot?.GetType(), migrationNamespace);
+            var modelSnapshotNamespace = overrideNamespace
+                ? migrationNamespace
+                : GetNamespace(modelSnapshot?.GetType(), migrationNamespace);
 
             var modelSnapshotName = sanitizedContextName + "ModelSnapshot";
             if (modelSnapshot != null)

src/EFCore.Tools/tools/EntityFrameworkCore.PS2.psm1

@@ -25,6 +25,9 @@ $versionErrorMessage = 'The Entity Framework Core Package Manager Console Tools
 .PARAMETER StartupProject
     The startup project to use. Defaults to the solution's startup project.
 
+.PARAMETER Namespace
+    Specify to override the namespace for the migration.
+
 .LINK
     Remove-Migration
     Update-Database
@@ -35,7 +38,8 @@ function Add-Migration(
     $OutputDir,
     $Context,
     $Project,
-    $StartupProject)
+    $StartupProject,
+    $Namespace)
 {
     WarnIfEF6 'Add-Migration'
     throw $UpdatePowerShell
@@ -177,6 +181,12 @@ function Remove-Migration(
 .PARAMETER StartupProject
     The startup project to use. Defaults to the solution's startup project.
 
+.PARAMETER Namespace
+    Specify to override the namespace for the generated entity types.
+
+.PARAMETER ContextNamespace
+    Specify to override the namespace for the DbContext class.
+
 .LINK
     about_EntityFrameworkCore
 #>
@@ -192,7 +202,9 @@ function Scaffold-DbContext(
     [switch] $UseDatabaseNames,
     [switch] $Force,
     $Project,
-    $StartupProject)
+    $StartupProject,
+    $Namespace,
+    $ContextNamespace)
 {
     throw $UpdatePowerShell
 }

src/EFCore.Tools/tools/EntityFrameworkCore.psm1

@@ -33,6 +33,9 @@ Register-TabExpansion Add-Migration @{
 .PARAMETER StartupProject
     The startup project to use. Defaults to the solution's startup project.
 
+.PARAMETER Namespace
+    Specify to override the namespace for the migration.
+
 .LINK
     Remove-Migration
     Update-Database
@@ -47,7 +50,8 @@ function Add-Migration
         [string] $OutputDir,
         [string] $Context,
         [string] $Project,
-        [string] $StartupProject)
+        [string] $StartupProject,
+        [string] $Namespace)
 
     WarnIfEF6 'Add-Migration'
 
@@ -61,6 +65,11 @@ function Add-Migration
         $params += '--output-dir', $OutputDir
     }
 
+    if ($Namespace)
+    {
+        $params += '--namespace', $Namespace
+    }
+
     $params += GetParams $Context
 
     # NB: -join is here to support ConvertFrom-Json on PowerShell 3.0
@@ -305,6 +314,12 @@ Register-TabExpansion Scaffold-DbContext @{
 .PARAMETER StartupProject
     The startup project to use. Defaults to the solution's startup project.
 
+.PARAMETER Namespace
+    Specify to override the namespace for the generated entity types.
+
+.PARAMETER ContextNamespace
+    Specify to override the namespace for the DbContext class.
+
 .LINK
     about_EntityFrameworkCore
 #>
@@ -325,7 +340,9 @@ function Scaffold-DbContext
         [switch] $UseDatabaseNames,
         [switch] $Force,
         [string] $Project,
-        [string] $StartupProject)
+        [string] $StartupProject,
+        [string] $Namespace,
+        [string] $ContextNamespace)
 
     $dteProject = GetProject $Project
     $dteStartupProject = GetStartupProject $StartupProject $dteProject
@@ -347,6 +364,16 @@ function Scaffold-DbContext
         $params += '--context', $Context
     }
 
+    if ($Namespace)
+    {
+        $params += '--namespace', $Namespace
+    }
+
+    if ($ContextNamespace)
+    {
+        $params += '--context-namespace', $ContextNamespace
+    }
+
     $params += $Schemas | %{ '--schema', $_ }
     $params += $Tables | %{ '--table', $_ }
 

src/dotnet-ef/Properties/Resources.resx

@@ -321,4 +321,13 @@
   <data name="DbContextConnectionDescription" xml:space="preserve">
     <value>The connection string to the database. Defaults to the one specified in AddDbContext or OnConfiguring.</value>
   </data>
+  <data name="NamespaceDescription" xml:space="preserve">
+    <value>Specify to override the namespace for the generated entity types.</value>
+  </data>
+  <data name="ContextNamespaceDescription" xml:space="preserve">
+    <value>Specify to override the namespace for the DbContext class.</value>
+  </data>
+  <data name="MigrationsNamespaceDescription" xml:space="preserve">
+    <value>Specify to override the namespace for the migration.</value>
+  </data>
 </root>