Remove static IoC from client & server EntryPoint (#40562)
* Remove static IoC from client & server EntryPoint * Fix missing log manager initialization * file namespace
This commit is contained in:
@@ -2,8 +2,8 @@ using System.Collections.Generic;
|
||||
using System.Reflection;
|
||||
using Content.Client.IoC;
|
||||
using Content.Server.IoC;
|
||||
using Content.Shared.IoC;
|
||||
using Robust.Shared.Analyzers;
|
||||
using Robust.Shared.IoC;
|
||||
using Robust.UnitTesting;
|
||||
using EntryPoint = Content.Server.Entry.EntryPoint;
|
||||
|
||||
@@ -15,16 +15,15 @@ namespace Content.Tests
|
||||
protected override void OverrideIoC()
|
||||
{
|
||||
base.OverrideIoC();
|
||||
|
||||
SharedContentIoC.Register();
|
||||
var dependencies = IoCManager.Instance!;
|
||||
|
||||
if (Project == UnitTestProject.Server)
|
||||
{
|
||||
ServerContentIoC.Register();
|
||||
ServerContentIoC.Register(dependencies);
|
||||
}
|
||||
else if (Project == UnitTestProject.Client)
|
||||
{
|
||||
ClientContentIoC.Register();
|
||||
ClientContentIoC.Register(dependencies);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user