diff --git a/Applications/AdminApi/test/AdminApi.Tests.Integration/AdminApi.Tests.Integration.csproj b/Applications/AdminApi/test/AdminApi.Tests.Integration/AdminApi.Tests.Integration.csproj
index d38e913197..927434fe29 100644
--- a/Applications/AdminApi/test/AdminApi.Tests.Integration/AdminApi.Tests.Integration.csproj
+++ b/Applications/AdminApi/test/AdminApi.Tests.Integration/AdminApi.Tests.Integration.csproj
@@ -10,7 +10,7 @@
-
+
diff --git a/Applications/ConsumerApi/test/ConsumerApi.Tests.Integration/ConsumerApi.Tests.Integration.csproj b/Applications/ConsumerApi/test/ConsumerApi.Tests.Integration/ConsumerApi.Tests.Integration.csproj
index 56a639879a..bf02792097 100644
--- a/Applications/ConsumerApi/test/ConsumerApi.Tests.Integration/ConsumerApi.Tests.Integration.csproj
+++ b/Applications/ConsumerApi/test/ConsumerApi.Tests.Integration/ConsumerApi.Tests.Integration.csproj
@@ -10,7 +10,7 @@
-
+
@@ -61,4 +61,4 @@
%(RelativeDir)%(Filename).feature$(DefaultLanguageSourceExtension)
-
\ No newline at end of file
+
diff --git a/Applications/EventHandlerService/test/EventHandlerService.Tests/EventHandlerService.Tests.csproj b/Applications/EventHandlerService/test/EventHandlerService.Tests/EventHandlerService.Tests.csproj
index 1e9a8d19a1..4a74951458 100644
--- a/Applications/EventHandlerService/test/EventHandlerService.Tests/EventHandlerService.Tests.csproj
+++ b/Applications/EventHandlerService/test/EventHandlerService.Tests/EventHandlerService.Tests.csproj
@@ -11,7 +11,7 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
all
diff --git a/Applications/FilesSanityCheck/test/Files.Jobs.SanityCheck.Tests/FilesSanityCheck.Tests.csproj b/Applications/FilesSanityCheck/test/Files.Jobs.SanityCheck.Tests/FilesSanityCheck.Tests.csproj
index 561192ba7f..5b6558a505 100644
--- a/Applications/FilesSanityCheck/test/Files.Jobs.SanityCheck.Tests/FilesSanityCheck.Tests.csproj
+++ b/Applications/FilesSanityCheck/test/Files.Jobs.SanityCheck.Tests/FilesSanityCheck.Tests.csproj
@@ -10,7 +10,7 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
all
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/Applications/IdentityDeletionJobs/test/Job.IdentityDeletion.Tests.Integration/Job.IdentityDeletion.Tests.Integration.csproj b/Applications/IdentityDeletionJobs/test/Job.IdentityDeletion.Tests.Integration/Job.IdentityDeletion.Tests.Integration.csproj
index 1fc6cde60c..1729701978 100644
--- a/Applications/IdentityDeletionJobs/test/Job.IdentityDeletion.Tests.Integration/Job.IdentityDeletion.Tests.Integration.csproj
+++ b/Applications/IdentityDeletionJobs/test/Job.IdentityDeletion.Tests.Integration/Job.IdentityDeletion.Tests.Integration.csproj
@@ -9,7 +9,7 @@
-
+
diff --git a/Applications/IdentityDeletionJobs/test/Job.IdentityDeletion.Tests/Job.IdentityDeletion.Tests.csproj b/Applications/IdentityDeletionJobs/test/Job.IdentityDeletion.Tests/Job.IdentityDeletion.Tests.csproj
index ebcb42be64..a5a4eda1bf 100644
--- a/Applications/IdentityDeletionJobs/test/Job.IdentityDeletion.Tests/Job.IdentityDeletion.Tests.csproj
+++ b/Applications/IdentityDeletionJobs/test/Job.IdentityDeletion.Tests/Job.IdentityDeletion.Tests.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/Applications/SseServer/test/SseServerTests/SseServerTests.csproj b/Applications/SseServer/test/SseServerTests/SseServerTests.csproj
index 15c968a81b..6b9e0e7628 100644
--- a/Applications/SseServer/test/SseServerTests/SseServerTests.csproj
+++ b/Applications/SseServer/test/SseServerTests/SseServerTests.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/Backbone.Tests.ArchUnit/Backbone.Tests.ArchUnit.csproj b/Backbone.Tests.ArchUnit/Backbone.Tests.ArchUnit.csproj
index 8709bad2c9..52412e950e 100644
--- a/Backbone.Tests.ArchUnit/Backbone.Tests.ArchUnit.csproj
+++ b/Backbone.Tests.ArchUnit/Backbone.Tests.ArchUnit.csproj
@@ -6,7 +6,7 @@
-
+
diff --git a/BuildingBlocks/src/UnitTestTools/UnitTestTools.csproj b/BuildingBlocks/src/UnitTestTools/UnitTestTools.csproj
index 97e0fe35a3..7ef1d76eb4 100644
--- a/BuildingBlocks/src/UnitTestTools/UnitTestTools.csproj
+++ b/BuildingBlocks/src/UnitTestTools/UnitTestTools.csproj
@@ -11,7 +11,7 @@
-
+
diff --git a/BuildingBlocks/test/BuildingBlocks.Application.Tests/BuildingBlocks.Application.Tests.csproj b/BuildingBlocks/test/BuildingBlocks.Application.Tests/BuildingBlocks.Application.Tests.csproj
index 6a8fab9e21..c9c52d883c 100644
--- a/BuildingBlocks/test/BuildingBlocks.Application.Tests/BuildingBlocks.Application.Tests.csproj
+++ b/BuildingBlocks/test/BuildingBlocks.Application.Tests/BuildingBlocks.Application.Tests.csproj
@@ -5,7 +5,7 @@
-
+
diff --git a/BuildingBlocks/test/BuildingBlocks.Infrastructure.Tests/BuildingBlocks.Infrastructure.Tests.csproj b/BuildingBlocks/test/BuildingBlocks.Infrastructure.Tests/BuildingBlocks.Infrastructure.Tests.csproj
index 3c0a902a51..ff942f3c4c 100644
--- a/BuildingBlocks/test/BuildingBlocks.Infrastructure.Tests/BuildingBlocks.Infrastructure.Tests.csproj
+++ b/BuildingBlocks/test/BuildingBlocks.Infrastructure.Tests/BuildingBlocks.Infrastructure.Tests.csproj
@@ -13,7 +13,7 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
all
-
+
diff --git a/BuildingBlocks/test/Crypto.Tests/Crypto.Tests.csproj b/BuildingBlocks/test/Crypto.Tests/Crypto.Tests.csproj
index 333547c0a6..997502b5e5 100644
--- a/BuildingBlocks/test/Crypto.Tests/Crypto.Tests.csproj
+++ b/BuildingBlocks/test/Crypto.Tests/Crypto.Tests.csproj
@@ -14,7 +14,7 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
all
-
+
all
diff --git a/BuildingBlocks/test/DevelopmentKit.Identity.Tests/DevelopmentKit.Identity.Tests.csproj b/BuildingBlocks/test/DevelopmentKit.Identity.Tests/DevelopmentKit.Identity.Tests.csproj
index dad0da632c..8a403509b4 100644
--- a/BuildingBlocks/test/DevelopmentKit.Identity.Tests/DevelopmentKit.Identity.Tests.csproj
+++ b/BuildingBlocks/test/DevelopmentKit.Identity.Tests/DevelopmentKit.Identity.Tests.csproj
@@ -10,7 +10,7 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
all
-
+
all
diff --git a/BuildingBlocks/test/Tooling.Tests/Tooling.Tests.csproj b/BuildingBlocks/test/Tooling.Tests/Tooling.Tests.csproj
index f92f5f15d9..f03151e050 100644
--- a/BuildingBlocks/test/Tooling.Tests/Tooling.Tests.csproj
+++ b/BuildingBlocks/test/Tooling.Tests/Tooling.Tests.csproj
@@ -10,7 +10,7 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
all
-
+
all
diff --git a/Modules/Challenges/test/Challenges.Application.Tests/Challenges.Application.Tests.csproj b/Modules/Challenges/test/Challenges.Application.Tests/Challenges.Application.Tests.csproj
index dccc7788b4..fdcb0fe2aa 100644
--- a/Modules/Challenges/test/Challenges.Application.Tests/Challenges.Application.Tests.csproj
+++ b/Modules/Challenges/test/Challenges.Application.Tests/Challenges.Application.Tests.csproj
@@ -12,7 +12,7 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
all
-
+
diff --git a/Modules/Devices/test/Devices.Application.Tests/Devices.Application.Tests.csproj b/Modules/Devices/test/Devices.Application.Tests/Devices.Application.Tests.csproj
index 4d02517c12..b956f3fbdf 100644
--- a/Modules/Devices/test/Devices.Application.Tests/Devices.Application.Tests.csproj
+++ b/Modules/Devices/test/Devices.Application.Tests/Devices.Application.Tests.csproj
@@ -8,7 +8,7 @@
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/Modules/Devices/test/Devices.Domain.Tests/Devices.Domain.Tests.csproj b/Modules/Devices/test/Devices.Domain.Tests/Devices.Domain.Tests.csproj
index dc3af4e3f6..afb952ab3a 100644
--- a/Modules/Devices/test/Devices.Domain.Tests/Devices.Domain.Tests.csproj
+++ b/Modules/Devices/test/Devices.Domain.Tests/Devices.Domain.Tests.csproj
@@ -11,7 +11,7 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
all
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/Modules/Devices/test/Devices.Infrastructure.Tests/Devices.Infrastructure.Tests.csproj b/Modules/Devices/test/Devices.Infrastructure.Tests/Devices.Infrastructure.Tests.csproj
index 72159f1bc7..735105d32b 100644
--- a/Modules/Devices/test/Devices.Infrastructure.Tests/Devices.Infrastructure.Tests.csproj
+++ b/Modules/Devices/test/Devices.Infrastructure.Tests/Devices.Infrastructure.Tests.csproj
@@ -8,7 +8,7 @@
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/Modules/Directory.Build.props b/Modules/Directory.Build.props
index 21fe448125..35c6510934 100644
--- a/Modules/Directory.Build.props
+++ b/Modules/Directory.Build.props
@@ -23,7 +23,7 @@
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/Modules/Files/test/Files.Application.Tests/Files.Application.Tests.csproj b/Modules/Files/test/Files.Application.Tests/Files.Application.Tests.csproj
index 4041a5e311..e6c6e9f15a 100644
--- a/Modules/Files/test/Files.Application.Tests/Files.Application.Tests.csproj
+++ b/Modules/Files/test/Files.Application.Tests/Files.Application.Tests.csproj
@@ -6,7 +6,7 @@
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/Modules/Files/test/Files.Infrastructure.Tests/Files.Infrastructure.Tests.csproj b/Modules/Files/test/Files.Infrastructure.Tests/Files.Infrastructure.Tests.csproj
index e3145db18f..38dc76acea 100644
--- a/Modules/Files/test/Files.Infrastructure.Tests/Files.Infrastructure.Tests.csproj
+++ b/Modules/Files/test/Files.Infrastructure.Tests/Files.Infrastructure.Tests.csproj
@@ -5,7 +5,7 @@
-
+
all
diff --git a/Modules/Messages/test/Messages.Application.Tests/Messages.Application.Tests.csproj b/Modules/Messages/test/Messages.Application.Tests/Messages.Application.Tests.csproj
index b4272fe2c8..4d32b3ddc4 100644
--- a/Modules/Messages/test/Messages.Application.Tests/Messages.Application.Tests.csproj
+++ b/Modules/Messages/test/Messages.Application.Tests/Messages.Application.Tests.csproj
@@ -11,7 +11,7 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
all
-
+
all
diff --git a/Modules/Messages/test/Messages.Domain.Tests/Messages.Domain.Tests.csproj b/Modules/Messages/test/Messages.Domain.Tests/Messages.Domain.Tests.csproj
index ad1da497c0..4c378f8e88 100644
--- a/Modules/Messages/test/Messages.Domain.Tests/Messages.Domain.Tests.csproj
+++ b/Modules/Messages/test/Messages.Domain.Tests/Messages.Domain.Tests.csproj
@@ -7,7 +7,7 @@
-
+
all
diff --git a/Modules/Quotas/test/Quotas.Application.Tests/Quotas.Application.Tests.csproj b/Modules/Quotas/test/Quotas.Application.Tests/Quotas.Application.Tests.csproj
index fbef178cff..553bd032e2 100644
--- a/Modules/Quotas/test/Quotas.Application.Tests/Quotas.Application.Tests.csproj
+++ b/Modules/Quotas/test/Quotas.Application.Tests/Quotas.Application.Tests.csproj
@@ -11,7 +11,7 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
all
-
+
all
diff --git a/Modules/Quotas/test/Quotas.Domain.Tests/Quotas.Domain.Tests.csproj b/Modules/Quotas/test/Quotas.Domain.Tests/Quotas.Domain.Tests.csproj
index efc4fe4ba0..2e4f17cf0a 100644
--- a/Modules/Quotas/test/Quotas.Domain.Tests/Quotas.Domain.Tests.csproj
+++ b/Modules/Quotas/test/Quotas.Domain.Tests/Quotas.Domain.Tests.csproj
@@ -10,7 +10,7 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
all
-
+
diff --git a/Modules/Quotas/test/Quotas.Infrastructure.Tests/Quotas.Infrastructure.Tests.csproj b/Modules/Quotas/test/Quotas.Infrastructure.Tests/Quotas.Infrastructure.Tests.csproj
index c93bf046c1..7b1acc769e 100644
--- a/Modules/Quotas/test/Quotas.Infrastructure.Tests/Quotas.Infrastructure.Tests.csproj
+++ b/Modules/Quotas/test/Quotas.Infrastructure.Tests/Quotas.Infrastructure.Tests.csproj
@@ -12,7 +12,7 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
all
-
+
all
diff --git a/Modules/Synchronization/test/Synchronization.Application.Tests/Synchronization.Application.Tests.csproj b/Modules/Synchronization/test/Synchronization.Application.Tests/Synchronization.Application.Tests.csproj
index aa4d9b3736..7e88c5bac7 100644
--- a/Modules/Synchronization/test/Synchronization.Application.Tests/Synchronization.Application.Tests.csproj
+++ b/Modules/Synchronization/test/Synchronization.Application.Tests/Synchronization.Application.Tests.csproj
@@ -8,7 +8,7 @@
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/Modules/Synchronization/test/Synchronization.Domain.Tests/Synchronization.Domain.Tests.csproj b/Modules/Synchronization/test/Synchronization.Domain.Tests/Synchronization.Domain.Tests.csproj
index 0e7c663b90..098ba086ec 100644
--- a/Modules/Synchronization/test/Synchronization.Domain.Tests/Synchronization.Domain.Tests.csproj
+++ b/Modules/Synchronization/test/Synchronization.Domain.Tests/Synchronization.Domain.Tests.csproj
@@ -10,7 +10,7 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
all
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/Modules/Tokens/test/Tokens.Application.Tests/Tokens.Application.Tests.csproj b/Modules/Tokens/test/Tokens.Application.Tests/Tokens.Application.Tests.csproj
index 1cd6a096a3..486348af0b 100644
--- a/Modules/Tokens/test/Tokens.Application.Tests/Tokens.Application.Tests.csproj
+++ b/Modules/Tokens/test/Tokens.Application.Tests/Tokens.Application.Tests.csproj
@@ -6,7 +6,7 @@
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/Modules/Tokens/test/Tokens.Domain.Tests/Tokens.Domain.Tests.csproj b/Modules/Tokens/test/Tokens.Domain.Tests/Tokens.Domain.Tests.csproj
index 2ff3e340d7..88c631f183 100644
--- a/Modules/Tokens/test/Tokens.Domain.Tests/Tokens.Domain.Tests.csproj
+++ b/Modules/Tokens/test/Tokens.Domain.Tests/Tokens.Domain.Tests.csproj
@@ -10,7 +10,7 @@
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
all