Moar C# 6/5 fixes

Author: mythz

src/ServiceStack.OrmLite/Dapper/CommandDefinition.cs

@@ -96,7 +96,7 @@ public CommandDefinition(string commandText, object parameters = null, IDbTransa
 #if ASYNC
                                  , CancellationToken cancellationToken = default(CancellationToken)
 #endif
-            )
+            ) : this()
         {
             CommandText = commandText;
             Parameters = parameters;
@@ -126,7 +126,7 @@ internal IDbCommand SetupCommand(IDbConnection cnn, Action<IDbCommand, object> p
         {
             var cmd = cnn.CreateCommand();
             var init = GetInit(cmd.GetType());
-            init?.Invoke(cmd);
+            if (init != null) init(cmd);
             if (Transaction != null)
                 cmd.Transaction = Transaction;
             cmd.CommandText = CommandText;
@@ -140,7 +140,7 @@ internal IDbCommand SetupCommand(IDbConnection cnn, Action<IDbCommand, object> p
             }
             if (CommandType.HasValue)
                 cmd.CommandType = CommandType.Value;
-            paramReader?.Invoke(cmd, Parameters);
+            if (paramReader != null) paramReader(cmd, Parameters);
             return cmd;
         }
 

src/ServiceStack.OrmLite/Dapper/DefaultTypeMap.cs

@@ -21,7 +21,7 @@ public sealed class DefaultTypeMap : SqlMapper.ITypeMap
         public DefaultTypeMap(Type type)
         {
             if (type == null)
-                throw new ArgumentNullException(nameof(type));
+                throw new ArgumentNullException("type");
 
             _fields = GetSettableFields(type);
             Properties = GetSettableProps(type);

src/ServiceStack.OrmLite/Dapper/SqlMapper.LiteralToken.cs

@@ -20,7 +20,7 @@ internal struct LiteralToken
             /// </summary>
             public string Member { get; private set; }
 
-            internal LiteralToken(string token, string member)
+            internal LiteralToken(string token, string member) : this()
             {
                 Token = token;
                 Member = member;

src/ServiceStack.OrmLite/Dapper/SqlMapper.cs

@@ -904,7 +904,7 @@ private static GridReader QueryMultipleImpl(this IDbConnection cnn, ref CommandD
                         catch { /* don't spoil the existing exception */ }
                     reader.Dispose();
                 }
-                cmd?.Dispose();
+                if (cmd != null) cmd.Dispose();
                 if (wasClosed) cnn.Close();
                 throw;
             }