Skip to content

Commit

Permalink
updates
Browse files Browse the repository at this point in the history
  • Loading branch information
david-driscoll committed Jun 10, 2018
1 parent 169ebe1 commit 1237c8a
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 7 deletions.
10 changes: 5 additions & 5 deletions Common.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
<LangVersion>latest</LangVersion>
</PropertyGroup>
<PropertyGroup>
<RSG_Build_Version>2.0.0</RSG_Build_Version>
<RSG_Builders_Version>2.0.1</RSG_Builders_Version>
<RSG_Configuration_Version>0.5.0</RSG_Configuration_Version>
<RSG_DependencyInjection_Version>0.7.0</RSG_DependencyInjection_Version>
<RSG_Build_Version>2.1.0</RSG_Build_Version>
<RSG_Builders_Version>3.0.0</RSG_Builders_Version>
<RSG_Configuration_Version>0.8.0</RSG_Configuration_Version>
<RSG_DependencyInjection_Version>0.11.0</RSG_DependencyInjection_Version>
<RSG_Extensions_Version>0.8.2</RSG_Extensions_Version>
<Microsoft_NET_Sdk_Functions_Version>1.0.7</Microsoft_NET_Sdk_Functions_Version>
<Autofac_Extras_CommonServiceLocator_Version>5.0.0</Autofac_Extras_CommonServiceLocator_Version>
Expand All @@ -29,7 +29,7 @@
<FakeItEasy_Version>4.6.0</FakeItEasy_Version>
<Autofac_FakeItEasy_Version>5.0.0</Autofac_FakeItEasy_Version>
<Bogus_Version>22.1.2</Bogus_Version>
<RSG_Testing_Version>0.5.0</RSG_Testing_Version>
<RSG_Testing_Version>0.7.1</RSG_Testing_Version>
<XunitXml_TestLogger_Version>2.0.0</XunitXml_TestLogger_Version>
</PropertyGroup>
</Project>
10 changes: 8 additions & 2 deletions src/Azure.Functions/FunctionExecutor.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
Expand Down Expand Up @@ -53,12 +55,15 @@ static IServiceProvider Init(ILogger logger, ExecutionContext executionContext)
var scanner = new AggregateConventionScanner(assemblyCandidateFinder);

var extBuilder = new Microsoft.Extensions.Configuration.ConfigurationBuilder();
var properties = new Dictionary<object, object>();
var diagnosticSource = new DiagnosticListener("Rocket.Surgery.Azure");
var configurationBuilder = new ConfigurationBuilder(
scanner,
envionment,
new Microsoft.Extensions.Configuration.ConfigurationBuilder().Build(),
extBuilder,
logger
diagnosticSource,
properties
);

configurationBuilder.Build();
Expand All @@ -74,7 +79,8 @@ static IServiceProvider Init(ILogger logger, ExecutionContext executionContext)
services,
configuration,
envionment,
logger
diagnosticSource,
properties
);

return _container = builder.Build();
Expand Down

0 comments on commit 1237c8a

Please sign in to comment.