From 110804eaeac8a4b953efbc271786dbf342eb2aeb Mon Sep 17 00:00:00 2001
From: Maryam Ariyan <maryam.ariyan@microsoft.com>
Date: Sat, 21 Mar 2020 17:20:32 -0700
Subject: [PATCH] Enable Microsoft.Extensions.DependencyInjection (#33816)

* Enables DI and Options
---
 eng/referenceFromRuntime.targets                    | 17 +++++++++++++++--
 src/libraries/Directory.Build.props                 | 11 ++++-------
 ...soft.Extensions.Configuration.Test.Common.csproj | 14 --------------
 .../ref/Microsoft.Extensions.DependencyInjection.cs |  7 +++++--
 .../Microsoft.Extensions.DependencyInjection.csproj | 21 ++++++++++++++++++---
 ...soft.Extensions.DependencyInjection.Tests.csproj | 15 +++++++++------
 .../tests/ServiceCollectionServiceExtensionsTest.cs |  5 +++--
 .../tests/ServiceProviderCompilationTest.cs         |  1 +
 .../tests/DI.Common}/Common/src/AssemblyTestLog.cs  |  0
 .../DI.Common}/Common/src/BeginScopeContext.cs      |  0
 .../DI.Common}/Common/src/CollectDumpAttribute.cs   |  0
 .../src/DumpCollector/DumpCollector.Windows.cs      |  0
 .../Common/src/DumpCollector/DumpCollector.cs       |  0
 .../tests/DI.Common}/Common/src/ITestSink.cs        |  0
 .../DI.Common}/Common/src/LogLevelAttribute.cs      |  0
 .../tests/DI.Common}/Common/src/LogValuesAssert.cs  |  0
 .../DI.Common}/Common/src/LoggedTest/ILoggedTest.cs |  0
 .../DI.Common}/Common/src/LoggedTest/LoggedTest.cs  |  0
 .../Common/src/LoggedTest/LoggedTestBase.cs         |  0
 .../src/Microsoft.Extensions.Logging.Testing.csproj |  0
 .../Common/src/TestFrameworkFileLoggerAttribute.cs  |  0
 .../tests/DI.Common}/Common/src/TestLogger.cs       |  0
 .../DI.Common}/Common/src/TestLoggerFactory.cs      |  0
 .../DI.Common}/Common/src/TestLoggerProvider.cs     |  0
 .../tests/DI.Common}/Common/src/TestLoggerT.cs      |  0
 .../tests/DI.Common}/Common/src/TestSink.cs         |  0
 .../tests/DI.Common}/Common/src/WriteContext.cs     |  0
 .../Common/src/XunitLoggerFactoryExtensions.cs      |  0
 .../DI.Common}/Common/src/XunitLoggerProvider.cs    |  0
 .../Microsoft.Extensions.Logging.Testing.props      |  0
 .../DI.Common}/Common/test/AssemblyTestLogTests.cs  |  0
 .../DI.Common}/Common/test/LogValuesAssertTest.cs   |  0
 .../DI.Common}/Common/test/LoggedTestXunitTests.cs  |  0
 ...icrosoft.Extensions.Logging.Testing.Tests.csproj |  0
 .../Common/test/Properties/AssemblyInfo.cs          |  0
 .../DI.Common}/Common/test/TestTestOutputHelper.cs  |  0
 .../Common/test/XunitLoggerProviderTest.cs          |  0
 .../binplacePackages/binplacePackages.depproj       |  2 ++
 .../restore/netstandard/netstandard.depproj         |  3 ---
 39 files changed, 57 insertions(+), 39 deletions(-)
 delete mode 100644 src/libraries/Microsoft.Extensions.Configuration/tests/Common/Microsoft.Extensions.Configuration.Test.Common.csproj
 rename src/libraries/{Microsoft.Extensions.DependencyInjection/tests => Microsoft.Extensions.Logging/tests/DI.Common}/Common/src/AssemblyTestLog.cs (100%)
 rename src/libraries/{Microsoft.Extensions.DependencyInjection/tests => Microsoft.Extensions.Logging/tests/DI.Common}/Common/src/BeginScopeContext.cs (100%)
 rename src/libraries/{Microsoft.Extensions.DependencyInjection/tests => Microsoft.Extensions.Logging/tests/DI.Common}/Common/src/CollectDumpAttribute.cs (100%)
 rename src/libraries/{Microsoft.Extensions.DependencyInjection/tests => Microsoft.Extensions.Logging/tests/DI.Common}/Common/src/DumpCollector/DumpCollector.Windows.cs (100%)
 rename src/libraries/{Microsoft.Extensions.DependencyInjection/tests => Microsoft.Extensions.Logging/tests/DI.Common}/Common/src/DumpCollector/DumpCollector.cs (100%)
 rename src/libraries/{Microsoft.Extensions.DependencyInjection/tests => Microsoft.Extensions.Logging/tests/DI.Common}/Common/src/ITestSink.cs (100%)
 rename src/libraries/{Microsoft.Extensions.DependencyInjection/tests => Microsoft.Extensions.Logging/tests/DI.Common}/Common/src/LogLevelAttribute.cs (100%)
 rename src/libraries/{Microsoft.Extensions.DependencyInjection/tests => Microsoft.Extensions.Logging/tests/DI.Common}/Common/src/LogValuesAssert.cs (100%)
 rename src/libraries/{Microsoft.Extensions.DependencyInjection/tests => Microsoft.Extensions.Logging/tests/DI.Common}/Common/src/LoggedTest/ILoggedTest.cs (100%)
 rename src/libraries/{Microsoft.Extensions.DependencyInjection/tests => Microsoft.Extensions.Logging/tests/DI.Common}/Common/src/LoggedTest/LoggedTest.cs (100%)
 rename src/libraries/{Microsoft.Extensions.DependencyInjection/tests => Microsoft.Extensions.Logging/tests/DI.Common}/Common/src/LoggedTest/LoggedTestBase.cs (100%)
 rename src/libraries/{Microsoft.Extensions.DependencyInjection/tests => Microsoft.Extensions.Logging/tests/DI.Common}/Common/src/Microsoft.Extensions.Logging.Testing.csproj (100%)
 rename src/libraries/{Microsoft.Extensions.DependencyInjection/tests => Microsoft.Extensions.Logging/tests/DI.Common}/Common/src/TestFrameworkFileLoggerAttribute.cs (100%)
 rename src/libraries/{Microsoft.Extensions.DependencyInjection/tests => Microsoft.Extensions.Logging/tests/DI.Common}/Common/src/TestLogger.cs (100%)
 rename src/libraries/{Microsoft.Extensions.DependencyInjection/tests => Microsoft.Extensions.Logging/tests/DI.Common}/Common/src/TestLoggerFactory.cs (100%)
 rename src/libraries/{Microsoft.Extensions.DependencyInjection/tests => Microsoft.Extensions.Logging/tests/DI.Common}/Common/src/TestLoggerProvider.cs (100%)
 rename src/libraries/{Microsoft.Extensions.DependencyInjection/tests => Microsoft.Extensions.Logging/tests/DI.Common}/Common/src/TestLoggerT.cs (100%)
 rename src/libraries/{Microsoft.Extensions.DependencyInjection/tests => Microsoft.Extensions.Logging/tests/DI.Common}/Common/src/TestSink.cs (100%)
 rename src/libraries/{Microsoft.Extensions.DependencyInjection/tests => Microsoft.Extensions.Logging/tests/DI.Common}/Common/src/WriteContext.cs (100%)
 rename src/libraries/{Microsoft.Extensions.DependencyInjection/tests => Microsoft.Extensions.Logging/tests/DI.Common}/Common/src/XunitLoggerFactoryExtensions.cs (100%)
 rename src/libraries/{Microsoft.Extensions.DependencyInjection/tests => Microsoft.Extensions.Logging/tests/DI.Common}/Common/src/XunitLoggerProvider.cs (100%)
 rename src/libraries/{Microsoft.Extensions.DependencyInjection/tests => Microsoft.Extensions.Logging/tests/DI.Common}/Common/src/build/Microsoft.Extensions.Logging.Testing.props (100%)
 rename src/libraries/{Microsoft.Extensions.DependencyInjection/tests => Microsoft.Extensions.Logging/tests/DI.Common}/Common/test/AssemblyTestLogTests.cs (100%)
 rename src/libraries/{Microsoft.Extensions.DependencyInjection/tests => Microsoft.Extensions.Logging/tests/DI.Common}/Common/test/LogValuesAssertTest.cs (100%)
 rename src/libraries/{Microsoft.Extensions.DependencyInjection/tests => Microsoft.Extensions.Logging/tests/DI.Common}/Common/test/LoggedTestXunitTests.cs (100%)
 rename src/libraries/{Microsoft.Extensions.DependencyInjection/tests => Microsoft.Extensions.Logging/tests/DI.Common}/Common/test/Microsoft.Extensions.Logging.Testing.Tests.csproj (100%)
 rename src/libraries/{Microsoft.Extensions.DependencyInjection/tests => Microsoft.Extensions.Logging/tests/DI.Common}/Common/test/Properties/AssemblyInfo.cs (100%)
 rename src/libraries/{Microsoft.Extensions.DependencyInjection/tests => Microsoft.Extensions.Logging/tests/DI.Common}/Common/test/TestTestOutputHelper.cs (100%)
 rename src/libraries/{Microsoft.Extensions.DependencyInjection/tests => Microsoft.Extensions.Logging/tests/DI.Common}/Common/test/XunitLoggerProviderTest.cs (100%)

