Merge pull request #120 from autofac/external-dependency-switch

Switch to ExternallyOwned for instance dependencies
autofac · Aug 11, 2024 · eb20702 · eb20702
2 parents dc03f10 + ecec468
commit eb20702
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,9 +1,9 @@
 image: Ubuntu
 
-version: 9.0.0.{build}
+version: 10.0.0.{build}
 
 dotnet_csproj:
-  version_prefix: '9.0.0'
+  version_prefix: '10.0.0'
   patch: true
   file: 'src\**\*.csproj'
 

diff --git a/src/Autofac.Extensions.DependencyInjection/AutofacRegistration.cs b/src/Autofac.Extensions.DependencyInjection/AutofacRegistration.cs
@@ -329,7 +329,8 @@ private static void Register(
             builder
                 .RegisterInstance(descriptor.NormalizedImplementationInstance()!)
                 .ConfigureServiceType(descriptor)
-                .ConfigureLifecycle(descriptor.Lifetime, null);
+                .ConfigureLifecycle(descriptor.Lifetime, null)
+                .ExternallyOwned();
         }
     }
 }
diff --git a/test/Autofac.Extensions.DependencyInjection.Test/Specification/AssumedBehaviorTests.cs b/test/Autofac.Extensions.DependencyInjection.Test/Specification/AssumedBehaviorTests.cs
@@ -171,6 +171,17 @@ public void ServiceScopesAreFlat()
         innerScope.Dispose();
     }
 
+    [Fact]
+    public void ServiceInstancesRegisteredAreNotDisposedWhenTheProviderIsDisposed()
+    {
+        var externalService = new DisposeTracker();
+        var services = new ServiceCollection().AddSingleton(externalService);
+        var rootProvider = CreateServiceProvider(services);
+        ((IDisposable)rootProvider).Dispose();
+
+        Assert.False(externalService.Disposed);
+    }
+
     protected abstract IServiceProvider CreateServiceProvider(IServiceCollection serviceCollection);
 
     [SuppressMessage("CA1812", "CA1812", Justification = "Instantiated through reflection.")]