diff --git a/src/libraries/Common/src/Extensions/ProviderAliasUtilities/ProviderAliasUtilities.cs b/src/libraries/Common/src/Extensions/ProviderAliasUtilities/ProviderAliasUtilities.cs index 7256313e68eeea..65bd2ca0b3ab90 100644 --- a/src/libraries/Common/src/Extensions/ProviderAliasUtilities/ProviderAliasUtilities.cs +++ b/src/libraries/Common/src/Extensions/ProviderAliasUtilities/ProviderAliasUtilities.cs @@ -10,7 +10,7 @@ namespace Microsoft.Extensions.Logging { internal static class ProviderAliasUtilities { - private const string AliasAttributeTypeFullName = "Microsoft.Extensions.Logging.ProviderAliasAttribute"; + private static readonly string AliasAttributeTypeFullName = typeof(ProviderAliasAttribute).FullName!; internal static string? GetAlias(Type providerType) { diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/ref/Microsoft.Extensions.Logging.Abstractions.cs b/src/libraries/Microsoft.Extensions.Logging.Abstractions/ref/Microsoft.Extensions.Logging.Abstractions.cs index c924efd9d2e02d..4e973443ef8257 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/ref/Microsoft.Extensions.Logging.Abstractions.cs +++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/ref/Microsoft.Extensions.Logging.Abstractions.cs @@ -155,6 +155,12 @@ public enum LogLevel Critical = 5, None = 6, } + [System.AttributeUsageAttribute(System.AttributeTargets.Class, AllowMultiple = false, Inherited = false)] + public partial class ProviderAliasAttribute : System.Attribute + { + public ProviderAliasAttribute(string alias) { } + public string Alias { get { throw null; } } + } } namespace Microsoft.Extensions.Logging.Abstractions { diff --git a/src/libraries/Microsoft.Extensions.Logging/src/ProviderAliasAttribute.cs b/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/ProviderAliasAttribute.cs similarity index 100% rename from src/libraries/Microsoft.Extensions.Logging/src/ProviderAliasAttribute.cs rename to src/libraries/Microsoft.Extensions.Logging.Abstractions/src/ProviderAliasAttribute.cs diff --git a/src/libraries/Microsoft.Extensions.Logging/ref/Microsoft.Extensions.Logging.Forwards.cs b/src/libraries/Microsoft.Extensions.Logging/ref/Microsoft.Extensions.Logging.Forwards.cs index 326ba6ebe3805c..ac715dab79067f 100644 --- a/src/libraries/Microsoft.Extensions.Logging/ref/Microsoft.Extensions.Logging.Forwards.cs +++ b/src/libraries/Microsoft.Extensions.Logging/ref/Microsoft.Extensions.Logging.Forwards.cs @@ -5,3 +5,4 @@ // ------------------------------------------------------------------------------ [assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(Microsoft.Extensions.Logging.ILoggingBuilder))] +[assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(Microsoft.Extensions.Logging.ProviderAliasAttribute))] diff --git a/src/libraries/Microsoft.Extensions.Logging/ref/Microsoft.Extensions.Logging.cs b/src/libraries/Microsoft.Extensions.Logging/ref/Microsoft.Extensions.Logging.cs index 966ed8922d0c78..d9ebf8f205cff6 100644 --- a/src/libraries/Microsoft.Extensions.Logging/ref/Microsoft.Extensions.Logging.cs +++ b/src/libraries/Microsoft.Extensions.Logging/ref/Microsoft.Extensions.Logging.cs @@ -89,10 +89,4 @@ public static partial class LoggingBuilderExtensions public static Microsoft.Extensions.Logging.ILoggingBuilder Configure(this Microsoft.Extensions.Logging.ILoggingBuilder builder, System.Action action) { throw null; } public static Microsoft.Extensions.Logging.ILoggingBuilder SetMinimumLevel(this Microsoft.Extensions.Logging.ILoggingBuilder builder, Microsoft.Extensions.Logging.LogLevel level) { throw null; } } - [System.AttributeUsageAttribute(System.AttributeTargets.Class, AllowMultiple=false, Inherited=false)] - public partial class ProviderAliasAttribute : System.Attribute - { - public ProviderAliasAttribute(string alias) { } - public string Alias { get { throw null; } } - } } diff --git a/src/libraries/Microsoft.Extensions.Logging/src/Properties/TypeForwards.cs b/src/libraries/Microsoft.Extensions.Logging/src/Properties/TypeForwards.cs index a075b0e477ccc6..659dd4ee6ca2f5 100644 --- a/src/libraries/Microsoft.Extensions.Logging/src/Properties/TypeForwards.cs +++ b/src/libraries/Microsoft.Extensions.Logging/src/Properties/TypeForwards.cs @@ -2,3 +2,4 @@ // The .NET Foundation licenses this file to you under the MIT license. [assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(Microsoft.Extensions.Logging.ILoggingBuilder))] +[assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(Microsoft.Extensions.Logging.ProviderAliasAttribute))] diff --git a/src/libraries/Microsoft.Extensions.Logging/tests/Common/ProviderAliasAttribute.cs b/src/libraries/Microsoft.Extensions.Logging/tests/Common/ProviderAliasAttribute.cs deleted file mode 100644 index 2ffd0ed5bd93e7..00000000000000 --- a/src/libraries/Microsoft.Extensions.Logging/tests/Common/ProviderAliasAttribute.cs +++ /dev/null @@ -1,21 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. - -using System; - -namespace Microsoft.Extensions.Logging -{ - /// - /// Test implementation of ProviderAliasAttribute - /// - [AttributeUsage(AttributeTargets.Class)] - public class ProviderAliasAttribute : Attribute - { - public ProviderAliasAttribute(string alias) - { - Alias = alias; - } - - public string Alias { get; } - } -}