diff --git a/src/DataAccess/src/SIL.DataAccess/SIL.DataAccess.csproj b/src/DataAccess/src/SIL.DataAccess/SIL.DataAccess.csproj
index 447b64ef..2c83f8b0 100644
--- a/src/DataAccess/src/SIL.DataAccess/SIL.DataAccess.csproj
+++ b/src/DataAccess/src/SIL.DataAccess/SIL.DataAccess.csproj
@@ -15,9 +15,9 @@
-
-
-
+
+
+
diff --git a/src/DataAccess/test/SIL.DataAccess.Tests/SIL.DataAccess.Tests.csproj b/src/DataAccess/test/SIL.DataAccess.Tests/SIL.DataAccess.Tests.csproj
index 873b71e3..6a003088 100644
--- a/src/DataAccess/test/SIL.DataAccess.Tests/SIL.DataAccess.Tests.csproj
+++ b/src/DataAccess/test/SIL.DataAccess.Tests/SIL.DataAccess.Tests.csproj
@@ -24,7 +24,7 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/src/Machine/src/Serval.Machine.EngineServer/Serval.Machine.EngineServer.csproj b/src/Machine/src/Serval.Machine.EngineServer/Serval.Machine.EngineServer.csproj
index f6d0691b..eea857fa 100644
--- a/src/Machine/src/Serval.Machine.EngineServer/Serval.Machine.EngineServer.csproj
+++ b/src/Machine/src/Serval.Machine.EngineServer/Serval.Machine.EngineServer.csproj
@@ -13,9 +13,9 @@
-
-
-
+
+
+
diff --git a/src/Machine/src/Serval.Machine.JobServer/Serval.Machine.JobServer.csproj b/src/Machine/src/Serval.Machine.JobServer/Serval.Machine.JobServer.csproj
index 0aec4612..7a893ba7 100644
--- a/src/Machine/src/Serval.Machine.JobServer/Serval.Machine.JobServer.csproj
+++ b/src/Machine/src/Serval.Machine.JobServer/Serval.Machine.JobServer.csproj
@@ -16,9 +16,9 @@
-
-
-
+
+
+
diff --git a/src/Machine/src/Serval.Machine.Shared/Serval.Machine.Shared.csproj b/src/Machine/src/Serval.Machine.Shared/Serval.Machine.Shared.csproj
index 1c267954..b599601e 100644
--- a/src/Machine/src/Serval.Machine.Shared/Serval.Machine.Shared.csproj
+++ b/src/Machine/src/Serval.Machine.Shared/Serval.Machine.Shared.csproj
@@ -28,16 +28,16 @@
-
+
-
+
-
-
-
-
+
+
+
+
diff --git a/src/Machine/test/Serval.Machine.IntegrationTests/Serval.Machine.IntegrationTests.csproj b/src/Machine/test/Serval.Machine.IntegrationTests/Serval.Machine.IntegrationTests.csproj
index 6b368a8a..c227f718 100644
--- a/src/Machine/test/Serval.Machine.IntegrationTests/Serval.Machine.IntegrationTests.csproj
+++ b/src/Machine/test/Serval.Machine.IntegrationTests/Serval.Machine.IntegrationTests.csproj
@@ -23,7 +23,7 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/src/Machine/test/Serval.Machine.Shared.Tests/Serval.Machine.Shared.Tests.csproj b/src/Machine/test/Serval.Machine.Shared.Tests/Serval.Machine.Shared.Tests.csproj
index 9af2ff37..40276586 100644
--- a/src/Machine/test/Serval.Machine.Shared.Tests/Serval.Machine.Shared.Tests.csproj
+++ b/src/Machine/test/Serval.Machine.Shared.Tests/Serval.Machine.Shared.Tests.csproj
@@ -35,7 +35,7 @@
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/src/Serval/src/Serval.ApiServer/Serval.ApiServer.csproj b/src/Serval/src/Serval.ApiServer/Serval.ApiServer.csproj
index e5595c6b..397ebc3c 100644
--- a/src/Serval/src/Serval.ApiServer/Serval.ApiServer.csproj
+++ b/src/Serval/src/Serval.ApiServer/Serval.ApiServer.csproj
@@ -23,19 +23,19 @@
-
-
-
+
+
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
-
-
+
+
diff --git a/src/Serval/src/Serval.DataFiles/Serval.DataFiles.csproj b/src/Serval/src/Serval.DataFiles/Serval.DataFiles.csproj
index fbc6b3b5..229966c2 100644
--- a/src/Serval/src/Serval.DataFiles/Serval.DataFiles.csproj
+++ b/src/Serval/src/Serval.DataFiles/Serval.DataFiles.csproj
@@ -13,7 +13,7 @@
-
+
diff --git a/src/Serval/src/Serval.Grpc/Serval.Grpc.csproj b/src/Serval/src/Serval.Grpc/Serval.Grpc.csproj
index 68092178..302dada6 100644
--- a/src/Serval/src/Serval.Grpc/Serval.Grpc.csproj
+++ b/src/Serval/src/Serval.Grpc/Serval.Grpc.csproj
@@ -17,9 +17,9 @@
-
+
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/src/Serval/src/Serval.Translation/Serval.Translation.csproj b/src/Serval/src/Serval.Translation/Serval.Translation.csproj
index 20a130b4..db989964 100644
--- a/src/Serval/src/Serval.Translation/Serval.Translation.csproj
+++ b/src/Serval/src/Serval.Translation/Serval.Translation.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/src/Serval/src/Serval.Webhooks/Serval.Webhooks.csproj b/src/Serval/src/Serval.Webhooks/Serval.Webhooks.csproj
index 8a728bec..8f004205 100644
--- a/src/Serval/src/Serval.Webhooks/Serval.Webhooks.csproj
+++ b/src/Serval/src/Serval.Webhooks/Serval.Webhooks.csproj
@@ -12,8 +12,8 @@
-
-
+
+
diff --git a/src/Serval/src/Serval.WordAlignment/Serval.WordAlignment.csproj b/src/Serval/src/Serval.WordAlignment/Serval.WordAlignment.csproj
index addc8a35..21baab6f 100644
--- a/src/Serval/src/Serval.WordAlignment/Serval.WordAlignment.csproj
+++ b/src/Serval/src/Serval.WordAlignment/Serval.WordAlignment.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/src/Serval/test/Serval.ApiServer.IntegrationTests/Serval.ApiServer.IntegrationTests.csproj b/src/Serval/test/Serval.ApiServer.IntegrationTests/Serval.ApiServer.IntegrationTests.csproj
index 2cfc8435..fddaeda2 100644
--- a/src/Serval/test/Serval.ApiServer.IntegrationTests/Serval.ApiServer.IntegrationTests.csproj
+++ b/src/Serval/test/Serval.ApiServer.IntegrationTests/Serval.ApiServer.IntegrationTests.csproj
@@ -21,7 +21,7 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
all
-
+
@@ -29,7 +29,7 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/src/Serval/test/Serval.DataFiles.Tests/Serval.DataFiles.Tests.csproj b/src/Serval/test/Serval.DataFiles.Tests/Serval.DataFiles.Tests.csproj
index 4b68dab9..36de015a 100644
--- a/src/Serval/test/Serval.DataFiles.Tests/Serval.DataFiles.Tests.csproj
+++ b/src/Serval/test/Serval.DataFiles.Tests/Serval.DataFiles.Tests.csproj
@@ -24,7 +24,7 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/src/Serval/test/Serval.E2ETests/Serval.E2ETests.csproj b/src/Serval/test/Serval.E2ETests/Serval.E2ETests.csproj
index 901cc6c9..5dcd7b51 100644
--- a/src/Serval/test/Serval.E2ETests/Serval.E2ETests.csproj
+++ b/src/Serval/test/Serval.E2ETests/Serval.E2ETests.csproj
@@ -17,7 +17,7 @@
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
diff --git a/src/Serval/test/Serval.IntegrationTests/Serval.IntegrationTests.csproj b/src/Serval/test/Serval.IntegrationTests/Serval.IntegrationTests.csproj
index b8076a89..bd2a5f7c 100644
--- a/src/Serval/test/Serval.IntegrationTests/Serval.IntegrationTests.csproj
+++ b/src/Serval/test/Serval.IntegrationTests/Serval.IntegrationTests.csproj
@@ -24,7 +24,7 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/src/Serval/test/Serval.Shared.Tests/Serval.Shared.Tests.csproj b/src/Serval/test/Serval.Shared.Tests/Serval.Shared.Tests.csproj
index a08beb8a..0e931be4 100644
--- a/src/Serval/test/Serval.Shared.Tests/Serval.Shared.Tests.csproj
+++ b/src/Serval/test/Serval.Shared.Tests/Serval.Shared.Tests.csproj
@@ -25,7 +25,7 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/src/Serval/test/Serval.Translation.Tests/Serval.Translation.Tests.csproj b/src/Serval/test/Serval.Translation.Tests/Serval.Translation.Tests.csproj
index 93e60253..f8a785e8 100644
--- a/src/Serval/test/Serval.Translation.Tests/Serval.Translation.Tests.csproj
+++ b/src/Serval/test/Serval.Translation.Tests/Serval.Translation.Tests.csproj
@@ -24,7 +24,7 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/src/Serval/test/Serval.Webhooks.Tests/Serval.Webhooks.Tests.csproj b/src/Serval/test/Serval.Webhooks.Tests/Serval.Webhooks.Tests.csproj
index 3cd1df69..7b149d34 100644
--- a/src/Serval/test/Serval.Webhooks.Tests/Serval.Webhooks.Tests.csproj
+++ b/src/Serval/test/Serval.Webhooks.Tests/Serval.Webhooks.Tests.csproj
@@ -23,7 +23,7 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/src/Serval/test/Serval.WordAlignment.Tests/Serval.WordAlignment.Tests.csproj b/src/Serval/test/Serval.WordAlignment.Tests/Serval.WordAlignment.Tests.csproj
index a30fd14b..0c63f90d 100644
--- a/src/Serval/test/Serval.WordAlignment.Tests/Serval.WordAlignment.Tests.csproj
+++ b/src/Serval/test/Serval.WordAlignment.Tests/Serval.WordAlignment.Tests.csproj
@@ -24,7 +24,7 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/src/ServiceToolkit/src/SIL.ServiceToolkit/SIL.ServiceToolkit.csproj b/src/ServiceToolkit/src/SIL.ServiceToolkit/SIL.ServiceToolkit.csproj
index 23e62fec..39a0d12b 100644
--- a/src/ServiceToolkit/src/SIL.ServiceToolkit/SIL.ServiceToolkit.csproj
+++ b/src/ServiceToolkit/src/SIL.ServiceToolkit/SIL.ServiceToolkit.csproj
@@ -12,7 +12,7 @@
-
+
diff --git a/src/ServiceToolkit/test/SIL.ServiceToolkit.Tests/SIL.ServiceToolkit.Tests.csproj b/src/ServiceToolkit/test/SIL.ServiceToolkit.Tests/SIL.ServiceToolkit.Tests.csproj
index 19723403..041e1c3b 100644
--- a/src/ServiceToolkit/test/SIL.ServiceToolkit.Tests/SIL.ServiceToolkit.Tests.csproj
+++ b/src/ServiceToolkit/test/SIL.ServiceToolkit.Tests/SIL.ServiceToolkit.Tests.csproj
@@ -19,7 +19,7 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive