harmonize QS UI code and namespaces for all host projects

src/AspNetIdentity/host/Configuration/Clients.cs

@@ -5,7 +5,7 @@
 using IdentityServer4.Models;
 using System.Collections.Generic;
 
-namespace Host.Configuration
+namespace IdentityServerHost.Configuration
 {
     public static class Clients
     {

src/AspNetIdentity/host/Configuration/ClientsConsole.cs

@@ -5,7 +5,7 @@
 using IdentityServer4;
 using IdentityServer4.Models;
 
-namespace Host.Configuration
+namespace IdentityServerHost.Configuration
 {
     public static class ClientsConsole
     {

src/AspNetIdentity/host/Configuration/ClientsWeb.cs

@@ -5,7 +5,7 @@
 using IdentityServer4;
 using IdentityServer4.Models;
 
-namespace Host.Configuration
+namespace IdentityServerHost.Configuration
 {
     public static class ClientsWeb
     {

src/AspNetIdentity/host/Configuration/Resources.cs

@@ -7,7 +7,7 @@
 using System.Collections.Generic;
 using static IdentityServer4.IdentityServerConstants;
 
-namespace Host.Configuration
+namespace IdentityServerHost.Configuration
 {
     public class Resources
     {

src/AspNetIdentity/host/Data/ApplicationDbContext.cs

@@ -2,7 +2,7 @@
 using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
 
-namespace Host.Data
+namespace IdentityServerHost.Data
 {
     public class ApplicationDbContext : IdentityDbContext<ApplicationUser>
     {

src/AspNetIdentity/host/Program.cs

@@ -1,40 +1,65 @@
-// Copyright (c) Brock Allen & Dominick Baier. All rights reserved.
+// Copyright (c) Brock Allen & Dominick Baier. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
 
 using Microsoft.AspNetCore.Hosting;
-using System;
+using Microsoft.Extensions.Hosting;
 using Serilog;
-using Serilog.Sinks.SystemConsole.Themes;
-using Microsoft.AspNetCore;
 using Serilog.Events;
+using Serilog.Sinks.SystemConsole.Themes;
+using System;
+using System.Diagnostics;
 
-namespace Host
+namespace IdentityServerHost
 {
     public class Program
     {
-        public static void Main(string[] args)
+        public static int Main(string[] args)
         {
             Console.Title = "IdentityServer4.AspNetIdentity";
+            Activity.DefaultIdFormat = ActivityIdFormat.W3C;
+
+            Log.Logger = new LoggerConfiguration()
+                .MinimumLevel.Debug()
+                .MinimumLevel.Override("Microsoft", LogEventLevel.Warning)
+                .MinimumLevel.Override("Microsoft.Hosting.Lifetime", LogEventLevel.Information)
+                .MinimumLevel.Override("System", LogEventLevel.Warning)
+                .MinimumLevel.Override("Microsoft.AspNetCore.Authentication", LogEventLevel.Information)
+                .Enrich.FromLogContext()
+                //.WriteTo.File(@"identityserver4_log.txt")
+                // uncomment to write to Azure diagnostics stream
+                //.WriteTo.File(
+                //    @"D:\home\LogFiles\Application\identityserver.txt",
+                //    fileSizeLimitBytes: 1_000_000,
+                //    rollOnFileSizeLimit: true,
+                //    shared: true,
+                //    flushToDiskInterval: TimeSpan.FromSeconds(1))
+                .WriteTo.Console(outputTemplate: "[{Timestamp:HH:mm:ss} {Level}] {SourceContext}{NewLine}{Message:lj}{NewLine}{Exception}{NewLine}", theme: AnsiConsoleTheme.Code)
+                .CreateLogger();
 
-            CreateWebHostBuilder(args).Build().Run();
+            try
+            {
+                Log.Information("Starting host...");
+                CreateHostBuilder(args).Build().Run();
+                return 0;
+            }
+            catch (Exception ex)
+            {
+                Log.Fatal(ex, "Host terminated unexpectedly.");
+                return 1;
+            }
+            finally
+            {
+                Log.CloseAndFlush();
+            }
         }
 
-        public static IWebHostBuilder CreateWebHostBuilder(string[] args)
-        {
-            return WebHost.CreateDefaultBuilder(args)
-                    .UseStartup<Startup>()
-                    .UseSerilog((context, config) =>
-                    {
-                        config
-                            .MinimumLevel.Debug()
-                            .MinimumLevel.Override("Microsoft", LogEventLevel.Warning)
-                            .MinimumLevel.Override("System", LogEventLevel.Warning)
-                            .MinimumLevel.Override("Microsoft.AspNetCore.Authentication", LogEventLevel.Information)
-                            .Enrich.FromLogContext()
-                            .WriteTo.File(@"identityserver4_log.txt")
-                            .WriteTo.Console(outputTemplate: "[{Timestamp:HH:mm:ss} {Level}] {SourceContext}{NewLine}{Message:lj}{NewLine}{Exception}{NewLine}", theme: AnsiConsoleTheme.Literate);
-                    });
-        }            
+        public static IHostBuilder CreateHostBuilder(string[] args) =>
+            Host.CreateDefaultBuilder(args)
+                .UseSerilog()
+                .ConfigureWebHostDefaults(webBuilder =>
+                {
+                    webBuilder.UseStartup<Startup>();
+                });
     }
 }

src/AspNetIdentity/host/Quickstart/Account/AccountController.cs

@@ -3,6 +3,7 @@
 
 
 using IdentityModel;
+using IdentityServer4;
 using IdentityServer4.Events;
 using IdentityServer4.Extensions;
 using IdentityServer4.Models;
@@ -17,7 +18,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace IdentityServer4.Quickstart.UI
+namespace IdentityServerHost.Quickstart.UI
 {
     [SecurityHeaders]
     [AllowAnonymous]

src/AspNetIdentity/host/Quickstart/Account/AccountOptions.cs

@@ -4,7 +4,7 @@
 
 using System;
 
-namespace IdentityServer4.Quickstart.UI
+namespace IdentityServerHost.Quickstart.UI
 {
     public class AccountOptions
     {

src/AspNetIdentity/host/Quickstart/Account/ExternalController.cs

@@ -2,23 +2,21 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Security.Claims;
-using System.Security.Principal;
 using System.Threading.Tasks;
 using IdentityModel;
+using IdentityServer4;
 using IdentityServer4.Events;
 using IdentityServer4.Models;
-using IdentityServer4.Quickstart.UI;
 using IdentityServer4.Services;
 using IdentityServer4.Stores;
-using IdentityServer4.Test;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
-namespace IdentityServer4.Quickstart.UI
+namespace IdentityServerHost.Quickstart.UI
 {
     [SecurityHeaders]
     [AllowAnonymous]

src/AspNetIdentity/host/Quickstart/Account/ExternalProvider.cs

@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
 
-namespace IdentityServer4.Quickstart.UI
+namespace IdentityServerHost.Quickstart.UI
 {
     public class ExternalProvider
     {

src/AspNetIdentity/host/Quickstart/Account/LoggedOutViewModel.cs

@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
 
-namespace IdentityServer4.Quickstart.UI
+namespace IdentityServerHost.Quickstart.UI
 {
     public class LoggedOutViewModel
     {

src/AspNetIdentity/host/Quickstart/Account/LoginInputModel.cs

@@ -4,7 +4,7 @@
 
 using System.ComponentModel.DataAnnotations;
 
-namespace IdentityServer4.Quickstart.UI
+namespace IdentityServerHost.Quickstart.UI
 {
     public class LoginInputModel
     {

src/AspNetIdentity/host/Quickstart/Account/LoginViewModel.cs

@@ -6,7 +6,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace IdentityServer4.Quickstart.UI
+namespace IdentityServerHost.Quickstart.UI
 {
     public class LoginViewModel : LoginInputModel
     {

src/AspNetIdentity/host/Quickstart/Account/LogoutInputModel.cs

@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
 
-namespace IdentityServer4.Quickstart.UI
+namespace IdentityServerHost.Quickstart.UI
 {
     public class LogoutInputModel
     {

src/AspNetIdentity/host/Quickstart/Account/LogoutViewModel.cs

@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
 
-namespace IdentityServer4.Quickstart.UI
+namespace IdentityServerHost.Quickstart.UI
 {
     public class LogoutViewModel : LogoutInputModel
     {

src/AspNetIdentity/host/Quickstart/Account/RedirectViewModel.cs

@@ -3,7 +3,7 @@
 
 
 
-namespace IdentityServer4.Quickstart.UI
+namespace IdentityServerHost.Quickstart.UI
 {
     public class RedirectViewModel
     {

src/AspNetIdentity/host/Quickstart/Consent/ConsentController.cs

@@ -15,7 +15,7 @@
 using System.Collections.Generic;
 using System;
 
-namespace IdentityServer4.Quickstart.UI
+namespace IdentityServerHost.Quickstart.UI
 {
     /// <summary>
     /// This controller processes the consent UI

src/AspNetIdentity/host/Quickstart/Consent/ConsentInputModel.cs

@@ -4,7 +4,7 @@
 
 using System.Collections.Generic;
 
-namespace IdentityServer4.Quickstart.UI
+namespace IdentityServerHost.Quickstart.UI
 {
     public class ConsentInputModel
     {

src/AspNetIdentity/host/Quickstart/Consent/ConsentOptions.cs

@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
 
-namespace IdentityServer4.Quickstart.UI
+namespace IdentityServerHost.Quickstart.UI
 {
     public class ConsentOptions
     {

src/AspNetIdentity/host/Quickstart/Consent/ConsentViewModel.cs

@@ -4,7 +4,7 @@
 
 using System.Collections.Generic;
 
-namespace IdentityServer4.Quickstart.UI
+namespace IdentityServerHost.Quickstart.UI
 {
     public class ConsentViewModel : ConsentInputModel
     {

src/AspNetIdentity/host/Quickstart/Consent/ProcessConsentResult.cs

@@ -4,7 +4,7 @@
 
 using IdentityServer4.Models;
 
-namespace IdentityServer4.Quickstart.UI
+namespace IdentityServerHost.Quickstart.UI
 {
     public class ProcessConsentResult
     {

src/AspNetIdentity/host/Quickstart/Consent/ScopeViewModel.cs

@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
 
-namespace IdentityServer4.Quickstart.UI
+namespace IdentityServerHost.Quickstart.UI
 {
     public class ScopeViewModel
     {

src/AspNetIdentity/host/Quickstart/Device/DeviceAuthorizationInputModel.cs

@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
 
-namespace IdentityServer4.Quickstart.UI
+namespace IdentityServerHost.Quickstart.UI
 {
     public class DeviceAuthorizationInputModel : ConsentInputModel
     {

src/AspNetIdentity/host/Quickstart/Device/DeviceAuthorizationViewModel.cs

@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
 
-namespace IdentityServer4.Quickstart.UI
+namespace IdentityServerHost.Quickstart.UI
 {
     public class DeviceAuthorizationViewModel : ConsentViewModel
     {

src/AspNetIdentity/host/Quickstart/Device/DeviceController.cs

@@ -17,7 +17,7 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 
-namespace IdentityServer4.Quickstart.UI
+namespace IdentityServerHost.Quickstart.UI
 {
     [Authorize]
     [SecurityHeaders]

src/AspNetIdentity/host/Quickstart/Diagnostics/DiagnosticsController.cs

@@ -8,7 +8,7 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
-namespace IdentityServer4.Quickstart.UI
+namespace IdentityServerHost.Quickstart.UI
 {
     [SecurityHeaders]
     [Authorize]

src/AspNetIdentity/host/Quickstart/Diagnostics/DiagnosticsViewModel.cs

@@ -8,7 +8,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace IdentityServer4.Quickstart.UI
+namespace IdentityServerHost.Quickstart.UI
 {
     public class DiagnosticsViewModel
     {

src/AspNetIdentity/host/Quickstart/Extensions.cs

@@ -2,7 +2,7 @@
 using IdentityServer4.Models;
 using Microsoft.AspNetCore.Mvc;
 
-namespace IdentityServer4.Quickstart.UI
+namespace IdentityServerHost.Quickstart.UI
 {
     public static class Extensions
     {

src/AspNetIdentity/host/Quickstart/Grants/GrantsController.cs

@@ -12,7 +12,7 @@
 using IdentityServer4.Events;
 using IdentityServer4.Extensions;
 
-namespace IdentityServer4.Quickstart.UI
+namespace IdentityServerHost.Quickstart.UI
 {
     /// <summary>
     /// This sample controller allows a user to revoke grants given to clients

src/AspNetIdentity/host/Quickstart/Grants/GrantsViewModel.cs

@@ -5,7 +5,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace IdentityServer4.Quickstart.UI
+namespace IdentityServerHost.Quickstart.UI
 {
     public class GrantsViewModel
     {

src/AspNetIdentity/host/Quickstart/Home/ErrorViewModel.cs

@@ -4,7 +4,7 @@
 
 using IdentityServer4.Models;
 
-namespace IdentityServer4.Quickstart.UI
+namespace IdentityServerHost.Quickstart.UI
 {
     public class ErrorViewModel
     {

src/AspNetIdentity/host/Quickstart/Home/HomeController.cs

@@ -10,7 +10,7 @@
 using Microsoft.Extensions.Logging;
 using System.Threading.Tasks;
 
-namespace IdentityServer4.Quickstart.UI
+namespace IdentityServerHost.Quickstart.UI
 {
     [SecurityHeaders]
     [AllowAnonymous]