AMT-Cheif
/
Stylet
mirror of https://github.com/AMT-Cheif/Stylet.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Dispose Instance bindings by default, but allow this to be configured

This commit is contained in:
Antony Male 2016-09-23 11:12:27 +01:00
parent bc29dda5b7
commit e538bbbd8f
10 changed files with 260 additions and 187 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Stylet/Bootstrapper.cs
View File

@ -58,7 +58,7 @@ namespace Stylet
// Bind it to both IViewManager and to itself, so that people can get it with Container.Get<ViewManager>()
builder.Bind<IViewManager>().And<ViewManager>().To<ViewManager>().AsWeakBinding();
builder.Bind<IWindowManagerConfig>().ToInstance(this).AsWeakBinding();
builder.Bind<IWindowManagerConfig>().ToInstance(this).DisposeWithContainer(false).AsWeakBinding();
builder.Bind<IWindowManager>().To<WindowManager>().InSingletonScope().AsWeakBinding();
builder.Bind<IEventAggregator>().To<EventAggregator>().InSingletonScope().AsWeakBinding();
builder.Bind<IMessageBoxViewModel>().To<MessageBoxViewModel>().AsWeakBinding();

306
Stylet/Stylet.csproj
View File

@ -1,160 +1,160 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{2435BD00-AC12-48B0-AD36-9BAB2FDEC3F5}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Stylet</RootNamespace>
<AssemblyName>Stylet</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>Stylet.ruleset</CodeAnalysisRuleSet>
<DocumentationFile>bin\Debug\Stylet.xml</DocumentationFile>
<LangVersion>5</LangVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Release\Stylet.xml</DocumentationFile>
<CodeAnalysisRuleSet>Stylet.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows" />
<Reference Include="System.Xaml" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Xml" />
<Reference Include="WindowsBase" />
</ItemGroup>
<ItemGroup>
<Compile Include="IDispatcher.cs" />
<Compile Include="INotifyCollectionChanging.cs" />
<Compile Include="Logging\ILogger.cs" />
<Compile Include="Logging\NullLogger.cs" />
<Compile Include="Logging\TraceLogger.cs" />
<Compile Include="StyletIoC\Creation\BuilderTypeKey.cs" />
<Compile Include="StyletIoC\Creation\ICreator.cs" />
<Compile Include="StyletIoC\Creation\IRegistration.cs" />
<Compile Include="StyletIoC\FluentInterface.cs" />
<Compile Include="StyletIoC\Internal\Builders\BuilderAbstractFactoryBinding.cs" />
<Compile Include="StyletIoC\Internal\Builders\BuilderBindingBase.cs" />
<Compile Include="StyletIoC\Internal\Builders\BuilderBindTo.cs" />
<Compile Include="StyletIoC\Internal\Builders\BuilderFactoryBinding.cs" />
<Compile Include="StyletIoC\Internal\Builders\BuilderToAllImplementationsBinding.cs" />
<Compile Include="StyletIoC\Internal\Builders\BuilderTypeBinding.cs" />
<Compile Include="StyletIoC\Internal\Builders\BuilderInstanceBinding.cs" />
<Compile Include="StyletIoC\Internal\Creators\InstanceCreator.cs" />
<Compile Include="StyletIoC\Internal\IRegistrationCollection.cs" />
<Compile Include="StyletIoC\Internal\Creators\AbstractFactoryCreator.cs" />
<Compile Include="StyletIoC\Internal\Creators\CreatorBase.cs" />
<Compile Include="StyletIoC\Internal\Creators\FactoryCreator.cs" />
<Compile Include="StyletIoC\Internal\Creators\TypeCreator.cs">
<ExcludeFromStyleCop>False</ExcludeFromStyleCop>
</Compile>
<Compile Include="StyletIoC\Creation\IRegistrationContext.cs" />
<Compile Include="StyletIoC\Internal\RegistrationCollections\EmptyRegistrationCollection.cs" />
<Compile Include="StyletIoC\Internal\RegistrationCollections\RegistrationCollection.cs" />
<Compile Include="StyletIoC\Internal\RegistrationCollections\SingleRegistration.cs" />
<Compile Include="StyletIoC\Internal\Registrations\FuncNoKeyRegistration.cs" />
<Compile Include="StyletIoC\Internal\Registrations\GetAllRegistration.cs" />
<Compile Include="StyletIoC\Internal\Registrations\RegistrationBase.cs" />
<Compile Include="StyletIoC\Internal\Registrations\SingletonRegistration.cs" />
<Compile Include="StyletIoC\Internal\Registrations\TransientRegistration.cs" />
<Compile Include="StyletIoC\Internal\TypeKey.cs" />
<Compile Include="StyletIoC\StyletIoCContainer.cs" />
<Compile Include="StyletIoC\StyletIoCModule.cs" />
<Compile Include="Xaml\ActionBase.cs" />
<Compile Include="Xaml\ApplicationLoader.cs" />
<Compile Include="ConductorNavigating.cs" />
<Compile Include="IBootstrapper.cs" />
<Compile Include="IValidationAdapter.cs" />
<Compile Include="LabelledValue.cs" />
<Compile Include="INotifyPropertyChangedDispatcher.cs" />
<Compile Include="Logging\LogManager.cs" />
<Compile Include="MessageBoxViewModel.cs" />
<Compile Include="StyletConductorExtensions.cs" />
<Compile Include="StyletIoC\IContainer.cs" />
<Compile Include="StyletIoC\IInjectionAware.cs" />
<Compile Include="StyletIoC\InjectAttribute.cs" />
<Compile Include="StyletIoC\StyletIoCException.cs" />
<Compile Include="StyletIoC\Internal\TypeExtensions.cs" />
<Compile Include="ValidatingModelBase.cs" />
<Compile Include="Xaml\ActionExtension.cs" />
<Compile Include="BindableCollection.cs" />
<Compile Include="BootstrapperBase.cs" />
<Compile Include="Xaml\BoolToVisibilityConverter.cs" />
<Compile Include="Xaml\CommandAction.cs" />
<Compile Include="Conductor.cs" />
<Compile Include="ConductorAllActive.cs" />
<Compile Include="ConductorBase.cs" />
<Compile Include="ConductorBaseWithActiveItem.cs" />
<Compile Include="ConductorOneActive.cs" />
<Compile Include="Xaml\DebugConverter.cs" />
<Compile Include="Xaml\EqualityConverter.cs" />
<Compile Include="Xaml\EventAction.cs" />
<Compile Include="EventAggregator.cs" />
<Compile Include="Execute.cs" />
<Compile Include="ExpressionExtensions.cs" />
<Compile Include="IConductor.cs" />
<Compile Include="Bootstrapper.cs" />
<Compile Include="IScreen.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="PropertyChangedBase.cs" />
<Compile Include="PropertyChangedExtensions.cs" />
<Compile Include="Screen.cs" />
<Compile Include="ScreenExtensions.cs" />
<Compile Include="StyletIoC\Creation\BuilderUpper.cs" />
<Compile Include="StyletIoC\StyletIoCBuilder.cs" />
<Compile Include="StyletIoC\Internal\Container.cs" />
<Compile Include="StyletIoC\Internal\UnboundGeneric.cs" />
<Compile Include="Xaml\IconToBitmapSourceConverter.cs" />
<Compile Include="Xaml\View.cs" />
<Compile Include="ViewManager.cs" />
<Compile Include="WindowManager.cs" />
</ItemGroup>
<ItemGroup>
<Page Include="MessageBoxView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Xaml\StyletResourceDictionary.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
</ItemGroup>
<ItemGroup>
<None Include="Stylet.ruleset" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{2435BD00-AC12-48B0-AD36-9BAB2FDEC3F5}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Stylet</RootNamespace>
<AssemblyName>Stylet</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>Stylet.ruleset</CodeAnalysisRuleSet>
<DocumentationFile>bin\Debug\Stylet.xml</DocumentationFile>
<LangVersion>5</LangVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Release\Stylet.xml</DocumentationFile>
<CodeAnalysisRuleSet>Stylet.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows" />
<Reference Include="System.Xaml" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Xml" />
<Reference Include="WindowsBase" />
</ItemGroup>
<ItemGroup>
<Compile Include="IDispatcher.cs" />
<Compile Include="INotifyCollectionChanging.cs" />
<Compile Include="Logging\ILogger.cs" />
<Compile Include="Logging\NullLogger.cs" />
<Compile Include="Logging\TraceLogger.cs" />
<Compile Include="StyletIoC\Creation\BuilderTypeKey.cs" />
<Compile Include="StyletIoC\Creation\ICreator.cs" />
<Compile Include="StyletIoC\Creation\IRegistration.cs" />
<Compile Include="StyletIoC\FluentInterface.cs" />
<Compile Include="StyletIoC\Internal\Builders\BuilderAbstractFactoryBinding.cs" />
<Compile Include="StyletIoC\Internal\Builders\BuilderBindingBase.cs" />
<Compile Include="StyletIoC\Internal\Builders\BuilderBindTo.cs" />
<Compile Include="StyletIoC\Internal\Builders\BuilderFactoryBinding.cs" />
<Compile Include="StyletIoC\Internal\Builders\BuilderToAllImplementationsBinding.cs" />
<Compile Include="StyletIoC\Internal\Builders\BuilderTypeBinding.cs" />
<Compile Include="StyletIoC\Internal\Builders\BuilderInstanceBinding.cs" />
<Compile Include="StyletIoC\Internal\Registrations\InstanceRegistration.cs" />
<Compile Include="StyletIoC\Internal\IRegistrationCollection.cs" />
<Compile Include="StyletIoC\Internal\Creators\AbstractFactoryCreator.cs" />
<Compile Include="StyletIoC\Internal\Creators\CreatorBase.cs" />
<Compile Include="StyletIoC\Internal\Creators\FactoryCreator.cs" />
<Compile Include="StyletIoC\Internal\Creators\TypeCreator.cs">
<ExcludeFromStyleCop>False</ExcludeFromStyleCop>
</Compile>
<Compile Include="StyletIoC\Creation\IRegistrationContext.cs" />
<Compile Include="StyletIoC\Internal\RegistrationCollections\EmptyRegistrationCollection.cs" />
<Compile Include="StyletIoC\Internal\RegistrationCollections\RegistrationCollection.cs" />
<Compile Include="StyletIoC\Internal\RegistrationCollections\SingleRegistration.cs" />
<Compile Include="StyletIoC\Internal\Registrations\FuncNoKeyRegistration.cs" />
<Compile Include="StyletIoC\Internal\Registrations\GetAllRegistration.cs" />
<Compile Include="StyletIoC\Internal\Registrations\RegistrationBase.cs" />
<Compile Include="StyletIoC\Internal\Registrations\SingletonRegistration.cs" />
<Compile Include="StyletIoC\Internal\Registrations\TransientRegistration.cs" />
<Compile Include="StyletIoC\Internal\TypeKey.cs" />
<Compile Include="StyletIoC\StyletIoCContainer.cs" />
<Compile Include="StyletIoC\StyletIoCModule.cs" />
<Compile Include="Xaml\ActionBase.cs" />
<Compile Include="Xaml\ApplicationLoader.cs" />
<Compile Include="ConductorNavigating.cs" />
<Compile Include="IBootstrapper.cs" />
<Compile Include="IValidationAdapter.cs" />
<Compile Include="LabelledValue.cs" />
<Compile Include="INotifyPropertyChangedDispatcher.cs" />
<Compile Include="Logging\LogManager.cs" />
<Compile Include="MessageBoxViewModel.cs" />
<Compile Include="StyletConductorExtensions.cs" />
<Compile Include="StyletIoC\IContainer.cs" />
<Compile Include="StyletIoC\IInjectionAware.cs" />
<Compile Include="StyletIoC\InjectAttribute.cs" />
<Compile Include="StyletIoC\StyletIoCException.cs" />
<Compile Include="StyletIoC\Internal\TypeExtensions.cs" />
<Compile Include="ValidatingModelBase.cs" />
<Compile Include="Xaml\ActionExtension.cs" />
<Compile Include="BindableCollection.cs" />
<Compile Include="BootstrapperBase.cs" />
<Compile Include="Xaml\BoolToVisibilityConverter.cs" />
<Compile Include="Xaml\CommandAction.cs" />
<Compile Include="Conductor.cs" />
<Compile Include="ConductorAllActive.cs" />
<Compile Include="ConductorBase.cs" />
<Compile Include="ConductorBaseWithActiveItem.cs" />
<Compile Include="ConductorOneActive.cs" />
<Compile Include="Xaml\DebugConverter.cs" />
<Compile Include="Xaml\EqualityConverter.cs" />
<Compile Include="Xaml\EventAction.cs" />
<Compile Include="EventAggregator.cs" />
<Compile Include="Execute.cs" />
<Compile Include="ExpressionExtensions.cs" />
<Compile Include="IConductor.cs" />
<Compile Include="Bootstrapper.cs" />
<Compile Include="IScreen.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="PropertyChangedBase.cs" />
<Compile Include="PropertyChangedExtensions.cs" />
<Compile Include="Screen.cs" />
<Compile Include="ScreenExtensions.cs" />
<Compile Include="StyletIoC\Creation\BuilderUpper.cs" />
<Compile Include="StyletIoC\StyletIoCBuilder.cs" />
<Compile Include="StyletIoC\Internal\Container.cs" />
<Compile Include="StyletIoC\Internal\UnboundGeneric.cs" />
<Compile Include="Xaml\IconToBitmapSourceConverter.cs" />
<Compile Include="Xaml\View.cs" />
<Compile Include="ViewManager.cs" />
<Compile Include="WindowManager.cs" />
</ItemGroup>
<ItemGroup>
<Page Include="MessageBoxView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Xaml\StyletResourceDictionary.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
</ItemGroup>
<ItemGroup>
<None Include="Stylet.ruleset" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
-->
</Project>

