Enable Microsoft.Extensions.DependencyInjection (#33816)

* Enables DI and Options
dotnet · Mar 22, 2020 · 110804e · 110804e
1 parent cf63e73
commit 110804e
Show file tree

Hide file tree

Showing 39 changed files with 57 additions and 39 deletions.
diff --git 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
@@ -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/...tensions.Configuration/tests/Common/Microsoft.Extensions.Configuration.Test.Common.csproj b/...tensions.Configuration/tests/Common/Microsoft.Extensions.Configuration.Test.Common.csproj
diff --git a/.../Microsoft.Extensions.DependencyInjection/ref/Microsoft.Extensions.DependencyInjection.cs b/.../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 @@ public void Dispose() { }
     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/...rosoft.Extensions.DependencyInjection/src/Microsoft.Extensions.DependencyInjection.csproj b/...rosoft.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/...xtensions.DependencyInjection/tests/Microsoft.Extensions.DependencyInjection.Tests.csproj b/...xtensions.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/.../Microsoft.Extensions.DependencyInjection/tests/ServiceCollectionServiceExtensionsTest.cs b/.../Microsoft.Extensions.DependencyInjection/tests/ServiceCollectionServiceExtensionsTest.cs
@@ -1,14 +1,15 @@
 // 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;
 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 @@ public void TryAddEnumerable_ThrowsWhenAddingIndistinguishableImplementationType
             ExceptionAssert.ThrowsArgument(
                 () => collection.TryAddEnumerable(descriptor),
                 "descriptor",
-                AbstractionResources.FormatTryAddIndistinguishableTypeToEnumerable(implementationType, serviceType));
+                AbstractionsSR.Format(AbstractionsSR.TryAddIndistinguishableTypeToEnumerable, implementationType, serviceType));
         }
 
         [Fact]

diff --git a/...ibraries/Microsoft.Extensions.DependencyInjection/tests/ServiceProviderCompilationTest.cs b/...ibraries/Microsoft.Extensions.DependencyInjection/tests/ServiceProviderCompilationTest.cs
@@ -16,6 +16,7 @@ public class ServiceProviderCompilationTest
         [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/...ction/tests/Common/src/AssemblyTestLog.cs → ...s/DI.Common/Common/src/AssemblyTestLog.cs b/...ction/tests/Common/src/AssemblyTestLog.cs → ...s/DI.Common/Common/src/AssemblyTestLog.cs
diff --git a/...ion/tests/Common/src/BeginScopeContext.cs → ...DI.Common/Common/src/BeginScopeContext.cs b/...ion/tests/Common/src/BeginScopeContext.cs → ...DI.Common/Common/src/BeginScopeContext.cs
diff --git a/.../tests/Common/src/CollectDumpAttribute.cs → ...Common/Common/src/CollectDumpAttribute.cs b/.../tests/Common/src/CollectDumpAttribute.cs → ...Common/Common/src/CollectDumpAttribute.cs
diff --git a/...rc/DumpCollector/DumpCollector.Windows.cs → ...rc/DumpCollector/DumpCollector.Windows.cs b/...rc/DumpCollector/DumpCollector.Windows.cs → ...rc/DumpCollector/DumpCollector.Windows.cs
diff --git a/...Common/src/DumpCollector/DumpCollector.cs → ...Common/src/DumpCollector/DumpCollector.cs b/...Common/src/DumpCollector/DumpCollector.cs → ...Common/src/DumpCollector/DumpCollector.cs
diff --git a/...cyInjection/tests/Common/src/ITestSink.cs → ...g/tests/DI.Common/Common/src/ITestSink.cs b/...cyInjection/tests/Common/src/ITestSink.cs → ...g/tests/DI.Common/Common/src/ITestSink.cs
diff --git a/...ion/tests/Common/src/LogLevelAttribute.cs → ...DI.Common/Common/src/LogLevelAttribute.cs b/...ion/tests/Common/src/LogLevelAttribute.cs → ...DI.Common/Common/src/LogLevelAttribute.cs
diff --git a/...ction/tests/Common/src/LogValuesAssert.cs → ...s/DI.Common/Common/src/LogValuesAssert.cs b/...ction/tests/Common/src/LogValuesAssert.cs → ...s/DI.Common/Common/src/LogValuesAssert.cs
diff --git a/...ests/Common/src/LoggedTest/ILoggedTest.cs → ...mmon/Common/src/LoggedTest/ILoggedTest.cs b/...ests/Common/src/LoggedTest/ILoggedTest.cs → ...mmon/Common/src/LoggedTest/ILoggedTest.cs
diff --git a/...tests/Common/src/LoggedTest/LoggedTest.cs → ...ommon/Common/src/LoggedTest/LoggedTest.cs b/...tests/Common/src/LoggedTest/LoggedTest.cs → ...ommon/Common/src/LoggedTest/LoggedTest.cs
diff --git a/...s/Common/src/LoggedTest/LoggedTestBase.cs → ...n/Common/src/LoggedTest/LoggedTestBase.cs b/...s/Common/src/LoggedTest/LoggedTestBase.cs → ...n/Common/src/LoggedTest/LoggedTestBase.cs
diff --git a/...crosoft.Extensions.Logging.Testing.csproj → ...crosoft.Extensions.Logging.Testing.csproj b/...crosoft.Extensions.Logging.Testing.csproj → ...crosoft.Extensions.Logging.Testing.csproj
diff --git a/...n/src/TestFrameworkFileLoggerAttribute.cs → ...n/src/TestFrameworkFileLoggerAttribute.cs b/...n/src/TestFrameworkFileLoggerAttribute.cs → ...n/src/TestFrameworkFileLoggerAttribute.cs
diff --git a/...yInjection/tests/Common/src/TestLogger.cs → .../tests/DI.Common/Common/src/TestLogger.cs b/...yInjection/tests/Common/src/TestLogger.cs → .../tests/DI.Common/Common/src/TestLogger.cs
diff --git a/...ion/tests/Common/src/TestLoggerFactory.cs → ...DI.Common/Common/src/TestLoggerFactory.cs b/...ion/tests/Common/src/TestLoggerFactory.cs → ...DI.Common/Common/src/TestLoggerFactory.cs
diff --git a/...on/tests/Common/src/TestLoggerProvider.cs → ...I.Common/Common/src/TestLoggerProvider.cs b/...on/tests/Common/src/TestLoggerProvider.cs → ...I.Common/Common/src/TestLoggerProvider.cs
diff --git a/...Injection/tests/Common/src/TestLoggerT.cs → ...tests/DI.Common/Common/src/TestLoggerT.cs b/...Injection/tests/Common/src/TestLoggerT.cs → ...tests/DI.Common/Common/src/TestLoggerT.cs
diff --git a/...ncyInjection/tests/Common/src/TestSink.cs → ...ng/tests/DI.Common/Common/src/TestSink.cs b/...ncyInjection/tests/Common/src/TestSink.cs → ...ng/tests/DI.Common/Common/src/TestSink.cs
diff --git a/...njection/tests/Common/src/WriteContext.cs → ...ests/DI.Common/Common/src/WriteContext.cs b/...njection/tests/Common/src/WriteContext.cs → ...ests/DI.Common/Common/src/WriteContext.cs
diff --git a/...ommon/src/XunitLoggerFactoryExtensions.cs → ...ommon/src/XunitLoggerFactoryExtensions.cs b/...ommon/src/XunitLoggerFactoryExtensions.cs → ...ommon/src/XunitLoggerFactoryExtensions.cs
diff --git a/...n/tests/Common/src/XunitLoggerProvider.cs → ....Common/Common/src/XunitLoggerProvider.cs b/...n/tests/Common/src/XunitLoggerProvider.cs → ....Common/Common/src/XunitLoggerProvider.cs
diff --git a/...icrosoft.Extensions.Logging.Testing.props → ...icrosoft.Extensions.Logging.Testing.props b/...icrosoft.Extensions.Logging.Testing.props → ...icrosoft.Extensions.Logging.Testing.props
diff --git a/...tests/Common/test/AssemblyTestLogTests.cs → ...ommon/Common/test/AssemblyTestLogTests.cs b/...tests/Common/test/AssemblyTestLogTests.cs → ...ommon/Common/test/AssemblyTestLogTests.cs
diff --git a/.../tests/Common/test/LogValuesAssertTest.cs → ...Common/Common/test/LogValuesAssertTest.cs b/.../tests/Common/test/LogValuesAssertTest.cs → ...Common/Common/test/LogValuesAssertTest.cs
diff --git a/...tests/Common/test/LoggedTestXunitTests.cs → ...ommon/Common/test/LoggedTestXunitTests.cs b/...tests/Common/test/LoggedTestXunitTests.cs → ...ommon/Common/test/LoggedTestXunitTests.cs
diff --git a/...t.Extensions.Logging.Testing.Tests.csproj → ...t.Extensions.Logging.Testing.Tests.csproj b/...t.Extensions.Logging.Testing.Tests.csproj → ...t.Extensions.Logging.Testing.Tests.csproj
diff --git a/...ts/Common/test/Properties/AssemblyInfo.cs → ...on/Common/test/Properties/AssemblyInfo.cs b/...ts/Common/test/Properties/AssemblyInfo.cs → ...on/Common/test/Properties/AssemblyInfo.cs
diff --git a/...tests/Common/test/TestTestOutputHelper.cs → ...ommon/Common/test/TestTestOutputHelper.cs b/...tests/Common/test/TestTestOutputHelper.cs → ...ommon/Common/test/TestTestOutputHelper.cs
diff --git a/...ts/Common/test/XunitLoggerProviderTest.cs → ...on/Common/test/XunitLoggerProviderTest.cs b/...ts/Common/test/XunitLoggerProviderTest.cs → ...on/Common/test/XunitLoggerProviderTest.cs
diff --git 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
@@ -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>