Merge pull request #267 from colinin/4.3

Simplified program entry

aspnet-core/services/account/AuthServer.Host/Program.cs

@@ -11,7 +11,7 @@ namespace AuthServer.Host
         {
             try
             {
-                Log.Information("Starting web host.");
+                Log.Information("Starting AuthServer.Host.");
                 CreateHostBuilder(args).Build().Run();
                 return 0;
             }
@@ -28,14 +28,14 @@ namespace AuthServer.Host
 
         internal static IHostBuilder CreateHostBuilder(string[] args) =>
            Microsoft.Extensions.Hosting.Host.CreateDefaultBuilder(args)
-                .UseSerilog((ctx, cfg) =>
-                {
-                    cfg = cfg.ReadFrom.Configuration(ctx.Configuration);
-                })
                 .ConfigureWebHostDefaults(webBuilder =>
                 {
                     webBuilder.UseStartup<Startup>();
                 })
+                .UseSerilog((context, provider, config) =>
+                {
+                    config.ReadFrom.Configuration(context.Configuration);
+                })
                 .UseAutofac();
     }
 }

aspnet-core/services/admin/LINGYUN.Abp.BackendAdmin.HttpApi.Host/Program.cs

@@ -11,18 +11,9 @@ namespace LINGYUN.Abp.BackendAdmin
     {
         public static int Main(string[] args)
         {
-            var env = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") ?? "Production";
-            var configuration = new ConfigurationBuilder()
-                .SetBasePath(Directory.GetCurrentDirectory())
-                .AddJsonFile($"appsettings.{env}.json", optional: false, reloadOnChange: true)
-                .AddEnvironmentVariables()
-                .Build();
-            Log.Logger = new LoggerConfiguration()
-               .ReadFrom.Configuration(configuration)
-               .CreateLogger();
             try
             {
-                Log.Information("Starting web host.");
+                Log.Information("Starting BackendAdmin.Host.");
                 CreateHostBuilder(args).Build().Run();
                 return 0;
             }
@@ -43,7 +34,10 @@ namespace LINGYUN.Abp.BackendAdmin
                 {
                     webBuilder.UseStartup<Startup>();
                 })
-                .UseSerilog()
+                .UseSerilog((context, provider, config) =>
+                {
+                    config.ReadFrom.Configuration(context.Configuration);
+                })
                 .UseAutofac();
     }
 }

aspnet-core/services/apigateway/LINGYUN.Abp.ApiGateway.Host/Program.cs

@@ -14,7 +14,7 @@ namespace LINGYUN.Abp.ApiGateway
             try
             {
                 var hostBuilder = CreateHostBuilder(args).Build();
-                Log.Information("Starting web host.");
+                Log.Information("Starting ApiGateway.Host.");
                 hostBuilder.Run();
 
                 return 0;
@@ -34,9 +34,7 @@ namespace LINGYUN.Abp.ApiGateway
            Host.CreateDefaultBuilder(args)
                 .ConfigureWebHostDefaults(webBuilder =>
                 {
-                    webBuilder
+                    webBuilder.UseStartup<Startup>();
-                        .UseKestrel()
-                        .UseStartup<Startup>();
                 })
                 .UseSerilog((context, provider, config) =>
                 {

aspnet-core/services/apigateway/LINGYUN.ApiGateway.Host/Program.cs

@@ -14,7 +14,7 @@ namespace LINGYUN.ApiGateway
             try
             {
                 var hostBuilder = CreateHostBuilder(args).Build();
-                Log.Information("Starting web host.");
+                Log.Information("Starting ApiGateway.Host.");
                 hostBuilder.Run();
 
                 return 0;
@@ -34,9 +34,7 @@ namespace LINGYUN.ApiGateway
            Host.CreateDefaultBuilder(args)
                 .ConfigureWebHostDefaults(webBuilder =>
                 {
-                    webBuilder
+                    webBuilder.UseStartup<Startup>();
-                        .UseKestrel()
-                        .UseStartup<Startup>();
                 })
                 .UseSerilog((context, provider, config) =>
                 {

aspnet-core/services/apigateway/LINGYUN.ApiGateway.HttpApi.Host/Program.cs

@@ -11,18 +11,9 @@ namespace LINGYUN.ApiGateway
     {
         public static int Main(string[] args)
         {
-            var env = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") ?? "Production";
-            var configuration = new ConfigurationBuilder()
-                .SetBasePath(Directory.GetCurrentDirectory())
-                .AddJsonFile($"appsettings.{env}.json", optional: false, reloadOnChange: true)
-                .AddEnvironmentVariables()
-                .Build();
-            Log.Logger = new LoggerConfiguration()
-               .ReadFrom.Configuration(configuration)
-               .CreateLogger();
             try
             {
-                Log.Information("Starting web host.");
+                Log.Information("Starting ApiGatewayAdmin.Host.");
                 CreateHostBuilder(args).Build().Run();
                 return 0;
             }
@@ -43,7 +34,10 @@ namespace LINGYUN.ApiGateway
                 {
                     webBuilder.UseStartup<Startup>();
                 })
-                .UseSerilog()
+                .UseSerilog((context, provider, config) =>
+                {
+                    config.ReadFrom.Configuration(context.Configuration);
+                })
                 .UseAutofac();
     }
 }

aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/Program.cs

@@ -5,25 +5,18 @@ using Serilog;
 using System;
 using System.IO;
 
-namespace LINGYUN.Abp.IdentityServer4.HttpApi.Host
+namespace LINGYUN.Abp.IdentityServer4
 {
     public class Program
     {
         public static int Main(string[] args)
         {
-            var env = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") ?? "Production";
-            var configuration = new ConfigurationBuilder()
-                .SetBasePath(Directory.GetCurrentDirectory())
-                .AddJsonFile($"appsettings.{env}.json", optional: false, reloadOnChange: true)
-                .AddEnvironmentVariables()
-                .Build();
-            Log.Logger = new LoggerConfiguration()
-               .ReadFrom.Configuration(configuration)
-               .CreateLogger();
             try
             {
-                Log.Information("Starting web host.");
+                var hostBuilder = CreateHostBuilder(args).Build();
-                CreateHostBuilder(args).Build().Run();
+                Log.Information("Starting IdentityServer4Admin.Host.");
+                hostBuilder.Run();
+
                 return 0;
             }
             catch (Exception ex)
@@ -38,12 +31,15 @@ namespace LINGYUN.Abp.IdentityServer4.HttpApi.Host
         }
 
         internal static IHostBuilder CreateHostBuilder(string[] args) =>
-           Microsoft.Extensions.Hosting.Host.CreateDefaultBuilder(args)
+           Host.CreateDefaultBuilder(args)
                 .ConfigureWebHostDefaults(webBuilder =>
                 {
                     webBuilder.UseStartup<Startup>();
                 })
-                .UseSerilog()
+                .UseSerilog((context, provider, config) =>
+                {
+                    config.ReadFrom.Configuration(context.Configuration);
+                })
                 .UseAutofac();
     }
 }

aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/Startup.cs

@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace LINGYUN.Abp.IdentityServer4.HttpApi.Host
+namespace LINGYUN.Abp.IdentityServer4
 {
     public class Startup
     {

aspnet-core/services/localization/LINGYUN.Abp.LocalizationManagement.HttpApi.Host/Program.cs

@@ -5,26 +5,18 @@ using Serilog;
 using System;
 using System.IO;
 
-namespace LINGYUN.Abp.LocalizationManagement.HttpApi.Host
+namespace LINGYUN.Abp.LocalizationManagement
 {
     public class Program
     {
         public static int Main(string[] args)
         {
-            var env = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") ?? "Production";
-            var configuration = new ConfigurationBuilder()
-                .SetBasePath(Directory.GetCurrentDirectory())
-                .AddJsonFile($"appsettings.json", optional: false, reloadOnChange: true)
-                .AddJsonFile($"appsettings.{env}.json", optional: false, reloadOnChange: true)
-                .AddEnvironmentVariables()
-                .Build();
-            Log.Logger = new LoggerConfiguration()
-               .ReadFrom.Configuration(configuration)
-               .CreateLogger();
             try
             {
-                Log.Information("Starting web host.");
+                var hostBuilder = CreateHostBuilder(args).Build();
-                CreateHostBuilder(args).Build().Run();
+                Log.Information("Starting LocalizationManagement.Host.");
+                hostBuilder.Run();
+
                 return 0;
             }
             catch (Exception ex)
@@ -39,12 +31,15 @@ namespace LINGYUN.Abp.LocalizationManagement.HttpApi.Host
         }
 
         internal static IHostBuilder CreateHostBuilder(string[] args) =>
-           Microsoft.Extensions.Hosting.Host.CreateDefaultBuilder(args)
+           Host.CreateDefaultBuilder(args)
                 .ConfigureWebHostDefaults(webBuilder =>
                 {
                     webBuilder.UseStartup<Startup>();
                 })
-                .UseSerilog()
+                .UseSerilog((context, provider, config) =>
+                {
+                    config.ReadFrom.Configuration(context.Configuration);
+                })
                 .UseAutofac();
     }
 }

aspnet-core/services/localization/LINGYUN.Abp.LocalizationManagement.HttpApi.Host/Startup.cs

@@ -8,7 +8,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace LINGYUN.Abp.LocalizationManagement.HttpApi.Host
+namespace LINGYUN.Abp.LocalizationManagement
 {
     public class Startup
     {

aspnet-core/services/messages/LINGYUN.Abp.MessageService.HttpApi.Host/Program.cs

@@ -11,19 +11,12 @@ namespace LINGYUN.Abp.MessageService
     {
         public static int Main(string[] args)
         {
-            var env = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") ?? "Production";
-            var configuration = new ConfigurationBuilder()
-                .SetBasePath(Directory.GetCurrentDirectory())
-                .AddJsonFile($"appsettings.{env}.json", optional: false, reloadOnChange: true)
-                .AddEnvironmentVariables()
-                .Build();
-            Log.Logger = new LoggerConfiguration()
-               .ReadFrom.Configuration(configuration)
-               .CreateLogger();
             try
             {
-                Log.Information("Starting web host.");
+                var hostBuilder = CreateHostBuilder(args).Build();
-                CreateHostBuilder(args).Build().Run();
+                Log.Information("Starting MessageService.Host.");
+                hostBuilder.Run();
+
                 return 0;
             }
             catch (Exception ex)
@@ -38,12 +31,15 @@ namespace LINGYUN.Abp.MessageService
         }
 
         internal static IHostBuilder CreateHostBuilder(string[] args) =>
-           Microsoft.Extensions.Hosting.Host.CreateDefaultBuilder(args)
+           Host.CreateDefaultBuilder(args)
                 .ConfigureWebHostDefaults(webBuilder =>
                 {
                     webBuilder.UseStartup<Startup>();
                 })
-                .UseSerilog()
+                .UseSerilog((context, provider, config) =>
+                {
+                    config.ReadFrom.Configuration(context.Configuration);
+                })
                 .UseAutofac();
     }
 }

aspnet-core/services/platform/LINGYUN.Platform.HttpApi.Host/Program.cs

@@ -11,19 +11,12 @@ namespace LINGYUN.Platform
     {
         public static int Main(string[] args)
         {
-            var env = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") ?? "Production";
-            var configuration = new ConfigurationBuilder()
-                .SetBasePath(Directory.GetCurrentDirectory())
-                .AddJsonFile($"appsettings.{env}.json", optional: false, reloadOnChange: true)
-                .AddEnvironmentVariables()
-                .Build();
-            Log.Logger = new LoggerConfiguration()
-               .ReadFrom.Configuration(configuration)
-               .CreateLogger();
             try
             {
-                Log.Information("Starting web host.");
+                var hostBuilder = CreateHostBuilder(args).Build();
-                CreateHostBuilder(args).Build().Run();
+                Log.Information("Starting Platform.Host.");
+                hostBuilder.Run();
+
                 return 0;
             }
             catch (Exception ex)
@@ -38,12 +31,15 @@ namespace LINGYUN.Platform
         }
 
         internal static IHostBuilder CreateHostBuilder(string[] args) =>
-           Microsoft.Extensions.Hosting.Host.CreateDefaultBuilder(args)
+           Host.CreateDefaultBuilder(args)
                 .ConfigureWebHostDefaults(webBuilder =>
                 {
                     webBuilder.UseStartup<Startup>();
                 })
-                .UseSerilog()
+                .UseSerilog((context, provider, config) =>
+                {
+                    config.ReadFrom.Configuration(context.Configuration);
+                })
                 .UseAutofac();
     }
 }