Merge pull request #98 from rafaelsc/feature/nullableReference

nblumhardt · web-flow · commit ffc2c0fc07a9 · 2021-07-13T08:41:37.000+10:00
Add support C# 8 nullable reference types
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,7 +1,6 @@
 version: '{build}'
 skip_tags: true
-image:
-  - Visual Studio 2019
+image: Visual Studio 2019
 configuration: Release
 test: off
 build_script:
diff --git a/src/Serilog.Sinks.Console/ConsoleLoggerConfigurationExtensions.cs b/src/Serilog.Sinks.Console/ConsoleLoggerConfigurationExtensions.cs
@@ -56,12 +56,12 @@ public static LoggerConfiguration Console(
             this LoggerSinkConfiguration sinkConfiguration,
             LogEventLevel restrictedToMinimumLevel = LevelAlias.Minimum,
             string outputTemplate = DefaultConsoleOutputTemplate,
-            IFormatProvider formatProvider = null,
-            LoggingLevelSwitch levelSwitch = null,
+            IFormatProvider? formatProvider = null,
+            LoggingLevelSwitch? levelSwitch = null,
             LogEventLevel? standardErrorFromLevel = null,
-            ConsoleTheme theme = null, 
+            ConsoleTheme? theme = null, 
             bool applyThemeToRedirectedOutput = false,
-            object syncRoot = null)
+            object? syncRoot = null)
         {
             if (sinkConfiguration is null) throw new ArgumentNullException(nameof(sinkConfiguration));
             if (outputTemplate is null) throw new ArgumentNullException(nameof(outputTemplate));
@@ -70,7 +70,7 @@ public static LoggerConfiguration Console(
                 ConsoleTheme.None :
                 theme ?? SystemConsoleThemes.Literate;
 
-            syncRoot = syncRoot ?? DefaultSyncRoot;
+            syncRoot ??= DefaultSyncRoot;
 
             var formatter = new OutputTemplateRenderer(appliedTheme, outputTemplate, formatProvider);
             return sinkConfiguration.Sink(new ConsoleSink(appliedTheme, formatter, standardErrorFromLevel, syncRoot), restrictedToMinimumLevel, levelSwitch);
@@ -97,14 +97,15 @@ public static LoggerConfiguration Console(
             this LoggerSinkConfiguration sinkConfiguration,
             ITextFormatter formatter,
             LogEventLevel restrictedToMinimumLevel = LevelAlias.Minimum,
-            LoggingLevelSwitch levelSwitch = null,
+            LoggingLevelSwitch? levelSwitch = null,
             LogEventLevel? standardErrorFromLevel = null,
-            object syncRoot = null)
+            object? syncRoot = null)
         {
             if (sinkConfiguration is null) throw new ArgumentNullException(nameof(sinkConfiguration));
             if (formatter is null) throw new ArgumentNullException(nameof(formatter));
 
-            syncRoot = syncRoot ?? DefaultSyncRoot;
+            syncRoot ??= DefaultSyncRoot;
+
             return sinkConfiguration.Sink(new ConsoleSink(ConsoleTheme.None, formatter, standardErrorFromLevel, syncRoot), restrictedToMinimumLevel, levelSwitch);
         }
     }
diff --git a/src/Serilog.Sinks.Console/Serilog.Sinks.Console.csproj b/src/Serilog.Sinks.Console/Serilog.Sinks.Console.csproj
@@ -1,10 +1,12 @@
-﻿<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <Description>A Serilog sink that writes log events to the console/terminal.</Description>
     <VersionPrefix>4.0.0</VersionPrefix>
     <Authors>Serilog Contributors</Authors>
     <TargetFrameworks>net45;netstandard1.3;netstandard2.0;</TargetFrameworks>
+    <LangVersion>8.0</LangVersion>
+    <Nullable>enable</Nullable>
     <AssemblyName>Serilog.Sinks.Console</AssemblyName>
     <AssemblyOriginatorKeyFile>../../assets/Serilog.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
diff --git a/src/Serilog.Sinks.Console/Sinks/SystemConsole/Formatting/ThemedDisplayValueFormatter.cs b/src/Serilog.Sinks.Console/Sinks/SystemConsole/Formatting/ThemedDisplayValueFormatter.cs
@@ -22,9 +22,9 @@ namespace Serilog.Sinks.SystemConsole.Formatting
 {
     class ThemedDisplayValueFormatter : ThemedValueFormatter
     {
-        readonly IFormatProvider _formatProvider;
+        readonly IFormatProvider? _formatProvider;
 
-        public ThemedDisplayValueFormatter(ConsoleTheme theme, IFormatProvider formatProvider)
+        public ThemedDisplayValueFormatter(ConsoleTheme theme, IFormatProvider? formatProvider)
             : base(theme)
         {
             _formatProvider = formatProvider;
@@ -150,7 +150,7 @@ protected override int VisitDictionaryValue(ThemedValueFormatterState state, Dic
             return count;
         }
 
-        public int FormatLiteralValue(ScalarValue scalar, TextWriter output, string format)
+        public int FormatLiteralValue(ScalarValue scalar, TextWriter output, string? format)
         {
             var value = scalar.Value;
             var count = 0;
diff --git a/src/Serilog.Sinks.Console/Sinks/SystemConsole/Formatting/ThemedJsonValueFormatter.cs b/src/Serilog.Sinks.Console/Sinks/SystemConsole/Formatting/ThemedJsonValueFormatter.cs
@@ -24,9 +24,9 @@ namespace Serilog.Sinks.SystemConsole.Formatting
     class ThemedJsonValueFormatter : ThemedValueFormatter
     {
         readonly ThemedDisplayValueFormatter _displayFormatter;
-        readonly IFormatProvider _formatProvider;
+        readonly IFormatProvider? _formatProvider;
 
-        public ThemedJsonValueFormatter(ConsoleTheme theme, IFormatProvider formatProvider)
+        public ThemedJsonValueFormatter(ConsoleTheme theme, IFormatProvider? formatProvider)
             : base(theme)
         {
             _displayFormatter = new ThemedDisplayValueFormatter(theme, formatProvider);
@@ -154,7 +154,7 @@ protected override int VisitDictionaryValue(ThemedValueFormatterState state, Dic
                         : ConsoleThemeStyle.Scalar;
 
                 using (ApplyStyle(state.Output, style, ref count))
-                    JsonValueFormatter.WriteQuotedJsonString((element.Key.Value ?? "null").ToString(), state.Output);
+                    JsonValueFormatter.WriteQuotedJsonString((element.Key.Value ?? "null").ToString() ?? "", state.Output);
 
                 using (ApplyStyle(state.Output, ConsoleThemeStyle.TertiaryText, ref count))
                     state.Output.Write(": ");
@@ -248,7 +248,7 @@ int FormatLiteralValue(ScalarValue scalar, TextWriter output)
             }
 
             using (ApplyStyle(output, ConsoleThemeStyle.Scalar, ref count))
-                JsonValueFormatter.WriteQuotedJsonString(value.ToString(), output);
+                JsonValueFormatter.WriteQuotedJsonString(value.ToString() ?? "", output);
 
             return count;
         }
diff --git a/src/Serilog.Sinks.Console/Sinks/SystemConsole/Formatting/ThemedValueFormatter.cs b/src/Serilog.Sinks.Console/Sinks/SystemConsole/Formatting/ThemedValueFormatter.cs
@@ -34,7 +34,7 @@ protected StyleReset ApplyStyle(TextWriter output, ConsoleThemeStyle style, ref
             return _theme.Apply(output, style, ref invisibleCharacterCount);
         }
 
-        public int Format(LogEventPropertyValue value, TextWriter output, string format, bool literalTopLevel = false)
+        public int Format(LogEventPropertyValue value, TextWriter output, string? format, bool literalTopLevel = false)
         {
             return Visit(new ThemedValueFormatterState { Output = output, Format = format, IsTopLevel = literalTopLevel }, value);
         }
diff --git a/src/Serilog.Sinks.Console/Sinks/SystemConsole/Formatting/ThemedValueFormatterState.cs b/src/Serilog.Sinks.Console/Sinks/SystemConsole/Formatting/ThemedValueFormatterState.cs
@@ -19,7 +19,7 @@ namespace Serilog.Sinks.SystemConsole.Formatting
     struct ThemedValueFormatterState
     {
         public TextWriter Output;
-        public string Format;
+        public string? Format;
         public bool IsTopLevel;
 
         public ThemedValueFormatterState Nest() => new ThemedValueFormatterState { Output = Output };
diff --git a/src/Serilog.Sinks.Console/Sinks/SystemConsole/Output/EventPropertyTokenRenderer.cs b/src/Serilog.Sinks.Console/Sinks/SystemConsole/Output/EventPropertyTokenRenderer.cs
@@ -25,9 +25,9 @@ class EventPropertyTokenRenderer : OutputTemplateTokenRenderer
     {
         readonly ConsoleTheme _theme;
         readonly PropertyToken _token;
-        readonly IFormatProvider _formatProvider;
+        readonly IFormatProvider? _formatProvider;
 
-        public EventPropertyTokenRenderer(ConsoleTheme theme, PropertyToken token, IFormatProvider formatProvider)
+        public EventPropertyTokenRenderer(ConsoleTheme theme, PropertyToken token, IFormatProvider? formatProvider)
         {
             _theme = theme;
             _token = token;
@@ -62,7 +62,7 @@ public override void Render(LogEvent logEvent, TextWriter output)
 
                 if (_token.Alignment.HasValue)
                 {
-                    var str = writer.ToString();
+                    var str = writer.ToString()!;
                     Padding.Apply(output, str, _token.Alignment);
                 }
             }
diff --git a/src/Serilog.Sinks.Console/Sinks/SystemConsole/Output/ExceptionTokenRenderer.cs b/src/Serilog.Sinks.Console/Sinks/SystemConsole/Output/ExceptionTokenRenderer.cs
@@ -38,7 +38,7 @@ public override void Render(LogEvent logEvent, TextWriter output)
                 return;
 
             var lines = new StringReader(logEvent.Exception.ToString());
-            string nextLine;
+            string? nextLine;
             while ((nextLine = lines.ReadLine()) != null)
             {
                 var style = nextLine.StartsWith(StackFrameLinePrefix) ? ConsoleThemeStyle.SecondaryText : ConsoleThemeStyle.Text;
diff --git a/src/Serilog.Sinks.Console/Sinks/SystemConsole/Output/LevelOutputFormat.cs b/src/Serilog.Sinks.Console/Sinks/SystemConsole/Output/LevelOutputFormat.cs
@@ -55,7 +55,7 @@ static class LevelOutputFormat
             new[] { "F", "FA", "FTL", "FATL" },
         };
 
-        public static string GetLevelMoniker(LogEventLevel value, string format = null)
+        public static string GetLevelMoniker(LogEventLevel value, string? format = null)
         {
             if (format is null || format.Length != 2 && format.Length != 3)
                 return Casing.Format(value.ToString(), format);
diff --git a/src/Serilog.Sinks.Console/Sinks/SystemConsole/Output/LevelTokenRenderer.cs b/src/Serilog.Sinks.Console/Sinks/SystemConsole/Output/LevelTokenRenderer.cs
@@ -42,10 +42,6 @@ public LevelTokenRenderer(ConsoleTheme theme, PropertyToken levelToken)
             _levelToken = levelToken;
         }
 
-        protected LevelTokenRenderer()
-        {
-        }
-
         public override void Render(LogEvent logEvent, TextWriter output)
         {
             var moniker = LevelOutputFormat.GetLevelMoniker(logEvent.Level, _levelToken.Format);
diff --git a/src/Serilog.Sinks.Console/Sinks/SystemConsole/Output/MessageTemplateOutputTokenRenderer.cs b/src/Serilog.Sinks.Console/Sinks/SystemConsole/Output/MessageTemplateOutputTokenRenderer.cs
@@ -28,10 +28,11 @@ class MessageTemplateOutputTokenRenderer : OutputTemplateTokenRenderer
         readonly PropertyToken _token;
         readonly ThemedMessageTemplateRenderer _renderer;
 
-        public MessageTemplateOutputTokenRenderer(ConsoleTheme theme, PropertyToken token, IFormatProvider formatProvider)
+        public MessageTemplateOutputTokenRenderer(ConsoleTheme theme, PropertyToken token, IFormatProvider? formatProvider)
         {
             _theme = theme ?? throw new ArgumentNullException(nameof(theme));
             _token = token ?? throw new ArgumentNullException(nameof(token));
+
             bool isLiteral = false, isJson = false;
 
             if (token.Format != null)
diff --git a/src/Serilog.Sinks.Console/Sinks/SystemConsole/Output/OutputTemplateRenderer.cs b/src/Serilog.Sinks.Console/Sinks/SystemConsole/Output/OutputTemplateRenderer.cs
@@ -27,7 +27,7 @@ class OutputTemplateRenderer : ITextFormatter
     {
         readonly OutputTemplateTokenRenderer[] _renderers;
 
-        public OutputTemplateRenderer(ConsoleTheme theme, string outputTemplate, IFormatProvider formatProvider)
+        public OutputTemplateRenderer(ConsoleTheme theme, string outputTemplate, IFormatProvider? formatProvider)
         {
             if (outputTemplate is null) throw new ArgumentNullException(nameof(outputTemplate));
             var template = new MessageTemplateParser().Parse(outputTemplate);
diff --git a/src/Serilog.Sinks.Console/Sinks/SystemConsole/Output/PropertiesTokenRenderer.cs b/src/Serilog.Sinks.Console/Sinks/SystemConsole/Output/PropertiesTokenRenderer.cs
@@ -31,11 +31,12 @@ class PropertiesTokenRenderer : OutputTemplateTokenRenderer
         readonly PropertyToken _token;
         readonly ThemedValueFormatter _valueFormatter;
 
-        public PropertiesTokenRenderer(ConsoleTheme theme, PropertyToken token, MessageTemplate outputTemplate, IFormatProvider formatProvider)
+        public PropertiesTokenRenderer(ConsoleTheme theme, PropertyToken token, MessageTemplate outputTemplate, IFormatProvider? formatProvider)
         {
             _outputTemplate = outputTemplate;
             _theme = theme ?? throw new ArgumentNullException(nameof(theme));
             _token = token ?? throw new ArgumentNullException(nameof(token));
+
             var isJson = false;
 
             if (token.Format != null)
diff --git a/src/Serilog.Sinks.Console/Sinks/SystemConsole/Output/TimestampTokenRenderer.cs b/src/Serilog.Sinks.Console/Sinks/SystemConsole/Output/TimestampTokenRenderer.cs
@@ -25,9 +25,9 @@ class TimestampTokenRenderer : OutputTemplateTokenRenderer
     {
         readonly ConsoleTheme _theme;
         readonly PropertyToken _token;
-        readonly IFormatProvider _formatProvider;
+        readonly IFormatProvider? _formatProvider;
 
-        public TimestampTokenRenderer(ConsoleTheme theme, PropertyToken token, IFormatProvider formatProvider)
+        public TimestampTokenRenderer(ConsoleTheme theme, PropertyToken token, IFormatProvider? formatProvider)
         {
             _theme = theme;
             _token = token;
diff --git a/src/Serilog.Sinks.Console/Sinks/SystemConsole/Rendering/Casing.cs b/src/Serilog.Sinks.Console/Sinks/SystemConsole/Rendering/Casing.cs
@@ -23,7 +23,7 @@ static class Casing
         /// <param name="value">Provided string for formatting.</param>
         /// <param name="format">Format string.</param>
         /// <returns>The provided <paramref name="value"/> with formatting applied.</returns>
-        public static string Format(string value, string format = null)
+        public static string Format(string value, string? format = null)
         {
             switch (format)
             {
diff --git a/src/Serilog.Sinks.Console/Sinks/SystemConsole/Rendering/ThemedMessageTemplateRenderer.cs b/src/Serilog.Sinks.Console/Sinks/SystemConsole/Rendering/ThemedMessageTemplateRenderer.cs
@@ -102,11 +102,12 @@ int RenderPropertyToken(PropertyToken pt, IReadOnlyDictionary<string, LogEventPr
 
         int RenderAlignedPropertyTokenUnbuffered(PropertyToken pt, TextWriter output, LogEventPropertyValue propertyValue)
         {
+            if(pt.Alignment == null) throw new ArgumentException("The PropertyToken should have a non-null Alignment.", nameof(pt));
+
             var valueOutput = new StringWriter();
             RenderValue(NoTheme, _unthemedValueFormatter, propertyValue, valueOutput, pt.Format);
 
             var valueLength = valueOutput.ToString().Length;
-            // ReSharper disable once PossibleInvalidOperationException
             if (valueLength >= pt.Alignment.Value.Width)
             {
                 return RenderValue(_theme, _valueFormatter, propertyValue, output, pt.Format);
@@ -123,7 +124,7 @@ int RenderAlignedPropertyTokenUnbuffered(PropertyToken pt, TextWriter output, Lo
             return RenderValue(_theme, _valueFormatter, propertyValue, output, pt.Format);
         }
 
-        int RenderValue(ConsoleTheme theme, ThemedValueFormatter valueFormatter, LogEventPropertyValue propertyValue, TextWriter output, string format)
+        int RenderValue(ConsoleTheme theme, ThemedValueFormatter valueFormatter, LogEventPropertyValue propertyValue, TextWriter output, string? format)
         {
             if (_isLiteral && propertyValue is ScalarValue sv && sv.Value is string)
             {
diff --git a/src/Serilog.Sinks.Console/Support/NullableAttributes..cs b/src/Serilog.Sinks.Console/Support/NullableAttributes..cs
diff --git a/test/Serilog.Sinks.Console.Tests/Output/OutputTemplateRendererTests.cs b/test/Serilog.Sinks.Console.Tests/Output/OutputTemplateRendererTests.cs
diff --git a/test/Serilog.Sinks.Console.Tests/Rendering/ThemedMessageTemplateRendererTests.cs b/test/Serilog.Sinks.Console.Tests/Rendering/ThemedMessageTemplateRendererTests.cs
diff --git a/test/Serilog.Sinks.Console.Tests/Serilog.Sinks.Console.Tests.csproj b/test/Serilog.Sinks.Console.Tests/Serilog.Sinks.Console.Tests.csproj
diff --git a/test/Serilog.Sinks.Console.Tests/Support/DelegatingSink.cs b/test/Serilog.Sinks.Console.Tests/Support/DelegatingSink.cs

Original file line number	Diff line number	Diff line change
`@@ -22,9 +22,9 @@ namespace Serilog.Sinks.SystemConsole.Formatting`
`22`	`22`	`{`
`23`	`23`	`class ThemedDisplayValueFormatter : ThemedValueFormatter`
`24`	`24`	`{`
`25`		`- readonly IFormatProvider _formatProvider;`
	`25`	`+ readonly IFormatProvider? _formatProvider;`
`26`	`26`
`27`		`- public ThemedDisplayValueFormatter(ConsoleTheme theme, IFormatProvider formatProvider)`
	`27`	`+ public ThemedDisplayValueFormatter(ConsoleTheme theme, IFormatProvider? formatProvider)`
`28`	`28`	`: base(theme)`
`29`	`29`	`{`
`30`	`30`	`_formatProvider = formatProvider;`
`@@ -150,7 +150,7 @@ protected override int VisitDictionaryValue(ThemedValueFormatterState state, Dic`
`150`	`150`	`return count;`
`151`	`151`	`}`
`152`	`152`
`153`		`- public int FormatLiteralValue(ScalarValue scalar, TextWriter output, string format)`
	`153`	`+ public int FormatLiteralValue(ScalarValue scalar, TextWriter output, string? format)`
`154`	`154`	`{`
`155`	`155`	`var value = scalar.Value;`
`156`	`156`	`var count = 0;`
Original file line number	Diff line number	Diff line change
`@@ -24,9 +24,9 @@ namespace Serilog.Sinks.SystemConsole.Formatting`
`24`	`24`	`class ThemedJsonValueFormatter : ThemedValueFormatter`
`25`	`25`	`{`
`26`	`26`	`readonly ThemedDisplayValueFormatter _displayFormatter;`
`27`		`- readonly IFormatProvider _formatProvider;`
	`27`	`+ readonly IFormatProvider? _formatProvider;`
`28`	`28`
`29`		`- public ThemedJsonValueFormatter(ConsoleTheme theme, IFormatProvider formatProvider)`
	`29`	`+ public ThemedJsonValueFormatter(ConsoleTheme theme, IFormatProvider? formatProvider)`
`30`	`30`	`: base(theme)`
`31`	`31`	`{`
`32`	`32`	`_displayFormatter = new ThemedDisplayValueFormatter(theme, formatProvider);`
`@@ -154,7 +154,7 @@ protected override int VisitDictionaryValue(ThemedValueFormatterState state, Dic`
`154`	`154`	`: ConsoleThemeStyle.Scalar;`
`155`	`155`
`156`	`156`	`using (ApplyStyle(state.Output, style, ref count))`
`157`		`- JsonValueFormatter.WriteQuotedJsonString((element.Key.Value ?? "null").ToString(), state.Output);`
	`157`	`+ JsonValueFormatter.WriteQuotedJsonString((element.Key.Value ?? "null").ToString() ?? "", state.Output);`
`158`	`158`
`159`	`159`	`using (ApplyStyle(state.Output, ConsoleThemeStyle.TertiaryText, ref count))`
`160`	`160`	`state.Output.Write(": ");`
`@@ -248,7 +248,7 @@ int FormatLiteralValue(ScalarValue scalar, TextWriter output)`
`248`	`248`	`}`
`249`	`249`
`250`	`250`	`using (ApplyStyle(output, ConsoleThemeStyle.Scalar, ref count))`
`251`		`- JsonValueFormatter.WriteQuotedJsonString(value.ToString(), output);`
	`251`	`+ JsonValueFormatter.WriteQuotedJsonString(value.ToString() ?? "", output);`
`252`	`252`
`253`	`253`	`return count;`
`254`	`254`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ protected StyleReset ApplyStyle(TextWriter output, ConsoleThemeStyle style, ref`
`34`	`34`	`return _theme.Apply(output, style, ref invisibleCharacterCount);`
`35`	`35`	`}`
`36`	`36`
`37`		`- public int Format(LogEventPropertyValue value, TextWriter output, string format, bool literalTopLevel = false)`
	`37`	`+ public int Format(LogEventPropertyValue value, TextWriter output, string? format, bool literalTopLevel = false)`
`38`	`38`	`{`
`39`	`39`	`return Visit(new ThemedValueFormatterState { Output = output, Format = format, IsTopLevel = literalTopLevel }, value);`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ namespace Serilog.Sinks.SystemConsole.Formatting`
`19`	`19`	`struct ThemedValueFormatterState`
`20`	`20`	`{`
`21`	`21`	`public TextWriter Output;`
`22`		`- public string Format;`
	`22`	`+ public string? Format;`
`23`	`23`	`public bool IsTopLevel;`
`24`	`24`
`25`	`25`	`public ThemedValueFormatterState Nest() => new ThemedValueFormatterState { Output = Output };`
Original file line number	Diff line number	Diff line change
`@@ -25,9 +25,9 @@ class EventPropertyTokenRenderer : OutputTemplateTokenRenderer`
`25`	`25`	`{`
`26`	`26`	`readonly ConsoleTheme _theme;`
`27`	`27`	`readonly PropertyToken _token;`
`28`		`- readonly IFormatProvider _formatProvider;`
	`28`	`+ readonly IFormatProvider? _formatProvider;`
`29`	`29`
`30`		`- public EventPropertyTokenRenderer(ConsoleTheme theme, PropertyToken token, IFormatProvider formatProvider)`
	`30`	`+ public EventPropertyTokenRenderer(ConsoleTheme theme, PropertyToken token, IFormatProvider? formatProvider)`
`31`	`31`	`{`
`32`	`32`	`_theme = theme;`
`33`	`33`	`_token = token;`
`@@ -62,7 +62,7 @@ public override void Render(LogEvent logEvent, TextWriter output)`
`62`	`62`
`63`	`63`	`if (_token.Alignment.HasValue)`
`64`	`64`	`{`
`65`		`- var str = writer.ToString();`
	`65`	`+ var str = writer.ToString()!;`
`66`	`66`	`Padding.Apply(output, str, _token.Alignment);`
`67`	`67`	`}`
`68`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public override void Render(LogEvent logEvent, TextWriter output)`
`38`	`38`	`return;`
`39`	`39`
`40`	`40`	`var lines = new StringReader(logEvent.Exception.ToString());`
`41`		`- string nextLine;`
	`41`	`+ string? nextLine;`
`42`	`42`	`while ((nextLine = lines.ReadLine()) != null)`
`43`	`43`	`{`
`44`	`44`	`var style = nextLine.StartsWith(StackFrameLinePrefix) ? ConsoleThemeStyle.SecondaryText : ConsoleThemeStyle.Text;`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ static class LevelOutputFormat`
`55`	`55`	`new[] { "F", "FA", "FTL", "FATL" },`
`56`	`56`	`};`
`57`	`57`
`58`		`- public static string GetLevelMoniker(LogEventLevel value, string format = null)`
	`58`	`+ public static string GetLevelMoniker(LogEventLevel value, string? format = null)`
`59`	`59`	`{`
`60`	`60`	`if (format is null \|\| format.Length != 2 && format.Length != 3)`
`61`	`61`	`return Casing.Format(value.ToString(), format);`