Refactored solution to reduce duplicates.

Author: hikalkan

src/AbpCompanyName.AbpProjectName.Core/AbpProjectNameConsts.cs

@@ -3,5 +3,7 @@
     public class AbpProjectNameConsts
     {
         public const string LocalizationSourceName = "AbpProjectName";
+
+        public const string ConnectionStringName = "Default";
     }
 }

src/AbpCompanyName.AbpProjectName.Core/Configuration/AppConfigurations.cs

@@ -0,0 +1,41 @@
+using System.Collections.Concurrent;
+using Abp.Extensions;
+using Microsoft.Extensions.Configuration;
+
+namespace AbpCompanyName.AbpProjectName.Configuration
+{
+    public static class AppConfigurations
+    {
+        private static readonly ConcurrentDictionary<string, IConfigurationRoot> ConfigurationCache;
+
+        static AppConfigurations()
+        {
+            ConfigurationCache = new ConcurrentDictionary<string, IConfigurationRoot>();
+        }
+
+        public static IConfigurationRoot Get(string path, string environmentName = null)
+        {
+            var cacheKey = path + "#" + environmentName;
+            return ConfigurationCache.GetOrAdd(
+                cacheKey,
+                _ => BuildConfiguration(path, environmentName)
+            );
+        }
+
+        private static IConfigurationRoot BuildConfiguration(string path, string environmentName = null)
+        {
+            var builder = new ConfigurationBuilder()
+                .SetBasePath(path)
+                .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true);
+
+            if (!environmentName.IsNullOrWhiteSpace())
+            {
+                builder = builder.AddJsonFile($"appsettings.{environmentName}.json", optional: true);
+            }
+            
+            builder = builder.AddEnvironmentVariables();
+
+            return builder.Build();
+        }
+    }
+}

src/AbpCompanyName.AbpProjectName.Core/Web/WebContentFolderHelper.cs

@@ -0,0 +1,40 @@
+using System;
+using System.IO;
+using System.Linq;
+
+namespace AbpCompanyName.AbpProjectName.Web
+{
+    /// <summary>
+    /// This class is used to find root path of the web project in;
+    /// unit tests (to find views) and entity framework core command line commands (to find conn string).
+    /// </summary>
+    public static class WebContentDirectoryFinder
+    {
+        public static string CalculateContentRootFolder()
+        {
+            var coreAssemblyDirectoryPath = Path.GetDirectoryName(typeof(AbpProjectNameCoreModule).Assembly.Location);
+            if (coreAssemblyDirectoryPath == null)
+            {
+                throw new ApplicationException("Could not find location of AbpCompanyName.AbpProjectName.Core assembly!");
+            }
+
+            var directoryInfo = new DirectoryInfo(coreAssemblyDirectoryPath);
+            while (!DirectoryContains(directoryInfo.FullName, "AbpCompanyName.AbpProjectName.sln"))
+            {
+                if (directoryInfo.Parent == null)
+                {
+                    throw new ApplicationException("Could not find content root folder!");
+                }
+
+                directoryInfo = directoryInfo.Parent;
+            }
+
+            return Path.Combine(directoryInfo.FullName, @"src\AbpCompanyName.AbpProjectName.Web");
+        }
+
+        private static bool DirectoryContains(string directory, string fileName)
+        {
+            return Directory.GetFiles(directory).Any(filePath => string.Equals(Path.GetFileName(filePath), fileName));
+        }
+    }
+}

src/AbpCompanyName.AbpProjectName.Core/project.json

