diff --git a/AdminApi/src/AdminApi/AdminApi.csproj b/AdminApi/src/AdminApi/AdminApi.csproj
index 53962c73ba..bfeb4ae5df 100644
--- a/AdminApi/src/AdminApi/AdminApi.csproj
+++ b/AdminApi/src/AdminApi/AdminApi.csproj
@@ -9,13 +9,13 @@
-
+
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
@@ -30,7 +30,7 @@
-
+
diff --git a/AdminApi/test/AdminApi.Tests.Integration/AdminApi.Tests.Integration.csproj b/AdminApi/test/AdminApi.Tests.Integration/AdminApi.Tests.Integration.csproj
index a2f89e9055..377c0dccb8 100644
--- a/AdminApi/test/AdminApi.Tests.Integration/AdminApi.Tests.Integration.csproj
+++ b/AdminApi/test/AdminApi.Tests.Integration/AdminApi.Tests.Integration.csproj
@@ -5,7 +5,7 @@
-
+
diff --git a/BuildingBlocks/src/BuildingBlocks.API/BuildingBlocks.API.csproj b/BuildingBlocks/src/BuildingBlocks.API/BuildingBlocks.API.csproj
index 45ce4a0207..d22e79cd5d 100644
--- a/BuildingBlocks/src/BuildingBlocks.API/BuildingBlocks.API.csproj
+++ b/BuildingBlocks/src/BuildingBlocks.API/BuildingBlocks.API.csproj
@@ -3,9 +3,9 @@
-
-
-
+
+
+
diff --git a/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/BuildingBlocks.Application.Abstractions.csproj b/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/BuildingBlocks.Application.Abstractions.csproj
index 479b64260c..9dd682948f 100644
--- a/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/BuildingBlocks.Application.Abstractions.csproj
+++ b/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/BuildingBlocks.Application.Abstractions.csproj
@@ -11,7 +11,7 @@
-
+
diff --git a/BuildingBlocks/src/BuildingBlocks.Application/BuildingBlocks.Application.csproj b/BuildingBlocks/src/BuildingBlocks.Application/BuildingBlocks.Application.csproj
index d0b3f320c7..ba4e584106 100644
--- a/BuildingBlocks/src/BuildingBlocks.Application/BuildingBlocks.Application.csproj
+++ b/BuildingBlocks/src/BuildingBlocks.Application/BuildingBlocks.Application.csproj
@@ -3,7 +3,7 @@
-
+
diff --git a/BuildingBlocks/src/BuildingBlocks.Infrastructure/BuildingBlocks.Infrastructure.csproj b/BuildingBlocks/src/BuildingBlocks.Infrastructure/BuildingBlocks.Infrastructure.csproj
index 3faac7a1d1..598066f8a5 100644
--- a/BuildingBlocks/src/BuildingBlocks.Infrastructure/BuildingBlocks.Infrastructure.csproj
+++ b/BuildingBlocks/src/BuildingBlocks.Infrastructure/BuildingBlocks.Infrastructure.csproj
@@ -2,20 +2,20 @@
-
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
-
+
diff --git a/BuildingBlocks/src/Tooling/Tooling.csproj b/BuildingBlocks/src/Tooling/Tooling.csproj
index 2ff7a5b632..a3e2c12de6 100644
--- a/BuildingBlocks/src/Tooling/Tooling.csproj
+++ b/BuildingBlocks/src/Tooling/Tooling.csproj
@@ -1,7 +1,7 @@
-
+
diff --git a/BuildingBlocks/src/UnitTestTools/UnitTestTools.csproj b/BuildingBlocks/src/UnitTestTools/UnitTestTools.csproj
index b9d6db1aa7..60b1688e48 100644
--- a/BuildingBlocks/src/UnitTestTools/UnitTestTools.csproj
+++ b/BuildingBlocks/src/UnitTestTools/UnitTestTools.csproj
@@ -8,7 +8,7 @@
-
+
diff --git a/BuildingBlocks/test/BuildingBlocks.Infrastructure.Tests/BuildingBlocks.Infrastructure.Tests.csproj b/BuildingBlocks/test/BuildingBlocks.Infrastructure.Tests/BuildingBlocks.Infrastructure.Tests.csproj
index ea7c9c627b..c53726ce0d 100644
--- a/BuildingBlocks/test/BuildingBlocks.Infrastructure.Tests/BuildingBlocks.Infrastructure.Tests.csproj
+++ b/BuildingBlocks/test/BuildingBlocks.Infrastructure.Tests/BuildingBlocks.Infrastructure.Tests.csproj
@@ -14,7 +14,7 @@
all
-
+
all
diff --git a/Common/src/Common.Infrastructure/Common.Infrastructure.csproj b/Common/src/Common.Infrastructure/Common.Infrastructure.csproj
index 12cb4890aa..cd8c436c0b 100644
--- a/Common/src/Common.Infrastructure/Common.Infrastructure.csproj
+++ b/Common/src/Common.Infrastructure/Common.Infrastructure.csproj
@@ -1,8 +1,8 @@
-
-
+
+
diff --git a/ConsumerApi.Tests.Integration/ConsumerApi.Tests.Integration.csproj b/ConsumerApi.Tests.Integration/ConsumerApi.Tests.Integration.csproj
index f266025eb5..66336fca88 100644
--- a/ConsumerApi.Tests.Integration/ConsumerApi.Tests.Integration.csproj
+++ b/ConsumerApi.Tests.Integration/ConsumerApi.Tests.Integration.csproj
@@ -5,7 +5,7 @@
-
+
diff --git a/ConsumerApi/ConsumerApi.csproj b/ConsumerApi/ConsumerApi.csproj
index 7cda8e8108..b2862b524e 100644
--- a/ConsumerApi/ConsumerApi.csproj
+++ b/ConsumerApi/ConsumerApi.csproj
@@ -7,15 +7,15 @@
-
+
-
+
-
-
+
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
true
@@ -29,7 +29,7 @@
-
+
diff --git a/Modules/Challenges/src/Challenges.Infrastructure/Challenges.Infrastructure.csproj b/Modules/Challenges/src/Challenges.Infrastructure/Challenges.Infrastructure.csproj
index fe1f4856e8..2acc0158f4 100644
--- a/Modules/Challenges/src/Challenges.Infrastructure/Challenges.Infrastructure.csproj
+++ b/Modules/Challenges/src/Challenges.Infrastructure/Challenges.Infrastructure.csproj
@@ -1,8 +1,8 @@
-
-
+
+
diff --git a/Modules/Devices/src/Devices.Application/Devices.Application.csproj b/Modules/Devices/src/Devices.Application/Devices.Application.csproj
index 98e839dcc8..5b72e2b7a6 100644
--- a/Modules/Devices/src/Devices.Application/Devices.Application.csproj
+++ b/Modules/Devices/src/Devices.Application/Devices.Application.csproj
@@ -3,8 +3,8 @@
-
-
+
+
diff --git a/Modules/Devices/src/Devices.Domain/Devices.Domain.csproj b/Modules/Devices/src/Devices.Domain/Devices.Domain.csproj
index e660efb4ae..46adb66e38 100644
--- a/Modules/Devices/src/Devices.Domain/Devices.Domain.csproj
+++ b/Modules/Devices/src/Devices.Domain/Devices.Domain.csproj
@@ -1,7 +1,7 @@
-
+
diff --git a/Modules/Devices/src/Devices.Infrastructure/Devices.Infrastructure.csproj b/Modules/Devices/src/Devices.Infrastructure/Devices.Infrastructure.csproj
index 5adb6d3dfa..ce5a6a5988 100644
--- a/Modules/Devices/src/Devices.Infrastructure/Devices.Infrastructure.csproj
+++ b/Modules/Devices/src/Devices.Infrastructure/Devices.Infrastructure.csproj
@@ -3,19 +3,19 @@
-
-
-
+
+
+
-
-
+
+
-
-
-
-
+
+
+
+
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 b2a74f67de..b881db6b4e 100644
--- a/Modules/Devices/test/Devices.Domain.Tests/Devices.Domain.Tests.csproj
+++ b/Modules/Devices/test/Devices.Domain.Tests/Devices.Domain.Tests.csproj
@@ -17,7 +17,7 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
all
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/Modules/Files/src/Files.Infrastructure/Files.Infrastructure.csproj b/Modules/Files/src/Files.Infrastructure/Files.Infrastructure.csproj
index 700382c101..a4b0f03d96 100644
--- a/Modules/Files/src/Files.Infrastructure/Files.Infrastructure.csproj
+++ b/Modules/Files/src/Files.Infrastructure/Files.Infrastructure.csproj
@@ -1,8 +1,8 @@
-
-
+
+
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 12b5f2246f..09bee01299 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
@@ -16,7 +16,7 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
all
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/Modules/Messages/src/Messages.Infrastructure/Messages.Infrastructure.csproj b/Modules/Messages/src/Messages.Infrastructure/Messages.Infrastructure.csproj
index ed9356d36d..3552fc9966 100644
--- a/Modules/Messages/src/Messages.Infrastructure/Messages.Infrastructure.csproj
+++ b/Modules/Messages/src/Messages.Infrastructure/Messages.Infrastructure.csproj
@@ -1,8 +1,8 @@
-
-
+
+
diff --git a/Modules/Quotas/src/Quotas.Infrastructure/Quotas.Infrastructure.csproj b/Modules/Quotas/src/Quotas.Infrastructure/Quotas.Infrastructure.csproj
index 94291fe04a..374c7d2489 100644
--- a/Modules/Quotas/src/Quotas.Infrastructure/Quotas.Infrastructure.csproj
+++ b/Modules/Quotas/src/Quotas.Infrastructure/Quotas.Infrastructure.csproj
@@ -1,10 +1,10 @@
-
-
+
+
-
+
diff --git a/Modules/Relationships/src/Relationships.Infrastructure/Relationships.Infrastructure.csproj b/Modules/Relationships/src/Relationships.Infrastructure/Relationships.Infrastructure.csproj
index 07ec409344..72dea2afa0 100644
--- a/Modules/Relationships/src/Relationships.Infrastructure/Relationships.Infrastructure.csproj
+++ b/Modules/Relationships/src/Relationships.Infrastructure/Relationships.Infrastructure.csproj
@@ -1,8 +1,8 @@
-
-
+
+
diff --git a/Modules/Synchronization/src/Synchronization.Infrastructure/Synchronization.Infrastructure.csproj b/Modules/Synchronization/src/Synchronization.Infrastructure/Synchronization.Infrastructure.csproj
index 0d3912b231..0f035c782d 100644
--- a/Modules/Synchronization/src/Synchronization.Infrastructure/Synchronization.Infrastructure.csproj
+++ b/Modules/Synchronization/src/Synchronization.Infrastructure/Synchronization.Infrastructure.csproj
@@ -7,9 +7,9 @@
-
-
-
+
+
+
diff --git a/Modules/Tokens/src/Tokens.Infrastructure/Tokens.Infrastructure.csproj b/Modules/Tokens/src/Tokens.Infrastructure/Tokens.Infrastructure.csproj
index 0ef6a34253..4376680fdc 100644
--- a/Modules/Tokens/src/Tokens.Infrastructure/Tokens.Infrastructure.csproj
+++ b/Modules/Tokens/src/Tokens.Infrastructure/Tokens.Infrastructure.csproj
@@ -1,8 +1,8 @@
-
-
+
+