Skip to content

Commit

Permalink
Updated base builders to be less strict with properties +semver:minor
Browse files Browse the repository at this point in the history
  • Loading branch information
david-driscoll committed Jun 30, 2019
1 parent 09e5cf7 commit e521e17
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 12 deletions.
4 changes: 2 additions & 2 deletions src/Conventions/ConventionBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ protected ConventionBuilder(
IConventionScanner scanner,
IAssemblyProvider assemblyProvider,
IAssemblyCandidateFinder assemblyCandidateFinder,
IServiceProviderDictionary serviceProperties
) : base(scanner, serviceProperties)
IDictionary<object, object> properties
) : base(scanner, properties)
{
AssemblyProvider = assemblyProvider ?? throw new ArgumentNullException(nameof(assemblyProvider));
AssemblyCandidateFinder = assemblyCandidateFinder ?? throw new ArgumentNullException(nameof(assemblyCandidateFinder));
Expand Down
14 changes: 4 additions & 10 deletions src/Conventions/ConventionContainerBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ public abstract class ConventionContainerBuilder<TBuilder, TConvention, TDelegat
{
protected ConventionContainerBuilder(
IConventionScanner scanner,
IServiceProviderDictionary serviceProperties)
IDictionary<object, object> properties)
{
Scanner = scanner ?? throw new ArgumentNullException(nameof(scanner));
ServiceProperties = serviceProperties ?? new ServiceProviderDictionary();
Properties = properties ?? throw new ArgumentNullException(nameof(properties));

if (!Properties.TryGetValue(typeof(IConventionScanner), out var _))
if (!Properties.TryGetValue(typeof(IConventionScanner), out _))
Properties[typeof(IConventionScanner)] = Scanner;
}

Expand All @@ -44,13 +44,7 @@ public virtual object this[object item]
/// A central location for sharing state between components during the convention building process.
/// </summary>
/// <value>The properties.</value>
public IServiceProviderDictionary ServiceProperties { get; }

/// <summary>
/// A central location for sharing state between components during the convention building process.
/// </summary>
/// <value>The properties.</value>
public IDictionary<object, object> Properties => ServiceProperties;
public IDictionary<object, object> Properties { get; }

/// <summary>
/// Gets the scanner.
Expand Down

0 comments on commit e521e17

Please sign in to comment.