Disable transitive project references in test projects (#1834)

dotnet · Jun 13, 2019 · e7d5bea · e7d5bea
1 parent 280d556
commit e7d5bea
Show file tree

Hide file tree

Showing 44 changed files with 197 additions and 64 deletions.
diff --git a/Extensions.sln b/Extensions.sln
@@ -1791,6 +1791,30 @@ Global
 		{DE47CB52-3E6F-4A6A-910E-AE118A00CE1A}.Release|x64.Build.0 = Release|Any CPU
 		{DE47CB52-3E6F-4A6A-910E-AE118A00CE1A}.Release|x86.ActiveCfg = Release|Any CPU
 		{DE47CB52-3E6F-4A6A-910E-AE118A00CE1A}.Release|x86.Build.0 = Release|Any CPU
+		{86C50991-634A-41BB-86EE-22B09A3EAD2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{86C50991-634A-41BB-86EE-22B09A3EAD2D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{86C50991-634A-41BB-86EE-22B09A3EAD2D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{86C50991-634A-41BB-86EE-22B09A3EAD2D}.Debug|x64.Build.0 = Debug|Any CPU
+		{86C50991-634A-41BB-86EE-22B09A3EAD2D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{86C50991-634A-41BB-86EE-22B09A3EAD2D}.Debug|x86.Build.0 = Debug|Any CPU
+		{86C50991-634A-41BB-86EE-22B09A3EAD2D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{86C50991-634A-41BB-86EE-22B09A3EAD2D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{86C50991-634A-41BB-86EE-22B09A3EAD2D}.Release|x64.ActiveCfg = Release|Any CPU
+		{86C50991-634A-41BB-86EE-22B09A3EAD2D}.Release|x64.Build.0 = Release|Any CPU
+		{86C50991-634A-41BB-86EE-22B09A3EAD2D}.Release|x86.ActiveCfg = Release|Any CPU
+		{86C50991-634A-41BB-86EE-22B09A3EAD2D}.Release|x86.Build.0 = Release|Any CPU
+		{C85BC039-863D-4577-AECF-681A8ACA601A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C85BC039-863D-4577-AECF-681A8ACA601A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C85BC039-863D-4577-AECF-681A8ACA601A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C85BC039-863D-4577-AECF-681A8ACA601A}.Debug|x64.Build.0 = Debug|Any CPU
+		{C85BC039-863D-4577-AECF-681A8ACA601A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C85BC039-863D-4577-AECF-681A8ACA601A}.Debug|x86.Build.0 = Debug|Any CPU
+		{C85BC039-863D-4577-AECF-681A8ACA601A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C85BC039-863D-4577-AECF-681A8ACA601A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C85BC039-863D-4577-AECF-681A8ACA601A}.Release|x64.ActiveCfg = Release|Any CPU
+		{C85BC039-863D-4577-AECF-681A8ACA601A}.Release|x64.Build.0 = Release|Any CPU
+		{C85BC039-863D-4577-AECF-681A8ACA601A}.Release|x86.ActiveCfg = Release|Any CPU
+		{C85BC039-863D-4577-AECF-681A8ACA601A}.Release|x86.Build.0 = Release|Any CPU
 		{452F9F79-40E8-4B1C-8857-404062886080}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{452F9F79-40E8-4B1C-8857-404062886080}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{452F9F79-40E8-4B1C-8857-404062886080}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -1875,30 +1899,6 @@ Global
 		{60313ECC-7C20-4509-B41B-C0F69F5162E7}.Release|x64.Build.0 = Release|Any CPU
 		{60313ECC-7C20-4509-B41B-C0F69F5162E7}.Release|x86.ActiveCfg = Release|Any CPU
 		{60313ECC-7C20-4509-B41B-C0F69F5162E7}.Release|x86.Build.0 = Release|Any CPU
-		{86C50991-634A-41BB-86EE-22B09A3EAD2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{86C50991-634A-41BB-86EE-22B09A3EAD2D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{86C50991-634A-41BB-86EE-22B09A3EAD2D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{86C50991-634A-41BB-86EE-22B09A3EAD2D}.Debug|x64.Build.0 = Debug|Any CPU
-		{86C50991-634A-41BB-86EE-22B09A3EAD2D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{86C50991-634A-41BB-86EE-22B09A3EAD2D}.Debug|x86.Build.0 = Debug|Any CPU
-		{86C50991-634A-41BB-86EE-22B09A3EAD2D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{86C50991-634A-41BB-86EE-22B09A3EAD2D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{86C50991-634A-41BB-86EE-22B09A3EAD2D}.Release|x64.ActiveCfg = Release|Any CPU
-		{86C50991-634A-41BB-86EE-22B09A3EAD2D}.Release|x64.Build.0 = Release|Any CPU
-		{86C50991-634A-41BB-86EE-22B09A3EAD2D}.Release|x86.ActiveCfg = Release|Any CPU
-		{86C50991-634A-41BB-86EE-22B09A3EAD2D}.Release|x86.Build.0 = Release|Any CPU
-		{C85BC039-863D-4577-AECF-681A8ACA601A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C85BC039-863D-4577-AECF-681A8ACA601A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C85BC039-863D-4577-AECF-681A8ACA601A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C85BC039-863D-4577-AECF-681A8ACA601A}.Debug|x64.Build.0 = Debug|Any CPU
-		{C85BC039-863D-4577-AECF-681A8ACA601A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{C85BC039-863D-4577-AECF-681A8ACA601A}.Debug|x86.Build.0 = Debug|Any CPU
-		{C85BC039-863D-4577-AECF-681A8ACA601A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C85BC039-863D-4577-AECF-681A8ACA601A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C85BC039-863D-4577-AECF-681A8ACA601A}.Release|x64.ActiveCfg = Release|Any CPU
-		{C85BC039-863D-4577-AECF-681A8ACA601A}.Release|x64.Build.0 = Release|Any CPU
-		{C85BC039-863D-4577-AECF-681A8ACA601A}.Release|x86.ActiveCfg = Release|Any CPU
-		{C85BC039-863D-4577-AECF-681A8ACA601A}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2032,6 +2032,8 @@ Global
 		{89B01C5B-42DF-4E99-847E-354B8C5FBA6F} = {6A293FDC-A13B-4137-87F9-C9225CF3542B}
 		{DE47CB52-3E6F-4A6A-910E-AE118A00CE1A} = {B0D89499-D1FA-4113-88C7-B82AB1D98EB6}
 		{15AC3300-D335-4C5C-9E3A-22F26904AB26} = {36617B81-CF74-4FCB-A7CA-E95DF3CA92FC}
+		{86C50991-634A-41BB-86EE-22B09A3EAD2D} = {6868A014-43FD-4047-B536-30D5D159D9D4}
+		{C85BC039-863D-4577-AECF-681A8ACA601A} = {6868A014-43FD-4047-B536-30D5D159D9D4}
 		{452F9F79-40E8-4B1C-8857-404062886080} = {6868A014-43FD-4047-B536-30D5D159D9D4}
 		{47D27C64-B8B7-4D10-9112-1432EACC79B3} = {6868A014-43FD-4047-B536-30D5D159D9D4}
 		{1303074F-0B69-4BD9-944D-69F7F15D2933} = {0ACE94D2-2AA1-4067-BAE1-5F9D2544FD3C}
@@ -2040,8 +2042,6 @@ Global
 		{1DF2C30F-4A33-4711-B198-6163C931FAC8} = {6868A014-43FD-4047-B536-30D5D159D9D4}
 		{C7204C14-0FA5-4EE6-B538-CAAEB7854E98} = {1DF2C30F-4A33-4711-B198-6163C931FAC8}
 		{60313ECC-7C20-4509-B41B-C0F69F5162E7} = {6868A014-43FD-4047-B536-30D5D159D9D4}
-		{86C50991-634A-41BB-86EE-22B09A3EAD2D} = {C4A5DF0A-0798-40BD-B7A4-CF02D3A993D5}
-		{C85BC039-863D-4577-AECF-681A8ACA601A} = {C4A5DF0A-0798-40BD-B7A4-CF02D3A993D5}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {814BFC88-0867-451F-AC8F-20FE107809B4}

diff --git a/eng/targets/ResolveReferences.targets b/eng/targets/ResolveReferences.targets
@@ -6,6 +6,9 @@
       ResolveCustomReferences;
       $(ResolveReferencesDependsOn);
     </ResolveReferencesDependsOn>
+
+    <!-- Disabling transitive references helps to ensure that tests are actually running against the latest assemblies in a patch. -->
+    <DisableTransitiveProjectReferences Condition="'$(IsTestProject)' == 'true'">true</DisableTransitiveProjectReferences>
   </PropertyGroup>
 
   <PropertyGroup>

diff --git a/src/Caching/Memory/test/Microsoft.Extensions.Caching.Memory.Tests.csproj b/src/Caching/Memory/test/Microsoft.Extensions.Caching.Memory.Tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <Import Project="$(MSBuildThisFileDirectory)..\..\..\Logging\Logging.Testing\src\build\Microsoft.Extensions.Logging.Testing.props" />
 
@@ -7,9 +7,15 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <Reference Include="Microsoft.Extensions.Caching.Abstractions" />
     <Reference Include="Microsoft.Extensions.Caching.Memory" />
+    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
     <Reference Include="Microsoft.Extensions.DependencyInjection" />
+    <Reference Include="Microsoft.Extensions.Logging.Abstractions" />
     <Reference Include="Microsoft.Extensions.Logging.Testing" />
+    <Reference Include="Microsoft.Extensions.Logging" />
+    <Reference Include="Microsoft.Extensions.Options" />
+    <Reference Include="Microsoft.Extensions.Primitives" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Caching/SqlServer/test/Microsoft.Extensions.Caching.SqlServer.Tests.csproj b/src/Caching/SqlServer/test/Microsoft.Extensions.Caching.SqlServer.Tests.csproj
@@ -9,10 +9,15 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Reference Include="Microsoft.Extensions.Caching.Abstractions" />
     <Reference Include="Microsoft.Extensions.Caching.SqlServer" />
+    <Reference Include="Microsoft.Extensions.Configuration.Abstractions" />
     <Reference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" />
     <Reference Include="Microsoft.Extensions.Configuration.Json" />
+    <Reference Include="Microsoft.Extensions.Configuration" />
+    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
     <Reference Include="Microsoft.Extensions.DependencyInjection" />
+    <Reference Include="Microsoft.Extensions.Options" />
   </ItemGroup>
 
 </Project>
diff --git a/...hing/StackExchangeRedis/test/Microsoft.Extensions.Caching.StackExchangeRedis.Tests.csproj b/...hing/StackExchangeRedis/test/Microsoft.Extensions.Caching.StackExchangeRedis.Tests.csproj
@@ -5,8 +5,12 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <Reference Include="Microsoft.Extensions.Caching.Abstractions" />
+    <Reference Include="Microsoft.Extensions.Caching.Memory" />
     <Reference Include="Microsoft.Extensions.Caching.StackExchangeRedis" />
+    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
     <Reference Include="Microsoft.Extensions.DependencyInjection" />
+    <Reference Include="Microsoft.Extensions.Options" />
   </ItemGroup>
 
 </Project>
diff --git a/...n/Config.AzureKeyVault/test/Microsoft.Extensions.Configuration.AzureKeyVault.Tests.csproj b/...n/Config.AzureKeyVault/test/Microsoft.Extensions.Configuration.AzureKeyVault.Tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>
@@ -10,7 +10,10 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Reference Include="Microsoft.Extensions.Configuration.Abstractions" />
     <Reference Include="Microsoft.Extensions.Configuration.AzureKeyVault" />
+    <Reference Include="Microsoft.Extensions.Configuration" />
+    <Reference Include="Microsoft.Extensions.Primitives" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Configuration/Config.Binder/test/Microsoft.Extensions.Configuration.Binder.Tests.csproj b/src/Configuration/Config.Binder/test/Microsoft.Extensions.Configuration.Binder.Tests.csproj
@@ -9,7 +9,9 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Reference Include="Microsoft.Extensions.Configuration.Abstractions" />
     <Reference Include="Microsoft.Extensions.Configuration.Binder" />
+    <Reference Include="Microsoft.Extensions.Configuration" />
   </ItemGroup>
 
 </Project>
diff --git a/...ation/Config.CommandLine/test/Microsoft.Extensions.Configuration.CommandLine.Tests.csproj b/...ation/Config.CommandLine/test/Microsoft.Extensions.Configuration.CommandLine.Tests.csproj
@@ -10,7 +10,9 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Reference Include="Microsoft.Extensions.Configuration.Abstractions" />
     <Reference Include="Microsoft.Extensions.Configuration.CommandLine" />
+    <Reference Include="Microsoft.Extensions.Configuration" />
   </ItemGroup>
 
 </Project>
diff --git a/...onmentVariables/test/Microsoft.Extensions.Configuration.EnvironmentVariables.Tests.csproj b/...onmentVariables/test/Microsoft.Extensions.Configuration.EnvironmentVariables.Tests.csproj
@@ -10,7 +10,10 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Reference Include="Microsoft.Extensions.Configuration.Abstractions" />
+    <Reference Include="Microsoft.Extensions.Configuration.Binder" />
     <Reference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" />
+    <Reference Include="Microsoft.Extensions.Configuration" />
   </ItemGroup>
 
 </Project>
diff --git a/...Config.FileExtensions/test/Microsoft.Extensions.Configuration.FileExtensions.Tests.csproj b/...Config.FileExtensions/test/Microsoft.Extensions.Configuration.FileExtensions.Tests.csproj
@@ -9,7 +9,12 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Reference Include="Microsoft.Extensions.Configuration.Abstractions" />
     <Reference Include="Microsoft.Extensions.Configuration.FileExtensions" />
+    <Reference Include="Microsoft.Extensions.Configuration" />
+    <Reference Include="Microsoft.Extensions.FileProviders.Abstractions" />
+    <Reference Include="Microsoft.Extensions.FileProviders.Physical" />
+    <Reference Include="Microsoft.Extensions.Primitives" />
   </ItemGroup>
 
 </Project>
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
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>netcoreapp3.0;net472</TargetFrameworks>
@@ -10,7 +10,10 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Reference Include="Microsoft.Extensions.Configuration.Abstractions" />
+    <Reference Include="Microsoft.Extensions.Configuration.FileExtensions" />
     <Reference Include="Microsoft.Extensions.Configuration.Ini" />
+    <Reference Include="Microsoft.Extensions.Configuration" />
   </ItemGroup>
 
 </Project>
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
@@ -10,7 +10,11 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Reference Include="Microsoft.Extensions.Configuration.Abstractions" />
+    <Reference Include="Microsoft.Extensions.Configuration.FileExtensions" />
     <Reference Include="Microsoft.Extensions.Configuration.Json" />
+    <Reference Include="Microsoft.Extensions.Configuration" />
+    <Reference Include="Microsoft.Extensions.FileProviders.Abstractions" />
     <Reference Include="Newtonsoft.Json" />
   </ItemGroup>
 

diff --git a/...uration/Config.KeyPerFile/test/Microsoft.Extensions.Configuration.KeyPerFile.Tests.csproj b/...uration/Config.KeyPerFile/test/Microsoft.Extensions.Configuration.KeyPerFile.Tests.csproj
@@ -9,7 +9,13 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Reference Include="Microsoft.Extensions.Configuration.Abstractions" />
+    <Reference Include="Microsoft.Extensions.Configuration.Binder" />
+    <Reference Include="Microsoft.Extensions.Configuration.FileExtensions" />
     <Reference Include="Microsoft.Extensions.Configuration.KeyPerFile" />
+    <Reference Include="Microsoft.Extensions.Configuration" />
+    <Reference Include="Microsoft.Extensions.FileProviders.Abstractions" />
+    <Reference Include="Microsoft.Extensions.Primitives" />
   </ItemGroup>
 
 </Project>
diff --git a/...Config.NewtonsoftJson/test/Microsoft.Extensions.Configuration.NewtonsoftJson.Tests.csproj b/...Config.NewtonsoftJson/test/Microsoft.Extensions.Configuration.NewtonsoftJson.Tests.csproj
@@ -10,7 +10,11 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Reference Include="Microsoft.Extensions.Configuration.Abstractions" />
+    <Reference Include="Microsoft.Extensions.Configuration.FileExtensions" />
     <Reference Include="Microsoft.Extensions.Configuration.NewtonsoftJson" />
+    <Reference Include="Microsoft.Extensions.Configuration" />
+    <Reference Include="Microsoft.Extensions.FileProviders.Abstractions" />
     <Reference Include="Newtonsoft.Json" />
   </ItemGroup>
 

diff --git a/...ation/Config.UserSecrets/test/Microsoft.Extensions.Configuration.UserSecrets.Tests.csproj b/...ation/Config.UserSecrets/test/Microsoft.Extensions.Configuration.UserSecrets.Tests.csproj
@@ -1,11 +1,15 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
+    <Reference Include="Microsoft.Extensions.Configuration.Abstractions" />
+    <Reference Include="Microsoft.Extensions.Configuration.FileExtensions" />
+    <Reference Include="Microsoft.Extensions.Configuration.Json" />
     <Reference Include="Microsoft.Extensions.Configuration.UserSecrets" />
+    <Reference Include="Microsoft.Extensions.Configuration" />
 
     <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute">
       <_Parameter1>TargetFramework</_Parameter1>

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
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>netcoreapp3.0;net472</TargetFrameworks>
@@ -10,7 +10,10 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Reference Include="Microsoft.Extensions.Configuration.Abstractions" />
+    <Reference Include="Microsoft.Extensions.Configuration.FileExtensions" />
     <Reference Include="Microsoft.Extensions.Configuration.Xml" />
+    <Reference Include="Microsoft.Extensions.Configuration" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">

diff --git a/src/Configuration/Config/test/Microsoft.Extensions.Configuration.Tests.csproj b/src/Configuration/Config/test/Microsoft.Extensions.Configuration.Tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>netcoreapp3.0;net472</TargetFrameworks>
@@ -10,7 +10,10 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Reference Include="Microsoft.Extensions.Configuration.Abstractions" />
     <Reference Include="Microsoft.Extensions.Configuration.FileExtensions" />
+    <Reference Include="Microsoft.Extensions.Configuration" />
+    <Reference Include="Microsoft.Extensions.Primitives" />
   </ItemGroup>
 
 </Project>
diff --git a/...ion/test/Config.FunctionalTests/Microsoft.Extensions.Configuration.FunctionalTests.csproj b/...ion/test/Config.FunctionalTests/Microsoft.Extensions.Configuration.FunctionalTests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>netcoreapp3.0;net472</TargetFrameworks>
@@ -9,13 +9,19 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Reference Include="Microsoft.Extensions.Configuration.Abstractions" />
     <Reference Include="Microsoft.Extensions.Configuration.Binder" />
     <Reference Include="Microsoft.Extensions.Configuration.CommandLine" />
     <Reference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" />
+    <Reference Include="Microsoft.Extensions.Configuration.FileExtensions" />
     <Reference Include="Microsoft.Extensions.Configuration.Ini" />
     <Reference Include="Microsoft.Extensions.Configuration.Json" />
     <Reference Include="Microsoft.Extensions.Configuration.Xml" />
     <Reference Include="Microsoft.Extensions.Configuration.UserSecrets" />
+    <Reference Include="Microsoft.Extensions.Configuration" />
+    <Reference Include="Microsoft.Extensions.FileProviders.Abstractions" />
+    <Reference Include="Microsoft.Extensions.FileProviders.Physical" />
+    <Reference Include="Microsoft.Extensions.Primitives" />
   </ItemGroup>
 
 </Project>
diff --git a/...ernal.Tests/test/Microsoft.Extensions.DependencyInjection.ExternalContainers.Tests.csproj b/...ernal.Tests/test/Microsoft.Extensions.DependencyInjection.ExternalContainers.Tests.csproj
@@ -9,8 +9,9 @@
   <ItemGroup>
     <Reference Include="Newtonsoft.Json" />
 
-    <Reference Include="Microsoft.Extensions.DependencyInjection" />
+    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
     <Reference Include="Microsoft.Extensions.DependencyInjection.Specification.Tests" />
+    <Reference Include="Microsoft.Extensions.DependencyInjection" />
 
     <Reference Include="Autofac.Extensions.DependencyInjection" />
     <Reference Include="DryIoc.Microsoft.DependencyInjection" />

diff --git a/src/DependencyInjection/DI/test/Microsoft.Extensions.DependencyInjection.Tests.csproj b/src/DependencyInjection/DI/test/Microsoft.Extensions.DependencyInjection.Tests.csproj
@@ -6,10 +6,11 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
+    <Reference Include="Microsoft.Extensions.DependencyInjection.Specification.Tests" />
+    <Reference Include="Microsoft.Extensions.DependencyInjection" />
+    <Reference Include="Microsoft.Extensions.Logging.Abstractions" />
     <Reference Include="Newtonsoft.Json" />
-
-    <ProjectReference Include="..\src\Microsoft.Extensions.DependencyInjection.csproj" />
-    <ProjectReference Include="..\..\DI.Specification.Tests\src\Microsoft.Extensions.DependencyInjection.Specification.Tests.csproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/DiagnosticAdapter/test/Microsoft.Extensions.DiagnosticAdapter.Tests.csproj b/src/DiagnosticAdapter/test/Microsoft.Extensions.DiagnosticAdapter.Tests.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\src\Microsoft.Extensions.DiagnosticAdapter.csproj" />
+    <Reference Include="Microsoft.Extensions.DiagnosticAdapter" />
   </ItemGroup>
 
 </Project>
diff --git a/src/FileProviders/Composite/test/Microsoft.Extensions.FileProviders.Composite.Tests.csproj b/src/FileProviders/Composite/test/Microsoft.Extensions.FileProviders.Composite.Tests.csproj
@@ -10,7 +10,9 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Reference Include="Microsoft.Extensions.FileProviders.Abstractions" />
     <Reference Include="Microsoft.Extensions.FileProviders.Composite" />
+    <Reference Include="Microsoft.Extensions.Primitives" />
   </ItemGroup>
 
 </Project>
diff --git a/src/FileProviders/Embedded/test/Microsoft.Extensions.FileProviders.Embedded.Tests.csproj b/src/FileProviders/Embedded/test/Microsoft.Extensions.FileProviders.Embedded.Tests.csproj
@@ -9,7 +9,9 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Reference Include="Microsoft.Extensions.FileProviders.Abstractions" />
     <Reference Include="Microsoft.Extensions.FileProviders.Embedded" />
+    <Reference Include="Microsoft.Extensions.Primitives" />
   </ItemGroup>
 
 </Project>