Merge branch 'custom-column-names' into localdb-tests

Author: Colin Young

src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/ColumnOptions.cs

@@ -68,30 +68,36 @@ public ICollection<StandardColumn> Store
         /// </summary>
         public ICollection<DataColumn> AdditionalDataColumns { get; set; }
 
-        /// Options for the Exception column.
+        /// <summary>
+        ///     Options for the Id column.
         /// </summary>
-        public ExceptionColumnOptions Exception { get; set; }
+        public IdColumnOptions Id { get; private set; }
 
         /// <summary>
-        /// Options for the MessageTemplate column.
+        ///     Options for the Level column.
         /// </summary>
-        public MessageTemplateColumnOptions MessageTemplate { get; set; }
+        public LevelColumnOptions Level { get; private set; }
 
         /// <summary>
-        /// Options for the Message column.
+        ///     Options for the Properties column.
         /// </summary>
-        public MessageColumnOptions Message { get; set; }
+        public PropertiesColumnOptions Properties { get; private set; }
 
         /// <summary>
-        ///     Options for the Level column.
+        /// Options for the Exception column.
         /// </summary>
-        public LevelColumnOptions Level { get; private set; }
+        public ExceptionColumnOptions Exception { get; set; }
 
         /// <summary>
-        ///     Options for the Properties column.
+        /// Options for the MessageTemplate column.
         /// </summary>
-        public PropertiesColumnOptions Properties { get; private set; }
+        public MessageTemplateColumnOptions MessageTemplate { get; set; }
 
+        /// <summary>
+        /// Options for the Message column.
+        /// </summary>
+        public MessageColumnOptions Message { get; set; }
+        
         /// <summary>
         ///     Options for the TimeStamp column.
         /// </summary>
@@ -105,13 +111,7 @@ public ICollection<StandardColumn> Store
         /// <summary>
         ///     Options for the Id column.
         /// </summary>
-        public class IdColumnOptions
-        {
-            /// <summary>
-            ///     The name of the Id column. "Id" is used if not set.
-            /// </summary>
-            public string ColumnName { get; set; }
-        }
+        public class IdColumnOptions : CommonColumnOptions { }
 
         /// <summary>
         ///     Options for the Level column.