diff --git a/Adaptors/Amqp/src/ArmoniK.Core.Adapters.Amqp.csproj b/Adaptors/Amqp/src/ArmoniK.Core.Adapters.Amqp.csproj
index 9475d1c9b..73bdab297 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 e754c3277..d9f811f5c 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 b0c2757d1..93d89459d 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/LocalStorage/tests/ArmoniK.Core.Adapters.LocalStorage.Tests.csproj b/Adaptors/LocalStorage/tests/ArmoniK.Core.Adapters.LocalStorage.Tests.csproj
index dbeca4b95..4e5765f5d 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 dba16cab4..33d1139f9 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 270174a8a..03dc9569e 100644
--- a/Adaptors/MongoDB/src/ArmoniK.Core.Adapters.MongoDB.csproj
+++ b/Adaptors/MongoDB/src/ArmoniK.Core.Adapters.MongoDB.csproj
@@ -34,7 +34,7 @@
-
+
diff --git a/Adaptors/MongoDB/tests/ArmoniK.Core.Adapters.MongoDB.Tests.csproj b/Adaptors/MongoDB/tests/ArmoniK.Core.Adapters.MongoDB.Tests.csproj
index aab7ef5ec..3d6f0fe82 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 cc4a30766..51b47517b 100644
--- a/Adaptors/Nats/src/ArmoniK.Core.Adapters.Nats.csproj
+++ b/Adaptors/Nats/src/ArmoniK.Core.Adapters.Nats.csproj
@@ -32,8 +32,8 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
+
+
diff --git a/Adaptors/NullStorage/src/ArmoniK.Core.Adapters.NullStorage.csproj b/Adaptors/NullStorage/src/ArmoniK.Core.Adapters.NullStorage.csproj
index 34800158c..3f5a1710d 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/PubSub/src/ArmoniK.Core.Adapters.PubSub.csproj b/Adaptors/PubSub/src/ArmoniK.Core.Adapters.PubSub.csproj
index 8ea21cd1c..8d2722c24 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 70c803395..cab618a9b 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 7452320e0..b6bc9712b 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 bc2683251..71cc3b657 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 029668d14..7f4bacd15 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 661d0bd4d..6ab0c5870 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 9cc492d5c..644c70937 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 39b1d03f9..4d6c3500c 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 1688750c0..bd861ba4b 100644
--- a/Common/src/ArmoniK.Core.Common.csproj
+++ b/Common/src/ArmoniK.Core.Common.csproj
@@ -34,8 +34,8 @@
-
-
+
+
@@ -43,7 +43,7 @@
-
+
diff --git a/Common/tests/ArmoniK.Core.Common.Tests.csproj b/Common/tests/ArmoniK.Core.Common.Tests.csproj
index 5515c1367..1ae24d50e 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/Control/Metrics/tests/ArmoniK.Core.Control.Metrics.Tests.csproj b/Control/Metrics/tests/ArmoniK.Core.Control.Metrics.Tests.csproj
index ab2b79ca8..4ddd35e80 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 2d346f50b..581700850 100644
--- a/Control/Submitter/src/ArmoniK.Core.Control.Submitter.csproj
+++ b/Control/Submitter/src/ArmoniK.Core.Control.Submitter.csproj
@@ -31,7 +31,7 @@
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 5480acabd..ff84cdbc8 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/Tests/Bench/Client/src/ArmoniK.Samples.Bench.Client.csproj b/Tests/Bench/Client/src/ArmoniK.Samples.Bench.Client.csproj
index b46eecf44..37ff59e8c 100644
--- a/Tests/Bench/Client/src/ArmoniK.Samples.Bench.Client.csproj
+++ b/Tests/Bench/Client/src/ArmoniK.Samples.Bench.Client.csproj
@@ -28,8 +28,8 @@
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 cce66c218..43d07a857 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 dc0572744..57b782c5c 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 e4ac65919..80e450316 100644
--- a/Tests/CrashingWorker/Client/src/ArmoniK.Samples.CrashingWorker.Client.csproj
+++ b/Tests/CrashingWorker/Client/src/ArmoniK.Samples.CrashingWorker.Client.csproj
@@ -28,10 +28,10 @@
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 7c8f81b05..e551361de 100644
--- a/Tests/HtcMock/Client/src/ArmoniK.Samples.HtcMock.Client.csproj
+++ b/Tests/HtcMock/Client/src/ArmoniK.Samples.HtcMock.Client.csproj
@@ -29,8 +29,8 @@
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 a3325fa5b..da645f574 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 3539354a3..a3867f86a 100644
--- a/Tests/UploadBench/ArmoniK.Core.Tests.UploadBench.csproj
+++ b/Tests/UploadBench/ArmoniK.Core.Tests.UploadBench.csproj
@@ -31,9 +31,9 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
-
+
+
+
diff --git a/Utils/src/ArmoniK.Core.Utils.csproj b/Utils/src/ArmoniK.Core.Utils.csproj
index c7f8d17fb..8dfc423cd 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
-
-
-
-
-
+
+
+
+
+