Commit f1b6d9b

authored

Fix service scope validation compatibility with Microsoft DI (#336)

* fix scope for some services to pass the Ms DI's validation * Install all required versions explicitly

1 parent 6a37bcc commit f1b6d9bCopy full SHA for f1b6d9b

File tree

+23

-4

lines changed

.github/workflows
- build-pr-ci.yml
src/AspectCore.Extensions.DependencyInjection
- ServiceCollectionExtensions.cs
tests/AspectCore.Extensions.DependencyInjection.Test
- ServiceCollectionBuildExtensionsTests.cs

+23

-4

lines changed

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,12 @@ jobs:`
`12`	`12`	`fetch-depth: 0`
`13`	`13`	`- name: Setup .NET Core`
`14`	`14`	`uses: actions/setup-dotnet@v4`
`15`		`- with: # NOTE: we don't need to install 6.x, 8.x and 9.x cause they are included in windows-latest(windows-2022) image.`
`16`		`- dotnet-version: 7.x`
	`15`	`+ with: # Install all required versions explicitly, since some frameworks may be missing from the image if they have been removed due to end of support.`
	`16`	`+ dotnet-version: \|`
	`17`	`+ 6.0.x`
	`18`	`+ 7.0.x`
	`19`	`+ 8.0.x`
	`20`	`+ 9.0.x`
`17`	`21`
`18`	`22`	`- name: Build Reason`
`19`	`23`	`run: "echo ref: ${{github.ref}} event: ${{github.event_name}}"`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -53,10 +53,10 @@ internal static IServiceCollection TryAddDynamicProxyServices(this IServiceColle`
`53`	`53`	`services.TryAddScoped<IAspectActivatorFactory, AspectActivatorFactory>();`
`54`	`54`	`services.TryAddScoped<IProxyGenerator, ProxyGenerator>();`
`55`	`55`	`services.TryAddScoped<IParameterInterceptorSelector, ParameterInterceptorSelector>();`
	`56`	`+ services.TryAddScoped<IInterceptorCollector, InterceptorCollector>();`
	`57`	`+ services.TryAddScoped<IAspectBuilderFactory, AspectBuilderFactory>();`
`56`	`58`
`57`		`- services.TryAddSingleton<IInterceptorCollector, InterceptorCollector>();`
`58`	`59`	`services.TryAddSingleton<IAspectValidatorBuilder, AspectValidatorBuilder>();`
`59`		`- services.TryAddSingleton<IAspectBuilderFactory, AspectBuilderFactory>();`
`60`	`60`	`services.TryAddSingleton<IProxyTypeGenerator, ProxyTypeGenerator>();`
`61`	`61`	`services.TryAddSingleton<IAspectCachingProvider, AspectCachingProvider>();`
`62`	`62`

Lines changed: 15 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,15 @@`
	`1`	`+using Microsoft.Extensions.DependencyInjection;`
	`2`	`+using Xunit;`
	`3`	`+`
	`4`	`+namespace AspectCore.Extensions.DependencyInjection.Test;`
	`5`	`+`
	`6`	`+public class ServiceCollectionBuildExtensionsTests`
	`7`	`+{`
	`8`	`+ [Fact]`
	`9`	`+ public void BuildDynamicProxyProvider_Validate()`
	`10`	`+ {`
	`11`	`+ var services = new ServiceCollection();`
	`12`	`+ var provider = services.BuildDynamicProxyProvider(new ServiceProviderOptions { ValidateOnBuild = true, ValidateScopes = true });`
	`13`	`+ Assert.NotNull(provider);`
	`14`	`+ }`
	`15`	`+}`

Comments

(0)