Add .NET Core 3.0 target and remove .NET Standard 1.3 support

This means .NET 4.7.2 is minimum supported version.
Technically 4.6.1 is supported, but not recommended.

Author: Krusen

BencodeNET.Tests/BencodeNET.Tests.csproj

@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net46;netcoreapp2.0;netcoreapp2.2</TargetFrameworks>
+    <TargetFrameworks>net472;netcoreapp2.0;netcoreapp2.2;netcoreapp3.0</TargetFrameworks>
     <LangVersion>7.3</LangVersion>
   </PropertyGroup>
 

BencodeNET/BencodeNET.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard1.3;netstandard2.0;netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netcoreapp2.1;netcoreapp3.0</TargetFrameworks>
     <LangVersion>7.3</LangVersion>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
     <CodeAnalysisRuleSet>BencodeNET.ruleset</CodeAnalysisRuleSet>
@@ -35,17 +35,18 @@
     <None Include="../Assets/icon.png" Pack="true" PackagePath="/" />
   </ItemGroup>
 
+  <!--Dev dependencies -->
   <ItemGroup>
-    <PackageReference Include="System.IO.Pipelines" Version="4.5.3" />
-    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="16.3.52" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="16.4.16" PrivateAssets="All" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
-    <PackageReference Include="System.Reflection" Version="4.3.0" />
-    <PackageReference Include="System.Security.Cryptography.Algorithms" Version="4.3.0" />
+  <!-- Shared dependencies -->
+  <ItemGroup>
+    <PackageReference Include="System.IO.Pipelines" Version="4.6.0" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' != 'netcoreapp2.1'">
+  <!-- .NET Standard 2.0 dependencies -->
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
     <PackageReference Include="System.Buffers" Version="4.5.0" />
   </ItemGroup>
 

BencodeNET/Objects/BNumber.cs

@@ -64,7 +64,7 @@ protected override void EncodeObject(PipeWriter writer)
             buffer[0] = (byte) 'i';
             buffer = buffer.Slice(1);
 
-#if NETCOREAPP2_1
+#if NETCOREAPP
             Encoding.ASCII.GetBytes(Value.ToString().AsSpan(), buffer);
 #else
             var bytes = Encoding.ASCII.GetBytes(Value.ToString());

BencodeNET/Objects/BObjectExtensions.cs

@@ -1,10 +1,11 @@
-#if NETCOREAPP2_1
-using System;
-#endif
-using System.Buffers;
+using System.Buffers;
 using System.IO;
 using System.Text;
 
+#if NETCOREAPP
+using System;
+#endif
+
 namespace BencodeNET.Objects
 {
     /// <summary>
@@ -40,7 +41,7 @@ public static string EncodeAsString(this IBObject bobject, Encoding encoding)
                 using (var stream = new MemoryStream(buffer))
                 {
                     bobject.EncodeTo(stream);
-#if NETCOREAPP2_1
+#if NETCOREAPP
                     return encoding.GetString(buffer.AsSpan().Slice(0, size));
 #else
                     return encoding.GetString(buffer, 0, size);

BencodeNET/Objects/BString.cs

@@ -98,7 +98,7 @@ protected override void EncodeObject(PipeWriter writer)
             var size = GetSizeInBytes();
             var buffer = writer.GetSpan(size);
 
-#if NETCOREAPP2_1
+#if NETCOREAPP
             // Write length
             var writtenBytes = Encoding.GetBytes(_value.Length.ToString().AsSpan(), buffer);
 
@@ -189,7 +189,7 @@ public int CompareTo(BString other)
         /// </returns>
         public override string ToString()
         {
-#if NETCOREAPP2_1
+#if NETCOREAPP
             return _encoding.GetString(_value.AsSpan());
 #else
             return _encoding.GetString(_value);
@@ -206,7 +206,7 @@ public override string ToString()
         public string ToString(Encoding encoding)
         {
             encoding = encoding ?? _encoding;
-#if NETCOREAPP2_1
+#if NETCOREAPP
             return encoding.GetString(_value.AsSpan());
 #else
             return encoding.GetString(_value);

BencodeNET/UtilityExtensions.cs

@@ -3,19 +3,12 @@
 using System.IO;
 using System.IO.Pipelines;
 using System.Linq;
-using System.Runtime.CompilerServices;
 using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
 
-#if !NETCOREAPP2_1
+#if !NETCOREAPP
 using System.Buffers;
 #endif
 
-#if NETSTANDARD1_3
-using System.Reflection;
-#endif
-
 namespace BencodeNET
 {
     internal static class UtilityExtensions
@@ -112,7 +105,7 @@ public static bool TrySetLength(this Stream stream, long length)
 
         public static void Write(this Stream stream, int number)
         {
-#if NETCOREAPP2_1
+#if NETCOREAPP
             Span<byte> buffer = stackalloc byte[11];
             var bytesRead = Encoding.ASCII.GetBytes(number.ToString().AsSpan(), buffer);
             stream.Write(buffer.Slice(0, bytesRead));
@@ -127,7 +120,7 @@ public static void Write(this Stream stream, int number)
 
         public static void Write(this Stream stream, long number)
         {
-#if NETCOREAPP2_1
+#if NETCOREAPP
             Span<byte> buffer = stackalloc byte[20];
             var bytesRead = Encoding.ASCII.GetBytes(number.ToString().AsSpan(), buffer);
             stream.Write(buffer.Slice(0, bytesRead));
@@ -145,20 +138,13 @@ public static void Write(this Stream stream, char c)
             stream.WriteByte((byte) c);
         }
 
-#if !NETCOREAPP2_1
+#if !NETCOREAPP
         public static void Write(this Stream stream, byte[] bytes)
         {
             stream.Write(bytes, 0, bytes.Length);
         }
 #endif
 
-#if NETSTANDARD1_3
-        public static bool IsAssignableFrom(this Type type, Type otherType)
-        {
-            return type.GetTypeInfo().IsAssignableFrom(otherType.GetTypeInfo());
-        }
-#endif
-
         public static void WriteChar(this PipeWriter writer, char c)
         {
             writer.GetSpan(1)[0] = (byte) c;
@@ -170,7 +156,7 @@ public static void WriteCharAt(this Span<byte> bytes, char c, int index)
             bytes[index] = (byte) c;
         }
 
-#if NETCOREAPP2_1
+#if NETCOREAPP
         public static string AsString(this ReadOnlySpan<char> chars)
         {
             return new string(chars);