Merge branch 'dev' of https://github.com/volosoft/abp into dev

samples/BasicConsoleApplication/AbpConsoleDemo/AbpConsoleDemo.csproj

@@ -7,6 +7,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\framework\src\Volo.Abp.Autofac\Volo.Abp.Autofac.csproj" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.1" />
   </ItemGroup>
 
 </Project>

samples/BasicConsoleApplication/AbpConsoleDemo/AppHostedService.cs

@@ -0,0 +1,32 @@
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using Volo.Abp;
+
+namespace AbpConsoleDemo
+{
+    public class AppHostedService : IHostedService
+    {
+        public Task StartAsync(CancellationToken cancellationToken)
+        {
+            using (var application = AbpApplicationFactory.Create<AppModule>(options =>
+            {
+                options.UseAutofac(); //Autofac integration
+            }))
+            {
+                application.Initialize();
+
+                //Resolve a service and use it
+                var helloWorldService = application.ServiceProvider.GetService<HelloWorldService>();
+                helloWorldService.SayHello();
+
+                application.Shutdown();
+            }
+
+            return Task.CompletedTask;
+        }
+
+        public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
+    }
+}

samples/BasicConsoleApplication/AbpConsoleDemo/Program.cs

@@ -1,28 +1,21 @@
-using System;
+using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp;
+using Microsoft.Extensions.Hosting;
 
 namespace AbpConsoleDemo
 {
     class Program
     {
-        static void Main(string[] args)
+        static async Task Main(string[] args)
         {
-            using (var application = AbpApplicationFactory.Create<AppModule>(options =>
-            {
-                options.UseAutofac(); //Autofac integration
-            }))
-            {
-                application.Initialize();
-
-                //Resolve a service and use it
-                var helloWorldService = 
-                    application.ServiceProvider.GetService<HelloWorldService>();
-                helloWorldService.SayHello();
-
-                Console.WriteLine("Press ENTER to stop application...");
-                Console.ReadLine();
-            }
+            await CreateHostBuilder(args).RunConsoleAsync();
         }
+
+        public static IHostBuilder CreateHostBuilder(string[] args) =>
+            Host.CreateDefaultBuilder(args)
+                .ConfigureServices((hostContext, services) =>
+                {
+                    services.AddHostedService<AppHostedService>();
+                });
     }
 }

samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.DbMigrator/DbMigratorHostedService.cs

@@ -0,0 +1,34 @@
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using Acme.BookStore.Data;
+using Serilog;
+using Volo.Abp;
+
+namespace Acme.BookStore.DbMigrator
+{
+    public class DbMigratorHostedService : IHostedService
+    {
+        public async Task StartAsync(CancellationToken cancellationToken)
+        {
+            using (var application = AbpApplicationFactory.Create<BookStoreDbMigratorModule>(options =>
+            {
+                options.UseAutofac();
+                options.Services.AddLogging(c => c.AddSerilog());
+            }))
+            {
+                application.Initialize();
+
+                await application
+                    .ServiceProvider
+                    .GetRequiredService<BookStoreDbMigrationService>()
+                    .MigrateAsync();
+
+                application.Shutdown();
+            }
+        }
+
+        public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
+    }
+}

samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.DbMigrator/Program.cs

@@ -1,39 +1,15 @@
-using System.IO;
+using System.IO;
+using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
-using Acme.BookStore.Data;
+using Microsoft.Extensions.Hosting;
 using Serilog;
 using Serilog.Events;
