Skip to content

Commit

Permalink
more testing stuffs
Browse files Browse the repository at this point in the history
  • Loading branch information
david-driscoll committed Sep 9, 2018
1 parent 02a8c9b commit d1bcef4
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions src/Azure.Functions/RocketSurgeryWebJobsBuilderExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ namespace Rocket.Surgery.Azure.Functions
{
public static class RocketSurgeryWebJobsBuilderExtensions
{
internal static IContainer BuildContainer(ILogger logger, ServiceCollection services, Assembly assembly, object startupInstance)
internal static IContainer BuildContainer(ILogger logger, ServiceCollection services, Assembly assembly, object startupInstance, IAssemblyCandidateFinder assemblyCandidateFinder, IAssemblyProvider assemblyProvider)
{
var environmentNames = new[]
{
Expand All @@ -48,8 +48,8 @@ internal static IContainer BuildContainer(ILogger logger, ServiceCollection serv
};

var context = DependencyContext.Load(assembly);
var assemblyCandidateFinder = new DependencyContextAssemblyCandidateFinder(context, logger);
var assemblyProvider = new DependencyContextAssemblyProvider(context, logger);
assemblyCandidateFinder = assemblyCandidateFinder ?? new DependencyContextAssemblyCandidateFinder(context, logger);
assemblyProvider = assemblyProvider ?? new DependencyContextAssemblyProvider(context, logger);
var scanner = new AggregateConventionScanner(assemblyCandidateFinder);

if (startupInstance is IConvention convention)
Expand Down Expand Up @@ -91,7 +91,7 @@ internal static IContainer BuildContainer(ILogger logger, ServiceCollection serv
return diBuilder.Build();
}

public static IWebJobsBuilder AddRocketSurgery(this IWebJobsBuilder builder, Assembly assembly, object startupInstance)
public static IWebJobsBuilder AddRocketSurgery(this IWebJobsBuilder builder, Assembly assembly, object startupInstance, IAssemblyCandidateFinder assemblyCandidateFinder = null, IAssemblyProvider assemblyProvider = null)
{
//builder.AddExtension<ServiceConfiguration>();
var logger = new ServiceCollection()
Expand All @@ -108,7 +108,7 @@ public static IWebJobsBuilder AddRocketSurgery(this IWebJobsBuilder builder, Ass
services.Add(s);
}

var container = BuildContainer(logger, services, assembly, startupInstance);
var container = BuildContainer(logger, services, assembly, startupInstance, assemblyCandidateFinder, assemblyProvider);

var injectBindingProvider = new ServiceBindingProvider(container, logger);
builder.Services.TryAddEnumerable(ServiceDescriptor.Singleton<IBindingProvider>(injectBindingProvider));
Expand Down
2 changes: 1 addition & 1 deletion src/Azure.Functions/RocketSurgeryWebJobsStartup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public abstract class RocketSurgeryWebJobsStartup : IWebJobsStartup
{
private readonly Assembly _assembly;

public RocketSurgeryWebJobsStartup(Assembly assembly)
public RocketSurgeryWebJobsStartup(Assembly assembly)
{
_assembly = assembly;
}
Expand Down

0 comments on commit d1bcef4

Please sign in to comment.