diff --git a/eng/referenceFromRuntime.targets b/eng/referenceFromRuntime.targets
index c428eb6..e2cd929 100644
--- a/eng/referenceFromRuntime.targets
+++ b/eng/referenceFromRuntime.targets
@@ -101,12 +101,25 @@
 
       <!-- transform back to path -->
       <!-- We are adding two items(with and without aliases) for references having Aliases. The major reason behind this to not use the Aliases for all the types in that reference.  -->
-      <!-- We can't use a Reference item for both since only the first one will be kept. Use ReferencePath for the second reference so it will still be passed to the compiler. -->
+      <!-- We can't use a Reference item for both since only the first one will be kept. -->
+      <!-- Aliases provides no way to encode both an alias and a non-aliased reference : https://github.com/dotnet/roslyn/issues/42604 -->
+      <!-- Use ReferencePath for the second reference so it will still be passed to the compiler. -->
       <Reference Include="@(_filteredReferencePathFromRuntimeByFileName->'%(ReferencePath)')" />
-      <ReferencePath Include="@(_filteredReferencePathFromRuntimeByFileName->'%(ReferencePath)')" Condition="'%(_filteredReferencePathFromRuntimeByFileName.Aliases)' != ''" Aliases="" />
+      <_aliasedReferencePathFromRuntime Include="@(_filteredReferencePathFromRuntimeByFileName->'%(ReferencePath)')" Condition="'%(_filteredReferencePathFromRuntimeByFileName.Aliases)' != ''" />
+      <ReferencePath Include="@(_aliasedReferencePathFromRuntime)" Aliases=""/>
     </ItemGroup>
 
     <Error Condition="'@(_missingReferenceFromRuntime)' != ''"
            Text="Could not resolve ReferenceFromRuntime item(s) '%(_missingReferenceFromRuntime.OriginalReferenceFromRuntime)' from '$(RuntimeProjectFile)'." />
   </Target>
+  
+  <Target Name="RemoveAliasedReferenceFromRuntime"
+          AfterTargets="CoreCompile"
+          Condition="'@(_aliasedReferencePathFromRuntime)' != ''">
+    <!-- SDK's GenerateBuildDependencyFile will break when they encounter two identical reference paths, fix by removing the aliased ones -->
+    <ItemGroup>
+      <ReferencePath Remove="@(_aliasedReferencePathFromRuntime)"/>
+    </ItemGroup>
+  </Target>
+
 </Project>
diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props
index dc7b886..bd273ec 100644
--- a/src/libraries/Directory.Build.props
+++ b/src/libraries/Directory.Build.props
@@ -13,22 +13,19 @@
     <PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.Configuration.EnvironmentVariables\**\*csproj" />
     <PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.Configuration.FileExtensions\**\*csproj" />
     <PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.Configuration.Ini\**\*csproj" />
+    <PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.DependencyInjection\**\*csproj" />
     <PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.DependencyInjection.Abstractions\**\*csproj" />
     <PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.FileProviders.*\**\*csproj" />
     <PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.FileSystemGlobbing\**\*csproj" />
     <PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.Hosting.Abstractions\**\*csproj" />
     <PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.Logging.Abstractions\**\*csproj" />
+    <PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.Options\**\*csproj" />
     <PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.Options.*\**\*csproj" />
     <PortedExtensionsProject Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.Primitives\**\*csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)*\ref\**\Microsoft.Extensions.*proj" Exclude="@(PortedExtensionsProject)" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)*\src\**\Microsoft.Extensions.*proj" Exclude="@(PortedExtensionsProject)" />