-using Volo.Abp;
-using Volo.Abp.Threading;
 
 namespace Acme.BookStore.DbMigrator
 {
     class Program
     {
-        static void Main(string[] args)
-        {
-            ConfigureLogging();
-
-            using (var application = AbpApplicationFactory.Create<BookStoreDbMigratorModule>(options =>
-            {
-                options.UseAutofac();
-                options.Services.AddLogging(c => c.AddSerilog());
-            }))
-            {
-                application.Initialize();
-
-                AsyncHelper.RunSync(
-                    () => application
-                        .ServiceProvider
-                        .GetRequiredService<BookStoreDbMigrationService>()
-                        .MigrateAsync()
-                );
-
-                application.Shutdown();
-            }
-        }
-
-        private static void ConfigureLogging()
+        static async Task Main(string[] args)
         {
             Log.Logger = new LoggerConfiguration()
                 .MinimumLevel.Information()
@@ -48,6 +24,15 @@ namespace Acme.BookStore.DbMigrator
                 .WriteTo.File(Path.Combine(Directory.GetCurrentDirectory(), "Logs/logs.txt"))
                 .WriteTo.Console()
                 .CreateLogger();
+
+            await CreateHostBuilder(args).RunConsoleAsync();
         }
+
+        public static IHostBuilder CreateHostBuilder(string[] args) =>
+            Host.CreateDefaultBuilder(args)
+                .ConfigureServices((hostContext, services) =>
+                {
+                    services.AddHostedService<DbMigratorHostedService>();
+                });
     }
 }

samples/BookStore-Angular-MongoDb/aspnet-core/test/Acme.BookStore.HttpApi.Client.ConsoleTestApp/ConsoleTestAppHostedService.cs

@@ -0,0 +1,26 @@
+using Microsoft.Extensions.Hosting;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp;
+
+namespace Acme.BookStore.HttpApi.Client.ConsoleTestApp
+{
+    public class ConsoleTestAppHostedService : IHostedService
+    {
+        public async Task StartAsync(CancellationToken cancellationToken)
+        {
+            using (var application = AbpApplicationFactory.Create<BookStoreConsoleApiClientModule>())
+            {
+                application.Initialize();
+
+                var demo = application.ServiceProvider.GetRequiredService<ClientDemoService>();
+                await demo.RunAsync();
+
+                application.Shutdown();
+            }
+        }
+
+        public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
+    }
+}

samples/BookStore-Angular-MongoDb/aspnet-core/test/Acme.BookStore.HttpApi.Client.ConsoleTestApp/Program.cs

@@ -1,24 +1,21 @@
-using System;
+using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp;
-using Volo.Abp.Threading;
+using Microsoft.Extensions.Hosting;
 
 namespace Acme.BookStore.HttpApi.Client.ConsoleTestApp
 {
     class Program
     {
-        static void Main(string[] args)
+        static async Task Main(string[] args)
         {
-            using (var application = AbpApplicationFactory.Create<BookStoreConsoleApiClientModule>())
-            {
-                application.Initialize();
-
-                var demo = application.ServiceProvider.GetRequiredService<ClientDemoService>();
-                AsyncHelper.RunSync(() => demo.RunAsync());
-
-                Console.WriteLine("Press ENTER to stop application...");
-                Console.ReadLine();
-            }
+            await CreateHostBuilder(args).RunConsoleAsync();
         }
+
+        public static IHostBuilder CreateHostBuilder(string[] args) =>
+            Host.CreateDefaultBuilder(args)
+                .ConfigureServices((hostContext, services) =>
+                {
+                    services.AddHostedService<ConsoleTestAppHostedService>();
+                });
     }
 }

samples/BookStore-Modular/application/src/Acme.BookStore.DbMigrator/DbMigratorHostedService.cs

@@ -0,0 +1,34 @@
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using Acme.BookStore.Data;
+using Serilog;
+using Volo.Abp;
+
+namespace Acme.BookStore.DbMigrator
+{
+    public class DbMigratorHostedService : IHostedService
+    {
+        public async Task StartAsync(CancellationToken cancellationToken)
+        {
+            using (var application = AbpApplicationFactory.Create<BookStoreDbMigratorModule>(options =>
+            {
+                options.UseAutofac();
+                options.Services.AddLogging(c => c.AddSerilog());
+            }))
+            {
+                application.Initialize();
+
+                await application
+                    .ServiceProvider
+                    .GetRequiredService<BookStoreDbMigrationService>()
+                    .MigrateAsync();
+
+                application.Shutdown();
+            }
+        }
+
+        public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
+    }
+}

samples/BookStore-Modular/application/src/Acme.BookStore.DbMigrator/Program.cs

@@ -1,39 +1,15 @@
-using System.IO;
+using System.IO;
+using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
-using Acme.BookStore.Data;
+using Microsoft.Extensions.Hosting;
 using Serilog;
 using Serilog.Events;
