diff --git a/Packages.props b/Packages.props
index 2ef2b486d..29ff33843 100644
--- a/Packages.props
+++ b/Packages.props
@@ -1,7 +1,7 @@
-
+
@@ -36,4 +36,4 @@
-
\ No newline at end of file
+
diff --git a/sample/Sample.DependencyOne/Class1.cs b/sample/Sample.DependencyOne/Class1.cs
index f3684efa6..3c8016498 100644
--- a/sample/Sample.DependencyOne/Class1.cs
+++ b/sample/Sample.DependencyOne/Class1.cs
@@ -1,5 +1,4 @@
-using System;
-using Rocket.Surgery.Conventions;
+using Rocket.Surgery.Conventions;
using Sample.DependencyOne;
[assembly: Convention(typeof(Class1))]
diff --git a/sample/Sample.DependencyThree/Class3.cs b/sample/Sample.DependencyThree/Class3.cs
index 6b428820e..37f6043dd 100644
--- a/sample/Sample.DependencyThree/Class3.cs
+++ b/sample/Sample.DependencyThree/Class3.cs
@@ -1,5 +1,4 @@
-using System;
-using Rocket.Surgery.Conventions;
+using Rocket.Surgery.Conventions;
using Sample.DependencyOne;
using Sample.DependencyThree;
diff --git a/sample/Sample.DependencyTwo/Class2.cs b/sample/Sample.DependencyTwo/Class2.cs
index 1d02f668d..faf7bb910 100644
--- a/sample/Sample.DependencyTwo/Class2.cs
+++ b/sample/Sample.DependencyTwo/Class2.cs
@@ -1,5 +1,4 @@
-using System;
-using Rocket.Surgery.Conventions;
+using Rocket.Surgery.Conventions;
using Sample.DependencyTwo;
[assembly: Convention(typeof(Class2))]
diff --git a/src/Builders.Abstractions/IBuilder.cs b/src/Builders.Abstractions/IBuilder.cs
index f03a12662..0e0740bcf 100644
--- a/src/Builders.Abstractions/IBuilder.cs
+++ b/src/Builders.Abstractions/IBuilder.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
namespace Rocket.Surgery.Builders
{
diff --git a/src/Builders/Builder.cs b/src/Builders/Builder.cs
index 0d9315e0a..471a07b89 100644
--- a/src/Builders/Builder.cs
+++ b/src/Builders/Builder.cs
@@ -5,9 +5,9 @@ namespace Rocket.Surgery.Builders
{
///
/// Abstract base class for implementing a builder
- /// Implements the
+ /// Implements the
///
- ///
+ ///
public abstract class Builder : IBuilder
{
///
@@ -27,7 +27,7 @@ protected Builder(IDictionary
/// The environment.
/// IRocketEnvironment.
+#pragma warning disable 618
public static IRocketEnvironment Convert(this IHostingEnvironment environment)
+#pragma warning restore 618
{
return new RocketEnvironment(environment);
}
#if NETCOREAPP3_0
+
+ ///
+ /// Converts the specified environment.
+ ///
+ /// The environment.
+ /// IRocketEnvironment.
public static IRocketEnvironment Convert(this IHostEnvironment environment)
{
return new RocketEnvironment(environment);
diff --git a/src/Conventions.Abstractions/Scanners/DelegateOrConvention.cs b/src/Conventions.Abstractions/Scanners/DelegateOrConvention.cs
index 27094b7f1..d2df1d9d8 100644
--- a/src/Conventions.Abstractions/Scanners/DelegateOrConvention.cs
+++ b/src/Conventions.Abstractions/Scanners/DelegateOrConvention.cs
@@ -5,9 +5,9 @@ namespace Rocket.Surgery.Conventions.Scanners
{
///
/// A pattern match class that is used to determine if a type is a , a or
- /// Implements the
+ /// Implements the
///
- ///
+ ///
public struct DelegateOrConvention : IEquatable
{
///
@@ -91,10 +91,10 @@ public static implicit operator DelegateOrConvention(Delegate @delegate)
}
///
- /// Determines whether the specified , is equal to this instance.
+ /// Determines whether the specified , is equal to this instance.
///
- /// The to compare with this instance.
- /// true if the specified is equal to this instance; otherwise, false.
+ /// The to compare with this instance.
+ /// true if the specified is equal to this instance; otherwise, false.
public override bool Equals(object obj)
{
return obj is DelegateOrConvention && Equals((DelegateOrConvention)obj);
diff --git a/src/Conventions.Abstractions/Scanners/IConventionProvider.cs b/src/Conventions.Abstractions/Scanners/IConventionProvider.cs
index 7b78b5680..b57d2dac1 100644
--- a/src/Conventions.Abstractions/Scanners/IConventionProvider.cs
+++ b/src/Conventions.Abstractions/Scanners/IConventionProvider.cs
@@ -13,7 +13,7 @@ public interface IConventionProvider
///
/// The type of the contribution.
/// The type of the delegate.
- /// IEnumerable<DelegateOrConvention>.
+ /// IEnumerable{DelegateOrConvention}.
IEnumerable Get()
where TContribution : IConvention
where TDelegate : Delegate;
@@ -21,7 +21,7 @@ IEnumerable Get()
///
/// Gets a all the conventions from the provider
///
- /// IEnumerable<DelegateOrConvention>.
+ /// IEnumerable{DelegateOrConvention}.
IEnumerable GetAll();
}
}
diff --git a/src/Conventions.Abstractions/Scanners/IConventionScanner.cs b/src/Conventions.Abstractions/Scanners/IConventionScanner.cs
index 45d5233bd..56b0e2fd6 100644
--- a/src/Conventions.Abstractions/Scanners/IConventionScanner.cs
+++ b/src/Conventions.Abstractions/Scanners/IConventionScanner.cs
@@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
-using System.Linq;
using System.Reflection;
namespace Rocket.Surgery.Conventions.Scanners
diff --git a/src/Conventions/Composer.cs b/src/Conventions/Composer.cs
index a4cf591b9..4b7bb770f 100644
--- a/src/Conventions/Composer.cs
+++ b/src/Conventions/Composer.cs
@@ -1,5 +1,4 @@
using System;
-using Microsoft.Extensions.Logging;
using Rocket.Surgery.Conventions.Scanners;
namespace Rocket.Surgery.Conventions
@@ -11,12 +10,12 @@ public static class Composer
{
///
/// ComposerImpl.
- /// Implements the
+ /// Implements the
///
/// The type of the t context.
/// The type of the t contribution.
/// The type of the t delegate.
- ///
+ ///
class ComposerImpl : ConventionComposer
where TContribution : IConvention
where TContext : IConventionContext
diff --git a/src/Conventions/ConventionBuilder.cs b/src/Conventions/ConventionBuilder.cs
index df7602538..207211927 100644
--- a/src/Conventions/ConventionBuilder.cs
+++ b/src/Conventions/ConventionBuilder.cs
@@ -2,25 +2,36 @@
using Rocket.Surgery.Conventions.Reflection;
using Rocket.Surgery.Conventions.Scanners;
using System.Collections.Generic;
-using System.Linq;
namespace Rocket.Surgery.Conventions
{
///
/// ConventionBuilder.
- /// Implements the
- /// Implements the
+ /// Implements the
+ /// Implements the
///
/// The type of the t builder.
/// The type of the t convention.
/// The type of the t delegate.
- ///
- ///
+ ///
+ ///
public abstract class ConventionBuilder : ConventionContainerBuilder, IConventionBuilder
where TBuilder : IConventionBuilder
where TConvention : IConvention
where TDelegate : Delegate
{
+ ///
+ /// Initializes a new instance of the class.
+ ///
+ /// The scanner.
+ /// The assembly provider.
+ /// The assembly candidate finder.
+ /// The properties.
+ ///
+ /// assemblyProvider
+ /// or
+ /// assemblyCandidateFinder
+ ///
protected ConventionBuilder(
IConventionScanner scanner,
IAssemblyProvider assemblyProvider,
@@ -43,6 +54,7 @@ IDictionary properties
///
/// The assembly provider.
public IAssemblyProvider AssemblyProvider { get; }
+
///
/// Gets the assembly candidate finder.
///
diff --git a/src/Conventions/ConventionComposer.cs b/src/Conventions/ConventionComposer.cs
index a4fec586e..39c4d10f0 100644
--- a/src/Conventions/ConventionComposer.cs
+++ b/src/Conventions/ConventionComposer.cs
@@ -1,23 +1,21 @@
using System;
-using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
-using Rocket.Surgery.Conventions;
using Rocket.Surgery.Conventions.Scanners;
namespace Rocket.Surgery.Conventions
{
///
/// Convention base compose, that calls all methods on register.
- /// Implements the
- /// Implements the
+ /// Implements the
+ /// Implements the
///
/// The context type
/// The contribution type
/// The delegate type
- ///
- ///
+ ///
+ ///
public abstract class ConventionComposer : ConventionComposerBase, IConventionComposer
where TContribution : IConvention
where TContext : IConventionContext
@@ -53,11 +51,11 @@ public void Register(TContext context)
///
/// Convention base compose, that calls all methods on register.
- /// Implements the
- /// Implements the
+ /// Implements the
+ /// Implements the
///
- ///
- ///
+ ///
+ ///
public class ConventionComposer : ConventionComposerBase, IConventionComposer
{
private readonly IConventionScanner _scanner;
diff --git a/src/Conventions/ConventionComposerBase.cs b/src/Conventions/ConventionComposerBase.cs
index 622efeafe..1bad10f41 100644
--- a/src/Conventions/ConventionComposerBase.cs
+++ b/src/Conventions/ConventionComposerBase.cs
@@ -13,6 +13,12 @@ namespace Rocket.Surgery.Conventions
///
public abstract class ConventionComposerBase
{
+ ///
+ /// Executes the register.
+ ///
+ /// The context.
+ /// The items.
+ /// The types.
protected void ExecuteRegister(IConventionContext context, List items, IEnumerable types)
{
var enumerable = types as Type[] ?? types.ToArray();
@@ -34,15 +40,15 @@ protected void ExecuteRegister(IConventionContext context, List type.IsInstanceOfType(item.Convention)))
{
context.Logger.LogDebug("Could not execute Convention {TypeName} from {AssemblyName} :: {@Types}",
- item.Convention?.GetType()?.FullName,
- item.Convention?.GetType()?.GetTypeInfo()?.Assembly?.GetName()?.Name,
+ item.Convention?.GetType().FullName,
+ item.Convention?.GetType().GetTypeInfo().Assembly.GetName().Name,
enumerable);
continue;
}
context.Logger.LogDebug("Executing Convention {TypeName} from {AssemblyName}",
- item.Convention?.GetType()?.FullName,
- item.Convention?.GetType()?.GetTypeInfo()?.Assembly?.GetName()?.Name);
+ item.Convention?.GetType().FullName,
+ item.Convention?.GetType().GetTypeInfo().Assembly.GetName().Name);
Register(item.Convention, context);
continue;
}
@@ -54,12 +60,12 @@ protected void ExecuteRegister(IConventionContext context, List type.IsInstanceOfType(item.Delegate)))
{
context.Logger.LogDebug("Could not execute Delegate {TypeName} :: {@Types}",
- item.Delegate.GetType()?.FullName,
+ item.Delegate.GetType().FullName,
enumerable);
continue;
}
- context.Logger.LogDebug("Executing Delegate {TypeName}", item.Delegate.GetType()?.FullName);
+ context.Logger.LogDebug("Executing Delegate {TypeName}", item.Delegate.GetType().FullName);
item.Delegate.DynamicInvoke(context);
continue;
}
@@ -69,7 +75,7 @@ protected void ExecuteRegister(IConventionContext context, List
/// ConventionContainerBuilder.
- /// Implements the
+ /// Implements the
///
/// The type of the t builder.
/// The type of the t convention.
/// The type of the t delegate.
- ///
+ ///
public abstract class ConventionContainerBuilder : IConventionContainer
where TBuilder : IConventionContainer
where TConvention : IConvention
where TDelegate : Delegate
{
+ ///
+ /// Initializes a new instance of the class.
+ ///
+ /// The scanner.
+ /// The properties.
+ ///
+ /// scanner
+ /// or
+ /// properties
+ ///
protected ConventionContainerBuilder(
IConventionScanner scanner,
IDictionary properties)
@@ -36,7 +46,7 @@ protected ConventionContainerBuilder(
/// System.Object.
public virtual object this[object item]
{
- get => Properties.TryGetValue(item, out object value) ? value : null;
+ get => Properties.TryGetValue(item, out var value) ? value : null;
set => Properties[item] = value;
}
@@ -92,7 +102,7 @@ public TBuilder AppendConvention() where T : TConvention
/// TBuilder.
public TBuilder AppendDelegate(params TDelegate[] delegates)
{
- Scanner.AppendDelegate(delegates);
+ Scanner.AppendDelegate(delegates.Cast().ToArray());
return (TBuilder)(object)this;
}
@@ -147,7 +157,7 @@ public TBuilder PrependConvention() where T : TConvention
/// TBuilder.
public TBuilder PrependDelegate(params TDelegate[] delegates)
{
- Scanner.PrependDelegate(delegates);
+ Scanner.PrependDelegate(delegates.Cast().ToArray());
return (TBuilder)(object)this;
}
diff --git a/src/Conventions/ConventionContext.cs b/src/Conventions/ConventionContext.cs
index 8d919e82e..73e3a6777 100644
--- a/src/Conventions/ConventionContext.cs
+++ b/src/Conventions/ConventionContext.cs
@@ -1,15 +1,14 @@
using System;
using System.Collections.Generic;
-using System.Reflection;
using Microsoft.Extensions.Logging;
namespace Rocket.Surgery.Conventions
{
///
/// Base convention context that allos for stashing items in index keys
- /// Implements the
+ /// Implements the
///
- ///
+ ///
public abstract class ConventionContext : IConventionContext
{
///
@@ -30,7 +29,7 @@ protected ConventionContext(ILogger logger, IDictionary properti
/// System.Object.
public virtual object this[object item]
{
- get => Properties.TryGetValue(item, out object value) ? value : null;
+ get => Properties.TryGetValue(item, out var value) ? value : null;
set => Properties[item] = value;
}
diff --git a/src/Conventions/ConventionHostBuilder.cs b/src/Conventions/ConventionHostBuilder.cs
index 80d6bb5ae..e53852af1 100644
--- a/src/Conventions/ConventionHostBuilder.cs
+++ b/src/Conventions/ConventionHostBuilder.cs
@@ -9,10 +9,10 @@ namespace Rocket.Surgery.Conventions
{
///
/// ConventionHostBuilder.
- /// Implements the
+ /// Implements the
///
/// The type of the t self.
- ///
+ ///
public abstract class ConventionHostBuilder : IConventionHostBuilder
where TSelf : IConventionHostBuilder
{
@@ -61,7 +61,7 @@ IServiceProviderDictionary serviceProperties
/// System.Object.
public virtual object this[object item]
{
- get => Properties.TryGetValue(item, out object value) ? value : null;
+ get => Properties.TryGetValue(item, out var value) ? value : null;
set => Properties[item] = value;
}
diff --git a/src/Conventions/DiagnosticLogger.cs b/src/Conventions/DiagnosticLogger.cs
index 8d70956b6..97118522b 100644
--- a/src/Conventions/DiagnosticLogger.cs
+++ b/src/Conventions/DiagnosticLogger.cs
@@ -8,9 +8,9 @@ namespace Rocket.Surgery.Conventions
{
///
/// DiagnosticLogger.
- /// Implements the
+ /// Implements the
///
- ///
+ ///
public class DiagnosticLogger : ILogger
{
private readonly DiagnosticSource _diagnosticSource;
@@ -81,9 +81,9 @@ public IDisposable BeginScope(TState state)
///
/// Disposable.
- /// Implements the
+ /// Implements the
///
- ///
+ ///
class Disposable : IDisposable
{
private readonly DiagnosticSource _diagnosticSource;
diff --git a/src/Conventions/Reflection/AppDomainAssemblyCandidateFinder.cs b/src/Conventions/Reflection/AppDomainAssemblyCandidateFinder.cs
index 041901fa5..9e23b2d0b 100644
--- a/src/Conventions/Reflection/AppDomainAssemblyCandidateFinder.cs
+++ b/src/Conventions/Reflection/AppDomainAssemblyCandidateFinder.cs
@@ -1,5 +1,4 @@
-using Microsoft.Extensions.DependencyModel;
-using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -11,7 +10,7 @@ namespace Rocket.Surgery.Conventions.Reflection
///
/// Assembly candidate finder that uses
///
- ///
+ ///
public class AppDomainAssemblyCandidateFinder : IAssemblyCandidateFinder
{
private readonly AppDomain _appDomain;
@@ -32,7 +31,7 @@ public AppDomainAssemblyCandidateFinder(AppDomain appDomain = null, ILogger logg
/// Get the candidates for a given set
///
/// The candidates as an enumerable
- /// IEnumerable<Assembly>.
+ /// IEnumerable{Assembly}.
public IEnumerable GetCandidateAssemblies(IEnumerable candidates)
{
diff --git a/src/Conventions/Reflection/AppDomainAssemblyProvider.cs b/src/Conventions/Reflection/AppDomainAssemblyProvider.cs
index ab4b3c31d..75bb0be57 100644
--- a/src/Conventions/Reflection/AppDomainAssemblyProvider.cs
+++ b/src/Conventions/Reflection/AppDomainAssemblyProvider.cs
@@ -1,9 +1,7 @@
using System;
-using System.Collections;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
-using Microsoft.Extensions.DependencyModel;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Abstractions;
@@ -12,7 +10,7 @@ namespace Rocket.Surgery.Conventions.Reflection
///
/// Assembly provider that uses
///
- ///
+ ///
public class AppDomainAssemblyProvider : IAssemblyProvider
{
private readonly ILogger _logger;
@@ -33,7 +31,7 @@ public AppDomainAssemblyProvider(AppDomain appDomain = null, ILogger logger = nu
///
/// Gets the assemblies.
///
- /// IEnumerable<Assembly>.
+ /// IEnumerable{Assembly}.
public IEnumerable GetAssemblies() => LoggingEnumerable.Create(_assembles.Value, LogValue);
private void LogValue(Assembly value) =>
diff --git a/src/Conventions/Reflection/AssemblyCandidateResolver.cs b/src/Conventions/Reflection/AssemblyCandidateResolver.cs
index f667b113b..b91407ba7 100644
--- a/src/Conventions/Reflection/AssemblyCandidateResolver.cs
+++ b/src/Conventions/Reflection/AssemblyCandidateResolver.cs
@@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
-using System.Linq;
using System.Reflection;
using Microsoft.Extensions.Logging;
@@ -122,7 +121,7 @@ private DependencyClassification ComputeClassification(string dependency, ISet
/// Gets the candidates.
///
- /// IEnumerable<Dependency>.
+ /// IEnumerable{Dependency}.
public IEnumerable GetCandidates()
{
foreach (var dependency in _dependencies)
@@ -163,9 +162,9 @@ public Dependency(Assembly assemblyName, DependencyClassification classification
public DependencyClassification Classification { get; set; }
///
- /// Returns a that represents this instance.
+ /// Returns a that represents this instance.
///
- /// A that represents this instance.
+ /// A that represents this instance.
public override string ToString()
{
return $"AssemblyName: {Assembly.GetName().Name}, Classification: {Classification}";
diff --git a/src/Conventions/Reflection/DefaultAssemblyCandidateFinder.cs b/src/Conventions/Reflection/DefaultAssemblyCandidateFinder.cs
index 499dda431..4bbb67ac8 100644
--- a/src/Conventions/Reflection/DefaultAssemblyCandidateFinder.cs
+++ b/src/Conventions/Reflection/DefaultAssemblyCandidateFinder.cs
@@ -2,7 +2,6 @@
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
-using Microsoft.Extensions.DependencyModel;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Abstractions;
@@ -11,7 +10,7 @@ namespace Rocket.Surgery.Conventions.Reflection
///
/// Default assembly candidate finder that uses a list of assemblies
///
- ///
+ ///
public class DefaultAssemblyCandidateFinder : IAssemblyCandidateFinder
{
///
@@ -38,7 +37,7 @@ public DefaultAssemblyCandidateFinder(IEnumerable assemblies, ILogger
/// Get the candidates for a given set
///
/// The candidates as an enumerable
- /// IEnumerable<Assembly>.
+ /// IEnumerable{Assembly}.
///
public IEnumerable GetCandidateAssemblies(IEnumerable candidates)
{
diff --git a/src/Conventions/Reflection/DefaultAssemblyProvider.cs b/src/Conventions/Reflection/DefaultAssemblyProvider.cs
index 3f96158c5..26cfb0f1b 100644
--- a/src/Conventions/Reflection/DefaultAssemblyProvider.cs
+++ b/src/Conventions/Reflection/DefaultAssemblyProvider.cs
@@ -1,9 +1,6 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
+using System.Collections.Generic;
using System.Linq;
using System.Reflection;
-using Microsoft.Extensions.DependencyModel;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Abstractions;
@@ -11,9 +8,9 @@ namespace Rocket.Surgery.Conventions.Reflection
{
///
/// Default assembly provider that uses a list of assemblies
- /// Implements the
+ /// Implements the
///
- ///
+ ///
public class DefaultAssemblyProvider : IAssemblyProvider
{
private readonly ILogger _logger;
@@ -33,7 +30,7 @@ public DefaultAssemblyProvider(IEnumerable assemblies, ILogger logger
///
/// Gets the assemblies.
///
- /// IEnumerable<Assembly>.
+ /// IEnumerable{Assembly}.
public IEnumerable GetAssemblies() => LoggingEnumerable.Create(_assembles, LogValue);
private void LogValue(Assembly value) =>
diff --git a/src/Conventions/Reflection/DependencyContextAssemblyCandidateFinder.cs b/src/Conventions/Reflection/DependencyContextAssemblyCandidateFinder.cs
index 8d788ca53..911128a92 100644
--- a/src/Conventions/Reflection/DependencyContextAssemblyCandidateFinder.cs
+++ b/src/Conventions/Reflection/DependencyContextAssemblyCandidateFinder.cs
@@ -10,9 +10,9 @@ namespace Rocket.Surgery.Conventions.Reflection
{
///
/// Assembly candidate finder that uses
- /// Implements the
+ /// Implements the
///
- ///
+ ///
public class DependencyContextAssemblyCandidateFinder : IAssemblyCandidateFinder
{
private readonly DependencyContext _dependencyContext;
@@ -33,7 +33,7 @@ public DependencyContextAssemblyCandidateFinder(DependencyContext dependencyCont
/// Get the candidates for a given set
///
/// The candidates as an enumerable
- /// IEnumerable<Assembly>.
+ /// IEnumerable{Assembly}.
///
public IEnumerable GetCandidateAssemblies(IEnumerable candidates)
{
diff --git a/src/Conventions/Reflection/DependencyContextAssemblyProvider.cs b/src/Conventions/Reflection/DependencyContextAssemblyProvider.cs
index 8477c69f4..2e22ba08f 100644
--- a/src/Conventions/Reflection/DependencyContextAssemblyProvider.cs
+++ b/src/Conventions/Reflection/DependencyContextAssemblyProvider.cs
@@ -10,9 +10,9 @@ namespace Rocket.Surgery.Conventions.Reflection
{
///
/// Assembly provider that uses
- /// Implements the
+ /// Implements the
///
- ///
+ ///
public class DependencyContextAssemblyProvider : IAssemblyProvider
{
private readonly ILogger _logger;
@@ -35,7 +35,7 @@ public DependencyContextAssemblyProvider(DependencyContext context, ILogger logg
///
/// Gets the assemblies.
///
- /// IEnumerable<Assembly>.
+ /// IEnumerable{Assembly}.
public IEnumerable GetAssemblies() => LoggingEnumerable.Create(_assembles.Value, LogValue);
private void LogValue(Assembly value) =>
diff --git a/src/Conventions/Reflection/LoggingEnumerable.cs b/src/Conventions/Reflection/LoggingEnumerable.cs
index 84859ab27..f32bae45a 100644
--- a/src/Conventions/Reflection/LoggingEnumerable.cs
+++ b/src/Conventions/Reflection/LoggingEnumerable.cs
@@ -15,17 +15,17 @@ static class LoggingEnumerable
///
/// The enumerable.
/// The log action.
- /// IEnumerable<T>.
+ /// IEnumerable{T}.
public static IEnumerable Create(IEnumerable enumerable, Action logAction) =>
new LoggingEnumerable(enumerable, logAction);
}
///
/// LoggingEnumerable.
- /// Implements the
+ /// Implements the
///
///
- ///
+ ///
class LoggingEnumerable : IEnumerable
{
private readonly IEnumerable _enumerable;
diff --git a/src/Conventions/Reflection/LoggingEnumerator.cs b/src/Conventions/Reflection/LoggingEnumerator.cs
index a07ed5132..a85e98b88 100644
--- a/src/Conventions/Reflection/LoggingEnumerator.cs
+++ b/src/Conventions/Reflection/LoggingEnumerator.cs
@@ -15,17 +15,17 @@ static class LoggingEnumerator
///
/// The enumerator.
/// The log action.
- /// IEnumerator<T>.
+ /// IEnumerator{T}.
public static IEnumerator Create(IEnumerator enumerator, Action logAction) =>
new LoggingEnumerator(enumerator, logAction);
}
///
/// LoggingEnumerator.
- /// Implements the
+ /// Implements the
///
///
- ///
+ ///
class LoggingEnumerator : IEnumerator
{
private readonly IEnumerator _enumerator;
diff --git a/src/Conventions/Reflection/RuntimeLibraryCandidateResolver.cs b/src/Conventions/Reflection/RuntimeLibraryCandidateResolver.cs
index 40d062fdc..cbc9fa4d1 100644
--- a/src/Conventions/Reflection/RuntimeLibraryCandidateResolver.cs
+++ b/src/Conventions/Reflection/RuntimeLibraryCandidateResolver.cs
@@ -71,7 +71,7 @@ private DependencyClassification ComputeClassification(string dependency)
///
/// Gets the candidates.
///
- /// IEnumerable<RuntimeLibrary>.
+ /// IEnumerable{RuntimeLibrary}
public IEnumerable GetCandidates()
{
foreach (var dependency in _dependencies)
@@ -112,9 +112,9 @@ public Dependency(RuntimeLibrary library, DependencyClassification classificatio
public DependencyClassification Classification { get; set; }
///
- /// Returns a that represents this instance.
+ /// Returns a that represents this instance.
///
- /// A that represents this instance.
+ /// A that represents this instance.
public override string ToString()
{
return $"Library: {Library.Name}, Classification: {Classification}";
diff --git a/src/Conventions/Scanners/AggregateConventionScanner.cs b/src/Conventions/Scanners/AggregateConventionScanner.cs
index c3448f9f0..c5abc0b7b 100644
--- a/src/Conventions/Scanners/AggregateConventionScanner.cs
+++ b/src/Conventions/Scanners/AggregateConventionScanner.cs
@@ -6,9 +6,9 @@ namespace Rocket.Surgery.Conventions.Scanners
{
///
/// A convention provider that is bootstrapped with a set of conventions that allow for manual inalization of the initial conventions.
- /// Implements the
+ /// Implements the
///
- ///
+ ///
public class AggregateConventionScanner : ConventionScannerBase
{
///
diff --git a/src/Conventions/Scanners/BasicConventionScanner.cs b/src/Conventions/Scanners/BasicConventionScanner.cs
index cd9737fc3..edd0d8e03 100644
--- a/src/Conventions/Scanners/BasicConventionScanner.cs
+++ b/src/Conventions/Scanners/BasicConventionScanner.cs
@@ -7,9 +7,9 @@ namespace Rocket.Surgery.Conventions.Scanners
{
///
/// A basic convention scanner that doesn't scan any assemblies it only composes provided conventions.
- /// Implements the
+ /// Implements the
///
- ///
+ ///
public class BasicConventionScanner : IConventionScanner
{
private readonly List _prependContributions = new List();
diff --git a/src/Conventions/Scanners/ConventionProvider.cs b/src/Conventions/Scanners/ConventionProvider.cs
index f87d04fe4..698c3c7eb 100644
--- a/src/Conventions/Scanners/ConventionProvider.cs
+++ b/src/Conventions/Scanners/ConventionProvider.cs
@@ -1,15 +1,14 @@
using System;
using System.Collections.Generic;
using System.Linq;
-using System.Reflection;
namespace Rocket.Surgery.Conventions.Scanners
{
///
/// ConventionProvider.
- /// Implements the
+ /// Implements the
///
- ///
+ ///
internal class ConventionProvider : IConventionProvider
{
private readonly IEnumerable _conventions;
@@ -43,7 +42,7 @@ public ConventionProvider(IEnumerable contributions, IEnumerable
/// The type of the contribution.
/// The type of the delegate.
- /// IEnumerable<DelegateOrConvention>.
+ /// IEnumerable{DelegateOrConvention}.
public IEnumerable Get()
where TContribution : IConvention
where TDelegate : Delegate
@@ -68,7 +67,7 @@ public IEnumerable Get()
///
/// Gets a all the conventions from the provider
///
- /// IEnumerable<DelegateOrConvention>.
+ /// IEnumerable{DelegateOrConvention}.
public IEnumerable GetAll()
{
return _conventions;
diff --git a/src/Conventions/Scanners/ConventionScannerBase.cs b/src/Conventions/Scanners/ConventionScannerBase.cs
index cf9d5ba91..4f756fcde 100644
--- a/src/Conventions/Scanners/ConventionScannerBase.cs
+++ b/src/Conventions/Scanners/ConventionScannerBase.cs
@@ -11,9 +11,9 @@ namespace Rocket.Surgery.Conventions.Scanners
{
///
/// Base class for various scanners
- /// Implements the
+ /// Implements the
///
- ///
+ ///
public abstract class ConventionScannerBase : IConventionScanner
{
private readonly List _prependedConventions = new List();
@@ -26,14 +26,14 @@ public abstract class ConventionScannerBase : IConventionScanner
private readonly IAssemblyCandidateFinder _assemblyCandidateFinder;
private readonly IServiceProvider _serviceProvider;
private readonly ILogger _logger;
- private bool _updatedConventionCollections = false;
+ private bool _updatedConventionCollections;
///
/// Default constructor for the scanner
///
/// The assembly candidate finder
/// The service provider for creating instances of conventions (usually a .
- /// A diagnostic logger factory
+ /// A diagnostic logger
protected ConventionScannerBase(IAssemblyCandidateFinder assemblyCandidateFinder, IServiceProvider serviceProvider, ILogger logger)
{
_assemblyCandidateFinder = assemblyCandidateFinder ?? throw new ArgumentNullException(nameof(assemblyCandidateFinder));
@@ -52,7 +52,7 @@ protected IEnumerable GetAssemblyConventions()
"Rocket.Surgery.Conventions"
).ToArray();
- var prependedConventionTypes = new Lazy>(() =>
+ var prependedConventionTypes = new Lazy>(() =>
new HashSet(_prependedConventions.Select(x => x is Type t ? t : x.GetType()).Distinct()));
var appendedConventionTypes = new Lazy>(() =>
new HashSet(_appendedConventions.Select(x => x is Type t ? t : x.GetType()).Distinct()));
@@ -207,7 +207,6 @@ public IConventionScanner AppendConvention(params Type[] conventions)
///
/// Adds a set of conventions to the scanner
///
- /// The conventions.
/// IConventionScanner.
///
public IConventionScanner AppendConvention() where T : IConvention
@@ -272,7 +271,6 @@ public IConventionScanner PrependConvention(params Type[] conventions)
///
/// Adds a set of conventions to the scanner
///
- /// The conventions.
/// IConventionScanner.
///
public IConventionScanner PrependConvention() where T : IConvention
diff --git a/src/Conventions/Scanners/SimpleConventionScanner.cs b/src/Conventions/Scanners/SimpleConventionScanner.cs
index a461abf10..fbf65b66e 100644
--- a/src/Conventions/Scanners/SimpleConventionScanner.cs
+++ b/src/Conventions/Scanners/SimpleConventionScanner.cs
@@ -6,9 +6,9 @@ namespace Rocket.Surgery.Conventions.Scanners
{
///
/// A simple convention scanner that scans using the provided assembly candidate finder
- /// Implements the
+ /// Implements the
///
- ///
+ ///
public class SimpleConventionScanner : ConventionScannerBase
{
///
diff --git a/src/Conventions/ServiceProviderDictionary.cs b/src/Conventions/ServiceProviderDictionary.cs
index 597ef1821..1ddeebe66 100644
--- a/src/Conventions/ServiceProviderDictionary.cs
+++ b/src/Conventions/ServiceProviderDictionary.cs
@@ -7,15 +7,15 @@ namespace Rocket.Surgery.Conventions
{
///
/// ServiceProviderDictionary.
- /// Implements the
+ /// Implements the
///
- ///
+ ///
public class ServiceProviderDictionary : IServiceProviderDictionary
{
private readonly IDictionary _values = new Dictionary();
private readonly IDictionary _services = new Dictionary();
///
- /// Gets or sets the with the specified key.
+ /// Gets or sets the with the specified key.
///
/// The key.
/// System.Object.
@@ -149,7 +149,7 @@ public void CopyTo(KeyValuePair[] array, int arrayIndex)
///
/// Gets the enumerator.
///
- /// IEnumerator<KeyValuePair<System.Object, System.Object>>.
+ /// IEnumerator{KeyValuePair{System.Object, System.Object}}.
public IEnumerator> GetEnumerator()
{
return _values.Concat(_services.Select(z => new KeyValuePair(z.Key, z.Value))).GetEnumerator();
diff --git a/test/Conventions.Tests/AggregateConventionScannerTests.cs b/test/Conventions.Tests/AggregateConventionScannerTests.cs
index 6d56179a6..21c875636 100644
--- a/test/Conventions.Tests/AggregateConventionScannerTests.cs
+++ b/test/Conventions.Tests/AggregateConventionScannerTests.cs
@@ -3,8 +3,6 @@
using System.Reflection;
using FakeItEasy;
using FluentAssertions;
-using Microsoft.Extensions.DependencyModel;
-using Microsoft.Extensions.Logging;
using Rocket.Surgery.Conventions.Reflection;
using Rocket.Surgery.Conventions.Scanners;
using Rocket.Surgery.Conventions.Tests.Fixtures;
@@ -27,7 +25,6 @@ public AggregateConventionScannerTests(ITestOutputHelper outputHelper) : base(ou
public void ShouldConstruct()
{
var scanner = AutoFake.Resolve();
- var finder = AutoFake.Resolve();
scanner.Should().NotBeNull();
}
diff --git a/test/Conventions.Tests/AppDomainAssemblyCandidateFinderTests.cs b/test/Conventions.Tests/AppDomainAssemblyCandidateFinderTests.cs
index df4aeb97a..968540c02 100644
--- a/test/Conventions.Tests/AppDomainAssemblyCandidateFinderTests.cs
+++ b/test/Conventions.Tests/AppDomainAssemblyCandidateFinderTests.cs
@@ -1,6 +1,5 @@
using System;
using System.Linq;
-using FakeItEasy;
using FluentAssertions;
using Microsoft.Extensions.Logging;
using Rocket.Surgery.Conventions.Reflection;
diff --git a/test/Conventions.Tests/BasicConventionScannerTests.cs b/test/Conventions.Tests/BasicConventionScannerTests.cs
index 83d13257b..7dd7371b2 100644
--- a/test/Conventions.Tests/BasicConventionScannerTests.cs
+++ b/test/Conventions.Tests/BasicConventionScannerTests.cs
@@ -14,7 +14,7 @@ class C : IServiceConvention
{
public void Register(IServiceConventionContext context)
{
- throw new System.NotImplementedException();
+ throw new NotImplementedException();
}
}
@@ -90,8 +90,9 @@ public void ShouldAppendConventions_AsASingle()
scanner.AppendConvention(convention);
var result = scanner.BuildProvider().Get();
- result.Count().Should().Be(1);
- result.Select(x => x.Convention).Should().Contain(convention);
+ var delegateOrConventions = result as DelegateOrConvention[] ?? result.ToArray();
+ delegateOrConventions.Count().Should().Be(1);
+ delegateOrConventions.Select(x => x.Convention).Should().Contain(convention);
}
[Fact]
diff --git a/test/Conventions.Tests/ConventionBuilderTests.cs b/test/Conventions.Tests/ConventionBuilderTests.cs
index 41c2dc014..3e99b686b 100644
--- a/test/Conventions.Tests/ConventionBuilderTests.cs
+++ b/test/Conventions.Tests/ConventionBuilderTests.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using FluentAssertions;
+using FluentAssertions;
using Rocket.Surgery.Conventions.Reflection;
using Rocket.Surgery.Conventions.Scanners;
using Rocket.Surgery.Conventions.Tests.Fixtures;
diff --git a/test/Conventions.Tests/ConventionComposerTests.cs b/test/Conventions.Tests/ConventionComposerTests.cs
index e4e677528..738f5b92e 100644
--- a/test/Conventions.Tests/ConventionComposerTests.cs
+++ b/test/Conventions.Tests/ConventionComposerTests.cs
@@ -1,7 +1,5 @@
-using System;
-using FakeItEasy;
+using FakeItEasy;
using FluentAssertions;
-using Microsoft.Extensions.Logging;
using Rocket.Surgery.Conventions.Scanners;
using Rocket.Surgery.Conventions.Tests.Fixtures;
using Xunit;
diff --git a/test/Conventions.Tests/ConventionContextTests.cs b/test/Conventions.Tests/ConventionContextTests.cs
index f370f2351..dd1472566 100644
--- a/test/Conventions.Tests/ConventionContextTests.cs
+++ b/test/Conventions.Tests/ConventionContextTests.cs
@@ -1,5 +1,4 @@
using System.Collections.Generic;
-using FakeItEasy;
using FluentAssertions;
using Microsoft.Extensions.Logging;
using Rocket.Surgery.Extensions.Testing;
diff --git a/test/Conventions.Tests/ConventionScannerTests.cs b/test/Conventions.Tests/ConventionScannerTests.cs
index 1981ffa97..810cb29ac 100644
--- a/test/Conventions.Tests/ConventionScannerTests.cs
+++ b/test/Conventions.Tests/ConventionScannerTests.cs
@@ -2,11 +2,9 @@
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
-using System.Runtime.InteropServices.ComTypes;
using FakeItEasy;
using FluentAssertions;
using Microsoft.Extensions.Logging;
-using Rocket.Surgery.Conventions;
using Rocket.Surgery.Conventions.Reflection;
using Rocket.Surgery.Conventions.Scanners;
using Rocket.Surgery.Conventions.Tests.Fixtures;
diff --git a/test/Conventions.Tests/DefaultAssemblyCandidateFinderTests.cs b/test/Conventions.Tests/DefaultAssemblyCandidateFinderTests.cs
index 7a2f047d2..cae5829fa 100644
--- a/test/Conventions.Tests/DefaultAssemblyCandidateFinderTests.cs
+++ b/test/Conventions.Tests/DefaultAssemblyCandidateFinderTests.cs
@@ -5,7 +5,6 @@
using Rocket.Surgery.Conventions.Reflection;
using Rocket.Surgery.Extensions.Testing;
using Sample.DependencyThree;
-using Sample.DependencyTwo;
using Xunit;
using Xunit.Abstractions;
diff --git a/test/Conventions.Tests/DependencyContextAssemblyCandidateFinderTests.cs b/test/Conventions.Tests/DependencyContextAssemblyCandidateFinderTests.cs
index d2f0050cd..33b276737 100644
--- a/test/Conventions.Tests/DependencyContextAssemblyCandidateFinderTests.cs
+++ b/test/Conventions.Tests/DependencyContextAssemblyCandidateFinderTests.cs
@@ -1,6 +1,5 @@
using System.Linq;
using System.Reflection;
-using FakeItEasy;
using FluentAssertions;
using Microsoft.Extensions.DependencyModel;
using Microsoft.Extensions.Logging;
diff --git a/test/Conventions.Tests/Fixtures/ServiceConventionComposer.cs b/test/Conventions.Tests/Fixtures/ServiceConventionComposer.cs
index c84943f85..4b1b49656 100644
--- a/test/Conventions.Tests/Fixtures/ServiceConventionComposer.cs
+++ b/test/Conventions.Tests/Fixtures/ServiceConventionComposer.cs
@@ -1,5 +1,4 @@
-using Microsoft.Extensions.Logging;
-using Rocket.Surgery.Conventions.Scanners;
+using Rocket.Surgery.Conventions.Scanners;
namespace Rocket.Surgery.Conventions.Tests.Fixtures
{
diff --git a/test/Conventions.Tests/Fixtures/ServicesBuilder.cs b/test/Conventions.Tests/Fixtures/ServicesBuilder.cs
index 504972afc..3c7f1f9d1 100644
--- a/test/Conventions.Tests/Fixtures/ServicesBuilder.cs
+++ b/test/Conventions.Tests/Fixtures/ServicesBuilder.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-
-namespace Rocket.Surgery.Conventions.Tests.Fixtures
+namespace Rocket.Surgery.Conventions.Tests.Fixtures
{
public class ServicesBuilder
{
diff --git a/test/Conventions.Tests/GenericConventionComposerTests.cs b/test/Conventions.Tests/GenericConventionComposerTests.cs
index 2d5013688..4a97a407c 100644
--- a/test/Conventions.Tests/GenericConventionComposerTests.cs
+++ b/test/Conventions.Tests/GenericConventionComposerTests.cs
@@ -1,7 +1,5 @@
-using System;
-using FakeItEasy;
+using FakeItEasy;
using FluentAssertions;
-using Microsoft.Extensions.Logging;
using Rocket.Surgery.Conventions.Scanners;
using Rocket.Surgery.Conventions.Tests.Fixtures;
using Rocket.Surgery.Extensions.Testing;
diff --git a/test/Conventions.Tests/StaticConventionComposerTests.cs b/test/Conventions.Tests/StaticConventionComposerTests.cs
index 607d63ae8..e6834d947 100644
--- a/test/Conventions.Tests/StaticConventionComposerTests.cs
+++ b/test/Conventions.Tests/StaticConventionComposerTests.cs
@@ -1,5 +1,4 @@
using FakeItEasy;
-using Microsoft.Extensions.Logging;
using Rocket.Surgery.Conventions.Scanners;
using Xunit;