add .NET 6.0 support

secana · Nov 21, 2021 · bcd781c · bcd781c
1 parent 454a6e1
commit bcd781c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/src/PeNet/ExtensionMethods.cs b/src/PeNet/ExtensionMethods.cs
@@ -255,7 +255,7 @@ public static List<string> ToHexString(this byte[] input, ulong from, ulong leng
         /// <returns>The hex string value as a long.</returns>
         public static long ToIntFromHexString(this string hexString)
         {
-            return (long) new Int64Converter().ConvertFromString(hexString);
+            return (long) (new Int64Converter().ConvertFromString(hexString) ?? throw new InvalidOperationException());
         }
 
         /// <summary>

diff --git a/src/PeNet/PeNet.csproj b/src/PeNet/PeNet.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;net5.0;net48;netstandard2</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;net5.0;net6.0;net48;netstandard2</TargetFrameworks>
     <Version>0.0.0</Version>
     <Nullable>enable</Nullable>
     <LangVersion>9</LangVersion>
@@ -52,6 +52,14 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net6.0|AnyCPU'">
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net6.0|AnyCPU'">
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+
   <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net48|AnyCPU'">
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>

diff --git a/test/PeNet.Test/PeNet.Test.csproj b/test/PeNet.Test/PeNet.Test.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <Nullable>disable</Nullable>
   </PropertyGroup>