Bump autofac version to 8.0

dotnetcore · Mar 27, 2024 · 14183a0 · 14183a0
1 parent ad7004e
commit 14183a0
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/src/AspectCore.Extensions.Autofac/AspectCore.Extensions.Autofac.csproj b/src/AspectCore.Extensions.Autofac/AspectCore.Extensions.Autofac.csproj
@@ -21,7 +21,7 @@
 
 
   <ItemGroup>
-    <PackageReference Include="Autofac" Version="[7.0.0, 8.0.0)" />
+    <PackageReference Include="Autofac" Version="[8.0.0, 9.0.0)" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/AspectCore.Extensions.Autofac/AutofacServiceResolver.cs b/src/AspectCore.Extensions.Autofac/AutofacServiceResolver.cs
@@ -2,6 +2,8 @@
 using AspectCore.DynamicProxy;
 using AspectCore.DependencyInjection;
 using Autofac;
+using Autofac.Core;
+using Autofac.Core.Lifetime;
 
 namespace AspectCore.Extensions.Autofac
 {
@@ -34,12 +36,20 @@ public object Resolve(Type serviceType)
 #if NET8_0_OR_GREATER
         public object GetKeyedService(Type serviceType, object serviceKey)
         {
-            throw new NotImplementedException();
+            if (serviceKey is null)
+            {
+                return _componentContext.ResolveOptional(serviceType);
+            }
+            return _componentContext.ResolveKeyed(serviceKey, serviceType);
         }
 
         public object GetRequiredKeyedService(Type serviceType, object serviceKey)
         {
-            throw new NotImplementedException();
+            if (serviceKey is null)
+            {
+                return _componentContext.Resolve(serviceType);
+            }
+            return _componentContext.ResolveKeyed(serviceKey, serviceType);
         }
 #endif
     }

diff --git a/tests/AspectCore.Extensions.Autofac.Test/AspectCore.Extensions.Autofac.Test.csproj b/tests/AspectCore.Extensions.Autofac.Test/AspectCore.Extensions.Autofac.Test.csproj
@@ -18,17 +18,17 @@
 	</ItemGroup>
 
 	<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
-		<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="8.0.0" />
-		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Specification.Tests" Version="6.0.0" />
+		<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="9.0.0" />
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Specification.Tests" Version="8.0.0" />
 	</ItemGroup>
 
 	<ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
-		<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="8.0.0" />
-		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Specification.Tests" Version="7.0.0" />
+		<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="9.0.0" />
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Specification.Tests" Version="8.0.0" />
 	</ItemGroup>
 
 	<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
-		<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="8.0.0" />
+		<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="9.0.0" />
 		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Specification.Tests" Version="8.0.0" />
 	</ItemGroup>