diff --git a/.gitignore b/.gitignore
index 4154f88..44c69af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,6 @@
 *.user
 bin
 obj
-packages
\ No newline at end of file
+packages
+/.vs/IntelHexFormatReader/v16/TestStore/0
+/.vs
diff --git a/Source/IntelHexFormatReader.sln b/Source/IntelHexFormatReader.sln
index 470a81f..f4d4647 100644
--- a/Source/IntelHexFormatReader.sln
+++ b/Source/IntelHexFormatReader.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26228.4
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.31613.86
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IntelHexFormatReader", "IntelHexFormatReader\IntelHexFormatReader.csproj", "{B08B7C2E-81CD-4033-9F80-26AEAAEB140E}"
 EndProject
@@ -45,4 +45,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {1E6475AD-451F-44F4-B259-F5F75ECF004F}
+	EndGlobalSection
 EndGlobal
diff --git a/Source/IntelHexFormatReader/IntelHexFormatReader.csproj b/Source/IntelHexFormatReader/IntelHexFormatReader.csproj
index fea0131..6b46bc1 100644
--- a/Source/IntelHexFormatReader/IntelHexFormatReader.csproj
+++ b/Source/IntelHexFormatReader/IntelHexFormatReader.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Title>IntelHexFormatReader</Title>
-    <TargetFrameworks>netstandard1.6;net45;net46</TargetFrameworks>
+    <TargetFrameworks>net45;net46;net5.0</TargetFrameworks>
     <Authors>Christophe Diericx</Authors>
     <Company />
     <Description>A .NET library to parse an Intel HEX file and emit a representative memory representation.</Description>
     <PackageProjectUrl>https://github.com/christophediericx/IntelHexFormatReader</PackageProjectUrl>
     <PackageIconUrl>https://avatars3.githubusercontent.com/u/19640854?s=140</PackageIconUrl>
-    <Version>2.2.3</Version>
+    <Version>2.3.0</Version>
     <PackageTags>intel hex memory</PackageTags>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/Source/IntelHexFormatReaderTests/IntelHexFormatReaderTests.csproj b/Source/IntelHexFormatReaderTests/IntelHexFormatReaderTests.csproj
index 1274663..a5af8ba 100644
--- a/Source/IntelHexFormatReaderTests/IntelHexFormatReaderTests.csproj
+++ b/Source/IntelHexFormatReaderTests/IntelHexFormatReaderTests.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp1.1;net45;net46</TargetFrameworks>
+    <TargetFrameworks>net45;net46;net5.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\IntelHexFormatReader\IntelHexFormatReader.csproj" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20170106-08" />
-    <PackageReference Include="MSTest.TestAdapter" Version="1.1.8-rc" />
-    <PackageReference Include="MSTest.TestFramework" Version="1.0.8-rc" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="2.2.6" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.2.6" />
     <PackageReference Include="FluentAssertions" Version="4.19.2" />
   </ItemGroup>
   <ItemGroup>