diff --git a/src/Nethermind/Directory.Packages.props b/src/Nethermind/Directory.Packages.props
index 1cee10e2369..87df4f85470 100644
--- a/src/Nethermind/Directory.Packages.props
+++ b/src/Nethermind/Directory.Packages.props
@@ -3,7 +3,6 @@
true
-
@@ -14,22 +13,20 @@
-
-
-
+
+
-
-
-
+
+
@@ -37,14 +34,13 @@
-
-
+
-
+
@@ -54,38 +50,29 @@
-
+
-
+
-
-
+
-
-
-
-
-
+
-
-
-
-
diff --git a/src/Nethermind/Ethereum.Abi.Test/Ethereum.Abi.Test.csproj b/src/Nethermind/Ethereum.Abi.Test/Ethereum.Abi.Test.csproj
index 4eb0fb44dbf..d446f54a5bd 100644
--- a/src/Nethermind/Ethereum.Abi.Test/Ethereum.Abi.Test.csproj
+++ b/src/Nethermind/Ethereum.Abi.Test/Ethereum.Abi.Test.csproj
@@ -5,7 +5,7 @@
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/src/Nethermind/Ethereum.Basic.Test/Ethereum.Basic.Test.csproj b/src/Nethermind/Ethereum.Basic.Test/Ethereum.Basic.Test.csproj
index 39a8cd4e73d..55268765563 100644
--- a/src/Nethermind/Ethereum.Basic.Test/Ethereum.Basic.Test.csproj
+++ b/src/Nethermind/Ethereum.Basic.Test/Ethereum.Basic.Test.csproj
@@ -13,7 +13,7 @@
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/src/Nethermind/Ethereum.Blockchain.Block.Test/Ethereum.Blockchain.Block.Test.csproj b/src/Nethermind/Ethereum.Blockchain.Block.Test/Ethereum.Blockchain.Block.Test.csproj
index 71fa90990da..087be68f5a4 100644
--- a/src/Nethermind/Ethereum.Blockchain.Block.Test/Ethereum.Blockchain.Block.Test.csproj
+++ b/src/Nethermind/Ethereum.Blockchain.Block.Test/Ethereum.Blockchain.Block.Test.csproj
@@ -3,7 +3,7 @@
false
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/src/Nethermind/Ethereum.Blockchain.Pyspec.Test/Ethereum.Blockchain.Pyspec.Test.csproj b/src/Nethermind/Ethereum.Blockchain.Pyspec.Test/Ethereum.Blockchain.Pyspec.Test.csproj
index 3aa4b1ff9b1..e450720acda 100644
--- a/src/Nethermind/Ethereum.Blockchain.Pyspec.Test/Ethereum.Blockchain.Pyspec.Test.csproj
+++ b/src/Nethermind/Ethereum.Blockchain.Pyspec.Test/Ethereum.Blockchain.Pyspec.Test.csproj
@@ -4,7 +4,7 @@
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/src/Nethermind/Ethereum.Blockchain.Pyspec.Test/LoadPyspecTestsStrategy.cs b/src/Nethermind/Ethereum.Blockchain.Pyspec.Test/LoadPyspecTestsStrategy.cs
index 24291f9fc06..ccaf096b186 100644
--- a/src/Nethermind/Ethereum.Blockchain.Pyspec.Test/LoadPyspecTestsStrategy.cs
+++ b/src/Nethermind/Ethereum.Blockchain.Pyspec.Test/LoadPyspecTestsStrategy.cs
@@ -3,13 +3,13 @@
using System;
using System.Collections.Generic;
+using System.Formats.Tar;
using System.IO;
+using System.IO.Compression;
using System.Linq;
using System.Net.Http;
using Ethereum.Test.Base;
using Ethereum.Test.Base.Interfaces;
-using SharpCompress.Archives;
-using SharpCompress.Archives.Tar;
namespace Ethereum.Blockchain.Pyspec.Test;
@@ -35,8 +35,12 @@ private void DownloadAndExtract(string archiveVersion, string archiveName, strin
HttpResponseMessage response = httpClient.GetAsync(string.Format(Constants.ARCHIVE_URL_TEMPLATE, archiveVersion, archiveName)).GetAwaiter().GetResult();
response.EnsureSuccessStatusCode();
using Stream contentStream = response.Content.ReadAsStreamAsync().GetAwaiter().GetResult();
- using TarArchive archive = TarArchive.Open(contentStream);
- archive.ExtractToDirectory(testsDirectoryName);
+ using GZipStream gzStream = new(contentStream, CompressionMode.Decompress);
+
+ if (!Directory.Exists(testsDirectoryName))
+ Directory.CreateDirectory(testsDirectoryName);
+
+ TarFile.ExtractToDirectory(gzStream, testsDirectoryName, true);
}
private IEnumerable LoadTestsFromDirectory(string testDir, string wildcard)
diff --git a/src/Nethermind/Ethereum.Blockchain.Test/Ethereum.Blockchain.Test.csproj b/src/Nethermind/Ethereum.Blockchain.Test/Ethereum.Blockchain.Test.csproj
index 70996b142dd..fa1f7d64911 100644
--- a/src/Nethermind/Ethereum.Blockchain.Test/Ethereum.Blockchain.Test.csproj
+++ b/src/Nethermind/Ethereum.Blockchain.Test/Ethereum.Blockchain.Test.csproj
@@ -4,12 +4,10 @@
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
-
-
@@ -18,8 +16,6 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
diff --git a/src/Nethermind/Ethereum.Difficulty.Test/Ethereum.Difficulty.Test.csproj b/src/Nethermind/Ethereum.Difficulty.Test/Ethereum.Difficulty.Test.csproj
index cd56ce690bf..acf8f06a2c7 100644
--- a/src/Nethermind/Ethereum.Difficulty.Test/Ethereum.Difficulty.Test.csproj
+++ b/src/Nethermind/Ethereum.Difficulty.Test/Ethereum.Difficulty.Test.csproj
@@ -4,7 +4,7 @@
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/src/Nethermind/Ethereum.HexPrefix.Test/Ethereum.HexPrefix.Test.csproj b/src/Nethermind/Ethereum.HexPrefix.Test/Ethereum.HexPrefix.Test.csproj
index 363c379697e..c89af99a847 100644
--- a/src/Nethermind/Ethereum.HexPrefix.Test/Ethereum.HexPrefix.Test.csproj
+++ b/src/Nethermind/Ethereum.HexPrefix.Test/Ethereum.HexPrefix.Test.csproj
@@ -4,7 +4,7 @@
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/src/Nethermind/Ethereum.KeyAddress.Test/Ethereum.KeyAddress.Test.csproj b/src/Nethermind/Ethereum.KeyAddress.Test/Ethereum.KeyAddress.Test.csproj
index e04c80752ca..efd09e53e29 100644
--- a/src/Nethermind/Ethereum.KeyAddress.Test/Ethereum.KeyAddress.Test.csproj
+++ b/src/Nethermind/Ethereum.KeyAddress.Test/Ethereum.KeyAddress.Test.csproj
@@ -4,7 +4,7 @@
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/src/Nethermind/Ethereum.KeyStore.Test/Ethereum.KeyStore.Test.csproj b/src/Nethermind/Ethereum.KeyStore.Test/Ethereum.KeyStore.Test.csproj
index f5b861659d4..fd66daa316b 100644
--- a/src/Nethermind/Ethereum.KeyStore.Test/Ethereum.KeyStore.Test.csproj
+++ b/src/Nethermind/Ethereum.KeyStore.Test/Ethereum.KeyStore.Test.csproj
@@ -4,7 +4,7 @@
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/src/Nethermind/Ethereum.PoW.Test/Ethereum.PoW.Test.csproj b/src/Nethermind/Ethereum.PoW.Test/Ethereum.PoW.Test.csproj
index 598f7278730..3d4b55a475f 100644
--- a/src/Nethermind/Ethereum.PoW.Test/Ethereum.PoW.Test.csproj
+++ b/src/Nethermind/Ethereum.PoW.Test/Ethereum.PoW.Test.csproj
@@ -4,7 +4,7 @@
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/src/Nethermind/Ethereum.Rlp.Test/Ethereum.Rlp.Test.csproj b/src/Nethermind/Ethereum.Rlp.Test/Ethereum.Rlp.Test.csproj
index ae824c709ea..4cad28dd45c 100644
--- a/src/Nethermind/Ethereum.Rlp.Test/Ethereum.Rlp.Test.csproj
+++ b/src/Nethermind/Ethereum.Rlp.Test/Ethereum.Rlp.Test.csproj
@@ -4,7 +4,7 @@
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/src/Nethermind/Ethereum.Test.Base/Ethereum.Test.Base.csproj b/src/Nethermind/Ethereum.Test.Base/Ethereum.Test.Base.csproj
index 8fce86d6fb7..4aa22e32cb1 100644
--- a/src/Nethermind/Ethereum.Test.Base/Ethereum.Test.Base.csproj
+++ b/src/Nethermind/Ethereum.Test.Base/Ethereum.Test.Base.csproj
@@ -11,7 +11,6 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
-
diff --git a/src/Nethermind/Ethereum.Transaction.Test/Ethereum.Transaction.Test.csproj b/src/Nethermind/Ethereum.Transaction.Test/Ethereum.Transaction.Test.csproj
index dc083596851..4d10e3bdd6f 100644
--- a/src/Nethermind/Ethereum.Transaction.Test/Ethereum.Transaction.Test.csproj
+++ b/src/Nethermind/Ethereum.Transaction.Test/Ethereum.Transaction.Test.csproj
@@ -4,7 +4,7 @@
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/src/Nethermind/Ethereum.Transition.Test/Ethereum.Transition.Test.csproj b/src/Nethermind/Ethereum.Transition.Test/Ethereum.Transition.Test.csproj
index b636274c2fa..9a745bd3b6c 100644
--- a/src/Nethermind/Ethereum.Transition.Test/Ethereum.Transition.Test.csproj
+++ b/src/Nethermind/Ethereum.Transition.Test/Ethereum.Transition.Test.csproj
@@ -4,7 +4,7 @@
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/src/Nethermind/Ethereum.Trie.Test/Ethereum.Trie.Test.csproj b/src/Nethermind/Ethereum.Trie.Test/Ethereum.Trie.Test.csproj
index 37a4d855b77..8edf6f11b7e 100644
--- a/src/Nethermind/Ethereum.Trie.Test/Ethereum.Trie.Test.csproj
+++ b/src/Nethermind/Ethereum.Trie.Test/Ethereum.Trie.Test.csproj
@@ -4,7 +4,7 @@
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/src/Nethermind/Ethereum.VM.Test/Ethereum.VM.Test.csproj b/src/Nethermind/Ethereum.VM.Test/Ethereum.VM.Test.csproj
index 2845074ea42..c0e63009ac5 100644
--- a/src/Nethermind/Ethereum.VM.Test/Ethereum.VM.Test.csproj
+++ b/src/Nethermind/Ethereum.VM.Test/Ethereum.VM.Test.csproj
@@ -4,7 +4,7 @@
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/src/Nethermind/Nethermind.Abi.Test/Nethermind.Abi.Test.csproj b/src/Nethermind/Nethermind.Abi.Test/Nethermind.Abi.Test.csproj
index 5f5434473d3..25b87f2c947 100644
--- a/src/Nethermind/Nethermind.Abi.Test/Nethermind.Abi.Test.csproj
+++ b/src/Nethermind/Nethermind.Abi.Test/Nethermind.Abi.Test.csproj
@@ -5,7 +5,7 @@
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/src/Nethermind/Nethermind.AccountAbstraction.Test/Nethermind.AccountAbstraction.Test.csproj b/src/Nethermind/Nethermind.AccountAbstraction.Test/Nethermind.AccountAbstraction.Test.csproj
index 57c7416365c..39005b40e29 100644
--- a/src/Nethermind/Nethermind.AccountAbstraction.Test/Nethermind.AccountAbstraction.Test.csproj
+++ b/src/Nethermind/Nethermind.AccountAbstraction.Test/Nethermind.AccountAbstraction.Test.csproj
@@ -22,8 +22,8 @@
-
+
diff --git a/src/Nethermind/Nethermind.AuRa.Test/Nethermind.AuRa.Test.csproj b/src/Nethermind/Nethermind.AuRa.Test/Nethermind.AuRa.Test.csproj
index 9e2d4900ca7..aa8bb0c1427 100644
--- a/src/Nethermind/Nethermind.AuRa.Test/Nethermind.AuRa.Test.csproj
+++ b/src/Nethermind/Nethermind.AuRa.Test/Nethermind.AuRa.Test.csproj
@@ -6,7 +6,7 @@
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/src/Nethermind/Nethermind.Benchmark.Runner/Nethermind.Benchmark.Runner.csproj b/src/Nethermind/Nethermind.Benchmark.Runner/Nethermind.Benchmark.Runner.csproj
index 6d8dae62d3e..743d1e25378 100644
--- a/src/Nethermind/Nethermind.Benchmark.Runner/Nethermind.Benchmark.Runner.csproj
+++ b/src/Nethermind/Nethermind.Benchmark.Runner/Nethermind.Benchmark.Runner.csproj
@@ -5,10 +5,6 @@
true
-
-
-
-
diff --git a/src/Nethermind/Nethermind.Blockchain.Test/Nethermind.Blockchain.Test.csproj b/src/Nethermind/Nethermind.Blockchain.Test/Nethermind.Blockchain.Test.csproj
index ddd9bbc5a82..a4aa0b53879 100644
--- a/src/Nethermind/Nethermind.Blockchain.Test/Nethermind.Blockchain.Test.csproj
+++ b/src/Nethermind/Nethermind.Blockchain.Test/Nethermind.Blockchain.Test.csproj
@@ -6,7 +6,7 @@
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
@@ -20,19 +20,13 @@
-
- {B1C9CF07-F89B-4F92-B8A5-F6949B9D3DA5}
- Nethermind.Blockchain
-
+
+
-
- {6BAD851C-B0A2-4DFE-A1F3-1C3A634C522B}
- Nethermind.Core.Test
-
+
-
diff --git a/src/Nethermind/Nethermind.Blockchain/Nethermind.Blockchain.csproj b/src/Nethermind/Nethermind.Blockchain/Nethermind.Blockchain.csproj
index 053506dd9c7..526614a0b31 100644
--- a/src/Nethermind/Nethermind.Blockchain/Nethermind.Blockchain.csproj
+++ b/src/Nethermind/Nethermind.Blockchain/Nethermind.Blockchain.csproj
@@ -16,8 +16,6 @@
-
-
diff --git a/src/Nethermind/Nethermind.Cli.Test/Nethermind.Cli.Test.csproj b/src/Nethermind/Nethermind.Cli.Test/Nethermind.Cli.Test.csproj
index 13aacbd10ef..3dc159082a2 100644
--- a/src/Nethermind/Nethermind.Cli.Test/Nethermind.Cli.Test.csproj
+++ b/src/Nethermind/Nethermind.Cli.Test/Nethermind.Cli.Test.csproj
@@ -5,7 +5,7 @@
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/src/Nethermind/Nethermind.Clique.Test/Nethermind.Clique.Test.csproj b/src/Nethermind/Nethermind.Clique.Test/Nethermind.Clique.Test.csproj
index 7af00f7d696..797c60d1345 100644
--- a/src/Nethermind/Nethermind.Clique.Test/Nethermind.Clique.Test.csproj
+++ b/src/Nethermind/Nethermind.Clique.Test/Nethermind.Clique.Test.csproj
@@ -5,7 +5,7 @@
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/src/Nethermind/Nethermind.Config.Test/Nethermind.Config.Test.csproj b/src/Nethermind/Nethermind.Config.Test/Nethermind.Config.Test.csproj
index cc10ee7e40d..e81ac159db0 100644
--- a/src/Nethermind/Nethermind.Config.Test/Nethermind.Config.Test.csproj
+++ b/src/Nethermind/Nethermind.Config.Test/Nethermind.Config.Test.csproj
@@ -4,7 +4,7 @@
enable
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/src/Nethermind/Nethermind.Consensus.Test/Nethermind.Consensus.Test.csproj b/src/Nethermind/Nethermind.Consensus.Test/Nethermind.Consensus.Test.csproj
index 6a42f854186..1ae4eaf97fd 100644
--- a/src/Nethermind/Nethermind.Consensus.Test/Nethermind.Consensus.Test.csproj
+++ b/src/Nethermind/Nethermind.Consensus.Test/Nethermind.Consensus.Test.csproj
@@ -1,7 +1,7 @@
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/src/Nethermind/Nethermind.Core.Test/Nethermind.Core.Test.csproj b/src/Nethermind/Nethermind.Core.Test/Nethermind.Core.Test.csproj
index ecc07c506ae..d277beb757b 100644
--- a/src/Nethermind/Nethermind.Core.Test/Nethermind.Core.Test.csproj
+++ b/src/Nethermind/Nethermind.Core.Test/Nethermind.Core.Test.csproj
@@ -5,7 +5,7 @@
enable
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
@@ -24,7 +24,6 @@
-
diff --git a/src/Nethermind/Nethermind.Crypto/Nethermind.Crypto.csproj b/src/Nethermind/Nethermind.Crypto/Nethermind.Crypto.csproj
index 23daf0a360e..0c5702026d5 100644
--- a/src/Nethermind/Nethermind.Crypto/Nethermind.Crypto.csproj
+++ b/src/Nethermind/Nethermind.Crypto/Nethermind.Crypto.csproj
@@ -13,7 +13,6 @@
-
diff --git a/src/Nethermind/Nethermind.Db.Rocks/Nethermind.Db.Rocks.csproj b/src/Nethermind/Nethermind.Db.Rocks/Nethermind.Db.Rocks.csproj
index 9c3dc1db1c0..82522e50654 100644
--- a/src/Nethermind/Nethermind.Db.Rocks/Nethermind.Db.Rocks.csproj
+++ b/src/Nethermind/Nethermind.Db.Rocks/Nethermind.Db.Rocks.csproj
@@ -16,7 +16,6 @@
-
diff --git a/src/Nethermind/Nethermind.Db.Rpc/Nethermind.Db.Rpc.csproj b/src/Nethermind/Nethermind.Db.Rpc/Nethermind.Db.Rpc.csproj
index 45983d3d9e5..abc149ac937 100644
--- a/src/Nethermind/Nethermind.Db.Rpc/Nethermind.Db.Rpc.csproj
+++ b/src/Nethermind/Nethermind.Db.Rpc/Nethermind.Db.Rpc.csproj
@@ -1,6 +1,5 @@
-
diff --git a/src/Nethermind/Nethermind.Db.Test/Nethermind.Db.Test.csproj b/src/Nethermind/Nethermind.Db.Test/Nethermind.Db.Test.csproj
index b39c8f60d29..9aca1473d3c 100644
--- a/src/Nethermind/Nethermind.Db.Test/Nethermind.Db.Test.csproj
+++ b/src/Nethermind/Nethermind.Db.Test/Nethermind.Db.Test.csproj
@@ -4,7 +4,7 @@
annotations
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/src/Nethermind/Nethermind.Db/Nethermind.Db.csproj b/src/Nethermind/Nethermind.Db/Nethermind.Db.csproj
index dcb4d59046a..9da055ad515 100644
--- a/src/Nethermind/Nethermind.Db/Nethermind.Db.csproj
+++ b/src/Nethermind/Nethermind.Db/Nethermind.Db.csproj
@@ -8,7 +8,4 @@
-
-
-
diff --git a/src/Nethermind/Nethermind.EthStats.Test/Nethermind.EthStats.Test.csproj b/src/Nethermind/Nethermind.EthStats.Test/Nethermind.EthStats.Test.csproj
index 76df1a2bc7b..0a24cf9e12d 100644
--- a/src/Nethermind/Nethermind.EthStats.Test/Nethermind.EthStats.Test.csproj
+++ b/src/Nethermind/Nethermind.EthStats.Test/Nethermind.EthStats.Test.csproj
@@ -5,7 +5,7 @@
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/src/Nethermind/Nethermind.Ethash.Test/Nethermind.Ethash.Test.csproj b/src/Nethermind/Nethermind.Ethash.Test/Nethermind.Ethash.Test.csproj
index 48b8647fc5c..bafc665bd12 100644
--- a/src/Nethermind/Nethermind.Ethash.Test/Nethermind.Ethash.Test.csproj
+++ b/src/Nethermind/Nethermind.Ethash.Test/Nethermind.Ethash.Test.csproj
@@ -5,7 +5,7 @@
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/src/Nethermind/Nethermind.Evm.Benchmark/Nethermind.Evm.Benchmark.csproj b/src/Nethermind/Nethermind.Evm.Benchmark/Nethermind.Evm.Benchmark.csproj
index ba6f323b232..3dad15dc282 100644
--- a/src/Nethermind/Nethermind.Evm.Benchmark/Nethermind.Evm.Benchmark.csproj
+++ b/src/Nethermind/Nethermind.Evm.Benchmark/Nethermind.Evm.Benchmark.csproj
@@ -2,7 +2,6 @@
-
diff --git a/src/Nethermind/Nethermind.Evm.Test/Nethermind.Evm.Test.csproj b/src/Nethermind/Nethermind.Evm.Test/Nethermind.Evm.Test.csproj
index 0d5a3c41ca6..86b59759dcc 100644
--- a/src/Nethermind/Nethermind.Evm.Test/Nethermind.Evm.Test.csproj
+++ b/src/Nethermind/Nethermind.Evm.Test/Nethermind.Evm.Test.csproj
@@ -5,7 +5,7 @@
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/src/Nethermind/Nethermind.Evm/Nethermind.Evm.csproj b/src/Nethermind/Nethermind.Evm/Nethermind.Evm.csproj
index 7933bea67e0..8f6c31d198f 100644
--- a/src/Nethermind/Nethermind.Evm/Nethermind.Evm.csproj
+++ b/src/Nethermind/Nethermind.Evm/Nethermind.Evm.csproj
@@ -6,12 +6,12 @@
+
+
-
-
diff --git a/src/Nethermind/Nethermind.Facade.Test/Nethermind.Facade.Test.csproj b/src/Nethermind/Nethermind.Facade.Test/Nethermind.Facade.Test.csproj
index 110733becfc..2a8cd6d9c0e 100644
--- a/src/Nethermind/Nethermind.Facade.Test/Nethermind.Facade.Test.csproj
+++ b/src/Nethermind/Nethermind.Facade.Test/Nethermind.Facade.Test.csproj
@@ -5,7 +5,7 @@
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/src/Nethermind/Nethermind.Facade/Nethermind.Facade.csproj b/src/Nethermind/Nethermind.Facade/Nethermind.Facade.csproj
index 9d3cf614a2b..2965849390b 100644
--- a/src/Nethermind/Nethermind.Facade/Nethermind.Facade.csproj
+++ b/src/Nethermind/Nethermind.Facade/Nethermind.Facade.csproj
@@ -8,9 +8,7 @@
-
-
diff --git a/src/Nethermind/Nethermind.HealthChecks.Test/Nethermind.HealthChecks.Test.csproj b/src/Nethermind/Nethermind.HealthChecks.Test/Nethermind.HealthChecks.Test.csproj
index be1fec5e5e9..4ea64850659 100644
--- a/src/Nethermind/Nethermind.HealthChecks.Test/Nethermind.HealthChecks.Test.csproj
+++ b/src/Nethermind/Nethermind.HealthChecks.Test/Nethermind.HealthChecks.Test.csproj
@@ -5,7 +5,7 @@
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
@@ -25,6 +25,7 @@
+
diff --git a/src/Nethermind/Nethermind.HealthChecks/Nethermind.HealthChecks.csproj b/src/Nethermind/Nethermind.HealthChecks/Nethermind.HealthChecks.csproj
index ab4b87433a6..304eb968ad0 100644
--- a/src/Nethermind/Nethermind.HealthChecks/Nethermind.HealthChecks.csproj
+++ b/src/Nethermind/Nethermind.HealthChecks/Nethermind.HealthChecks.csproj
@@ -3,10 +3,8 @@
-
-
diff --git a/src/Nethermind/Nethermind.Hive/Nethermind.Hive.csproj b/src/Nethermind/Nethermind.Hive/Nethermind.Hive.csproj
index b7f8e0e80d1..276b24d2554 100644
--- a/src/Nethermind/Nethermind.Hive/Nethermind.Hive.csproj
+++ b/src/Nethermind/Nethermind.Hive/Nethermind.Hive.csproj
@@ -4,10 +4,6 @@
enable
-
-
-
-
diff --git a/src/Nethermind/Nethermind.JsonRpc.Test/Nethermind.JsonRpc.Test.csproj b/src/Nethermind/Nethermind.JsonRpc.Test/Nethermind.JsonRpc.Test.csproj
index 6299240cf76..0d37deb6f08 100644
--- a/src/Nethermind/Nethermind.JsonRpc.Test/Nethermind.JsonRpc.Test.csproj
+++ b/src/Nethermind/Nethermind.JsonRpc.Test/Nethermind.JsonRpc.Test.csproj
@@ -5,7 +5,7 @@
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
@@ -20,8 +20,6 @@
-
-
{53D62515-72D1-4DEA-BC60-71BCC9C928E3}
diff --git a/src/Nethermind/Nethermind.JsonRpc/Nethermind.JsonRpc.csproj b/src/Nethermind/Nethermind.JsonRpc/Nethermind.JsonRpc.csproj
index d3e2a06964d..a7900f361f1 100644
--- a/src/Nethermind/Nethermind.JsonRpc/Nethermind.JsonRpc.csproj
+++ b/src/Nethermind/Nethermind.JsonRpc/Nethermind.JsonRpc.csproj
@@ -5,9 +5,7 @@
True
-
-
@@ -18,7 +16,6 @@
-
diff --git a/src/Nethermind/Nethermind.KeyStore.Test/Nethermind.KeyStore.Test.csproj b/src/Nethermind/Nethermind.KeyStore.Test/Nethermind.KeyStore.Test.csproj
index f042f676d49..bc2f923e03a 100644
--- a/src/Nethermind/Nethermind.KeyStore.Test/Nethermind.KeyStore.Test.csproj
+++ b/src/Nethermind/Nethermind.KeyStore.Test/Nethermind.KeyStore.Test.csproj
@@ -3,7 +3,7 @@
false
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/src/Nethermind/Nethermind.Logging.NLog.Test/Nethermind.Logging.NLog.Test.csproj b/src/Nethermind/Nethermind.Logging.NLog.Test/Nethermind.Logging.NLog.Test.csproj
index 052255a2359..fc5b9355a4e 100644
--- a/src/Nethermind/Nethermind.Logging.NLog.Test/Nethermind.Logging.NLog.Test.csproj
+++ b/src/Nethermind/Nethermind.Logging.NLog.Test/Nethermind.Logging.NLog.Test.csproj
@@ -5,7 +5,7 @@
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/src/Nethermind/Nethermind.Logging/Nethermind.Logging.csproj b/src/Nethermind/Nethermind.Logging/Nethermind.Logging.csproj
index d1c07288e96..6b512ec9245 100644
--- a/src/Nethermind/Nethermind.Logging/Nethermind.Logging.csproj
+++ b/src/Nethermind/Nethermind.Logging/Nethermind.Logging.csproj
@@ -1,7 +1 @@
-
-
-
-
-
-
-
+
diff --git a/src/Nethermind/Nethermind.Merge.AuRa.Test/Nethermind.Merge.AuRa.Test.csproj b/src/Nethermind/Nethermind.Merge.AuRa.Test/Nethermind.Merge.AuRa.Test.csproj
index 854ed31bf86..40bef72a3b7 100644
--- a/src/Nethermind/Nethermind.Merge.AuRa.Test/Nethermind.Merge.AuRa.Test.csproj
+++ b/src/Nethermind/Nethermind.Merge.AuRa.Test/Nethermind.Merge.AuRa.Test.csproj
@@ -18,6 +18,7 @@
+
diff --git a/src/Nethermind/Nethermind.Merge.Plugin.Test/Nethermind.Merge.Plugin.Test.csproj b/src/Nethermind/Nethermind.Merge.Plugin.Test/Nethermind.Merge.Plugin.Test.csproj
index 6a9b0e08905..b89fce1e281 100644
--- a/src/Nethermind/Nethermind.Merge.Plugin.Test/Nethermind.Merge.Plugin.Test.csproj
+++ b/src/Nethermind/Nethermind.Merge.Plugin.Test/Nethermind.Merge.Plugin.Test.csproj
@@ -6,7 +6,7 @@
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/src/Nethermind/Nethermind.Mining.Test/Nethermind.Mining.Test.csproj b/src/Nethermind/Nethermind.Mining.Test/Nethermind.Mining.Test.csproj
index 055f40ae8d9..2238d71fe1c 100644
--- a/src/Nethermind/Nethermind.Mining.Test/Nethermind.Mining.Test.csproj
+++ b/src/Nethermind/Nethermind.Mining.Test/Nethermind.Mining.Test.csproj
@@ -3,7 +3,7 @@
false
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/src/Nethermind/Nethermind.Monitoring/Nethermind.Monitoring.csproj b/src/Nethermind/Nethermind.Monitoring/Nethermind.Monitoring.csproj
index d8c8a5b1b50..82ce272b94d 100644
--- a/src/Nethermind/Nethermind.Monitoring/Nethermind.Monitoring.csproj
+++ b/src/Nethermind/Nethermind.Monitoring/Nethermind.Monitoring.csproj
@@ -1,15 +1,7 @@
-
+
-
- Library
- true
-
-
-
-
-
diff --git a/src/Nethermind/Nethermind.Network.Enr/Nethermind.Network.Enr.csproj b/src/Nethermind/Nethermind.Network.Enr/Nethermind.Network.Enr.csproj
index 817c2373bbd..24fcd5b1e3d 100644
--- a/src/Nethermind/Nethermind.Network.Enr/Nethermind.Network.Enr.csproj
+++ b/src/Nethermind/Nethermind.Network.Enr/Nethermind.Network.Enr.csproj
@@ -5,10 +5,6 @@
enable
-
-
-
-
diff --git a/src/Nethermind/Nethermind.Network.Stats/Nethermind.Network.Stats.csproj b/src/Nethermind/Nethermind.Network.Stats/Nethermind.Network.Stats.csproj
index 13ecd777382..92b83b4fb5b 100644
--- a/src/Nethermind/Nethermind.Network.Stats/Nethermind.Network.Stats.csproj
+++ b/src/Nethermind/Nethermind.Network.Stats/Nethermind.Network.Stats.csproj
@@ -7,12 +7,7 @@
-
-
-
-
-
diff --git a/src/Nethermind/Nethermind.Network.Test/Nethermind.Network.Test.csproj b/src/Nethermind/Nethermind.Network.Test/Nethermind.Network.Test.csproj
index 89aace460fe..53c6755be93 100644
--- a/src/Nethermind/Nethermind.Network.Test/Nethermind.Network.Test.csproj
+++ b/src/Nethermind/Nethermind.Network.Test/Nethermind.Network.Test.csproj
@@ -28,13 +28,12 @@
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
-
-
+
@@ -43,7 +42,6 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
-
diff --git a/src/Nethermind/Nethermind.Network/Nethermind.Network.csproj b/src/Nethermind/Nethermind.Network/Nethermind.Network.csproj
index 3a78d5c1a68..76c0c785d8c 100644
--- a/src/Nethermind/Nethermind.Network/Nethermind.Network.csproj
+++ b/src/Nethermind/Nethermind.Network/Nethermind.Network.csproj
@@ -7,19 +7,14 @@
-
-
-
-
-
diff --git a/src/Nethermind/Nethermind.Runner.Test/Nethermind.Runner.Test.csproj b/src/Nethermind/Nethermind.Runner.Test/Nethermind.Runner.Test.csproj
index bcb68a227ae..26b52154cab 100644
--- a/src/Nethermind/Nethermind.Runner.Test/Nethermind.Runner.Test.csproj
+++ b/src/Nethermind/Nethermind.Runner.Test/Nethermind.Runner.Test.csproj
@@ -5,7 +5,7 @@
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/src/Nethermind/Nethermind.Runner/Nethermind.Runner.csproj b/src/Nethermind/Nethermind.Runner/Nethermind.Runner.csproj
index 77757cff573..23463ef6ad5 100644
--- a/src/Nethermind/Nethermind.Runner/Nethermind.Runner.csproj
+++ b/src/Nethermind/Nethermind.Runner/Nethermind.Runner.csproj
@@ -11,8 +11,6 @@
true
true
1
-
- $(NoWarn);AD0001
@@ -22,22 +20,11 @@
-
-
-
-
-
-
-
-
-
-
-
@@ -47,30 +34,29 @@
-
+
+
+
-
+
+
-
-
-
+
+
+
+
-
-
-
-
-
diff --git a/src/Nethermind/Nethermind.Serialization.Json/Nethermind.Serialization.Json.csproj b/src/Nethermind/Nethermind.Serialization.Json/Nethermind.Serialization.Json.csproj
index ee58e74ddc3..28c5578b12f 100644
--- a/src/Nethermind/Nethermind.Serialization.Json/Nethermind.Serialization.Json.csproj
+++ b/src/Nethermind/Nethermind.Serialization.Json/Nethermind.Serialization.Json.csproj
@@ -6,7 +6,6 @@
-
diff --git a/src/Nethermind/Nethermind.Serialization.Ssz.Test/Nethermind.Serialization.Ssz.Test.csproj b/src/Nethermind/Nethermind.Serialization.Ssz.Test/Nethermind.Serialization.Ssz.Test.csproj
index c04f8248d8e..6055d364c59 100644
--- a/src/Nethermind/Nethermind.Serialization.Ssz.Test/Nethermind.Serialization.Ssz.Test.csproj
+++ b/src/Nethermind/Nethermind.Serialization.Ssz.Test/Nethermind.Serialization.Ssz.Test.csproj
@@ -6,7 +6,7 @@
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/src/Nethermind/Nethermind.Serialization.Ssz/Nethermind.Serialization.Ssz.csproj b/src/Nethermind/Nethermind.Serialization.Ssz/Nethermind.Serialization.Ssz.csproj
index 274f06491b9..52082fafa10 100644
--- a/src/Nethermind/Nethermind.Serialization.Ssz/Nethermind.Serialization.Ssz.csproj
+++ b/src/Nethermind/Nethermind.Serialization.Ssz/Nethermind.Serialization.Ssz.csproj
@@ -5,10 +5,6 @@
enable
-
-
-
-
diff --git a/src/Nethermind/Nethermind.Sockets.Test/Nethermind.Sockets.Test.csproj b/src/Nethermind/Nethermind.Sockets.Test/Nethermind.Sockets.Test.csproj
index d2f2c196d83..f5db2a3e89d 100644
--- a/src/Nethermind/Nethermind.Sockets.Test/Nethermind.Sockets.Test.csproj
+++ b/src/Nethermind/Nethermind.Sockets.Test/Nethermind.Sockets.Test.csproj
@@ -5,7 +5,7 @@
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
@@ -17,7 +17,6 @@
-
diff --git a/src/Nethermind/Nethermind.Sockets/Extensions.cs b/src/Nethermind/Nethermind.Sockets/Extensions.cs
index 615963e7c8c..9496161195b 100644
--- a/src/Nethermind/Nethermind.Sockets/Extensions.cs
+++ b/src/Nethermind/Nethermind.Sockets/Extensions.cs
@@ -4,9 +4,7 @@
using System;
using System.Linq;
using System.Net.WebSockets;
-using System.Threading.Tasks;
using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Primitives;
using Nethermind.Logging;
@@ -25,7 +23,7 @@ public static void UseWebSocketsModules(this IApplicationBuilder app)
logger = scope.ServiceProvider.GetService()?.GetClassLogger();
}
- app.Use(async (HttpContext context, Func next) =>
+ app.Run(async (context) =>
{
string id = string.Empty;
string clientName = string.Empty;
diff --git a/src/Nethermind/Nethermind.Sockets/Nethermind.Sockets.csproj b/src/Nethermind/Nethermind.Sockets/Nethermind.Sockets.csproj
index bbcf655c05a..e83063c895c 100644
--- a/src/Nethermind/Nethermind.Sockets/Nethermind.Sockets.csproj
+++ b/src/Nethermind/Nethermind.Sockets/Nethermind.Sockets.csproj
@@ -1,9 +1,7 @@
-
+
enable
- Library
- true
@@ -13,7 +11,7 @@
-
+
diff --git a/src/Nethermind/Nethermind.State.Test/Nethermind.State.Test.csproj b/src/Nethermind/Nethermind.State.Test/Nethermind.State.Test.csproj
index d622a9a18fe..3b93b491b8b 100644
--- a/src/Nethermind/Nethermind.State.Test/Nethermind.State.Test.csproj
+++ b/src/Nethermind/Nethermind.State.Test/Nethermind.State.Test.csproj
@@ -5,7 +5,7 @@
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/src/Nethermind/Nethermind.State/Nethermind.State.csproj b/src/Nethermind/Nethermind.State/Nethermind.State.csproj
index 111e6b6570f..44bc806511d 100644
--- a/src/Nethermind/Nethermind.State/Nethermind.State.csproj
+++ b/src/Nethermind/Nethermind.State/Nethermind.State.csproj
@@ -7,7 +7,6 @@
-
diff --git a/src/Nethermind/Nethermind.Synchronization.Test/Nethermind.Synchronization.Test.csproj b/src/Nethermind/Nethermind.Synchronization.Test/Nethermind.Synchronization.Test.csproj
index bd422313c8e..adc3e797f41 100644
--- a/src/Nethermind/Nethermind.Synchronization.Test/Nethermind.Synchronization.Test.csproj
+++ b/src/Nethermind/Nethermind.Synchronization.Test/Nethermind.Synchronization.Test.csproj
@@ -6,7 +6,7 @@
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
@@ -20,7 +20,6 @@
-
diff --git a/src/Nethermind/Nethermind.Synchronization/Nethermind.Synchronization.csproj b/src/Nethermind/Nethermind.Synchronization/Nethermind.Synchronization.csproj
index 2768aa316a8..ee7087d2c59 100644
--- a/src/Nethermind/Nethermind.Synchronization/Nethermind.Synchronization.csproj
+++ b/src/Nethermind/Nethermind.Synchronization/Nethermind.Synchronization.csproj
@@ -13,7 +13,6 @@
-
diff --git a/src/Nethermind/Nethermind.Trie.Test/Nethermind.Trie.Test.csproj b/src/Nethermind/Nethermind.Trie.Test/Nethermind.Trie.Test.csproj
index 8b08031475d..e6e63e1ef27 100644
--- a/src/Nethermind/Nethermind.Trie.Test/Nethermind.Trie.Test.csproj
+++ b/src/Nethermind/Nethermind.Trie.Test/Nethermind.Trie.Test.csproj
@@ -6,7 +6,7 @@
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/src/Nethermind/Nethermind.TxPool.Test/Nethermind.TxPool.Test.csproj b/src/Nethermind/Nethermind.TxPool.Test/Nethermind.TxPool.Test.csproj
index b026f63b041..4c0c9ed8aa4 100644
--- a/src/Nethermind/Nethermind.TxPool.Test/Nethermind.TxPool.Test.csproj
+++ b/src/Nethermind/Nethermind.TxPool.Test/Nethermind.TxPool.Test.csproj
@@ -20,6 +20,7 @@
+
diff --git a/src/Nethermind/Nethermind.TxPool/Nethermind.TxPool.csproj b/src/Nethermind/Nethermind.TxPool/Nethermind.TxPool.csproj
index 18860f2000f..00cf44d7b69 100644
--- a/src/Nethermind/Nethermind.TxPool/Nethermind.TxPool.csproj
+++ b/src/Nethermind/Nethermind.TxPool/Nethermind.TxPool.csproj
@@ -11,8 +11,4 @@
-
-
-
-
diff --git a/src/Nethermind/Nethermind.Wallet.Test/Nethermind.Wallet.Test.csproj b/src/Nethermind/Nethermind.Wallet.Test/Nethermind.Wallet.Test.csproj
index 7cb3151fd7e..aa9dda80b82 100644
--- a/src/Nethermind/Nethermind.Wallet.Test/Nethermind.Wallet.Test.csproj
+++ b/src/Nethermind/Nethermind.Wallet.Test/Nethermind.Wallet.Test.csproj
@@ -6,7 +6,7 @@
Off
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/src/Nethermind/Nethermind.Wallet/Nethermind.Wallet.csproj b/src/Nethermind/Nethermind.Wallet/Nethermind.Wallet.csproj
index 8ed4ebfdb7c..8eb97a95d9c 100644
--- a/src/Nethermind/Nethermind.Wallet/Nethermind.Wallet.csproj
+++ b/src/Nethermind/Nethermind.Wallet/Nethermind.Wallet.csproj
@@ -5,8 +5,4 @@
-
-
-
-
diff --git a/src/Nethermind/Nethermind.sln b/src/Nethermind/Nethermind.sln
index 395531b2b64..87f05329dfb 100644
--- a/src/Nethermind/Nethermind.sln
+++ b/src/Nethermind/Nethermind.sln
@@ -205,12 +205,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UPnP", "UPnP", "{2EDE2554-5
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Nethermind.UPnP.Plugin", "Nethermind.UPnP.Plugin\Nethermind.UPnP.Plugin.csproj", "{48E50409-26FE-4FD8-AF6E-2A0E79F794CE}"
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{0E0F75A7-A03F-4D66-910B-17DB659A33E3}"
- ProjectSection(SolutionItems) = preProject
- Directory.Build.props = Directory.Build.props
- Directory.Packages.props = Directory.Packages.props
- EndProjectSection
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Nethermind.Serialization.Ssz.Test", "Nethermind.Serialization.Ssz.Test\Nethermind.Serialization.Ssz.Test.csproj", "{E1E7BEFC-52C0-49ED-B0A7-CB8C3250D120}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Nethermind.Merkleization", "Nethermind.Merkleization\Nethermind.Merkleization.csproj", "{E5001E79-6562-4EC4-9000-4C70DF95DF00}"
@@ -223,6 +217,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Nethermind.Optimism", "Neth
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Nethermind.Init.Snapshot", "Nethermind.Init.Snapshot\Nethermind.Init.Snapshot.csproj", "{AD09FBCB-5496-499B-9129-B6D139A65B6F}"
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{06E9C864-638E-4DB4-B40B-F73475EA0449}"
+ ProjectSection(SolutionItems) = preProject
+ Directory.Build.props = Directory.Build.props
+ Directory.Packages.props = Directory.Packages.props
+ nuget.config = nuget.config
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU