Merge pull request dotnet#37103 from maryamariyan/di-external

Adding DI.External to runtime with its history

src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.External.Tests/Autofac.cs

@@ -0,0 +1,20 @@
+// 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.
+
+using System;
+using Autofac;
+using Autofac.Extensions.DependencyInjection;
+
+namespace Microsoft.Extensions.DependencyInjection.Specification
+{
+    public class AutofacDependencyInjectionSpecificationTests: DependencyInjectionSpecificationTests
+    {
+        protected override IServiceProvider CreateServiceProvider(IServiceCollection serviceCollection)
+        {
+            var builder = new ContainerBuilder();
+            builder.Populate(serviceCollection);
+            return new AutofacServiceProvider(builder.Build());
+        }
+    }
+}

src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.External.Tests/DryIoc.cs

@@ -0,0 +1,20 @@
+// 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.
+
+using System;
+using DryIoc;
+using DryIoc.Microsoft.DependencyInjection;
+
+namespace Microsoft.Extensions.DependencyInjection.Specification
+{
+    public class DryIocDependencyInjectionSpecificationTests: DependencyInjectionSpecificationTests
+    {
+        protected override IServiceProvider CreateServiceProvider(IServiceCollection serviceCollection)
+        {
+            return new Container()
+                .WithDependencyInjectionAdapter(serviceCollection)
+                .BuildServiceProvider();
+        }
+    }
+}

src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.External.Tests/Grace.cs

@@ -0,0 +1,24 @@
+// 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.
+
+using System;
+using Grace.DependencyInjection;
+using Grace.DependencyInjection.Extensions;
+
+namespace Microsoft.Extensions.DependencyInjection.Specification
+{
+    public class GraceDependencyInjectionSpecificationTests: SkippableDependencyInjectionSpecificationTests
+    {
+        public override string[] SkippedTests => new[]
+        {
+            "ResolvesMixedOpenClosedGenericsAsEnumerable",
+            "TypeActivatorWorksWithCtorWithOptionalArgs_WithStructDefaults"
+        };
+
+        protected override IServiceProvider CreateServiceProviderImpl(IServiceCollection serviceCollection)
+        {
+            return new DependencyInjectionContainer().Populate(serviceCollection);
+        }
+    }
+}

src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.External.Tests/Lamar.cs

@@ -0,0 +1,22 @@
+// 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.
+
+using System;
+
+namespace Microsoft.Extensions.DependencyInjection.Specification
+{
+    public class LamarDependencyInjectionSpecificationTests : SkippableDependencyInjectionSpecificationTests
+    {
+        public override string[] SkippedTests => new[]
+        {
+            "DisposesInReverseOrderOfCreation",
+            "ResolvesMixedOpenClosedGenericsAsEnumerable"
+        };
+
+        protected override IServiceProvider CreateServiceProviderImpl(IServiceCollection serviceCollection)
+        {
+            return Lamar.Container.BuildAsync(serviceCollection).Result;
+        }
+    }
+}

src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.External.Tests/LightInject.cs

@@ -0,0 +1,21 @@
+// 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.
+
+using System;
+using Autofac;
+using Autofac.Extensions.DependencyInjection;
+using LightInject.Microsoft.DependencyInjection;
+
+namespace Microsoft.Extensions.DependencyInjection.Specification
+{
+    public class LightInjectDependencyInjectionSpecificationTests: DependencyInjectionSpecificationTests
+    {
+        protected override IServiceProvider CreateServiceProvider(IServiceCollection serviceCollection)
+        {
+            var builder = new ContainerBuilder();
+            builder.Populate(serviceCollection);
+            return serviceCollection.CreateLightInjectServiceProvider();
+        }
+    }
+}

src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.External.Tests/Microsoft.Extensions.DependencyInjection.ExternalContainers.Tests.csproj

@@ -0,0 +1,32 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
+    <EnableDefaultItems>true</EnableDefaultItems>
+    <NoWarn>$(NoWarn);CS8002</NoWarn>
+    <SignAssembly Condition="$(TargetFramework.StartsWith('net4'))">false</SignAssembly>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <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>
+    <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>

src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.External.Tests/SkippableDependencyInjectionSpecificationTests.cs

@@ -0,0 +1,32 @@
+// 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.
+
+using System;
+using System.Diagnostics;
+using System.Linq;
+
+namespace Microsoft.Extensions.DependencyInjection.Specification
+{
+    public abstract class SkippableDependencyInjectionSpecificationTests: DependencyInjectionSpecificationTests
+    {
+        public abstract string[] SkippedTests { get; }
+
+
+        protected sealed override IServiceProvider CreateServiceProvider(IServiceCollection serviceCollection)
+        {
+            foreach (var stackFrame in new StackTrace(1).GetFrames().Take(2))
+            {
+                if (SkippedTests.Contains(stackFrame.GetMethod().Name))
+                {
+                    // We skip tests by returning MEDI service provider that we know passes the test
+                    return serviceCollection.BuildServiceProvider();
+                }
+            }
+
+            return CreateServiceProviderImpl(serviceCollection);
+        }
+
+        protected abstract IServiceProvider CreateServiceProviderImpl(IServiceCollection serviceCollection);
+    }
+}

