cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-27 07:04:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup commandline config loading for .NET 6

Browse Source
This commit is contained in:
Jordan Brown
2022-09-21 10:02:07 -04:00
parent 9c5bc17961
commit 3a1c44c71e
1 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Host/ServerFactory.cs
+21 -4
View File
@@ -62,15 +62,32 @@ namespace Tgstation.Server.Host
// values obtained via debugger
var environmentJsonConfig = builder.Sources[2];
var envConfig = builder.Sources[3];
var cmdLineConfig = builder.Sources[4];
var baseYmlConfig = builder.Sources[5];
var environmentYmlConfig = builder.Sources[6];
// CURSED
// https://github.com/dotnet/runtime/blob/30dc7e7aedb7aab085c7d9702afeae5bc5a43133/src/libraries/Microsoft.Extensions.Hosting/src/HostingHostBuilderExtensions.cs#L246-L249
IConfigurationSource cmdLineConfig, baseYmlConfig, environmentYmlConfig;
if (args.Length == 0)
{
cmdLineConfig = null;
baseYmlConfig = builder.Sources[4];
environmentYmlConfig = builder.Sources[5];
}
else
{
cmdLineConfig = builder.Sources[4];
baseYmlConfig = builder.Sources[5];
environmentYmlConfig = builder.Sources[6];
}
builder.Sources[2] = baseYmlConfig;
builder.Sources[3] = environmentJsonConfig;
builder.Sources[4] = environmentYmlConfig;
builder.Sources[5] = envConfig;
builder.Sources[6] = cmdLineConfig;
if (cmdLineConfig != null)
{
builder.Sources[6] = cmdLineConfig;
}
});
var setupWizardHostBuilder = CreateDefaultBuilder()