15
Stylet/StyletIoC/FluentInterface.cs
View File

@ -45,7 +45,7 @@ namespace StyletIoC
/// </summary>
/// <param name="instance">Instance to use</param>
/// <returns>Fluent interface to continue configuration</returns>
IWithKeyOrAsWeakBinding ToInstance(object instance);
IWithKeyOrAsWeakBindingOrDisposeWithContainer ToInstance(object instance);
}
/// <summary>
@ -168,6 +168,19 @@ namespace StyletIoC
IAsWeakBinding WithKey(string key);
}
/// <summary>
/// Fluent interface on which WithKey, AsWeakBinding, or DisposeWithContainer can be called
/// </summary>
public interface IWithKeyOrAsWeakBindingOrDisposeWithContainer : IWithKeyOrAsWeakBinding
{
/// <summary>
/// Control whether or not this instance will be disposed when the IoC container is disposed. Defaults to true
/// </summary>
/// <param name="disposeWithContainer">True to dispose this instance when the container is disposed, false otherwise</param>
/// <returns>Fluent interface to continue configuration</returns>
IWithKeyOrAsWeakBinding DisposeWithContainer(bool disposeWithContainer);
}
/// <summary>
/// Fluent interface on which methods to modify the scope can be called
/// </summary>

7
Stylet/StyletIoC/Internal/Builders/BuilderBindTo.cs
View File

