Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removed unused / obsolete config.json from configuration system #1319

Merged
merged 3 commits into from
Oct 26, 2018
Merged

Removed unused / obsolete config.json from configuration system #1319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4fc6469
removed the config json Constant
filipw Oct 24, 2018
b607c83
removed loading of config.json
filipw Oct 24, 2018
462fd5f
added #1319 to changelog
filipw Oct 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)).
Expand Down
4 changes: 1 addition & 3 deletions src/OmniSharp.Host/ConfigurationBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down
3 changes: 1 addition & 2 deletions src/OmniSharp.Host/Internal/OmniSharpConstants.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
{
internal static class Constants
{
internal const string ConfigFile = "config.json";
internal const string OptionsFile = "omnisharp.json";
}
}
}