From 92d3e6800bf9cec370fcdad08baecb1f8a15a225 Mon Sep 17 00:00:00 2001
From: liangshiwei <liangshiw@outlook.com>
Date: Thu, 4 Mar 2021 15:37:41 +0800
Subject: [PATCH] Make wpf template logger work

---
 .../MyCompanyName.MyProjectName/App.xaml.cs   | 43 +++++++++----------
 .../MainWindow.xaml.cs                        | 12 ------
 .../MyCompanyName.MyProjectName.csproj        |  2 +-
 3 files changed, 21 insertions(+), 36 deletions(-)

diff --git a/templates/wpf/src/MyCompanyName.MyProjectName/App.xaml.cs b/templates/wpf/src/MyCompanyName.MyProjectName/App.xaml.cs
index 6ab1bd8c86..686cb5cba1 100644
--- a/templates/wpf/src/MyCompanyName.MyProjectName/App.xaml.cs
+++ b/templates/wpf/src/MyCompanyName.MyProjectName/App.xaml.cs
@@ -1,9 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Data;
-using System.Linq;
-using System.Threading.Tasks;
 using System.Windows;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
@@ -22,19 +17,6 @@ namespace MyCompanyName.MyProjectName
         private readonly IAbpApplicationWithExternalServiceProvider _application;
 
         public App()
-        {
-            _host = Host
-                .CreateDefaultBuilder(null)
-                .UseAutofac()
-                .UseSerilog()
-                .ConfigureServices((hostContext, services) =>
-                {
-                    services.AddApplication<MyProjectNameModule>();
-                }).Build();
-            _application = _host.Services.GetService<IAbpApplicationWithExternalServiceProvider>();
-        }
-
-        protected async override void OnStartup(StartupEventArgs e)
         {
             Log.Logger = new LoggerConfiguration()
 #if DEBUG
@@ -47,6 +29,12 @@ namespace MyCompanyName.MyProjectName
                 .WriteTo.Async(c => c.File("Logs/logs.txt"))
                 .CreateLogger();
 
+            _host = CreateHostBuilder();
+            _application = _host.Services.GetService<IAbpApplicationWithExternalServiceProvider>();
+        }
+
+        protected override async void OnStartup(StartupEventArgs e)
+        {
             try
             {
                 Log.Information("Starting WPF host.");
@@ -60,22 +48,31 @@ namespace MyCompanyName.MyProjectName
             {
                 Log.Fatal(ex, "Host terminated unexpectedly!");
             }
-            finally
-            {
-                Log.CloseAndFlush();
-            }
         }
 
-        protected async override void OnExit(ExitEventArgs e)
+        protected override async void OnExit(ExitEventArgs e)
         {
             _application.Shutdown();
             await _host.StopAsync();
             _host.Dispose();
+            Log.CloseAndFlush();
         }
 
         private void Initialize(IServiceProvider serviceProvider)
         {
             _application.Initialize(serviceProvider);
         }
+
+        private IHost CreateHostBuilder()
+        {
+            return Host
+                .CreateDefaultBuilder(null)
+                .UseAutofac()
+                .UseSerilog()
+                .ConfigureServices((hostContext, services) =>
+                {
+                    services.AddApplication<MyProjectNameModule>();
+                }).Build();
+        }
     }
 }
diff --git a/templates/wpf/src/MyCompanyName.MyProjectName/MainWindow.xaml.cs b/templates/wpf/src/MyCompanyName.MyProjectName/MainWindow.xaml.cs
index be1004415d..a8244aa270 100644
--- a/templates/wpf/src/MyCompanyName.MyProjectName/MainWindow.xaml.cs
+++ b/templates/wpf/src/MyCompanyName.MyProjectName/MainWindow.xaml.cs
@@ -1,17 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 
 namespace MyCompanyName.MyProjectName
 {
diff --git a/templates/wpf/src/MyCompanyName.MyProjectName/MyCompanyName.MyProjectName.csproj b/templates/wpf/src/MyCompanyName.MyProjectName/MyCompanyName.MyProjectName.csproj
index c1a57201f4..75a7074db5 100644
--- a/templates/wpf/src/MyCompanyName.MyProjectName/MyCompanyName.MyProjectName.csproj
+++ b/templates/wpf/src/MyCompanyName.MyProjectName/MyCompanyName.MyProjectName.csproj
@@ -14,7 +14,7 @@
 
     <ItemGroup>
         <PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.*" />
-        <PackageReference Include="Serilog.Extensions.Hosting" Version="3.1.0" />
+        <PackageReference Include="Serilog.Extensions.Hosting" Version="4.1.2" />
         <PackageReference Include="Serilog.Sinks.Async" Version="1.4.0" />
         <PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
     </ItemGroup>