Merge from dev

Author: daningalla

src/Vertical.CommandLine/Vertical.CommandLine.csproj

@@ -8,7 +8,7 @@
 	  <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
     <Description>Simple command line argument mapping</Description>
     <Authors>Vertical Software contributors</Authors>
-	  <VersionPrefix>1.0.1</VersionPrefix>
+	  <VersionPrefix>1.0.2</VersionPrefix>
     <PackageId>vertical-commandline</PackageId>
 	  <PackageTags>commandline;utilities</PackageTags>
 	  <PackageProjectUrl>https://github.com/verticalsoftware/vertical-commandline</PackageProjectUrl>

src/Vertical.CommandLine/Vertical/CommandLine/CommandLineException.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Vertical.CommandLine
+{
+    /// <summary>
+    /// Represents the base type for exceptions in this namespace.
+    /// </summary>
+    [ExcludeFromCodeCoverage]
+    public abstract class CommandLineException : Exception
+    {
+        /// <summary>
+        /// Creates a new instance of this type.
+        /// </summary>
+        /// <param name="message">Message</param>
+        /// <param name="innerException">Inner exception or null reference.</param>
+        protected CommandLineException(string message, Exception innerException = null)
+            : base(message, innerException)
+        {
+        }
+    }
+}

src/Vertical.CommandLine/Vertical/CommandLine/Configuration/ConfigurationException.cs

@@ -19,7 +19,7 @@ namespace Vertical.CommandLine.Configuration
     /// - A converter wasn't specified, and the API didn't find an out-of-box option
     /// - An exception was thrown in mapping, conversion or validation delegate code
     /// </remarks>
-    public sealed class ConfigurationException : Exception
+    public sealed class ConfigurationException : CommandLineException
     {
         /// <inheritdoc />
         internal ConfigurationException(string message, Exception innerException = null) 

src/Vertical.CommandLine/Vertical/CommandLine/Mapping/DelegateMapper.cs

@@ -37,6 +37,10 @@ public virtual void MapValue(TOptions options, TValue value)
             {
                 throw ConfigurationExceptions.NullReferenceInMapping<TOptions>(ex);
             }
+            catch (UsageException) 
+            { 
+                throw; 
+            }
             catch (Exception ex)
             {
                 throw ConfigurationExceptions.ErrorInDelegateMapping(ex);

src/Vertical.CommandLine/Vertical/CommandLine/Mapping/Mapper.cs

@@ -32,7 +32,11 @@ internal static void MapValue<TOptions, TValue>(IMapper<TOptions, TValue> mapper
             {
                 mapper.MapValue(options, value);
             }
-            catch (Exception ex) when (!(ex is UsageException))
+            catch (CommandLineException) 
+            { 
+                throw; 
+            }
+            catch (Exception ex)
             {
                 throw ConfigurationExceptions.MappingFailed(context, ex);
             }

src/Vertical.CommandLine/Vertical/CommandLine/UsageException.cs

@@ -11,7 +11,7 @@ namespace Vertical.CommandLine
     /// <summary>
     /// Represents an error caused by user input.
     /// </summary>
-    public class UsageException : Exception
+    public class UsageException : CommandLineException
     {
         /// <summary>
         /// Creates a new instance.