Enables DI.External

Moving around files in DI tests, correcting folder structure
Disable tests failing on mono and for netfx

diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.External.Tests/Microsoft.Extensions.DependencyInjection.ExternalContainers.Tests.csproj b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.External.Tests/Microsoft.Extensions.DependencyInjection.ExternalContainers.Tests.csproj
index d6b2f1e..9aaa52f 100644 (file)
--- a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.External.Tests/Microsoft.Extensions.DependencyInjection.ExternalContainers.Tests.csproj
+++ b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.External.Tests/Microsoft.Extensions.DependencyInjection.ExternalContainers.Tests.csproj
@@ -1,30 +1,32 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>$(DefaultNetCoreTargetFramework);net472</TargetFrameworks>
-    <RootNamespace>Microsoft.Extensions.DependencyInjection</RootNamespace>
-    <SignAssembly>false</SignAssembly>
+    <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
+    <EnableDefaultItems>true</EnableDefaultItems>
+    <NoWarn>$(NoWarn);CS8002</NoWarn>
+    <SignAssembly Condition="$(TargetFramework.StartsWith('net4'))">false</SignAssembly>
   </PropertyGroup>
 
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json" />
-
-    <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" />
-    <Reference Include="Lamar.Microsoft.DependencyInjection" />
-    <Reference Include="LightInject.Microsoft.DependencyInjection" />
-    <Reference Include="StructureMap.Microsoft.DependencyInjection" />
-    <Reference Include="Grace.DependencyInjection.Extensions" />
-    <Reference Include="Stashbox.Extensions.Dependencyinjection" />
-    <Reference Include="Unity.Microsoft.DependencyInjection" />
+    <Compile Include="$(CommonTestPath)Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\ExceptionAssertions.cs"
+             Link="Common\tests\Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\ExceptionAssertions.cs" />
+    <Compile Include="$(CommonTestPath)Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\CultureReplacer.cs"
+             Link="Common\tests\Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\CultureReplacer.cs" />
+    <Compile Include="..\DI.Specification.Tests\**\*.cs" />
   </ItemGroup>
 
   <ItemGroup>
-    <None Update="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
+    <ReferenceFromRuntime Include="Microsoft.Extensions.DependencyInjection" />
+    <ReferenceFromRuntime Include="Microsoft.Extensions.DependencyInjection.Abstractions" Aliases="DIAbstractions" />
+    <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
+    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.3.1"/>
+    <PackageReference Include="DryIoc.Microsoft.DependencyInjection"  Version="2.1.0"/>
+    <PackageReference Include="Lamar.Microsoft.DependencyInjection"  Version="2.0.1"/>
+    <PackageReference Include="LightInject.Microsoft.DependencyInjection"  Version="2.2.0"/>
+    <PackageReference Include="StructureMap.Microsoft.DependencyInjection"  Version="1.4.0"/>
+    <PackageReference Include="Grace.DependencyInjection.Extensions"  Version="6.4.0"/>
+    <PackageReference Include="Stashbox.Extensions.Dependencyinjection"  Version="2.6.3"/>
+    <PackageReference Include="Unity.Microsoft.DependencyInjection" Version="2.1.3" />
   </ItemGroup>
 
 </Project>

diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Specification.Tests/ActivatorUtilitiesTests.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Specification.Tests/ActivatorUtilitiesTests.cs
index d653a67..df19b86 100644 (file)
--- a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Specification.Tests/ActivatorUtilitiesTests.cs
+++ b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Specification.Tests/ActivatorUtilitiesTests.cs
@@ -10,6 +10,7 @@ using Xunit;
 
 namespace Microsoft.Extensions.DependencyInjection.Specification
 {
+    [ActiveIssue("https://github.com/dotnet/runtime/issues/33894", TestRuntimes.Mono)]
     public abstract partial class DependencyInjectionSpecificationTests
     {
         public delegate object CreateInstanceFunc(IServiceProvider provider, Type type, object[] args);
@@ -41,6 +42,7 @@ namespace Microsoft.Extensions.DependencyInjection.Specification
 
         [Theory]
         [MemberData(nameof(CreateInstanceFuncs))]
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/33894", TestRuntimes.Mono)]
         public void TypeActivatorEnablesYouToCreateAnyTypeWithServicesEvenWhenNotInIocContainer(CreateInstanceFunc createFunc)
         {
             // Arrange
@@ -55,6 +57,7 @@ namespace Microsoft.Extensions.DependencyInjection.Specification
 
         [Theory]
         [MemberData(nameof(CreateInstanceFuncs))]
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/33894", TestRuntimes.Mono)]
         public void TypeActivatorAcceptsAnyNumberOfAdditionalConstructorParametersToProvide(CreateInstanceFunc createFunc)
         {
             // Arrange
@@ -119,6 +122,7 @@ namespace Microsoft.Extensions.DependencyInjection.Specification
 
         [Theory]
         [MemberData(nameof(CreateInstanceFuncs))]
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/33894", TestRuntimes.Mono)]
         public void TypeActivatorCanDisambiguateConstructorsWithUniqueArguments(CreateInstanceFunc createFunc)
         {
             // Arrange
@@ -267,6 +271,7 @@ namespace Microsoft.Extensions.DependencyInjection.Specification
         }
 
         [Fact]
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/33894", TestRuntimes.Mono)]
         public void GetServiceOrCreateInstanceRegisteredServiceTransient()
         {
             // Reset the count because test order is not guaranteed
@@ -293,6 +298,7 @@ namespace Microsoft.Extensions.DependencyInjection.Specification
         }
 
         [Fact]
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/33894", TestRuntimes.Mono)]
         public void GetServiceOrCreateInstanceRegisteredServiceSingleton()
         {
             lock (CreationCountFakeService.InstanceLock)
@@ -320,6 +326,7 @@ namespace Microsoft.Extensions.DependencyInjection.Specification
         }
 
         [Fact]
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/33894", TestRuntimes.Mono)]
         public void GetServiceOrCreateInstanceUnregisteredService()
         {
             lock (CreationCountFakeService.InstanceLock)

diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Specification.Tests/DependencyInjectionSpecificationTests.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Specification.Tests/DependencyInjectionSpecificationTests.cs
index beed0c8..a8f9bba 100644 (file)
--- a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Specification.Tests/DependencyInjectionSpecificationTests.cs
+++ b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Specification.Tests/DependencyInjectionSpecificationTests.cs
@@ -11,6 +11,7 @@ using Xunit;
 
 namespace Microsoft.Extensions.DependencyInjection.Specification
 {
+    [ActiveIssue("https://github.com/dotnet/runtime/issues/33894", TestRuntimes.Mono)]
     public abstract partial class DependencyInjectionSpecificationTests
     {
         protected abstract IServiceProvider CreateServiceProvider(IServiceCollection serviceCollection);
@@ -32,6 +33,7 @@ namespace Microsoft.Extensions.DependencyInjection.Specification
         }
 
         [Fact]
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/33894", TestRuntimes.Mono)]
         public void ServicesRegisteredWithImplementationType_ReturnDifferentInstancesPerResolution_ForTransientServices()
         {
             // Arrange
@@ -84,6 +86,7 @@ namespace Microsoft.Extensions.DependencyInjection.Specification
         }
 
         [Fact]
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/33894", TestRuntimes.Mono)]
         public void TransientServiceCanBeResolvedFromProvider()
         {
             // Arrange
@@ -101,6 +104,7 @@ namespace Microsoft.Extensions.DependencyInjection.Specification
         }
 
         [Fact]
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/33894", TestRuntimes.Mono)]
         public void TransientServiceCanBeResolvedFromScope()
         {
             // Arrange
@@ -173,6 +177,7 @@ namespace Microsoft.Extensions.DependencyInjection.Specification
         }
 
         [Fact]
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/33894", TestRuntimes.Mono)]
         public void MultipleServiceCanBeIEnumerableResolved()
         {
             // Arrange
@@ -191,6 +196,7 @@ namespace Microsoft.Extensions.DependencyInjection.Specification
         }
 
         [Fact]
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/33894", TestRuntimes.Mono)]
         public void RegistrationOrderIsPreservedWhenServicesAreIEnumerableResolved()
         {
             // Arrange
@@ -218,6 +224,7 @@ namespace Microsoft.Extensions.DependencyInjection.Specification
         }
 
         [Fact]
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/33894", TestRuntimes.Mono)]
         public void OuterServiceCanHaveOtherServicesInjected()
         {
             // Arrange
@@ -267,6 +274,7 @@ namespace Microsoft.Extensions.DependencyInjection.Specification
         }
 
         [Fact]
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/33894", TestRuntimes.Mono)]
         public void FactoryServicesAreCreatedAsPartOfCreatingObjectGraph()
         {
             // Arrange
@@ -311,6 +319,7 @@ namespace Microsoft.Extensions.DependencyInjection.Specification
         }
 
         [Fact]
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/33894", TestRuntimes.Mono)]
         public void LastServiceReplacesPreviousServices()
         {
             // Arrange
@@ -358,6 +367,7 @@ namespace Microsoft.Extensions.DependencyInjection.Specification
         }
 
         [Fact]
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/33894", TestRuntimes.Mono)]
         public void ScopedServiceCanBeResolved()
         {
             // Arrange
@@ -379,6 +389,7 @@ namespace Microsoft.Extensions.DependencyInjection.Specification
         }
 
         [Fact]
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/33894", TestRuntimes.Mono)]
         public void NestedScopedServiceCanBeResolved()
         {
             // Arrange
@@ -401,6 +412,7 @@ namespace Microsoft.Extensions.DependencyInjection.Specification
         }
 
         [Fact]
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/33894", TestRuntimes.Mono)]
         public void ScopedServices_FromCachedScopeFactory_CanBeResolvedAndDisposed()
         {
             // Arrange
@@ -436,6 +448,7 @@ namespace Microsoft.Extensions.DependencyInjection.Specification
         }
 
         [Fact]
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/33894", TestRuntimes.Mono)]
         public void DisposingScopeDisposesService()
         {
             // Arrange
@@ -542,6 +555,7 @@ namespace Microsoft.Extensions.DependencyInjection.Specification
         }
 
         [Fact]
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/33894", TestRuntimes.Mono)]
         public void NestedScopedServiceCanBeResolvedWithNoFallbackProvider()
         {
             // Arrange
@@ -671,6 +685,7 @@ namespace Microsoft.Extensions.DependencyInjection.Specification
 
         [Theory]
         [MemberData(nameof(ServiceContainerPicksConstructorWithLongestMatchesData))]
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/33894", TestRuntimes.Mono)]
         public void ServiceContainerPicksConstructorWithLongestMatches(
             IServiceCollection serviceCollection,
             TypeWithSupersetConstructors expected)
@@ -747,6 +762,7 @@ namespace Microsoft.Extensions.DependencyInjection.Specification
         [InlineData(typeof(IFakeService), typeof(FakeService), typeof(IFakeService), ServiceLifetime.Singleton)]
         [InlineData(typeof(IFakeOpenGenericService<>), typeof(FakeOpenGenericService<>), typeof(IFakeOpenGenericService<IServiceProvider>), ServiceLifetime.Scoped)]
         [InlineData(typeof(IFakeOpenGenericService<>), typeof(FakeOpenGenericService<>), typeof(IFakeOpenGenericService<IServiceProvider>), ServiceLifetime.Singleton)]
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/33894", TestRuntimes.Mono)]
         public void ResolvesDifferentInstancesForServiceWhenResolvingEnumerable(Type serviceType, Type implementation, Type resolve, ServiceLifetime lifetime)
         {
             // Arrange

diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/CallSiteTests.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/CallSiteTests.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/CallSiteTests.cs
rename to src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/CallSiteTests.cs

diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/CircularDependencyTests.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/CircularDependencyTests.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/CircularDependencyTests.cs
rename to src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/CircularDependencyTests.cs

diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DependencyInjectionEventSourceTests.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/DependencyInjectionEventSourceTests.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/DependencyInjectionEventSourceTests.cs
rename to src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/DependencyInjectionEventSourceTests.cs

diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/Fakes/AbstractClass.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/Fakes/AbstractClass.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/Fakes/AbstractClass.cs
rename to src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/Fakes/AbstractClass.cs

diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/Fakes/CircularReferences/DependencyOnCircularDependency.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/Fakes/CircularReferences/DependencyOnCircularDependency.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/Fakes/CircularReferences/DependencyOnCircularDependency.cs
rename to src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/Fakes/CircularReferences/DependencyOnCircularDependency.cs

diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/Fakes/CircularReferences/DirectCircularDependencyA.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/Fakes/CircularReferences/DirectCircularDependencyA.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/Fakes/CircularReferences/DirectCircularDependencyA.cs
rename to src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/Fakes/CircularReferences/DirectCircularDependencyA.cs

diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/Fakes/CircularReferences/DirectCircularDependencyB.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/Fakes/CircularReferences/DirectCircularDependencyB.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/Fakes/CircularReferences/DirectCircularDependencyB.cs
rename to src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/Fakes/CircularReferences/DirectCircularDependencyB.cs

diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/Fakes/CircularReferences/ISelfCircularDependencyWithInterface.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/Fakes/CircularReferences/ISelfCircularDependencyWithInterface.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/Fakes/CircularReferences/ISelfCircularDependencyWithInterface.cs
rename to src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/Fakes/CircularReferences/ISelfCircularDependencyWithInterface.cs

diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/Fakes/CircularReferences/IndirectCircularDependencyA.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/Fakes/CircularReferences/IndirectCircularDependencyA.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/Fakes/CircularReferences/IndirectCircularDependencyA.cs
rename to src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/Fakes/CircularReferences/IndirectCircularDependencyA.cs

diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/Fakes/CircularReferences/IndirectCircularDependencyB.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/Fakes/CircularReferences/IndirectCircularDependencyB.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/Fakes/CircularReferences/IndirectCircularDependencyB.cs
rename to src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/Fakes/CircularReferences/IndirectCircularDependencyB.cs

diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/Fakes/CircularReferences/IndirectCircularDependencyC.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/Fakes/CircularReferences/IndirectCircularDependencyC.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/Fakes/CircularReferences/IndirectCircularDependencyC.cs
rename to src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/Fakes/CircularReferences/IndirectCircularDependencyC.cs

diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/Fakes/CircularReferences/NoCircularDependencySameTypeMultipleTimesA.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/Fakes/CircularReferences/NoCircularDependencySameTypeMultipleTimesA.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/Fakes/CircularReferences/NoCircularDependencySameTypeMultipleTimesA.cs
rename to src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/Fakes/CircularReferences/NoCircularDependencySameTypeMultipleTimesA.cs

diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/Fakes/CircularReferences/NoCircularDependencySameTypeMultipleTimesB.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/Fakes/CircularReferences/NoCircularDependencySameTypeMultipleTimesB.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/Fakes/CircularReferences/NoCircularDependencySameTypeMultipleTimesB.cs
rename to src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/Fakes/CircularReferences/NoCircularDependencySameTypeMultipleTimesB.cs

diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/Fakes/CircularReferences/NoCircularDependencySameTypeMultipleTimesC.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/Fakes/CircularReferences/NoCircularDependencySameTypeMultipleTimesC.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/Fakes/CircularReferences/NoCircularDependencySameTypeMultipleTimesC.cs
rename to src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/Fakes/CircularReferences/NoCircularDependencySameTypeMultipleTimesC.cs

diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/Fakes/CircularReferences/SelfCircularDependency.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/Fakes/CircularReferences/SelfCircularDependency.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/Fakes/CircularReferences/SelfCircularDependency.cs
rename to src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/Fakes/CircularReferences/SelfCircularDependency.cs

diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/Fakes/CircularReferences/SelfCircularDependencyGeneric.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/Fakes/CircularReferences/SelfCircularDependencyGeneric.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/Fakes/CircularReferences/SelfCircularDependencyGeneric.cs
rename to src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/Fakes/CircularReferences/SelfCircularDependencyGeneric.cs

diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/Fakes/CircularReferences/SelfCircularDependencyWithInterface.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/Fakes/CircularReferences/SelfCircularDependencyWithInterface.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/Fakes/CircularReferences/SelfCircularDependencyWithInterface.cs
rename to src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/Fakes/CircularReferences/SelfCircularDependencyWithInterface.cs

diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/Fakes/ClassDependsOnPrivateConstructorClass.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/Fakes/ClassDependsOnPrivateConstructorClass.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/Fakes/ClassDependsOnPrivateConstructorClass.cs
rename to src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/Fakes/ClassDependsOnPrivateConstructorClass.cs

diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/Fakes/ClassWithNestedReferencesToProvider.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/Fakes/ClassWithNestedReferencesToProvider.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/Fakes/ClassWithNestedReferencesToProvider.cs
rename to src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/Fakes/ClassWithNestedReferencesToProvider.cs

diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/Fakes/ClassWithOptionalArgsCtorWithStructs.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/Fakes/ClassWithOptionalArgsCtorWithStructs.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/Fakes/ClassWithOptionalArgsCtorWithStructs.cs
rename to src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/Fakes/ClassWithOptionalArgsCtorWithStructs.cs

diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/Fakes/DependOnNonexistentService.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/Fakes/DependOnNonexistentService.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/Fakes/DependOnNonexistentService.cs
rename to src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/Fakes/DependOnNonexistentService.cs

diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/Fakes/StructFakeMultipleService.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/Fakes/StructFakeMultipleService.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/Fakes/StructFakeMultipleService.cs
rename to src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/Fakes/StructFakeMultipleService.cs

diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/Fakes/StructFakeService.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/Fakes/StructFakeService.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/Fakes/StructFakeService.cs
rename to src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/Fakes/StructFakeService.cs

diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/Fakes/StructService.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/Fakes/StructService.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/Fakes/StructService.cs
rename to src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/Fakes/StructService.cs

diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/Microsoft.Extensions.DependencyInjection.Tests.csproj b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/Microsoft.Extensions.DependencyInjection.Tests.csproj
similarity index 73%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/Microsoft.Extensions.DependencyInjection.Tests.csproj
rename to src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/Microsoft.Extensions.DependencyInjection.Tests.csproj
index 8b1dd15..6a2b155 100644 (file)
--- a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/Microsoft.Extensions.DependencyInjection.Tests.csproj
+++ b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/Microsoft.Extensions.DependencyInjection.Tests.csproj
@@ -6,10 +6,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="..\..\Common\tests\Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\ExceptionAssertions.cs"
+    <Compile Include="$(CommonTestPath)Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\ExceptionAssertions.cs"
              Link="Common\tests\Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\ExceptionAssertions.cs" />
-    <Compile Include="..\..\Common\tests\Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\CultureReplacer.cs"
+    <Compile Include="$(CommonTestPath)Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\CultureReplacer.cs"
              Link="Common\tests\Extensions\TestingUtils\Microsoft.AspNetCore.Testing\src\CultureReplacer.cs" />
+    <Compile Include="..\DI.Specification.Tests\**\*.cs" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/ServiceCollectionDescriptorExtensionsTests.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/ServiceCollectionDescriptorExtensionsTests.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/ServiceCollectionDescriptorExtensionsTests.cs
rename to src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/ServiceCollectionDescriptorExtensionsTests.cs

diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/ServiceCollectionServiceExtensionsTest.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/ServiceCollectionServiceExtensionsTest.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/ServiceCollectionServiceExtensionsTest.cs
rename to src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/ServiceCollectionServiceExtensionsTest.cs

diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/ServiceLookup/CallSiteFactoryTest.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/ServiceLookup/CallSiteFactoryTest.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/ServiceLookup/CallSiteFactoryTest.cs
rename to src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/ServiceLookup/CallSiteFactoryTest.cs

diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/ServiceLookup/Types/TypeWithDefaultConstructorParameters.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/ServiceLookup/Types/TypeWithDefaultConstructorParameters.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/ServiceLookup/Types/TypeWithDefaultConstructorParameters.cs
rename to src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/ServiceLookup/Types/TypeWithDefaultConstructorParameters.cs

diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/ServiceLookup/Types/TypeWithEnumerableConstructors.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/ServiceLookup/Types/TypeWithEnumerableConstructors.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/ServiceLookup/Types/TypeWithEnumerableConstructors.cs
rename to src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/ServiceLookup/Types/TypeWithEnumerableConstructors.cs

diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/ServiceLookup/Types/TypeWithGenericServices.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/ServiceLookup/Types/TypeWithGenericServices.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/ServiceLookup/Types/TypeWithGenericServices.cs
rename to src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/ServiceLookup/Types/TypeWithGenericServices.cs

diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/ServiceLookup/Types/TypeWithMultipleParameterizedConstructors.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/ServiceLookup/Types/TypeWithMultipleParameterizedConstructors.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/ServiceLookup/Types/TypeWithMultipleParameterizedConstructors.cs
rename to src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/ServiceLookup/Types/TypeWithMultipleParameterizedConstructors.cs

diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/ServiceLookup/Types/TypeWithNoConstructors.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/ServiceLookup/Types/TypeWithNoConstructors.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/ServiceLookup/Types/TypeWithNoConstructors.cs
rename to src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/ServiceLookup/Types/TypeWithNoConstructors.cs

diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/ServiceLookup/Types/TypeWithNoPublicConstructors.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/ServiceLookup/Types/TypeWithNoPublicConstructors.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/ServiceLookup/Types/TypeWithNoPublicConstructors.cs
rename to src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/ServiceLookup/Types/TypeWithNoPublicConstructors.cs

diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/ServiceLookup/Types/TypeWithNonOverlappedConstructors.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/ServiceLookup/Types/TypeWithNonOverlappedConstructors.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/ServiceLookup/Types/TypeWithNonOverlappedConstructors.cs
rename to src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/ServiceLookup/Types/TypeWithNonOverlappedConstructors.cs

diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/ServiceLookup/Types/TypeWithParameterizedAndNullaryConstructor.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/ServiceLookup/Types/TypeWithParameterizedAndNullaryConstructor.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/ServiceLookup/Types/TypeWithParameterizedAndNullaryConstructor.cs
rename to src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/ServiceLookup/Types/TypeWithParameterizedAndNullaryConstructor.cs

diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/ServiceLookup/Types/TypeWithParameterizedConstructor.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/ServiceLookup/Types/TypeWithParameterizedConstructor.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/ServiceLookup/Types/TypeWithParameterizedConstructor.cs
rename to src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/ServiceLookup/Types/TypeWithParameterizedConstructor.cs

diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/ServiceLookup/Types/TypeWithParameterlessConstructor.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/ServiceLookup/Types/TypeWithParameterlessConstructor.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/ServiceLookup/Types/TypeWithParameterlessConstructor.cs
rename to src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/ServiceLookup/Types/TypeWithParameterlessConstructor.cs

diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/ServiceLookup/Types/TypeWithParameterlessPublicConstructor.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/ServiceLookup/Types/TypeWithParameterlessPublicConstructor.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/ServiceLookup/Types/TypeWithParameterlessPublicConstructor.cs
rename to src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/ServiceLookup/Types/TypeWithParameterlessPublicConstructor.cs

diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/ServiceLookup/Types/TypeWithUnresolvableEnumerableConstructors.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/ServiceLookup/Types/TypeWithUnresolvableEnumerableConstructors.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/ServiceLookup/Types/TypeWithUnresolvableEnumerableConstructors.cs
rename to src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/ServiceLookup/Types/TypeWithUnresolvableEnumerableConstructors.cs

diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/ServiceProviderCompilationTest.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/ServiceProviderCompilationTest.cs
similarity index 95%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/ServiceProviderCompilationTest.cs
rename to src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/ServiceProviderCompilationTest.cs
index bdeb426..69c5978 100644 (file)
--- a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/ServiceProviderCompilationTest.cs
+++ b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/ServiceProviderCompilationTest.cs
@@ -9,6 +9,7 @@ using Xunit;
 
 namespace Microsoft.Extensions.DependencyInjection.Tests
 {
+    [ActiveIssue("https://github.com/dotnet/runtime/issues/33894", TestRuntimes.Mono)]
     public class ServiceProviderCompilationTest
     {
         [Theory]

diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/ServiceProviderCompilationTestData.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/ServiceProviderCompilationTestData.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/ServiceProviderCompilationTestData.cs
rename to src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/ServiceProviderCompilationTestData.cs

diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/ServiceProviderContainerTests.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/ServiceProviderContainerTests.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/ServiceProviderContainerTests.cs
rename to src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/ServiceProviderContainerTests.cs

diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/ServiceProviderDefaultContainerTests.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/ServiceProviderDefaultContainerTests.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/ServiceProviderDefaultContainerTests.cs
rename to src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/ServiceProviderDefaultContainerTests.cs

diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/ServiceProviderDynamicContainerTests.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/ServiceProviderDynamicContainerTests.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/ServiceProviderDynamicContainerTests.cs
rename to src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/ServiceProviderDynamicContainerTests.cs

diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/ServiceProviderEngineScopeTests.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/ServiceProviderEngineScopeTests.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/ServiceProviderEngineScopeTests.cs
rename to src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/ServiceProviderEngineScopeTests.cs

diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/ServiceProviderExpressionsContainerTests.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/ServiceProviderExpressionsContainerTests.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/ServiceProviderExpressionsContainerTests.cs
rename to src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/ServiceProviderExpressionsContainerTests.cs

diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/ServiceProviderILEmitContainerTests.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/ServiceProviderILEmitContainerTests.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/ServiceProviderILEmitContainerTests.cs
rename to src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/ServiceProviderILEmitContainerTests.cs

diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/ServiceProviderServiceExtensionsTest.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/ServiceProviderServiceExtensionsTest.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/ServiceProviderServiceExtensionsTest.cs
rename to src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/ServiceProviderServiceExtensionsTest.cs

diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/ServiceProviderValidationTests.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/ServiceProviderValidationTests.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/ServiceProviderValidationTests.cs
rename to src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/ServiceProviderValidationTests.cs

diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/ServiceTableTest.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/ServiceTableTest.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/ServiceTableTest.cs
rename to src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/ServiceTableTest.cs

diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/Utils/MultiServiceHelpers.cs b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/Utils/MultiServiceHelpers.cs
similarity index 100%
rename from src/libraries/Microsoft.Extensions.DependencyInjection/tests/Utils/MultiServiceHelpers.cs
rename to src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Tests/Utils/MultiServiceHelpers.cs