Merge pull request #5 from jellyhive/0.1.2

Support for .NET Standard 2.0

.github/workflows/csharp.yml

@@ -1,9 +1,9 @@
 name: Build & Test
 
 on:
+  push:
   pull_request:
-    branches: [ main ]
-
+
 jobs:
   build:
 

README.md

@@ -1,4 +1,6 @@
 [![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/jellyhive/swedishbankaccounts/csharp.yml?branch=main)](https://github.com/jellyhive/swedishbankaccounts/actions)
+[![NuGet](http://img.shields.io/nuget/v/SwedishBankAccounts.svg)](https://www.nuget.org/packages/SwedishBankAccounts/)
+[![Downloads](https://img.shields.io/nuget/dt/SwedishBankAccounts)](#)
 
 # Swedish Bank Account for C#
 

src/SwedishBankAccounts/BankAccountNumber.cs

@@ -38,11 +38,9 @@ private BankAccountNumber(string bank, string sortingCode, string accountNumber)
     /// <returns>The parsed bank account number</returns>
     public static BankAccountNumber Parse(string value)
     {
-        if(!TryParse(value, InitOptions.Strict, out var bankAccountNumber))
-        {
-            throw new FormatException("Invalid: " + nameof(value));
-        }
-        return bankAccountNumber;
+        return !TryParse(value, InitOptions.Strict, out var bankAccountNumber)
+            ? throw new FormatException("Invalid: " + nameof(value))
+            : bankAccountNumber!;
     }
     /// <summary>
     /// Parses a bank account number
@@ -52,8 +50,9 @@ public static BankAccountNumber Parse(string value)
     /// <returns>The parsed bank account number</returns>
     public static BankAccountNumber Parse(string value, InitOptions initOptions)
     {
-        if (TryParse(value, initOptions, out var bankAccountNumber)) throw new FormatException("Invalid: " + nameof(value));
-        return bankAccountNumber;
+        return TryParse(value, initOptions, out var bankAccountNumber)
+            ? throw new FormatException("Invalid: " + nameof(value))
+            : bankAccountNumber!;
     }
 
     /// <summary>
@@ -82,15 +81,15 @@ public static bool TryParse(string value, InitOptions? initOptions, out BankAcco
         bankAccountNumber = null;
         value = Regex.Replace(value, @"[^\d]", "");
 
-        if (value.StartsWith('8') && value.Length < 7) return false;
-        if(!value.StartsWith('8') && value.Length < 6) return false;
+        if (value.StartsWith("8") && value.Length < 7) return false;
+        if(!value.StartsWith("8") && value.Length < 6) return false;
 
-        var sortingCode = value[..(value.StartsWith('8') ? 5 : 4)];
-        var accountNumber = value[(value.StartsWith('8') ? 5 : 4)..];
+        var sortingCode = value.Substring(0, value.StartsWith("8") ? 5 : 4);
+        var accountNumber = value.Substring(value.StartsWith("8") ? 5 : 4);
 
         if (sortingCode.Length is < 4 or > 4 && !Modulus10.Validate(sortingCode)) return false;
 
-        var bank = SwedishBankAccounts.Bank.Banks.SingleOrDefault(s => s.HasSortingCode(sortingCode[..4]));
+        var bank = SwedishBankAccounts.Bank.Banks.SingleOrDefault(s => s.HasSortingCode(sortingCode.Substring(0, 4)));
         if(bank == null) return false;
 
         var valid = bank.BankAccountNumberType.Validate(sortingCode, accountNumber);

src/SwedishBankAccounts/BankAccountNumberType1A.cs

@@ -3,5 +3,5 @@
 public record BankAccountNumberType1A : BankAccountNumberType
 {
     public override bool Validate(string sortingCode, string accountNumber) => 
-        Modulus11.Validate($"{sortingCode[1..]}{accountNumber.PadLeft(7, '0')}");
+        Modulus11.Validate($"{sortingCode.Substring(1)}{accountNumber.PadLeft(7, '0')}");
 }

src/SwedishBankAccounts/Modulus10.cs

@@ -21,7 +21,7 @@ public static class Modulus10
     /// <returns>True if the number is valid according to to the modulus-10 method, otherwise false</returns>
     public static bool Validate(string number)
     {
-        var checkDigit = CalculateCheckDigit(number[..^1]);
+        var checkDigit = CalculateCheckDigit(number.Substring(0, number.Length - 1));
         return number.Last() - 48 == checkDigit;
     }
 

src/SwedishBankAccounts/Modulus11.cs

@@ -21,7 +21,7 @@ public static class Modulus11
     /// <returns>True if the number is valid according to to the modulus-11 method, otherwise false</returns>
     public static bool Validate(string number)
     {
-        var checkDigit = CalculateCheckDigit(number[..^1]);
+        var checkDigit = CalculateCheckDigit(number.Substring(0, number.Length - 1));
         return number.Last() - 48 == checkDigit;
     }
 

src/SwedishBankAccounts/SwedishBankAccounts.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>netstandard2.1</TargetFramework>
+		<TargetFramework>netstandard2.0</TargetFramework>
 		<Nullable>enable</Nullable>
 		<LangVersion>11.0</LangVersion>
 		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>