Squashed commit of the following:

commit 05501d0
Author: David Fowler <[email protected]>
Date:   Fri Mar 25 02:27:23 2016 -0700

    Fixed build

commit 213f4ec
Author: BrennanConroy <[email protected]>
Date:   Wed Mar 23 14:57:22 2016 -0700

    Add missing tests from DNX451 -> NET451 rename

commit ad487c7
Author: BrennanConroy <[email protected]>
Date:   Wed Mar 23 14:02:34 2016 -0700

    Fix overload of Debug.WriteLine we are using

commit 1f2c413
Author: Pranav K <[email protected]>
Date:   Tue Mar 22 09:40:22 2016 -0700

    Revert "Revert "Reacting to CoreCLR package changes""

    This reverts commit a63a9d0.

commit c6bfb21
Author: Arthur Vickers <[email protected]>
Date:   Fri Mar 11 09:51:45 2016 -0800

    Return IServiceCollection from AddLogging so that additional calls can be chained

    Previously the AddLogging method did this. It is also common in other builder methods like this. It doesn't do any harm for those that don't want to chain and allows cleaner code with fewer variable declarations for those that do.

    More details:
    We often write code like this:
    ```C#\
    var appServiceProivder = new ServiceCollection()
        .AddLogging()
        .AddCaching()
        .BuildServiceProvider();
    ```
    This is really clean and easy to read. When we are no longer able to chain we have to write this instead:
    ```C#
    var serviceCollection = new ServiceCollection();
    serviceCollection.AddLogging();
    serviceCollection.AddCaching();
    var appServiceProivder = serviceCollection.BuildServiceProvider();
    ```
    This additional clutter detracts from the overall readability of the code.

    Furthermore, the benefits of this kind of pattern are cascading. For example, it lets us use expression body syntax to again create very clear, very readable code:
    ```C#
    protected virtual void ConfigureServices([NotNull] IServiceCollection services)
        => services
            .AddSingleton<CSharpHelper>()
            .AddSingleton<CSharpMigrationOperationGenerator>()
            .AddSingleton<CSharpSnapshotGenerator>()
            .AddSingleton<MigrationsCodeGenerator, CSharpMigrationsGenerator>()
            .AddScaffolding()
            .AddLogging();
    ```
    This was the reason when these methods where designed a couple of years ago they allowed chaining. I'm not sure why we think this is no longer relevant. Also, returning the service collection as opposed to void doesn't force anybody to use chaining if they don't want to, so what is the downside?

commit a63a9d0
Author: ryanbrandenburg <[email protected]>
Date:   Mon Mar 21 11:16:29 2016 -0700

    Revert "Reacting to CoreCLR package changes"

    This reverts commit b4b1129.

commit b4b1129
Author: Pranav K <[email protected]>
Date:   Sat Mar 19 10:34:45 2016 -0700

    Reacting to CoreCLR package changes

Author: Oleksii Ruban

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

@@ -2,8 +2,6 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
 using System.Text;
 using Microsoft.Extensions.Logging.Console.Internal;
 using Microsoft.Extensions.PlatformAbstractions;

src/Microsoft.Extensions.Logging.Console/project.json

@@ -29,7 +29,8 @@
     },
     "netstandard1.3": {
       "dependencies": {
-        "System.Console": "4.0.0-*"
+        "System.Console": "4.0.0-*",
+        "System.Threading": "4.0.11-*"
       },
       "imports": [
         "dotnet5.4"

src/Microsoft.Extensions.Logging.Debug/DebugLogger.debug.cs

@@ -12,7 +12,7 @@ public partial class DebugLogger
     {
         private void DebugWriteLine(string message, string name)
         {
-            System.Diagnostics.Debug.WriteLine(message, name);
+            System.Diagnostics.Debug.WriteLine(message, category: name);
         }
     }
 }

src/Microsoft.Extensions.Logging.Debug/project.json

@@ -20,12 +20,17 @@
     "Microsoft.Extensions.Logging.Abstractions": "1.0.0-*"
   },
   "frameworks": {
-    "netstandard1.1": {
+    "net451": {
+      "frameworkAssemblies": {
+        "System.Runtime": { "type": "build" }
+      }
+    },
+    "netstandard1.3": {
       "dependencies": {
         "System.Diagnostics.Debug": "4.0.11-*"
       },
       "imports": [
-        "dotnet5.2"
+        "dotnet5.4"
       ]
     }
   }

src/Microsoft.Extensions.Logging/LoggingServiceCollectionExtensions.cs

@@ -16,7 +16,8 @@ public static class LoggingServiceCollectionExtensions
         /// Adds logging services to the specified <see cref="IServiceCollection" />.
         /// </summary>
         /// <param name="services">The <see cref="IServiceCollection" /> to add services to.</param>
-        public static void AddLogging(this IServiceCollection services)
+        /// <returns>The <see cref="IServiceCollection"/> so that additional calls can be chained.</returns>
+        public static IServiceCollection AddLogging(this IServiceCollection services)
         {
             if (services == null)
             {
@@ -25,6 +26,8 @@ public static void AddLogging(this IServiceCollection services)
 
             services.TryAdd(ServiceDescriptor.Singleton<ILoggerFactory, LoggerFactory>());
             services.TryAdd(ServiceDescriptor.Singleton(typeof(ILogger<>), typeof(Logger<>)));
+
+            return services;
         }
     }
 }

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