-    <ProjectExclusions Include="$(MSBuildThisFileDirectory)*\tests\Microsoft.Extensions.*.Tests.csproj" Exclude="@(PortedExtensionsProject)" />
-    <ProjectExclusions Include="$(MSBuildThisFileDirectory)*\tests\FunctionalTests\Microsoft.Extensions.Configuration.Functional.Tests.csproj" />
-    <ProjectExclusions Include="$(MSBuildThisFileDirectory)*\tests\Common\test\Microsoft.Extensions.Logging.Testing.Tests.csproj" />
-    <ProjectExclusions Include="$(MSBuildThisFileDirectory)*\tests\FunctionalTests\Microsoft.Extensions.Hosting.Functional.Tests.csproj" />
-    <ProjectExclusions Include="$(MSBuildThisFileDirectory)*\tests\TestApp\Microsoft.Extensions.Hosting.TestApp.csproj" />
-    <ProjectExclusions Include="$(MSBuildThisFileDirectory)*\tests\UnitTests\Microsoft.Extensions.Hosting.Unit.Tests.csproj" />
-    <ProjectExclusions Include="$(MSBuildThisFileDirectory)*\tests\Common\Microsoft.Extensions.Logging.Tests.csproj" />
+    <ProjectExclusions Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.*\tests\**\*.csproj" Exclude="@(PortedExtensionsProject)" />
+    <ProjectExclusions Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.*\tests\FunctionalTests\Microsoft.Extensions.Configuration.Functional.Tests.csproj"/>
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)Common\tests\Extensions\**\*.csproj" />
   </ItemGroup>
 
diff --git a/src/libraries/Microsoft.Extensions.Configuration/tests/Common/Microsoft.Extensions.Configuration.Test.Common.csproj b/src/libraries/Microsoft.Extensions.Configuration/tests/Common/Microsoft.Extensions.Configuration.Test.Common.csproj
deleted file mode 100644
index 5ed8f6d..0000000
--- a/src/libraries/Microsoft.Extensions.Configuration/tests/Common/Microsoft.Extensions.Configuration.Test.Common.csproj
+++ /dev/null
@@ -1,14 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <GenerateDocumentationFile>false</GenerateDocumentationFile>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Reference Include="Microsoft.Extensions.Configuration" />
-    <Reference Include="Microsoft.Extensions.FileProviders.Physical" />
-    <Reference Include="Microsoft.Extensions.Primitives" />
-  </ItemGroup>
-
-</Project>
diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/ref/Microsoft.Extensions.DependencyInjection.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/ref/Microsoft.Extensions.DependencyInjection.cs
index 2ebdaee..2a13d69 100644
--- a/src/libraries/Microsoft.Extensions.DependencyInjection/ref/Microsoft.Extensions.DependencyInjection.cs
+++ b/src/libraries/Microsoft.Extensions.DependencyInjection/ref/Microsoft.Extensions.DependencyInjection.cs
@@ -1,6 +1,9 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
+// ------------------------------------------------------------------------------
+// Changes to this file must follow the https://aka.ms/api-review process.
+// ------------------------------------------------------------------------------
 
 namespace Microsoft.Extensions.DependencyInjection
 {
@@ -44,7 +47,7 @@ namespace Microsoft.Extensions.DependencyInjection
     public partial class ServiceProviderOptions
     {
         public ServiceProviderOptions() { }
-        public bool ValidateOnBuild { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
-        public bool ValidateScopes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
+        public bool ValidateOnBuild { get { throw null; } set { } }
+        public bool ValidateScopes { get { throw null; } set { } }
     }
 }
diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/src/Microsoft.Extensions.DependencyInjection.csproj b/src/libraries/Microsoft.Extensions.DependencyInjection/src/Microsoft.Extensions.DependencyInjection.csproj
index 23dacff..8058940 100644
--- a/src/libraries/Microsoft.Extensions.DependencyInjection/src/Microsoft.Extensions.DependencyInjection.csproj
+++ b/src/libraries/Microsoft.Extensions.DependencyInjection/src/Microsoft.Extensions.DependencyInjection.csproj
@@ -1,21 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net461;netstandard2.0;netstandard2.1</TargetFrameworks>
+    <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent);net461;netstandard2.0;netstandard2.1</TargetFrameworks>
+    <ExcludeCurrentFullFrameworkFromPackage>true</ExcludeCurrentFullFrameworkFromPackage>
 
     <ILEmitBackend Condition="$(TargetFramework) != 'netstandard2.0'">True</ILEmitBackend>
     <DefineConstants Condition="'$(ILEmitBackend)' == 'True'">$(DefineConstants);IL_EMIT</DefineConstants>
 
     <!-- Debug IL generation -->
     <ILEmitBackendSaveAssemblies>False</ILEmitBackendSaveAssemblies>
