diff --git a/AdminUi/src/AdminUi/AdminUi.csproj b/AdminUi/src/AdminUi/AdminUi.csproj
index 4a6c5be495..d4cf68e7ae 100644
--- a/AdminUi/src/AdminUi/AdminUi.csproj
+++ b/AdminUi/src/AdminUi/AdminUi.csproj
@@ -24,14 +24,14 @@
-
+
-
+
diff --git a/AdminUi/test/AdminUi.Tests.Integration/AdminUi.Tests.Integration.csproj b/AdminUi/test/AdminUi.Tests.Integration/AdminUi.Tests.Integration.csproj
index 11a18ed113..7dee9bf341 100644
--- a/AdminUi/test/AdminUi.Tests.Integration/AdminUi.Tests.Integration.csproj
+++ b/AdminUi/test/AdminUi.Tests.Integration/AdminUi.Tests.Integration.csproj
@@ -11,7 +11,7 @@
-
+
diff --git a/Backbone.Tests.ArchUnit/Backbone.Tests.ArchUnit.csproj b/Backbone.Tests.ArchUnit/Backbone.Tests.ArchUnit.csproj
index bad1c3240b..147636ee54 100644
--- a/Backbone.Tests.ArchUnit/Backbone.Tests.ArchUnit.csproj
+++ b/Backbone.Tests.ArchUnit/Backbone.Tests.ArchUnit.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/BuildingBlocks/src/BuildingBlocks.Infrastructure/BuildingBlocks.Infrastructure.csproj b/BuildingBlocks/src/BuildingBlocks.Infrastructure/BuildingBlocks.Infrastructure.csproj
index 55dc236f30..210dfdf3b3 100644
--- a/BuildingBlocks/src/BuildingBlocks.Infrastructure/BuildingBlocks.Infrastructure.csproj
+++ b/BuildingBlocks/src/BuildingBlocks.Infrastructure/BuildingBlocks.Infrastructure.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/BuildingBlocks/src/SpecFlowCucumberResultsExporter/SpecFlowCucumberResultsExporter.csproj b/BuildingBlocks/src/SpecFlowCucumberResultsExporter/SpecFlowCucumberResultsExporter.csproj
index e34f298b8f..d20c2cf6fc 100644
--- a/BuildingBlocks/src/SpecFlowCucumberResultsExporter/SpecFlowCucumberResultsExporter.csproj
+++ b/BuildingBlocks/src/SpecFlowCucumberResultsExporter/SpecFlowCucumberResultsExporter.csproj
@@ -5,7 +5,7 @@
-
+
diff --git a/BuildingBlocks/test/BuildingBlocks.Application.Tests/BuildingBlocks.Application.Tests.csproj b/BuildingBlocks/test/BuildingBlocks.Application.Tests/BuildingBlocks.Application.Tests.csproj
index 1d460f3ebf..d049792cda 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 10000ba756..2ebc17c59f 100644
--- a/BuildingBlocks/test/BuildingBlocks.Infrastructure.Tests/BuildingBlocks.Infrastructure.Tests.csproj
+++ b/BuildingBlocks/test/BuildingBlocks.Infrastructure.Tests/BuildingBlocks.Infrastructure.Tests.csproj
@@ -9,7 +9,7 @@
-
+
diff --git a/BuildingBlocks/test/Crypto.Tests/Crypto.Tests.csproj b/BuildingBlocks/test/Crypto.Tests/Crypto.Tests.csproj
index 7657ca4df0..04156b3d04 100644
--- a/BuildingBlocks/test/Crypto.Tests/Crypto.Tests.csproj
+++ b/BuildingBlocks/test/Crypto.Tests/Crypto.Tests.csproj
@@ -10,7 +10,7 @@
-
+
all
diff --git a/BuildingBlocks/test/DevelopmentKit.Identity.Tests/DevelopmentKit.Identity.Tests.csproj b/BuildingBlocks/test/DevelopmentKit.Identity.Tests/DevelopmentKit.Identity.Tests.csproj
index 2025c547b6..1476d89b51 100644
--- a/BuildingBlocks/test/DevelopmentKit.Identity.Tests/DevelopmentKit.Identity.Tests.csproj
+++ b/BuildingBlocks/test/DevelopmentKit.Identity.Tests/DevelopmentKit.Identity.Tests.csproj
@@ -6,7 +6,7 @@
-
+
all
diff --git a/BuildingBlocks/test/StronglyTypedIds.Tests/StronglyTypedIds.Tests.csproj b/BuildingBlocks/test/StronglyTypedIds.Tests/StronglyTypedIds.Tests.csproj
index 74b9c4fd0a..30dc697c87 100644
--- a/BuildingBlocks/test/StronglyTypedIds.Tests/StronglyTypedIds.Tests.csproj
+++ b/BuildingBlocks/test/StronglyTypedIds.Tests/StronglyTypedIds.Tests.csproj
@@ -5,7 +5,7 @@
-
+
all
diff --git a/BuildingBlocks/test/Tooling.Tests/Tooling.Tests.csproj b/BuildingBlocks/test/Tooling.Tests/Tooling.Tests.csproj
index b591086cc4..73b10b23fd 100644
--- a/BuildingBlocks/test/Tooling.Tests/Tooling.Tests.csproj
+++ b/BuildingBlocks/test/Tooling.Tests/Tooling.Tests.csproj
@@ -6,7 +6,7 @@
-
+
all
diff --git a/Common/src/Common.Infrastructure/Common.Infrastructure.csproj b/Common/src/Common.Infrastructure/Common.Infrastructure.csproj
index 0cc31708c4..f5aeb5bb1c 100644
--- a/Common/src/Common.Infrastructure/Common.Infrastructure.csproj
+++ b/Common/src/Common.Infrastructure/Common.Infrastructure.csproj
@@ -5,7 +5,7 @@
-
+
diff --git a/ConsumerApi.Tests.Integration/ConsumerApi.Tests.Integration.csproj b/ConsumerApi.Tests.Integration/ConsumerApi.Tests.Integration.csproj
index 2170f56cf8..05681a9434 100644
--- a/ConsumerApi.Tests.Integration/ConsumerApi.Tests.Integration.csproj
+++ b/ConsumerApi.Tests.Integration/ConsumerApi.Tests.Integration.csproj
@@ -12,7 +12,7 @@
-
+
diff --git a/ConsumerApi/ConsumerApi.csproj b/ConsumerApi/ConsumerApi.csproj
index 9a8eb167d7..2ed926caa0 100644
--- a/ConsumerApi/ConsumerApi.csproj
+++ b/ConsumerApi/ConsumerApi.csproj
@@ -23,14 +23,14 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
true
-
+
-
+
diff --git a/Infrastructure/Infrastructure.csproj b/Infrastructure/Infrastructure.csproj
index 51d8339752..25e2594864 100644
--- a/Infrastructure/Infrastructure.csproj
+++ b/Infrastructure/Infrastructure.csproj
@@ -1,4 +1,4 @@
-
+
enable
@@ -9,7 +9,7 @@
-
+
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 4ce05fce5b..5c61be560b 100644
--- a/Modules/Devices/test/Devices.Application.Tests/Devices.Application.Tests.csproj
+++ b/Modules/Devices/test/Devices.Application.Tests/Devices.Application.Tests.csproj
@@ -7,8 +7,8 @@
-
-
+
+
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 bb8a88ca04..4ac3eed62b 100644
--- a/Modules/Devices/test/Devices.Domain.Tests/Devices.Domain.Tests.csproj
+++ b/Modules/Devices/test/Devices.Domain.Tests/Devices.Domain.Tests.csproj
@@ -7,7 +7,7 @@
-
+
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 749aa8dcb2..4561bf7362 100644
--- a/Modules/Devices/test/Devices.Infrastructure.Tests/Devices.Infrastructure.Tests.csproj
+++ b/Modules/Devices/test/Devices.Infrastructure.Tests/Devices.Infrastructure.Tests.csproj
@@ -8,8 +8,8 @@
-
-
+
+
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 ded65551a8..eabd73d5f3 100644
--- a/Modules/Files/test/Files.Application.Tests/Files.Application.Tests.csproj
+++ b/Modules/Files/test/Files.Application.Tests/Files.Application.Tests.csproj
@@ -5,7 +5,7 @@
-
+
all
diff --git a/Modules/Files/test/Files.Jobs.SanityCheck.Tests/Files.Jobs.SanityCheck.Tests.csproj b/Modules/Files/test/Files.Jobs.SanityCheck.Tests/Files.Jobs.SanityCheck.Tests.csproj
index e9d5101938..913b09edbb 100644
--- a/Modules/Files/test/Files.Jobs.SanityCheck.Tests/Files.Jobs.SanityCheck.Tests.csproj
+++ b/Modules/Files/test/Files.Jobs.SanityCheck.Tests/Files.Jobs.SanityCheck.Tests.csproj
@@ -7,7 +7,7 @@
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
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 3d113eb28f..3761a1decc 100644
--- a/Modules/Messages/test/Messages.Application.Tests/Messages.Application.Tests.csproj
+++ b/Modules/Messages/test/Messages.Application.Tests/Messages.Application.Tests.csproj
@@ -1,13 +1,13 @@
-
+
false
-
+
-
+
all
diff --git a/Modules/Messages/test/Messages.Jobs.SanityCheck.Tests/Messages.Jobs.SanityCheck.Tests.csproj b/Modules/Messages/test/Messages.Jobs.SanityCheck.Tests/Messages.Jobs.SanityCheck.Tests.csproj
index 19bb2a3756..ec9f6c0bea 100644
--- a/Modules/Messages/test/Messages.Jobs.SanityCheck.Tests/Messages.Jobs.SanityCheck.Tests.csproj
+++ b/Modules/Messages/test/Messages.Jobs.SanityCheck.Tests/Messages.Jobs.SanityCheck.Tests.csproj
@@ -7,7 +7,7 @@
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
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 8788f96957..6030b55ef4 100644
--- a/Modules/Quotas/test/Quotas.Application.Tests/Quotas.Application.Tests.csproj
+++ b/Modules/Quotas/test/Quotas.Application.Tests/Quotas.Application.Tests.csproj
@@ -5,9 +5,9 @@
-
+
-
+
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 efd0c759de..fee007d692 100644
--- a/Modules/Quotas/test/Quotas.Domain.Tests/Quotas.Domain.Tests.csproj
+++ b/Modules/Quotas/test/Quotas.Domain.Tests/Quotas.Domain.Tests.csproj
@@ -7,7 +7,7 @@
-
+
all
diff --git a/Modules/Relationships/test/Relationships.Application.Tests/Relationships.Application.Tests.csproj b/Modules/Relationships/test/Relationships.Application.Tests/Relationships.Application.Tests.csproj
index 9de6183d43..3320d87932 100644
--- a/Modules/Relationships/test/Relationships.Application.Tests/Relationships.Application.Tests.csproj
+++ b/Modules/Relationships/test/Relationships.Application.Tests/Relationships.Application.Tests.csproj
@@ -5,8 +5,8 @@
-
-
+
+
diff --git a/Modules/Relationships/test/Relationships.Domain.Tests/Relationships.Domain.Tests.csproj b/Modules/Relationships/test/Relationships.Domain.Tests/Relationships.Domain.Tests.csproj
index b1a808e2e0..6d21380be8 100644
--- a/Modules/Relationships/test/Relationships.Domain.Tests/Relationships.Domain.Tests.csproj
+++ b/Modules/Relationships/test/Relationships.Domain.Tests/Relationships.Domain.Tests.csproj
@@ -5,7 +5,7 @@
-
+
diff --git a/Modules/Relationships/test/Relationships.Jobs.SanityCheck.Tests/Relationships.Jobs.SanityCheck.Tests.csproj b/Modules/Relationships/test/Relationships.Jobs.SanityCheck.Tests/Relationships.Jobs.SanityCheck.Tests.csproj
index f2b5334d83..901c77db5e 100644
--- a/Modules/Relationships/test/Relationships.Jobs.SanityCheck.Tests/Relationships.Jobs.SanityCheck.Tests.csproj
+++ b/Modules/Relationships/test/Relationships.Jobs.SanityCheck.Tests/Relationships.Jobs.SanityCheck.Tests.csproj
@@ -7,7 +7,7 @@
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
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 e910608132..e9fb9d409a 100644
--- a/Modules/Synchronization/test/Synchronization.Application.Tests/Synchronization.Application.Tests.csproj
+++ b/Modules/Synchronization/test/Synchronization.Application.Tests/Synchronization.Application.Tests.csproj
@@ -7,8 +7,8 @@
-
-
+
+
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 cf4025dc10..6e3c4257b4 100644
--- a/Modules/Synchronization/test/Synchronization.Domain.Tests/Synchronization.Domain.Tests.csproj
+++ b/Modules/Synchronization/test/Synchronization.Domain.Tests/Synchronization.Domain.Tests.csproj
@@ -6,7 +6,7 @@
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/Modules/Synchronization/test/Synchronization.Jobs.SanityCheck.Tests/Synchronization.Jobs.SanityCheck.Tests.csproj b/Modules/Synchronization/test/Synchronization.Jobs.SanityCheck.Tests/Synchronization.Jobs.SanityCheck.Tests.csproj
index 4f98c59558..3b3101d455 100644
--- a/Modules/Synchronization/test/Synchronization.Jobs.SanityCheck.Tests/Synchronization.Jobs.SanityCheck.Tests.csproj
+++ b/Modules/Synchronization/test/Synchronization.Jobs.SanityCheck.Tests/Synchronization.Jobs.SanityCheck.Tests.csproj
@@ -7,7 +7,7 @@
-
+
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 a4c8c19203..c9dc0cf419 100644
--- a/Modules/Tokens/test/Tokens.Application.Tests/Tokens.Application.Tests.csproj
+++ b/Modules/Tokens/test/Tokens.Application.Tests/Tokens.Application.Tests.csproj
@@ -5,8 +5,8 @@
-
-
+
+
diff --git a/Modules/Tokens/test/Tokens.Jobs.SanityCheck.Tests/Tokens.Jobs.SanityCheck.Tests.csproj b/Modules/Tokens/test/Tokens.Jobs.SanityCheck.Tests/Tokens.Jobs.SanityCheck.Tests.csproj
index 779a363bba..c1942ec44d 100644
--- a/Modules/Tokens/test/Tokens.Jobs.SanityCheck.Tests/Tokens.Jobs.SanityCheck.Tests.csproj
+++ b/Modules/Tokens/test/Tokens.Jobs.SanityCheck.Tests/Tokens.Jobs.SanityCheck.Tests.csproj
@@ -7,7 +7,7 @@
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive