From e683c5facc6b239c992da1880b88a05d69a5528b Mon Sep 17 00:00:00 2001
From: Halil ibrahim Kalkan <hi_kalkan@yahoo.com>
Date: Wed, 20 Jun 2018 15:28:52 +0300
Subject: [PATCH] Change Serilog nuget package.

---
 modules/blog/app/Volo.BlogTestApp/Program.cs  | 34 ++++++++++++++-----
 modules/blog/app/Volo.BlogTestApp/Startup.cs  |  1 -
 .../Volo.BlogTestApp/Volo.BlogTestApp.csproj  |  9 ++++-
 .../MyCompanyName.MyProjectName.Web.csproj    |  2 +-
 .../Program.cs                                | 31 +++++++++++++++--
 5 files changed, 63 insertions(+), 14 deletions(-)

diff --git a/modules/blog/app/Volo.BlogTestApp/Program.cs b/modules/blog/app/Volo.BlogTestApp/Program.cs
index 642d30991c..63eae82eb4 100644
--- a/modules/blog/app/Volo.BlogTestApp/Program.cs
+++ b/modules/blog/app/Volo.BlogTestApp/Program.cs
@@ -1,20 +1,37 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Logging;
+using Serilog;
+using Serilog.Events;
 
 namespace Volo.BlogTestApp
 {
     public class Program
     {
-        public static void Main(string[] args)
+        public static int Main(string[] args)
         {
-            BuildWebHostInternal(args).Run();
+            Log.Logger = new LoggerConfiguration()
+                .MinimumLevel.Debug() //TODO: Should be configurable!
+                .MinimumLevel.Override("Microsoft", LogEventLevel.Information)
+                .Enrich.FromLogContext()
+                .WriteTo.File("Logs/logs.txt")
+                .CreateLogger();
+
+            try
+            {
+                Log.Information("Starting web host.");
+                BuildWebHostInternal(args).Run();
+                return 0;
+            }
+            catch (Exception ex)
+            {
+                Log.Fatal(ex, "Host terminated unexpectedly!");
+                return 1;
+            }
+            finally
+            {
+                Log.CloseAndFlush();
+            }
         }
 
         public static IWebHost BuildWebHostInternal(string[] args) =>
@@ -23,6 +40,7 @@ namespace Volo.BlogTestApp
                 .UseContentRoot(Directory.GetCurrentDirectory())
                 .UseIISIntegration()
                 .UseStartup<Startup>()
+                .UseSerilog()
                 .Build();
     }
 }
diff --git a/modules/blog/app/Volo.BlogTestApp/Startup.cs b/modules/blog/app/Volo.BlogTestApp/Startup.cs
index a09f92a40e..30e5af286b 100644
--- a/modules/blog/app/Volo.BlogTestApp/Startup.cs
+++ b/modules/blog/app/Volo.BlogTestApp/Startup.cs
@@ -10,7 +10,6 @@ namespace Volo.BlogTestApp
 {
     public class Startup
     {
-
         public IServiceProvider ConfigureServices(IServiceCollection services)
         {
             services.AddApplication<BlogTestAppModule>(options =>
diff --git a/modules/blog/app/Volo.BlogTestApp/Volo.BlogTestApp.csproj b/modules/blog/app/Volo.BlogTestApp/Volo.BlogTestApp.csproj
index 9103f0fec0..01f93bcb79 100644
--- a/modules/blog/app/Volo.BlogTestApp/Volo.BlogTestApp.csproj
+++ b/modules/blog/app/Volo.BlogTestApp/Volo.BlogTestApp.csproj
@@ -4,13 +4,20 @@
     <TargetFramework>netcoreapp2.1</TargetFramework>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Compile Remove="Logs\**" />
+    <Content Remove="Logs\**" />
+    <EmbeddedResource Remove="Logs\**" />
+    <None Remove="Logs\**" />
+  </ItemGroup>
+
   <ItemGroup>
     <Folder Include="wwwroot\" />
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.All" Version="2.1.0" />
-    <PackageReference Include="Serilog.Extensions.Logging" Version="2.0.2" />
+    <PackageReference Include="Serilog.AspNetCore" Version="2.1.1" />
     <PackageReference Include="Serilog.Sinks.File" Version="4.0.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="2.1.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.1.0" />
diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj b/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj
index dfbd643e00..116926ae6b 100644
--- a/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj
+++ b/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj
@@ -19,7 +19,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.All" Version="2.1.0" />
-    <PackageReference Include="Serilog.Extensions.Logging" Version="2.0.2" />
+    <PackageReference Include="Serilog.AspNetCore" Version="2.1.1" />
     <PackageReference Include="Serilog.Sinks.File" Version="4.0.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="2.1.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.1.0" />
diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web/Program.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Web/Program.cs
index 7035ee4f23..2b99ef0371 100644
--- a/templates/mvc/src/MyCompanyName.MyProjectName.Web/Program.cs
+++ b/templates/mvc/src/MyCompanyName.MyProjectName.Web/Program.cs
@@ -1,13 +1,37 @@
-using System.IO;
+using System;
+using System.IO;
 using Microsoft.AspNetCore.Hosting;
+using Serilog;
+using Serilog.Events;
 
 namespace MyCompanyName.MyProjectName
 {
     public class Program
     {
-        public static void Main(string[] args)
+        public static int Main(string[] args)
         {
-            BuildWebHostInternal(args).Run();
+            Log.Logger = new LoggerConfiguration()
+                .MinimumLevel.Debug() //TODO: Should be configurable!
+                .MinimumLevel.Override("Microsoft", LogEventLevel.Information)
+                .Enrich.FromLogContext()
+                .WriteTo.File("Logs/logs.txt")
+                .CreateLogger();
+
+            try
+            {
+                Log.Information("Starting web host.");
+                BuildWebHostInternal(args).Run();
+                return 0;
+            }
+            catch (Exception ex)
+            {
+                Log.Fatal(ex, "Host terminated unexpectedly!");
+                return 1;
+            }
+            finally
+            {
+                Log.CloseAndFlush();
+            }
         }
 
         public static IWebHost BuildWebHostInternal(string[] args) =>
@@ -16,6 +40,7 @@ namespace MyCompanyName.MyProjectName
                 .UseContentRoot(Directory.GetCurrentDirectory())
                 .UseIISIntegration()
                 .UseStartup<Startup>()
+                .UseSerilog()
                 .Build();
     }
 }