Merge branch '20-11-27-merge'

Content.IntegrationTests/Tests/Networking/SimplePredictReconcileTest.cs

@@ -14,6 +14,7 @@ using Robust.Shared.Interfaces.Map;
 using Robust.Shared.Interfaces.Timing;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
+using Robust.Shared.Reflection;
 using Robust.Shared.Timing;
 
 namespace Content.IntegrationTests.Tests.Networking
@@ -425,6 +426,7 @@ namespace Content.IntegrationTests.Tests.Networking
             }
         }
 
+        [Reflect(false)]
         private sealed class PredictionTestEntitySystem : EntitySystem
         {
             public bool Allow { get; set; } = true;

Content.IntegrationTests/Tests/ResettingEntitySystemTests.cs

@@ -6,6 +6,7 @@ using NUnit.Framework;
 using Robust.Shared.GameObjects.Systems;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.IoC;
+using Robust.Shared.Reflection;
 
 namespace Content.IntegrationTests.Tests
 {
@@ -13,6 +14,7 @@ namespace Content.IntegrationTests.Tests
     [TestOf(typeof(IResettingEntitySystem))]
     public class ResettingEntitySystemTests : ContentIntegrationTest
     {
+        [Reflect(false)]
         private class TestResettingEntitySystem : EntitySystem, IResettingEntitySystem
         {
             public bool HasBeenReset { get; set; }