Skip to content

Commit 5f5b6f7

Browse files
committed
Cleaned Program startup and removed unnecessary methods
1 parent 8084030 commit 5f5b6f7

File tree

1 file changed

+8
-15
lines changed

1 file changed

+8
-15
lines changed

src/HyperMC/Program.cs

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,14 @@ static class Program
2121
[STAThread]
2222
static async Task Main()
2323
{
24-
var builder = new ConfigurationBuilder();
25-
BuildConfig(builder);
26-
builder.Build();
27-
2824
var host = Host.CreateDefaultBuilder()
25+
.ConfigureAppConfiguration(builder =>
26+
{
27+
builder.SetBasePath(Directory.GetCurrentDirectory())
28+
.AddJsonFile("appsettings.json", optional: false, reloadOnChange: true)
29+
.AddJsonFile($"appsettings.{ Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") ?? "Production" }.json", optional: true)
30+
.AddEnvironmentVariables();
31+
})
2932
.ConfigureServices((context, services) =>
3033
{
3134
ConfigureServices(services);
@@ -40,7 +43,7 @@ static async Task Main()
4043
Application.Run(host.Services.GetRequiredService<HyperMcView>());
4144
}
4245

43-
private static IServiceProvider ConfigureServices(IServiceCollection services)
46+
private static void ConfigureServices(IServiceCollection services)
4447
{
4548
services.AddSingleton<HyperMcView>()
4649
.AddSingleton<IUserSettings, UserSettings>();
@@ -49,16 +52,6 @@ private static IServiceProvider ConfigureServices(IServiceCollection services)
4952
.AddTransient<IFileManager, FileManager>();
5053

5154
services.AddForgeClient();
52-
53-
return services.BuildServiceProvider();
54-
}
55-
56-
static void BuildConfig(IConfigurationBuilder builder)
57-
{
58-
builder.SetBasePath(Directory.GetCurrentDirectory())
59-
.AddJsonFile("appsettings.json", optional: false, reloadOnChange: true)
60-
.AddJsonFile($"appsettings.{ Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") ?? "Production" }.json", optional: true)
61-
.AddEnvironmentVariables();
6255
}
6356
}
6457
}

0 commit comments

Comments
 (0)