All warnings gone. All tests passed

seesharper · Oct 27, 2024 · e0f425a · e0f425a
1 parent 2f42bb7
commit e0f425a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 26 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -22,6 +22,7 @@
     "Newobj",
     "Stelem",
     "Stloc",
+    "Unkeyed",
     "Xunit"
   ],
   "dotnet-test-explorer.testArguments": "-c release -f netcoreapp2.0"

diff --git a/src/LightInject.Tests/KeyedMicrosoftTests.cs b/src/LightInject.Tests/KeyedMicrosoftTests.cs
@@ -898,7 +898,7 @@ internal class Service : IService
 
         public Service([ServiceKey] string id) => _id = id;
 
-        public override string? ToString() => _id;
+        public override string ToString() => _id;
     }
 
     internal class OtherService

diff --git a/src/LightInject.Tests/MicrosoftTests.cs b/src/LightInject.Tests/MicrosoftTests.cs
@@ -614,7 +614,7 @@ public void ConstrainedOpenGenericServicesCanBeResolved()
         Assert.Equal(2, allServices.Count);
         Assert.Same(poco, allServices[0].Value);
         Assert.Same(poco, allServices[1].Value);
-        Assert.Equal(1, constrainedServices.Count);
+        Assert.Single(constrainedServices);
         Assert.Same(singletonService, constrainedServices[0].Value);
     }
 
@@ -630,7 +630,7 @@ public void ConstrainedOpenGenericServicesReturnsEmptyWithNoMatches()
         // Act
         var constrainedServices = rootScope.GetAllInstances<IFakeOpenGenericService<IFakeSingletonService>>().ToList();
         // Assert
-        Assert.Equal(0, constrainedServices.Count);
+        Assert.Empty(constrainedServices);
     }
 
     [Fact]
@@ -655,7 +655,7 @@ public void InterfaceConstrainedOpenGenericServicesCanBeResolved()
         Assert.Equal(2, allServices.Count);
         Assert.Same(enumerableVal, allServices[0].Value);
         Assert.Same(enumerableVal, allServices[1].Value);
-        Assert.Equal(1, constrainedServices.Count);
+        Assert.Single(constrainedServices);        
         Assert.Same(singletonService, constrainedServices[0].Value);
     }
 
@@ -684,7 +684,7 @@ public void AbstractClassConstrainedOpenGenericServicesCanBeResolved()
         Assert.Equal(2, allServices.Count);
         Assert.Same(classInheritingClassInheritingAbstractClass, allServices[0].Value);
         Assert.Same(classInheritingClassInheritingAbstractClass, allServices[1].Value);
-        Assert.Equal(1, constrainedServices.Count);
+        Assert.Single(constrainedServices);
         Assert.Same(poco, constrainedServices[0].Value);
     }
 
@@ -729,8 +729,8 @@ public void ResolvingEnumerableContainingOpenGenericServiceUsesCorrectSlot()
         // Assert
         Assert.IsType<FakeService>(service);
         Assert.Equal(2, services.Length);
-        Assert.True(services.Any(s => s.GetType() == typeof(FakeService)));
-        Assert.True(services.Any(s => s.GetType() == typeof(FakeOpenGenericService<PocoClass>)));
+        Assert.Contains(services, s => s.GetType() == typeof(FakeService));                
+        Assert.Contains(services, s => s.GetType() == typeof(FakeOpenGenericService<PocoClass>));
     }
 
 

diff --git a/src/LightInject/LightInject.cs b/src/LightInject/LightInject.cs
@@ -3340,24 +3340,6 @@ public IServiceRegistry RegisterOrdered(
             return this;
         }
 
-        /// <inheritdoc/>
-        public IServiceRegistry RegisterOrdered(Type serviceType, ServiceRegistration[] serviceRegistrations)
-        {
-            List<Action<IEmitter>> emitters = new List<Action<IEmitter>>();
-            foreach (var registration in serviceRegistrations)
-            {
-                var emitMethod = ResolveEmitMethod(registration);
-                emitters.Add(emitMethod);
-            }
-
-            Action<IEmitter> emitAction = (emitter) => EmitEnumerable(emitters.ToArray(), serviceType, emitter);
-
-            Type enumerableType = typeof(IEnumerable<>).MakeGenericType(serviceType);
-            registrationOrder++;
-            RegisterEmitMethod(enumerableType, string.Empty, registrationOrder, emitAction);
-            return this;
-        }
-
         /// <inheritdoc/>
         public void Compile(Func<ServiceRegistration, bool> predicate)
         {
@@ -7074,7 +7056,7 @@ public Scope(ServiceContainer serviceFactory)
         /// <summary>
         /// Registers the <paramref name="disposable"/> so that it is disposed when the scope is completed.
         /// </summary>
-        /// <param name="disposable">The <see cref="IDisposable"/> or <see cref="IAsyncDisposable"/> object to register.</param>
+        /// <param name="disposable">The <see cref="IDisposable"/> to register.</param>
         public void TrackInstance(object disposable)
         {
             if (disposable is Scope)