src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.External.Tests/StashBox.cs

@@ -0,0 +1,16 @@
+// 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.
+
+using System;
+
+namespace Microsoft.Extensions.DependencyInjection.Specification
+{
+    public class StashBoxDependencyInjectionSpecificationTests: DependencyInjectionSpecificationTests
+    {
+        protected override IServiceProvider CreateServiceProvider(IServiceCollection serviceCollection)
+        {
+            return serviceCollection.UseStashbox();
+        }
+    }
+}

src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.External.Tests/StructureMap.cs

@@ -0,0 +1,29 @@
+// 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.
+
+using System;
+using StructureMap;
+
+namespace Microsoft.Extensions.DependencyInjection.Specification
+{
+    public class StructureMapDependencyInjectionSpecificationTests: SkippableDependencyInjectionSpecificationTests
+    {
+        public override string[] SkippedTests => new[]
+        {
+            "DisposesInReverseOrderOfCreation",
+            "ResolvesMixedOpenClosedGenericsAsEnumerable"
+        };
+
+        protected override IServiceProvider CreateServiceProviderImpl(IServiceCollection serviceCollection)
+        {
+            var container = new Container();
+            container.Configure(config =>
+            {
+                config.Populate(serviceCollection);
+            });
+
+            return container.GetInstance<IServiceProvider>();
+        }
+    }
+}

src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.External.Tests/Unity.cs

@@ -0,0 +1,21 @@
+// 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.
+
+using System;
+
+namespace Microsoft.Extensions.DependencyInjection.Specification
+{
+    public class UnityDependencyInjectionSpecificationTests: SkippableDependencyInjectionSpecificationTests
+    {
+        public override string[] SkippedTests => new[]
+        {
+            "SingletonServiceCanBeResolvedFromScope"
+        };
+
+        protected override IServiceProvider CreateServiceProviderImpl(IServiceCollection serviceCollection)
+        {
+            return Unity.Microsoft.DependencyInjection.ServiceProviderExtensions.BuildServiceProvider(serviceCollection);
+        }
+    }
+}

src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.Specification.Tests/ActivatorUtilitiesTests.cs

@@ -10,6 +10,7 @@
 
 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 @@ public static IEnumerable<object[]> CreateInstanceFuncs
 
         [Theory]
         [MemberData(nameof(CreateInstanceFuncs))]
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/33894", TestRuntimes.Mono)]
         public void TypeActivatorEnablesYouToCreateAnyTypeWithServicesEvenWhenNotInIocContainer(CreateInstanceFunc createFunc)
         {
             // Arrange
@@ -55,6 +57,7 @@ public void TypeActivatorEnablesYouToCreateAnyTypeWithServicesEvenWhenNotInIocCo
 
         [Theory]
         [MemberData(nameof(CreateInstanceFuncs))]
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/33894", TestRuntimes.Mono)]
         public void TypeActivatorAcceptsAnyNumberOfAdditionalConstructorParametersToProvide(CreateInstanceFunc createFunc)
         {
             // Arrange
@@ -119,6 +122,7 @@ public void TypeActivatorWorksWithCtorWithOptionalArgs_WithStructDefaults(Create
 
         [Theory]
         [MemberData(nameof(CreateInstanceFuncs))]
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/33894", TestRuntimes.Mono)]
         public void TypeActivatorCanDisambiguateConstructorsWithUniqueArguments(CreateInstanceFunc createFunc)
         {
             // Arrange
@@ -267,6 +271,7 @@ public void TypeActivatorThrowsWhenMarkedCtorDoesntAcceptArguments(CreateInstanc
         }
 
         [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 @@ public void GetServiceOrCreateInstanceRegisteredServiceTransient()
         }
 
         [Fact]
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/33894", TestRuntimes.Mono)]
         public void GetServiceOrCreateInstanceRegisteredServiceSingleton()
         {
             lock (CreationCountFakeService.InstanceLock)
@@ -320,6 +326,7 @@ public void GetServiceOrCreateInstanceRegisteredServiceSingleton()
         }
 
         [Fact]
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/33894", TestRuntimes.Mono)]
         public void GetServiceOrCreateInstanceUnregisteredService()
         {
             lock (CreationCountFakeService.InstanceLock)