diff --git a/aiplatform/api/AIPlatform.Samples.Tests/AIPlatform.Samples.Tests.csproj b/aiplatform/api/AIPlatform.Samples.Tests/AIPlatform.Samples.Tests.csproj
index f41860a6e2f..c8537405870 100644
--- a/aiplatform/api/AIPlatform.Samples.Tests/AIPlatform.Samples.Tests.csproj
+++ b/aiplatform/api/AIPlatform.Samples.Tests/AIPlatform.Samples.Tests.csproj
@@ -7,8 +7,8 @@
-
-
+
+
diff --git a/appengine/flexible/Analytics/Analytics.Tests/Analytics.Tests.csproj b/appengine/flexible/Analytics/Analytics.Tests/Analytics.Tests.csproj
index e69a21e957d..70bce5fe7bb 100644
--- a/appengine/flexible/Analytics/Analytics.Tests/Analytics.Tests.csproj
+++ b/appengine/flexible/Analytics/Analytics.Tests/Analytics.Tests.csproj
@@ -12,8 +12,8 @@
-
-
+
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/appengine/flexible/CloudStorage/CloudStorage.Tests/CloudStorage.Tests.csproj b/appengine/flexible/CloudStorage/CloudStorage.Tests/CloudStorage.Tests.csproj
index 46aa24a744e..9083ad534da 100644
--- a/appengine/flexible/CloudStorage/CloudStorage.Tests/CloudStorage.Tests.csproj
+++ b/appengine/flexible/CloudStorage/CloudStorage.Tests/CloudStorage.Tests.csproj
@@ -12,8 +12,8 @@
-
-
+
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/appengine/flexible/Datastore/Datastore.Tests/Datastore.Tests.csproj b/appengine/flexible/Datastore/Datastore.Tests/Datastore.Tests.csproj
index c1f1f9643d7..d0f8321e9d0 100644
--- a/appengine/flexible/Datastore/Datastore.Tests/Datastore.Tests.csproj
+++ b/appengine/flexible/Datastore/Datastore.Tests/Datastore.Tests.csproj
@@ -12,8 +12,8 @@
-
-
+
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/appengine/flexible/HelloWorld/HelloWorld.Tests/HelloWorld.Tests.csproj b/appengine/flexible/HelloWorld/HelloWorld.Tests/HelloWorld.Tests.csproj
index 1b29d7c1f21..b5a396487d1 100644
--- a/appengine/flexible/HelloWorld/HelloWorld.Tests/HelloWorld.Tests.csproj
+++ b/appengine/flexible/HelloWorld/HelloWorld.Tests/HelloWorld.Tests.csproj
@@ -12,8 +12,8 @@
-
-
+
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/appengine/flexible/Metadata/Metadata.Tests/Metadata.Tests.csproj b/appengine/flexible/Metadata/Metadata.Tests/Metadata.Tests.csproj
index 1a99e7a25f0..945256800d5 100644
--- a/appengine/flexible/Metadata/Metadata.Tests/Metadata.Tests.csproj
+++ b/appengine/flexible/Metadata/Metadata.Tests/Metadata.Tests.csproj
@@ -12,8 +12,8 @@
-
-
+
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/appengine/flexible/Pubsub/Pubsub.Tests/Pubsub.Tests.csproj b/appengine/flexible/Pubsub/Pubsub.Tests/Pubsub.Tests.csproj
index 668bad051c2..2559bbf686b 100644
--- a/appengine/flexible/Pubsub/Pubsub.Tests/Pubsub.Tests.csproj
+++ b/appengine/flexible/Pubsub/Pubsub.Tests/Pubsub.Tests.csproj
@@ -12,8 +12,8 @@
-
-
+
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/appengine/flexible/StaticContent/StaticContent.Tests/StaticContent.Tests.csproj b/appengine/flexible/StaticContent/StaticContent.Tests/StaticContent.Tests.csproj
index b3bc3d452e4..f536b1fef9b 100644
--- a/appengine/flexible/StaticContent/StaticContent.Tests/StaticContent.Tests.csproj
+++ b/appengine/flexible/StaticContent/StaticContent.Tests/StaticContent.Tests.csproj
@@ -12,8 +12,8 @@
-
-
+
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/appengine/flexible/WebSocket/WebSocket.Tests/WebSocket.Tests.csproj b/appengine/flexible/WebSocket/WebSocket.Tests/WebSocket.Tests.csproj
index 989dff3dafd..61e7244e218 100644
--- a/appengine/flexible/WebSocket/WebSocket.Tests/WebSocket.Tests.csproj
+++ b/appengine/flexible/WebSocket/WebSocket.Tests/WebSocket.Tests.csproj
@@ -12,8 +12,8 @@
-
-
+
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/applications/leaderboard/LeaderboardTest/LeaderboardTest.csproj b/applications/leaderboard/LeaderboardTest/LeaderboardTest.csproj
index 0a60ebb3c6d..0dc40153aaa 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 d653d6002f5..cbf19519144 100644
--- a/asset/api/Asset.Samples.Tests/Asset.Samples.Tests.csproj
+++ b/asset/api/Asset.Samples.Tests/Asset.Samples.Tests.csproj
@@ -9,8 +9,8 @@
-
-
+
+
diff --git a/auth/AuthTest/AuthTest.csproj b/auth/AuthTest/AuthTest.csproj
index c38b7c8d79f..84145c5d4ee 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-storage/api/BigQueryStorage.Samples.Tests/BigQueryStorage.Samples.Tests.csproj b/bigquery-storage/api/BigQueryStorage.Samples.Tests/BigQueryStorage.Samples.Tests.csproj
index 540ebbc084b..e34a1e40873 100644
--- a/bigquery-storage/api/BigQueryStorage.Samples.Tests/BigQueryStorage.Samples.Tests.csproj
+++ b/bigquery-storage/api/BigQueryStorage.Samples.Tests/BigQueryStorage.Samples.Tests.csproj
@@ -7,8 +7,8 @@
-
-
+
+
diff --git a/bigquery/api/SimpleApp/SimpleApp.csproj b/bigquery/api/SimpleApp/SimpleApp.csproj
index 9ce256262dc..a55ac844714 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 d600ea4a27a..5cb5d72a2b4 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 f1d5dde0ac0..96f9a5ddb2a 100644
--- a/bigquery/data-transfer/api/QuickStartTest/QuickStartTest.csproj
+++ b/bigquery/data-transfer/api/QuickStartTest/QuickStartTest.csproj
@@ -9,8 +9,8 @@
-
-
+
+
runtime; build; native; contentfiles; analyzers
all
diff --git a/cdn/signUrl/SignUrlSample.Tests/SignUrlSample.Tests.csproj b/cdn/signUrl/SignUrlSample.Tests/SignUrlSample.Tests.csproj
index 72f8dd49126..816d784776f 100644
--- a/cdn/signUrl/SignUrlSample.Tests/SignUrlSample.Tests.csproj
+++ b/cdn/signUrl/SignUrlSample.Tests/SignUrlSample.Tests.csproj
@@ -9,8 +9,8 @@
-
-
+
+
runtime; build; native; contentfiles; analyzers
all
diff --git a/cloudtasks/api/TasksSample/TasksSample.csproj b/cloudtasks/api/TasksSample/TasksSample.csproj
index d0f808a0ad0..4260a91d121 100644
--- a/cloudtasks/api/TasksSample/TasksSample.csproj
+++ b/cloudtasks/api/TasksSample/TasksSample.csproj
@@ -8,7 +8,7 @@
-
-
+
+
diff --git a/commandlineutil/SampleTest/SampleTest.csproj b/commandlineutil/SampleTest/SampleTest.csproj
index 13c3f21e4da..b284fba8533 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 05bba448082..a60731e4058 100644
--- a/compute/api/Compute.Samples.Tests/Compute.Samples.Tests.csproj
+++ b/compute/api/Compute.Samples.Tests/Compute.Samples.Tests.csproj
@@ -10,8 +10,8 @@
-
-
+
+
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 9360b919049..1c74c0d69b7 100644
--- a/datastore/admin-api/DatastoreAdmin.Samples.Tests/DatastoreAdmin.Samples.Tests.csproj
+++ b/datastore/admin-api/DatastoreAdmin.Samples.Tests/DatastoreAdmin.Samples.Tests.csproj
@@ -9,8 +9,8 @@
-
-
+
+
diff --git a/datastore/api/QuickStartTest/QuickStartTest.csproj b/datastore/api/QuickStartTest/QuickStartTest.csproj
index 271e710b9d6..e7501e72d68 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 6cccd65e159..e7a532df38c 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 9fa60a79424..fd776840871 100644
--- a/dlp/api/Snippets.Tests/Snippets.Tests.csproj
+++ b/dlp/api/Snippets.Tests/Snippets.Tests.csproj
@@ -6,8 +6,8 @@
-
-
+
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/documentai/api/DocumentAI.Samples.Tests/DocumentAI.Samples.Tests.csproj b/documentai/api/DocumentAI.Samples.Tests/DocumentAI.Samples.Tests.csproj
index 4b21b8cab0a..f12f4fc3f1e 100644
--- a/documentai/api/DocumentAI.Samples.Tests/DocumentAI.Samples.Tests.csproj
+++ b/documentai/api/DocumentAI.Samples.Tests/DocumentAI.Samples.Tests.csproj
@@ -7,8 +7,8 @@
-
-
+
+
diff --git a/error-reporting/api/test/test.csproj b/error-reporting/api/test/test.csproj
index a79f243949a..365ed7a5ca6 100644
--- a/error-reporting/api/test/test.csproj
+++ b/error-reporting/api/test/test.csproj
@@ -9,8 +9,8 @@
-
-
+
+
runtime; build; native; contentfiles; analyzers
all
diff --git a/firestore/api/FirestoreTest/FirestoreTest.csproj b/firestore/api/FirestoreTest/FirestoreTest.csproj
index 9da373b1916..a2a384a1efe 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 dab514e32a9..feda6aabed4 100644
--- a/functions/concepts/Concepts.Tests/Concepts.Tests.csproj
+++ b/functions/concepts/Concepts.Tests/Concepts.Tests.csproj
@@ -10,8 +10,8 @@
-
-
+
+
diff --git a/functions/firebase/Firebase.Tests/Firebase.Tests.csproj b/functions/firebase/Firebase.Tests/Firebase.Tests.csproj
index eed7e3f279a..562987dc9e3 100644
--- a/functions/firebase/Firebase.Tests/Firebase.Tests.csproj
+++ b/functions/firebase/Firebase.Tests/Firebase.Tests.csproj
@@ -10,8 +10,8 @@
-
-
+
+
diff --git a/functions/helloworld/HelloWorld.Tests/HelloWorld.Tests.csproj b/functions/helloworld/HelloWorld.Tests/HelloWorld.Tests.csproj
index b00ddf6d3b3..11e94547ed5 100644
--- a/functions/helloworld/HelloWorld.Tests/HelloWorld.Tests.csproj
+++ b/functions/helloworld/HelloWorld.Tests/HelloWorld.Tests.csproj
@@ -10,8 +10,8 @@
-
-
+
+
diff --git a/functions/http/Http.Tests/Http.Tests.csproj b/functions/http/Http.Tests/Http.Tests.csproj
index 61c5f1b24a7..f942ed09369 100644
--- a/functions/http/Http.Tests/Http.Tests.csproj
+++ b/functions/http/Http.Tests/Http.Tests.csproj
@@ -9,8 +9,8 @@
-
-
+
+
diff --git a/functions/logging/Logging.Tests/Logging.Tests.csproj b/functions/logging/Logging.Tests/Logging.Tests.csproj
index adcbf334ff2..1bb8b755ddb 100644
--- a/functions/logging/Logging.Tests/Logging.Tests.csproj
+++ b/functions/logging/Logging.Tests/Logging.Tests.csproj
@@ -9,8 +9,8 @@
-
-
+
+
diff --git a/functions/responsestreaming/StreamBigQuery.Tests/StreamBigQuery.Tests.csproj b/functions/responsestreaming/StreamBigQuery.Tests/StreamBigQuery.Tests.csproj
index 9cdaa07ae40..e656fd9b0d3 100644
--- a/functions/responsestreaming/StreamBigQuery.Tests/StreamBigQuery.Tests.csproj
+++ b/functions/responsestreaming/StreamBigQuery.Tests/StreamBigQuery.Tests.csproj
@@ -9,8 +9,8 @@
-
-
+
+
diff --git a/functions/typed/Typed.Tests/Typed.Tests.csproj b/functions/typed/Typed.Tests/Typed.Tests.csproj
index 21800ccd5ca..e22d5365623 100644
--- a/functions/typed/Typed.Tests/Typed.Tests.csproj
+++ b/functions/typed/Typed.Tests/Typed.Tests.csproj
@@ -10,8 +10,8 @@
-
-
+
+
diff --git a/iam/api/AccessTest/AccessTest.csproj b/iam/api/AccessTest/AccessTest.csproj
index b1a73adf3f2..6ed4f98c10e 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 dffee394312..39fcffaf4a5 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 13284c7d004..2d0a4c90115 100644
--- a/iam/api/QuickStartTest/QuickStartTest.csproj
+++ b/iam/api/QuickStartTest/QuickStartTest.csproj
@@ -8,8 +8,8 @@
-
-
+
+
runtime; build; native; contentfiles; analyzers
all
diff --git a/iam/api/ServiceAccountTests/ServiceAccountTests.csproj b/iam/api/ServiceAccountTests/ServiceAccountTests.csproj
index 536efe60600..9b76898023b 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 c0d29d016e4..6beb927a1c7 100644
--- a/identity-aware-proxy/IAPClientTest/IAPClientTest.csproj
+++ b/identity-aware-proxy/IAPClientTest/IAPClientTest.csproj
@@ -10,8 +10,8 @@
-
-
+
+
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 79151679c56..9f255113a4b 100644
--- a/kms/api/Kms.Samples.Tests/Kms.Samples.Tests.csproj
+++ b/kms/api/Kms.Samples.Tests/Kms.Samples.Tests.csproj
@@ -7,8 +7,8 @@
-
-
+
+
diff --git a/logging/api/LoggingTest/LoggingTest.csproj b/logging/api/LoggingTest/LoggingTest.csproj
index d1bf9a870af..fa96bd020e8 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/media/livestream/api/LiveStream.Samples.Tests/LiveStream.Samples.Tests.csproj b/media/livestream/api/LiveStream.Samples.Tests/LiveStream.Samples.Tests.csproj
index 6ad8d373a56..52a6fa0f328 100644
--- a/media/livestream/api/LiveStream.Samples.Tests/LiveStream.Samples.Tests.csproj
+++ b/media/livestream/api/LiveStream.Samples.Tests/LiveStream.Samples.Tests.csproj
@@ -8,8 +8,8 @@
-
-
+
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/media/stitcher/api/Stitcher.Samples.Tests/Stitcher.Samples.Tests.csproj b/media/stitcher/api/Stitcher.Samples.Tests/Stitcher.Samples.Tests.csproj
index c0cd174d4de..845f6ca3945 100644
--- a/media/stitcher/api/Stitcher.Samples.Tests/Stitcher.Samples.Tests.csproj
+++ b/media/stitcher/api/Stitcher.Samples.Tests/Stitcher.Samples.Tests.csproj
@@ -8,8 +8,8 @@
-
-
+
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/media/transcoder/api/Transcoder.Samples.Tests/Transcoder.Samples.Tests.csproj b/media/transcoder/api/Transcoder.Samples.Tests/Transcoder.Samples.Tests.csproj
index d8e1086678e..6b0f5c51849 100644
--- a/media/transcoder/api/Transcoder.Samples.Tests/Transcoder.Samples.Tests.csproj
+++ b/media/transcoder/api/Transcoder.Samples.Tests/Transcoder.Samples.Tests.csproj
@@ -8,8 +8,8 @@
-
-
+
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/monitoring/api/AlertSnippets/AlertSnippets.csproj b/monitoring/api/AlertSnippets/AlertSnippets.csproj
index 9238c6c6aef..95638382202 100644
--- a/monitoring/api/AlertSnippets/AlertSnippets.csproj
+++ b/monitoring/api/AlertSnippets/AlertSnippets.csproj
@@ -9,8 +9,8 @@
-
-
+
+
runtime; build; native; contentfiles; analyzers
all
diff --git a/monitoring/api/AlertTest/AlertTest.csproj b/monitoring/api/AlertTest/AlertTest.csproj
index 16a708331a5..f01600fd359 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 98143126b11..ed31a0d87fa 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 c4cff9e882b..f7fc36c515a 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 e09dab3a690..6ec26a524c5 100644
--- a/pubsub/api/Pubsub.Samples.Tests/Pubsub.Samples.Tests.csproj
+++ b/pubsub/api/Pubsub.Samples.Tests/Pubsub.Samples.Tests.csproj
@@ -10,8 +10,8 @@
-
-
+
+
diff --git a/retail/interactive-tutorial/RetailEvents.Samples.Tests/RetailEvents.Samples.Tests.csproj b/retail/interactive-tutorial/RetailEvents.Samples.Tests/RetailEvents.Samples.Tests.csproj
index 84f62b37547..23439deafc3 100644
--- a/retail/interactive-tutorial/RetailEvents.Samples.Tests/RetailEvents.Samples.Tests.csproj
+++ b/retail/interactive-tutorial/RetailEvents.Samples.Tests/RetailEvents.Samples.Tests.csproj
@@ -8,8 +8,8 @@
-
-
+
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/retail/interactive-tutorial/RetailProducts.Samples.Tests/RetailProducts.Samples.Tests.csproj b/retail/interactive-tutorial/RetailProducts.Samples.Tests/RetailProducts.Samples.Tests.csproj
index 6cc9e3414a2..f30053ebb92 100644
--- a/retail/interactive-tutorial/RetailProducts.Samples.Tests/RetailProducts.Samples.Tests.csproj
+++ b/retail/interactive-tutorial/RetailProducts.Samples.Tests/RetailProducts.Samples.Tests.csproj
@@ -9,8 +9,8 @@
-
-
+
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/retail/interactive-tutorial/RetailSearch.Samples.Tests/RetailSearch.Samples.Tests.csproj b/retail/interactive-tutorial/RetailSearch.Samples.Tests/RetailSearch.Samples.Tests.csproj
index f555da0f339..bd4442739ea 100644
--- a/retail/interactive-tutorial/RetailSearch.Samples.Tests/RetailSearch.Samples.Tests.csproj
+++ b/retail/interactive-tutorial/RetailSearch.Samples.Tests/RetailSearch.Samples.Tests.csproj
@@ -8,8 +8,8 @@
-
-
+
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/run/markdown-preview/Samples.Run.MarkdownPreview.Editor.Tests/Samples.Run.MarkdownPreview.Editor.Tests.csproj b/run/markdown-preview/Samples.Run.MarkdownPreview.Editor.Tests/Samples.Run.MarkdownPreview.Editor.Tests.csproj
index 3d8ef964e37..8909b8ecb0e 100644
--- a/run/markdown-preview/Samples.Run.MarkdownPreview.Editor.Tests/Samples.Run.MarkdownPreview.Editor.Tests.csproj
+++ b/run/markdown-preview/Samples.Run.MarkdownPreview.Editor.Tests/Samples.Run.MarkdownPreview.Editor.Tests.csproj
@@ -14,8 +14,8 @@
-
-
+
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/run/markdown-preview/Samples.Run.MarkdownPreview.Renderer.Tests/Samples.Run.MarkdownPreview.Renderer.Tests.csproj b/run/markdown-preview/Samples.Run.MarkdownPreview.Renderer.Tests/Samples.Run.MarkdownPreview.Renderer.Tests.csproj
index 5d479423330..73a86cf2205 100644
--- a/run/markdown-preview/Samples.Run.MarkdownPreview.Renderer.Tests/Samples.Run.MarkdownPreview.Renderer.Tests.csproj
+++ b/run/markdown-preview/Samples.Run.MarkdownPreview.Renderer.Tests/Samples.Run.MarkdownPreview.Renderer.Tests.csproj
@@ -13,8 +13,8 @@
-
-
+
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/run/pubsub/Run.Samples.Pubsub.MinimalApi.Tests/Run.Samples.Pubsub.MinimalApi.Tests.csproj b/run/pubsub/Run.Samples.Pubsub.MinimalApi.Tests/Run.Samples.Pubsub.MinimalApi.Tests.csproj
index 3fb9d652f7b..e530e98df34 100644
--- a/run/pubsub/Run.Samples.Pubsub.MinimalApi.Tests/Run.Samples.Pubsub.MinimalApi.Tests.csproj
+++ b/run/pubsub/Run.Samples.Pubsub.MinimalApi.Tests/Run.Samples.Pubsub.MinimalApi.Tests.csproj
@@ -11,8 +11,8 @@
-
-
+
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/secretmanager/api/SecretManager.Samples.Tests/SecretManager.Samples.Tests.csproj b/secretmanager/api/SecretManager.Samples.Tests/SecretManager.Samples.Tests.csproj
index 1e655f821c4..2158d6f82f2 100644
--- a/secretmanager/api/SecretManager.Samples.Tests/SecretManager.Samples.Tests.csproj
+++ b/secretmanager/api/SecretManager.Samples.Tests/SecretManager.Samples.Tests.csproj
@@ -7,8 +7,8 @@
-
-
+
+
diff --git a/securitycenter/api/tests/Tests.csproj b/securitycenter/api/tests/Tests.csproj
index 822b54b68c7..6da617ffd93 100644
--- a/securitycenter/api/tests/Tests.csproj
+++ b/securitycenter/api/tests/Tests.csproj
@@ -5,8 +5,8 @@
-
-
+
+
diff --git a/servicedirectory/api/ServiceDirectory.Samples.Tests/ServiceDirectory.Samples.Tests.csproj b/servicedirectory/api/ServiceDirectory.Samples.Tests/ServiceDirectory.Samples.Tests.csproj
index 113c8103401..57c8fb09dcc 100644
--- a/servicedirectory/api/ServiceDirectory.Samples.Tests/ServiceDirectory.Samples.Tests.csproj
+++ b/servicedirectory/api/ServiceDirectory.Samples.Tests/ServiceDirectory.Samples.Tests.csproj
@@ -7,8 +7,8 @@
-
-
+
+
diff --git a/spanner/api/Spanner.Samples.Tests/Spanner.Samples.Tests.csproj b/spanner/api/Spanner.Samples.Tests/Spanner.Samples.Tests.csproj
index 5529b72777c..d248cfd2607 100644
--- a/spanner/api/Spanner.Samples.Tests/Spanner.Samples.Tests.csproj
+++ b/spanner/api/Spanner.Samples.Tests/Spanner.Samples.Tests.csproj
@@ -14,8 +14,8 @@
-
-
+
+
diff --git a/storage/api/Storage.Samples.Tests/Storage.Samples.Tests.csproj b/storage/api/Storage.Samples.Tests/Storage.Samples.Tests.csproj
index 67fd87b6226..f223abfd0b3 100644
--- a/storage/api/Storage.Samples.Tests/Storage.Samples.Tests.csproj
+++ b/storage/api/Storage.Samples.Tests/Storage.Samples.Tests.csproj
@@ -9,8 +9,8 @@
-
-
+
+
diff --git a/storagetransfer/api/StorageTransfer.Samples.Tests/StorageTransfer.Samples.Tests.csproj b/storagetransfer/api/StorageTransfer.Samples.Tests/StorageTransfer.Samples.Tests.csproj
index bfa9f3a336c..e2d628835e2 100644
--- a/storagetransfer/api/StorageTransfer.Samples.Tests/StorageTransfer.Samples.Tests.csproj
+++ b/storagetransfer/api/StorageTransfer.Samples.Tests/StorageTransfer.Samples.Tests.csproj
@@ -14,8 +14,8 @@
-
-
+
+
\ No newline at end of file
diff --git a/testutil/testutil.csproj b/testutil/testutil.csproj
index 80500182205..519043a5c97 100644
--- a/testutil/testutil.csproj
+++ b/testutil/testutil.csproj
@@ -8,7 +8,7 @@
-
+
\ No newline at end of file