Update dependencies (#10)

Fix code style

SystemExtensions.NetStandard.DependencyInjection/SystemExtensions.NetStandard.DependencyInjection.csproj

@@ -6,7 +6,7 @@
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <LangVersion>latest</LangVersion>
-    <Version>1.1.2</Version>
+    <Version>1.1.3</Version>
     <Authors>Alexandru Macocian</Authors>
     <RepositoryUrl>https://github.com/AlexMacocian/SystemExtensions</RepositoryUrl>
   </PropertyGroup>
@@ -21,8 +21,8 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.CorrelationVector" Version="1.0.42" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
-    <PackageReference Include="Slim" Version="1.5.1" />
+    <PackageReference Include="Slim" Version="1.5.2" />
-    <PackageReference Include="SystemExtensions.NetStandard" Version="1.3.0" />
+    <PackageReference Include="SystemExtensions.NetStandard" Version="1.3.1" />
   </ItemGroup>
 
 </Project>

SystemExtensions.NetStandard.Security/Encryption/AesEncrypter.cs

@@ -77,16 +77,16 @@ namespace SystemExtensions.NetStandard.Security.Encryption
 
         public async Task<Stream> Encrypt(string key, string iv, Stream value)
         {
-            if (value is null) throw new ArgumentNullException(nameof(value));
+            return value is null
-
+                ? throw new ArgumentNullException(nameof(value))
-            return await EncryptInternal(StringToBytes(key), StringToBytes(iv), value).ConfigureAwait(false);
+                : await EncryptInternal(StringToBytes(key), StringToBytes(iv), value).ConfigureAwait(false);
         }
 
         public async Task<Stream> Encrypt(byte[] key, byte[] iv, Stream value)
         {
-            if (value is null) throw new ArgumentNullException(nameof(value));
+            return value is null
-
+                ? throw new ArgumentNullException(nameof(value))
-            return await EncryptInternal(key, iv, value).ConfigureAwait(false);
+                : await EncryptInternal(key, iv, value).ConfigureAwait(false);
         }
 
         public Stream GetEncryptionStream(string key, string iv, Stream outStream)
@@ -112,9 +112,9 @@ namespace SystemExtensions.NetStandard.Security.Encryption
         private static byte[] StreamToBytes(Stream value)
         {
             value.Position = 0;
-            byte[] buffer = new byte[1024];
+            var buffer = new byte[1024];
             using var ms = new MemoryStream();
-            int read = -1;
+            var read = -1;
             do
             {
                 read = value.Read(buffer, 0, buffer.Length);

SystemExtensions.NetStandard.Security/Encryption/SecureString.cs

@@ -47,20 +47,33 @@ namespace System.Encryption
         public static implicit operator SecureString(string s) => new(s);
         public static SecureString operator +(SecureString ss1, SecureString ss2)
         {
-            if (ss1 is null) throw new ArgumentNullException(nameof(ss1));
+            if (ss1 is null)
-            if (ss2 is null) throw new ArgumentNullException(nameof(ss2));
+            {
+                throw new ArgumentNullException(nameof(ss1));
+            }
+
+            if (ss2 is null)
+            {
+                throw new ArgumentNullException(nameof(ss2));
+            }
 
             return new SecureString(ss1.Value + ss2.Value);
         }
         public static SecureString operator +(SecureString ss1, string s2)
         {
-            if (ss1 is null) throw new ArgumentNullException(nameof(ss1));
+            if (ss1 is null)
+            {
+                throw new ArgumentNullException(nameof(ss1));
+            }
 
             return new SecureString(ss1.Value + s2);
         }
         public static SecureString operator +(SecureString ss1, char c)
         {
-            if (ss1 is null) throw new ArgumentNullException(nameof(ss1));
+            if (ss1 is null)
+            {
+                throw new ArgumentNullException(nameof(ss1));
+            }
 
             return new SecureString(ss1.Value + c);
         }

SystemExtensions.NetStandard.Security/Hashing/Sha256HashingService.cs

@@ -27,9 +27,9 @@ namespace SystemExtensions.NetStandard.Security.Hashing
         private static byte[] StreamToBytes(Stream value)
         {
             value.Position = 0;
-            byte[] buffer = new byte[1024];
+            var buffer = new byte[1024];
             using var ms = new MemoryStream();
-            int read = -1;
+            var read = -1;
             do
             {
                 read = value.Read(buffer, 0, buffer.Length);
@@ -51,7 +51,10 @@ namespace SystemExtensions.NetStandard.Security.Hashing
         }
         private static async Task<Stream> HashInternal(Stream raw)
         {
-            if (raw is null) throw new ArgumentNullException(nameof(raw));
+            if (raw is null)
+            {
+                throw new ArgumentNullException(nameof(raw));
+            }
 
             using var sha256 = SHA256.Create();
             return await Task.Run(() => new MemoryStream(sha256.ComputeHash(raw)));

SystemExtensions.NetStandard.Security/Utilities/NotClosingCryptoStream.cs

@@ -13,7 +13,9 @@ namespace SystemExtensions.NetStandard.Security.Utilities
         protected override void Dispose(bool disposing)
         {
             if (!this.HasFlushedFinalBlock)
+            {
                 this.FlushFinalBlock();
+            }
 
             base.Dispose(false);
         }

SystemExtensions.NetStandard/Collections/AVLTree.cs

@@ -60,7 +60,7 @@ namespace System.Collections.Generic
         public void Add(T value)
         {
             count++;
-            AVLNode<T> newItem = new AVLNode<T>(value);
+            var newItem = new AVLNode<T>(value);
             if (root == null)
             {
                 root = newItem;
@@ -77,7 +77,7 @@ namespace System.Collections.Generic
         /// <returns>True if the value is in the tree.</returns>
         public bool Contains(T value)
         {
-            AVLNode<T> node = Find(value, root);
+            var node = Find(value, root);
             if (node == null)
             {
                 return false;
@@ -105,12 +105,12 @@ namespace System.Collections.Generic
         /// </summary>
         public void Clear()
         {
-            Queue<AVLNode<T>> queue = new Queue<AVLNode<T>>();
+            var queue = new Queue<AVLNode<T>>();
             queue.Enqueue(root);
 
             while (queue.Count > 0)
             {
-                AVLNode<T> currentNode = queue.Dequeue();
+                var currentNode = queue.Dequeue();
                 if (currentNode.Left != null)
                 {
                     queue.Enqueue(currentNode.Left);
@@ -134,11 +134,11 @@ namespace System.Collections.Generic
         /// <param name="arrayIndex">Starting index of the provided array.</param>
         public void CopyTo(T[] array, int arrayIndex)
         {
-            Queue<AVLNode<T>> queue = new Queue<AVLNode<T>>();
+            var queue = new Queue<AVLNode<T>>();
             queue.Enqueue(root);
             while (queue.Count > 0)
             {
-                AVLNode<T> currentNode = queue.Dequeue();
+                var currentNode = queue.Dequeue();
                 array[arrayIndex++] = currentNode.Value;
                 if (currentNode.Left != null)
                 {
@@ -164,7 +164,7 @@ namespace System.Collections.Generic
         /// <returns>Array containing the values contained in the tree.</returns>
         public T[] ToArray()
         {
-            T[] array = new T[count];
+            var array = new T[count];
             CopyTo(array, 0);
             return array;
         }
@@ -191,7 +191,7 @@ namespace System.Collections.Generic
         }
         private AVLNode<T> BalanceTree(AVLNode<T> current)
         {
-            int b_factor = BalanceFactor(current);
+            var b_factor = BalanceFactor(current);
             if (b_factor > 1)
             {
                 if (BalanceFactor(current.Left) > 0)
@@ -299,7 +299,9 @@ namespace System.Collections.Generic
                     return current;
                 }
                 else
+                {
                     return Find(target, current.Left);
+                }
             }
             else
             {
@@ -308,7 +310,9 @@ namespace System.Collections.Generic
                     return current;
                 }
                 else
+                {
                     return Find(target, current.Right);
+                }
             }
 
         }
@@ -318,46 +322,46 @@ namespace System.Collections.Generic
         }
         private int GetHeight(AVLNode<T> current)
         {
-            int height = 0;
+            var height = 0;
             if (current != null)
             {
-                int l = GetHeight(current.Left);
+                var l = GetHeight(current.Left);
-                int r = GetHeight(current.Right);
+                var r = GetHeight(current.Right);
-                int m = Max(l, r);
+                var m = Max(l, r);
                 height = m + 1;
             }
             return height;
         }
         private int BalanceFactor(AVLNode<T> current)
         {
-            int l = GetHeight(current.Left);
+            var l = GetHeight(current.Left);
-            int r = GetHeight(current.Right);
+            var r = GetHeight(current.Right);
-            int b_factor = l - r;
+            var b_factor = l - r;
             return b_factor;
         }
         private AVLNode<T> RotateRR(AVLNode<T> parent)
         {
-            AVLNode<T> pivot = parent.Right;
+            var pivot = parent.Right;
             parent.Right = pivot.Left;
             pivot.Left = parent;
             return pivot;
         }
         private AVLNode<T> RotateLL(AVLNode<T> parent)
         {
-            AVLNode<T> pivot = parent.Left;
+            var pivot = parent.Left;
             parent.Left = pivot.Right;
             pivot.Right = parent;
             return pivot;
         }
         private AVLNode<T> RotateLR(AVLNode<T> parent)
         {
-            AVLNode<T> pivot = parent.Left;
+            var pivot = parent.Left;
             parent.Left = RotateRR(pivot);
             return RotateLL(parent);
         }
         private AVLNode<T> RotateRL(AVLNode<T> parent)
         {
-            AVLNode<T> pivot = parent.Right;
+            var pivot = parent.Right;
             parent.Right = RotateLL(pivot);
             return RotateRR(parent);
         }
@@ -367,12 +371,12 @@ namespace System.Collections.Generic
         }
         private IEnumerator<T> GetEnumerator(AVLNode<T> rootNode)
         {
-            Queue<AVLNode<T>> queue = new Queue<AVLNode<T>>();
+            var queue = new Queue<AVLNode<T>>();
             queue.Enqueue(rootNode);
 
             while (queue.Count > 0)
             {
-                AVLNode<T> currentNode = queue.Dequeue();
+                var currentNode = queue.Dequeue();
                 yield return currentNode.Value;
                 if (currentNode.Left != null)
                 {

SystemExtensions.NetStandard/Collections/BinaryHeap.cs

@@ -88,7 +88,7 @@ namespace System.Collections.Generic
             {
                 Capacity = 2 * Capacity;
             }
-            int position = ++count;
+            var position = ++count;
             for (; position > 1 && value.CompareTo(items[position / 2]) < 0; position /= 2)
             {
                 items[position] = items[position / 2];
@@ -105,7 +105,7 @@ namespace System.Collections.Generic
             {
                 throw new IndexOutOfRangeException("Heap is empty!");
             }
-            T min = items[1];
+            var min = items[1];
             items[1] = items[count--];
             BubbleDown(1);
             return min;
@@ -120,7 +120,7 @@ namespace System.Collections.Generic
             {
                 throw new IndexOutOfRangeException("Heap is empty!");
             }
-            T min = items[1];
+            var min = items[1];
             return min;
         }
         /// <summary>
@@ -129,7 +129,7 @@ namespace System.Collections.Generic
         /// <returns>Array with values sorted as in heap</returns>
         public T[] ToArray()
         {
-            T[] newArray = new T[count];
+            var newArray = new T[count];
             Array.Copy(items, 1, newArray, 0, count);
             return newArray;
         }
@@ -168,7 +168,7 @@ namespace System.Collections.Generic
         /// <returns>Enumerator that iterates over the heap.</returns>
         public IEnumerator<T> GetEnumerator()
         {
-            for (int i = 0; i < count; i++)
+            for (var i = 0; i < count; i++)
             {
                 yield return items[i + 1];
             }
@@ -181,7 +181,7 @@ namespace System.Collections.Generic
         /// <param name="index">Index of element to bubble</param>
         private void BubbleDown(int index)
         {
-            T temp = items[index];
+            var temp = items[index];
             int childIndex;
             for (; 2 * index <= count; index = childIndex)
             {

SystemExtensions.NetStandard/Collections/FibonacciHeap.cs

@@ -49,7 +49,7 @@
         /// <param name="value">Value to be added.</param>
         public void Add(T value)
         {
-            FibonacciNode<T> node = new FibonacciNode<T>
+            var node = new FibonacciNode<T>
             {
                 Value = value,
                 Marked = false,
@@ -77,7 +77,7 @@
         /// <returns>Minimum value.</returns>
         public T Remove()
         {
-            FibonacciNode<T> currentRoot = root;
+            var currentRoot = root;
             if (currentRoot != null)
             {
                 root = RemoveMinimum(root);
@@ -96,7 +96,7 @@
         /// <param name="value">New value to be assigned to the node.</param>
         public void DecreaseKey(T oldValue, T value)
         {
-            FibonacciNode<T> node = Find(root, oldValue);
+            var node = Find(root, oldValue);
             root = DecreaseKey(root, node, value);
         }
         /// <summary>
@@ -129,7 +129,7 @@
             {
                 return null;
             }
-            T[] array = new T[count];
+            var array = new T[count];
             if (count == 1)
             {
                 array[0] = root.Value;
@@ -137,7 +137,7 @@
             }
             else
             {
-                int index = 0;
+                var index = 0;
                 RecursiveFillArray(root, ref array, ref index);
                 return array;
             }
@@ -160,7 +160,7 @@
         /// <param name="index">Index of the next unintialized element in the array.</param>
         private void RecursiveFillArray(FibonacciNode<T> currentNode, ref T[] array, ref int index)
         {
-            FibonacciNode<T> oldNode = currentNode;
+            var oldNode = currentNode;
             do
             {
                 array[index] = currentNode.Value;
@@ -178,12 +178,12 @@
         /// <param name="currentNode">Current node in the iteration.</param>
         private IEnumerator<T> GetEnumerator(FibonacciNode<T> currentNode)
         {
-            Queue<FibonacciNode<T>> queue = new Queue<FibonacciNode<T>>();
+            var queue = new Queue<FibonacciNode<T>>();
             queue.Enqueue(currentNode);
             while (queue.Count > 0)
             {
                 currentNode = queue.Dequeue();
-                FibonacciNode<T> oldNode = currentNode;
+                var oldNode = currentNode;
                 do
                 {
                     yield return currentNode.Value;
@@ -204,7 +204,7 @@
         {
             if (node != null)
             {
-                FibonacciNode<T> current = node;
+                var current = node;
                 do
                 {
                     Remove(current.Child);
@@ -234,12 +234,12 @@
             }
             if (node1.Value.CompareTo(node2.Value) > 0)
             {
-                FibonacciNode<T> temp = node1;
+                var temp = node1;
                 node1 = node2;
                 node2 = temp;
             }
-            FibonacciNode<T> node1Next = node1.Next;
+            var node1Next = node1.Next;
-            FibonacciNode<T> node2Prev = node2.Previous;
+            var node2Prev = node2.Previous;
             node1.Next = node2;
             node2.Previous = node1;
             node1Next.Previous = node2Prev;
@@ -268,7 +268,7 @@
             {
                 return;
             }
-            FibonacciNode<T> current = node;
+            var current = node;
             do
             {
                 current.Marked = false;
@@ -299,12 +299,12 @@
                 return node;
             }
 
-            FibonacciNode<T>[] trees = new FibonacciNode<T>[64];
+            var trees = new FibonacciNode<T>[64];
             while (true)
             {
                 if (trees[node.Degree] != null)
                 {
-                    FibonacciNode<T> t = trees[node.Degree];
+                    var t = trees[node.Degree];
                     if (t == node)
                     {
                         break;
@@ -344,8 +344,8 @@
                 }
                 node = node.Next;
             }
-            FibonacciNode<T> min = node;
+            var min = node;
-            FibonacciNode<T> start = node;
+            var start = node;
             do
             {
                 if (node.Value.CompareTo(min.Value) < 0)
@@ -397,7 +397,7 @@
                 if (node.Value.CompareTo(node.Parent.Value) < 0)
                 {
                     root = Cut(root, node);
-                    FibonacciNode<T> parent = node.Parent;
+                    var parent = node.Parent;
                     node.Parent = null;
                     while (parent != null && parent.Marked)
                     {
@@ -429,7 +429,7 @@
         /// <returns></returns>
         private FibonacciNode<T> Find(FibonacciNode<T> root, T value)
         {
-            FibonacciNode<T> node = root;
+            var node = root;
             if (node == null)
             {
                 return null;
@@ -440,7 +440,7 @@
                 {
                     return node;
                 }
-                FibonacciNode<T> ret = Find(node.Child, value);
+                var ret = Find(node.Child, value);
                 if (ret != null)
                 {
                     return ret;

SystemExtensions.NetStandard/Collections/SkipList.cs

@@ -50,7 +50,7 @@
             random = new Random();
             head = new NodeSet<T>(default, maxLevel);
             end = head;
-            for (int i = 0; i <= maxLevel; i++)
+            for (var i = 0; i <= maxLevel; i++)
             {
                 head.Next[i] = end;
             }
@@ -64,8 +64,8 @@
         /// <param name="item">Item to be added.</param>
         public void Add(T item)
         {
-            NodeSet<T> curNode = head;
+            var curNode = head;
-            int newLevel = 0;
+            var newLevel = 0;
             while (random.Next(0, 2) > 0 && newLevel < maxLevel)
             {
                 newLevel++;
@@ -74,7 +74,7 @@
             {
                 level = newLevel;
             }
-            NodeSet<T> newNode = new NodeSet<T>(item, newLevel);
+            var newNode = new NodeSet<T>(item, newLevel);
             for (var i = 0; i <= newLevel; i++)
             {
                 if (i > curNode.Level)
@@ -97,8 +97,8 @@
         /// <returns>True if removal was successful.</returns>
         public bool Remove(T item)
         {
-            bool removed = false;
+            var removed = false;
-            NodeSet<T> curNode = head;
+            var curNode = head;
             for (var i = 0; i <= maxLevel; i++)
             {
                 if (i > curNode.Level)
@@ -134,7 +134,7 @@
         /// </summary>
         public void Clear()
         {
-            for (int i = 0; i < maxLevel; i++)
+            for (var i = 0; i < maxLevel; i++)
             {
                 head.Next[i] = end;
             }
@@ -160,7 +160,7 @@
         /// <param name="arrayIndex">Index to start insertion in the array.</param>
         public void CopyTo(T[] array, int arrayIndex)
         {
-            NodeSet<T> node = head.Next[0];
+            var node = head.Next[0];
             while (node != end)
             {
                 array[arrayIndex] = node.Key;
@@ -174,9 +174,9 @@
         /// <returns>Array filled with elements from the collection.</returns>
         public T[] ToArray()
         {
-            T[] array = new T[count];
+            var array = new T[count];
-            int index = 0;
+            var index = 0;
-            NodeSet<T> curNode = head.Next[0];
+            var curNode = head.Next[0];
             while (curNode != end)
             {
                 array[index] = curNode.Key;
@@ -191,7 +191,7 @@
         /// <returns></returns>
         public IEnumerator<T> GetEnumerator()
         {
-            NodeSet<T> curNode = head.Next[0];
+            var curNode = head.Next[0];
             while (curNode != end)
             {
                 yield return curNode.Key;
@@ -206,9 +206,9 @@
         }
         private NodeSet<T> Find(T key)
         {
-            NodeSet<T> curNode = head;
+            var curNode = head;
 
-            for (int i = level; i >= 0; i--)
+            for (var i = level; i >= 0; i--)
             {
                 while (curNode.Next[i] != end)
                 {

SystemExtensions.NetStandard/Collections/Treap.cs

@@ -97,8 +97,8 @@
         {
             if (root != null)
             {
-                T[] array = new T[count];
+                var array = new T[count];
-                int index = 0;
+                var index = 0;
                 ToArray(root, ref array, ref index);
                 return array;
             }
@@ -221,7 +221,7 @@
             {
                 if (node.Key.CompareTo(key) < 0)
                 {
-                    Node<T> found = Find(node.Left, key);
+                    var found = Find(node.Left, key);
                     if (found == null)
                     {
                         found = Find(node.Right, key);
@@ -230,7 +230,7 @@
                 }
                 else if (node.Key.CompareTo(key) > 0)
                 {
-                    Node<T> found = Find(node.Right, key);
+                    var found = Find(node.Right, key);
                     if (found == null)
                     {
                         found = Find(node.Left, key);
@@ -255,7 +255,7 @@
         }
         private IEnumerator<T> GetEnumerator(Node<T> currentNode)
         {
-            Queue<Node<T>> queue = new Queue<Node<T>>();
+            var queue = new Queue<Node<T>>();
             queue.Enqueue(currentNode);
             while (queue.Count > 0)
             {

SystemExtensions.NetStandard/Extensions/BytesExtensions.cs

@@ -6,10 +6,13 @@ namespace System.Extensions
     {
         public static byte[] ReadAllBytes(this Stream stream)
         {
-            if (stream is null) throw new ArgumentNullException(nameof(stream));
+            if (stream is null)
+            {
+                throw new ArgumentNullException(nameof(stream));
+            }
 
             var buffer = new byte[256];
-            using (MemoryStream ms = new MemoryStream())
+            using (var ms = new MemoryStream())
             {
                 int read;
                 while ((read = stream.Read(buffer, 0, 256)) > 0)

SystemExtensions.NetStandard/Extensions/LinqExtensions.cs

@@ -22,7 +22,10 @@ namespace System.Extensions
 
         public static ICollection<T> ClearAnd<T>(this ICollection<T> collection)
         {
-            if (collection is null) throw new ArgumentNullException(nameof(collection));
+            if (collection is null)
+            {
+                throw new ArgumentNullException(nameof(collection));
+            }
 
             collection.Clear();
             return collection;
@@ -30,10 +33,17 @@ namespace System.Extensions
         
         public static ICollection<T> AddRange<T>(this ICollection<T> collection, IEnumerable<T> values)
         {
-            if (collection is null) throw new ArgumentNullException(nameof(collection));
+            if (collection is null)
-            if (values is null) throw new ArgumentNullException(nameof(values));
+            {
+                throw new ArgumentNullException(nameof(collection));
+            }
 
-            foreach(var item in values)
+            if (values is null)
+            {
+                throw new ArgumentNullException(nameof(values));
+            }
+
+            foreach (var item in values)
             {
                 collection.Add(item);
             }
@@ -43,8 +53,15 @@ namespace System.Extensions
 
         public static int IndexOfWhere<T>(this ICollection<T> collection, Func<T, bool> selector)
         {
-            if (collection is null) throw new ArgumentNullException(nameof(collection));
+            if (collection is null)
-            if (selector is null) throw new ArgumentNullException(nameof(selector));
+            {
+                throw new ArgumentNullException(nameof(collection));
+            }
+
+            if (selector is null)
+            {
+                throw new ArgumentNullException(nameof(selector));
+            }
 
             var index = 0;
             foreach (var item in collection)

SystemExtensions.NetStandard/Extensions/ObjectExtensions.cs

@@ -7,7 +7,10 @@ namespace System.Extensions
         public static T Deserialize<T>(this string serialized)
             where T : class
         {
-            if (serialized.IsNullOrWhiteSpace()) throw new ArgumentException("Provided serialized string cannot be null or whitespace", nameof(serialized));
+            if (serialized.IsNullOrWhiteSpace())
+            {
+                throw new ArgumentException("Provided serialized string cannot be null or whitespace", nameof(serialized));
+            }
 
             return JsonConvert.DeserializeObject<T>(serialized);
         }
@@ -15,7 +18,10 @@ namespace System.Extensions
         public static string Serialize<T>(this T obj)
             where T : class
         {
-            if (obj is null) throw new ArgumentNullException(nameof(obj));
+            if (obj is null)
+            {
+                throw new ArgumentNullException(nameof(obj));
+            }
 
             return JsonConvert.SerializeObject(obj);
         }
@@ -37,7 +43,10 @@ namespace System.Extensions
 
         public static T ThrowIfNull<T>([ValidatedNotNull] this T obj, string name) where T : class
         {
-            if (obj is null) throw new ArgumentNullException(name);
+            if (obj is null)
+            {
+                throw new ArgumentNullException(name);
+            }
 
             return obj;
         }

SystemExtensions.NetStandard/Extensions/Optional.cs

@@ -40,8 +40,15 @@
         }
         public Optional<T> Do(Action<T> onSome, Action onNone)
         {
-            if (onSome is null) throw new ArgumentNullException(nameof(onSome));
+            if (onSome is null)
-            if (onNone is null) throw new ArgumentNullException(nameof(onNone));
+            {
+                throw new ArgumentNullException(nameof(onSome));
+            }
+
+            if (onNone is null)
+            {
+                throw new ArgumentNullException(nameof(onNone));
+            }
 
             if (this is Some)
             {
@@ -67,8 +74,15 @@
         }
         public Optional<V> Switch<V>(Func<T, V> onSome, Func<V> onNone)
         {
-            if (onSome is null) throw new ArgumentNullException($"{nameof(onSome)}");
+            if (onSome is null)
-            if (onNone is null) throw new ArgumentNullException($"{nameof(onNone)}");
+            {
+                throw new ArgumentNullException($"{nameof(onSome)}");
+            }
+
+            if (onNone is null)
+            {
+                throw new ArgumentNullException($"{nameof(onNone)}");
+            }
 
             if (this is Some)
             {

SystemExtensions.NetStandard/Extensions/Result.cs

@@ -43,9 +43,15 @@
         }
         public Result<TSuccess, TFailure> Do(Action onSuccess, Action onFailure)
         {
-            if (onSuccess is null) throw new ArgumentNullException(nameof(onSuccess));
+            if (onSuccess is null)
+            {
+                throw new ArgumentNullException(nameof(onSuccess));
+            }
 
-            if (onFailure is null) throw new ArgumentNullException(nameof(onFailure));
+            if (onFailure is null)
+            {
+                throw new ArgumentNullException(nameof(onFailure));
+            }
 
             if (value is TSuccess)
             {
@@ -71,9 +77,15 @@
         }
         public Result<TSuccess, TFailure> Do(Action<TSuccess> onSuccess, Action<TFailure> onFailure)
         {
-            if (onSuccess is null) throw new ArgumentNullException(nameof(onSuccess));
+            if (onSuccess is null)
+            {
+                throw new ArgumentNullException(nameof(onSuccess));
+            }
 
-            if (onFailure is null) throw new ArgumentNullException(nameof(onFailure));
+            if (onFailure is null)
+            {
+                throw new ArgumentNullException(nameof(onFailure));
+            }
 
             if (value is TSuccess success)
             {
@@ -99,9 +111,15 @@
         }
         public T Switch<T>(Func<TSuccess, T> onSuccess, Func<TFailure, T> onFailure)
         {
-            if (onSuccess is null) throw new ArgumentNullException(nameof(onSuccess));
+            if (onSuccess is null)
+            {
+                throw new ArgumentNullException(nameof(onSuccess));
+            }
 
-            if (onFailure is null) throw new ArgumentNullException(nameof(onFailure));
+            if (onFailure is null)
+            {
+                throw new ArgumentNullException(nameof(onFailure));
+            }
 
             if (value is TSuccess success)
             {
@@ -127,9 +145,15 @@
         }
         public Result<V, K> Switch<V, K>(Func<TSuccess, V> onSuccess, Func<TFailure, K> onFailure)
         {
-            if (onSuccess is null) throw new ArgumentNullException(nameof(onSuccess));
+            if (onSuccess is null)
+            {
+                throw new ArgumentNullException(nameof(onSuccess));
+            }
 
-            if (onFailure is null) throw new ArgumentNullException(nameof(onFailure));
+            if (onFailure is null)
+            {
+                throw new ArgumentNullException(nameof(onFailure));
+            }
 
             if (value is TSuccess success)
             {

SystemExtensions.NetStandard/Extensions/StreamExtensions.cs

@@ -7,8 +7,15 @@ namespace System.Extensions
     {
         public static void DoWhileReading(this Stream stream, Action<int, byte[]> action, int bufferLength = 256)
         {
-            if (stream is null) throw new ArgumentNullException(nameof(stream));
+            if (stream is null)
-            if (action is null) throw new ArgumentNullException(nameof(action));
+            {
+                throw new ArgumentNullException(nameof(stream));
+            }
+
+            if (action is null)
+            {
+                throw new ArgumentNullException(nameof(action));
+            }
 
             var buffer = new byte[bufferLength];
             var read = stream.Read(buffer, 0, bufferLength);
@@ -21,7 +28,10 @@ namespace System.Extensions
 
         public static byte[] ReadBytes(this Stream stream, int count)
         {
-            if (stream is null) throw new ArgumentNullException(nameof(stream));
+            if (stream is null)
+            {
+                throw new ArgumentNullException(nameof(stream));
+            }
 
             var buffer = new byte[count];
             stream.Read(buffer, 0, count);
@@ -30,9 +40,15 @@ namespace System.Extensions
 
         public static Stream Rewind(this Stream stream)
         {
-            if (stream is null) throw new ArgumentNullException(nameof(stream));
+            if (stream is null)
+            {
+                throw new ArgumentNullException(nameof(stream));
+            }
 
-            if (!stream.CanSeek) throw new InvalidOperationException("Stream doesn't support rewinding");
+            if (!stream.CanSeek)
+            {
+                throw new InvalidOperationException("Stream doesn't support rewinding");
+            }
 
             stream.Seek(0, SeekOrigin.Begin);
             return stream;
@@ -41,17 +57,19 @@ namespace System.Extensions
         public static string ReadUntil(this StreamReader sr, string delim)
         {
             var sb = new StringBuilder();
-            bool found = false;
+            var found = false;
 
             while (!found && !sr.EndOfStream)
             {
-                for (int i = 0; i < delim.Length; i++)
+                for (var i = 0; i < delim.Length; i++)
                 {
-                    char c = (char)sr.Read();
+                    var c = (char)sr.Read();
                     sb.Append(c);
 
                     if (c != delim[i])
+                    {
                         break;
+                    }
 
                     if (i == delim.Length - 1)
                     {

SystemExtensions.NetStandard/Extensions/TaskExtensions.cs

@@ -44,13 +44,17 @@ namespace System.Extensions
         public static async Task RunPeriodicAsync(this Action onTick, TimeSpan dueTime, TimeSpan interval, CancellationToken token)
         {
             if (dueTime > TimeSpan.Zero)
+            {
                 await Task.Delay(dueTime, token).ConfigureAwait(false);
+            }
 
             while (!token.IsCancellationRequested)
             {
                 onTick?.Invoke();
                 if (interval > TimeSpan.Zero)
+                {
                     await Task.Delay(interval, token).ConfigureAwait(false);
+                }
             }
         }
 
@@ -95,7 +99,7 @@ namespace System.Extensions
             var oldContext = SynchronizationContext.Current;
             var synch = new ExclusiveSynchronizationContext();
             SynchronizationContext.SetSynchronizationContext(synch);
-            T ret = default(T);
+            var ret = default(T);
             synch.Post(async _ =>
             {
                 try

SystemExtensions.NetStandard/Extensions/Try.cs

@@ -46,7 +46,10 @@ namespace System.Extensions
 
         public TResult Finally(Action act)
         {
-            if (act is null) throw new ArgumentNullException(nameof(act));
+            if (act is null)
+            {
+                throw new ArgumentNullException(nameof(act));
+            }
 
             try
             {

SystemExtensions.NetStandard/Threading/PriorityThreadPool.cs

@@ -174,7 +174,7 @@ namespace System.Threading
             threadpool = new List<WorkerThread>();
             tasks = new PriorityQueue<QueueEntry>();
             maxThreads = System.Environment.ProcessorCount;
-            for (int i = 0; i < maxThreads; i++)
+            for (var i = 0; i < maxThreads; i++)
             {
                 this.CreateAndStartWorkerThread();
             }
@@ -194,7 +194,7 @@ namespace System.Threading
             threadpool = new List<WorkerThread>();
             tasks = new PriorityQueue<QueueEntry>();
             this.maxThreads = Math.Max(maxThreads, 1);
-            for (int i = 0; i < maxThreads; i++)
+            for (var i = 0; i < maxThreads; i++)
             {
                 this.CreateAndStartWorkerThread();
             }
@@ -216,23 +216,23 @@ namespace System.Threading
         {
             threadpool = new List<WorkerThread>();
             tasks = new PriorityQueue<QueueEntry>();
-            for (int i = 0; i < lowest; i++)
+            for (var i = 0; i < lowest; i++)
             {
                 this.CreateAndStartWorkerThread(ThreadPriority.Lowest);
             }
-            for (int i = 0; i < belowNormal; i++)
+            for (var i = 0; i < belowNormal; i++)
             {
                 this.CreateAndStartWorkerThread(ThreadPriority.BelowNormal);
             }
-            for (int i = 0; i < normal; i++)
+            for (var i = 0; i < normal; i++)
             {
                 this.CreateAndStartWorkerThread(ThreadPriority.Normal);
             }
-            for (int i = 0; i < aboveNormal; i++)
+            for (var i = 0; i < aboveNormal; i++)
             {
                 this.CreateAndStartWorkerThread(ThreadPriority.AboveNormal);
             }
-            for (int i = 0; i < highest; i++)
+            for (var i = 0; i < highest; i++)
             {
                 this.CreateAndStartWorkerThread(ThreadPriority.Highest);
             }
@@ -247,7 +247,11 @@ namespace System.Threading
         /// <param name="taskPriority">Priority of task. Affects its position into the queue.</param>
         public void QueueUserWorkItem(WaitCallback waitCallback, object callbackState, TaskPriority taskPriority)
         {
-            while (!Monitor.TryEnter(tasksLock)) ;
+            while (!Monitor.TryEnter(tasksLock))
+            {
+                ;
+            }
+
             tasks.Enqueue(new QueueEntry(taskPriority, waitCallback, callbackState));
             Monitor.Exit(tasksLock);
         }
@@ -307,7 +311,11 @@ namespace System.Threading
 
                     thisWorkerThread.Working = true;
                     QueueEntry task = null;
-                    while (!Monitor.TryEnter(tasksLock)) ;
+                    while (!Monitor.TryEnter(tasksLock))
+                    {
+                        ;
+                    }
+
                     if (tasks.Count > 0)
                     {
                         task = tasks.Dequeue();
@@ -316,7 +324,7 @@ namespace System.Threading
                     if (task != null)
                     {
                         System.Diagnostics.Debug.WriteLine(Thread.CurrentThread.Name + " - Running task!");
-                        WaitCallback waitCallback = task.WaitCallback;
+                        var waitCallback = task.WaitCallback;
                         waitCallback.Invoke(task.Object);
                     }
                     thisWorkerThread.Working = false;
@@ -328,7 +336,7 @@ namespace System.Threading
         /// </summary>
         private void ObserverLoop()
         {
-            Statistics statistics = new Statistics();
+            var statistics = new Statistics();
             while (true)
             {
                 //Observer operates on a 100ms loop. Due to the low priority of the thread itself, this loop will almost always take
@@ -346,7 +354,7 @@ namespace System.Threading
                 //This part of code updates the statistics of the threadpool.
                 if (statistics.Initialized)
                 {
-                    double loopDuration = (DateTime.Now - statistics.LastUpdate).TotalMilliseconds;
+                    var loopDuration = (DateTime.Now - statistics.LastUpdate).TotalMilliseconds;
                     if (statistics.LoopFrequency == 0)
                     {
                         statistics.LoopFrequency = loopDuration;
@@ -387,7 +395,7 @@ namespace System.Threading
                 if (tasks.Count > 0)
                 {
                     //If there are tasks pending, find a thread with priority under Normal and upgrade its priority.
-                    Thread t = FindThreadWithLowPriority();
+                    var t = FindThreadWithLowPriority();
                     if (t != null)
                     {
                         UpgradeThreadPriority(t);
@@ -396,7 +404,7 @@ namespace System.Threading
                 else
                 {
                     //If there are no tasks pending, find a thread with priority above Lowest and downgrade its priority.
-                    Thread t = FindThreadWithAcceptablePriority();
+                    var t = FindThreadWithAcceptablePriority();
                     if (t != null)
                     {
                         DowngradeThreadPriority(t);
@@ -423,7 +431,7 @@ namespace System.Threading
                         //If thread is currently working, notify it to close.
                         //Else, abort the thread.
                         //Reset counter to 0.
-                        WorkerThread worker = threadpool[threadpool.Count - 1];
+                        var worker = threadpool[threadpool.Count - 1];
                         if (worker.Working)
                         {
                             worker.Running = false;
@@ -444,7 +452,7 @@ namespace System.Threading
         /// <returns>Thread with low priority.</returns>
         private Thread FindThreadWithLowPriority()
         {
-            foreach (WorkerThread t in threadpool)
+            foreach (var t in threadpool)
             {
                 if (t.Thread.Priority == ThreadPriority.Lowest || t.Thread.Priority == ThreadPriority.BelowNormal)
                 {
@@ -459,7 +467,7 @@ namespace System.Threading
         /// <returns>Thread with BelowNormal or Normal priority.</returns>
         private Thread FindThreadWithAcceptablePriority()
         {
-            foreach (WorkerThread t in threadpool)
+            foreach (var t in threadpool)
             {
                 if (t.Thread.Priority == ThreadPriority.Normal || t.Thread.Priority == ThreadPriority.BelowNormal)
                 {
@@ -538,7 +546,7 @@ namespace System.Threading
                         this.observerCancellationTokenSource.Cancel();
                         this.observer.Join();
                     }
-                    foreach (WorkerThread worker in threadpool)
+                    foreach (var worker in threadpool)
                     {
                         worker.CancellationTokenSource.Cancel();
                         worker.Thread.Join();

SystemExtensions.Tests/Collections/AVLTreeTests.cs

@@ -20,7 +20,7 @@ namespace System.Collections.Tests
         {
             try
             {
-                for (int i = 0; i < 100; i++)
+                for (var i = 0; i < 100; i++)
                 {
                     avlTree.Add(i * 20 - (50 + i));
                 }
@@ -38,7 +38,7 @@ namespace System.Collections.Tests
         [TestMethod()]
         public void ContainsTest()
         {
-            for (int i = 0; i < 100; i++)
+            for (var i = 0; i < 100; i++)
             {
                 avlTree.Add(i);
             }
@@ -52,7 +52,7 @@ namespace System.Collections.Tests
         [TestMethod()]
         public void RemoveTest()
         {
-            for (int i = 0; i < 100; i++)
+            for (var i = 0; i < 100; i++)
             {
                 avlTree.Add(i);
             }
@@ -68,7 +68,7 @@ namespace System.Collections.Tests
         [TestMethod()]
         public void ClearTest()
         {
-            for (int i = 0; i < 100; i++)
+            for (var i = 0; i < 100; i++)
             {
                 avlTree.Add(i);
             }
@@ -82,24 +82,24 @@ namespace System.Collections.Tests
         [TestMethod()]
         public void CopyToTest()
         {
-            for (int i = 0; i < 100; i++)
+            for (var i = 0; i < 100; i++)
             {
                 avlTree.Add(i);
             }
 
-            int[] array = new int[100];
+            var array = new int[100];
             avlTree.CopyTo(array, 0);
         }
 
         [TestMethod()]
         public void GetEnumeratorTest()
         {
-            for (int i = 0; i < 100; i++)
+            for (var i = 0; i < 100; i++)
             {
                 avlTree.Add(i);
             }
-            int count = 0;
+            var count = 0;
-            foreach(int value in avlTree)
+            foreach(var value in avlTree)
             {
                 count++;
                 System.Diagnostics.Debug.WriteLine(value);
@@ -114,34 +114,34 @@ namespace System.Collections.Tests
         [TestMethod()]
         public void ToArrayTest()
         {
-            for (int i = 0; i < 100; i++)
+            for (var i = 0; i < 100; i++)
             {
                 avlTree.Add(i);
             }
 
-            int[] array = avlTree.ToArray();
+            var array = avlTree.ToArray();
         }
 
         [TestMethod()]
         public void Serialize()
         {
-            AVLTree<int> avlTree2 = new AVLTree<int>();
+            var avlTree2 = new AVLTree<int>();
-            for (int i = 0; i < 100; i++)
+            for (var i = 0; i < 100; i++)
             {
                 avlTree.Add(i);
             }
-            BinaryFormatter serializer = new BinaryFormatter();
+            var serializer = new BinaryFormatter();
-            string s = string.Empty;
+            var s = string.Empty;
             using (var stream = new MemoryStream())
             {
                 serializer.Serialize(stream, avlTree);
                 stream.Position = 0;
                 avlTree2 = (AVLTree<int>)serializer.Deserialize(stream);
             }
-            IEnumerator<int> avlTreeEnum = avlTree.GetEnumerator();
+            var avlTreeEnum = avlTree.GetEnumerator();
-            IEnumerator<int> avlTree2Enum = avlTree2.GetEnumerator();
+            var avlTree2Enum = avlTree2.GetEnumerator();
             
-            for(int i = 0; i < 100; i++)
+            for(var i = 0; i < 100; i++)
             {
                 if(avlTreeEnum.Current != avlTree2Enum.Current)
                 {

SystemExtensions.Tests/Collections/BinaryHeapTests.cs

@@ -31,7 +31,7 @@ namespace System.Collections.Tests
         {
             try
             {
-                for (int i = 0; i < 100; i++)
+                for (var i = 0; i < 100; i++)
                 {
                     binaryHeap.Add(i * 20 - (50 + i));
                 }
@@ -52,7 +52,7 @@ namespace System.Collections.Tests
         {
             try
             {
-                int tries = binaryHeap.Count;
+                var tries = binaryHeap.Count;
                 while (binaryHeap.Count > 0)
                 {
                     if (tries == 0)
@@ -72,7 +72,7 @@ namespace System.Collections.Tests
         [TestMethod()]
         public void MinMaxTest()
         {
-            for (int i = 0; i < 1000; i++)
+            for (var i = 0; i < 1000; i++)
             {
                 binaryHeap.Add(i);
             }
@@ -85,7 +85,7 @@ namespace System.Collections.Tests
         [TestMethod()]
         public void ClearTest()
         {
-            for (int i = 0; i < 100; i++)
+            for (var i = 0; i < 100; i++)
             {
                 binaryHeap.Add(i);
             }
@@ -99,12 +99,12 @@ namespace System.Collections.Tests
         [TestMethod()]
         public void ClearTest2()
         {
-            for (int i = 100; i < 200; i++)
+            for (var i = 100; i < 200; i++)
             {
                 binaryHeap.Add(i);
             }
             binaryHeap.Clear(false);
-            int[] array = binaryHeap.ToArray();
+            var array = binaryHeap.ToArray();
             if (binaryHeap.Count > 0 || binaryHeap.Capacity == 10)
             {
                 Assert.Fail();
@@ -133,11 +133,11 @@ namespace System.Collections.Tests
         [TestMethod()]
         public void ToArrayTest()
         {
-            for(int i = 0; i < 1000; i++)
+            for(var i = 0; i < 1000; i++)
             {
                 binaryHeap.Add(i);
             }
-            int[] array = binaryHeap.ToArray();
+            var array = binaryHeap.ToArray();
             if(array.Length != binaryHeap.Count)
             {
                 Assert.Fail();
@@ -151,12 +151,12 @@ namespace System.Collections.Tests
         [TestMethod()]
         public void GetEnumeratorTest()
         {
-            for (int i = 0; i < 1000; i++)
+            for (var i = 0; i < 1000; i++)
             {
                 binaryHeap.Add(i);
             }
-            int count = 0;
+            var count = 0;
-            foreach(int value in binaryHeap)
+            foreach(var value in binaryHeap)
             {
                 System.Diagnostics.Debug.WriteLine(value);
                 count++;
@@ -173,22 +173,22 @@ namespace System.Collections.Tests
         [TestMethod()]
         public void Serialize()
         {
-            BinaryHeap<int> binaryHeap2 = new BinaryHeap<int>();
+            var binaryHeap2 = new BinaryHeap<int>();
-            for (int i = 0; i < 100; i++)
+            for (var i = 0; i < 100; i++)
             {
                 binaryHeap.Add(i);
             }
-            BinaryFormatter serializer = new BinaryFormatter();
+            var serializer = new BinaryFormatter();
-            string s = string.Empty;
+            var s = string.Empty;
             using (var stream = new MemoryStream()) {
                 serializer.Serialize(stream, binaryHeap);
                 stream.Position = 0;
                 binaryHeap2 = (BinaryHeap<int>)serializer.Deserialize(stream);
             }
-            IEnumerator<int> binaryHeapEnum = binaryHeap.GetEnumerator();
+            var binaryHeapEnum = binaryHeap.GetEnumerator();
-            IEnumerator<int> binaryHeapEnum2 = binaryHeap2.GetEnumerator();
+            var binaryHeapEnum2 = binaryHeap2.GetEnumerator();
 
-            for (int i = 0; i < 100; i++)
+            for (var i = 0; i < 100; i++)
             {
                 if (binaryHeapEnum.Current != binaryHeapEnum2.Current)
                 {

SystemExtensions.Tests/Collections/FibonacciHeapTests.cs

@@ -12,7 +12,7 @@ namespace System.Collections.Tests
         [TestMethod()]
         public void InsertTest()
         {
-            for (int i = 0; i < 1000; i++)
+            for (var i = 0; i < 1000; i++)
             {
                 fibonacciHeap.Add(i);
             }
@@ -31,21 +31,21 @@ namespace System.Collections.Tests
         [TestMethod()]
         public void MergeTest()
         {
-            FibonacciHeap<int> fibonacciHeap1 = new FibonacciHeap<int>();
+            var fibonacciHeap1 = new FibonacciHeap<int>();
-            FibonacciHeap<int> fibonacciHeap2 = new FibonacciHeap<int>();
+            var fibonacciHeap2 = new FibonacciHeap<int>();
 
-            for(int i = 0; i < 100; i++)
+            for(var i = 0; i < 100; i++)
             {
                 fibonacciHeap1.Add(i);
             }
 
-            for(int i = 100; i < 300; i++)
+            for(var i = 100; i < 300; i++)
             {
                 fibonacciHeap2.Add(i);
             }
 
             fibonacciHeap1.Merge(fibonacciHeap2);
-            for(int i = 1; i < 300; i++)
+            for(var i = 1; i < 300; i++)
             {
                 if (!fibonacciHeap1.Contains(i))
                 {
@@ -70,11 +70,11 @@ namespace System.Collections.Tests
             {
                 Assert.Fail();
             }
-            for (int i = 0; i < 1000; i++)
+            for (var i = 0; i < 1000; i++)
             {
                 fibonacciHeap.Add(i);
             }
-            for (int i = 0; i < 1000; i++)
+            for (var i = 0; i < 1000; i++)
             {
                 if (fibonacciHeap.Remove() != i)
                 {
@@ -104,7 +104,7 @@ namespace System.Collections.Tests
         [TestMethod()]
         public void ContainsTest()
         {
-            for(int i = 0; i < 10000; i++)
+            for(var i = 0; i < 10000; i++)
             {
                 fibonacciHeap.Add(i);
             }
@@ -117,7 +117,7 @@ namespace System.Collections.Tests
         [TestMethod()]
         public void ClearTest()
         {
-            for(int i = 0; i < 10000; i++)
+            for(var i = 0; i < 10000; i++)
             {
                 fibonacciHeap.Add(i);
             }
@@ -132,14 +132,14 @@ namespace System.Collections.Tests
         [TestMethod()]
         public void ToArrayTest()
         {
-            for(int i = 999; i >= 0; i--)
+            for(var i = 999; i >= 0; i--)
             {
                 fibonacciHeap.Add(i);
             }
             fibonacciHeap.Remove();
-            int[] arr = fibonacciHeap.ToArray();
+            var arr = fibonacciHeap.ToArray();
 
-            for(int i = 1; i < 512; i++)
+            for(var i = 1; i < 512; i++)
             {
                 if(arr[i - 1] != i)
                 {
@@ -151,14 +151,14 @@ namespace System.Collections.Tests
         [TestMethod()]
         public void GetEnumeratorTest()
         {
-            for (int i = 999; i >= 0; i--)
+            for (var i = 999; i >= 0; i--)
             {
                 fibonacciHeap.Add(i);
             }
 
-            int count = 0;
+            var count = 0;
 
-            foreach(int value in fibonacciHeap)
+            foreach(var value in fibonacciHeap)
             {
                 System.Diagnostics.Debug.WriteLine(value);
                 count++;
@@ -175,23 +175,23 @@ namespace System.Collections.Tests
         [TestMethod()]
         public void Serialize()
         {
-            FibonacciHeap<int> fibonacciHeap2 = new FibonacciHeap<int>();
+            var fibonacciHeap2 = new FibonacciHeap<int>();
-            for (int i = 0; i < 100; i++)
+            for (var i = 0; i < 100; i++)
             {
                 fibonacciHeap.Add(i);
             }
-            BinaryFormatter serializer = new BinaryFormatter();
+            var serializer = new BinaryFormatter();
-            string s = string.Empty;
+            var s = string.Empty;
             using (var stream = new MemoryStream())
             {
                 serializer.Serialize(stream, fibonacciHeap);
                 stream.Position = 0;
                 fibonacciHeap2 = (FibonacciHeap<int>)serializer.Deserialize(stream);
             }
-            IEnumerator<int> enum1 = fibonacciHeap.GetEnumerator();
+            var enum1 = fibonacciHeap.GetEnumerator();
-            IEnumerator<int> enum2 = fibonacciHeap2.GetEnumerator();
+            var enum2 = fibonacciHeap2.GetEnumerator();
 
-            for (int i = 0; i < 100; i++)
+            for (var i = 0; i < 100; i++)
             {
                 if (enum1.Current != enum2.Current)
                 {

SystemExtensions.Tests/Collections/PriorityQueueTests.cs

@@ -29,7 +29,7 @@ namespace System.Collections.Tests
         [TestMethod()]
         public void EnqueueTest()
         {
-            for(int i = 0; i < 100; i++)
+            for(var i = 0; i < 100; i++)
             {
                 priorityQueue.Enqueue(i);
             }
@@ -42,11 +42,11 @@ namespace System.Collections.Tests
         [TestMethod()]
         public void DequeueTest()
         {
-            for(int i = 0; i < 100; i++)
+            for(var i = 0; i < 100; i++)
             {
                 priorityQueue.Enqueue(i);
             }
-            for(int i = 0; i < 100; i++)
+            for(var i = 0; i < 100; i++)
             {
                 if(i != priorityQueue.Dequeue())
                 {
@@ -81,23 +81,23 @@ namespace System.Collections.Tests
         [TestMethod()]
         public void Serialize()
         {
-            PriorityQueue<int> priorityQueue2 = new PriorityQueue<int>();
+            var priorityQueue2 = new PriorityQueue<int>();
-            for (int i = 0; i < 100; i++)
+            for (var i = 0; i < 100; i++)
             {
                 priorityQueue.Enqueue(i);
             }
-            BinaryFormatter serializer = new BinaryFormatter();
+            var serializer = new BinaryFormatter();
-            string s = string.Empty;
+            var s = string.Empty;
             using (var stream = new MemoryStream())
             {
                 serializer.Serialize(stream, priorityQueue);
                 stream.Position = 0;
                 priorityQueue2 = (PriorityQueue<int>)serializer.Deserialize(stream);
             }
-            IEnumerator<int> enum1 = priorityQueue.GetEnumerator();
+            var enum1 = priorityQueue.GetEnumerator();
-            IEnumerator<int> enum2 = priorityQueue2.GetEnumerator();
+            var enum2 = priorityQueue2.GetEnumerator();
 
-            for (int i = 0; i < 100; i++)
+            for (var i = 0; i < 100; i++)
             {
                 if (enum1.Current != enum2.Current)
                 {

SystemExtensions.Tests/Collections/SkipListTests.cs

@@ -12,19 +12,19 @@ namespace System.Collections.Tests
         [TestMethod()]
         public void SkipListTest()
         {
-            SkipList<int> skipList = new SkipList<int>();
+            var skipList = new SkipList<int>();
         }
 
         [TestMethod()]
         public void SkipListTest2()
         {
-            SkipList<int> skipList = new SkipList<int>(30);
+            var skipList = new SkipList<int>(30);
         }
 
         [TestMethod()]
         public void AddTest()
         {
-            for(int i = 0; i < 200; i++)
+            for(var i = 0; i < 200; i++)
             {
                 skipList.Add(i);
             }
@@ -33,7 +33,7 @@ namespace System.Collections.Tests
         [TestMethod()]
         public void ClearTest()
         {
-            for (int i = 0; i < 200; i++)
+            for (var i = 0; i < 200; i++)
             {
                 skipList.Add(i);
             }
@@ -47,7 +47,7 @@ namespace System.Collections.Tests
         [TestMethod()]
         public void ContainsTest()
         {
-            for (int i = 0; i < 200; i++)
+            for (var i = 0; i < 200; i++)
             {
                 skipList.Add(i);
             }
@@ -61,13 +61,13 @@ namespace System.Collections.Tests
         [TestMethod()]
         public void CopyToTest()
         {
-            for (int i = 0; i < 200; i++)
+            for (var i = 0; i < 200; i++)
             {
                 skipList.Add(i);
             }
-            int[] array = new int[skipList.Count];
+            var array = new int[skipList.Count];
             skipList.CopyTo(array, 0);
-            for (int i = 0; i < 200; i++)
+            for (var i = 0; i < 200; i++)
             {
                 if(array[i] != i)
                 {
@@ -79,13 +79,13 @@ namespace System.Collections.Tests
         [TestMethod()]
         public void ToArrayTest()
         {
-            for (int i = 0; i < 200; i++)
+            for (var i = 0; i < 200; i++)
             {
                 skipList.Add(i);
             }
-            int[] array = skipList.ToArray();
+            var array = skipList.ToArray();
 
-            for (int i = 0; i < 200; i++)
+            for (var i = 0; i < 200; i++)
             {
                 if(array[i] != i)
                 {
@@ -97,12 +97,12 @@ namespace System.Collections.Tests
         [TestMethod()]
         public void GetEnumeratorTest()
         {
-            for (int i = 0; i < 200; i++)
+            for (var i = 0; i < 200; i++)
             {
                 skipList.Add(i);
             }
 
-            foreach(int i in skipList)
+            foreach(var i in skipList)
             {
                 System.Diagnostics.Debug.WriteLine(i);
             }
@@ -111,7 +111,7 @@ namespace System.Collections.Tests
         [TestMethod()]
         public void RemoveTest()
         {
-            for (int i = 0; i < 200; i++)
+            for (var i = 0; i < 200; i++)
             {
                 skipList.Add(i);
             }
@@ -126,23 +126,23 @@ namespace System.Collections.Tests
         [Ignore("Binary serialization is obsolete and should not be used anymore")]
         public void Serialize()
         {
-            SkipList<int> skipList2 = new SkipList<int>();
+            var skipList2 = new SkipList<int>();
-            for (int i = 0; i < 100; i++)
+            for (var i = 0; i < 100; i++)
             {
                 skipList.Add(i);
             }
-            BinaryFormatter serializer = new BinaryFormatter();
+            var serializer = new BinaryFormatter();
-            string s = string.Empty;
+            var s = string.Empty;
             using (var stream = new MemoryStream())
             {
                 serializer.Serialize(stream, skipList);
                 stream.Position = 0;
                 skipList2 = (SkipList<int>)serializer.Deserialize(stream);
             }
-            IEnumerator<int> enum1 = skipList.GetEnumerator();
+            var enum1 = skipList.GetEnumerator();
-            IEnumerator<int> enum2 = skipList2.GetEnumerator();
+            var enum2 = skipList2.GetEnumerator();
 
-            for (int i = 0; i < 100; i++)
+            for (var i = 0; i < 100; i++)
             {
                 if (enum1.Current != enum2.Current)
                 {

SystemExtensions.Tests/Collections/TreapTests.cs

@@ -18,8 +18,8 @@ namespace System.Collections.Tests
         [TestMethod()]
         public void InsertTest()
         {
-            Random random = new Random();
+            var random = new Random();
-            for(int i = 0; i < 1000; i++)
+            for(var i = 0; i < 1000; i++)
             {
                 treap.Add(random.Next(0, 5000));
             }
@@ -41,8 +41,8 @@ namespace System.Collections.Tests
         [TestMethod()]
         public void ClearTest()
         {
-            Random random = new Random();
+            var random = new Random();
-            for (int i = 0; i < 100; i++)
+            for (var i = 0; i < 100; i++)
             {
                 treap.Add(random.Next(0, 5000));
             }
@@ -71,12 +71,12 @@ namespace System.Collections.Tests
         [TestMethod()]
         public void ToArrayTest()
         {
-            for(int i = 0; i < 1000; i++)
+            for(var i = 0; i < 1000; i++)
             {
                 treap.Add(i);
             }
-            int[] arr = treap.ToArray();
+            var arr = treap.ToArray();
-            for(int i = 0; i < 1000; i++)
+            for(var i = 0; i < 1000; i++)
             {
                 if(arr[i] != i)
                 {
@@ -88,13 +88,13 @@ namespace System.Collections.Tests
         [TestMethod()]
         public void GetEnumeratorTest()
         {
-            for (int i = 0; i < 1000; i++)
+            for (var i = 0; i < 1000; i++)
             {
                 treap.Add(i);
             }
 
-            int count = 0;
+            var count = 0;
-            foreach(int value in treap)
+            foreach(var value in treap)
             {
                 System.Diagnostics.Debug.WriteLine(value);
                 count++;
@@ -112,23 +112,23 @@ namespace System.Collections.Tests
         [Ignore("Binary serialization is obsolete and should not be used anymore")]
         public void Serialize()
         {
-            Treap<int> treap2 = new Treap<int>();
+            var treap2 = new Treap<int>();
-            for (int i = 0; i < 100; i++)
+            for (var i = 0; i < 100; i++)
             {
                 treap.Add(i);
             }
-            BinaryFormatter serializer = new BinaryFormatter();
+            var serializer = new BinaryFormatter();
-            string s = string.Empty;
+            var s = string.Empty;
             using (var stream = new MemoryStream())
             {
                 serializer.Serialize(stream, treap);
                 stream.Position = 0;
                 treap2 = (Treap<int>)serializer.Deserialize(stream);
             }
-            IEnumerator<int> enum1 = treap.GetEnumerator();
+            var enum1 = treap.GetEnumerator();
-            IEnumerator<int> enum2 = treap2.GetEnumerator();
+            var enum2 = treap2.GetEnumerator();
 
-            for (int i = 0; i < 100; i++)
+            for (var i = 0; i < 100; i++)
             {
                 if (enum1.Current != enum2.Current)
                 {

SystemExtensions.Tests/Http/HttpClientTests.cs

@@ -32,7 +32,7 @@ namespace SystemExtensionsTests.Http
         [TestMethod]
         public async Task HttpClientEmitsCorrectMessages()
         {
-            int messagesEmitted = 0;
+            var messagesEmitted = 0;
             this.httpClient.EventEmitted += (sender, message) =>
             {
                 messagesEmitted++;
@@ -309,7 +309,7 @@ namespace SystemExtensionsTests.Http
             this.handler.ResponseResolverAsync = async (request) =>
             {
                 request.RequestUri.Should().Be(expectedUri);
-                for (int i = 0; i < 10; i++)
+                for (var i = 0; i < 10; i++)
                 {
                     await Task.Delay(100);
                 }

SystemExtensions.Tests/Structures/Int64BitStructTests.cs

@@ -53,7 +53,7 @@ namespace System.Structures.BitStructures.Tests
         [DataRow(int.MaxValue, int.MinValue)]
         public void TestLowHigh(int low, int high)
         {
-            Int64BitStruct int64 = new Int64BitStruct(low, high);
+            var int64 = new Int64BitStruct(low, high);
             Int32BitStruct lowStruct = low;
             Int32BitStruct highStruct = high;
             Assert.IsTrue(int64.Low == lowStruct);

SystemExtensions.Tests/Threading/PriorityThreadPoolTests.cs

@@ -49,7 +49,7 @@ namespace System.Threading.Tests
             Thread.Sleep(100);
             try
             {
-                int x = threadPool.NumberOfThreads;
+                var x = threadPool.NumberOfThreads;
                 Assert.Fail();
             }
             catch(Exception e)
@@ -63,17 +63,17 @@ namespace System.Threading.Tests
         {
             threadPool.Dispose();
             threadPool = new PriorityThreadPool();
-            for (int i = 0; i < 10; i++)
+            for (var i = 0; i < 10; i++)
             {
                 threadPool.QueueUserWorkItem(o =>
                 {
-                    for (int x = 0; x < 100; x++)
+                    for (var x = 0; x < 100; x++)
                     {
                         System.Diagnostics.Debug.WriteLine(Thread.CurrentThread.ManagedThreadId + " - " + x);
                     }
                 }, null);
             }
-            for (int i = 0; i < 10; i++)
+            for (var i = 0; i < 10; i++)
             {
                 System.Diagnostics.Debug.WriteLine("=====================================");
                 System.Diagnostics.Debug.WriteLine("Current threads in threadpool: " + threadPool.NumberOfThreads);
@@ -98,11 +98,11 @@ namespace System.Threading.Tests
             {
                 Assert.Fail();
             }
-            for (int i = 0; i < 10; i++)
+            for (var i = 0; i < 10; i++)
             {
                 threadPool.QueueUserWorkItem(o =>
                 {
-                    for (int x = 0; x < 100; x++)
+                    for (var x = 0; x < 100; x++)
                     {
                         System.Diagnostics.Debug.WriteLine(Thread.CurrentThread.ManagedThreadId + " - " + x);
                     }
@@ -126,11 +126,11 @@ namespace System.Threading.Tests
             {
                 Assert.Fail();
             }
-            for (int i = 0; i < 10; i++)
+            for (var i = 0; i < 10; i++)
             {
                 threadPool.QueueUserWorkItem(o =>
                 {
-                    for (int x = 0; x < 100; x++)
+                    for (var x = 0; x < 100; x++)
                     {
                         switch (Thread.CurrentThread.Priority)
                         {
@@ -153,7 +153,7 @@ namespace System.Threading.Tests
                     }
                 }, null);
             }
-            for (int i = 0; i < 50; i++)
+            for (var i = 0; i < 50; i++)
             {
                 System.Diagnostics.Debug.WriteLine("=====================================");
                 System.Diagnostics.Debug.WriteLine("Current threads in threadpool: " + threadPool.NumberOfThreads);
@@ -168,9 +168,9 @@ namespace System.Threading.Tests
         {
             threadPool.Dispose();
             threadPool = new PriorityThreadPool();
-            for (int i = 0; i < 1000; i++)
+            for (var i = 0; i < 1000; i++)
             {
-                TaskPriority taskPriority = TaskPriority.Lowest;
+                var taskPriority = TaskPriority.Lowest;
                 if(i % 10 == 0)
                 {
                     taskPriority = TaskPriority.Highest;