DNX: More cleanup

Dapper.DNX.Tests/Assert.cs

@@ -3,7 +3,7 @@
 using System.Linq;
 
 #if DNXCORE50
-using ApplicationException = global::System.InvalidOperationException;
+using ApplicationException = System.InvalidOperationException;
 #endif
 
 namespace SqlMapper

Dapper.DNX.Tests/Tests.Async.cs

@@ -10,11 +10,7 @@
 using System.Data.SqlClient;
 
 #if DNXCORE50
-using IDbCommand = global::System.Data.Common.DbCommand;
-using IDbDataParameter = global::System.Data.Common.DbParameter;
-using IDbConnection = global::System.Data.Common.DbConnection;
-using IDbTransaction = global::System.Data.Common.DbTransaction;
-using IDataReader = global::System.Data.Common.DbDataReader;
+using IDbConnection = System.Data.Common.DbConnection;
 #endif
 
 namespace DapperTests_NET45

Dapper.DNX.Tests/Tests.cs

@@ -2572,7 +2572,7 @@ static string GetDescriptionFromAttribute(MemberInfo member)
             if (member == null) return null;
 #if DNXCORE50
             var data = member.CustomAttributes.FirstOrDefault(x => x.AttributeType == typeof(DescriptionAttribute));
-            return data == null ? null : (string)data.ConstructorArguments.Single().Value;
+            return (string) data?.ConstructorArguments.Single().Value;
 #else
             var attrib = (DescriptionAttribute)Attribute.GetCustomAttribute(member, typeof(DescriptionAttribute), false);
             return attrib == null ? null : attrib.Description;
@@ -2957,9 +2957,9 @@ public TransactedConnection(IDbConnection conn, IDbTransaction tran)
             }
 
             public override string ConnectionString { get { return _conn.ConnectionString; } set { _conn.ConnectionString = value; } }
-            public override int ConnectionTimeout { get { return _conn.ConnectionTimeout; } }
-            public override string Database { get { return _conn.Database; } }
-            public override ConnectionState State { get { return _conn.State; } }
+            public override int ConnectionTimeout => _conn.ConnectionTimeout;
+            public override string Database => _conn.Database;
+            public override ConnectionState State => _conn.State;
 
             protected override IDbTransaction BeginDbTransaction(IsolationLevel isolationLevel)
             {
@@ -2970,20 +2970,10 @@ public override void ChangeDatabase(string databaseName)
             {
                 _conn.ChangeDatabase(databaseName);
             }
-            public override string DataSource
-            {
-                get
-                {
-                    return _conn.DataSource;
-                }
-            }
-            public override string ServerVersion
-            {
-                get
-                {
-                    return _conn.ServerVersion;
-                }
-            }
+            public override string DataSource => _conn.DataSource;
+
+            public override string ServerVersion => _conn.ServerVersion;
+
             public override void Close()
             {
                 _conn.Close();

Dapper/SqlMapper.GridReader.Async.cs

@@ -7,16 +7,8 @@
 using System.Threading;
 using System.Threading.Tasks;
 #if DNXCORE50
-using IDbDataParameter = global::System.Data.Common.DbParameter;
-using IDataParameter = global::System.Data.Common.DbParameter;
-using IDbTransaction = global::System.Data.Common.DbTransaction;
-using IDbConnection = global::System.Data.Common.DbConnection;
-using IDbCommand = global::System.Data.Common.DbCommand;
-using IDataReader = global::System.Data.Common.DbDataReader;
-using IDataRecord = global::System.Data.Common.DbDataReader;
-using IDataParameterCollection = global::System.Data.Common.DbParameterCollection;
-using DataException = global::System.InvalidOperationException;
-using ApplicationException = global::System.InvalidOperationException;
+using IDbCommand = System.Data.Common.DbCommand;
+using IDataReader = System.Data.Common.DbDataReader;
 #endif
 namespace Dapper
 {