Remove ActivatorUtilities_In_DependencyInjection #define

src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/src/ActivatorUtilities.cs

@@ -4,31 +4,17 @@
 using System;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
-using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
 using System.Runtime.ExceptionServices;
-
-#if ActivatorUtilities_In_DependencyInjection
 using Microsoft.Extensions.Internal;
 
 namespace Microsoft.Extensions.DependencyInjection
-#else
-namespace Microsoft.Extensions.Internal
-#endif
 {
     /// <summary>
     /// Helper code for the various activator services.
     /// </summary>
-
-#if ActivatorUtilities_In_DependencyInjection
-    public
-#else
-    // Do not take a dependency on this class unless you are explicitly trying to avoid taking a
-    // dependency on Microsoft.AspNetCore.DependencyInjection.Abstractions.
-    internal
-#endif
-    static class ActivatorUtilities
+    public static class ActivatorUtilities
     {
         private static readonly MethodInfo GetServiceInfo =
             GetMethodInfo<Func<IServiceProvider, Type, Type, bool, object?>>((sp, t, r, c) => GetService(sp, t, r, c));

src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/src/ActivatorUtilitiesConstructorAttribute.cs

@@ -3,25 +3,13 @@
 
 using System;
 
-#if ActivatorUtilities_In_DependencyInjection
 namespace Microsoft.Extensions.DependencyInjection
-#else
-namespace Microsoft.Extensions.Internal
-#endif
 {
     /// <summary>
     /// Marks the constructor to be used when activating type using <see cref="ActivatorUtilities"/>.
     /// </summary>
-
     [AttributeUsage(AttributeTargets.All)]
-#if ActivatorUtilities_In_DependencyInjection
-    public
-#else
-    // Do not take a dependency on this class unless you are explicitly trying to avoid taking a
-    // dependency on Microsoft.AspNetCore.DependencyInjection.Abstractions.
-    internal
-#endif
-    class ActivatorUtilitiesConstructorAttribute: Attribute
+    public class ActivatorUtilitiesConstructorAttribute : Attribute
     {
     }
 }

src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/src/Microsoft.Extensions.DependencyInjection.Abstractions.csproj

@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
-    <DefineConstants>$(DefineConstants);ActivatorUtilities_In_DependencyInjection</DefineConstants>
     <EnableDefaultItems>true</EnableDefaultItems>
     <Nullable>enable</Nullable>
   </PropertyGroup>

src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/src/ObjectFactory.cs

@@ -3,23 +3,13 @@
 
 using System;
 
-#if ActivatorUtilities_In_DependencyInjection
 namespace Microsoft.Extensions.DependencyInjection
-#else
-namespace Microsoft.Extensions.Internal
-#endif
 {
-
     /// <summary>
     /// The result of <see cref="ActivatorUtilities.CreateFactory(Type, Type[])"/>.
     /// </summary>
     /// <param name="serviceProvider">The <see cref="IServiceProvider"/> to get service arguments from.</param>
     /// <param name="arguments">Additional constructor arguments.</param>
     /// <returns>The instantiated type.</returns>
-#if ActivatorUtilities_In_DependencyInjection
-    public
-#else
-    internal
-#endif
-    delegate object ObjectFactory(IServiceProvider serviceProvider, object?[]? arguments);
+    public delegate object ObjectFactory(IServiceProvider serviceProvider, object?[]? arguments);
 }