tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move some files out of Content.Shared root because I forgot (#4182)

Browse Source
This commit is contained in:
DrSmugleaf
2021-06-13 14:52:40 +02:00
committed by GitHub
parent dc239fb384
commit f878f353e4
173 changed files with 185 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Content.IntegrationTests/ContentIntegrationTest.cs
View File

@@ -1,12 +1,10 @@
using System;
using System.Threading.Tasks;
using Content.Client;
using Content.Client.IoC;
using Content.Client.Parallax.Managers;
using Content.Server;
using Content.Server.GameTicking;
using Content.Server.IoC;
using Content.Shared;
using Content.Shared.CCVar;
using NUnit.Framework;
using Robust.Server.Maps;
using Robust.Shared;
@@ -17,7 +15,7 @@ using Robust.Shared.Map;
using Robust.Shared.Network;
using Robust.Shared.Timing;
using Robust.UnitTesting;
using EntryPoint = Content.Client.EntryPoint.EntryPoint;
using EntryPoint = Content.Client.Entry.EntryPoint;
namespace Content.IntegrationTests
{
@@ -35,7 +33,7 @@ namespace Content.IntegrationTests
options.ContentAssemblies = new[]
{
typeof(Shared.EntryPoint).Assembly,
typeof(Shared.Entry.EntryPoint).Assembly,
typeof(EntryPoint).Assembly,
typeof(ContentIntegrationTest).Assembly
};
@@ -78,8 +76,8 @@ namespace Content.IntegrationTests
options.ContentAssemblies = new[]
{
typeof(Shared.EntryPoint).Assembly,
typeof(Server.EntryPoint.EntryPoint).Assembly,
typeof(Shared.Entry.EntryPoint).Assembly,
typeof(Server.Entry.EntryPoint).Assembly,
typeof(ContentIntegrationTest).Assembly
};