Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bugfix net6 ms di no available scope #662 #666

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Bugfix net6 ms di no available scope #662 #666

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
752 changes: 752 additions & 0 deletions src/Castle.Windsor.Extensions.DependencyInjection.Tests/ResolveFromThreadpoolUnsafe.cs
View file
Open in desktop

Large diffs are not rendered by default.

29 changes: 0 additions & 29 deletions src/Castle.Windsor.Extensions.DependencyInjection/Scope/ExtensionContainerRootScope.cs
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ...astle.Windsor.Extensions.DependencyInjection/Scope/ExtensionContainerRootScopeAccessor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ internal class ExtensionContainerRootScopeAccessor : IScopeAccessor
{
public ILifetimeScope GetScope(CreationContext context)
{
return ExtensionContainerScopeCache.Current.RootScope ?? throw new InvalidOperationException("No root scope available");
return ExtensionContainerScopeCache.current.Value?.RootScope ?? throw new InvalidOperationException("No root scope available");
}

public void Dispose()
Expand Down
9 changes: 3 additions & 6 deletions src/Castle.Windsor.Extensions.DependencyInjection/Scope/ExtensionContainerScope.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,12 @@ internal class ExtensionContainerScope : ExtensionContainerScopeBase

protected ExtensionContainerScope()
{
parent = ExtensionContainerScopeCache.Current;
parent = ExtensionContainerScopeCache.current.Value;
}

internal override ExtensionContainerScopeBase RootScope { get; set; }


internal static ExtensionContainerScopeBase BeginScope()
internal static ExtensionContainerScopeBase BeginScope(ExtensionContainerScopeBase rootScope = null)
{
var scope = new ExtensionContainerScope { RootScope = ExtensionContainerScopeCache.Current.RootScope };
var scope = new ExtensionContainerScope { RootScope = rootScope };
ExtensionContainerScopeCache.Current = scope;
return scope;
}
Expand Down
4 changes: 2 additions & 2 deletions src/Castle.Windsor.Extensions.DependencyInjection/Scope/ForcedScope.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ internal class ForcedScope : IDisposable
private readonly ExtensionContainerScopeBase previousScope;
internal ForcedScope(ExtensionContainerScopeBase scope)
{
previousScope = ExtensionContainerScopeCache.Current;
previousScope = ExtensionContainerScopeCache.current.Value;
this.scope = scope;
ExtensionContainerScopeCache.Current = scope;
}
public void Dispose()
{
if(ExtensionContainerScopeCache.Current != scope) return;
if(ExtensionContainerScopeCache.Current != scope || previousScope == null) return;
ExtensionContainerScopeCache.Current = previousScope;
}
}
Expand Down
8 changes: 5 additions & 3 deletions src/Castle.Windsor.Extensions.DependencyInjection/Scope/WindsorScopeFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,17 @@ namespace Castle.Windsor.Extensions.DependencyInjection.Scope
internal class WindsorScopeFactory : IServiceScopeFactory
{
private readonly IWindsorContainer scopeFactoryContainer;

public WindsorScopeFactory(IWindsorContainer container)
private readonly ExtensionContainerScopeBase rootScope;

public WindsorScopeFactory(IWindsorContainer container, ExtensionContainerScopeBase rootScope)
{
scopeFactoryContainer = container;
this.rootScope = rootScope;
}

public IServiceScope CreateScope()
{
var scope = ExtensionContainerScope.BeginScope();
var scope = ExtensionContainerScope.BeginScope(rootScope);

//since WindsorServiceProvider is scoped, this gives us new instance
var provider = scopeFactoryContainer.Resolve<IServiceProvider>();
Expand Down
2 changes: 1 addition & 1 deletion src/Castle.Windsor.Extensions.DependencyInjection/WindsorScopedServiceProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public object GetRequiredService(Type serviceType)

public void Dispose()
{
if (!(scope is ExtensionContainerRootScope)) return;
if (scope != scope.RootScope) return;
if (disposing) return;
disposing = true;
var disposableScope = scope as IDisposable;
Expand Down
7 changes: 4 additions & 3 deletions src/Castle.Windsor.Extensions.DependencyInjection/WindsorServiceProviderFactoryBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ namespace Castle.Windsor.Extensions.DependencyInjection

public abstract class WindsorServiceProviderFactoryBase : IServiceProviderFactory<IWindsorContainer>
{
internal ExtensionContainerRootScope rootScope;
internal ExtensionContainerScopeBase rootScope;
protected IWindsorContainer rootContainer;

public virtual IWindsorContainer Container => rootContainer;
Expand All @@ -44,7 +44,8 @@ public virtual IServiceProvider CreateServiceProvider(IWindsorContainer containe

protected virtual void CreateRootScope()
{
rootScope = ExtensionContainerRootScope.BeginRootScope();
rootScope = ExtensionContainerScope.BeginScope();
rootScope.RootScope = rootScope;
}

protected virtual void CreateRootContainer()
Expand Down Expand Up @@ -111,7 +112,7 @@ protected virtual void RegisterFactories(IWindsorContainer container)
container.Register(Component
.For<IServiceScopeFactory>()
.ImplementedBy<WindsorScopeFactory>()
.DependsOn(Dependency.OnValue<ExtensionContainerRootScope>(rootScope))
.DependsOn(Dependency.OnValue<ExtensionContainerScopeBase>(rootScope))
.LifestyleSingleton(),
Component
.For<IServiceProviderFactory<IWindsorContainer>>()
Expand Down