-    <DefineConstants Condition="'$(TargetFramework)' == 'net461' AND '$(ILEmitBackendSaveAssemblies)' == 'True'">$(DefineConstants);SAVE_ASSEMBLIES</DefineConstants>
+    <DefineConstants Condition="'$(TargetsNetFx)' == 'true' AND '$(ILEmitBackendSaveAssemblies)' == 'True'">$(DefineConstants);SAVE_ASSEMBLIES</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>
     <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'netstandard2.0'">
+  <ItemGroup Condition="'$(TargetsNetFx)' == 'true' Or '$(TargetFramework)' == 'netstandard2.0'">
     <Reference Include="Microsoft.Bcl.AsyncInterfaces" />
     <Reference Include="System.Threading.Tasks.Extensions" />
   </ItemGroup>
@@ -27,6 +28,20 @@
     <Reference Include="System.Core" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetsNetCoreApp)' == 'true'">
+    <Reference Include="System.Collections" />
+    <Reference Include="System.Collections.Concurrent" />
+    <Reference Include="System.ComponentModel" />
+    <Reference Include="System.Diagnostics.Tracing" />
+    <Reference Include="System.Linq" />
+    <Reference Include="System.Linq.Expressions" />
+    <Reference Include="System.Reflection.Emit.ILGeneration" />
+    <Reference Include="System.Reflection.Emit.Lightweight" />
+    <Reference Include="System.Reflection.Primitives" />
+    <Reference Include="System.Runtime" />
+    <Reference Include="System.Threading" />
+  </ItemGroup>
+
   <ItemGroup>
     <Compile Include="**\*.cs" />
     <Compile Remove="ServiceLookup\ILEmit\**\*.cs" />
diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/Microsoft.Extensions.DependencyInjection.Tests.csproj b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/Microsoft.Extensions.DependencyInjection.Tests.csproj
index d63903f..064b1a4 100644
--- a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/Microsoft.Extensions.DependencyInjection.Tests.csproj
+++ b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/Microsoft.Extensions.DependencyInjection.Tests.csproj
@@ -2,18 +2,21 @@
 
   <PropertyGroup>
     <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
-    <RootNamespace>Microsoft.Extensions.DependencyInjection</RootNamespace>
+    <EnableDefaultItems>true</EnableDefaultItems>
   </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" />
+    <Compile Include="..\..\Common\tests\Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\ExceptionAssertions.cs">
+      <Link>Common\tests\Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\ExceptionAssertions.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Common\tests\Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\CultureReplacer.cs">
+      <Link>Common\tests\Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\CultureReplacer.cs</Link>
+    </Compile>
   </ItemGroup>
 
   <ItemGroup>
+    <ReferenceFromRuntime Include="Microsoft.Extensions.DependencyInjection" />
+    <ReferenceFromRuntime Include="Microsoft.Extensions.DependencyInjection.Abstractions" Aliases="DIAbstractions" />
     <None Update="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 
diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/ServiceCollectionServiceExtensionsTest.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/ServiceCollectionServiceExtensionsTest.cs
index 5f72d04..8c7f357 100644
--- a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/ServiceCollectionServiceExtensionsTest.cs
+++ b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/ServiceCollectionServiceExtensionsTest.cs
@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
+extern alias DIAbstractions;
 
 using System;
 using Microsoft.AspNetCore.Testing;
@@ -8,7 +9,7 @@ using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.DependencyInjection.Specification.Fakes;
 using Xunit;
 
-using AbstractionResources = Microsoft.Extensions.DependencyInjection.Abstractions.Resources;
+using AbstractionsSR = DIAbstractions::System.SR;
 
 namespace Microsoft.Extensions.DependencyInjection
 {
@@ -350,7 +351,7 @@ namespace Microsoft.Extensions.DependencyInjection
             ExceptionAssert.ThrowsArgument(
                 () => collection.TryAddEnumerable(descriptor),
                 "descriptor",
-                AbstractionResources.FormatTryAddIndistinguishableTypeToEnumerable(implementationType, serviceType));
+                AbstractionsSR.Format(AbstractionsSR.TryAddIndistinguishableTypeToEnumerable, implementationType, serviceType));
         }
 
         [Fact]
diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/ServiceProviderCompilationTest.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/ServiceProviderCompilationTest.cs
index 173073a..bdeb426 100644
--- a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/ServiceProviderCompilationTest.cs
+++ b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/ServiceProviderCompilationTest.cs
@@ -16,6 +16,7 @@ namespace Microsoft.Extensions.DependencyInjection.Tests
         [InlineData(ServiceProviderMode.Runtime, typeof(I999))]
         [InlineData(ServiceProviderMode.ILEmit, typeof(I999))]
         [InlineData(ServiceProviderMode.Expressions, typeof(I999))]
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/33894", TestRuntimes.Mono)]
         private async Task CompilesInLimitedStackSpace(ServiceProviderMode mode, Type serviceType)
         {
             // Arrange
diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/Common/src/AssemblyTestLog.cs b/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/AssemblyTestLog.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/Common/src/AssemblyTestLog.cs
rename to src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/AssemblyTestLog.cs
diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/Common/src/BeginScopeContext.cs b/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/BeginScopeContext.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/Common/src/BeginScopeContext.cs
rename to src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/BeginScopeContext.cs
diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/Common/src/CollectDumpAttribute.cs b/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/CollectDumpAttribute.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/Common/src/CollectDumpAttribute.cs
rename to src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/CollectDumpAttribute.cs
diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/Common/src/DumpCollector/DumpCollector.Windows.cs b/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/DumpCollector/DumpCollector.Windows.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/Common/src/DumpCollector/DumpCollector.Windows.cs
rename to src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/DumpCollector/DumpCollector.Windows.cs
diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/Common/src/DumpCollector/DumpCollector.cs b/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/DumpCollector/DumpCollector.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/Common/src/DumpCollector/DumpCollector.cs
rename to src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/DumpCollector/DumpCollector.cs
diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/Common/src/ITestSink.cs b/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/ITestSink.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/Common/src/ITestSink.cs
rename to src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/ITestSink.cs
diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/Common/src/LogLevelAttribute.cs b/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/LogLevelAttribute.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/Common/src/LogLevelAttribute.cs
rename to src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/LogLevelAttribute.cs
diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/Common/src/LogValuesAssert.cs b/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/LogValuesAssert.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/Common/src/LogValuesAssert.cs
rename to src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/LogValuesAssert.cs
diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/Common/src/LoggedTest/ILoggedTest.cs b/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/LoggedTest/ILoggedTest.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/Common/src/LoggedTest/ILoggedTest.cs
rename to src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/LoggedTest/ILoggedTest.cs
diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/Common/src/LoggedTest/LoggedTest.cs b/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/LoggedTest/LoggedTest.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/Common/src/LoggedTest/LoggedTest.cs
rename to src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/LoggedTest/LoggedTest.cs
diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/Common/src/LoggedTest/LoggedTestBase.cs b/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/LoggedTest/LoggedTestBase.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/Common/src/LoggedTest/LoggedTestBase.cs
rename to src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/LoggedTest/LoggedTestBase.cs
diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/Common/src/Microsoft.Extensions.Logging.Testing.csproj b/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/Microsoft.Extensions.Logging.Testing.csproj
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/Common/src/Microsoft.Extensions.Logging.Testing.csproj
rename to src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/Microsoft.Extensions.Logging.Testing.csproj
diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/Common/src/TestFrameworkFileLoggerAttribute.cs b/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/TestFrameworkFileLoggerAttribute.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/Common/src/TestFrameworkFileLoggerAttribute.cs
rename to src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/TestFrameworkFileLoggerAttribute.cs
diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/Common/src/TestLogger.cs b/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/TestLogger.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/Common/src/TestLogger.cs
rename to src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/TestLogger.cs
diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/Common/src/TestLoggerFactory.cs b/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/TestLoggerFactory.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/Common/src/TestLoggerFactory.cs
rename to src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/TestLoggerFactory.cs
diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/Common/src/TestLoggerProvider.cs b/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/TestLoggerProvider.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/Common/src/TestLoggerProvider.cs
rename to src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/TestLoggerProvider.cs
diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/Common/src/TestLoggerT.cs b/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/TestLoggerT.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/Common/src/TestLoggerT.cs
rename to src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/TestLoggerT.cs
diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/Common/src/TestSink.cs b/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/TestSink.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/Common/src/TestSink.cs
rename to src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/TestSink.cs
diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/Common/src/WriteContext.cs b/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/WriteContext.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/Common/src/WriteContext.cs
rename to src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/WriteContext.cs
diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/Common/src/XunitLoggerFactoryExtensions.cs b/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/XunitLoggerFactoryExtensions.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/Common/src/XunitLoggerFactoryExtensions.cs
rename to src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/XunitLoggerFactoryExtensions.cs
diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/Common/src/XunitLoggerProvider.cs b/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/XunitLoggerProvider.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/Common/src/XunitLoggerProvider.cs
rename to src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/XunitLoggerProvider.cs
diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/Common/src/build/Microsoft.Extensions.Logging.Testing.props b/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/build/Microsoft.Extensions.Logging.Testing.props
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/Common/src/build/Microsoft.Extensions.Logging.Testing.props
rename to src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/src/build/Microsoft.Extensions.Logging.Testing.props
diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/Common/test/AssemblyTestLogTests.cs b/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/test/AssemblyTestLogTests.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/Common/test/AssemblyTestLogTests.cs
rename to src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/test/AssemblyTestLogTests.cs
diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/Common/test/LogValuesAssertTest.cs b/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/test/LogValuesAssertTest.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/Common/test/LogValuesAssertTest.cs
rename to src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/test/LogValuesAssertTest.cs
diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/Common/test/LoggedTestXunitTests.cs b/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/test/LoggedTestXunitTests.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/Common/test/LoggedTestXunitTests.cs
rename to src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/test/LoggedTestXunitTests.cs
diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/Common/test/Microsoft.Extensions.Logging.Testing.Tests.csproj b/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/test/Microsoft.Extensions.Logging.Testing.Tests.csproj
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/Common/test/Microsoft.Extensions.Logging.Testing.Tests.csproj
rename to src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/test/Microsoft.Extensions.Logging.Testing.Tests.csproj
diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/Common/test/Properties/AssemblyInfo.cs b/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/test/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/Common/test/Properties/AssemblyInfo.cs
rename to src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/test/Properties/AssemblyInfo.cs
diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/Common/test/TestTestOutputHelper.cs b/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/test/TestTestOutputHelper.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/Common/test/TestTestOutputHelper.cs
rename to src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/test/TestTestOutputHelper.cs
diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/Common/test/XunitLoggerProviderTest.cs b/src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/test/XunitLoggerProviderTest.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/Common/test/XunitLoggerProviderTest.cs
rename to src/libraries/Microsoft.Extensions.Logging/tests/DI.Common/Common/test/XunitLoggerProviderTest.cs
diff --git a/src/libraries/restore/binplacePackages/binplacePackages.depproj b/src/libraries/restore/binplacePackages/binplacePackages.depproj
index 34d7004d..d97b5b5 100644
--- a/src/libraries/restore/binplacePackages/binplacePackages.depproj
+++ b/src/libraries/restore/binplacePackages/binplacePackages.depproj
@@ -38,6 +38,8 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="1.0.0" Condition="'$(TargetsNetStandard)' != 'true' or '$(NETStandardVersion)' &gt;= 2.0" />
     <PackageReference Include="System.Data.SqlClient" Version="$(SystemDataSqlClientVersion)" Condition="'$(TargetsNetStandard)' != 'true' or '$(NETStandardVersion)' &gt;= 2.0" />
+    
+    <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" Condition="'$(TargetsNetStandard)' != 'true' or '$(NETStandardVersion)' &lt;= 2.0" />
     <!-- Only include the assets from the direct packages we reference in the output -->
     <PackageToInclude Include="@(PackageReference)" />
   </ItemGroup>
diff --git a/src/libraries/restore/netstandard/netstandard.depproj b/src/libraries/restore/netstandard/netstandard.depproj
index 756d35d..6ecf6cb 100644
--- a/src/libraries/restore/netstandard/netstandard.depproj
+++ b/src/libraries/restore/netstandard/netstandard.depproj
@@ -69,9 +69,6 @@
     <PackageReference Include="System.Data.SqlClient">
       <Version>4.7.0</Version>
     </PackageReference>
-    <PackageReference Include="System.ComponentModel.Annotations">
-      <Version>4.7.0</Version>
-    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>
-- 
2.7.4