diff --git a/Apps/AccountDataAccess/test/unit/AccountDataAccessTests.csproj b/Apps/AccountDataAccess/test/unit/AccountDataAccessTests.csproj
index 0836fa017d..a69d2409fe 100644
--- a/Apps/AccountDataAccess/test/unit/AccountDataAccessTests.csproj
+++ b/Apps/AccountDataAccess/test/unit/AccountDataAccessTests.csproj
@@ -20,7 +20,7 @@
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/Apps/Admin/Client/Admin.Client.csproj b/Apps/Admin/Client/Admin.Client.csproj
index 3088633b7c..42c4033673 100644
--- a/Apps/Admin/Client/Admin.Client.csproj
+++ b/Apps/Admin/Client/Admin.Client.csproj
@@ -14,12 +14,12 @@
-
-
-
+
+
+
-
-
+
+
diff --git a/Apps/Admin/Tests/Admin.Tests.csproj b/Apps/Admin/Tests/Admin.Tests.csproj
index 9d685fbd5b..3edd53c06f 100644
--- a/Apps/Admin/Tests/Admin.Tests.csproj
+++ b/Apps/Admin/Tests/Admin.Tests.csproj
@@ -10,7 +10,7 @@
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/Apps/ClinicalDocument/src/ClinicalDocument.csproj b/Apps/ClinicalDocument/src/ClinicalDocument.csproj
index 9099904a85..8a4c0d6f38 100644
--- a/Apps/ClinicalDocument/src/ClinicalDocument.csproj
+++ b/Apps/ClinicalDocument/src/ClinicalDocument.csproj
@@ -29,6 +29,6 @@
-
+
diff --git a/Apps/ClinicalDocument/test/unit/ClinicalDocumentTests.csproj b/Apps/ClinicalDocument/test/unit/ClinicalDocumentTests.csproj
index f47ecf734f..9613698919 100644
--- a/Apps/ClinicalDocument/test/unit/ClinicalDocumentTests.csproj
+++ b/Apps/ClinicalDocument/test/unit/ClinicalDocumentTests.csproj
@@ -17,7 +17,7 @@
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/Apps/Common/src/Common.csproj b/Apps/Common/src/Common.csproj
index 4ac484281d..b2842e2242 100644
--- a/Apps/Common/src/Common.csproj
+++ b/Apps/Common/src/Common.csproj
@@ -9,7 +9,7 @@
-
+
@@ -19,8 +19,8 @@
-
-
+
+
@@ -34,7 +34,7 @@
-
+
diff --git a/Apps/Common/test/unit/CommonTests.csproj b/Apps/Common/test/unit/CommonTests.csproj
index c9d15fe0c3..789b06570b 100644
--- a/Apps/Common/test/unit/CommonTests.csproj
+++ b/Apps/Common/test/unit/CommonTests.csproj
@@ -20,7 +20,7 @@
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/Apps/CommonData/src/Common.Data.csproj b/Apps/CommonData/src/Common.Data.csproj
index 4337fcb479..4691c54bab 100644
--- a/Apps/CommonData/src/Common.Data.csproj
+++ b/Apps/CommonData/src/Common.Data.csproj
@@ -9,7 +9,7 @@
-
+
diff --git a/Apps/CommonData/test/unit/CommonDataTests.csproj b/Apps/CommonData/test/unit/CommonDataTests.csproj
index 83efef1416..d315691111 100644
--- a/Apps/CommonData/test/unit/CommonDataTests.csproj
+++ b/Apps/CommonData/test/unit/CommonDataTests.csproj
@@ -18,7 +18,7 @@
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/Apps/CommonUi/test/unit/CommonUiTests.csproj b/Apps/CommonUi/test/unit/CommonUiTests.csproj
index 1312a421ff..91be553088 100644
--- a/Apps/CommonUi/test/unit/CommonUiTests.csproj
+++ b/Apps/CommonUi/test/unit/CommonUiTests.csproj
@@ -17,7 +17,7 @@
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/Apps/Database/test/unit/DatabaseTests.csproj b/Apps/Database/test/unit/DatabaseTests.csproj
index 3f0b427bc6..d51f9e34b6 100644
--- a/Apps/Database/test/unit/DatabaseTests.csproj
+++ b/Apps/Database/test/unit/DatabaseTests.csproj
@@ -29,7 +29,7 @@
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/Apps/Encounter/src/Encounter.csproj b/Apps/Encounter/src/Encounter.csproj
index 9cbaf7abc0..a1ce192ab9 100644
--- a/Apps/Encounter/src/Encounter.csproj
+++ b/Apps/Encounter/src/Encounter.csproj
@@ -6,9 +6,9 @@
84e2fe9a-a1f5-4de7-bef6-4518a33fa8b9
-
-
-
+
+
+
diff --git a/Apps/Encounter/test/unit/EncounterTests.csproj b/Apps/Encounter/test/unit/EncounterTests.csproj
index 5daecc7812..e68a82a2e6 100644
--- a/Apps/Encounter/test/unit/EncounterTests.csproj
+++ b/Apps/Encounter/test/unit/EncounterTests.csproj
@@ -22,7 +22,7 @@
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/Apps/GatewayApi/test/unit/GatewayApiTests.csproj b/Apps/GatewayApi/test/unit/GatewayApiTests.csproj
index 5a9d4a02f9..f581a808c7 100644
--- a/Apps/GatewayApi/test/unit/GatewayApiTests.csproj
+++ b/Apps/GatewayApi/test/unit/GatewayApiTests.csproj
@@ -18,7 +18,7 @@
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/Apps/Immunization/src/Immunization.csproj b/Apps/Immunization/src/Immunization.csproj
index 0bad761a1c..2e95b22b0d 100644
--- a/Apps/Immunization/src/Immunization.csproj
+++ b/Apps/Immunization/src/Immunization.csproj
@@ -33,7 +33,7 @@
-
-
+
+
diff --git a/Apps/Immunization/test/unit/ImmunizationTests.csproj b/Apps/Immunization/test/unit/ImmunizationTests.csproj
index df307685c0..b82998d051 100644
--- a/Apps/Immunization/test/unit/ImmunizationTests.csproj
+++ b/Apps/Immunization/test/unit/ImmunizationTests.csproj
@@ -22,7 +22,7 @@
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/Apps/JobScheduler/src/JobScheduler.csproj b/Apps/JobScheduler/src/JobScheduler.csproj
index e1cf3bee20..6bec90185a 100644
--- a/Apps/JobScheduler/src/JobScheduler.csproj
+++ b/Apps/JobScheduler/src/JobScheduler.csproj
@@ -8,7 +8,7 @@
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/Apps/Laboratory/src/Laboratory.csproj b/Apps/Laboratory/src/Laboratory.csproj
index 902fbb589b..819b6f75f7 100644
--- a/Apps/Laboratory/src/Laboratory.csproj
+++ b/Apps/Laboratory/src/Laboratory.csproj
@@ -6,9 +6,9 @@
84e2fe9a-a1f5-4de7-bef6-4518a33fa8b9
-
-
-
+
+
+
diff --git a/Apps/Laboratory/test/unit/LaboratoryTests.csproj b/Apps/Laboratory/test/unit/LaboratoryTests.csproj
index cccfcfb47e..539ad36181 100644
--- a/Apps/Laboratory/test/unit/LaboratoryTests.csproj
+++ b/Apps/Laboratory/test/unit/LaboratoryTests.csproj
@@ -17,7 +17,7 @@
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/Apps/Medication/test/unit/MedicationTests.csproj b/Apps/Medication/test/unit/MedicationTests.csproj
index 97391b54ee..b69d0c5a33 100644
--- a/Apps/Medication/test/unit/MedicationTests.csproj
+++ b/Apps/Medication/test/unit/MedicationTests.csproj
@@ -19,7 +19,7 @@
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/Apps/Patient/test/unit/PatientTests.csproj b/Apps/Patient/test/unit/PatientTests.csproj
index b9700aca5d..8b071848a0 100644
--- a/Apps/Patient/test/unit/PatientTests.csproj
+++ b/Apps/Patient/test/unit/PatientTests.csproj
@@ -19,7 +19,7 @@
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/Apps/PatientDataAccess/src/PatientDataAccess.csproj b/Apps/PatientDataAccess/src/PatientDataAccess.csproj
index f9d33b3dcd..9ab619607e 100644
--- a/Apps/PatientDataAccess/src/PatientDataAccess.csproj
+++ b/Apps/PatientDataAccess/src/PatientDataAccess.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/Apps/PatientDataAccess/test/unit/PatientDataAccessTests.csproj b/Apps/PatientDataAccess/test/unit/PatientDataAccessTests.csproj
index 98d9f44bce..3605e6a5df 100644
--- a/Apps/PatientDataAccess/test/unit/PatientDataAccessTests.csproj
+++ b/Apps/PatientDataAccess/test/unit/PatientDataAccessTests.csproj
@@ -18,7 +18,7 @@
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/Apps/WebClient/test/unit/WebClientTests.csproj b/Apps/WebClient/test/unit/WebClientTests.csproj
index f0d8940db6..4af5c0f77d 100644
--- a/Apps/WebClient/test/unit/WebClientTests.csproj
+++ b/Apps/WebClient/test/unit/WebClientTests.csproj
@@ -24,7 +24,7 @@
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/Testing/integration/tests/IntegrationTests.csproj b/Testing/integration/tests/IntegrationTests.csproj
index 7cae8db568..38b186aba4 100644
--- a/Testing/integration/tests/IntegrationTests.csproj
+++ b/Testing/integration/tests/IntegrationTests.csproj
@@ -30,7 +30,7 @@
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive