Generate DbContext Class in a Different Location

EFCore.sln.DotSettings

@@ -61,6 +61,7 @@
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INITIALIZER_BRACES/@EntryValue">NEXT_LINE</s:String>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_BLANK_LINES_IN_CODE/@EntryValue">1</s:Int64>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_BLANK_LINES_IN_DECLARATIONS/@EntryValue">1</s:Int64>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_EXISTING_INITIALIZER_ARRANGEMENT/@EntryValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/LINE_FEED_AT_FILE_END/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ACCESSORHOLDER_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_CONSTRUCTOR_INITIALIZER_ON_SAME_LINE/@EntryValue">False</s:Boolean>

src/EFCore.Design/Design/DesignTimeServiceCollectionExtensions.cs

@@ -14,6 +14,7 @@
 using Microsoft.EntityFrameworkCore.Scaffolding;
 using Microsoft.EntityFrameworkCore.Scaffolding.Internal;
 using Microsoft.EntityFrameworkCore.Storage;
+using Microsoft.EntityFrameworkCore.Storage.Converters;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 
@@ -51,6 +52,7 @@ public static IServiceCollection AddEntityFrameworkDesignTimeServices(
                 .AddSingleton<ModelCodeGeneratorDependencies>()
                 .AddSingleton<ProviderCodeGeneratorDependencies>()
                 .AddSingleton<RelationalTypeMapperDependencies>()
+                .AddSingleton<ValueConverterSelectorDependencies>()
                 .AddSingleton<ICandidateNamingService, CandidateNamingService>()
                 .AddSingleton<ICSharpDbContextGenerator, CSharpDbContextGenerator>()
                 .AddSingleton<ICSharpEntityTypeGenerator, CSharpEntityTypeGenerator>()
@@ -70,6 +72,7 @@ public static IServiceCollection AddEntityFrameworkDesignTimeServices(
                 .AddSingleton<IReverseEngineerScaffolder, ReverseEngineerScaffolder>()
                 .AddSingleton<IScaffoldingModelFactory, RelationalScaffoldingModelFactory>()
                 .AddSingleton<IScaffoldingTypeMapper, ScaffoldingTypeMapper>()
+                .AddSingleton<IValueConverterSelector, ValueConverterSelector>()
                 .AddTransient<MigrationsScaffolderDependencies>()
                 .AddTransient<IMigrationsScaffolder, MigrationsScaffolder>()
                 .AddTransient<ISnapshotModelProcessor, SnapshotModelProcessor>()

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

@@ -57,6 +57,7 @@ public virtual ModelFiles ScaffoldContext(
             [NotNull] string provider,
             [NotNull] string connectionString,
             [CanBeNull] string outputDir,
+            [CanBeNull] string outputContextDir,
             [CanBeNull] string dbContextClassName,
             [NotNull] IEnumerable<string> schemas,
             [NotNull] IEnumerable<string> tables,
@@ -81,12 +82,21 @@ public virtual ModelFiles ScaffoldContext(
                 @namespace += "." + subNamespace;
             }
 
+            var absoluteOutputDir = outputDir != null
+                ? Path.GetFullPath(Path.Combine(_projectDir, outputDir))
+                : _projectDir;
+            var absoluteContextDir = outputContextDir != null
+                ? Path.GetFullPath(Path.Combine(_projectDir, outputContextDir))
+                : absoluteOutputDir;
+            var relativeContextDir = MakeDirRelative(absoluteOutputDir, absoluteContextDir);
+
             var scaffoldedModel = scaffolder.ScaffoldModel(
                 connectionString,
                 tables,
                 schemas,
                 @namespace,
                 _language,
+                relativeContextDir,
                 dbContextClassName,
                 useDataAnnotations,
                 useDatabaseNames);
@@ -124,5 +134,29 @@ private string SubnamespaceFromOutputPath(string projectDir, string outputDir)
                 ? string.Join(".", subPath.Split(new[] { Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar }, StringSplitOptions.RemoveEmptyEntries))
                 : null;
         }
+
+        private static string MakeDirRelative(string root, string path)
+        {
+            var relativeUri = new Uri(NormalizeDir(root)).MakeRelativeUri(new Uri(NormalizeDir(path)));
+
+            return Uri.UnescapeDataString(relativeUri.ToString()).Replace('/', Path.DirectorySeparatorChar);
+        }
+
+        private static string NormalizeDir(string path)
+        {
+            if (string.IsNullOrEmpty(path))
+            {
+                return path;
+            }
+
+            var last = path[path.Length - 1];
+            if (last == Path.DirectorySeparatorChar
+                || last == Path.AltDirectorySeparatorChar)
+            {
+                return path;
+            }
+
+            return path + Path.DirectorySeparatorChar;
+        }
     }
 }

