diff --git a/Plugins/Quic.NET/libs/netstandard2.1/QuicNet.Infrastructure.deps.json b/Plugins/Quic.NET/libs/netstandard2.1/QuicNet.Infrastructure.deps.json
new file mode 100644
index 0000000..17cd833
--- /dev/null
+++ b/Plugins/Quic.NET/libs/netstandard2.1/QuicNet.Infrastructure.deps.json
@@ -0,0 +1,37 @@
+{
+  "runtimeTarget": {
+    "name": ".NETStandard,Version=v2.1/",
+    "signature": ""
+  },
+  "compilationOptions": {},
+  "targets": {
+    ".NETStandard,Version=v2.1": {},
+    ".NETStandard,Version=v2.1/": {
+      "QuicNet.Infrastructure/1.0.0": {
+        "dependencies": {
+          "QuicNet.Utilities": "1.0.0"
+        },
+        "runtime": {
+          "QuicNet.Infrastructure.dll": {}
+        }
+      },
+      "QuicNet.Utilities/1.0.0": {
+        "runtime": {
+          "QuicNet.Utilities.dll": {}
+        }
+      }
+    }
+  },
+  "libraries": {
+    "QuicNet.Infrastructure/1.0.0": {
+      "type": "project",
+      "serviceable": false,
+      "sha512": ""
+    },
+    "QuicNet.Utilities/1.0.0": {
+      "type": "project",
+      "serviceable": false,
+      "sha512": ""
+    }
+  }
+}
\ No newline at end of file
diff --git a/Plugins/Quic.NET/libs/netstandard2.1/QuicNet.Infrastructure.dll b/Plugins/Quic.NET/libs/netstandard2.1/QuicNet.Infrastructure.dll
new file mode 100644
index 0000000..6b2a7f9
Binary files /dev/null and b/Plugins/Quic.NET/libs/netstandard2.1/QuicNet.Infrastructure.dll differ
diff --git a/Plugins/Quic.NET/libs/netstandard2.1/QuicNet.Utilities.deps.json b/Plugins/Quic.NET/libs/netstandard2.1/QuicNet.Utilities.deps.json
new file mode 100644
index 0000000..dc71fb1
--- /dev/null
+++ b/Plugins/Quic.NET/libs/netstandard2.1/QuicNet.Utilities.deps.json
@@ -0,0 +1,24 @@
+{
+  "runtimeTarget": {
+    "name": ".NETStandard,Version=v2.1/",
+    "signature": ""
+  },
+  "compilationOptions": {},
+  "targets": {
+    ".NETStandard,Version=v2.1": {},
+    ".NETStandard,Version=v2.1/": {
+      "QuicNet.Utilities/1.0.0": {
+        "runtime": {
+          "QuicNet.Utilities.dll": {}
+        }
+      }
+    }
+  },
+  "libraries": {
+    "QuicNet.Utilities/1.0.0": {
+      "type": "project",
+      "serviceable": false,
+      "sha512": ""
+    }
+  }
+}
\ No newline at end of file
diff --git a/Plugins/Quic.NET/libs/netstandard2.1/QuicNet.Utilities.dll b/Plugins/Quic.NET/libs/netstandard2.1/QuicNet.Utilities.dll
new file mode 100644
index 0000000..dbdb3f0
Binary files /dev/null and b/Plugins/Quic.NET/libs/netstandard2.1/QuicNet.Utilities.dll differ
diff --git a/Plugins/Quic.NET/libs/netstandard2.1/QuicNet.deps.json b/Plugins/Quic.NET/libs/netstandard2.1/QuicNet.deps.json
new file mode 100644
index 0000000..02be7b0
--- /dev/null
+++ b/Plugins/Quic.NET/libs/netstandard2.1/QuicNet.deps.json
@@ -0,0 +1,51 @@
+{
+  "runtimeTarget": {
+    "name": ".NETStandard,Version=v2.1/",
+    "signature": ""
+  },
+  "compilationOptions": {},
+  "targets": {
+    ".NETStandard,Version=v2.1": {},
+    ".NETStandard,Version=v2.1/": {
+      "QuicNet/1.0.0": {
+        "dependencies": {
+          "QuicNet.Infrastructure": "1.0.0",
+          "QuicNet.Utilities": "1.0.0"
+        },
+        "runtime": {
+          "QuicNet.dll": {}
+        }
+      },
+      "QuicNet.Infrastructure/1.0.0": {
+        "dependencies": {
+          "QuicNet.Utilities": "1.0.0"
+        },
+        "runtime": {
+          "QuicNet.Infrastructure.dll": {}
+        }
+      },
+      "QuicNet.Utilities/1.0.0": {
+        "runtime": {
+          "QuicNet.Utilities.dll": {}
+        }
+      }
+    }
+  },
+  "libraries": {
+    "QuicNet/1.0.0": {
+      "type": "project",
+      "serviceable": false,
+      "sha512": ""
+    },
+    "QuicNet.Infrastructure/1.0.0": {
+      "type": "project",
+      "serviceable": false,
+      "sha512": ""
+    },
+    "QuicNet.Utilities/1.0.0": {
+      "type": "project",
+      "serviceable": false,
+      "sha512": ""
+    }
+  }
+}
\ No newline at end of file
diff --git a/Plugins/Quic.NET/libs/netstandard2.1/QuicNet.dll b/Plugins/Quic.NET/libs/netstandard2.1/QuicNet.dll
new file mode 100644
index 0000000..b7d40e9
Binary files /dev/null and b/Plugins/Quic.NET/libs/netstandard2.1/QuicNet.dll differ
diff --git a/Plugins/Quic.NET/link.xml b/Plugins/Quic.NET/link.xml
new file mode 100644
index 0000000..5847acf
--- /dev/null
+++ b/Plugins/Quic.NET/link.xml
@@ -0,0 +1,5 @@
+<linker>
+    <assembly fullname="QuicNet" preserve="all"/>
+    <assembly fullname="QuicNet.Infrastructure" preserve="all"/>
+    <assembly fullname="QuicNet.Utilities" preserve="all"/>
+</linker>
diff --git a/QuicNet.Infrastructure/QuicNet.Infrastructure.csproj b/QuicNet.Infrastructure/QuicNet.Infrastructure.csproj
index b20f395..0a4c48f 100644
--- a/QuicNet.Infrastructure/QuicNet.Infrastructure.csproj
+++ b/QuicNet.Infrastructure/QuicNet.Infrastructure.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/QuicNet.Tests.ConsoleClient/App.config b/QuicNet.Tests.ConsoleClient/App.config
index 7eb8d24..8a99d30 100644
--- a/QuicNet.Tests.ConsoleClient/App.config
+++ b/QuicNet.Tests.ConsoleClient/App.config
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-    <startup>
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
-    </startup>
-</configuration>
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+    <startup>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
+    </startup>
+</configuration>
diff --git a/QuicNet.Tests.ConsoleClient/Properties/AssemblyInfo.cs b/QuicNet.Tests.ConsoleClient/Properties/AssemblyInfo.cs
index f4c0835..6367303 100644
--- a/QuicNet.Tests.ConsoleClient/Properties/AssemblyInfo.cs
+++ b/QuicNet.Tests.ConsoleClient/Properties/AssemblyInfo.cs
@@ -1,16 +1,6 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("QuicNet.Tests.ConsoleClient")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("QuicNet.Tests.ConsoleClient")]
-[assembly: AssemblyCopyright("Copyright ©  2018")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -21,16 +11,3 @@
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("1ddc355e-7ff1-4ed5-8431-9d61711a06df")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/QuicNet.Tests.ConsoleClient/QuicNet.Tests.ConsoleClient.csproj b/QuicNet.Tests.ConsoleClient/QuicNet.Tests.ConsoleClient.csproj
index f1e481d..248e805 100644
--- a/QuicNet.Tests.ConsoleClient/QuicNet.Tests.ConsoleClient.csproj
+++ b/QuicNet.Tests.ConsoleClient/QuicNet.Tests.ConsoleClient.csproj
@@ -1,66 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{1DDC355E-7FF1-4ED5-8431-9D61711A06DF}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>QuicNet.Tests.ConsoleClient</RootNamespace>
-    <AssemblyName>QuicNet.Tests.ConsoleClient</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\QuickNet.Utilities\QuicNet.Utilities.csproj">
-      <Project>{69a23c4b-b675-4e1e-a4b4-ef8740c30c07}</Project>
-      <Name>QuicNet.Utilities</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\QuicNet.Infrastructure\QuicNet.Infrastructure.csproj">
-      <Project>{8159f64b-7511-4dff-8998-efb029334a56}</Project>
-      <Name>QuicNet.Infrastructure</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\QuicNet\QuicNet.csproj">
-      <Project>{139530bb-cb8c-4f82-b7d9-31c445ef2f69}</Project>
-      <Name>QuicNet</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net7.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <AssemblyTitle>QuicNet.Tests.ConsoleClient</AssemblyTitle>
+    <Product>QuicNet.Tests.ConsoleClient</Product>
+    <Copyright>Copyright ©  2018</Copyright>
+    <AssemblyVersion>1.0.0.0</AssemblyVersion>
+    <FileVersion>1.0.0.0</FileVersion>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\QuickNet.Utilities\QuicNet.Utilities.csproj" />
+    <ProjectReference Include="..\QuicNet.Infrastructure\QuicNet.Infrastructure.csproj" />
+    <ProjectReference Include="..\QuicNet\QuicNet.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/QuicNet.Tests.Unit/Properties/AssemblyInfo.cs b/QuicNet.Tests.Unit/Properties/AssemblyInfo.cs
index c7cd503..c28e7c7 100644
--- a/QuicNet.Tests.Unit/Properties/AssemblyInfo.cs
+++ b/QuicNet.Tests.Unit/Properties/AssemblyInfo.cs
@@ -1,20 +1,9 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-
-[assembly: AssemblyTitle("QuicNet.Tests.Unit")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("QuicNet.Tests.Unit")]
-[assembly: AssemblyCopyright("Copyright ©  2018")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
 [assembly: ComVisible(false)]
 
 [assembly: Guid("4170c9d8-b2d1-4e59-9f5f-c9665cad9a37")]
-
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/QuicNet.Tests.Unit/QuicNet.Tests.Unit.csproj b/QuicNet.Tests.Unit/QuicNet.Tests.Unit.csproj
index fff14b3..d357448 100644
--- a/QuicNet.Tests.Unit/QuicNet.Tests.Unit.csproj
+++ b/QuicNet.Tests.Unit/QuicNet.Tests.Unit.csproj
@@ -1,86 +1,21 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\MSTest.TestAdapter.1.2.1\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.1.2.1\build\net45\MSTest.TestAdapter.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{4170C9D8-B2D1-4E59-9F5F-C9665CAD9A37}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>QuicNet.Tests.Unit</RootNamespace>
-    <AssemblyName>QuicNet.Tests.Unit</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">15.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
-    <IsCodedUITest>False</IsCodedUITest>
-    <TestProjectType>UnitTest</TestProjectType>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\MSTest.TestFramework.1.2.1\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\MSTest.TestFramework.1.2.1\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="ByteArrayTests.cs" />
-    <Compile Include="PacketTests.cs" />
-    <Compile Include="StreamIdTests.cs" />
-    <Compile Include="GranularIntegerTests.cs" />
-    <Compile Include="FrameTests.cs" />
-    <Compile Include="VariableIntegerTests.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\QuickNet.Utilities\QuicNet.Utilities.csproj">
-      <Project>{69a23c4b-b675-4e1e-a4b4-ef8740c30c07}</Project>
-      <Name>QuicNet.Utilities</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\QuicNet.Infrastructure\QuicNet.Infrastructure.csproj">
-      <Project>{8159f64b-7511-4dff-8998-efb029334a56}</Project>
-      <Name>QuicNet.Infrastructure</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\QuicNet\QuicNet.csproj">
-      <Project>{139530bb-cb8c-4f82-b7d9-31c445ef2f69}</Project>
-      <Name>QuicNet</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.1.2.1\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.1.2.1\build\net45\MSTest.TestAdapter.props'))" />
-    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.1.2.1\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.1.2.1\build\net45\MSTest.TestAdapter.targets'))" />
-  </Target>
-  <Import Project="..\packages\MSTest.TestAdapter.1.2.1\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.1.2.1\build\net45\MSTest.TestAdapter.targets')" />
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>netstandard2.1</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <AssemblyTitle>QuicNet.Tests.Unit</AssemblyTitle>
+    <Product>QuicNet.Tests.Unit</Product>
+    <Copyright>Copyright ©  2018</Copyright>
+    <AssemblyVersion>1.0.0.0</AssemblyVersion>
+    <FileVersion>1.0.0.0</FileVersion>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\QuickNet.Utilities\QuicNet.Utilities.csproj" />
+    <ProjectReference Include="..\QuicNet.Infrastructure\QuicNet.Infrastructure.csproj" />
+    <ProjectReference Include="..\QuicNet\QuicNet.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.*" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
+    <PackageReference Include="MSTest.TestFramework" Version="1.2.1" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/QuicNet.Tests.Unit/packages.config b/QuicNet.Tests.Unit/packages.config
deleted file mode 100644
index 0908943..0000000
--- a/QuicNet.Tests.Unit/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="MSTest.TestAdapter" version="1.2.1" targetFramework="net461" />
-  <package id="MSTest.TestFramework" version="1.2.1" targetFramework="net461" />
-</packages>
\ No newline at end of file
diff --git a/QuicNet.sln b/QuicNet.sln
index 8d46686..58410ab 100644
--- a/QuicNet.sln
+++ b/QuicNet.sln
@@ -1,55 +1,54 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29926.136
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QuicNet", "QuicNet\QuicNet.csproj", "{139530BB-CB8C-4F82-B7D9-31C445EF2F69}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QuickNet.Tests.ConsoleServer", "QuickNet.Tests.ConsoleServer\QuickNet.Tests.ConsoleServer.csproj", "{D348C0C7-7F21-4E6D-855B-397BCC35F4B6}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QuicNet.Infrastructure", "QuicNet.Infrastructure\QuicNet.Infrastructure.csproj", "{8159F64B-7511-4DFF-8998-EFB029334A56}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QuicNet.Tests.Unit", "QuicNet.Tests.Unit\QuicNet.Tests.Unit.csproj", "{4170C9D8-B2D1-4E59-9F5F-C9665CAD9A37}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QuicNet.Tests.ConsoleClient", "QuicNet.Tests.ConsoleClient\QuicNet.Tests.ConsoleClient.csproj", "{1DDC355E-7FF1-4ED5-8431-9D61711A06DF}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QuicNet.Utilities", "QuickNet.Utilities\QuicNet.Utilities.csproj", "{69A23C4B-B675-4E1E-A4B4-EF8740C30C07}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{139530BB-CB8C-4F82-B7D9-31C445EF2F69}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{139530BB-CB8C-4F82-B7D9-31C445EF2F69}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{139530BB-CB8C-4F82-B7D9-31C445EF2F69}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{139530BB-CB8C-4F82-B7D9-31C445EF2F69}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D348C0C7-7F21-4E6D-855B-397BCC35F4B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D348C0C7-7F21-4E6D-855B-397BCC35F4B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D348C0C7-7F21-4E6D-855B-397BCC35F4B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D348C0C7-7F21-4E6D-855B-397BCC35F4B6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8159F64B-7511-4DFF-8998-EFB029334A56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8159F64B-7511-4DFF-8998-EFB029334A56}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8159F64B-7511-4DFF-8998-EFB029334A56}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8159F64B-7511-4DFF-8998-EFB029334A56}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4170C9D8-B2D1-4E59-9F5F-C9665CAD9A37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4170C9D8-B2D1-4E59-9F5F-C9665CAD9A37}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4170C9D8-B2D1-4E59-9F5F-C9665CAD9A37}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4170C9D8-B2D1-4E59-9F5F-C9665CAD9A37}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1DDC355E-7FF1-4ED5-8431-9D61711A06DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1DDC355E-7FF1-4ED5-8431-9D61711A06DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1DDC355E-7FF1-4ED5-8431-9D61711A06DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1DDC355E-7FF1-4ED5-8431-9D61711A06DF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{69A23C4B-B675-4E1E-A4B4-EF8740C30C07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{69A23C4B-B675-4E1E-A4B4-EF8740C30C07}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{69A23C4B-B675-4E1E-A4B4-EF8740C30C07}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{69A23C4B-B675-4E1E-A4B4-EF8740C30C07}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {966163EE-313A-4044-B883-9862119400C4}
-	EndGlobalSection
-EndGlobal
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.6.33829.357
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QuicNet", "QuicNet\QuicNet.csproj", "{139530BB-CB8C-4F82-B7D9-31C445EF2F69}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QuickNet.Tests.ConsoleServer", "QuickNet.Tests.ConsoleServer\QuickNet.Tests.ConsoleServer.csproj", "{D348C0C7-7F21-4E6D-855B-397BCC35F4B6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QuicNet.Infrastructure", "QuicNet.Infrastructure\QuicNet.Infrastructure.csproj", "{8159F64B-7511-4DFF-8998-EFB029334A56}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QuicNet.Tests.Unit", "QuicNet.Tests.Unit\QuicNet.Tests.Unit.csproj", "{4170C9D8-B2D1-4E59-9F5F-C9665CAD9A37}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QuicNet.Tests.ConsoleClient", "QuicNet.Tests.ConsoleClient\QuicNet.Tests.ConsoleClient.csproj", "{1DDC355E-7FF1-4ED5-8431-9D61711A06DF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QuicNet.Utilities", "QuickNet.Utilities\QuicNet.Utilities.csproj", "{69A23C4B-B675-4E1E-A4B4-EF8740C30C07}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{139530BB-CB8C-4F82-B7D9-31C445EF2F69}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{139530BB-CB8C-4F82-B7D9-31C445EF2F69}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{139530BB-CB8C-4F82-B7D9-31C445EF2F69}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{139530BB-CB8C-4F82-B7D9-31C445EF2F69}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D348C0C7-7F21-4E6D-855B-397BCC35F4B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D348C0C7-7F21-4E6D-855B-397BCC35F4B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D348C0C7-7F21-4E6D-855B-397BCC35F4B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D348C0C7-7F21-4E6D-855B-397BCC35F4B6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8159F64B-7511-4DFF-8998-EFB029334A56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8159F64B-7511-4DFF-8998-EFB029334A56}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8159F64B-7511-4DFF-8998-EFB029334A56}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8159F64B-7511-4DFF-8998-EFB029334A56}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4170C9D8-B2D1-4E59-9F5F-C9665CAD9A37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4170C9D8-B2D1-4E59-9F5F-C9665CAD9A37}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4170C9D8-B2D1-4E59-9F5F-C9665CAD9A37}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4170C9D8-B2D1-4E59-9F5F-C9665CAD9A37}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1DDC355E-7FF1-4ED5-8431-9D61711A06DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1DDC355E-7FF1-4ED5-8431-9D61711A06DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1DDC355E-7FF1-4ED5-8431-9D61711A06DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1DDC355E-7FF1-4ED5-8431-9D61711A06DF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{69A23C4B-B675-4E1E-A4B4-EF8740C30C07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{69A23C4B-B675-4E1E-A4B4-EF8740C30C07}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{69A23C4B-B675-4E1E-A4B4-EF8740C30C07}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{69A23C4B-B675-4E1E-A4B4-EF8740C30C07}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {966163EE-313A-4044-B883-9862119400C4}
+	EndGlobalSection
+EndGlobal
diff --git a/QuicNet/QuicNet.csproj b/QuicNet/QuicNet.csproj
index 15bcccd..c2e9f0c 100644
--- a/QuicNet/QuicNet.csproj
+++ b/QuicNet/QuicNet.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/QuickNet.Tests.ConsoleServer/App.config b/QuickNet.Tests.ConsoleServer/App.config
index bae5d6d..5ffd8f8 100644
--- a/QuickNet.Tests.ConsoleServer/App.config
+++ b/QuickNet.Tests.ConsoleServer/App.config
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
-    </startup>
-</configuration>
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+    <startup> 
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
+    </startup>
+</configuration>
diff --git a/QuickNet.Tests.ConsoleServer/Properties/AssemblyInfo.cs b/QuickNet.Tests.ConsoleServer/Properties/AssemblyInfo.cs
index 4783bfb..5d9a8ab 100644
--- a/QuickNet.Tests.ConsoleServer/Properties/AssemblyInfo.cs
+++ b/QuickNet.Tests.ConsoleServer/Properties/AssemblyInfo.cs
@@ -1,16 +1,6 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("QuickNet.Console")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("QuickNet.Console")]
-[assembly: AssemblyCopyright("Copyright ©  2018")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -21,16 +11,3 @@
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("d348c0c7-7f21-4e6d-855b-397bcc35f4b6")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/QuickNet.Tests.ConsoleServer/QuickNet.Tests.ConsoleServer.csproj b/QuickNet.Tests.ConsoleServer/QuickNet.Tests.ConsoleServer.csproj
index a5e176b..5e3f3cf 100644
--- a/QuickNet.Tests.ConsoleServer/QuickNet.Tests.ConsoleServer.csproj
+++ b/QuickNet.Tests.ConsoleServer/QuickNet.Tests.ConsoleServer.csproj
@@ -1,75 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{D348C0C7-7F21-4E6D-855B-397BCC35F4B6}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>QuickNet.Tests.ConsoleServer</RootNamespace>
-    <AssemblyName>QuickNet.Tests.ConsoleServer</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\QuickNet.Utilities\QuicNet.Utilities.csproj">
-      <Project>{69a23c4b-b675-4e1e-a4b4-ef8740c30c07}</Project>
-      <Name>QuicNet.Utilities</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\QuicNet.Infrastructure\QuicNet.Infrastructure.csproj">
-      <Project>{8159f64b-7511-4dff-8998-efb029334a56}</Project>
-      <Name>QuicNet.Infrastructure</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\QuicNet\QuicNet.csproj">
-      <Project>{139530bb-cb8c-4f82-b7d9-31c445ef2f69}</Project>
-      <Name>QuicNet</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net7.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <AssemblyTitle>QuickNet.Console</AssemblyTitle>
+    <Product>QuickNet.Console</Product>
+    <Copyright>Copyright ©  2018</Copyright>
+    <AssemblyVersion>1.0.0.0</AssemblyVersion>
+    <FileVersion>1.0.0.0</FileVersion>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\QuickNet.Utilities\QuicNet.Utilities.csproj" />
+    <ProjectReference Include="..\QuicNet.Infrastructure\QuicNet.Infrastructure.csproj" />
+    <ProjectReference Include="..\QuicNet\QuicNet.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/QuickNet.Utilities/QuicNet.Utilities.csproj b/QuickNet.Utilities/QuicNet.Utilities.csproj
index dff83b9..a54f2c4 100644
--- a/QuickNet.Utilities/QuicNet.Utilities.csproj
+++ b/QuickNet.Utilities/QuicNet.Utilities.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup>