Updated to C# 12

AMWD.Common/Cli/CommandLineParser.cs

@@ -14,7 +14,7 @@ namespace AMWD.Common.Cli
 
 		private string[] _args;
 		private List<Argument> _parsedArguments;
-		private readonly List<Option> _options = new();
+		private readonly List<Option> _options = [];
 
 		#endregion Private data
 
@@ -129,7 +129,7 @@ namespace AMWD.Common.Cli
 			{
 				args.Add(currentArg.ToString());
 			}
-			return args.ToArray();
+			return [.. args];
 		}
 
 		/// <summary>
@@ -199,7 +199,7 @@ namespace AMWD.Common.Cli
 			}
 
 			// Clear/reset data
-			_parsedArguments = new();
+			_parsedArguments = [];
 			foreach (var option in _options)
 			{
 				option.IsSet = false;
@@ -223,7 +223,7 @@ namespace AMWD.Common.Cli
 					string optName = arg.Substring(arg.StartsWith("--") ? 2 : 1);
 
 					// Split option value if separated with : or = instead of whitespace
-					int separatorIndex = optName.IndexOfAny(new[] { ':', '=' });
+					int separatorIndex = optName.IndexOfAny([':', '=']);
 					string optValue = null;
 					if (separatorIndex != -1)
 					{
@@ -288,7 +288,7 @@ namespace AMWD.Common.Cli
 				}
 				else
 				{
-					_parsedArguments.Add(new Argument(null, new[] { arg }));
+					_parsedArguments.Add(new Argument(null, [arg]));
 				}
 			}
 
@@ -315,7 +315,7 @@ namespace AMWD.Common.Cli
 				if (_parsedArguments == null)
 					Parse();
 
-				return _parsedArguments.ToArray();
+				return [.. _parsedArguments];
 			}
 		}
 

AMWD.Common/Cli/EnumerableWalker.cs

@@ -8,21 +8,16 @@ namespace AMWD.Common.Cli
 	/// Walks through an <see cref="IEnumerable{T}"/> and allows retrieving additional items.
 	/// </summary>
 	/// <typeparam name="T"></typeparam>
-	internal class EnumerableWalker<T> : IEnumerable<T>
-		where T : class
+	/// <remarks>
+	/// Initialises a new instance of the <see cref="EnumerableWalker{T}"/> class.
+	/// </remarks>
+	/// <param name="array">The array to walk though.</param>
+	internal class EnumerableWalker<T>(IEnumerable<T> array)
+		: IEnumerable<T> where T : class
 	{
-		private readonly IEnumerable<T> _array;
+		private readonly IEnumerable<T> _array = array ?? throw new ArgumentNullException(nameof(array));
 		private IEnumerator<T> _enumerator;
 
-		/// <summary>
-		/// Initialises a new instance of the <see cref="EnumerableWalker{T}"/> class.
-		/// </summary>
-		/// <param name="array">The array to walk though.</param>
-		public EnumerableWalker(IEnumerable<T> array)
-		{
-			_array = array ?? throw new ArgumentNullException(nameof(array));
-		}
-
 		IEnumerator<T> IEnumerable<T>.GetEnumerator()
 		{
 			_enumerator = _array.GetEnumerator();

AMWD.Common/Cli/Option.cs

@@ -16,7 +16,7 @@ namespace AMWD.Common.Cli
 		/// <param name="parameterCount">The number of additional parameters for this option.</param>
 		internal Option(string name, int parameterCount)
 		{
-			Names = new List<string>() { name };
+			Names = [name];
 			ParameterCount = parameterCount;
 		}