Bump autofac version to 8.0

nivalxer · nivalxer · commit 14183a0db333 · 2024-03-27T22:20:07.000+08:00
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>
 

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,8 @@`
`2`	`2`	`using AspectCore.DynamicProxy;`
`3`	`3`	`using AspectCore.DependencyInjection;`
`4`	`4`	`using Autofac;`
	`5`	`+using Autofac.Core;`
	`6`	`+using Autofac.Core.Lifetime;`
`5`	`7`
`6`	`8`	`namespace AspectCore.Extensions.Autofac`
`7`	`9`	`{`
`@@ -34,12 +36,20 @@ public object Resolve(Type serviceType)`
`34`	`36`	`#if NET8_0_OR_GREATER`
`35`	`37`	`public object GetKeyedService(Type serviceType, object serviceKey)`
`36`	`38`	`{`
`37`		`- throw new NotImplementedException();`
	`39`	`+ if (serviceKey is null)`
	`40`	`+ {`
	`41`	`+ return _componentContext.ResolveOptional(serviceType);`
	`42`	`+ }`
	`43`	`+ return _componentContext.ResolveKeyed(serviceKey, serviceType);`
`38`	`44`	`}`
`39`	`45`
`40`	`46`	`public object GetRequiredKeyedService(Type serviceType, object serviceKey)`
`41`	`47`	`{`
`42`		`- throw new NotImplementedException();`
	`48`	`+ if (serviceKey is null)`
	`49`	`+ {`
	`50`	`+ return _componentContext.Resolve(serviceType);`
	`51`	`+ }`
	`52`	`+ return _componentContext.ResolveKeyed(serviceKey, serviceType);`
`43`	`53`	`}`
`44`	`54`	`#endif`
`45`	`55`	`}`