diff --git a/eng/targets/ResolveReferences.targets b/eng/targets/ResolveReferences.targets
index 3206d0b23f6..a5ef49da852 100644
--- a/eng/targets/ResolveReferences.targets
+++ b/eng/targets/ResolveReferences.targets
@@ -54,11 +54,11 @@
false
- true
+ true
false
- true
+ true
false
diff --git a/src/Configuration/Config.Ini/test/Microsoft.Extensions.Configuration.Ini.Tests.csproj b/src/Configuration/Config.Ini/test/Microsoft.Extensions.Configuration.Ini.Tests.csproj
index bf19b8b62c1..b6d4f6c8d97 100644
--- a/src/Configuration/Config.Ini/test/Microsoft.Extensions.Configuration.Ini.Tests.csproj
+++ b/src/Configuration/Config.Ini/test/Microsoft.Extensions.Configuration.Ini.Tests.csproj
@@ -14,6 +14,8 @@
+
+
diff --git a/src/Configuration/Config.Json/test/Microsoft.Extensions.Configuration.Json.Tests.csproj b/src/Configuration/Config.Json/test/Microsoft.Extensions.Configuration.Json.Tests.csproj
index ff81d8bd885..492bc5310e6 100644
--- a/src/Configuration/Config.Json/test/Microsoft.Extensions.Configuration.Json.Tests.csproj
+++ b/src/Configuration/Config.Json/test/Microsoft.Extensions.Configuration.Json.Tests.csproj
@@ -15,6 +15,7 @@
+
diff --git a/src/Configuration/Config.KeyPerFile/test/Microsoft.Extensions.Configuration.KeyPerFile.Tests.csproj b/src/Configuration/Config.KeyPerFile/test/Microsoft.Extensions.Configuration.KeyPerFile.Tests.csproj
index 95a73ae6cfd..465544aaf8d 100644
--- a/src/Configuration/Config.KeyPerFile/test/Microsoft.Extensions.Configuration.KeyPerFile.Tests.csproj
+++ b/src/Configuration/Config.KeyPerFile/test/Microsoft.Extensions.Configuration.KeyPerFile.Tests.csproj
@@ -15,6 +15,7 @@
+
diff --git a/src/Configuration/Config.NewtonsoftJson/test/Microsoft.Extensions.Configuration.NewtonsoftJson.Tests.csproj b/src/Configuration/Config.NewtonsoftJson/test/Microsoft.Extensions.Configuration.NewtonsoftJson.Tests.csproj
index ace142c0c57..5731507587b 100644
--- a/src/Configuration/Config.NewtonsoftJson/test/Microsoft.Extensions.Configuration.NewtonsoftJson.Tests.csproj
+++ b/src/Configuration/Config.NewtonsoftJson/test/Microsoft.Extensions.Configuration.NewtonsoftJson.Tests.csproj
@@ -15,6 +15,7 @@
+
diff --git a/src/Configuration/Config.UserSecrets/test/Microsoft.Extensions.Configuration.UserSecrets.Tests.csproj b/src/Configuration/Config.UserSecrets/test/Microsoft.Extensions.Configuration.UserSecrets.Tests.csproj
index 158fbb72c92..4c7064b6c27 100644
--- a/src/Configuration/Config.UserSecrets/test/Microsoft.Extensions.Configuration.UserSecrets.Tests.csproj
+++ b/src/Configuration/Config.UserSecrets/test/Microsoft.Extensions.Configuration.UserSecrets.Tests.csproj
@@ -10,6 +10,9 @@
+
+
+
diff --git a/src/Configuration/Config.Xml/test/Microsoft.Extensions.Configuration.Xml.Tests.csproj b/src/Configuration/Config.Xml/test/Microsoft.Extensions.Configuration.Xml.Tests.csproj
index c2dc80237de..3ca2747ce85 100644
--- a/src/Configuration/Config.Xml/test/Microsoft.Extensions.Configuration.Xml.Tests.csproj
+++ b/src/Configuration/Config.Xml/test/Microsoft.Extensions.Configuration.Xml.Tests.csproj
@@ -14,6 +14,8 @@
+
+
diff --git a/src/Configuration/test/Config.FunctionalTests/Microsoft.Extensions.Configuration.FunctionalTests.csproj b/src/Configuration/test/Config.FunctionalTests/Microsoft.Extensions.Configuration.FunctionalTests.csproj
index 4c993034998..0714840a5fe 100644
--- a/src/Configuration/test/Config.FunctionalTests/Microsoft.Extensions.Configuration.FunctionalTests.csproj
+++ b/src/Configuration/test/Config.FunctionalTests/Microsoft.Extensions.Configuration.FunctionalTests.csproj
@@ -21,6 +21,7 @@
+
diff --git a/src/Configuration/testassets/Test.Common/Microsoft.Extensions.Configuration.Test.Common.csproj b/src/Configuration/testassets/Test.Common/Microsoft.Extensions.Configuration.Test.Common.csproj
index d588486aa49..5ed8f6d1e3b 100644
--- a/src/Configuration/testassets/Test.Common/Microsoft.Extensions.Configuration.Test.Common.csproj
+++ b/src/Configuration/testassets/Test.Common/Microsoft.Extensions.Configuration.Test.Common.csproj
@@ -8,6 +8,7 @@
+
diff --git a/src/HealthChecks/HealthChecks/test/Microsoft.Extensions.Diagnostics.HealthChecks.Tests.csproj b/src/HealthChecks/HealthChecks/test/Microsoft.Extensions.Diagnostics.HealthChecks.Tests.csproj
index 21763e51651..958565354bf 100644
--- a/src/HealthChecks/HealthChecks/test/Microsoft.Extensions.Diagnostics.HealthChecks.Tests.csproj
+++ b/src/HealthChecks/HealthChecks/test/Microsoft.Extensions.Diagnostics.HealthChecks.Tests.csproj
@@ -17,6 +17,7 @@
+
diff --git a/src/Hosting/Hosting/test/Microsoft.Extensions.Hosting.Tests.csproj b/src/Hosting/Hosting/test/Microsoft.Extensions.Hosting.Tests.csproj
index 18d794aac7f..177ee10e238 100644
--- a/src/Hosting/Hosting/test/Microsoft.Extensions.Hosting.Tests.csproj
+++ b/src/Hosting/Hosting/test/Microsoft.Extensions.Hosting.Tests.csproj
@@ -11,20 +11,31 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Hosting/Systemd/test/Microsoft.Extensions.Hosting.Systemd.Tests.csproj b/src/Hosting/Systemd/test/Microsoft.Extensions.Hosting.Systemd.Tests.csproj
index 24bc4da4e3d..ee99baf4433 100644
--- a/src/Hosting/Systemd/test/Microsoft.Extensions.Hosting.Systemd.Tests.csproj
+++ b/src/Hosting/Systemd/test/Microsoft.Extensions.Hosting.Systemd.Tests.csproj
@@ -5,11 +5,20 @@
+
+
+
+
+
+
+
+
+
-
+
\ No newline at end of file
diff --git a/src/Hosting/WindowsServices/test/Microsoft.Extensions.Hosting.WindowsServices.Tests.csproj b/src/Hosting/WindowsServices/test/Microsoft.Extensions.Hosting.WindowsServices.Tests.csproj
index 383edc335ab..6f6df8afdd3 100644
--- a/src/Hosting/WindowsServices/test/Microsoft.Extensions.Hosting.WindowsServices.Tests.csproj
+++ b/src/Hosting/WindowsServices/test/Microsoft.Extensions.Hosting.WindowsServices.Tests.csproj
@@ -5,11 +5,20 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/Hosting/test/FunctionalTests/Microsoft.Extensions.Hosting.FunctionalTests.csproj b/src/Hosting/test/FunctionalTests/Microsoft.Extensions.Hosting.FunctionalTests.csproj
index 6f120cb531f..840a61963fd 100644
--- a/src/Hosting/test/FunctionalTests/Microsoft.Extensions.Hosting.FunctionalTests.csproj
+++ b/src/Hosting/test/FunctionalTests/Microsoft.Extensions.Hosting.FunctionalTests.csproj
@@ -13,10 +13,15 @@
+
+
+
+
+
diff --git a/src/Hosting/test/testassets/Microsoft.Extensions.Hosting.TestApp/Microsoft.Extensions.Hosting.TestApp.csproj b/src/Hosting/test/testassets/Microsoft.Extensions.Hosting.TestApp/Microsoft.Extensions.Hosting.TestApp.csproj
index c0a4c3b1ed6..6f70452dac0 100644
--- a/src/Hosting/test/testassets/Microsoft.Extensions.Hosting.TestApp/Microsoft.Extensions.Hosting.TestApp.csproj
+++ b/src/Hosting/test/testassets/Microsoft.Extensions.Hosting.TestApp/Microsoft.Extensions.Hosting.TestApp.csproj
@@ -6,7 +6,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/HttpClientFactory/Http/test/Microsoft.Extensions.Http.Tests.csproj b/src/HttpClientFactory/Http/test/Microsoft.Extensions.Http.Tests.csproj
index 398c0c3680d..379fc31de69 100644
--- a/src/HttpClientFactory/Http/test/Microsoft.Extensions.Http.Tests.csproj
+++ b/src/HttpClientFactory/Http/test/Microsoft.Extensions.Http.Tests.csproj
@@ -11,6 +11,7 @@
+
diff --git a/src/HttpClientFactory/Polly/test/Microsoft.Extensions.Http.Polly.Tests.csproj b/src/HttpClientFactory/Polly/test/Microsoft.Extensions.Http.Polly.Tests.csproj
index bcd4830ce6f..9577488f6f6 100644
--- a/src/HttpClientFactory/Polly/test/Microsoft.Extensions.Http.Polly.Tests.csproj
+++ b/src/HttpClientFactory/Polly/test/Microsoft.Extensions.Http.Polly.Tests.csproj
@@ -11,6 +11,8 @@
+
+
diff --git a/src/Logging/Logging.AzureAppServices/test/Microsoft.Extensions.Logging.AzureAppServices.Tests.csproj b/src/Logging/Logging.AzureAppServices/test/Microsoft.Extensions.Logging.AzureAppServices.Tests.csproj
index 54b36b5aabb..f8541da53fe 100644
--- a/src/Logging/Logging.AzureAppServices/test/Microsoft.Extensions.Logging.AzureAppServices.Tests.csproj
+++ b/src/Logging/Logging.AzureAppServices/test/Microsoft.Extensions.Logging.AzureAppServices.Tests.csproj
@@ -6,14 +6,23 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/Logging/Logging.EventSource/test/Microsoft.Extensions.Logging.EventSource.Tests.csproj b/src/Logging/Logging.EventSource/test/Microsoft.Extensions.Logging.EventSource.Tests.csproj
index 57e510639a6..500a1a4a09a 100644
--- a/src/Logging/Logging.EventSource/test/Microsoft.Extensions.Logging.EventSource.Tests.csproj
+++ b/src/Logging/Logging.EventSource/test/Microsoft.Extensions.Logging.EventSource.Tests.csproj
@@ -10,6 +10,8 @@
+
+
diff --git a/src/Logging/test/Microsoft.Extensions.Logging.Tests.csproj b/src/Logging/test/Microsoft.Extensions.Logging.Tests.csproj
index aac8c073b46..890e6a6b180 100644
--- a/src/Logging/test/Microsoft.Extensions.Logging.Tests.csproj
+++ b/src/Logging/test/Microsoft.Extensions.Logging.Tests.csproj
@@ -6,11 +6,13 @@
+
+
@@ -19,6 +21,7 @@
+
diff --git a/src/WebEncoders/test/Microsoft.Extensions.WebEncoders.Tests.csproj b/src/WebEncoders/test/Microsoft.Extensions.WebEncoders.Tests.csproj
index 68ad589e3f6..a190e7bbb31 100755
--- a/src/WebEncoders/test/Microsoft.Extensions.WebEncoders.Tests.csproj
+++ b/src/WebEncoders/test/Microsoft.Extensions.WebEncoders.Tests.csproj
@@ -8,6 +8,7 @@
+