diff --git a/applications/leaderboard/LeaderboardTest/LeaderboardTest.csproj b/applications/leaderboard/LeaderboardTest/LeaderboardTest.csproj
index 72e87650d1..196cf8d075 100644
--- a/applications/leaderboard/LeaderboardTest/LeaderboardTest.csproj
+++ b/applications/leaderboard/LeaderboardTest/LeaderboardTest.csproj
@@ -9,7 +9,7 @@
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/asset/api/Asset.Samples.Tests/Asset.Samples.Tests.csproj b/asset/api/Asset.Samples.Tests/Asset.Samples.Tests.csproj
index 8f7b6b910b..a6241e0c75 100644
--- a/asset/api/Asset.Samples.Tests/Asset.Samples.Tests.csproj
+++ b/asset/api/Asset.Samples.Tests/Asset.Samples.Tests.csproj
@@ -10,7 +10,7 @@
-
+
diff --git a/asset/quickstart/BatchGetAssetsHistoryTest/BatchGetAssetsHistoryTest.csproj b/asset/quickstart/BatchGetAssetsHistoryTest/BatchGetAssetsHistoryTest.csproj
index 32ddd205e8..73171f74ad 100644
--- a/asset/quickstart/BatchGetAssetsHistoryTest/BatchGetAssetsHistoryTest.csproj
+++ b/asset/quickstart/BatchGetAssetsHistoryTest/BatchGetAssetsHistoryTest.csproj
@@ -8,7 +8,7 @@
-
+
runtime; build; native; contentfiles; analyzers
all
diff --git a/asset/quickstart/ExportAssetsTest/ExportAssetsTest.csproj b/asset/quickstart/ExportAssetsTest/ExportAssetsTest.csproj
index 2c5109cdd2..1d60ce0a1a 100644
--- a/asset/quickstart/ExportAssetsTest/ExportAssetsTest.csproj
+++ b/asset/quickstart/ExportAssetsTest/ExportAssetsTest.csproj
@@ -8,7 +8,7 @@
-
+
runtime; build; native; contentfiles; analyzers
all
diff --git a/auth/AuthTest/AuthTest.csproj b/auth/AuthTest/AuthTest.csproj
index 53a6a39747..0bc5678cae 100644
--- a/auth/AuthTest/AuthTest.csproj
+++ b/auth/AuthTest/AuthTest.csproj
@@ -6,7 +6,7 @@
-
+
runtime; build; native; contentfiles; analyzers
all
diff --git a/bigquery/api/SimpleApp/SimpleApp.csproj b/bigquery/api/SimpleApp/SimpleApp.csproj
index d4a6f657a7..90d2d42ea9 100644
--- a/bigquery/api/SimpleApp/SimpleApp.csproj
+++ b/bigquery/api/SimpleApp/SimpleApp.csproj
@@ -10,7 +10,7 @@
-
+
runtime; build; native; contentfiles; analyzers
all
diff --git a/bigquery/api/Snippets/Snippets.csproj b/bigquery/api/Snippets/Snippets.csproj
index cb9b34dd8e..6c4a603783 100644
--- a/bigquery/api/Snippets/Snippets.csproj
+++ b/bigquery/api/Snippets/Snippets.csproj
@@ -8,7 +8,7 @@
-
+
runtime; build; native; contentfiles; analyzers
all
diff --git a/bigquery/data-transfer/api/QuickStartTest/QuickStartTest.csproj b/bigquery/data-transfer/api/QuickStartTest/QuickStartTest.csproj
index 65996ba7a4..0860b5f63d 100644
--- a/bigquery/data-transfer/api/QuickStartTest/QuickStartTest.csproj
+++ b/bigquery/data-transfer/api/QuickStartTest/QuickStartTest.csproj
@@ -10,7 +10,7 @@
-
+
runtime; build; native; contentfiles; analyzers
all
diff --git a/bigtable/api/BigtableTest/BigtableTest.csproj b/bigtable/api/BigtableTest/BigtableTest.csproj
index 4e3dad8407..3690648bb7 100644
--- a/bigtable/api/BigtableTest/BigtableTest.csproj
+++ b/bigtable/api/BigtableTest/BigtableTest.csproj
@@ -9,7 +9,7 @@
-
+
runtime; build; native; contentfiles; analyzers
all
diff --git a/bigtable/api/SnippetsTest/SnippetsTest.csproj b/bigtable/api/SnippetsTest/SnippetsTest.csproj
index 9f6680c8a8..07a3969725 100644
--- a/bigtable/api/SnippetsTest/SnippetsTest.csproj
+++ b/bigtable/api/SnippetsTest/SnippetsTest.csproj
@@ -12,7 +12,7 @@
-
+
diff --git a/cdn/signUrl/SignUrlSample.Tests/SignUrlSample.Tests.csproj b/cdn/signUrl/SignUrlSample.Tests/SignUrlSample.Tests.csproj
index 9635945569..ecf526e926 100644
--- a/cdn/signUrl/SignUrlSample.Tests/SignUrlSample.Tests.csproj
+++ b/cdn/signUrl/SignUrlSample.Tests/SignUrlSample.Tests.csproj
@@ -10,7 +10,7 @@
-
+
runtime; build; native; contentfiles; analyzers
all
diff --git a/cloudtasks/api/TasksSample/TasksSample.csproj b/cloudtasks/api/TasksSample/TasksSample.csproj
index 8e37133889..f08b1e873f 100644
--- a/cloudtasks/api/TasksSample/TasksSample.csproj
+++ b/cloudtasks/api/TasksSample/TasksSample.csproj
@@ -9,6 +9,6 @@
-
+
diff --git a/commandlineutil/SampleTest/SampleTest.csproj b/commandlineutil/SampleTest/SampleTest.csproj
index c0e05c5fa7..5a5d4356e1 100644
--- a/commandlineutil/SampleTest/SampleTest.csproj
+++ b/commandlineutil/SampleTest/SampleTest.csproj
@@ -9,7 +9,7 @@
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/compute/api/Compute.Samples.Tests/Compute.Samples.Tests.csproj b/compute/api/Compute.Samples.Tests/Compute.Samples.Tests.csproj
index 0b09fd4a15..486a967ab6 100644
--- a/compute/api/Compute.Samples.Tests/Compute.Samples.Tests.csproj
+++ b/compute/api/Compute.Samples.Tests/Compute.Samples.Tests.csproj
@@ -11,7 +11,7 @@
-
+
diff --git a/datastore/admin-api/DatastoreAdmin.Samples.Tests/DatastoreAdmin.Samples.Tests.csproj b/datastore/admin-api/DatastoreAdmin.Samples.Tests/DatastoreAdmin.Samples.Tests.csproj
index 2e60d1e12a..0584a07b2b 100644
--- a/datastore/admin-api/DatastoreAdmin.Samples.Tests/DatastoreAdmin.Samples.Tests.csproj
+++ b/datastore/admin-api/DatastoreAdmin.Samples.Tests/DatastoreAdmin.Samples.Tests.csproj
@@ -10,7 +10,7 @@
-
+
diff --git a/datastore/api/QuickStartTest/QuickStartTest.csproj b/datastore/api/QuickStartTest/QuickStartTest.csproj
index cbb854a436..a6a5e87985 100644
--- a/datastore/api/QuickStartTest/QuickStartTest.csproj
+++ b/datastore/api/QuickStartTest/QuickStartTest.csproj
@@ -9,7 +9,7 @@
-
+
runtime; build; native; contentfiles; analyzers
all
diff --git a/datastore/api/TaskListTest/DatastoreTest.csproj b/datastore/api/TaskListTest/DatastoreTest.csproj
index 388bb7a387..9b8e56f427 100644
--- a/datastore/api/TaskListTest/DatastoreTest.csproj
+++ b/datastore/api/TaskListTest/DatastoreTest.csproj
@@ -6,7 +6,7 @@
-
+
runtime; build; native; contentfiles; analyzers
all
diff --git a/dlp/api/Snippets.Tests/Snippets.Tests.csproj b/dlp/api/Snippets.Tests/Snippets.Tests.csproj
index fa5bfa3c8a..7db20d291e 100644
--- a/dlp/api/Snippets.Tests/Snippets.Tests.csproj
+++ b/dlp/api/Snippets.Tests/Snippets.Tests.csproj
@@ -7,7 +7,7 @@
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/endpoints/getting-started/src/IO.SwaggerTest/IO.SwaggerTest.csproj b/endpoints/getting-started/src/IO.SwaggerTest/IO.SwaggerTest.csproj
index 73802e9f52..d67e0814e6 100644
--- a/endpoints/getting-started/src/IO.SwaggerTest/IO.SwaggerTest.csproj
+++ b/endpoints/getting-started/src/IO.SwaggerTest/IO.SwaggerTest.csproj
@@ -11,7 +11,7 @@
-
+
runtime; build; native; contentfiles; analyzers
all
diff --git a/firestore/api/FirestoreTest/FirestoreTest.csproj b/firestore/api/FirestoreTest/FirestoreTest.csproj
index a7fb6ccd87..08f8e02945 100644
--- a/firestore/api/FirestoreTest/FirestoreTest.csproj
+++ b/firestore/api/FirestoreTest/FirestoreTest.csproj
@@ -7,7 +7,7 @@
-
+
runtime; build; native; contentfiles; analyzers
all
diff --git a/functions/concepts/Concepts.Tests/Concepts.Tests.csproj b/functions/concepts/Concepts.Tests/Concepts.Tests.csproj
index 179df436f8..f803c964f6 100644
--- a/functions/concepts/Concepts.Tests/Concepts.Tests.csproj
+++ b/functions/concepts/Concepts.Tests/Concepts.Tests.csproj
@@ -11,7 +11,7 @@
-
+
diff --git a/functions/firebase/Firebase.Tests/Firebase.Tests.csproj b/functions/firebase/Firebase.Tests/Firebase.Tests.csproj
index 8e243a8ea0..f93cffefe0 100644
--- a/functions/firebase/Firebase.Tests/Firebase.Tests.csproj
+++ b/functions/firebase/Firebase.Tests/Firebase.Tests.csproj
@@ -11,7 +11,7 @@
-
+
diff --git a/functions/helloworld/HelloWorld.Tests/HelloWorld.Tests.csproj b/functions/helloworld/HelloWorld.Tests/HelloWorld.Tests.csproj
index a4081c0f2a..432fa13d4f 100644
--- a/functions/helloworld/HelloWorld.Tests/HelloWorld.Tests.csproj
+++ b/functions/helloworld/HelloWorld.Tests/HelloWorld.Tests.csproj
@@ -11,7 +11,7 @@
-
+
diff --git a/functions/http/Http.Tests/Http.Tests.csproj b/functions/http/Http.Tests/Http.Tests.csproj
index 635af69a8b..5c2217426f 100644
--- a/functions/http/Http.Tests/Http.Tests.csproj
+++ b/functions/http/Http.Tests/Http.Tests.csproj
@@ -10,7 +10,7 @@
-
+
diff --git a/functions/logging/Logging.Tests/Logging.Tests.csproj b/functions/logging/Logging.Tests/Logging.Tests.csproj
index ec8884e4d8..d0cf86436c 100644
--- a/functions/logging/Logging.Tests/Logging.Tests.csproj
+++ b/functions/logging/Logging.Tests/Logging.Tests.csproj
@@ -10,7 +10,7 @@
-
+
diff --git a/iam/api/AccessTest/AccessTest.csproj b/iam/api/AccessTest/AccessTest.csproj
index 975ed0b238..16bc6ddb01 100644
--- a/iam/api/AccessTest/AccessTest.csproj
+++ b/iam/api/AccessTest/AccessTest.csproj
@@ -9,7 +9,7 @@
-
+
runtime; build; native; contentfiles; analyzers
all
diff --git a/iam/api/CustomRolesTest/CustomRolesTest.csproj b/iam/api/CustomRolesTest/CustomRolesTest.csproj
index 757d66b5ed..67dfb4e1f4 100644
--- a/iam/api/CustomRolesTest/CustomRolesTest.csproj
+++ b/iam/api/CustomRolesTest/CustomRolesTest.csproj
@@ -8,7 +8,7 @@
-
+
runtime; build; native; contentfiles; analyzers
all
diff --git a/iam/api/QuickStartTest/QuickStartTest.csproj b/iam/api/QuickStartTest/QuickStartTest.csproj
index e966b03ee6..aa3efffa5d 100644
--- a/iam/api/QuickStartTest/QuickStartTest.csproj
+++ b/iam/api/QuickStartTest/QuickStartTest.csproj
@@ -9,7 +9,7 @@
-
+
runtime; build; native; contentfiles; analyzers
all
diff --git a/iam/api/ServiceAccountTests/ServiceAccountTests.csproj b/iam/api/ServiceAccountTests/ServiceAccountTests.csproj
index 7ba5d96241..4cad78bb11 100644
--- a/iam/api/ServiceAccountTests/ServiceAccountTests.csproj
+++ b/iam/api/ServiceAccountTests/ServiceAccountTests.csproj
@@ -8,7 +8,7 @@
-
+
runtime; build; native; contentfiles; analyzers
all
diff --git a/identity-aware-proxy/IAPClientTest/IAPClientTest.csproj b/identity-aware-proxy/IAPClientTest/IAPClientTest.csproj
index 46c3c0952d..87fe5c6c2c 100644
--- a/identity-aware-proxy/IAPClientTest/IAPClientTest.csproj
+++ b/identity-aware-proxy/IAPClientTest/IAPClientTest.csproj
@@ -11,7 +11,7 @@
-
+
runtime; build; native; contentfiles; analyzers
all
diff --git a/iot/api/CloudIotMqttExampleTest/CloudIotMqttTest.csproj b/iot/api/CloudIotMqttExampleTest/CloudIotMqttTest.csproj
index c2421d6c98..0dedcc21bb 100644
--- a/iot/api/CloudIotMqttExampleTest/CloudIotMqttTest.csproj
+++ b/iot/api/CloudIotMqttExampleTest/CloudIotMqttTest.csproj
@@ -8,7 +8,7 @@
-
+
runtime; build; native; contentfiles; analyzers
all
diff --git a/iot/api/CloudIotTest/CloudIotTest.csproj b/iot/api/CloudIotTest/CloudIotTest.csproj
index 1b635f6520..922818f867 100644
--- a/iot/api/CloudIotTest/CloudIotTest.csproj
+++ b/iot/api/CloudIotTest/CloudIotTest.csproj
@@ -8,7 +8,7 @@
-
+
runtime; build; native; contentfiles; analyzers
all
diff --git a/kms/api/Kms.Samples.Tests/Kms.Samples.Tests.csproj b/kms/api/Kms.Samples.Tests/Kms.Samples.Tests.csproj
index 6920138150..5342725e0c 100644
--- a/kms/api/Kms.Samples.Tests/Kms.Samples.Tests.csproj
+++ b/kms/api/Kms.Samples.Tests/Kms.Samples.Tests.csproj
@@ -8,7 +8,7 @@
-
+
diff --git a/logging/api/LoggingTest/LoggingTest.csproj b/logging/api/LoggingTest/LoggingTest.csproj
index 160f6fc92c..99c3f1ace2 100644
--- a/logging/api/LoggingTest/LoggingTest.csproj
+++ b/logging/api/LoggingTest/LoggingTest.csproj
@@ -9,7 +9,7 @@
-
+
runtime; build; native; contentfiles; analyzers
all
diff --git a/monitoring/api/AlertSnippets/AlertSnippets.csproj b/monitoring/api/AlertSnippets/AlertSnippets.csproj
index 94773b4ac9..3b66d0586b 100644
--- a/monitoring/api/AlertSnippets/AlertSnippets.csproj
+++ b/monitoring/api/AlertSnippets/AlertSnippets.csproj
@@ -10,7 +10,7 @@
-
+
runtime; build; native; contentfiles; analyzers
all
diff --git a/monitoring/api/AlertTest/AlertTest.csproj b/monitoring/api/AlertTest/AlertTest.csproj
index 88ad5e02e8..155ee9e650 100644
--- a/monitoring/api/AlertTest/AlertTest.csproj
+++ b/monitoring/api/AlertTest/AlertTest.csproj
@@ -9,7 +9,7 @@
-
+
runtime; build; native; contentfiles; analyzers
all
diff --git a/monitoring/api/MonitoringTest/MonitoringTest.csproj b/monitoring/api/MonitoringTest/MonitoringTest.csproj
index 688a461e2e..516729185f 100644
--- a/monitoring/api/MonitoringTest/MonitoringTest.csproj
+++ b/monitoring/api/MonitoringTest/MonitoringTest.csproj
@@ -6,7 +6,7 @@
-
+
runtime; build; native; contentfiles; analyzers
all
diff --git a/monitoring/api/UptimeCheckTest/UptimeCheckTest.csproj b/monitoring/api/UptimeCheckTest/UptimeCheckTest.csproj
index ec0196b0da..d5d95a8c64 100644
--- a/monitoring/api/UptimeCheckTest/UptimeCheckTest.csproj
+++ b/monitoring/api/UptimeCheckTest/UptimeCheckTest.csproj
@@ -8,7 +8,7 @@
-
+
runtime; build; native; contentfiles; analyzers
all
diff --git a/pubsub/api/Pubsub.Samples.Tests/Pubsub.Samples.Tests.csproj b/pubsub/api/Pubsub.Samples.Tests/Pubsub.Samples.Tests.csproj
index 04c170d122..cc2c1f6cf2 100644
--- a/pubsub/api/Pubsub.Samples.Tests/Pubsub.Samples.Tests.csproj
+++ b/pubsub/api/Pubsub.Samples.Tests/Pubsub.Samples.Tests.csproj
@@ -10,7 +10,7 @@
-
+
diff --git a/secretmanager/api/SecretManager.Samples.Tests/SecretManager.Samples.Tests.csproj b/secretmanager/api/SecretManager.Samples.Tests/SecretManager.Samples.Tests.csproj
index 76b87cb48d..1afa285c0f 100644
--- a/secretmanager/api/SecretManager.Samples.Tests/SecretManager.Samples.Tests.csproj
+++ b/secretmanager/api/SecretManager.Samples.Tests/SecretManager.Samples.Tests.csproj
@@ -8,7 +8,7 @@
-
+
diff --git a/servicedirectory/api/ServiceDirectory.Samples.Tests/ServiceDirectory.Samples.Tests.csproj b/servicedirectory/api/ServiceDirectory.Samples.Tests/ServiceDirectory.Samples.Tests.csproj
index 0d3f076285..7e467bb935 100644
--- a/servicedirectory/api/ServiceDirectory.Samples.Tests/ServiceDirectory.Samples.Tests.csproj
+++ b/servicedirectory/api/ServiceDirectory.Samples.Tests/ServiceDirectory.Samples.Tests.csproj
@@ -8,7 +8,7 @@
-
+
diff --git a/spanner/api/Spanner.Samples.Tests/Spanner.Samples.Tests.csproj b/spanner/api/Spanner.Samples.Tests/Spanner.Samples.Tests.csproj
index 6bd125a0c9..a20d5e7ae4 100644
--- a/spanner/api/Spanner.Samples.Tests/Spanner.Samples.Tests.csproj
+++ b/spanner/api/Spanner.Samples.Tests/Spanner.Samples.Tests.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/storage/api/Storage.Samples.Tests/Storage.Samples.Tests.csproj b/storage/api/Storage.Samples.Tests/Storage.Samples.Tests.csproj
index e9c36c152b..b117dfd66c 100644
--- a/storage/api/Storage.Samples.Tests/Storage.Samples.Tests.csproj
+++ b/storage/api/Storage.Samples.Tests/Storage.Samples.Tests.csproj
@@ -9,7 +9,7 @@
-
+