-using Volo.Abp;
-using Volo.Abp.Threading;
 
 namespace Acme.BookStore.DbMigrator
 {
     class Program
     {
-        static void Main(string[] args)
-        {
-            ConfigureLogging();
-
-            using (var application = AbpApplicationFactory.Create<BookStoreDbMigratorModule>(options =>
-            {
-                options.UseAutofac();
-                options.Services.AddLogging(c => c.AddSerilog());
-            }))
-            {
-                application.Initialize();
-
-                AsyncHelper.RunSync(
-                    () => application
-                        .ServiceProvider
-                        .GetRequiredService<BookStoreDbMigrationService>()
-                        .MigrateAsync()
-                );
-
-                application.Shutdown();
-            }
-        }
-
-        private static void ConfigureLogging()
+        static async Task Main(string[] args)
         {
             Log.Logger = new LoggerConfiguration()
                 .MinimumLevel.Information()
@@ -48,6 +24,15 @@ namespace Acme.BookStore.DbMigrator
                 .WriteTo.File(Path.Combine(Directory.GetCurrentDirectory(), "Logs/logs.txt"))
                 .WriteTo.Console()
                 .CreateLogger();
+
+            await CreateHostBuilder(args).RunConsoleAsync();
         }
+
+        public static IHostBuilder CreateHostBuilder(string[] args) =>
+            Host.CreateDefaultBuilder(args)
+                .ConfigureServices((hostContext, services) =>
+                {
+                    services.AddHostedService<DbMigratorHostedService>();
+                });
     }
 }

samples/BookStore-Modular/application/test/Acme.BookStore.HttpApi.Client.ConsoleTestApp/ConsoleTestAppHostedService.cs

@@ -0,0 +1,26 @@
+using Microsoft.Extensions.Hosting;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp;
+
+namespace Acme.BookStore.HttpApi.Client.ConsoleTestApp
+{
+    public class ConsoleTestAppHostedService : IHostedService
+    {
+        public async Task StartAsync(CancellationToken cancellationToken)
+        {
+            using (var application = AbpApplicationFactory.Create<BookStoreConsoleApiClientModule>())
+            {
+                application.Initialize();
+
+                var demo = application.ServiceProvider.GetRequiredService<ClientDemoService>();
+                await demo.RunAsync();
+
+                application.Shutdown();
+            }
+        }
+
+        public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
+    }
+}

samples/BookStore-Modular/application/test/Acme.BookStore.HttpApi.Client.ConsoleTestApp/Program.cs

@@ -1,24 +1,21 @@
-using System;
+using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp;
-using Volo.Abp.Threading;
+using Microsoft.Extensions.Hosting;
 
 namespace Acme.BookStore.HttpApi.Client.ConsoleTestApp
 {
     class Program
     {
-        static void Main(string[] args)
+        static async Task Main(string[] args)
         {
-            using (var application = AbpApplicationFactory.Create<BookStoreConsoleApiClientModule>())
-            {
-                application.Initialize();
-
-                var demo = application.ServiceProvider.GetRequiredService<ClientDemoService>();
-                AsyncHelper.RunSync(() => demo.RunAsync());
-
-                Console.WriteLine("Press ENTER to stop application...");
-                Console.ReadLine();
-            }
+            await CreateHostBuilder(args).RunConsoleAsync();
         }
+
+        public static IHostBuilder CreateHostBuilder(string[] args) =>
+            Host.CreateDefaultBuilder(args)
+                .ConfigureServices((hostContext, services) =>
+                {
+                    services.AddHostedService<ConsoleTestAppHostedService>();
+                });
     }
 }

samples/BookStore-Modular/modules/book-management/test/Acme.BookStore.BookManagement.HttpApi.Client.ConsoleTestApp/ConsoleTestAppHostedService.cs

@@ -0,0 +1,26 @@
+using Microsoft.Extensions.Hosting;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp;
+
+namespace Acme.BookStore.BookManagement
+{
+    public class ConsoleTestAppHostedService : IHostedService
+    {
+        public async Task StartAsync(CancellationToken cancellationToken)
+        {
+            using (var application = AbpApplicationFactory.Create<BookManagementConsoleApiClientModule>())
+            {
+                application.Initialize();
+
+                var demo = application.ServiceProvider.GetRequiredService<ClientDemoService>();
+                await demo.RunAsync();
+
+                application.Shutdown();
+            }
+        }
+
+        public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
+    }
+}

samples/BookStore-Modular/modules/book-management/test/Acme.BookStore.BookManagement.HttpApi.Client.ConsoleTestApp/Program.cs

@@ -1,24 +1,21 @@
-using System;
+using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp;
-using Volo.Abp.Threading;
+using Microsoft.Extensions.Hosting;
 
 namespace Acme.BookStore.BookManagement
 {
     class Program
     {
-        static void Main(string[] args)
+        static async Task Main(string[] args)
         {
-            using (var application = AbpApplicationFactory.Create<BookManagementConsoleApiClientModule>())
-            {
-                application.Initialize();
-
-                var demo = application.ServiceProvider.GetRequiredService<ClientDemoService>();
-                AsyncHelper.RunSync(() => demo.RunAsync());
-
-                Console.WriteLine("Press ENTER to stop application...");
-                Console.ReadLine();
-            }
+            await CreateHostBuilder(args).RunConsoleAsync();
         }
+
+        public static IHostBuilder CreateHostBuilder(string[] args) =>
+            Host.CreateDefaultBuilder(args)
+                .ConfigureServices((hostContext, services) =>
+                {
+                    services.AddHostedService<ConsoleTestAppHostedService>();
+                });
     }
 }

samples/BookStore/src/Acme.BookStore.DbMigrator/DbMigratorHostedService.cs

@@ -0,0 +1,34 @@
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using Acme.BookStore.Data;
+using Serilog;
+using Volo.Abp;
+
+namespace Acme.BookStore.DbMigrator
+{
+    public class DbMigratorHostedService : IHostedService
+    {
+        public async Task StartAsync(CancellationToken cancellationToken)
+        {
+            using (var application = AbpApplicationFactory.Create<BookStoreDbMigratorModule>(options =>
+            {
+                options.UseAutofac();
+                options.Services.AddLogging(c => c.AddSerilog());
+            }))
+            {
+                application.Initialize();
+
+                await application
+                    .ServiceProvider
+                    .GetRequiredService<BookStoreDbMigrationService>()
+                    .MigrateAsync();
+
+                application.Shutdown();
+            }
+        }
+
+        public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
+    }
+}

samples/BookStore/src/Acme.BookStore.DbMigrator/Program.cs

@@ -1,39 +1,15 @@
-using System.IO;
+using System.IO;
+using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
-using Acme.BookStore.Data;
+using Microsoft.Extensions.Hosting;
 using Serilog;
 using Serilog.Events;
-using Volo.Abp;
-using Volo.Abp.Threading;
 
 namespace Acme.BookStore.DbMigrator
 {
     class Program
     {
-        static void Main(string[] args)
-        {
-            ConfigureLogging();
-
-            using (var application = AbpApplicationFactory.Create<BookStoreDbMigratorModule>(options =>
-            {
-                options.UseAutofac();
-                options.Services.AddLogging(c => c.AddSerilog());
-            }))
-            {
-                application.Initialize();
-
-                AsyncHelper.RunSync(
-                    () => application
-                        .ServiceProvider
-                        .GetRequiredService<BookStoreDbMigrationService>()
-                        .MigrateAsync()
-                );
-
-                application.Shutdown();
-            }
-        }
-
-        private static void ConfigureLogging()
+        static async Task Main(string[] args)
         {
             Log.Logger = new LoggerConfiguration()
                 .MinimumLevel.Information()
@@ -48,6 +24,15 @@ namespace Acme.BookStore.DbMigrator
                 .WriteTo.File(Path.Combine(Directory.GetCurrentDirectory(), "Logs/logs.txt"))
                 .WriteTo.Console()
                 .CreateLogger();
+
+            await CreateHostBuilder(args).RunConsoleAsync();
         }
+
+        public static IHostBuilder CreateHostBuilder(string[] args) =>
+            Host.CreateDefaultBuilder(args)
+                .ConfigureServices((hostContext, services) =>
+                {
+                    services.AddHostedService<DbMigratorHostedService>();
+                });
     }
 }

