diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-09-11 22:18:09 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-09-11 22:18:09 -0400 |
| commit | dd17096b5d60e24f88f8f0c21227961d54587f6f (patch) | |
| tree | a4b9ae3bea033aeed798900b5fd5f59b8cb51f1f /MediaBrowser.Common.Implementations | |
| parent | cd5615c6ce4c4de44f7c9118d2ca0454fadd0868 (diff) | |
update libs
Diffstat (limited to 'MediaBrowser.Common.Implementations')
4 files changed, 9 insertions, 10 deletions
diff --git a/MediaBrowser.Common.Implementations/BaseApplicationHost.cs b/MediaBrowser.Common.Implementations/BaseApplicationHost.cs index 70ed5c319..bfd8c1f82 100644 --- a/MediaBrowser.Common.Implementations/BaseApplicationHost.cs +++ b/MediaBrowser.Common.Implementations/BaseApplicationHost.cs @@ -581,7 +581,7 @@ namespace MediaBrowser.Common.Implementations protected void RegisterSingleInstance<T>(T obj, bool manageLifetime = true) where T : class { - Container.RegisterSingle(obj); + Container.RegisterSingleton(obj); if (manageLifetime) { @@ -607,7 +607,7 @@ namespace MediaBrowser.Common.Implementations protected void RegisterSingleInstance<T>(Func<T> func) where T : class { - Container.RegisterSingle(func); + Container.RegisterSingleton(func); } void IDependencyContainer.Register(Type typeInterface, Type typeImplementation) diff --git a/MediaBrowser.Common.Implementations/Logging/NlogManager.cs b/MediaBrowser.Common.Implementations/Logging/NlogManager.cs index 698792802..6d4cd06cb 100644 --- a/MediaBrowser.Common.Implementations/Logging/NlogManager.cs +++ b/MediaBrowser.Common.Implementations/Logging/NlogManager.cs @@ -170,7 +170,7 @@ namespace MediaBrowser.Common.Implementations.Logging /// </summary> /// <param name="name">The name.</param> /// <returns>ILogger.</returns> - public ILogger GetLogger(string name) + public Model.Logging.ILogger GetLogger(string name) { return new NLogger(name, this); } diff --git a/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj b/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj index e603ea373..e765b1ca3 100644 --- a/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj +++ b/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj @@ -48,18 +48,17 @@ <RunPostBuildEvent>Always</RunPostBuildEvent> </PropertyGroup> <ItemGroup> - <Reference Include="NLog, Version=3.2.1.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL"> + <Reference Include="NLog, Version=4.1.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\packages\NLog.3.2.1\lib\net45\NLog.dll</HintPath> + <HintPath>..\packages\NLog.4.1.0\lib\net45\NLog.dll</HintPath> </Reference> <Reference Include="SharpCompress, Version=0.10.2.0, Culture=neutral, PublicKeyToken=beaf6f427e128133, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> <HintPath>..\ThirdParty\SharpCompress\SharpCompress.dll</HintPath> </Reference> - <Reference Include="SimpleInjector, Version=2.7.0.0, Culture=neutral, PublicKeyToken=984cb50dea722e99, processorArchitecture=MSIL"> + <Reference Include="SimpleInjector, Version=2.8.0.0, Culture=neutral, PublicKeyToken=984cb50dea722e99, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\packages\SimpleInjector.2.8.0\lib\net45\SimpleInjector.dll</HintPath> - <Private>True</Private> + <HintPath>..\packages\SimpleInjector.3.0.5\lib\net45\SimpleInjector.dll</HintPath> </Reference> <Reference Include="System" /> <Reference Include="System.Core" /> diff --git a/MediaBrowser.Common.Implementations/packages.config b/MediaBrowser.Common.Implementations/packages.config index e57c874f2..151a3a36d 100644 --- a/MediaBrowser.Common.Implementations/packages.config +++ b/MediaBrowser.Common.Implementations/packages.config @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="NLog" version="3.2.1" targetFramework="net45" /> - <package id="SimpleInjector" version="2.8.0" targetFramework="net45" /> + <package id="NLog" version="4.1.0" targetFramework="net45" /> + <package id="SimpleInjector" version="3.0.5" targetFramework="net45" /> </packages> |