From 2e3ba380237b87d02f0edaea89d206ad65fd7713 Mon Sep 17 00:00:00 2001 From: Harry Date: Wed, 18 Nov 2020 17:27:10 -0800 Subject: [PATCH 1/6] use shared directory.build.props file --- src/ApplicationLogs/ApplicationLogs.csproj | 4 +--- src/Directory.Build.props | 21 +++++++++++++++++++++ src/LevelDBStore/LevelDBStore.csproj | 8 +------- src/RocksDBStore/RocksDBStore.csproj | 4 +--- src/RpcClient/RpcClient.csproj | 15 +-------------- src/RpcNep5Tracker/RpcNep5Tracker.csproj | 4 +--- src/RpcServer/RpcServer.csproj | 5 +---- src/StatesDumper/StatesDumper.csproj | 5 +---- 8 files changed, 28 insertions(+), 38 deletions(-) create mode 100644 src/Directory.Build.props diff --git a/src/ApplicationLogs/ApplicationLogs.csproj b/src/ApplicationLogs/ApplicationLogs.csproj index 5318c84ca..7f969fcf0 100644 --- a/src/ApplicationLogs/ApplicationLogs.csproj +++ b/src/ApplicationLogs/ApplicationLogs.csproj @@ -1,9 +1,7 @@ - 3.0.0-preview3 - netstandard2.1 - Neo.Plugins + Neo.Plugins.ApplicationLogs diff --git a/src/Directory.Build.props b/src/Directory.Build.props new file mode 100644 index 000000000..44d252790 --- /dev/null +++ b/src/Directory.Build.props @@ -0,0 +1,21 @@ + + + + + 3.0.0 + preview3 + netstandard2.1 + Neo.Plugins + The Neo Project + NEO;Blockchain + https://github.com/neo-project/neo-modules + MIT + git + https://github.com/neo-project/neo-modules.git + + + + + + + \ No newline at end of file diff --git a/src/LevelDBStore/LevelDBStore.csproj b/src/LevelDBStore/LevelDBStore.csproj index 2acba8102..7f10495fa 100644 --- a/src/LevelDBStore/LevelDBStore.csproj +++ b/src/LevelDBStore/LevelDBStore.csproj @@ -1,9 +1,7 @@ - 3.0.0-preview3 - netstandard2.1 - Neo + Neo.Plugins.LevelDBStore true @@ -14,8 +12,4 @@ - - - - diff --git a/src/RocksDBStore/RocksDBStore.csproj b/src/RocksDBStore/RocksDBStore.csproj index 8cace3405..aea8fbf61 100644 --- a/src/RocksDBStore/RocksDBStore.csproj +++ b/src/RocksDBStore/RocksDBStore.csproj @@ -1,8 +1,7 @@ - 3.0.0-preview3 - netstandard2.1 + Neo.Plugins.RocksDBStore Neo.Plugins.Storage @@ -14,7 +13,6 @@ - diff --git a/src/RpcClient/RpcClient.csproj b/src/RpcClient/RpcClient.csproj index d687d0cce..11444b196 100644 --- a/src/RpcClient/RpcClient.csproj +++ b/src/RpcClient/RpcClient.csproj @@ -1,20 +1,7 @@ - 3.0.0-preview3 - netstandard2.1 - Neo.Network.RPC - The Neo Project - Neo.Network.RPC.RpcClient - NEO;Blockchain - https://github.com/neo-project/neo-modules - MIT - git - https://github.com/neo-project/neo-modules.git + Neo.RpcClient - - - - diff --git a/src/RpcNep5Tracker/RpcNep5Tracker.csproj b/src/RpcNep5Tracker/RpcNep5Tracker.csproj index 7a9a6764e..12997a50a 100644 --- a/src/RpcNep5Tracker/RpcNep5Tracker.csproj +++ b/src/RpcNep5Tracker/RpcNep5Tracker.csproj @@ -1,8 +1,6 @@ - 3.0.0-preview3 - netstandard2.1 - Neo.Plugins + Neo.Plugins.RpcNep5Tracker diff --git a/src/RpcServer/RpcServer.csproj b/src/RpcServer/RpcServer.csproj index eafe5d8d5..c72bdce9b 100644 --- a/src/RpcServer/RpcServer.csproj +++ b/src/RpcServer/RpcServer.csproj @@ -1,9 +1,7 @@  - 3.0.0-preview3 - netstandard2.1 - Neo.Plugins + Neo.Plugins.RpcServer @@ -15,7 +13,6 @@ - diff --git a/src/StatesDumper/StatesDumper.csproj b/src/StatesDumper/StatesDumper.csproj index ee9be372a..c361bbf96 100644 --- a/src/StatesDumper/StatesDumper.csproj +++ b/src/StatesDumper/StatesDumper.csproj @@ -1,9 +1,7 @@ - 3.0.0-preview3 - netstandard2.1 - Neo.Plugins + Neo.Plugins.StatesDumper @@ -14,7 +12,6 @@ - From 839e87e7593608d348d06392c98719d72e9bfc51 Mon Sep 17 00:00:00 2001 From: Harry Pierson Date: Fri, 20 Nov 2020 09:11:09 -0800 Subject: [PATCH 2/6] Update src/LevelDBStore/LevelDBStore.csproj Co-authored-by: Erik Zhang --- src/LevelDBStore/LevelDBStore.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/LevelDBStore/LevelDBStore.csproj b/src/LevelDBStore/LevelDBStore.csproj index 7f10495fa..a721a850e 100644 --- a/src/LevelDBStore/LevelDBStore.csproj +++ b/src/LevelDBStore/LevelDBStore.csproj @@ -1,7 +1,7 @@ - Neo.Plugins.LevelDBStore + Neo.Plugins.Storage.LevelDBStore true From 68be9011311a35ee50630609e765808c75900ef7 Mon Sep 17 00:00:00 2001 From: Harry Pierson Date: Fri, 20 Nov 2020 09:11:25 -0800 Subject: [PATCH 3/6] Update src/RocksDBStore/RocksDBStore.csproj Co-authored-by: Erik Zhang --- src/RocksDBStore/RocksDBStore.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/RocksDBStore/RocksDBStore.csproj b/src/RocksDBStore/RocksDBStore.csproj index aea8fbf61..e1f5bad60 100644 --- a/src/RocksDBStore/RocksDBStore.csproj +++ b/src/RocksDBStore/RocksDBStore.csproj @@ -1,7 +1,7 @@ - Neo.Plugins.RocksDBStore + Neo.Plugins.Storage.RocksDBStore Neo.Plugins.Storage From 5a84b895e55cd1e293a731106d9eb4a358ef00fd Mon Sep 17 00:00:00 2001 From: Harry Pierson Date: Fri, 20 Nov 2020 09:12:34 -0800 Subject: [PATCH 4/6] Update src/RocksDBStore/RocksDBStore.csproj Co-authored-by: Erik Zhang --- src/RocksDBStore/RocksDBStore.csproj | 1 - 1 file changed, 1 deletion(-) diff --git a/src/RocksDBStore/RocksDBStore.csproj b/src/RocksDBStore/RocksDBStore.csproj index e1f5bad60..2e193c77f 100644 --- a/src/RocksDBStore/RocksDBStore.csproj +++ b/src/RocksDBStore/RocksDBStore.csproj @@ -2,7 +2,6 @@ Neo.Plugins.Storage.RocksDBStore - Neo.Plugins.Storage From bbe7b2fef6d1b515d35f3c3e68bd20a28bdb8e18 Mon Sep 17 00:00:00 2001 From: Harry Pierson Date: Sat, 21 Nov 2020 08:50:34 -0800 Subject: [PATCH 5/6] CR Feedback --- src/ApplicationLogs/ApplicationLogs.csproj | 1 + src/LevelDBStore/LevelDBStore.csproj | 1 + src/RocksDBStore/RocksDBStore.csproj | 1 + src/RpcClient/RpcClient.csproj | 3 ++- src/RpcNep5Tracker/RpcNep5Tracker.csproj | 1 + src/RpcServer/RpcServer.csproj | 1 + 6 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/ApplicationLogs/ApplicationLogs.csproj b/src/ApplicationLogs/ApplicationLogs.csproj index 7f969fcf0..007129f40 100644 --- a/src/ApplicationLogs/ApplicationLogs.csproj +++ b/src/ApplicationLogs/ApplicationLogs.csproj @@ -2,6 +2,7 @@ Neo.Plugins.ApplicationLogs + Neo.Plugins diff --git a/src/LevelDBStore/LevelDBStore.csproj b/src/LevelDBStore/LevelDBStore.csproj index a721a850e..d49bce97d 100644 --- a/src/LevelDBStore/LevelDBStore.csproj +++ b/src/LevelDBStore/LevelDBStore.csproj @@ -2,6 +2,7 @@ Neo.Plugins.Storage.LevelDBStore + Neo.Plugins.Storage true diff --git a/src/RocksDBStore/RocksDBStore.csproj b/src/RocksDBStore/RocksDBStore.csproj index 2e193c77f..e1f5bad60 100644 --- a/src/RocksDBStore/RocksDBStore.csproj +++ b/src/RocksDBStore/RocksDBStore.csproj @@ -2,6 +2,7 @@ Neo.Plugins.Storage.RocksDBStore + Neo.Plugins.Storage diff --git a/src/RpcClient/RpcClient.csproj b/src/RpcClient/RpcClient.csproj index 11444b196..57551190a 100644 --- a/src/RpcClient/RpcClient.csproj +++ b/src/RpcClient/RpcClient.csproj @@ -1,7 +1,8 @@ - Neo.RpcClient + Neo.Network.RPC.RpcClient + Neo.Network.RPC.RpcClient diff --git a/src/RpcNep5Tracker/RpcNep5Tracker.csproj b/src/RpcNep5Tracker/RpcNep5Tracker.csproj index 12997a50a..403f4a12a 100644 --- a/src/RpcNep5Tracker/RpcNep5Tracker.csproj +++ b/src/RpcNep5Tracker/RpcNep5Tracker.csproj @@ -1,6 +1,7 @@ Neo.Plugins.RpcNep5Tracker + Neo.Plugins diff --git a/src/RpcServer/RpcServer.csproj b/src/RpcServer/RpcServer.csproj index c72bdce9b..9ce3d9e1c 100644 --- a/src/RpcServer/RpcServer.csproj +++ b/src/RpcServer/RpcServer.csproj @@ -2,6 +2,7 @@ Neo.Plugins.RpcServer + Neo.Plugins From f0c47bc4e4f3eba615a37352fbcc35b0013584ad Mon Sep 17 00:00:00 2001 From: Erik Zhang Date: Mon, 23 Nov 2020 17:57:28 +0800 Subject: [PATCH 6/6] Fix namespace --- src/RpcClient/RpcClient.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/RpcClient/RpcClient.csproj b/src/RpcClient/RpcClient.csproj index 57551190a..d2f535e5e 100644 --- a/src/RpcClient/RpcClient.csproj +++ b/src/RpcClient/RpcClient.csproj @@ -2,7 +2,7 @@ Neo.Network.RPC.RpcClient - Neo.Network.RPC.RpcClient + Neo.Network.RPC