Added net45 target framework. Minor redundant code cleanup.

hhog-pkamburov · hhog-pkamburov · commit dcd739d0fbfc · 2015-10-20T14:35:03.000-04:00
diff --git a/samples/Sample/project.lock.json b/samples/Sample/project.lock.json
@@ -526,7 +526,7 @@
   },
   "libraries": {
     "Microsoft.CSharp/4.0.0-beta-23019": {
-      "sha512": "wp5SlNCIXAFqPbWMOAD8eedaPA1vPyBSh6P/OZUaSab4ogrFdElpHVoW+wTicbXLVJcvQwp1Jtk9xP5Slmq4EA==",
+      "sha512": "TsYR8ylpBw89cxCTzA9eD8wqLR5u4TnNvUCLU7Qt9TlbxmNM0jPaz80L4N+W81kEoOpchlckGGCTA4JVemmEVA==",
       "files": [
         "lib/dotnet/Microsoft.CSharp.dll",
         "lib/net45/_._",
@@ -613,7 +613,7 @@
       ]
     },
     "System.Collections/4.0.10-beta-23019": {
-      "sha512": "MHZUp2LFl6sc22mBNHgM1vN5cQcxdcqPuQ3xRThg1UOH+eZ3rJIk5Ja+mkMFOdAiMB626u0fQMNEdNfItRyWuw==",
+      "sha512": "76/FZ9wYhhU6wdNwrB3NiVJ5lpLZnLhS3dbLCOXOSf8NN3KXPrlcm5f2PUeHSJxgu5nP2H8lGLfshIaWq2qSNQ==",
       "files": [
         "lib/DNXCore50/System.Collections.dll",
         "lib/net46/_._",
@@ -669,7 +669,7 @@
       ]
     },
     "System.Console/4.0.0-beta-23019": {
-      "sha512": "RuoqqvFoPFtGJXb8+yigoz8EmNIUFfrMvb1Ea6uMJbhd5nqCRvzjyyWBaDJBRNhVOCPVQldhU4q2rG2W2IfXDQ==",
+      "sha512": "r2RvVIDjSRvY6ycAh3DtYD5gP7U6jbouTkPQvqUvxAx90pDNdT8zQMpE46rVvTJxzgytliIoJbWjnVww6jIpgg==",
       "files": [
         "lib/DNXCore50/System.Console.dll",
         "lib/net46/System.Console.dll",
@@ -737,7 +737,7 @@
       ]
     },
     "System.Dynamic.Runtime/4.0.0-beta-23019": {
-      "sha512": "N09LuTgPVDNxgUz+IZsX8j0nCzd7vBruIi/Qhjumy5vaaL3pKmKsPS1ZbyIrmwaHuP0GIfpNfdd3WAQWEf07Fw==",
+      "sha512": "WE/wuubmpzkmAh34gOHYvF+eJR9xUKSif2sB7CNZykWwtnVvSkd+nIjocduT88BXZZteW5LWD/M85EefFYc50A==",
       "files": [
         "lib/net45/_._",
         "lib/win8/_._",
@@ -808,7 +808,7 @@
       ]
     },
     "System.IO.FileSystem.Primitives/4.0.0-beta-23019": {
-      "sha512": "wGjn8X4EAnKEH4+uZ3CjiUCHW9WoXuWFNrzORmMhzvHpmxJUsiZkjvKhXGakclVlqMI+T4yn+MDwbrpC3TGofQ==",
+      "sha512": "XwoRwTvCrfCvNg1rIwfEZvKk0zqIaqP5F3+LFvKbCMzZtRBh5EUtd+oFk40XhfVytweJxMsrT/n8VaDOHqxvrQ==",
       "files": [
         "lib/dotnet/System.IO.FileSystem.Primitives.dll",
         "lib/net46/System.IO.FileSystem.Primitives.dll",
@@ -820,7 +820,7 @@
       ]
     },
     "System.Linq/4.0.0-beta-23019": {
-      "sha512": "jBHOkMRLTew/lr+awaPzEt5+rif4S7L9h/tY17unLaILq9P5muWVtsP2Tg/9YAJmHYoJDoCBKMpdGJ0hA5kqow==",
+      "sha512": "kw6QeVsZWOKdonnArSWFerSyXCsr2LmGqT9Z2W7HFf7yN09o6O8YLfIALlFnhD4CXgJZYC8ebgMPC6uK9IZfOQ==",
       "files": [
         "lib/dotnet/System.Linq.dll",
         "lib/net45/_._",
@@ -1203,7 +1203,7 @@
       ]
     },
     "System.Text.Encoding/4.0.10-beta-23019": {
-      "sha512": "NKMM7EowhH4JzVRNip0l8RZqMy934A98sLGUpddQslUus5N3Qsbg+mUTpGjd3X0ns2kASjmJFvvh5i8hh9qMMQ==",
+      "sha512": "sOenr4gxU9m8QSMLulpHqbYijO5vcpFS58//8XXhALF1ORf+REAXv7zJ/M0ppnHLBmRpRoq5Ysd/gq1IjDUZsw==",
       "files": [
         "lib/DNXCore50/System.Text.Encoding.dll",
         "lib/net46/_._",
@@ -1217,7 +1217,7 @@
       ]
     },
     "System.Text.Encoding.Extensions/4.0.10-beta-23019": {
-      "sha512": "LBtVrbFvCa0GAAT7z5m/w0dMSynoqPi+11C670me7+1tmW9rnj5O0DGTR9x1GgUgcqf1I+t5lGFyvrHO14++oQ==",
+      "sha512": "zzRxOB/C9/svL7yLXuTdn1WT5lnkCfblo4GyrrKEUCvEWEulrW+yRhWMmaRzMeRMzKOLsjyTAXdEBXTwRICG4Q==",
       "files": [
         "lib/DNXCore50/System.Text.Encoding.Extensions.dll",
         "lib/net46/_._",
@@ -1231,7 +1231,7 @@
       ]
     },
     "System.Threading/4.0.10-beta-23019": {
-      "sha512": "ss8p5o4C+f+rjpq0hxrcFsRXGUF+ojzjsW9MKfLrAqTuXhQywwDAPiTEvvEmDG8ptpwfQHWR09jlhcBNFhkG6w==",
+      "sha512": "xJYu7J22Fc4G7pfUlPBYuRj4Rla0VkaqU77SW2DyT/oMq1KQmmR7oQnQ7yq/yig0St17I7rYZYBbSrNbe1l5+g==",
       "files": [
         "lib/DNXCore50/System.Threading.dll",
         "lib/net46/_._",
diff --git a/src/Serilog.Framework.Logging/SerilogLogger.cs b/src/Serilog.Framework.Logging/SerilogLogger.cs
@@ -21,7 +21,7 @@ public SerilogLogger(
             ILogger logger = null,
             string name = null)
         {
-            if (provider == null) throw new ArgumentNullException("provider");
+            if (provider == null) throw new ArgumentNullException(nameof(provider));
             _provider = provider;
             _name = name;
             _logger = logger;
@@ -100,7 +100,7 @@ public void Log(LogLevel logLevel, int eventId, object state, Exception exceptio
 
             if (eventId != 0)
             {
-                logger = logger.ForContext("EventId", eventId, false);
+                logger = logger.ForContext("EventId", eventId);
             }
 
             logger.Write(level, exception, messageTemplate);
@@ -120,7 +120,6 @@ private LogEventLevel ConvertLevel(LogLevel logLevel)
                     return LogEventLevel.Information;
                 case LogLevel.Verbose:
                     return LogEventLevel.Debug;
-                case LogLevel.Debug:
                 default:
                     return LogEventLevel.Verbose;
             }
diff --git a/src/Serilog.Framework.Logging/SerilogLoggerProvider.cs b/src/Serilog.Framework.Logging/SerilogLoggerProvider.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-#if DNX451
+#if NET45 || DNX451
 using System.Runtime.Remoting;
 using System.Runtime.Remoting.Messaging;
 #else
@@ -33,7 +33,7 @@ public FrameworkLogger CreateLogger(string name)
 
         public IDisposable BeginScopeImpl(string name, object state)
         {
-            return new SerilogLoggerScope(this, CurrentScope, name, state);
+            return new SerilogLoggerScope(this, name, state);
         }
 
         public void Enrich(LogEvent logEvent, ILogEventPropertyFactory propertyFactory)
diff --git a/src/Serilog.Framework.Logging/SerilogLoggerScope.cs b/src/Serilog.Framework.Logging/SerilogLoggerScope.cs
@@ -2,18 +2,14 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-#if DNX451
-using System.Runtime.Remoting;
-using System.Runtime.Remoting.Messaging;
-#endif
 
 namespace Serilog.Framework.Logging
 {
     public class SerilogLoggerScope : IDisposable
     {
         private readonly SerilogLoggerProvider _provider;
 
-        public SerilogLoggerScope(SerilogLoggerProvider provider, SerilogLoggerScope parent, string name, object state)
+        public SerilogLoggerScope(SerilogLoggerProvider provider, string name, object state)
         {
             _provider = provider;
             Name = name;
@@ -23,7 +19,7 @@ public SerilogLoggerScope(SerilogLoggerProvider provider, SerilogLoggerScope par
             _provider.CurrentScope = this;
         }
 
-        public SerilogLoggerScope Parent { get; private set; }
+        public SerilogLoggerScope Parent { get; }
         public string Name { get; private set; }
         public object State { get; private set; }
 
@@ -38,7 +34,7 @@ public void RemoveScope()
             }
         }
 
-        private bool _disposedValue = false; // To detect redundant calls
+        private bool _disposedValue; // To detect redundant calls
 
         public void Dispose()
         {
diff --git a/src/Serilog.Framework.Logging/project.json b/src/Serilog.Framework.Logging/project.json
@@ -1,29 +1,34 @@
 ﻿{
-    "version": "1.0.0-beta7-*",
-    "description": "Serilog provider for Microsoft.Framework.Logging",
-    "authors": [ "Microsoft", "Serilog Contributors" ],
-    "tags": [ "serilog dnx" ],
-    "projectUrl": "https://github.com/serilog/serilog-framework-logging",
-    "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0",
+  "version": "1.0.0-beta7-*",
+  "description": "Serilog provider for Microsoft.Framework.Logging",
+  "authors": [ "Microsoft", "Serilog Contributors" ],
+  "tags": [ "serilog dnx" ],
+  "projectUrl": "https://github.com/serilog/serilog-framework-logging",
+  "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0",
 
-    "dependencies": {
-        "Serilog": "1.5.7",
-        "Microsoft.Framework.Logging.Abstractions": "1.0.0-beta7"
-    },
+  "dependencies": {
+    "Serilog": "1.5.7",
+    "Microsoft.Framework.Logging.Abstractions": "1.0.0-beta7"
+  },
 
-    "frameworks": {
-        "dnx451": {
-            "frameworkAssemblies": {
-                "System.Runtime": ""
-            }
-        },
-        "dnxcore50": {
-            "dependencies": {
-                "System.Collections": "4.0.10-beta-23019",
-                "System.Linq": "4.0.0-beta-23019",
-                "System.Threading": "4.0.10-beta-23019",
-                "Microsoft.CSharp": "4.0.0-beta-23019"
-            }
-        }
+  "frameworks": {
+    "net45": {
+      "frameworkAssemblies": {
+        "System.Runtime": ""
+      }
+    },
+    "dnx451": {
+      "frameworkAssemblies": {
+        "System.Runtime": ""
+      }
+    },
+    "dnxcore50": {
+      "dependencies": {
+        "System.Collections": "4.0.10-beta-23019",
+        "System.Linq": "4.0.0-beta-23019",
+        "System.Threading": "4.0.10-beta-23019",
+        "Microsoft.CSharp": "4.0.0-beta-23019"
+      }
     }
+  }
 }
diff --git a/src/Serilog.Framework.Logging/project.lock.json b/src/Serilog.Framework.Logging/project.lock.json
@@ -2,6 +2,32 @@
   "locked": false,
   "version": 1,
   "targets": {
+    ".NETFramework,Version=v4.5": {
+      "Microsoft.Framework.Logging.Abstractions/1.0.0-beta7": {
+        "frameworkAssemblies": [
+          "Microsoft.CSharp",
+          "mscorlib",
+          "System",
+          "System.Core"
+        ],
+        "compile": {
+          "lib/net45/Microsoft.Framework.Logging.Abstractions.dll": {}
+        },
+        "runtime": {
+          "lib/net45/Microsoft.Framework.Logging.Abstractions.dll": {}
+        }
+      },
+      "Serilog/1.5.7": {
+        "compile": {
+          "lib/net45/Serilog.dll": {},
+          "lib/net45/Serilog.FullNetFx.dll": {}
+        },
+        "runtime": {
+          "lib/net45/Serilog.dll": {},
+          "lib/net45/Serilog.FullNetFx.dll": {}
+        }
+      }
+    },
     "DNX,Version=v4.5.1": {
       "Microsoft.Framework.Logging.Abstractions/1.0.0-beta7": {
         "frameworkAssemblies": [
@@ -355,7 +381,7 @@
   },
   "libraries": {
     "Microsoft.CSharp/4.0.0-beta-23019": {
-      "sha512": "wp5SlNCIXAFqPbWMOAD8eedaPA1vPyBSh6P/OZUaSab4ogrFdElpHVoW+wTicbXLVJcvQwp1Jtk9xP5Slmq4EA==",
+      "sha512": "TsYR8ylpBw89cxCTzA9eD8wqLR5u4TnNvUCLU7Qt9TlbxmNM0jPaz80L4N+W81kEoOpchlckGGCTA4JVemmEVA==",
       "files": [
         "lib/dotnet/Microsoft.CSharp.dll",
         "lib/net45/_._",
@@ -410,7 +436,7 @@
       ]
     },
     "System.Collections/4.0.10-beta-23019": {
-      "sha512": "MHZUp2LFl6sc22mBNHgM1vN5cQcxdcqPuQ3xRThg1UOH+eZ3rJIk5Ja+mkMFOdAiMB626u0fQMNEdNfItRyWuw==",
+      "sha512": "76/FZ9wYhhU6wdNwrB3NiVJ5lpLZnLhS3dbLCOXOSf8NN3KXPrlcm5f2PUeHSJxgu5nP2H8lGLfshIaWq2qSNQ==",
       "files": [
         "lib/DNXCore50/System.Collections.dll",
         "lib/net46/_._",
@@ -511,7 +537,7 @@
       ]
     },
     "System.Dynamic.Runtime/4.0.0-beta-23019": {
-      "sha512": "N09LuTgPVDNxgUz+IZsX8j0nCzd7vBruIi/Qhjumy5vaaL3pKmKsPS1ZbyIrmwaHuP0GIfpNfdd3WAQWEf07Fw==",
+      "sha512": "WE/wuubmpzkmAh34gOHYvF+eJR9xUKSif2sB7CNZykWwtnVvSkd+nIjocduT88BXZZteW5LWD/M85EefFYc50A==",
       "files": [
         "lib/net45/_._",
         "lib/win8/_._",
@@ -596,7 +622,7 @@
       ]
     },
     "System.Linq/4.0.0-beta-23019": {
-      "sha512": "jBHOkMRLTew/lr+awaPzEt5+rif4S7L9h/tY17unLaILq9P5muWVtsP2Tg/9YAJmHYoJDoCBKMpdGJ0hA5kqow==",
+      "sha512": "kw6QeVsZWOKdonnArSWFerSyXCsr2LmGqT9Z2W7HFf7yN09o6O8YLfIALlFnhD4CXgJZYC8ebgMPC6uK9IZfOQ==",
       "files": [
         "lib/dotnet/System.Linq.dll",
         "lib/net45/_._",
@@ -612,7 +638,7 @@
       ]
     },
     "System.Linq.Expressions/4.0.0-beta-23019": {
-      "sha512": "F+gr9tKGrIZo11f3RpfOXuoSU7dUZfnNmkDeYKgHSIG4Q4knnUhIHcbRlS+5vUbeBYsUXMMQWMryEiOOG3kJLw==",
+      "sha512": "2YDSiXCOPONzEA/8fMN089faDfOiKfntYnodryL5sFskdszIbg3E9pMXKBMuclHx6g2ceBkOuZy/M5FYmq3YMg==",
       "files": [
         "lib/net45/_._",
         "lib/win8/_._",
@@ -627,7 +653,7 @@
       ]
     },
     "System.ObjectModel/4.0.10-beta-23019": {
-      "sha512": "sJ+7kgWoTs4d8eNlhJB/p1Uq2iWHYVxO7ALNpB3sTwh3LORqwwPZe5FbSweccA3seM+zLSYa2AqBGp69JOXbcA==",
+      "sha512": "xG9aUQ0QLcA1uJdiEZmkAuXnMg7/cZB9fc8S+zgNTkbfOdjXMITcmmT9RTMkNrTQBO7rjLMZAMMDvihxi3Htiw==",
       "files": [
         "lib/dotnet/System.ObjectModel.dll",
         "lib/net46/_._",
@@ -676,7 +702,7 @@
       ]
     },
     "System.Reflection.Extensions/4.0.0-beta-23019": {
-      "sha512": "fU02uzgKfO6lAUxR2eRHo6+JQ3/HqRi4zr38uOnieKtqV2dl8Cs2354gwYrjIxgxhkO1zLo70021P1cbpL7UIA==",
+      "sha512": "1Ny4GnVyN8O7ZG3m3xfcLJXnieO1u1zafLEW70gBlvAnkCKF2jbU5y/R+01gYtw4ThaXRdfY1mNTit0EioAMZg==",
       "files": [
         "lib/DNXCore50/System.Reflection.Extensions.dll",
         "lib/net45/_._",
@@ -726,7 +752,7 @@
       ]
     },
     "System.Reflection.TypeExtensions/4.0.0-beta-23019": {
-      "sha512": "5/WcPvsdnw0d8rwwsCgQKoo9oXFQA1gMHtyNcYjelDjaaYC/dYoU7Eo0JdP+0PMgy9FnBOHVjRHOTcJ2HIjefA==",
+      "sha512": "X4cQwPMccI/zW0HXlCXXn4vKdIme5jTKA+DYapZlAeyce1rUxwfNMZbfwW+ccjBzJ5v9PvjYwDrBptU+oXPphA==",
       "files": [
         "lib/DNXCore50/System.Reflection.TypeExtensions.dll",
         "lib/net46/System.Reflection.TypeExtensions.dll",
@@ -922,7 +948,7 @@
       ]
     },
     "System.Threading/4.0.10-beta-23019": {
-      "sha512": "ss8p5o4C+f+rjpq0hxrcFsRXGUF+ojzjsW9MKfLrAqTuXhQywwDAPiTEvvEmDG8ptpwfQHWR09jlhcBNFhkG6w==",
+      "sha512": "xJYu7J22Fc4G7pfUlPBYuRj4Rla0VkaqU77SW2DyT/oMq1KQmmR7oQnQ7yq/yig0St17I7rYZYBbSrNbe1l5+g==",
       "files": [
         "lib/DNXCore50/System.Threading.dll",
         "lib/net46/_._",
@@ -974,6 +1000,9 @@
       "Serilog >= 1.5.7",
       "Microsoft.Framework.Logging.Abstractions >= 1.0.0-beta7"
     ],
+    ".NETFramework,Version=v4.5": [
+      "fx/System.Runtime "
+    ],
     "DNX,Version=v4.5.1": [
       "fx/System.Runtime "
     ],

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public SerilogLogger(`
`21`	`21`	`ILogger logger = null,`
`22`	`22`	`string name = null)`
`23`	`23`	`{`
`24`		`- if (provider == null) throw new ArgumentNullException("provider");`
	`24`	`+ if (provider == null) throw new ArgumentNullException(nameof(provider));`
`25`	`25`	`_provider = provider;`
`26`	`26`	`_name = name;`
`27`	`27`	`_logger = logger;`
`@@ -100,7 +100,7 @@ public void Log(LogLevel logLevel, int eventId, object state, Exception exceptio`
`100`	`100`
`101`	`101`	`if (eventId != 0)`
`102`	`102`	`{`
`103`		`- logger = logger.ForContext("EventId", eventId, false);`
	`103`	`+ logger = logger.ForContext("EventId", eventId);`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`logger.Write(level, exception, messageTemplate);`
`@@ -120,7 +120,6 @@ private LogEventLevel ConvertLevel(LogLevel logLevel)`
`120`	`120`	`return LogEventLevel.Information;`
`121`	`121`	`case LogLevel.Verbose:`
`122`	`122`	`return LogEventLevel.Debug;`
`123`		`- case LogLevel.Debug:`
`124`	`123`	`default:`
`125`	`124`	`return LogEventLevel.Verbose;`
`126`	`125`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.`
`3`	`3`
`4`	`4`	`using System;`
`5`		`-#if DNX451`
	`5`	`+#if NET45 \|\| DNX451`
`6`	`6`	`using System.Runtime.Remoting;`
`7`	`7`	`using System.Runtime.Remoting.Messaging;`
`8`	`8`	`#else`
`@@ -33,7 +33,7 @@ public FrameworkLogger CreateLogger(string name)`
`33`	`33`
`34`	`34`	`public IDisposable BeginScopeImpl(string name, object state)`
`35`	`35`	`{`
`36`		`- return new SerilogLoggerScope(this, CurrentScope, name, state);`
	`36`	`+ return new SerilogLoggerScope(this, name, state);`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`public void Enrich(LogEvent logEvent, ILogEventPropertyFactory propertyFactory)`
Original file line number	Diff line number	Diff line change
`@@ -2,18 +2,14 @@`
`2`	`2`	`// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.`
`3`	`3`
`4`	`4`	`using System;`
`5`		`-#if DNX451`
`6`		`-using System.Runtime.Remoting;`
`7`		`-using System.Runtime.Remoting.Messaging;`
`8`		`-#endif`
`9`	`5`
`10`	`6`	`namespace Serilog.Framework.Logging`
`11`	`7`	`{`
`12`	`8`	`public class SerilogLoggerScope : IDisposable`
`13`	`9`	`{`
`14`	`10`	`private readonly SerilogLoggerProvider _provider;`
`15`	`11`
`16`		`- public SerilogLoggerScope(SerilogLoggerProvider provider, SerilogLoggerScope parent, string name, object state)`
	`12`	`+ public SerilogLoggerScope(SerilogLoggerProvider provider, string name, object state)`
`17`	`13`	`{`
`18`	`14`	`_provider = provider;`
`19`	`15`	`Name = name;`
`@@ -23,7 +19,7 @@ public SerilogLoggerScope(SerilogLoggerProvider provider, SerilogLoggerScope par`
`23`	`19`	`_provider.CurrentScope = this;`
`24`	`20`	`}`
`25`	`21`
`26`		`- public SerilogLoggerScope Parent { get; private set; }`
	`22`	`+ public SerilogLoggerScope Parent { get; }`
`27`	`23`	`public string Name { get; private set; }`
`28`	`24`	`public object State { get; private set; }`
`29`	`25`
`@@ -38,7 +34,7 @@ public void RemoveScope()`
`38`	`34`	`}`
`39`	`35`	`}`
`40`	`36`
`41`		`- private bool _disposedValue = false; // To detect redundant calls`
	`37`	`+ private bool _disposedValue; // To detect redundant calls`
`42`	`38`
`43`	`39`	`public void Dispose()`
`44`	`40`	`{`