src/EFCore.Design/Design/OperationExecutor.cs

@@ -408,6 +408,7 @@ public class ScaffoldContext : OperationBase
             ///     <para><c>connectionString</c>--The connection string to the database.</para>
             ///     <para><c>provider</c>--The provider to use.</para>
             ///     <para><c>outputDir</c>--The directory to put files in. Paths are relative to the project directory.</para>
+            ///     <para><c>outputDbContextDir</c>--The directory to put DbContext file in. Paths are relative to the project directory.</para>
             ///     <para><c>dbContextClassName</c>--The name of the DbContext to generate.</para>
             ///     <para><c>schemaFilters</c>--The schemas of tables to generate entity types for.</para>
             ///     <para><c>tableFilters</c>--The tables to generate entity types for.</para>
@@ -427,6 +428,7 @@ public ScaffoldContext([NotNull] OperationExecutor executor, [NotNull] object re
                 var connectionString = (string)args["connectionString"];
                 var provider = (string)args["provider"];
                 var outputDir = (string)args["outputDir"];
+                var outputDbContextDir = (string)args["outputDbContextDir"];
                 var dbContextClassName = (string)args["dbContextClassName"];
                 var schemaFilters = (IEnumerable<string>)args["schemaFilters"];
                 var tableFilters = (IEnumerable<string>)args["tableFilters"];
@@ -436,8 +438,7 @@ public ScaffoldContext([NotNull] OperationExecutor executor, [NotNull] object re
 
                 Execute(
                     () => executor.ScaffoldContextImpl(
-                        provider,
-                        connectionString, outputDir, dbContextClassName,
+                        provider, connectionString, outputDir, outputDbContextDir, dbContextClassName,
                         schemaFilters, tableFilters, useDataAnnotations, overwriteFiles, useDatabaseNames));
             }
         }
