Migrate to NET7 and C#11

.editorconfig

@@ -0,0 +1,23 @@
+root = true
+
+[*]
+trim_trailing_whitespace = true
+insert_final_newline = true
+indent_style = space
+indent_size = 4
+charset = utf-8
+end_of_line = lf
+
+[*.{csproj,json,config,yml,props}]
+indent_size = 2
+
+[*.sh]
+end_of_line = lf
+
+[*.{cmd, bat}]
+end_of_line = crlf
+
+# C# formatting settings - Namespace options
+csharp_style_namespace_declarations = file_scoped:suggestion
+
+csharp_style_prefer_switch_expression = true:suggestion

Directory.Build.props

@@ -0,0 +1,13 @@
+<Project>
+
+  <PropertyGroup>
+    <LangVersion>latest</LangVersion>
+    <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)assets/Serilog.snk</AssemblyOriginatorKeyFile>
+    <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+  </PropertyGroup>
+
+</Project>

Directory.Build.targets

@@ -0,0 +1,3 @@
+<Project>
+
+</Project>

samples/Sample/Program.cs

@@ -1,79 +1,77 @@
-using System;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Serilog;
 using Serilog.Extensions.Logging;
 
-namespace Sample
+namespace Sample;
+
+public class Program
 {
-    public class Program
+    public static void Main(string[] args)
     {
-        public static void Main(string[] args)
+        // Creating a `LoggerProviderCollection` lets Serilog optionally write
+        // events through other dynamically-added MEL ILoggerProviders.
+        var providers = new LoggerProviderCollection();
+
+        Log.Logger = new LoggerConfiguration()
+            .MinimumLevel.Debug()
+            .WriteTo.Console()
+            .WriteTo.Providers(providers)
+            .CreateLogger();
+
+        var services = new ServiceCollection();
+
+        services.AddSingleton(providers);
+        services.AddSingleton<ILoggerFactory>(sc =>
+        {
+            var providerCollection = sc.GetService<LoggerProviderCollection>();
+            var factory = new SerilogLoggerFactory(null, true, providerCollection);
+
+            foreach (var provider in sc.GetServices<ILoggerProvider>())
+                factory.AddProvider(provider);
+
+            return factory;
+        });
+
+        services.AddLogging(l => l.AddConsole());
+
+        var serviceProvider = services.BuildServiceProvider();
+        var logger = serviceProvider.GetRequiredService<ILogger<Program>>();
+
+        var startTime = DateTimeOffset.UtcNow;
+        logger.LogInformation(1, "Started at {StartTime} and 0x{Hello:X} is hex of 42", startTime, 42);
+
+        try
+        {
+            throw new Exception("Boom!");
+        }
+        catch (Exception ex)
+        {
+            logger.LogCritical("Unexpected critical error starting application", ex);
+            logger.Log(LogLevel.Critical, 0, "Unexpected critical error", ex, null!);
+            // This write should not log anything
+            logger.Log<object>(LogLevel.Critical, 0, null!, null, null!);
+            logger.LogError("Unexpected error", ex);
+            logger.LogWarning("Unexpected warning", ex);
+        }
+
+        using (logger.BeginScope("Main"))
         {
-            // Creating a `LoggerProviderCollection` lets Serilog optionally write
-            // events through other dynamically-added MEL ILoggerProviders.
-            var providers = new LoggerProviderCollection();
-
-            Log.Logger = new LoggerConfiguration()
-                .MinimumLevel.Debug()
-                .WriteTo.Console()
-                .WriteTo.Providers(providers)
-                .CreateLogger();
-
-            var services = new ServiceCollection();
-
-            services.AddSingleton(providers);
-            services.AddSingleton<ILoggerFactory>(sc =>
-            {
-                var providerCollection = sc.GetService<LoggerProviderCollection>();
-                var factory = new SerilogLoggerFactory(null, true, providerCollection);
-
-                foreach (var provider in sc.GetServices<ILoggerProvider>())
-                    factory.AddProvider(provider);
-
-                return factory;
-            });
-
-            services.AddLogging(l => l.AddConsole());
-
-            var serviceProvider = services.BuildServiceProvider();
-            var logger = serviceProvider.GetRequiredService<ILogger<Program>>();
-
-            var startTime = DateTimeOffset.UtcNow;
-            logger.LogInformation(1, "Started at {StartTime} and 0x{Hello:X} is hex of 42", startTime, 42);
-
-            try
-            {
-                throw new Exception("Boom!");
-            }
-            catch (Exception ex)
-            {
-                logger.LogCritical("Unexpected critical error starting application", ex);
-                logger.Log(LogLevel.Critical, 0, "Unexpected critical error", ex, null);
-                // This write should not log anything
-                logger.Log<object>(LogLevel.Critical, 0, null, null, null);
-                logger.LogError("Unexpected error", ex);
-                logger.LogWarning("Unexpected warning", ex);
-            }
-
-            using (logger.BeginScope("Main"))
-            {
-                logger.LogInformation("Waiting for user input");
-                var key = Console.Read();
-                logger.LogInformation("User pressed {@KeyInfo}", new { Key = key, KeyChar = (char)key });
-            }
-
-            var endTime = DateTimeOffset.UtcNow;
-            logger.LogInformation(2, "Stopping at {StopTime}", endTime);
-
-            logger.LogInformation("Stopping");
-
-            logger.LogInformation(Environment.NewLine);
-            logger.LogInformation("{Result,-10:l}{StartTime,15:l}{EndTime,15:l}{Duration,15:l}", "RESULT", "START TIME", "END TIME", "DURATION(ms)");
-            logger.LogInformation("{Result,-10:l}{StartTime,15:l}{EndTime,15:l}{Duration,15:l}", "------", "----- ----", "--- ----", "------------");
-            logger.LogInformation("{Result,-10:l}{StartTime,15:mm:s tt}{EndTime,15:mm:s tt}{Duration,15}", "SUCCESS", startTime, endTime, (endTime - startTime).TotalMilliseconds);
-
-            serviceProvider.Dispose();
+            logger.LogInformation("Waiting for user input");
+            var key = Console.Read();
+            logger.LogInformation("User pressed {@KeyInfo}", new { Key = key, KeyChar = (char)key });
         }
+
+        var endTime = DateTimeOffset.UtcNow;
+        logger.LogInformation(2, "Stopping at {StopTime}", endTime);
+
+        logger.LogInformation("Stopping");
+
+        logger.LogInformation(Environment.NewLine);
+        logger.LogInformation("{Result,-10:l}{StartTime,15:l}{EndTime,15:l}{Duration,15:l}", "RESULT", "START TIME", "END TIME", "DURATION(ms)");
+        logger.LogInformation("{Result,-10:l}{StartTime,15:l}{EndTime,15:l}{Duration,15:l}", "------", "----- ----", "--- ----", "------------");
+        logger.LogInformation("{Result,-10:l}{StartTime,15:mm:s tt}{EndTime,15:mm:s tt}{Duration,15}", "SUCCESS", startTime, endTime, (endTime - startTime).TotalMilliseconds);
+
+        serviceProvider.Dispose();
     }
 }

