diff --git a/src/service/idam-api/src/FamilyHubs.Idam.Api/FamilyHubs.Idam.Api.csproj b/src/service/idam-api/src/FamilyHubs.Idam.Api/FamilyHubs.Idam.Api.csproj
index e9d09c7d0..e5b7e6ebd 100644
--- a/src/service/idam-api/src/FamilyHubs.Idam.Api/FamilyHubs.Idam.Api.csproj
+++ b/src/service/idam-api/src/FamilyHubs.Idam.Api/FamilyHubs.Idam.Api.csproj
@@ -13,17 +13,17 @@
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
+
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
diff --git a/src/service/idam-api/src/FamilyHubs.Idam.Data/FamilyHubs.Idam.Data.csproj b/src/service/idam-api/src/FamilyHubs.Idam.Data/FamilyHubs.Idam.Data.csproj
index a6fd44e41..aa1aa2c53 100644
--- a/src/service/idam-api/src/FamilyHubs.Idam.Data/FamilyHubs.Idam.Data.csproj
+++ b/src/service/idam-api/src/FamilyHubs.Idam.Data/FamilyHubs.Idam.Data.csproj
@@ -10,12 +10,12 @@
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
+
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/src/service/notification-api/shared/FamilyHubs.Notification.Api.Contracts/FamilyHubs.Notification.Api.Contracts.csproj b/src/service/notification-api/shared/FamilyHubs.Notification.Api.Contracts/FamilyHubs.Notification.Api.Contracts.csproj
index f628093fb..00c2a3716 100644
--- a/src/service/notification-api/shared/FamilyHubs.Notification.Api.Contracts/FamilyHubs.Notification.Api.Contracts.csproj
+++ b/src/service/notification-api/shared/FamilyHubs.Notification.Api.Contracts/FamilyHubs.Notification.Api.Contracts.csproj
@@ -10,7 +10,7 @@
-
+
diff --git a/src/service/notification-api/src/FamilyHubs.Notification.Api.Client/FamilyHubs.Notification.Api.Client.csproj b/src/service/notification-api/src/FamilyHubs.Notification.Api.Client/FamilyHubs.Notification.Api.Client.csproj
index 9988ba45c..fd271506c 100644
--- a/src/service/notification-api/src/FamilyHubs.Notification.Api.Client/FamilyHubs.Notification.Api.Client.csproj
+++ b/src/service/notification-api/src/FamilyHubs.Notification.Api.Client/FamilyHubs.Notification.Api.Client.csproj
@@ -17,7 +17,7 @@
-
+
all
diff --git a/src/service/notification-api/src/FamilyHubs.Notification.Api/FamilyHubs.Notification.Api.csproj b/src/service/notification-api/src/FamilyHubs.Notification.Api/FamilyHubs.Notification.Api.csproj
index 032b42201..9a4a8b334 100644
--- a/src/service/notification-api/src/FamilyHubs.Notification.Api/FamilyHubs.Notification.Api.csproj
+++ b/src/service/notification-api/src/FamilyHubs.Notification.Api/FamilyHubs.Notification.Api.csproj
@@ -8,8 +8,8 @@
-
-
+
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/src/service/notification-api/src/FamilyHubs.Notification.Data/FamilyHubs.Notification.Data.csproj b/src/service/notification-api/src/FamilyHubs.Notification.Data/FamilyHubs.Notification.Data.csproj
index bf9be5911..e5904a330 100644
--- a/src/service/notification-api/src/FamilyHubs.Notification.Data/FamilyHubs.Notification.Data.csproj
+++ b/src/service/notification-api/src/FamilyHubs.Notification.Data/FamilyHubs.Notification.Data.csproj
@@ -15,11 +15,11 @@
-
-
-
-
-
+
+
+
+
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/src/service/referral-api/src/FamilyHubs.Referral.Api/FamilyHubs.Referral.Api.csproj b/src/service/referral-api/src/FamilyHubs.Referral.Api/FamilyHubs.Referral.Api.csproj
index 50e3ce72e..264746d7c 100644
--- a/src/service/referral-api/src/FamilyHubs.Referral.Api/FamilyHubs.Referral.Api.csproj
+++ b/src/service/referral-api/src/FamilyHubs.Referral.Api/FamilyHubs.Referral.Api.csproj
@@ -12,8 +12,8 @@
-
-
+
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/src/service/referral-api/src/FamilyHubs.Referral.Data/FamilyHubs.Referral.Data.csproj b/src/service/referral-api/src/FamilyHubs.Referral.Data/FamilyHubs.Referral.Data.csproj
index 7db43efb2..1df270887 100644
--- a/src/service/referral-api/src/FamilyHubs.Referral.Data/FamilyHubs.Referral.Data.csproj
+++ b/src/service/referral-api/src/FamilyHubs.Referral.Data/FamilyHubs.Referral.Data.csproj
@@ -15,11 +15,11 @@
-
-
-
-
-
+
+
+
+
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/src/service/report-api/src/FamilyHubs.Report.Api/FamilyHubs.Report.Api.csproj b/src/service/report-api/src/FamilyHubs.Report.Api/FamilyHubs.Report.Api.csproj
index 18210f1ba..317a9d701 100644
--- a/src/service/report-api/src/FamilyHubs.Report.Api/FamilyHubs.Report.Api.csproj
+++ b/src/service/report-api/src/FamilyHubs.Report.Api/FamilyHubs.Report.Api.csproj
@@ -11,9 +11,9 @@
-
-
-
+
+
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/src/service/report-api/src/FamilyHubs.Report.Data/FamilyHubs.Report.Data.csproj b/src/service/report-api/src/FamilyHubs.Report.Data/FamilyHubs.Report.Data.csproj
index 82f14c539..1c202d0b7 100644
--- a/src/service/report-api/src/FamilyHubs.Report.Data/FamilyHubs.Report.Data.csproj
+++ b/src/service/report-api/src/FamilyHubs.Report.Data/FamilyHubs.Report.Data.csproj
@@ -9,12 +9,12 @@
-
-
+
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
diff --git a/src/service/service-directory-api/acceptance-tests/FamilyHubs.ServiceDirectory.Api.AcceptanceTests/FamilyHubs.ServiceDirectory.Api.AcceptanceTests.csproj b/src/service/service-directory-api/acceptance-tests/FamilyHubs.ServiceDirectory.Api.AcceptanceTests/FamilyHubs.ServiceDirectory.Api.AcceptanceTests.csproj
index f8f6633bc..e2ff366b9 100644
--- a/src/service/service-directory-api/acceptance-tests/FamilyHubs.ServiceDirectory.Api.AcceptanceTests/FamilyHubs.ServiceDirectory.Api.AcceptanceTests.csproj
+++ b/src/service/service-directory-api/acceptance-tests/FamilyHubs.ServiceDirectory.Api.AcceptanceTests/FamilyHubs.ServiceDirectory.Api.AcceptanceTests.csproj
@@ -12,7 +12,7 @@
-
+
diff --git a/src/service/service-directory-api/src/FamilyHubs.ServiceDirectory.Api/FamilyHubs.ServiceDirectory.Api.csproj b/src/service/service-directory-api/src/FamilyHubs.ServiceDirectory.Api/FamilyHubs.ServiceDirectory.Api.csproj
index 9ecfcb9e5..3b66dd257 100644
--- a/src/service/service-directory-api/src/FamilyHubs.ServiceDirectory.Api/FamilyHubs.ServiceDirectory.Api.csproj
+++ b/src/service/service-directory-api/src/FamilyHubs.ServiceDirectory.Api/FamilyHubs.ServiceDirectory.Api.csproj
@@ -12,17 +12,17 @@
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
+
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
diff --git a/src/service/service-directory-api/src/FamilyHubs.ServiceDirectory.Core/FamilyHubs.ServiceDirectory.Core.csproj b/src/service/service-directory-api/src/FamilyHubs.ServiceDirectory.Core/FamilyHubs.ServiceDirectory.Core.csproj
index ad4173172..0c329400c 100644
--- a/src/service/service-directory-api/src/FamilyHubs.ServiceDirectory.Core/FamilyHubs.ServiceDirectory.Core.csproj
+++ b/src/service/service-directory-api/src/FamilyHubs.ServiceDirectory.Core/FamilyHubs.ServiceDirectory.Core.csproj
@@ -15,7 +15,7 @@
-
+
all
diff --git a/src/service/service-directory-api/src/FamilyHubs.ServiceDirectory.Data/FamilyHubs.ServiceDirectory.Data.csproj b/src/service/service-directory-api/src/FamilyHubs.ServiceDirectory.Data/FamilyHubs.ServiceDirectory.Data.csproj
index 02c50f05f..1286c48d8 100644
--- a/src/service/service-directory-api/src/FamilyHubs.ServiceDirectory.Data/FamilyHubs.ServiceDirectory.Data.csproj
+++ b/src/service/service-directory-api/src/FamilyHubs.ServiceDirectory.Data/FamilyHubs.ServiceDirectory.Data.csproj
@@ -13,14 +13,14 @@
-
-
-
+
+
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
+
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/src/shared/referral-shared/src/FamilyHubs.ReferralService.Shared/FamilyHubs.ReferralService.Shared.csproj b/src/shared/referral-shared/src/FamilyHubs.ReferralService.Shared/FamilyHubs.ReferralService.Shared.csproj
index db9936b4b..bad33c3b4 100644
--- a/src/shared/referral-shared/src/FamilyHubs.ReferralService.Shared/FamilyHubs.ReferralService.Shared.csproj
+++ b/src/shared/referral-shared/src/FamilyHubs.ReferralService.Shared/FamilyHubs.ReferralService.Shared.csproj
@@ -11,7 +11,7 @@
-
+
diff --git a/src/shared/service-directory-shared/src/FamilyHubs.ServiceDirectory.Shared/FamilyHubs.ServiceDirectory.Shared.csproj b/src/shared/service-directory-shared/src/FamilyHubs.ServiceDirectory.Shared/FamilyHubs.ServiceDirectory.Shared.csproj
index cd8bb7249..6381d4400 100644
--- a/src/shared/service-directory-shared/src/FamilyHubs.ServiceDirectory.Shared/FamilyHubs.ServiceDirectory.Shared.csproj
+++ b/src/shared/service-directory-shared/src/FamilyHubs.ServiceDirectory.Shared/FamilyHubs.ServiceDirectory.Shared.csproj
@@ -11,7 +11,7 @@
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/src/shared/shared-kernel/src/EntityFrameworkCore.DataEncryption/EntityFrameworkCore.DataEncryption.csproj b/src/shared/shared-kernel/src/EntityFrameworkCore.DataEncryption/EntityFrameworkCore.DataEncryption.csproj
index fdbe89988..51a95de9c 100644
--- a/src/shared/shared-kernel/src/EntityFrameworkCore.DataEncryption/EntityFrameworkCore.DataEncryption.csproj
+++ b/src/shared/shared-kernel/src/EntityFrameworkCore.DataEncryption/EntityFrameworkCore.DataEncryption.csproj
@@ -42,7 +42,7 @@
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/src/shared/shared-kernel/src/fh-shared-kernel.shared-kernel/FamilyHubs.SharedKernel.csproj b/src/shared/shared-kernel/src/fh-shared-kernel.shared-kernel/FamilyHubs.SharedKernel.csproj
index fb7c0efda..e82bbef17 100644
--- a/src/shared/shared-kernel/src/fh-shared-kernel.shared-kernel/FamilyHubs.SharedKernel.csproj
+++ b/src/shared/shared-kernel/src/fh-shared-kernel.shared-kernel/FamilyHubs.SharedKernel.csproj
@@ -27,20 +27,20 @@
-
-
-
-
+
+
+
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
-
+
@@ -50,7 +50,7 @@
-
+
all
diff --git a/src/shared/web-components/src/FamilyHubs.SharedKernel.Razor/FamilyHubs.SharedKernel.Razor.csproj b/src/shared/web-components/src/FamilyHubs.SharedKernel.Razor/FamilyHubs.SharedKernel.Razor.csproj
index e285a9d6f..4a1e49259 100644
--- a/src/shared/web-components/src/FamilyHubs.SharedKernel.Razor/FamilyHubs.SharedKernel.Razor.csproj
+++ b/src/shared/web-components/src/FamilyHubs.SharedKernel.Razor/FamilyHubs.SharedKernel.Razor.csproj
@@ -21,8 +21,8 @@
-
-
+
+
diff --git a/src/ui/connect-ui/src/FamilyHubs.Referral.Core/FamilyHubs.Referral.Core.csproj b/src/ui/connect-ui/src/FamilyHubs.Referral.Core/FamilyHubs.Referral.Core.csproj
index 64d081560..0fcbcec08 100644
--- a/src/ui/connect-ui/src/FamilyHubs.Referral.Core/FamilyHubs.Referral.Core.csproj
+++ b/src/ui/connect-ui/src/FamilyHubs.Referral.Core/FamilyHubs.Referral.Core.csproj
@@ -17,7 +17,7 @@
-
+
all
diff --git a/src/ui/find-ui/src/FamilyHubs.ServiceDirectory.Infrastructure/FamilyHubs.ServiceDirectory.Infrastructure.csproj b/src/ui/find-ui/src/FamilyHubs.ServiceDirectory.Infrastructure/FamilyHubs.ServiceDirectory.Infrastructure.csproj
index 49553c0e0..049a64a71 100644
--- a/src/ui/find-ui/src/FamilyHubs.ServiceDirectory.Infrastructure/FamilyHubs.ServiceDirectory.Infrastructure.csproj
+++ b/src/ui/find-ui/src/FamilyHubs.ServiceDirectory.Infrastructure/FamilyHubs.ServiceDirectory.Infrastructure.csproj
@@ -19,7 +19,7 @@
-
+
all
diff --git a/src/ui/idam-maintenance-ui/src/FamilyHubs.Idams.Maintenance.Data/FamilyHubs.Idams.Maintenance.Data.csproj b/src/ui/idam-maintenance-ui/src/FamilyHubs.Idams.Maintenance.Data/FamilyHubs.Idams.Maintenance.Data.csproj
index b3ee8ea8f..269642604 100644
--- a/src/ui/idam-maintenance-ui/src/FamilyHubs.Idams.Maintenance.Data/FamilyHubs.Idams.Maintenance.Data.csproj
+++ b/src/ui/idam-maintenance-ui/src/FamilyHubs.Idams.Maintenance.Data/FamilyHubs.Idams.Maintenance.Data.csproj
@@ -9,8 +9,8 @@
-
-
+
+
diff --git a/src/ui/idam-maintenance-ui/src/FamilyHubs.Idams.Maintenance.UI/FamilyHubs.Idams.Maintenance.UI.csproj b/src/ui/idam-maintenance-ui/src/FamilyHubs.Idams.Maintenance.UI/FamilyHubs.Idams.Maintenance.UI.csproj
index 1cd0b4fed..e64dfe124 100644
--- a/src/ui/idam-maintenance-ui/src/FamilyHubs.Idams.Maintenance.UI/FamilyHubs.Idams.Maintenance.UI.csproj
+++ b/src/ui/idam-maintenance-ui/src/FamilyHubs.Idams.Maintenance.UI/FamilyHubs.Idams.Maintenance.UI.csproj
@@ -62,7 +62,7 @@
-
+
diff --git a/src/ui/manage-ui/Test/FamilyHubs.ServiceDirectory.Admin.Web.IntegrationTests/FamilyHubs.ServiceDirectory.Admin.Web.IntegrationTests.csproj b/src/ui/manage-ui/Test/FamilyHubs.ServiceDirectory.Admin.Web.IntegrationTests/FamilyHubs.ServiceDirectory.Admin.Web.IntegrationTests.csproj
index aef31093d..218bc8e29 100644
--- a/src/ui/manage-ui/Test/FamilyHubs.ServiceDirectory.Admin.Web.IntegrationTests/FamilyHubs.ServiceDirectory.Admin.Web.IntegrationTests.csproj
+++ b/src/ui/manage-ui/Test/FamilyHubs.ServiceDirectory.Admin.Web.IntegrationTests/FamilyHubs.ServiceDirectory.Admin.Web.IntegrationTests.csproj
@@ -10,7 +10,7 @@
-
+
diff --git a/src/ui/manage-ui/src/FamilyHubs.ServiceDirectory.Admin.Core/FamilyHubs.ServiceDirectory.Admin.Core.csproj b/src/ui/manage-ui/src/FamilyHubs.ServiceDirectory.Admin.Core/FamilyHubs.ServiceDirectory.Admin.Core.csproj
index 87c7b68bc..bf2ba4141 100644
--- a/src/ui/manage-ui/src/FamilyHubs.ServiceDirectory.Admin.Core/FamilyHubs.ServiceDirectory.Admin.Core.csproj
+++ b/src/ui/manage-ui/src/FamilyHubs.ServiceDirectory.Admin.Core/FamilyHubs.ServiceDirectory.Admin.Core.csproj
@@ -26,7 +26,7 @@
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive