Update to C# 10 and use file-scoped namespaces

Author: 0xced

src/CDataMode.cs

@@ -1,21 +1,20 @@
-namespace Serilog.Formatting.Log4Net
+namespace Serilog.Formatting.Log4Net;
+
+/// <summary>
+/// Controls how <see cref="Log4NetTextFormatter"/> writes <c>message</c> and <c>exception</c> XML elements.
+/// </summary>
+public enum CDataMode
 {
     /// <summary>
-    /// Controls how <see cref="Log4NetTextFormatter"/> writes <c>message</c> and <c>exception</c> XML elements.
+    /// The XML element content is always written as a CDATA section.
     /// </summary>
-    public enum CDataMode
-    {
-        /// <summary>
-        /// The XML element content is always written as a CDATA section.
-        /// </summary>
-        Always,
-        /// <summary>
-        /// The XML element content is never written as a CDATA section. I.e. the characters '&amp;', '&lt;' and '&gt;' are escaped.
-        /// </summary>
-        Never,
-        /// <summary>
-        /// The XML element content is written as CDATA section if its content contains the '&amp;', '&lt;' or '&gt;' character.
-        /// </summary>
-        IfNeeded,
-    }
-}
+    Always,
+    /// <summary>
+    /// The XML element content is never written as a CDATA section. I.e. the characters '&amp;', '&lt;' and '&gt;' are escaped.
+    /// </summary>
+    Never,
+    /// <summary>
+    /// The XML element content is written as CDATA section if its content contains the '&amp;', '&lt;' or '&gt;' character.
+    /// </summary>
+    IfNeeded,
+}

src/Indentation.cs

@@ -1,17 +1,16 @@
-namespace Serilog.Formatting.Log4Net
+namespace Serilog.Formatting.Log4Net;
+
+/// <summary>
+/// Possible values for XML elements indentation.
+/// </summary>
+public enum Indentation
 {
     /// <summary>
-    /// Possible values for XML elements indentation.
+    /// Indent with the space character, i.e. unicode U+0020.
     /// </summary>
-    public enum Indentation
-    {
-        /// <summary>
-        /// Indent with the space character, i.e. unicode U+0020.
-        /// </summary>
-        Space,
-        /// <summary>
-        /// Indent with the tabulation character, i.e. unicode U+0009.
-        /// </summary>
-        Tab,
-    }
+    Space,
+    /// <summary>
+    /// Indent with the tabulation character, i.e. unicode U+0009.
+    /// </summary>
+    Tab,
 }

src/IndentationSettings.cs

@@ -1,37 +1,36 @@
 using System;
 
-namespace Serilog.Formatting.Log4Net
+namespace Serilog.Formatting.Log4Net;
+
+/// <summary>
+/// Defines how XML elements are indented.
+/// </summary>
+public class IndentationSettings
 {
+    private readonly string _indentationString;
+
     /// <summary>
-    /// Defines how XML elements are indented.
+    /// Initialize a new instance of the <see cref="IndentationSettings"/> class.
     /// </summary>
-    public class IndentationSettings
+    /// <param name="indentation">The <see cref="Log4Net.Indentation"/> character to use for indenting XML elements.</param>
+    /// <param name="size">The number of times the <see cref="Indentation"/> character is repeated.</param>
+    /// <exception cref="ArgumentOutOfRangeException">If the <paramref name="size"/> is zero or if the <paramref name="indentation"/> is an invalid value for the enum type <see cref="Indentation"/>.</exception>
+    public IndentationSettings(Indentation indentation, byte size)
     {
-        private readonly string _indentationString;
-
-        /// <summary>
-        /// Initialize a new instance of the <see cref="IndentationSettings"/> class.
-        /// </summary>
-        /// <param name="indentation">The <see cref="Log4Net.Indentation"/> character to use for indenting XML elements.</param>
-        /// <param name="size">The number of times the <see cref="Indentation"/> character is repeated.</param>
-        /// <exception cref="ArgumentOutOfRangeException">If the <paramref name="size"/> is zero or if the <paramref name="indentation"/> is an invalid value for the enum type <see cref="Indentation"/>.</exception>
-        public IndentationSettings(Indentation indentation, byte size)
+        if (size == 0)
         {
-            if (size == 0)
-            {
-                throw new ArgumentOutOfRangeException(nameof(size), size, $"The value of argument '{nameof(size)}' must be greater than 0.");
-            }
-            _indentationString = indentation switch
-            {
-                Indentation.Space => new string(c: ' ', size),
-                Indentation.Tab => new string(c: '\t', size),
-                _ => throw new ArgumentOutOfRangeException(nameof(indentation), indentation, $"The value of argument '{nameof(indentation)}' ({indentation}) is invalid for enum type '{nameof(Indentation)}'.")
-            };
+            throw new ArgumentOutOfRangeException(nameof(size), size, $"The value of argument '{nameof(size)}' must be greater than 0.");
         }
-
-        /// <summary>
-        /// Returns a string representation of the indentation settings.
-        /// </summary>
-        public override string ToString() => _indentationString;
+        _indentationString = indentation switch
+        {
+            Indentation.Space => new string(c: ' ', size),
+            Indentation.Tab => new string(c: '\t', size),
+            _ => throw new ArgumentOutOfRangeException(nameof(indentation), indentation, $"The value of argument '{nameof(indentation)}' ({indentation}) is invalid for enum type '{nameof(Indentation)}'.")
+        };
     }
+
+    /// <summary>
+    /// Returns a string representation of the indentation settings.
+    /// </summary>
+    public override string ToString() => _indentationString;
 }

src/LineEnding.cs

@@ -1,49 +1,48 @@
 using System;
 
-namespace Serilog.Formatting.Log4Net
+namespace Serilog.Formatting.Log4Net;
+
+/// <summary>
+/// Possible XML line endings.
+/// <para>Both <see cref="CarriageReturn"/> and <see cref="LineFeed"/> can be combined, i.e. <c>LineEnding.CarriageReturn | LineEnding.LineFeed</c> in order to produce the CR+LF characters.</para>
+/// <para>See also [End-of-Line Handling](https://www.w3.org/TR/xml/#sec-line-ends) in the XML specification.</para>
+/// </summary>
+[Flags]
+public enum LineEnding
 {
     /// <summary>
-    /// Possible XML line endings.
-    /// <para>Both <see cref="CarriageReturn"/> and <see cref="LineFeed"/> can be combined, i.e. <c>LineEnding.CarriageReturn | LineEnding.LineFeed</c> in order to produce the CR+LF characters.</para>
-    /// <para>See also [End-of-Line Handling](https://www.w3.org/TR/xml/#sec-line-ends) in the XML specification.</para>
+    /// No line ending.
     /// </summary>
-    [Flags]
-    public enum LineEnding
-    {
-        /// <summary>
-        /// No line ending.
-        /// </summary>
-        None = 0,
-        /// <summary>
-        /// End lines with the line feed (LF) character, i.e. unicode U+000A.
-        /// </summary>
-        LineFeed = 1,
-        /// <summary>
-        /// End lines with the carriage return (CR) character, i.e. unicode U+000D.
-        /// </summary>
-        CarriageReturn = 2,
-    }
+    None = 0,
+    /// <summary>
+    /// End lines with the line feed (LF) character, i.e. unicode U+000A.
+    /// </summary>
+    LineFeed = 1,
+    /// <summary>
+    /// End lines with the carriage return (CR) character, i.e. unicode U+000D.
+    /// </summary>
+    CarriageReturn = 2,
+}
 
+/// <summary>
+/// Extensions to the <see cref="LineEnding"/> enum type.
+/// </summary>
+internal static class LineEndingExtensions
+{
     /// <summary>
-    /// Extensions to the <see cref="LineEnding"/> enum type.
+    /// Returns a string representation of the specified <paramref name="lineEnding"/>.
     /// </summary>
-    internal static class LineEndingExtensions
+    /// <param name="lineEnding">The <see cref="LineEnding"/> to convert to a string.</param>
+    /// <returns>A string representation of the <see cref="LineEnding"/>.</returns>
+    public static string ToCharacters(this LineEnding lineEnding)
     {
-        /// <summary>
-        /// Returns a string representation of the specified <paramref name="lineEnding"/>.
-        /// </summary>
-        /// <param name="lineEnding">The <see cref="LineEnding"/> to convert to a string.</param>
-        /// <returns>A string representation of the <see cref="LineEnding"/>.</returns>
-        public static string ToCharacters(this LineEnding lineEnding)
+        return lineEnding switch
         {
-            return lineEnding switch
-            {
-                LineEnding.None => "",
-                LineEnding.LineFeed => "\n",
-                LineEnding.CarriageReturn => "\r",
-                LineEnding.CarriageReturn | LineEnding.LineFeed => "\r\n",
-                _ => throw new ArgumentOutOfRangeException(nameof(lineEnding), lineEnding, $"The value of argument '{nameof(lineEnding)}' ({lineEnding}) is invalid for enum type '{nameof(LineEnding)}'.")
-            };
-        }
+            LineEnding.None => "",
+            LineEnding.LineFeed => "\n",
+            LineEnding.CarriageReturn => "\r",
+            LineEnding.CarriageReturn | LineEnding.LineFeed => "\r\n",
+            _ => throw new ArgumentOutOfRangeException(nameof(lineEnding), lineEnding, $"The value of argument '{nameof(lineEnding)}' ({lineEnding}) is invalid for enum type '{nameof(LineEnding)}'.")
+        };
     }
 }