diff --git a/src/ScadaLink.ClusterInfrastructure/ScadaLink.ClusterInfrastructure.csproj b/src/ScadaLink.ClusterInfrastructure/ScadaLink.ClusterInfrastructure.csproj
index 049c7d99..55ee4be8 100644
--- a/src/ScadaLink.ClusterInfrastructure/ScadaLink.ClusterInfrastructure.csproj
+++ b/src/ScadaLink.ClusterInfrastructure/ScadaLink.ClusterInfrastructure.csproj
@@ -8,8 +8,8 @@
-
-
+
+
diff --git a/src/ScadaLink.ConfigurationDatabase/ScadaLink.ConfigurationDatabase.csproj b/src/ScadaLink.ConfigurationDatabase/ScadaLink.ConfigurationDatabase.csproj
index f5ef6d42..f4629720 100644
--- a/src/ScadaLink.ConfigurationDatabase/ScadaLink.ConfigurationDatabase.csproj
+++ b/src/ScadaLink.ConfigurationDatabase/ScadaLink.ConfigurationDatabase.csproj
@@ -8,16 +8,16 @@
-
-
-
+
+
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
-
-
-
-
+
+
+
+
diff --git a/src/ScadaLink.DataConnectionLayer/ScadaLink.DataConnectionLayer.csproj b/src/ScadaLink.DataConnectionLayer/ScadaLink.DataConnectionLayer.csproj
index cf866a65..396db313 100644
--- a/src/ScadaLink.DataConnectionLayer/ScadaLink.DataConnectionLayer.csproj
+++ b/src/ScadaLink.DataConnectionLayer/ScadaLink.DataConnectionLayer.csproj
@@ -11,10 +11,10 @@
-
-
-
-
+
+
+
+
diff --git a/src/ScadaLink.DeploymentManager/ScadaLink.DeploymentManager.csproj b/src/ScadaLink.DeploymentManager/ScadaLink.DeploymentManager.csproj
index 1b77f280..fc3191bb 100644
--- a/src/ScadaLink.DeploymentManager/ScadaLink.DeploymentManager.csproj
+++ b/src/ScadaLink.DeploymentManager/ScadaLink.DeploymentManager.csproj
@@ -8,9 +8,9 @@
-
-
-
+
+
+
diff --git a/src/ScadaLink.ExternalSystemGateway/ScadaLink.ExternalSystemGateway.csproj b/src/ScadaLink.ExternalSystemGateway/ScadaLink.ExternalSystemGateway.csproj
index 01c2bdba..41838f80 100644
--- a/src/ScadaLink.ExternalSystemGateway/ScadaLink.ExternalSystemGateway.csproj
+++ b/src/ScadaLink.ExternalSystemGateway/ScadaLink.ExternalSystemGateway.csproj
@@ -9,10 +9,10 @@
-
-
-
-
+
+
+
+
diff --git a/src/ScadaLink.HealthMonitoring/ScadaLink.HealthMonitoring.csproj b/src/ScadaLink.HealthMonitoring/ScadaLink.HealthMonitoring.csproj
index b4930580..814bbbd0 100644
--- a/src/ScadaLink.HealthMonitoring/ScadaLink.HealthMonitoring.csproj
+++ b/src/ScadaLink.HealthMonitoring/ScadaLink.HealthMonitoring.csproj
@@ -8,10 +8,10 @@
-
-
-
-
+
+
+
+
diff --git a/src/ScadaLink.Host/ScadaLink.Host.csproj b/src/ScadaLink.Host/ScadaLink.Host.csproj
index f75004f3..7bcb4d0b 100644
--- a/src/ScadaLink.Host/ScadaLink.Host.csproj
+++ b/src/ScadaLink.Host/ScadaLink.Host.csproj
@@ -13,15 +13,18 @@
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
-
+
+
+
diff --git a/src/ScadaLink.NotificationService/ScadaLink.NotificationService.csproj b/src/ScadaLink.NotificationService/ScadaLink.NotificationService.csproj
index c7a73fd1..a3ed893c 100644
--- a/src/ScadaLink.NotificationService/ScadaLink.NotificationService.csproj
+++ b/src/ScadaLink.NotificationService/ScadaLink.NotificationService.csproj
@@ -8,11 +8,11 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/src/ScadaLink.Security/ScadaLink.Security.csproj b/src/ScadaLink.Security/ScadaLink.Security.csproj
index 93e5878e..32aec4f5 100644
--- a/src/ScadaLink.Security/ScadaLink.Security.csproj
+++ b/src/ScadaLink.Security/ScadaLink.Security.csproj
@@ -8,10 +8,10 @@
-
-
-
-
+
+
+
+
diff --git a/src/ScadaLink.SiteEventLogging/ScadaLink.SiteEventLogging.csproj b/src/ScadaLink.SiteEventLogging/ScadaLink.SiteEventLogging.csproj
index c66bd598..98c3ee68 100644
--- a/src/ScadaLink.SiteEventLogging/ScadaLink.SiteEventLogging.csproj
+++ b/src/ScadaLink.SiteEventLogging/ScadaLink.SiteEventLogging.csproj
@@ -9,11 +9,11 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/src/ScadaLink.SiteRuntime/ScadaLink.SiteRuntime.csproj b/src/ScadaLink.SiteRuntime/ScadaLink.SiteRuntime.csproj
index a3f47f43..8c2c9d58 100644
--- a/src/ScadaLink.SiteRuntime/ScadaLink.SiteRuntime.csproj
+++ b/src/ScadaLink.SiteRuntime/ScadaLink.SiteRuntime.csproj
@@ -13,11 +13,11 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/src/ScadaLink.StoreAndForward/ScadaLink.StoreAndForward.csproj b/src/ScadaLink.StoreAndForward/ScadaLink.StoreAndForward.csproj
index a3b50f45..3d1f13cc 100644
--- a/src/ScadaLink.StoreAndForward/ScadaLink.StoreAndForward.csproj
+++ b/src/ScadaLink.StoreAndForward/ScadaLink.StoreAndForward.csproj
@@ -8,10 +8,10 @@
-
-
-
-
+
+
+
+
diff --git a/src/ScadaLink.TemplateEngine/ScadaLink.TemplateEngine.csproj b/src/ScadaLink.TemplateEngine/ScadaLink.TemplateEngine.csproj
index 45d44e6a..718e461a 100644
--- a/src/ScadaLink.TemplateEngine/ScadaLink.TemplateEngine.csproj
+++ b/src/ScadaLink.TemplateEngine/ScadaLink.TemplateEngine.csproj
@@ -12,8 +12,8 @@
-
-
+
+
diff --git a/tests/ScadaLink.Communication.Tests/ScadaLink.Communication.Tests.csproj b/tests/ScadaLink.Communication.Tests/ScadaLink.Communication.Tests.csproj
index 9ad4fd25..2a75120e 100644
--- a/tests/ScadaLink.Communication.Tests/ScadaLink.Communication.Tests.csproj
+++ b/tests/ScadaLink.Communication.Tests/ScadaLink.Communication.Tests.csproj
@@ -12,7 +12,7 @@
-
+
diff --git a/tests/ScadaLink.ConfigurationDatabase.Tests/ScadaLink.ConfigurationDatabase.Tests.csproj b/tests/ScadaLink.ConfigurationDatabase.Tests/ScadaLink.ConfigurationDatabase.Tests.csproj
index 50a3aaf7..e44d1c44 100644
--- a/tests/ScadaLink.ConfigurationDatabase.Tests/ScadaLink.ConfigurationDatabase.Tests.csproj
+++ b/tests/ScadaLink.ConfigurationDatabase.Tests/ScadaLink.ConfigurationDatabase.Tests.csproj
@@ -10,10 +10,10 @@
-
-
-
-
+
+
+
+
diff --git a/tests/ScadaLink.HealthMonitoring.Tests/ScadaLink.HealthMonitoring.Tests.csproj b/tests/ScadaLink.HealthMonitoring.Tests/ScadaLink.HealthMonitoring.Tests.csproj
index 3c67cbb2..bae45fa1 100644
--- a/tests/ScadaLink.HealthMonitoring.Tests/ScadaLink.HealthMonitoring.Tests.csproj
+++ b/tests/ScadaLink.HealthMonitoring.Tests/ScadaLink.HealthMonitoring.Tests.csproj
@@ -10,8 +10,8 @@
-
-
+
+
diff --git a/tests/ScadaLink.Host.Tests/ScadaLink.Host.Tests.csproj b/tests/ScadaLink.Host.Tests/ScadaLink.Host.Tests.csproj
index 3b73f4ec..0021a99e 100644
--- a/tests/ScadaLink.Host.Tests/ScadaLink.Host.Tests.csproj
+++ b/tests/ScadaLink.Host.Tests/ScadaLink.Host.Tests.csproj
@@ -15,8 +15,8 @@
-
-
+
+
diff --git a/tests/ScadaLink.IntegrationTests/ScadaLink.IntegrationTests.csproj b/tests/ScadaLink.IntegrationTests/ScadaLink.IntegrationTests.csproj
index 023ffdcc..3938a711 100644
--- a/tests/ScadaLink.IntegrationTests/ScadaLink.IntegrationTests.csproj
+++ b/tests/ScadaLink.IntegrationTests/ScadaLink.IntegrationTests.csproj
@@ -15,8 +15,8 @@
-
-
+
+
diff --git a/tests/ScadaLink.PerformanceTests/ScadaLink.PerformanceTests.csproj b/tests/ScadaLink.PerformanceTests/ScadaLink.PerformanceTests.csproj
index 67acfdda..86f24e5b 100644
--- a/tests/ScadaLink.PerformanceTests/ScadaLink.PerformanceTests.csproj
+++ b/tests/ScadaLink.PerformanceTests/ScadaLink.PerformanceTests.csproj
@@ -10,7 +10,7 @@
-
+
diff --git a/tests/ScadaLink.Security.Tests/ScadaLink.Security.Tests.csproj b/tests/ScadaLink.Security.Tests/ScadaLink.Security.Tests.csproj
index bc96ad86..65623a3d 100644
--- a/tests/ScadaLink.Security.Tests/ScadaLink.Security.Tests.csproj
+++ b/tests/ScadaLink.Security.Tests/ScadaLink.Security.Tests.csproj
@@ -10,12 +10,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/tests/ScadaLink.SiteEventLogging.Tests/ScadaLink.SiteEventLogging.Tests.csproj b/tests/ScadaLink.SiteEventLogging.Tests/ScadaLink.SiteEventLogging.Tests.csproj
index 6c5413d5..9c20af02 100644
--- a/tests/ScadaLink.SiteEventLogging.Tests/ScadaLink.SiteEventLogging.Tests.csproj
+++ b/tests/ScadaLink.SiteEventLogging.Tests/ScadaLink.SiteEventLogging.Tests.csproj
@@ -10,9 +10,9 @@
-
-
-
+
+
+
diff --git a/tests/ScadaLink.StoreAndForward.Tests/ScadaLink.StoreAndForward.Tests.csproj b/tests/ScadaLink.StoreAndForward.Tests/ScadaLink.StoreAndForward.Tests.csproj
index a154b6f9..cd6f7d2f 100644
--- a/tests/ScadaLink.StoreAndForward.Tests/ScadaLink.StoreAndForward.Tests.csproj
+++ b/tests/ScadaLink.StoreAndForward.Tests/ScadaLink.StoreAndForward.Tests.csproj
@@ -10,7 +10,7 @@
-
+