Merge pull request #136 from martincostello/Tidy-Up-Dependencies

Tidy up dependencies
martincostello · Aug 19, 2017 · 9313c3b · 9313c3b
2 parents 272549e + c6fb65b
commit 9313c3b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/src/LondonTravel.Site/LondonTravel.Site.csproj b/src/LondonTravel.Site/LondonTravel.Site.csproj
@@ -23,7 +23,6 @@
     <EmbeddedResource Update="SiteResources.resx" Generator="" />
   </ItemGroup>
   <ItemGroup>
-    <DotNetCliToolReference Include="BundlerMinifier.Core" Version="2.4.337" />
     <DotNetCliToolReference Include="dotnet-sourcelink" Version="2.1.2" />
     <DotNetCliToolReference Include="dotnet-sourcelink-git" Version="2.1.2" />
     <DotNetCliToolReference Include="Microsoft.Extensions.SecretManager.Tools" Version="2.0.0" />
@@ -41,9 +40,8 @@
     <PackageReference Include="Microsoft.Azure.KeyVault.WebKey" Version="2.0.7" />
     <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
     <PackageReference Include="NodaTime" Version="2.2.0" />
-    <PackageReference Include="Polly" Version="5.3.1" />
     <PackageReference Include="Serilog" Version="2.5.0" />
-    <PackageReference Include="Serilog.Extensions.Logging" Version="1.4.0" />
+    <PackageReference Include="Serilog.Extensions.Logging" Version="2.0.0" />
     <PackageReference Include="Serilog.Settings.Configuration" Version="2.4.0" />
     <PackageReference Include="Serilog.Sinks.ApplicationInsights" Version="2.2.1" />
     <PackageReference Include="Serilog.Sinks.Literate" Version="3.0.0" />

diff --git a/src/LondonTravel.Site/StartupBase.cs b/src/LondonTravel.Site/StartupBase.cs
@@ -87,9 +87,6 @@ public void Configure(
             ILoggerFactory loggerFactory,
             IOptionsSnapshot<SiteOptions> options)
         {
-            loggerFactory.AddSerilog();
-            appLifetime.ApplicationStopped.Register(Log.CloseAndFlush);
-
             if (environment.IsDevelopment())
             {
                 loggerFactory.AddDebug();
@@ -168,6 +165,7 @@ public void Configure(
         /// </returns>
         public IServiceProvider ConfigureServices(IServiceCollection services)
         {
+            services.AddLogging((p) => p.AddSerilog(dispose: true));
             services.AddApplicationInsightsTelemetry(Configuration);
 
             services.AddOptions();