Merge pull request #32912 from maryamariyan/primitives-total

Extensions consolidation

Author: maryamariyan

eng/Versions.props

@@ -8,6 +8,7 @@
     <PatchVersion>0</PatchVersion>
     <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
     <PreReleaseVersionIteration>2</PreReleaseVersionIteration>
+    <PreReleaseVersionIteration Condition="$(MSBuildProjectName.StartsWith('Microsoft.Extensions.'))">$(PreReleaseVersionIteration)-runtime</PreReleaseVersionIteration>
     <!-- Set assembly version to align with major and minor version,
          as for the patches and revisions should be manually updated per assembly if it is serviced. -->
     <AssemblyVersion>$(MajorVersion).$(MinorVersion).0.0</AssemblyVersion>

src/libraries/Common/src/Extensions/ActivatorUtilities/ActivatorUtilities.cs

@@ -0,0 +1,27 @@
+// 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;
+
+#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>
+
+#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
+    {
+    }
+}

src/libraries/Common/src/Extensions/ActivatorUtilities/ActivatorUtilitiesConstructorAttribute.cs

@@ -0,0 +1,14 @@
+<Project>
+  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
+  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
+
+  <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)..\ParameterDefaultValue\ParameterDefaultValue.cs">
+      <Pack>true</Pack>
+      <PackagePath>$(ContentTargetFolders)\cs\netstandard1.0\</PackagePath>
+    </Compile>
+  </ItemGroup>
+
+  <Target Name="Compile" />
+  <Target Name="CopyFilesToOutputDirectory" />
+</Project>

src/libraries/Common/src/Extensions/ActivatorUtilities/Microsoft.Extensions.ActivatorUtilities.Sources.csproj

@@ -0,0 +1,26 @@
+// 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;
+
+#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);
+}

src/libraries/Common/src/Extensions/ActivatorUtilities/ObjectFactory.cs

@@ -0,0 +1,74 @@
+// 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.Collections.Generic;
+using BenchmarkDotNet.Configs;
+
+namespace BenchmarkDotNet.Attributes
+{
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Assembly)]
+    internal class AspNetCoreBenchmarkAttribute : Attribute, IConfigSource
+    {
+        public AspNetCoreBenchmarkAttribute()
+            : this(typeof(DefaultCoreConfig))
+        {
+        }
+
+        public AspNetCoreBenchmarkAttribute(Type configType)
+            : this(configType, typeof(DefaultCoreValidationConfig))
+        {
+        }
+
+        public AspNetCoreBenchmarkAttribute(Type configType, Type validationConfigType)
+        {
+            ConfigTypes = new Dictionary<string, Type>()
+            {
+                { NamedConfiguration.Default, typeof(DefaultCoreConfig) },
+                { NamedConfiguration.Validation, typeof(DefaultCoreValidationConfig) },
+                { NamedConfiguration.Profile, typeof(DefaultCoreProfileConfig) },
+                { NamedConfiguration.Debug, typeof(DefaultCoreDebugConfig) },
+                { NamedConfiguration.PerfLab, typeof(DefaultCorePerfLabConfig) },
+            };
+
+            if (configType != null)
+            {
+                ConfigTypes[NamedConfiguration.Default] = configType;
+            }
+
+            if (validationConfigType != null)
+            {
+                ConfigTypes[NamedConfiguration.Validation] = validationConfigType;
+            }
+        }
+
+        public IConfig Config
+        {
+            get
+            {
+                if (!ConfigTypes.TryGetValue(ConfigName ?? NamedConfiguration.Default, out var configType))
+                {
+                    var message = $"Could not find a configuration matching {ConfigName}. " +
+                        $"Known configurations: {string.Join(", ", ConfigTypes.Keys)}";
+                    throw new InvalidOperationException(message);
+                }
+                
+                return (IConfig)Activator.CreateInstance(configType, Array.Empty<object>());
+            }
+        }
+
+        public Dictionary<string, Type> ConfigTypes { get; }
+
+        public static string ConfigName { get; set; } = NamedConfiguration.Default;
+
+        public static class NamedConfiguration
+        {
+            public static readonly string Default = "default";
+            public static readonly string Validation = "validation";
+            public static readonly string Profile = "profile";
+            public static readonly string Debug = "debug";
+            public static readonly string PerfLab = "perflab";
+        }
+    }
+}

src/libraries/Common/src/Extensions/BenchmarkRunner/AspNetCoreBenchmarkAttribute.cs

@@ -0,0 +1,47 @@
+// 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 BenchmarkDotNet.Columns;
+using BenchmarkDotNet.Configs;
+using BenchmarkDotNet.Diagnosers;
+using BenchmarkDotNet.Engines;
+using BenchmarkDotNet.Exporters;
+using BenchmarkDotNet.Jobs;
+using BenchmarkDotNet.Loggers;
+using BenchmarkDotNet.Toolchains.CsProj;
+using BenchmarkDotNet.Toolchains.DotNetCli;
+using BenchmarkDotNet.Validators;
+
+namespace BenchmarkDotNet.Attributes
+{
+    internal class DefaultCoreConfig : ManualConfig
+    {
+        public DefaultCoreConfig()
+        {
+            Add(ConsoleLogger.Default);
+            Add(MarkdownExporter.GitHub);
+
+            Add(MemoryDiagnoser.Default);
+            Add(StatisticColumn.OperationsPerSecond);
+            Add(DefaultColumnProviders.Instance);
+
+            Add(JitOptimizationsValidator.FailOnError);
+
+            Add(Job.Core
+#if NETCOREAPP2_1
+                .With(CsProjCoreToolchain.From(NetCoreAppSettings.NetCoreApp21))
+#elif NETCOREAPP3_0
+                .With(CsProjCoreToolchain.From(new NetCoreAppSettings("netcoreapp3.0", null, ".NET Core 3.0")))
+#elif NETCOREAPP3_1
+                .With(CsProjCoreToolchain.From(new NetCoreAppSettings("netcoreapp3.1", null, ".NET Core 3.1")))
+#elif NETCOREAPP5_0
+                .With(CsProjCoreToolchain.From(new NetCoreAppSettings("netcoreapp5.0", null, ".NET Core 5.0")))
+#else
+#error Target frameworks need to be updated.
+#endif
+                .With(new GcMode { Server = true })
+                .With(RunStrategy.Throughput));
+        }
+    }
+}

src/libraries/Common/src/Extensions/BenchmarkRunner/DefaultCoreConfig.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 BenchmarkDotNet.Configs;
+using BenchmarkDotNet.Engines;
+using BenchmarkDotNet.Jobs;
+using BenchmarkDotNet.Loggers;
+using BenchmarkDotNet.Validators;
+
+namespace BenchmarkDotNet.Attributes
+{
+    internal class DefaultCoreDebugConfig : ManualConfig
+    {
+        public DefaultCoreDebugConfig()
+        {
+            Add(ConsoleLogger.Default);
+            Add(JitOptimizationsValidator.DontFailOnError);
+
+            Add(Job.InProcess
+                .With(RunStrategy.Throughput));
+        }
+    }
+}

src/libraries/Common/src/Extensions/BenchmarkRunner/DefaultCoreDebugConfig.cs

@@ -0,0 +1,49 @@
+// 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 BenchmarkDotNet.Columns;
+using BenchmarkDotNet.Configs;
+using BenchmarkDotNet.Diagnosers;
+using BenchmarkDotNet.Engines;
+using BenchmarkDotNet.Exporters;
+using BenchmarkDotNet.Exporters.Csv;
+using BenchmarkDotNet.Jobs;
+using BenchmarkDotNet.Loggers;
+using BenchmarkDotNet.Validators;
+
+namespace BenchmarkDotNet.Attributes
+{
+    internal class DefaultCorePerfLabConfig : ManualConfig
+    {
+        public DefaultCorePerfLabConfig()
+        {
+            Add(ConsoleLogger.Default);
+
+            Add(MemoryDiagnoser.Default);
+            Add(StatisticColumn.OperationsPerSecond);
+            Add(new ParamsSummaryColumn());
+            Add(DefaultColumnProviders.Statistics, DefaultColumnProviders.Diagnosers, DefaultColumnProviders.Target);
+
+            // TODO: When upgrading to BDN 0.11.1, use Add(DefaultColumnProviders.Descriptor); 
+            // DefaultColumnProviders.Target is deprecated
+
+            Add(JitOptimizationsValidator.FailOnError);
+
+            Add(Job.InProcess
+                .With(RunStrategy.Throughput));
+
+            Add(MarkdownExporter.GitHub);
+
+            Add(new CsvExporter(
+                CsvSeparator.Comma,
+                new Reports.SummaryStyle
+                {
+                    PrintUnitsInHeader = true,
+                    PrintUnitsInContent = false,
+                    TimeUnit = Horology.TimeUnit.Microsecond,
+                    SizeUnit = SizeUnit.KB
+                }));
+        }
+    }
+}

src/libraries/Common/src/Extensions/BenchmarkRunner/DefaultCorePerfLabConfig.cs

@@ -0,0 +1,33 @@
+// 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 BenchmarkDotNet.Columns;
+using BenchmarkDotNet.Configs;
+using BenchmarkDotNet.Diagnosers;
+using BenchmarkDotNet.Engines;
+using BenchmarkDotNet.Exporters;
+using BenchmarkDotNet.Jobs;
+using BenchmarkDotNet.Loggers;
+using BenchmarkDotNet.Validators;
+
+namespace BenchmarkDotNet.Attributes
+{
+    internal class DefaultCoreProfileConfig : ManualConfig
+    {
+        public DefaultCoreProfileConfig()
+        {
+            Add(ConsoleLogger.Default);
+            Add(MarkdownExporter.GitHub);
+
+            Add(MemoryDiagnoser.Default);
+            Add(StatisticColumn.OperationsPerSecond);
+            Add(DefaultColumnProviders.Instance);
+
+            Add(JitOptimizationsValidator.FailOnError);
+
+            Add(Job.InProcess
+                .With(RunStrategy.Throughput));
+        }
+    }
+}