From 981edd9c0259566216d4f1b6c0dd83ed85bf677b Mon Sep 17 00:00:00 2001
From: Owen Zhang <38493437+superboyiii@users.noreply.github.com>
Date: Wed, 5 Aug 2020 16:19:48 +0800
Subject: [PATCH] Merge Preview3 to Master (#307)

* Add Utility.StackItemFromJson (#302) (#303)

* fix invoke tojson

* add StackItemFromJson

* optimize code

* remove src/RpcClientTests/UtilityTests.cs

Co-authored-by: Luchuan <luchuan@neo.org>

Co-authored-by: Luchuan <luchuan@ngd.neo.org>
Co-authored-by: Luchuan <luchuan@neo.org>

* update to preview3 (#305)

Co-authored-by: Luchuan <luchuan@ngd.neo.org>
Co-authored-by: Luchuan <luchuan@neo.org>
---
 src/ApplicationLogs/ApplicationLogs.csproj | 2 +-
 src/LevelDBStore/LevelDBStore.csproj       | 6 +++---
 src/RocksDBStore/RocksDBStore.csproj       | 6 +++---
 src/RpcClient/RpcClient.csproj             | 4 ++--
 src/RpcNep5Tracker/RpcNep5Tracker.csproj   | 2 +-
 src/RpcServer/RpcServer.csproj             | 4 ++--
 src/StatesDumper/StatesDumper.csproj       | 4 ++--
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/ApplicationLogs/ApplicationLogs.csproj b/src/ApplicationLogs/ApplicationLogs.csproj
index c06947925..5318c84ca 100644
--- a/src/ApplicationLogs/ApplicationLogs.csproj
+++ b/src/ApplicationLogs/ApplicationLogs.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Version>3.0.0-preview2</Version>
+    <Version>3.0.0-preview3</Version>
     <TargetFramework>netstandard2.1</TargetFramework>
     <RootNamespace>Neo.Plugins</RootNamespace>
   </PropertyGroup>
diff --git a/src/LevelDBStore/LevelDBStore.csproj b/src/LevelDBStore/LevelDBStore.csproj
index 9e6e2a829..9c57ece5c 100644
--- a/src/LevelDBStore/LevelDBStore.csproj
+++ b/src/LevelDBStore/LevelDBStore.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Version>3.0.0-preview2</Version>
+    <Version>3.0.0-preview3</Version>
     <TargetFramework>netstandard2.1</TargetFramework>
     <RootNamespace>Neo</RootNamespace>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -15,7 +15,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Neo" Version="3.0.0-CI00970" />
+    <PackageReference Include="Neo" Version="3.0.0-preview3-00" />
   </ItemGroup>
 
 </Project>
diff --git a/src/RocksDBStore/RocksDBStore.csproj b/src/RocksDBStore/RocksDBStore.csproj
index fb9d1a700..5f67e8f73 100644
--- a/src/RocksDBStore/RocksDBStore.csproj
+++ b/src/RocksDBStore/RocksDBStore.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Version>3.0.0-preview2</Version>
+    <Version>3.0.0-preview3</Version>
     <TargetFramework>netstandard2.1</TargetFramework>
     <RootNamespace>Neo.Plugins.Storage</RootNamespace>
   </PropertyGroup>
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Neo" Version="3.0.0-CI00970" />
+    <PackageReference Include="Neo" Version="3.0.0-preview3-00" />
     <PackageReference Include="RocksDbNative" Version="6.2.2" />
     <PackageReference Include="RocksDbSharp" Version="6.2.2" />
   </ItemGroup>
diff --git a/src/RpcClient/RpcClient.csproj b/src/RpcClient/RpcClient.csproj
index a8b93604a..31e757d12 100644
--- a/src/RpcClient/RpcClient.csproj
+++ b/src/RpcClient/RpcClient.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Version>3.0.0-preview2</Version>
+    <Version>3.0.0-preview3</Version>
     <TargetFramework>netstandard2.1</TargetFramework>
     <RootNamespace>Neo.Network.RPC</RootNamespace>
     <Authors>The Neo Project</Authors>
@@ -14,7 +14,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Neo" Version="3.0.0-CI00972" />
+    <PackageReference Include="Neo" Version="3.0.0-preview3-00" />
   </ItemGroup>
 
 </Project>
diff --git a/src/RpcNep5Tracker/RpcNep5Tracker.csproj b/src/RpcNep5Tracker/RpcNep5Tracker.csproj
index 408ffed03..7a9a6764e 100644
--- a/src/RpcNep5Tracker/RpcNep5Tracker.csproj
+++ b/src/RpcNep5Tracker/RpcNep5Tracker.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Version>3.0.0-preview2</Version>
+    <Version>3.0.0-preview3</Version>
     <TargetFramework>netstandard2.1</TargetFramework>
     <RootNamespace>Neo.Plugins</RootNamespace>
   </PropertyGroup>
diff --git a/src/RpcServer/RpcServer.csproj b/src/RpcServer/RpcServer.csproj
index 853edc38f..c337384ad 100644
--- a/src/RpcServer/RpcServer.csproj
+++ b/src/RpcServer/RpcServer.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Version>3.0.0-preview2</Version>
+    <Version>3.0.0-preview3</Version>
     <TargetFramework>netstandard2.1</TargetFramework>
     <RootNamespace>Neo.Plugins</RootNamespace>
   </PropertyGroup>
@@ -15,7 +15,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.ResponseCompression" Version="2.2.0" />
-    <PackageReference Include="Neo" Version="3.0.0-CI00970" />
+    <PackageReference Include="Neo" Version="3.0.0-preview3-00" />
   </ItemGroup>
 
 </Project>
diff --git a/src/StatesDumper/StatesDumper.csproj b/src/StatesDumper/StatesDumper.csproj
index 5ae67e8ca..9e695830a 100644
--- a/src/StatesDumper/StatesDumper.csproj
+++ b/src/StatesDumper/StatesDumper.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Version>3.0.0-preview2</Version>
+    <Version>3.0.0-preview3</Version>
     <TargetFramework>netstandard2.1</TargetFramework>
     <RootNamespace>Neo.Plugins</RootNamespace>
   </PropertyGroup>
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Neo" Version="3.0.0-CI00970" />
+    <PackageReference Include="Neo" Version="3.0.0-preview3-00" />
     <PackageReference Include="Neo.ConsoleService" Version="1.0.0" />
   </ItemGroup>