samples/Sample/Sample.csproj

@@ -1,20 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0</TargetFrameworks>
+    <TargetFramework>net7</TargetFramework>
     <AssemblyName>Sample</AssemblyName>
     <OutputType>Exe</OutputType>
-    <PackageId>Sample</PackageId>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\Serilog.Extensions.Logging\Serilog.Extensions.Logging.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.0.0" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
   </ItemGroup>
 
 </Project>

serilog-extensions-logging.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29209.62
+# Visual Studio Version 17
+VisualStudioVersion = 17.5.33424.131
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A1893BD1-333D-4DFE-A0F0-DDBB2FE526E0}"
 EndProject
@@ -17,9 +17,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sample", "samples\Sample\Sa
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "assets", "assets", "{9C21B9DF-AEDD-4AA6-BEA4-912DEF3E5B8E}"
 	ProjectSection(SolutionItems) = preProject
+		.editorconfig = .editorconfig
 		appveyor.yml = appveyor.yml
 		Build.ps1 = Build.ps1
-		global.json = global.json
+		Directory.Build.props = Directory.Build.props
+		Directory.Build.targets = Directory.Build.targets
 		README.md = README.md
 		assets\Serilog.snk = assets\Serilog.snk
 	EndProjectSection

src/Serilog.Extensions.Logging/Extensions/Logging/CachingMessageTemplateParser.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Serilog Contributors
+// Copyright (c) Serilog Contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -13,55 +13,53 @@
 // limitations under the License.
 
 
-using System;
 using Serilog.Events;
 using Serilog.Parsing;
 using System.Collections;
 
-namespace Serilog.Extensions.Logging
+namespace Serilog.Extensions.Logging;
+
+class CachingMessageTemplateParser
 {
-    class CachingMessageTemplateParser
-    {
-        readonly MessageTemplateParser _innerParser = new MessageTemplateParser();
+    readonly MessageTemplateParser _innerParser = new();
 
-        readonly object _templatesLock = new object();
-        readonly Hashtable _templates = new Hashtable();
+    readonly object _templatesLock = new();
+    readonly Hashtable _templates = new();
 
-        const int MaxCacheItems = 1000;
-        const int MaxCachedTemplateLength = 1024;
+    const int MaxCacheItems = 1000;
+    const int MaxCachedTemplateLength = 1024;
 
-        public MessageTemplate Parse(string messageTemplate)
-        {
-            if (messageTemplate == null) throw new ArgumentNullException(nameof(messageTemplate));
-
-            if (messageTemplate.Length > MaxCachedTemplateLength)
-                return _innerParser.Parse(messageTemplate);
+    public MessageTemplate Parse(string messageTemplate)
+    {
+        if (messageTemplate == null) throw new ArgumentNullException(nameof(messageTemplate));
 
-            // ReSharper disable once InconsistentlySynchronizedField
-            // ignored warning because this is by design
-            var result = (MessageTemplate)_templates[messageTemplate];
-            if (result != null)
-                return result;
+        if (messageTemplate.Length > MaxCachedTemplateLength)
+            return _innerParser.Parse(messageTemplate);
 
-            result = _innerParser.Parse(messageTemplate);
+        // ReSharper disable once InconsistentlySynchronizedField
+        // ignored warning because this is by design
+        var result = (MessageTemplate)_templates[messageTemplate];
+        if (result != null)
+            return result;
 
-            lock (_templatesLock)
-            {
-                // Exceeding MaxCacheItems is *not* the sunny day scenario; all we're doing here is preventing out-of-memory
-                // conditions when the library is used incorrectly. Correct use (templates, rather than
-                // direct message strings) should barely, if ever, overflow this cache.
+        result = _innerParser.Parse(messageTemplate);
 
-                // Changing workloads through the lifecycle of an app instance mean we can gain some ground by
-                // potentially dropping templates generated only in startup, or only during specific infrequent
-                // activities.
+        lock (_templatesLock)
+        {
+            // Exceeding MaxCacheItems is *not* the sunny day scenario; all we're doing here is preventing out-of-memory
+            // conditions when the library is used incorrectly. Correct use (templates, rather than
+            // direct message strings) should barely, if ever, overflow this cache.
 
-                if (_templates.Count == MaxCacheItems)
-                    _templates.Clear();
+            // Changing workloads through the lifecycle of an app instance mean we can gain some ground by
+            // potentially dropping templates generated only in startup, or only during specific infrequent
+            // activities.
 
-                _templates[messageTemplate] = result;
-            }
+            if (_templates.Count == MaxCacheItems)
+                _templates.Clear();
 
-            return result;
+            _templates[messageTemplate] = result;
         }
+
+        return result;
     }
 }