From 8b060efce5449e9c1360e94920e5add0d66998f4 Mon Sep 17 00:00:00 2001 From: Shuai Date: Mon, 20 Nov 2023 18:36:34 +0800 Subject: [PATCH 1/3] refac build props --- Directory.Build.props | 17 +++++++++++ src/ApplicationLogs/ApplicationLogs.csproj | 16 ++++++----- src/DBFTPlugin/DBFTPlugin.csproj | 2 +- src/Directory.Build.props | 33 ++++++---------------- src/OracleService/OracleService.csproj | 23 ++++++++------- src/RpcServer/RpcServer.csproj | 1 - src/StateService/StateService.csproj | 26 +++++++++-------- src/StatesDumper/StatesDumper.csproj | 2 +- src/StorageDumper/StorageDumper.csproj | 2 +- src/TokensTracker/TokensTracker.csproj | 16 ++++++----- tests/Directory.Build.props | 10 +++---- 11 files changed, 78 insertions(+), 70 deletions(-) create mode 100644 Directory.Build.props diff --git a/Directory.Build.props b/Directory.Build.props new file mode 100644 index 000000000..f0d4f85a6 --- /dev/null +++ b/Directory.Build.props @@ -0,0 +1,17 @@ + + + + 3.6.2 + net7.0 + 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/ApplicationLogs/ApplicationLogs.csproj b/src/ApplicationLogs/ApplicationLogs.csproj index c2b42fec8..c01541737 100644 --- a/src/ApplicationLogs/ApplicationLogs.csproj +++ b/src/ApplicationLogs/ApplicationLogs.csproj @@ -1,12 +1,14 @@ - - Neo.Plugins.ApplicationLogs - Neo.Plugins - + + Neo.Plugins.ApplicationLogs + - - - + + + false + runtime + + diff --git a/src/DBFTPlugin/DBFTPlugin.csproj b/src/DBFTPlugin/DBFTPlugin.csproj index f169d5eba..74daed38a 100644 --- a/src/DBFTPlugin/DBFTPlugin.csproj +++ b/src/DBFTPlugin/DBFTPlugin.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 94e2979c9..84c40a02c 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -1,27 +1,10 @@ - - - 3.6.2 - net7.0 - Neo.Plugins - The Neo Project - NEO;Blockchain - https://github.com/neo-project/neo-modules - MIT - git - https://github.com/neo-project/neo-modules.git - - - - - PreserveNewest - PreserveNewest - - - - - - - - + + + + PreserveNewest + PreserveNewest + + + \ No newline at end of file diff --git a/src/OracleService/OracleService.csproj b/src/OracleService/OracleService.csproj index 5afa10cbe..bf62164e8 100644 --- a/src/OracleService/OracleService.csproj +++ b/src/OracleService/OracleService.csproj @@ -1,16 +1,19 @@ - - Neo.Plugins.OracleService - + + Neo.Plugins.OracleService + - - - - + + + + - - - + + + false + runtime + + diff --git a/src/RpcServer/RpcServer.csproj b/src/RpcServer/RpcServer.csproj index 77a4c158e..af5dc619c 100644 --- a/src/RpcServer/RpcServer.csproj +++ b/src/RpcServer/RpcServer.csproj @@ -2,7 +2,6 @@ Neo.Plugins.RpcServer - Neo.Plugins diff --git a/src/StateService/StateService.csproj b/src/StateService/StateService.csproj index 4f6902f20..f08c38bdb 100644 --- a/src/StateService/StateService.csproj +++ b/src/StateService/StateService.csproj @@ -1,18 +1,20 @@ - - Neo.Plugins.StateService - Neo.Plugins - true - + + Neo.Plugins.StateService + true + - - - + + + - - - - + + + + false + runtime + + diff --git a/src/StatesDumper/StatesDumper.csproj b/src/StatesDumper/StatesDumper.csproj index ab9aaa9dd..02d67dbe3 100644 --- a/src/StatesDumper/StatesDumper.csproj +++ b/src/StatesDumper/StatesDumper.csproj @@ -5,7 +5,7 @@ - + diff --git a/src/StorageDumper/StorageDumper.csproj b/src/StorageDumper/StorageDumper.csproj index 6ba3c63ea..a291fda32 100644 --- a/src/StorageDumper/StorageDumper.csproj +++ b/src/StorageDumper/StorageDumper.csproj @@ -7,6 +7,6 @@ - + diff --git a/src/TokensTracker/TokensTracker.csproj b/src/TokensTracker/TokensTracker.csproj index f4a8482ee..383afbe29 100644 --- a/src/TokensTracker/TokensTracker.csproj +++ b/src/TokensTracker/TokensTracker.csproj @@ -1,12 +1,14 @@ - - Neo.Plugins.TokensTracker - Neo.Plugins - + + Neo.Plugins.TokensTracker + - - - + + + false + runtime + + diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props index bfbc4d574..e478faf64 100644 --- a/tests/Directory.Build.props +++ b/tests/Directory.Build.props @@ -1,15 +1,15 @@ - + - net7.0 false - - - + + + + \ No newline at end of file From e21a8b96fb21e84214e61326cc948c2cb53b25d2 Mon Sep 17 00:00:00 2001 From: Shuai Date: Fri, 24 Nov 2023 17:17:50 +0800 Subject: [PATCH 2/3] remove AdditionalProperties --- src/ApplicationLogs/ApplicationLogs.csproj | 23 ++++++++++------------ src/OracleService/OracleService.csproj | 8 ++------ src/StateService/StateService.csproj | 8 ++------ src/TokensTracker/TokensTracker.csproj | 7 ++----- 4 files changed, 16 insertions(+), 30 deletions(-) diff --git a/src/ApplicationLogs/ApplicationLogs.csproj b/src/ApplicationLogs/ApplicationLogs.csproj index c01541737..61ce39219 100644 --- a/src/ApplicationLogs/ApplicationLogs.csproj +++ b/src/ApplicationLogs/ApplicationLogs.csproj @@ -1,14 +1,11 @@ - - - Neo.Plugins.ApplicationLogs - - - - - false - runtime - - - - + + Neo.Plugins.ApplicationLogs + + + + false + runtime + + + \ No newline at end of file diff --git a/src/OracleService/OracleService.csproj b/src/OracleService/OracleService.csproj index bf62164e8..1e4f29e8a 100644 --- a/src/OracleService/OracleService.csproj +++ b/src/OracleService/OracleService.csproj @@ -1,19 +1,15 @@ - Neo.Plugins.OracleService - - - + false runtime - - + \ No newline at end of file diff --git a/src/StateService/StateService.csproj b/src/StateService/StateService.csproj index f08c38bdb..b438508f8 100644 --- a/src/StateService/StateService.csproj +++ b/src/StateService/StateService.csproj @@ -1,20 +1,16 @@ - Neo.Plugins.StateService true - - - + false runtime - - + \ No newline at end of file diff --git a/src/TokensTracker/TokensTracker.csproj b/src/TokensTracker/TokensTracker.csproj index 383afbe29..28ac9bf3d 100644 --- a/src/TokensTracker/TokensTracker.csproj +++ b/src/TokensTracker/TokensTracker.csproj @@ -1,14 +1,11 @@ - Neo.Plugins.TokensTracker - - + false runtime - - + \ No newline at end of file From 48e1ee531292430dc8cfae416a86c14207b6626e Mon Sep 17 00:00:00 2001 From: Shuai Date: Wed, 29 Nov 2023 17:47:19 +0800 Subject: [PATCH 3/3] remove IncludeSettingsFileOutput --- src/Directory.Build.props | 2 +- tests/Directory.Build.props | 6 +++--- .../Neo.Cryptography.MPTTrie.Tests.csproj | 10 +--------- .../Neo.Network.RPC.Tests.csproj | 19 ++++--------------- .../Neo.Plugins.OracleService.Tests.csproj | 18 ++++++------------ .../Neo.Plugins.RpcServer.Tests.csproj | 12 +----------- .../Neo.Plugins.Storage.Tests.csproj | 11 +---------- 7 files changed, 17 insertions(+), 61 deletions(-) diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 84c40a02c..b173f4db2 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -2,7 +2,7 @@ - + PreserveNewest PreserveNewest diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props index e478faf64..6ff47a7c2 100644 --- a/tests/Directory.Build.props +++ b/tests/Directory.Build.props @@ -5,9 +5,9 @@ false - - - + + + diff --git a/tests/Neo.Cryptography.MPTTrie.Tests/Neo.Cryptography.MPTTrie.Tests.csproj b/tests/Neo.Cryptography.MPTTrie.Tests/Neo.Cryptography.MPTTrie.Tests.csproj index a2d6822c5..17392da61 100644 --- a/tests/Neo.Cryptography.MPTTrie.Tests/Neo.Cryptography.MPTTrie.Tests.csproj +++ b/tests/Neo.Cryptography.MPTTrie.Tests/Neo.Cryptography.MPTTrie.Tests.csproj @@ -1,16 +1,8 @@ - Neo.Cryptography.MPT.Tests - - - - - - - - + \ No newline at end of file diff --git a/tests/Neo.Network.RPC.Tests/Neo.Network.RPC.Tests.csproj b/tests/Neo.Network.RPC.Tests/Neo.Network.RPC.Tests.csproj index 9815f51e9..38851f4a9 100644 --- a/tests/Neo.Network.RPC.Tests/Neo.Network.RPC.Tests.csproj +++ b/tests/Neo.Network.RPC.Tests/Neo.Network.RPC.Tests.csproj @@ -1,32 +1,21 @@ - Neo.Network.RPC.Tests - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive + + all + runtime; build; native; contentfiles; analyzers; buildtransitive - - PreserveNewest - - - - - - - - + \ No newline at end of file diff --git a/tests/Neo.Plugins.OracleService.Tests/Neo.Plugins.OracleService.Tests.csproj b/tests/Neo.Plugins.OracleService.Tests/Neo.Plugins.OracleService.Tests.csproj index 1584f425f..cb4dd1c6c 100644 --- a/tests/Neo.Plugins.OracleService.Tests/Neo.Plugins.OracleService.Tests.csproj +++ b/tests/Neo.Plugins.OracleService.Tests/Neo.Plugins.OracleService.Tests.csproj @@ -1,23 +1,17 @@ - OracleService.Tests Neo.Plugins - - - + + + false + runtime + - - - - - - - - + \ No newline at end of file diff --git a/tests/Neo.Plugins.RpcServer.Tests/Neo.Plugins.RpcServer.Tests.csproj b/tests/Neo.Plugins.RpcServer.Tests/Neo.Plugins.RpcServer.Tests.csproj index 9508d750e..9b3fcaed4 100644 --- a/tests/Neo.Plugins.RpcServer.Tests/Neo.Plugins.RpcServer.Tests.csproj +++ b/tests/Neo.Plugins.RpcServer.Tests/Neo.Plugins.RpcServer.Tests.csproj @@ -1,22 +1,12 @@ - Neo.Plugins.RpcServer.Tests Neo.Plugins.RpcServer.Tests - - - - - - - - - - + \ No newline at end of file diff --git a/tests/Neo.Plugins.Storage.Tests/Neo.Plugins.Storage.Tests.csproj b/tests/Neo.Plugins.Storage.Tests/Neo.Plugins.Storage.Tests.csproj index 1366e66f8..10f373f5e 100644 --- a/tests/Neo.Plugins.Storage.Tests/Neo.Plugins.Storage.Tests.csproj +++ b/tests/Neo.Plugins.Storage.Tests/Neo.Plugins.Storage.Tests.csproj @@ -1,18 +1,9 @@ - Neo.Plugins.Storage.Tests - - - - - - - - - + \ No newline at end of file