Validate scope into singleton sevice injection

Author: pakrym

src/Microsoft.Extensions.DependencyInjection/Properties/Resources.Designer.cs

@@ -141,4 +141,7 @@
     <value>A suitable constructor for type '{0}' could not be located. Ensure the type is concrete and services are registered for all parameters of a public constructor.</value>
     <comment>{0} = service type</comment>
   </data>
+  <data name="ScopedInSingletonException" xml:space="preserve">
+    <value>Cannot consume scoped service '{0}' from singleton '{1}'.</value>
+  </data>
 </root>

src/Microsoft.Extensions.DependencyInjection/Resources.resx

@@ -9,7 +9,12 @@ public static class ServiceCollectionContainerBuilderExtensions
     {
         public static IServiceProvider BuildServiceProvider(this IServiceCollection services)
         {
-            return new ServiceProvider(services);
+            return BuildServiceProvider(services, false);
+        }
+
+        public static IServiceProvider BuildServiceProvider(this IServiceCollection services, bool validateScopes)
+        {
+            return new ServiceProvider(services, validateScopes);
         }
     }
 }

src/Microsoft.Extensions.DependencyInjection/ServiceCollectionContainerBuilderExtensions.cs

@@ -0,0 +1,68 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.Extensions.DependencyInjection.ServiceLookup
+{
+    internal class CallSiteValidator: CallSiteVisitor<CallSiteValidatorState, object>
+    {
+        public void Validate(IServiceCallSite callSite)
+        {
+            VisitCallSite(callSite, default(CallSiteValidatorState));
+        }
+
+        protected override object VisitTransient(TransientCallSite transientCallSite, CallSiteValidatorState state)
+        {
+            VisitCallSite(transientCallSite.Service, state);
+            return null;
+        }
+
+        protected override object VisitConstructor(ConstructorCallSite constructorCallSite, CallSiteValidatorState state)
+        {
+            foreach (var parameterCallSite in constructorCallSite.ParameterCallSites)
+            {
+                VisitCallSite(parameterCallSite, state);
+            }
+            return null;
+        }
+
+        protected override object VisitSingleton(SingletonCallSite singletonCallSite, CallSiteValidatorState state)
+        {
+            state.Singleton = singletonCallSite;
+            VisitCallSite(singletonCallSite.ServiceCallSite, state);
+            return null;
+        }
+
+        protected override object VisitScoped(ScopedCallSite scopedCallSite, CallSiteValidatorState state)
+        {
+            // We are fine with having ServiceScopeService requested by singletons
+            if (scopedCallSite.ServiceCallSite is ServiceScopeService)
+            {
+                return null;
+            }
+            if (state.Singleton != null)
+            {
+                throw new InvalidOperationException(Resources.FormatScopedInSingletonException(scopedCallSite.Key.Type, state.Singleton.Key.Type));
+            }
+            VisitCallSite(scopedCallSite.ServiceCallSite, state);
+            return null;
+        }
+
+        protected override object VisitConstant(ConstantCallSite constantCallSite, CallSiteValidatorState state) => null;
+
+        protected override object VisitCreateInstance(CreateInstanceCallSite createInstanceCallSite, CallSiteValidatorState state) => null;
+
+        protected override object VisitInstanceService(InstanceService instanceCallSite, CallSiteValidatorState state) => null;
+
+        protected override object VisitServiceProviderService(ServiceProviderService serviceProviderService, CallSiteValidatorState state) => null;
+
+        protected override object VisitEmptyIEnumerable(EmptyIEnumerableCallSite emptyIEnumerableCallSite, CallSiteValidatorState state) => null;
+
+        protected override object VisitServiceScopeService(ServiceScopeService serviceScopeService, CallSiteValidatorState state) => null;
+
+        protected override object VisitClosedIEnumerable(ClosedIEnumerableCallSite closedIEnumerableCallSite, CallSiteValidatorState state) => null;
+
+        protected override object VisitFactoryService(FactoryService factoryService, CallSiteValidatorState state) => null;
+    }
+}

src/Microsoft.Extensions.DependencyInjection/ServiceLookup/CallSiteValidator.cs

@@ -0,0 +1,10 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+namespace Microsoft.Extensions.DependencyInjection.ServiceLookup
+{
+    internal struct CallSiteValidatorState
+    {
+        public SingletonCallSite Singleton;
+    }
+}

src/Microsoft.Extensions.DependencyInjection/ServiceLookup/CallSiteValidatorState.cs

@@ -25,6 +25,8 @@ public ServiceLifetime Lifetime
             get { return ServiceLifetime.Transient; }
         }
 
+        public Type Type => _itemType;
+
         public IServiceCallSite CreateCallSite(ServiceProvider provider, ISet<Type> callSiteChain)
         {
             var list = new List<IServiceCallSite>();
@@ -36,6 +38,5 @@ public IServiceCallSite CreateCallSite(ServiceProvider provider, ISet<Type> call
             }
             return new ClosedIEnumerableCallSite(_itemType, list.ToArray());
         }
-
     }
 }

src/Microsoft.Extensions.DependencyInjection/ServiceLookup/ClosedIEnumerableService.cs

@@ -22,6 +22,8 @@ public ServiceLifetime Lifetime
             get { return Descriptor.Lifetime; }
         }
 
+        public Type Type => Descriptor.ServiceType;
+
         public IServiceCallSite CreateCallSite(ServiceProvider provider, ISet<Type> callSiteChain)
         {
             return this;

src/Microsoft.Extensions.DependencyInjection/ServiceLookup/FactoryService.cs

@@ -13,5 +13,7 @@ internal interface IService
         ServiceLifetime Lifetime { get; }
 
         IServiceCallSite CreateCallSite(ServiceProvider provider, ISet<Type> callSiteChain);
+
+        Type Type { get; }
     }
 }

src/Microsoft.Extensions.DependencyInjection/ServiceLookup/IService.cs

@@ -25,6 +25,8 @@ public ServiceLifetime Lifetime
             get { return Descriptor.Lifetime; }
         }
 
+        public Type Type => Descriptor.ServiceType;
+
         public IServiceCallSite CreateCallSite(ServiceProvider provider, ISet<Type> callSiteChain)
         {
             return this;

src/Microsoft.Extensions.DependencyInjection/ServiceLookup/InstanceService.cs

@@ -117,6 +117,8 @@ public IServiceCallSite CreateCallSite(ServiceProvider provider, ISet<Type> call
             }
         }
 
+        public Type Type => _descriptor.ServiceType;
+
         private bool IsSuperset(IEnumerable<Type> left, IEnumerable<Type> right)
         {
             return new HashSet<Type>(left).IsSupersetOf(right);