diff --git a/AddSortKey/AddSortKey.csproj b/AddSortKey/AddSortKey.csproj
index b88c1b816..860a0deb6 100644
--- a/AddSortKey/AddSortKey.csproj
+++ b/AddSortKey/AddSortKey.csproj
@@ -18,7 +18,7 @@
-
+
all
diff --git a/ExtractCopyright.Tests/ExtractCopyright.Tests.csproj b/ExtractCopyright.Tests/ExtractCopyright.Tests.csproj
index 48cfbbd91..1eaead665 100644
--- a/ExtractCopyright.Tests/ExtractCopyright.Tests.csproj
+++ b/ExtractCopyright.Tests/ExtractCopyright.Tests.csproj
@@ -17,7 +17,7 @@
-
+
all
diff --git a/ExtractCopyright/ExtractCopyright.csproj b/ExtractCopyright/ExtractCopyright.csproj
index 7328bc6fb..2cfd74cf3 100644
--- a/ExtractCopyright/ExtractCopyright.csproj
+++ b/ExtractCopyright/ExtractCopyright.csproj
@@ -18,7 +18,7 @@
-
+
all
diff --git a/SIL.Archiving.Tests/SIL.Archiving.Tests.csproj b/SIL.Archiving.Tests/SIL.Archiving.Tests.csproj
index 843737511..e0ac2bede 100644
--- a/SIL.Archiving.Tests/SIL.Archiving.Tests.csproj
+++ b/SIL.Archiving.Tests/SIL.Archiving.Tests.csproj
@@ -18,7 +18,7 @@
-
+
all
diff --git a/SIL.Archiving/SIL.Archiving.csproj b/SIL.Archiving/SIL.Archiving.csproj
index cec713208..aafae3f7b 100644
--- a/SIL.Archiving/SIL.Archiving.csproj
+++ b/SIL.Archiving/SIL.Archiving.csproj
@@ -23,7 +23,7 @@
-
+
all
diff --git a/SIL.Core.Desktop.Tests/SIL.Core.Desktop.Tests.csproj b/SIL.Core.Desktop.Tests/SIL.Core.Desktop.Tests.csproj
index 5650eb787..36922d847 100644
--- a/SIL.Core.Desktop.Tests/SIL.Core.Desktop.Tests.csproj
+++ b/SIL.Core.Desktop.Tests/SIL.Core.Desktop.Tests.csproj
@@ -17,7 +17,7 @@
-
+
all
@@ -30,4 +30,8 @@
+
+
+
+
diff --git a/SIL.Core.Desktop/SIL.Core.Desktop.csproj b/SIL.Core.Desktop/SIL.Core.Desktop.csproj
index 6c9276eb3..7717c7dae 100644
--- a/SIL.Core.Desktop/SIL.Core.Desktop.csproj
+++ b/SIL.Core.Desktop/SIL.Core.Desktop.csproj
@@ -23,7 +23,7 @@
snupkg
-
+
all
diff --git a/SIL.Core/SIL.Core.csproj b/SIL.Core/SIL.Core.csproj
index 8acdeab28..436d5e2c1 100644
--- a/SIL.Core/SIL.Core.csproj
+++ b/SIL.Core/SIL.Core.csproj
@@ -21,7 +21,7 @@
-
+
all
diff --git a/SIL.DblBundle.Tests/SIL.DblBundle.Tests.csproj b/SIL.DblBundle.Tests/SIL.DblBundle.Tests.csproj
index d41993eaf..3bcb23cd3 100644
--- a/SIL.DblBundle.Tests/SIL.DblBundle.Tests.csproj
+++ b/SIL.DblBundle.Tests/SIL.DblBundle.Tests.csproj
@@ -18,7 +18,7 @@
-
+
all
diff --git a/SIL.DblBundle/SIL.DblBundle.csproj b/SIL.DblBundle/SIL.DblBundle.csproj
index 2ecc6a55b..365a23a30 100644
--- a/SIL.DblBundle/SIL.DblBundle.csproj
+++ b/SIL.DblBundle/SIL.DblBundle.csproj
@@ -22,7 +22,7 @@
-
+
all
diff --git a/SIL.DictionaryServices.Tests/SIL.DictionaryServices.Tests.csproj b/SIL.DictionaryServices.Tests/SIL.DictionaryServices.Tests.csproj
index b6678103b..4bf116816 100644
--- a/SIL.DictionaryServices.Tests/SIL.DictionaryServices.Tests.csproj
+++ b/SIL.DictionaryServices.Tests/SIL.DictionaryServices.Tests.csproj
@@ -17,7 +17,7 @@
-
+
all
diff --git a/SIL.DictionaryServices/SIL.DictionaryServices.csproj b/SIL.DictionaryServices/SIL.DictionaryServices.csproj
index 0b2c71169..16093cff5 100644
--- a/SIL.DictionaryServices/SIL.DictionaryServices.csproj
+++ b/SIL.DictionaryServices/SIL.DictionaryServices.csproj
@@ -22,7 +22,7 @@
-
+
all
diff --git a/SIL.Lexicon.Tests/SIL.Lexicon.Tests.csproj b/SIL.Lexicon.Tests/SIL.Lexicon.Tests.csproj
index 897ca1089..556bfbf85 100644
--- a/SIL.Lexicon.Tests/SIL.Lexicon.Tests.csproj
+++ b/SIL.Lexicon.Tests/SIL.Lexicon.Tests.csproj
@@ -17,7 +17,7 @@
-
+
all
diff --git a/SIL.Lexicon/SIL.Lexicon.csproj b/SIL.Lexicon/SIL.Lexicon.csproj
index dbdb92afd..46d624b2a 100644
--- a/SIL.Lexicon/SIL.Lexicon.csproj
+++ b/SIL.Lexicon/SIL.Lexicon.csproj
@@ -22,7 +22,7 @@
-
+
all
diff --git a/SIL.Lift.Tests/SIL.Lift.Tests.csproj b/SIL.Lift.Tests/SIL.Lift.Tests.csproj
index 573d83cf4..3a5bda9b0 100644
--- a/SIL.Lift.Tests/SIL.Lift.Tests.csproj
+++ b/SIL.Lift.Tests/SIL.Lift.Tests.csproj
@@ -17,7 +17,7 @@
-
+
all
diff --git a/SIL.Lift/SIL.Lift.csproj b/SIL.Lift/SIL.Lift.csproj
index 961b3e6b1..8807ce241 100644
--- a/SIL.Lift/SIL.Lift.csproj
+++ b/SIL.Lift/SIL.Lift.csproj
@@ -22,7 +22,7 @@
snupkg
-
+
all
diff --git a/SIL.Linux.Logging.Tests/SIL.Linux.Logging.Tests.csproj b/SIL.Linux.Logging.Tests/SIL.Linux.Logging.Tests.csproj
index 5216f843c..5923b580d 100644
--- a/SIL.Linux.Logging.Tests/SIL.Linux.Logging.Tests.csproj
+++ b/SIL.Linux.Logging.Tests/SIL.Linux.Logging.Tests.csproj
@@ -17,7 +17,7 @@
-
+
all
diff --git a/SIL.Linux.Logging/SIL.Linux.Logging.csproj b/SIL.Linux.Logging/SIL.Linux.Logging.csproj
index 5d264357e..642749042 100644
--- a/SIL.Linux.Logging/SIL.Linux.Logging.csproj
+++ b/SIL.Linux.Logging/SIL.Linux.Logging.csproj
@@ -22,7 +22,7 @@
-
+
all
diff --git a/SIL.Media.Tests/SIL.Media.Tests.csproj b/SIL.Media.Tests/SIL.Media.Tests.csproj
index 7edc82d08..5adad2359 100644
--- a/SIL.Media.Tests/SIL.Media.Tests.csproj
+++ b/SIL.Media.Tests/SIL.Media.Tests.csproj
@@ -15,7 +15,7 @@
-
+
all
diff --git a/SIL.Media/SIL.Media.csproj b/SIL.Media/SIL.Media.csproj
index cd9ab02a1..43181cfb5 100644
--- a/SIL.Media/SIL.Media.csproj
+++ b/SIL.Media/SIL.Media.csproj
@@ -25,7 +25,7 @@
snupkg
-
+
all
diff --git a/SIL.NUnit3Compatibility/SIL.NUnit3Compatibility.csproj b/SIL.NUnit3Compatibility/SIL.NUnit3Compatibility.csproj
index ca3aa33c2..a3feff20d 100644
--- a/SIL.NUnit3Compatibility/SIL.NUnit3Compatibility.csproj
+++ b/SIL.NUnit3Compatibility/SIL.NUnit3Compatibility.csproj
@@ -23,7 +23,7 @@
-
+
all
diff --git a/SIL.Scripture.Tests/SIL.Scripture.Tests.csproj b/SIL.Scripture.Tests/SIL.Scripture.Tests.csproj
index ef586025b..20658b90f 100644
--- a/SIL.Scripture.Tests/SIL.Scripture.Tests.csproj
+++ b/SIL.Scripture.Tests/SIL.Scripture.Tests.csproj
@@ -17,7 +17,7 @@
-
+
all
diff --git a/SIL.Scripture/SIL.Scripture.csproj b/SIL.Scripture/SIL.Scripture.csproj
index 59a323a51..d66f1c2eb 100644
--- a/SIL.Scripture/SIL.Scripture.csproj
+++ b/SIL.Scripture/SIL.Scripture.csproj
@@ -22,7 +22,7 @@
-
+
all
diff --git a/SIL.TestUtilities.Tests/SIL.TestUtilities.Tests.csproj b/SIL.TestUtilities.Tests/SIL.TestUtilities.Tests.csproj
index 99ef8492d..a377a705a 100644
--- a/SIL.TestUtilities.Tests/SIL.TestUtilities.Tests.csproj
+++ b/SIL.TestUtilities.Tests/SIL.TestUtilities.Tests.csproj
@@ -17,7 +17,7 @@
-
+
all
diff --git a/SIL.TestUtilities/SIL.TestUtilities.csproj b/SIL.TestUtilities/SIL.TestUtilities.csproj
index fb36c81b7..2b140e880 100644
--- a/SIL.TestUtilities/SIL.TestUtilities.csproj
+++ b/SIL.TestUtilities/SIL.TestUtilities.csproj
@@ -22,7 +22,7 @@
-
+
all
diff --git a/SIL.Windows.Forms.DblBundle/SIL.Windows.Forms.DblBundle.csproj b/SIL.Windows.Forms.DblBundle/SIL.Windows.Forms.DblBundle.csproj
index 9e332b0e4..0e8ce80ce 100644
--- a/SIL.Windows.Forms.DblBundle/SIL.Windows.Forms.DblBundle.csproj
+++ b/SIL.Windows.Forms.DblBundle/SIL.Windows.Forms.DblBundle.csproj
@@ -20,7 +20,7 @@
-
+
all
diff --git a/SIL.Windows.Forms.GeckoBrowserAdapter/SIL.Windows.Forms.GeckoBrowserAdapter.csproj b/SIL.Windows.Forms.GeckoBrowserAdapter/SIL.Windows.Forms.GeckoBrowserAdapter.csproj
index df7e10546..a44739dbd 100644
--- a/SIL.Windows.Forms.GeckoBrowserAdapter/SIL.Windows.Forms.GeckoBrowserAdapter.csproj
+++ b/SIL.Windows.Forms.GeckoBrowserAdapter/SIL.Windows.Forms.GeckoBrowserAdapter.csproj
@@ -22,7 +22,7 @@
-
+
all
diff --git a/SIL.Windows.Forms.Keyboarding/SIL.Windows.Forms.Keyboarding.csproj b/SIL.Windows.Forms.Keyboarding/SIL.Windows.Forms.Keyboarding.csproj
index 88093a0ec..c9e3cafd4 100644
--- a/SIL.Windows.Forms.Keyboarding/SIL.Windows.Forms.Keyboarding.csproj
+++ b/SIL.Windows.Forms.Keyboarding/SIL.Windows.Forms.Keyboarding.csproj
@@ -22,7 +22,7 @@
-
+
all
diff --git a/SIL.Windows.Forms.Scripture.Tests/SIL.Windows.Forms.Scripture.Tests.csproj b/SIL.Windows.Forms.Scripture.Tests/SIL.Windows.Forms.Scripture.Tests.csproj
index e857e90ef..f63c5c07e 100644
--- a/SIL.Windows.Forms.Scripture.Tests/SIL.Windows.Forms.Scripture.Tests.csproj
+++ b/SIL.Windows.Forms.Scripture.Tests/SIL.Windows.Forms.Scripture.Tests.csproj
@@ -17,7 +17,7 @@
-
+
all
diff --git a/SIL.Windows.Forms.Scripture/SIL.Windows.Forms.Scripture.csproj b/SIL.Windows.Forms.Scripture/SIL.Windows.Forms.Scripture.csproj
index 25ae6de49..aec4f69fd 100644
--- a/SIL.Windows.Forms.Scripture/SIL.Windows.Forms.Scripture.csproj
+++ b/SIL.Windows.Forms.Scripture/SIL.Windows.Forms.Scripture.csproj
@@ -22,7 +22,7 @@
-
+
all
diff --git a/SIL.Windows.Forms.WritingSystems.Tests/SIL.Windows.Forms.WritingSystems.Tests.csproj b/SIL.Windows.Forms.WritingSystems.Tests/SIL.Windows.Forms.WritingSystems.Tests.csproj
index 109b72d53..2371b5728 100644
--- a/SIL.Windows.Forms.WritingSystems.Tests/SIL.Windows.Forms.WritingSystems.Tests.csproj
+++ b/SIL.Windows.Forms.WritingSystems.Tests/SIL.Windows.Forms.WritingSystems.Tests.csproj
@@ -17,7 +17,7 @@
-
+
all
diff --git a/SIL.Windows.Forms.WritingSystems/SIL.Windows.Forms.WritingSystems.csproj b/SIL.Windows.Forms.WritingSystems/SIL.Windows.Forms.WritingSystems.csproj
index d3ae7819c..10a7d1c0b 100644
--- a/SIL.Windows.Forms.WritingSystems/SIL.Windows.Forms.WritingSystems.csproj
+++ b/SIL.Windows.Forms.WritingSystems/SIL.Windows.Forms.WritingSystems.csproj
@@ -22,7 +22,7 @@
-
+
all
diff --git a/SIL.Windows.Forms/SIL.Windows.Forms.csproj b/SIL.Windows.Forms/SIL.Windows.Forms.csproj
index 55e57afad..f595d7e25 100644
--- a/SIL.Windows.Forms/SIL.Windows.Forms.csproj
+++ b/SIL.Windows.Forms/SIL.Windows.Forms.csproj
@@ -25,7 +25,7 @@
-
+
all
diff --git a/SIL.WritingSystems.Tests/SIL.WritingSystems.Tests.csproj b/SIL.WritingSystems.Tests/SIL.WritingSystems.Tests.csproj
index 33e10ab61..d97380218 100644
--- a/SIL.WritingSystems.Tests/SIL.WritingSystems.Tests.csproj
+++ b/SIL.WritingSystems.Tests/SIL.WritingSystems.Tests.csproj
@@ -24,7 +24,7 @@
-
+
all
diff --git a/SIL.WritingSystems/SIL.WritingSystems.csproj b/SIL.WritingSystems/SIL.WritingSystems.csproj
index 814fec0c6..35c97171e 100644
--- a/SIL.WritingSystems/SIL.WritingSystems.csproj
+++ b/SIL.WritingSystems/SIL.WritingSystems.csproj
@@ -20,7 +20,7 @@
-
+
all
diff --git a/TestApps/FastSplitterTest/FastSplitterTest.csproj b/TestApps/FastSplitterTest/FastSplitterTest.csproj
index 50217e71d..baf96b912 100644
--- a/TestApps/FastSplitterTest/FastSplitterTest.csproj
+++ b/TestApps/FastSplitterTest/FastSplitterTest.csproj
@@ -18,7 +18,7 @@
-
+
all
diff --git a/TestApps/ReportingTest/Reporting.TestApp.csproj b/TestApps/ReportingTest/Reporting.TestApp.csproj
index 3ee18903c..6ecd8f75a 100644
--- a/TestApps/ReportingTest/Reporting.TestApp.csproj
+++ b/TestApps/ReportingTest/Reporting.TestApp.csproj
@@ -18,7 +18,7 @@
-
+
all
diff --git a/TestApps/SIL.Email.TestApp/SIL.Email.TestApp.csproj b/TestApps/SIL.Email.TestApp/SIL.Email.TestApp.csproj
index 779a4729f..0474e3e75 100644
--- a/TestApps/SIL.Email.TestApp/SIL.Email.TestApp.csproj
+++ b/TestApps/SIL.Email.TestApp/SIL.Email.TestApp.csproj
@@ -18,7 +18,7 @@
-
+
all
diff --git a/TestApps/SIL.Windows.Forms.TestApp/SIL.Windows.Forms.TestApp.csproj b/TestApps/SIL.Windows.Forms.TestApp/SIL.Windows.Forms.TestApp.csproj
index 528e6b5e6..9c6b68d12 100644
--- a/TestApps/SIL.Windows.Forms.TestApp/SIL.Windows.Forms.TestApp.csproj
+++ b/TestApps/SIL.Windows.Forms.TestApp/SIL.Windows.Forms.TestApp.csproj
@@ -16,7 +16,7 @@
-
+
all
diff --git a/TestApps/TestAppKeyboard/TestAppKeyboard.csproj b/TestApps/TestAppKeyboard/TestAppKeyboard.csproj
index 102fcf42f..b0d4a16ed 100644
--- a/TestApps/TestAppKeyboard/TestAppKeyboard.csproj
+++ b/TestApps/TestAppKeyboard/TestAppKeyboard.csproj
@@ -18,7 +18,7 @@
-
+
all