samples/BookStore/test/Acme.BookStore.HttpApi.Client.ConsoleTestApp/ConsoleTestAppHostedService.cs

@@ -0,0 +1,26 @@
+using Microsoft.Extensions.Hosting;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp;
+
+namespace Acme.BookStore.HttpApi.Client.ConsoleTestApp
+{
+    public class ConsoleTestAppHostedService : IHostedService
+    {
+        public async Task StartAsync(CancellationToken cancellationToken)
+        {
+            using (var application = AbpApplicationFactory.Create<BookStoreConsoleApiClientModule>())
+            {
+                application.Initialize();
+
+                var demo = application.ServiceProvider.GetRequiredService<ClientDemoService>();
+                await demo.RunAsync();
+
+                application.Shutdown();
+            }
+        }
+
+        public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
+    }
+}

samples/BookStore/test/Acme.BookStore.HttpApi.Client.ConsoleTestApp/Program.cs

@@ -1,24 +1,21 @@
-using System;
+using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp;
-using Volo.Abp.Threading;
+using Microsoft.Extensions.Hosting;
 
 namespace Acme.BookStore.HttpApi.Client.ConsoleTestApp
 {
     class Program
     {
-        static void Main(string[] args)
+        static async Task Main(string[] args)
         {
-            using (var application = AbpApplicationFactory.Create<BookStoreConsoleApiClientModule>())
-            {
-                application.Initialize();
-
-                var demo = application.ServiceProvider.GetRequiredService<ClientDemoService>();
-                AsyncHelper.RunSync(() => demo.RunAsync());
-
-                Console.WriteLine("Press ENTER to stop application...");
-                Console.ReadLine();
-            }
+            await CreateHostBuilder(args).RunConsoleAsync();
         }
+
+        public static IHostBuilder CreateHostBuilder(string[] args) =>
+            Host.CreateDefaultBuilder(args)
+                .ConfigureServices((hostContext, services) =>
+                {
+                    services.AddHostedService<ConsoleTestAppHostedService>();
+                });
     }
 }

samples/DashboardDemo/src/DashboardDemo.DbMigrator/DbMigratorHostedService.cs

@@ -0,0 +1,34 @@
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using DashboardDemo.Data;
+using Serilog;
+using Volo.Abp;
+
+namespace DashboardDemo.DbMigrator
+{
+    public class DbMigratorHostedService : IHostedService
+    {
+        public async Task StartAsync(CancellationToken cancellationToken)
+        {
+            using (var application = AbpApplicationFactory.Create<DashboardDemoDbMigratorModule>(options =>
+            {
+                options.UseAutofac();
+                options.Services.AddLogging(c => c.AddSerilog());
+            }))
+            {
+                application.Initialize();
+
+                await application
+                    .ServiceProvider
+                    .GetRequiredService<DashboardDemoDbMigrationService>()
+                    .MigrateAsync();
+
+                application.Shutdown();
+            }
+        }
+
+        public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
+    }
+}

samples/DashboardDemo/src/DashboardDemo.DbMigrator/Program.cs

@@ -1,39 +1,15 @@
-using System.IO;
+using System.IO;
+using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
-using DashboardDemo.Data;
+using Microsoft.Extensions.Hosting;
 using Serilog;
 using Serilog.Events;
-using Volo.Abp;
-using Volo.Abp.Threading;
 
 namespace DashboardDemo.DbMigrator
 {
     class Program
     {
-        static void Main(string[] args)
-        {
-            ConfigureLogging();
-
-            using (var application = AbpApplicationFactory.Create<DashboardDemoDbMigratorModule>(options =>
-            {
-                options.UseAutofac();
-                options.Services.AddLogging(c => c.AddSerilog());
-            }))
-            {
-                application.Initialize();
-
-                AsyncHelper.RunSync(
-                    () => application
-                        .ServiceProvider
-                        .GetRequiredService<DashboardDemoDbMigrationService>()
-                        .MigrateAsync()
-                );
-
-                application.Shutdown();
-            }
-        }
-
-        private static void ConfigureLogging()
+        static async Task Main(string[] args)
         {
             Log.Logger = new LoggerConfiguration()
                 .MinimumLevel.Information()
@@ -48,6 +24,15 @@ namespace DashboardDemo.DbMigrator
                 .WriteTo.File(Path.Combine(Directory.GetCurrentDirectory(), "Logs/logs.txt"))
                 .WriteTo.Console()
                 .CreateLogger();
+
+            await CreateHostBuilder(args).RunConsoleAsync();
         }
+
+        public static IHostBuilder CreateHostBuilder(string[] args) =>
+            Host.CreateDefaultBuilder(args)
+                .ConfigureServices((hostContext, services) =>
+                {
+                    services.AddHostedService<DbMigratorHostedService>();
+                });
     }
 }

samples/DashboardDemo/test/DashboardDemo.HttpApi.Client.ConsoleTestApp/ConsoleTestAppHostedService.cs

@@ -0,0 +1,26 @@
+using Microsoft.Extensions.Hosting;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp;
+
+namespace DashboardDemo.HttpApi.Client.ConsoleTestApp
+{
+    public class ConsoleTestAppHostedService : IHostedService
+    {
+        public async Task StartAsync(CancellationToken cancellationToken)
+        {
+            using (var application = AbpApplicationFactory.Create<DashboardDemoConsoleApiClientModule>())
+            {
+                application.Initialize();
+
+                var demo = application.ServiceProvider.GetRequiredService<ClientDemoService>();
+                await demo.RunAsync();
+
+                application.Shutdown();
+            }
+        }
+
+        public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
+    }
+}

samples/DashboardDemo/test/DashboardDemo.HttpApi.Client.ConsoleTestApp/Program.cs

@@ -1,24 +1,21 @@
-using System;
+using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp;
-using Volo.Abp.Threading;
+using Microsoft.Extensions.Hosting;
 
 namespace DashboardDemo.HttpApi.Client.ConsoleTestApp
 {
     class Program
     {
-        static void Main(string[] args)
+        static async Task Main(string[] args)
         {
-            using (var application = AbpApplicationFactory.Create<DashboardDemoConsoleApiClientModule>())
-            {
-                application.Initialize();
-
-                var demo = application.ServiceProvider.GetRequiredService<ClientDemoService>();
-                AsyncHelper.RunSync(() => demo.RunAsync());
-
-                Console.WriteLine("Press ENTER to stop application...");
-                Console.ReadLine();
-            }
+            await CreateHostBuilder(args).RunConsoleAsync();
         }
+
+        public static IHostBuilder CreateHostBuilder(string[] args) =>
+            Host.CreateDefaultBuilder(args)
+                .ConfigureServices((hostContext, services) =>
+                {
+                    services.AddHostedService<ConsoleTestAppHostedService>();
+                });
     }
 }

samples/MicroserviceDemo/applications/ConsoleClientDemo/ConsoleClientDemoHostedService.cs

@@ -0,0 +1,33 @@
+using Microsoft.Extensions.Hosting;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp;
+using Serilog;
+
+namespace ConsoleClientDemo
+{
+    public class ConsoleClientDemoHostedService : IHostedService
+    {
+        public async Task StartAsync(CancellationToken cancellationToken)
+        {
+            using (var application = AbpApplicationFactory.Create<ConsoleClientDemoModule>(options =>
+            {
+                options.Services.AddLogging(loggingBuilder =>
+                {
+                    loggingBuilder.AddSerilog(dispose: true);
+                });
+            }))
+            {
+                application.Initialize();
+
+                var demo = application.ServiceProvider.GetRequiredService<ClientDemoService>();
+                await demo.RunAsync();
+
+                application.Shutdown();
+            }
+        }
+
+        public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
+    }
+}

samples/MicroserviceDemo/applications/ConsoleClientDemo/Program.cs

@@ -1,48 +1,14 @@
-using Serilog;
-using Serilog.Events;
-using System;
+using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp;
-using Volo.Abp.Threading;
+using Microsoft.Extensions.Hosting;
+using Serilog;
+using Serilog.Events;
 
 namespace ConsoleClientDemo
 {
     internal class Program
     {
-        private static void Main(string[] args)
-        {
-            InitializeSerilog();
-
-            Log.Information("Starting ConsoleClientDemo...");
-
-            try
-            {
-                using (var application = AbpApplicationFactory.Create<ConsoleClientDemoModule>(options =>
-                    {
-                        options.Services.AddLogging(loggingBuilder =>
-                        {
-                            loggingBuilder.AddSerilog(dispose: true);
-                        });
-                    }))
-                {
-                    application.Initialize();
-
-                    var demo = application.ServiceProvider.GetRequiredService<ClientDemoService>();
-                    AsyncHelper.RunSync(() => demo.RunAsync());
-
-                    Console.WriteLine("Press ENTER to stop application...");
-                    Console.ReadLine();
-                }
-            }
-            catch (Exception ex)
-            {
-                Log.Error(ex.Message);
-                Log.Error(ex.StackTrace);
-                throw;
-            }
-        }
-
-        private static void InitializeSerilog()
+        static async Task Main(string[] args)
         {
             Log.Logger = new LoggerConfiguration()
                 .MinimumLevel.Debug()
@@ -50,6 +16,17 @@ namespace ConsoleClientDemo
                 .Enrich.FromLogContext()
                 .WriteTo.File("Logs/logs.txt")
                 .CreateLogger();
+
+            Log.Information("Starting ConsoleClientDemo...");
+
+            await CreateHostBuilder(args).RunConsoleAsync();
         }
+
+        public static IHostBuilder CreateHostBuilder(string[] args) =>
+            Host.CreateDefaultBuilder(args)
+                .ConfigureServices((hostContext, services) =>
+                {
+                    services.AddHostedService<ConsoleClientDemoHostedService>();
+                });
     }
 }

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/DbMigratorHostedService.cs

@@ -0,0 +1,34 @@
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using MyCompanyName.MyProjectName.Data;
+using Serilog;
+using Volo.Abp;
+
+namespace MyCompanyName.MyProjectName.DbMigrator
+{
+    public class DbMigratorHostedService : IHostedService
+    {
+        public async Task StartAsync(CancellationToken cancellationToken)
+        {
+            using (var application = AbpApplicationFactory.Create<MyProjectNameDbMigratorModule>(options =>
+            {
+                options.UseAutofac();
+                options.Services.AddLogging(c => c.AddSerilog());
+            }))
+            {
+                application.Initialize();
+
+                await application
+                    .ServiceProvider
+                    .GetRequiredService<MyProjectNameDbMigrationService>()
+                    .MigrateAsync();
+
+                application.Shutdown();
+            }
+        }
+
+        public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
+    }
+}

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/Program.cs

@@ -1,39 +1,15 @@
-using System.IO;
+using System.IO;
+using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
-using MyCompanyName.MyProjectName.Data;
+using Microsoft.Extensions.Hosting;
 using Serilog;
 using Serilog.Events;
-using Volo.Abp;
-using Volo.Abp.Threading;
 
 namespace MyCompanyName.MyProjectName.DbMigrator
 {
     class Program
     {
-        static void Main(string[] args)
-        {
-            ConfigureLogging();
-
-            using (var application = AbpApplicationFactory.Create<MyProjectNameDbMigratorModule>(options =>
-            {
-                options.UseAutofac();
-                options.Services.AddLogging(c => c.AddSerilog());
-            }))
-            {
-                application.Initialize();
-
-                AsyncHelper.RunSync(
-                    () => application
-                        .ServiceProvider
-                        .GetRequiredService<MyProjectNameDbMigrationService>()
-                        .MigrateAsync()
-                );
-
-                application.Shutdown();
-            }
-        }
-
-        private static void ConfigureLogging()
+        static async Task Main(string[] args)
         {
             Log.Logger = new LoggerConfiguration()
                 .MinimumLevel.Information()
@@ -48,6 +24,15 @@ namespace MyCompanyName.MyProjectName.DbMigrator
                 .WriteTo.File(Path.Combine(Directory.GetCurrentDirectory(), "Logs/logs.txt"))
                 .WriteTo.Console()
                 .CreateLogger();
+
+            await CreateHostBuilder(args).RunConsoleAsync();
         }
+
+        public static IHostBuilder CreateHostBuilder(string[] args) =>
+            Host.CreateDefaultBuilder(args)
+                .ConfigureServices((hostContext, services) =>
+                {
+                    services.AddHostedService<DbMigratorHostedService>();
+                });
     }
 }

