Merge branch 'dev' of https://github.com/aspnet-plus/AspNet.Plus.Logging into dev

codematrix · codematrix · commit 884d3dd6e62a · 2016-04-30T13:45:29.000-04:00
# Conflicts:
#	samples/LoggingReflectInsight/Console.ReflectInsightSample/Console.ReflectInsightSample.xproj
#	samples/LoggingReflectInsight/Console.ReflectInsightSample/Program.cs
#	samples/LoggingReflectInsight/Console.ReflectInsightSample/ReflectInsight.config
#	samples/LoggingReflectInsight/Console.ReflectInsightSample/project.json
diff --git a/samples/LoggingReflectInsight/Console.ReflectInsightSample/Program.cs b/samples/LoggingReflectInsight/Console.ReflectInsightSample/Program.cs
@@ -9,10 +9,17 @@
 
 namespace Console.ReflectInsightSample
 {
+    /// <summary>
+    /// 
+    /// </summary>
     public class Program
     {
         private static LoggerFactory _factory;
 
+        /// <summary>
+        /// Mains the specified arguments.
+        /// </summary>
+        /// <param name="args">The arguments.</param>
         public static void Main(string[] args)
         {
             _factory = new LoggerFactory();

Original file line number	Diff line number	Diff line change
`@@ -9,10 +9,17 @@`
`9`	`9`
`10`	`10`	`namespace Console.ReflectInsightSample`
`11`	`11`	`{`
	`12`	`+ /// <summary>`
	`13`	`+ ///`
	`14`	`+ /// </summary>`
`12`	`15`	`public class Program`
`13`	`16`	`{`
`14`	`17`	`private static LoggerFactory _factory;`
`15`	`18`
	`19`	`+ /// <summary>`
	`20`	`+ /// Mains the specified arguments.`
	`21`	`+ /// </summary>`
	`22`	`+ /// <param name="args">The arguments.</param>`
`16`	`23`	`public static void Main(string[] args)`
`17`	`24`	`{`
`18`	`25`	`_factory = new LoggerFactory();`