Core - Flattened namespaces

Shared UI - Flattened namespaces
Shared UI - General housekeeping
Project - Code cleanup
This commit is contained in:
SpoinkyNL committed 2020-09-01 00:14:08 +02:00
1 parent aa06d8c43e
commit 29d4db55db
454 files changed
+1678 -1938

No files matched your search

+5 -5
View File
@@ -1,9 +1,5 @@
using System.IO;
using System.Security.AccessControl;
using System.Security.Principal;
using Artemis.Core.Exceptions;
using Artemis.Core.Plugins.Settings;
using Artemis.Core.Services.Interfaces;
using Artemis.Core.Services;
using Artemis.Storage;
using Artemis.Storage.Migrations.Interfaces;
using Artemis.Storage.Repositories.Interfaces;
@@ -15,8 +11,12 @@ using Serilog;
namespace Artemis.Core.Ninject
{
/// <summary>
/// The main <see cref="NinjectModule" /> of the Artemis Core that binds all services
/// </summary>
public class CoreModule : NinjectModule
{
/// <inheritdoc />
public override void Load()
{
if (Kernel == null)
@@ -1,8 +1,5 @@
using System.Linq;
using Artemis.Core.Exceptions;
using Artemis.Core.Plugins;
using Artemis.Core.Plugins.Settings;
using Artemis.Core.Services.Interfaces;
using Artemis.Core.Services;
using Artemis.Storage.Repositories.Interfaces;
using Ninject.Activation;
@@ -31,8 +28,10 @@ namespace Artemis.Core.Ninject
pluginInfo = _pluginService.GetPluginByAssembly(parentRequest.Service.Assembly)?.PluginInfo;
// Fall back to assembly based detection
if (pluginInfo == null)
{
throw new ArtemisCoreException("PluginSettings can only be injected with the PluginInfo parameter provided " +
"or into a class defined in a plugin assembly");
}
return new PluginSettings(pluginInfo, _pluginRepository);
}
@@ -1,13 +1,10 @@
using Artemis.Core.Plugins;
using Artemis.Core.Plugins.Exceptions;
using Artemis.Core.Plugins.Settings;
using Artemis.Core.Services;
using Artemis.Core.Services;
using Ninject;
using Ninject.Activation;
namespace Artemis.Core.Ninject
{
public class SettingsServiceProvider : Provider<ISettingsService>
internal class SettingsServiceProvider : Provider<ISettingsService>
{
private readonly SettingsService _instance;