@ -65,10 +65,11 @@ namespace StyletIoC.Internal.Builders
return this.builderBinding;
}
public IWithKeyOrAsWeakBinding ToInstance(object instance)
public IWithKeyOrAsWeakBindingOrDisposeWithContainer ToInstance(object instance)
{
this.builderBinding = new BuilderInstanceBinding(this.ServiceTypes, instance);
return this.builderBinding;
var builderBinding = new BuilderInstanceBinding(this.ServiceTypes, instance);
this.builderBinding = builderBinding;
return builderBinding;
}
public IWithKeyOrAsWeakBinding ToAbstractFactory()

13
Stylet/StyletIoC/Internal/Builders/BuilderInstanceBinding.cs
View File

@ -2,12 +2,14 @@
using System.Collections.Generic;
using StyletIoC.Creation;
using StyletIoC.Internal.Creators;
using StyletIoC.Internal.Registrations;
namespace StyletIoC.Internal.Builders
{
internal class BuilderInstanceBinding : BuilderBindingBase
internal class BuilderInstanceBinding : BuilderBindingBase, IWithKeyOrAsWeakBindingOrDisposeWithContainer
{
private readonly object instance;
private bool disposeWithContainer = true;
public BuilderInstanceBinding(List<BuilderTypeKey> serviceTypes, object instance)
: base(serviceTypes)
@ -18,13 +20,18 @@ namespace StyletIoC.Internal.Builders
public override void Build(Container container)
{
var creator = new InstanceCreator(this.instance);
var registration = this.CreateRegistration(container, creator);
var registration = new InstanceRegistration(container, this.instance, this.disposeWithContainer);
foreach (var serviceType in this.ServiceTypes)
{
container.AddRegistration(new TypeKey(serviceType.Type.TypeHandle, serviceType.Key), registration);
}
}
public IWithKeyOrAsWeakBinding DisposeWithContainer(bool disposeWithContainer)
{
this.disposeWithContainer = disposeWithContainer;
return this;
}
}
}

