From c624eac412f68d201f4efc00033e41dcc47516be Mon Sep 17 00:00:00 2001
From: Halil ibrahim Kalkan <hi_kalkan@yahoo.com>
Date: Mon, 31 Dec 2018 14:57:08 +0300
Subject: [PATCH] Fixed #698: Conflict for ConfigurationHelper

---
 ...Abp.BackgroundJobs.DemoApp.HangFire.csproj |  6 +++
 .../ConfigurationHelper.cs                    | 37 -------------------
 .../DemoAppModule.cs                          | 13 +------
 .../Volo.Abp.BackgroundJobs.DemoApp.csproj    |  6 +++
 4 files changed, 13 insertions(+), 49 deletions(-)
 delete mode 100644 modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.Shared/ConfigurationHelper.cs

diff --git a/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.HangFire/Volo.Abp.BackgroundJobs.DemoApp.HangFire.csproj b/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.HangFire/Volo.Abp.BackgroundJobs.DemoApp.HangFire.csproj
index b4ea7332fb..d85e206871 100644
--- a/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.HangFire/Volo.Abp.BackgroundJobs.DemoApp.HangFire.csproj
+++ b/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.HangFire/Volo.Abp.BackgroundJobs.DemoApp.HangFire.csproj
@@ -11,5 +11,11 @@
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.BackgroundJobs.HangFire\Volo.Abp.BackgroundJobs.HangFire.csproj" />
     <ProjectReference Include="..\Volo.Abp.BackgroundJobs.DemoApp.Shared\Volo.Abp.BackgroundJobs.DemoApp.Shared.csproj" />
   </ItemGroup>
+  
+  <ItemGroup>
+    <None Update="appsettings.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
 
 </Project>
diff --git a/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.Shared/ConfigurationHelper.cs b/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.Shared/ConfigurationHelper.cs
deleted file mode 100644
index c71aec904e..0000000000
--- a/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.Shared/ConfigurationHelper.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System.IO;
-using Microsoft.Extensions.Configuration;
-
-namespace Volo.Abp.BackgroundJobs.DemoApp.Shared
-{
-    public static class ConfigurationHelper
-    {
-        public static IConfigurationRoot BuildConfiguration()
-        {
-            const string fileName = "appsettings.json";
-
-            var directory = Directory.GetCurrentDirectory();
-
-            while (!File.Exists(Path.Combine(directory, fileName)))
-            {
-                var parentDirectory = new DirectoryInfo(directory).Parent;
-                if (parentDirectory == null)
-                {
-                    break;
-                }
-
-                directory = parentDirectory.FullName;
-            }
-
-            if (File.Exists(Path.Combine(directory, fileName)))
-            {
-                var builder = new ConfigurationBuilder()
-                    .SetBasePath(directory)
-                    .AddJsonFile(fileName, optional: false);
-
-                return builder.Build();
-            }
-
-            return null;
-        }
-    }
-}
diff --git a/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp/DemoAppModule.cs b/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp/DemoAppModule.cs
index 4f01d40c70..69cfb2aa6f 100644
--- a/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp/DemoAppModule.cs
+++ b/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp/DemoAppModule.cs
@@ -1,10 +1,8 @@
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Volo.Abp.Autofac;
 using Volo.Abp.BackgroundJobs.DemoApp.Shared;
 using Volo.Abp.BackgroundJobs.EntityFrameworkCore;
-using Volo.Abp.Data;
 using Volo.Abp.EntityFrameworkCore;
 using Volo.Abp.EntityFrameworkCore.SqlServer;
 using Volo.Abp.Modularity;
@@ -21,15 +19,6 @@ namespace Volo.Abp.BackgroundJobs.DemoApp
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            var configuration = ConfigurationHelper.BuildConfiguration();
-
-            context.Services.SetConfiguration(configuration);
-
-            Configure<DbConnectionOptions>(options =>
-            {
-                options.ConnectionStrings.Default = configuration.GetConnectionString("Default");
-            });
-
             Configure<AbpDbContextOptions>(options =>
             {
                 options.Configure(opts =>
diff --git a/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp/Volo.Abp.BackgroundJobs.DemoApp.csproj b/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp/Volo.Abp.BackgroundJobs.DemoApp.csproj
index d386d134bf..04fc1f16c6 100644
--- a/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp/Volo.Abp.BackgroundJobs.DemoApp.csproj
+++ b/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp/Volo.Abp.BackgroundJobs.DemoApp.csproj
@@ -14,4 +14,10 @@
     <ProjectReference Include="..\Volo.Abp.BackgroundJobs.DemoApp.Shared\Volo.Abp.BackgroundJobs.DemoApp.Shared.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Update="appsettings.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
 </Project>