Merge pull request #1319 from OmniSharp/feature/config-json-kill

Removed unused / obsolete config.json from configuration system
OmniSharp · Oct 26, 2018 · bc9e22c · bc9e22c
2 parents a9b9d71 + 462fd5f
commit bc9e22c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@ All changes to the project will be documented in this file.
 
 ## [1.32.7] - not yet released
 * It's now possible to override the default location of OmniSharp's global folder (%USERPROFILE%\.omnisharp or ~/.omnisharp.) with an OMNISHARPHOME environment variable (PR: [#1317](https://github.com/OmniSharp/omnisharp-roslyn/pull/1317)) 
+* OmniSharp no longer searches for `config.json` in its source directory to load configuration (PR: [#1319](https://github.com/OmniSharp/omnisharp-roslyn/pull/1319))
 
 ## [1.32.6] - 2018-10-02
 * Fixed a bug where virtual C# documents would not get promoted to be a part of a project. (PR: [#1306](https://github.com/OmniSharp/omnisharp-roslyn/pull/1306)).

diff --git a/src/OmniSharp.Host/ConfigurationBuilder.cs b/src/OmniSharp.Host/ConfigurationBuilder.cs
@@ -16,8 +16,7 @@ public ConfigurationBuilder(IOmniSharpEnvironment environment)
         {
             _environment = environment;
             _builder = new Microsoft.Extensions.Configuration.ConfigurationBuilder()
-                .SetBasePath(AppContext.BaseDirectory)
-                .AddJsonFile(Constants.ConfigFile, optional: true);
+                .SetBasePath(AppContext.BaseDirectory);
         }
 
         public IConfigurationBuilder Add(IConfigurationSource source)
@@ -30,7 +29,6 @@ public IConfigurationRoot Build()
         {
             var configBuilder = new Microsoft.Extensions.Configuration.ConfigurationBuilder()
                 .SetBasePath(AppContext.BaseDirectory)
-                .AddJsonFile(Constants.ConfigFile, optional: true)
                 .AddEnvironmentVariables("OMNISHARP_");
 
             if (_environment.AdditionalArguments?.Length > 0)

diff --git a/src/OmniSharp.Host/Internal/OmniSharpConstants.cs b/src/OmniSharp.Host/Internal/OmniSharpConstants.cs
@@ -2,7 +2,6 @@
 {
     internal static class Constants
     {
-        internal const string ConfigFile = "config.json";
         internal const string OptionsFile = "omnisharp.json";
     }
-}
+}