Skip to content

Commit

Permalink
Merge pull request #22 from pfpack/release/v2.0.0-rc.1.0.1
Browse files Browse the repository at this point in the history
release/v2.0.0-rc.1.0.1
  • Loading branch information
pmosk committed Feb 8, 2022
2 parents 3b9927a + 93b364a commit 0452ce7
Show file tree
Hide file tree
Showing 7 changed files with 57 additions and 63 deletions.
Original file line number Diff line number Diff line change
@@ -1,25 +1,24 @@
using Microsoft.Extensions.DependencyInjection;
using System;

namespace PrimeFuncPack
{
public sealed partial class DependencyRegistrar<T>
where T : class
{
private readonly IServiceCollection services;
namespace PrimeFuncPack;

private readonly Func<IServiceProvider, T> resolver;
public sealed partial class DependencyRegistrar<T>
where T : class
{
private readonly IServiceCollection services;

internal DependencyRegistrar(IServiceCollection services, Func<IServiceProvider, T> resolver)
{
this.services = services;
this.resolver = resolver;
}
private readonly Func<IServiceProvider, T> resolver;

public static DependencyRegistrar<T> Create(IServiceCollection services, Func<IServiceProvider, T> resolver)
=>
new(
services ?? throw new ArgumentNullException(nameof(services)),
resolver ?? throw new ArgumentNullException(nameof(resolver)));
internal DependencyRegistrar(IServiceCollection services, Func<IServiceProvider, T> resolver)
{
this.services = services;
this.resolver = resolver;
}
}

public static DependencyRegistrar<T> Create(IServiceCollection services, Func<IServiceProvider, T> resolver)
=>
new(
services ?? throw new ArgumentNullException(nameof(services)),
resolver ?? throw new ArgumentNullException(nameof(resolver)));
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
using Microsoft.Extensions.DependencyInjection;

namespace PrimeFuncPack
namespace PrimeFuncPack;

partial class DependencyRegistrar<T>
{
partial class DependencyRegistrar<T>
{
public IServiceCollection RegisterScoped() => services.AddScoped(resolver);
}
}
public IServiceCollection RegisterScoped() => services.AddScoped(resolver);
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
using Microsoft.Extensions.DependencyInjection;

namespace PrimeFuncPack
namespace PrimeFuncPack;

partial class DependencyRegistrar<T>
{
partial class DependencyRegistrar<T>
{
public IServiceCollection RegisterSingleton() => services.AddSingleton(resolver);
}
}
public IServiceCollection RegisterSingleton() => services.AddSingleton(resolver);
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
using Microsoft.Extensions.DependencyInjection;

namespace PrimeFuncPack
namespace PrimeFuncPack;

partial class DependencyRegistrar<T>
{
partial class DependencyRegistrar<T>
{
public IServiceCollection RegisterTransient() => services.AddTransient(resolver);
}
}
public IServiceCollection RegisterTransient() => services.AddTransient(resolver);
}
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
using Microsoft.Extensions.DependencyInjection;
using System;

namespace PrimeFuncPack
namespace PrimeFuncPack;

public static class DependencyRegistrar
{
public static class DependencyRegistrar
{
public static DependencyRegistrar<T> Create<T>(IServiceCollection services, Func<IServiceProvider, T> resolver)
where T : class
=>
new(
services ?? throw new ArgumentNullException(nameof(services)),
resolver ?? throw new ArgumentNullException(nameof(resolver)));
}
}
public static DependencyRegistrar<T> Create<T>(IServiceCollection services, Func<IServiceProvider, T> resolver)
where T : class
=>
new(
services ?? throw new ArgumentNullException(nameof(services)),
resolver ?? throw new ArgumentNullException(nameof(resolver)));
}
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@
using Microsoft.Extensions.DependencyInjection;
using System;

namespace PrimeFuncPack
namespace PrimeFuncPack;

public static class DependencyRegistryExtensions
{
public static class DependencyRegistryExtensions
{
public static DependencyRegistrar<T> ToRegistrar<T>(this Dependency<T> dependency, IServiceCollection services)
where T : class
=>
InnerToRegistrar(
dependency ?? throw new ArgumentNullException(nameof(dependency)),
services ?? throw new ArgumentNullException(nameof(services)));
public static DependencyRegistrar<T> ToRegistrar<T>(this Dependency<T> dependency, IServiceCollection services)
where T : class
=>
InnerToRegistrar(
dependency ?? throw new ArgumentNullException(nameof(dependency)),
services ?? throw new ArgumentNullException(nameof(services)));

private static DependencyRegistrar<T> InnerToRegistrar<T>(Dependency<T> dependency, IServiceCollection services)
where T : class
=>
new(services, dependency.Resolve);
}
}
private static DependencyRegistrar<T> InnerToRegistrar<T>(Dependency<T> dependency, IServiceCollection services)
where T : class
=>
new(services, dependency.Resolve);
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<Description>PrimeFuncPack Dependency Registry is a library for .NET providing the dependency registrar targeted to both usual services and dependency trees built by PrimeFuncPack Dependency to register the dependencies in the .NET dependency injection mechanism.</Description>
<RootNamespace>PrimeFuncPack</RootNamespace>
<AssemblyName>PrimeFuncPack.DependencyRegistry</AssemblyName>
<Version>2.0.0-rc.1.0.0</Version>
<Version>2.0.0-rc.1.0.1</Version>
</PropertyGroup>

<ItemGroup>
Expand Down

0 comments on commit 0452ce7

Please sign in to comment.