diff --git a/DiscordBotCore.WebApplication/DiscordBotCore.WebApplication.csproj b/DiscordBotCore.WebApplication/DiscordBotCore.WebApplication.csproj deleted file mode 100644 index d5333be..0000000 --- a/DiscordBotCore.WebApplication/DiscordBotCore.WebApplication.csproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - net8.0 - enable - enable - AnyCPU;x64;ARM64 - - - - - - - - - - - diff --git a/SethDiscordBot.sln b/SethDiscordBot.sln index d88b594..5112025 100644 --- a/SethDiscordBot.sln +++ b/SethDiscordBot.sln @@ -33,8 +33,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiscordBotCore.PluginManage EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiscordBotCore.Database.Sqlite", "DiscordBotCore.Database.Sqlite\DiscordBotCore.Database.Sqlite.csproj", "{6D43E9A7-A295-41AC-8B2A-9A877FABB5DE}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiscordBotCore.WebApplication", "DiscordBotCore.WebApplication\DiscordBotCore.WebApplication.csproj", "{A65A1D7A-99E9-463F-A205-F96CA54D5C51}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebUI", "WebUI\WebUI.csproj", "{DE42253E-2ED6-4653-B9CC-C2C2551E1EA8}" EndProject Global @@ -191,18 +189,6 @@ Global {6D43E9A7-A295-41AC-8B2A-9A877FABB5DE}.Release|ARM64.Build.0 = Release|ARM64 {6D43E9A7-A295-41AC-8B2A-9A877FABB5DE}.Release|x64.ActiveCfg = Release|x64 {6D43E9A7-A295-41AC-8B2A-9A877FABB5DE}.Release|x64.Build.0 = Release|x64 - {A65A1D7A-99E9-463F-A205-F96CA54D5C51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A65A1D7A-99E9-463F-A205-F96CA54D5C51}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A65A1D7A-99E9-463F-A205-F96CA54D5C51}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {A65A1D7A-99E9-463F-A205-F96CA54D5C51}.Debug|ARM64.Build.0 = Debug|ARM64 - {A65A1D7A-99E9-463F-A205-F96CA54D5C51}.Debug|x64.ActiveCfg = Debug|x64 - {A65A1D7A-99E9-463F-A205-F96CA54D5C51}.Debug|x64.Build.0 = Debug|x64 - {A65A1D7A-99E9-463F-A205-F96CA54D5C51}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A65A1D7A-99E9-463F-A205-F96CA54D5C51}.Release|Any CPU.Build.0 = Release|Any CPU - {A65A1D7A-99E9-463F-A205-F96CA54D5C51}.Release|ARM64.ActiveCfg = Release|ARM64 - {A65A1D7A-99E9-463F-A205-F96CA54D5C51}.Release|ARM64.Build.0 = Release|ARM64 - {A65A1D7A-99E9-463F-A205-F96CA54D5C51}.Release|x64.ActiveCfg = Release|x64 - {A65A1D7A-99E9-463F-A205-F96CA54D5C51}.Release|x64.Build.0 = Release|x64 {DE42253E-2ED6-4653-B9CC-C2C2551E1EA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {DE42253E-2ED6-4653-B9CC-C2C2551E1EA8}.Debug|Any CPU.Build.0 = Debug|Any CPU {DE42253E-2ED6-4653-B9CC-C2C2551E1EA8}.Debug|ARM64.ActiveCfg = Debug|ARM64 diff --git a/DiscordBotCore.WebApplication/Initializer.cs b/WebUI/Initializer.cs similarity index 95% rename from DiscordBotCore.WebApplication/Initializer.cs rename to WebUI/Initializer.cs index 602160f..bc635cc 100644 --- a/DiscordBotCore.WebApplication/Initializer.cs +++ b/WebUI/Initializer.cs @@ -1,14 +1,14 @@ -using DiscordBotCore.Bot; +using DiscordBotCore.Bot; using DiscordBotCore.Configuration; using DiscordBotCore.Logging; using DiscordBotCore.PluginManagement; using DiscordBotCore.PluginManagement.Helpers; using DiscordBotCore.PluginManagement.Loading; +using IConfiguration = DiscordBotCore.Configuration.IConfiguration; +using ILogger = DiscordBotCore.Logging.ILogger; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Hosting; +namespace WebUI; -namespace DiscordBotCore.WebApplication; public static class Initializer { @@ -47,7 +47,7 @@ public static class Initializer ILogger logger = sp.GetRequiredService(); string configFile = builder.Configuration["ConfigFile"] ?? DefaultConfigFile; Directory.CreateDirectory(new FileInfo(configFile).DirectoryName); - IConfiguration configuration = Configuration.Configuration.CreateFromFile(logger, configFile, true); + IConfiguration configuration = Configuration.CreateFromFile(logger, configFile, true); return configuration; }); diff --git a/WebUI/Program.cs b/WebUI/Program.cs index f0d7a1b..1df343f 100644 --- a/WebUI/Program.cs +++ b/WebUI/Program.cs @@ -1,4 +1,4 @@ -using DiscordBotCore.WebApplication; +using WebUI; using WebUI.Components; using WebUI.Services; diff --git a/WebUI/WebUI.csproj b/WebUI/WebUI.csproj index 8239fdc..fb8d5f9 100644 --- a/WebUI/WebUI.csproj +++ b/WebUI/WebUI.csproj @@ -8,8 +8,11 @@ + - + + +