Merge pull request #93 from hsaito/develop

Additional versioning resolutions

Author: hsaito

MyNumberNET/MyNumber.cs

@@ -16,11 +16,13 @@ public class MyNumber
         /// <returns>Whether it is a valid "My Number" sequence</returns>
         public static bool VerifyNumber(int[] number)
         {
+            if (number == null)
+                throw new MyNumberMalformedException("Input array is null.");
             if (number.Length != 12)
                 throw new MyNumberMalformedException("Malformed sequence. Must be 12 digits.");
-
+            if (Array.Exists(number, n => n < 0 || n > 9))
+                throw new MyNumberMalformedException("All digits must be between 0 and 9.");
             var checkDigit = CalculateCheckDigits(Truncate(number));
-
             return number[11] == checkDigit;
         }
 
@@ -32,22 +34,19 @@ public static bool VerifyNumber(int[] number)
         /// <returns>Check digit for the "My Number" supplied</returns>
         public static int CalculateCheckDigits(int[] number)
         {
+            if (number == null)
+                throw new MyNumberMalformedException("Input array is null.");
             if (number.Length != 11)
                 throw new MyNumberMalformedException("Malformed sequence. Must be 11 digits.");
-
-            // They count their digits high to low, so reorder it
+            if (Array.Exists(number, n => n < 0 || n > 9))
+                throw new MyNumberMalformedException("All digits must be between 0 and 9.");
             Array.Reverse(number);
-
             var sum = 0;
             for (var n = 1; n < 7; n++)
-                // From digit 1 to 6, sum is n+1
                 sum += (n + 1) * number[n - 1];
-
             for (var n = 7; n < 12; n++)
-                // From digit 7 to 11, sum is n-5
                 sum += (n - 5) * number[n - 1];
             Array.Reverse(number);
-            // Calculate against MOD
             if (sum % 11 <= 1)
                 return 0;
             return 11 - sum % 11;
@@ -61,8 +60,7 @@ public int[] GenerateRandomNumber()
         {
             var result = new int[12];
             for (var i = 0; i < 11; i++)
-                result[i] = _random.Next(0, 9);
-
+                result[i] = _random.Next(0, 10);
             result[11] = CalculateCheckDigits(Truncate(result));
             return result;
         }
@@ -75,6 +73,8 @@ public int[] GenerateRandomNumber()
         /// <returns></returns>
         private static int[] Truncate(IReadOnlyList<int> number)
         {
+            if (number == null)
+                throw new MyNumberMalformedException("Input array is null.");
             if (number.Count < 11 || number.Count > 12)
                 throw new MyNumberMalformedException("Malformed sequence. Must be 11 or 12 digits.");
             var result = new int[11];
@@ -85,15 +85,15 @@ private static int[] Truncate(IReadOnlyList<int> number)
 
         #region Exceptions
 
-        private class MyNumberException : Exception
+        public class MyNumberException : Exception
         {
-            protected MyNumberException(string message)
+            public MyNumberException(string message)
                 : base(message)
             {
             }
         }
 
-        private class MyNumberMalformedException : MyNumberException
+        public class MyNumberMalformedException : MyNumberException
         {
             public MyNumberMalformedException(string message)
                 : base(message)

MyNumberNET/MyNumberNET.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Authors>Hideki Saito</Authors>
     <Company>Hideki Saito</Company>
     <Title>MyNumberNET My Number Validation Library</Title>

MyNumberNET_CLI/MyNumberNET_CLI.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Authors>Hideki Saito</Authors>
     <Company>Hideki Saito</Company>
     <Title>MyNumber My Number Validation Command Line Tool</Title>
@@ -17,23 +17,13 @@
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <ItemGroup>
-    <None Update="log4net.config">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="log4net" Version="3.2.0" />
+    <PackageReference Include="NLog" Version="5.2.0" />
     <PackageReference Include="System.Console" Version="4.3.1" />
     <PackageReference Include="System.Net.Sockets" Version="4.3.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\MyNumberNET\MyNumberNET.csproj" />
   </ItemGroup>
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-  </PropertyGroup>
-
   <PropertyGroup>
     <Deterministic>true</Deterministic>
     <DeterministicSourceRoot>/_/</DeterministicSourceRoot>