24
Stylet/StyletIoC/Internal/Creators/InstanceCreator.cs
View File

@ -1,24 +0,0 @@
using StyletIoC.Creation;
using System;
using System.Linq.Expressions;
namespace StyletIoC.Internal.Creators
{
internal class InstanceCreator : ICreator
{
public RuntimeTypeHandle TypeHandle { get; private set; }
private readonly Expression instanceExpression;
public InstanceCreator(object instance)
{
var type = instance.GetType();
this.TypeHandle = type.TypeHandle;
this.instanceExpression = Expression.Constant(instance, type);
}
public Expression GetInstanceExpression(ParameterExpression registrationContext)
{
return this.instanceExpression;
}
}
}

41
Stylet/StyletIoC/Internal/Registrations/InstanceRegistration.cs Normal file
View File

@ -0,0 +1,41 @@
using StyletIoC.Creation;
using System;
using System.Linq.Expressions;
namespace StyletIoC.Internal.Registrations
{
internal class InstanceRegistration : IRegistration
{
public RuntimeTypeHandle TypeHandle { get; private set; }
private readonly object instance;
private readonly Expression instanceExpression;
public InstanceRegistration(IRegistrationContext parentContext, object instance, bool disposeWithContainer)
{
var type = instance.GetType();
this.TypeHandle = type.TypeHandle;
this.instance = instance;
this.instanceExpression = Expression.Constant(instance, type);
if (disposeWithContainer)
{
parentContext.Disposing += (o, e) =>
{
var disposable = this.instance as IDisposable;
if (disposable != null)
disposable.Dispose();
};
}
}
public Expression GetInstanceExpression(ParameterExpression registrationContext)
{
return this.instanceExpression;
}
public Func<IRegistrationContext, object> GetGenerator()
{
return x => this.instance;
}
}
}