@@ -1,6 +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 System;
 using Microsoft.Extensions.Logging.Debug;
 using Xunit;
 
@@ -36,5 +37,16 @@ public void CallingBeginScopeOnLogger_ReturnsNonNullableInstance()
             // Assert
             Assert.NotNull(disposable);
         }
+
+        [Fact]
+        public void CallingLogWithCurlyBracesAfterFormatter_DoesNotThrow()
+        {
+            // Arrange
+            var logger = new DebugLogger("Test");
+            var message = "{test string}";
+
+            // Act
+            logger.Log(LogLevel.Debug, 0, message, null, (s, e) => s);
+        }
     }
 }

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

@@ -1,7 +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.
 
-#if DNX451
+#if NET451
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;

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

@@ -0,0 +1,19 @@
+// 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.DependencyInjection;
+using Xunit;
+
+namespace Microsoft.Extensions.Logging.Test
+{
+    public class LoggingServiceCollectionExtensionsTest
+    {
+        [Fact]
+        public void AddLogging_allows_chaining()
+        {
+            var services = new ServiceCollection();
+
+            Assert.Same(services, services.AddLogging());
+        }
+    }
+}

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

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-#if DNX451
+#if NET451
 using System.Diagnostics;
 using Microsoft.Extensions.Logging.TraceSource;
 using Xunit;
@@ -17,13 +17,13 @@ public void Dispose_TraceListenerIsFlushedOnce()
             var testSwitch = new SourceSwitch("TestSwitch", "Level will be set to warning for this test");
             testSwitch.Level = SourceLevels.Warning;
             var listener = new BufferedConsoleTraceListener();
-            
+
             TraceSourceLoggerProvider provider = new TraceSourceLoggerProvider(testSwitch, listener);
             var logger1 = provider.CreateLogger("FirstLogger");
             var logger2 = provider.CreateLogger("SecondLogger");
             logger1.LogError("message1");
             logger2.LogError("message2");
-            
+
             // Act
             provider.Dispose();
 

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

@@ -1,7 +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.
 
-#if DNX451
+#if NET451
 using System.Diagnostics;
 using Xunit;
 

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

@@ -8,15 +8,15 @@ namespace Microsoft.Extensions.Logging.Test
 {
     public class TraceSourceScopeTest
     {
-#if DNX451
+#if NET451
         [Fact]
         public static void DiagnosticsScope_PushesAndPops_LogicalOperationStack()
         {
             // Arrange
             var baseState = "base";
             Trace.CorrelationManager.StartLogicalOperation(baseState);
             var state = "1337state7331";
-            
+
             var factory = new LoggerFactory();
             var logger = factory.CreateLogger("Test");
             factory.AddTraceSource(new SourceSwitch("TestSwitch"), new ConsoleTraceListener());

test/Microsoft.Extensions.Logging.Test/project.json

@@ -4,6 +4,7 @@
   },
   "dependencies": {
     "Microsoft.AspNetCore.Testing": "1.0.0-*",
+    "Microsoft.Extensions.DependencyInjection": "1.0.0-*",
     "Microsoft.Extensions.Logging": "1.0.0-*",
     "Microsoft.Extensions.Logging.Console": "1.0.0-*",
     "Microsoft.Extensions.Logging.Debug": "1.0.0-*",
@@ -18,7 +19,8 @@
         "portable-net451+win8"
       ],
       "dependencies": {
-        "Microsoft.NETCore.Platforms": "1.0.1-*",
+        "NETStandard.Library": "1.5.0-*",
+        "System.Diagnostics.Process": "4.1.0-*",
         "moq.netcore": "4.4.0-beta8",
         "dotnet-test-xunit": "1.0.0-dev-*"
       }

test/Microsoft.Extensions.Logging.Testing.Tests/project.json

@@ -15,7 +15,8 @@
         "portable-net451+win8"
       ],
       "dependencies": {
-        "Microsoft.NETCore.Platforms": "1.0.1-*",
+        "NETStandard.Library": "1.5.0-*",
+        "System.Diagnostics.Process": "4.1.0-*",
         "dotnet-test-xunit": "1.0.0-dev-*"
       }
     },