@@ -2,7 +2,9 @@
   "version": "1.0.0.0-*",
 
   "dependencies": {
-    "Abp": "0.10.3"
+    "Abp": "0.10.3",
+    "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0",
+    "Microsoft.Extensions.Configuration.Json": "1.0.0"
   },
 
   "frameworks": {

src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/EntityFrameworkCore/AbpProjectNameDbContextFactory.cs

@@ -1,17 +1,24 @@
-using Microsoft.EntityFrameworkCore;
+using AbpCompanyName.AbpProjectName.Configuration;
+using AbpCompanyName.AbpProjectName.Web;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.Extensions.Configuration;
 
 namespace AbpCompanyName.AbpProjectName.EntityFrameworkCore
 {
-    /* This class is needed to run "dotnet ef ..." commands from command line.
-     */
+    /* This class is needed to run "dotnet ef ..." commands from command line on development. Not used anywhere else */
     public class AbpProjectNameDbContextFactory : IDbContextFactory<AbpProjectNameDbContext>
     {
         public AbpProjectNameDbContext Create(DbContextFactoryOptions options)
         {
-            //TODO: Get connection string from a common place
             var builder = new DbContextOptionsBuilder<AbpProjectNameDbContext>();
-            builder.UseSqlServer("Server=localhost; Database=AbpProjectNameDb; Trusted_Connection=True;");
+            var configuration = AppConfigurations.Get(WebContentDirectoryFinder.CalculateContentRootFolder());
+
+            DbContextOptionsConfigurer.Configure(
+                builder, 
+                configuration.GetConnectionString(AbpProjectNameConsts.ConnectionStringName)
+                );
+
             return new AbpProjectNameDbContext(builder.Options);
         }
     }

src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/EntityFrameworkCore/AbpProjectNameEntityFrameworkCoreModule.cs

@@ -9,11 +9,6 @@ namespace AbpCompanyName.AbpProjectName.EntityFrameworkCore
         typeof(AbpEntityFrameworkCoreModule))]
     public class AbpProjectNameEntityFrameworkCoreModule : AbpModule
     {
-        public override void PreInitialize()
-        {
-            Configuration.DefaultNameOrConnectionString = "Default";
-        }
-
         public override void Initialize()
         {
             IocManager.RegisterAssemblyByConvention(Assembly.GetExecutingAssembly());

src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/EntityFrameworkCore/DbContextOptionsConfigurer.cs

@@ -0,0 +1,16 @@
+using Microsoft.EntityFrameworkCore;
+
+namespace AbpCompanyName.AbpProjectName.EntityFrameworkCore
+{
+    public static class DbContextOptionsConfigurer
+    {
+        public static void Configure(
+            DbContextOptionsBuilder<AbpProjectNameDbContext> dbContextOptions, 
+            string connectionString
+            )
+        {
+            /* This is the single point to configure DbContextOptions for AbpProjectNameDbContext */
+            dbContextOptions.UseSqlServer(connectionString);
+        }
+    }
+}

src/AbpCompanyName.AbpProjectName.Web/Startup/AbpProjectNameWebModule.cs

@@ -1,8 +1,12 @@
 using System.Reflection;
 using Abp.AspNetCore;
 using Abp.AspNetCore.Configuration;
+using Abp.EntityFrameworkCore.Configuration;
 using Abp.Modules;
+using AbpCompanyName.AbpProjectName.Configuration;
 using AbpCompanyName.AbpProjectName.EntityFrameworkCore;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Configuration;
 
 namespace AbpCompanyName.AbpProjectName.Web.Startup
 {
@@ -12,8 +16,22 @@ namespace AbpCompanyName.AbpProjectName.Web.Startup
         typeof(AbpAspNetCoreModule))]
     public class AbpProjectNameWebModule : AbpModule
     {
+        private readonly IConfigurationRoot _appConfiguration;
+
+        public AbpProjectNameWebModule(IHostingEnvironment env)
+        {
+            _appConfiguration = AppConfigurations.Get(env.ContentRootPath, env.EnvironmentName);
+        }
+
         public override void PreInitialize()
         {
+            Configuration.DefaultNameOrConnectionString = _appConfiguration.GetConnectionString(AbpProjectNameConsts.ConnectionStringName);
+
+            Configuration.Modules.AbpEfCore().AddDbContext<AbpProjectNameDbContext>(options =>
+            {
+                DbContextOptionsConfigurer.Configure(options.DbContextOptions, options.ConnectionString);
+            });
+
             Configuration.Navigation.Providers.Add<AbpProjectNameNavigationProvider>();
 
             Configuration.Modules.AbpAspNetCore()

src/AbpCompanyName.AbpProjectName.Web/Startup/Startup.cs

@@ -1,37 +1,18 @@
 using System;
 using Abp.AspNetCore;
 using Abp.AspNetCore.Mvc;
-using AbpCompanyName.AbpProjectName.EntityFrameworkCore;
 using Castle.Facilities.Logging;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 
 namespace AbpCompanyName.AbpProjectName.Web.Startup
 {
     public class Startup
     {
-        public IConfigurationRoot Configuration { get; }
-
-        public Startup(IHostingEnvironment env)
-        {
-            var builder = new ConfigurationBuilder()
-                .SetBasePath(env.ContentRootPath)
-                .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true)
-                .AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true)
-                .AddEnvironmentVariables();
-            Configuration = builder.Build();
-        }
-
         public IServiceProvider ConfigureServices(IServiceCollection services)
         {
-            services.AddDbContext<AbpProjectNameDbContext>(
-                options => options.UseSqlServer(Configuration.GetConnectionString("Default"))
-            );
-
             services.AddMvc(options =>
             {
                 options.AddAbp(services); //Add ABP infrastructure to MVC

src/AbpCompanyName.AbpProjectName.Web/project.json

@@ -20,8 +20,6 @@
       "version": "1.0.0-preview2-final",
       "type": "build"
     },
-    "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0",
-    "Microsoft.Extensions.Configuration.Json": "1.0.0",
     "Microsoft.Extensions.Logging": "1.0.0",
     "Microsoft.Extensions.Options.ConfigurationExtensions": "1.0.0",
     "Microsoft.VisualStudio.Web.BrowserLink.Loader": "14.0.0",