2
Stylet/StyletIoC/StyletIoCBuilder.cs
View File

@ -165,7 +165,7 @@ namespace StyletIoC
var container = new Container(this.autobindAssemblies);
// Just in case they want it
this.Bind<IContainer>().ToInstance(container).AsWeakBinding();
this.Bind<IContainer>().ToInstance(container).DisposeWithContainer(false).AsWeakBinding();
// For each binding which is weak, if another binding exists with any of the same type+key which is strong, we remove this binding
var groups = (from binding in this.bindings

2
StyletUnitTests/BootstrapperTests.cs
View File

@ -50,7 +50,7 @@ namespace StyletUnitTests
this.ConfigureIoCCalled = true;
builder.Bind<I1>().To<C1>();
// Singleton, so we can test against it
builder.Bind<RootViewModel>().ToInstance(this.MyRootViewModel);
builder.Bind<RootViewModel>().ToInstance(this.MyRootViewModel).DisposeWithContainer(false);
base.ConfigureIoC(builder);
}
}

35
StyletUnitTests/StyletIoC/StyletIoCInstanceBindingTests.cs
View File

@ -1,5 +1,6 @@
using NUnit.Framework;
using StyletIoC;
using System;
namespace StyletUnitTests.StyletIoC
{
@ -8,6 +9,14 @@ namespace StyletUnitTests.StyletIoC
{
interface I1 { }
class C1 : I1 { }
class C2 : IDisposable
{
public bool Disposed;
public void Dispose()
{
this.Disposed = true;
}
}
[Test]
public void InstanceBindingUsesInstanceToResolve()
@ -21,5 +30,31 @@ namespace StyletUnitTests.StyletIoC
Assert.AreEqual(c1, ioc.Get<I1>());
Assert.AreEqual(c1, ioc.Get<I1>());
}
[Test]
public void ContainerDisposesOfInstanceBindingIfRequested()
{
var c2 = new C2();
var builder = new StyletIoCBuilder();
builder.Bind<C2>().ToInstance(c2);
var ioc = builder.BuildContainer();
ioc.Dispose();
Assert.True(c2.Disposed);
}
[Test]
public void ContainerDoesNotDisposeOfInstanceBindingIfNotRequested()
{
var c2 = new C2();
var builder = new StyletIoCBuilder();
builder.Bind<C2>().ToInstance(c2).DisposeWithContainer(false);
var ioc = builder.BuildContainer();
ioc.Dispose();
Assert.False(c2.Disposed);
}
}
}