Merge pull request #86 from sungam3r/files

File-scoped namespaces

Author: nblumhardt

samples/SimpleServiceSample/PrintTimeService.cs

@@ -4,24 +4,23 @@
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 
-namespace SimpleServiceSample
+namespace SimpleServiceSample;
+
+public class PrintTimeService : BackgroundService
 {
-    public class PrintTimeService : BackgroundService
-    {
-        private readonly ILogger _logger;
+    private readonly ILogger _logger;
 
-        public PrintTimeService(ILogger<PrintTimeService> logger)
-        {
-            _logger = logger;
-        }
+    public PrintTimeService(ILogger<PrintTimeService> logger)
+    {
+        _logger = logger;
+    }
 
-        protected override async Task ExecuteAsync(CancellationToken stoppingToken)
+    protected override async Task ExecuteAsync(CancellationToken stoppingToken)
+    {
+        while (!stoppingToken.IsCancellationRequested)
         {
-            while (!stoppingToken.IsCancellationRequested)
-            {
-                _logger.LogInformation("The current time is: {CurrentTime}", DateTimeOffset.UtcNow);
-                await Task.Delay(TimeSpan.FromSeconds(5), stoppingToken);
-            }
+            _logger.LogInformation("The current time is: {CurrentTime}", DateTimeOffset.UtcNow);
+            await Task.Delay(TimeSpan.FromSeconds(5), stoppingToken);
         }
     }
 }

samples/SimpleServiceSample/Program.cs

@@ -3,41 +3,40 @@
 using Microsoft.Extensions.Hosting;
 using Serilog;
 
-namespace SimpleServiceSample
+namespace SimpleServiceSample;
+
+public static class Program
 {
-    public static class Program
+    public static int Main(string[] args)
     {
-        public static int Main(string[] args)
-        {
-            Log.Logger = new LoggerConfiguration()
-                .Enrich.FromLogContext()
-                .WriteTo.Console()
-                .CreateBootstrapLogger();
+        Log.Logger = new LoggerConfiguration()
+            .Enrich.FromLogContext()
+            .WriteTo.Console()
+            .CreateBootstrapLogger();
 
-            try
-            {
-                Log.Information("Getting the motors running...");
-                CreateHostBuilder(args).Build().Run();
-                return 0;
-            }
-            catch (Exception ex)
-            {
-                Log.Fatal(ex, "Host terminated unexpectedly");
-                return 1;
-            }
-            finally
-            {
-                Log.CloseAndFlush();
-            }
+        try
+        {
+            Log.Information("Getting the motors running...");
+            CreateHostBuilder(args).Build().Run();
+            return 0;
+        }
+        catch (Exception ex)
+        {
+            Log.Fatal(ex, "Host terminated unexpectedly");
+            return 1;
+        }
+        finally
+        {
+            Log.CloseAndFlush();
         }
-
-        public static IHostBuilder CreateHostBuilder(string[] args) =>
-            Host.CreateDefaultBuilder(args)
-                .ConfigureServices(services => services.AddHostedService<PrintTimeService>())
-                .UseSerilog((context, services, loggerConfiguration) => loggerConfiguration
-                    .ReadFrom.Configuration(context.Configuration)
-                    .ReadFrom.Services(services)
-                    .Enrich.FromLogContext()
-                    .WriteTo.Console());
     }
+
+    public static IHostBuilder CreateHostBuilder(string[] args) =>
+        Host.CreateDefaultBuilder(args)
+            .ConfigureServices(services => services.AddHostedService<PrintTimeService>())
+            .UseSerilog((context, services, loggerConfiguration) => loggerConfiguration
+                .ReadFrom.Configuration(context.Configuration)
+                .ReadFrom.Services(services)
+                .Enrich.FromLogContext()
+                .WriteTo.Console());
 }

samples/WebApplicationSample/Program.cs

@@ -3,42 +3,41 @@
 using Microsoft.Extensions.Hosting;
 using Serilog;
 
-namespace WebApplicationSample
+namespace WebApplicationSample;
+
+public static class Program
 {
-    public static class Program
+    public static int Main(string[] args)
     {
-        public static int Main(string[] args)
-        {
-            Log.Logger = new LoggerConfiguration()
-                .WriteTo.Console()
-                .CreateBootstrapLogger();
-            
-            Log.Information("Starting up!");
+        Log.Logger = new LoggerConfiguration()
+            .WriteTo.Console()
+            .CreateBootstrapLogger();
+        
+        Log.Information("Starting up!");
 
-            try
-            {
-                CreateHostBuilder(args).Build().Run();
+        try
+        {
+            CreateHostBuilder(args).Build().Run();
 
-                Log.Information("Stopped cleanly");
-                return 0;
-            }
-            catch (Exception ex)
-            {
-                Log.Fatal(ex, "An unhandled exception occured during bootstrapping");
-                return 1;
-            }
-            finally
-            {
-                Log.CloseAndFlush();
-            }
+            Log.Information("Stopped cleanly");
+            return 0;
+        }
+        catch (Exception ex)
+        {
+            Log.Fatal(ex, "An unhandled exception occured during bootstrapping");
+            return 1;
+        }
+        finally
+        {
+            Log.CloseAndFlush();
         }
-
-        public static IHostBuilder CreateHostBuilder(string[] args) =>
-            Host.CreateDefaultBuilder(args)
-                .UseSerilog((context, services, configuration) => configuration
-                    .WriteTo.Console()
-                    .ReadFrom.Configuration(context.Configuration)
-                    .ReadFrom.Services(services))
-                .ConfigureWebHostDefaults(webBuilder => { webBuilder.UseStartup<Startup>(); });
     }
+
+    public static IHostBuilder CreateHostBuilder(string[] args) =>
+        Host.CreateDefaultBuilder(args)
+            .UseSerilog((context, services, configuration) => configuration
+                .WriteTo.Console()
+                .ReadFrom.Configuration(context.Configuration)
+                .ReadFrom.Services(services))
+            .ConfigureWebHostDefaults(webBuilder => { webBuilder.UseStartup<Startup>(); });
 }

samples/WebApplicationSample/Startup.cs

@@ -9,34 +9,33 @@
 using Microsoft.Extensions.Hosting;
 using Serilog;
 
-namespace WebApplicationSample
+namespace WebApplicationSample;
+
+public class Startup
 {
-    public class Startup
+    // This method gets called by the runtime. Use this method to add services to the container.
+    // For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940
+    public void ConfigureServices(IServiceCollection services)
     {
-        // This method gets called by the runtime. Use this method to add services to the container.
-        // For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940
-        public void ConfigureServices(IServiceCollection services)
-        {
-        }
+    }
 
-        // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
+    // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
+    public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
+    {
+        if (env.IsDevelopment())
         {
-            if (env.IsDevelopment())
-            {
-                app.UseDeveloperExceptionPage();
-            }
+            app.UseDeveloperExceptionPage();
+        }
 
-            app.UseRouting();
+        app.UseRouting();
 
-            app.UseEndpoints(endpoints =>
+        app.UseEndpoints(endpoints =>
+        {
+            endpoints.MapGet("/", async context =>
             {
-                endpoints.MapGet("/", async context =>
-                {
-                    Log.Information("Saying hello");
-                    await context.Response.WriteAsync("Hello World!");
-                });
+                Log.Information("Saying hello");
+                await context.Response.WriteAsync("Hello World!");
             });
-        }
+        });
     }
 }

src/Serilog.Extensions.Hosting/Extensions/Hosting/AmbientDiagnosticContextCollector.cs

@@ -15,32 +15,31 @@
 using System;
 using System.Threading;
 
-namespace Serilog.Extensions.Hosting
+namespace Serilog.Extensions.Hosting;
+
+class AmbientDiagnosticContextCollector : IDisposable
 {
-    class AmbientDiagnosticContextCollector : IDisposable
-    {
-        static readonly AsyncLocal<AmbientDiagnosticContextCollector> AmbientCollector =
-            new AsyncLocal<AmbientDiagnosticContextCollector>();
+    static readonly AsyncLocal<AmbientDiagnosticContextCollector> AmbientCollector =
+        new AsyncLocal<AmbientDiagnosticContextCollector>();
 
-        // The indirection here ensures that completing collection cleans up the collector in all
-        // execution contexts. Via @benaadams' addition to `HttpContextAccessor` :-)
-        DiagnosticContextCollector _collector;
+    // The indirection here ensures that completing collection cleans up the collector in all
+    // execution contexts. Via @benaadams' addition to `HttpContextAccessor` :-)
+    DiagnosticContextCollector _collector;
 
-        public static DiagnosticContextCollector Current => AmbientCollector.Value?._collector;
+    public static DiagnosticContextCollector Current => AmbientCollector.Value?._collector;
 
-        public static DiagnosticContextCollector Begin()
-        {
-            var value = new AmbientDiagnosticContextCollector();
-            value._collector = new DiagnosticContextCollector(value);
-            AmbientCollector.Value = value;
-            return value._collector;
-        }
+    public static DiagnosticContextCollector Begin()
+    {
+        var value = new AmbientDiagnosticContextCollector();
+        value._collector = new DiagnosticContextCollector(value);
+        AmbientCollector.Value = value;
+        return value._collector;
+    }
 
-        public void Dispose()
-        {
-            _collector = null;
-            if (AmbientCollector.Value == this)
-                AmbientCollector.Value = null;
-        }
+    public void Dispose()
+    {
+        _collector = null;
+        if (AmbientCollector.Value == this)
+            AmbientCollector.Value = null;
     }
 }