Remove net47

neo-project · Oct 28, 2019 · e9911be · e9911be
1 parent a13972d
commit e9911be
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 26 deletions.
diff --git a/neo/Cryptography/RIPEMD160Managed.cs b/neo/Cryptography/RIPEMD160Managed.cs
@@ -1,4 +1,3 @@
-#if !NET47
 using System;
 using System.Runtime.InteropServices;
 using System.Security;
@@ -1051,4 +1050,3 @@ private static void DWORDToLittleEndian(byte[] block, uint[] x, int digits)
         }
     }
 }
-#endif
diff --git a/neo/Cryptography/SCrypt.cs b/neo/Cryptography/SCrypt.cs
@@ -245,12 +245,6 @@ private unsafe static void SMix(byte* B, int r, int N, uint* V, uint* XY)
             }
         }
 
-#if NET47
-        public static byte[] DeriveKey(byte[] password, byte[] salt, int N, int r, int p, int derivedKeyLength)
-        {
-            return Replicon.Cryptography.SCrypt.SCrypt.DeriveKey(password, salt, (ulong)N, (uint)r, (uint)p, (uint)derivedKeyLength);
-        }
-#else
         public unsafe static byte[] DeriveKey(byte[] password, byte[] salt, int N, int r, int p, int derivedKeyLength)
         {
             var Ba = new byte[128 * r * p + 63];
@@ -280,7 +274,6 @@ public unsafe static byte[] DeriveKey(byte[] password, byte[] salt, int N, int r
 
             return buf;
         }
-#endif
 
         private static void PBKDF2_SHA256(HMACSHA256 mac, byte[] password, byte[] salt, int saltLength, long iterationCount, byte[] derivedKey, int derivedKeyLength)
         {

diff --git a/neo/IO/Data/LevelDB/Native.cs b/neo/IO/Data/LevelDB/Native.cs
@@ -12,17 +12,6 @@ public enum CompressionType : byte
 
     public static class Native
     {
-#if NET47
-        static Native()
-        {
-            string platform = IntPtr.Size == 8 ? "x64" : "x86";
-            LoadLibrary(Path.Combine(AppContext.BaseDirectory, platform, "libleveldb"));
-        }
-
-        [DllImport("kernel32")]
-        private static extern IntPtr LoadLibrary(string dllToLoad);
-#endif
-
         #region Logger
         [DllImport("libleveldb", CharSet = CharSet.Ansi, CallingConvention = CallingConvention.Cdecl)]
         public static extern IntPtr leveldb_logger_create(IntPtr /* Action<string> */ logger);

diff --git a/neo/neo.csproj b/neo/neo.csproj
@@ -5,7 +5,7 @@
     <AssemblyTitle>Neo</AssemblyTitle>
     <Version>3.0.0-preview1</Version>
     <Authors>The Neo Project</Authors>
-    <TargetFrameworks>netstandard2.1;net47</TargetFrameworks>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <AssemblyName>Neo</AssemblyName>
     <PackageId>Neo</PackageId>
@@ -17,7 +17,6 @@
     <RootNamespace>Neo</RootNamespace>
     <Company>The Neo Project</Company>
     <Description>Neo</Description>
-    <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
@@ -34,8 +33,4 @@
     <PackageReference Include="System.Text.Encodings.Web" Version="4.6.0" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net47'">
-    <PackageReference Include="Replicon.Cryptography.SCrypt" Version="1.1.6.13" />
-  </ItemGroup>
-
 </Project>