templates/app/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/ConsoleTestAppHostedService.cs

@@ -0,0 +1,26 @@
+using Microsoft.Extensions.Hosting;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp;
+
+namespace MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp
+{
+    public class ConsoleTestAppHostedService : IHostedService
+    {
+        public async Task StartAsync(CancellationToken cancellationToken)
+        {
+            using (var application = AbpApplicationFactory.Create<MyProjectNameConsoleApiClientModule>())
+            {
+                application.Initialize();
+
+                var demo = application.ServiceProvider.GetRequiredService<ClientDemoService>();
+                await demo.RunAsync();
+
+                application.Shutdown();
+            }
+        }
+
+        public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
+    }
+}

templates/app/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/Program.cs

@@ -1,24 +1,21 @@
-using System;
+using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp;
-using Volo.Abp.Threading;
+using Microsoft.Extensions.Hosting;
 
 namespace MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp
 {
     class Program
     {
-        static void Main(string[] args)
+        static async Task Main(string[] args)
         {
-            using (var application = AbpApplicationFactory.Create<MyProjectNameConsoleApiClientModule>())
-            {
-                application.Initialize();
-
-                var demo = application.ServiceProvider.GetRequiredService<ClientDemoService>();
-                AsyncHelper.RunSync(() => demo.RunAsync());
-
-                Console.WriteLine("Press ENTER to stop application...");
-                Console.ReadLine();
-            }
+            await CreateHostBuilder(args).RunConsoleAsync();
         }
+
+        public static IHostBuilder CreateHostBuilder(string[] args) =>
+            Host.CreateDefaultBuilder(args)
+                .ConfigureServices((hostContext, services) =>
+                {
+                    services.AddHostedService<ConsoleTestAppHostedService>();
+                });
     }
 }

templates/module/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/ConsoleTestAppHostedService.cs

@@ -0,0 +1,26 @@
+using Microsoft.Extensions.Hosting;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp;
+
+namespace MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp
+{
+    public class ConsoleTestAppHostedService : IHostedService
+    {
+        public async Task StartAsync(CancellationToken cancellationToken)
+        {
+            using (var application = AbpApplicationFactory.Create<MyProjectNameConsoleApiClientModule>())
+            {
+                application.Initialize();
+
+                var demo = application.ServiceProvider.GetRequiredService<ClientDemoService>();
+                await demo.RunAsync();
+
+                application.Shutdown();
+            }
+        }
+
+        public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
+    }
+}

templates/module/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/Program.cs

@@ -1,24 +1,21 @@
-using System;
+using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp;
-using Volo.Abp.Threading;
+using Microsoft.Extensions.Hosting;
 
-namespace MyCompanyName.MyProjectName
+namespace MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp
 {
     class Program
     {
-        static void Main(string[] args)
+        static async Task Main(string[] args)
         {
-            using (var application = AbpApplicationFactory.Create<MyProjectNameConsoleApiClientModule>())
-            {
-                application.Initialize();
-
-                var demo = application.ServiceProvider.GetRequiredService<ClientDemoService>();
-                AsyncHelper.RunSync(() => demo.RunAsync());
-
-                Console.WriteLine("Press ENTER to stop application...");
-                Console.ReadLine();
-            }
+            await CreateHostBuilder(args).RunConsoleAsync();
         }
+
+        public static IHostBuilder CreateHostBuilder(string[] args) =>
+            Host.CreateDefaultBuilder(args)
+                .ConfigureServices((hostContext, services) =>
+                {
+                    services.AddHostedService<ConsoleTestAppHostedService>();
+                });
     }
 }