Merge pull request #3 from AppCoreNet/features/extend-error-codes

Fix error codes

Author: prochnowc

src/AppCore.SigningTool/Commands/Sn/SnCreateKeyCommand.cs

@@ -48,7 +48,7 @@ public int Execute(CommandLineApplication cmd)
             try
             {
                 if (File.Exists(keyFile) && !force)
-                    throw new FileAreadyExistsException(keyFile);
+                    throw new FileAlreadyExistsException(keyFile);
 
                 StrongNameKey key = _keyGenerator.Generate(keySize);
                 File.WriteAllBytes(keyFile, key.CreateStrongName());

src/AppCore.SigningTool/Commands/Sn/SnExportPublicKeyCommand.cs

@@ -54,21 +54,28 @@ public void Configure(CommandLineApplication cmd)
 
         private AssemblyHashAlgorithm ParseAssemblyHashAlgorithm(string value)
         {
-            var result = AssemblyHashAlgorithm.None;
-            switch (value.ToLowerInvariant())
+            var result = AssemblyHashAlgorithm.SHA1;
+
+            if (!string.IsNullOrEmpty(value))
             {
-                case "sha1":
-                    result = AssemblyHashAlgorithm.SHA1;
-                    break;
-                case "sha256":
-                    result = AssemblyHashAlgorithm.SHA_256;
-                    break;
-                case "sha384":
-                    result = AssemblyHashAlgorithm.SHA_384;
-                    break;
-                case "sha512":
-                    result = AssemblyHashAlgorithm.SHA_512;
-                    break;
+                switch (value.ToLowerInvariant())
+                {
+                    case "sha1":
+                        result = AssemblyHashAlgorithm.SHA1;
+                        break;
+                    case "sha256":
+                        result = AssemblyHashAlgorithm.SHA_256;
+                        break;
+                    case "sha384":
+                        result = AssemblyHashAlgorithm.SHA_384;
+                        break;
+                    case "sha512":
+                        result = AssemblyHashAlgorithm.SHA_512;
+                        break;
+                    default:
+                        result = AssemblyHashAlgorithm.None;
+                        break;
+                }
             }
 
             return result;
@@ -78,17 +85,15 @@ public int Execute(CommandLineApplication cmd)
         {
             bool force = _force.HasValue();
 
-            AssemblyHashAlgorithm hashAlgorithm = _hashAlgorithm.HasValue()
-                ? ParseAssemblyHashAlgorithm(_hashAlgorithm.ParsedValue)
-                : AssemblyHashAlgorithm.SHA1;
+            AssemblyHashAlgorithm hashAlgorithm = ParseAssemblyHashAlgorithm(_hashAlgorithm.ParsedValue);
 
             string keyFile = _keyFile.Value;
             string publicKeyFile = _publicKeyFile.Value;
 
             try
             {
                 if (File.Exists(publicKeyFile) && !force)
-                    throw new FileAreadyExistsException(publicKeyFile);
+                    throw new FileAlreadyExistsException(publicKeyFile);
 
                 StrongNameKey key = _keyLoader.LoadKey(keyFile);
 

src/AppCore.SigningTool/Commands/Sn/SnSignCommand.cs

@@ -59,7 +59,7 @@ public int Execute(CommandLineApplication cmd)
             try
             {
                 if (File.Exists(outAssemblyFile) && !force)
-                    throw new FileAreadyExistsException(outAssemblyFile);
+                    throw new FileAlreadyExistsException(outAssemblyFile);
 
                 if (delaySign)
                 {

…/Exceptions/FileAreadyExistsException.cs …Exceptions/FileAlreadyExistsException.cssrc/AppCore.SigningTool/Exceptions/FileAreadyExistsException.cs renamed to src/AppCore.SigningTool/Exceptions/FileAlreadyExistsException.cs src/AppCore.SigningTool/Exceptions/FileAreadyExistsException.cs renamed to src/AppCore.SigningTool/Exceptions/FileAlreadyExistsException.cs

@@ -2,9 +2,9 @@
 
 namespace AppCore.SigningTool.Exceptions
 {
-    public class FileAreadyExistsException : IOException
+    public class FileAlreadyExistsException : IOException
     {
-        public FileAreadyExistsException(string fileName)
+        public FileAlreadyExistsException(string fileName)
             : base($"File {Path.GetFullPath(fileName)} already exists.")
         {
         }

src/AppCore.SigningTool/ExitCodes.cs

@@ -14,22 +14,27 @@ internal static class ExitCodes
 
         public const int UnrecognizedCommandOrArgument = 1;
 
-        public const int FileNotFound = 2;
+        public const int DirectoryNotFound = 2;
 
-        public const int InvalidKey = 3;
+        public const int FileNotFound = 3;
 
-        public const int InvalidAssembly = 4;
+        public const int FileAlreadyExists = 4;
 
-        public const int FileAreadyExists = 5;
+        public const int InvalidKey = 5;
+
+        public const int InvalidAssembly = 6;
 
         public const int Unknown = -1;
 
         public static int FromException(Exception error)
         {
             switch (error)
             {
-                case FileAreadyExistsException _:
-                    return FileAreadyExists;
+                case FileAlreadyExistsException _:
+                    return FileAlreadyExists;
+
+                case DirectoryNotFoundException _:
+                    return DirectoryNotFound;
 
                 case FileNotFoundException _:
                     return FileNotFound;