diff --git a/Adaptors/Amqp/src/ArmoniK.Core.Adapters.Amqp.csproj b/Adaptors/Amqp/src/ArmoniK.Core.Adapters.Amqp.csproj
index b92ef0522..438cb9f98 100644
--- a/Adaptors/Amqp/src/ArmoniK.Core.Adapters.Amqp.csproj
+++ b/Adaptors/Amqp/src/ArmoniK.Core.Adapters.Amqp.csproj
@@ -26,12 +26,12 @@
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
false
runtime
diff --git a/Adaptors/Embed/src/ArmoniK.Core.Adapters.Embed.csproj b/Adaptors/Embed/src/ArmoniK.Core.Adapters.Embed.csproj
index bd9061c07..2554b66aa 100644
--- a/Adaptors/Embed/src/ArmoniK.Core.Adapters.Embed.csproj
+++ b/Adaptors/Embed/src/ArmoniK.Core.Adapters.Embed.csproj
@@ -25,17 +25,17 @@
-
+
runtime
-
+
false
runtime
-
+
runtime
-
+
runtime
diff --git a/Adaptors/Embed/tests/ArmoniK.Core.Adapters.Embed.Tests.csproj b/Adaptors/Embed/tests/ArmoniK.Core.Adapters.Embed.Tests.csproj
index ddc8c4251..0962db1ba 100644
--- a/Adaptors/Embed/tests/ArmoniK.Core.Adapters.Embed.Tests.csproj
+++ b/Adaptors/Embed/tests/ArmoniK.Core.Adapters.Embed.Tests.csproj
@@ -11,9 +11,9 @@
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
-
+
+
+
diff --git a/Adaptors/Gcs/src/ArmoniK.Core.Adapters.Gcs.csproj b/Adaptors/Gcs/src/ArmoniK.Core.Adapters.Gcs.csproj
index 1ebc963ec..eea180972 100644
--- a/Adaptors/Gcs/src/ArmoniK.Core.Adapters.Gcs.csproj
+++ b/Adaptors/Gcs/src/ArmoniK.Core.Adapters.Gcs.csproj
@@ -17,21 +17,21 @@
runtime
-
+
-
+
runtime
-
+
false
runtime
-
+
runtime
-
+
runtime
diff --git a/Adaptors/Gcs/tests/ArmoniK.Core.Adapters.Gcs.Tests.csproj b/Adaptors/Gcs/tests/ArmoniK.Core.Adapters.Gcs.Tests.csproj
index 2104867ad..15765971d 100644
--- a/Adaptors/Gcs/tests/ArmoniK.Core.Adapters.Gcs.Tests.csproj
+++ b/Adaptors/Gcs/tests/ArmoniK.Core.Adapters.Gcs.Tests.csproj
@@ -12,14 +12,14 @@
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
-
-
+
+
+
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/Adaptors/LocalStorage/tests/ArmoniK.Core.Adapters.LocalStorage.Tests.csproj b/Adaptors/LocalStorage/tests/ArmoniK.Core.Adapters.LocalStorage.Tests.csproj
index a446a36a4..d8015b350 100644
--- a/Adaptors/LocalStorage/tests/ArmoniK.Core.Adapters.LocalStorage.Tests.csproj
+++ b/Adaptors/LocalStorage/tests/ArmoniK.Core.Adapters.LocalStorage.Tests.csproj
@@ -11,9 +11,9 @@
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
-
+
+
+
diff --git a/Adaptors/Memory/tests/ArmoniK.Core.Adapters.Memory.Tests.csproj b/Adaptors/Memory/tests/ArmoniK.Core.Adapters.Memory.Tests.csproj
index aa0ba458c..ab944676f 100644
--- a/Adaptors/Memory/tests/ArmoniK.Core.Adapters.Memory.Tests.csproj
+++ b/Adaptors/Memory/tests/ArmoniK.Core.Adapters.Memory.Tests.csproj
@@ -18,9 +18,9 @@
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
-
+
+
+
diff --git a/Adaptors/MongoDB/src/ArmoniK.Core.Adapters.MongoDB.csproj b/Adaptors/MongoDB/src/ArmoniK.Core.Adapters.MongoDB.csproj
index eb0ad2976..4afdf0300 100644
--- a/Adaptors/MongoDB/src/ArmoniK.Core.Adapters.MongoDB.csproj
+++ b/Adaptors/MongoDB/src/ArmoniK.Core.Adapters.MongoDB.csproj
@@ -32,9 +32,9 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
-
+
diff --git a/Adaptors/MongoDB/tests/ArmoniK.Core.Adapters.MongoDB.Tests.csproj b/Adaptors/MongoDB/tests/ArmoniK.Core.Adapters.MongoDB.Tests.csproj
index 4dd3a3168..5c7d22ca5 100644
--- a/Adaptors/MongoDB/tests/ArmoniK.Core.Adapters.MongoDB.Tests.csproj
+++ b/Adaptors/MongoDB/tests/ArmoniK.Core.Adapters.MongoDB.Tests.csproj
@@ -11,9 +11,9 @@
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
-
+
+
+
diff --git a/Adaptors/Nats/src/ArmoniK.Core.Adapters.Nats.csproj b/Adaptors/Nats/src/ArmoniK.Core.Adapters.Nats.csproj
index 82a7985ad..67855f3f3 100644
--- a/Adaptors/Nats/src/ArmoniK.Core.Adapters.Nats.csproj
+++ b/Adaptors/Nats/src/ArmoniK.Core.Adapters.Nats.csproj
@@ -33,8 +33,8 @@
-
-
+
+
diff --git a/Adaptors/NullStorage/src/ArmoniK.Core.Adapters.NullStorage.csproj b/Adaptors/NullStorage/src/ArmoniK.Core.Adapters.NullStorage.csproj
index aed5533b7..1920b5804 100644
--- a/Adaptors/NullStorage/src/ArmoniK.Core.Adapters.NullStorage.csproj
+++ b/Adaptors/NullStorage/src/ArmoniK.Core.Adapters.NullStorage.csproj
@@ -25,17 +25,17 @@
-
+
runtime
-
+
false
runtime
-
+
runtime
-
+
runtime
diff --git a/Adaptors/PostgresSQL/src/ArmoniK.Core.Adapters.PostgresSQL.csproj b/Adaptors/PostgresSQL/src/ArmoniK.Core.Adapters.PostgresSQL.csproj
index 7126f6316..ca470da58 100644
--- a/Adaptors/PostgresSQL/src/ArmoniK.Core.Adapters.PostgresSQL.csproj
+++ b/Adaptors/PostgresSQL/src/ArmoniK.Core.Adapters.PostgresSQL.csproj
@@ -32,8 +32,8 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
+
+
diff --git a/Adaptors/PostgresSQL/tests/ArmoniK.Core.Adapters.PostgresSQL.Tests.csproj b/Adaptors/PostgresSQL/tests/ArmoniK.Core.Adapters.PostgresSQL.Tests.csproj
index bfddbb2a2..854683e3f 100644
--- a/Adaptors/PostgresSQL/tests/ArmoniK.Core.Adapters.PostgresSQL.Tests.csproj
+++ b/Adaptors/PostgresSQL/tests/ArmoniK.Core.Adapters.PostgresSQL.Tests.csproj
@@ -7,9 +7,9 @@
-
-
-
+
+
+
diff --git a/Adaptors/PubSub/src/ArmoniK.Core.Adapters.PubSub.csproj b/Adaptors/PubSub/src/ArmoniK.Core.Adapters.PubSub.csproj
index 053d5b553..9b90d6e4c 100644
--- a/Adaptors/PubSub/src/ArmoniK.Core.Adapters.PubSub.csproj
+++ b/Adaptors/PubSub/src/ArmoniK.Core.Adapters.PubSub.csproj
@@ -17,31 +17,31 @@
runtime
-
+
runtime
-
+
runtime
-
+
runtime
-
+
runtime
-
+
runtime
-
+
runtime
-
+
runtime
-
+
diff --git a/Adaptors/Redis/src/ArmoniK.Core.Adapters.Redis.csproj b/Adaptors/Redis/src/ArmoniK.Core.Adapters.Redis.csproj
index 484c467c2..8ca0937c4 100644
--- a/Adaptors/Redis/src/ArmoniK.Core.Adapters.Redis.csproj
+++ b/Adaptors/Redis/src/ArmoniK.Core.Adapters.Redis.csproj
@@ -29,18 +29,18 @@
runtime
-
-
+
+
runtime
-
+
false
runtime
-
+
runtime
-
+
runtime
diff --git a/Adaptors/Redis/tests/ArmoniK.Core.Adapters.Redis.Tests.csproj b/Adaptors/Redis/tests/ArmoniK.Core.Adapters.Redis.Tests.csproj
index 106dc2956..cea006f3e 100644
--- a/Adaptors/Redis/tests/ArmoniK.Core.Adapters.Redis.Tests.csproj
+++ b/Adaptors/Redis/tests/ArmoniK.Core.Adapters.Redis.Tests.csproj
@@ -11,9 +11,9 @@
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
-
+
+
+
diff --git a/Adaptors/S3/src/ArmoniK.Core.Adapters.S3.csproj b/Adaptors/S3/src/ArmoniK.Core.Adapters.S3.csproj
index d9cd27413..c33896b2c 100644
--- a/Adaptors/S3/src/ArmoniK.Core.Adapters.S3.csproj
+++ b/Adaptors/S3/src/ArmoniK.Core.Adapters.S3.csproj
@@ -17,24 +17,24 @@
runtime
-
+
-
-
+
+
-
+
runtime
-
+
false
runtime
-
+
runtime
-
+
runtime
diff --git a/Adaptors/S3/tests/ArmoniK.Core.Adapters.S3.Tests.csproj b/Adaptors/S3/tests/ArmoniK.Core.Adapters.S3.Tests.csproj
index 2104867ad..15765971d 100644
--- a/Adaptors/S3/tests/ArmoniK.Core.Adapters.S3.Tests.csproj
+++ b/Adaptors/S3/tests/ArmoniK.Core.Adapters.S3.Tests.csproj
@@ -12,14 +12,14 @@
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
-
-
+
+
+
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/Adaptors/SQS/src/ArmoniK.Core.Adapters.SQS.csproj b/Adaptors/SQS/src/ArmoniK.Core.Adapters.SQS.csproj
index c64b66580..b2dabac51 100644
--- a/Adaptors/SQS/src/ArmoniK.Core.Adapters.SQS.csproj
+++ b/Adaptors/SQS/src/ArmoniK.Core.Adapters.SQS.csproj
@@ -12,13 +12,13 @@
runtime
-
+
runtime
-
+
runtime
-
+
runtime
@@ -31,11 +31,11 @@
-
+
-
-
-
+
+
+
diff --git a/Base/src/ArmoniK.Core.Base.csproj b/Base/src/ArmoniK.Core.Base.csproj
index 0d4473605..0ea60a7cf 100644
--- a/Base/src/ArmoniK.Core.Base.csproj
+++ b/Base/src/ArmoniK.Core.Base.csproj
@@ -30,8 +30,8 @@
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
+
+
diff --git a/Base/tests/Queue/Queue.csproj b/Base/tests/Queue/Queue.csproj
index 4231f9bee..07ec60d5d 100644
--- a/Base/tests/Queue/Queue.csproj
+++ b/Base/tests/Queue/Queue.csproj
@@ -19,14 +19,14 @@
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
-
-
+
+
+
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/Common/src/ArmoniK.Core.Common.csproj b/Common/src/ArmoniK.Core.Common.csproj
index 02b8bf7b3..e9929ddf9 100644
--- a/Common/src/ArmoniK.Core.Common.csproj
+++ b/Common/src/ArmoniK.Core.Common.csproj
@@ -34,16 +34,16 @@
-
-
+
+
-
+
-
+
diff --git a/Common/tests/ArmoniK.Core.Common.Tests.csproj b/Common/tests/ArmoniK.Core.Common.Tests.csproj
index 5a7c053a4..ca6cd4ecf 100644
--- a/Common/tests/ArmoniK.Core.Common.Tests.csproj
+++ b/Common/tests/ArmoniK.Core.Common.Tests.csproj
@@ -19,12 +19,12 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
-
-
-
-
+
+
+
+
diff --git a/Compute/PollingAgent/src/ArmoniK.Core.Compute.PollingAgent.csproj b/Compute/PollingAgent/src/ArmoniK.Core.Compute.PollingAgent.csproj
index 88a62e94e..a01a98744 100644
--- a/Compute/PollingAgent/src/ArmoniK.Core.Compute.PollingAgent.csproj
+++ b/Compute/PollingAgent/src/ArmoniK.Core.Compute.PollingAgent.csproj
@@ -31,8 +31,8 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
+
+
diff --git a/Control/Metrics/tests/ArmoniK.Core.Control.Metrics.Tests.csproj b/Control/Metrics/tests/ArmoniK.Core.Control.Metrics.Tests.csproj
index ab2b79ca8..6bbf79a8b 100644
--- a/Control/Metrics/tests/ArmoniK.Core.Control.Metrics.Tests.csproj
+++ b/Control/Metrics/tests/ArmoniK.Core.Control.Metrics.Tests.csproj
@@ -16,9 +16,9 @@
-
-
-
+
+
+
diff --git a/Control/Submitter/src/ArmoniK.Core.Control.Submitter.csproj b/Control/Submitter/src/ArmoniK.Core.Control.Submitter.csproj
index 8a2d79527..2778f708e 100644
--- a/Control/Submitter/src/ArmoniK.Core.Control.Submitter.csproj
+++ b/Control/Submitter/src/ArmoniK.Core.Control.Submitter.csproj
@@ -31,9 +31,9 @@
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
-
+
+
+
diff --git a/Control/Submitter/tests/ArmoniK.Core.Control.Submitter.Tests.csproj b/Control/Submitter/tests/ArmoniK.Core.Control.Submitter.Tests.csproj
index 0769937f9..cdce19c39 100644
--- a/Control/Submitter/tests/ArmoniK.Core.Control.Submitter.Tests.csproj
+++ b/Control/Submitter/tests/ArmoniK.Core.Control.Submitter.Tests.csproj
@@ -18,8 +18,8 @@
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
+
+
diff --git a/ProfilingTools/src/ArmoniK.Core.ProfilingTools.csproj b/ProfilingTools/src/ArmoniK.Core.ProfilingTools.csproj
index 865085702..d4d78a454 100644
--- a/ProfilingTools/src/ArmoniK.Core.ProfilingTools.csproj
+++ b/ProfilingTools/src/ArmoniK.Core.ProfilingTools.csproj
@@ -32,7 +32,7 @@
-
+
diff --git a/Tests/Bench/Client/src/ArmoniK.Samples.Bench.Client.csproj b/Tests/Bench/Client/src/ArmoniK.Samples.Bench.Client.csproj
index 4fa053f73..a286dfe79 100644
--- a/Tests/Bench/Client/src/ArmoniK.Samples.Bench.Client.csproj
+++ b/Tests/Bench/Client/src/ArmoniK.Samples.Bench.Client.csproj
@@ -30,10 +30,10 @@
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
+
+
-
+
diff --git a/Tests/Common/Client/src/ArmoniK.Core.Common.Client.csproj b/Tests/Common/Client/src/ArmoniK.Core.Common.Client.csproj
index 61f5fb9ef..b3f68164c 100644
--- a/Tests/Common/Client/src/ArmoniK.Core.Common.Client.csproj
+++ b/Tests/Common/Client/src/ArmoniK.Core.Common.Client.csproj
@@ -30,7 +30,7 @@
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
diff --git a/Tests/Connectivity/src/ArmoniK.Core.Tests.Connectivity.csproj b/Tests/Connectivity/src/ArmoniK.Core.Tests.Connectivity.csproj
index c8f0effd7..b3530cc11 100644
--- a/Tests/Connectivity/src/ArmoniK.Core.Tests.Connectivity.csproj
+++ b/Tests/Connectivity/src/ArmoniK.Core.Tests.Connectivity.csproj
@@ -30,10 +30,10 @@
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
-
-
+
+
+
+
diff --git a/Tests/CrashingWorker/Client/src/ArmoniK.Samples.CrashingWorker.Client.csproj b/Tests/CrashingWorker/Client/src/ArmoniK.Samples.CrashingWorker.Client.csproj
index df92b5103..a60b40136 100644
--- a/Tests/CrashingWorker/Client/src/ArmoniK.Samples.CrashingWorker.Client.csproj
+++ b/Tests/CrashingWorker/Client/src/ArmoniK.Samples.CrashingWorker.Client.csproj
@@ -28,12 +28,12 @@
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
-
-
+
+
+
+
-
+
diff --git a/Tests/HtcMock/Client/src/ArmoniK.Samples.HtcMock.Client.csproj b/Tests/HtcMock/Client/src/ArmoniK.Samples.HtcMock.Client.csproj
index 7e618b32e..cd874b7ac 100644
--- a/Tests/HtcMock/Client/src/ArmoniK.Samples.HtcMock.Client.csproj
+++ b/Tests/HtcMock/Client/src/ArmoniK.Samples.HtcMock.Client.csproj
@@ -31,10 +31,10 @@
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
+
+
-
+
diff --git a/Tests/Stream/Client/ArmoniK.Extensions.Common.StreamWrapper.Tests.Client.csproj b/Tests/Stream/Client/ArmoniK.Extensions.Common.StreamWrapper.Tests.Client.csproj
index 0c0b0d190..f848c3007 100644
--- a/Tests/Stream/Client/ArmoniK.Extensions.Common.StreamWrapper.Tests.Client.csproj
+++ b/Tests/Stream/Client/ArmoniK.Extensions.Common.StreamWrapper.Tests.Client.csproj
@@ -29,10 +29,10 @@
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
-
-
+
+
+
+
diff --git a/Tests/UploadBench/ArmoniK.Core.Tests.UploadBench.csproj b/Tests/UploadBench/ArmoniK.Core.Tests.UploadBench.csproj
index 789ef3f5b..f98cd5ac9 100644
--- a/Tests/UploadBench/ArmoniK.Core.Tests.UploadBench.csproj
+++ b/Tests/UploadBench/ArmoniK.Core.Tests.UploadBench.csproj
@@ -31,11 +31,11 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
-
+
+
+
-
+
diff --git a/Utils/src/ArmoniK.Core.Utils.csproj b/Utils/src/ArmoniK.Core.Utils.csproj
index 97acd8626..d9c112861 100644
--- a/Utils/src/ArmoniK.Core.Utils.csproj
+++ b/Utils/src/ArmoniK.Core.Utils.csproj
@@ -31,11 +31,11 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
-
-
-
+
+
+
+
+