diff --git a/src/Blockcore/Blockcore.csproj b/src/Blockcore/Blockcore.csproj
index e28918399..9830c2961 100644
--- a/src/Blockcore/Blockcore.csproj
+++ b/src/Blockcore/Blockcore.csproj
@@ -27,9 +27,9 @@
-
+
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/src/Features/Blockcore.Features.BlockStore/Blockcore.Features.BlockStore.csproj b/src/Features/Blockcore.Features.BlockStore/Blockcore.Features.BlockStore.csproj
index a7db8af00..f80e8a0c9 100644
--- a/src/Features/Blockcore.Features.BlockStore/Blockcore.Features.BlockStore.csproj
+++ b/src/Features/Blockcore.Features.BlockStore/Blockcore.Features.BlockStore.csproj
@@ -9,7 +9,7 @@
true
-
+
all
diff --git a/src/Features/Blockcore.Features.ColdStaking/Blockcore.Features.ColdStaking.csproj b/src/Features/Blockcore.Features.ColdStaking/Blockcore.Features.ColdStaking.csproj
index 0a2041d39..29f99559f 100644
--- a/src/Features/Blockcore.Features.ColdStaking/Blockcore.Features.ColdStaking.csproj
+++ b/src/Features/Blockcore.Features.ColdStaking/Blockcore.Features.ColdStaking.csproj
@@ -14,7 +14,7 @@
-
+
all
diff --git a/src/Features/Blockcore.Features.Miner/Blockcore.Features.Miner.csproj b/src/Features/Blockcore.Features.Miner/Blockcore.Features.Miner.csproj
index bbd23358d..195bc87e5 100644
--- a/src/Features/Blockcore.Features.Miner/Blockcore.Features.Miner.csproj
+++ b/src/Features/Blockcore.Features.Miner/Blockcore.Features.Miner.csproj
@@ -24,7 +24,7 @@
-
+
all
diff --git a/src/Features/Blockcore.Features.NodeHost/Blockcore.Features.NodeHost.csproj b/src/Features/Blockcore.Features.NodeHost/Blockcore.Features.NodeHost.csproj
index cee021365..498aaa959 100644
--- a/src/Features/Blockcore.Features.NodeHost/Blockcore.Features.NodeHost.csproj
+++ b/src/Features/Blockcore.Features.NodeHost/Blockcore.Features.NodeHost.csproj
@@ -16,13 +16,13 @@
-
-
+
+
-
-
-
-
+
+
+
+
all
diff --git a/src/Features/Blockcore.Features.RPC/Blockcore.Features.RPC.csproj b/src/Features/Blockcore.Features.RPC/Blockcore.Features.RPC.csproj
index b679156d3..20f125270 100644
--- a/src/Features/Blockcore.Features.RPC/Blockcore.Features.RPC.csproj
+++ b/src/Features/Blockcore.Features.RPC/Blockcore.Features.RPC.csproj
@@ -8,9 +8,9 @@
true
-
+
-
+
all
diff --git a/src/Features/Blockcore.Features.Wallet/Blockcore.Features.Wallet.csproj b/src/Features/Blockcore.Features.Wallet/Blockcore.Features.Wallet.csproj
index 21c1bf083..509c6bc4c 100644
--- a/src/Features/Blockcore.Features.Wallet/Blockcore.Features.Wallet.csproj
+++ b/src/Features/Blockcore.Features.Wallet/Blockcore.Features.Wallet.csproj
@@ -15,8 +15,8 @@
-->
-
-
+
+
all
diff --git a/src/Features/Blockcore.Features.WalletWatchOnly/Blockcore.Features.WalletWatchOnly.csproj b/src/Features/Blockcore.Features.WalletWatchOnly/Blockcore.Features.WalletWatchOnly.csproj
index 14ad92985..205d13795 100644
--- a/src/Features/Blockcore.Features.WalletWatchOnly/Blockcore.Features.WalletWatchOnly.csproj
+++ b/src/Features/Blockcore.Features.WalletWatchOnly/Blockcore.Features.WalletWatchOnly.csproj
@@ -7,7 +7,7 @@
False
-
+
all
diff --git a/src/Features/Persistence/Blockcore.Features.BlockStore.Persistence.LevelDb/Blockcore.Features.BlockStore.Persistence.LevelDb.csproj b/src/Features/Persistence/Blockcore.Features.BlockStore.Persistence.LevelDb/Blockcore.Features.BlockStore.Persistence.LevelDb.csproj
index a42ff43e1..8a2fb39c0 100644
--- a/src/Features/Persistence/Blockcore.Features.BlockStore.Persistence.LevelDb/Blockcore.Features.BlockStore.Persistence.LevelDb.csproj
+++ b/src/Features/Persistence/Blockcore.Features.BlockStore.Persistence.LevelDb/Blockcore.Features.BlockStore.Persistence.LevelDb.csproj
@@ -19,7 +19,7 @@
-
+
all
diff --git a/src/Features/Persistence/Blockcore.Features.BlockStore.Persistence.RocksDb/Blockcore.Features.BlockStore.Persistence.RocksDb.csproj b/src/Features/Persistence/Blockcore.Features.BlockStore.Persistence.RocksDb/Blockcore.Features.BlockStore.Persistence.RocksDb.csproj
index 1a42cc0b1..d25134ff0 100644
--- a/src/Features/Persistence/Blockcore.Features.BlockStore.Persistence.RocksDb/Blockcore.Features.BlockStore.Persistence.RocksDb.csproj
+++ b/src/Features/Persistence/Blockcore.Features.BlockStore.Persistence.RocksDb/Blockcore.Features.BlockStore.Persistence.RocksDb.csproj
@@ -19,7 +19,7 @@
-
+
all
diff --git a/src/Features/Persistence/Blockcore.Features.Persistence.LevelDb.CorePackage/Blockcore.Features.Persistence.LevelDb.CorePackage.csproj b/src/Features/Persistence/Blockcore.Features.Persistence.LevelDb.CorePackage/Blockcore.Features.Persistence.LevelDb.CorePackage.csproj
index 7a89a91af..7a94ac08b 100644
--- a/src/Features/Persistence/Blockcore.Features.Persistence.LevelDb.CorePackage/Blockcore.Features.Persistence.LevelDb.CorePackage.csproj
+++ b/src/Features/Persistence/Blockcore.Features.Persistence.LevelDb.CorePackage/Blockcore.Features.Persistence.LevelDb.CorePackage.csproj
@@ -19,7 +19,7 @@
-
+
all
diff --git a/src/Features/Persistence/Blockcore.Features.Persistence.Rocksdb.CorePackage/Blockcore.Features.Persistence.Rocksdb.CorePackage.csproj b/src/Features/Persistence/Blockcore.Features.Persistence.Rocksdb.CorePackage/Blockcore.Features.Persistence.Rocksdb.CorePackage.csproj
index 9af643bd9..3183f88f0 100644
--- a/src/Features/Persistence/Blockcore.Features.Persistence.Rocksdb.CorePackage/Blockcore.Features.Persistence.Rocksdb.CorePackage.csproj
+++ b/src/Features/Persistence/Blockcore.Features.Persistence.Rocksdb.CorePackage/Blockcore.Features.Persistence.Rocksdb.CorePackage.csproj
@@ -19,7 +19,7 @@
-
+
all
diff --git a/src/Networks/Blockcore.Networks.HomeCoin/Blockcore.Networks.HomeCoin.csproj b/src/Networks/Blockcore.Networks.HomeCoin/Blockcore.Networks.HomeCoin.csproj
index 0ad3dd79f..b93c2bd37 100644
--- a/src/Networks/Blockcore.Networks.HomeCoin/Blockcore.Networks.HomeCoin.csproj
+++ b/src/Networks/Blockcore.Networks.HomeCoin/Blockcore.Networks.HomeCoin.csproj
@@ -31,7 +31,7 @@
-
+
all
diff --git a/src/Networks/Blockcore.Networks.X1/Blockcore.Networks.X1.csproj b/src/Networks/Blockcore.Networks.X1/Blockcore.Networks.X1.csproj
index 1a6d4ef89..8bb1a1df8 100644
--- a/src/Networks/Blockcore.Networks.X1/Blockcore.Networks.X1.csproj
+++ b/src/Networks/Blockcore.Networks.X1/Blockcore.Networks.X1.csproj
@@ -23,7 +23,7 @@
-
+
all
diff --git a/src/Networks/Blockcore.Networks.x42/Blockcore.Networks.x42.csproj b/src/Networks/Blockcore.Networks.x42/Blockcore.Networks.x42.csproj
index 62d273fa7..7ffed7844 100644
--- a/src/Networks/Blockcore.Networks.x42/Blockcore.Networks.x42.csproj
+++ b/src/Networks/Blockcore.Networks.x42/Blockcore.Networks.x42.csproj
@@ -27,7 +27,7 @@
-
+
all
diff --git a/src/Node/Blockcore.Node/Blockcore.Node.csproj b/src/Node/Blockcore.Node/Blockcore.Node.csproj
index 4ac71296b..48cc199d1 100644
--- a/src/Node/Blockcore.Node/Blockcore.Node.csproj
+++ b/src/Node/Blockcore.Node/Blockcore.Node.csproj
@@ -38,7 +38,7 @@
-
+
all
diff --git a/src/Tests/Blockcore.Features.BlockStore.Tests/Blockcore.Features.BlockStore.Tests.csproj b/src/Tests/Blockcore.Features.BlockStore.Tests/Blockcore.Features.BlockStore.Tests.csproj
index decb4927c..bbc878368 100644
--- a/src/Tests/Blockcore.Features.BlockStore.Tests/Blockcore.Features.BlockStore.Tests.csproj
+++ b/src/Tests/Blockcore.Features.BlockStore.Tests/Blockcore.Features.BlockStore.Tests.csproj
@@ -17,7 +17,7 @@
-
+
all
runtime; build; native; contentfiles; analyzers
diff --git a/src/Tests/Blockcore.Features.ColdStaking.Tests/Blockcore.Features.ColdStaking.Tests.csproj b/src/Tests/Blockcore.Features.ColdStaking.Tests/Blockcore.Features.ColdStaking.Tests.csproj
index d8fd5fd00..6bddbf3a6 100644
--- a/src/Tests/Blockcore.Features.ColdStaking.Tests/Blockcore.Features.ColdStaking.Tests.csproj
+++ b/src/Tests/Blockcore.Features.ColdStaking.Tests/Blockcore.Features.ColdStaking.Tests.csproj
@@ -17,7 +17,7 @@
-
+
all
runtime; build; native; contentfiles; analyzers
diff --git a/src/Tests/Blockcore.Features.Consensus.Tests/Blockcore.Features.Consensus.Tests.csproj b/src/Tests/Blockcore.Features.Consensus.Tests/Blockcore.Features.Consensus.Tests.csproj
index 999a09dff..8b5804856 100644
--- a/src/Tests/Blockcore.Features.Consensus.Tests/Blockcore.Features.Consensus.Tests.csproj
+++ b/src/Tests/Blockcore.Features.Consensus.Tests/Blockcore.Features.Consensus.Tests.csproj
@@ -17,7 +17,7 @@
-
+
all
runtime; build; native; contentfiles; analyzers
diff --git a/src/Tests/Blockcore.Features.Dns.Tests/Blockcore.Features.Dns.Tests.csproj b/src/Tests/Blockcore.Features.Dns.Tests/Blockcore.Features.Dns.Tests.csproj
index cc15c514e..9afddbc46 100644
--- a/src/Tests/Blockcore.Features.Dns.Tests/Blockcore.Features.Dns.Tests.csproj
+++ b/src/Tests/Blockcore.Features.Dns.Tests/Blockcore.Features.Dns.Tests.csproj
@@ -17,13 +17,13 @@
-
+
all
runtime; build; native; contentfiles; analyzers
-
+
diff --git a/src/Tests/Blockcore.Features.MemoryPool.Tests/Blockcore.Features.MemoryPool.Tests.csproj b/src/Tests/Blockcore.Features.MemoryPool.Tests/Blockcore.Features.MemoryPool.Tests.csproj
index 31f478d17..8d9569066 100644
--- a/src/Tests/Blockcore.Features.MemoryPool.Tests/Blockcore.Features.MemoryPool.Tests.csproj
+++ b/src/Tests/Blockcore.Features.MemoryPool.Tests/Blockcore.Features.MemoryPool.Tests.csproj
@@ -18,7 +18,7 @@
-
+
all
runtime; build; native; contentfiles; analyzers
diff --git a/src/Tests/Blockcore.Features.Miner.Tests/Blockcore.Features.Miner.Tests.csproj b/src/Tests/Blockcore.Features.Miner.Tests/Blockcore.Features.Miner.Tests.csproj
index 1d25b99d1..0bda35f08 100644
--- a/src/Tests/Blockcore.Features.Miner.Tests/Blockcore.Features.Miner.Tests.csproj
+++ b/src/Tests/Blockcore.Features.Miner.Tests/Blockcore.Features.Miner.Tests.csproj
@@ -12,7 +12,7 @@
-
+
all
runtime; build; native; contentfiles; analyzers
diff --git a/src/Tests/Blockcore.Features.NodeHost.Tests/Blockcore.Features.NodeHost.Tests.csproj b/src/Tests/Blockcore.Features.NodeHost.Tests/Blockcore.Features.NodeHost.Tests.csproj
index d8778bcec..a338b40bc 100644
--- a/src/Tests/Blockcore.Features.NodeHost.Tests/Blockcore.Features.NodeHost.Tests.csproj
+++ b/src/Tests/Blockcore.Features.NodeHost.Tests/Blockcore.Features.NodeHost.Tests.csproj
@@ -7,12 +7,12 @@
-
+
all
runtime; build; native; contentfiles; analyzers
-
+
diff --git a/src/Tests/Blockcore.Features.Notifications.Tests/Blockcore.Features.Notifications.Tests.csproj b/src/Tests/Blockcore.Features.Notifications.Tests/Blockcore.Features.Notifications.Tests.csproj
index 4df24951e..0b6523d63 100644
--- a/src/Tests/Blockcore.Features.Notifications.Tests/Blockcore.Features.Notifications.Tests.csproj
+++ b/src/Tests/Blockcore.Features.Notifications.Tests/Blockcore.Features.Notifications.Tests.csproj
@@ -12,7 +12,7 @@
-
+
all
runtime; build; native; contentfiles; analyzers
diff --git a/src/Tests/Blockcore.Features.PoA.Tests/Blockcore.Features.PoA.Tests.csproj b/src/Tests/Blockcore.Features.PoA.Tests/Blockcore.Features.PoA.Tests.csproj
index 5a2cf295e..bff7d2dc1 100644
--- a/src/Tests/Blockcore.Features.PoA.Tests/Blockcore.Features.PoA.Tests.csproj
+++ b/src/Tests/Blockcore.Features.PoA.Tests/Blockcore.Features.PoA.Tests.csproj
@@ -5,7 +5,7 @@
-
+
all
diff --git a/src/Tests/Blockcore.Features.RPC.Tests/Blockcore.Features.RPC.Tests.csproj b/src/Tests/Blockcore.Features.RPC.Tests/Blockcore.Features.RPC.Tests.csproj
index 8ea5c2333..8e6ecbc89 100644
--- a/src/Tests/Blockcore.Features.RPC.Tests/Blockcore.Features.RPC.Tests.csproj
+++ b/src/Tests/Blockcore.Features.RPC.Tests/Blockcore.Features.RPC.Tests.csproj
@@ -18,7 +18,7 @@
-
+
all
runtime; build; native; contentfiles; analyzers
diff --git a/src/Tests/Blockcore.Features.Wallet.Tests/Blockcore.Features.Wallet.Tests.csproj b/src/Tests/Blockcore.Features.Wallet.Tests/Blockcore.Features.Wallet.Tests.csproj
index 168dee269..52df95844 100644
--- a/src/Tests/Blockcore.Features.Wallet.Tests/Blockcore.Features.Wallet.Tests.csproj
+++ b/src/Tests/Blockcore.Features.Wallet.Tests/Blockcore.Features.Wallet.Tests.csproj
@@ -19,7 +19,7 @@
-
+
all
runtime; build; native; contentfiles; analyzers
diff --git a/src/Tests/Blockcore.Features.WalletWatchOnly.Tests/Blockcore.Features.WalletWatchOnly.Tests.csproj b/src/Tests/Blockcore.Features.WalletWatchOnly.Tests/Blockcore.Features.WalletWatchOnly.Tests.csproj
index cbfc2d419..d42553c28 100644
--- a/src/Tests/Blockcore.Features.WalletWatchOnly.Tests/Blockcore.Features.WalletWatchOnly.Tests.csproj
+++ b/src/Tests/Blockcore.Features.WalletWatchOnly.Tests/Blockcore.Features.WalletWatchOnly.Tests.csproj
@@ -12,7 +12,7 @@
-
+
all
runtime; build; native; contentfiles; analyzers
diff --git a/src/Tests/Blockcore.IntegrationTests/Blockcore.IntegrationTests.csproj b/src/Tests/Blockcore.IntegrationTests/Blockcore.IntegrationTests.csproj
index 5e0e6e023..045c3ebf6 100644
--- a/src/Tests/Blockcore.IntegrationTests/Blockcore.IntegrationTests.csproj
+++ b/src/Tests/Blockcore.IntegrationTests/Blockcore.IntegrationTests.csproj
@@ -23,10 +23,10 @@
-
+
-
+
@@ -51,7 +51,7 @@
-
+
all
runtime; build; native; contentfiles; analyzers
diff --git a/src/Tests/Blockcore.Tests.Common/Blockcore.Tests.Common.csproj b/src/Tests/Blockcore.Tests.Common/Blockcore.Tests.Common.csproj
index 0c6f733cc..be99a5a84 100644
--- a/src/Tests/Blockcore.Tests.Common/Blockcore.Tests.Common.csproj
+++ b/src/Tests/Blockcore.Tests.Common/Blockcore.Tests.Common.csproj
@@ -9,9 +9,9 @@
-
+
-
+
all
runtime; build; native; contentfiles; analyzers
diff --git a/src/Tests/Blockcore.Tests/Blockcore.Tests.csproj b/src/Tests/Blockcore.Tests/Blockcore.Tests.csproj
index 77366539f..a8c283e55 100644
--- a/src/Tests/Blockcore.Tests/Blockcore.Tests.csproj
+++ b/src/Tests/Blockcore.Tests/Blockcore.Tests.csproj
@@ -18,7 +18,7 @@
-
+
all
runtime; build; native; contentfiles; analyzers