Merge 7a764a5929 into 5aaa0d318a

.github/workflows/cd.yaml

@@ -4,7 +4,10 @@ on:
   push:
     branches:
       - master
-
+  pull_request:
+    branches:
+      - master
+      
 jobs:
 
   build:
@@ -48,23 +51,14 @@ jobs:
     - name: Build SystemExtensions.NetStandard.DependencyInjection project
       run: dotnet build SystemExtensions.NetStandard.DependencyInjection -c $env:Configuration
 
-    - name: Build SystemExtensions.NetStandard.Security project
-      run: dotnet build SystemExtensions.NetStandard.Security -c $env:Configuration
-
-    - name: Push SystemExtensions.NetStandard nuget package
+    - name: Push nuget package
       uses: brandedoutcast/publish-nuget@v2.5.5
       with:
          PROJECT_FILE_PATH: SystemExtensions.NetStandard\SystemExtensions.NetStandard.csproj
          NUGET_KEY: ${{secrets.NUGET_API_KEY}}
 
-    - name: Push SystemExtensions.NetStandard.DependencyInjection nuget package
+    - name: Push nuget package
       uses: brandedoutcast/publish-nuget@v2.5.5
       with:
          PROJECT_FILE_PATH: SystemExtensions.NetStandard.DependencyInjection\SystemExtensions.NetStandard.DependencyInjection.csproj
-         NUGET_KEY: ${{secrets.NUGET_API_KEY}}
-
-    - name: Push SystemExtensions.NetStandard.Security nuget package
-      uses: brandedoutcast/publish-nuget@v2.5.5
-      with:
-         PROJECT_FILE_PATH: SystemExtensions.NetStandard.Security\SystemExtensions.NetStandard.Security.csproj
          NUGET_KEY: ${{secrets.NUGET_API_KEY}}

.github/workflows/ci.yaml

@@ -22,7 +22,6 @@ jobs:
       Solution_Path: SystemExtensions.sln
       Test_Project_Path: SystemExtensions.Tests\SystemExtensions.NetStandard.Tests.csproj
       DI_Test_Project_Path: SystemExtensions.DependencyInjection.Tests\SystemExtensions.NetStandard.DependencyInjection.Tests.csproj
-      Sec_Test_Project_Path: SystemExtensions.NetStandard.Security.Tests\SystemExtensions.NetStandard.Security.Tests.csproj
       Source_Project_Path: SystemExtensions.NetStandard\SystemExtensions.NetStandard.csproj
       Actions_Allow_Unsecure_Commands: true
 
@@ -46,9 +45,6 @@ jobs:
     - name: Execute DI Unit Tests
       run: dotnet test $env:DI_Test_Project_Path
 
-    - name: Execute Security Unit Tests
-      run: dotnet test $env:Sec_Test_Project_Path
-
     - name: Restore Project
       run: msbuild $env:Solution_Path /t:Restore /p:Configuration=$env:Configuration /p:RuntimeIdentifier=$env:RuntimeIdentifier
       env:

SystemExtensions.DependencyInjection.Tests/Configuration/DefaultOptionsManagerTests.cs

@@ -1,6 +1,6 @@
 using FluentAssertions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using System.Configuration;
