Merge branch 'feature-14' of https://github.com/simpleinjector/SimpleInjector.Integration.AspNetCore into v5.3.x

Author: dotnetjunkie

src/SimpleInjector.Integration.ServiceCollection/DefaultServiceProviderAccessor.cs

@@ -16,9 +16,9 @@ internal DefaultServiceProviderAccessor(Container container)
             this.container = container;
         }
 
-        public IServiceProvider Current => this.CurentServiceScope.ServiceProvider;
+        public IServiceProvider Current => this.CurrentServiceScope.ServiceProvider;
 
-        private IServiceScope CurentServiceScope
+        private IServiceScope CurrentServiceScope
         {
             get
             {

src/SimpleInjector.Integration.ServiceCollection/ServiceScopeProvider.cs

@@ -0,0 +1,35 @@
+// Copyright (c) Simple Injector Contributors. All rights reserved.
+// Licensed under the MIT License. See LICENSE file in the project root for license information.
+
+namespace SimpleInjector
+{
+    using Microsoft.Extensions.DependencyInjection;
+
+    /// <summary>
+    /// Allows providing an <see cref="IServiceScope"/> that can be used within a single Simple Injector
+    /// <see cref="Scope"/>. When the <see cref="ServiceScope"/> property is set before an
+    /// <see cref="IServiceScope"/> is resolved for the first time within a <see cref="Scope"/>, the provided value
+    /// will be returned. When this property is set <i>after</i> <see cref="IServiceScope"/> is resolved, it has
+    /// no effect.
+    /// </summary>
+    /// <remarks>
+    /// <code lang="cs"><![CDATA[
+    /// using (AsyncScopedLifestyle.BeginScope(container))
+    /// {
+    ///     container.GetInstance<ServiceScopeProvider>().ServiceScope = serviceScope;
+    ///     
+    ///     var resolvedScope = container.GetInstance<IServiceScope>();
+    ///     
+    ///     Assert.AreSame(serviceScope, resolvedScope);
+    /// }
+    /// ]]></code>
+    /// </remarks>
+    public sealed class ServiceScopeProvider
+    {
+        /// <summary>
+        /// Gets or sets the <see cref="IServiceScope"/>.
+        /// </summary>
+        public IServiceScope? ServiceScope { get; set; }
+    }
+
+}

src/SimpleInjector.Integration.ServiceCollection/SimpleInjectorServiceCollectionExtensions.cs

@@ -374,8 +374,13 @@ private static void VerifyStringLocalizerFactoryAvailable(IServiceCollection ser
 
         private static void RegisterServiceScope(SimpleInjectorAddOptions options)
         {
-            options.Container.Register(
-                () => options.ServiceScopeFactory.CreateScope(),
+            var container = options.Container;
+
+            container.Register<ServiceScopeProvider>(Lifestyle.Scoped);
+
+            container.Register(
+                () => container.GetInstance<ServiceScopeProvider>().ServiceScope
+                    ?? options.ServiceScopeFactory.CreateScope(),
                 Lifestyle.Scoped);
         }