diff --git a/data/BookingsDataExtracts/BookingsDataExtracts.csproj b/data/BookingsDataExtracts/BookingsDataExtracts.csproj
index 01f32bbd4..9173028aa 100644
--- a/data/BookingsDataExtracts/BookingsDataExtracts.csproj
+++ b/data/BookingsDataExtracts/BookingsDataExtracts.csproj
@@ -10,11 +10,11 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/data/CapacityDataExtract/CapacityDataExtracts.csproj b/data/CapacityDataExtract/CapacityDataExtracts.csproj
index 8277872db..7f030f99a 100644
--- a/data/CapacityDataExtract/CapacityDataExtracts.csproj
+++ b/data/CapacityDataExtract/CapacityDataExtracts.csproj
@@ -10,10 +10,10 @@
-
-
-
-
+
+
+
+
diff --git a/data/DataExtract/DataExtract.csproj b/data/DataExtract/DataExtract.csproj
index 2b33a7178..aad27ae5b 100644
--- a/data/DataExtract/DataExtract.csproj
+++ b/data/DataExtract/DataExtract.csproj
@@ -7,12 +7,15 @@
-
-
+
+
+
+
+
diff --git a/data/MeshUtil/MeshUtil.csproj b/data/MeshUtil/MeshUtil.csproj
index 8ad822287..60c69c82e 100644
--- a/data/MeshUtil/MeshUtil.csproj
+++ b/data/MeshUtil/MeshUtil.csproj
@@ -8,13 +8,13 @@
-
+
-
-
-
+
+
+
diff --git a/src/api/Nhs.Appointments.Api/Nhs.Appointments.Api.csproj b/src/api/Nhs.Appointments.Api/Nhs.Appointments.Api.csproj
index 60098f5ca..0e5974eed 100644
--- a/src/api/Nhs.Appointments.Api/Nhs.Appointments.Api.csproj
+++ b/src/api/Nhs.Appointments.Api/Nhs.Appointments.Api.csproj
@@ -14,38 +14,38 @@
AnyCPU
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
+
+
-
+
diff --git a/src/api/Nhs.Appointments.Audit/Nhs.Appointments.Audit.csproj b/src/api/Nhs.Appointments.Audit/Nhs.Appointments.Audit.csproj
index 1a1e2fadc..924189ba4 100644
--- a/src/api/Nhs.Appointments.Audit/Nhs.Appointments.Audit.csproj
+++ b/src/api/Nhs.Appointments.Audit/Nhs.Appointments.Audit.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/src/api/Nhs.Appointments.Core/Nhs.Appointments.Core.csproj b/src/api/Nhs.Appointments.Core/Nhs.Appointments.Core.csproj
index 5e8f8571d..2e34ffb6b 100644
--- a/src/api/Nhs.Appointments.Core/Nhs.Appointments.Core.csproj
+++ b/src/api/Nhs.Appointments.Core/Nhs.Appointments.Core.csproj
@@ -8,24 +8,30 @@
-
+
-
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
<_Parameter1>Nhs.Appointments.Core.UnitTests
diff --git a/src/api/Nhs.Appointments.Persistance/Nhs.Appointments.Persistance.csproj b/src/api/Nhs.Appointments.Persistance/Nhs.Appointments.Persistance.csproj
index 9562279b8..61a5ab5bf 100644
--- a/src/api/Nhs.Appointments.Persistance/Nhs.Appointments.Persistance.csproj
+++ b/src/api/Nhs.Appointments.Persistance/Nhs.Appointments.Persistance.csproj
@@ -8,9 +8,9 @@
-
-
-
+
+
+
@@ -24,6 +24,16 @@
+
+
+
+
+
+
+
+
+
+
<_Parameter1>Nhs.Appointments.Persistance.UnitTests
diff --git a/src/jobs/Nhs.Appointments.Jobs.BlobAuditor/Nhs.Appointments.Jobs.BlobAuditor.csproj b/src/jobs/Nhs.Appointments.Jobs.BlobAuditor/Nhs.Appointments.Jobs.BlobAuditor.csproj
index 8f4df8af5..743ccf708 100644
--- a/src/jobs/Nhs.Appointments.Jobs.BlobAuditor/Nhs.Appointments.Jobs.BlobAuditor.csproj
+++ b/src/jobs/Nhs.Appointments.Jobs.BlobAuditor/Nhs.Appointments.Jobs.BlobAuditor.csproj
@@ -18,13 +18,13 @@
-
+
-
-
-
-
-
+
+
+
+
+
diff --git a/src/libraries/Nbs.MeshClient/Nbs.MeshClient.csproj b/src/libraries/Nbs.MeshClient/Nbs.MeshClient.csproj
index 5c84070df..284e4c807 100644
--- a/src/libraries/Nbs.MeshClient/Nbs.MeshClient.csproj
+++ b/src/libraries/Nbs.MeshClient/Nbs.MeshClient.csproj
@@ -10,11 +10,11 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/tests/BookingDataExtractTests/BookingDataExtracts.Integration.csproj b/tests/BookingDataExtractTests/BookingDataExtracts.Integration.csproj
index 330e73294..b29a2eea4 100644
--- a/tests/BookingDataExtractTests/BookingDataExtracts.Integration.csproj
+++ b/tests/BookingDataExtractTests/BookingDataExtracts.Integration.csproj
@@ -12,11 +12,11 @@
-
+
-
+
diff --git a/tests/BookingDataExtracts.UnitTests/BookingDataExtracts.UnitTests.csproj b/tests/BookingDataExtracts.UnitTests/BookingDataExtracts.UnitTests.csproj
index fa851d5f1..096f9e275 100644
--- a/tests/BookingDataExtracts.UnitTests/BookingDataExtracts.UnitTests.csproj
+++ b/tests/BookingDataExtracts.UnitTests/BookingDataExtracts.UnitTests.csproj
@@ -12,9 +12,9 @@
-
+
-
+
diff --git a/tests/CapacityDataExtracts.Integration/CapacityDataExtracts.Integration.csproj b/tests/CapacityDataExtracts.Integration/CapacityDataExtracts.Integration.csproj
index 8838cc7a1..27c8c4898 100644
--- a/tests/CapacityDataExtracts.Integration/CapacityDataExtracts.Integration.csproj
+++ b/tests/CapacityDataExtracts.Integration/CapacityDataExtracts.Integration.csproj
@@ -12,11 +12,11 @@
-
+
-
+
diff --git a/tests/CapacityDataExtracts.UnitTests/CapacityDataExtracts.UnitTests.csproj b/tests/CapacityDataExtracts.UnitTests/CapacityDataExtracts.UnitTests.csproj
index a9b575c09..a520d8da0 100644
--- a/tests/CapacityDataExtracts.UnitTests/CapacityDataExtracts.UnitTests.csproj
+++ b/tests/CapacityDataExtracts.UnitTests/CapacityDataExtracts.UnitTests.csproj
@@ -11,9 +11,9 @@
-
+
-
+
diff --git a/tests/CosmosDbSeederTests/CosmosDbSeederTests.csproj b/tests/CosmosDbSeederTests/CosmosDbSeederTests.csproj
index bca047265..dfb3a9eb4 100644
--- a/tests/CosmosDbSeederTests/CosmosDbSeederTests.csproj
+++ b/tests/CosmosDbSeederTests/CosmosDbSeederTests.csproj
@@ -11,9 +11,9 @@
-
+
-
+
diff --git a/tests/Nhs.Appointments.Api.Integration/Nhs.Appointments.Api.Integration.csproj b/tests/Nhs.Appointments.Api.Integration/Nhs.Appointments.Api.Integration.csproj
index 435a4a15b..f5544dcd1 100644
--- a/tests/Nhs.Appointments.Api.Integration/Nhs.Appointments.Api.Integration.csproj
+++ b/tests/Nhs.Appointments.Api.Integration/Nhs.Appointments.Api.Integration.csproj
@@ -11,10 +11,10 @@
-
+
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/tests/Nhs.Appointments.Api.UnitTests/Nhs.Appointments.Api.UnitTests.csproj b/tests/Nhs.Appointments.Api.UnitTests/Nhs.Appointments.Api.UnitTests.csproj
index 349f88319..256ab3967 100644
--- a/tests/Nhs.Appointments.Api.UnitTests/Nhs.Appointments.Api.UnitTests.csproj
+++ b/tests/Nhs.Appointments.Api.UnitTests/Nhs.Appointments.Api.UnitTests.csproj
@@ -11,14 +11,14 @@
-
-
-
-
-
+
+
+
+
+
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/tests/Nhs.Appointments.Core.UnitTests/Nhs.Appointments.Core.UnitTests.csproj b/tests/Nhs.Appointments.Core.UnitTests/Nhs.Appointments.Core.UnitTests.csproj
index 180fcca02..c19da1f38 100644
--- a/tests/Nhs.Appointments.Core.UnitTests/Nhs.Appointments.Core.UnitTests.csproj
+++ b/tests/Nhs.Appointments.Core.UnitTests/Nhs.Appointments.Core.UnitTests.csproj
@@ -10,11 +10,11 @@
-
+
-
+
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/tests/Nhs.Appointments.Jobs.BlobAuditor.Integration/Nhs.Appointments.Jobs.BlobAuditor.Integration.csproj b/tests/Nhs.Appointments.Jobs.BlobAuditor.Integration/Nhs.Appointments.Jobs.BlobAuditor.Integration.csproj
index 50671690e..57f0057c1 100644
--- a/tests/Nhs.Appointments.Jobs.BlobAuditor.Integration/Nhs.Appointments.Jobs.BlobAuditor.Integration.csproj
+++ b/tests/Nhs.Appointments.Jobs.BlobAuditor.Integration/Nhs.Appointments.Jobs.BlobAuditor.Integration.csproj
@@ -11,10 +11,10 @@
-
+
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/tests/Nhs.Appointments.Jobs.BlobAuditor.UnitTests/Nhs.Appointments.Jobs.BlobAuditor.UnitTests.csproj b/tests/Nhs.Appointments.Jobs.BlobAuditor.UnitTests/Nhs.Appointments.Jobs.BlobAuditor.UnitTests.csproj
index 75c6e0893..9c7935659 100644
--- a/tests/Nhs.Appointments.Jobs.BlobAuditor.UnitTests/Nhs.Appointments.Jobs.BlobAuditor.UnitTests.csproj
+++ b/tests/Nhs.Appointments.Jobs.BlobAuditor.UnitTests/Nhs.Appointments.Jobs.BlobAuditor.UnitTests.csproj
@@ -9,10 +9,10 @@
-
+
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/tests/Nhs.Appointments.Persistance.UnitTests/Nhs.Appointments.Persistance.UnitTests.csproj b/tests/Nhs.Appointments.Persistance.UnitTests/Nhs.Appointments.Persistance.UnitTests.csproj
index f9663bc61..d870e7a79 100644
--- a/tests/Nhs.Appointments.Persistance.UnitTests/Nhs.Appointments.Persistance.UnitTests.csproj
+++ b/tests/Nhs.Appointments.Persistance.UnitTests/Nhs.Appointments.Persistance.UnitTests.csproj
@@ -11,7 +11,7 @@
-
+