+using System.Extensions.Configuration;
 
 namespace SystemExtensions.DependencyInjection.Tests.Configuration
 {

SystemExtensions.DependencyInjection.Tests/Configuration/LiveOptionsResolverTests.cs

@@ -2,7 +2,7 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 using System;
-using System.Configuration;
+using System.Extensions.Configuration;
 
 namespace SystemExtensions.DependencyInjection.Tests.Configuration
 {

SystemExtensions.DependencyInjection.Tests/Configuration/LiveUpdateableOptionsResolverTests.cs

@@ -2,7 +2,7 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 using System;
-using System.Configuration;
+using System.Extensions.Configuration;
 
 namespace SystemExtensions.DependencyInjection.Tests.Configuration
 {

SystemExtensions.DependencyInjection.Tests/Configuration/LiveUpdateableOptionsWrapperTests.cs

@@ -1,7 +1,7 @@
 using FluentAssertions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
-using System.Configuration;
+using System.Extensions.Configuration;
 
 namespace SystemExtensions.DependencyInjection.Tests.Configuration
 {

SystemExtensions.DependencyInjection.Tests/Configuration/OptionsResolverTests.cs

@@ -3,7 +3,7 @@ using Microsoft.Extensions.Options;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 using System;
-using System.Configuration;
+using System.Extensions.Configuration;
 
 namespace SystemExtensions.DependencyInjection.Tests.Configuration
 {

SystemExtensions.DependencyInjection.Tests/Configuration/UpdateableOptionsResolverTests.cs

@@ -2,7 +2,7 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 using System;
-using System.Configuration;
+using System.Extensions.Configuration;
 
 namespace SystemExtensions.DependencyInjection.Tests.Configuration
 {

SystemExtensions.DependencyInjection.Tests/Configuration/UpdateableOptionsWrapperTests.cs

@@ -2,7 +2,6 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 using System;
-using System.Configuration;
 using System.Extensions.Configuration;
 
 namespace SystemExtensions.DependencyInjection.Tests.Configuration

SystemExtensions.DependencyInjection.Tests/Logging/LoggerResolverTests.cs

@@ -4,6 +4,7 @@ using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 using System;
 using System.Logging;
+using System.Windows.Extensions.Logging;
 
 namespace SystemExtensions.DependencyInjection.Tests.Logging
 {

SystemExtensions.NetStandard.DependencyInjection/Configuration/DefaultOptionsManager.cs

@@ -1,4 +1,4 @@
-namespace System.Configuration
+namespace System.Extensions.Configuration
 {
     public sealed class DefaultOptionsManager : IOptionsManager
     {

SystemExtensions.NetStandard.DependencyInjection/Configuration/ILiveOptions.cs

@@ -1,6 +1,6 @@
 using Microsoft.Extensions.Options;
 
-namespace System.Configuration
+namespace System.Extensions.Configuration
 {
     public interface ILiveOptions<T> : IOptions<T>
         where T : class

SystemExtensions.NetStandard.DependencyInjection/Configuration/ILiveUpdateableOptions.cs

@@ -1,4 +1,4 @@
-namespace System.Configuration
+namespace System.Extensions.Configuration
 {
     public interface ILiveUpdateableOptions<T> : ILiveOptions<T>, IUpdateableOptions<T>
         where T : class

SystemExtensions.NetStandard.DependencyInjection/Configuration/IOptionsManager.cs

@@ -1,4 +1,4 @@
-namespace System.Configuration
+namespace System.Extensions.Configuration
 {
     public interface IOptionsManager
     {

SystemExtensions.NetStandard.DependencyInjection/Configuration/IUpdateableOptions.cs

@@ -1,6 +1,6 @@
 using Microsoft.Extensions.Options;
 
-namespace System.Configuration
+namespace System.Extensions.Configuration
 {
     public interface IUpdateableOptions<out T> : IOptions<T>
         where T : class

SystemExtensions.NetStandard.DependencyInjection/Configuration/LiveOptionsResolver.cs

@@ -1,6 +1,6 @@
 using Slim.Resolvers;
 
-namespace System.Configuration
+namespace System.Extensions.Configuration
 {
     public sealed class LiveOptionsResolver : IDependencyResolver
     {

SystemExtensions.NetStandard.DependencyInjection/Configuration/LiveUpdateableOptionsResolver.cs

@@ -1,6 +1,6 @@
 using Slim.Resolvers;
 
-namespace System.Configuration
+namespace System.Extensions.Configuration
 {
     public sealed class LiveUpdateableOptionsResolver : IDependencyResolver
     {

SystemExtensions.NetStandard.DependencyInjection/Configuration/LiveUpdateableOptionsWrapper.cs

@@ -1,6 +1,6 @@
 using System.Extensions;
 
-namespace System.Configuration
+namespace System.Extensions.Configuration
 {
     public sealed class LiveUpdateableOptionsWrapper<T> : ILiveUpdateableOptions<T>
         where T : class

SystemExtensions.NetStandard.DependencyInjection/Configuration/OptionsResolver.cs

@@ -1,7 +1,7 @@
 using Microsoft.Extensions.Options;
 using Slim.Resolvers;
 
-namespace System.Configuration
+namespace System.Extensions.Configuration
 {
     public sealed class OptionsResolver : IDependencyResolver
     {

SystemExtensions.NetStandard.DependencyInjection/Configuration/UpdateableOptionsResolver.cs

@@ -1,7 +1,6 @@
 using Slim.Resolvers;
-using System.Extensions.Configuration;
 
-namespace System.Configuration
+namespace System.Extensions.Configuration
 {
     public sealed class UpdateableOptionsResolver : IDependencyResolver
     {

SystemExtensions.NetStandard.DependencyInjection/Configuration/UpdateableOptionsWrapper.cs

@@ -1,4 +1,4 @@
-using System.Configuration;
+using System.Extensions;
 
 namespace System.Extensions.Configuration
 {

SystemExtensions.NetStandard.DependencyInjection/Extensions/ServiceManagerExtensions.cs

@@ -1,7 +1,8 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Slim;
-using System.Configuration;
+using System.Extensions;
+using System.Extensions.Configuration;
 using System.Http;
 using System.Logging;
 using System.Net.Http;
@@ -104,23 +105,6 @@ namespace System.Extensions
             return serviceManager;
         }
 
-        /// <summary>
-        /// Register a <see cref="ILoggerFactory"/> with a <see cref="CVLoggerProvider"/>.
-        /// </summary>
-        /// <param name="serviceManager"></param>
-        /// <returns></returns>
-        public static IServiceManager RegisterCVLoggerFactory(this IServiceManager serviceManager)
-        {
-            serviceManager.RegisterScoped<ILoggerFactory, LoggerFactory>(sp =>
-            {
-                LoggerFactory loggerFactory = new();
-                loggerFactory.AddProvider(new CVLoggerProvider(sp.GetService<ILogsWriter>()));
-                return loggerFactory;
-            });
-
-            return serviceManager;
-        }
-
         public static IServiceManager RegisterLoggerFactory(this IServiceManager serviceManager, Func<Slim.IServiceProvider, ILoggerFactory> loggerFactory)
         {
             serviceManager.ThrowIfNull(nameof(serviceManager));

SystemExtensions.NetStandard.DependencyInjection/Logging/CVLoggerProvider.cs

@@ -7,7 +7,7 @@ namespace System.Logging
     public sealed class CVLoggerProvider : ICVLoggerProvider
     {
         private readonly ILogsWriter logsManager;
-        private readonly CorrelationVector correlationVector;
+        private CorrelationVector correlationVector;
 
         public CVLoggerProvider(ILogsWriter logsWriter)
         {
@@ -28,6 +28,11 @@ namespace System.Logging
 
         public ILogger CreateLogger(string categoryName)
         {
+            if (this.correlationVector is not null)
+            {
+                this.correlationVector = CorrelationVector.Extend(this.correlationVector.ToString());
+            }
+
             return new CVLogger(categoryName, this);
         }
 

SystemExtensions.NetStandard.DependencyInjection/Logging/LoggerResolver.cs

@@ -2,7 +2,7 @@
 using Slim.Resolvers;
 using System.Linq;
 
-namespace System.Logging
+namespace System.Windows.Extensions.Logging
 {
     public sealed class LoggerResolver : IDependencyResolver
     {
@@ -25,7 +25,7 @@ namespace System.Logging
             }
             else if (type == typeof(ILogger))
             {
-                return ResolveLogger(serviceProvider);
+                return ResolveLogger(serviceProvider, type);
             }
             else
             {
@@ -41,7 +41,7 @@ namespace System.Logging
             return createLoggerMethod.MakeGenericMethod(categoryTypes.First()).Invoke(null, new object[] { loggerFactory });
         }
 
-        private static object ResolveLogger(Slim.IServiceProvider serviceProvider)
+        private static object ResolveLogger(Slim.IServiceProvider serviceProvider, Type type)
         {
             var loggerFactory = serviceProvider.GetService<ILoggerFactory>();
             return loggerFactory.CreateLogger(string.Empty);

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

@@ -6,7 +6,7 @@
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <LangVersion>latest</LangVersion>
-    <Version>1.1.5</Version>
+    <Version>1.0.0</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.4" />
-    <PackageReference Include="SystemExtensions.NetStandard" Version="1.3.1" />
+    <PackageReference Include="Slim" Version="1.5.1" />
+    <PackageReference Include="SystemExtensions.NetStandard" Version="1.3.0" />
   </ItemGroup>
 
 </Project>

SystemExtensions.NetStandard.Security.Tests/AesEncrypterTests.cs

@@ -1,105 +0,0 @@
-using FluentAssertions;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using System;
-using System.IO;
-using System.Security.Cryptography;
-using System.Text;
-using System.Threading.Tasks;
-using SystemExtensions.NetStandard.Security.Encryption;
-
-namespace SystemExtensions.NetStandard.Security.Tests
-{
-    [TestClass]
-    public class AesEncrypterTests
-    {
-        private ISymmetricEncrypter symmetricEncrypter;
-        private string keyString;
-        private byte[] keyBytes;
-        private byte[] ivBytes;
-        private string ivString;
-        private string toEncryptString;
-        private byte[] toEncryptBytes;
-
-        [TestInitialize]
-        public void TestInitialize()
-        {
-            this.symmetricEncrypter = new AesEncrypter();
-            this.keyBytes = new byte[] { 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2 };
-            this.keyString = Convert.ToBase64String(this.keyBytes);
-            this.ivBytes = new byte[] { 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6 };
-            this.ivString = Convert.ToBase64String(this.ivBytes);
-            this.toEncryptBytes = Encoding.UTF8.GetBytes("toEncrypt");
-            this.toEncryptString = Convert.ToBase64String(this.toEncryptBytes);
-        }
-
-        [TestMethod]
-        public async Task EncryptDecryptStringWithStringKeyStringIv()
-        {
-            var encrypted = await this.symmetricEncrypter.Encrypt(this.keyString, this.ivString, this.toEncryptString).ConfigureAwait(false);
-            var decrypted = await this.symmetricEncrypter.Decrypt(this.keyString, this.ivString, encrypted).ConfigureAwait(false);
-
-            this.toEncryptString.Should().Be(decrypted);
-        }
-
-        [TestMethod]
-        public async Task EncryptDecryptStringWithByteKeyByteIv()
-        {
-            var encrypted = await this.symmetricEncrypter.Encrypt(this.keyBytes, this.ivBytes, this.toEncryptString).ConfigureAwait(false);
-            var decrypted = await this.symmetricEncrypter.Decrypt(this.keyBytes, this.ivBytes, encrypted).ConfigureAwait(false);
-
-            this.toEncryptString.Should().Be(decrypted);
-        }
-
-        [TestMethod]
-        public async Task EncryptDecryptByteWithStringKeyStringIv()
-        {
-            var encrypted = await this.symmetricEncrypter.Encrypt(this.keyString, this.ivString, this.toEncryptBytes).ConfigureAwait(false);
-            var decrypted = await this.symmetricEncrypter.Decrypt(this.keyString, this.ivString, encrypted).ConfigureAwait(false);
-
-            this.toEncryptBytes.Should().BeEquivalentTo(decrypted);
-        }
-
-        [TestMethod]
-        public async Task EncryptDecryptByteWithByteKeyByteIv()
-        {
-            var encrypted = await this.symmetricEncrypter.Encrypt(this.keyBytes, this.ivBytes, this.toEncryptBytes).ConfigureAwait(false);
-            var decrypted = await this.symmetricEncrypter.Decrypt(this.keyBytes, this.ivBytes, encrypted).ConfigureAwait(false);
-
-            this.toEncryptBytes.Should().BeEquivalentTo(decrypted);
-        }
-
-        [TestMethod]
-        public async Task EncryptDecryptStreamWithStringKeyStringIv()
-        {
-            var encrypted = await this.symmetricEncrypter.Encrypt(this.keyString, this.ivString, new MemoryStream(this.toEncryptBytes)).ConfigureAwait(false);
-            encrypted.Position = 0;
-            var decrypted = await this.symmetricEncrypter.Decrypt(this.keyString, this.ivString, encrypted).ConfigureAwait(false);
-
-            this.toEncryptBytes.Should().BeEquivalentTo(((MemoryStream)decrypted).ToArray());
-        }
-
-        [TestMethod]
-        public async Task EncryptDecryptStreamWithByteKeyByteIv()
-        {
-            var encrypted = await this.symmetricEncrypter.Encrypt(this.keyBytes, this.ivBytes, new MemoryStream(this.toEncryptBytes)).ConfigureAwait(false);
-            encrypted.Position = 0;
-            var decrypted = await this.symmetricEncrypter.Decrypt(this.keyBytes, this.ivBytes, encrypted).ConfigureAwait(false);
-
-            this.toEncryptBytes.Should().BeEquivalentTo(((MemoryStream)decrypted).ToArray());
-        }
-
-        [TestMethod]
-        public void GetEncryptionStreamReturnsCryptoStream()
-        {
-            var encryptionStream = this.symmetricEncrypter.GetEncryptionStream(this.keyBytes, this.ivBytes, new MemoryStream());
-            encryptionStream.Should().BeAssignableTo<CryptoStream>();
-        }
-
-        [TestMethod]
-        public void GetDecryptionStreamReturnsCryptoStream()
-        {
-            var encryptionStream = this.symmetricEncrypter.GetDecryptionStream(this.keyBytes, this.ivBytes, new MemoryStream());
-            encryptionStream.Should().BeAssignableTo<CryptoStream>();
-        }
-    }
-}

SystemExtensions.NetStandard.Security.Tests/CryptoRngProviderTests.cs

@@ -1,55 +0,0 @@
-using FluentAssertions;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using System.Linq;
-using System.Rng;
-
-namespace SystemExtensions.NetStandard.Security.Tests
-{
-    [TestClass]
-    public class CryptoRngProviderTests
-    {
-        private CryptoRngProvider cryptoRngProvider;
-
-        [TestInitialize]
-        public void TestInitialize()
-        {
-            this.cryptoRngProvider = new CryptoRngProvider();
-        }
-
-        [TestMethod]
-        public void GetBytes_ShouldSetValues()
-        {
-            var bytes = new byte[100];
-
-            this.cryptoRngProvider.GetBytes(bytes);
-
-            bytes.All(b => b == 0).Should().BeFalse();
-        }
-
-        [TestMethod]
-        public void GetNonZeroBytes_ShouldSetNonZeroValues()
-        {
-            var bytes = new byte[100];
-
-            this.cryptoRngProvider.GetNonZeroBytes(bytes);
-
-            bytes.All(b => b != 0).Should().BeTrue();
-        }
-
-        [TestMethod]
-        public void GetBytes_ShouldReturnBytes()
-        {
-            var bytes = this.cryptoRngProvider.GetBytes(10);
-
-            bytes.Length.Should().Be(10);
-        }
-
-        [TestMethod]
-        public void GetNonZeroBytes_ShouldReturnBytes()
-        {
-            var bytes = this.cryptoRngProvider.GetNonZeroBytes(10);
-
-            bytes.Length.Should().Be(10);
-        }
-    }
-}

SystemExtensions.NetStandard.Security.Tests/SecureStringTests.cs

@@ -1,123 +0,0 @@
-using FluentAssertions;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using System;
-using System.Encryption;
-
-namespace SystemExtensions.NetStandard.Security.Tests
-{
-    [TestClass]
-    public class SecureStringTests
-    {
-        [TestMethod]
-        public void SecureString_NewSecureString_ReturnsValue()
-        {
-            var str = new SecureString("hello");
-
-            str.Value.Should().Be("hello");
-        }
-
-        [TestMethod]
-        public void SecureStringEmpty_AreEqual()
-        {
-            var str = SecureString.Empty;
-            str.Should().Be(SecureString.Empty);
-        }
-
-        [TestMethod]
-        public void SecureStringEmpty_Equals_StringEmpty()
-        {
-            var ss = SecureString.Empty;
-            var s = string.Empty;
-
-            ss.Should().Be(s);
-        }
-
-        [TestMethod]
-        public void SecureString_Equals_OtherSecureString()
-        {
-            var ss1 = new SecureString("Hello");
-            var ss2 = new SecureString("Hello");
-
-            ss1.Equals(ss2).Should().BeTrue();
-        }
-
-        [TestMethod]
-        [DataRow("hello", "hello", true)]
-        [DataRow("hello", "henlo", false)]
-        public void SecureString_EqualOperator_OtherSecureString(string str1, string str2, bool isEqual)
-        {
-            var ss1 = new SecureString(str1);
-            var ss2 = new SecureString(str2);
-
-            (ss1 == ss2).Should().Be(isEqual);
-        }
-
-        [TestMethod]
-        [DataRow("hello", "hello", false)]
-        [DataRow("hello", "henlo", true)]
-        public void SecureString_DifferentOperator_OtherSecureString(string str1, string str2, bool isDifferent)
-        {
-            var ss1 = new SecureString(str1);
-            var ss2 = new SecureString(str2);
-
-            (ss1 != ss2).Should().Be(isDifferent);
-        }
-
-        [TestMethod]
-        [DataRow("hello", "hello", true)]
-        [DataRow("hello", "henlo", false)]
-        public void SecureString_EqualOperator_String(string str1, string str2, bool isEqual)
-        {
-            var ss1 = new SecureString(str1);
-
-            (ss1 == str2).Should().Be(isEqual);
-        }
-
-        [TestMethod]
-        [DataRow("hello", "hello", false)]
-        [DataRow("hello", "henlo", true)]
-        public void SecureString_DifferentOperator_String(string str1, string str2, bool isDifferent)
-        {
-            var ss1 = new SecureString(str1);
-
-            (ss1 != str2).Should().Be(isDifferent);
-        }
-
-        [TestMethod]
-        public void SecureString_PlusOperator_SecureString()
-        {
-            var ss1 = new SecureString("Hello ");
-            var ss2 = new SecureString("World");
-
-            (ss1 + ss2).Should().Be("Hello World");
-        }
-
-        [TestMethod]
-        public void SecureString_PlusOperator_String()
-        {
-            var ss1 = new SecureString("Hello ");
-            var ss2 = "World";
-
-            (ss1 + ss2).Should().Be("Hello World");
-        }
-
-        [TestMethod]
-        public void SecureString_PlusOperator_Char()
-        {
-            var ss1 = new SecureString("Hello ");
-            var c = 'W';
-
-            (ss1 + c).Should().Be("Hello W");
-        }
-
-        [TestMethod]
-        public void SecureString_WithOptionalEntropy_Matches()
-        {
-            SecureString.AddOptionalEntropy(new byte[] { 10, 20, 25, 34, 56, 12, 10, 81, 200, 155, 123, 144, 123, 192, 122, 1 });
-            var ss1 = new SecureString("Hello");
-            var ss2 = new SecureString("Hello");
-
-            ss1.Should().Be(ss2);
-        }
-    }
-}

SystemExtensions.NetStandard.Security.Tests/Sha256HashingServiceTests.cs

@@ -1,48 +0,0 @@
-using FluentAssertions;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using System;
-using System.IO;
-using System.Text;
-using System.Threading.Tasks;
-using SystemExtensions.NetStandard.Security.Hashing;
-
-namespace SystemExtensions.NetStandard.Security.Tests
-{
-    [TestClass]
-    public sealed class Sha256HashingServiceTests
-    {
-        private readonly IHashingService hashingService = new Sha256HashingService();
-        private string toHashtString;
-        private byte[] toHashtBytes;
-        private Stream toHashStream;
-
-        [TestInitialize]
-        public void TestInitialize()
-        {
-            this.toHashtBytes = Encoding.UTF8.GetBytes("toEncrypt");
-            this.toHashtString = Convert.ToBase64String(this.toHashtBytes);
-            this.toHashStream = new MemoryStream(this.toHashtBytes);
-        }
-
-        [TestMethod]
-        public async Task HashString()
-        {
-            var hash = await this.hashingService.Hash(this.toHashtString).ConfigureAwait(false);
-            hash.Should().BeOfType<string>();
-        }
-
-        [TestMethod]
-        public async Task HashBytes()
-        {
-            var hash = await this.hashingService.Hash(this.toHashtBytes).ConfigureAwait(false);
-            hash.Should().BeOfType<byte[]>();
-        }
-
-        [TestMethod]
-        public async Task HashStream()
-        {
-            var hash = await this.hashingService.Hash(this.toHashStream).ConfigureAwait(false);
-            hash.Should().BeAssignableTo<Stream>();
-        }
-    }
-}

SystemExtensions.NetStandard.Security.Tests/SystemExtensions.NetStandard.Security.Tests.csproj

@@ -1,21 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
-
-    <IsPackable>false</IsPackable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="5.10.3" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.2.3" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.2.3" />
-    <PackageReference Include="coverlet.collector" Version="3.0.2" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\SystemExtensions.NetStandard.Security\SystemExtensions.NetStandard.Security.csproj" />
-  </ItemGroup>
-
-</Project>

SystemExtensions.NetStandard.Security/Encryption/AesEncrypter.cs

@@ -1,215 +0,0 @@
-using System;
-using System.IO;
-using System.Linq;
-using System.Security.Cryptography;
-using System.Threading.Tasks;
-using SystemExtensions.NetStandard.Security.Utilities;
-
-namespace SystemExtensions.NetStandard.Security.Encryption
-{
-    public sealed class AesEncrypter : ISymmetricEncrypter
-    {
-        public async Task<string> Decrypt(string key, string iv, string value)
-        {
-            using var valueStream = BytesToStream(StringToBytes(value));
-            using var decryptedStream = await DecryptInternal(StringToBytes(key), StringToBytes(iv), valueStream).ConfigureAwait(false);
-            return StreamToString(decryptedStream);
-        }
-
-        public async Task<string> Decrypt(byte[] key, byte[] iv, string value)
-        {
-            using var valueStream = BytesToStream(StringToBytes(value));
-            using var decryptedStream = await DecryptInternal(key, iv, valueStream).ConfigureAwait(false);
-            return StreamToString(decryptedStream);
-        }
-
-        public async Task<byte[]> Decrypt(string key, string iv, byte[] value)
-        {
-            using var valueStream = BytesToStream(value);
-            using var decryptedStream = await DecryptInternal(StringToBytes(key), StringToBytes(iv), valueStream).ConfigureAwait(false);
-            return StreamToBytes(decryptedStream);
-        }
-
-        public async Task<byte[]> Decrypt(byte[] key, byte[] iv, byte[] value)
-        {
-            using var valueStream = BytesToStream(value);
-            using var decryptedStream = await DecryptInternal(key, iv, valueStream).ConfigureAwait(false);
-            return StreamToBytes(decryptedStream);
-        }
-
-        public async Task<Stream> Decrypt(string key, string iv, Stream value)
-        {
-            return await DecryptInternal(StringToBytes(key), StringToBytes(iv), value).ConfigureAwait(false);
-        }
-
-        public async Task<Stream> Decrypt(byte[] key, byte[] iv, Stream value)
-        {
-            return await DecryptInternal(key, iv, value).ConfigureAwait(false);
-        }
-
-        public async Task<string> Encrypt(string key, string iv, string value)
-        {
-            using var valueStream = BytesToStream(StringToBytes(value));
-            using var encryptedStream = await EncryptInternal(StringToBytes(key), StringToBytes(iv), valueStream).ConfigureAwait(false);
-            return StreamToString(encryptedStream);
-        }
-
-        public async Task<string> Encrypt(byte[] key, byte[] iv, string value)
-        {
-            using var valueStream = BytesToStream(StringToBytes(value));
-            using var encryptedStream = await EncryptInternal(key, iv, valueStream).ConfigureAwait(false);
-            return StreamToString(encryptedStream);
-        }
-
-        public async Task<byte[]> Encrypt(string key, string iv, byte[] value)
-        {
-            using var valueStream = BytesToStream(value);
-            using var encryptedStream = await EncryptInternal(StringToBytes(key), StringToBytes(iv), valueStream).ConfigureAwait(false);
-            return StreamToBytes(encryptedStream);
-        }
-
-        public async Task<byte[]> Encrypt(byte[] key, byte[] iv, byte[] value)
-        {
-            using var valueStream = BytesToStream(value);
-            using var encryptedStream = await EncryptInternal(key, iv, valueStream).ConfigureAwait(false);
-            return StreamToBytes(encryptedStream);
-        }
-
-        public async Task<Stream> Encrypt(string key, string iv, Stream value)
-        {
-            return value is null
-                ? throw new ArgumentNullException(nameof(value))
-                : await EncryptInternal(StringToBytes(key), StringToBytes(iv), value).ConfigureAwait(false);
-        }
-
-        public async Task<Stream> Encrypt(byte[] key, byte[] iv, Stream value)
-        {
-            return value is null
-                ? throw new ArgumentNullException(nameof(value))
-                : await EncryptInternal(key, iv, value).ConfigureAwait(false);
-        }
-
-        public Stream GetEncryptionStream(string key, string iv, Stream outStream)
-        {
-            return GetEncryptionStreamInternal(StringToBytes(key), StringToBytes(iv), outStream);
-        }
-
-        public Stream GetEncryptionStream(byte[] key, byte[] iv, Stream outStream)
-        {
-            return GetEncryptionStreamInternal(key, iv, outStream);
-        }
-
-        public Stream GetDecryptionStream(string key, string iv, Stream inStream)
-        {
-            return GetDecryptionStreamInternal(StringToBytes(key), StringToBytes(iv), inStream);
-        }
-
-        public Stream GetDecryptionStream(byte[] key, byte[] iv, Stream inStream)
-        {
-            return GetDecryptionStreamInternal(key, iv, inStream);
-        }
-
-        private static byte[] StreamToBytes(Stream value)
-        {
-            value.Position = 0;
-            var buffer = new byte[1024];
-            using var ms = new MemoryStream();
-            var read = -1;
-            do
-            {
-                read = value.Read(buffer, 0, buffer.Length);
-                ms.Write(buffer, 0, read);
-            } while (read > 0);
-            return ms.ToArray();
-        }
-
-        private static string StreamToString(Stream value)
-        {
-            return Convert.ToBase64String(StreamToBytes(value));
-        }
-
-        private static byte[] StringToBytes(string value)
-        {
-            return Convert.FromBase64String(value);
-        }
-
-        private static Stream BytesToStream(byte[] value)
-        {
-            return new MemoryStream(value);
-        }
-
-        private static async Task<Stream> EncryptInternal(byte[] key, byte[] iv, Stream toEncryptStream)
-        {
-            if (key.Length < 32)
-            {
-                throw new ArgumentException($"{nameof(key)} must be at least 32 bytes");
-            }
-
-            if (iv.Length < 16)
-            {
-                throw new ArgumentException($"{nameof(iv)} must be at least 16 bytes");
-            }
-
-            key = key.Take(32).ToArray();
-            iv = iv.Take(16).ToArray();
-
-
-            var encryptedMemoryStream = new MemoryStream();
-            using var cryptoStream = GetEncryptionStreamInternal(key, iv, encryptedMemoryStream);
-            await toEncryptStream.CopyToAsync(cryptoStream).ConfigureAwait(false);
-            if (!cryptoStream.HasFlushedFinalBlock)
-            {
-                cryptoStream.FlushFinalBlock();
-            }
-
-            encryptedMemoryStream.Position = 0;
-            return encryptedMemoryStream;
-        }
-
-        private static async Task<Stream> DecryptInternal(byte[] key, byte[] iv, Stream toDecryptStream)
-        {
-            if (key.Length < 32)
-            {
-                throw new ArgumentException($"{nameof(key)} must be at least 32 bytes");
-            }
-
-            if (iv.Length < 16)
-            {
-                throw new ArgumentException($"{nameof(iv)} must be at least 16 bytes");
-            }
-
-            key = key.Take(32).ToArray();
-            iv = iv.Take(16).ToArray();
-
-
-            var decryptedMemoryStream = new MemoryStream();
-            using var cryptoStream = GetDecryptionStreamInternal(key, iv, toDecryptStream);
-            await cryptoStream.CopyToAsync(decryptedMemoryStream).ConfigureAwait(false);
-            if (!cryptoStream.HasFlushedFinalBlock)
-            {
-                cryptoStream.FlushFinalBlock();
-            }
-
-            decryptedMemoryStream.Position = 0;
-            return decryptedMemoryStream;
-        }
-
-        private static CryptoStream GetEncryptionStreamInternal(byte[] key, byte[] iv, Stream encryptedStream)
-        {
-            using var aes = Aes.Create();
-            aes.Padding = PaddingMode.PKCS7;
-            var crypto = aes.CreateEncryptor(key, iv);
-            var cryptoStream = new NotClosingCryptoStream(encryptedStream, crypto, CryptoStreamMode.Write);
-            return cryptoStream;
-        }
-
-        private static CryptoStream GetDecryptionStreamInternal(byte[] key, byte[] iv, Stream encryptedStream)
-        {
-            using var aes = Aes.Create();
-            aes.Padding = PaddingMode.PKCS7;
-            var crypto = aes.CreateDecryptor(key, iv);
-            var cryptoStream = new NotClosingCryptoStream(encryptedStream, crypto, CryptoStreamMode.Read);
-            return cryptoStream;
-        }
-    }
-}

SystemExtensions.NetStandard.Security/Encryption/ISymmetricEncrypter.cs

@@ -1,25 +0,0 @@
-using System.IO;
-using System.Threading.Tasks;
-
-namespace SystemExtensions.NetStandard.Security.Encryption
-{
-    public interface ISymmetricEncrypter
-    {
-        Stream GetEncryptionStream(string key, string iv, Stream outStream);
-        Stream GetEncryptionStream(byte[] key, byte[] iv, Stream outStream);
-        Stream GetDecryptionStream(string key, string iv, Stream inStream);
-        Stream GetDecryptionStream(byte[] key, byte[] iv, Stream inStream);
-        Task<string> Encrypt(string key, string iv, string value);
-        Task<string> Encrypt(byte[] key, byte[] iv, string value);
-        Task<byte[]> Encrypt(string key, string iv, byte[] value);
-        Task<byte[]> Encrypt(byte[] key, byte[] iv, byte[] value);
-        Task<Stream> Encrypt(string key, string iv, Stream value);
-        Task<Stream> Encrypt(byte[] key, byte[] iv, Stream value);
-        Task<string> Decrypt(string key, string iv, string value);
-        Task<string> Decrypt(byte[] key, byte[] iv, string value);
-        Task<byte[]> Decrypt(string key, string iv, byte[] value);
-        Task<byte[]> Decrypt(byte[] key, byte[] iv, byte[] value);
-        Task<Stream> Decrypt(string key, string iv, Stream value);
-        Task<Stream> Decrypt(byte[] key, byte[] iv, Stream value);
-    }
-}

SystemExtensions.NetStandard.Security/Encryption/SecureString.cs

@@ -1,102 +0,0 @@
-using System.Security.Cryptography;
-using System.Text;
-
-namespace System.Encryption
-{
-    public sealed class SecureString
-    {
-        private static byte[] optionalEntropy;
-        private byte[] encryptedValue;
-
-        public string Value {
-            get => this.encryptedValue is not null ? Encoding.UTF8.GetString(ProtectedData.Unprotect(this.encryptedValue, optionalEntropy, DataProtectionScope.CurrentUser)) : null;
-            private set => this.encryptedValue = ProtectedData.Protect(Encoding.UTF8.GetBytes(value), optionalEntropy, DataProtectionScope.CurrentUser);
-        }
-
-        public SecureString(string value)
-        {
-            this.Value = value;
-        }
-
-        public override bool Equals(object obj)
-        {
-            if (obj is string)
-            {
-                return this == (obj as string);
-            }
-            else if (obj is SecureString)
-            {
-                return this == (obj as SecureString);
-            }
-            else
-            {
-                return base.Equals(obj);
-            }
-        }
-        public override int GetHashCode()
-        {
-            return this.Value.GetHashCode();
-        }
-        public override string ToString()
-        {
-            return this.Value;
-        }
-
-        public static readonly SecureString Empty = new(string.Empty);
-        public static implicit operator string(SecureString ss) => ss is null ? string.Empty : ss.Value;
-        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 (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));
-            }
-
-            return new SecureString(ss1.Value + s2);
-        }
-        public static SecureString operator +(SecureString ss1, char c)
-        {
-            if (ss1 is null)
-            {
-                throw new ArgumentNullException(nameof(ss1));
-            }
-
-            return new SecureString(ss1.Value + c);
-        }
-        public static bool operator ==(SecureString ss1, SecureString ss2)
-        {
-            return ss1?.Value == ss2?.Value;
-        }
-        public static bool operator !=(SecureString ss1, SecureString ss2)
-        {
-            return !(ss1 == ss2);
-        }
-        public static bool operator ==(SecureString ss1, string s2)
-        {
-            return ss1?.Value == s2;
-        }
-        public static bool operator !=(SecureString ss1, string s2)
-        {
-            return !(ss1?.Value == s2);
-        }
-
-        public static void AddOptionalEntropy(byte[] entropy)
-        {
-            optionalEntropy = entropy;
-        }
-    }
-}

SystemExtensions.NetStandard.Security/Hashing/IHashingService.cs

@@ -1,12 +0,0 @@
-using System.IO;
-using System.Threading.Tasks;
-
-namespace SystemExtensions.NetStandard.Security.Hashing
-{
-    public interface IHashingService
-    {
-        Task<string> Hash(string raw);
-        Task<byte[]> Hash(byte[] raw);
-        Task<Stream> Hash(Stream raw);
-    }
-}

SystemExtensions.NetStandard.Security/Hashing/Sha256HashingService.cs

@@ -1,63 +0,0 @@
-using System;
-using System.IO;
-using System.Security.Cryptography;
-using System.Threading.Tasks;
-
-namespace SystemExtensions.NetStandard.Security.Hashing
-{
-    public sealed class Sha256HashingService : IHashingService
-    {
-        public async Task<string> Hash(string raw)
-        {
-            using var rawStream = BytesToStream(StringToBytes(raw));
-            using var hashedStream = await HashInternal(rawStream).ConfigureAwait(false);
-            return StreamToString(hashedStream);
-        }
-        public async Task<byte[]> Hash(byte[] raw)
-        {
-            using var rawStream = BytesToStream(raw);
-            using var hashedStream = await HashInternal(rawStream).ConfigureAwait(false);
-            return StreamToBytes(hashedStream);
-        }
-        public async Task<Stream> Hash(Stream raw)
-        {
-            return await HashInternal(raw);
-        }
-
-        private static byte[] StreamToBytes(Stream value)
-        {
-            value.Position = 0;
-            var buffer = new byte[1024];
-            using var ms = new MemoryStream();
-            var read = -1;
-            do
-            {
-                read = value.Read(buffer, 0, buffer.Length);
-                ms.Write(buffer, 0, read);
-            } while (read > 0);
-            return ms.ToArray();
-        }
-        private static string StreamToString(Stream value)
-        {
-            return Convert.ToBase64String(StreamToBytes(value));
-        }
-        private static byte[] StringToBytes(string value)
-        {
-            return Convert.FromBase64String(value);
-        }
-        private static Stream BytesToStream(byte[] value)
-        {
-            return new MemoryStream(value);
-        }
-        private static async Task<Stream> HashInternal(Stream 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/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2021 Macocian Alexandru Victor
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

SystemExtensions.NetStandard.Security/Rng/CryptoRngProvider.cs

@@ -1,59 +0,0 @@
-using System.Security.Cryptography;
-
-namespace System.Rng
-{
-    public sealed class CryptoRngProvider : ICryptoRngProvider, IDisposable
-    {
-        private readonly RNGCryptoServiceProvider rngProvider;
-        private bool disposedValue;
-
-        public CryptoRngProvider()
-        {
-            this.rngProvider = new RNGCryptoServiceProvider();
-        }
-        public CryptoRngProvider(CspParameters cspParams)
-        {
-            this.rngProvider = new RNGCryptoServiceProvider(cspParams);
-        }
-
-
-        public void GetBytes(byte[] data)
-        {
-            this.rngProvider.GetBytes(data);
-        }
-        public void GetNonZeroBytes(byte[] data)
-        {
-            this.rngProvider.GetNonZeroBytes(data);
-        }
-        public byte[] GetBytes(int byteCount)
-        {
-            var bytes = new byte[byteCount];
-            this.GetBytes(bytes);
-            return bytes;
-        }
-        public byte[] GetNonZeroBytes(int byteCount)
-        {
-            var bytes = new byte[byteCount];
-            this.GetNonZeroBytes(bytes);
-            return bytes;
-        }
-
-        private void Dispose(bool disposing)
-        {
-            if (!this.disposedValue)
-            {
-                if (disposing)
-                {
-                    this.rngProvider.Dispose();
-                }
-
-                this.disposedValue = true;
-            }
-        }
-        public void Dispose()
-        {
-            this.Dispose(disposing: true);
-            GC.SuppressFinalize(this);
-        }
-    }
-}

SystemExtensions.NetStandard.Security/Rng/ICryptoRngProvider.cs

@@ -1,10 +0,0 @@
-namespace System.Rng
-{
-    public interface ICryptoRngProvider
-    {
-        public void GetBytes(byte[] data);
-        public byte[] GetBytes(int byteCount);
-        public void GetNonZeroBytes(byte[] data);
-        public byte[] GetNonZeroBytes(int byteCount);
-    }
-}

SystemExtensions.NetStandard.Security/SystemExtensions.NetStandard.Security.csproj

@@ -1,26 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
-    <LangVersion>latest</LangVersion>
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <PackageLicenseFile>LICENSE</PackageLicenseFile>
-    <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-    <RootNamespace>System</RootNamespace>
-    <Version>1.1.1</Version>
-    <Authors>Alexandru Macocian</Authors>
-    <RepositoryUrl>https://github.com/AlexMacocian/SystemExtensions</RepositoryUrl>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <None Include="../LICENSE">
-      <Pack>True</Pack>
-      <PackagePath></PackagePath>
-    </None>
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="5.0.0" />
-  </ItemGroup>
-
-</Project>

SystemExtensions.NetStandard.Security/Utilities/NotClosingCryptoStream.cs

@@ -1,23 +0,0 @@
-using System.IO;
-using System.Security.Cryptography;
-
-namespace SystemExtensions.NetStandard.Security.Utilities
-{
-    internal sealed class NotClosingCryptoStream : CryptoStream
-    {
-        public NotClosingCryptoStream(Stream stream, ICryptoTransform transform, CryptoStreamMode mode)
-            : base(stream, transform, mode)
-        {
-        }
-
-        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++;
-            var newItem = new AVLNode<T>(value);
+            AVLNode<T> 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)
         {
-            var node = Find(value, root);
+            AVLNode<T> node = Find(value, root);
             if (node == null)
             {
                 return false;
@@ -105,12 +105,12 @@ namespace System.Collections.Generic
         /// </summary>
         public void Clear()
         {
-            var queue = new Queue<AVLNode<T>>();
+            Queue<AVLNode<T>> queue = new Queue<AVLNode<T>>();
             queue.Enqueue(root);
 
             while (queue.Count > 0)
             {
-                var currentNode = queue.Dequeue();
+                AVLNode<T> 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)
         {
-            var queue = new Queue<AVLNode<T>>();
+            Queue<AVLNode<T>> queue = new Queue<AVLNode<T>>();
             queue.Enqueue(root);
             while (queue.Count > 0)
             {
-                var currentNode = queue.Dequeue();
+                AVLNode<T> 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()
         {
-            var array = new T[count];
+            T[] array = new T[count];
             CopyTo(array, 0);
             return array;
         }
@@ -191,7 +191,7 @@ namespace System.Collections.Generic
         }
         private AVLNode<T> BalanceTree(AVLNode<T> current)
         {
-            var b_factor = BalanceFactor(current);
+            int b_factor = BalanceFactor(current);
             if (b_factor > 1)
             {
                 if (BalanceFactor(current.Left) > 0)
@@ -299,9 +299,7 @@ namespace System.Collections.Generic
                     return current;
                 }
                 else
-                {
                     return Find(target, current.Left);
-                }
             }
             else
             {
@@ -310,9 +308,7 @@ namespace System.Collections.Generic
                     return current;
                 }
                 else
-                {
                     return Find(target, current.Right);
-                }
             }
 
         }
@@ -322,46 +318,46 @@ namespace System.Collections.Generic
         }
         private int GetHeight(AVLNode<T> current)
         {
-            var height = 0;
+            int height = 0;
             if (current != null)
             {
-                var l = GetHeight(current.Left);
-                var r = GetHeight(current.Right);
-                var m = Max(l, r);
+                int l = GetHeight(current.Left);
+                int r = GetHeight(current.Right);
+                int m = Max(l, r);
                 height = m + 1;
             }
             return height;
         }
         private int BalanceFactor(AVLNode<T> current)
         {
-            var l = GetHeight(current.Left);
-            var r = GetHeight(current.Right);
-            var b_factor = l - r;
+            int l = GetHeight(current.Left);
+            int r = GetHeight(current.Right);
+            int b_factor = l - r;
             return b_factor;
         }
         private AVLNode<T> RotateRR(AVLNode<T> parent)
         {
-            var pivot = parent.Right;
+            AVLNode<T> pivot = parent.Right;
             parent.Right = pivot.Left;
             pivot.Left = parent;
             return pivot;
         }
         private AVLNode<T> RotateLL(AVLNode<T> parent)
         {
-            var pivot = parent.Left;
+            AVLNode<T> pivot = parent.Left;
             parent.Left = pivot.Right;
             pivot.Right = parent;
             return pivot;
         }
         private AVLNode<T> RotateLR(AVLNode<T> parent)
         {
-            var pivot = parent.Left;
+            AVLNode<T> pivot = parent.Left;
             parent.Left = RotateRR(pivot);
             return RotateLL(parent);
         }
         private AVLNode<T> RotateRL(AVLNode<T> parent)
         {
-            var pivot = parent.Right;
+            AVLNode<T> pivot = parent.Right;
             parent.Right = RotateLL(pivot);
             return RotateRR(parent);
         }
@@ -371,12 +367,12 @@ namespace System.Collections.Generic
         }
         private IEnumerator<T> GetEnumerator(AVLNode<T> rootNode)
         {
-            var queue = new Queue<AVLNode<T>>();
+            Queue<AVLNode<T>> queue = new Queue<AVLNode<T>>();
             queue.Enqueue(rootNode);
 
             while (queue.Count > 0)
             {
-                var currentNode = queue.Dequeue();
+                AVLNode<T> 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;
             }
-            var position = ++count;
+            int 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!");
             }
-            var min = items[1];
+            T 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!");
             }
-            var min = items[1];
+            T 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()
         {
-            var newArray = new T[count];
+            T[] 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 (var i = 0; i < count; i++)
+            for (int 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)
         {
-            var temp = items[index];
+            T 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)
         {
-            var node = new FibonacciNode<T>
+            FibonacciNode<T> node = new FibonacciNode<T>
             {
                 Value = value,
                 Marked = false,
@@ -77,7 +77,7 @@
         /// <returns>Minimum value.</returns>
         public T Remove()
         {
-            var currentRoot = root;
+            FibonacciNode<T> 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)
         {
-            var node = Find(root, oldValue);
+            FibonacciNode<T> node = Find(root, oldValue);
             root = DecreaseKey(root, node, value);
         }
         /// <summary>
@@ -129,7 +129,7 @@
             {
                 return null;
             }
-            var array = new T[count];
+            T[] array = new T[count];
             if (count == 1)
             {
                 array[0] = root.Value;
@@ -137,7 +137,7 @@
             }
             else
             {
-                var index = 0;
+                int 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)
         {
-            var oldNode = currentNode;
+            FibonacciNode<T> 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)
         {
-            var queue = new Queue<FibonacciNode<T>>();
+            Queue<FibonacciNode<T>> queue = new Queue<FibonacciNode<T>>();
             queue.Enqueue(currentNode);
             while (queue.Count > 0)
             {
                 currentNode = queue.Dequeue();
-                var oldNode = currentNode;
+                FibonacciNode<T> oldNode = currentNode;
                 do
                 {
                     yield return currentNode.Value;
@@ -204,7 +204,7 @@
         {
             if (node != null)
             {
-                var current = node;
+                FibonacciNode<T> current = node;
                 do
                 {
                     Remove(current.Child);
@@ -234,12 +234,12 @@
             }
             if (node1.Value.CompareTo(node2.Value) > 0)
             {
-                var temp = node1;
+                FibonacciNode<T> temp = node1;
                 node1 = node2;
                 node2 = temp;
             }
-            var node1Next = node1.Next;
-            var node2Prev = node2.Previous;
+            FibonacciNode<T> node1Next = node1.Next;
+            FibonacciNode<T> node2Prev = node2.Previous;
             node1.Next = node2;
             node2.Previous = node1;
             node1Next.Previous = node2Prev;
@@ -268,7 +268,7 @@
             {
                 return;
             }
-            var current = node;
+            FibonacciNode<T> current = node;
             do
             {
                 current.Marked = false;
@@ -299,12 +299,12 @@
                 return node;
             }
 
-            var trees = new FibonacciNode<T>[64];
+            FibonacciNode<T>[] trees = new FibonacciNode<T>[64];
             while (true)
             {
                 if (trees[node.Degree] != null)
                 {
-                    var t = trees[node.Degree];
+                    FibonacciNode<T> t = trees[node.Degree];
                     if (t == node)
                     {
                         break;
@@ -344,8 +344,8 @@
                 }
                 node = node.Next;
             }
-            var min = node;
-            var start = node;
+            FibonacciNode<T> min = node;
+            FibonacciNode<T> 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);
-                    var parent = node.Parent;
+                    FibonacciNode<T> 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)
         {
-            var node = root;
+            FibonacciNode<T> node = root;
             if (node == null)
             {
                 return null;
@@ -440,7 +440,7 @@
                 {
                     return node;
                 }
-                var ret = Find(node.Child, value);
+                FibonacciNode<T> 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 (var i = 0; i <= maxLevel; i++)
+            for (int 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)
         {
-            var curNode = head;
-            var newLevel = 0;
+            NodeSet<T> curNode = head;
+            int newLevel = 0;
             while (random.Next(0, 2) > 0 && newLevel < maxLevel)
             {
                 newLevel++;
@@ -74,7 +74,7 @@
             {
                 level = newLevel;
             }
-            var newNode = new NodeSet<T>(item, newLevel);
+            NodeSet<T> 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)
         {
-            var removed = false;
-            var curNode = head;
+            bool removed = false;
+            NodeSet<T> curNode = head;
             for (var i = 0; i <= maxLevel; i++)
             {
                 if (i > curNode.Level)
@@ -134,7 +134,7 @@
         /// </summary>
         public void Clear()
         {
-            for (var i = 0; i < maxLevel; i++)
+            for (int 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)
         {
-            var node = head.Next[0];
+            NodeSet<T> 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()
         {
-            var array = new T[count];
-            var index = 0;
-            var curNode = head.Next[0];
+            T[] array = new T[count];
+            int index = 0;
+            NodeSet<T> curNode = head.Next[0];
             while (curNode != end)
             {
                 array[index] = curNode.Key;
@@ -191,7 +191,7 @@
         /// <returns></returns>
         public IEnumerator<T> GetEnumerator()
         {
-            var curNode = head.Next[0];
+            NodeSet<T> curNode = head.Next[0];
             while (curNode != end)
             {
                 yield return curNode.Key;
@@ -206,9 +206,9 @@
         }
         private NodeSet<T> Find(T key)
         {
-            var curNode = head;
+            NodeSet<T> curNode = head;
 
-            for (var i = level; i >= 0; i--)
+            for (int i = level; i >= 0; i--)
             {
                 while (curNode.Next[i] != end)
                 {

SystemExtensions.NetStandard/Collections/Treap.cs

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

SystemExtensions.NetStandard/Extensions/BytesExtensions.cs

@@ -6,13 +6,10 @@ 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 (var ms = new MemoryStream())
+            using (MemoryStream ms = new MemoryStream())
             {
                 int read;
                 while ((read = stream.Read(buffer, 0, 256)) > 0)

SystemExtensions.NetStandard/Extensions/LinqExtensions.cs

@@ -22,10 +22,7 @@ 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;
@@ -33,17 +30,10 @@ 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) throw new ArgumentNullException(nameof(collection));
+            if (values is null) throw new ArgumentNullException(nameof(values));
 
-            if (values is null)
-            {
-                throw new ArgumentNullException(nameof(values));
-            }
-
-            foreach (var item in values)
+            foreach(var item in values)
             {
                 collection.Add(item);
             }
@@ -53,15 +43,8 @@ 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 (selector is null)
-            {
-                throw new ArgumentNullException(nameof(selector));
-            }
+            if (collection is null) 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

@@ -1,31 +1,7 @@
-using Newtonsoft.Json;
-
-namespace System.Extensions
+namespace System.Extensions
 {
     public static class ObjectExtensions
     {
-        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));
-            }
-
-            return JsonConvert.DeserializeObject<T>(serialized);
-        }
-
-        public static string Serialize<T>(this T obj)
-            where T : class
-        {
-            if (obj is null)
-            {
-                throw new ArgumentNullException(nameof(obj));
-            }
-
-            return JsonConvert.SerializeObject(obj);
-        }
-
         public static T Cast<T>(this object obj)
         {
             return (T)obj;
@@ -43,10 +19,7 @@ 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,15 +40,8 @@
         }
         public Optional<T> Do(Action<T> onSome, Action onNone)
         {
-            if (onSome is null)
-            {
-                throw new ArgumentNullException(nameof(onSome));
-            }
-
-            if (onNone is null)
-            {
-                throw new ArgumentNullException(nameof(onNone));
-            }
+            if (onSome is null) throw new ArgumentNullException(nameof(onSome));
+            if (onNone is null) throw new ArgumentNullException(nameof(onNone));
 
             if (this is Some)
             {
@@ -74,15 +67,8 @@
         }
         public Optional<V> Switch<V>(Func<T, V> onSome, Func<V> onNone)
         {
-            if (onSome is null)
-            {
-                throw new ArgumentNullException($"{nameof(onSome)}");
-            }
-
-            if (onNone is null)
-            {
-                throw new ArgumentNullException($"{nameof(onNone)}");
-            }
+            if (onSome is null) throw new ArgumentNullException($"{nameof(onSome)}");
+            if (onNone is null) throw new ArgumentNullException($"{nameof(onNone)}");
 
             if (this is Some)
             {

SystemExtensions.NetStandard/Extensions/Result.cs

@@ -43,15 +43,9 @@
         }
         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)
             {
@@ -77,15 +71,9 @@
         }
         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)
             {
@@ -111,15 +99,9 @@
         }
         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)
             {
@@ -145,15 +127,9 @@
         }
         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,15 +7,8 @@ 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 (action is null)
-            {
-                throw new ArgumentNullException(nameof(action));
-            }
+            if (stream is null) 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);
@@ -28,10 +21,7 @@ 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);
@@ -40,15 +30,9 @@ 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;
@@ -57,19 +41,17 @@ namespace System.Extensions
         public static string ReadUntil(this StreamReader sr, string delim)
         {
             var sb = new StringBuilder();
-            var found = false;
+            bool found = false;
 
             while (!found && !sr.EndOfStream)
             {
-                for (var i = 0; i < delim.Length; i++)
+                for (int i = 0; i < delim.Length; i++)
                 {
-                    var c = (char)sr.Read();
+                    char c = (char)sr.Read();
                     sb.Append(c);
 
                     if (c != delim[i])
-                    {
                         break;
-                    }
 
                     if (i == delim.Length - 1)
                     {

SystemExtensions.NetStandard/Extensions/TaskExtensions.cs

@@ -44,17 +44,13 @@ 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);
-                }
             }
         }
 
@@ -99,7 +95,7 @@ namespace System.Extensions
             var oldContext = SynchronizationContext.Current;
             var synch = new ExclusiveSynchronizationContext();
             SynchronizationContext.SetSynchronizationContext(synch);
-            var ret = default(T);
+            T ret = default(T);
             synch.Post(async _ =>
             {
                 try

SystemExtensions.NetStandard/Extensions/Try.cs

@@ -46,10 +46,7 @@ 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/SystemExtensions.NetStandard.csproj

@@ -6,7 +6,7 @@
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <RootNamespace>System</RootNamespace>
-    <Version>1.3.1</Version>
+    <Version>1.3.0</Version>
     <Authors>Alexandru Macocian</Authors>
     <RepositoryUrl>https://github.com/AlexMacocian/SystemExtensions</RepositoryUrl>
   </PropertyGroup>
@@ -18,8 +18,4 @@
     </None>
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-  </ItemGroup>
-
 </Project>

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

SystemExtensions.Tests/Collections/AVLTreeTests.cs

@@ -20,7 +20,7 @@ namespace System.Collections.Tests
         {
             try
             {
-                for (var i = 0; i < 100; i++)
+                for (int i = 0; i < 100; i++)
                 {
                     avlTree.Add(i * 20 - (50 + i));
                 }
@@ -38,7 +38,7 @@ namespace System.Collections.Tests
         [TestMethod()]
         public void ContainsTest()
         {
-            for (var i = 0; i < 100; i++)
+            for (int i = 0; i < 100; i++)
             {
                 avlTree.Add(i);
             }
@@ -52,7 +52,7 @@ namespace System.Collections.Tests
         [TestMethod()]
         public void RemoveTest()
         {
-            for (var i = 0; i < 100; i++)
+            for (int i = 0; i < 100; i++)
             {
                 avlTree.Add(i);
             }
@@ -68,7 +68,7 @@ namespace System.Collections.Tests
         [TestMethod()]
         public void ClearTest()
         {
-            for (var i = 0; i < 100; i++)
+            for (int i = 0; i < 100; i++)
             {
                 avlTree.Add(i);
             }
@@ -82,24 +82,24 @@ namespace System.Collections.Tests
         [TestMethod()]
         public void CopyToTest()
         {
-            for (var i = 0; i < 100; i++)
+            for (int i = 0; i < 100; i++)
             {
                 avlTree.Add(i);
             }
 
-            var array = new int[100];
+            int[] array = new int[100];
             avlTree.CopyTo(array, 0);
         }
 
         [TestMethod()]
         public void GetEnumeratorTest()
         {
-            for (var i = 0; i < 100; i++)
+            for (int i = 0; i < 100; i++)
             {
                 avlTree.Add(i);
             }
-            var count = 0;
-            foreach(var value in avlTree)
+            int count = 0;
+            foreach(int value in avlTree)
             {
                 count++;
                 System.Diagnostics.Debug.WriteLine(value);
@@ -114,34 +114,34 @@ namespace System.Collections.Tests
         [TestMethod()]
         public void ToArrayTest()
         {
-            for (var i = 0; i < 100; i++)
+            for (int i = 0; i < 100; i++)
             {
                 avlTree.Add(i);
             }
 
-            var array = avlTree.ToArray();
+            int[] array = avlTree.ToArray();
         }
 
         [TestMethod()]
         public void Serialize()
         {
-            var avlTree2 = new AVLTree<int>();
-            for (var i = 0; i < 100; i++)
+            AVLTree<int> avlTree2 = new AVLTree<int>();
+            for (int i = 0; i < 100; i++)
             {
                 avlTree.Add(i);
             }
-            var serializer = new BinaryFormatter();
-            var s = string.Empty;
+            BinaryFormatter serializer = new BinaryFormatter();
+            string s = string.Empty;
             using (var stream = new MemoryStream())
             {
                 serializer.Serialize(stream, avlTree);
                 stream.Position = 0;
                 avlTree2 = (AVLTree<int>)serializer.Deserialize(stream);
             }
-            var avlTreeEnum = avlTree.GetEnumerator();
-            var avlTree2Enum = avlTree2.GetEnumerator();
+            IEnumerator<int> avlTreeEnum = avlTree.GetEnumerator();
+            IEnumerator<int> avlTree2Enum = avlTree2.GetEnumerator();
             
-            for(var i = 0; i < 100; i++)
+            for(int 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 (var i = 0; i < 100; i++)
+                for (int i = 0; i < 100; i++)
                 {
                     binaryHeap.Add(i * 20 - (50 + i));
                 }
@@ -52,7 +52,7 @@ namespace System.Collections.Tests
         {
             try
             {
-                var tries = binaryHeap.Count;
+                int tries = binaryHeap.Count;
                 while (binaryHeap.Count > 0)
                 {
                     if (tries == 0)
@@ -72,7 +72,7 @@ namespace System.Collections.Tests
         [TestMethod()]
         public void MinMaxTest()
         {
-            for (var i = 0; i < 1000; i++)
+            for (int i = 0; i < 1000; i++)
             {
                 binaryHeap.Add(i);
             }
@@ -85,7 +85,7 @@ namespace System.Collections.Tests
         [TestMethod()]
         public void ClearTest()
         {
-            for (var i = 0; i < 100; i++)
+            for (int i = 0; i < 100; i++)
             {
                 binaryHeap.Add(i);
             }
@@ -99,12 +99,12 @@ namespace System.Collections.Tests
         [TestMethod()]
         public void ClearTest2()
         {
-            for (var i = 100; i < 200; i++)
+            for (int i = 100; i < 200; i++)
             {
                 binaryHeap.Add(i);
             }
             binaryHeap.Clear(false);
-            var array = binaryHeap.ToArray();
+            int[] 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(var i = 0; i < 1000; i++)
+            for(int i = 0; i < 1000; i++)
             {
                 binaryHeap.Add(i);
             }
-            var array = binaryHeap.ToArray();
+            int[] array = binaryHeap.ToArray();
             if(array.Length != binaryHeap.Count)
             {
                 Assert.Fail();
@@ -151,12 +151,12 @@ namespace System.Collections.Tests
         [TestMethod()]
         public void GetEnumeratorTest()
         {
-            for (var i = 0; i < 1000; i++)
+            for (int i = 0; i < 1000; i++)
             {
                 binaryHeap.Add(i);
             }
-            var count = 0;
-            foreach(var value in binaryHeap)
+            int count = 0;
+            foreach(int value in binaryHeap)
             {
                 System.Diagnostics.Debug.WriteLine(value);
                 count++;
@@ -173,22 +173,22 @@ namespace System.Collections.Tests
         [TestMethod()]
         public void Serialize()
         {
-            var binaryHeap2 = new BinaryHeap<int>();
-            for (var i = 0; i < 100; i++)
+            BinaryHeap<int> binaryHeap2 = new BinaryHeap<int>();
+            for (int i = 0; i < 100; i++)
             {
                 binaryHeap.Add(i);
             }
-            var serializer = new BinaryFormatter();
-            var s = string.Empty;
+            BinaryFormatter serializer = new BinaryFormatter();
+            string s = string.Empty;
             using (var stream = new MemoryStream()) {
                 serializer.Serialize(stream, binaryHeap);
                 stream.Position = 0;
                 binaryHeap2 = (BinaryHeap<int>)serializer.Deserialize(stream);
             }
-            var binaryHeapEnum = binaryHeap.GetEnumerator();
-            var binaryHeapEnum2 = binaryHeap2.GetEnumerator();
+            IEnumerator<int> binaryHeapEnum = binaryHeap.GetEnumerator();
+            IEnumerator<int> binaryHeapEnum2 = binaryHeap2.GetEnumerator();
 
-            for (var i = 0; i < 100; i++)
+            for (int 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 (var i = 0; i < 1000; i++)
+            for (int i = 0; i < 1000; i++)
             {
                 fibonacciHeap.Add(i);
             }
@@ -31,21 +31,21 @@ namespace System.Collections.Tests
         [TestMethod()]
         public void MergeTest()
         {
-            var fibonacciHeap1 = new FibonacciHeap<int>();
-            var fibonacciHeap2 = new FibonacciHeap<int>();
+            FibonacciHeap<int> fibonacciHeap1 = new FibonacciHeap<int>();
+            FibonacciHeap<int> fibonacciHeap2 = new FibonacciHeap<int>();
 
-            for(var i = 0; i < 100; i++)
+            for(int i = 0; i < 100; i++)
             {
                 fibonacciHeap1.Add(i);
             }
 
-            for(var i = 100; i < 300; i++)
+            for(int i = 100; i < 300; i++)
             {
                 fibonacciHeap2.Add(i);
             }
 
             fibonacciHeap1.Merge(fibonacciHeap2);
-            for(var i = 1; i < 300; i++)
+            for(int i = 1; i < 300; i++)
             {
                 if (!fibonacciHeap1.Contains(i))
                 {
@@ -70,11 +70,11 @@ namespace System.Collections.Tests
             {
                 Assert.Fail();
             }
-            for (var i = 0; i < 1000; i++)
+            for (int i = 0; i < 1000; i++)
             {
                 fibonacciHeap.Add(i);
             }
-            for (var i = 0; i < 1000; i++)
+            for (int i = 0; i < 1000; i++)
             {
                 if (fibonacciHeap.Remove() != i)
                 {
@@ -104,7 +104,7 @@ namespace System.Collections.Tests
         [TestMethod()]
         public void ContainsTest()
         {
-            for(var i = 0; i < 10000; i++)
+            for(int i = 0; i < 10000; i++)
             {
                 fibonacciHeap.Add(i);
             }
@@ -117,7 +117,7 @@ namespace System.Collections.Tests
         [TestMethod()]
         public void ClearTest()
         {
-            for(var i = 0; i < 10000; i++)
+            for(int i = 0; i < 10000; i++)
             {
                 fibonacciHeap.Add(i);
             }
@@ -132,14 +132,14 @@ namespace System.Collections.Tests
         [TestMethod()]
         public void ToArrayTest()
         {
-            for(var i = 999; i >= 0; i--)
+            for(int i = 999; i >= 0; i--)
             {
                 fibonacciHeap.Add(i);
             }
             fibonacciHeap.Remove();
-            var arr = fibonacciHeap.ToArray();
+            int[] arr = fibonacciHeap.ToArray();
 
-            for(var i = 1; i < 512; i++)
+            for(int i = 1; i < 512; i++)
             {
                 if(arr[i - 1] != i)
                 {
@@ -151,14 +151,14 @@ namespace System.Collections.Tests
         [TestMethod()]
         public void GetEnumeratorTest()
         {
-            for (var i = 999; i >= 0; i--)
+            for (int i = 999; i >= 0; i--)
             {
                 fibonacciHeap.Add(i);
             }
 
-            var count = 0;
+            int count = 0;
 
-            foreach(var value in fibonacciHeap)
+            foreach(int value in fibonacciHeap)
             {
                 System.Diagnostics.Debug.WriteLine(value);
                 count++;
@@ -175,23 +175,23 @@ namespace System.Collections.Tests
         [TestMethod()]
         public void Serialize()
         {
-            var fibonacciHeap2 = new FibonacciHeap<int>();
-            for (var i = 0; i < 100; i++)
+            FibonacciHeap<int> fibonacciHeap2 = new FibonacciHeap<int>();
+            for (int i = 0; i < 100; i++)
             {
                 fibonacciHeap.Add(i);
             }
-            var serializer = new BinaryFormatter();
-            var s = string.Empty;
+            BinaryFormatter serializer = new BinaryFormatter();
+            string s = string.Empty;
             using (var stream = new MemoryStream())
             {
                 serializer.Serialize(stream, fibonacciHeap);
                 stream.Position = 0;
                 fibonacciHeap2 = (FibonacciHeap<int>)serializer.Deserialize(stream);
             }
-            var enum1 = fibonacciHeap.GetEnumerator();
-            var enum2 = fibonacciHeap2.GetEnumerator();
+            IEnumerator<int> enum1 = fibonacciHeap.GetEnumerator();
+            IEnumerator<int> enum2 = fibonacciHeap2.GetEnumerator();
 
-            for (var i = 0; i < 100; i++)
+            for (int 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(var i = 0; i < 100; i++)
+            for(int i = 0; i < 100; i++)
             {
                 priorityQueue.Enqueue(i);
             }
@@ -42,11 +42,11 @@ namespace System.Collections.Tests
         [TestMethod()]
         public void DequeueTest()
         {
-            for(var i = 0; i < 100; i++)
+            for(int i = 0; i < 100; i++)
             {
                 priorityQueue.Enqueue(i);
             }
-            for(var i = 0; i < 100; i++)
+            for(int i = 0; i < 100; i++)
             {
                 if(i != priorityQueue.Dequeue())
                 {
@@ -81,23 +81,23 @@ namespace System.Collections.Tests
         [TestMethod()]
         public void Serialize()
         {
-            var priorityQueue2 = new PriorityQueue<int>();
-            for (var i = 0; i < 100; i++)
+            PriorityQueue<int> priorityQueue2 = new PriorityQueue<int>();
+            for (int i = 0; i < 100; i++)
             {
                 priorityQueue.Enqueue(i);
             }
-            var serializer = new BinaryFormatter();
-            var s = string.Empty;
+            BinaryFormatter serializer = new BinaryFormatter();
+            string s = string.Empty;
             using (var stream = new MemoryStream())
             {
                 serializer.Serialize(stream, priorityQueue);
                 stream.Position = 0;
                 priorityQueue2 = (PriorityQueue<int>)serializer.Deserialize(stream);
             }
-            var enum1 = priorityQueue.GetEnumerator();
-            var enum2 = priorityQueue2.GetEnumerator();
+            IEnumerator<int> enum1 = priorityQueue.GetEnumerator();
+            IEnumerator<int> enum2 = priorityQueue2.GetEnumerator();
 
-            for (var i = 0; i < 100; i++)
+            for (int 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()
         {
-            var skipList = new SkipList<int>();
+            SkipList<int> skipList = new SkipList<int>();
         }
 
         [TestMethod()]
         public void SkipListTest2()
         {
-            var skipList = new SkipList<int>(30);
+            SkipList<int> skipList = new SkipList<int>(30);
         }
 
         [TestMethod()]
         public void AddTest()
         {
-            for(var i = 0; i < 200; i++)
+            for(int i = 0; i < 200; i++)
             {
                 skipList.Add(i);
             }
@@ -33,7 +33,7 @@ namespace System.Collections.Tests
         [TestMethod()]
         public void ClearTest()
         {
-            for (var i = 0; i < 200; i++)
+            for (int i = 0; i < 200; i++)
             {
                 skipList.Add(i);
             }
@@ -47,7 +47,7 @@ namespace System.Collections.Tests
         [TestMethod()]
         public void ContainsTest()
         {
-            for (var i = 0; i < 200; i++)
+            for (int i = 0; i < 200; i++)
             {
                 skipList.Add(i);
             }
@@ -61,13 +61,13 @@ namespace System.Collections.Tests
         [TestMethod()]
         public void CopyToTest()
         {
-            for (var i = 0; i < 200; i++)
+            for (int i = 0; i < 200; i++)
             {
                 skipList.Add(i);
             }
-            var array = new int[skipList.Count];
+            int[] array = new int[skipList.Count];
             skipList.CopyTo(array, 0);
-            for (var i = 0; i < 200; i++)
+            for (int i = 0; i < 200; i++)
             {
                 if(array[i] != i)
                 {
@@ -79,13 +79,13 @@ namespace System.Collections.Tests
         [TestMethod()]
         public void ToArrayTest()
         {
-            for (var i = 0; i < 200; i++)
+            for (int i = 0; i < 200; i++)
             {
                 skipList.Add(i);
             }
-            var array = skipList.ToArray();
+            int[] array = skipList.ToArray();
 
-            for (var i = 0; i < 200; i++)
+            for (int i = 0; i < 200; i++)
             {
                 if(array[i] != i)
                 {
@@ -97,12 +97,12 @@ namespace System.Collections.Tests
         [TestMethod()]
         public void GetEnumeratorTest()
         {
-            for (var i = 0; i < 200; i++)
+            for (int i = 0; i < 200; i++)
             {
                 skipList.Add(i);
             }
 
-            foreach(var i in skipList)
+            foreach(int i in skipList)
             {
                 System.Diagnostics.Debug.WriteLine(i);
             }
@@ -111,7 +111,7 @@ namespace System.Collections.Tests
         [TestMethod()]
         public void RemoveTest()
         {
-            for (var i = 0; i < 200; i++)
+            for (int 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()
         {
-            var skipList2 = new SkipList<int>();
-            for (var i = 0; i < 100; i++)
+            SkipList<int> skipList2 = new SkipList<int>();
+            for (int i = 0; i < 100; i++)
             {
                 skipList.Add(i);
             }
-            var serializer = new BinaryFormatter();
-            var s = string.Empty;
+            BinaryFormatter serializer = new BinaryFormatter();
+            string s = string.Empty;
             using (var stream = new MemoryStream())
             {
                 serializer.Serialize(stream, skipList);
                 stream.Position = 0;
                 skipList2 = (SkipList<int>)serializer.Deserialize(stream);
             }
-            var enum1 = skipList.GetEnumerator();
-            var enum2 = skipList2.GetEnumerator();
+            IEnumerator<int> enum1 = skipList.GetEnumerator();
+            IEnumerator<int> enum2 = skipList2.GetEnumerator();
 
-            for (var i = 0; i < 100; i++)
+            for (int 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()
         {
-            var random = new Random();
-            for(var i = 0; i < 1000; i++)
+            Random random = new Random();
+            for(int i = 0; i < 1000; i++)
             {
                 treap.Add(random.Next(0, 5000));
             }
@@ -41,8 +41,8 @@ namespace System.Collections.Tests
         [TestMethod()]
         public void ClearTest()
         {
-            var random = new Random();
-            for (var i = 0; i < 100; i++)
+            Random random = new Random();
+            for (int i = 0; i < 100; i++)
             {
                 treap.Add(random.Next(0, 5000));
             }
@@ -71,12 +71,12 @@ namespace System.Collections.Tests
         [TestMethod()]
         public void ToArrayTest()
         {
-            for(var i = 0; i < 1000; i++)
+            for(int i = 0; i < 1000; i++)
             {
                 treap.Add(i);
             }
-            var arr = treap.ToArray();
-            for(var i = 0; i < 1000; i++)
+            int[] arr = treap.ToArray();
+            for(int i = 0; i < 1000; i++)
             {
                 if(arr[i] != i)
                 {
@@ -88,13 +88,13 @@ namespace System.Collections.Tests
         [TestMethod()]
         public void GetEnumeratorTest()
         {
-            for (var i = 0; i < 1000; i++)
+            for (int i = 0; i < 1000; i++)
             {
                 treap.Add(i);
             }
 
-            var count = 0;
-            foreach(var value in treap)
+            int count = 0;
+            foreach(int 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()
         {
-            var treap2 = new Treap<int>();
-            for (var i = 0; i < 100; i++)
+            Treap<int> treap2 = new Treap<int>();
+            for (int i = 0; i < 100; i++)
             {
                 treap.Add(i);
             }
-            var serializer = new BinaryFormatter();
-            var s = string.Empty;
+            BinaryFormatter serializer = new BinaryFormatter();
+            string s = string.Empty;
             using (var stream = new MemoryStream())
             {
                 serializer.Serialize(stream, treap);
                 stream.Position = 0;
                 treap2 = (Treap<int>)serializer.Deserialize(stream);
             }
-            var enum1 = treap.GetEnumerator();
-            var enum2 = treap2.GetEnumerator();
+            IEnumerator<int> enum1 = treap.GetEnumerator();
+            IEnumerator<int> enum2 = treap2.GetEnumerator();
 
-            for (var i = 0; i < 100; i++)
+            for (int 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()
         {
-            var messagesEmitted = 0;
+            int 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 (var i = 0; i < 10; i++)
+                for (int 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)
         {
-            var int64 = new Int64BitStruct(low, high);
+            Int64BitStruct 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
             {
-                var x = threadPool.NumberOfThreads;
+                int x = threadPool.NumberOfThreads;
                 Assert.Fail();
             }
             catch(Exception e)
@@ -63,17 +63,17 @@ namespace System.Threading.Tests
         {
             threadPool.Dispose();
             threadPool = new PriorityThreadPool();
-            for (var i = 0; i < 10; i++)
+            for (int i = 0; i < 10; i++)
             {
                 threadPool.QueueUserWorkItem(o =>
                 {
-                    for (var x = 0; x < 100; x++)
+                    for (int x = 0; x < 100; x++)
                     {
                         System.Diagnostics.Debug.WriteLine(Thread.CurrentThread.ManagedThreadId + " - " + x);
                     }
                 }, null);
             }
-            for (var i = 0; i < 10; i++)
+            for (int 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 (var i = 0; i < 10; i++)
+            for (int i = 0; i < 10; i++)
             {
                 threadPool.QueueUserWorkItem(o =>
                 {
-                    for (var x = 0; x < 100; x++)
+                    for (int x = 0; x < 100; x++)
                     {
                         System.Diagnostics.Debug.WriteLine(Thread.CurrentThread.ManagedThreadId + " - " + x);
                     }
@@ -126,11 +126,11 @@ namespace System.Threading.Tests
             {
                 Assert.Fail();
             }
-            for (var i = 0; i < 10; i++)
+            for (int i = 0; i < 10; i++)
             {
                 threadPool.QueueUserWorkItem(o =>
                 {
-                    for (var x = 0; x < 100; x++)
+                    for (int x = 0; x < 100; x++)
                     {
                         switch (Thread.CurrentThread.Priority)
                         {
@@ -153,7 +153,7 @@ namespace System.Threading.Tests
                     }
                 }, null);
             }
-            for (var i = 0; i < 50; i++)
+            for (int 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 (var i = 0; i < 1000; i++)
+            for (int i = 0; i < 1000; i++)
             {
-                var taskPriority = TaskPriority.Lowest;
+                TaskPriority taskPriority = TaskPriority.Lowest;
                 if(i % 10 == 0)
                 {
                     taskPriority = TaskPriority.Highest;

SystemExtensions.sln

@@ -14,10 +14,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SystemExtensions.NetStandar
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SystemExtensions.NetStandard.DependencyInjection.Tests", "SystemExtensions.DependencyInjection.Tests\SystemExtensions.NetStandard.DependencyInjection.Tests.csproj", "{1AFA1EEF-CEBA-4046-8466-C9B52979B7DA}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SystemExtensions.NetStandard.Security", "SystemExtensions.NetStandard.Security\SystemExtensions.NetStandard.Security.csproj", "{BFC5BEE7-2569-45EA-9713-CDB32EED57AA}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SystemExtensions.NetStandard.Security.Tests", "SystemExtensions.NetStandard.Security.Tests\SystemExtensions.NetStandard.Security.Tests.csproj", "{341ECE0F-A8DD-49A0-AE3D-B28D72E85130}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -40,14 +36,6 @@ Global
 		{1AFA1EEF-CEBA-4046-8466-C9B52979B7DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1AFA1EEF-CEBA-4046-8466-C9B52979B7DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1AFA1EEF-CEBA-4046-8466-C9B52979B7DA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BFC5BEE7-2569-45EA-9713-CDB32EED57AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BFC5BEE7-2569-45EA-9713-CDB32EED57AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BFC5BEE7-2569-45EA-9713-CDB32EED57AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BFC5BEE7-2569-45EA-9713-CDB32EED57AA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{341ECE0F-A8DD-49A0-AE3D-B28D72E85130}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{341ECE0F-A8DD-49A0-AE3D-B28D72E85130}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{341ECE0F-A8DD-49A0-AE3D-B28D72E85130}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{341ECE0F-A8DD-49A0-AE3D-B28D72E85130}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE