Add Microsoft.Extensions.Logging.Configuration

Logging.sln

@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26413.2
+VisualStudioVersion = 15.0.26510.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Extensions.Logging", "src\Microsoft.Extensions.Logging\Microsoft.Extensions.Logging.csproj", "{19D1B6C5-8A62-4387-8816-C54874D1DF5F}"
 EndProject
@@ -43,6 +43,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{C3F6BF54
 		build\Key.snk = build\Key.snk
 	EndProjectSection
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Configuration", "src\Microsoft.Extensions.Logging.Configuration\Microsoft.Extensions.Logging.Configuration.csproj", "{6D921637-507E-4CDC-8C5F-C3D6B62D118C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -211,6 +213,18 @@ Global
 		{B4A43221-DE95-47BB-A2D4-2DC761FC9419}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{B4A43221-DE95-47BB-A2D4-2DC761FC9419}.Release|x86.ActiveCfg = Release|Any CPU
 		{B4A43221-DE95-47BB-A2D4-2DC761FC9419}.Release|x86.Build.0 = Release|Any CPU
+		{6D921637-507E-4CDC-8C5F-C3D6B62D118C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6D921637-507E-4CDC-8C5F-C3D6B62D118C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6D921637-507E-4CDC-8C5F-C3D6B62D118C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6D921637-507E-4CDC-8C5F-C3D6B62D118C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6D921637-507E-4CDC-8C5F-C3D6B62D118C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6D921637-507E-4CDC-8C5F-C3D6B62D118C}.Debug|x86.Build.0 = Debug|Any CPU
+		{6D921637-507E-4CDC-8C5F-C3D6B62D118C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6D921637-507E-4CDC-8C5F-C3D6B62D118C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6D921637-507E-4CDC-8C5F-C3D6B62D118C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{6D921637-507E-4CDC-8C5F-C3D6B62D118C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{6D921637-507E-4CDC-8C5F-C3D6B62D118C}.Release|x86.ActiveCfg = Release|Any CPU
+		{6D921637-507E-4CDC-8C5F-C3D6B62D118C}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -230,5 +244,6 @@ Global
 		{F3B898C3-D441-4207-A92B-420D6E73CA5D} = {09920C51-6220-4D8D-94DC-E70C13446187}
 		{854133D5-6252-4A0A-B682-BDBB83B62AE6} = {699DB330-0095-4266-B7B0-3EAB3710CA49}
 		{B4A43221-DE95-47BB-A2D4-2DC761FC9419} = {09920C51-6220-4D8D-94DC-E70C13446187}
+		{6D921637-507E-4CDC-8C5F-C3D6B62D118C} = {699DB330-0095-4266-B7B0-3EAB3710CA49}
 	EndGlobalSection
 EndGlobal

samples/SampleApp/SampleApp.csproj

@@ -12,7 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Microsoft.Extensions.Logging\Microsoft.Extensions.Logging.csproj" />
+    <ProjectReference Include="..\..\src\Microsoft.Extensions.Logging.Configuration\Microsoft.Extensions.Logging.Configuration.csproj" />
     <ProjectReference Include="..\..\src\Microsoft.Extensions.Logging.Console\Microsoft.Extensions.Logging.Console.csproj" />
   </ItemGroup>
 

src/Microsoft.Extensions.Logging.Configuration/LoggingBuilderExtensions.cs

@@ -0,0 +1,23 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.Extensions.Logging
+{
+    /// <summary>
+    /// Extension methods for setting up logging services in an <see cref="ILoggingBuilder" />.
+    /// </summary>
+    public static class LoggingBuilderExtensions
+    {
+        public static ILoggingBuilder AddConfiguration(this ILoggingBuilder builder, IConfiguration configuration)
+        {
+            builder.Services.AddSingleton<IConfigureOptions<LoggerFilterOptions>>(new LoggerFilterConfigureOptions(configuration));
+            builder.Services.AddSingleton<IOptionsChangeTokenSource<LoggerFilterOptions>>(new ConfigurationChangeTokenSource<LoggerFilterOptions>(configuration));
+
+            return builder;
+        }
+    }
+}

src/Microsoft.Extensions.Logging.Configuration/Microsoft.Extensions.Logging.Configuration.csproj

@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <Import Project="..\..\build\common.props" />
+
+  <PropertyGroup>
+    <Description>Configuration support for Microsoft.Extensions.Logging.</Description>
+    <TargetFramework>netstandard1.1</TargetFramework>
+    <NoWarn>$(NoWarn);CS1591</NoWarn>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <PackageTags>logging</PackageTags>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.Extensions.Logging\Microsoft.Extensions.Logging.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="$(AspNetCoreVersion)" />
+  </ItemGroup>
+
+</Project>

src/Microsoft.Extensions.Logging.Console/ConsoleLoggerFactoryExtensions.cs

@@ -39,24 +39,6 @@ public static ILoggingBuilder AddConsole(this ILoggingBuilder builder, Action<Co
             return builder;
         }
 
-        /// <summary>
-        /// Adds a console logger named 'Console' to the factory.
-        /// </summary>
-        /// <param name="builder">The <see cref="ILoggingBuilder"/> to use.</param>
-        /// <param name="configuration"></param>
-        public static ILoggingBuilder AddConsole(this ILoggingBuilder builder, IConfiguration configuration)
-        {
-            if (configuration == null)
-            {
-                throw new ArgumentNullException(nameof(configuration));
-            }
-
-            builder.AddConsole();
-            builder.Services.Configure<ConsoleLoggerOptions>(configuration);
-
-            return builder;
-        }
-
         /// <summary>
         /// Adds a console logger that is enabled for <see cref="LogLevel"/>.Information or higher.
         /// </summary>

src/Microsoft.Extensions.Logging/LoggingBuilderExtensions.cs

@@ -1,9 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Options;
 
 namespace Microsoft.Extensions.Logging
@@ -13,14 +11,6 @@ namespace Microsoft.Extensions.Logging
     /// </summary>
     public static class LoggingBuilderExtensions
     {
-        public static ILoggingBuilder AddConfiguration(this ILoggingBuilder builder, IConfiguration configuration)
-        {
-            builder.Services.AddSingleton<IConfigureOptions<LoggerFilterOptions>>(new LoggerFilterConfigureOptions(configuration));
-            builder.Services.AddSingleton<IOptionsChangeTokenSource<LoggerFilterOptions>>(new ConfigurationChangeTokenSource<LoggerFilterOptions>(configuration));
-
-            return builder;
-        }
-
         public static ILoggingBuilder SetMinimumLevel(this ILoggingBuilder builder, LogLevel level)
         {
             builder.Services.Add(ServiceDescriptor.Singleton<IConfigureOptions<LoggerFilterOptions>>(

src/Microsoft.Extensions.Logging/Microsoft.Extensions.Logging.csproj

@@ -15,10 +15,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="$(AspNetCoreVersion)" />
   </ItemGroup>
 
 </Project>

test/Microsoft.Extensions.Logging.Test/LoggerFilterTest.cs

@@ -423,7 +423,18 @@ public void FilterTest(LoggerFilterOptions options, (string category, LogLevel l
         public static TheoryData<LoggerFilterOptions, (string, LogLevel, bool, bool)> FilterTestData =
             new TheoryData<LoggerFilterOptions, (string, LogLevel, bool, bool)>()
             {
-                { // Provider specific rule if preferred
+                {
+                    new LoggerFilterOptions()
+                    {
+                        Rules =
+                        {
+                            new LoggerFilterRule(typeof(TestLoggerProvider).FullName, "System", LogLevel.Information, null),
+                            new LoggerFilterRule(null, "Microsoft", LogLevel.Trace, null)
+                        }
+                    },
+                    ("Microsoft", LogLevel.Debug, true, true)
+                },
+                {  // Provider specific rule if preferred
                     new LoggerFilterOptions()
                     {
                         Rules =

test/Microsoft.Extensions.Logging.Test/Microsoft.Extensions.Logging.Test.csproj

@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Microsoft.Extensions.Logging\Microsoft.Extensions.Logging.csproj" />
+    <ProjectReference Include="..\..\src\Microsoft.Extensions.Logging.Configuration\Microsoft.Extensions.Logging.Configuration.csproj" />
     <ProjectReference Include="..\..\src\Microsoft.Extensions.Logging.Console\Microsoft.Extensions.Logging.Console.csproj" />
     <ProjectReference Include="..\..\src\Microsoft.Extensions.Logging.Debug\Microsoft.Extensions.Logging.Debug.csproj" />
     <ProjectReference Include="..\..\src\Microsoft.Extensions.Logging.Testing\Microsoft.Extensions.Logging.Testing.csproj" />