@@ -446,6 +447,7 @@ private IDictionary ScaffoldContextImpl(
             [NotNull] string provider,
             [NotNull] string connectionString,
             [CanBeNull] string outputDir,
+            [CanBeNull] string outputDbContextDir,
             [CanBeNull] string dbContextClassName,
             [NotNull] IEnumerable<string> schemaFilters,
             [NotNull] IEnumerable<string> tableFilters,
@@ -464,9 +466,17 @@ private IDictionary ScaffoldContextImpl(
             {
                 outputDir = Path.GetFullPath(Path.Combine(_projectDir, outputDir));
             }
+            if (!string.IsNullOrWhiteSpace(outputDbContextDir))
+            {
+                outputDbContextDir = Path.GetFullPath(Path.Combine(_projectDir, outputDbContextDir));
+            }
+            else
+            {
+                outputDbContextDir = outputDir;
+            }
 
             var files = _databaseOperations.Value.ScaffoldContext(
-                provider, connectionString, outputDir, dbContextClassName,
+                provider, connectionString, outputDir, outputDbContextDir, dbContextClassName,
                 schemaFilters, tableFilters, useDataAnnotations, overwriteFiles, useDatabaseNames);
 
             return new Hashtable

src/EFCore.Design/Scaffolding/IModelCodeGenerator.cs

@@ -17,13 +17,15 @@ public interface IModelCodeGenerator : ILanguageBasedService
         /// </summary>
         /// <param name="model"> The model. </param>
         /// <param name="namespace"> The namespace. </param>
+        /// <param name="contextDir"> The directory of the <see cref="DbContext"/>. </param>
         /// <param name="contextName"> The name of the <see cref="DbContext"/>. </param>
         /// <param name="connectionString"> The connection string. </param>
         /// <param name="dataAnnotations"> A value indicating whether to use data annotations. </param>
         /// <returns> The generated model. </returns>
         ScaffoldedModel GenerateModel(
             [NotNull] IModel model,
             [NotNull] string @namespace,
+            [NotNull] string contextDir,
             [NotNull] string contextName,
             [NotNull] string connectionString,
             bool dataAnnotations);

src/EFCore.Design/Scaffolding/IReverseEngineerScaffolder.cs

@@ -19,6 +19,7 @@ public interface IReverseEngineerScaffolder
         /// <param name="schemas"> A list of schemas to include. Empty to include all schemas. </param>
         /// <param name="namespace"> The namespace of the model. </param>
         /// <param name="language"> The programming language to scaffold for. </param>
+        /// <param name="outputDbContextDir"> The DbContext output dirctory. </param>
         /// <param name="contextName"> The <see cref="DbContext"/> name. </param>
         /// <param name="useDataAnnotations"> True to scaffold data annotations. </param>
         /// <param name="useDatabaseNames"> True to use the database schema names directly. </param>
@@ -29,6 +30,7 @@ ScaffoldedModel ScaffoldModel(
             [NotNull] IEnumerable<string> schemas,
             [NotNull] string @namespace,
             [NotNull] string language,
+            [CanBeNull] string outputDbContextDir,
             [CanBeNull] string contextName,
             bool useDataAnnotations,
             bool useDatabaseNames);

src/EFCore.Design/Scaffolding/Internal/CSharpDbContextGenerator.cs

@@ -66,12 +66,7 @@ public CSharpDbContextGenerator(
         ///     This API supports the Entity Framework Core infrastructure and is not intended to be used
         ///     directly from your code. This API may change or be removed in future releases.
         /// </summary>
-        public virtual string WriteCode(
-            IModel model,
-            string @namespace,
-            string contextName,
-            string connectionString,
-            bool useDataAnnotations)
+        public virtual string WriteCode(IModel model, string @namespace, string contextName, string connectionString, bool useDataAnnotations)
         {
             Check.NotNull(model, nameof(model));
 

src/EFCore.Design/Scaffolding/Internal/CSharpModelGenerator.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.IO;
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Metadata.Internal;
@@ -58,12 +59,14 @@ public CSharpModelGenerator(
         public override ScaffoldedModel GenerateModel(
             IModel model,
             string @namespace,
+            string contextDir,
             string contextName,
             string connectionString,
             bool useDataAnnotations)
         {
             Check.NotNull(model, nameof(model));
             Check.NotEmpty(@namespace, nameof(@namespace));
+            Check.NotNull(contextDir, nameof(contextDir));
             Check.NotEmpty(contextName, nameof(contextName));
             Check.NotEmpty(connectionString, nameof(connectionString));
 
@@ -73,7 +76,7 @@ public override ScaffoldedModel GenerateModel(
 
             // output DbContext .cs file
             var dbContextFileName = contextName + FileExtension;
-            resultingFiles.ContextFile = new ScaffoldedFile { Path = dbContextFileName, Code = generatedCode };
+            resultingFiles.ContextFile = new ScaffoldedFile { Path = Path.Combine(contextDir, dbContextFileName), Code = generatedCode };
 
             foreach (var entityType in model.GetEntityTypes())
             {

src/EFCore.Design/Scaffolding/Internal/ReverseEngineerScaffolder.cs

@@ -63,6 +63,7 @@ public virtual ScaffoldedModel ScaffoldModel(
             IEnumerable<string> schemas,
             string @namespace,
             string language,
+            string outputDbContextDir,
             string contextName,
             bool useDataAnnotations,
             bool useDatabaseNames)
@@ -107,7 +108,7 @@ public virtual ScaffoldedModel ScaffoldModel(
 
             var codeGenerator = ModelCodeGeneratorSelector.Select(language);
 
-            return codeGenerator.GenerateModel(model, @namespace, contextName, connectionString, useDataAnnotations);
+            return codeGenerator.GenerateModel(model, @namespace, outputDbContextDir ?? string.Empty, contextName, connectionString, useDataAnnotations);
         }
 
         /// <summary>
@@ -131,7 +132,8 @@ public virtual ModelFiles Save(
             var files = new ModelFiles();
             Directory.CreateDirectory(outputDir);
 
-            var contextPath = Path.Combine(outputDir, scaffoldedModel.ContextFile.Path);
+            var contextPath = Path.GetFullPath(Path.Combine(outputDir, scaffoldedModel.ContextFile.Path));
+            Directory.CreateDirectory(Path.GetDirectoryName(contextPath));
             File.WriteAllText(contextPath, scaffoldedModel.ContextFile.Code, Encoding.UTF8);
             files.ContextFile = contextPath;
 

src/EFCore.Design/Scaffolding/ModelCodeGenerator.cs

@@ -35,13 +35,15 @@ public ModelCodeGenerator([NotNull] ModelCodeGeneratorDependencies dependencies)
         /// </summary>
         /// <param name="model"> The model. </param>
         /// <param name="namespace"> The namespace. </param>
+        /// <param name="contextDir"> The directory of the <see cref="DbContext"/>. </param>
         /// <param name="contextName"> The name of the <see cref="DbContext"/>. </param>
         /// <param name="connectionString"> The connection string. </param>
         /// <param name="dataAnnotations"> A value indicating whether to use data annotations. </param>
         /// <returns> The generated model. </returns>
         public abstract ScaffoldedModel GenerateModel(
             IModel model,
             string @namespace,
+            string contextDir,
             string contextName,
             string connectionString,
             bool dataAnnotations);

src/EFCore.Tools/tools/EntityFrameworkCore.psm1

@@ -259,6 +259,7 @@ Register-TabExpansion Scaffold-DbContext @{
     Project = { GetProjects }
     StartupProject = { GetProjects }
     OutputDir = { <# Disabled. Otherwise, paths would be relative to the solution directory. #> }
+    OutputDbContextDir = { <# Disabled. Otherwise, paths would be relative to the solution directory. #> }
 }
 
 <#
@@ -277,6 +278,9 @@ Register-TabExpansion Scaffold-DbContext @{
 .PARAMETER OutputDir
     The directory to put files in. Paths are relative to the project directory.
 
+.PARAMETER OutputDbContextDir
+    The directory to put DbContext file in. Paths are relative to the project directory.
+
 .PARAMETER Context
     The name of the DbContext to generate.
 
@@ -313,6 +317,7 @@ function Scaffold-DbContext
         [Parameter(Position = 1, Mandatory = $true)]
         [string] $Provider,
         [string] $OutputDir,
+        [string] $OutputDbContextDir,
         [string] $Context,
         [string[]] $Schemas = @(),
         [string[]] $Tables = @(),
@@ -331,6 +336,11 @@ function Scaffold-DbContext
     {
         $params += '--output-dir', $OutputDir
     }
+
+    if ($OutputDbContextDir)
+    {
+        $params += '--output-dbcontext-dir', $OutputDbContextDir
+    }
 
     if ($Context)
     {

src/dotnet-ef/Properties/Resources.resx

@@ -294,4 +294,7 @@
   <data name="MigrationsRemoveRevertDescription" xml:space="preserve">
     <value>Revert the migration if it has been applied to the database.</value>
   </data>
+  <data name="OutputDbContextDirDescription" xml:space="preserve">
+    <value>The directory to put DbContext file in. Paths are relative to the project directory.</value>
+  </data>
 </root>

src/ef/Commands/DbContextScaffoldCommand.Configure.cs

@@ -14,6 +14,7 @@ internal partial class DbContextScaffoldCommand : ProjectCommandBase
         private CommandOption _context;
         private CommandOption _force;
         private CommandOption _outputDir;
+        private CommandOption _outputDbContextDir;
         private CommandOption _schemas;
         private CommandOption _tables;
         private CommandOption _useDatabaseNames;
@@ -30,6 +31,7 @@ public override void Configure(CommandLineApplication command)
             _context = command.Option("-c|--context <NAME>", Resources.ContextNameDescription);
             _force = command.Option("-f|--force", Resources.DbContextScaffoldForceDescription);
             _outputDir = command.Option("-o|--output-dir <PATH>", Resources.OutputDirDescription);
+            _outputDbContextDir = command.Option("--output-dbcontext-dir <PATH>", Resources.OutputDbContextDirDescription);
             _schemas = command.Option("--schema <SCHEMA_NAME>...", Resources.SchemasDescription);
             _tables = command.Option("-t|--table <TABLE_NAME>...", Resources.TablesDescription);
             _useDatabaseNames = command.Option("--use-database-names", Resources.UseDatabaseNamesDescription);

src/ef/Commands/DbContextScaffoldCommand.cs

@@ -30,6 +30,7 @@ protected override int Execute()
                 _provider.Value,
                 _connection.Value,
                 _outputDir.Value(),
+                _outputDbContextDir.Value(),
                 _context.Value(),
                 _schemas.Values,
                 _tables.Values,

src/ef/IOperationExecutor.cs

@@ -21,6 +21,7 @@ IDictionary ScaffoldContext(
             string provider,
             string connectionString,
             string outputDir,
+            string outputDbContextDir,
             string dbContextClassName,
             IEnumerable<string> schemaFilters,
             IEnumerable<string> tableFilters,

src/ef/OperationExecutorBase.cs

@@ -146,6 +146,7 @@ public IDictionary ScaffoldContext(
             string provider,
             string connectionString,
             string outputDir,
+            string outputDbContextDir,
             string dbContextClassName,
             IEnumerable<string> schemaFilters,
             IEnumerable<string> tableFilters,
@@ -159,6 +160,7 @@ public IDictionary ScaffoldContext(
                     ["provider"] = provider,
                     ["connectionString"] = connectionString,
                     ["outputDir"] = outputDir,
+                    ["outputDbContextDir"] = outputDbContextDir,
                     ["dbContextClassName"] = dbContextClassName,
                     ["schemaFilters"] = schemaFilters,
                     ["tableFilters"] = tableFilters,

src/ef/Properties/Resources.resx

@@ -312,4 +312,7 @@
   <data name="MigrationsRemoveRevertDescription" xml:space="preserve">
     <value>Revert the migration if it has been applied to the database.</value>
   </data>
+  <data name="OutputDbContextDirDescription" xml:space="preserve">
+    <value>The directory to put DbContext file in. Paths are relative to the project directory.</value>
+  </data>
 </root>